Project import generated by Copybara. GitOrigin-RevId: 88f9012e845a30ed526abd4c772bc588a416c382
diff --git a/Documentation/ABI/testing/sysfs-bus-iio b/Documentation/ABI/testing/sysfs-bus-iio index 4d873e8..c3767d4 100644 --- a/Documentation/ABI/testing/sysfs-bus-iio +++ b/Documentation/ABI/testing/sysfs-bus-iio
@@ -138,7 +138,7 @@ Raw capacitance measurement from channel Y. Units after application of scale and offset are nanofarads. -What: /sys/.../iio:deviceX/in_capacitanceY-capacitanceZ_raw +What: /sys/.../iio:deviceX/in_capacitanceY-in_capacitanceZ_raw KernelVersion: 3.2 Contact: linux-iio@vger.kernel.org Description:
diff --git a/Documentation/ABI/testing/sysfs-class-led-multicolor b/Documentation/ABI/testing/sysfs-class-led-multicolor deleted file mode 100644 index eeeddcb..0000000 --- a/Documentation/ABI/testing/sysfs-class-led-multicolor +++ /dev/null
@@ -1,35 +0,0 @@ -What: /sys/class/leds/<led>/brightness -Date: March 2020 -KernelVersion: 5.9 -Contact: Dan Murphy <dmurphy@ti.com> -Description: read/write - Writing to this file will update all LEDs within the group to a - calculated percentage of what each color LED intensity is set - to. The percentage is calculated for each grouped LED via the - equation below: - - led_brightness = brightness * multi_intensity/max_brightness - - For additional details please refer to - Documentation/leds/leds-class-multicolor.rst. - - The value of the LED is from 0 to - /sys/class/leds/<led>/max_brightness. - -What: /sys/class/leds/<led>/multi_index -Date: March 2020 -KernelVersion: 5.9 -Contact: Dan Murphy <dmurphy@ti.com> -Description: read - The multi_index array, when read, will output the LED colors - as an array of strings as they are indexed in the - multi_intensity file. - -What: /sys/class/leds/<led>/multi_intensity -Date: March 2020 -KernelVersion: 5.9 -Contact: Dan Murphy <dmurphy@ti.com> -Description: read/write - This file contains array of integers. Order of components is - described by the multi_index array. The maximum intensity should - not exceed /sys/class/leds/<led>/max_brightness.
diff --git a/Documentation/ABI/testing/sysfs-fs-incfs b/Documentation/ABI/testing/sysfs-fs-incfs index e4e05f9..690c687 100644 --- a/Documentation/ABI/testing/sysfs-fs-incfs +++ b/Documentation/ABI/testing/sysfs-fs-incfs
@@ -15,12 +15,6 @@ Description: Reads 'supported'. Present if zstd compression is supported for data blocks. -What: /sys/fs/incremental-fs/features/bugfix_throttling -Date: January 2023 -Contact: Paul Lawrence <paullawrence@google.com> -Description: Reads 'supported'. Present if the throttling lock bug is fixed - https://android-review.git.corp.google.com/c/kernel/common/+/2381827 - What: /sys/fs/incremental-fs/instances/[name] Date: April 2021 Contact: Paul Lawrence <paullawrence@google.com>
diff --git a/Documentation/ABI/testing/sysfs-kernel-oops_count b/Documentation/ABI/testing/sysfs-kernel-oops_count deleted file mode 100644 index 156cca9..0000000 --- a/Documentation/ABI/testing/sysfs-kernel-oops_count +++ /dev/null
@@ -1,6 +0,0 @@ -What: /sys/kernel/oops_count -Date: November 2022 -KernelVersion: 6.2.0 -Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org> -Description: - Shows how many times the system has Oopsed since last boot.
diff --git a/Documentation/ABI/testing/sysfs-kernel-warn_count b/Documentation/ABI/testing/sysfs-kernel-warn_count deleted file mode 100644 index 90a0298..0000000 --- a/Documentation/ABI/testing/sysfs-kernel-warn_count +++ /dev/null
@@ -1,6 +0,0 @@ -What: /sys/kernel/warn_count -Date: November 2022 -KernelVersion: 6.2.0 -Contact: Linux Kernel Hardening List <linux-hardening@vger.kernel.org> -Description: - Shows how many times the system has Warned since last boot.
diff --git a/Documentation/admin-guide/cgroup-v1/memory.rst b/Documentation/admin-guide/cgroup-v1/memory.rst index 6ec63c2..0ae4f56 100644 --- a/Documentation/admin-guide/cgroup-v1/memory.rst +++ b/Documentation/admin-guide/cgroup-v1/memory.rst
@@ -82,8 +82,6 @@ memory.swappiness set/show swappiness parameter of vmscan (See sysctl's vm.swappiness) memory.move_charge_at_immigrate set/show controls of moving charges - This knob is deprecated and shouldn't be - used. memory.oom_control set/show oom controls. memory.numa_stat show the number of memory usage per numa node @@ -747,15 +745,8 @@ It is recommended to set the soft limit always below the hard limit, otherwise the hard limit will take precedence. -8. Move charges at task migration (DEPRECATED!) -=============================================== - -THIS IS DEPRECATED! - -It's expensive and unreliable! It's better practice to launch workload -tasks directly from inside their target cgroup. Use dedicated workload -cgroups to allow fine-grained policy adjustments without having to -move physical pages between control domains. +8. Move charges at task migration +================================= Users can move charges associated with a task along with task migration, that is, uncharge task's pages from the old cgroup and charge them to the new cgroup.
diff --git a/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst b/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst index c98fd11..9393c50 100644 --- a/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst +++ b/Documentation/admin-guide/hw-vuln/processor_mmio_stale_data.rst
@@ -230,20 +230,6 @@ * - 'Mitigation: Clear CPU buffers' - The processor is vulnerable and the CPU buffer clearing mitigation is enabled. - * - 'Unknown: No mitigations' - - The processor vulnerability status is unknown because it is - out of Servicing period. Mitigation is not attempted. - -Definitions: ------------- - -Servicing period: The process of providing functional and security updates to -Intel processors or platforms, utilizing the Intel Platform Update (IPU) -process or other similar mechanisms. - -End of Servicing Updates (ESU): ESU is the date at which Intel will no -longer provide Servicing, such as through IPU or other similar update -processes. ESU dates will typically be aligned to end of quarter. If the processor is vulnerable then the following information is appended to the above information:
diff --git a/Documentation/admin-guide/hw-vuln/spectre.rst b/Documentation/admin-guide/hw-vuln/spectre.rst index 0fba375..7e061ed 100644 --- a/Documentation/admin-guide/hw-vuln/spectre.rst +++ b/Documentation/admin-guide/hw-vuln/spectre.rst
@@ -479,16 +479,8 @@ On Intel Skylake-era systems the mitigation covers most, but not all, cases. See :ref:`[3] <spec_ref3>` for more details. - On CPUs with hardware mitigation for Spectre variant 2 (e.g. IBRS - or enhanced IBRS on x86), retpoline is automatically disabled at run time. - - Systems which support enhanced IBRS (eIBRS) enable IBRS protection once at - boot, by setting the IBRS bit, and they're automatically protected against - Spectre v2 variant attacks, including cross-thread branch target injections - on SMT systems (STIBP). In other words, eIBRS enables STIBP too. - - Legacy IBRS systems clear the IBRS bit on exit to userspace and - therefore explicitly enable STIBP for that + On CPUs with hardware mitigation for Spectre variant 2 (e.g. Enhanced + IBRS on x86), retpoline is automatically disabled at run time. The retpoline mitigation is turned on by default on vulnerable CPUs. It can be forced on or off by the administrator @@ -512,12 +504,9 @@ For Spectre variant 2 mitigation, individual user programs can be compiled with return trampolines for indirect branches. This protects them from consuming poisoned entries in the branch - target buffer left by malicious software. - - On legacy IBRS systems, at return to userspace, implicit STIBP is disabled - because the kernel clears the IBRS bit. In this case, the userspace programs - can disable indirect branch speculation via prctl() (See - :ref:`Documentation/userspace-api/spec_ctrl.rst <set_spec_ctrl>`). + target buffer left by malicious software. Alternatively, the + programs can disable their indirect branch speculation via prctl() + (See :ref:`Documentation/userspace-api/spec_ctrl.rst <set_spec_ctrl>`). On x86, this will turn on STIBP to guard against attacks from the sibling thread when the user program is running, and use IBPB to flush the branch target buffer when switching to/from the program.
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index d7d649d..fbddd0d 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1955,57 +1955,24 @@ ivrs_ioapic [HW,X86_64] Provide an override to the IOAPIC-ID<->DEVICE-ID - mapping provided in the IVRS ACPI table. - By default, PCI segment is 0, and can be omitted. - - For example, to map IOAPIC-ID decimal 10 to - PCI segment 0x1 and PCI device 00:14.0, - write the parameter as: - ivrs_ioapic=10@0001:00:14.0 - - Deprecated formats: - * To map IOAPIC-ID decimal 10 to PCI device 00:14.0 - write the parameter as: + mapping provided in the IVRS ACPI table. For + example, to map IOAPIC-ID decimal 10 to + PCI device 00:14.0 write the parameter as: ivrs_ioapic[10]=00:14.0 - * To map IOAPIC-ID decimal 10 to PCI segment 0x1 and - PCI device 00:14.0 write the parameter as: - ivrs_ioapic[10]=0001:00:14.0 ivrs_hpet [HW,X86_64] Provide an override to the HPET-ID<->DEVICE-ID - mapping provided in the IVRS ACPI table. - By default, PCI segment is 0, and can be omitted. - - For example, to map HPET-ID decimal 10 to - PCI segment 0x1 and PCI device 00:14.0, - write the parameter as: - ivrs_hpet=10@0001:00:14.0 - - Deprecated formats: - * To map HPET-ID decimal 0 to PCI device 00:14.0 - write the parameter as: + mapping provided in the IVRS ACPI table. For + example, to map HPET-ID decimal 0 to + PCI device 00:14.0 write the parameter as: ivrs_hpet[0]=00:14.0 - * To map HPET-ID decimal 10 to PCI segment 0x1 and - PCI device 00:14.0 write the parameter as: - ivrs_ioapic[10]=0001:00:14.0 ivrs_acpihid [HW,X86_64] Provide an override to the ACPI-HID:UID<->DEVICE-ID - mapping provided in the IVRS ACPI table. - By default, PCI segment is 0, and can be omitted. - - For example, to map UART-HID:UID AMD0020:0 to - PCI segment 0x1 and PCI device ID 00:14.5, - write the parameter as: - ivrs_acpihid=AMD0020:0@0001:00:14.5 - - Deprecated formats: - * To map UART-HID:UID AMD0020:0 to PCI segment is 0, - PCI device ID 00:14.5, write the parameter as: + mapping provided in the IVRS ACPI table. For + example, to map UART-HID:UID AMD0020:0 to + PCI device 00:14.5 write the parameter as: ivrs_acpihid[00:14.5]=AMD0020:0 - * To map UART-HID:UID AMD0020:0 to PCI segment 0x1 and - PCI device ID 00:14.5, write the parameter as: - ivrs_acpihid[0001:00:14.5]=AMD0020:0 js= [HW,JOY] Analog joystick See Documentation/input/joydev/joystick.rst. @@ -4364,18 +4331,6 @@ retain_initrd [RAM] Keep initrd memory after extraction - retbleed= [X86] Control mitigation of RETBleed (Arbitrary - Speculative Code Execution with Return Instructions) - vulnerability. - - off - unconditionally disable - auto - automatically select a migitation - - Selecting 'auto' will choose a mitigation method at run - time according to the CPU. - - Not specifying this option is equivalent to retbleed=auto. - rfkill.default_state= 0 "airplane mode". All wifi, bluetooth, wimax, gps, fm, etc. communication is blocked by default. @@ -4619,7 +4574,6 @@ eibrs - enhanced IBRS eibrs,retpoline - enhanced IBRS + Retpolines eibrs,lfence - enhanced IBRS + LFENCE - ibrs - use IBRS to protect kernel Not specifying this option is equivalent to spectre_v2=auto.
diff --git a/Documentation/admin-guide/pm/cpuidle.rst b/Documentation/admin-guide/pm/cpuidle.rst index 80cf2ef..e70b365 100644 --- a/Documentation/admin-guide/pm/cpuidle.rst +++ b/Documentation/admin-guide/pm/cpuidle.rst
@@ -676,8 +676,8 @@ by default this way, for example. The other kernel command line parameters controlling CPU idle time management -described below are only relevant for the *x86* architecture and references -to ``intel_idle`` affect Intel processors only. +described below are only relevant for the *x86* architecture and some of +them affect Intel processors only. The *x86* architecture support code recognizes three kernel command line options related to CPU idle time management: ``idle=poll``, ``idle=halt``, @@ -699,13 +699,10 @@ energy-efficiency. Thus using it for performance reasons may not be a good idea at all.] -The ``idle=nomwait`` option prevents the use of ``MWAIT`` instruction of -the CPU to enter idle states. When this option is used, the ``acpi_idle`` -driver will use the ``HLT`` instruction instead of ``MWAIT``. On systems -running Intel processors, this option disables the ``intel_idle`` driver -and forces the use of the ``acpi_idle`` driver instead. Note that in either -case, ``acpi_idle`` driver will function only if all the information needed -by it is in the system's ACPI tables. +The ``idle=nomwait`` option disables the ``intel_idle`` driver and causes +``acpi_idle`` to be used (as long as all of the information needed by it is +there in the system's ACPI tables), but it is not allowed to use the +``MWAIT`` instruction of the CPUs to ask the hardware to enter idle states. In addition to the architecture-level kernel command line options affecting CPU idle time management, there are parameters affecting individual ``CPUIdle``
diff --git a/Documentation/admin-guide/sysctl/kernel.rst b/Documentation/admin-guide/sysctl/kernel.rst index 80331cf..b150e55 100644 --- a/Documentation/admin-guide/sysctl/kernel.rst +++ b/Documentation/admin-guide/sysctl/kernel.rst
@@ -557,15 +557,6 @@ scanned for a given scan. -oops_limit -========== - -Number of kernel oopses after which the kernel should panic when -``panic_on_oops`` is not set. Setting this to 0 disables checking -the count. Setting this to 1 has the same effect as setting -``panic_on_oops=1``. The default value is 10000. - - osrelease, ostype & version: ============================ @@ -1240,16 +1231,6 @@ 2 Unprivileged calls to ``bpf()`` are disabled = ============================================================= - -warn_limit -========== - -Number of kernel warnings after which the kernel should panic when -``panic_on_warn`` is not set. Setting this to 0 disables checking -the warning count. Setting this to 1 has the same effect as setting -``panic_on_warn=1``. The default value is 0. - - watchdog: =========
diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 36a8c01..59daa4c 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst
@@ -70,12 +70,8 @@ +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 | +----------------+-----------------+-----------------+-----------------------------+ -| ARM | Cortex-A57 | #1742098 | ARM64_ERRATUM_1742098 | -+----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A72 | #853709 | N/A | +----------------+-----------------+-----------------+-----------------------------+ -| ARM | Cortex-A72 | #1655431 | ARM64_ERRATUM_1742098 | -+----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A73 | #858921 | ARM64_ERRATUM_858921 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A55 | #1024718 | ARM64_ERRATUM_1024718 |
diff --git a/Documentation/atomic_bitops.txt b/Documentation/atomic_bitops.txt index d8b101c..093cdae 100644 --- a/Documentation/atomic_bitops.txt +++ b/Documentation/atomic_bitops.txt
@@ -59,7 +59,7 @@ - RMW operations that have a return value are fully ordered. - RMW operations that are conditional are unordered on FAILURE, - otherwise the above rules apply. In the case of test_and_set_bit_lock(), + otherwise the above rules apply. In the case of test_and_{}_bit() operations, if the bit in memory is unchanged by the operation then it is deemed to have failed.
diff --git a/Documentation/dev-tools/gdb-kernel-debugging.rst b/Documentation/dev-tools/gdb-kernel-debugging.rst index afe4bc2..19df792 100644 --- a/Documentation/dev-tools/gdb-kernel-debugging.rst +++ b/Documentation/dev-tools/gdb-kernel-debugging.rst
@@ -39,10 +39,6 @@ this mode. In this case, you should build the kernel with CONFIG_RANDOMIZE_BASE disabled if the architecture supports KASLR. -- Build the gdb scripts (required on kernels v5.1 and above):: - - make scripts_gdb - - Enable the gdb stub of QEMU/KVM, either - at VM startup time by appending "-s" to the QEMU command line
diff --git a/Documentation/devicetree/bindings/arm/qcom.yaml b/Documentation/devicetree/bindings/arm/qcom.yaml index 3de6182..e39d8f0 100644 --- a/Documentation/devicetree/bindings/arm/qcom.yaml +++ b/Documentation/devicetree/bindings/arm/qcom.yaml
@@ -112,8 +112,8 @@ - const: qcom,msm8974 - items: - - const: qcom,msm8916-mtp - const: qcom,msm8916-mtp/1 + - const: qcom,msm8916-mtp - const: qcom,msm8916 - items:
diff --git a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt index 7e14e26..8a9f355 100644 --- a/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt +++ b/Documentation/devicetree/bindings/dma/moxa,moxart-dma.txt
@@ -34,8 +34,8 @@ Use specific request line passing from dma For example, MMC request line is 5 - mmc: mmc@98e00000 { - compatible = "moxa,moxart-mmc"; + sdhci: sdhci@98e00000 { + compatible = "moxa,moxart-sdhci"; reg = <0x98e00000 0x5C>; interrupts = <5 0>; clocks = <&clk_apb>;
diff --git a/Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml similarity index 82% rename from Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml rename to Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml index 5407468..346f9c3 100644 --- a/Documentation/devicetree/bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml +++ b/Documentation/devicetree/bindings/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml
@@ -2,7 +2,7 @@ # Copyright 2019 BayLibre, SAS %YAML 1.2 --- -$id: "http://devicetree.org/schemas/phy/amlogic,g12a-usb3-pcie-phy.yaml#" +$id: "http://devicetree.org/schemas/phy/amlogic,meson-g12a-usb3-pcie-phy.yaml#" $schema: "http://devicetree.org/meta-schemas/core.yaml#" title: Amlogic G12A USB3 + PCIE Combo PHY @@ -13,7 +13,7 @@ properties: compatible: enum: - - amlogic,g12a-usb3-pcie-phy + - amlogic,meson-g12a-usb3-pcie-phy reg: maxItems: 1 @@ -47,7 +47,7 @@ examples: - | phy@46000 { - compatible = "amlogic,g12a-usb3-pcie-phy"; + compatible = "amlogic,meson-g12a-usb3-pcie-phy"; reg = <0x46000 0x2000>; clocks = <&ref_clk>; clock-names = "ref_clk";
diff --git a/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml b/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml index 1407930..d7a57ec 100644 --- a/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml +++ b/Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
@@ -128,6 +128,7 @@ - compatible - reg - interrupts + - clocks - clock-output-names additionalProperties: false
diff --git a/Documentation/devicetree/bindings/sound/qcom,wcd9335.txt b/Documentation/devicetree/bindings/sound/qcom,wcd9335.txt index 1f75fee..5d6ea66 100644 --- a/Documentation/devicetree/bindings/sound/qcom,wcd9335.txt +++ b/Documentation/devicetree/bindings/sound/qcom,wcd9335.txt
@@ -109,7 +109,7 @@ reg = <1 0>; interrupts = <&msmgpio 54 IRQ_TYPE_LEVEL_HIGH>; interrupt-names = "intr2" - reset-gpios = <&msmgpio 64 GPIO_ACTIVE_LOW>; + reset-gpios = <&msmgpio 64 0>; slim-ifc-dev = <&wc9335_ifd>; clock-names = "mclk", "native"; clocks = <&rpmcc RPM_SMD_DIV_CLK1>,
diff --git a/Documentation/driver-api/spi.rst b/Documentation/driver-api/spi.rst index f288870..f64cb66 100644 --- a/Documentation/driver-api/spi.rst +++ b/Documentation/driver-api/spi.rst
@@ -25,8 +25,8 @@ a pair of FIFOs connected to dual DMA engines on the other side of the SPI shift register (maximizing throughput). Such drivers bridge between whatever bus they sit on (often the platform bus) and SPI, and expose -the SPI side of their device as a :c:type:`struct spi_controller -<spi_controller>`. SPI devices are children of that master, +the SPI side of their device as a :c:type:`struct spi_master +<spi_master>`. SPI devices are children of that master, represented as a :c:type:`struct spi_device <spi_device>` and manufactured from :c:type:`struct spi_board_info <spi_board_info>` descriptors which are usually provided by
diff --git a/Documentation/fault-injection/fault-injection.rst b/Documentation/fault-injection/fault-injection.rst index 49b5773..f51bb21 100644 --- a/Documentation/fault-injection/fault-injection.rst +++ b/Documentation/fault-injection/fault-injection.rst
@@ -74,8 +74,8 @@ - /sys/kernel/debug/fail*/times: - specifies how many times failures may happen at most. A value of -1 - means "no limit". + specifies how many times failures may happen at most. + A value of -1 means "no limit". - /sys/kernel/debug/fail*/space: @@ -163,13 +163,11 @@ - ERRNO: retval must be -1 to -MAX_ERRNO (-4096). - ERR_NULL: retval must be 0 or -1 to -MAX_ERRNO (-4096). -- /sys/kernel/debug/fail_function/<function-name>/retval: +- /sys/kernel/debug/fail_function/<functiuon-name>/retval: - specifies the "error" return value to inject to the given function. - This will be created when the user specifies a new injection entry. - Note that this file only accepts unsigned values. So, if you want to - use a negative errno, you better use 'printf' instead of 'echo', e.g.: - $ printf %#x -12 > retval + specifies the "error" return value to inject to the given + function for given function. This will be created when + user specifies new injection entry. Boot option ^^^^^^^^^^^ @@ -333,7 +331,7 @@ FAILTYPE=fail_function FAILFUNC=open_ctree echo $FAILFUNC > /sys/kernel/debug/$FAILTYPE/inject - printf %#x -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval + echo -12 > /sys/kernel/debug/$FAILTYPE/$FAILFUNC/retval echo N > /sys/kernel/debug/$FAILTYPE/task-filter echo 100 > /sys/kernel/debug/$FAILTYPE/probability echo 0 > /sys/kernel/debug/$FAILTYPE/interval
diff --git a/Documentation/filesystems/incfs.rst b/Documentation/filesystems/incfs.rst index f0fb1d0..19db303 100644 --- a/Documentation/filesystems/incfs.rst +++ b/Documentation/filesystems/incfs.rst
@@ -35,9 +35,6 @@ /sys/fs/incremental-fs/features/zstd Reads 'supported'. Present if zstd compression is supported for data blocks. -/sys/fs/incremental-fs/features/bugfix_throttling - Reads 'supported'. Present if the throttling lock bug is fixed - Optional per mount ------------------
diff --git a/Documentation/filesystems/vfs.rst b/Documentation/filesystems/vfs.rst index 241e312..7d4d09d 100644 --- a/Documentation/filesystems/vfs.rst +++ b/Documentation/filesystems/vfs.rst
@@ -1173,7 +1173,7 @@ return -ECHILD and it will be called again in ref-walk mode. -``d_weak_revalidate`` +``_weak_revalidate`` called when the VFS needs to revalidate a "jumped" dentry. This is called when a path-walk ends at dentry that was not acquired by doing a lookup in the parent directory. This includes "/",
diff --git a/Documentation/firmware-guide/acpi/apei/einj.rst b/Documentation/firmware-guide/acpi/apei/einj.rst index 3442842..e588bcc 100644 --- a/Documentation/firmware-guide/acpi/apei/einj.rst +++ b/Documentation/firmware-guide/acpi/apei/einj.rst
@@ -168,7 +168,7 @@ 0x00000008 Memory Correctable 0x00000010 Memory Uncorrectable non-fatal # echo 0x12345000 > param1 # Set memory address for injection - # echo 0xfffffffffffff000 > param2 # Mask - anywhere in this page + # echo $((-1 << 12)) > param2 # Mask 0xfffffffffffff000 - anywhere in this page # echo 0x8 > error_type # Choose correctable memory error # echo 1 > error_inject # Inject now
diff --git a/Documentation/input/joydev/joystick.rst b/Documentation/input/joydev/joystick.rst index f38c330..9746fd7 100644 --- a/Documentation/input/joydev/joystick.rst +++ b/Documentation/input/joydev/joystick.rst
@@ -517,7 +517,6 @@ * AVB Mag Turbo Force * AVB Top Shot Pegasus * AVB Top Shot Force Feedback Racing Wheel -* Boeder Force Feedback Wheel * Logitech WingMan Force * Logitech WingMan Force Wheel * Guillemot Race Leader Force Feedback
diff --git a/Documentation/leds/index.rst b/Documentation/leds/index.rst index bc70c6a..060f4e4 100644 --- a/Documentation/leds/index.rst +++ b/Documentation/leds/index.rst
@@ -9,7 +9,6 @@ leds-class leds-class-flash - leds-class-multicolor ledtrig-oneshot ledtrig-transient ledtrig-usbport
diff --git a/Documentation/leds/leds-class-multicolor.rst b/Documentation/leds/leds-class-multicolor.rst deleted file mode 100644 index c57b98b..0000000 --- a/Documentation/leds/leds-class-multicolor.rst +++ /dev/null
@@ -1,86 +0,0 @@ -.. SPDX-License-Identifier: GPL-2.0 - -==================================== -Multicolor LED handling under Linux -==================================== - -Description -=========== -The multicolor class groups monochrome LEDs and allows controlling two -aspects of the final combined color: hue and lightness. The former is -controlled via the multi_intensity array file and the latter is controlled -via brightness file. - -Multicolor Class Control -======================== -The multicolor class presents files that groups the colors as indexes in an -array. These files are children under the LED parent node created by the -led_class framework. The led_class framework is documented in led-class.rst -within this documentation directory. - -Each colored LED will be indexed under the multi_* files. The order of the -colors will be arbitrary. The multi_index file can be read to determine the -color name to indexed value. - -The multi_index file is an array that contains the string list of the colors as -they are defined in each multi_* array file. - -The multi_intensity is an array that can be read or written to for the -individual color intensities. All elements within this array must be written in -order for the color LED intensities to be updated. - -Directory Layout Example -======================== -root:/sys/class/leds/multicolor:status# ls -lR --rw-r--r-- 1 root root 4096 Oct 19 16:16 brightness --r--r--r-- 1 root root 4096 Oct 19 16:16 max_brightness --r--r--r-- 1 root root 4096 Oct 19 16:16 multi_index --rw-r--r-- 1 root root 4096 Oct 19 16:16 multi_intensity - -Multicolor Class Brightness Control -=================================== -The brightness level for each LED is calculated based on the color LED -intensity setting divided by the global max_brightness setting multiplied by -the requested brightness. - -led_brightness = brightness * multi_intensity/max_brightness - -Example: -A user first writes the multi_intensity file with the brightness levels -for each LED that are necessary to achieve a certain color output from a -multicolor LED group. - -cat /sys/class/leds/multicolor:status/multi_index -green blue red - -echo 43 226 138 > /sys/class/leds/multicolor:status/multi_intensity - -red - - intensity = 138 - max_brightness = 255 -green - - intensity = 43 - max_brightness = 255 -blue - - intensity = 226 - max_brightness = 255 - -The user can control the brightness of that multicolor LED group by writing the -global 'brightness' control. Assuming a max_brightness of 255 the user -may want to dim the LED color group to half. The user would write a value of -128 to the global brightness file then the values written to each LED will be -adjusted base on this value. - -cat /sys/class/leds/multicolor:status/max_brightness -255 -echo 128 > /sys/class/leds/multicolor:status/brightness - -adjusted_red_value = 128 * 138/255 = 69 -adjusted_green_value = 128 * 43/255 = 21 -adjusted_blue_value = 128 * 226/255 = 113 - -Reading the global brightness file will return the current brightness value of -the color LED group. - -cat /sys/class/leds/multicolor:status/brightness -128
diff --git a/Documentation/process/code-of-conduct-interpretation.rst b/Documentation/process/code-of-conduct-interpretation.rst index 43da2cc..e899f14 100644 --- a/Documentation/process/code-of-conduct-interpretation.rst +++ b/Documentation/process/code-of-conduct-interpretation.rst
@@ -51,7 +51,7 @@ uncertain how to handle situations that come up. It will not be considered a violation report unless you want it to be. If you are uncertain about approaching the TAB or any other maintainers, please -reach out to our conflict mediator, Joanna Lee <jlee@linuxfoundation.org>. +reach out to our conflict mediator, Mishi Choudhary <mishi@linux.com>. In the end, "be kind to each other" is really what the end goal is for everybody. We know everyone is human and we all fail at times, but the
diff --git a/Documentation/sound/hd-audio/models.rst b/Documentation/sound/hd-audio/models.rst index 71ac387..4c91aba 100644 --- a/Documentation/sound/hd-audio/models.rst +++ b/Documentation/sound/hd-audio/models.rst
@@ -702,7 +702,7 @@ no-jd BIOS setup but without jack-detection intel - Intel D*45* mobos + Intel DG45* mobos dell-m6-amic Dell desktops/laptops with analog mics dell-m6-dmic
diff --git a/Documentation/sphinx/load_config.py b/Documentation/sphinx/load_config.py index 8b416bf..eeb394b 100644 --- a/Documentation/sphinx/load_config.py +++ b/Documentation/sphinx/load_config.py
@@ -3,7 +3,7 @@ import os import sys -from sphinx.util.osutil import fs_encoding +from sphinx.util.pycompat import execfile_ # ------------------------------------------------------------------------------ def loadConfig(namespace): @@ -48,9 +48,7 @@ sys.stdout.write("load additional sphinx-config: %s\n" % config_file) config = namespace.copy() config['__file__'] = config_file - with open(config_file, 'rb') as f: - code = compile(f.read(), fs_encoding, 'exec') - exec(code, config) + execfile_(config_file, config) del config['__file__'] namespace.update(config) else:
diff --git a/Documentation/trace/histogram.rst b/Documentation/trace/histogram.rst index 931f3b7..3f3d1b9 100644 --- a/Documentation/trace/histogram.rst +++ b/Documentation/trace/histogram.rst
@@ -39,7 +39,7 @@ will use the event's kernel stacktrace as the key. The keywords 'keys' or 'key' can be used to specify keys, and the keywords 'values', 'vals', or 'val' can be used to specify values. Compound - keys consisting of up to three fields can be specified by the 'keys' + keys consisting of up to two fields can be specified by the 'keys' keyword. Hashing a compound key produces a unique entry in the table for each unique combination of component keys, and can be useful for providing more fine-grained summaries of event data.
diff --git a/Documentation/virt/kvm/api.txt b/Documentation/virt/kvm/api.txt index 180475b..fd22224 100644 --- a/Documentation/virt/kvm/api.txt +++ b/Documentation/virt/kvm/api.txt
@@ -3615,18 +3615,6 @@ Parameters: struct kvm_s390_cmma_log (in, out) Returns: 0 on success, a negative value on error -Errors: - - ====== ============================================================= - ENOMEM not enough memory can be allocated to complete the task - ENXIO if CMMA is not enabled - EINVAL if KVM_S390_CMMA_PEEK is not set but migration mode was not enabled - EINVAL if KVM_S390_CMMA_PEEK is not set but dirty tracking has been - disabled (and thus migration mode was automatically disabled) - EFAULT if the userspace address is invalid or if no page table is - present for the addresses (e.g. when using hugepages). - ====== ============================================================= - This ioctl is used to get the values of the CMMA bits on the s390 architecture. It is meant to be used in two scenarios: - During live migration to save the CMMA values. Live migration needs @@ -3703,6 +3691,12 @@ values points to the userspace buffer where the result will be stored. +This ioctl can fail with -ENOMEM if not enough memory can be allocated to +complete the task, with -ENXIO if CMMA is not enabled, with -EINVAL if +KVM_S390_CMMA_PEEK is not set but migration mode was not enabled, with +-EFAULT if the userspace address is invalid or if no page table is +present for the addresses (e.g. when using hugepages). + 4.108 KVM_S390_SET_CMMA_BITS Capability: KVM_CAP_S390_CMMA_MIGRATION
diff --git a/Documentation/virt/kvm/devices/vm.txt b/Documentation/virt/kvm/devices/vm.txt index 38ec142..4ffb82b 100644 --- a/Documentation/virt/kvm/devices/vm.txt +++ b/Documentation/virt/kvm/devices/vm.txt
@@ -254,10 +254,6 @@ Setting this attribute when migration mode is already active will have no effects. -Dirty tracking must be enabled on all memslots, else -EINVAL is returned. When -dirty tracking is disabled on any memslot, migration mode is automatically -stopped. - Parameters: none Returns: -ENOMEM if there is not enough free memory to start migration mode -EINVAL if the state of the VM is invalid (e.g. no memory defined)
diff --git a/MAINTAINERS b/MAINTAINERS index c52c40f..793e9c9 100644 --- a/MAINTAINERS +++ b/MAINTAINERS
@@ -14700,7 +14700,6 @@ S: Maintained F: drivers/net/phy/phylink.c F: drivers/net/phy/sfp* -F: include/linux/mdio/mdio-i2c.h F: include/linux/phylink.h F: include/linux/sfp.h K: phylink @@ -17921,8 +17920,7 @@ F: sound/xen/* XFS FILESYSTEM -M: Chandan Babu R <chandan.babu@oracle.com> -M: Darrick J. Wong <djwong@kernel.org> +M: Darrick J. Wong <darrick.wong@oracle.com> M: linux-xfs@vger.kernel.org L: linux-xfs@vger.kernel.org W: http://xfs.org/
diff --git a/Makefile b/Makefile index cfd2fab..0b1a8b2 100644 --- a/Makefile +++ b/Makefile
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 5 PATCHLEVEL = 4 -SUBLEVEL = 242 +SUBLEVEL = 210 EXTRAVERSION = NAME = Kleptomaniac Octopus @@ -89,16 +89,9 @@ # If the user is running make -s (silent mode), suppress echoing of # commands -# make-4.0 (and later) keep single letter options in the 1st word of MAKEFLAGS. -ifeq ($(filter 3.%,$(MAKE_VERSION)),) -silence:=$(findstring s,$(firstword -$(MAKEFLAGS))) -else -silence:=$(findstring s,$(filter-out --%,$(MAKEFLAGS))) -endif - -ifeq ($(silence),s) -quiet=silent_ +ifneq ($(findstring s,$(filter-out --%,$(MAKEFLAGS))),) + quiet=silent_ endif export quiet Q KBUILD_VERBOSE @@ -857,9 +850,7 @@ else DEBUG_CFLAGS += -g endif -ifeq ($(LLVM_IAS),1) -KBUILD_AFLAGS += -g -else +ifneq ($(LLVM_IAS),1) KBUILD_AFLAGS += -Wa,-gdwarf-2 endif endif @@ -1041,9 +1032,6 @@ KBUILD_LDFLAGS_MODULE += --build-id LDFLAGS_vmlinux += --build-id -KBUILD_LDFLAGS += -z noexecstack -KBUILD_LDFLAGS += $(call ld-option,--no-warn-rwx-segments) - ifeq ($(CONFIG_STRIP_ASM_SYMS),y) LDFLAGS_vmlinux += $(call ld-option, -X,) endif
diff --git a/android/abi_gki_aarch64.xml b/android/abi_gki_aarch64.xml index c1c7a37..31d3b31 100644 --- a/android/abi_gki_aarch64.xml +++ b/android/abi_gki_aarch64.xml
@@ -492,7 +492,6 @@ <elf-symbol name='bpf_trace_run9' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x83d8502e'/> <elf-symbol name='bpf_warn_invalid_xdp_action' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5c2bcd37'/> <elf-symbol name='bprm_change_interp' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb6d43c06'/> - <elf-symbol name='br_fdb_find_port' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc1fa0614'/> <elf-symbol name='bsearch' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x50a90e8d'/> <elf-symbol name='bt_err' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7b8c32f1'/> <elf-symbol name='bt_info' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x718b8b7'/> @@ -1161,7 +1160,6 @@ <elf-symbol name='dma_resv_add_shared_fence' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x123476cd'/> <elf-symbol name='dma_resv_copy_fences' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x32b0a40a'/> <elf-symbol name='dma_resv_fini' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8870ec55'/> - <elf-symbol name='dma_resv_get_fences_rcu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xff3e7788'/> <elf-symbol name='dma_resv_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x992bce5'/> <elf-symbol name='dma_resv_reserve_shared' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd142d8cd'/> <elf-symbol name='dma_resv_test_signaled_rcu' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4baea7b0'/> @@ -1955,7 +1953,6 @@ <elf-symbol name='in4_pton' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xac5fcec0'/> <elf-symbol name='in6_dev_finish_destroy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc46f97c'/> <elf-symbol name='in6_pton' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x609bcd98'/> - <elf-symbol name='in_aton' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1b6314fd'/> <elf-symbol name='in_egroup_p' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x39461d6a'/> <elf-symbol name='in_group_p' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8b8059bd'/> <elf-symbol name='inc_nlink' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf51c55cb'/> @@ -2164,7 +2161,6 @@ <elf-symbol name='kernel_recvmsg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbf934e4d'/> <elf-symbol name='kernel_sendmsg' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb8c6e108'/> <elf-symbol name='kernel_sigaction' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6df1aaf1'/> - <elf-symbol name='kernel_sock_shutdown' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xa582c64a'/> <elf-symbol name='kernfs_find_and_get_ns' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x75956452'/> <elf-symbol name='kernfs_notify' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb158c819'/> <elf-symbol name='kernfs_put' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf9983c21'/> @@ -2572,7 +2568,6 @@ <elf-symbol name='of_clk_hw_onecell_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfd151355'/> <elf-symbol name='of_clk_hw_register' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc715b510'/> <elf-symbol name='of_clk_hw_simple_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb423ebdb'/> - <elf-symbol name='of_clk_parent_fill' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7755271d'/> <elf-symbol name='of_clk_set_defaults' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd3f99ff6'/> <elf-symbol name='of_clk_src_onecell_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb987cddb'/> <elf-symbol name='of_clk_src_simple_get' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7dce2412'/> @@ -3062,7 +3057,6 @@ <elf-symbol name='register_netdevice' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x82a0fc5c'/> <elf-symbol name='register_netdevice_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd2da1048'/> <elf-symbol name='register_netevent_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4761f17c'/> - <elf-symbol name='register_oom_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x622c7922'/> <elf-symbol name='register_pernet_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x241c81db'/> <elf-symbol name='register_pernet_subsys' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xe9c4fed0'/> <elf-symbol name='register_pm_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9cc4f70a'/> @@ -3086,7 +3080,6 @@ <elf-symbol name='regmap_field_update_bits_base' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdcb0448a'/> <elf-symbol name='regmap_get_reg_stride' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x70eb8ba4'/> <elf-symbol name='regmap_get_val_bytes' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x27532a0e'/> - <elf-symbol name='regmap_irq_chip_get_base' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x6e89a560'/> <elf-symbol name='regmap_irq_get_domain' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x424ad9bb'/> <elf-symbol name='regmap_irq_get_virq' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x55784228'/> <elf-symbol name='regmap_multi_reg_write' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2514dc99'/> @@ -3279,7 +3272,6 @@ <elf-symbol name='sdhci_cqe_irq' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xf8d18124'/> <elf-symbol name='sdhci_enable_clk' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8e2d8abc'/> <elf-symbol name='sdhci_enable_v4_mode' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xb52d943d'/> - <elf-symbol name='sdhci_execute_tuning' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xea054998'/> <elf-symbol name='sdhci_get_property' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8d9f3508'/> <elf-symbol name='sdhci_pltfm_free' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x26256ed8'/> <elf-symbol name='sdhci_pltfm_init' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x3cb607d1'/> @@ -3291,7 +3283,6 @@ <elf-symbol name='sdhci_runtime_suspend_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x447943ae'/> <elf-symbol name='sdhci_set_bus_width' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x83328134'/> <elf-symbol name='sdhci_set_clock' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8f5055f6'/> - <elf-symbol name='sdhci_set_uhs_signaling' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5e8c9207'/> <elf-symbol name='sdhci_setup_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xd033fe36'/> <elf-symbol name='sdio_align_size' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x8bcf513'/> <elf-symbol name='sdio_claim_host' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x2e8b312e'/> @@ -3524,7 +3515,6 @@ <elf-symbol name='snd_pcm_hw_constraint_mask64' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfc747f96'/> <elf-symbol name='snd_pcm_hw_constraint_minmax' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x80c0be2a'/> <elf-symbol name='snd_pcm_hw_constraint_msbits' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x38a7ac42'/> - <elf-symbol name='snd_pcm_hw_constraint_pow2' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x354ce4b3'/> <elf-symbol name='snd_pcm_hw_constraint_step' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x886abd48'/> <elf-symbol name='snd_pcm_hw_rule_add' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4d9c75b3'/> <elf-symbol name='snd_pcm_lib_default_mmap' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfe668d59'/> @@ -3736,7 +3726,6 @@ <elf-symbol name='strrchr' type='func-type' binding='weak-binding' visibility='default-visibility' is-defined='yes' crc='0x9f984513'/> <elf-symbol name='strreplace' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7410aba2'/> <elf-symbol name='strscpy' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xdd64e639'/> - <elf-symbol name='strscpy_pad' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xfbb8a761'/> <elf-symbol name='strsep' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x85df9b6c'/> <elf-symbol name='strstr' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x1e6d26a8'/> <elf-symbol name='submit_bh' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbd635528'/> @@ -3980,7 +3969,6 @@ <elf-symbol name='unregister_netdevice_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9d0d6206'/> <elf-symbol name='unregister_netdevice_queue' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xbdb6faa2'/> <elf-symbol name='unregister_netevent_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x4fe1eddf'/> - <elf-symbol name='unregister_oom_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0xc617f82c'/> <elf-symbol name='unregister_pernet_device' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x5c8edd1e'/> <elf-symbol name='unregister_pernet_subsys' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x9156a215'/> <elf-symbol name='unregister_pm_notifier' type='func-type' binding='global-binding' visibility='default-visibility' is-defined='yes' crc='0x7681946c'/> @@ -4645,11 +4633,11 @@ <var-decl name='key' type-id='00205383' visibility='default' filepath='include/linux/jump_label.h' line='351' column='1'/> </data-member> </class-decl> - <var-decl name='cpu_hwcap_keys' type-id='6288ed8b' mangled-name='cpu_hwcap_keys' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='88' column='1' elf-symbol-id='cpu_hwcap_keys'/> - <var-decl name='arm64_const_caps_ready' type-id='237c0d27' mangled-name='arm64_const_caps_ready' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='2112' column='1' elf-symbol-id='arm64_const_caps_ready'/> - <var-decl name='cpu_hwcaps' type-id='f066dd3c' mangled-name='cpu_hwcaps' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='45' column='1' elf-symbol-id='cpu_hwcaps'/> - <function-decl name='cpu_have_feature' mangled-name='cpu_have_feature' filepath='arch/arm64/kernel/cpufeature.c' line='2139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpu_have_feature'> - <parameter type-id='f0981eeb' name='num' filepath='arch/arm64/kernel/cpufeature.c' line='2139' column='1'/> + <var-decl name='cpu_hwcap_keys' type-id='6288ed8b' mangled-name='cpu_hwcap_keys' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='87' column='1' elf-symbol-id='cpu_hwcap_keys'/> + <var-decl name='arm64_const_caps_ready' type-id='237c0d27' mangled-name='arm64_const_caps_ready' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='2103' column='1' elf-symbol-id='arm64_const_caps_ready'/> + <var-decl name='cpu_hwcaps' type-id='f066dd3c' mangled-name='cpu_hwcaps' visibility='default' filepath='arch/arm64/kernel/cpufeature.c' line='44' column='1' elf-symbol-id='cpu_hwcaps'/> + <function-decl name='cpu_have_feature' mangled-name='cpu_have_feature' filepath='arch/arm64/kernel/cpufeature.c' line='2130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cpu_have_feature'> + <parameter type-id='f0981eeb' name='num' filepath='arch/arm64/kernel/cpufeature.c' line='2130' column='1'/> <return type-id='b50a4934'/> </function-decl> <class-decl name='static_key' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/jump_label.h' line='87' column='1' id='00205383'> @@ -6391,12 +6379,12 @@ <var-decl name='no_numa' type-id='b50a4934' visibility='default' filepath='include/linux/workqueue.h' line='161' column='1'/> </data-member> </class-decl> - <class-decl name='wq_device' size-in-bits='7552' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5370' column='1' id='a88ecfc8'> + <class-decl name='wq_device' size-in-bits='7552' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5372' column='1' id='a88ecfc8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5371' column='1'/> + <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5373' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5372' column='1'/> + <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5374' column='1'/> </data-member> </class-decl> <class-decl name='wq_flusher' size-in-bits='448' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='231' column='1' id='c8eb0f4f'> @@ -7745,7 +7733,7 @@ <array-type-def dimensions='1' type-id='f9b06939' size-in-bits='64' id='d2f7b56a'> <subrange length='8' type-id='7ff19f0f' id='56e0c0b1'/> </array-type-def> - <union-decl name='__anonymous_union__23' is-anonymous='yes' visibility='default' filepath='include/linux/filter.h' line='562' column='1' id='fe772793'> + <union-decl name='__anonymous_union__21' is-anonymous='yes' visibility='default' filepath='include/linux/filter.h' line='562' column='1' id='fe772793'> <data-member access='public'> <var-decl name='insns' type-id='4967766c' visibility='default' filepath='include/linux/filter.h' line='563' column='1'/> </data-member> @@ -8642,15 +8630,15 @@ <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/sched.h' line='508' column='1'/> </data-member> </class-decl> - <class-decl name='seccomp' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/seccomp.h' line='31' column='1' id='298af459'> + <class-decl name='seccomp' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/seccomp.h' line='30' column='1' id='298af459'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/seccomp.h' line='32' column='1'/> + <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/seccomp.h' line='31' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='filter_count' type-id='49178f86' visibility='default' filepath='include/linux/seccomp.h' line='33' column='1'/> + <var-decl name='filter_count' type-id='49178f86' visibility='default' filepath='include/linux/seccomp.h' line='32' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='filter' type-id='2a128f5a' visibility='default' filepath='include/linux/seccomp.h' line='34' column='1'/> + <var-decl name='filter' type-id='2a128f5a' visibility='default' filepath='include/linux/seccomp.h' line='33' column='1'/> </data-member> </class-decl> <class-decl name='sigpending' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/signal_types.h' line='30' column='1' id='7b5c012d'> @@ -10725,7 +10713,7 @@ <var-decl name='preempt' type-id='45bb8abd' visibility='default' filepath='arch/arm64/include/asm/thread_info.h' line='42' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__22' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/bpf.h' line='428' column='1' id='b597c0fa'> + <union-decl name='__anonymous_union__20' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/bpf.h' line='428' column='1' id='b597c0fa'> <data-member access='public'> <var-decl name='work' type-id='ef9025d0' visibility='default' filepath='include/linux/bpf.h' line='429' column='1'/> </data-member> @@ -12304,7 +12292,7 @@ <array-type-def dimensions='1' type-id='91ce1af9' size-in-bits='320' id='64af1365'> <subrange length='5' type-id='7ff19f0f' id='53010e10'/> </array-type-def> - <union-decl name='__anonymous_union__47' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='64' column='1' id='f5a928fc'> + <union-decl name='__anonymous_union__45' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='64' column='1' id='f5a928fc'> <data-member access='public'> <var-decl name='' type-id='2b31becf' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1'/> </data-member> @@ -12924,21 +12912,21 @@ <var-decl name='ancestor_ids' type-id='1fdc7fa6' visibility='default' filepath='include/linux/cgroup-defs.h' line='492' column='1'/> </data-member> </class-decl> - <class-decl name='cgroup_namespace' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/cgroup.h' line='867' column='1' id='e54806c5'> + <class-decl name='cgroup_namespace' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/cgroup.h' line='866' column='1' id='e54806c5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='count' type-id='64615833' visibility='default' filepath='include/linux/cgroup.h' line='868' column='1'/> + <var-decl name='count' type-id='64615833' visibility='default' filepath='include/linux/cgroup.h' line='867' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ns' type-id='99f367f2' visibility='default' filepath='include/linux/cgroup.h' line='869' column='1'/> + <var-decl name='ns' type-id='99f367f2' visibility='default' filepath='include/linux/cgroup.h' line='868' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/cgroup.h' line='870' column='1'/> + <var-decl name='user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/cgroup.h' line='869' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ucounts' type-id='b1d4934a' visibility='default' filepath='include/linux/cgroup.h' line='871' column='1'/> + <var-decl name='ucounts' type-id='b1d4934a' visibility='default' filepath='include/linux/cgroup.h' line='870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='root_cset' type-id='85d57723' visibility='default' filepath='include/linux/cgroup.h' line='872' column='1'/> + <var-decl name='root_cset' type-id='85d57723' visibility='default' filepath='include/linux/cgroup.h' line='871' column='1'/> </data-member> </class-decl> <class-decl name='cpu_itimer' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/sched/signal.h' line='39' column='1' id='47841236'> @@ -13036,24 +13024,24 @@ <var-decl name='hash' type-id='53b70d6c' visibility='default' filepath='include/linux/elevator.h' line='117' column='1'/> </data-member> </class-decl> - <class-decl name='fasync_struct' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1378' column='1' id='70c545cd'> + <class-decl name='fasync_struct' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1373' column='1' id='70c545cd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='fa_lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='1379' column='1'/> + <var-decl name='fa_lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='1374' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='magic' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1380' column='1'/> + <var-decl name='magic' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1375' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='fa_fd' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1381' column='1'/> + <var-decl name='fa_fd' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1376' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='fa_next' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1382' column='1'/> + <var-decl name='fa_next' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1377' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='fa_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1383' column='1'/> + <var-decl name='fa_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1378' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='fa_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1384' column='1'/> + <var-decl name='fa_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1379' column='1'/> </data-member> </class-decl> <class-decl name='fprop_global' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/flex_proportions.h' line='28' column='1' id='7dc82ec2'> @@ -14290,7 +14278,7 @@ <var-decl name='android_vendor_data1' type-id='91ce1af9' visibility='default' filepath='include/linux/mm_types.h' line='370' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__40' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='2b31becf'> + <class-decl name='__anonymous_struct__38' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='2b31becf'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='autask' type-id='79aea64f' visibility='default' filepath='include/linux/uprobes.h' line='66' column='1'/> </data-member> @@ -14298,7 +14286,7 @@ <var-decl name='vaddr' type-id='7359adad' visibility='default' filepath='include/linux/uprobes.h' line='67' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__41' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='46982a3f'> + <class-decl name='__anonymous_struct__39' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='46982a3f'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='dup_xol_work' type-id='e3d8ce29' visibility='default' filepath='include/linux/uprobes.h' line='71' column='1'/> </data-member> @@ -14345,7 +14333,7 @@ <var-decl name='runnable_sum' type-id='7359adad' visibility='default' filepath='kernel/sched/sched.h' line='540' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__37' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='e6cd5ecf' visibility='default' filepath='include/linux/seqlock.h' line='411' column='1' id='c87ee7e4'> + <class-decl name='__anonymous_struct__35' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='e6cd5ecf' visibility='default' filepath='include/linux/seqlock.h' line='411' column='1' id='c87ee7e4'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='seqcount' type-id='3a74ff0b' visibility='default' filepath='include/linux/seqlock.h' line='412' column='1'/> </data-member> @@ -14971,81 +14959,81 @@ <var-decl name='dir' type-id='7c7d6006' visibility='default' filepath='include/linux/sysctl.h' line='171' column='1'/> </data-member> </class-decl> - <class-decl name='file' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='967' column='1' id='b4b8adeb'> + <class-decl name='file' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='962' column='1' id='b4b8adeb'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='f_u' type-id='8c8e2781' visibility='default' filepath='include/linux/fs.h' line='971' column='1'/> + <var-decl name='f_u' type-id='8c8e2781' visibility='default' filepath='include/linux/fs.h' line='966' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='f_path' type-id='b5382ece' visibility='default' filepath='include/linux/fs.h' line='972' column='1'/> + <var-decl name='f_path' type-id='b5382ece' visibility='default' filepath='include/linux/fs.h' line='967' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='f_inode' type-id='7e666abe' visibility='default' filepath='include/linux/fs.h' line='973' column='1'/> + <var-decl name='f_inode' type-id='7e666abe' visibility='default' filepath='include/linux/fs.h' line='968' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='f_op' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='974' column='1'/> + <var-decl name='f_op' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='969' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='f_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='980' column='1'/> + <var-decl name='f_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='975' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='f_write_hint' type-id='0d20c3dd' visibility='default' filepath='include/linux/fs.h' line='981' column='1'/> + <var-decl name='f_write_hint' type-id='0d20c3dd' visibility='default' filepath='include/linux/fs.h' line='976' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='f_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='982' column='1'/> + <var-decl name='f_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='977' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='f_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='983' column='1'/> + <var-decl name='f_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='978' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='544'> - <var-decl name='f_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='984' column='1'/> + <var-decl name='f_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='979' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='f_pos_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='985' column='1'/> + <var-decl name='f_pos_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='980' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='f_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='986' column='1'/> + <var-decl name='f_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='981' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='f_owner' type-id='6b640edd' visibility='default' filepath='include/linux/fs.h' line='987' column='1'/> + <var-decl name='f_owner' type-id='6b640edd' visibility='default' filepath='include/linux/fs.h' line='982' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='f_cred' type-id='bc33861a' visibility='default' filepath='include/linux/fs.h' line='988' column='1'/> + <var-decl name='f_cred' type-id='bc33861a' visibility='default' filepath='include/linux/fs.h' line='983' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='f_ra' type-id='b31f003f' visibility='default' filepath='include/linux/fs.h' line='989' column='1'/> + <var-decl name='f_ra' type-id='b31f003f' visibility='default' filepath='include/linux/fs.h' line='984' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='f_version' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='991' column='1'/> + <var-decl name='f_version' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='986' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='f_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='993' column='1'/> + <var-decl name='f_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='988' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='private_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='996' column='1'/> + <var-decl name='private_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='991' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='f_ep_links' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1000' column='1'/> + <var-decl name='f_ep_links' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='995' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='f_tfile_llink' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1001' column='1'/> + <var-decl name='f_tfile_llink' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='996' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='f_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='1003' column='1'/> + <var-decl name='f_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='998' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='f_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1004' column='1'/> + <var-decl name='f_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='999' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2016'> - <var-decl name='f_sb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1005' column='1'/> + <var-decl name='f_sb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1000' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1007' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1002' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1008' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1003' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1009' column='1'/> + <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1004' column='1'/> </data-member> </class-decl> <class-decl name='group_info' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/cred.h' line='25' column='1' id='781993c9'> @@ -15363,417 +15351,417 @@ <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/mmu_notifier.h' line='60' column='1'/> </data-member> </class-decl> - <class-decl name='net_device' size-in-bits='19456' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1825' column='1' id='5a9929eb'> + <class-decl name='net_device' size-in-bits='19456' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1823' column='1' id='5a9929eb'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/linux/netdevice.h' line='1826' column='1'/> + <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/linux/netdevice.h' line='1824' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='name_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='1827' column='1'/> + <var-decl name='name_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='1825' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='ifalias' type-id='d81cf24c' visibility='default' filepath='include/linux/netdevice.h' line='1828' column='1'/> + <var-decl name='ifalias' type-id='d81cf24c' visibility='default' filepath='include/linux/netdevice.h' line='1826' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='mem_end' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1833' column='1'/> + <var-decl name='mem_end' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1831' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='mem_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1834' column='1'/> + <var-decl name='mem_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1832' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='base_addr' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1835' column='1'/> + <var-decl name='base_addr' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1833' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1836' column='1'/> + <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1834' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1844' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1842' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1846' column='1'/> + <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1844' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='napi_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1847' column='1'/> + <var-decl name='napi_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1845' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='unreg_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1848' column='1'/> + <var-decl name='unreg_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1846' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='close_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1849' column='1'/> + <var-decl name='close_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1847' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='ptype_all' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1850' column='1'/> + <var-decl name='ptype_all' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1848' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='ptype_specific' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1851' column='1'/> + <var-decl name='ptype_specific' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1849' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='adj_list' type-id='19245258' visibility='default' filepath='include/linux/netdevice.h' line='1856' column='1'/> + <var-decl name='adj_list' type-id='19245258' visibility='default' filepath='include/linux/netdevice.h' line='1854' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1858' column='1'/> + <var-decl name='features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1856' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='hw_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1859' column='1'/> + <var-decl name='hw_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1857' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='wanted_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1860' column='1'/> + <var-decl name='wanted_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1858' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='vlan_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1861' column='1'/> + <var-decl name='vlan_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1859' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='hw_enc_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1862' column='1'/> + <var-decl name='hw_enc_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1860' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='mpls_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1863' column='1'/> + <var-decl name='mpls_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1861' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='gso_partial_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1864' column='1'/> + <var-decl name='gso_partial_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1862' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='ifindex' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1866' column='1'/> + <var-decl name='ifindex' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1864' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2144'> - <var-decl name='group' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1867' column='1'/> + <var-decl name='group' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1865' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='stats' type-id='a3566137' visibility='default' filepath='include/linux/netdevice.h' line='1869' column='1'/> + <var-decl name='stats' type-id='a3566137' visibility='default' filepath='include/linux/netdevice.h' line='1867' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3648'> - <var-decl name='rx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1871' column='1'/> + <var-decl name='rx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1869' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3712'> - <var-decl name='tx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1872' column='1'/> + <var-decl name='tx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3776'> - <var-decl name='rx_nohandler' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1873' column='1'/> + <var-decl name='rx_nohandler' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1871' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3840'> - <var-decl name='carrier_up_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1876' column='1'/> + <var-decl name='carrier_up_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1874' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3872'> - <var-decl name='carrier_down_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1877' column='1'/> + <var-decl name='carrier_down_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1875' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3904'> - <var-decl name='wireless_handlers' type-id='3e2bb973' visibility='default' filepath='include/linux/netdevice.h' line='1880' column='1'/> + <var-decl name='wireless_handlers' type-id='3e2bb973' visibility='default' filepath='include/linux/netdevice.h' line='1878' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3968'> - <var-decl name='wireless_data' type-id='e40f7bda' visibility='default' filepath='include/linux/netdevice.h' line='1881' column='1'/> + <var-decl name='wireless_data' type-id='e40f7bda' visibility='default' filepath='include/linux/netdevice.h' line='1879' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4032'> - <var-decl name='netdev_ops' type-id='a84ec761' visibility='default' filepath='include/linux/netdevice.h' line='1883' column='1'/> + <var-decl name='netdev_ops' type-id='a84ec761' visibility='default' filepath='include/linux/netdevice.h' line='1881' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4096'> - <var-decl name='ethtool_ops' type-id='bdf901f8' visibility='default' filepath='include/linux/netdevice.h' line='1884' column='1'/> + <var-decl name='ethtool_ops' type-id='bdf901f8' visibility='default' filepath='include/linux/netdevice.h' line='1882' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4160'> - <var-decl name='ndisc_ops' type-id='a2e418a6' visibility='default' filepath='include/linux/netdevice.h' line='1889' column='1'/> + <var-decl name='ndisc_ops' type-id='a2e418a6' visibility='default' filepath='include/linux/netdevice.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4224'> - <var-decl name='header_ops' type-id='2d747e78' visibility='default' filepath='include/linux/netdevice.h' line='1900' column='1'/> + <var-decl name='header_ops' type-id='2d747e78' visibility='default' filepath='include/linux/netdevice.h' line='1898' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4288'> - <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1902' column='1'/> + <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1900' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4320'> - <var-decl name='priv_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1903' column='1'/> + <var-decl name='priv_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1901' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4352'> - <var-decl name='gflags' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1905' column='1'/> + <var-decl name='gflags' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1903' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4368'> - <var-decl name='padded' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1906' column='1'/> + <var-decl name='padded' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1904' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4384'> - <var-decl name='operstate' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1908' column='1'/> + <var-decl name='operstate' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1906' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4392'> - <var-decl name='link_mode' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1909' column='1'/> + <var-decl name='link_mode' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1907' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4400'> - <var-decl name='if_port' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1911' column='1'/> + <var-decl name='if_port' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1909' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4408'> - <var-decl name='dma' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1912' column='1'/> + <var-decl name='dma' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1910' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4416'> - <var-decl name='mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1919' column='1'/> + <var-decl name='mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1917' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4448'> - <var-decl name='min_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1920' column='1'/> + <var-decl name='min_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1918' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4480'> - <var-decl name='max_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1921' column='1'/> + <var-decl name='max_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1919' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4512'> - <var-decl name='type' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1922' column='1'/> + <var-decl name='type' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1920' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4528'> - <var-decl name='hard_header_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1923' column='1'/> + <var-decl name='hard_header_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1921' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4544'> - <var-decl name='min_header_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1924' column='1'/> + <var-decl name='min_header_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1922' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4560'> - <var-decl name='needed_headroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1926' column='1'/> + <var-decl name='needed_headroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1924' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4576'> - <var-decl name='needed_tailroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1927' column='1'/> + <var-decl name='needed_tailroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1925' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4592'> - <var-decl name='perm_addr' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='1930' column='1'/> + <var-decl name='perm_addr' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='1928' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4848'> - <var-decl name='addr_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1931' column='1'/> + <var-decl name='addr_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1929' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4856'> - <var-decl name='addr_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1932' column='1'/> + <var-decl name='addr_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1930' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4864'> - <var-decl name='upper_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1933' column='1'/> + <var-decl name='upper_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1931' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4872'> - <var-decl name='lower_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1934' column='1'/> + <var-decl name='lower_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1932' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4880'> - <var-decl name='neigh_priv_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1935' column='1'/> + <var-decl name='neigh_priv_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4896'> - <var-decl name='dev_id' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1936' column='1'/> + <var-decl name='dev_id' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4912'> - <var-decl name='dev_port' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1937' column='1'/> + <var-decl name='dev_port' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='addr_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='1938' column='1'/> + <var-decl name='addr_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='1936' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4960'> - <var-decl name='name_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1939' column='1'/> + <var-decl name='name_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1937' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4968'> - <var-decl name='uc_promisc' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='1940' column='1'/> + <var-decl name='uc_promisc' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='1938' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4992'> - <var-decl name='uc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1941' column='1'/> + <var-decl name='uc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1939' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5184'> - <var-decl name='mc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1942' column='1'/> + <var-decl name='mc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1940' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5376'> - <var-decl name='dev_addrs' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1943' column='1'/> + <var-decl name='dev_addrs' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1941' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5568'> - <var-decl name='queues_kset' type-id='89b70200' visibility='default' filepath='include/linux/netdevice.h' line='1946' column='1'/> + <var-decl name='queues_kset' type-id='89b70200' visibility='default' filepath='include/linux/netdevice.h' line='1944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5632'> - <var-decl name='promiscuity' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1948' column='1'/> + <var-decl name='promiscuity' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1946' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5664'> - <var-decl name='allmulti' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1949' column='1'/> + <var-decl name='allmulti' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5696'> - <var-decl name='tipc_ptr' type-id='eeaf504d' visibility='default' filepath='include/linux/netdevice.h' line='1961' column='1'/> + <var-decl name='tipc_ptr' type-id='eeaf504d' visibility='default' filepath='include/linux/netdevice.h' line='1959' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5760'> - <var-decl name='ip_ptr' type-id='fc6f14a9' visibility='default' filepath='include/linux/netdevice.h' line='1966' column='1'/> + <var-decl name='ip_ptr' type-id='fc6f14a9' visibility='default' filepath='include/linux/netdevice.h' line='1964' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5824'> - <var-decl name='ip6_ptr' type-id='f026b16b' visibility='default' filepath='include/linux/netdevice.h' line='1970' column='1'/> + <var-decl name='ip6_ptr' type-id='f026b16b' visibility='default' filepath='include/linux/netdevice.h' line='1968' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5888'> - <var-decl name='ieee80211_ptr' type-id='63c7e8e1' visibility='default' filepath='include/linux/netdevice.h' line='1974' column='1'/> + <var-decl name='ieee80211_ptr' type-id='63c7e8e1' visibility='default' filepath='include/linux/netdevice.h' line='1972' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5952'> - <var-decl name='ieee802154_ptr' type-id='165146ad' visibility='default' filepath='include/linux/netdevice.h' line='1975' column='1'/> + <var-decl name='ieee802154_ptr' type-id='165146ad' visibility='default' filepath='include/linux/netdevice.h' line='1973' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6016'> - <var-decl name='dev_addr' type-id='cf536864' visibility='default' filepath='include/linux/netdevice.h' line='1984' column='1'/> + <var-decl name='dev_addr' type-id='cf536864' visibility='default' filepath='include/linux/netdevice.h' line='1982' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6080'> - <var-decl name='_rx' type-id='31094274' visibility='default' filepath='include/linux/netdevice.h' line='1986' column='1'/> + <var-decl name='_rx' type-id='31094274' visibility='default' filepath='include/linux/netdevice.h' line='1984' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6144'> - <var-decl name='num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1987' column='1'/> + <var-decl name='num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1985' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6176'> - <var-decl name='real_num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1988' column='1'/> + <var-decl name='real_num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1986' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6208'> - <var-decl name='xdp_prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='1990' column='1'/> + <var-decl name='xdp_prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='1988' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6272'> - <var-decl name='gro_flush_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1991' column='1'/> + <var-decl name='gro_flush_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1989' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6336'> - <var-decl name='rx_handler' type-id='da1cb816' visibility='default' filepath='include/linux/netdevice.h' line='1992' column='1'/> + <var-decl name='rx_handler' type-id='da1cb816' visibility='default' filepath='include/linux/netdevice.h' line='1990' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6400'> - <var-decl name='rx_handler_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='1993' column='1'/> + <var-decl name='rx_handler_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='1991' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6464'> - <var-decl name='miniq_ingress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='1996' column='1'/> + <var-decl name='miniq_ingress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='1994' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6528'> - <var-decl name='ingress_queue' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='1998' column='1'/> + <var-decl name='ingress_queue' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='1996' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6592'> - <var-decl name='nf_hooks_ingress' type-id='39a43b40' visibility='default' filepath='include/linux/netdevice.h' line='2000' column='1'/> + <var-decl name='nf_hooks_ingress' type-id='39a43b40' visibility='default' filepath='include/linux/netdevice.h' line='1998' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6656'> - <var-decl name='broadcast' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='2003' column='1'/> + <var-decl name='broadcast' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='2001' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6912'> - <var-decl name='rx_cpu_rmap' type-id='52baee64' visibility='default' filepath='include/linux/netdevice.h' line='2005' column='1'/> + <var-decl name='rx_cpu_rmap' type-id='52baee64' visibility='default' filepath='include/linux/netdevice.h' line='2003' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6976'> - <var-decl name='index_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='2007' column='1'/> + <var-decl name='index_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='2005' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7168'> - <var-decl name='_tx' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='2012' column='1'/> + <var-decl name='_tx' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='2010' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7232'> - <var-decl name='num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2013' column='1'/> + <var-decl name='num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2011' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7264'> - <var-decl name='real_num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2014' column='1'/> + <var-decl name='real_num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2012' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7296'> - <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='2015' column='1'/> + <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='2013' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7360'> - <var-decl name='qdisc_hash' type-id='ccfd385f' visibility='default' filepath='include/linux/netdevice.h' line='2017' column='1'/> + <var-decl name='qdisc_hash' type-id='ccfd385f' visibility='default' filepath='include/linux/netdevice.h' line='2015' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8384'> - <var-decl name='tx_queue_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2019' column='1'/> + <var-decl name='tx_queue_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2017' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8416'> - <var-decl name='tx_global_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='2020' column='1'/> + <var-decl name='tx_global_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='2018' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8448'> - <var-decl name='watchdog_timeo' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='2021' column='1'/> + <var-decl name='watchdog_timeo' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='2019' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8512'> - <var-decl name='xps_cpus_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2024' column='1'/> + <var-decl name='xps_cpus_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2022' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8576'> - <var-decl name='xps_rxqs_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2025' column='1'/> + <var-decl name='xps_rxqs_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2023' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8640'> - <var-decl name='miniq_egress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='2028' column='1'/> + <var-decl name='miniq_egress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='2026' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='watchdog_timer' type-id='abe41e67' visibility='default' filepath='include/linux/netdevice.h' line='2032' column='1'/> + <var-decl name='watchdog_timer' type-id='abe41e67' visibility='default' filepath='include/linux/netdevice.h' line='2030' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='pcpu_refcnt' type-id='7292109c' visibility='default' filepath='include/linux/netdevice.h' line='2034' column='1'/> + <var-decl name='pcpu_refcnt' type-id='7292109c' visibility='default' filepath='include/linux/netdevice.h' line='2032' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9216'> - <var-decl name='todo_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2035' column='1'/> + <var-decl name='todo_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2033' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='link_watch_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2037' column='1'/> + <var-decl name='link_watch_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2035' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='reg_state' type-id='08f5ca17' visibility='default' filepath='include/linux/netdevice.h' line='2045' column='1'/> + <var-decl name='reg_state' type-id='08f5ca17' visibility='default' filepath='include/linux/netdevice.h' line='2043' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9480'> - <var-decl name='dismantle' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2047' column='1'/> + <var-decl name='dismantle' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='rtnl_link_state' type-id='08f5ca18' visibility='default' filepath='include/linux/netdevice.h' line='2052' column='1'/> + <var-decl name='rtnl_link_state' type-id='08f5ca18' visibility='default' filepath='include/linux/netdevice.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9504'> - <var-decl name='needs_free_netdev' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2054' column='1'/> + <var-decl name='needs_free_netdev' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9536'> - <var-decl name='priv_destructor' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='2055' column='1'/> + <var-decl name='priv_destructor' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='2053' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9600'> - <var-decl name='nd_net' type-id='c9df1e6c' visibility='default' filepath='include/linux/netdevice.h' line='2061' column='1'/> + <var-decl name='nd_net' type-id='c9df1e6c' visibility='default' filepath='include/linux/netdevice.h' line='2059' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9664'> - <var-decl name='ml_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2064' column='1'/> + <var-decl name='ml_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2062' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9728'> - <var-decl name='ml_priv_type' type-id='9c6bf017' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1'/> + <var-decl name='ml_priv_type' type-id='9c6bf017' visibility='default' filepath='include/linux/netdevice.h' line='2063' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9792'> - <var-decl name='' type-id='ca29cb68' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1'/> + <var-decl name='' type-id='ca29cb68' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9856'> - <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='include/linux/netdevice.h' line='2080' column='1'/> + <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='include/linux/netdevice.h' line='2078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17344'> - <var-decl name='sysfs_groups' type-id='db1b7234' visibility='default' filepath='include/linux/netdevice.h' line='2081' column='1'/> + <var-decl name='sysfs_groups' type-id='db1b7234' visibility='default' filepath='include/linux/netdevice.h' line='2079' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17600'> - <var-decl name='sysfs_rx_queue_group' type-id='8ff9530e' visibility='default' filepath='include/linux/netdevice.h' line='2082' column='1'/> + <var-decl name='sysfs_rx_queue_group' type-id='8ff9530e' visibility='default' filepath='include/linux/netdevice.h' line='2080' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17664'> - <var-decl name='rtnl_link_ops' type-id='999c8d90' visibility='default' filepath='include/linux/netdevice.h' line='2084' column='1'/> + <var-decl name='rtnl_link_ops' type-id='999c8d90' visibility='default' filepath='include/linux/netdevice.h' line='2082' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17728'> - <var-decl name='gso_max_size' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2088' column='1'/> + <var-decl name='gso_max_size' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2086' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17760'> - <var-decl name='gso_max_segs' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='2090' column='1'/> + <var-decl name='gso_max_segs' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='2088' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17776'> - <var-decl name='num_tc' type-id='9b7e9486' visibility='default' filepath='include/linux/netdevice.h' line='2095' column='1'/> + <var-decl name='num_tc' type-id='9b7e9486' visibility='default' filepath='include/linux/netdevice.h' line='2093' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17792'> - <var-decl name='tc_to_txq' type-id='b5839634' visibility='default' filepath='include/linux/netdevice.h' line='2096' column='1'/> + <var-decl name='tc_to_txq' type-id='b5839634' visibility='default' filepath='include/linux/netdevice.h' line='2094' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18304'> - <var-decl name='prio_tc_map' type-id='0d8415b5' visibility='default' filepath='include/linux/netdevice.h' line='2097' column='1'/> + <var-decl name='prio_tc_map' type-id='0d8415b5' visibility='default' filepath='include/linux/netdevice.h' line='2095' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18432'> - <var-decl name='phydev' type-id='7efbcaaf' visibility='default' filepath='include/linux/netdevice.h' line='2105' column='1'/> + <var-decl name='phydev' type-id='7efbcaaf' visibility='default' filepath='include/linux/netdevice.h' line='2103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18496'> - <var-decl name='sfp_bus' type-id='6daf6abd' visibility='default' filepath='include/linux/netdevice.h' line='2106' column='1'/> + <var-decl name='sfp_bus' type-id='6daf6abd' visibility='default' filepath='include/linux/netdevice.h' line='2104' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_tx_busylock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2107' column='1'/> + <var-decl name='qdisc_tx_busylock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2105' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_running_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2108' column='1'/> + <var-decl name='qdisc_running_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2106' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_xmit_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2109' column='1'/> + <var-decl name='qdisc_xmit_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2107' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='addr_list_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2110' column='1'/> + <var-decl name='addr_list_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2108' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='proto_down' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2111' column='1'/> + <var-decl name='proto_down' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2109' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8'> - <var-decl name='wol_enabled' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2112' column='1'/> + <var-decl name='wol_enabled' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2110' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18624'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2114' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2112' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18688'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2115' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2113' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18752'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2116' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2114' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18816'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2117' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2115' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18880'> - <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2118' column='1'/> + <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2116' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18944'> - <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2119' column='1'/> + <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2117' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='19008'> - <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2120' column='1'/> + <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2118' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='19072'> - <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2121' column='1'/> + <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2119' column='1'/> </data-member> </class-decl> <class-decl name='netns_can' size-in-bits='1536' is-struct='yes' visibility='default' filepath='include/net/netns/can.h' line='16' column='1' id='8f9898ce'> @@ -17300,18 +17288,18 @@ <var-decl name='sa_mask' type-id='daf33c64' visibility='default' filepath='include/linux/signal_types.h' line='46' column='1'/> </data-member> </class-decl> - <class-decl name='sk_buff_head' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='292' column='1' id='e61c85d0'> + <class-decl name='sk_buff_head' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='291' column='1' id='e61c85d0'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='294' column='1'/> + <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='293' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='295' column='1'/> + <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='qlen' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='297' column='1'/> + <var-decl name='qlen' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='296' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/skbuff.h' line='298' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/skbuff.h' line='297' column='1'/> </data-member> </class-decl> <class-decl name='user_namespace' size-in-bits='4544' is-struct='yes' visibility='default' filepath='include/linux/user_namespace.h' line='56' column='1' id='8c178e22'> @@ -17880,7 +17868,7 @@ <var-decl name='tv_nsec' type-id='1eb56b1e' visibility='default' filepath='include/uapi/linux/time_types.h' line='9' column='1'/> </data-member> </class-decl> - <class-decl name='anon_vma' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/rmap.h' line='29' column='1' id='14f332cc'> + <class-decl name='anon_vma' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/linux/rmap.h' line='29' column='1' id='14f332cc'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='root' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='30' column='1'/> </data-member> @@ -17891,19 +17879,13 @@ <var-decl name='refcount' type-id='49178f86' visibility='default' filepath='include/linux/rmap.h' line='39' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='degree' type-id='f0981eeb' visibility='default' filepath='include/linux/rmap.h' line='41' column='1'/> + <var-decl name='degree' type-id='f0981eeb' visibility='default' filepath='include/linux/rmap.h' line='47' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='parent' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='43' column='1'/> + <var-decl name='parent' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='49' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='rb_root' type-id='6fe1603d' visibility='default' filepath='include/linux/rmap.h' line='55' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='num_children' type-id='7359adad' visibility='default' filepath='include/linux/rmap.h' line='70' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='num_active_vmas' type-id='7359adad' visibility='default' filepath='include/linux/rmap.h' line='72' column='1'/> + <var-decl name='rb_root' type-id='6fe1603d' visibility='default' filepath='include/linux/rmap.h' line='61' column='1'/> </data-member> </class-decl> <class-decl name='bio_crypt_ctx' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/linux/blk-crypto.h' line='71' column='1' id='b545ce08'> @@ -18247,44 +18229,44 @@ <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/elevator.h' line='97' column='1'/> </data-member> </class-decl> - <class-decl name='file_ra_state' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='947' column='1' id='b31f003f'> + <class-decl name='file_ra_state' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='942' column='1' id='b31f003f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='start' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='948' column='1'/> + <var-decl name='start' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='943' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='949' column='1'/> + <var-decl name='size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='async_size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='950' column='1'/> + <var-decl name='async_size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='945' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ra_pages' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='953' column='1'/> + <var-decl name='ra_pages' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='948' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='mmap_miss' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='954' column='1'/> + <var-decl name='mmap_miss' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='949' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='prev_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='955' column='1'/> + <var-decl name='prev_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='950' column='1'/> </data-member> </class-decl> - <class-decl name='fown_struct' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='936' column='1' id='6b640edd'> + <class-decl name='fown_struct' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='931' column='1' id='6b640edd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='937' column='1'/> + <var-decl name='lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='932' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pid' type-id='b94e5398' visibility='default' filepath='include/linux/fs.h' line='938' column='1'/> + <var-decl name='pid' type-id='b94e5398' visibility='default' filepath='include/linux/fs.h' line='933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='pid_type' type-id='ce78cf46' visibility='default' filepath='include/linux/fs.h' line='939' column='1'/> + <var-decl name='pid_type' type-id='ce78cf46' visibility='default' filepath='include/linux/fs.h' line='934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='940' column='1'/> + <var-decl name='uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='euid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='940' column='1'/> + <var-decl name='euid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='signum' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='941' column='1'/> + <var-decl name='signum' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='936' column='1'/> </data-member> </class-decl> <class-decl name='freq_qos_request' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/pm_qos.h' line='96' column='1' id='da4cc8f3'> @@ -18483,174 +18465,174 @@ <var-decl name='sysctl_max_tw_buckets' type-id='95e97e5e' visibility='default' filepath='include/net/netns/ipv4.h' line='39' column='1'/> </data-member> </class-decl> - <class-decl name='inode' size-in-bits='5312' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='656' column='1' id='fe070fe8'> + <class-decl name='inode' size-in-bits='5312' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='651' column='1' id='fe070fe8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='i_mode' type-id='2594b00f' visibility='default' filepath='include/linux/fs.h' line='657' column='1'/> + <var-decl name='i_mode' type-id='2594b00f' visibility='default' filepath='include/linux/fs.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='i_opflags' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='658' column='1'/> + <var-decl name='i_opflags' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='i_uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='659' column='1'/> + <var-decl name='i_uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='i_gid' type-id='094d8048' visibility='default' filepath='include/linux/fs.h' line='660' column='1'/> + <var-decl name='i_gid' type-id='094d8048' visibility='default' filepath='include/linux/fs.h' line='655' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='i_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='661' column='1'/> + <var-decl name='i_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='i_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='664' column='1'/> + <var-decl name='i_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='659' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='i_default_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='665' column='1'/> + <var-decl name='i_default_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='660' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='i_op' type-id='de2c232c' visibility='default' filepath='include/linux/fs.h' line='668' column='1'/> + <var-decl name='i_op' type-id='de2c232c' visibility='default' filepath='include/linux/fs.h' line='663' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='i_sb' type-id='42c8f564' visibility='default' filepath='include/linux/fs.h' line='669' column='1'/> + <var-decl name='i_sb' type-id='42c8f564' visibility='default' filepath='include/linux/fs.h' line='664' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='i_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='670' column='1'/> + <var-decl name='i_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='665' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='i_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='673' column='1'/> + <var-decl name='i_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='668' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='i_ino' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='677' column='1'/> + <var-decl name='i_ino' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='672' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='' type-id='3ee18b51' visibility='default' filepath='include/linux/fs.h' line='685' column='1'/> + <var-decl name='' type-id='3ee18b51' visibility='default' filepath='include/linux/fs.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='i_rdev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='689' column='1'/> + <var-decl name='i_rdev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='684' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='i_size' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='690' column='1'/> + <var-decl name='i_size' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='685' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='i_atime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='691' column='1'/> + <var-decl name='i_atime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='686' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='i_mtime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='692' column='1'/> + <var-decl name='i_mtime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='687' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='i_ctime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='693' column='1'/> + <var-decl name='i_ctime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='688' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='i_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='694' column='1'/> + <var-decl name='i_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='689' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='i_bytes' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='695' column='1'/> + <var-decl name='i_bytes' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='690' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1136'> - <var-decl name='i_blkbits' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='696' column='1'/> + <var-decl name='i_blkbits' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='691' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1144'> - <var-decl name='i_write_hint' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='697' column='1'/> + <var-decl name='i_write_hint' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='i_blocks' type-id='17345459' visibility='default' filepath='include/linux/fs.h' line='698' column='1'/> + <var-decl name='i_blocks' type-id='17345459' visibility='default' filepath='include/linux/fs.h' line='693' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='i_state' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='705' column='1'/> + <var-decl name='i_state' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='700' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='i_rwsem' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='706' column='1'/> + <var-decl name='i_rwsem' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='701' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='dirtied_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='708' column='1'/> + <var-decl name='dirtied_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='703' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='dirtied_time_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='709' column='1'/> + <var-decl name='dirtied_time_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='704' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='i_hash' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='711' column='1'/> + <var-decl name='i_hash' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='706' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='i_io_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='712' column='1'/> + <var-decl name='i_io_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='707' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='i_wb' type-id='f885ca7d' visibility='default' filepath='include/linux/fs.h' line='714' column='1'/> + <var-decl name='i_wb' type-id='f885ca7d' visibility='default' filepath='include/linux/fs.h' line='709' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='i_wb_frn_winner' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='717' column='1'/> + <var-decl name='i_wb_frn_winner' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='712' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2144'> - <var-decl name='i_wb_frn_avg_time' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='718' column='1'/> + <var-decl name='i_wb_frn_avg_time' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='713' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2160'> - <var-decl name='i_wb_frn_history' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='719' column='1'/> + <var-decl name='i_wb_frn_history' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='714' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='i_lru' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='721' column='1'/> + <var-decl name='i_lru' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='716' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='i_sb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='722' column='1'/> + <var-decl name='i_sb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='717' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='i_wb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='723' column='1'/> + <var-decl name='i_wb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='718' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2560'> - <var-decl name='' type-id='cbd4a95b' visibility='default' filepath='include/linux/fs.h' line='724' column='1'/> + <var-decl name='' type-id='cbd4a95b' visibility='default' filepath='include/linux/fs.h' line='719' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2688'> - <var-decl name='i_version' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='728' column='1'/> + <var-decl name='i_version' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='723' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2752'> - <var-decl name='i_sequence' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='729' column='1'/> + <var-decl name='i_sequence' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='724' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='i_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='730' column='1'/> + <var-decl name='i_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='725' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2848'> - <var-decl name='i_dio_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='731' column='1'/> + <var-decl name='i_dio_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='726' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2880'> - <var-decl name='i_writecount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='732' column='1'/> + <var-decl name='i_writecount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='727' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2912'> - <var-decl name='i_readcount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='734' column='1'/> + <var-decl name='i_readcount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='729' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='' type-id='67f3b119' visibility='default' filepath='include/linux/fs.h' line='736' column='1'/> + <var-decl name='' type-id='67f3b119' visibility='default' filepath='include/linux/fs.h' line='731' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3008'> - <var-decl name='i_flctx' type-id='731257ff' visibility='default' filepath='include/linux/fs.h' line='740' column='1'/> + <var-decl name='i_flctx' type-id='731257ff' visibility='default' filepath='include/linux/fs.h' line='735' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='i_data' type-id='0fd82dc2' visibility='default' filepath='include/linux/fs.h' line='741' column='1'/> + <var-decl name='i_data' type-id='0fd82dc2' visibility='default' filepath='include/linux/fs.h' line='736' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4672'> - <var-decl name='i_devices' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='742' column='1'/> + <var-decl name='i_devices' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='737' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4800'> - <var-decl name='' type-id='d1afa4fe' visibility='default' filepath='include/linux/fs.h' line='743' column='1'/> + <var-decl name='' type-id='d1afa4fe' visibility='default' filepath='include/linux/fs.h' line='738' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4864'> - <var-decl name='i_generation' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='751' column='1'/> + <var-decl name='i_generation' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='746' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4896'> - <var-decl name='i_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='754' column='1'/> + <var-decl name='i_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='749' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='i_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='755' column='1'/> + <var-decl name='i_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='750' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4992'> - <var-decl name='i_crypt_info' type-id='1ea8c5af' visibility='default' filepath='include/linux/fs.h' line='759' column='1'/> + <var-decl name='i_crypt_info' type-id='1ea8c5af' visibility='default' filepath='include/linux/fs.h' line='754' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5056'> - <var-decl name='i_verity_info' type-id='ba18e248' visibility='default' filepath='include/linux/fs.h' line='763' column='1'/> + <var-decl name='i_verity_info' type-id='ba18e248' visibility='default' filepath='include/linux/fs.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5120'> - <var-decl name='i_private' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='766' column='1'/> + <var-decl name='i_private' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5184'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='768' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='763' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5248'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='769' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='764' column='1'/> </data-member> </class-decl> <class-decl name='irq_chip_generic' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/irq.h' line='1031' column='1' id='bb06f572'> @@ -19715,213 +19697,213 @@ <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/net/sock.h' line='536' column='1'/> </data-member> </class-decl> - <class-decl name='super_block' size-in-bits='12800' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1478' column='1' id='bc39a8be'> + <class-decl name='super_block' size-in-bits='12800' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1473' column='1' id='bc39a8be'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='s_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1479' column='1'/> + <var-decl name='s_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1474' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='s_dev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='1480' column='1'/> + <var-decl name='s_dev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='1475' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='s_blocksize_bits' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1481' column='1'/> + <var-decl name='s_blocksize_bits' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1476' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='s_blocksize' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1482' column='1'/> + <var-decl name='s_blocksize' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1477' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='s_maxbytes' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1483' column='1'/> + <var-decl name='s_maxbytes' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1478' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='s_type' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='1484' column='1'/> + <var-decl name='s_type' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='1479' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='s_op' type-id='f7c6dcac' visibility='default' filepath='include/linux/fs.h' line='1485' column='1'/> + <var-decl name='s_op' type-id='f7c6dcac' visibility='default' filepath='include/linux/fs.h' line='1480' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='dq_op' type-id='85741a2a' visibility='default' filepath='include/linux/fs.h' line='1486' column='1'/> + <var-decl name='dq_op' type-id='85741a2a' visibility='default' filepath='include/linux/fs.h' line='1481' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='s_qcop' type-id='2cb49514' visibility='default' filepath='include/linux/fs.h' line='1487' column='1'/> + <var-decl name='s_qcop' type-id='2cb49514' visibility='default' filepath='include/linux/fs.h' line='1482' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_export_op' type-id='ab932c45' visibility='default' filepath='include/linux/fs.h' line='1488' column='1'/> + <var-decl name='s_export_op' type-id='ab932c45' visibility='default' filepath='include/linux/fs.h' line='1483' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='s_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1489' column='1'/> + <var-decl name='s_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1484' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='s_iflags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1490' column='1'/> + <var-decl name='s_iflags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1485' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='s_magic' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1491' column='1'/> + <var-decl name='s_magic' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1486' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='s_root' type-id='27675065' visibility='default' filepath='include/linux/fs.h' line='1492' column='1'/> + <var-decl name='s_root' type-id='27675065' visibility='default' filepath='include/linux/fs.h' line='1487' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='s_umount' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='1493' column='1'/> + <var-decl name='s_umount' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='1488' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='s_count' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1494' column='1'/> + <var-decl name='s_count' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1489' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1312'> - <var-decl name='s_active' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='1495' column='1'/> + <var-decl name='s_active' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='1490' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='s_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1497' column='1'/> + <var-decl name='s_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1492' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='s_xattr' type-id='cb49d4b8' visibility='default' filepath='include/linux/fs.h' line='1499' column='1'/> + <var-decl name='s_xattr' type-id='cb49d4b8' visibility='default' filepath='include/linux/fs.h' line='1494' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='s_cop' type-id='8d31a8d6' visibility='default' filepath='include/linux/fs.h' line='1501' column='1'/> + <var-decl name='s_cop' type-id='8d31a8d6' visibility='default' filepath='include/linux/fs.h' line='1496' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='s_master_keys' type-id='204a4632' visibility='default' filepath='include/linux/fs.h' line='1502' column='1'/> + <var-decl name='s_master_keys' type-id='204a4632' visibility='default' filepath='include/linux/fs.h' line='1497' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='s_vop' type-id='e3008443' visibility='default' filepath='include/linux/fs.h' line='1505' column='1'/> + <var-decl name='s_vop' type-id='e3008443' visibility='default' filepath='include/linux/fs.h' line='1500' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='s_encoding' type-id='72835629' visibility='default' filepath='include/linux/fs.h' line='1508' column='1'/> + <var-decl name='s_encoding' type-id='72835629' visibility='default' filepath='include/linux/fs.h' line='1503' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='s_encoding_flags' type-id='d315442e' visibility='default' filepath='include/linux/fs.h' line='1509' column='1'/> + <var-decl name='s_encoding_flags' type-id='d315442e' visibility='default' filepath='include/linux/fs.h' line='1504' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='s_roots' type-id='def98e71' visibility='default' filepath='include/linux/fs.h' line='1511' column='1'/> + <var-decl name='s_roots' type-id='def98e71' visibility='default' filepath='include/linux/fs.h' line='1506' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='s_mounts' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1512' column='1'/> + <var-decl name='s_mounts' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1507' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='s_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='1513' column='1'/> + <var-decl name='s_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='1508' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='s_bdi' type-id='ef4fae1b' visibility='default' filepath='include/linux/fs.h' line='1514' column='1'/> + <var-decl name='s_bdi' type-id='ef4fae1b' visibility='default' filepath='include/linux/fs.h' line='1509' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='s_mtd' type-id='58ed56f5' visibility='default' filepath='include/linux/fs.h' line='1515' column='1'/> + <var-decl name='s_mtd' type-id='58ed56f5' visibility='default' filepath='include/linux/fs.h' line='1510' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='s_instances' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1516' column='1'/> + <var-decl name='s_instances' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1511' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='s_quota_types' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1517' column='1'/> + <var-decl name='s_quota_types' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1512' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='s_dquot' type-id='c26e4ad8' visibility='default' filepath='include/linux/fs.h' line='1518' column='1'/> + <var-decl name='s_dquot' type-id='c26e4ad8' visibility='default' filepath='include/linux/fs.h' line='1513' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='s_writers' type-id='fb476a2b' visibility='default' filepath='include/linux/fs.h' line='1520' column='1'/> + <var-decl name='s_writers' type-id='fb476a2b' visibility='default' filepath='include/linux/fs.h' line='1515' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8064'> - <var-decl name='s_fs_info' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1527' column='1'/> + <var-decl name='s_fs_info' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1522' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8128'> - <var-decl name='s_time_gran' type-id='19c2251e' visibility='default' filepath='include/linux/fs.h' line='1530' column='1'/> + <var-decl name='s_time_gran' type-id='19c2251e' visibility='default' filepath='include/linux/fs.h' line='1525' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8192'> - <var-decl name='s_time_min' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1532' column='1'/> + <var-decl name='s_time_min' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1527' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8256'> - <var-decl name='s_time_max' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1533' column='1'/> + <var-decl name='s_time_max' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1528' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8320'> - <var-decl name='s_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='1535' column='1'/> + <var-decl name='s_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='1530' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8384'> - <var-decl name='s_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='1536' column='1'/> + <var-decl name='s_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='1531' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8448'> - <var-decl name='s_id' type-id='16dc656a' visibility='default' filepath='include/linux/fs.h' line='1539' column='1'/> + <var-decl name='s_id' type-id='16dc656a' visibility='default' filepath='include/linux/fs.h' line='1534' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='s_uuid' type-id='ec55eb74' visibility='default' filepath='include/linux/fs.h' line='1540' column='1'/> + <var-decl name='s_uuid' type-id='ec55eb74' visibility='default' filepath='include/linux/fs.h' line='1535' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8832'> - <var-decl name='s_max_links' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1542' column='1'/> + <var-decl name='s_max_links' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1537' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8864'> - <var-decl name='s_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='1543' column='1'/> + <var-decl name='s_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='1538' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8896'> - <var-decl name='s_vfs_rename_mutex' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1549' column='1'/> + <var-decl name='s_vfs_rename_mutex' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1544' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='s_subtype' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='1555' column='1'/> + <var-decl name='s_subtype' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='1550' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9216'> - <var-decl name='s_d_op' type-id='1ee57353' visibility='default' filepath='include/linux/fs.h' line='1557' column='1'/> + <var-decl name='s_d_op' type-id='1ee57353' visibility='default' filepath='include/linux/fs.h' line='1552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9280'> - <var-decl name='cleancache_poolid' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1562' column='1'/> + <var-decl name='cleancache_poolid' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1557' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='s_shrink' type-id='27cb404f' visibility='default' filepath='include/linux/fs.h' line='1564' column='1'/> + <var-decl name='s_shrink' type-id='27cb404f' visibility='default' filepath='include/linux/fs.h' line='1559' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9856'> - <var-decl name='s_remove_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1567' column='1'/> + <var-decl name='s_remove_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1562' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9920'> - <var-decl name='s_fsnotify_inode_refs' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1570' column='1'/> + <var-decl name='s_fsnotify_inode_refs' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1565' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9984'> - <var-decl name='s_readonly_remount' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1573' column='1'/> + <var-decl name='s_readonly_remount' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1568' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10016'> - <var-decl name='s_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1576' column='1'/> + <var-decl name='s_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1571' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10048'> - <var-decl name='s_dio_done_wq' type-id='242e3d19' visibility='default' filepath='include/linux/fs.h' line='1579' column='1'/> + <var-decl name='s_dio_done_wq' type-id='242e3d19' visibility='default' filepath='include/linux/fs.h' line='1574' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10112'> - <var-decl name='s_pins' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='1580' column='1'/> + <var-decl name='s_pins' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='1575' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10176'> - <var-decl name='s_user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/fs.h' line='1587' column='1'/> + <var-decl name='s_user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/fs.h' line='1582' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10240'> - <var-decl name='s_dentry_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1594' column='1'/> + <var-decl name='s_dentry_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1589' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10496'> - <var-decl name='s_inode_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1595' column='1'/> + <var-decl name='s_inode_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1590' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10752'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1596' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1591' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10880'> - <var-decl name='destroy_work' type-id='ef9025d0' visibility='default' filepath='include/linux/fs.h' line='1597' column='1'/> + <var-decl name='destroy_work' type-id='ef9025d0' visibility='default' filepath='include/linux/fs.h' line='1592' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11264'> - <var-decl name='s_sync_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1599' column='1'/> + <var-decl name='s_sync_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1594' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11520'> - <var-decl name='s_stack_depth' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1604' column='1'/> + <var-decl name='s_stack_depth' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11776'> - <var-decl name='s_inode_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1607' column='1'/> + <var-decl name='s_inode_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11840'> - <var-decl name='s_inodes' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1608' column='1'/> + <var-decl name='s_inodes' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11968'> - <var-decl name='s_inode_wblist_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1610' column='1'/> + <var-decl name='s_inode_wblist_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12032'> - <var-decl name='s_inodes_wb' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1611' column='1'/> + <var-decl name='s_inodes_wb' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12160'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1613' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12224'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1614' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12288'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1615' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1610' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12352'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1616' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1611' column='1'/> </data-member> </class-decl> <class-decl name='task_cputime' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/sched/types.h' line='17' column='1' id='ad6873f4'> @@ -20204,7 +20186,7 @@ <var-decl name='raw_lock' type-id='fed2d8ee' visibility='default' filepath='include/linux/rwlock_types.h' line='12' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__39' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='111' column='1' id='a03c964b'> + <class-decl name='__anonymous_struct__37' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='111' column='1' id='a03c964b'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='head' type-id='e151255a' visibility='default' filepath='include/net/netns/ipv6.h' line='112' column='1'/> </data-member> @@ -20223,12 +20205,12 @@ <var-decl name='priv' type-id='24ae0315' visibility='default' filepath='include/linux/blkdev.h' line='195' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__12' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1853' column='1' id='19245258'> + <class-decl name='__anonymous_struct__12' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1851' column='1' id='19245258'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='upper' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1854' column='1'/> + <var-decl name='upper' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1852' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1855' column='1'/> + <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1853' column='1'/> </data-member> </class-decl> <class-decl name='__anonymous_struct__19' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='98' column='1' id='88c21632'> @@ -20336,7 +20318,7 @@ <pointer-type-def type-id='4ec43a31' size-in-bits='64' id='b2bcb5d9'/> <pointer-type-def type-id='ddd212e6' size-in-bits='64' id='d81cf24c'/> <pointer-type-def type-id='8e586c5c' size-in-bits='64' id='b1a5e68a'/> - <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2039' column='1' id='08f5ca17'> + <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2037' column='1' id='08f5ca17'> <underlying-type type-id='9cac1fee'/> <enumerator name='NETREG_UNINITIALIZED' value='0'/> <enumerator name='NETREG_REGISTERED' value='1'/> @@ -20345,12 +20327,12 @@ <enumerator name='NETREG_RELEASED' value='4'/> <enumerator name='NETREG_DUMMY' value='5'/> </enum-decl> - <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2049' column='1' id='08f5ca18'> + <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2047' column='1' id='08f5ca18'> <underlying-type type-id='9cac1fee'/> <enumerator name='RTNL_LINK_INITIALIZED' value='0'/> <enumerator name='RTNL_LINK_INITIALIZING' value='1'/> </enum-decl> - <enum-decl name='netdev_ml_priv_type' filepath='include/linux/netdevice.h' line='1594' column='1' id='9c6bf017'> + <enum-decl name='netdev_ml_priv_type' filepath='include/linux/netdevice.h' line='1592' column='1' id='9c6bf017'> <underlying-type type-id='9cac1fee'/> <enumerator name='ML_PRIV_NONE' value='0'/> <enumerator name='ML_PRIV_CAN' value='1'/> @@ -20565,12 +20547,12 @@ <var-decl name='' type-id='5e3b2ede' visibility='default' filepath='include/linux/mm_types.h' line='108' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__4' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='968' column='1' id='8c8e2781'> + <union-decl name='__anonymous_union__4' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='963' column='1' id='8c8e2781'> <data-member access='public'> - <var-decl name='fu_llist' type-id='c5ccfee8' visibility='default' filepath='include/linux/fs.h' line='969' column='1'/> + <var-decl name='fu_llist' type-id='c5ccfee8' visibility='default' filepath='include/linux/fs.h' line='964' column='1'/> </data-member> <data-member access='public'> - <var-decl name='fu_rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='970' column='1'/> + <var-decl name='fu_rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='965' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='150' column='1' id='787e8237'> @@ -20581,15 +20563,15 @@ <var-decl name='pt_frag_refcount' type-id='49178f86' visibility='default' filepath='include/linux/mm_types.h' line='152' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1' id='ca29cb68'> + <union-decl name='__anonymous_union__18' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1' id='ca29cb68'> <data-member access='public'> - <var-decl name='lstats' type-id='a42934eb' visibility='default' filepath='include/linux/netdevice.h' line='2068' column='1'/> + <var-decl name='lstats' type-id='a42934eb' visibility='default' filepath='include/linux/netdevice.h' line='2066' column='1'/> </data-member> <data-member access='public'> - <var-decl name='tstats' type-id='90cd86e5' visibility='default' filepath='include/linux/netdevice.h' line='2069' column='1'/> + <var-decl name='tstats' type-id='90cd86e5' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1'/> </data-member> <data-member access='public'> - <var-decl name='dstats' type-id='f59f5033' visibility='default' filepath='include/linux/netdevice.h' line='2070' column='1'/> + <var-decl name='dstats' type-id='f59f5033' visibility='default' filepath='include/linux/netdevice.h' line='2068' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__28' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/mm_types.h' line='122' column='1' id='77c8e02e'> @@ -21098,12 +21080,12 @@ <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/dcache.h' line='159' column='1'/> </data-member> </class-decl> - <class-decl name='dev_ifalias' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='948' column='1' id='ddd212e6'> + <class-decl name='dev_ifalias' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='946' column='1' id='ddd212e6'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='949' column='1'/> + <var-decl name='rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ifalias' type-id='e84913bd' visibility='default' filepath='include/linux/netdevice.h' line='950' column='1'/> + <var-decl name='ifalias' type-id='e84913bd' visibility='default' filepath='include/linux/netdevice.h' line='948' column='1'/> </data-member> </class-decl> <class-decl name='dev_pagemap' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/memremap.h' line='107' column='1' id='8e586c5c'> @@ -21985,97 +21967,97 @@ <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/sch_generic.h' line='1302' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_queue' size-in-bits='3584' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='602' column='1' id='49a7c5a7'> + <class-decl name='netdev_queue' size-in-bits='3584' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='600' column='1' id='49a7c5a7'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='606' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='604' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='607' column='1'/> + <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='qdisc_sleeping' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='608' column='1'/> + <var-decl name='qdisc_sleeping' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='610' column='1'/> + <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='tx_maxrate' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='615' column='1'/> + <var-decl name='tx_maxrate' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='trans_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='620' column='1'/> + <var-decl name='trans_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='618' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='sb_dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='623' column='1'/> + <var-decl name='sb_dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='625' column='1'/> + <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='_xmit_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='630' column='1'/> + <var-decl name='_xmit_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='628' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1568'> - <var-decl name='xmit_lock_owner' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='631' column='1'/> + <var-decl name='xmit_lock_owner' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='629' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='trans_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='635' column='1'/> + <var-decl name='trans_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='633' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='637' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='635' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='dql' type-id='471cb386' visibility='default' filepath='include/linux/netdevice.h' line='640' column='1'/> + <var-decl name='dql' type-id='471cb386' visibility='default' filepath='include/linux/netdevice.h' line='638' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='643' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='644' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='642' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='645' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='643' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='646' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='644' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_rx_queue' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='754' column='1' id='f12ac4ae'> + <class-decl name='netdev_rx_queue' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='752' column='1' id='f12ac4ae'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rps_map' type-id='f30dbff5' visibility='default' filepath='include/linux/netdevice.h' line='756' column='1'/> + <var-decl name='rps_map' type-id='f30dbff5' visibility='default' filepath='include/linux/netdevice.h' line='754' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rps_flow_table' type-id='deff2378' visibility='default' filepath='include/linux/netdevice.h' line='757' column='1'/> + <var-decl name='rps_flow_table' type-id='deff2378' visibility='default' filepath='include/linux/netdevice.h' line='755' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='759' column='1'/> + <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='757' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='760' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='xdp_rxq' type-id='eb0d6f26' visibility='default' filepath='include/linux/netdevice.h' line='761' column='1'/> + <var-decl name='xdp_rxq' type-id='eb0d6f26' visibility='default' filepath='include/linux/netdevice.h' line='759' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='763' column='1'/> + <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='766' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='764' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='767' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='765' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='768' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='766' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='769' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='767' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_tc_txq' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='816' column='1' id='f1e1eb79'> + <class-decl name='netdev_tc_txq' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='814' column='1' id='f1e1eb79'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='count' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='817' column='1'/> + <var-decl name='count' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='815' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='818' column='1'/> + <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='816' column='1'/> </data-member> </class-decl> <class-decl name='nf_ct_event_notifier' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/net/netfilter/nf_conntrack_ecache.h' line='75' column='1' id='a27aef61'> @@ -22334,9 +22316,9 @@ <var-decl name='get' type-id='c2ab7955' visibility='default' filepath='include/linux/pipe_fs_i.h' line='104' column='1'/> </data-member> </class-decl> - <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3277' column='1' id='ac763c5d'> + <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3261' column='1' id='ac763c5d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3278' column='1'/> + <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3262' column='1'/> </data-member> </class-decl> <class-decl name='psi_group_cpu' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/psi_types.h' line='56' column='1' id='956e764e'> @@ -22620,15 +22602,15 @@ <var-decl name='queue' type-id='6f53db1b' visibility='default' filepath='kernel/sched/sched.h' line='239' column='1'/> </data-member> </class-decl> - <class-decl name='sb_writers' size-in-bits='3136' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1472' column='1' id='fb476a2b'> + <class-decl name='sb_writers' size-in-bits='3136' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1467' column='1' id='fb476a2b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='frozen' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1473' column='1'/> + <var-decl name='frozen' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1468' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='wait_unfrozen' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1474' column='1'/> + <var-decl name='wait_unfrozen' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1469' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='rw_sem' type-id='a09ef5a6' visibility='default' filepath='include/linux/fs.h' line='1475' column='1'/> + <var-decl name='rw_sem' type-id='a09ef5a6' visibility='default' filepath='include/linux/fs.h' line='1470' column='1'/> </data-member> </class-decl> <class-decl name='sched_domain' size-in-bits='2432' is-struct='yes' visibility='default' filepath='include/linux/sched/topology.h' line='72' column='1' id='1706cf19'> @@ -22793,234 +22775,234 @@ <var-decl name='nr_deferred' type-id='5403cb36' visibility='default' filepath='include/linux/shrinker.h' line='77' column='1'/> </data-member> </class-decl> - <class-decl name='sk_buff' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1' id='ae8bfcdd'> + <class-decl name='sk_buff' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='691' column='1' id='ae8bfcdd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='' type-id='da6f1b1a' visibility='default' filepath='include/linux/skbuff.h' line='694' column='1'/> + <var-decl name='' type-id='da6f1b1a' visibility='default' filepath='include/linux/skbuff.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='' type-id='a6d66544' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1'/> + <var-decl name='' type-id='a6d66544' visibility='default' filepath='include/linux/skbuff.h' line='711' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='' type-id='b24a5a7e' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1'/> + <var-decl name='' type-id='b24a5a7e' visibility='default' filepath='include/linux/skbuff.h' line='716' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='cb' type-id='36d7f119' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1'/> + <var-decl name='cb' type-id='36d7f119' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='' type-id='271a40b8' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1'/> + <var-decl name='' type-id='271a40b8' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='_nfct' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='739' column='1'/> + <var-decl name='_nfct' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='737' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='741' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='739' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='928'> - <var-decl name='data_len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='742' column='1'/> + <var-decl name='data_len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='740' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='mac_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='743' column='1'/> + <var-decl name='mac_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='741' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='976'> - <var-decl name='hdr_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='744' column='1'/> + <var-decl name='hdr_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='742' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='992'> - <var-decl name='queue_mapping' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='749' column='1'/> + <var-decl name='queue_mapping' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='747' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1008'> - <var-decl name='__cloned_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='759' column='1'/> + <var-decl name='__cloned_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='757' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cloned' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='760' column='1'/> + <var-decl name='cloned' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='nohdr' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='761' column='1'/> + <var-decl name='nohdr' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='759' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='fclone' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/> + <var-decl name='fclone' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='760' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='peeked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='763' column='1'/> + <var-decl name='peeked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='head_frag' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='764' column='1'/> + <var-decl name='head_frag' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='pfmemalloc' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='765' column='1'/> + <var-decl name='pfmemalloc' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='763' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1016'> - <var-decl name='active_extensions' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='767' column='1'/> + <var-decl name='active_extensions' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='765' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='headers_start' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='773' column='1'/> + <var-decl name='headers_start' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='771' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='__pkt_type_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='784' column='1'/> + <var-decl name='__pkt_type_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='782' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pkt_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='785' column='1'/> + <var-decl name='pkt_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='783' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='ignore_df' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='786' column='1'/> + <var-decl name='ignore_df' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='784' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='nf_trace' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='787' column='1'/> + <var-decl name='nf_trace' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='785' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='ip_summed' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='788' column='1'/> + <var-decl name='ip_summed' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='786' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='ooo_okay' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='789' column='1'/> + <var-decl name='ooo_okay' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='787' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='l4_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='791' column='1'/> + <var-decl name='l4_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='789' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='sw_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='792' column='1'/> + <var-decl name='sw_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='790' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='wifi_acked_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='793' column='1'/> + <var-decl name='wifi_acked_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='791' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='wifi_acked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='794' column='1'/> + <var-decl name='wifi_acked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='792' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='no_fcs' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='795' column='1'/> + <var-decl name='no_fcs' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='793' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='encapsulation' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='797' column='1'/> + <var-decl name='encapsulation' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='795' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='encap_hdr_csum' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='798' column='1'/> + <var-decl name='encap_hdr_csum' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='796' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='csum_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='799' column='1'/> + <var-decl name='csum_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='797' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1040'> - <var-decl name='__pkt_vlan_present_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='807' column='1'/> + <var-decl name='__pkt_vlan_present_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='805' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='vlan_present' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='808' column='1'/> + <var-decl name='vlan_present' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='806' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='csum_complete_sw' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='809' column='1'/> + <var-decl name='csum_complete_sw' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='807' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='csum_level' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='810' column='1'/> + <var-decl name='csum_level' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='808' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='csum_not_inet' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='811' column='1'/> + <var-decl name='csum_not_inet' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='809' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='dst_pending_confirm' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='812' column='1'/> + <var-decl name='dst_pending_confirm' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='810' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='ndisc_nodetype' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='814' column='1'/> + <var-decl name='ndisc_nodetype' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='812' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ipvs_property' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='817' column='1'/> + <var-decl name='ipvs_property' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='815' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='inner_protocol_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='818' column='1'/> + <var-decl name='inner_protocol_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='816' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='remcsum_offload' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='819' column='1'/> + <var-decl name='remcsum_offload' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='817' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='tc_skip_classify' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='825' column='1'/> + <var-decl name='tc_skip_classify' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='823' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='tc_at_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='826' column='1'/> + <var-decl name='tc_at_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='824' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='redirected' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='829' column='1'/> + <var-decl name='redirected' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='827' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='from_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='830' column='1'/> + <var-decl name='from_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='828' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='tc_index' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='837' column='1'/> + <var-decl name='tc_index' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='835' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='' type-id='b4fc55b7' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1'/> + <var-decl name='' type-id='b4fc55b7' visibility='default' filepath='include/linux/skbuff.h' line='838' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='priority' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='847' column='1'/> + <var-decl name='priority' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='845' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='skb_iif' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='848' column='1'/> + <var-decl name='skb_iif' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='846' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1184'> - <var-decl name='hash' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='849' column='1'/> + <var-decl name='hash' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='847' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='vlan_proto' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='850' column='1'/> + <var-decl name='vlan_proto' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='848' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1232'> - <var-decl name='vlan_tci' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1'/> + <var-decl name='vlan_tci' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='849' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1248'> - <var-decl name='' type-id='8c3ee840' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1'/> + <var-decl name='' type-id='8c3ee840' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='secmark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='859' column='1'/> + <var-decl name='secmark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='857' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1312'> - <var-decl name='' type-id='9c81e675' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1'/> + <var-decl name='' type-id='9c81e675' visibility='default' filepath='include/linux/skbuff.h' line='860' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='' type-id='b97daab4' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1'/> + <var-decl name='' type-id='b97daab4' visibility='default' filepath='include/linux/skbuff.h' line='865' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1360'> - <var-decl name='inner_transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='872' column='1'/> + <var-decl name='inner_transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1376'> - <var-decl name='inner_network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='873' column='1'/> + <var-decl name='inner_network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='871' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1392'> - <var-decl name='inner_mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='874' column='1'/> + <var-decl name='inner_mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='872' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='876' column='1'/> + <var-decl name='protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='874' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1424'> - <var-decl name='transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='877' column='1'/> + <var-decl name='transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='875' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1440'> - <var-decl name='network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='878' column='1'/> + <var-decl name='network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='876' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1456'> - <var-decl name='mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='879' column='1'/> + <var-decl name='mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='877' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='headers_end' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='882' column='1'/> + <var-decl name='headers_end' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='880' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='' type-id='607684dc' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='883' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='904' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='884' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='tail' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='907' column='1'/> + <var-decl name='tail' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1632'> - <var-decl name='end' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='908' column='1'/> + <var-decl name='end' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='888' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='head' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='909' column='1'/> + <var-decl name='head' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='889' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='data' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='910' column='1'/> + <var-decl name='data' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='890' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='truesize' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='911' column='1'/> + <var-decl name='truesize' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='891' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1824'> - <var-decl name='users' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='912' column='1'/> + <var-decl name='users' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='892' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='extensions' type-id='374692c7' visibility='default' filepath='include/linux/skbuff.h' line='916' column='1'/> + <var-decl name='extensions' type-id='374692c7' visibility='default' filepath='include/linux/skbuff.h' line='896' column='1'/> </data-member> </class-decl> <class-decl name='sock_cgroup_data' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/cgroup-defs.h' line='797' column='1' id='8544f103'> @@ -23105,15 +23087,15 @@ <var-decl name='' type-id='5547e6b1' visibility='default' filepath='include/net/sock.h' line='228' column='1'/> </data-member> </class-decl> - <class-decl name='tcp_fastopen_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1683' column='1' id='f77d4717'> + <class-decl name='tcp_fastopen_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1678' column='1' id='f77d4717'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='key' type-id='5b02a6fc' visibility='default' filepath='include/net/tcp.h' line='1684' column='1'/> + <var-decl name='key' type-id='5b02a6fc' visibility='default' filepath='include/net/tcp.h' line='1679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='num' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1685' column='1'/> + <var-decl name='num' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/tcp.h' line='1686' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/tcp.h' line='1681' column='1'/> </data-member> </class-decl> <class-decl name='tcp_mib' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/net/snmp.h' line='92' column='1' id='e1f906a3'> @@ -23555,12 +23537,12 @@ <var-decl name='sbits6' type-id='f9b06939' visibility='default' filepath='include/net/netns/xfrm.h' line='21' column='1'/> </data-member> </class-decl> - <class-decl name='xps_dev_maps' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='800' column='1' id='4edc4180'> + <class-decl name='xps_dev_maps' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='798' column='1' id='4edc4180'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='801' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='799' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='attr_map' type-id='a0955e2b' visibility='default' filepath='include/linux/netdevice.h' line='802' column='1'/> + <var-decl name='attr_map' type-id='a0955e2b' visibility='default' filepath='include/linux/netdevice.h' line='800' column='1'/> </data-member> </class-decl> <class-decl name='xt_table' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='223' column='1' id='469df90e'> @@ -23664,7 +23646,7 @@ <var-decl name='next' type-id='91ce1af9' visibility='default' filepath='kernel/sched/sched.h' line='656' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__38' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='7799da43' visibility='default' filepath='include/linux/siphash.h' line='20' column='1' id='a1908dcc'> + <class-decl name='__anonymous_struct__36' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='7799da43' visibility='default' filepath='include/linux/siphash.h' line='20' column='1' id='a1908dcc'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='key' type-id='24a375b2' visibility='default' filepath='include/linux/siphash.h' line='21' column='1'/> </data-member> @@ -23812,7 +23794,7 @@ <typedef-decl name='put_budget_fn' type-id='4e7ef9a4' filepath='include/linux/blk-mq.h' line='127' column='1' id='695ed59c'/> <typedef-decl name='queue_rq_fn' type-id='32672900' filepath='include/linux/blk-mq.h' line='123' column='1' id='aa8737f6'/> <typedef-decl name='request_key_actor_t' type-id='a4946104' filepath='include/linux/key-type.h' line='41' column='1' id='99147724'/> - <typedef-decl name='rx_handler_func_t' type-id='77c9a241' filepath='include/linux/netdevice.h' line='434' column='1' id='9193647b'/> + <typedef-decl name='rx_handler_func_t' type-id='77c9a241' filepath='include/linux/netdevice.h' line='432' column='1' id='9193647b'/> <typedef-decl name='sigval_t' type-id='a094b870' filepath='include/uapi/asm-generic/siginfo.h' line='11' column='1' id='95506cfb'/> <typedef-decl name='smp_call_func_t' type-id='b7f9d8e6' filepath='include/linux/smp.h' line='17' column='1' id='89714567'/> <typedef-decl name='socket_lock_t' type-id='a865a4bb' filepath='include/net/sock.h' line='110' column='1' id='40d8a3da'/> @@ -23912,12 +23894,12 @@ <var-decl name='ptr' type-id='baf98fd3' visibility='default' filepath='include/net/netns/generic.h' line='35' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__25' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='736' column='1' id='67f3b119'> + <union-decl name='__anonymous_union__25' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='731' column='1' id='67f3b119'> <data-member access='public'> - <var-decl name='i_fop' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='737' column='1'/> + <var-decl name='i_fop' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='732' column='1'/> </data-member> <data-member access='public'> - <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='738' column='1'/> + <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='733' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='fs/proc/internal.h' line='44' column='1' id='1371a02f'> @@ -23928,37 +23910,37 @@ <var-decl name='single_show' type-id='0131eb61' visibility='default' filepath='fs/proc/internal.h' line='46' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__23' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='685' column='1' id='3ee18b51'> + <union-decl name='__anonymous_union__23' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='680' column='1' id='3ee18b51'> <data-member access='public'> - <var-decl name='i_nlink' type-id='20f5f452' visibility='default' filepath='include/linux/fs.h' line='686' column='1'/> + <var-decl name='i_nlink' type-id='20f5f452' visibility='default' filepath='include/linux/fs.h' line='681' column='1'/> </data-member> <data-member access='public'> - <var-decl name='__i_nlink' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='687' column='1'/> + <var-decl name='__i_nlink' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='682' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='724' column='1' id='cbd4a95b'> + <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='719' column='1' id='cbd4a95b'> <data-member access='public'> - <var-decl name='i_dentry' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='725' column='1'/> + <var-decl name='i_dentry' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='720' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='726' column='1'/> + <var-decl name='i_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='721' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='743' column='1' id='d1afa4fe'> + <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='738' column='1' id='d1afa4fe'> <data-member access='public'> - <var-decl name='i_pipe' type-id='15d29710' visibility='default' filepath='include/linux/fs.h' line='744' column='1'/> + <var-decl name='i_pipe' type-id='15d29710' visibility='default' filepath='include/linux/fs.h' line='739' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='745' column='1'/> + <var-decl name='i_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='740' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_cdev' type-id='3e6eb939' visibility='default' filepath='include/linux/fs.h' line='746' column='1'/> + <var-decl name='i_cdev' type-id='3e6eb939' visibility='default' filepath='include/linux/fs.h' line='741' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_link' type-id='26a90f95' visibility='default' filepath='include/linux/fs.h' line='747' column='1'/> + <var-decl name='i_link' type-id='26a90f95' visibility='default' filepath='include/linux/fs.h' line='742' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_dir_seq' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='748' column='1'/> + <var-decl name='i_dir_seq' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='743' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__5' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='77' column='1' id='c4e140b8'> @@ -23972,7 +23954,7 @@ <var-decl name='_addr_pkey' type-id='8a41173c' visibility='default' filepath='include/uapi/asm-generic/siginfo.h' line='93' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='413' column='1' id='fc714247'> + <union-decl name='__anonymous_union__18' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='413' column='1' id='fc714247'> <data-member access='public'> <var-decl name='sk_send_head' type-id='0fbf3cfd' visibility='default' filepath='include/net/sock.h' line='414' column='1'/> </data-member> @@ -23980,7 +23962,7 @@ <var-decl name='tcp_rtx_queue' type-id='dec44472' visibility='default' filepath='include/net/sock.h' line='415' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='397' column='1' id='a29f8367'> + <union-decl name='__anonymous_union__17' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='397' column='1' id='a29f8367'> <data-member access='public'> <var-decl name='sk_wq' type-id='99f34ac1' visibility='default' filepath='include/net/sock.h' line='398' column='1'/> </data-member> @@ -23988,7 +23970,7 @@ <var-decl name='sk_wq_raw' type-id='99f34ac1' visibility='default' filepath='include/net/sock.h' line='399' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='526' column='1' id='b3414a3c'> + <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='526' column='1' id='b3414a3c'> <data-member access='public'> <var-decl name='sk_peer_lock' type-id='fb4018a0' visibility='default' filepath='include/net/sock.h' line='526' column='1'/> </data-member> @@ -24666,190 +24648,190 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/net/ip6_fib.h' line='88' column='1'/> </data-member> </class-decl> - <class-decl name='file_lock_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1164' column='1' id='fb0c2987'> + <class-decl name='file_lock_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1159' column='1' id='fb0c2987'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='flc_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1165' column='1'/> + <var-decl name='flc_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1160' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='flc_flock' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1166' column='1'/> + <var-decl name='flc_flock' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1161' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='flc_posix' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1167' column='1'/> + <var-decl name='flc_posix' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1162' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='flc_lease' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1168' column='1'/> + <var-decl name='flc_lease' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1163' column='1'/> </data-member> </class-decl> - <class-decl name='file_operations' size-in-bits='2304' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1890' column='1' id='7dffcde2'> + <class-decl name='file_operations' size-in-bits='2304' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1885' column='1' id='7dffcde2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='1891' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='1886' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='llseek' type-id='07ebb4cd' visibility='default' filepath='include/linux/fs.h' line='1892' column='1'/> + <var-decl name='llseek' type-id='07ebb4cd' visibility='default' filepath='include/linux/fs.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='read' type-id='4d8f5625' visibility='default' filepath='include/linux/fs.h' line='1893' column='1'/> + <var-decl name='read' type-id='4d8f5625' visibility='default' filepath='include/linux/fs.h' line='1888' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='write' type-id='5f29549c' visibility='default' filepath='include/linux/fs.h' line='1894' column='1'/> + <var-decl name='write' type-id='5f29549c' visibility='default' filepath='include/linux/fs.h' line='1889' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='read_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1895' column='1'/> + <var-decl name='read_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1890' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='write_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1896' column='1'/> + <var-decl name='write_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1891' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='iopoll' type-id='6c4618be' visibility='default' filepath='include/linux/fs.h' line='1897' column='1'/> + <var-decl name='iopoll' type-id='6c4618be' visibility='default' filepath='include/linux/fs.h' line='1892' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='iterate' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1898' column='1'/> + <var-decl name='iterate' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1893' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='iterate_shared' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1899' column='1'/> + <var-decl name='iterate_shared' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1894' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='poll' type-id='4d01ede7' visibility='default' filepath='include/linux/fs.h' line='1900' column='1'/> + <var-decl name='poll' type-id='4d01ede7' visibility='default' filepath='include/linux/fs.h' line='1895' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='unlocked_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1901' column='1'/> + <var-decl name='unlocked_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1896' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='compat_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1902' column='1'/> + <var-decl name='compat_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1897' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='mmap' type-id='8ea2626c' visibility='default' filepath='include/linux/fs.h' line='1903' column='1'/> + <var-decl name='mmap' type-id='8ea2626c' visibility='default' filepath='include/linux/fs.h' line='1898' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='mmap_supported_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1904' column='1'/> + <var-decl name='mmap_supported_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1899' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='open' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1905' column='1'/> + <var-decl name='open' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1900' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='flush' type-id='5ddef2dd' visibility='default' filepath='include/linux/fs.h' line='1906' column='1'/> + <var-decl name='flush' type-id='5ddef2dd' visibility='default' filepath='include/linux/fs.h' line='1901' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='release' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1907' column='1'/> + <var-decl name='release' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1902' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='fsync' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1908' column='1'/> + <var-decl name='fsync' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1903' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='fasync' type-id='b94ac371' visibility='default' filepath='include/linux/fs.h' line='1909' column='1'/> + <var-decl name='fasync' type-id='b94ac371' visibility='default' filepath='include/linux/fs.h' line='1904' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='lock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1910' column='1'/> + <var-decl name='lock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1905' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='sendpage' type-id='40da47a8' visibility='default' filepath='include/linux/fs.h' line='1911' column='1'/> + <var-decl name='sendpage' type-id='40da47a8' visibility='default' filepath='include/linux/fs.h' line='1906' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='get_unmapped_area' type-id='d44a8cec' visibility='default' filepath='include/linux/fs.h' line='1912' column='1'/> + <var-decl name='get_unmapped_area' type-id='d44a8cec' visibility='default' filepath='include/linux/fs.h' line='1907' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='check_flags' type-id='7f416e10' visibility='default' filepath='include/linux/fs.h' line='1913' column='1'/> + <var-decl name='check_flags' type-id='7f416e10' visibility='default' filepath='include/linux/fs.h' line='1908' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='flock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1914' column='1'/> + <var-decl name='flock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1909' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='splice_write' type-id='b22f4610' visibility='default' filepath='include/linux/fs.h' line='1915' column='1'/> + <var-decl name='splice_write' type-id='b22f4610' visibility='default' filepath='include/linux/fs.h' line='1910' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='splice_read' type-id='72cd68b0' visibility='default' filepath='include/linux/fs.h' line='1916' column='1'/> + <var-decl name='splice_read' type-id='72cd68b0' visibility='default' filepath='include/linux/fs.h' line='1911' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='setlease' type-id='87e3d3e2' visibility='default' filepath='include/linux/fs.h' line='1917' column='1'/> + <var-decl name='setlease' type-id='87e3d3e2' visibility='default' filepath='include/linux/fs.h' line='1912' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='fallocate' type-id='a53e2328' visibility='default' filepath='include/linux/fs.h' line='1918' column='1'/> + <var-decl name='fallocate' type-id='a53e2328' visibility='default' filepath='include/linux/fs.h' line='1913' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='show_fdinfo' type-id='eda08098' visibility='default' filepath='include/linux/fs.h' line='1920' column='1'/> + <var-decl name='show_fdinfo' type-id='eda08098' visibility='default' filepath='include/linux/fs.h' line='1915' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='copy_file_range' type-id='d0882d6b' visibility='default' filepath='include/linux/fs.h' line='1924' column='1'/> + <var-decl name='copy_file_range' type-id='d0882d6b' visibility='default' filepath='include/linux/fs.h' line='1919' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='remap_file_range' type-id='c1de1086' visibility='default' filepath='include/linux/fs.h' line='1926' column='1'/> + <var-decl name='remap_file_range' type-id='c1de1086' visibility='default' filepath='include/linux/fs.h' line='1921' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='fadvise' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1929' column='1'/> + <var-decl name='fadvise' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1924' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1931' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1926' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1932' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1927' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1933' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1928' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1934' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1929' column='1'/> </data-member> </class-decl> - <class-decl name='file_system_type' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2304' column='1' id='2f5a60be'> + <class-decl name='file_system_type' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2299' column='1' id='2f5a60be'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2305' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fs_flags' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2306' column='1'/> + <var-decl name='fs_flags' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2301' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='init_fs_context' type-id='57f0383a' visibility='default' filepath='include/linux/fs.h' line='2313' column='1'/> + <var-decl name='init_fs_context' type-id='57f0383a' visibility='default' filepath='include/linux/fs.h' line='2308' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='parameters' type-id='a2fb6348' visibility='default' filepath='include/linux/fs.h' line='2314' column='1'/> + <var-decl name='parameters' type-id='a2fb6348' visibility='default' filepath='include/linux/fs.h' line='2309' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='mount' type-id='d9394db1' visibility='default' filepath='include/linux/fs.h' line='2315' column='1'/> + <var-decl name='mount' type-id='d9394db1' visibility='default' filepath='include/linux/fs.h' line='2310' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='kill_sb' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2317' column='1'/> + <var-decl name='kill_sb' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2312' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='2318' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='2313' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='next' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='2319' column='1'/> + <var-decl name='next' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='2314' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='fs_supers' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='2320' column='1'/> + <var-decl name='fs_supers' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='2315' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2322' column='1'/> + <var-decl name='s_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2317' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_umount_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2323' column='1'/> + <var-decl name='s_umount_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2318' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_vfs_rename_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2324' column='1'/> + <var-decl name='s_vfs_rename_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2319' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_writers_key' type-id='9c02e2a6' visibility='default' filepath='include/linux/fs.h' line='2325' column='1'/> + <var-decl name='s_writers_key' type-id='9c02e2a6' visibility='default' filepath='include/linux/fs.h' line='2320' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2327' column='1'/> + <var-decl name='i_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2322' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_mutex_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2328' column='1'/> + <var-decl name='i_mutex_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2323' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_mutex_dir_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2329' column='1'/> + <var-decl name='i_mutex_dir_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2324' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2331' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2326' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2332' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2327' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2333' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2328' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2334' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2329' column='1'/> </data-member> </class-decl> <class-decl name='fscrypt_info' is-struct='yes' visibility='default' is-declaration-only='yes' id='9441bb37'/> @@ -24899,30 +24881,30 @@ <var-decl name='overlimits' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/gen_stats.h' line='67' column='1'/> </data-member> </class-decl> - <class-decl name='header_ops' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='268' column='1' id='f6e7855b'> + <class-decl name='header_ops' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='266' column='1' id='f6e7855b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='create' type-id='e82aa0fb' visibility='default' filepath='include/linux/netdevice.h' line='269' column='1'/> + <var-decl name='create' type-id='e82aa0fb' visibility='default' filepath='include/linux/netdevice.h' line='267' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='parse' type-id='35b37061' visibility='default' filepath='include/linux/netdevice.h' line='272' column='1'/> + <var-decl name='parse' type-id='35b37061' visibility='default' filepath='include/linux/netdevice.h' line='270' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='cache' type-id='464a4247' visibility='default' filepath='include/linux/netdevice.h' line='273' column='1'/> + <var-decl name='cache' type-id='464a4247' visibility='default' filepath='include/linux/netdevice.h' line='271' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='cache_update' type-id='b713d448' visibility='default' filepath='include/linux/netdevice.h' line='274' column='1'/> + <var-decl name='cache_update' type-id='b713d448' visibility='default' filepath='include/linux/netdevice.h' line='272' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='validate' type-id='5a60e638' visibility='default' filepath='include/linux/netdevice.h' line='277' column='1'/> + <var-decl name='validate' type-id='5a60e638' visibility='default' filepath='include/linux/netdevice.h' line='275' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='parse_protocol' type-id='98c4c95a' visibility='default' filepath='include/linux/netdevice.h' line='278' column='1'/> + <var-decl name='parse_protocol' type-id='98c4c95a' visibility='default' filepath='include/linux/netdevice.h' line='276' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='280' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='278' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='281' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='279' column='1'/> </data-member> </class-decl> <class-decl name='hlist_nulls_head' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/list_nulls.h' line='21' column='1' id='af86905d'> @@ -25122,228 +25104,228 @@ <var-decl name='prefix_rcv_add_addr' type-id='1cebc84d' visibility='default' filepath='include/net/ndisc.h' line='216' column='1'/> </data-member> </class-decl> - <class-decl name='net_device_ops' size-in-bits='4736' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1275' column='1' id='ba44c7d8'> + <class-decl name='net_device_ops' size-in-bits='4736' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1273' column='1' id='ba44c7d8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ndo_init' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1276' column='1'/> + <var-decl name='ndo_init' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1274' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ndo_uninit' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1277' column='1'/> + <var-decl name='ndo_uninit' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1275' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ndo_open' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1278' column='1'/> + <var-decl name='ndo_open' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1276' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='ndo_stop' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1279' column='1'/> + <var-decl name='ndo_stop' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1277' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='ndo_start_xmit' type-id='bd3f3f93' visibility='default' filepath='include/linux/netdevice.h' line='1280' column='1'/> + <var-decl name='ndo_start_xmit' type-id='bd3f3f93' visibility='default' filepath='include/linux/netdevice.h' line='1278' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ndo_features_check' type-id='7a0ed254' visibility='default' filepath='include/linux/netdevice.h' line='1282' column='1'/> + <var-decl name='ndo_features_check' type-id='7a0ed254' visibility='default' filepath='include/linux/netdevice.h' line='1280' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='ndo_select_queue' type-id='de36db77' visibility='default' filepath='include/linux/netdevice.h' line='1285' column='1'/> + <var-decl name='ndo_select_queue' type-id='de36db77' visibility='default' filepath='include/linux/netdevice.h' line='1283' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='ndo_change_rx_flags' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1288' column='1'/> + <var-decl name='ndo_change_rx_flags' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1286' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='ndo_set_rx_mode' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1290' column='1'/> + <var-decl name='ndo_set_rx_mode' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1288' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='ndo_set_mac_address' type-id='f4dd5cc5' visibility='default' filepath='include/linux/netdevice.h' line='1291' column='1'/> + <var-decl name='ndo_set_mac_address' type-id='f4dd5cc5' visibility='default' filepath='include/linux/netdevice.h' line='1289' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='ndo_validate_addr' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1293' column='1'/> + <var-decl name='ndo_validate_addr' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1291' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='ndo_do_ioctl' type-id='cc325be7' visibility='default' filepath='include/linux/netdevice.h' line='1294' column='1'/> + <var-decl name='ndo_do_ioctl' type-id='cc325be7' visibility='default' filepath='include/linux/netdevice.h' line='1292' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='ndo_set_config' type-id='bd2d1eba' visibility='default' filepath='include/linux/netdevice.h' line='1296' column='1'/> + <var-decl name='ndo_set_config' type-id='bd2d1eba' visibility='default' filepath='include/linux/netdevice.h' line='1294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='ndo_change_mtu' type-id='d6762aa0' visibility='default' filepath='include/linux/netdevice.h' line='1298' column='1'/> + <var-decl name='ndo_change_mtu' type-id='d6762aa0' visibility='default' filepath='include/linux/netdevice.h' line='1296' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='ndo_neigh_setup' type-id='5c9f2a92' visibility='default' filepath='include/linux/netdevice.h' line='1300' column='1'/> + <var-decl name='ndo_neigh_setup' type-id='5c9f2a92' visibility='default' filepath='include/linux/netdevice.h' line='1298' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='ndo_tx_timeout' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1302' column='1'/> + <var-decl name='ndo_tx_timeout' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='ndo_get_stats64' type-id='cb4c6db1' visibility='default' filepath='include/linux/netdevice.h' line='1304' column='1'/> + <var-decl name='ndo_get_stats64' type-id='cb4c6db1' visibility='default' filepath='include/linux/netdevice.h' line='1302' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='ndo_has_offload_stats' type-id='e95fd96b' visibility='default' filepath='include/linux/netdevice.h' line='1306' column='1'/> + <var-decl name='ndo_has_offload_stats' type-id='e95fd96b' visibility='default' filepath='include/linux/netdevice.h' line='1304' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='ndo_get_offload_stats' type-id='f98694f9' visibility='default' filepath='include/linux/netdevice.h' line='1307' column='1'/> + <var-decl name='ndo_get_offload_stats' type-id='f98694f9' visibility='default' filepath='include/linux/netdevice.h' line='1305' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='ndo_get_stats' type-id='3217f9ba' visibility='default' filepath='include/linux/netdevice.h' line='1310' column='1'/> + <var-decl name='ndo_get_stats' type-id='3217f9ba' visibility='default' filepath='include/linux/netdevice.h' line='1308' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='ndo_vlan_rx_add_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1312' column='1'/> + <var-decl name='ndo_vlan_rx_add_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1310' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='ndo_vlan_rx_kill_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1314' column='1'/> + <var-decl name='ndo_vlan_rx_kill_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1312' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='ndo_set_vf_mac' type-id='bae60bcf' visibility='default' filepath='include/linux/netdevice.h' line='1322' column='1'/> + <var-decl name='ndo_set_vf_mac' type-id='bae60bcf' visibility='default' filepath='include/linux/netdevice.h' line='1320' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='ndo_set_vf_vlan' type-id='699131d0' visibility='default' filepath='include/linux/netdevice.h' line='1324' column='1'/> + <var-decl name='ndo_set_vf_vlan' type-id='699131d0' visibility='default' filepath='include/linux/netdevice.h' line='1322' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='ndo_set_vf_rate' type-id='7cd466e6' visibility='default' filepath='include/linux/netdevice.h' line='1327' column='1'/> + <var-decl name='ndo_set_vf_rate' type-id='7cd466e6' visibility='default' filepath='include/linux/netdevice.h' line='1325' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='ndo_set_vf_spoofchk' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1330' column='1'/> + <var-decl name='ndo_set_vf_spoofchk' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1328' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='ndo_set_vf_trust' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1332' column='1'/> + <var-decl name='ndo_set_vf_trust' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1330' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='ndo_get_vf_config' type-id='d22f8cbe' visibility='default' filepath='include/linux/netdevice.h' line='1334' column='1'/> + <var-decl name='ndo_get_vf_config' type-id='d22f8cbe' visibility='default' filepath='include/linux/netdevice.h' line='1332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='ndo_set_vf_link_state' type-id='b54cfa0f' visibility='default' filepath='include/linux/netdevice.h' line='1337' column='1'/> + <var-decl name='ndo_set_vf_link_state' type-id='b54cfa0f' visibility='default' filepath='include/linux/netdevice.h' line='1335' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='ndo_get_vf_stats' type-id='eee971fd' visibility='default' filepath='include/linux/netdevice.h' line='1339' column='1'/> + <var-decl name='ndo_get_vf_stats' type-id='eee971fd' visibility='default' filepath='include/linux/netdevice.h' line='1337' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='ndo_set_vf_port' type-id='af60ef81' visibility='default' filepath='include/linux/netdevice.h' line='1343' column='1'/> + <var-decl name='ndo_set_vf_port' type-id='af60ef81' visibility='default' filepath='include/linux/netdevice.h' line='1341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='ndo_get_vf_port' type-id='be55abd8' visibility='default' filepath='include/linux/netdevice.h' line='1346' column='1'/> + <var-decl name='ndo_get_vf_port' type-id='be55abd8' visibility='default' filepath='include/linux/netdevice.h' line='1344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='ndo_set_vf_guid' type-id='0617ad2b' visibility='default' filepath='include/linux/netdevice.h' line='1348' column='1'/> + <var-decl name='ndo_set_vf_guid' type-id='0617ad2b' visibility='default' filepath='include/linux/netdevice.h' line='1346' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='ndo_set_vf_rss_query_en' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1351' column='1'/> + <var-decl name='ndo_set_vf_rss_query_en' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1349' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='ndo_setup_tc' type-id='06b83346' visibility='default' filepath='include/linux/netdevice.h' line='1354' column='1'/> + <var-decl name='ndo_setup_tc' type-id='06b83346' visibility='default' filepath='include/linux/netdevice.h' line='1352' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='ndo_rx_flow_steer' type-id='47498e6c' visibility='default' filepath='include/linux/netdevice.h' line='1382' column='1'/> + <var-decl name='ndo_rx_flow_steer' type-id='47498e6c' visibility='default' filepath='include/linux/netdevice.h' line='1380' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='ndo_add_slave' type-id='031fe454' visibility='default' filepath='include/linux/netdevice.h' line='1387' column='1'/> + <var-decl name='ndo_add_slave' type-id='031fe454' visibility='default' filepath='include/linux/netdevice.h' line='1385' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='ndo_del_slave' type-id='ed3019e9' visibility='default' filepath='include/linux/netdevice.h' line='1390' column='1'/> + <var-decl name='ndo_del_slave' type-id='ed3019e9' visibility='default' filepath='include/linux/netdevice.h' line='1388' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='ndo_fix_features' type-id='4a028f44' visibility='default' filepath='include/linux/netdevice.h' line='1392' column='1'/> + <var-decl name='ndo_fix_features' type-id='4a028f44' visibility='default' filepath='include/linux/netdevice.h' line='1390' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2496'> - <var-decl name='ndo_set_features' type-id='10dae4c5' visibility='default' filepath='include/linux/netdevice.h' line='1394' column='1'/> + <var-decl name='ndo_set_features' type-id='10dae4c5' visibility='default' filepath='include/linux/netdevice.h' line='1392' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2560'> - <var-decl name='ndo_neigh_construct' type-id='92446276' visibility='default' filepath='include/linux/netdevice.h' line='1396' column='1'/> + <var-decl name='ndo_neigh_construct' type-id='92446276' visibility='default' filepath='include/linux/netdevice.h' line='1394' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2624'> - <var-decl name='ndo_neigh_destroy' type-id='11e89fb9' visibility='default' filepath='include/linux/netdevice.h' line='1398' column='1'/> + <var-decl name='ndo_neigh_destroy' type-id='11e89fb9' visibility='default' filepath='include/linux/netdevice.h' line='1396' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2688'> - <var-decl name='ndo_fdb_add' type-id='5ffcd66c' visibility='default' filepath='include/linux/netdevice.h' line='1401' column='1'/> + <var-decl name='ndo_fdb_add' type-id='5ffcd66c' visibility='default' filepath='include/linux/netdevice.h' line='1399' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2752'> - <var-decl name='ndo_fdb_del' type-id='e6032f80' visibility='default' filepath='include/linux/netdevice.h' line='1408' column='1'/> + <var-decl name='ndo_fdb_del' type-id='e6032f80' visibility='default' filepath='include/linux/netdevice.h' line='1406' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='ndo_fdb_dump' type-id='147cd5a7' visibility='default' filepath='include/linux/netdevice.h' line='1413' column='1'/> + <var-decl name='ndo_fdb_dump' type-id='147cd5a7' visibility='default' filepath='include/linux/netdevice.h' line='1411' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2880'> - <var-decl name='ndo_fdb_get' type-id='6537d478' visibility='default' filepath='include/linux/netdevice.h' line='1418' column='1'/> + <var-decl name='ndo_fdb_get' type-id='6537d478' visibility='default' filepath='include/linux/netdevice.h' line='1416' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='ndo_bridge_setlink' type-id='50756496' visibility='default' filepath='include/linux/netdevice.h' line='1424' column='1'/> + <var-decl name='ndo_bridge_setlink' type-id='50756496' visibility='default' filepath='include/linux/netdevice.h' line='1422' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3008'> - <var-decl name='ndo_bridge_getlink' type-id='e78e01a9' visibility='default' filepath='include/linux/netdevice.h' line='1428' column='1'/> + <var-decl name='ndo_bridge_getlink' type-id='e78e01a9' visibility='default' filepath='include/linux/netdevice.h' line='1426' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='ndo_bridge_dellink' type-id='1223555b' visibility='default' filepath='include/linux/netdevice.h' line='1433' column='1'/> + <var-decl name='ndo_bridge_dellink' type-id='1223555b' visibility='default' filepath='include/linux/netdevice.h' line='1431' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='ndo_change_carrier' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1436' column='1'/> + <var-decl name='ndo_change_carrier' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1434' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='ndo_get_phys_port_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1438' column='1'/> + <var-decl name='ndo_get_phys_port_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1436' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='ndo_get_port_parent_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1440' column='1'/> + <var-decl name='ndo_get_port_parent_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1438' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3328'> - <var-decl name='ndo_get_phys_port_name' type-id='5139dd84' visibility='default' filepath='include/linux/netdevice.h' line='1442' column='1'/> + <var-decl name='ndo_get_phys_port_name' type-id='5139dd84' visibility='default' filepath='include/linux/netdevice.h' line='1440' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3392'> - <var-decl name='ndo_udp_tunnel_add' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1444' column='1'/> + <var-decl name='ndo_udp_tunnel_add' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1442' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3456'> - <var-decl name='ndo_udp_tunnel_del' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1446' column='1'/> + <var-decl name='ndo_udp_tunnel_del' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1444' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3520'> - <var-decl name='ndo_dfwd_add_station' type-id='e2d7f258' visibility='default' filepath='include/linux/netdevice.h' line='1448' column='1'/> + <var-decl name='ndo_dfwd_add_station' type-id='e2d7f258' visibility='default' filepath='include/linux/netdevice.h' line='1446' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3584'> - <var-decl name='ndo_dfwd_del_station' type-id='5ac7baf4' visibility='default' filepath='include/linux/netdevice.h' line='1450' column='1'/> + <var-decl name='ndo_dfwd_del_station' type-id='5ac7baf4' visibility='default' filepath='include/linux/netdevice.h' line='1448' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3648'> - <var-decl name='ndo_set_tx_maxrate' type-id='c1e0b02f' visibility='default' filepath='include/linux/netdevice.h' line='1453' column='1'/> + <var-decl name='ndo_set_tx_maxrate' type-id='c1e0b02f' visibility='default' filepath='include/linux/netdevice.h' line='1451' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3712'> - <var-decl name='ndo_get_iflink' type-id='4753b592' visibility='default' filepath='include/linux/netdevice.h' line='1456' column='1'/> + <var-decl name='ndo_get_iflink' type-id='4753b592' visibility='default' filepath='include/linux/netdevice.h' line='1454' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3776'> - <var-decl name='ndo_change_proto_down' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1457' column='1'/> + <var-decl name='ndo_change_proto_down' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1455' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3840'> - <var-decl name='ndo_fill_metadata_dst' type-id='2cc5a575' visibility='default' filepath='include/linux/netdevice.h' line='1459' column='1'/> + <var-decl name='ndo_fill_metadata_dst' type-id='2cc5a575' visibility='default' filepath='include/linux/netdevice.h' line='1457' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3904'> - <var-decl name='ndo_set_rx_headroom' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1461' column='1'/> + <var-decl name='ndo_set_rx_headroom' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1459' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3968'> - <var-decl name='ndo_bpf' type-id='49f84764' visibility='default' filepath='include/linux/netdevice.h' line='1463' column='1'/> + <var-decl name='ndo_bpf' type-id='49f84764' visibility='default' filepath='include/linux/netdevice.h' line='1461' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4032'> - <var-decl name='ndo_xdp_xmit' type-id='0c7d25ff' visibility='default' filepath='include/linux/netdevice.h' line='1465' column='1'/> + <var-decl name='ndo_xdp_xmit' type-id='0c7d25ff' visibility='default' filepath='include/linux/netdevice.h' line='1463' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4096'> - <var-decl name='ndo_xsk_wakeup' type-id='149f0e1f' visibility='default' filepath='include/linux/netdevice.h' line='1468' column='1'/> + <var-decl name='ndo_xsk_wakeup' type-id='149f0e1f' visibility='default' filepath='include/linux/netdevice.h' line='1466' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4160'> - <var-decl name='ndo_get_devlink_port' type-id='cd97030f' visibility='default' filepath='include/linux/netdevice.h' line='1470' column='1'/> + <var-decl name='ndo_get_devlink_port' type-id='cd97030f' visibility='default' filepath='include/linux/netdevice.h' line='1468' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4224'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1472' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1470' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4288'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1473' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1471' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4352'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1474' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1472' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4416'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1475' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1473' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4480'> - <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1476' column='1'/> + <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1474' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4544'> - <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1477' column='1'/> + <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1475' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4608'> - <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1478' column='1'/> + <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1476' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4672'> - <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1479' column='1'/> + <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1477' column='1'/> </data-member> </class-decl> <class-decl name='nf_queue_handler' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/net/netfilter/nf_queue.h' line='27' column='1' id='b77325d2'> @@ -25363,32 +25345,32 @@ </data-member> </class-decl> <class-decl name='pcpu_dstats' is-struct='yes' visibility='default' is-declaration-only='yes' id='45092453'/> - <class-decl name='pcpu_lstats' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2479' column='1' id='b71b307b'> + <class-decl name='pcpu_lstats' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2477' column='1' id='b71b307b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2480' column='1'/> + <var-decl name='packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2478' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2481' column='1'/> + <var-decl name='bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2479' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2482' column='1'/> + <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2480' column='1'/> </data-member> </class-decl> - <class-decl name='pcpu_sw_netstats' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2471' column='1' id='101eeec5'> + <class-decl name='pcpu_sw_netstats' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2469' column='1' id='101eeec5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2472' column='1'/> + <var-decl name='rx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2470' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2473' column='1'/> + <var-decl name='rx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2471' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='tx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2474' column='1'/> + <var-decl name='tx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2472' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='tx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2475' column='1'/> + <var-decl name='tx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2473' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2476' column='1'/> + <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2474' column='1'/> </data-member> </class-decl> <class-decl name='pglist_data' size-in-bits='46080' is-struct='yes' visibility='default' filepath='include/linux/mmzone.h' line='711' column='1' id='54406315'> @@ -25960,60 +25942,60 @@ <var-decl name='wq' type-id='8bd06fd9' visibility='default' filepath='include/linux/net.h' line='125' column='1'/> </data-member> </class-decl> - <class-decl name='tcp_congestion_ops' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1041' column='1' id='54718f09'> + <class-decl name='tcp_congestion_ops' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1039' column='1' id='54718f09'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='1042' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='1040' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='key' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1043' column='1'/> + <var-decl name='key' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1041' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1044' column='1'/> + <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1042' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='init' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1047' column='1'/> + <var-decl name='init' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1049' column='1'/> + <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ssthresh' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1052' column='1'/> + <var-decl name='ssthresh' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='cong_avoid' type-id='ece3af1e' visibility='default' filepath='include/net/tcp.h' line='1054' column='1'/> + <var-decl name='cong_avoid' type-id='ece3af1e' visibility='default' filepath='include/net/tcp.h' line='1052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='set_state' type-id='f5feb7a4' visibility='default' filepath='include/net/tcp.h' line='1056' column='1'/> + <var-decl name='set_state' type-id='f5feb7a4' visibility='default' filepath='include/net/tcp.h' line='1054' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='cwnd_event' type-id='bfacbc7a' visibility='default' filepath='include/net/tcp.h' line='1058' column='1'/> + <var-decl name='cwnd_event' type-id='bfacbc7a' visibility='default' filepath='include/net/tcp.h' line='1056' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='in_ack_event' type-id='815f64bf' visibility='default' filepath='include/net/tcp.h' line='1060' column='1'/> + <var-decl name='in_ack_event' type-id='815f64bf' visibility='default' filepath='include/net/tcp.h' line='1058' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='undo_cwnd' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1062' column='1'/> + <var-decl name='undo_cwnd' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1060' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='pkts_acked' type-id='bffb5883' visibility='default' filepath='include/net/tcp.h' line='1064' column='1'/> + <var-decl name='pkts_acked' type-id='bffb5883' visibility='default' filepath='include/net/tcp.h' line='1062' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='min_tso_segs' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1066' column='1'/> + <var-decl name='min_tso_segs' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1064' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='sndbuf_expand' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1068' column='1'/> + <var-decl name='sndbuf_expand' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1066' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='cong_control' type-id='636d3a20' visibility='default' filepath='include/net/tcp.h' line='1072' column='1'/> + <var-decl name='cong_control' type-id='636d3a20' visibility='default' filepath='include/net/tcp.h' line='1070' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='get_info' type-id='14ca5c08' visibility='default' filepath='include/net/tcp.h' line='1074' column='1'/> + <var-decl name='get_info' type-id='14ca5c08' visibility='default' filepath='include/net/tcp.h' line='1072' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='1077' column='1'/> + <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='1075' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='1078' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='1076' column='1'/> </data-member> </class-decl> <class-decl name='timer_rand_state' is-struct='yes' visibility='default' is-declaration-only='yes' id='f308a7ce'/> @@ -26528,7 +26510,7 @@ <typedef-decl name='phy_interface_t' type-id='08f5ca19' filepath='include/linux/phy.h' line='107' column='1' id='d61bf978'/> <pointer-type-def type-id='59145b91' size-in-bits='64' id='ae18a37d'/> <pointer-type-def type-id='3ad2f92f' size-in-bits='64' id='b3002d4b'/> - <typedef-decl name='sk_buff_data_t' type-id='f0981eeb' filepath='include/linux/skbuff.h' line='609' column='1' id='5c1abc34'/> + <typedef-decl name='sk_buff_data_t' type-id='f0981eeb' filepath='include/linux/skbuff.h' line='608' column='1' id='5c1abc34'/> <pointer-type-def type-id='670d37f5' size-in-bits='64' id='82ff4739'/> <pointer-type-def type-id='90c1df7f' size-in-bits='64' id='ad13fd93'/> <typedef-decl name='u_int8_t' type-id='f9b06939' filepath='include/linux/types.h' line='98' column='1' id='892641a4'/> @@ -26574,12 +26556,12 @@ <var-decl name='' type-id='7eabe5fc' visibility='default' filepath='include/net/sock.h' line='155' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__41' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1' id='b97daab4'> + <union-decl name='__anonymous_union__41' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='865' column='1' id='b97daab4'> <data-member access='public'> - <var-decl name='inner_protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='868' column='1'/> + <var-decl name='inner_protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='866' column='1'/> </data-member> <data-member access='public'> - <var-decl name='inner_ipproto' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='869' column='1'/> + <var-decl name='inner_ipproto' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__2' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='165' column='1' id='d1c6b54d'> @@ -26590,45 +26572,34 @@ <var-decl name='' type-id='a414c3c0' visibility='default' filepath='include/net/sock.h' line='167' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__40' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1' id='9c81e675'> + <union-decl name='__anonymous_union__40' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='860' column='1' id='9c81e675'> <data-member access='public'> - <var-decl name='mark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='863' column='1'/> + <var-decl name='mark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='861' column='1'/> </data-member> <data-member access='public'> - <var-decl name='reserved_tailroom' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='864' column='1'/> + <var-decl name='reserved_tailroom' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__38' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1' id='b4fc55b7'> + <union-decl name='__anonymous_union__38' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='838' column='1' id='b4fc55b7'> <data-member access='public'> - <var-decl name='csum' type-id='fbd88bba' visibility='default' filepath='include/linux/skbuff.h' line='841' column='1'/> + <var-decl name='csum' type-id='fbd88bba' visibility='default' filepath='include/linux/skbuff.h' line='839' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='358587ec' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1'/> + <var-decl name='' type-id='358587ec' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__42' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='607684dc'> + <union-decl name='__anonymous_union__33' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='692' column='1' id='da6f1b1a'> <data-member access='public'> - <var-decl name='' type-id='51db537c' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='' type-id='fe3b99ac' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='156952c4' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='rbnode' type-id='2a8a6332' visibility='default' filepath='include/linux/skbuff.h' line='707' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='708' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__33' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='694' column='1' id='da6f1b1a'> - <data-member access='public'> - <var-decl name='' type-id='fe3b99ac' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1'/> - </data-member> - <data-member access='public'> - <var-decl name='rbnode' type-id='2a8a6332' visibility='default' filepath='include/linux/skbuff.h' line='709' column='1'/> - </data-member> - <data-member access='public'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='710' column='1'/> - </data-member> - </union-decl> - <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/cgroup-defs.h' line='798' column='1' id='de05b94c'> + <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/cgroup-defs.h' line='798' column='1' id='de05b94c'> <data-member access='public'> <var-decl name='' type-id='16b0d6e5' visibility='default' filepath='include/linux/cgroup-defs.h' line='800' column='1'/> </data-member> @@ -26636,12 +26607,12 @@ <var-decl name='val' type-id='91ce1af9' visibility='default' filepath='include/linux/cgroup-defs.h' line='818' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__37' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1' id='271a40b8'> + <union-decl name='__anonymous_union__37' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1' id='271a40b8'> <data-member access='public'> - <var-decl name='' type-id='710cec71' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1'/> + <var-decl name='' type-id='710cec71' visibility='default' filepath='include/linux/skbuff.h' line='729' column='1'/> </data-member> <data-member access='public'> - <var-decl name='tcp_tsorted_anchor' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='735' column='1'/> + <var-decl name='tcp_tsorted_anchor' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='733' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__3' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='180' column='1' id='9e20c58f'> @@ -26652,7 +26623,7 @@ <var-decl name='skc_portaddr_node' type-id='03a4a074' visibility='default' filepath='include/net/sock.h' line='182' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__16' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='211' column='1' id='38f5bda8'> + <union-decl name='__anonymous_union__14' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='211' column='1' id='38f5bda8'> <data-member access='public'> <var-decl name='skc_node' type-id='03a4a074' visibility='default' filepath='include/net/sock.h' line='212' column='1'/> </data-member> @@ -26660,7 +26631,7 @@ <var-decl name='skc_nulls_node' type-id='5bd248e7' visibility='default' filepath='include/net/sock.h' line='213' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__17' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='219' column='1' id='9e121764'> + <union-decl name='__anonymous_union__15' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='219' column='1' id='9e121764'> <data-member access='public'> <var-decl name='skc_incoming_cpu' type-id='95e97e5e' visibility='default' filepath='include/net/sock.h' line='220' column='1'/> </data-member> @@ -26671,12 +26642,12 @@ <var-decl name='skc_tw_rcv_nxt' type-id='19c2251e' visibility='default' filepath='include/net/sock.h' line='222' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__36' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1' id='b24a5a7e'> + <union-decl name='__anonymous_union__36' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='716' column='1' id='b24a5a7e'> <data-member access='public'> - <var-decl name='tstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='719' column='1'/> + <var-decl name='tstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='717' column='1'/> </data-member> <data-member access='public'> - <var-decl name='skb_mstamp_ns' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='720' column='1'/> + <var-decl name='skb_mstamp_ns' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip6_fib.h' line='151' column='1' id='faf198da'> @@ -26687,15 +26658,15 @@ <var-decl name='nh_list' type-id='72f469ec' visibility='default' filepath='include/net/ip6_fib.h' line='153' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1' id='a6d66544'> + <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='711' column='1' id='a6d66544'> <data-member access='public'> - <var-decl name='sk' type-id='f772df6d' visibility='default' filepath='include/linux/skbuff.h' line='714' column='1'/> + <var-decl name='sk' type-id='f772df6d' visibility='default' filepath='include/linux/skbuff.h' line='712' column='1'/> </data-member> <data-member access='public'> - <var-decl name='ip_defrag_offset' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='715' column='1'/> + <var-decl name='ip_defrag_offset' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__18' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='228' column='1' id='5547e6b1'> + <union-decl name='__anonymous_union__16' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='228' column='1' id='5547e6b1'> <data-member access='public'> <var-decl name='skc_rxhash' type-id='19c2251e' visibility='default' filepath='include/net/sock.h' line='229' column='1'/> </data-member> @@ -26706,12 +26677,12 @@ <var-decl name='skc_tw_snd_nxt' type-id='19c2251e' visibility='default' filepath='include/net/sock.h' line='231' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__39' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1' id='8c3ee840'> + <union-decl name='__anonymous_union__39' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1' id='8c3ee840'> <data-member access='public'> - <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='854' column='1'/> + <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='852' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sender_cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='855' column='1'/> + <var-decl name='sender_cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__1' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='160' column='1' id='5d6a1e78'> @@ -26722,7 +26693,7 @@ <var-decl name='skc_u16hashes' type-id='810b4a17' visibility='default' filepath='include/net/sock.h' line='162' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='199' column='1' id='56935795'> + <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='199' column='1' id='56935795'> <data-member access='public'> <var-decl name='skc_flags' type-id='7359adad' visibility='default' filepath='include/net/sock.h' line='200' column='1'/> </data-member> @@ -26733,7 +26704,7 @@ <var-decl name='skc_tw_dr' type-id='b7ab21fc' visibility='default' filepath='include/net/sock.h' line='202' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__32' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ip.h' line='127' column='1' id='4fa91678'> + <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ip.h' line='127' column='1' id='4fa91678'> <data-member access='public'> <var-decl name='destructor' type-id='841969d0' visibility='default' filepath='include/net/ip.h' line='128' column='1'/> </data-member> @@ -27379,81 +27350,81 @@ <var-decl name='completion' type-id='f9fef04f' visibility='default' filepath='include/net/inet_frag.h' line='109' column='1'/> </data-member> </class-decl> - <class-decl name='inode_operations' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1937' column='1' id='5f5aa1ff'> + <class-decl name='inode_operations' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1932' column='1' id='5f5aa1ff'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lookup' type-id='02f90a61' visibility='default' filepath='include/linux/fs.h' line='1938' column='1'/> + <var-decl name='lookup' type-id='02f90a61' visibility='default' filepath='include/linux/fs.h' line='1933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='get_link' type-id='76ae8e1d' visibility='default' filepath='include/linux/fs.h' line='1939' column='1'/> + <var-decl name='get_link' type-id='76ae8e1d' visibility='default' filepath='include/linux/fs.h' line='1934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='permission' type-id='f4f91b99' visibility='default' filepath='include/linux/fs.h' line='1940' column='1'/> + <var-decl name='permission' type-id='f4f91b99' visibility='default' filepath='include/linux/fs.h' line='1935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='get_acl' type-id='7f30b822' visibility='default' filepath='include/linux/fs.h' line='1941' column='1'/> + <var-decl name='get_acl' type-id='7f30b822' visibility='default' filepath='include/linux/fs.h' line='1936' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='readlink' type-id='a57bd028' visibility='default' filepath='include/linux/fs.h' line='1943' column='1'/> + <var-decl name='readlink' type-id='a57bd028' visibility='default' filepath='include/linux/fs.h' line='1938' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='create' type-id='c9cd0e09' visibility='default' filepath='include/linux/fs.h' line='1945' column='1'/> + <var-decl name='create' type-id='c9cd0e09' visibility='default' filepath='include/linux/fs.h' line='1940' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='link' type-id='4b872e00' visibility='default' filepath='include/linux/fs.h' line='1946' column='1'/> + <var-decl name='link' type-id='4b872e00' visibility='default' filepath='include/linux/fs.h' line='1941' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='unlink' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1947' column='1'/> + <var-decl name='unlink' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1942' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='symlink' type-id='234843b5' visibility='default' filepath='include/linux/fs.h' line='1948' column='1'/> + <var-decl name='symlink' type-id='234843b5' visibility='default' filepath='include/linux/fs.h' line='1943' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='mkdir' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1949' column='1'/> + <var-decl name='mkdir' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='rmdir' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1950' column='1'/> + <var-decl name='rmdir' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1945' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='mknod' type-id='f9e0c0e5' visibility='default' filepath='include/linux/fs.h' line='1951' column='1'/> + <var-decl name='mknod' type-id='f9e0c0e5' visibility='default' filepath='include/linux/fs.h' line='1946' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='rename' type-id='7733ef81' visibility='default' filepath='include/linux/fs.h' line='1952' column='1'/> + <var-decl name='rename' type-id='7733ef81' visibility='default' filepath='include/linux/fs.h' line='1947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='setattr' type-id='c237e829' visibility='default' filepath='include/linux/fs.h' line='1954' column='1'/> + <var-decl name='setattr' type-id='c237e829' visibility='default' filepath='include/linux/fs.h' line='1949' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='getattr' type-id='0b787edf' visibility='default' filepath='include/linux/fs.h' line='1955' column='1'/> + <var-decl name='getattr' type-id='0b787edf' visibility='default' filepath='include/linux/fs.h' line='1950' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='listxattr' type-id='3494e4bb' visibility='default' filepath='include/linux/fs.h' line='1956' column='1'/> + <var-decl name='listxattr' type-id='3494e4bb' visibility='default' filepath='include/linux/fs.h' line='1951' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='fiemap' type-id='0508acce' visibility='default' filepath='include/linux/fs.h' line='1957' column='1'/> + <var-decl name='fiemap' type-id='0508acce' visibility='default' filepath='include/linux/fs.h' line='1952' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='update_time' type-id='64ecf6a5' visibility='default' filepath='include/linux/fs.h' line='1959' column='1'/> + <var-decl name='update_time' type-id='64ecf6a5' visibility='default' filepath='include/linux/fs.h' line='1954' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='atomic_open' type-id='d3807eb0' visibility='default' filepath='include/linux/fs.h' line='1960' column='1'/> + <var-decl name='atomic_open' type-id='d3807eb0' visibility='default' filepath='include/linux/fs.h' line='1955' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='tmpfile' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1963' column='1'/> + <var-decl name='tmpfile' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1958' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='set_acl' type-id='820976ef' visibility='default' filepath='include/linux/fs.h' line='1964' column='1'/> + <var-decl name='set_acl' type-id='820976ef' visibility='default' filepath='include/linux/fs.h' line='1959' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1966' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1961' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1967' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1962' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1968' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1963' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1969' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1964' column='1'/> </data-member> </class-decl> <class-decl name='ip_mc_list' is-struct='yes' visibility='default' is-declaration-only='yes' id='c2a59aaa'/> @@ -28064,26 +28035,26 @@ <var-decl name='obj_cmpfn' type-id='a8e15d8c' visibility='default' filepath='include/linux/rhashtable-types.h' line='66' column='1'/> </data-member> </class-decl> - <class-decl name='rps_dev_flow_table' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='702' column='1' id='aca51d4a'> + <class-decl name='rps_dev_flow_table' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='700' column='1' id='aca51d4a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='703' column='1'/> + <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='701' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='704' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='702' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='flows' type-id='11d66d65' visibility='default' filepath='include/linux/netdevice.h' line='705' column='1'/> + <var-decl name='flows' type-id='11d66d65' visibility='default' filepath='include/linux/netdevice.h' line='703' column='1'/> </data-member> </class-decl> - <class-decl name='rps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='680' column='1' id='6f8d5f55'> + <class-decl name='rps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='678' column='1' id='6f8d5f55'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='681' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='682' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='cpus' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='683' column='1'/> + <var-decl name='cpus' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='681' column='1'/> </data-member> </class-decl> <class-decl name='sched_domain_shared' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/linux/sched/topology.h' line='66' column='1' id='ccc53977'> @@ -28117,18 +28088,18 @@ <var-decl name='cpumask' type-id='c99b5ecd' visibility='default' filepath='kernel/sched/sched.h' line='1447' column='1'/> </data-member> </class-decl> - <class-decl name='skb_ext' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='4181' column='1' id='a8c69bdf'> + <class-decl name='skb_ext' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='4137' column='1' id='a8c69bdf'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='refcnt' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='4182' column='1'/> + <var-decl name='refcnt' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='4138' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='offset' type-id='cf114704' visibility='default' filepath='include/linux/skbuff.h' line='4183' column='1'/> + <var-decl name='offset' type-id='cf114704' visibility='default' filepath='include/linux/skbuff.h' line='4139' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='48'> - <var-decl name='chunks' type-id='f9b06939' visibility='default' filepath='include/linux/skbuff.h' line='4184' column='1'/> + <var-decl name='chunks' type-id='f9b06939' visibility='default' filepath='include/linux/skbuff.h' line='4140' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='data' type-id='e84913bd' visibility='default' filepath='include/linux/skbuff.h' line='4185' column='1'/> + <var-decl name='data' type-id='e84913bd' visibility='default' filepath='include/linux/skbuff.h' line='4141' column='1'/> </data-member> </class-decl> <class-decl name='socket_wq' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/linux/net.h' line='96' column='1' id='8bd06fd9'> @@ -28145,96 +28116,96 @@ <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/net.h' line='101' column='1'/> </data-member> </class-decl> - <class-decl name='super_operations' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2021' column='1' id='874691ab'> + <class-decl name='super_operations' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2016' column='1' id='874691ab'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='alloc_inode' type-id='e8c4dba4' visibility='default' filepath='include/linux/fs.h' line='2022' column='1'/> + <var-decl name='alloc_inode' type-id='e8c4dba4' visibility='default' filepath='include/linux/fs.h' line='2017' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='destroy_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2023' column='1'/> + <var-decl name='destroy_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2018' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2024' column='1'/> + <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2019' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='dirty_inode' type-id='5f5506f6' visibility='default' filepath='include/linux/fs.h' line='2026' column='1'/> + <var-decl name='dirty_inode' type-id='5f5506f6' visibility='default' filepath='include/linux/fs.h' line='2021' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='write_inode' type-id='fd780be6' visibility='default' filepath='include/linux/fs.h' line='2027' column='1'/> + <var-decl name='write_inode' type-id='fd780be6' visibility='default' filepath='include/linux/fs.h' line='2022' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='drop_inode' type-id='28ba4492' visibility='default' filepath='include/linux/fs.h' line='2028' column='1'/> + <var-decl name='drop_inode' type-id='28ba4492' visibility='default' filepath='include/linux/fs.h' line='2023' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='evict_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2029' column='1'/> + <var-decl name='evict_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2024' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='put_super' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2030' column='1'/> + <var-decl name='put_super' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2025' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='sync_fs' type-id='dcab5203' visibility='default' filepath='include/linux/fs.h' line='2031' column='1'/> + <var-decl name='sync_fs' type-id='dcab5203' visibility='default' filepath='include/linux/fs.h' line='2026' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='freeze_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2032' column='1'/> + <var-decl name='freeze_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2027' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='freeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2033' column='1'/> + <var-decl name='freeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2028' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='thaw_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2034' column='1'/> + <var-decl name='thaw_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2029' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='unfreeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2035' column='1'/> + <var-decl name='unfreeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2030' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='statfs' type-id='35646c79' visibility='default' filepath='include/linux/fs.h' line='2036' column='1'/> + <var-decl name='statfs' type-id='35646c79' visibility='default' filepath='include/linux/fs.h' line='2031' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='remount_fs' type-id='552c8f87' visibility='default' filepath='include/linux/fs.h' line='2037' column='1'/> + <var-decl name='remount_fs' type-id='552c8f87' visibility='default' filepath='include/linux/fs.h' line='2032' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='umount_begin' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2038' column='1'/> + <var-decl name='umount_begin' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2033' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='show_options' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2040' column='1'/> + <var-decl name='show_options' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2035' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='show_devname' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2041' column='1'/> + <var-decl name='show_devname' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2036' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='show_path' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2042' column='1'/> + <var-decl name='show_path' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2037' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='show_stats' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2043' column='1'/> + <var-decl name='show_stats' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2038' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='quota_read' type-id='e295c77c' visibility='default' filepath='include/linux/fs.h' line='2045' column='1'/> + <var-decl name='quota_read' type-id='e295c77c' visibility='default' filepath='include/linux/fs.h' line='2040' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='quota_write' type-id='a9b95107' visibility='default' filepath='include/linux/fs.h' line='2046' column='1'/> + <var-decl name='quota_write' type-id='a9b95107' visibility='default' filepath='include/linux/fs.h' line='2041' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='get_dquots' type-id='ae02292a' visibility='default' filepath='include/linux/fs.h' line='2047' column='1'/> + <var-decl name='get_dquots' type-id='ae02292a' visibility='default' filepath='include/linux/fs.h' line='2042' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='bdev_try_to_free_page' type-id='ea44f8d2' visibility='default' filepath='include/linux/fs.h' line='2049' column='1'/> + <var-decl name='bdev_try_to_free_page' type-id='ea44f8d2' visibility='default' filepath='include/linux/fs.h' line='2044' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='nr_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2050' column='1'/> + <var-decl name='nr_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='free_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2052' column='1'/> + <var-decl name='free_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2055' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2056' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2051' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2057' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2058' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2053' column='1'/> </data-member> </class-decl> <class-decl name='tcf_proto' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/net/sch_generic.h' line='387' column='1' id='17992e3b'> @@ -28822,26 +28793,12 @@ <var-decl name='skc_rcv_saddr' type-id='78a133c2' visibility='default' filepath='include/net/sock.h' line='157' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__34' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1' id='358587ec'> + <class-decl name='__anonymous_struct__34' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1' id='358587ec'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='csum_start' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='843' column='1'/> + <var-decl name='csum_start' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='841' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='csum_offset' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='844' column='1'/> - </data-member> - </class-decl> - <class-decl name='__anonymous_struct__35' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='51db537c'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='scm_io_uring' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='8'> - <var-decl name='android_kabi_reserved1_padding1' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='android_kabi_reserved1_padding2' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='android_kabi_reserved1_padding3' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='csum_offset' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1'/> </data-member> </class-decl> <class-decl name='__anonymous_struct__2' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='dd91f264' visibility='default' filepath='include/asm-generic/local.h' line='22' column='1' id='de878dd6'> @@ -28849,15 +28806,15 @@ <var-decl name='a' type-id='f22a8abb' visibility='default' filepath='include/asm-generic/local.h' line='24' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__32' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1' id='fe3b99ac'> + <class-decl name='__anonymous_struct__32' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1' id='fe3b99ac'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='697' column='1'/> + <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1'/> + <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='696' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='' type-id='1285aa79' visibility='default' filepath='include/linux/skbuff.h' line='700' column='1'/> + <var-decl name='' type-id='1285aa79' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1'/> </data-member> </class-decl> <class-decl name='__anonymous_struct__1' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/cpu_rmap.h' line='28' column='1' id='bb08c7e1'> @@ -28888,12 +28845,12 @@ <var-decl name='classid' type-id='19c2251e' visibility='default' filepath='include/linux/cgroup-defs.h' line='806' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__33' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1' id='710cec71'> + <class-decl name='__anonymous_struct__33' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='729' column='1' id='710cec71'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='_skb_refdst' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='732' column='1'/> + <var-decl name='_skb_refdst' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='destructor' type-id='0ef96694' visibility='default' filepath='include/linux/skbuff.h' line='733' column='1'/> + <var-decl name='destructor' type-id='0ef96694' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='47692c1a' const='yes' id='2212bd2d'/> @@ -29199,7 +29156,7 @@ <var-decl name='destroy_next' type-id='994d9d61' visibility='default' filepath='include/linux/fsnotify_backend.h' line='302' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__14' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1198' column='1' id='adf5bf47'> + <union-decl name='__anonymous_union__12' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1198' column='1' id='adf5bf47'> <data-member access='public'> <var-decl name='hashinfo' type-id='d7a1e3c2' visibility='default' filepath='include/net/sock.h' line='1199' column='1'/> </data-member> @@ -30444,18 +30401,18 @@ <var-decl name='data' type-id='eaa32e2f' visibility='default' filepath='include/net/xfrm.h' line='259' column='1'/> </data-member> </class-decl> - <class-decl name='xps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='787' column='1' id='279bdcdf'> + <class-decl name='xps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='785' column='1' id='279bdcdf'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='788' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='786' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='alloc_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='789' column='1'/> + <var-decl name='alloc_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='787' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='790' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='788' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='queues' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='791' column='1'/> + <var-decl name='queues' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='789' column='1'/> </data-member> </class-decl> <class-decl name='zone' size-in-bits='13312' is-struct='yes' visibility='default' filepath='include/linux/mmzone.h' line='421' column='1' id='be9189df'> @@ -30814,12 +30771,12 @@ <var-decl name='' type-id='7179013d' visibility='default' filepath='include/uapi/linux/perf_event.h' line='520' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='700' column='1' id='1285aa79'> + <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1' id='1285aa79'> <data-member access='public'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/skbuff.h' line='701' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/skbuff.h' line='699' column='1'/> </data-member> <data-member access='public'> - <var-decl name='dev_scratch' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='706' column='1'/> + <var-decl name='dev_scratch' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='704' column='1'/> </data-member> </union-decl> <union-decl name='__anonymous_union__1' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/nexthop.h' line='96' column='1' id='21fca59c'> @@ -31346,15 +31303,15 @@ <var-decl name='ht' type-id='a7c26c7b' visibility='default' filepath='include/net/raw.h' line='37' column='1'/> </data-member> </class-decl> - <class-decl name='rps_dev_flow' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='692' column='1' id='b65a052d'> + <class-decl name='rps_dev_flow' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='690' column='1' id='b65a052d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cpu' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='693' column='1'/> + <var-decl name='cpu' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='691' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='filter' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='694' column='1'/> + <var-decl name='filter' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='last_qtail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='695' column='1'/> + <var-decl name='last_qtail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='693' column='1'/> </data-member> </class-decl> <class-decl name='rt6_exception_bucket' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/net/ip6_fib.h' line='114' column='1' id='db281924'> @@ -31838,7 +31795,7 @@ <array-type-def dimensions='1' type-id='f9b06939' size-in-bits='infinite' id='29c3368c'> <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/> </array-type-def> - <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip_fib.h' line='89' column='1' id='37def4b7'> + <union-decl name='__anonymous_union__22' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip_fib.h' line='89' column='1' id='37def4b7'> <data-member access='public'> <var-decl name='ipv4' type-id='78a133c2' visibility='default' filepath='include/net/ip_fib.h' line='90' column='1'/> </data-member> @@ -31846,7 +31803,7 @@ <var-decl name='ipv6' type-id='f6ed712a' visibility='default' filepath='include/net/ip_fib.h' line='91' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/inet_hashtables.h' line='115' column='1' id='ba169a6c'> + <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/inet_hashtables.h' line='115' column='1' id='ba169a6c'> <data-member access='public'> <var-decl name='head' type-id='e151255a' visibility='default' filepath='include/net/inet_hashtables.h' line='116' column='1'/> </data-member> @@ -31870,7 +31827,7 @@ <var-decl name='e_gid' type-id='094d8048' visibility='default' filepath='include/linux/posix_acl.h' line='23' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/netlink.h' line='295' column='1' id='4a3999ba'> + <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/netlink.h' line='295' column='1' id='4a3999ba'> <data-member access='public'> <var-decl name='validation_data' type-id='eaa32e2f' visibility='default' filepath='include/net/netlink.h' line='296' column='1'/> </data-member> @@ -32516,7 +32473,7 @@ <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/> </array-type-def> <pointer-type-def type-id='fa07ab8f' size-in-bits='64' id='9cc41107'/> - <union-decl name='__anonymous_union__21' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/xfrm.h' line='15' column='1' id='eba8a6fd'> + <union-decl name='__anonymous_union__19' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/xfrm.h' line='15' column='1' id='eba8a6fd'> <data-member access='public'> <var-decl name='a4' type-id='78a133c2' visibility='default' filepath='include/uapi/linux/xfrm.h' line='16' column='1'/> </data-member> @@ -33090,7 +33047,7 @@ <array-type-def dimensions='1' type-id='f9b06939' size-in-bits='80' id='097504df'> <subrange length='10' type-id='7ff19f0f' id='487da03a'/> </array-type-def> - <union-decl name='__anonymous_union__25' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/route.h' line='62' column='1' id='77077303'> + <union-decl name='__anonymous_union__23' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/route.h' line='62' column='1' id='77077303'> <data-member access='public'> <var-decl name='rt_gw4' type-id='78a133c2' visibility='default' filepath='include/net/route.h' line='63' column='1'/> </data-member> @@ -37834,20 +37791,20 @@ <var-decl name='jited_len' type-id='19c2251e' visibility='default' filepath='include/linux/bpf.h' line='359' column='1'/> </data-member> </class-decl> - <class-decl name='dev_ifalias' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='948' column='1' id='ddd212e6'> + <class-decl name='dev_ifalias' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='946' column='1' id='ddd212e6'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='949' column='1'/> + <var-decl name='rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ifalias' type-id='e84913bd' visibility='default' filepath='include/linux/netdevice.h' line='950' column='1'/> + <var-decl name='ifalias' type-id='e84913bd' visibility='default' filepath='include/linux/netdevice.h' line='948' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__12' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1853' column='1' id='19245258'> + <class-decl name='__anonymous_struct__12' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='1851' column='1' id='19245258'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='upper' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1854' column='1'/> + <var-decl name='upper' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1852' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1855' column='1'/> + <var-decl name='lower' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1853' column='1'/> </data-member> </class-decl> <typedef-decl name='netdev_features_t' type-id='91ce1af9' filepath='include/linux/netdev_features.h' line='12' column='1' id='f9f4b16f'/> @@ -37922,228 +37879,228 @@ <var-decl name='tx_compressed' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='187' column='1'/> </data-member> </class-decl> - <class-decl name='net_device_ops' size-in-bits='4736' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1275' column='1' id='ba44c7d8'> + <class-decl name='net_device_ops' size-in-bits='4736' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1273' column='1' id='ba44c7d8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ndo_init' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1276' column='1'/> + <var-decl name='ndo_init' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1274' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ndo_uninit' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1277' column='1'/> + <var-decl name='ndo_uninit' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1275' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ndo_open' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1278' column='1'/> + <var-decl name='ndo_open' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1276' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='ndo_stop' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1279' column='1'/> + <var-decl name='ndo_stop' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1277' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='ndo_start_xmit' type-id='bd3f3f93' visibility='default' filepath='include/linux/netdevice.h' line='1280' column='1'/> + <var-decl name='ndo_start_xmit' type-id='bd3f3f93' visibility='default' filepath='include/linux/netdevice.h' line='1278' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ndo_features_check' type-id='7a0ed254' visibility='default' filepath='include/linux/netdevice.h' line='1282' column='1'/> + <var-decl name='ndo_features_check' type-id='7a0ed254' visibility='default' filepath='include/linux/netdevice.h' line='1280' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='ndo_select_queue' type-id='de36db77' visibility='default' filepath='include/linux/netdevice.h' line='1285' column='1'/> + <var-decl name='ndo_select_queue' type-id='de36db77' visibility='default' filepath='include/linux/netdevice.h' line='1283' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='ndo_change_rx_flags' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1288' column='1'/> + <var-decl name='ndo_change_rx_flags' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1286' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='ndo_set_rx_mode' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1290' column='1'/> + <var-decl name='ndo_set_rx_mode' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1288' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='ndo_set_mac_address' type-id='f4dd5cc5' visibility='default' filepath='include/linux/netdevice.h' line='1291' column='1'/> + <var-decl name='ndo_set_mac_address' type-id='f4dd5cc5' visibility='default' filepath='include/linux/netdevice.h' line='1289' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='ndo_validate_addr' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1293' column='1'/> + <var-decl name='ndo_validate_addr' type-id='2555df59' visibility='default' filepath='include/linux/netdevice.h' line='1291' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='ndo_do_ioctl' type-id='cc325be7' visibility='default' filepath='include/linux/netdevice.h' line='1294' column='1'/> + <var-decl name='ndo_do_ioctl' type-id='cc325be7' visibility='default' filepath='include/linux/netdevice.h' line='1292' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='ndo_set_config' type-id='bd2d1eba' visibility='default' filepath='include/linux/netdevice.h' line='1296' column='1'/> + <var-decl name='ndo_set_config' type-id='bd2d1eba' visibility='default' filepath='include/linux/netdevice.h' line='1294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='ndo_change_mtu' type-id='d6762aa0' visibility='default' filepath='include/linux/netdevice.h' line='1298' column='1'/> + <var-decl name='ndo_change_mtu' type-id='d6762aa0' visibility='default' filepath='include/linux/netdevice.h' line='1296' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='ndo_neigh_setup' type-id='5c9f2a92' visibility='default' filepath='include/linux/netdevice.h' line='1300' column='1'/> + <var-decl name='ndo_neigh_setup' type-id='5c9f2a92' visibility='default' filepath='include/linux/netdevice.h' line='1298' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='ndo_tx_timeout' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1302' column='1'/> + <var-decl name='ndo_tx_timeout' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='1300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='ndo_get_stats64' type-id='cb4c6db1' visibility='default' filepath='include/linux/netdevice.h' line='1304' column='1'/> + <var-decl name='ndo_get_stats64' type-id='cb4c6db1' visibility='default' filepath='include/linux/netdevice.h' line='1302' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='ndo_has_offload_stats' type-id='e95fd96b' visibility='default' filepath='include/linux/netdevice.h' line='1306' column='1'/> + <var-decl name='ndo_has_offload_stats' type-id='e95fd96b' visibility='default' filepath='include/linux/netdevice.h' line='1304' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='ndo_get_offload_stats' type-id='f98694f9' visibility='default' filepath='include/linux/netdevice.h' line='1307' column='1'/> + <var-decl name='ndo_get_offload_stats' type-id='f98694f9' visibility='default' filepath='include/linux/netdevice.h' line='1305' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='ndo_get_stats' type-id='3217f9ba' visibility='default' filepath='include/linux/netdevice.h' line='1310' column='1'/> + <var-decl name='ndo_get_stats' type-id='3217f9ba' visibility='default' filepath='include/linux/netdevice.h' line='1308' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='ndo_vlan_rx_add_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1312' column='1'/> + <var-decl name='ndo_vlan_rx_add_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1310' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='ndo_vlan_rx_kill_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1314' column='1'/> + <var-decl name='ndo_vlan_rx_kill_vid' type-id='4fcb4c39' visibility='default' filepath='include/linux/netdevice.h' line='1312' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='ndo_set_vf_mac' type-id='bae60bcf' visibility='default' filepath='include/linux/netdevice.h' line='1322' column='1'/> + <var-decl name='ndo_set_vf_mac' type-id='bae60bcf' visibility='default' filepath='include/linux/netdevice.h' line='1320' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='ndo_set_vf_vlan' type-id='699131d0' visibility='default' filepath='include/linux/netdevice.h' line='1324' column='1'/> + <var-decl name='ndo_set_vf_vlan' type-id='699131d0' visibility='default' filepath='include/linux/netdevice.h' line='1322' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='ndo_set_vf_rate' type-id='7cd466e6' visibility='default' filepath='include/linux/netdevice.h' line='1327' column='1'/> + <var-decl name='ndo_set_vf_rate' type-id='7cd466e6' visibility='default' filepath='include/linux/netdevice.h' line='1325' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='ndo_set_vf_spoofchk' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1330' column='1'/> + <var-decl name='ndo_set_vf_spoofchk' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1328' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='ndo_set_vf_trust' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1332' column='1'/> + <var-decl name='ndo_set_vf_trust' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1330' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='ndo_get_vf_config' type-id='d22f8cbe' visibility='default' filepath='include/linux/netdevice.h' line='1334' column='1'/> + <var-decl name='ndo_get_vf_config' type-id='d22f8cbe' visibility='default' filepath='include/linux/netdevice.h' line='1332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='ndo_set_vf_link_state' type-id='b54cfa0f' visibility='default' filepath='include/linux/netdevice.h' line='1337' column='1'/> + <var-decl name='ndo_set_vf_link_state' type-id='b54cfa0f' visibility='default' filepath='include/linux/netdevice.h' line='1335' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='ndo_get_vf_stats' type-id='eee971fd' visibility='default' filepath='include/linux/netdevice.h' line='1339' column='1'/> + <var-decl name='ndo_get_vf_stats' type-id='eee971fd' visibility='default' filepath='include/linux/netdevice.h' line='1337' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='ndo_set_vf_port' type-id='af60ef81' visibility='default' filepath='include/linux/netdevice.h' line='1343' column='1'/> + <var-decl name='ndo_set_vf_port' type-id='af60ef81' visibility='default' filepath='include/linux/netdevice.h' line='1341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='ndo_get_vf_port' type-id='be55abd8' visibility='default' filepath='include/linux/netdevice.h' line='1346' column='1'/> + <var-decl name='ndo_get_vf_port' type-id='be55abd8' visibility='default' filepath='include/linux/netdevice.h' line='1344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='ndo_set_vf_guid' type-id='0617ad2b' visibility='default' filepath='include/linux/netdevice.h' line='1348' column='1'/> + <var-decl name='ndo_set_vf_guid' type-id='0617ad2b' visibility='default' filepath='include/linux/netdevice.h' line='1346' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='ndo_set_vf_rss_query_en' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1351' column='1'/> + <var-decl name='ndo_set_vf_rss_query_en' type-id='0c16aca1' visibility='default' filepath='include/linux/netdevice.h' line='1349' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='ndo_setup_tc' type-id='06b83346' visibility='default' filepath='include/linux/netdevice.h' line='1354' column='1'/> + <var-decl name='ndo_setup_tc' type-id='06b83346' visibility='default' filepath='include/linux/netdevice.h' line='1352' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='ndo_rx_flow_steer' type-id='47498e6c' visibility='default' filepath='include/linux/netdevice.h' line='1382' column='1'/> + <var-decl name='ndo_rx_flow_steer' type-id='47498e6c' visibility='default' filepath='include/linux/netdevice.h' line='1380' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='ndo_add_slave' type-id='031fe454' visibility='default' filepath='include/linux/netdevice.h' line='1387' column='1'/> + <var-decl name='ndo_add_slave' type-id='031fe454' visibility='default' filepath='include/linux/netdevice.h' line='1385' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='ndo_del_slave' type-id='ed3019e9' visibility='default' filepath='include/linux/netdevice.h' line='1390' column='1'/> + <var-decl name='ndo_del_slave' type-id='ed3019e9' visibility='default' filepath='include/linux/netdevice.h' line='1388' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='ndo_fix_features' type-id='4a028f44' visibility='default' filepath='include/linux/netdevice.h' line='1392' column='1'/> + <var-decl name='ndo_fix_features' type-id='4a028f44' visibility='default' filepath='include/linux/netdevice.h' line='1390' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2496'> - <var-decl name='ndo_set_features' type-id='10dae4c5' visibility='default' filepath='include/linux/netdevice.h' line='1394' column='1'/> + <var-decl name='ndo_set_features' type-id='10dae4c5' visibility='default' filepath='include/linux/netdevice.h' line='1392' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2560'> - <var-decl name='ndo_neigh_construct' type-id='92446276' visibility='default' filepath='include/linux/netdevice.h' line='1396' column='1'/> + <var-decl name='ndo_neigh_construct' type-id='92446276' visibility='default' filepath='include/linux/netdevice.h' line='1394' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2624'> - <var-decl name='ndo_neigh_destroy' type-id='11e89fb9' visibility='default' filepath='include/linux/netdevice.h' line='1398' column='1'/> + <var-decl name='ndo_neigh_destroy' type-id='11e89fb9' visibility='default' filepath='include/linux/netdevice.h' line='1396' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2688'> - <var-decl name='ndo_fdb_add' type-id='5ffcd66c' visibility='default' filepath='include/linux/netdevice.h' line='1401' column='1'/> + <var-decl name='ndo_fdb_add' type-id='5ffcd66c' visibility='default' filepath='include/linux/netdevice.h' line='1399' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2752'> - <var-decl name='ndo_fdb_del' type-id='e6032f80' visibility='default' filepath='include/linux/netdevice.h' line='1408' column='1'/> + <var-decl name='ndo_fdb_del' type-id='e6032f80' visibility='default' filepath='include/linux/netdevice.h' line='1406' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='ndo_fdb_dump' type-id='147cd5a7' visibility='default' filepath='include/linux/netdevice.h' line='1413' column='1'/> + <var-decl name='ndo_fdb_dump' type-id='147cd5a7' visibility='default' filepath='include/linux/netdevice.h' line='1411' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2880'> - <var-decl name='ndo_fdb_get' type-id='6537d478' visibility='default' filepath='include/linux/netdevice.h' line='1418' column='1'/> + <var-decl name='ndo_fdb_get' type-id='6537d478' visibility='default' filepath='include/linux/netdevice.h' line='1416' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='ndo_bridge_setlink' type-id='50756496' visibility='default' filepath='include/linux/netdevice.h' line='1424' column='1'/> + <var-decl name='ndo_bridge_setlink' type-id='50756496' visibility='default' filepath='include/linux/netdevice.h' line='1422' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3008'> - <var-decl name='ndo_bridge_getlink' type-id='e78e01a9' visibility='default' filepath='include/linux/netdevice.h' line='1428' column='1'/> + <var-decl name='ndo_bridge_getlink' type-id='e78e01a9' visibility='default' filepath='include/linux/netdevice.h' line='1426' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='ndo_bridge_dellink' type-id='1223555b' visibility='default' filepath='include/linux/netdevice.h' line='1433' column='1'/> + <var-decl name='ndo_bridge_dellink' type-id='1223555b' visibility='default' filepath='include/linux/netdevice.h' line='1431' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='ndo_change_carrier' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1436' column='1'/> + <var-decl name='ndo_change_carrier' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1434' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='ndo_get_phys_port_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1438' column='1'/> + <var-decl name='ndo_get_phys_port_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1436' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='ndo_get_port_parent_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1440' column='1'/> + <var-decl name='ndo_get_port_parent_id' type-id='98252144' visibility='default' filepath='include/linux/netdevice.h' line='1438' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3328'> - <var-decl name='ndo_get_phys_port_name' type-id='5139dd84' visibility='default' filepath='include/linux/netdevice.h' line='1442' column='1'/> + <var-decl name='ndo_get_phys_port_name' type-id='5139dd84' visibility='default' filepath='include/linux/netdevice.h' line='1440' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3392'> - <var-decl name='ndo_udp_tunnel_add' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1444' column='1'/> + <var-decl name='ndo_udp_tunnel_add' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1442' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3456'> - <var-decl name='ndo_udp_tunnel_del' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1446' column='1'/> + <var-decl name='ndo_udp_tunnel_del' type-id='a43821b9' visibility='default' filepath='include/linux/netdevice.h' line='1444' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3520'> - <var-decl name='ndo_dfwd_add_station' type-id='e2d7f258' visibility='default' filepath='include/linux/netdevice.h' line='1448' column='1'/> + <var-decl name='ndo_dfwd_add_station' type-id='e2d7f258' visibility='default' filepath='include/linux/netdevice.h' line='1446' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3584'> - <var-decl name='ndo_dfwd_del_station' type-id='5ac7baf4' visibility='default' filepath='include/linux/netdevice.h' line='1450' column='1'/> + <var-decl name='ndo_dfwd_del_station' type-id='5ac7baf4' visibility='default' filepath='include/linux/netdevice.h' line='1448' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3648'> - <var-decl name='ndo_set_tx_maxrate' type-id='c1e0b02f' visibility='default' filepath='include/linux/netdevice.h' line='1453' column='1'/> + <var-decl name='ndo_set_tx_maxrate' type-id='c1e0b02f' visibility='default' filepath='include/linux/netdevice.h' line='1451' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3712'> - <var-decl name='ndo_get_iflink' type-id='4753b592' visibility='default' filepath='include/linux/netdevice.h' line='1456' column='1'/> + <var-decl name='ndo_get_iflink' type-id='4753b592' visibility='default' filepath='include/linux/netdevice.h' line='1454' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3776'> - <var-decl name='ndo_change_proto_down' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1457' column='1'/> + <var-decl name='ndo_change_proto_down' type-id='e36088ec' visibility='default' filepath='include/linux/netdevice.h' line='1455' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3840'> - <var-decl name='ndo_fill_metadata_dst' type-id='2cc5a575' visibility='default' filepath='include/linux/netdevice.h' line='1459' column='1'/> + <var-decl name='ndo_fill_metadata_dst' type-id='2cc5a575' visibility='default' filepath='include/linux/netdevice.h' line='1457' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3904'> - <var-decl name='ndo_set_rx_headroom' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1461' column='1'/> + <var-decl name='ndo_set_rx_headroom' type-id='c7c94ce1' visibility='default' filepath='include/linux/netdevice.h' line='1459' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3968'> - <var-decl name='ndo_bpf' type-id='49f84764' visibility='default' filepath='include/linux/netdevice.h' line='1463' column='1'/> + <var-decl name='ndo_bpf' type-id='49f84764' visibility='default' filepath='include/linux/netdevice.h' line='1461' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4032'> - <var-decl name='ndo_xdp_xmit' type-id='0c7d25ff' visibility='default' filepath='include/linux/netdevice.h' line='1465' column='1'/> + <var-decl name='ndo_xdp_xmit' type-id='0c7d25ff' visibility='default' filepath='include/linux/netdevice.h' line='1463' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4096'> - <var-decl name='ndo_xsk_wakeup' type-id='149f0e1f' visibility='default' filepath='include/linux/netdevice.h' line='1468' column='1'/> + <var-decl name='ndo_xsk_wakeup' type-id='149f0e1f' visibility='default' filepath='include/linux/netdevice.h' line='1466' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4160'> - <var-decl name='ndo_get_devlink_port' type-id='cd97030f' visibility='default' filepath='include/linux/netdevice.h' line='1470' column='1'/> + <var-decl name='ndo_get_devlink_port' type-id='cd97030f' visibility='default' filepath='include/linux/netdevice.h' line='1468' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4224'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1472' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1470' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4288'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1473' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1471' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4352'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1474' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1472' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4416'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1475' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1473' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4480'> - <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1476' column='1'/> + <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1474' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4544'> - <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1477' column='1'/> + <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1475' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4608'> - <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1478' column='1'/> + <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1476' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4672'> - <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1479' column='1'/> + <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='1477' column='1'/> </data-member> </class-decl> <typedef-decl name='netdev_tx_t' type-id='e246a80b' filepath='include/linux/netdevice.h' line='115' column='1' id='6849a88c'/> @@ -38161,12 +38118,12 @@ <var-decl name='ifr_ifru' type-id='95fd560f' visibility='default' filepath='include/uapi/linux/if.h' line='252' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__13' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='233' column='1' id='96ef15db'> + <union-decl name='__anonymous_union__11' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='233' column='1' id='96ef15db'> <data-member access='public'> <var-decl name='ifrn_name' type-id='ac1fa8c0' visibility='default' filepath='include/uapi/linux/if.h' line='235' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__14' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='238' column='1' id='95fd560f'> + <union-decl name='__anonymous_union__12' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='238' column='1' id='95fd560f'> <data-member access='public'> <var-decl name='ifru_addr' type-id='5221b18a' visibility='default' filepath='include/uapi/linux/if.h' line='239' column='1'/> </data-member> @@ -38248,7 +38205,7 @@ <var-decl name='ifs_ifsu' type-id='11418911' visibility='default' filepath='include/uapi/linux/if.h' line='219' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='208' column='1' id='11418911'> + <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/if.h' line='208' column='1' id='11418911'> <data-member access='public'> <var-decl name='raw_hdlc' type-id='b3ce99dc' visibility='default' filepath='include/uapi/linux/if.h' line='210' column='1'/> </data-member> @@ -38498,7 +38455,7 @@ <var-decl name='nla_type' type-id='d315442e' visibility='default' filepath='include/uapi/linux/netlink.h' line='213' column='1'/> </data-member> </class-decl> - <enum-decl name='tc_setup_type' filepath='include/linux/netdevice.h' line='859' column='1' id='b3e12f1c'> + <enum-decl name='tc_setup_type' filepath='include/linux/netdevice.h' line='857' column='1' id='b3e12f1c'> <underlying-type type-id='9cac1fee'/> <enumerator name='TC_SETUP_QDISC_MQPRIO' value='0'/> <enumerator name='TC_SETUP_CLSU32' value='1'/> @@ -38613,7 +38570,7 @@ <var-decl name='nlmsg_pid' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/netlink.h' line='49' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__16' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/netlink.h' line='195' column='1' id='4ce2708e'> + <union-decl name='__anonymous_union__14' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/netlink.h' line='195' column='1' id='4ce2708e'> <data-member access='public'> <var-decl name='ctx' type-id='6aa9aca0' visibility='default' filepath='include/linux/netlink.h' line='196' column='1'/> </data-member> @@ -38621,23 +38578,23 @@ <var-decl name='args' type-id='613ff906' visibility='default' filepath='include/linux/netlink.h' line='201' column='1'/> </data-member> </union-decl> - <class-decl name='netdev_phys_item_id' size-in-bits='264' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='843' column='1' id='14a30316'> + <class-decl name='netdev_phys_item_id' size-in-bits='264' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='841' column='1' id='14a30316'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='844' column='1'/> + <var-decl name='id' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='842' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='id_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='845' column='1'/> + <var-decl name='id_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='843' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_bpf' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='901' column='1' id='0360a184'> + <class-decl name='netdev_bpf' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='899' column='1' id='0360a184'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='command' type-id='fa64b30d' visibility='default' filepath='include/linux/netdevice.h' line='902' column='1'/> + <var-decl name='command' type-id='fa64b30d' visibility='default' filepath='include/linux/netdevice.h' line='900' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='dd64c8e8' visibility='default' filepath='include/linux/netdevice.h' line='903' column='1'/> + <var-decl name='' type-id='dd64c8e8' visibility='default' filepath='include/linux/netdevice.h' line='901' column='1'/> </data-member> </class-decl> - <enum-decl name='bpf_netdev_command' filepath='include/linux/netdevice.h' line='879' column='1' id='fa64b30d'> + <enum-decl name='bpf_netdev_command' filepath='include/linux/netdevice.h' line='877' column='1' id='fa64b30d'> <underlying-type type-id='9cac1fee'/> <enumerator name='XDP_SETUP_PROG' value='0'/> <enumerator name='XDP_SETUP_PROG_HW' value='1'/> @@ -38647,42 +38604,42 @@ <enumerator name='BPF_OFFLOAD_MAP_FREE' value='5'/> <enumerator name='XDP_SETUP_XSK_UMEM' value='6'/> </enum-decl> - <union-decl name='__anonymous_union__17' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='903' column='1' id='dd64c8e8'> + <union-decl name='__anonymous_union__15' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='901' column='1' id='dd64c8e8'> <data-member access='public'> - <var-decl name='' type-id='33bba89f' visibility='default' filepath='include/linux/netdevice.h' line='905' column='1'/> + <var-decl name='' type-id='33bba89f' visibility='default' filepath='include/linux/netdevice.h' line='903' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='0ed9a4e9' visibility='default' filepath='include/linux/netdevice.h' line='911' column='1'/> + <var-decl name='' type-id='0ed9a4e9' visibility='default' filepath='include/linux/netdevice.h' line='909' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='f7a2361f' visibility='default' filepath='include/linux/netdevice.h' line='917' column='1'/> + <var-decl name='' type-id='f7a2361f' visibility='default' filepath='include/linux/netdevice.h' line='915' column='1'/> </data-member> <data-member access='public'> - <var-decl name='xsk' type-id='40a847cb' visibility='default' filepath='include/linux/netdevice.h' line='924' column='1'/> + <var-decl name='xsk' type-id='40a847cb' visibility='default' filepath='include/linux/netdevice.h' line='922' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__21' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='905' column='1' id='33bba89f'> + <class-decl name='__anonymous_struct__21' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='903' column='1' id='33bba89f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='906' column='1'/> + <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='904' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='907' column='1'/> + <var-decl name='prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='905' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='extack' type-id='5799dc94' visibility='default' filepath='include/linux/netdevice.h' line='908' column='1'/> + <var-decl name='extack' type-id='5799dc94' visibility='default' filepath='include/linux/netdevice.h' line='906' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__22' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='911' column='1' id='0ed9a4e9'> + <class-decl name='__anonymous_struct__22' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='909' column='1' id='0ed9a4e9'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='prog_id' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='912' column='1'/> + <var-decl name='prog_id' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='910' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='prog_flags' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='914' column='1'/> + <var-decl name='prog_flags' type-id='19c2251e' visibility='default' filepath='include/linux/netdevice.h' line='912' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__23' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='917' column='1' id='f7a2361f'> + <class-decl name='__anonymous_struct__23' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='915' column='1' id='f7a2361f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='offmap' type-id='366d2695' visibility='default' filepath='include/linux/netdevice.h' line='918' column='1'/> + <var-decl name='offmap' type-id='366d2695' visibility='default' filepath='include/linux/netdevice.h' line='916' column='1'/> </data-member> </class-decl> <class-decl name='bpf_offloaded_map' size-in-bits='2560' is-struct='yes' visibility='default' filepath='include/linux/bpf.h' line='157' column='1' id='15ac14d5'> @@ -38719,12 +38676,12 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/bpf.h' line='154' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__24' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='921' column='1' id='40a847cb'> + <class-decl name='__anonymous_struct__24' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='919' column='1' id='40a847cb'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='922' column='1'/> + <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='920' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='queue_id' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='923' column='1'/> + <var-decl name='queue_id' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='921' column='1'/> </data-member> </class-decl> <class-decl name='xdp_frame' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/net/xdp.h' line='75' column='1' id='21f83f61'> @@ -39383,7 +39340,7 @@ <var-decl name='data' type-id='f41331a9' visibility='default' filepath='include/uapi/linux/ethtool.h' line='885' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__18' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/ethtool.h' line='1006' column='1' id='9567c730'> + <union-decl name='__anonymous_union__16' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/ethtool.h' line='1006' column='1' id='9567c730'> <data-member access='public'> <var-decl name='rule_cnt' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/ethtool.h' line='1007' column='1'/> </data-member> @@ -39608,30 +39565,30 @@ <var-decl name='reserved' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/ethtool.h' line='1307' column='1'/> </data-member> </class-decl> - <class-decl name='header_ops' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='268' column='1' id='f6e7855b'> + <class-decl name='header_ops' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='266' column='1' id='f6e7855b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='create' type-id='e82aa0fb' visibility='default' filepath='include/linux/netdevice.h' line='269' column='1'/> + <var-decl name='create' type-id='e82aa0fb' visibility='default' filepath='include/linux/netdevice.h' line='267' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='parse' type-id='35b37061' visibility='default' filepath='include/linux/netdevice.h' line='272' column='1'/> + <var-decl name='parse' type-id='35b37061' visibility='default' filepath='include/linux/netdevice.h' line='270' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='cache' type-id='464a4247' visibility='default' filepath='include/linux/netdevice.h' line='273' column='1'/> + <var-decl name='cache' type-id='464a4247' visibility='default' filepath='include/linux/netdevice.h' line='271' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='cache_update' type-id='b713d448' visibility='default' filepath='include/linux/netdevice.h' line='274' column='1'/> + <var-decl name='cache_update' type-id='b713d448' visibility='default' filepath='include/linux/netdevice.h' line='272' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='validate' type-id='5a60e638' visibility='default' filepath='include/linux/netdevice.h' line='277' column='1'/> + <var-decl name='validate' type-id='5a60e638' visibility='default' filepath='include/linux/netdevice.h' line='275' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='parse_protocol' type-id='98c4c95a' visibility='default' filepath='include/linux/netdevice.h' line='278' column='1'/> + <var-decl name='parse_protocol' type-id='98c4c95a' visibility='default' filepath='include/linux/netdevice.h' line='276' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='280' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='278' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='281' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='279' column='1'/> </data-member> </class-decl> <class-decl name='hh_cache' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='240' column='1' id='0db936dc'> @@ -39653,69 +39610,69 @@ <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='222' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_rx_queue' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='754' column='1' id='f12ac4ae'> + <class-decl name='netdev_rx_queue' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='752' column='1' id='f12ac4ae'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rps_map' type-id='f30dbff5' visibility='default' filepath='include/linux/netdevice.h' line='756' column='1'/> + <var-decl name='rps_map' type-id='f30dbff5' visibility='default' filepath='include/linux/netdevice.h' line='754' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rps_flow_table' type-id='deff2378' visibility='default' filepath='include/linux/netdevice.h' line='757' column='1'/> + <var-decl name='rps_flow_table' type-id='deff2378' visibility='default' filepath='include/linux/netdevice.h' line='755' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='759' column='1'/> + <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='757' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='760' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='xdp_rxq' type-id='eb0d6f26' visibility='default' filepath='include/linux/netdevice.h' line='761' column='1'/> + <var-decl name='xdp_rxq' type-id='eb0d6f26' visibility='default' filepath='include/linux/netdevice.h' line='759' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='763' column='1'/> + <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='766' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='764' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='767' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='765' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='768' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='766' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='769' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='767' column='1'/> </data-member> </class-decl> - <class-decl name='rps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='680' column='1' id='6f8d5f55'> + <class-decl name='rps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='678' column='1' id='6f8d5f55'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='681' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='682' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='cpus' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='683' column='1'/> + <var-decl name='cpus' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='681' column='1'/> </data-member> </class-decl> - <class-decl name='rps_dev_flow_table' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='702' column='1' id='aca51d4a'> + <class-decl name='rps_dev_flow_table' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='700' column='1' id='aca51d4a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='703' column='1'/> + <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='701' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='704' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='702' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='flows' type-id='11d66d65' visibility='default' filepath='include/linux/netdevice.h' line='705' column='1'/> + <var-decl name='flows' type-id='11d66d65' visibility='default' filepath='include/linux/netdevice.h' line='703' column='1'/> </data-member> </class-decl> - <class-decl name='rps_dev_flow' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='692' column='1' id='b65a052d'> + <class-decl name='rps_dev_flow' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='690' column='1' id='b65a052d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cpu' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='693' column='1'/> + <var-decl name='cpu' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='691' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='filter' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='694' column='1'/> + <var-decl name='filter' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='last_qtail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='695' column='1'/> + <var-decl name='last_qtail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='693' column='1'/> </data-member> </class-decl> <class-decl name='xdp_rxq_info' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/net/xdp.h' line='59' column='1' id='eb0d6f26'> @@ -39732,9 +39689,9 @@ <var-decl name='mem' type-id='1182636e' visibility='default' filepath='include/net/xdp.h' line='63' column='1'/> </data-member> </class-decl> - <typedef-decl name='rx_handler_func_t' type-id='77c9a241' filepath='include/linux/netdevice.h' line='434' column='1' id='9193647b'/> - <typedef-decl name='rx_handler_result_t' type-id='aee6711b' filepath='include/linux/netdevice.h' line='433' column='1' id='a110acfc'/> - <enum-decl name='rx_handler_result' filepath='include/linux/netdevice.h' line='427' column='1' id='aee6711b'> + <typedef-decl name='rx_handler_func_t' type-id='77c9a241' filepath='include/linux/netdevice.h' line='432' column='1' id='9193647b'/> + <typedef-decl name='rx_handler_result_t' type-id='aee6711b' filepath='include/linux/netdevice.h' line='431' column='1' id='a110acfc'/> + <enum-decl name='rx_handler_result' filepath='include/linux/netdevice.h' line='425' column='1' id='aee6711b'> <underlying-type type-id='9cac1fee'/> <enumerator name='RX_HANDLER_CONSUMED' value='0'/> <enumerator name='RX_HANDLER_ANOTHER' value='1'/> @@ -39801,7 +39758,7 @@ <var-decl name='' type-id='e686dd16' visibility='default' filepath='include/net/sch_generic.h' line='311' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__19' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sch_generic.h' line='311' column='1' id='e686dd16'> + <union-decl name='__anonymous_union__17' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sch_generic.h' line='311' column='1' id='e686dd16'> <data-member access='public'> <var-decl name='' type-id='a2699296' visibility='default' filepath='include/net/sch_generic.h' line='312' column='1'/> </data-member> @@ -40208,57 +40165,57 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/net/sch_generic.h' line='261' column='1'/> </data-member> </class-decl> - <class-decl name='netdev_queue' size-in-bits='3584' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='602' column='1' id='49a7c5a7'> + <class-decl name='netdev_queue' size-in-bits='3584' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='600' column='1' id='49a7c5a7'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='606' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='604' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='607' column='1'/> + <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='qdisc_sleeping' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='608' column='1'/> + <var-decl name='qdisc_sleeping' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='610' column='1'/> + <var-decl name='kobj' type-id='b6ab8849' visibility='default' filepath='include/linux/netdevice.h' line='608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='tx_maxrate' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='615' column='1'/> + <var-decl name='tx_maxrate' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='trans_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='620' column='1'/> + <var-decl name='trans_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='618' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='sb_dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='623' column='1'/> + <var-decl name='sb_dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='625' column='1'/> + <var-decl name='umem' type-id='577ede06' visibility='default' filepath='include/linux/netdevice.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='_xmit_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='630' column='1'/> + <var-decl name='_xmit_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='628' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1568'> - <var-decl name='xmit_lock_owner' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='631' column='1'/> + <var-decl name='xmit_lock_owner' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='629' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='trans_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='635' column='1'/> + <var-decl name='trans_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='633' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='637' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='635' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='dql' type-id='471cb386' visibility='default' filepath='include/linux/netdevice.h' line='640' column='1'/> + <var-decl name='dql' type-id='471cb386' visibility='default' filepath='include/linux/netdevice.h' line='638' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='643' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='644' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='642' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='645' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='643' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='646' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='644' column='1'/> </data-member> </class-decl> <class-decl name='dql' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/dynamic_queue_limits.h' line='41' column='1' id='471cb386'> @@ -40466,29 +40423,29 @@ <var-decl name='filter_chain_list' type-id='72f469ec' visibility='default' filepath='include/net/sch_generic.h' line='461' column='1'/> </data-member> </class-decl> - <class-decl name='xps_dev_maps' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='800' column='1' id='4edc4180'> + <class-decl name='xps_dev_maps' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='798' column='1' id='4edc4180'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='801' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='799' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='attr_map' type-id='a0955e2b' visibility='default' filepath='include/linux/netdevice.h' line='802' column='1'/> + <var-decl name='attr_map' type-id='a0955e2b' visibility='default' filepath='include/linux/netdevice.h' line='800' column='1'/> </data-member> </class-decl> - <class-decl name='xps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='787' column='1' id='279bdcdf'> + <class-decl name='xps_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='785' column='1' id='279bdcdf'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='788' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='786' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='alloc_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='789' column='1'/> + <var-decl name='alloc_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='787' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='790' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/netdevice.h' line='788' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='queues' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='791' column='1'/> + <var-decl name='queues' type-id='0f300383' visibility='default' filepath='include/linux/netdevice.h' line='789' column='1'/> </data-member> </class-decl> - <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2039' column='1' id='08f5ca17'> + <enum-decl name='__anonymous_enum__' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2037' column='1' id='08f5ca17'> <underlying-type type-id='9cac1fee'/> <enumerator name='NETREG_UNINITIALIZED' value='0'/> <enumerator name='NETREG_REGISTERED' value='1'/> @@ -40497,7 +40454,7 @@ <enumerator name='NETREG_RELEASED' value='4'/> <enumerator name='NETREG_DUMMY' value='5'/> </enum-decl> - <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2049' column='1' id='08f5ca18'> + <enum-decl name='__anonymous_enum__1' is-anonymous='yes' filepath='include/linux/netdevice.h' line='2047' column='1' id='08f5ca18'> <underlying-type type-id='9cac1fee'/> <enumerator name='RTNL_LINK_INITIALIZED' value='0'/> <enumerator name='RTNL_LINK_INITIALIZING' value='1'/> @@ -40508,48 +40465,48 @@ <var-decl name='net' type-id='a2bff676' visibility='default' filepath='include/net/net_namespace.h' line='313' column='1'/> </data-member> </class-decl> - <enum-decl name='netdev_ml_priv_type' filepath='include/linux/netdevice.h' line='1594' column='1' id='9c6bf017'> + <enum-decl name='netdev_ml_priv_type' filepath='include/linux/netdevice.h' line='1592' column='1' id='9c6bf017'> <underlying-type type-id='9cac1fee'/> <enumerator name='ML_PRIV_NONE' value='0'/> <enumerator name='ML_PRIV_CAN' value='1'/> </enum-decl> - <union-decl name='__anonymous_union__20' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1' id='ca29cb68'> + <union-decl name='__anonymous_union__18' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1' id='ca29cb68'> <data-member access='public'> - <var-decl name='lstats' type-id='a42934eb' visibility='default' filepath='include/linux/netdevice.h' line='2068' column='1'/> + <var-decl name='lstats' type-id='a42934eb' visibility='default' filepath='include/linux/netdevice.h' line='2066' column='1'/> </data-member> <data-member access='public'> - <var-decl name='tstats' type-id='90cd86e5' visibility='default' filepath='include/linux/netdevice.h' line='2069' column='1'/> + <var-decl name='tstats' type-id='90cd86e5' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1'/> </data-member> <data-member access='public'> - <var-decl name='dstats' type-id='f59f5033' visibility='default' filepath='include/linux/netdevice.h' line='2070' column='1'/> + <var-decl name='dstats' type-id='f59f5033' visibility='default' filepath='include/linux/netdevice.h' line='2068' column='1'/> </data-member> </union-decl> - <class-decl name='pcpu_lstats' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2479' column='1' id='b71b307b'> + <class-decl name='pcpu_lstats' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2477' column='1' id='b71b307b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2480' column='1'/> + <var-decl name='packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2478' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2481' column='1'/> + <var-decl name='bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2479' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2482' column='1'/> + <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2480' column='1'/> </data-member> </class-decl> - <class-decl name='pcpu_sw_netstats' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2471' column='1' id='101eeec5'> + <class-decl name='pcpu_sw_netstats' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2469' column='1' id='101eeec5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='rx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2472' column='1'/> + <var-decl name='rx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2470' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='rx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2473' column='1'/> + <var-decl name='rx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2471' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='tx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2474' column='1'/> + <var-decl name='tx_packets' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2472' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='tx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2475' column='1'/> + <var-decl name='tx_bytes' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2473' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2476' column='1'/> + <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/netdevice.h' line='2474' column='1'/> </data-member> </class-decl> <class-decl name='rtnl_link_ops' size-in-bits='1600' is-struct='yes' visibility='default' filepath='include/net/rtnetlink.h' line='60' column='1' id='6696ef79'> @@ -40643,7 +40600,7 @@ <var-decl name='' type-id='4a3999ba' visibility='default' filepath='include/net/netlink.h' line='295' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__21' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/netlink.h' line='295' column='1' id='4a3999ba'> + <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/netlink.h' line='295' column='1' id='4a3999ba'> <data-member access='public'> <var-decl name='validation_data' type-id='eaa32e2f' visibility='default' filepath='include/net/netlink.h' line='296' column='1'/> </data-member> @@ -40666,12 +40623,12 @@ </data-member> </class-decl> <typedef-decl name='s16' type-id='b55def60' filepath='include/asm-generic/int-ll64.h' line='18' column='1' id='9b7e9486'/> - <class-decl name='netdev_tc_txq' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='816' column='1' id='f1e1eb79'> + <class-decl name='netdev_tc_txq' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='814' column='1' id='f1e1eb79'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='count' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='817' column='1'/> + <var-decl name='count' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='815' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='818' column='1'/> + <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='816' column='1'/> </data-member> </class-decl> <class-decl name='bpf_func_info' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/bpf.h' line='3604' column='1' id='8a1373a3'> @@ -40707,7 +40664,7 @@ <var-decl name='syncp' type-id='e4d85780' visibility='default' filepath='include/linux/bpf.h' line='373' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__22' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/bpf.h' line='428' column='1' id='b597c0fa'> + <union-decl name='__anonymous_union__20' size-in-bits='384' is-anonymous='yes' visibility='default' filepath='include/linux/bpf.h' line='428' column='1' id='b597c0fa'> <data-member access='public'> <var-decl name='work' type-id='ef9025d0' visibility='default' filepath='include/linux/bpf.h' line='429' column='1'/> </data-member> @@ -40737,7 +40694,7 @@ <var-decl name='k' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/filter.h' line='28' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__23' is-anonymous='yes' visibility='default' filepath='include/linux/filter.h' line='562' column='1' id='fe772793'> + <union-decl name='__anonymous_union__21' is-anonymous='yes' visibility='default' filepath='include/linux/filter.h' line='562' column='1' id='fe772793'> <data-member access='public'> <var-decl name='insns' type-id='4967766c' visibility='default' filepath='include/linux/filter.h' line='563' column='1'/> </data-member> @@ -42402,18 +42359,18 @@ <pointer-type-def type-id='72b61a2d' size-in-bits='64' id='9baaf905'/> <pointer-type-def type-id='28e1d9ae' size-in-bits='64' id='278a4544'/> <pointer-type-def type-id='41425a4b' size-in-bits='64' id='cdff193b'/> - <function-decl name='submit_bio' mangled-name='submit_bio' filepath='block/blk-core.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='submit_bio'> - <parameter type-id='fb55efa1' name='bio' filepath='block/blk-core.c' line='1151' column='1'/> + <function-decl name='submit_bio' mangled-name='submit_bio' filepath='block/blk-core.c' line='1154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='submit_bio'> + <parameter type-id='fb55efa1' name='bio' filepath='block/blk-core.c' line='1154' column='1'/> <return type-id='041bc907'/> </function-decl> - <function-decl name='rq_flush_dcache_pages' mangled-name='rq_flush_dcache_pages' filepath='block/blk-core.c' line='1542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rq_flush_dcache_pages'> - <parameter type-id='3dad1a48' name='rq' filepath='block/blk-core.c' line='1542' column='1'/> + <function-decl name='rq_flush_dcache_pages' mangled-name='rq_flush_dcache_pages' filepath='block/blk-core.c' line='1538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rq_flush_dcache_pages'> + <parameter type-id='3dad1a48' name='rq' filepath='block/blk-core.c' line='1538' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_update_request' mangled-name='blk_update_request' filepath='block/blk-core.c' line='1443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_update_request'> - <parameter type-id='3dad1a48' name='req' filepath='block/blk-core.c' line='1443' column='1'/> - <parameter type-id='f4e2facd' name='error' filepath='block/blk-core.c' line='1443' column='1'/> - <parameter type-id='f0981eeb' name='nr_bytes' filepath='block/blk-core.c' line='1444' column='1'/> + <function-decl name='blk_update_request' mangled-name='blk_update_request' filepath='block/blk-core.c' line='1446' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_update_request'> + <parameter type-id='3dad1a48' name='req' filepath='block/blk-core.c' line='1446' column='1'/> + <parameter type-id='f4e2facd' name='error' filepath='block/blk-core.c' line='1446' column='1'/> + <parameter type-id='f0981eeb' name='nr_bytes' filepath='block/blk-core.c' line='1447' column='1'/> <return type-id='b50a4934'/> </function-decl> <function-decl name='blk_sync_queue' mangled-name='blk_sync_queue' filepath='block/blk-core.c' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_sync_queue'> @@ -42424,8 +42381,8 @@ <parameter type-id='f4e2facd' name='status' filepath='block/blk-core.c' line='205' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='blk_start_plug' mangled-name='blk_start_plug' filepath='block/blk-core.c' line='1721' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_start_plug'> - <parameter type-id='39944481' name='plug' filepath='block/blk-core.c' line='1721' column='1'/> + <function-decl name='blk_start_plug' mangled-name='blk_start_plug' filepath='block/blk-core.c' line='1717' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_start_plug'> + <parameter type-id='39944481' name='plug' filepath='block/blk-core.c' line='1717' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='blk_set_queue_dying' mangled-name='blk_set_queue_dying' filepath='block/blk-core.c' line='316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_set_queue_dying'> @@ -42465,8 +42422,8 @@ <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-core.c' line='566' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='blk_finish_plug' mangled-name='blk_finish_plug' filepath='block/blk-core.c' line='1804' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_finish_plug'> - <parameter type-id='39944481' name='plug' filepath='block/blk-core.c' line='1804' column='1'/> + <function-decl name='blk_finish_plug' mangled-name='blk_finish_plug' filepath='block/blk-core.c' line='1800' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_finish_plug'> + <parameter type-id='39944481' name='plug' filepath='block/blk-core.c' line='1800' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='blk_cleanup_queue' mangled-name='blk_cleanup_queue' filepath='block/blk-core.c' line='342' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_cleanup_queue'> @@ -42684,84 +42641,84 @@ <var-decl name='teardown_irq' type-id='694b6f36' visibility='default' filepath='include/linux/msi.h' line='225' column='1'/> </data-member> </class-decl> - <class-decl name='pci_sriov' size-in-bits='1280' is-struct='yes' visibility='default' filepath='drivers/pci/pci.h' line='327' column='1' id='1c590219'> + <class-decl name='pci_sriov' size-in-bits='1280' is-struct='yes' visibility='default' filepath='drivers/pci/pci.h' line='319' column='1' id='1c590219'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pos' type-id='95e97e5e' visibility='default' filepath='drivers/pci/pci.h' line='328' column='1'/> + <var-decl name='pos' type-id='95e97e5e' visibility='default' filepath='drivers/pci/pci.h' line='320' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='nres' type-id='95e97e5e' visibility='default' filepath='drivers/pci/pci.h' line='329' column='1'/> + <var-decl name='nres' type-id='95e97e5e' visibility='default' filepath='drivers/pci/pci.h' line='321' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='cap' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='330' column='1'/> + <var-decl name='cap' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='322' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='ctrl' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='331' column='1'/> + <var-decl name='ctrl' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='323' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='112'> - <var-decl name='total_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='332' column='1'/> + <var-decl name='total_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='324' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='initial_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='333' column='1'/> + <var-decl name='initial_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='325' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='144'> - <var-decl name='num_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='334' column='1'/> + <var-decl name='num_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='326' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='335' column='1'/> + <var-decl name='offset' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='327' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='176'> - <var-decl name='stride' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='336' column='1'/> + <var-decl name='stride' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='328' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='vf_device' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='337' column='1'/> + <var-decl name='vf_device' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='329' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='pgsz' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='338' column='1'/> + <var-decl name='pgsz' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='330' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='link' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='339' column='1'/> + <var-decl name='link' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='331' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='264'> - <var-decl name='max_VF_buses' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='340' column='1'/> + <var-decl name='max_VF_buses' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='272'> - <var-decl name='driver_max_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='341' column='1'/> + <var-decl name='driver_max_VFs' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='333' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='dev' type-id='85196e3f' visibility='default' filepath='drivers/pci/pci.h' line='342' column='1'/> + <var-decl name='dev' type-id='85196e3f' visibility='default' filepath='drivers/pci/pci.h' line='334' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='self' type-id='85196e3f' visibility='default' filepath='drivers/pci/pci.h' line='343' column='1'/> + <var-decl name='self' type-id='85196e3f' visibility='default' filepath='drivers/pci/pci.h' line='335' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='class' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='344' column='1'/> + <var-decl name='class' type-id='19c2251e' visibility='default' filepath='drivers/pci/pci.h' line='336' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='hdr_type' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='345' column='1'/> + <var-decl name='hdr_type' type-id='f9b06939' visibility='default' filepath='drivers/pci/pci.h' line='337' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='496'> - <var-decl name='subsystem_vendor' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='346' column='1'/> + <var-decl name='subsystem_vendor' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='338' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='subsystem_device' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='347' column='1'/> + <var-decl name='subsystem_device' type-id='1dc6a898' visibility='default' filepath='drivers/pci/pci.h' line='339' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='barsz' type-id='21e79dbc' visibility='default' filepath='drivers/pci/pci.h' line='348' column='1'/> + <var-decl name='barsz' type-id='21e79dbc' visibility='default' filepath='drivers/pci/pci.h' line='340' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='drivers_autoprobe' type-id='b50a4934' visibility='default' filepath='drivers/pci/pci.h' line='349' column='1'/> + <var-decl name='drivers_autoprobe' type-id='b50a4934' visibility='default' filepath='drivers/pci/pci.h' line='341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='351' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='343' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='352' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='353' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='345' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='354' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='drivers/pci/pci.h' line='346' column='1'/> </data-member> </class-decl> <class-decl name='pci_vpd' is-struct='yes' visibility='default' is-declaration-only='yes' id='059a2256'/> @@ -43597,18 +43554,18 @@ <abi-instr address-size='64' path='block/blk-mq-tag.c' language='LANG_C89'> <typedef-decl name='busy_tag_iter_fn' type-id='784e7aa9' filepath='include/linux/blk-mq.h' line='138' column='1' id='f8a88be2'/> <pointer-type-def type-id='f8a88be2' size-in-bits='64' id='65a8a3df'/> - <function-decl name='blk_mq_unique_tag' mangled-name='blk_mq_unique_tag' filepath='block/blk-mq-tag.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_unique_tag'> - <parameter type-id='3dad1a48' name='rq' filepath='block/blk-mq-tag.c' line='586' column='1'/> + <function-decl name='blk_mq_unique_tag' mangled-name='blk_mq_unique_tag' filepath='block/blk-mq-tag.c' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_unique_tag'> + <parameter type-id='3dad1a48' name='rq' filepath='block/blk-mq-tag.c' line='556' column='1'/> <return type-id='19c2251e'/> </function-decl> - <function-decl name='blk_mq_tagset_wait_completed_request' mangled-name='blk_mq_tagset_wait_completed_request' filepath='block/blk-mq-tag.c' line='402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_tagset_wait_completed_request'> - <parameter type-id='cc26d15f' name='tagset' filepath='block/blk-mq-tag.c' line='402' column='1'/> + <function-decl name='blk_mq_tagset_wait_completed_request' mangled-name='blk_mq_tagset_wait_completed_request' filepath='block/blk-mq-tag.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_tagset_wait_completed_request'> + <parameter type-id='cc26d15f' name='tagset' filepath='block/blk-mq-tag.c' line='375' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_mq_tagset_busy_iter' mangled-name='blk_mq_tagset_busy_iter' filepath='block/blk-mq-tag.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_tagset_busy_iter'> - <parameter type-id='cc26d15f' name='tagset' filepath='block/blk-mq-tag.c' line='373' column='1'/> - <parameter type-id='65a8a3df' name='fn' filepath='block/blk-mq-tag.c' line='374' column='1'/> - <parameter type-id='eaa32e2f' name='priv' filepath='block/blk-mq-tag.c' line='374' column='1'/> + <function-decl name='blk_mq_tagset_busy_iter' mangled-name='blk_mq_tagset_busy_iter' filepath='block/blk-mq-tag.c' line='346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_tagset_busy_iter'> + <parameter type-id='cc26d15f' name='tagset' filepath='block/blk-mq-tag.c' line='346' column='1'/> + <parameter type-id='65a8a3df' name='fn' filepath='block/blk-mq-tag.c' line='347' column='1'/> + <parameter type-id='eaa32e2f' name='priv' filepath='block/blk-mq-tag.c' line='347' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-type size-in-bits='64' id='784e7aa9'> @@ -43972,14 +43929,14 @@ <qualified-type-def type-id='1354385d' const='yes' id='6b2a4486'/> </abi-instr> <abi-instr address-size='64' path='block/blk-mq.c' language='LANG_C89'> - <function-decl name='blk_mq_alloc_tag_set' mangled-name='blk_mq_alloc_tag_set' filepath='block/blk-mq.c' line='3174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_alloc_tag_set'> - <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3174' column='1'/> + <function-decl name='blk_mq_alloc_tag_set' mangled-name='blk_mq_alloc_tag_set' filepath='block/blk-mq.c' line='3093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_alloc_tag_set'> + <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3093' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='blk_poll' mangled-name='blk_poll' filepath='block/blk-mq.c' line='3623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_poll'> - <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='3623' column='1'/> - <parameter type-id='041bc907' name='cookie' filepath='block/blk-mq.c' line='3623' column='1'/> - <parameter type-id='b50a4934' name='spin' filepath='block/blk-mq.c' line='3623' column='1'/> + <function-decl name='blk_poll' mangled-name='blk_poll' filepath='block/blk-mq.c' line='3542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_poll'> + <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='3542' column='1'/> + <parameter type-id='041bc907' name='cookie' filepath='block/blk-mq.c' line='3542' column='1'/> + <parameter type-id='b50a4934' name='spin' filepath='block/blk-mq.c' line='3542' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='blk_mq_free_request' mangled-name='blk_mq_free_request' filepath='block/blk-mq.c' line='512' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_free_request'> @@ -44003,9 +43960,9 @@ <parameter type-id='f4e2facd' name='error' filepath='block/blk-mq.c' line='543' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_mq_update_nr_hw_queues' mangled-name='blk_mq_update_nr_hw_queues' filepath='block/blk-mq.c' line='3457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_update_nr_hw_queues'> - <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3457' column='1'/> - <parameter type-id='95e97e5e' name='nr_hw_queues' filepath='block/blk-mq.c' line='3457' column='1'/> + <function-decl name='blk_mq_update_nr_hw_queues' mangled-name='blk_mq_update_nr_hw_queues' filepath='block/blk-mq.c' line='3376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_update_nr_hw_queues'> + <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3376' column='1'/> + <parameter type-id='95e97e5e' name='nr_hw_queues' filepath='block/blk-mq.c' line='3376' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='blk_mq_unquiesce_queue' mangled-name='blk_mq_unquiesce_queue' filepath='block/blk-mq.c' line='261' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_unquiesce_queue'> @@ -44017,22 +43974,22 @@ <parameter type-id='f0981eeb' name='tag' filepath='block/blk-mq.c' line='819' column='1'/> <return type-id='3dad1a48'/> </function-decl> - <function-decl name='blk_mq_stop_hw_queue' mangled-name='blk_mq_stop_hw_queue' filepath='block/blk-mq.c' line='1591' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_stop_hw_queue'> - <parameter type-id='a47d3467' name='hctx' filepath='block/blk-mq.c' line='1591' column='1'/> + <function-decl name='blk_mq_stop_hw_queue' mangled-name='blk_mq_stop_hw_queue' filepath='block/blk-mq.c' line='1583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_stop_hw_queue'> + <parameter type-id='a47d3467' name='hctx' filepath='block/blk-mq.c' line='1583' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_mq_start_stopped_hw_queues' mangled-name='blk_mq_start_stopped_hw_queues' filepath='block/blk-mq.c' line='1646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_start_stopped_hw_queues'> - <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='1646' column='1'/> - <parameter type-id='b50a4934' name='async' filepath='block/blk-mq.c' line='1646' column='1'/> + <function-decl name='blk_mq_start_stopped_hw_queues' mangled-name='blk_mq_start_stopped_hw_queues' filepath='block/blk-mq.c' line='1638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_start_stopped_hw_queues'> + <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='1638' column='1'/> + <parameter type-id='b50a4934' name='async' filepath='block/blk-mq.c' line='1638' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='blk_mq_start_request' mangled-name='blk_mq_start_request' filepath='block/blk-mq.c' line='681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_start_request'> <parameter type-id='3dad1a48' name='rq' filepath='block/blk-mq.c' line='681' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_mq_run_hw_queues' mangled-name='blk_mq_run_hw_queues' filepath='block/blk-mq.c' line='1548' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_run_hw_queues'> - <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='1548' column='1'/> - <parameter type-id='b50a4934' name='async' filepath='block/blk-mq.c' line='1548' column='1'/> + <function-decl name='blk_mq_run_hw_queues' mangled-name='blk_mq_run_hw_queues' filepath='block/blk-mq.c' line='1540' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_run_hw_queues'> + <parameter type-id='e7d2a5fc' name='q' filepath='block/blk-mq.c' line='1540' column='1'/> + <parameter type-id='b50a4934' name='async' filepath='block/blk-mq.c' line='1540' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='blk_mq_requeue_request' mangled-name='blk_mq_requeue_request' filepath='block/blk-mq.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_requeue_request'> @@ -44044,19 +44001,19 @@ <parameter type-id='3dad1a48' name='rq' filepath='block/blk-mq.c' line='675' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='blk_mq_init_sq_queue' mangled-name='blk_mq_init_sq_queue' filepath='block/blk-mq.c' line='2847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_init_sq_queue'> - <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='2847' column='1'/> - <parameter type-id='e1962c5d' name='ops' filepath='block/blk-mq.c' line='2848' column='1'/> - <parameter type-id='f0981eeb' name='queue_depth' filepath='block/blk-mq.c' line='2849' column='1'/> - <parameter type-id='f0981eeb' name='set_flags' filepath='block/blk-mq.c' line='2850' column='1'/> + <function-decl name='blk_mq_init_sq_queue' mangled-name='blk_mq_init_sq_queue' filepath='block/blk-mq.c' line='2766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_init_sq_queue'> + <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='2766' column='1'/> + <parameter type-id='e1962c5d' name='ops' filepath='block/blk-mq.c' line='2767' column='1'/> + <parameter type-id='f0981eeb' name='queue_depth' filepath='block/blk-mq.c' line='2768' column='1'/> + <parameter type-id='f0981eeb' name='set_flags' filepath='block/blk-mq.c' line='2769' column='1'/> <return type-id='e7d2a5fc'/> </function-decl> - <function-decl name='blk_mq_free_tag_set' mangled-name='blk_mq_free_tag_set' filepath='block/blk-mq.c' line='3260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_free_tag_set'> - <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3260' column='1'/> + <function-decl name='blk_mq_free_tag_set' mangled-name='blk_mq_free_tag_set' filepath='block/blk-mq.c' line='3179' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_free_tag_set'> + <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='3179' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='blk_mq_init_queue' mangled-name='blk_mq_init_queue' filepath='block/blk-mq.c' line='2823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_init_queue'> - <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='2823' column='1'/> + <function-decl name='blk_mq_init_queue' mangled-name='blk_mq_init_queue' filepath='block/blk-mq.c' line='2742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_init_queue'> + <parameter type-id='cc26d15f' name='set' filepath='block/blk-mq.c' line='2742' column='1'/> <return type-id='e7d2a5fc'/> </function-decl> <function-decl name='blk_mq_freeze_queue_wait_timeout' mangled-name='blk_mq_freeze_queue_wait_timeout' filepath='block/blk-mq.c' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='blk_mq_freeze_queue_wait_timeout'> @@ -45392,6 +45349,11 @@ <parameter type-id='67f526b5' name='alg' filepath='crypto/algapi.c' line='383' column='1'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='crypto_enqueue_request' mangled-name='crypto_enqueue_request' filepath='crypto/algapi.c' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_enqueue_request'> + <parameter type-id='1a8fddbe' name='queue' filepath='crypto/algapi.c' line='904' column='1'/> + <parameter type-id='af5eeab9' name='request' filepath='crypto/algapi.c' line='905' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> <function-decl name='crypto_unregister_template' mangled-name='crypto_unregister_template' filepath='crypto/algapi.c' line='514' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_unregister_template'> <parameter type-id='f0f856cb' name='tmpl' filepath='crypto/algapi.c' line='514' column='1'/> <return type-id='48b5725f'/> @@ -45423,11 +45385,6 @@ <parameter type-id='f0981eeb' name='size' filepath='crypto/algapi.c' line='959' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='crypto_enqueue_request' mangled-name='crypto_enqueue_request' filepath='crypto/algapi.c' line='904' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_enqueue_request'> - <parameter type-id='1a8fddbe' name='queue' filepath='crypto/algapi.c' line='904' column='1'/> - <parameter type-id='af5eeab9' name='request' filepath='crypto/algapi.c' line='905' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='crypto_dequeue_request' mangled-name='crypto_dequeue_request' filepath='crypto/algapi.c' line='927' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='crypto_dequeue_request'> <parameter type-id='1a8fddbe' name='queue' filepath='crypto/algapi.c' line='927' column='1'/> <return type-id='af5eeab9'/> @@ -47387,21 +47344,21 @@ <pointer-type-def type-id='32aa9d63' size-in-bits='64' id='c4c01ce7'/> <pointer-type-def type-id='5243924f' size-in-bits='64' id='dfcac4bb'/> <pointer-type-def type-id='391f1e06' size-in-bits='64' id='0bd06100'/> - <function-decl name='class_find_device' mangled-name='class_find_device' filepath='drivers/base/class.c' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_find_device'> - <parameter type-id='67aca04f' name='class' filepath='drivers/base/class.c' line='403' column='1'/> - <parameter type-id='fa0b179b' name='start' filepath='drivers/base/class.c' line='403' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/base/class.c' line='404' column='1'/> - <parameter type-id='92d15ae9' name='match' filepath='drivers/base/class.c' line='405' column='1'/> + <function-decl name='class_find_device' mangled-name='class_find_device' filepath='drivers/base/class.c' line='398' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_find_device'> + <parameter type-id='67aca04f' name='class' filepath='drivers/base/class.c' line='398' column='1'/> + <parameter type-id='fa0b179b' name='start' filepath='drivers/base/class.c' line='398' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/base/class.c' line='399' column='1'/> + <parameter type-id='92d15ae9' name='match' filepath='drivers/base/class.c' line='400' column='1'/> <return type-id='fa0b179b'/> </function-decl> - <function-decl name='class_interface_unregister' mangled-name='class_interface_unregister' filepath='drivers/base/class.c' line='457' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_interface_unregister'> - <parameter type-id='ec167ceb' name='class_intf' filepath='drivers/base/class.c' line='457' column='1'/> + <function-decl name='class_interface_unregister' mangled-name='class_interface_unregister' filepath='drivers/base/class.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_interface_unregister'> + <parameter type-id='ec167ceb' name='class_intf' filepath='drivers/base/class.c' line='452' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__class_create' mangled-name='__class_create' filepath='drivers/base/class.c' line='230' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__class_create'> - <parameter type-id='2730d015' name='owner' filepath='drivers/base/class.c' line='230' column='1'/> - <parameter type-id='80f4b756' name='name' filepath='drivers/base/class.c' line='230' column='1'/> - <parameter type-id='a57283f9' name='key' filepath='drivers/base/class.c' line='231' column='1'/> + <function-decl name='__class_create' mangled-name='__class_create' filepath='drivers/base/class.c' line='225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__class_create'> + <parameter type-id='2730d015' name='owner' filepath='drivers/base/class.c' line='225' column='1'/> + <parameter type-id='80f4b756' name='name' filepath='drivers/base/class.c' line='225' column='1'/> + <parameter type-id='a57283f9' name='key' filepath='drivers/base/class.c' line='226' column='1'/> <return type-id='67aca04f'/> </function-decl> <function-decl name='__class_register' mangled-name='__class_register' filepath='drivers/base/class.c' line='152' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__class_register'> @@ -47409,12 +47366,12 @@ <parameter type-id='a57283f9' name='key' filepath='drivers/base/class.c' line='152' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='class_destroy' mangled-name='class_destroy' filepath='drivers/base/class.c' line='265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_destroy'> - <parameter type-id='67aca04f' name='cls' filepath='drivers/base/class.c' line='265' column='1'/> + <function-decl name='class_destroy' mangled-name='class_destroy' filepath='drivers/base/class.c' line='260' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_destroy'> + <parameter type-id='67aca04f' name='cls' filepath='drivers/base/class.c' line='260' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='class_unregister' mangled-name='class_unregister' filepath='drivers/base/class.c' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_unregister'> - <parameter type-id='67aca04f' name='cls' filepath='drivers/base/class.c' line='203' column='1'/> + <function-decl name='class_unregister' mangled-name='class_unregister' filepath='drivers/base/class.c' line='198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_unregister'> + <parameter type-id='67aca04f' name='cls' filepath='drivers/base/class.c' line='198' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='class_remove_file_ns' mangled-name='class_remove_file_ns' filepath='drivers/base/class.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='class_remove_file_ns'> @@ -48002,20 +47959,20 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/base/dd.c' language='LANG_C89'> - <function-decl name='driver_attach' mangled-name='driver_attach' filepath='drivers/base/dd.c' line='1139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='driver_attach'> - <parameter type-id='00c7b870' name='drv' filepath='drivers/base/dd.c' line='1139' column='1'/> + <function-decl name='driver_attach' mangled-name='driver_attach' filepath='drivers/base/dd.c' line='1118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='driver_attach'> + <parameter type-id='00c7b870' name='drv' filepath='drivers/base/dd.c' line='1118' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='device_release_driver' mangled-name='device_release_driver' filepath='drivers/base/dd.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='device_release_driver'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/dd.c' line='1236' column='1'/> + <function-decl name='device_release_driver' mangled-name='device_release_driver' filepath='drivers/base/dd.c' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='device_release_driver'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/dd.c' line='1215' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='device_bind_driver' mangled-name='device_bind_driver' filepath='drivers/base/dd.c' line='468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='device_bind_driver'> <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/dd.c' line='468' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='device_attach' mangled-name='device_attach' filepath='drivers/base/dd.c' line='974' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='device_attach'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/dd.c' line='974' column='1'/> + <function-decl name='device_attach' mangled-name='device_attach' filepath='drivers/base/dd.c' line='965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='device_attach'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/dd.c' line='965' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -48428,17 +48385,6 @@ <parameter type-id='80f4b756' name='name' filepath='drivers/base/platform.c' line='274' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__platform_driver_probe' mangled-name='__platform_driver_probe' filepath='drivers/base/platform.c' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__platform_driver_probe'> - <parameter type-id='d53c2eb5' name='drv' filepath='drivers/base/platform.c' line='775' column='1'/> - <parameter type-id='e05ae2cd' name='probe' filepath='drivers/base/platform.c' line='776' column='1'/> - <parameter type-id='2730d015' name='module' filepath='drivers/base/platform.c' line='776' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='devm_platform_ioremap_resource' mangled-name='devm_platform_ioremap_resource' filepath='drivers/base/platform.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_platform_ioremap_resource'> - <parameter type-id='db362995' name='pdev' filepath='drivers/base/platform.c' line='73' column='1'/> - <parameter type-id='f0981eeb' name='index' filepath='drivers/base/platform.c' line='74' column='1'/> - <return type-id='eaa32e2f'/> - </function-decl> <function-decl name='platform_device_alloc' mangled-name='platform_device_alloc' filepath='drivers/base/platform.c' line='379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='platform_device_alloc'> <parameter type-id='80f4b756' name='name' filepath='drivers/base/platform.c' line='379' column='1'/> <parameter type-id='95e97e5e' name='id' filepath='drivers/base/platform.c' line='379' column='1'/> @@ -48512,6 +48458,11 @@ <parameter type-id='b59d7dce' name='size' filepath='drivers/base/platform.c' line='436' column='1'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='devm_platform_ioremap_resource' mangled-name='devm_platform_ioremap_resource' filepath='drivers/base/platform.c' line='73' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_platform_ioremap_resource'> + <parameter type-id='db362995' name='pdev' filepath='drivers/base/platform.c' line='73' column='1'/> + <parameter type-id='f0981eeb' name='index' filepath='drivers/base/platform.c' line='74' column='1'/> + <return type-id='eaa32e2f'/> + </function-decl> <function-decl name='__platform_register_drivers' mangled-name='__platform_register_drivers' filepath='drivers/base/platform.c' line='897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__platform_register_drivers'> <parameter type-id='77e06080' name='drivers' filepath='drivers/base/platform.c' line='897' column='1'/> <parameter type-id='f0981eeb' name='count' filepath='drivers/base/platform.c' line='898' column='1'/> @@ -48523,6 +48474,12 @@ <parameter type-id='2730d015' name='owner' filepath='drivers/base/platform.c' line='733' column='1'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='__platform_driver_probe' mangled-name='__platform_driver_probe' filepath='drivers/base/platform.c' line='775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__platform_driver_probe'> + <parameter type-id='d53c2eb5' name='drv' filepath='drivers/base/platform.c' line='775' column='1'/> + <parameter type-id='e05ae2cd' name='probe' filepath='drivers/base/platform.c' line='776' column='1'/> + <parameter type-id='2730d015' name='module' filepath='drivers/base/platform.c' line='776' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> <pointer-type-def type-id='213c3202' size-in-bits='64' id='79c2f4f8'/> <pointer-type-def type-id='20b17040' size-in-bits='64' id='e153f6de'/> <function-type size-in-bits='64' id='b083f9b9'> @@ -50357,75 +50314,75 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/base/power/runtime.c' language='LANG_C89'> - <function-decl name='__pm_runtime_resume' mangled-name='__pm_runtime_resume' filepath='drivers/base/power/runtime.c' line='1106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_resume'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1106' column='1'/> - <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1106' column='1'/> + <function-decl name='__pm_runtime_resume' mangled-name='__pm_runtime_resume' filepath='drivers/base/power/runtime.c' line='1096' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_resume'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1096' column='1'/> + <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1096' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__pm_runtime_idle' mangled-name='__pm_runtime_idle' filepath='drivers/base/power/runtime.c' line='1043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_idle'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1043' column='1'/> - <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1043' column='1'/> + <function-decl name='__pm_runtime_idle' mangled-name='__pm_runtime_idle' filepath='drivers/base/power/runtime.c' line='1033' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_idle'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1033' column='1'/> + <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1033' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pm_runtime_set_autosuspend_delay' mangled-name='pm_runtime_set_autosuspend_delay' filepath='drivers/base/power/runtime.c' line='1568' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_set_autosuspend_delay'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1568' column='1'/> - <parameter type-id='95e97e5e' name='delay' filepath='drivers/base/power/runtime.c' line='1568' column='1'/> + <function-decl name='pm_runtime_set_autosuspend_delay' mangled-name='pm_runtime_set_autosuspend_delay' filepath='drivers/base/power/runtime.c' line='1558' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_set_autosuspend_delay'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1558' column='1'/> + <parameter type-id='95e97e5e' name='delay' filepath='drivers/base/power/runtime.c' line='1558' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__pm_runtime_use_autosuspend' mangled-name='__pm_runtime_use_autosuspend' filepath='drivers/base/power/runtime.c' line='1589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_use_autosuspend'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1589' column='1'/> - <parameter type-id='b50a4934' name='use' filepath='drivers/base/power/runtime.c' line='1589' column='1'/> + <function-decl name='__pm_runtime_use_autosuspend' mangled-name='__pm_runtime_use_autosuspend' filepath='drivers/base/power/runtime.c' line='1579' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_use_autosuspend'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1579' column='1'/> + <parameter type-id='b50a4934' name='use' filepath='drivers/base/power/runtime.c' line='1579' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__pm_runtime_suspend' mangled-name='__pm_runtime_suspend' filepath='drivers/base/power/runtime.c' line='1075' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_suspend'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1075' column='1'/> - <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1075' column='1'/> + <function-decl name='__pm_runtime_suspend' mangled-name='__pm_runtime_suspend' filepath='drivers/base/power/runtime.c' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_suspend'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1065' column='1'/> + <parameter type-id='95e97e5e' name='rpmflags' filepath='drivers/base/power/runtime.c' line='1065' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__pm_runtime_disable' mangled-name='__pm_runtime_disable' filepath='drivers/base/power/runtime.c' line='1370' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_disable'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1370' column='1'/> - <parameter type-id='b50a4934' name='check_resume' filepath='drivers/base/power/runtime.c' line='1370' column='1'/> + <function-decl name='__pm_runtime_disable' mangled-name='__pm_runtime_disable' filepath='drivers/base/power/runtime.c' line='1360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_disable'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1360' column='1'/> + <parameter type-id='b50a4934' name='check_resume' filepath='drivers/base/power/runtime.c' line='1360' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_enable' mangled-name='pm_runtime_enable' filepath='drivers/base/power/runtime.c' line='1412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_enable'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1412' column='1'/> + <function-decl name='pm_runtime_enable' mangled-name='pm_runtime_enable' filepath='drivers/base/power/runtime.c' line='1402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_enable'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1402' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_no_callbacks' mangled-name='pm_runtime_no_callbacks' filepath='drivers/base/power/runtime.c' line='1491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_no_callbacks'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1491' column='1'/> + <function-decl name='pm_runtime_no_callbacks' mangled-name='pm_runtime_no_callbacks' filepath='drivers/base/power/runtime.c' line='1481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_no_callbacks'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1481' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_allow' mangled-name='pm_runtime_allow' filepath='drivers/base/power/runtime.c' line='1468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_allow'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1468' column='1'/> + <function-decl name='pm_runtime_allow' mangled-name='pm_runtime_allow' filepath='drivers/base/power/runtime.c' line='1458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_allow'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1458' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_forbid' mangled-name='pm_runtime_forbid' filepath='drivers/base/power/runtime.c' line='1447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_forbid'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1447' column='1'/> + <function-decl name='pm_runtime_forbid' mangled-name='pm_runtime_forbid' filepath='drivers/base/power/runtime.c' line='1437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_forbid'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1437' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_barrier' mangled-name='pm_runtime_barrier' filepath='drivers/base/power/runtime.c' line='1334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_barrier'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1334' column='1'/> + <function-decl name='pm_runtime_barrier' mangled-name='pm_runtime_barrier' filepath='drivers/base/power/runtime.c' line='1324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_barrier'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1324' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__pm_runtime_set_status' mangled-name='__pm_runtime_set_status' filepath='drivers/base/power/runtime.c' line='1173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_set_status'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1173' column='1'/> - <parameter type-id='f0981eeb' name='status' filepath='drivers/base/power/runtime.c' line='1173' column='1'/> + <function-decl name='__pm_runtime_set_status' mangled-name='__pm_runtime_set_status' filepath='drivers/base/power/runtime.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pm_runtime_set_status'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1163' column='1'/> + <parameter type-id='f0981eeb' name='status' filepath='drivers/base/power/runtime.c' line='1163' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pm_runtime_irq_safe' mangled-name='pm_runtime_irq_safe' filepath='drivers/base/power/runtime.c' line='1512' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_irq_safe'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1512' column='1'/> + <function-decl name='pm_runtime_irq_safe' mangled-name='pm_runtime_irq_safe' filepath='drivers/base/power/runtime.c' line='1502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_irq_safe'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1502' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pm_runtime_get_if_in_use' mangled-name='pm_runtime_get_if_in_use' filepath='drivers/base/power/runtime.c' line='1135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_get_if_in_use'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1135' column='1'/> + <function-decl name='pm_runtime_get_if_in_use' mangled-name='pm_runtime_get_if_in_use' filepath='drivers/base/power/runtime.c' line='1125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_get_if_in_use'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1125' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pm_runtime_force_suspend' mangled-name='pm_runtime_force_suspend' filepath='drivers/base/power/runtime.c' line='1770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_force_suspend'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1770' column='1'/> + <function-decl name='pm_runtime_force_suspend' mangled-name='pm_runtime_force_suspend' filepath='drivers/base/power/runtime.c' line='1760' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_force_suspend'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1760' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pm_runtime_force_resume' mangled-name='pm_runtime_force_resume' filepath='drivers/base/power/runtime.c' line='1818' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_force_resume'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1818' column='1'/> + <function-decl name='pm_runtime_force_resume' mangled-name='pm_runtime_force_resume' filepath='drivers/base/power/runtime.c' line='1808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pm_runtime_force_resume'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/base/power/runtime.c' line='1808' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -51304,10 +51261,6 @@ <parameter type-id='a2782ece' name='data' filepath='drivers/base/regmap/regmap-irq.c' line='986' column='1'/> <return type-id='7544e824'/> </function-decl> - <function-decl name='regmap_irq_chip_get_base' mangled-name='regmap_irq_chip_get_base' filepath='drivers/base/regmap/regmap-irq.c' line='951' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regmap_irq_chip_get_base'> - <parameter type-id='a2782ece' name='data' filepath='drivers/base/regmap/regmap-irq.c' line='951' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='regmap_del_irq_chip' mangled-name='regmap_del_irq_chip' filepath='drivers/base/regmap/regmap-irq.c' line='822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regmap_del_irq_chip'> <parameter type-id='95e97e5e' name='irq' filepath='drivers/base/regmap/regmap-irq.c' line='822' column='1'/> <parameter type-id='a2782ece' name='d' filepath='drivers/base/regmap/regmap-irq.c' line='822' column='1'/> @@ -52199,11 +52152,6 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/char/random.c' language='LANG_C89'> - <function-decl name='add_device_randomness' mangled-name='add_device_randomness' filepath='drivers/char/random.c' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='add_device_randomness'> - <parameter type-id='eaa32e2f' name='buf' filepath='drivers/char/random.c' line='850' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='drivers/char/random.c' line='850' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='get_random_bytes' mangled-name='get_random_bytes' filepath='drivers/char/random.c' line='435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_random_bytes'> <parameter type-id='eaa32e2f' name='buf' filepath='drivers/char/random.c' line='435' column='1'/> <parameter type-id='95e97e5e' name='len' filepath='drivers/char/random.c' line='435' column='1'/> @@ -52212,6 +52160,11 @@ <function-decl name='get_random_u32' mangled-name='get_random_u32' filepath='drivers/char/random.c' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_random_u32'> <return type-id='19c2251e'/> </function-decl> + <function-decl name='add_device_randomness' mangled-name='add_device_randomness' filepath='drivers/char/random.c' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='add_device_randomness'> + <parameter type-id='eaa32e2f' name='buf' filepath='drivers/char/random.c' line='850' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='drivers/char/random.c' line='850' column='1'/> + <return type-id='48b5725f'/> + </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/clk/clk-bulk.c' language='LANG_C89'> <qualified-type-def type-id='158c8c35' const='yes' id='38a035e6'/> @@ -52281,42 +52234,42 @@ </class-decl> <pointer-type-def type-id='158c8c35' size-in-bits='64' id='2942e355'/> <pointer-type-def type-id='2942e355' size-in-bits='64' id='734c20ed'/> - <function-decl name='devm_clk_get' mangled-name='devm_clk_get' filepath='drivers/clk/clk-devres.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='63' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/clk/clk-devres.c' line='63' column='1'/> + <function-decl name='devm_clk_get' mangled-name='devm_clk_get' filepath='drivers/clk/clk-devres.c' line='12' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='12' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/clk/clk-devres.c' line='12' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='devm_clk_bulk_get' mangled-name='devm_clk_bulk_get' filepath='drivers/clk/clk-devres.c' line='140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='140' column='1'/> - <parameter type-id='95e97e5e' name='num_clks' filepath='drivers/clk/clk-devres.c' line='140' column='1'/> - <parameter type-id='2942e355' name='clks' filepath='drivers/clk/clk-devres.c' line='141' column='1'/> + <function-decl name='devm_clk_bulk_get' mangled-name='devm_clk_bulk_get' filepath='drivers/clk/clk-devres.c' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='81' column='1'/> + <parameter type-id='95e97e5e' name='num_clks' filepath='drivers/clk/clk-devres.c' line='81' column='1'/> + <parameter type-id='2942e355' name='clks' filepath='drivers/clk/clk-devres.c' line='82' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='devm_clk_get_optional' mangled-name='devm_clk_get_optional' filepath='drivers/clk/clk-devres.c' line='82' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_get_optional'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='82' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/clk/clk-devres.c' line='82' column='1'/> + <function-decl name='devm_clk_get_optional' mangled-name='devm_clk_get_optional' filepath='drivers/clk/clk-devres.c' line='32' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_get_optional'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='32' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/clk/clk-devres.c' line='32' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='devm_get_clk_from_child' mangled-name='devm_get_clk_from_child' filepath='drivers/clk/clk-devres.c' line='205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_get_clk_from_child'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='205' column='1'/> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk-devres.c' line='206' column='1'/> - <parameter type-id='80f4b756' name='con_id' filepath='drivers/clk/clk-devres.c' line='206' column='1'/> + <function-decl name='devm_get_clk_from_child' mangled-name='devm_get_clk_from_child' filepath='drivers/clk/clk-devres.c' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_get_clk_from_child'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='146' column='1'/> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk-devres.c' line='147' column='1'/> + <parameter type-id='80f4b756' name='con_id' filepath='drivers/clk/clk-devres.c' line='147' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='devm_clk_put' mangled-name='devm_clk_put' filepath='drivers/clk/clk-devres.c' line='195' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_put'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='195' column='1'/> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk-devres.c' line='195' column='1'/> + <function-decl name='devm_clk_put' mangled-name='devm_clk_put' filepath='drivers/clk/clk-devres.c' line='136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_put'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='136' column='1'/> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk-devres.c' line='136' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='devm_clk_bulk_get_optional' mangled-name='devm_clk_bulk_get_optional' filepath='drivers/clk/clk-devres.c' line='147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get_optional'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='147' column='1'/> - <parameter type-id='95e97e5e' name='num_clks' filepath='drivers/clk/clk-devres.c' line='147' column='1'/> - <parameter type-id='2942e355' name='clks' filepath='drivers/clk/clk-devres.c' line='148' column='1'/> + <function-decl name='devm_clk_bulk_get_optional' mangled-name='devm_clk_bulk_get_optional' filepath='drivers/clk/clk-devres.c' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get_optional'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='88' column='1'/> + <parameter type-id='95e97e5e' name='num_clks' filepath='drivers/clk/clk-devres.c' line='88' column='1'/> + <parameter type-id='2942e355' name='clks' filepath='drivers/clk/clk-devres.c' line='89' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='devm_clk_bulk_get_all' mangled-name='devm_clk_bulk_get_all' filepath='drivers/clk/clk-devres.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get_all'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='161' column='1'/> - <parameter type-id='734c20ed' name='clks' filepath='drivers/clk/clk-devres.c' line='162' column='1'/> + <function-decl name='devm_clk_bulk_get_all' mangled-name='devm_clk_bulk_get_all' filepath='drivers/clk/clk-devres.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_bulk_get_all'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk-devres.c' line='102' column='1'/> + <parameter type-id='734c20ed' name='clks' filepath='drivers/clk/clk-devres.c' line='103' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -52789,227 +52742,221 @@ <pointer-type-def type-id='0a38a8f0' size-in-bits='64' id='93097cd2'/> <pointer-type-def type-id='30913582' size-in-bits='64' id='0112fb3c'/> <pointer-type-def type-id='7c1f247e' size-in-bits='64' id='c2d2a400'/> - <function-decl name='clk_prepare' mangled-name='clk_prepare' filepath='drivers/clk/clk.c' line='972' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_prepare'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='972' column='1'/> + <function-decl name='clk_prepare' mangled-name='clk_prepare' filepath='drivers/clk/clk.c' line='962' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_prepare'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='962' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_unprepare' mangled-name='clk_unprepare' filepath='drivers/clk/clk.c' line='891' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_unprepare'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='891' column='1'/> + <function-decl name='clk_unprepare' mangled-name='clk_unprepare' filepath='drivers/clk/clk.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_unprepare'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='881' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='clk_set_rate' mangled-name='clk_set_rate' filepath='drivers/clk/clk.c' line='2311' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_set_rate'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2311' column='1'/> - <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='2311' column='1'/> + <function-decl name='clk_set_rate' mangled-name='clk_set_rate' filepath='drivers/clk/clk.c' line='2301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_set_rate'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2301' column='1'/> + <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='2301' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='of_clk_get_by_name' mangled-name='of_clk_get_by_name' filepath='drivers/clk/clk.c' line='4788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_by_name'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4788' column='1'/> - <parameter type-id='80f4b756' name='name' filepath='drivers/clk/clk.c' line='4788' column='1'/> + <function-decl name='of_clk_get_by_name' mangled-name='of_clk_get_by_name' filepath='drivers/clk/clk.c' line='4778' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_by_name'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4778' column='1'/> + <parameter type-id='80f4b756' name='name' filepath='drivers/clk/clk.c' line='4778' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='of_clk_src_simple_get' mangled-name='of_clk_src_simple_get' filepath='drivers/clk/clk.c' line='4391' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_src_simple_get'> - <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4391' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4392' column='1'/> + <function-decl name='of_clk_src_simple_get' mangled-name='of_clk_src_simple_get' filepath='drivers/clk/clk.c' line='4381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_src_simple_get'> + <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4381' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4382' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='of_clk_src_onecell_get' mangled-name='of_clk_src_onecell_get' filepath='drivers/clk/clk.c' line='4404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_src_onecell_get'> - <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4404' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4404' column='1'/> + <function-decl name='of_clk_src_onecell_get' mangled-name='of_clk_src_onecell_get' filepath='drivers/clk/clk.c' line='4394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_src_onecell_get'> + <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4394' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4394' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='of_clk_parent_fill' mangled-name='of_clk_parent_fill' filepath='drivers/clk/clk.c' line='4884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_parent_fill'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4884' column='1'/> - <parameter type-id='7d3cd834' name='parents' filepath='drivers/clk/clk.c' line='4884' column='1'/> - <parameter type-id='f0981eeb' name='size' filepath='drivers/clk/clk.c' line='4885' column='1'/> + <function-decl name='of_clk_hw_simple_get' mangled-name='of_clk_hw_simple_get' filepath='drivers/clk/clk.c' line='4388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_simple_get'> + <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4388' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4388' column='1'/> + <return type-id='3aaeef89'/> + </function-decl> + <function-decl name='of_clk_hw_register' mangled-name='of_clk_hw_register' filepath='drivers/clk/clk.c' line='3941' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_register'> + <parameter type-id='9a537bbe' name='node' filepath='drivers/clk/clk.c' line='3941' column='1'/> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3941' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='of_clk_get_parent_name' mangled-name='of_clk_get_parent_name' filepath='drivers/clk/clk.c' line='4815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_parent_name'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4815' column='1'/> - <parameter type-id='95e97e5e' name='index' filepath='drivers/clk/clk.c' line='4815' column='1'/> + <function-decl name='of_clk_get_parent_name' mangled-name='of_clk_get_parent_name' filepath='drivers/clk/clk.c' line='4805' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_parent_name'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4805' column='1'/> + <parameter type-id='95e97e5e' name='index' filepath='drivers/clk/clk.c' line='4805' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='of_clk_hw_simple_get' mangled-name='of_clk_hw_simple_get' filepath='drivers/clk/clk.c' line='4398' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_simple_get'> - <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4398' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4398' column='1'/> + <function-decl name='of_clk_hw_onecell_get' mangled-name='of_clk_hw_onecell_get' filepath='drivers/clk/clk.c' line='4409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_onecell_get'> + <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4409' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4409' column='1'/> <return type-id='3aaeef89'/> </function-decl> - <function-decl name='of_clk_hw_register' mangled-name='of_clk_hw_register' filepath='drivers/clk/clk.c' line='3951' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_register'> - <parameter type-id='9a537bbe' name='node' filepath='drivers/clk/clk.c' line='3951' column='1'/> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3951' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='of_clk_hw_onecell_get' mangled-name='of_clk_hw_onecell_get' filepath='drivers/clk/clk.c' line='4419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_hw_onecell_get'> - <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4419' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4419' column='1'/> - <return type-id='3aaeef89'/> - </function-decl> - <function-decl name='of_clk_get_parent_count' mangled-name='of_clk_get_parent_count' filepath='drivers/clk/clk.c' line='4803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_parent_count'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4803' column='1'/> + <function-decl name='of_clk_get_parent_count' mangled-name='of_clk_get_parent_count' filepath='drivers/clk/clk.c' line='4793' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_parent_count'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4793' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='of_clk_get_from_provider' mangled-name='of_clk_get_from_provider' filepath='drivers/clk/clk.c' line='4739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_from_provider'> - <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4739' column='1'/> + <function-decl name='of_clk_get_from_provider' mangled-name='of_clk_get_from_provider' filepath='drivers/clk/clk.c' line='4729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get_from_provider'> + <parameter type-id='51a94113' name='clkspec' filepath='drivers/clk/clk.c' line='4729' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='of_clk_get' mangled-name='of_clk_get' filepath='drivers/clk/clk.c' line='4773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4773' column='1'/> - <parameter type-id='95e97e5e' name='index' filepath='drivers/clk/clk.c' line='4773' column='1'/> + <function-decl name='of_clk_get' mangled-name='of_clk_get' filepath='drivers/clk/clk.c' line='4763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_get'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4763' column='1'/> + <parameter type-id='95e97e5e' name='index' filepath='drivers/clk/clk.c' line='4763' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='of_clk_del_provider' mangled-name='of_clk_del_provider' filepath='drivers/clk/clk.c' line='4577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_del_provider'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4577' column='1'/> + <function-decl name='of_clk_del_provider' mangled-name='of_clk_del_provider' filepath='drivers/clk/clk.c' line='4567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_del_provider'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4567' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='of_clk_add_provider' mangled-name='of_clk_add_provider' filepath='drivers/clk/clk.c' line='4441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_add_provider'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4441' column='1'/> - <parameter type-id='f1c652ac' name='clk_src_get' filepath='drivers/clk/clk.c' line='4442' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4444' column='1'/> + <function-decl name='of_clk_add_provider' mangled-name='of_clk_add_provider' filepath='drivers/clk/clk.c' line='4431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_add_provider'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4431' column='1'/> + <parameter type-id='f1c652ac' name='clk_src_get' filepath='drivers/clk/clk.c' line='4432' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4434' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='of_clk_add_hw_provider' mangled-name='of_clk_add_hw_provider' filepath='drivers/clk/clk.c' line='4478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_add_hw_provider'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4478' column='1'/> - <parameter type-id='a5186342' name='get' filepath='drivers/clk/clk.c' line='4479' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4481' column='1'/> + <function-decl name='of_clk_add_hw_provider' mangled-name='of_clk_add_hw_provider' filepath='drivers/clk/clk.c' line='4468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_clk_add_hw_provider'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/clk/clk.c' line='4468' column='1'/> + <parameter type-id='a5186342' name='get' filepath='drivers/clk/clk.c' line='4469' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4471' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='devm_of_clk_add_hw_provider' mangled-name='devm_of_clk_add_hw_provider' filepath='drivers/clk/clk.c' line='4547' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_of_clk_add_hw_provider'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4547' column='1'/> - <parameter type-id='a5186342' name='get' filepath='drivers/clk/clk.c' line='4548' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4550' column='1'/> + <function-decl name='devm_of_clk_add_hw_provider' mangled-name='devm_of_clk_add_hw_provider' filepath='drivers/clk/clk.c' line='4537' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_of_clk_add_hw_provider'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4537' column='1'/> + <parameter type-id='a5186342' name='get' filepath='drivers/clk/clk.c' line='4538' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/clk/clk.c' line='4540' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='devm_clk_register' mangled-name='devm_clk_register' filepath='drivers/clk/clk.c' line='4119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_register'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4119' column='1'/> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4119' column='1'/> + <function-decl name='devm_clk_register' mangled-name='devm_clk_register' filepath='drivers/clk/clk.c' line='4109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_register'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4109' column='1'/> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4109' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='clk_unregister' mangled-name='clk_unregister' filepath='drivers/clk/clk.c' line='4036' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_unregister'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='4036' column='1'/> + <function-decl name='clk_unregister' mangled-name='clk_unregister' filepath='drivers/clk/clk.c' line='4026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_unregister'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='4026' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='devm_clk_hw_register' mangled-name='devm_clk_hw_register' filepath='drivers/clk/clk.c' line='4149' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_hw_register'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4149' column='1'/> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4149' column='1'/> + <function-decl name='devm_clk_hw_register' mangled-name='devm_clk_hw_register' filepath='drivers/clk/clk.c' line='4139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_clk_hw_register'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='4139' column='1'/> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4139' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_sync_state' mangled-name='clk_sync_state' filepath='drivers/clk/clk.c' line='1361' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_sync_state'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='1361' column='1'/> + <function-decl name='clk_sync_state' mangled-name='clk_sync_state' filepath='drivers/clk/clk.c' line='1351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_sync_state'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='1351' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='clk_set_parent' mangled-name='clk_set_parent' filepath='drivers/clk/clk.c' line='2661' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_set_parent'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2661' column='1'/> - <parameter type-id='7d0bc0eb' name='parent' filepath='drivers/clk/clk.c' line='2661' column='1'/> + <function-decl name='clk_set_parent' mangled-name='clk_set_parent' filepath='drivers/clk/clk.c' line='2651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_set_parent'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2651' column='1'/> + <parameter type-id='7d0bc0eb' name='parent' filepath='drivers/clk/clk.c' line='2651' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_round_rate' mangled-name='clk_round_rate' filepath='drivers/clk/clk.c' line='1498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_round_rate'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1498' column='1'/> - <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='1498' column='1'/> + <function-decl name='clk_round_rate' mangled-name='clk_round_rate' filepath='drivers/clk/clk.c' line='1488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_round_rate'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1488' column='1'/> + <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='1488' column='1'/> <return type-id='bd54fe1a'/> </function-decl> - <function-decl name='clk_register' mangled-name='clk_register' filepath='drivers/clk/clk.c' line='3917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_register'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='3917' column='1'/> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3917' column='1'/> + <function-decl name='clk_register' mangled-name='clk_register' filepath='drivers/clk/clk.c' line='3907' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_register'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='3907' column='1'/> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3907' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='clk_notifier_register' mangled-name='clk_notifier_register' filepath='drivers/clk/clk.c' line='4279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_notifier_register'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='4279' column='1'/> - <parameter type-id='d504f73d' name='nb' filepath='drivers/clk/clk.c' line='4279' column='1'/> + <function-decl name='clk_notifier_register' mangled-name='clk_notifier_register' filepath='drivers/clk/clk.c' line='4269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_notifier_register'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='4269' column='1'/> + <parameter type-id='d504f73d' name='nb' filepath='drivers/clk/clk.c' line='4269' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_hw_unregister' mangled-name='clk_hw_unregister' filepath='drivers/clk/clk.c' line='4093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_unregister'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4093' column='1'/> + <function-decl name='clk_hw_unregister' mangled-name='clk_hw_unregister' filepath='drivers/clk/clk.c' line='4083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_unregister'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='4083' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='clk_hw_set_rate_range' mangled-name='clk_hw_set_rate_range' filepath='drivers/clk/clk.c' line='671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_set_rate_range'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='671' column='1'/> - <parameter type-id='7359adad' name='min_rate' filepath='drivers/clk/clk.c' line='671' column='1'/> - <parameter type-id='7359adad' name='max_rate' filepath='drivers/clk/clk.c' line='672' column='1'/> + <function-decl name='clk_hw_set_rate_range' mangled-name='clk_hw_set_rate_range' filepath='drivers/clk/clk.c' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_set_rate_range'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='660' column='1'/> + <parameter type-id='7359adad' name='min_rate' filepath='drivers/clk/clk.c' line='660' column='1'/> + <parameter type-id='7359adad' name='max_rate' filepath='drivers/clk/clk.c' line='661' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='clk_hw_round_rate' mangled-name='clk_hw_round_rate' filepath='drivers/clk/clk.c' line='1473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_round_rate'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='1473' column='1'/> - <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='1473' column='1'/> + <function-decl name='clk_hw_round_rate' mangled-name='clk_hw_round_rate' filepath='drivers/clk/clk.c' line='1463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_round_rate'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='1463' column='1'/> + <parameter type-id='7359adad' name='rate' filepath='drivers/clk/clk.c' line='1463' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='clk_hw_register' mangled-name='clk_hw_register' filepath='drivers/clk/clk.c' line='3933' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_register'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='3933' column='1'/> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3933' column='1'/> + <function-decl name='clk_hw_register' mangled-name='clk_hw_register' filepath='drivers/clk/clk.c' line='3923' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_register'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/clk/clk.c' line='3923' column='1'/> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='3923' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_hw_is_prepared' mangled-name='clk_hw_is_prepared' filepath='drivers/clk/clk.c' line='528' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_is_prepared'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='528' column='1'/> + <function-decl name='clk_hw_is_prepared' mangled-name='clk_hw_is_prepared' filepath='drivers/clk/clk.c' line='517' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_is_prepared'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='517' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='clk_hw_is_enabled' mangled-name='clk_hw_is_enabled' filepath='drivers/clk/clk.c' line='540' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_is_enabled'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='540' column='1'/> + <function-decl name='clk_hw_is_enabled' mangled-name='clk_hw_is_enabled' filepath='drivers/clk/clk.c' line='529' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_is_enabled'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='529' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='clk_hw_get_rate' mangled-name='clk_hw_get_rate' filepath='drivers/clk/clk.c' line='502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_rate'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='502' column='1'/> + <function-decl name='clk_hw_get_rate' mangled-name='clk_hw_get_rate' filepath='drivers/clk/clk.c' line='491' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_rate'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='491' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='clk_hw_get_parent_by_index' mangled-name='clk_hw_get_parent_by_index' filepath='drivers/clk/clk.c' line='471' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_parent_by_index'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='471' column='1'/> - <parameter type-id='f0981eeb' name='index' filepath='drivers/clk/clk.c' line='471' column='1'/> + <function-decl name='clk_hw_get_parent_by_index' mangled-name='clk_hw_get_parent_by_index' filepath='drivers/clk/clk.c' line='460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_parent_by_index'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='460' column='1'/> + <parameter type-id='f0981eeb' name='index' filepath='drivers/clk/clk.c' line='460' column='1'/> <return type-id='3aaeef89'/> </function-decl> - <function-decl name='clk_hw_get_parent' mangled-name='clk_hw_get_parent' filepath='drivers/clk/clk.c' line='301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_parent'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='301' column='1'/> + <function-decl name='clk_hw_get_parent' mangled-name='clk_hw_get_parent' filepath='drivers/clk/clk.c' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_parent'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='290' column='1'/> <return type-id='3aaeef89'/> </function-decl> - <function-decl name='clk_hw_get_num_parents' mangled-name='clk_hw_get_num_parents' filepath='drivers/clk/clk.c' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_num_parents'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='295' column='1'/> + <function-decl name='clk_hw_get_num_parents' mangled-name='clk_hw_get_num_parents' filepath='drivers/clk/clk.c' line='284' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_num_parents'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='284' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='clk_hw_get_name' mangled-name='clk_hw_get_name' filepath='drivers/clk/clk.c' line='283' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_name'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='283' column='1'/> + <function-decl name='clk_hw_get_name' mangled-name='clk_hw_get_name' filepath='drivers/clk/clk.c' line='272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_name'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='272' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='clk_hw_get_flags' mangled-name='clk_hw_get_flags' filepath='drivers/clk/clk.c' line='522' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_flags'> - <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='522' column='1'/> + <function-decl name='clk_hw_get_flags' mangled-name='clk_hw_get_flags' filepath='drivers/clk/clk.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_hw_get_flags'> + <parameter type-id='9e6d4b4e' name='hw' filepath='drivers/clk/clk.c' line='511' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='clk_get_rate' mangled-name='clk_get_rate' filepath='drivers/clk/clk.c' line='1699' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_get_rate'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1699' column='1'/> + <function-decl name='clk_get_rate' mangled-name='clk_get_rate' filepath='drivers/clk/clk.c' line='1689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_get_rate'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1689' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='clk_get_parent' mangled-name='clk_get_parent' filepath='drivers/clk/clk.c' line='2497' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_get_parent'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2497' column='1'/> + <function-decl name='clk_get_parent' mangled-name='clk_get_parent' filepath='drivers/clk/clk.c' line='2487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_get_parent'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='2487' column='1'/> <return type-id='7d0bc0eb'/> </function-decl> - <function-decl name='clk_enable' mangled-name='clk_enable' filepath='drivers/clk/clk.c' line='1194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_enable'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1194' column='1'/> + <function-decl name='clk_enable' mangled-name='clk_enable' filepath='drivers/clk/clk.c' line='1184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_enable'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1184' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='clk_disable' mangled-name='clk_disable' filepath='drivers/clk/clk.c' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_disable'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1029' column='1'/> + <function-decl name='clk_disable' mangled-name='clk_disable' filepath='drivers/clk/clk.c' line='1019' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clk_disable'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='1019' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__clk_mux_determine_rate_closest' mangled-name='__clk_mux_determine_rate_closest' filepath='drivers/clk/clk.c' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_mux_determine_rate_closest'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='697' column='1'/> - <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='698' column='1'/> + <function-decl name='__clk_mux_determine_rate_closest' mangled-name='__clk_mux_determine_rate_closest' filepath='drivers/clk/clk.c' line='686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_mux_determine_rate_closest'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='686' column='1'/> + <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='687' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__clk_mux_determine_rate' mangled-name='__clk_mux_determine_rate' filepath='drivers/clk/clk.c' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_mux_determine_rate'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='690' column='1'/> - <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='691' column='1'/> + <function-decl name='__clk_mux_determine_rate' mangled-name='__clk_mux_determine_rate' filepath='drivers/clk/clk.c' line='679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_mux_determine_rate'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='679' column='1'/> + <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='680' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__clk_is_enabled' mangled-name='__clk_is_enabled' filepath='drivers/clk/clk.c' line='546' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_is_enabled'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='546' column='1'/> + <function-decl name='__clk_is_enabled' mangled-name='__clk_is_enabled' filepath='drivers/clk/clk.c' line='535' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_is_enabled'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='535' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='__clk_get_name' mangled-name='__clk_get_name' filepath='drivers/clk/clk.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_get_name'> - <parameter type-id='10f66866' name='clk' filepath='drivers/clk/clk.c' line='277' column='1'/> + <function-decl name='__clk_get_name' mangled-name='__clk_get_name' filepath='drivers/clk/clk.c' line='266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_get_name'> + <parameter type-id='10f66866' name='clk' filepath='drivers/clk/clk.c' line='266' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='__clk_get_hw' mangled-name='__clk_get_hw' filepath='drivers/clk/clk.c' line='289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_get_hw'> - <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='289' column='1'/> + <function-decl name='__clk_get_hw' mangled-name='__clk_get_hw' filepath='drivers/clk/clk.c' line='278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_get_hw'> + <parameter type-id='7d0bc0eb' name='clk' filepath='drivers/clk/clk.c' line='278' column='1'/> <return type-id='3aaeef89'/> </function-decl> - <function-decl name='__clk_determine_rate' mangled-name='__clk_determine_rate' filepath='drivers/clk/clk.c' line='1462' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_determine_rate'> - <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='1462' column='1'/> - <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='1462' column='1'/> + <function-decl name='__clk_determine_rate' mangled-name='__clk_determine_rate' filepath='drivers/clk/clk.c' line='1452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__clk_determine_rate'> + <parameter type-id='3aaeef89' name='hw' filepath='drivers/clk/clk.c' line='1452' column='1'/> + <parameter type-id='23a0ad0a' name='req' filepath='drivers/clk/clk.c' line='1452' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='824a7fd2'> @@ -54909,30 +54856,30 @@ <pointer-type-def type-id='400fb07b' size-in-bits='64' id='aa29ecab'/> </abi-instr> <abi-instr address-size='64' path='drivers/dma-buf/dma-heap.c' language='LANG_C89'> - <class-decl name='dma_heap' size-in-bits='1600' is-struct='yes' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='38' column='1' id='060e2e70'> + <class-decl name='dma_heap' size-in-bits='1600' is-struct='yes' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='37' column='1' id='060e2e70'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='39' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='38' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ops' type-id='cabcb658' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='40' column='1'/> + <var-decl name='ops' type-id='cabcb658' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='39' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='41' column='1'/> + <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='40' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='heap_devt' type-id='8504f260' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='42' column='1'/> + <var-decl name='heap_devt' type-id='8504f260' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='41' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='43' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='42' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='heap_cdev' type-id='22f86351' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='44' column='1'/> + <var-decl name='heap_cdev' type-id='22f86351' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='43' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='refcount' type-id='400fb07b' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='45' column='1'/> + <var-decl name='refcount' type-id='400fb07b' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='44' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='heap_dev' type-id='fa0b179b' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='46' column='1'/> + <var-decl name='heap_dev' type-id='fa0b179b' visibility='default' filepath='drivers/dma-buf/dma-heap.c' line='45' column='1'/> </data-member> </class-decl> <class-decl name='dma_heap_ops' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/dma-heap.h' line='23' column='1' id='e87e70f3'> @@ -54957,20 +54904,20 @@ <pointer-type-def type-id='3651c762' size-in-bits='64' id='cabcb658'/> <pointer-type-def type-id='9a08a831' size-in-bits='64' id='404d559d'/> <pointer-type-def type-id='060e2e70' size-in-bits='64' id='ea1bdaf6'/> - <function-decl name='dma_heap_get_name' mangled-name='dma_heap_get_name' filepath='drivers/dma-buf/dma-heap.c' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_name'> - <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='292' column='1'/> + <function-decl name='dma_heap_get_name' mangled-name='dma_heap_get_name' filepath='drivers/dma-buf/dma-heap.c' line='290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_name'> + <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='290' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='dma_heap_get_drvdata' mangled-name='dma_heap_get_drvdata' filepath='drivers/dma-buf/dma-heap.c' line='239' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_drvdata'> - <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='239' column='1'/> + <function-decl name='dma_heap_get_drvdata' mangled-name='dma_heap_get_drvdata' filepath='drivers/dma-buf/dma-heap.c' line='237' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_drvdata'> + <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='237' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='dma_heap_get_dev' mangled-name='dma_heap_get_dev' filepath='drivers/dma-buf/dma-heap.c' line='279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_dev'> - <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='279' column='1'/> + <function-decl name='dma_heap_get_dev' mangled-name='dma_heap_get_dev' filepath='drivers/dma-buf/dma-heap.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_get_dev'> + <parameter type-id='ea1bdaf6' name='heap' filepath='drivers/dma-buf/dma-heap.c' line='277' column='1'/> <return type-id='fa0b179b'/> </function-decl> - <function-decl name='dma_heap_add' mangled-name='dma_heap_add' filepath='drivers/dma-buf/dma-heap.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_add'> - <parameter type-id='dbe60995' name='exp_info' filepath='drivers/dma-buf/dma-heap.c' line='298' column='1'/> + <function-decl name='dma_heap_add' mangled-name='dma_heap_add' filepath='drivers/dma-buf/dma-heap.c' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_heap_add'> + <parameter type-id='dbe60995' name='exp_info' filepath='drivers/dma-buf/dma-heap.c' line='296' column='1'/> <return type-id='ea1bdaf6'/> </function-decl> <function-type size-in-bits='64' id='9a08a831'> @@ -55002,7 +54949,6 @@ <var-decl name='is_wait_die' type-id='f0981eeb' visibility='default' filepath='include/linux/ww_mutex.h' line='28' column='1'/> </data-member> </class-decl> - <pointer-type-def type-id='be937eab' size-in-bits='64' id='83302513'/> <var-decl name='reservation_ww_class' type-id='f0dc3c34' mangled-name='reservation_ww_class' visibility='default' filepath='drivers/dma-buf/dma-resv.c' line='49' column='1' elf-symbol-id='reservation_ww_class'/> <function-decl name='dma_resv_init' mangled-name='dma_resv_init' filepath='drivers/dma-buf/dma-resv.c' line='102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_resv_init'> <parameter type-id='340cea9c' name='obj' filepath='drivers/dma-buf/dma-resv.c' line='102' column='1'/> @@ -55019,13 +54965,6 @@ <parameter type-id='7359adad' name='timeout' filepath='drivers/dma-buf/dma-resv.c' line='501' column='1'/> <return type-id='bd54fe1a'/> </function-decl> - <function-decl name='dma_resv_get_fences_rcu' mangled-name='dma_resv_get_fences_rcu' filepath='drivers/dma-buf/dma-resv.c' line='399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_resv_get_fences_rcu'> - <parameter type-id='340cea9c' name='obj' filepath='drivers/dma-buf/dma-resv.c' line='399' column='1'/> - <parameter type-id='be937eab' name='pfence_excl' filepath='drivers/dma-buf/dma-resv.c' line='400' column='1'/> - <parameter type-id='807869d3' name='pshared_count' filepath='drivers/dma-buf/dma-resv.c' line='401' column='1'/> - <parameter type-id='83302513' name='pshared' filepath='drivers/dma-buf/dma-resv.c' line='402' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='dma_resv_test_signaled_rcu' mangled-name='dma_resv_test_signaled_rcu' filepath='drivers/dma-buf/dma-resv.c' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_resv_test_signaled_rcu'> <parameter type-id='340cea9c' name='obj' filepath='drivers/dma-buf/dma-resv.c' line='601' column='1'/> <parameter type-id='b50a4934' name='test_all' filepath='drivers/dma-buf/dma-resv.c' line='601' column='1'/> @@ -55621,55 +55560,55 @@ <pointer-type-def type-id='b5d4a6d2' size-in-bits='64' id='680bf43c'/> <pointer-type-def type-id='a198c269' size-in-bits='64' id='42e84365'/> <pointer-type-def type-id='1c2e282d' size-in-bits='64' id='31316b61'/> - <function-decl name='dma_release_channel' mangled-name='dma_release_channel' filepath='drivers/dma/dmaengine.c' line='781' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_release_channel'> - <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='781' column='1'/> + <function-decl name='dma_release_channel' mangled-name='dma_release_channel' filepath='drivers/dma/dmaengine.c' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_release_channel'> + <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='780' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='dma_async_device_unregister' mangled-name='dma_async_device_unregister' filepath='drivers/dma/dmaengine.c' line='1112' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_device_unregister'> - <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='1112' column='1'/> + <function-decl name='dma_async_device_unregister' mangled-name='dma_async_device_unregister' filepath='drivers/dma/dmaengine.c' line='1111' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_device_unregister'> + <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='1111' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='dmaengine_unmap_put' mangled-name='dmaengine_unmap_put' filepath='drivers/dma/dmaengine.c' line='1232' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dmaengine_unmap_put'> - <parameter type-id='e220a5e2' name='unmap' filepath='drivers/dma/dmaengine.c' line='1232' column='1'/> + <function-decl name='dmaengine_unmap_put' mangled-name='dmaengine_unmap_put' filepath='drivers/dma/dmaengine.c' line='1231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dmaengine_unmap_put'> + <parameter type-id='e220a5e2' name='unmap' filepath='drivers/dma/dmaengine.c' line='1231' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='dma_request_slave_channel' mangled-name='dma_request_slave_channel' filepath='drivers/dma/dmaengine.c' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_request_slave_channel'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/dma/dmaengine.c' line='743' column='1'/> - <parameter type-id='80f4b756' name='name' filepath='drivers/dma/dmaengine.c' line='744' column='1'/> + <function-decl name='dma_request_slave_channel' mangled-name='dma_request_slave_channel' filepath='drivers/dma/dmaengine.c' line='742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_request_slave_channel'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/dma/dmaengine.c' line='742' column='1'/> + <parameter type-id='80f4b756' name='name' filepath='drivers/dma/dmaengine.c' line='743' column='1'/> <return type-id='27f3f5d8'/> </function-decl> - <function-decl name='dma_request_chan' mangled-name='dma_request_chan' filepath='drivers/dma/dmaengine.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_request_chan'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/dma/dmaengine.c' line='695' column='1'/> - <parameter type-id='80f4b756' name='name' filepath='drivers/dma/dmaengine.c' line='695' column='1'/> + <function-decl name='dma_request_chan' mangled-name='dma_request_chan' filepath='drivers/dma/dmaengine.c' line='694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_request_chan'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/dma/dmaengine.c' line='694' column='1'/> + <parameter type-id='80f4b756' name='name' filepath='drivers/dma/dmaengine.c' line='694' column='1'/> <return type-id='27f3f5d8'/> </function-decl> - <function-decl name='dma_get_slave_channel' mangled-name='dma_get_slave_channel' filepath='drivers/dma/dmaengine.c' line='578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_slave_channel'> - <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='578' column='1'/> + <function-decl name='dma_get_slave_channel' mangled-name='dma_get_slave_channel' filepath='drivers/dma/dmaengine.c' line='577' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_slave_channel'> + <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='577' column='1'/> <return type-id='27f3f5d8'/> </function-decl> - <function-decl name='dma_get_slave_caps' mangled-name='dma_get_slave_caps' filepath='drivers/dma/dmaengine.c' line='464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_slave_caps'> - <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='464' column='1'/> - <parameter type-id='d9f19b23' name='caps' filepath='drivers/dma/dmaengine.c' line='464' column='1'/> + <function-decl name='dma_get_slave_caps' mangled-name='dma_get_slave_caps' filepath='drivers/dma/dmaengine.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_slave_caps'> + <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='463' column='1'/> + <parameter type-id='d9f19b23' name='caps' filepath='drivers/dma/dmaengine.c' line='463' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='dma_get_any_slave_channel' mangled-name='dma_get_any_slave_channel' filepath='drivers/dma/dmaengine.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_any_slave_channel'> - <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='609' column='1'/> + <function-decl name='dma_get_any_slave_channel' mangled-name='dma_get_any_slave_channel' filepath='drivers/dma/dmaengine.c' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_get_any_slave_channel'> + <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='608' column='1'/> <return type-id='27f3f5d8'/> </function-decl> - <function-decl name='dma_async_tx_descriptor_init' mangled-name='dma_async_tx_descriptor_init' filepath='drivers/dma/dmaengine.c' line='1298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_tx_descriptor_init'> - <parameter type-id='0e3f80d9' name='tx' filepath='drivers/dma/dmaengine.c' line='1298' column='1'/> - <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='1299' column='1'/> + <function-decl name='dma_async_tx_descriptor_init' mangled-name='dma_async_tx_descriptor_init' filepath='drivers/dma/dmaengine.c' line='1297' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_tx_descriptor_init'> + <parameter type-id='0e3f80d9' name='tx' filepath='drivers/dma/dmaengine.c' line='1297' column='1'/> + <parameter type-id='27f3f5d8' name='chan' filepath='drivers/dma/dmaengine.c' line='1298' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='dma_async_device_register' mangled-name='dma_async_device_register' filepath='drivers/dma/dmaengine.c' line='908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_device_register'> - <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='908' column='1'/> + <function-decl name='dma_async_device_register' mangled-name='dma_async_device_register' filepath='drivers/dma/dmaengine.c' line='907' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dma_async_device_register'> + <parameter type-id='c60ba652' name='device' filepath='drivers/dma/dmaengine.c' line='907' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__dma_request_channel' mangled-name='__dma_request_channel' filepath='drivers/dma/dmaengine.c' line='637' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dma_request_channel'> - <parameter type-id='d2b9f7d5' name='mask' filepath='drivers/dma/dmaengine.c' line='637' column='1'/> - <parameter type-id='55f53546' name='fn' filepath='drivers/dma/dmaengine.c' line='638' column='1'/> - <parameter type-id='eaa32e2f' name='fn_param' filepath='drivers/dma/dmaengine.c' line='638' column='1'/> - <parameter type-id='9a537bbe' name='np' filepath='drivers/dma/dmaengine.c' line='639' column='1'/> + <function-decl name='__dma_request_channel' mangled-name='__dma_request_channel' filepath='drivers/dma/dmaengine.c' line='636' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dma_request_channel'> + <parameter type-id='d2b9f7d5' name='mask' filepath='drivers/dma/dmaengine.c' line='636' column='1'/> + <parameter type-id='55f53546' name='fn' filepath='drivers/dma/dmaengine.c' line='637' column='1'/> + <parameter type-id='eaa32e2f' name='fn_param' filepath='drivers/dma/dmaengine.c' line='637' column='1'/> + <parameter type-id='9a537bbe' name='np' filepath='drivers/dma/dmaengine.c' line='638' column='1'/> <return type-id='27f3f5d8'/> </function-decl> <function-type size-in-bits='64' id='81e2e960'> @@ -57904,6 +57843,13 @@ </class-decl> </abi-instr> <abi-instr address-size='64' path='drivers/gpu/drm/drm_atomic.c' language='LANG_C89'> + <function-decl name='drm_atomic_private_obj_init' mangled-name='drm_atomic_private_obj_init' filepath='drivers/gpu/drm/drm_atomic.c' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_private_obj_init'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic.c' line='722' column='1'/> + <parameter type-id='11c98e9a' name='obj' filepath='drivers/gpu/drm/drm_atomic.c' line='723' column='1'/> + <parameter type-id='4ea020ae' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='724' column='1'/> + <parameter type-id='515fa1af' name='funcs' filepath='drivers/gpu/drm/drm_atomic.c' line='725' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='drm_atomic_get_private_obj_state' mangled-name='drm_atomic_get_private_obj_state' filepath='drivers/gpu/drm/drm_atomic.c' line='766' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_get_private_obj_state'> <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='766' column='1'/> <parameter type-id='11c98e9a' name='obj' filepath='drivers/gpu/drm/drm_atomic.c' line='767' column='1'/> @@ -57937,9 +57883,9 @@ <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='147' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_state_dump' mangled-name='drm_state_dump' filepath='drivers/gpu/drm/drm_atomic.c' line='1503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_state_dump'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic.c' line='1503' column='1'/> - <parameter type-id='7ac48c21' name='p' filepath='drivers/gpu/drm/drm_atomic.c' line='1503' column='1'/> + <function-decl name='drm_state_dump' mangled-name='drm_state_dump' filepath='drivers/gpu/drm/drm_atomic.c' line='1502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_state_dump'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic.c' line='1502' column='1'/> + <parameter type-id='7ac48c21' name='p' filepath='drivers/gpu/drm/drm_atomic.c' line='1502' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='drm_atomic_state_default_release' mangled-name='drm_atomic_state_default_release' filepath='drivers/gpu/drm/drm_atomic.c' line='63' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_state_default_release'> @@ -57958,19 +57904,12 @@ <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic.c' line='118' column='1'/> <return type-id='e3dd029e'/> </function-decl> - <function-decl name='drm_atomic_private_obj_init' mangled-name='drm_atomic_private_obj_init' filepath='drivers/gpu/drm/drm_atomic.c' line='722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_private_obj_init'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_atomic.c' line='722' column='1'/> - <parameter type-id='11c98e9a' name='obj' filepath='drivers/gpu/drm/drm_atomic.c' line='723' column='1'/> - <parameter type-id='4ea020ae' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='724' column='1'/> - <parameter type-id='515fa1af' name='funcs' filepath='drivers/gpu/drm/drm_atomic.c' line='725' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='drm_atomic_private_obj_fini' mangled-name='drm_atomic_private_obj_fini' filepath='drivers/gpu/drm/drm_atomic.c' line='744' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_private_obj_fini'> <parameter type-id='11c98e9a' name='obj' filepath='drivers/gpu/drm/drm_atomic.c' line='744' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_atomic_commit' mangled-name='drm_atomic_commit' filepath='drivers/gpu/drm/drm_atomic.c' line='1215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_commit'> - <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='1215' column='1'/> + <function-decl name='drm_atomic_commit' mangled-name='drm_atomic_commit' filepath='drivers/gpu/drm/drm_atomic.c' line='1214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_atomic_commit'> + <parameter type-id='e3dd029e' name='state' filepath='drivers/gpu/drm/drm_atomic.c' line='1214' column='1'/> <return type-id='95e97e5e'/> </function-decl> <pointer-type-def type-id='6d7d60df' size-in-bits='64' id='515fa1af'/> @@ -62526,38 +62465,38 @@ <parameter type-id='95e97e5e' name='connector_type' filepath='drivers/gpu/drm/drm_connector.c' line='198' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_connector_list_iter_next' mangled-name='drm_connector_list_iter_next' filepath='drivers/gpu/drm/drm_connector.c' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_next'> - <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='680' column='1'/> + <function-decl name='drm_connector_list_iter_next' mangled-name='drm_connector_list_iter_next' filepath='drivers/gpu/drm/drm_connector.c' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_next'> + <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='677' column='1'/> <return type-id='4db02c58'/> </function-decl> - <function-decl name='drm_connector_list_iter_end' mangled-name='drm_connector_list_iter_end' filepath='drivers/gpu/drm/drm_connector.c' line='719' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_end'> - <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='719' column='1'/> + <function-decl name='drm_connector_list_iter_end' mangled-name='drm_connector_list_iter_end' filepath='drivers/gpu/drm/drm_connector.c' line='716' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_end'> + <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='716' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_connector_update_edid_property' mangled-name='drm_connector_update_edid_property' filepath='drivers/gpu/drm/drm_connector.c' line='1938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_update_edid_property'> - <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='1938' column='1'/> - <parameter type-id='776adf76' name='edid' filepath='drivers/gpu/drm/drm_connector.c' line='1939' column='1'/> + <function-decl name='drm_connector_update_edid_property' mangled-name='drm_connector_update_edid_property' filepath='drivers/gpu/drm/drm_connector.c' line='1935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_update_edid_property'> + <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='1935' column='1'/> + <parameter type-id='776adf76' name='edid' filepath='drivers/gpu/drm/drm_connector.c' line='1936' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_mode_create_dp_colorspace_property' mangled-name='drm_mode_create_dp_colorspace_property' filepath='drivers/gpu/drm/drm_connector.c' line='1780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_create_dp_colorspace_property'> - <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='1780' column='1'/> + <function-decl name='drm_mode_create_dp_colorspace_property' mangled-name='drm_mode_create_dp_colorspace_property' filepath='drivers/gpu/drm/drm_connector.c' line='1777' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_create_dp_colorspace_property'> + <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='1777' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_get_connector_status_name' mangled-name='drm_get_connector_status_name' filepath='drivers/gpu/drm/drm_connector.c' line='595' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_get_connector_status_name'> - <parameter type-id='f7b0e1b4' name='status' filepath='drivers/gpu/drm/drm_connector.c' line='595' column='1'/> + <function-decl name='drm_get_connector_status_name' mangled-name='drm_get_connector_status_name' filepath='drivers/gpu/drm/drm_connector.c' line='592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_get_connector_status_name'> + <parameter type-id='f7b0e1b4' name='status' filepath='drivers/gpu/drm/drm_connector.c' line='592' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='drm_connector_unregister' mangled-name='drm_connector_unregister' filepath='drivers/gpu/drm/drm_connector.c' line='539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_unregister'> - <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='539' column='1'/> + <function-decl name='drm_connector_unregister' mangled-name='drm_connector_unregister' filepath='drivers/gpu/drm/drm_connector.c' line='536' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_unregister'> + <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='536' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_connector_register' mangled-name='drm_connector_register' filepath='drivers/gpu/drm/drm_connector.c' line='492' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_register'> - <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='492' column='1'/> + <function-decl name='drm_connector_register' mangled-name='drm_connector_register' filepath='drivers/gpu/drm/drm_connector.c' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_register'> + <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_connector.c' line='489' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_connector_list_iter_begin' mangled-name='drm_connector_list_iter_begin' filepath='drivers/gpu/drm/drm_connector.c' line='644' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_begin'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_connector.c' line='644' column='1'/> - <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='645' column='1'/> + <function-decl name='drm_connector_list_iter_begin' mangled-name='drm_connector_list_iter_begin' filepath='drivers/gpu/drm/drm_connector.c' line='641' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_list_iter_begin'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_connector.c' line='641' column='1'/> + <parameter type-id='40a902ec' name='iter' filepath='drivers/gpu/drm/drm_connector.c' line='642' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='drm_connector_has_possible_encoder' mangled-name='drm_connector_has_possible_encoder' filepath='drivers/gpu/drm/drm_connector.c' line='403' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_connector_has_possible_encoder'> @@ -70363,13 +70302,13 @@ <parameter type-id='d00fb93a' name='buf' filepath='drivers/gpu/drm/drm_fourcc.c' line='138' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='drm_get_format_info' mangled-name='drm_get_format_info' filepath='drivers/gpu/drm/drm_fourcc.c' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_get_format_info'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_fourcc.c' line='324' column='1'/> - <parameter type-id='92ed24a5' name='mode_cmd' filepath='drivers/gpu/drm/drm_fourcc.c' line='325' column='1'/> + <function-decl name='drm_get_format_info' mangled-name='drm_get_format_info' filepath='drivers/gpu/drm/drm_fourcc.c' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_get_format_info'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_fourcc.c' line='320' column='1'/> + <parameter type-id='92ed24a5' name='mode_cmd' filepath='drivers/gpu/drm/drm_fourcc.c' line='321' column='1'/> <return type-id='f10b2208'/> </function-decl> - <function-decl name='drm_format_info' mangled-name='drm_format_info' filepath='drivers/gpu/drm/drm_fourcc.c' line='304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_format_info'> - <parameter type-id='19c2251e' name='format' filepath='drivers/gpu/drm/drm_fourcc.c' line='304' column='1'/> + <function-decl name='drm_format_info' mangled-name='drm_format_info' filepath='drivers/gpu/drm/drm_fourcc.c' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_format_info'> + <parameter type-id='19c2251e' name='format' filepath='drivers/gpu/drm/drm_fourcc.c' line='300' column='1'/> <return type-id='f10b2208'/> </function-decl> </abi-instr> @@ -70400,28 +70339,28 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/gpu/drm/drm_gem.c' language='LANG_C89'> - <function-decl name='drm_gem_object_put_unlocked' mangled-name='drm_gem_object_put_unlocked' filepath='drivers/gpu/drm/drm_gem.c' line='985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_put_unlocked'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='985' column='1'/> + <function-decl name='drm_gem_object_put_unlocked' mangled-name='drm_gem_object_put_unlocked' filepath='drivers/gpu/drm/drm_gem.c' line='1000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_put_unlocked'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='1000' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_object_lookup' mangled-name='drm_gem_object_lookup' filepath='drivers/gpu/drm/drm_gem.c' line='733' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_lookup'> - <parameter type-id='9e99ecc1' name='filp' filepath='drivers/gpu/drm/drm_gem.c' line='733' column='1'/> - <parameter type-id='19c2251e' name='handle' filepath='drivers/gpu/drm/drm_gem.c' line='733' column='1'/> + <function-decl name='drm_gem_object_lookup' mangled-name='drm_gem_object_lookup' filepath='drivers/gpu/drm/drm_gem.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_lookup'> + <parameter type-id='9e99ecc1' name='filp' filepath='drivers/gpu/drm/drm_gem.c' line='748' column='1'/> + <parameter type-id='19c2251e' name='handle' filepath='drivers/gpu/drm/drm_gem.c' line='748' column='1'/> <return type-id='abd62a96'/> </function-decl> - <function-decl name='drm_gem_vm_open' mangled-name='drm_gem_vm_open' filepath='drivers/gpu/drm/drm_gem.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_vm_open'> - <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1034' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='drm_gem_vm_close' mangled-name='drm_gem_vm_close' filepath='drivers/gpu/drm/drm_gem.c' line='1049' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_vm_close'> + <function-decl name='drm_gem_vm_open' mangled-name='drm_gem_vm_open' filepath='drivers/gpu/drm/drm_gem.c' line='1049' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_vm_open'> <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1049' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_put_pages' mangled-name='drm_gem_put_pages' filepath='drivers/gpu/drm/drm_gem.c' line='601' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_put_pages'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='601' column='1'/> - <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_gem.c' line='601' column='1'/> - <parameter type-id='b50a4934' name='dirty' filepath='drivers/gpu/drm/drm_gem.c' line='602' column='1'/> - <parameter type-id='b50a4934' name='accessed' filepath='drivers/gpu/drm/drm_gem.c' line='602' column='1'/> + <function-decl name='drm_gem_vm_close' mangled-name='drm_gem_vm_close' filepath='drivers/gpu/drm/drm_gem.c' line='1064' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_vm_close'> + <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1064' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='drm_gem_put_pages' mangled-name='drm_gem_put_pages' filepath='drivers/gpu/drm/drm_gem.c' line='616' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_put_pages'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='616' column='1'/> + <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_gem.c' line='616' column='1'/> + <parameter type-id='b50a4934' name='dirty' filepath='drivers/gpu/drm/drm_gem.c' line='617' column='1'/> + <parameter type-id='b50a4934' name='accessed' filepath='drivers/gpu/drm/drm_gem.c' line='617' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='drm_gem_private_object_init' mangled-name='drm_gem_private_object_init' filepath='drivers/gpu/drm/drm_gem.c' line='151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_private_object_init'> @@ -70430,12 +70369,12 @@ <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_gem.c' line='152' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_object_release' mangled-name='drm_gem_object_release' filepath='drivers/gpu/drm/drm_gem.c' line='935' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_release'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='935' column='1'/> + <function-decl name='drm_gem_object_release' mangled-name='drm_gem_object_release' filepath='drivers/gpu/drm/drm_gem.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_release'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='950' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_object_put' mangled-name='drm_gem_object_put' filepath='drivers/gpu/drm/drm_gem.c' line='1017' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_put'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='1017' column='1'/> + <function-decl name='drm_gem_object_put' mangled-name='drm_gem_object_put' filepath='drivers/gpu/drm/drm_gem.c' line='1032' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_put'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='1032' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='drm_gem_object_init' mangled-name='drm_gem_object_init' filepath='drivers/gpu/drm/drm_gem.c' line='124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_object_init'> @@ -70444,40 +70383,40 @@ <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_gem.c' line='125' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_mmap_obj' mangled-name='drm_gem_mmap_obj' filepath='drivers/gpu/drm/drm_gem.c' line='1081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_mmap_obj'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='1081' column='1'/> - <parameter type-id='7359adad' name='obj_size' filepath='drivers/gpu/drm/drm_gem.c' line='1081' column='1'/> - <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1082' column='1'/> + <function-decl name='drm_gem_mmap_obj' mangled-name='drm_gem_mmap_obj' filepath='drivers/gpu/drm/drm_gem.c' line='1096' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_mmap_obj'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='1096' column='1'/> + <parameter type-id='7359adad' name='obj_size' filepath='drivers/gpu/drm/drm_gem.c' line='1096' column='1'/> + <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1097' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_mmap' mangled-name='drm_gem_mmap' filepath='drivers/gpu/drm/drm_gem.c' line='1129' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_mmap'> - <parameter type-id='77e79a4b' name='filp' filepath='drivers/gpu/drm/drm_gem.c' line='1129' column='1'/> - <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1129' column='1'/> + <function-decl name='drm_gem_mmap' mangled-name='drm_gem_mmap' filepath='drivers/gpu/drm/drm_gem.c' line='1144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_mmap'> + <parameter type-id='77e79a4b' name='filp' filepath='drivers/gpu/drm/drm_gem.c' line='1144' column='1'/> + <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_gem.c' line='1144' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_handle_create' mangled-name='drm_gem_handle_create' filepath='drivers/gpu/drm/drm_gem.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_handle_create'> - <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_gem.c' line='429' column='1'/> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='430' column='1'/> - <parameter type-id='f9409001' name='handlep' filepath='drivers/gpu/drm/drm_gem.c' line='431' column='1'/> + <function-decl name='drm_gem_handle_create' mangled-name='drm_gem_handle_create' filepath='drivers/gpu/drm/drm_gem.c' line='444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_handle_create'> + <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_gem.c' line='444' column='1'/> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='445' column='1'/> + <parameter type-id='f9409001' name='handlep' filepath='drivers/gpu/drm/drm_gem.c' line='446' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_get_pages' mangled-name='drm_gem_get_pages' filepath='drivers/gpu/drm/drm_gem.c' line='538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_get_pages'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='538' column='1'/> + <function-decl name='drm_gem_get_pages' mangled-name='drm_gem_get_pages' filepath='drivers/gpu/drm/drm_gem.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_get_pages'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='553' column='1'/> <return type-id='9f93c9da'/> </function-decl> - <function-decl name='drm_gem_free_mmap_offset' mangled-name='drm_gem_free_mmap_offset' filepath='drivers/gpu/drm/drm_gem.c' line='451' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_free_mmap_offset'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='451' column='1'/> + <function-decl name='drm_gem_free_mmap_offset' mangled-name='drm_gem_free_mmap_offset' filepath='drivers/gpu/drm/drm_gem.c' line='466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_free_mmap_offset'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='466' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_dumb_map_offset' mangled-name='drm_gem_dumb_map_offset' filepath='drivers/gpu/drm/drm_gem.c' line='298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dumb_map_offset'> - <parameter type-id='9e99ecc1' name='file' filepath='drivers/gpu/drm/drm_gem.c' line='298' column='1'/> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_gem.c' line='298' column='1'/> - <parameter type-id='19c2251e' name='handle' filepath='drivers/gpu/drm/drm_gem.c' line='299' column='1'/> - <parameter type-id='3df9fd28' name='offset' filepath='drivers/gpu/drm/drm_gem.c' line='299' column='1'/> + <function-decl name='drm_gem_dumb_map_offset' mangled-name='drm_gem_dumb_map_offset' filepath='drivers/gpu/drm/drm_gem.c' line='313' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dumb_map_offset'> + <parameter type-id='9e99ecc1' name='file' filepath='drivers/gpu/drm/drm_gem.c' line='313' column='1'/> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_gem.c' line='313' column='1'/> + <parameter type-id='19c2251e' name='handle' filepath='drivers/gpu/drm/drm_gem.c' line='314' column='1'/> + <parameter type-id='3df9fd28' name='offset' filepath='drivers/gpu/drm/drm_gem.c' line='314' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_create_mmap_offset' mangled-name='drm_gem_create_mmap_offset' filepath='drivers/gpu/drm/drm_gem.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_create_mmap_offset'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='500' column='1'/> + <function-decl name='drm_gem_create_mmap_offset' mangled-name='drm_gem_create_mmap_offset' filepath='drivers/gpu/drm/drm_gem.c' line='515' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_create_mmap_offset'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_gem.c' line='515' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -70527,27 +70466,18 @@ <array-type-def dimensions='1' type-id='28271da3' size-in-bits='infinite' id='f5432a6f'> <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/> </array-type-def> - <class-decl name='drm_mm' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='186' column='1' id='0b8ea949'> + <class-decl name='drm_vma_offset_node' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/drm/drm_vma_manager.h' line='52' column='1' id='743d7e52'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='color_adjust' type-id='4bcdfb80' visibility='default' filepath='include/drm/drm_mm.h' line='196' column='1'/> + <var-decl name='vm_lock' type-id='ac16795b' visibility='default' filepath='include/drm/drm_vma_manager.h' line='53' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='hole_stack' type-id='72f469ec' visibility='default' filepath='include/drm/drm_mm.h' line='202' column='1'/> + <var-decl name='vm_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_vma_manager.h' line='54' column='1'/> </data-member> - <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='head_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_mm.h' line='205' column='1'/> + <data-member access='public' layout-offset-in-bits='1344'> + <var-decl name='vm_files' type-id='dec44472' visibility='default' filepath='include/drm/drm_vma_manager.h' line='55' column='1'/> </data-member> - <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='interval_tree' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='207' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='holes_size' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='208' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='holes_addr' type-id='dec44472' visibility='default' filepath='include/drm/drm_mm.h' line='209' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='scan_active' type-id='7359adad' visibility='default' filepath='include/drm/drm_mm.h' line='211' column='1'/> + <data-member access='public' layout-offset-in-bits='0'> + <var-decl name='readonly' type-id='b50a4934' visibility='default' filepath='include/drm/drm_vma_manager.h' line='56' column='1'/> </data-member> </class-decl> <class-decl name='drm_mm_node' size-in-bits='1280' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='155' column='1' id='60498a7e'> @@ -70591,18 +70521,27 @@ <var-decl name='scanned_block' type-id='b50a4934' visibility='default' filepath='include/drm/drm_mm.h' line='172' column='1'/> </data-member> </class-decl> - <class-decl name='drm_vma_offset_node' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/drm/drm_vma_manager.h' line='52' column='1' id='743d7e52'> + <class-decl name='drm_mm' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/drm/drm_mm.h' line='186' column='1' id='0b8ea949'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='vm_lock' type-id='ac16795b' visibility='default' filepath='include/drm/drm_vma_manager.h' line='53' column='1'/> + <var-decl name='color_adjust' type-id='4bcdfb80' visibility='default' filepath='include/drm/drm_mm.h' line='196' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='vm_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_vma_manager.h' line='54' column='1'/> + <var-decl name='hole_stack' type-id='72f469ec' visibility='default' filepath='include/drm/drm_mm.h' line='202' column='1'/> </data-member> - <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='vm_files' type-id='dec44472' visibility='default' filepath='include/drm/drm_vma_manager.h' line='55' column='1'/> + <data-member access='public' layout-offset-in-bits='192'> + <var-decl name='head_node' type-id='60498a7e' visibility='default' filepath='include/drm/drm_mm.h' line='205' column='1'/> </data-member> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='readonly' type-id='b50a4934' visibility='default' filepath='include/drm/drm_vma_manager.h' line='56' column='1'/> + <data-member access='public' layout-offset-in-bits='1472'> + <var-decl name='interval_tree' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='207' column='1'/> + </data-member> + <data-member access='public' layout-offset-in-bits='1600'> + <var-decl name='holes_size' type-id='6fe1603d' visibility='default' filepath='include/drm/drm_mm.h' line='208' column='1'/> + </data-member> + <data-member access='public' layout-offset-in-bits='1728'> + <var-decl name='holes_addr' type-id='dec44472' visibility='default' filepath='include/drm/drm_mm.h' line='209' column='1'/> + </data-member> + <data-member access='public' layout-offset-in-bits='1792'> + <var-decl name='scan_active' type-id='7359adad' visibility='default' filepath='include/drm/drm_mm.h' line='211' column='1'/> </data-member> </class-decl> <class-decl name='dma_buf_ops' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/linux/dma-buf.h' line='36' column='1' id='3f8b3d98'> @@ -70929,17 +70868,17 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/gpu/drm/drm_ioctl.c' language='LANG_C89'> - <function-decl name='drm_ioctl_kernel' mangled-name='drm_ioctl_kernel' filepath='drivers/gpu/drm/drm_ioctl.c' line='776' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_ioctl_kernel'> - <parameter type-id='77e79a4b' name='file' filepath='drivers/gpu/drm/drm_ioctl.c' line='776' column='1'/> - <parameter type-id='e2cefc47' name='func' filepath='drivers/gpu/drm/drm_ioctl.c' line='776' column='1'/> - <parameter type-id='eaa32e2f' name='kdata' filepath='drivers/gpu/drm/drm_ioctl.c' line='776' column='1'/> - <parameter type-id='19c2251e' name='flags' filepath='drivers/gpu/drm/drm_ioctl.c' line='777' column='1'/> + <function-decl name='drm_ioctl_kernel' mangled-name='drm_ioctl_kernel' filepath='drivers/gpu/drm/drm_ioctl.c' line='770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_ioctl_kernel'> + <parameter type-id='77e79a4b' name='file' filepath='drivers/gpu/drm/drm_ioctl.c' line='770' column='1'/> + <parameter type-id='e2cefc47' name='func' filepath='drivers/gpu/drm/drm_ioctl.c' line='770' column='1'/> + <parameter type-id='eaa32e2f' name='kdata' filepath='drivers/gpu/drm/drm_ioctl.c' line='770' column='1'/> + <parameter type-id='19c2251e' name='flags' filepath='drivers/gpu/drm/drm_ioctl.c' line='771' column='1'/> <return type-id='bd54fe1a'/> </function-decl> - <function-decl name='drm_ioctl' mangled-name='drm_ioctl' filepath='drivers/gpu/drm/drm_ioctl.c' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_ioctl'> - <parameter type-id='77e79a4b' name='filp' filepath='drivers/gpu/drm/drm_ioctl.c' line='816' column='1'/> - <parameter type-id='f0981eeb' name='cmd' filepath='drivers/gpu/drm/drm_ioctl.c' line='817' column='1'/> - <parameter type-id='7359adad' name='arg' filepath='drivers/gpu/drm/drm_ioctl.c' line='817' column='1'/> + <function-decl name='drm_ioctl' mangled-name='drm_ioctl' filepath='drivers/gpu/drm/drm_ioctl.c' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_ioctl'> + <parameter type-id='77e79a4b' name='filp' filepath='drivers/gpu/drm/drm_ioctl.c' line='810' column='1'/> + <parameter type-id='f0981eeb' name='cmd' filepath='drivers/gpu/drm/drm_ioctl.c' line='811' column='1'/> + <parameter type-id='7359adad' name='arg' filepath='drivers/gpu/drm/drm_ioctl.c' line='811' column='1'/> <return type-id='bd54fe1a'/> </function-decl> </abi-instr> @@ -71056,18 +70995,18 @@ <var-decl name='node' type-id='9a537bbe' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='168' column='1'/> </data-member> </class-decl> - <class-decl name='mipi_dsi_driver' size-in-bits='1600' is-struct='yes' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='306' column='1' id='51d715c2'> + <class-decl name='mipi_dsi_driver' size-in-bits='1600' is-struct='yes' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='302' column='1' id='51d715c2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='driver' type-id='fe007c02' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='307' column='1'/> + <var-decl name='driver' type-id='fe007c02' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='303' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='probe' type-id='289e8bdc' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='308' column='1'/> + <var-decl name='probe' type-id='289e8bdc' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='304' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='remove' type-id='289e8bdc' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='309' column='1'/> + <var-decl name='remove' type-id='289e8bdc' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='305' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='shutdown' type-id='fea4b945' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='310' column='1'/> + <var-decl name='shutdown' type-id='fea4b945' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='306' column='1'/> </data-member> </class-decl> <class-decl name='mipi_dsi_packet' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/drm/drm_mipi_dsi.h' line='63' column='1' id='7e369584'> @@ -71102,17 +71041,17 @@ <parameter type-id='9a537bbe' name='node' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='261' column='1'/> <return type-id='c149fe34'/> </function-decl> - <function-decl name='mipi_dsi_set_maximum_return_packet_size' mangled-name='mipi_dsi_set_maximum_return_packet_size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='535' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_set_maximum_return_packet_size'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='535' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='536' column='1'/> + <function-decl name='mipi_dsi_set_maximum_return_packet_size' mangled-name='mipi_dsi_set_maximum_return_packet_size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_set_maximum_return_packet_size'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='534' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='535' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mipi_dsi_packet_format_is_long' mangled-name='mipi_dsi_packet_format_is_long' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_packet_format_is_long'> - <parameter type-id='f9b06939' name='type' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='408' column='1'/> + <function-decl name='mipi_dsi_packet_format_is_long' mangled-name='mipi_dsi_packet_format_is_long' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='407' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_packet_format_is_long'> + <parameter type-id='f9b06939' name='type' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='407' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='mipi_dsi_host_unregister' mangled-name='mipi_dsi_host_unregister' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_host_unregister'> - <parameter type-id='c149fe34' name='host' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='309' column='1'/> + <function-decl name='mipi_dsi_host_unregister' mangled-name='mipi_dsi_host_unregister' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_host_unregister'> + <parameter type-id='c149fe34' name='host' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='308' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='mipi_dsi_host_register' mangled-name='mipi_dsi_host_register' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_host_register'> @@ -71124,66 +71063,66 @@ <parameter type-id='4b2c3420' name='info' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='201' column='1'/> <return type-id='182be7cc'/> </function-decl> - <function-decl name='mipi_dsi_generic_write' mangled-name='mipi_dsi_generic_write' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_generic_write'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='563' column='1'/> - <parameter type-id='eaa32e2f' name='payload' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='563' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='564' column='1'/> + <function-decl name='mipi_dsi_generic_write' mangled-name='mipi_dsi_generic_write' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='562' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_generic_write'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='562' column='1'/> + <parameter type-id='eaa32e2f' name='payload' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='562' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='563' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='mipi_dsi_generic_read' mangled-name='mipi_dsi_generic_read' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_generic_read'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1'/> - <parameter type-id='eaa32e2f' name='params' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1'/> - <parameter type-id='b59d7dce' name='num_params' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='609' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='609' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='609' column='1'/> + <function-decl name='mipi_dsi_generic_read' mangled-name='mipi_dsi_generic_read' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_generic_read'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='607' column='1'/> + <parameter type-id='eaa32e2f' name='params' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='607' column='1'/> + <parameter type-id='b59d7dce' name='num_params' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='608' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='mipi_dsi_driver_unregister' mangled-name='mipi_dsi_driver_unregister' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_driver_unregister'> - <parameter type-id='0588e2f0' name='drv' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1201' column='1'/> + <function-decl name='mipi_dsi_driver_unregister' mangled-name='mipi_dsi_driver_unregister' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1148' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_driver_unregister'> + <parameter type-id='0588e2f0' name='drv' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1148' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mipi_dsi_driver_register_full' mangled-name='mipi_dsi_driver_register_full' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_driver_register_full'> - <parameter type-id='0588e2f0' name='drv' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1178' column='1'/> - <parameter type-id='2730d015' name='owner' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1179' column='1'/> + <function-decl name='mipi_dsi_driver_register_full' mangled-name='mipi_dsi_driver_register_full' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_driver_register_full'> + <parameter type-id='0588e2f0' name='drv' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1125' column='1'/> + <parameter type-id='2730d015' name='owner' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1126' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='mipi_dsi_device_unregister' mangled-name='mipi_dsi_device_unregister' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_device_unregister'> <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='243' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mipi_dsi_detach' mangled-name='mipi_dsi_detach' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_detach'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='338' column='1'/> + <function-decl name='mipi_dsi_detach' mangled-name='mipi_dsi_detach' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_detach'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='337' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mipi_dsi_dcs_write_buffer' mangled-name='mipi_dsi_dcs_write_buffer' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_write_buffer'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='652' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='653' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='653' column='1'/> + <function-decl name='mipi_dsi_dcs_write_buffer' mangled-name='mipi_dsi_dcs_write_buffer' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='651' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_write_buffer'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='651' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='652' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='652' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='mipi_dsi_dcs_set_tear_off' mangled-name='mipi_dsi_dcs_set_tear_off' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_set_tear_off'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='968' column='1'/> + <function-decl name='mipi_dsi_dcs_set_tear_off' mangled-name='mipi_dsi_dcs_set_tear_off' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_set_tear_off'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='967' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mipi_dsi_dcs_set_display_brightness' mangled-name='mipi_dsi_dcs_set_display_brightness' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_set_display_brightness'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1054' column='1'/> - <parameter type-id='1dc6a898' name='brightness' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1055' column='1'/> + <function-decl name='mipi_dsi_dcs_set_display_brightness' mangled-name='mipi_dsi_dcs_set_display_brightness' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_set_display_brightness'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1053' column='1'/> + <parameter type-id='1dc6a898' name='brightness' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='1054' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mipi_dsi_dcs_read' mangled-name='mipi_dsi_dcs_read' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_read'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='735' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='735' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='735' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='736' column='1'/> + <function-decl name='mipi_dsi_dcs_read' mangled-name='mipi_dsi_dcs_read' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='734' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_dcs_read'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='734' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='734' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='734' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='735' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='mipi_dsi_create_packet' mangled-name='mipi_dsi_create_packet' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_create_packet'> - <parameter type-id='368a0122' name='packet' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='441' column='1'/> - <parameter type-id='001b67aa' name='msg' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='442' column='1'/> + <function-decl name='mipi_dsi_create_packet' mangled-name='mipi_dsi_create_packet' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='440' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_create_packet'> + <parameter type-id='368a0122' name='packet' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='440' column='1'/> + <parameter type-id='001b67aa' name='msg' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='441' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mipi_dsi_attach' mangled-name='mipi_dsi_attach' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_attach'> - <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='323' column='1'/> + <function-decl name='mipi_dsi_attach' mangled-name='mipi_dsi_attach' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mipi_dsi_attach'> + <parameter type-id='182be7cc' name='dsi' filepath='drivers/gpu/drm/drm_mipi_dsi.c' line='322' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='ce6ad852'> @@ -71348,6 +71287,11 @@ <pointer-type-def type-id='c2623161' size-in-bits='64' id='4b939911'/> <qualified-type-def type-id='70ab3bc7' const='yes' id='ceff8680'/> <pointer-type-def type-id='ceff8680' size-in-bits='64' id='8640fd9e'/> + <function-decl name='drm_mode_probed_add' mangled-name='drm_mode_probed_add' filepath='drivers/gpu/drm/drm_modes.c' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_probed_add'> + <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_modes.c' line='107' column='1'/> + <parameter type-id='11e02f83' name='mode' filepath='drivers/gpu/drm/drm_modes.c' line='108' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='drm_mode_set_crtcinfo' mangled-name='drm_mode_set_crtcinfo' filepath='drivers/gpu/drm/drm_modes.c' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_set_crtcinfo'> <parameter type-id='11e02f83' name='p' filepath='drivers/gpu/drm/drm_modes.c' line='843' column='1'/> <parameter type-id='95e97e5e' name='adjust_flags' filepath='drivers/gpu/drm/drm_modes.c' line='843' column='1'/> @@ -71379,11 +71323,6 @@ <parameter type-id='11e02f83' name='mode' filepath='drivers/gpu/drm/drm_modes.c' line='739' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_mode_probed_add' mangled-name='drm_mode_probed_add' filepath='drivers/gpu/drm/drm_modes.c' line='107' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_probed_add'> - <parameter type-id='4db02c58' name='connector' filepath='drivers/gpu/drm/drm_modes.c' line='107' column='1'/> - <parameter type-id='11e02f83' name='mode' filepath='drivers/gpu/drm/drm_modes.c' line='108' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='drm_mode_equal' mangled-name='drm_mode_equal' filepath='drivers/gpu/drm/drm_modes.c' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_mode_equal'> <parameter type-id='745b39e8' name='mode1' filepath='drivers/gpu/drm/drm_modes.c' line='1053' column='1'/> <parameter type-id='745b39e8' name='mode2' filepath='drivers/gpu/drm/drm_modes.c' line='1054' column='1'/> @@ -71772,66 +71711,66 @@ </data-member> </class-decl> <pointer-type-def type-id='4da0249b' size-in-bits='64' id='3bc4f0bb'/> - <function-decl name='drm_prime_sg_to_page_addr_arrays' mangled-name='drm_prime_sg_to_page_addr_arrays' filepath='drivers/gpu/drm/drm_prime.c' line='974' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_sg_to_page_addr_arrays'> - <parameter type-id='4adb0e6a' name='sgt' filepath='drivers/gpu/drm/drm_prime.c' line='974' column='1'/> - <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_prime.c' line='974' column='1'/> - <parameter type-id='e835b5d8' name='addrs' filepath='drivers/gpu/drm/drm_prime.c' line='975' column='1'/> - <parameter type-id='95e97e5e' name='max_entries' filepath='drivers/gpu/drm/drm_prime.c' line='975' column='1'/> + <function-decl name='drm_prime_sg_to_page_addr_arrays' mangled-name='drm_prime_sg_to_page_addr_arrays' filepath='drivers/gpu/drm/drm_prime.c' line='970' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_sg_to_page_addr_arrays'> + <parameter type-id='4adb0e6a' name='sgt' filepath='drivers/gpu/drm/drm_prime.c' line='970' column='1'/> + <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_prime.c' line='970' column='1'/> + <parameter type-id='e835b5d8' name='addrs' filepath='drivers/gpu/drm/drm_prime.c' line='971' column='1'/> + <parameter type-id='95e97e5e' name='max_entries' filepath='drivers/gpu/drm/drm_prime.c' line='971' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_prime_pages_to_sg' mangled-name='drm_prime_pages_to_sg' filepath='drivers/gpu/drm/drm_prime.c' line='820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_pages_to_sg'> - <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_prime.c' line='820' column='1'/> - <parameter type-id='f0981eeb' name='nr_pages' filepath='drivers/gpu/drm/drm_prime.c' line='820' column='1'/> + <function-decl name='drm_prime_pages_to_sg' mangled-name='drm_prime_pages_to_sg' filepath='drivers/gpu/drm/drm_prime.c' line='816' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_pages_to_sg'> + <parameter type-id='9f93c9da' name='pages' filepath='drivers/gpu/drm/drm_prime.c' line='816' column='1'/> + <parameter type-id='f0981eeb' name='nr_pages' filepath='drivers/gpu/drm/drm_prime.c' line='816' column='1'/> <return type-id='4adb0e6a'/> </function-decl> - <function-decl name='drm_prime_gem_destroy' mangled-name='drm_prime_gem_destroy' filepath='drivers/gpu/drm/drm_prime.c' line='1015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_gem_destroy'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='1015' column='1'/> - <parameter type-id='4adb0e6a' name='sg' filepath='drivers/gpu/drm/drm_prime.c' line='1015' column='1'/> + <function-decl name='drm_prime_gem_destroy' mangled-name='drm_prime_gem_destroy' filepath='drivers/gpu/drm/drm_prime.c' line='1011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_prime_gem_destroy'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='1011' column='1'/> + <parameter type-id='4adb0e6a' name='sg' filepath='drivers/gpu/drm/drm_prime.c' line='1011' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_prime_mmap' mangled-name='drm_gem_prime_mmap' filepath='drivers/gpu/drm/drm_prime.c' line='714' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_mmap'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='714' column='1'/> - <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_prime.c' line='714' column='1'/> + <function-decl name='drm_gem_prime_mmap' mangled-name='drm_gem_prime_mmap' filepath='drivers/gpu/drm/drm_prime.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_mmap'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='710' column='1'/> + <parameter type-id='2ae08426' name='vma' filepath='drivers/gpu/drm/drm_prime.c' line='710' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_prime_import_dev' mangled-name='drm_gem_prime_import_dev' filepath='drivers/gpu/drm/drm_prime.c' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_import_dev'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='884' column='1'/> - <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='885' column='1'/> - <parameter type-id='fa0b179b' name='attach_dev' filepath='drivers/gpu/drm/drm_prime.c' line='886' column='1'/> + <function-decl name='drm_gem_prime_import_dev' mangled-name='drm_gem_prime_import_dev' filepath='drivers/gpu/drm/drm_prime.c' line='880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_import_dev'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='880' column='1'/> + <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='881' column='1'/> + <parameter type-id='fa0b179b' name='attach_dev' filepath='drivers/gpu/drm/drm_prime.c' line='882' column='1'/> <return type-id='abd62a96'/> </function-decl> - <function-decl name='drm_gem_dmabuf_release' mangled-name='drm_gem_dmabuf_release' filepath='drivers/gpu/drm/drm_prime.c' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dmabuf_release'> - <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='269' column='1'/> + <function-decl name='drm_gem_dmabuf_release' mangled-name='drm_gem_dmabuf_release' filepath='drivers/gpu/drm/drm_prime.c' line='265' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dmabuf_release'> + <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='265' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='drm_gem_prime_import' mangled-name='drm_gem_prime_import' filepath='drivers/gpu/drm/drm_prime.c' line='954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_import'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='954' column='1'/> - <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='955' column='1'/> + <function-decl name='drm_gem_prime_import' mangled-name='drm_gem_prime_import' filepath='drivers/gpu/drm/drm_prime.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_import'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='950' column='1'/> + <parameter type-id='5e4f599b' name='dma_buf' filepath='drivers/gpu/drm/drm_prime.c' line='951' column='1'/> <return type-id='abd62a96'/> </function-decl> - <function-decl name='drm_gem_prime_handle_to_fd' mangled-name='drm_gem_prime_handle_to_fd' filepath='drivers/gpu/drm/drm_prime.c' line='426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_handle_to_fd'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='426' column='1'/> - <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_prime.c' line='427' column='1'/> - <parameter type-id='8f92235e' name='handle' filepath='drivers/gpu/drm/drm_prime.c' line='427' column='1'/> - <parameter type-id='8f92235e' name='flags' filepath='drivers/gpu/drm/drm_prime.c' line='428' column='1'/> - <parameter type-id='7292109c' name='prime_fd' filepath='drivers/gpu/drm/drm_prime.c' line='429' column='1'/> + <function-decl name='drm_gem_prime_handle_to_fd' mangled-name='drm_gem_prime_handle_to_fd' filepath='drivers/gpu/drm/drm_prime.c' line='422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_handle_to_fd'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='422' column='1'/> + <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_prime.c' line='423' column='1'/> + <parameter type-id='8f92235e' name='handle' filepath='drivers/gpu/drm/drm_prime.c' line='423' column='1'/> + <parameter type-id='8f92235e' name='flags' filepath='drivers/gpu/drm/drm_prime.c' line='424' column='1'/> + <parameter type-id='7292109c' name='prime_fd' filepath='drivers/gpu/drm/drm_prime.c' line='425' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_dmabuf_export' mangled-name='drm_gem_dmabuf_export' filepath='drivers/gpu/drm/drm_prime.c' line='244' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dmabuf_export'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='244' column='1'/> - <parameter type-id='3bc4f0bb' name='exp_info' filepath='drivers/gpu/drm/drm_prime.c' line='245' column='1'/> + <function-decl name='drm_gem_dmabuf_export' mangled-name='drm_gem_dmabuf_export' filepath='drivers/gpu/drm/drm_prime.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_dmabuf_export'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='240' column='1'/> + <parameter type-id='3bc4f0bb' name='exp_info' filepath='drivers/gpu/drm/drm_prime.c' line='241' column='1'/> <return type-id='5e4f599b'/> </function-decl> - <function-decl name='drm_gem_prime_fd_to_handle' mangled-name='drm_gem_prime_fd_to_handle' filepath='drivers/gpu/drm/drm_prime.c' line='295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_fd_to_handle'> - <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='295' column='1'/> - <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_prime.c' line='296' column='1'/> - <parameter type-id='95e97e5e' name='prime_fd' filepath='drivers/gpu/drm/drm_prime.c' line='296' column='1'/> - <parameter type-id='90421557' name='handle' filepath='drivers/gpu/drm/drm_prime.c' line='297' column='1'/> + <function-decl name='drm_gem_prime_fd_to_handle' mangled-name='drm_gem_prime_fd_to_handle' filepath='drivers/gpu/drm/drm_prime.c' line='291' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_fd_to_handle'> + <parameter type-id='8898134d' name='dev' filepath='drivers/gpu/drm/drm_prime.c' line='291' column='1'/> + <parameter type-id='9e99ecc1' name='file_priv' filepath='drivers/gpu/drm/drm_prime.c' line='292' column='1'/> + <parameter type-id='95e97e5e' name='prime_fd' filepath='drivers/gpu/drm/drm_prime.c' line='292' column='1'/> + <parameter type-id='90421557' name='handle' filepath='drivers/gpu/drm/drm_prime.c' line='293' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='drm_gem_prime_export' mangled-name='drm_gem_prime_export' filepath='drivers/gpu/drm/drm_prime.c' line='852' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_export'> - <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='852' column='1'/> - <parameter type-id='95e97e5e' name='flags' filepath='drivers/gpu/drm/drm_prime.c' line='853' column='1'/> + <function-decl name='drm_gem_prime_export' mangled-name='drm_gem_prime_export' filepath='drivers/gpu/drm/drm_prime.c' line='848' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drm_gem_prime_export'> + <parameter type-id='abd62a96' name='obj' filepath='drivers/gpu/drm/drm_prime.c' line='848' column='1'/> + <parameter type-id='95e97e5e' name='flags' filepath='drivers/gpu/drm/drm_prime.c' line='849' column='1'/> <return type-id='5e4f599b'/> </function-decl> </abi-instr> @@ -73973,10 +73912,10 @@ <parameter type-id='b9af02c3' name='adap' filepath='drivers/i2c/i2c-core-base.c' line='245' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='i2c_put_dma_safe_msg_buf' mangled-name='i2c_put_dma_safe_msg_buf' filepath='drivers/i2c/i2c-core-base.c' line='2407' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_put_dma_safe_msg_buf'> - <parameter type-id='8bff8096' name='buf' filepath='drivers/i2c/i2c-core-base.c' line='2407' column='1'/> - <parameter type-id='cd44bc95' name='msg' filepath='drivers/i2c/i2c-core-base.c' line='2407' column='1'/> - <parameter type-id='b50a4934' name='xferred' filepath='drivers/i2c/i2c-core-base.c' line='2407' column='1'/> + <function-decl name='i2c_put_dma_safe_msg_buf' mangled-name='i2c_put_dma_safe_msg_buf' filepath='drivers/i2c/i2c-core-base.c' line='2406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_put_dma_safe_msg_buf'> + <parameter type-id='8bff8096' name='buf' filepath='drivers/i2c/i2c-core-base.c' line='2406' column='1'/> + <parameter type-id='cd44bc95' name='msg' filepath='drivers/i2c/i2c-core-base.c' line='2406' column='1'/> + <parameter type-id='b50a4934' name='xferred' filepath='drivers/i2c/i2c-core-base.c' line='2406' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='i2c_put_adapter' mangled-name='i2c_put_adapter' filepath='drivers/i2c/i2c-core-base.c' line='2356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_put_adapter'> @@ -74017,9 +73956,9 @@ <parameter type-id='1dc6a898' name='default_addr' filepath='drivers/i2c/i2c-core-base.c' line='1011' column='1'/> <return type-id='3e31633b'/> </function-decl> - <function-decl name='i2c_get_dma_safe_msg_buf' mangled-name='i2c_get_dma_safe_msg_buf' filepath='drivers/i2c/i2c-core-base.c' line='2379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_get_dma_safe_msg_buf'> - <parameter type-id='cd44bc95' name='msg' filepath='drivers/i2c/i2c-core-base.c' line='2379' column='1'/> - <parameter type-id='f0981eeb' name='threshold' filepath='drivers/i2c/i2c-core-base.c' line='2379' column='1'/> + <function-decl name='i2c_get_dma_safe_msg_buf' mangled-name='i2c_get_dma_safe_msg_buf' filepath='drivers/i2c/i2c-core-base.c' line='2378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_get_dma_safe_msg_buf'> + <parameter type-id='cd44bc95' name='msg' filepath='drivers/i2c/i2c-core-base.c' line='2378' column='1'/> + <parameter type-id='f0981eeb' name='threshold' filepath='drivers/i2c/i2c-core-base.c' line='2378' column='1'/> <return type-id='8bff8096'/> </function-decl> <function-decl name='i2c_get_adapter' mangled-name='i2c_get_adapter' filepath='drivers/i2c/i2c-core-base.c' line='2336' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='i2c_get_adapter'> @@ -75693,21 +75632,21 @@ </class-decl> <pointer-type-def type-id='63a6e12c' size-in-bits='64' id='2712709a'/> <pointer-type-def type-id='a8e1d4e9' size-in-bits='64' id='58dde3b1'/> - <function-decl name='iio_write_channel_attribute' mangled-name='iio_write_channel_attribute' filepath='drivers/iio/inkern.c' line='886' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_write_channel_attribute'> - <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='886' column='1'/> - <parameter type-id='95e97e5e' name='val' filepath='drivers/iio/inkern.c' line='886' column='1'/> - <parameter type-id='95e97e5e' name='val2' filepath='drivers/iio/inkern.c' line='886' column='1'/> - <parameter type-id='cda049ab' name='attribute' filepath='drivers/iio/inkern.c' line='887' column='1'/> + <function-decl name='iio_write_channel_attribute' mangled-name='iio_write_channel_attribute' filepath='drivers/iio/inkern.c' line='884' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_write_channel_attribute'> + <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='884' column='1'/> + <parameter type-id='95e97e5e' name='val' filepath='drivers/iio/inkern.c' line='884' column='1'/> + <parameter type-id='95e97e5e' name='val2' filepath='drivers/iio/inkern.c' line='884' column='1'/> + <parameter type-id='cda049ab' name='attribute' filepath='drivers/iio/inkern.c' line='885' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='iio_read_channel_raw' mangled-name='iio_read_channel_raw' filepath='drivers/iio/inkern.c' line='554' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_read_channel_raw'> - <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='554' column='1'/> - <parameter type-id='7292109c' name='val' filepath='drivers/iio/inkern.c' line='554' column='1'/> + <function-decl name='iio_read_channel_raw' mangled-name='iio_read_channel_raw' filepath='drivers/iio/inkern.c' line='552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_read_channel_raw'> + <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='552' column='1'/> + <parameter type-id='7292109c' name='val' filepath='drivers/iio/inkern.c' line='552' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='iio_read_channel_processed' mangled-name='iio_read_channel_processed' filepath='drivers/iio/inkern.c' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_read_channel_processed'> - <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='713' column='1'/> - <parameter type-id='7292109c' name='val' filepath='drivers/iio/inkern.c' line='713' column='1'/> + <function-decl name='iio_read_channel_processed' mangled-name='iio_read_channel_processed' filepath='drivers/iio/inkern.c' line='711' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_read_channel_processed'> + <parameter type-id='2712709a' name='chan' filepath='drivers/iio/inkern.c' line='711' column='1'/> + <parameter type-id='7292109c' name='val' filepath='drivers/iio/inkern.c' line='711' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='iio_map_array_unregister' mangled-name='iio_map_array_unregister' filepath='drivers/iio/inkern.c' line='58' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_map_array_unregister'> @@ -75719,18 +75658,18 @@ <parameter type-id='58dde3b1' name='maps' filepath='drivers/iio/inkern.c' line='27' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='iio_channel_release' mangled-name='iio_channel_release' filepath='drivers/iio/inkern.c' line='349' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_channel_release'> - <parameter type-id='2712709a' name='channel' filepath='drivers/iio/inkern.c' line='349' column='1'/> + <function-decl name='iio_channel_release' mangled-name='iio_channel_release' filepath='drivers/iio/inkern.c' line='347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_channel_release'> + <parameter type-id='2712709a' name='channel' filepath='drivers/iio/inkern.c' line='347' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='iio_channel_get' mangled-name='iio_channel_get' filepath='drivers/iio/inkern.c' line='332' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_channel_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/iio/inkern.c' line='332' column='1'/> - <parameter type-id='80f4b756' name='channel_name' filepath='drivers/iio/inkern.c' line='333' column='1'/> + <function-decl name='iio_channel_get' mangled-name='iio_channel_get' filepath='drivers/iio/inkern.c' line='330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iio_channel_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/iio/inkern.c' line='330' column='1'/> + <parameter type-id='80f4b756' name='channel_name' filepath='drivers/iio/inkern.c' line='331' column='1'/> <return type-id='2712709a'/> </function-decl> - <function-decl name='devm_iio_channel_get' mangled-name='devm_iio_channel_get' filepath='drivers/iio/inkern.c' line='377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_iio_channel_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/iio/inkern.c' line='377' column='1'/> - <parameter type-id='80f4b756' name='channel_name' filepath='drivers/iio/inkern.c' line='378' column='1'/> + <function-decl name='devm_iio_channel_get' mangled-name='devm_iio_channel_get' filepath='drivers/iio/inkern.c' line='375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_iio_channel_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/iio/inkern.c' line='375' column='1'/> + <parameter type-id='80f4b756' name='channel_name' filepath='drivers/iio/inkern.c' line='376' column='1'/> <return type-id='2712709a'/> </function-decl> </abi-instr> @@ -76909,34 +76848,34 @@ <parameter type-id='b5fdec5e' name='path' filepath='drivers/interconnect/core.c' line='527' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='icc_provider_del' mangled-name='icc_provider_del' filepath='drivers/interconnect/core.c' line='785' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_provider_del'> - <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='785' column='1'/> + <function-decl name='icc_provider_del' mangled-name='icc_provider_del' filepath='drivers/interconnect/core.c' line='781' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_provider_del'> + <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='781' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='icc_provider_add' mangled-name='icc_provider_add' filepath='drivers/interconnect/core.c' line='759' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_provider_add'> - <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='759' column='1'/> + <function-decl name='icc_provider_add' mangled-name='icc_provider_add' filepath='drivers/interconnect/core.c' line='755' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_provider_add'> + <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='755' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='icc_node_destroy' mangled-name='icc_node_destroy' filepath='drivers/interconnect/core.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_destroy'> <parameter type-id='95e97e5e' name='id' filepath='drivers/interconnect/core.c' line='603' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='icc_node_del' mangled-name='icc_node_del' filepath='drivers/interconnect/core.c' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_del'> - <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='743' column='1'/> + <function-decl name='icc_node_del' mangled-name='icc_node_del' filepath='drivers/interconnect/core.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_del'> + <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='739' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='icc_node_create' mangled-name='icc_node_create' filepath='drivers/interconnect/core.c' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_create'> <parameter type-id='95e97e5e' name='id' filepath='drivers/interconnect/core.c' line='585' column='1'/> <return type-id='18d76f87'/> </function-decl> - <function-decl name='icc_node_add' mangled-name='icc_node_add' filepath='drivers/interconnect/core.c' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_add'> - <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='728' column='1'/> - <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='728' column='1'/> + <function-decl name='icc_node_add' mangled-name='icc_node_add' filepath='drivers/interconnect/core.c' line='724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_node_add'> + <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='724' column='1'/> + <parameter type-id='e68dc824' name='provider' filepath='drivers/interconnect/core.c' line='724' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='icc_link_create' mangled-name='icc_link_create' filepath='drivers/interconnect/core.c' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_link_create'> - <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='638' column='1'/> - <parameter type-id='2448a865' name='dst_id' filepath='drivers/interconnect/core.c' line='638' column='1'/> + <function-decl name='icc_link_create' mangled-name='icc_link_create' filepath='drivers/interconnect/core.c' line='634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_link_create'> + <parameter type-id='18d76f87' name='node' filepath='drivers/interconnect/core.c' line='634' column='1'/> + <parameter type-id='2448a865' name='dst_id' filepath='drivers/interconnect/core.c' line='634' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='icc_get' mangled-name='icc_get' filepath='drivers/interconnect/core.c' line='488' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='icc_get'> @@ -79534,24 +79473,24 @@ <var-decl name='' type-id='e0a2553c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1015' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_create_buffers' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2413' column='1' id='20d04fee'> + <class-decl name='v4l2_create_buffers' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2412' column='1' id='20d04fee'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2414' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2413' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2415' column='1'/> + <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2414' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='memory' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2416' column='1'/> + <var-decl name='memory' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2415' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='format' type-id='0a5711c9' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2417' column='1'/> + <var-decl name='format' type-id='0a5711c9' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2416' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2418' column='1'/> + <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2417' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1824'> - <var-decl name='reserved' type-id='3faaea70' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2419' column='1'/> + <var-decl name='reserved' type-id='3faaea70' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2418' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_exportbuffer' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1091' column='1' id='b201a5c2'> @@ -79605,12 +79544,12 @@ <var-decl name='tv_usec' type-id='55c6233e' visibility='default' filepath='include/uapi/linux/time.h' line='18' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_format' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2244' column='1' id='0a5711c9'> + <class-decl name='v4l2_format' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2243' column='1' id='0a5711c9'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2245' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2244' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fmt' type-id='08bd2345' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2255' column='1'/> + <var-decl name='fmt' type-id='08bd2345' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2254' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_timecode' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='856' column='1' id='5f820012'> @@ -79660,42 +79599,42 @@ </union-decl> <typedef-decl name='__kernel_suseconds_t' type-id='6a11bd61' filepath='include/uapi/asm-generic/posix_types.h' line='41' column='1' id='55c6233e'/> <typedef-decl name='__kernel_time_t' type-id='6a11bd61' filepath='include/uapi/asm-generic/posix_types.h' line='89' column='1' id='f7d92306'/> - <union-decl name='__anonymous_union__7' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2246' column='1' id='08bd2345'> + <union-decl name='__anonymous_union__7' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2245' column='1' id='08bd2345'> <data-member access='public'> - <var-decl name='pix' type-id='e8f6102b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2247' column='1'/> + <var-decl name='pix' type-id='e8f6102b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2246' column='1'/> </data-member> <data-member access='public'> - <var-decl name='pix_mp' type-id='dece967b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2248' column='1'/> + <var-decl name='pix_mp' type-id='dece967b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2247' column='1'/> </data-member> <data-member access='public'> - <var-decl name='win' type-id='3a0ab346' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2249' column='1'/> + <var-decl name='win' type-id='3a0ab346' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2248' column='1'/> </data-member> <data-member access='public'> - <var-decl name='vbi' type-id='ae01ca89' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2250' column='1'/> + <var-decl name='vbi' type-id='ae01ca89' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2249' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sliced' type-id='a2be7826' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2251' column='1'/> + <var-decl name='sliced' type-id='a2be7826' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2250' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sdr' type-id='a37aff65' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2252' column='1'/> + <var-decl name='sdr' type-id='a37aff65' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2251' column='1'/> </data-member> <data-member access='public'> - <var-decl name='meta' type-id='1db7c88b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2253' column='1'/> + <var-decl name='meta' type-id='1db7c88b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2252' column='1'/> </data-member> <data-member access='public'> - <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2254' column='1'/> + <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2253' column='1'/> </data-member> </union-decl> <pointer-type-def type-id='8cd967bc' size-in-bits='64' id='00e8fe5a'/> <array-type-def dimensions='1' type-id='8f048e17' size-in-bits='1600' id='0530f1a6'> <subrange length='200' type-id='7ff19f0f' id='53119c2f'/> </array-type-def> - <class-decl name='v4l2_meta_format' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2229' column='1' id='1db7c88b'> + <class-decl name='v4l2_meta_format' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2228' column='1' id='1db7c88b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='dataformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2230' column='1'/> + <var-decl name='dataformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2229' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2231' column='1'/> + <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2230' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_pix_format' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='494' column='1' id='e8f6102b'> @@ -79736,42 +79675,42 @@ <var-decl name='xfer_func' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='511' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_pix_format_mplane' size-in-bits='1536' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2194' column='1' id='dece967b'> + <class-decl name='v4l2_pix_format_mplane' size-in-bits='1536' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2193' column='1' id='dece967b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2195' column='1'/> + <var-decl name='width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2194' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2196' column='1'/> + <var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2195' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2197' column='1'/> + <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2196' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2198' column='1'/> + <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2197' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='colorspace' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2199' column='1'/> + <var-decl name='colorspace' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2198' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='plane_fmt' type-id='15b94482' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2201' column='1'/> + <var-decl name='plane_fmt' type-id='15b94482' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2200' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1440'> - <var-decl name='num_planes' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2202' column='1'/> + <var-decl name='num_planes' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2201' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1448'> - <var-decl name='flags' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1'/> + <var-decl name='flags' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2202' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1456'> - <var-decl name='' type-id='29c254d4' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1'/> + <var-decl name='' type-id='29c254d4' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1464'> - <var-decl name='quantization' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2208' column='1'/> + <var-decl name='quantization' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2207' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='xfer_func' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2209' column='1'/> + <var-decl name='xfer_func' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2208' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1480'> - <var-decl name='reserved' type-id='c20b850f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2210' column='1'/> + <var-decl name='reserved' type-id='c20b850f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2209' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_plane' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='951' column='1' id='8cd967bc'> @@ -79791,55 +79730,55 @@ <var-decl name='reserved' type-id='9d263779' visibility='default' filepath='include/uapi/linux/videodev2.h' line='961' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sdr_format' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2218' column='1' id='a37aff65'> + <class-decl name='v4l2_sdr_format' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2217' column='1' id='a37aff65'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2219' column='1'/> + <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2218' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2220' column='1'/> + <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2219' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='26f0765c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2221' column='1'/> + <var-decl name='reserved' type-id='26f0765c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2220' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sliced_vbi_format' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2073' column='1' id='a2be7826'> + <class-decl name='v4l2_sliced_vbi_format' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2072' column='1' id='a2be7826'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2074' column='1'/> + <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2073' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2079' column='1'/> + <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='800'> - <var-decl name='io_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2080' column='1'/> + <var-decl name='io_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2079' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2081' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2080' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_vbi_format' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2045' column='1' id='ae01ca89'> + <class-decl name='v4l2_vbi_format' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2044' column='1' id='ae01ca89'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sampling_rate' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2046' column='1'/> + <var-decl name='sampling_rate' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='offset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2047' column='1'/> + <var-decl name='offset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2046' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='samples_per_line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2048' column='1'/> + <var-decl name='samples_per_line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='sample_format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2049' column='1'/> + <var-decl name='sample_format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2048' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='start' type-id='e5d37c7b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2050' column='1'/> + <var-decl name='start' type-id='e5d37c7b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2049' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='count' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2051' column='1'/> + <var-decl name='count' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2052' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2051' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2053' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2052' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_window' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1143' column='1' id='3a0ab346'> @@ -79911,12 +79850,12 @@ <var-decl name='hsv_enc' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='508' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__9' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1' id='29c254d4'> + <union-decl name='__anonymous_union__9' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1' id='29c254d4'> <data-member access='public'> - <var-decl name='ycbcr_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2205' column='1'/> + <var-decl name='ycbcr_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1'/> </data-member> <data-member access='public'> - <var-decl name='hsv_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2206' column='1'/> + <var-decl name='hsv_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2205' column='1'/> </data-member> </union-decl> <pointer-type-def type-id='aecf225c' size-in-bits='64' id='db634b6a'/> @@ -79931,15 +79870,15 @@ <var-decl name='next' type-id='db634b6a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1140' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_plane_pix_format' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2174' column='1' id='69ab6968'> + <class-decl name='v4l2_plane_pix_format' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2173' column='1' id='69ab6968'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sizeimage' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2175' column='1'/> + <var-decl name='sizeimage' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2174' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='bytesperline' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2176' column='1'/> + <var-decl name='bytesperline' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2175' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='81144473' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2177' column='1'/> + <var-decl name='reserved' type-id='81144473' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2176' column='1'/> </data-member> </class-decl> <array-type-def dimensions='1' type-id='d315442e' size-in-bits='96' id='81144473'> @@ -83359,7 +83298,7 @@ </class-decl> <pointer-type-def type-id='0645931b' size-in-bits='64' id='1086b623'/> <pointer-type-def type-id='d26ed346' size-in-bits='64' id='b076d304'/> - <enum-decl name='v4l2_ctrl_type' filepath='include/uapi/linux/videodev2.h' line='1719' column='1' id='cf13dc99'> + <enum-decl name='v4l2_ctrl_type' filepath='include/uapi/linux/videodev2.h' line='1718' column='1' id='cf13dc99'> <underlying-type type-id='9cac1fee'/> <enumerator name='V4L2_CTRL_TYPE_INTEGER' value='1'/> <enumerator name='V4L2_CTRL_TYPE_BOOLEAN' value='2'/> @@ -83790,33 +83729,33 @@ </array-type-def> </abi-instr> <abi-instr address-size='64' path='drivers/media/v4l2-core/v4l2-common.c' language='LANG_C89'> - <class-decl name='v4l2_format_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/media/v4l2-common.h' line='487' column='1' id='c151291a'> + <class-decl name='v4l2_format_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/media/v4l2-common.h' line='486' column='1' id='c151291a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='format' type-id='19c2251e' visibility='default' filepath='include/media/v4l2-common.h' line='488' column='1'/> + <var-decl name='format' type-id='19c2251e' visibility='default' filepath='include/media/v4l2-common.h' line='487' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='pixel_enc' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='489' column='1'/> + <var-decl name='pixel_enc' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='488' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='40'> - <var-decl name='mem_planes' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='490' column='1'/> + <var-decl name='mem_planes' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='489' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='48'> - <var-decl name='comp_planes' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='491' column='1'/> + <var-decl name='comp_planes' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='490' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='56'> - <var-decl name='bpp' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='492' column='1'/> + <var-decl name='bpp' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='491' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='88'> - <var-decl name='hdiv' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='493' column='1'/> + <var-decl name='hdiv' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='492' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='vdiv' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='494' column='1'/> + <var-decl name='vdiv' type-id='f9b06939' visibility='default' filepath='include/media/v4l2-common.h' line='493' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='104'> - <var-decl name='block_w' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='495' column='1'/> + <var-decl name='block_w' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='494' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='136'> - <var-decl name='block_h' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='496' column='1'/> + <var-decl name='block_h' type-id='931565be' visibility='default' filepath='include/media/v4l2-common.h' line='495' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='c151291a' const='yes' id='bccc86df'/> @@ -84020,49 +83959,49 @@ <pointer-type-def type-id='967c1c06' size-in-bits='64' id='a5c94ccc'/> <pointer-type-def type-id='1251351e' size-in-bits='64' id='8edac644'/> <pointer-type-def type-id='53422e64' size-in-bits='64' id='b7db9582'/> - <class-decl name='v4l2_control' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1673' column='1' id='d6a7cd6f'> + <class-decl name='v4l2_control' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1672' column='1' id='d6a7cd6f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1674' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1673' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1675' column='1'/> + <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1674' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event' size-in-bits='1088' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2332' column='1' id='967c1c06'> + <class-decl name='v4l2_event' size-in-bits='1088' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2331' column='1' id='967c1c06'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2333' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='u' type-id='454ee2bf' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2341' column='1'/> + <var-decl name='u' type-id='454ee2bf' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2340' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='pending' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2342' column='1'/> + <var-decl name='pending' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2343' column='1'/> + <var-decl name='sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2342' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='timestamp' type-id='a9c79a1f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2344' column='1'/> + <var-decl name='timestamp' type-id='a9c79a1f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2343' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2345' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='800'> - <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2346' column='1'/> + <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2345' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_subscription' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2352' column='1' id='1251351e'> + <class-decl name='v4l2_event_subscription' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2351' column='1' id='1251351e'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2353' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2352' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2354' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2353' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2355' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2354' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2356' column='1'/> + <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2355' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_fh' size-in-bits='1152' is-struct='yes' visibility='default' filepath='include/media/v4l2-fh.h' line='42' column='1' id='53422e64'> @@ -84121,86 +84060,86 @@ <enumerator name='V4L2_PRIORITY_RECORD' value='3'/> <enumerator name='V4L2_PRIORITY_DEFAULT' value='2'/> </enum-decl> - <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2334' column='1' id='454ee2bf'> + <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2333' column='1' id='454ee2bf'> <data-member access='public'> - <var-decl name='vsync' type-id='cbe6daf0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2335' column='1'/> + <var-decl name='vsync' type-id='cbe6daf0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2334' column='1'/> </data-member> <data-member access='public'> - <var-decl name='ctrl' type-id='ecd6d55a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2336' column='1'/> + <var-decl name='ctrl' type-id='ecd6d55a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2335' column='1'/> </data-member> <data-member access='public'> - <var-decl name='frame_sync' type-id='101c7fc2' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2337' column='1'/> + <var-decl name='frame_sync' type-id='101c7fc2' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2336' column='1'/> </data-member> <data-member access='public'> - <var-decl name='src_change' type-id='af41d400' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2338' column='1'/> + <var-decl name='src_change' type-id='af41d400' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2337' column='1'/> </data-member> <data-member access='public'> - <var-decl name='motion_det' type-id='f95c1b03' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2339' column='1'/> + <var-decl name='motion_det' type-id='f95c1b03' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2338' column='1'/> </data-member> <data-member access='public'> - <var-decl name='data' type-id='73b95420' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2340' column='1'/> + <var-decl name='data' type-id='73b95420' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2339' column='1'/> </data-member> </union-decl> <pointer-type-def type-id='e1b58b0e' size-in-bits='64' id='2c7f1dc4'/> - <class-decl name='v4l2_event_ctrl' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2293' column='1' id='ecd6d55a'> + <class-decl name='v4l2_event_ctrl' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2292' column='1' id='ecd6d55a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2294' column='1'/> + <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2293' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='de5442d3' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1'/> + <var-decl name='' type-id='de5442d3' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2300' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2299' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2301' column='1'/> + <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2302' column='1'/> + <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2301' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2303' column='1'/> + <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2302' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2304' column='1'/> + <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2303' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_frame_sync' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2307' column='1' id='101c7fc2'> + <class-decl name='v4l2_event_frame_sync' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2306' column='1' id='101c7fc2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2308' column='1'/> + <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2307' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_motion_det' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2326' column='1' id='f95c1b03'> + <class-decl name='v4l2_event_motion_det' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2325' column='1' id='f95c1b03'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2327' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2326' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2328' column='1'/> + <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2327' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='region_mask' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2329' column='1'/> + <var-decl name='region_mask' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2328' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_src_change' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2313' column='1' id='af41d400'> + <class-decl name='v4l2_event_src_change' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2312' column='1' id='af41d400'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2314' column='1'/> + <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2313' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_vsync' size-in-bits='8' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2283' column='1' id='cbe6daf0'> + <class-decl name='v4l2_event_vsync' size-in-bits='8' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2282' column='1' id='cbe6daf0'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='field' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2285' column='1'/> + <var-decl name='field' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2284' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_m2m_ctx' is-struct='yes' visibility='default' is-declaration-only='yes' id='e1b58b0e'/> - <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1' id='de5442d3'> + <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1' id='de5442d3'> <data-member access='public'> - <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2297' column='1'/> + <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1'/> </data-member> <data-member access='public'> - <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2298' column='1'/> + <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2297' column='1'/> </data-member> </union-decl> </abi-instr> @@ -84800,18 +84739,18 @@ <enumerator name='V4L2_PRIORITY_RECORD' value='3'/> <enumerator name='V4L2_PRIORITY_DEFAULT' value='2'/> </enum-decl> - <class-decl name='v4l2_event_subscription' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2352' column='1' id='1251351e'> + <class-decl name='v4l2_event_subscription' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2351' column='1' id='1251351e'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2353' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2352' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2354' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2353' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2355' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2354' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2356' column='1'/> + <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2355' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_subdev_tuner_ops' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/media/v4l2-subdev.h' line='264' column='1' id='40eafb47'> @@ -84849,113 +84788,113 @@ <var-decl name='s_config' type-id='f8acd34f' visibility='default' filepath='include/media/v4l2-subdev.h' line='275' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_frequency' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1862' column='1' id='a15ecb0c'> + <class-decl name='v4l2_frequency' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1861' column='1' id='a15ecb0c'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1863' column='1'/> + <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1862' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1864' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1863' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='frequency' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1865' column='1'/> + <var-decl name='frequency' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1864' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1866' column='1'/> + <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1865' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_frequency_band' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1873' column='1' id='400ed05a'> + <class-decl name='v4l2_frequency_band' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1872' column='1' id='400ed05a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1874' column='1'/> + <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1873' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1875' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1874' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1876' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1875' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1877' column='1'/> + <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1876' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1878' column='1'/> + <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1877' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1879' column='1'/> + <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1878' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='modulation' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1880' column='1'/> + <var-decl name='modulation' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1879' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='reserved' type-id='43885e7a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1881' column='1'/> + <var-decl name='reserved' type-id='43885e7a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1880' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_tuner' size-in-bits='672' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1805' column='1' id='fd240b02'> + <class-decl name='v4l2_tuner' size-in-bits='672' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1804' column='1' id='fd240b02'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1806' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1805' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1807' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1806' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1808' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1807' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1809' column='1'/> + <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1808' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1810' column='1'/> + <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1809' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1811' column='1'/> + <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1810' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='rxsubchans' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1812' column='1'/> + <var-decl name='rxsubchans' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1811' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='audmode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1813' column='1'/> + <var-decl name='audmode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1812' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='signal' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1814' column='1'/> + <var-decl name='signal' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1813' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='afc' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1815' column='1'/> + <var-decl name='afc' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1814' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='544'> - <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1816' column='1'/> + <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1815' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_modulator' size-in-bits='544' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1819' column='1' id='7c3a095f'> + <class-decl name='v4l2_modulator' size-in-bits='544' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1818' column='1' id='7c3a095f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1820' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1819' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1821' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1820' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1822' column='1'/> + <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1821' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1823' column='1'/> + <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1822' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1824' column='1'/> + <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1823' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='txsubchans' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1825' column='1'/> + <var-decl name='txsubchans' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1824' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1826' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1825' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1827' column='1'/> + <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1826' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_priv_tun_config' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/media/v4l2-common.h' line='336' column='1' id='52c7f7a2'> + <class-decl name='v4l2_priv_tun_config' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/media/v4l2-common.h' line='335' column='1' id='52c7f7a2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tuner' type-id='95e97e5e' visibility='default' filepath='include/media/v4l2-common.h' line='337' column='1'/> + <var-decl name='tuner' type-id='95e97e5e' visibility='default' filepath='include/media/v4l2-common.h' line='336' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/media/v4l2-common.h' line='338' column='1'/> + <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/media/v4l2-common.h' line='337' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_subdev_audio_ops' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/media/v4l2-subdev.h' line='304' column='1' id='e3913a59'> @@ -85054,20 +84993,20 @@ <var-decl name='reserved' type-id='43885e7a' visibility='default' filepath='include/uapi/linux/v4l2-subdev.h' line='110' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_dv_timings' size-in-bits='1056' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1519' column='1' id='9a25f4b0'> + <class-decl name='v4l2_dv_timings' size-in-bits='1056' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1518' column='1' id='9a25f4b0'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1520' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1519' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='' type-id='d749ec6e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1521' column='1'/> + <var-decl name='' type-id='d749ec6e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1520' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__2' size-in-bits='1024' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1521' column='1' id='d749ec6e'> + <union-decl name='__anonymous_union__2' size-in-bits='1024' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1520' column='1' id='d749ec6e'> <data-member access='public'> - <var-decl name='bt' type-id='ecc13ba0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1522' column='1'/> + <var-decl name='bt' type-id='ecc13ba0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1521' column='1'/> </data-member> <data-member access='public'> - <var-decl name='reserved' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1523' column='1'/> + <var-decl name='reserved' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1522' column='1'/> </data-member> </union-decl> <class-decl name='v4l2_bt_timings' size-in-bits='992' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1395' column='1' id='ecc13ba0'> @@ -85188,75 +85127,75 @@ <var-decl name='type' type-id='19c2251e' visibility='default' filepath='include/media/v4l2-subdev.h' line='56' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sliced_vbi_data' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2108' column='1' id='6fab59d9'> + <class-decl name='v4l2_sliced_vbi_data' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2107' column='1' id='6fab59d9'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2109' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2108' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2110' column='1'/> + <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2109' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2111' column='1'/> + <var-decl name='line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2110' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='reserved' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2112' column='1'/> + <var-decl name='reserved' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2111' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='data' type-id='51dffe12' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2113' column='1'/> + <var-decl name='data' type-id='51dffe12' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2112' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sliced_vbi_cap' size-in-bits='928' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2097' column='1' id='97ed0ee7'> + <class-decl name='v4l2_sliced_vbi_cap' size-in-bits='928' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2096' column='1' id='97ed0ee7'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2098' column='1'/> + <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2097' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2103' column='1'/> + <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2102' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='800'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2104' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2105' column='1'/> + <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2104' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_vbi_format' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2045' column='1' id='ae01ca89'> + <class-decl name='v4l2_vbi_format' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2044' column='1' id='ae01ca89'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sampling_rate' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2046' column='1'/> + <var-decl name='sampling_rate' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='offset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2047' column='1'/> + <var-decl name='offset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2046' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='samples_per_line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2048' column='1'/> + <var-decl name='samples_per_line' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='sample_format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2049' column='1'/> + <var-decl name='sample_format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2048' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='start' type-id='e5d37c7b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2050' column='1'/> + <var-decl name='start' type-id='e5d37c7b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2049' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='count' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2051' column='1'/> + <var-decl name='count' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2052' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2051' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2053' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2052' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sliced_vbi_format' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2073' column='1' id='a2be7826'> + <class-decl name='v4l2_sliced_vbi_format' size-in-bits='896' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2072' column='1' id='a2be7826'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2074' column='1'/> + <var-decl name='service_set' type-id='d315442e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2073' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2079' column='1'/> + <var-decl name='service_lines' type-id='025daa6d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='800'> - <var-decl name='io_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2080' column='1'/> + <var-decl name='io_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2079' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2081' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2080' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_subdev_ir_ops' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/media/v4l2-subdev.h' line='599' column='1' id='77a58158'> @@ -85562,69 +85501,69 @@ <var-decl name='edid' type-id='474e5dcc' visibility='default' filepath='include/uapi/linux/v4l2-common.h' line='92' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_dv_timings_cap' size-in-bits='1152' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1583' column='1' id='cdb274e3'> + <class-decl name='v4l2_dv_timings_cap' size-in-bits='1152' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1582' column='1' id='cdb274e3'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1584' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1583' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='pad' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1585' column='1'/> + <var-decl name='pad' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1584' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1586' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1585' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='' type-id='7bbb3c88' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1587' column='1'/> + <var-decl name='' type-id='7bbb3c88' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1586' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__3' size-in-bits='1024' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1587' column='1' id='7bbb3c88'> + <union-decl name='__anonymous_union__3' size-in-bits='1024' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1586' column='1' id='7bbb3c88'> <data-member access='public'> - <var-decl name='bt' type-id='e5bfe593' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1588' column='1'/> + <var-decl name='bt' type-id='e5bfe593' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1587' column='1'/> </data-member> <data-member access='public'> - <var-decl name='raw_data' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1589' column='1'/> + <var-decl name='raw_data' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1588' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_bt_timings_cap' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1556' column='1' id='e5bfe593'> + <class-decl name='v4l2_bt_timings_cap' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1555' column='1' id='e5bfe593'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='min_width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1557' column='1'/> + <var-decl name='min_width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1556' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='max_width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1558' column='1'/> + <var-decl name='max_width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1557' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='min_height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1559' column='1'/> + <var-decl name='min_height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1558' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='max_height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1560' column='1'/> + <var-decl name='max_height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1559' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='min_pixelclock' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1561' column='1'/> + <var-decl name='min_pixelclock' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1560' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='max_pixelclock' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1562' column='1'/> + <var-decl name='max_pixelclock' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1561' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='standards' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1563' column='1'/> + <var-decl name='standards' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1562' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1564' column='1'/> + <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1563' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='reserved' type-id='9d2cf33e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1565' column='1'/> + <var-decl name='reserved' type-id='9d2cf33e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1564' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_enum_dv_timings' size-in-bits='1184' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1538' column='1' id='b6da1a0e'> + <class-decl name='v4l2_enum_dv_timings' size-in-bits='1184' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1537' column='1' id='b6da1a0e'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1539' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1538' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='pad' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1540' column='1'/> + <var-decl name='pad' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1539' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1541' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1540' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='timings' type-id='9a25f4b0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1542' column='1'/> + <var-decl name='timings' type-id='9a25f4b0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1541' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_mbus_frame_desc' size-in-bits='416' is-struct='yes' visibility='default' filepath='include/media/v4l2-subdev.h' line='348' column='1' id='9a759b95'> @@ -86201,38 +86140,38 @@ <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='778' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_format' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2244' column='1' id='0a5711c9'> + <class-decl name='v4l2_format' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2243' column='1' id='0a5711c9'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2245' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2244' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fmt' type-id='08bd2345' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2255' column='1'/> + <var-decl name='fmt' type-id='08bd2345' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2254' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__7' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2246' column='1' id='08bd2345'> + <union-decl name='__anonymous_union__7' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2245' column='1' id='08bd2345'> <data-member access='public'> - <var-decl name='pix' type-id='e8f6102b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2247' column='1'/> + <var-decl name='pix' type-id='e8f6102b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2246' column='1'/> </data-member> <data-member access='public'> - <var-decl name='pix_mp' type-id='dece967b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2248' column='1'/> + <var-decl name='pix_mp' type-id='dece967b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2247' column='1'/> </data-member> <data-member access='public'> - <var-decl name='win' type-id='3a0ab346' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2249' column='1'/> + <var-decl name='win' type-id='3a0ab346' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2248' column='1'/> </data-member> <data-member access='public'> - <var-decl name='vbi' type-id='ae01ca89' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2250' column='1'/> + <var-decl name='vbi' type-id='ae01ca89' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2249' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sliced' type-id='a2be7826' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2251' column='1'/> + <var-decl name='sliced' type-id='a2be7826' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2250' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sdr' type-id='a37aff65' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2252' column='1'/> + <var-decl name='sdr' type-id='a37aff65' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2251' column='1'/> </data-member> <data-member access='public'> - <var-decl name='meta' type-id='1db7c88b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2253' column='1'/> + <var-decl name='meta' type-id='1db7c88b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2252' column='1'/> </data-member> <data-member access='public'> - <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2254' column='1'/> + <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2253' column='1'/> </data-member> </union-decl> <class-decl name='v4l2_pix_format' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='494' column='1' id='e8f6102b'> @@ -86281,61 +86220,61 @@ <var-decl name='hsv_enc' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='508' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_pix_format_mplane' size-in-bits='1536' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2194' column='1' id='dece967b'> + <class-decl name='v4l2_pix_format_mplane' size-in-bits='1536' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2193' column='1' id='dece967b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2195' column='1'/> + <var-decl name='width' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2194' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2196' column='1'/> + <var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2195' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2197' column='1'/> + <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2196' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2198' column='1'/> + <var-decl name='field' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2197' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='colorspace' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2199' column='1'/> + <var-decl name='colorspace' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2198' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='plane_fmt' type-id='15b94482' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2201' column='1'/> + <var-decl name='plane_fmt' type-id='15b94482' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2200' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1440'> - <var-decl name='num_planes' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2202' column='1'/> + <var-decl name='num_planes' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2201' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1448'> - <var-decl name='flags' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1'/> + <var-decl name='flags' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2202' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1456'> - <var-decl name='' type-id='29c254d4' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1'/> + <var-decl name='' type-id='29c254d4' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1464'> - <var-decl name='quantization' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2208' column='1'/> + <var-decl name='quantization' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2207' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='xfer_func' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2209' column='1'/> + <var-decl name='xfer_func' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2208' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1480'> - <var-decl name='reserved' type-id='c20b850f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2210' column='1'/> + <var-decl name='reserved' type-id='c20b850f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2209' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_plane_pix_format' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2174' column='1' id='69ab6968'> + <class-decl name='v4l2_plane_pix_format' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2173' column='1' id='69ab6968'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sizeimage' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2175' column='1'/> + <var-decl name='sizeimage' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2174' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='bytesperline' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2176' column='1'/> + <var-decl name='bytesperline' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2175' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='81144473' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2177' column='1'/> + <var-decl name='reserved' type-id='81144473' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2176' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__9' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1' id='29c254d4'> + <union-decl name='__anonymous_union__9' size-in-bits='8' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2203' column='1' id='29c254d4'> <data-member access='public'> - <var-decl name='ycbcr_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2205' column='1'/> + <var-decl name='ycbcr_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2204' column='1'/> </data-member> <data-member access='public'> - <var-decl name='hsv_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2206' column='1'/> + <var-decl name='hsv_enc' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2205' column='1'/> </data-member> </union-decl> <class-decl name='v4l2_window' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1143' column='1' id='3a0ab346'> @@ -86369,23 +86308,23 @@ <var-decl name='next' type-id='db634b6a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1140' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_sdr_format' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2218' column='1' id='a37aff65'> + <class-decl name='v4l2_sdr_format' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2217' column='1' id='a37aff65'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2219' column='1'/> + <var-decl name='pixelformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2218' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2220' column='1'/> + <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2219' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='26f0765c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2221' column='1'/> + <var-decl name='reserved' type-id='26f0765c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2220' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_meta_format' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2229' column='1' id='1db7c88b'> + <class-decl name='v4l2_meta_format' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2228' column='1' id='1db7c88b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='dataformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2230' column='1'/> + <var-decl name='dataformat' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2229' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2231' column='1'/> + <var-decl name='buffersize' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2230' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_requestbuffers' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='913' column='1' id='879dea4a'> @@ -86539,24 +86478,24 @@ <var-decl name='reserved' type-id='9d263779' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1097' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_create_buffers' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2413' column='1' id='20d04fee'> + <class-decl name='v4l2_create_buffers' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2412' column='1' id='20d04fee'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2414' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2413' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2415' column='1'/> + <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2414' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='memory' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2416' column='1'/> + <var-decl name='memory' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2415' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='format' type-id='0a5711c9' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2417' column='1'/> + <var-decl name='format' type-id='0a5711c9' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2416' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2418' column='1'/> + <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2417' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1824'> - <var-decl name='reserved' type-id='3faaea70' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2419' column='1'/> + <var-decl name='reserved' type-id='3faaea70' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2418' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_framebuffer' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1103' column='1' id='e2103cb1'> @@ -86617,202 +86556,202 @@ <enumerator name='V4L2_BUF_TYPE_META_OUTPUT' value='14'/> <enumerator name='V4L2_BUF_TYPE_PRIVATE' value='128'/> </enum-decl> - <class-decl name='v4l2_input' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1597' column='1' id='f1bdbe5e'> + <class-decl name='v4l2_input' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1596' column='1' id='f1bdbe5e'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1598' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1599' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1598' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1600' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='audioset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1601' column='1'/> + <var-decl name='audioset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1600' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1602' column='1'/> + <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1601' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='std' type-id='692d176e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1603' column='1'/> + <var-decl name='std' type-id='692d176e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='status' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1604' column='1'/> + <var-decl name='status' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1605' column='1'/> + <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1604' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1606' column='1'/> + <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1605' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_output' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1649' column='1' id='97abd73b'> + <class-decl name='v4l2_output' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1648' column='1' id='97abd73b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1650' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1649' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1651' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1650' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1652' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1651' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='audioset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1653' column='1'/> + <var-decl name='audioset' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='modulator' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1654' column='1'/> + <var-decl name='modulator' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='std' type-id='692d176e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1655' column='1'/> + <var-decl name='std' type-id='692d176e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1656' column='1'/> + <var-decl name='capabilities' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1655' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1657' column='1'/> + <var-decl name='reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1656' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_queryctrl' size-in-bits='544' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1739' column='1' id='e162c03f'> + <class-decl name='v4l2_queryctrl' size-in-bits='544' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1738' column='1' id='e162c03f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1740' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1739' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1741' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1740' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1742' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1741' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1743' column='1'/> + <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1742' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1744' column='1'/> + <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1743' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1745' column='1'/> + <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1744' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1746' column='1'/> + <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1745' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1747' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1746' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1748' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1747' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_query_ext_ctrl' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1752' column='1' id='92bf903a'> + <class-decl name='v4l2_query_ext_ctrl' size-in-bits='1856' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1751' column='1' id='92bf903a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1753' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1752' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1754' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1753' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='name' type-id='16dc656a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1755' column='1'/> + <var-decl name='name' type-id='16dc656a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1754' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='minimum' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1756' column='1'/> + <var-decl name='minimum' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1755' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='maximum' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1757' column='1'/> + <var-decl name='maximum' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1756' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='step' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1758' column='1'/> + <var-decl name='step' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1757' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='default_value' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1759' column='1'/> + <var-decl name='default_value' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1760' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1759' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='elem_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1761' column='1'/> + <var-decl name='elem_size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1760' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='elems' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1762' column='1'/> + <var-decl name='elems' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='nr_of_dims' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1763' column='1'/> + <var-decl name='nr_of_dims' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1762' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='dims' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1764' column='1'/> + <var-decl name='dims' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1763' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='reserved' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1765' column='1'/> + <var-decl name='reserved' type-id='734a963c' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1764' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_control' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1673' column='1' id='d6a7cd6f'> + <class-decl name='v4l2_control' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1672' column='1' id='d6a7cd6f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1674' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1673' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1675' column='1'/> + <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1674' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_ext_controls' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1694' column='1' id='1a041cb4'> + <class-decl name='v4l2_ext_controls' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1693' column='1' id='1a041cb4'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='' type-id='3e79fede' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1695' column='1'/> + <var-decl name='' type-id='3e79fede' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1694' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1701' column='1'/> + <var-decl name='count' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1700' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='error_idx' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1702' column='1'/> + <var-decl name='error_idx' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1701' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='request_fd' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1703' column='1'/> + <var-decl name='request_fd' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1702' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='reserved' type-id='439be632' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1704' column='1'/> + <var-decl name='reserved' type-id='439be632' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1703' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='controls' type-id='264baaf7' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1705' column='1'/> + <var-decl name='controls' type-id='264baaf7' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1704' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__13' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1695' column='1' id='3e79fede'> + <union-decl name='__anonymous_union__13' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1694' column='1' id='3e79fede'> <data-member access='public'> - <var-decl name='which' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1699' column='1'/> + <var-decl name='which' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1698' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_ext_control' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1678' column='1' id='99cd308f'> + <class-decl name='v4l2_ext_control' size-in-bits='160' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1677' column='1' id='99cd308f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1679' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1678' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1680' column='1'/> + <var-decl name='size' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved2' type-id='439be632' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1681' column='1'/> + <var-decl name='reserved2' type-id='439be632' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='' type-id='56e9fb5b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1682' column='1'/> + <var-decl name='' type-id='56e9fb5b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1681' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__14' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1682' column='1' id='56e9fb5b'> + <union-decl name='__anonymous_union__14' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1681' column='1' id='56e9fb5b'> <data-member access='public'> - <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1683' column='1'/> + <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1682' column='1'/> </data-member> <data-member access='public'> - <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1684' column='1'/> + <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1683' column='1'/> </data-member> <data-member access='public'> - <var-decl name='string' type-id='26a90f95' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1685' column='1'/> + <var-decl name='string' type-id='26a90f95' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1684' column='1'/> </data-member> <data-member access='public'> - <var-decl name='p_u8' type-id='474e5dcc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1686' column='1'/> + <var-decl name='p_u8' type-id='474e5dcc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1685' column='1'/> </data-member> <data-member access='public'> - <var-decl name='p_u16' type-id='2e5e3725' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1687' column='1'/> + <var-decl name='p_u16' type-id='2e5e3725' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1686' column='1'/> </data-member> <data-member access='public'> - <var-decl name='p_u32' type-id='cd1b45ab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1688' column='1'/> + <var-decl name='p_u32' type-id='cd1b45ab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1687' column='1'/> </data-member> <data-member access='public'> - <var-decl name='p_area' type-id='26385187' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1689' column='1'/> + <var-decl name='p_area' type-id='26385187' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1688' column='1'/> </data-member> <data-member access='public'> - <var-decl name='ptr' type-id='eaa32e2f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1690' column='1'/> + <var-decl name='ptr' type-id='eaa32e2f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1689' column='1'/> </data-member> </union-decl> <class-decl name='v4l2_area' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='424' column='1' id='baab64cf'> @@ -86823,60 +86762,60 @@ <var-decl name='height' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='426' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_querymenu' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1769' column='1' id='7647d8c9'> + <class-decl name='v4l2_querymenu' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1768' column='1' id='7647d8c9'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1770' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1769' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1771' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1770' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='3cef873b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1772' column='1'/> + <var-decl name='' type-id='3cef873b' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1771' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='reserved' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1776' column='1'/> + <var-decl name='reserved' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1775' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__15' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1772' column='1' id='3cef873b'> + <union-decl name='__anonymous_union__15' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1771' column='1' id='3cef873b'> <data-member access='public'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1773' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1772' column='1'/> </data-member> <data-member access='public'> - <var-decl name='value' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1774' column='1'/> + <var-decl name='value' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1773' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_audio' size-in-bits='416' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1919' column='1' id='014e0a24'> + <class-decl name='v4l2_audio' size-in-bits='416' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1918' column='1' id='014e0a24'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1920' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1919' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1921' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1920' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1922' column='1'/> + <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1921' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='mode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1923' column='1'/> + <var-decl name='mode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1922' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1924' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1923' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_audioout' size-in-bits='416' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1934' column='1' id='5b3ea0c8'> + <class-decl name='v4l2_audioout' size-in-bits='416' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1933' column='1' id='5b3ea0c8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1935' column='1'/> + <var-decl name='index' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1936' column='1'/> + <var-decl name='name' type-id='7e67d89d' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1937' column='1'/> + <var-decl name='capability' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1936' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='mode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1938' column='1'/> + <var-decl name='mode' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1937' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1939' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1938' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_selection' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1206' column='1' id='676b848c'> @@ -86919,115 +86858,115 @@ <var-decl name='jpeg_markers' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='892' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_enc_idx' size-in-bits='16576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1960' column='1' id='e5f6c4d2'> + <class-decl name='v4l2_enc_idx' size-in-bits='16576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1959' column='1' id='e5f6c4d2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='entries' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1961' column='1'/> + <var-decl name='entries' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1960' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='entries_cap' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1962' column='1'/> + <var-decl name='entries_cap' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1961' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1963' column='1'/> + <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1962' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='entry' type-id='faa42463' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1964' column='1'/> + <var-decl name='entry' type-id='faa42463' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1963' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_enc_idx_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1951' column='1' id='59b5b331'> + <class-decl name='v4l2_enc_idx_entry' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1950' column='1' id='59b5b331'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='offset' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1952' column='1'/> + <var-decl name='offset' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1951' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pts' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1953' column='1'/> + <var-decl name='pts' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1952' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='length' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1954' column='1'/> + <var-decl name='length' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1953' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1955' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1954' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1956' column='1'/> + <var-decl name='reserved' type-id='839e8989' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1955' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_encoder_cmd' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1976' column='1' id='769f1ed1'> + <class-decl name='v4l2_encoder_cmd' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1975' column='1' id='769f1ed1'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cmd' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1977' column='1'/> + <var-decl name='cmd' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1976' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1978' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1977' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='96b0dd6a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1979' column='1'/> + <var-decl name='' type-id='96b0dd6a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1978' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__16' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1979' column='1' id='96b0dd6a'> + <union-decl name='__anonymous_union__16' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1978' column='1' id='96b0dd6a'> <data-member access='public'> - <var-decl name='raw' type-id='f1fdc4dc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1982' column='1'/> + <var-decl name='raw' type-id='f1fdc4dc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1981' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__3' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1980' column='1' id='f1fdc4dc'> + <class-decl name='__anonymous_struct__3' size-in-bits='256' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1979' column='1' id='f1fdc4dc'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='data' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1981' column='1'/> + <var-decl name='data' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1980' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_decoder_cmd' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2012' column='1' id='440818bd'> + <class-decl name='v4l2_decoder_cmd' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2011' column='1' id='440818bd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cmd' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2013' column='1'/> + <var-decl name='cmd' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2012' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2014' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2013' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='ddc566bc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2015' column='1'/> + <var-decl name='' type-id='ddc566bc' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2014' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__17' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2015' column='1' id='ddc566bc'> + <union-decl name='__anonymous_union__17' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2014' column='1' id='ddc566bc'> <data-member access='public'> - <var-decl name='stop' type-id='e0122dec' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2018' column='1'/> + <var-decl name='stop' type-id='e0122dec' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2017' column='1'/> </data-member> <data-member access='public'> - <var-decl name='start' type-id='98d68d57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2028' column='1'/> + <var-decl name='start' type-id='98d68d57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2027' column='1'/> </data-member> <data-member access='public'> - <var-decl name='raw' type-id='62956517' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2032' column='1'/> + <var-decl name='raw' type-id='62956517' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2031' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2016' column='1' id='e0122dec'> + <class-decl name='__anonymous_struct__4' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2015' column='1' id='e0122dec'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pts' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2017' column='1'/> + <var-decl name='pts' type-id='d3130597' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2016' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__5' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2020' column='1' id='98d68d57'> + <class-decl name='__anonymous_struct__5' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2019' column='1' id='98d68d57'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='speed' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2026' column='1'/> + <var-decl name='speed' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2025' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2027' column='1'/> + <var-decl name='format' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2026' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__6' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2030' column='1' id='62956517'> + <class-decl name='__anonymous_struct__6' size-in-bits='512' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2029' column='1' id='62956517'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='data' type-id='9d2cf33e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2031' column='1'/> + <var-decl name='data' type-id='9d2cf33e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2030' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_streamparm' size-in-bits='1632' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2260' column='1' id='2f896428'> + <class-decl name='v4l2_streamparm' size-in-bits='1632' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2259' column='1' id='2f896428'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2261' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2260' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='parm' type-id='1ccea1b5' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2266' column='1'/> + <var-decl name='parm' type-id='1ccea1b5' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2265' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__18' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2262' column='1' id='1ccea1b5'> + <union-decl name='__anonymous_union__18' size-in-bits='1600' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2261' column='1' id='1ccea1b5'> <data-member access='public'> - <var-decl name='capture' type-id='f88a5c22' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2263' column='1'/> + <var-decl name='capture' type-id='f88a5c22' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2262' column='1'/> </data-member> <data-member access='public'> - <var-decl name='output' type-id='b573e9f1' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2264' column='1'/> + <var-decl name='output' type-id='b573e9f1' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2263' column='1'/> </data-member> <data-member access='public'> - <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2265' column='1'/> + <var-decl name='raw_data' type-id='0530f1a6' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2264' column='1'/> </data-member> </union-decl> <class-decl name='v4l2_captureparm' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1156' column='1' id='f88a5c22'> @@ -87070,30 +87009,30 @@ <var-decl name='reserved' type-id='3fa29bab' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1175' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_hw_freq_seek' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1884' column='1' id='a5eead8f'> + <class-decl name='v4l2_hw_freq_seek' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1883' column='1' id='a5eead8f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1885' column='1'/> + <var-decl name='tuner' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1884' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1886' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1885' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='seek_upward' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1887' column='1'/> + <var-decl name='seek_upward' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1886' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='wrap_around' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1888' column='1'/> + <var-decl name='wrap_around' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='spacing' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1889' column='1'/> + <var-decl name='spacing' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1888' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1890' column='1'/> + <var-decl name='rangelow' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1889' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1891' column='1'/> + <var-decl name='rangehigh' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1890' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1892' column='1'/> + <var-decl name='reserved' type-id='83a5454e' visibility='default' filepath='include/uapi/linux/videodev2.h' line='1891' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_frmsizeenum' size-in-bits='352' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='810' column='1' id='aba31911'> @@ -89177,7 +89116,7 @@ <var-decl name='delta_chroma_log2_weight_denom' type-id='8af57d41' visibility='default' filepath='include/media/hevc-ctrls.h' line='151' column='1'/> </data-member> </class-decl> - <enum-decl name='v4l2_ctrl_type' filepath='include/uapi/linux/videodev2.h' line='1719' column='1' id='cf13dc99'> + <enum-decl name='v4l2_ctrl_type' filepath='include/uapi/linux/videodev2.h' line='1718' column='1' id='cf13dc99'> <underlying-type type-id='9cac1fee'/> <enumerator name='V4L2_CTRL_TYPE_INTEGER' value='1'/> <enumerator name='V4L2_CTRL_TYPE_BOOLEAN' value='2'/> @@ -89364,107 +89303,107 @@ <array-type-def dimensions='1' type-id='9ac9cd61' size-in-bits='infinite' id='a892e311'> <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/> </array-type-def> - <class-decl name='v4l2_event' size-in-bits='1088' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2332' column='1' id='967c1c06'> + <class-decl name='v4l2_event' size-in-bits='1088' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2331' column='1' id='967c1c06'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2333' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='u' type-id='454ee2bf' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2341' column='1'/> + <var-decl name='u' type-id='454ee2bf' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2340' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='pending' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2342' column='1'/> + <var-decl name='pending' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2343' column='1'/> + <var-decl name='sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2342' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='timestamp' type-id='a9c79a1f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2344' column='1'/> + <var-decl name='timestamp' type-id='a9c79a1f' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2343' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2345' column='1'/> + <var-decl name='id' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='800'> - <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2346' column='1'/> + <var-decl name='reserved' type-id='7f84eb57' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2345' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2334' column='1' id='454ee2bf'> + <union-decl name='__anonymous_union__1' size-in-bits='512' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2333' column='1' id='454ee2bf'> <data-member access='public'> - <var-decl name='vsync' type-id='cbe6daf0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2335' column='1'/> + <var-decl name='vsync' type-id='cbe6daf0' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2334' column='1'/> </data-member> <data-member access='public'> - <var-decl name='ctrl' type-id='ecd6d55a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2336' column='1'/> + <var-decl name='ctrl' type-id='ecd6d55a' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2335' column='1'/> </data-member> <data-member access='public'> - <var-decl name='frame_sync' type-id='101c7fc2' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2337' column='1'/> + <var-decl name='frame_sync' type-id='101c7fc2' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2336' column='1'/> </data-member> <data-member access='public'> - <var-decl name='src_change' type-id='af41d400' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2338' column='1'/> + <var-decl name='src_change' type-id='af41d400' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2337' column='1'/> </data-member> <data-member access='public'> - <var-decl name='motion_det' type-id='f95c1b03' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2339' column='1'/> + <var-decl name='motion_det' type-id='f95c1b03' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2338' column='1'/> </data-member> <data-member access='public'> - <var-decl name='data' type-id='73b95420' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2340' column='1'/> + <var-decl name='data' type-id='73b95420' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2339' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_event_vsync' size-in-bits='8' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2283' column='1' id='cbe6daf0'> + <class-decl name='v4l2_event_vsync' size-in-bits='8' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2282' column='1' id='cbe6daf0'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='field' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2285' column='1'/> + <var-decl name='field' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2284' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_ctrl' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2293' column='1' id='ecd6d55a'> + <class-decl name='v4l2_event_ctrl' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2292' column='1' id='ecd6d55a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2294' column='1'/> + <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2293' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1'/> + <var-decl name='type' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='' type-id='de5442d3' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1'/> + <var-decl name='' type-id='de5442d3' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2300' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2299' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2301' column='1'/> + <var-decl name='minimum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2302' column='1'/> + <var-decl name='maximum' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2301' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2303' column='1'/> + <var-decl name='step' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2302' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2304' column='1'/> + <var-decl name='default_value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2303' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1' id='de5442d3'> + <union-decl name='__anonymous_union__2' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2295' column='1' id='de5442d3'> <data-member access='public'> - <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2297' column='1'/> + <var-decl name='value' type-id='3158a266' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2296' column='1'/> </data-member> <data-member access='public'> - <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2298' column='1'/> + <var-decl name='value64' type-id='49659421' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2297' column='1'/> </data-member> </union-decl> - <class-decl name='v4l2_event_frame_sync' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2307' column='1' id='101c7fc2'> + <class-decl name='v4l2_event_frame_sync' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2306' column='1' id='101c7fc2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2308' column='1'/> + <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2307' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_src_change' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2313' column='1' id='af41d400'> + <class-decl name='v4l2_event_src_change' size-in-bits='32' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2312' column='1' id='af41d400'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2314' column='1'/> + <var-decl name='changes' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2313' column='1'/> </data-member> </class-decl> - <class-decl name='v4l2_event_motion_det' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2326' column='1' id='f95c1b03'> + <class-decl name='v4l2_event_motion_det' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2325' column='1' id='f95c1b03'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2327' column='1'/> + <var-decl name='flags' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2326' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2328' column='1'/> + <var-decl name='frame_sequence' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2327' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='region_mask' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2329' column='1'/> + <var-decl name='region_mask' type-id='3f1a6b60' visibility='default' filepath='include/uapi/linux/videodev2.h' line='2328' column='1'/> </data-member> </class-decl> <class-decl name='v4l2_subscribed_event_ops' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/media/v4l2-event.h' line='46' column='1' id='a81e67e2'> @@ -92714,8 +92653,8 @@ <parameter type-id='f1e196e0' name='ctx' filepath='drivers/mmc/core/core.c' line='885' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mmc_hw_reset' mangled-name='mmc_hw_reset' filepath='drivers/mmc/core/core.c' line='2135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_hw_reset'> - <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='2135' column='1'/> + <function-decl name='mmc_hw_reset' mangled-name='mmc_hw_reset' filepath='drivers/mmc/core/core.c' line='2124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_hw_reset'> + <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='2124' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='mmc_get_card' mangled-name='mmc_get_card' filepath='drivers/mmc/core/core.c' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_get_card'> @@ -92723,26 +92662,26 @@ <parameter type-id='f1e196e0' name='ctx' filepath='drivers/mmc/core/core.c' line='874' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mmc_erase_group_aligned' mangled-name='mmc_erase_group_aligned' filepath='drivers/mmc/core/core.c' line='1988' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_erase_group_aligned'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1988' column='1'/> - <parameter type-id='f0981eeb' name='from' filepath='drivers/mmc/core/core.c' line='1988' column='1'/> - <parameter type-id='f0981eeb' name='nr' filepath='drivers/mmc/core/core.c' line='1989' column='1'/> + <function-decl name='mmc_erase_group_aligned' mangled-name='mmc_erase_group_aligned' filepath='drivers/mmc/core/core.c' line='1977' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_erase_group_aligned'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1977' column='1'/> + <parameter type-id='f0981eeb' name='from' filepath='drivers/mmc/core/core.c' line='1977' column='1'/> + <parameter type-id='f0981eeb' name='nr' filepath='drivers/mmc/core/core.c' line='1978' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_erase' mangled-name='mmc_erase' filepath='drivers/mmc/core/core.c' line='1878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_erase'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1878' column='1'/> - <parameter type-id='f0981eeb' name='from' filepath='drivers/mmc/core/core.c' line='1878' column='1'/> - <parameter type-id='f0981eeb' name='nr' filepath='drivers/mmc/core/core.c' line='1878' column='1'/> - <parameter type-id='f0981eeb' name='arg' filepath='drivers/mmc/core/core.c' line='1879' column='1'/> + <function-decl name='mmc_erase' mangled-name='mmc_erase' filepath='drivers/mmc/core/core.c' line='1867' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_erase'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1867' column='1'/> + <parameter type-id='f0981eeb' name='from' filepath='drivers/mmc/core/core.c' line='1867' column='1'/> + <parameter type-id='f0981eeb' name='nr' filepath='drivers/mmc/core/core.c' line='1867' column='1'/> + <parameter type-id='f0981eeb' name='arg' filepath='drivers/mmc/core/core.c' line='1868' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_detect_change' mangled-name='mmc_detect_change' filepath='drivers/mmc/core/core.c' line='1508' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_detect_change'> - <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='1508' column='1'/> - <parameter type-id='7359adad' name='delay' filepath='drivers/mmc/core/core.c' line='1508' column='1'/> + <function-decl name='mmc_detect_change' mangled-name='mmc_detect_change' filepath='drivers/mmc/core/core.c' line='1502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_detect_change'> + <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='1502' column='1'/> + <parameter type-id='7359adad' name='delay' filepath='drivers/mmc/core/core.c' line='1502' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mmc_detect_card_removed' mangled-name='mmc_detect_card_removed' filepath='drivers/mmc/core/core.c' line='2258' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_detect_card_removed'> - <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='2258' column='1'/> + <function-decl name='mmc_detect_card_removed' mangled-name='mmc_detect_card_removed' filepath='drivers/mmc/core/core.c' line='2247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_detect_card_removed'> + <parameter type-id='dd575c43' name='host' filepath='drivers/mmc/core/core.c' line='2247' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='mmc_cqe_start_req' mangled-name='mmc_cqe_start_req' filepath='drivers/mmc/core/core.c' line='449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_cqe_start_req'> @@ -92764,24 +92703,24 @@ <parameter type-id='47f117d4' name='mrq' filepath='drivers/mmc/core/core.c' line='533' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mmc_can_trim' mangled-name='mmc_can_trim' filepath='drivers/mmc/core/core.c' line='1948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_trim'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1948' column='1'/> + <function-decl name='mmc_can_trim' mangled-name='mmc_can_trim' filepath='drivers/mmc/core/core.c' line='1937' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_trim'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1937' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_can_secure_erase_trim' mangled-name='mmc_can_secure_erase_trim' filepath='drivers/mmc/core/core.c' line='1979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_secure_erase_trim'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1979' column='1'/> + <function-decl name='mmc_can_secure_erase_trim' mangled-name='mmc_can_secure_erase_trim' filepath='drivers/mmc/core/core.c' line='1968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_secure_erase_trim'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1968' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_can_sanitize' mangled-name='mmc_can_sanitize' filepath='drivers/mmc/core/core.c' line='1969' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_sanitize'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1969' column='1'/> + <function-decl name='mmc_can_sanitize' mangled-name='mmc_can_sanitize' filepath='drivers/mmc/core/core.c' line='1958' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_sanitize'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1958' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_can_erase' mangled-name='mmc_can_erase' filepath='drivers/mmc/core/core.c' line='1939' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_erase'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1939' column='1'/> + <function-decl name='mmc_can_erase' mangled-name='mmc_can_erase' filepath='drivers/mmc/core/core.c' line='1928' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_can_erase'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='1928' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mmc_calc_max_discard' mangled-name='mmc_calc_max_discard' filepath='drivers/mmc/core/core.c' line='2077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_calc_max_discard'> - <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='2077' column='1'/> + <function-decl name='mmc_calc_max_discard' mangled-name='mmc_calc_max_discard' filepath='drivers/mmc/core/core.c' line='2066' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmc_calc_max_discard'> + <parameter type-id='13d38dcb' name='card' filepath='drivers/mmc/core/core.c' line='2066' column='1'/> <return type-id='f0981eeb'/> </function-decl> <function-type size-in-bits='64' id='72e932b0'> @@ -93309,324 +93248,324 @@ </function-decl> <pointer-type-def type-id='cfa9604e' size-in-bits='64' id='4ba2bd6c'/> <pointer-type-def type-id='9d22e201' size-in-bits='64' id='2661e0d9'/> - <class-decl name='sdhci_host' size-in-bits='9728' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='372' column='1' id='9d22e201'> + <class-decl name='sdhci_host' size-in-bits='9728' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='374' column='1' id='9d22e201'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='hw_name' type-id='80f4b756' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='374' column='1'/> + <var-decl name='hw_name' type-id='80f4b756' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='376' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='quirks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='376' column='1'/> + <var-decl name='quirks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='378' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='quirks2' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='443' column='1'/> + <var-decl name='quirks2' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='445' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='488' column='1'/> + <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='490' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='ioaddr' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='489' column='1'/> + <var-decl name='ioaddr' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='491' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='bounce_buffer' type-id='26a90f95' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='490' column='1'/> + <var-decl name='bounce_buffer' type-id='26a90f95' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='492' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='bounce_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='491' column='1'/> + <var-decl name='bounce_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='493' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='bounce_buffer_size' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='492' column='1'/> + <var-decl name='bounce_buffer_size' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='494' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='ops' type-id='4ba2bd6c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='494' column='1'/> + <var-decl name='ops' type-id='4ba2bd6c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='496' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='mmc' type-id='dd575c43' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='497' column='1'/> + <var-decl name='mmc' type-id='dd575c43' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='499' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='mmc_host_ops' type-id='f2d6d1c0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='498' column='1'/> + <var-decl name='mmc_host_ops' type-id='f2d6d1c0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='500' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='dma_mask' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='499' column='1'/> + <var-decl name='dma_mask' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='501' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='led' type-id='6e0e17b0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='502' column='1'/> + <var-decl name='led' type-id='6e0e17b0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='504' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5248'> - <var-decl name='led_name' type-id='16dc656a' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='503' column='1'/> + <var-decl name='led_name' type-id='16dc656a' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='505' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5504'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='506' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='508' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5536'> - <var-decl name='flags' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='508' column='1'/> + <var-decl name='flags' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='510' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5568'> - <var-decl name='version' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='523' column='1'/> + <var-decl name='version' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='525' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5600'> - <var-decl name='max_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='525' column='1'/> + <var-decl name='max_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='527' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5632'> - <var-decl name='timeout_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='526' column='1'/> + <var-decl name='timeout_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='528' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5664'> - <var-decl name='clk_mul' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='527' column='1'/> + <var-decl name='clk_mul' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='529' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5696'> - <var-decl name='clock' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='529' column='1'/> + <var-decl name='clock' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='531' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5728'> - <var-decl name='pwr' type-id='f9b06939' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='530' column='1'/> + <var-decl name='pwr' type-id='f9b06939' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='532' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5736'> - <var-decl name='runtime_suspended' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='532' column='1'/> + <var-decl name='runtime_suspended' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='534' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5744'> - <var-decl name='bus_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='533' column='1'/> + <var-decl name='bus_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='535' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5752'> - <var-decl name='preset_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='534' column='1'/> + <var-decl name='preset_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='536' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5760'> - <var-decl name='pending_reset' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='535' column='1'/> + <var-decl name='pending_reset' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='537' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5768'> - <var-decl name='irq_wake_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='536' column='1'/> + <var-decl name='irq_wake_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='538' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5776'> - <var-decl name='v4_mode' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='537' column='1'/> + <var-decl name='v4_mode' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='539' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5784'> - <var-decl name='always_defer_done' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='538' column='1'/> + <var-decl name='always_defer_done' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='540' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5824'> - <var-decl name='mrqs_done' type-id='c2c0ece0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='540' column='1'/> + <var-decl name='mrqs_done' type-id='c2c0ece0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='542' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5952'> - <var-decl name='cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='541' column='1'/> + <var-decl name='cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='543' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6016'> - <var-decl name='data_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='542' column='1'/> + <var-decl name='data_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='544' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6080'> - <var-decl name='deferred_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='543' column='1'/> + <var-decl name='deferred_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='545' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6144'> - <var-decl name='data' type-id='6de64ec1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='544' column='1'/> + <var-decl name='data' type-id='6de64ec1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='546' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='data_early' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='545' column='1'/> + <var-decl name='data_early' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='547' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6272'> - <var-decl name='sg_miter' type-id='52378ac1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='547' column='1'/> + <var-decl name='sg_miter' type-id='52378ac1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='549' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6848'> - <var-decl name='blocks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='548' column='1'/> + <var-decl name='blocks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='550' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6880'> - <var-decl name='sg_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='550' column='1'/> + <var-decl name='sg_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6912'> - <var-decl name='adma_table' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='552' column='1'/> + <var-decl name='adma_table' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='554' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6976'> - <var-decl name='align_buffer' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='553' column='1'/> + <var-decl name='align_buffer' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='555' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7040'> - <var-decl name='adma_table_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='555' column='1'/> + <var-decl name='adma_table_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='557' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7104'> - <var-decl name='align_buffer_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='556' column='1'/> + <var-decl name='align_buffer_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='558' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7168'> - <var-decl name='adma_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='558' column='1'/> + <var-decl name='adma_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='560' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7232'> - <var-decl name='align_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='559' column='1'/> + <var-decl name='align_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='561' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7296'> - <var-decl name='desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='561' column='1'/> + <var-decl name='desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='563' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7328'> - <var-decl name='alloc_desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='562' column='1'/> + <var-decl name='alloc_desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='564' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7360'> - <var-decl name='complete_wq' type-id='242e3d19' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='564' column='1'/> + <var-decl name='complete_wq' type-id='242e3d19' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='566' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7424'> - <var-decl name='complete_work' type-id='ef9025d0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='565' column='1'/> + <var-decl name='complete_work' type-id='ef9025d0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='567' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7808'> - <var-decl name='timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='567' column='1'/> + <var-decl name='timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='569' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8256'> - <var-decl name='data_timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='568' column='1'/> + <var-decl name='data_timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='570' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='caps' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='570' column='1'/> + <var-decl name='caps' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='572' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8736'> - <var-decl name='caps1' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='571' column='1'/> + <var-decl name='caps1' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='573' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8768'> - <var-decl name='read_caps' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='572' column='1'/> + <var-decl name='read_caps' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='574' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8800'> - <var-decl name='ocr_avail_sdio' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='574' column='1'/> + <var-decl name='ocr_avail_sdio' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='576' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8832'> - <var-decl name='ocr_avail_sd' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='575' column='1'/> + <var-decl name='ocr_avail_sd' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='577' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8864'> - <var-decl name='ocr_avail_mmc' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='576' column='1'/> + <var-decl name='ocr_avail_mmc' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='578' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8896'> - <var-decl name='ocr_mask' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='577' column='1'/> + <var-decl name='ocr_mask' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='579' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8928'> - <var-decl name='timing' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='579' column='1'/> + <var-decl name='timing' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='581' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8960'> - <var-decl name='thread_isr' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='581' column='1'/> + <var-decl name='thread_isr' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='583' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8992'> - <var-decl name='ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='584' column='1'/> + <var-decl name='ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='586' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9024'> - <var-decl name='cqe_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='586' column='1'/> + <var-decl name='cqe_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='588' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9056'> - <var-decl name='cqe_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='587' column='1'/> + <var-decl name='cqe_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='589' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9088'> - <var-decl name='cqe_err_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='588' column='1'/> + <var-decl name='cqe_err_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='590' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='buf_ready_int' type-id='b5ab048f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='590' column='1'/> + <var-decl name='buf_ready_int' type-id='b5ab048f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='592' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='tuning_done' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='591' column='1'/> + <var-decl name='tuning_done' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='593' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9376'> - <var-decl name='tuning_count' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='593' column='1'/> + <var-decl name='tuning_count' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='595' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9408'> - <var-decl name='tuning_mode' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='594' column='1'/> + <var-decl name='tuning_mode' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='596' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9440'> - <var-decl name='tuning_err' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='595' column='1'/> + <var-decl name='tuning_err' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9472'> - <var-decl name='tuning_delay' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='600' column='1'/> + <var-decl name='tuning_delay' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9504'> - <var-decl name='tuning_loop_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='601' column='1'/> + <var-decl name='tuning_loop_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9536'> - <var-decl name='sdma_boundary' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='604' column='1'/> + <var-decl name='sdma_boundary' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9568'> - <var-decl name='adma_table_cnt' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='607' column='1'/> + <var-decl name='adma_table_cnt' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9600'> - <var-decl name='data_timeout' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='609' column='1'/> + <var-decl name='data_timeout' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='611' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9664'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='611' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9728'> - <var-decl name='private' type-id='c99b5ecd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='613' column='1'/> + <var-decl name='private' type-id='c99b5ecd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='615' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='63b6be81' const='yes' id='cfa9604e'/> - <class-decl name='sdhci_ops' size-in-bits='1920' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='616' column='1' id='63b6be81'> + <class-decl name='sdhci_ops' size-in-bits='1920' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='618' column='1' id='63b6be81'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='read_l' type-id='06b0c85e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='618' column='1'/> + <var-decl name='read_l' type-id='06b0c85e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='620' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='read_w' type-id='c7990768' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='619' column='1'/> + <var-decl name='read_w' type-id='c7990768' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='read_b' type-id='8715d191' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='620' column='1'/> + <var-decl name='read_b' type-id='8715d191' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='622' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='write_l' type-id='b291458e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='621' column='1'/> + <var-decl name='write_l' type-id='b291458e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='write_w' type-id='c8439540' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='622' column='1'/> + <var-decl name='write_w' type-id='c8439540' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='624' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='write_b' type-id='3cf0497b' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='623' column='1'/> + <var-decl name='write_b' type-id='3cf0497b' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='625' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='set_clock' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='626' column='1'/> + <var-decl name='set_clock' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='628' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='set_power' type-id='71399c6f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='627' column='1'/> + <var-decl name='set_power' type-id='71399c6f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='629' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='irq' type-id='02663b56' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='630' column='1'/> + <var-decl name='irq' type-id='02663b56' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='632' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='set_dma_mask' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='632' column='1'/> + <var-decl name='set_dma_mask' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='634' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='enable_dma' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='633' column='1'/> + <var-decl name='enable_dma' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='635' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='get_max_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='634' column='1'/> + <var-decl name='get_max_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='636' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='get_min_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='635' column='1'/> + <var-decl name='get_min_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='637' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='get_timeout_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='637' column='1'/> + <var-decl name='get_timeout_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='639' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='get_max_timeout_count' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='638' column='1'/> + <var-decl name='get_max_timeout_count' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='640' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='set_timeout' type-id='3fec7331' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='639' column='1'/> + <var-decl name='set_timeout' type-id='3fec7331' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='set_bus_width' type-id='288e0067' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='641' column='1'/> + <var-decl name='set_bus_width' type-id='288e0067' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='643' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='platform_send_init_74_clocks' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='642' column='1'/> + <var-decl name='platform_send_init_74_clocks' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='644' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='get_ro' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='644' column='1'/> + <var-decl name='get_ro' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='646' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='reset' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='645' column='1'/> + <var-decl name='reset' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='647' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='platform_execute_tuning' type-id='d846c996' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='646' column='1'/> + <var-decl name='platform_execute_tuning' type-id='d846c996' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='648' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='set_uhs_signaling' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='647' column='1'/> + <var-decl name='set_uhs_signaling' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='649' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='hw_reset' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='648' column='1'/> + <var-decl name='hw_reset' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='650' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='adma_workaround' type-id='bb4db0f7' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='649' column='1'/> + <var-decl name='adma_workaround' type-id='bb4db0f7' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='651' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='card_event' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='650' column='1'/> + <var-decl name='card_event' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='voltage_switch' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='651' column='1'/> + <var-decl name='voltage_switch' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='adma_write_desc' type-id='7a3863fd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='652' column='1'/> + <var-decl name='adma_write_desc' type-id='7a3863fd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='request_done' type-id='d17e9a1d' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='654' column='1'/> + <var-decl name='request_done' type-id='d17e9a1d' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='dump_vendor_regs' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='656' column='1'/> + <var-decl name='dump_vendor_regs' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='658' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='658' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='660' column='1'/> </data-member> </class-decl> <class-decl name='sg_mapping_iter' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/scatterlist.h' line='491' column='1' id='52378ac1'> @@ -93696,323 +93635,323 @@ <array-type-def dimensions='1' type-id='47f117d4' size-in-bits='128' id='c2c0ece0'> <subrange length='2' type-id='7ff19f0f' id='52efc4ef'/> </array-type-def> - <class-decl name='sdhci_host' size-in-bits='9728' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='372' column='1' id='9d22e201'> + <class-decl name='sdhci_host' size-in-bits='9728' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='374' column='1' id='9d22e201'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='hw_name' type-id='80f4b756' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='374' column='1'/> + <var-decl name='hw_name' type-id='80f4b756' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='376' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='quirks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='376' column='1'/> + <var-decl name='quirks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='378' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='quirks2' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='443' column='1'/> + <var-decl name='quirks2' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='445' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='488' column='1'/> + <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='490' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='ioaddr' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='489' column='1'/> + <var-decl name='ioaddr' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='491' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='bounce_buffer' type-id='26a90f95' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='490' column='1'/> + <var-decl name='bounce_buffer' type-id='26a90f95' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='492' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='bounce_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='491' column='1'/> + <var-decl name='bounce_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='493' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='bounce_buffer_size' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='492' column='1'/> + <var-decl name='bounce_buffer_size' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='494' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='ops' type-id='4ba2bd6c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='494' column='1'/> + <var-decl name='ops' type-id='4ba2bd6c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='496' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='mmc' type-id='dd575c43' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='497' column='1'/> + <var-decl name='mmc' type-id='dd575c43' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='499' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='mmc_host_ops' type-id='f2d6d1c0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='498' column='1'/> + <var-decl name='mmc_host_ops' type-id='f2d6d1c0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='500' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='dma_mask' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='499' column='1'/> + <var-decl name='dma_mask' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='501' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='led' type-id='6e0e17b0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='502' column='1'/> + <var-decl name='led' type-id='6e0e17b0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='504' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5248'> - <var-decl name='led_name' type-id='16dc656a' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='503' column='1'/> + <var-decl name='led_name' type-id='16dc656a' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='505' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5504'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='506' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='508' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5536'> - <var-decl name='flags' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='508' column='1'/> + <var-decl name='flags' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='510' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5568'> - <var-decl name='version' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='523' column='1'/> + <var-decl name='version' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='525' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5600'> - <var-decl name='max_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='525' column='1'/> + <var-decl name='max_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='527' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5632'> - <var-decl name='timeout_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='526' column='1'/> + <var-decl name='timeout_clk' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='528' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5664'> - <var-decl name='clk_mul' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='527' column='1'/> + <var-decl name='clk_mul' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='529' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5696'> - <var-decl name='clock' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='529' column='1'/> + <var-decl name='clock' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='531' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5728'> - <var-decl name='pwr' type-id='f9b06939' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='530' column='1'/> + <var-decl name='pwr' type-id='f9b06939' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='532' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5736'> - <var-decl name='runtime_suspended' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='532' column='1'/> + <var-decl name='runtime_suspended' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='534' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5744'> - <var-decl name='bus_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='533' column='1'/> + <var-decl name='bus_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='535' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5752'> - <var-decl name='preset_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='534' column='1'/> + <var-decl name='preset_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='536' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5760'> - <var-decl name='pending_reset' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='535' column='1'/> + <var-decl name='pending_reset' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='537' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5768'> - <var-decl name='irq_wake_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='536' column='1'/> + <var-decl name='irq_wake_enabled' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='538' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5776'> - <var-decl name='v4_mode' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='537' column='1'/> + <var-decl name='v4_mode' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='539' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5784'> - <var-decl name='always_defer_done' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='538' column='1'/> + <var-decl name='always_defer_done' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='540' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5824'> - <var-decl name='mrqs_done' type-id='c2c0ece0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='540' column='1'/> + <var-decl name='mrqs_done' type-id='c2c0ece0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='542' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5952'> - <var-decl name='cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='541' column='1'/> + <var-decl name='cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='543' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6016'> - <var-decl name='data_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='542' column='1'/> + <var-decl name='data_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='544' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6080'> - <var-decl name='deferred_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='543' column='1'/> + <var-decl name='deferred_cmd' type-id='6df3750c' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='545' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6144'> - <var-decl name='data' type-id='6de64ec1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='544' column='1'/> + <var-decl name='data' type-id='6de64ec1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='546' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='data_early' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='545' column='1'/> + <var-decl name='data_early' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='547' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6272'> - <var-decl name='sg_miter' type-id='52378ac1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='547' column='1'/> + <var-decl name='sg_miter' type-id='52378ac1' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='549' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6848'> - <var-decl name='blocks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='548' column='1'/> + <var-decl name='blocks' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='550' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6880'> - <var-decl name='sg_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='550' column='1'/> + <var-decl name='sg_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6912'> - <var-decl name='adma_table' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='552' column='1'/> + <var-decl name='adma_table' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='554' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6976'> - <var-decl name='align_buffer' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='553' column='1'/> + <var-decl name='align_buffer' type-id='eaa32e2f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='555' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7040'> - <var-decl name='adma_table_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='555' column='1'/> + <var-decl name='adma_table_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='557' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7104'> - <var-decl name='align_buffer_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='556' column='1'/> + <var-decl name='align_buffer_sz' type-id='b59d7dce' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='558' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7168'> - <var-decl name='adma_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='558' column='1'/> + <var-decl name='adma_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='560' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7232'> - <var-decl name='align_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='559' column='1'/> + <var-decl name='align_addr' type-id='cf29c9b3' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='561' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7296'> - <var-decl name='desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='561' column='1'/> + <var-decl name='desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='563' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7328'> - <var-decl name='alloc_desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='562' column='1'/> + <var-decl name='alloc_desc_sz' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='564' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7360'> - <var-decl name='complete_wq' type-id='242e3d19' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='564' column='1'/> + <var-decl name='complete_wq' type-id='242e3d19' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='566' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7424'> - <var-decl name='complete_work' type-id='ef9025d0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='565' column='1'/> + <var-decl name='complete_work' type-id='ef9025d0' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='567' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7808'> - <var-decl name='timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='567' column='1'/> + <var-decl name='timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='569' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8256'> - <var-decl name='data_timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='568' column='1'/> + <var-decl name='data_timer' type-id='abe41e67' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='570' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='caps' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='570' column='1'/> + <var-decl name='caps' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='572' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8736'> - <var-decl name='caps1' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='571' column='1'/> + <var-decl name='caps1' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='573' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8768'> - <var-decl name='read_caps' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='572' column='1'/> + <var-decl name='read_caps' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='574' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8800'> - <var-decl name='ocr_avail_sdio' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='574' column='1'/> + <var-decl name='ocr_avail_sdio' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='576' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8832'> - <var-decl name='ocr_avail_sd' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='575' column='1'/> + <var-decl name='ocr_avail_sd' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='577' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8864'> - <var-decl name='ocr_avail_mmc' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='576' column='1'/> + <var-decl name='ocr_avail_mmc' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='578' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8896'> - <var-decl name='ocr_mask' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='577' column='1'/> + <var-decl name='ocr_mask' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='579' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8928'> - <var-decl name='timing' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='579' column='1'/> + <var-decl name='timing' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='581' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8960'> - <var-decl name='thread_isr' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='581' column='1'/> + <var-decl name='thread_isr' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='583' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8992'> - <var-decl name='ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='584' column='1'/> + <var-decl name='ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='586' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9024'> - <var-decl name='cqe_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='586' column='1'/> + <var-decl name='cqe_on' type-id='b50a4934' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='588' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9056'> - <var-decl name='cqe_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='587' column='1'/> + <var-decl name='cqe_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='589' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9088'> - <var-decl name='cqe_err_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='588' column='1'/> + <var-decl name='cqe_err_ier' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='590' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='buf_ready_int' type-id='b5ab048f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='590' column='1'/> + <var-decl name='buf_ready_int' type-id='b5ab048f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='592' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='tuning_done' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='591' column='1'/> + <var-decl name='tuning_done' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='593' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9376'> - <var-decl name='tuning_count' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='593' column='1'/> + <var-decl name='tuning_count' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='595' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9408'> - <var-decl name='tuning_mode' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='594' column='1'/> + <var-decl name='tuning_mode' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='596' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9440'> - <var-decl name='tuning_err' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='595' column='1'/> + <var-decl name='tuning_err' type-id='f0981eeb' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9472'> - <var-decl name='tuning_delay' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='600' column='1'/> + <var-decl name='tuning_delay' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9504'> - <var-decl name='tuning_loop_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='601' column='1'/> + <var-decl name='tuning_loop_count' type-id='95e97e5e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9536'> - <var-decl name='sdma_boundary' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='604' column='1'/> + <var-decl name='sdma_boundary' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9568'> - <var-decl name='adma_table_cnt' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='607' column='1'/> + <var-decl name='adma_table_cnt' type-id='19c2251e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9600'> - <var-decl name='data_timeout' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='609' column='1'/> + <var-decl name='data_timeout' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='611' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9664'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='611' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9728'> - <var-decl name='private' type-id='c99b5ecd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='613' column='1'/> + <var-decl name='private' type-id='c99b5ecd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='615' column='1'/> </data-member> </class-decl> - <class-decl name='sdhci_ops' size-in-bits='1920' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='616' column='1' id='63b6be81'> + <class-decl name='sdhci_ops' size-in-bits='1920' is-struct='yes' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='618' column='1' id='63b6be81'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='read_l' type-id='06b0c85e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='618' column='1'/> + <var-decl name='read_l' type-id='06b0c85e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='620' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='read_w' type-id='c7990768' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='619' column='1'/> + <var-decl name='read_w' type-id='c7990768' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='read_b' type-id='8715d191' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='620' column='1'/> + <var-decl name='read_b' type-id='8715d191' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='622' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='write_l' type-id='b291458e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='621' column='1'/> + <var-decl name='write_l' type-id='b291458e' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='write_w' type-id='c8439540' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='622' column='1'/> + <var-decl name='write_w' type-id='c8439540' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='624' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='write_b' type-id='3cf0497b' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='623' column='1'/> + <var-decl name='write_b' type-id='3cf0497b' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='625' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='set_clock' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='626' column='1'/> + <var-decl name='set_clock' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='628' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='set_power' type-id='71399c6f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='627' column='1'/> + <var-decl name='set_power' type-id='71399c6f' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='629' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='irq' type-id='02663b56' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='630' column='1'/> + <var-decl name='irq' type-id='02663b56' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='632' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='set_dma_mask' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='632' column='1'/> + <var-decl name='set_dma_mask' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='634' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='enable_dma' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='633' column='1'/> + <var-decl name='enable_dma' type-id='a9d7e307' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='635' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='get_max_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='634' column='1'/> + <var-decl name='get_max_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='636' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='get_min_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='635' column='1'/> + <var-decl name='get_min_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='637' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='get_timeout_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='637' column='1'/> + <var-decl name='get_timeout_clock' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='639' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='get_max_timeout_count' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='638' column='1'/> + <var-decl name='get_max_timeout_count' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='640' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='set_timeout' type-id='3fec7331' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='639' column='1'/> + <var-decl name='set_timeout' type-id='3fec7331' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='set_bus_width' type-id='288e0067' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='641' column='1'/> + <var-decl name='set_bus_width' type-id='288e0067' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='643' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='platform_send_init_74_clocks' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='642' column='1'/> + <var-decl name='platform_send_init_74_clocks' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='644' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='get_ro' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='644' column='1'/> + <var-decl name='get_ro' type-id='601d7eac' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='646' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='reset' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='645' column='1'/> + <var-decl name='reset' type-id='30c362fc' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='647' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='platform_execute_tuning' type-id='d846c996' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='646' column='1'/> + <var-decl name='platform_execute_tuning' type-id='d846c996' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='648' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='set_uhs_signaling' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='647' column='1'/> + <var-decl name='set_uhs_signaling' type-id='98dbb7da' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='649' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='hw_reset' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='648' column='1'/> + <var-decl name='hw_reset' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='650' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='adma_workaround' type-id='bb4db0f7' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='649' column='1'/> + <var-decl name='adma_workaround' type-id='bb4db0f7' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='651' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='card_event' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='650' column='1'/> + <var-decl name='card_event' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='voltage_switch' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='651' column='1'/> + <var-decl name='voltage_switch' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='adma_write_desc' type-id='7a3863fd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='652' column='1'/> + <var-decl name='adma_write_desc' type-id='7a3863fd' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='request_done' type-id='d17e9a1d' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='654' column='1'/> + <var-decl name='request_done' type-id='d17e9a1d' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='dump_vendor_regs' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='656' column='1'/> + <var-decl name='dump_vendor_regs' type-id='13daec78' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='658' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='658' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='drivers/mmc/host/sdhci.h' line='660' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='63b6be81' const='yes' id='cfa9604e'/> @@ -94045,11 +93984,6 @@ <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='3875' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sdhci_set_uhs_signaling' mangled-name='sdhci_set_uhs_signaling' filepath='drivers/mmc/host/sdhci.c' line='1995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_uhs_signaling'> - <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='1995' column='1'/> - <parameter type-id='f0981eeb' name='timing' filepath='drivers/mmc/host/sdhci.c' line='1995' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='sdhci_set_clock' mangled-name='sdhci_set_clock' filepath='drivers/mmc/host/sdhci.c' line='1772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_set_clock'> <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='1772' column='1'/> <parameter type-id='f0981eeb' name='clock' filepath='drivers/mmc/host/sdhci.c' line='1772' column='1'/> @@ -94074,9 +94008,9 @@ <parameter type-id='95e97e5e' name='soft_reset' filepath='drivers/mmc/host/sdhci.c' line='3502' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sdhci_reset' mangled-name='sdhci_reset' filepath='drivers/mmc/host/sdhci.c' line='202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset'> - <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='202' column='1'/> - <parameter type-id='f9b06939' name='mask' filepath='drivers/mmc/host/sdhci.c' line='202' column='1'/> + <function-decl name='sdhci_reset' mangled-name='sdhci_reset' filepath='drivers/mmc/host/sdhci.c' line='201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_reset'> + <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='201' column='1'/> + <parameter type-id='f9b06939' name='mask' filepath='drivers/mmc/host/sdhci.c' line='201' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='sdhci_request_atomic' mangled-name='sdhci_request_atomic' filepath='drivers/mmc/host/sdhci.c' line='1941' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_request_atomic'> @@ -94084,9 +94018,9 @@ <parameter type-id='47f117d4' name='mrq' filepath='drivers/mmc/host/sdhci.c' line='1941' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__sdhci_set_timeout' mangled-name='__sdhci_set_timeout' filepath='drivers/mmc/host/sdhci.c' line='999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_set_timeout'> - <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='999' column='1'/> - <parameter type-id='6df3750c' name='cmd' filepath='drivers/mmc/host/sdhci.c' line='999' column='1'/> + <function-decl name='__sdhci_set_timeout' mangled-name='__sdhci_set_timeout' filepath='drivers/mmc/host/sdhci.c' line='998' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sdhci_set_timeout'> + <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='998' column='1'/> + <parameter type-id='6df3750c' name='cmd' filepath='drivers/mmc/host/sdhci.c' line='998' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='sdhci_request' mangled-name='sdhci_request' filepath='drivers/mmc/host/sdhci.c' line='1897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_request'> @@ -94099,13 +94033,8 @@ <parameter type-id='95e97e5e' name='dead' filepath='drivers/mmc/host/sdhci.c' line='4516' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='sdhci_execute_tuning' mangled-name='sdhci_execute_tuning' filepath='drivers/mmc/host/sdhci.c' line='2571' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_execute_tuning'> - <parameter type-id='dd575c43' name='mmc' filepath='drivers/mmc/host/sdhci.c' line='2571' column='1'/> - <parameter type-id='19c2251e' name='opcode' filepath='drivers/mmc/host/sdhci.c' line='2571' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='sdhci_enable_v4_mode' mangled-name='sdhci_enable_v4_mode' filepath='drivers/mmc/host/sdhci.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_v4_mode'> - <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='142' column='1'/> + <function-decl name='sdhci_enable_v4_mode' mangled-name='sdhci_enable_v4_mode' filepath='drivers/mmc/host/sdhci.c' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_enable_v4_mode'> + <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='141' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='sdhci_cqe_irq' mangled-name='sdhci_cqe_irq' filepath='drivers/mmc/host/sdhci.c' line='3628' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_cqe_irq'> @@ -94128,12 +94057,12 @@ <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='4411' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='sdhci_adma_write_desc' mangled-name='sdhci_adma_write_desc' filepath='drivers/mmc/host/sdhci.c' line='667' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_adma_write_desc'> - <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='667' column='1'/> - <parameter type-id='63e171df' name='desc' filepath='drivers/mmc/host/sdhci.c' line='667' column='1'/> - <parameter type-id='cf29c9b3' name='addr' filepath='drivers/mmc/host/sdhci.c' line='668' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='drivers/mmc/host/sdhci.c' line='668' column='1'/> - <parameter type-id='f0981eeb' name='cmd' filepath='drivers/mmc/host/sdhci.c' line='668' column='1'/> + <function-decl name='sdhci_adma_write_desc' mangled-name='sdhci_adma_write_desc' filepath='drivers/mmc/host/sdhci.c' line='666' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_adma_write_desc'> + <parameter type-id='2661e0d9' name='host' filepath='drivers/mmc/host/sdhci.c' line='666' column='1'/> + <parameter type-id='63e171df' name='desc' filepath='drivers/mmc/host/sdhci.c' line='666' column='1'/> + <parameter type-id='cf29c9b3' name='addr' filepath='drivers/mmc/host/sdhci.c' line='667' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='drivers/mmc/host/sdhci.c' line='667' column='1'/> + <parameter type-id='f0981eeb' name='cmd' filepath='drivers/mmc/host/sdhci.c' line='667' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='sdhci_add_host' mangled-name='sdhci_add_host' filepath='drivers/mmc/host/sdhci.c' line='4495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sdhci_add_host'> @@ -94419,43 +94348,43 @@ </class-decl> </abi-instr> <abi-instr address-size='64' path='drivers/net/phy/mdio_bus.c' language='LANG_C89'> - <function-decl name='__mdiobus_register' mangled-name='__mdiobus_register' filepath='drivers/net/phy/mdio_bus.c' line='374' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_register'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='374' column='1'/> - <parameter type-id='2730d015' name='owner' filepath='drivers/net/phy/mdio_bus.c' line='374' column='1'/> + <function-decl name='__mdiobus_register' mangled-name='__mdiobus_register' filepath='drivers/net/phy/mdio_bus.c' line='369' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_register'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='369' column='1'/> + <parameter type-id='2730d015' name='owner' filepath='drivers/net/phy/mdio_bus.c' line='369' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mdiobus_read' mangled-name='mdiobus_read' filepath='drivers/net/phy/mdio_bus.c' line='638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_read'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='638' column='1'/> - <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='638' column='1'/> - <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='638' column='1'/> + <function-decl name='mdiobus_read' mangled-name='mdiobus_read' filepath='drivers/net/phy/mdio_bus.c' line='633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_read'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='633' column='1'/> + <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='633' column='1'/> + <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='633' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='mdiobus_write' mangled-name='mdiobus_write' filepath='drivers/net/phy/mdio_bus.c' line='691' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_write'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='691' column='1'/> - <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='691' column='1'/> - <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='691' column='1'/> - <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/mdio_bus.c' line='691' column='1'/> + <function-decl name='mdiobus_write' mangled-name='mdiobus_write' filepath='drivers/net/phy/mdio_bus.c' line='686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_write'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='686' column='1'/> + <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='686' column='1'/> + <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='686' column='1'/> + <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/mdio_bus.c' line='686' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__mdiobus_write' mangled-name='__mdiobus_write' filepath='drivers/net/phy/mdio_bus.c' line='587' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_write'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='587' column='1'/> - <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='587' column='1'/> - <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='587' column='1'/> - <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/mdio_bus.c' line='587' column='1'/> + <function-decl name='__mdiobus_write' mangled-name='__mdiobus_write' filepath='drivers/net/phy/mdio_bus.c' line='582' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_write'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='582' column='1'/> + <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='582' column='1'/> + <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='582' column='1'/> + <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/mdio_bus.c' line='582' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__mdiobus_read' mangled-name='__mdiobus_read' filepath='drivers/net/phy/mdio_bus.c' line='562' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_read'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='562' column='1'/> - <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='562' column='1'/> - <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='562' column='1'/> + <function-decl name='__mdiobus_read' mangled-name='__mdiobus_read' filepath='drivers/net/phy/mdio_bus.c' line='557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mdiobus_read'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='557' column='1'/> + <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='557' column='1'/> + <parameter type-id='19c2251e' name='regnum' filepath='drivers/net/phy/mdio_bus.c' line='557' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='of_mdio_find_bus' mangled-name='of_mdio_find_bus' filepath='drivers/net/phy/mdio_bus.c' line='282' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_mdio_find_bus'> - <parameter type-id='9a537bbe' name='mdio_bus_np' filepath='drivers/net/phy/mdio_bus.c' line='282' column='1'/> + <function-decl name='of_mdio_find_bus' mangled-name='of_mdio_find_bus' filepath='drivers/net/phy/mdio_bus.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_mdio_find_bus'> + <parameter type-id='9a537bbe' name='mdio_bus_np' filepath='drivers/net/phy/mdio_bus.c' line='277' column='1'/> <return type-id='ff47b24b'/> </function-decl> - <function-decl name='mdiobus_unregister' mangled-name='mdiobus_unregister' filepath='drivers/net/phy/mdio_bus.c' line='463' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_unregister'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='463' column='1'/> + <function-decl name='mdiobus_unregister' mangled-name='mdiobus_unregister' filepath='drivers/net/phy/mdio_bus.c' line='458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_unregister'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='458' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='mdiobus_get_phy' mangled-name='mdiobus_get_phy' filepath='drivers/net/phy/mdio_bus.c' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_get_phy'> @@ -94463,12 +94392,12 @@ <parameter type-id='95e97e5e' name='addr' filepath='drivers/net/phy/mdio_bus.c' line='118' column='1'/> <return type-id='7efbcaaf'/> </function-decl> - <function-decl name='mdiobus_free' mangled-name='mdiobus_free' filepath='drivers/net/phy/mdio_bus.c' line='500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_free'> - <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='500' column='1'/> + <function-decl name='mdiobus_free' mangled-name='mdiobus_free' filepath='drivers/net/phy/mdio_bus.c' line='495' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_free'> + <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/mdio_bus.c' line='495' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mdiobus_alloc_size' mangled-name='mdiobus_alloc_size' filepath='drivers/net/phy/mdio_bus.c' line='151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_alloc_size'> - <parameter type-id='b59d7dce' name='size' filepath='drivers/net/phy/mdio_bus.c' line='151' column='1'/> + <function-decl name='mdiobus_alloc_size' mangled-name='mdiobus_alloc_size' filepath='drivers/net/phy/mdio_bus.c' line='146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mdiobus_alloc_size'> + <parameter type-id='b59d7dce' name='size' filepath='drivers/net/phy/mdio_bus.c' line='146' column='1'/> <return type-id='ff47b24b'/> </function-decl> </abi-instr> @@ -95082,25 +95011,25 @@ </function-type> </abi-instr> <abi-instr address-size='64' path='drivers/net/phy/phy_device.c' language='LANG_C89'> - <function-decl name='genphy_read_status' mangled-name='genphy_read_status' filepath='drivers/net/phy/phy_device.c' line='1855' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_status'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1855' column='1'/> + <function-decl name='genphy_read_status' mangled-name='genphy_read_status' filepath='drivers/net/phy/phy_device.c' line='1854' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_status'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1854' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__genphy_config_aneg' mangled-name='__genphy_config_aneg' filepath='drivers/net/phy/phy_device.c' line='1694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__genphy_config_aneg'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1694' column='1'/> - <parameter type-id='b50a4934' name='changed' filepath='drivers/net/phy/phy_device.c' line='1694' column='1'/> + <function-decl name='__genphy_config_aneg' mangled-name='__genphy_config_aneg' filepath='drivers/net/phy/phy_device.c' line='1693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__genphy_config_aneg'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1693' column='1'/> + <parameter type-id='b50a4934' name='changed' filepath='drivers/net/phy/phy_device.c' line='1693' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='genphy_read_abilities' mangled-name='genphy_read_abilities' filepath='drivers/net/phy/phy_device.c' line='1944' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_abilities'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1944' column='1'/> + <function-decl name='genphy_read_abilities' mangled-name='genphy_read_abilities' filepath='drivers/net/phy/phy_device.c' line='1943' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_abilities'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1943' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='genphy_suspend' mangled-name='genphy_suspend' filepath='drivers/net/phy/phy_device.c' line='2002' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_suspend'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2002' column='1'/> + <function-decl name='genphy_suspend' mangled-name='genphy_suspend' filepath='drivers/net/phy/phy_device.c' line='2001' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_suspend'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2001' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='genphy_resume' mangled-name='genphy_resume' filepath='drivers/net/phy/phy_device.c' line='2008' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_resume'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2008' column='1'/> + <function-decl name='genphy_resume' mangled-name='genphy_resume' filepath='drivers/net/phy/phy_device.c' line='2007' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_resume'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2007' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='phy_unregister_fixup_for_uid' mangled-name='phy_unregister_fixup_for_uid' filepath='drivers/net/phy/phy_device.c' line='429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_unregister_fixup_for_uid'> @@ -95108,15 +95037,15 @@ <parameter type-id='19c2251e' name='phy_uid_mask' filepath='drivers/net/phy/phy_device.c' line='429' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='phy_set_asym_pause' mangled-name='phy_set_asym_pause' filepath='drivers/net/phy/phy_device.c' line='2123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_set_asym_pause'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2123' column='1'/> - <parameter type-id='b50a4934' name='rx' filepath='drivers/net/phy/phy_device.c' line='2123' column='1'/> - <parameter type-id='b50a4934' name='tx' filepath='drivers/net/phy/phy_device.c' line='2123' column='1'/> + <function-decl name='phy_set_asym_pause' mangled-name='phy_set_asym_pause' filepath='drivers/net/phy/phy_device.c' line='2122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_set_asym_pause'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2122' column='1'/> + <parameter type-id='b50a4934' name='rx' filepath='drivers/net/phy/phy_device.c' line='2122' column='1'/> + <parameter type-id='b50a4934' name='tx' filepath='drivers/net/phy/phy_device.c' line='2122' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='phy_remove_link_mode' mangled-name='phy_remove_link_mode' filepath='drivers/net/phy/phy_device.c' line='2030' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_remove_link_mode'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2030' column='1'/> - <parameter type-id='19c2251e' name='link_mode' filepath='drivers/net/phy/phy_device.c' line='2030' column='1'/> + <function-decl name='phy_remove_link_mode' mangled-name='phy_remove_link_mode' filepath='drivers/net/phy/phy_device.c' line='2029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_remove_link_mode'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='2029' column='1'/> + <parameter type-id='19c2251e' name='link_mode' filepath='drivers/net/phy/phy_device.c' line='2029' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='phy_register_fixup_for_uid' mangled-name='phy_register_fixup_for_uid' filepath='drivers/net/phy/phy_device.c' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_register_fixup_for_uid'> @@ -95129,23 +95058,23 @@ <parameter type-id='ff47b24b' name='bus' filepath='drivers/net/phy/phy_device.c' line='903' column='1'/> <return type-id='7efbcaaf'/> </function-decl> - <function-decl name='phy_drivers_unregister' mangled-name='phy_drivers_unregister' filepath='drivers/net/phy/phy_device.c' line='2368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_drivers_unregister'> - <parameter type-id='e812884b' name='drv' filepath='drivers/net/phy/phy_device.c' line='2368' column='1'/> - <parameter type-id='95e97e5e' name='n' filepath='drivers/net/phy/phy_device.c' line='2368' column='1'/> + <function-decl name='phy_drivers_unregister' mangled-name='phy_drivers_unregister' filepath='drivers/net/phy/phy_device.c' line='2367' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_drivers_unregister'> + <parameter type-id='e812884b' name='drv' filepath='drivers/net/phy/phy_device.c' line='2367' column='1'/> + <parameter type-id='95e97e5e' name='n' filepath='drivers/net/phy/phy_device.c' line='2367' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='phy_drivers_register' mangled-name='phy_drivers_register' filepath='drivers/net/phy/phy_device.c' line='2345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_drivers_register'> - <parameter type-id='e812884b' name='new_driver' filepath='drivers/net/phy/phy_device.c' line='2345' column='1'/> - <parameter type-id='95e97e5e' name='n' filepath='drivers/net/phy/phy_device.c' line='2345' column='1'/> - <parameter type-id='2730d015' name='owner' filepath='drivers/net/phy/phy_device.c' line='2346' column='1'/> + <function-decl name='phy_drivers_register' mangled-name='phy_drivers_register' filepath='drivers/net/phy/phy_device.c' line='2344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_drivers_register'> + <parameter type-id='e812884b' name='new_driver' filepath='drivers/net/phy/phy_device.c' line='2344' column='1'/> + <parameter type-id='95e97e5e' name='n' filepath='drivers/net/phy/phy_device.c' line='2344' column='1'/> + <parameter type-id='2730d015' name='owner' filepath='drivers/net/phy/phy_device.c' line='2345' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='phy_disconnect' mangled-name='phy_disconnect' filepath='drivers/net/phy/phy_device.c' line='1023' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_disconnect'> <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1023' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='phy_detach' mangled-name='phy_detach' filepath='drivers/net/phy/phy_device.c' line='1400' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_detach'> - <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1400' column='1'/> + <function-decl name='phy_detach' mangled-name='phy_detach' filepath='drivers/net/phy/phy_device.c' line='1399' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_detach'> + <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1399' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='phy_connect_direct' mangled-name='phy_connect_direct' filepath='drivers/net/phy/phy_device.c' line='955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='phy_connect_direct'> @@ -95173,17 +95102,17 @@ <parameter type-id='7efbcaaf' name='phydev' filepath='drivers/net/phy/phy_device.c' line='1104' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='genphy_write_mmd_unsupported' mangled-name='genphy_write_mmd_unsupported' filepath='drivers/net/phy/phy_device.c' line='1995' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_write_mmd_unsupported'> - <parameter type-id='7efbcaaf' name='phdev' filepath='drivers/net/phy/phy_device.c' line='1995' column='1'/> - <parameter type-id='95e97e5e' name='devnum' filepath='drivers/net/phy/phy_device.c' line='1995' column='1'/> - <parameter type-id='1dc6a898' name='regnum' filepath='drivers/net/phy/phy_device.c' line='1996' column='1'/> - <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/phy_device.c' line='1996' column='1'/> + <function-decl name='genphy_write_mmd_unsupported' mangled-name='genphy_write_mmd_unsupported' filepath='drivers/net/phy/phy_device.c' line='1994' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_write_mmd_unsupported'> + <parameter type-id='7efbcaaf' name='phdev' filepath='drivers/net/phy/phy_device.c' line='1994' column='1'/> + <parameter type-id='95e97e5e' name='devnum' filepath='drivers/net/phy/phy_device.c' line='1994' column='1'/> + <parameter type-id='1dc6a898' name='regnum' filepath='drivers/net/phy/phy_device.c' line='1995' column='1'/> + <parameter type-id='1dc6a898' name='val' filepath='drivers/net/phy/phy_device.c' line='1995' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='genphy_read_mmd_unsupported' mangled-name='genphy_read_mmd_unsupported' filepath='drivers/net/phy/phy_device.c' line='1989' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_mmd_unsupported'> - <parameter type-id='7efbcaaf' name='phdev' filepath='drivers/net/phy/phy_device.c' line='1989' column='1'/> - <parameter type-id='95e97e5e' name='devad' filepath='drivers/net/phy/phy_device.c' line='1989' column='1'/> - <parameter type-id='1dc6a898' name='regnum' filepath='drivers/net/phy/phy_device.c' line='1989' column='1'/> + <function-decl name='genphy_read_mmd_unsupported' mangled-name='genphy_read_mmd_unsupported' filepath='drivers/net/phy/phy_device.c' line='1988' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='genphy_read_mmd_unsupported'> + <parameter type-id='7efbcaaf' name='phdev' filepath='drivers/net/phy/phy_device.c' line='1988' column='1'/> + <parameter type-id='95e97e5e' name='devad' filepath='drivers/net/phy/phy_device.c' line='1988' column='1'/> + <parameter type-id='1dc6a898' name='regnum' filepath='drivers/net/phy/phy_device.c' line='1988' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -95355,51 +95284,51 @@ <pointer-type-def type-id='2c09b409' size-in-bits='64' id='20cd282d'/> <pointer-type-def type-id='7591d8fc' size-in-bits='64' id='15f4611e'/> <pointer-type-def type-id='ee9a0086' size-in-bits='64' id='26560df0'/> - <function-decl name='ppp_register_net_channel' mangled-name='ppp_register_net_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_net_channel'> - <parameter type-id='a2bff676' name='net' filepath='drivers/net/ppp/ppp_generic.c' line='2618' column='1'/> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2618' column='1'/> + <function-decl name='ppp_register_net_channel' mangled-name='ppp_register_net_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2616' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_net_channel'> + <parameter type-id='a2bff676' name='net' filepath='drivers/net/ppp/ppp_generic.c' line='2616' column='1'/> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2616' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ppp_unregister_compressor' mangled-name='ppp_unregister_compressor' filepath='drivers/net/ppp/ppp_generic.c' line='2985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unregister_compressor'> - <parameter type-id='a3e624c2' name='cp' filepath='drivers/net/ppp/ppp_generic.c' line='2985' column='1'/> + <function-decl name='ppp_unregister_compressor' mangled-name='ppp_unregister_compressor' filepath='drivers/net/ppp/ppp_generic.c' line='2983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unregister_compressor'> + <parameter type-id='a3e624c2' name='cp' filepath='drivers/net/ppp/ppp_generic.c' line='2983' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ppp_unregister_channel' mangled-name='ppp_unregister_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2703' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unregister_channel'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2703' column='1'/> + <function-decl name='ppp_unregister_channel' mangled-name='ppp_unregister_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2701' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unregister_channel'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2701' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ppp_unit_number' mangled-name='ppp_unit_number' filepath='drivers/net/ppp/ppp_generic.c' line='2666' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unit_number'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2666' column='1'/> + <function-decl name='ppp_unit_number' mangled-name='ppp_unit_number' filepath='drivers/net/ppp/ppp_generic.c' line='2664' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_unit_number'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2664' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ppp_register_compressor' mangled-name='ppp_register_compressor' filepath='drivers/net/ppp/ppp_generic.c' line='2963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_compressor'> - <parameter type-id='a3e624c2' name='cp' filepath='drivers/net/ppp/ppp_generic.c' line='2963' column='1'/> + <function-decl name='ppp_register_compressor' mangled-name='ppp_register_compressor' filepath='drivers/net/ppp/ppp_generic.c' line='2961' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_compressor'> + <parameter type-id='a3e624c2' name='cp' filepath='drivers/net/ppp/ppp_generic.c' line='2961' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ppp_register_channel' mangled-name='ppp_register_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_channel'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2612' column='1'/> + <function-decl name='ppp_register_channel' mangled-name='ppp_register_channel' filepath='drivers/net/ppp/ppp_generic.c' line='2610' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_register_channel'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2610' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ppp_output_wakeup' mangled-name='ppp_output_wakeup' filepath='drivers/net/ppp/ppp_generic.c' line='2740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_output_wakeup'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2740' column='1'/> + <function-decl name='ppp_output_wakeup' mangled-name='ppp_output_wakeup' filepath='drivers/net/ppp/ppp_generic.c' line='2738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_output_wakeup'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2738' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ppp_input_error' mangled-name='ppp_input_error' filepath='drivers/net/ppp/ppp_generic.c' line='2062' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_input_error'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2062' column='1'/> - <parameter type-id='95e97e5e' name='code' filepath='drivers/net/ppp/ppp_generic.c' line='2062' column='1'/> + <function-decl name='ppp_input_error' mangled-name='ppp_input_error' filepath='drivers/net/ppp/ppp_generic.c' line='2060' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_input_error'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2060' column='1'/> + <parameter type-id='95e97e5e' name='code' filepath='drivers/net/ppp/ppp_generic.c' line='2060' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ppp_input' mangled-name='ppp_input' filepath='drivers/net/ppp/ppp_generic.c' line='2023' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_input'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2023' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='drivers/net/ppp/ppp_generic.c' line='2023' column='1'/> + <function-decl name='ppp_input' mangled-name='ppp_input' filepath='drivers/net/ppp/ppp_generic.c' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_input'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2021' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='drivers/net/ppp/ppp_generic.c' line='2021' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ppp_dev_name' mangled-name='ppp_dev_name' filepath='drivers/net/ppp/ppp_generic.c' line='2683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_dev_name'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2683' column='1'/> + <function-decl name='ppp_dev_name' mangled-name='ppp_dev_name' filepath='drivers/net/ppp/ppp_generic.c' line='2681' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_dev_name'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2681' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='ppp_channel_index' mangled-name='ppp_channel_index' filepath='drivers/net/ppp/ppp_generic.c' line='2654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_channel_index'> - <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2654' column='1'/> + <function-decl name='ppp_channel_index' mangled-name='ppp_channel_index' filepath='drivers/net/ppp/ppp_generic.c' line='2652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ppp_channel_index'> + <parameter type-id='b8e94b0b' name='chan' filepath='drivers/net/ppp/ppp_generic.c' line='2652' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='fca2ff53'> @@ -96832,140 +96761,140 @@ <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/usb/usbnet.h' line='186' column='1'/> </data-member> </class-decl> - <class-decl name='urb' size-in-bits='1728' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1579' column='1' id='b209b4e4'> + <class-decl name='urb' size-in-bits='1728' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1576' column='1' id='b209b4e4'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='kref' type-id='400fb07b' visibility='default' filepath='include/linux/usb.h' line='1581' column='1'/> + <var-decl name='kref' type-id='400fb07b' visibility='default' filepath='include/linux/usb.h' line='1578' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='unlinked' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1582' column='1'/> + <var-decl name='unlinked' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1579' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='hcpriv' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1583' column='1'/> + <var-decl name='hcpriv' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1580' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='use_count' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1584' column='1'/> + <var-decl name='use_count' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1581' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='reject' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1585' column='1'/> + <var-decl name='reject' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1582' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='urb_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1588' column='1'/> + <var-decl name='urb_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1585' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='anchor_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1590' column='1'/> + <var-decl name='anchor_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1587' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='anchor' type-id='bd300bf3' visibility='default' filepath='include/linux/usb.h' line='1591' column='1'/> + <var-decl name='anchor' type-id='bd300bf3' visibility='default' filepath='include/linux/usb.h' line='1588' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='dev' type-id='25e60cb2' visibility='default' filepath='include/linux/usb.h' line='1592' column='1'/> + <var-decl name='dev' type-id='25e60cb2' visibility='default' filepath='include/linux/usb.h' line='1589' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='ep' type-id='15adb516' visibility='default' filepath='include/linux/usb.h' line='1593' column='1'/> + <var-decl name='ep' type-id='15adb516' visibility='default' filepath='include/linux/usb.h' line='1590' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='pipe' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1594' column='1'/> + <var-decl name='pipe' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1591' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='stream_id' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1595' column='1'/> + <var-decl name='stream_id' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1592' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1596' column='1'/> + <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1593' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='736'> - <var-decl name='transfer_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1597' column='1'/> + <var-decl name='transfer_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1594' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='transfer_buffer' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1598' column='1'/> + <var-decl name='transfer_buffer' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1595' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='transfer_dma' type-id='cf29c9b3' visibility='default' filepath='include/linux/usb.h' line='1599' column='1'/> + <var-decl name='transfer_dma' type-id='cf29c9b3' visibility='default' filepath='include/linux/usb.h' line='1596' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='sg' type-id='bf3ef905' visibility='default' filepath='include/linux/usb.h' line='1600' column='1'/> + <var-decl name='sg' type-id='bf3ef905' visibility='default' filepath='include/linux/usb.h' line='1597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='num_mapped_sgs' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1601' column='1'/> + <var-decl name='num_mapped_sgs' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1598' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='992'> - <var-decl name='num_sgs' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1602' column='1'/> + <var-decl name='num_sgs' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='transfer_buffer_length' type-id='19c2251e' visibility='default' filepath='include/linux/usb.h' line='1603' column='1'/> + <var-decl name='transfer_buffer_length' type-id='19c2251e' visibility='default' filepath='include/linux/usb.h' line='1600' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='actual_length' type-id='19c2251e' visibility='default' filepath='include/linux/usb.h' line='1604' column='1'/> + <var-decl name='actual_length' type-id='19c2251e' visibility='default' filepath='include/linux/usb.h' line='1601' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='setup_packet' type-id='cf536864' visibility='default' filepath='include/linux/usb.h' line='1605' column='1'/> + <var-decl name='setup_packet' type-id='cf536864' visibility='default' filepath='include/linux/usb.h' line='1602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='setup_dma' type-id='cf29c9b3' visibility='default' filepath='include/linux/usb.h' line='1606' column='1'/> + <var-decl name='setup_dma' type-id='cf29c9b3' visibility='default' filepath='include/linux/usb.h' line='1603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='start_frame' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1607' column='1'/> + <var-decl name='start_frame' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1604' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1248'> - <var-decl name='number_of_packets' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1608' column='1'/> + <var-decl name='number_of_packets' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='interval' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1609' column='1'/> + <var-decl name='interval' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1312'> - <var-decl name='error_count' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1611' column='1'/> + <var-decl name='error_count' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='context' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1612' column='1'/> + <var-decl name='context' type-id='eaa32e2f' visibility='default' filepath='include/linux/usb.h' line='1609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='complete' type-id='4086973b' visibility='default' filepath='include/linux/usb.h' line='1613' column='1'/> + <var-decl name='complete' type-id='4086973b' visibility='default' filepath='include/linux/usb.h' line='1610' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1615' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1612' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1616' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1617' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1614' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1618' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1615' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='iso_frame_desc' type-id='b585dd30' visibility='default' filepath='include/linux/usb.h' line='1620' column='1'/> + <var-decl name='iso_frame_desc' type-id='b585dd30' visibility='default' filepath='include/linux/usb.h' line='1617' column='1'/> </data-member> </class-decl> - <class-decl name='usb_anchor' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1378' column='1' id='b3bcc053'> + <class-decl name='usb_anchor' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1375' column='1' id='b3bcc053'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='urb_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1379' column='1'/> + <var-decl name='urb_list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1376' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='wait' type-id='b5ab048f' visibility='default' filepath='include/linux/usb.h' line='1380' column='1'/> + <var-decl name='wait' type-id='b5ab048f' visibility='default' filepath='include/linux/usb.h' line='1377' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1381' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1378' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='suspend_wakeups' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1382' column='1'/> + <var-decl name='suspend_wakeups' type-id='49178f86' visibility='default' filepath='include/linux/usb.h' line='1379' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='poisoned' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1383' column='1'/> + <var-decl name='poisoned' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1380' column='1'/> </data-member> </class-decl> - <typedef-decl name='usb_complete_t' type-id='79dbccfb' filepath='include/linux/usb.h' line='1394' column='1' id='4086973b'/> - <class-decl name='usb_iso_packet_descriptor' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1369' column='1' id='fc6d031c'> + <typedef-decl name='usb_complete_t' type-id='79dbccfb' filepath='include/linux/usb.h' line='1391' column='1' id='4086973b'/> + <class-decl name='usb_iso_packet_descriptor' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1366' column='1' id='fc6d031c'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='offset' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1370' column='1'/> + <var-decl name='offset' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1367' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='length' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1371' column='1'/> + <var-decl name='length' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1368' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='actual_length' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1372' column='1'/> + <var-decl name='actual_length' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1369' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1373' column='1'/> + <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1370' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='26a90f95' size-in-bits='64' id='9b23c9ad'/> @@ -97004,15 +96933,15 @@ <pointer-type-def type-id='1c800c47' size-in-bits='64' id='e8ad2523'/> <pointer-type-def type-id='6a162484' size-in-bits='64' id='a426551e'/> <pointer-type-def type-id='bb4afb30' size-in-bits='64' id='ca0a9af6'/> - <function-decl name='usbnet_probe' mangled-name='usbnet_probe' filepath='drivers/net/usb/usbnet.c' line='1655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_probe'> - <parameter type-id='8bf48c31' name='udev' filepath='drivers/net/usb/usbnet.c' line='1655' column='1'/> - <parameter type-id='bc57058f' name='prod' filepath='drivers/net/usb/usbnet.c' line='1655' column='1'/> + <function-decl name='usbnet_probe' mangled-name='usbnet_probe' filepath='drivers/net/usb/usbnet.c' line='1654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_probe'> + <parameter type-id='8bf48c31' name='udev' filepath='drivers/net/usb/usbnet.c' line='1654' column='1'/> + <parameter type-id='bc57058f' name='prod' filepath='drivers/net/usb/usbnet.c' line='1654' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_link_change' mangled-name='usbnet_link_change' filepath='drivers/net/usb/usbnet.c' line='1971' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_link_change'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='1971' column='1'/> - <parameter type-id='b50a4934' name='link' filepath='drivers/net/usb/usbnet.c' line='1971' column='1'/> - <parameter type-id='b50a4934' name='need_reset' filepath='drivers/net/usb/usbnet.c' line='1971' column='1'/> + <function-decl name='usbnet_link_change' mangled-name='usbnet_link_change' filepath='drivers/net/usb/usbnet.c' line='1970' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_link_change'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='1970' column='1'/> + <parameter type-id='b50a4934' name='link' filepath='drivers/net/usb/usbnet.c' line='1970' column='1'/> + <parameter type-id='b50a4934' name='need_reset' filepath='drivers/net/usb/usbnet.c' line='1970' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='usbnet_get_endpoints' mangled-name='usbnet_get_endpoints' filepath='drivers/net/usb/usbnet.c' line='81' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_endpoints'> @@ -97020,34 +96949,34 @@ <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='81' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_write_cmd_nopm' mangled-name='usbnet_write_cmd_nopm' filepath='drivers/net/usb/usbnet.c' line='2102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd_nopm'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> - <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2103' column='1'/> - <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2103' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2103' column='1'/> - <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2104' column='1'/> + <function-decl name='usbnet_write_cmd_nopm' mangled-name='usbnet_write_cmd_nopm' filepath='drivers/net/usb/usbnet.c' line='2101' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd_nopm'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2101' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2101' column='1'/> + <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2101' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> + <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2102' column='1'/> + <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2103' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_write_cmd_async' mangled-name='usbnet_write_cmd_async' filepath='drivers/net/usb/usbnet.c' line='2128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd_async'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> - <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2129' column='1'/> - <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2129' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2129' column='1'/> - <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2129' column='1'/> + <function-decl name='usbnet_write_cmd_async' mangled-name='usbnet_write_cmd_async' filepath='drivers/net/usb/usbnet.c' line='2127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd_async'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2127' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2127' column='1'/> + <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2127' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> + <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> + <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2128' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_write_cmd' mangled-name='usbnet_write_cmd' filepath='drivers/net/usb/usbnet.c' line='2072' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> - <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2073' column='1'/> - <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2073' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2073' column='1'/> - <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2073' column='1'/> + <function-decl name='usbnet_write_cmd' mangled-name='usbnet_write_cmd' filepath='drivers/net/usb/usbnet.c' line='2071' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_write_cmd'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2071' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2071' column='1'/> + <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2071' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> + <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> + <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2072' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='usbnet_update_max_qlen' mangled-name='usbnet_update_max_qlen' filepath='drivers/net/usb/usbnet.c' line='343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_update_max_qlen'> @@ -97058,22 +96987,22 @@ <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='752' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_tx_timeout' mangled-name='usbnet_tx_timeout' filepath='drivers/net/usb/usbnet.c' line='1294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_tx_timeout'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1294' column='1'/> + <function-decl name='usbnet_tx_timeout' mangled-name='usbnet_tx_timeout' filepath='drivers/net/usb/usbnet.c' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_tx_timeout'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1296' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_suspend' mangled-name='usbnet_suspend' filepath='drivers/net/usb/usbnet.c' line='1861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_suspend'> - <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1861' column='1'/> - <parameter type-id='08496218' name='message' filepath='drivers/net/usb/usbnet.c' line='1861' column='1'/> + <function-decl name='usbnet_suspend' mangled-name='usbnet_suspend' filepath='drivers/net/usb/usbnet.c' line='1860' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_suspend'> + <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1860' column='1'/> + <parameter type-id='08496218' name='message' filepath='drivers/net/usb/usbnet.c' line='1860' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='usbnet_stop' mangled-name='usbnet_stop' filepath='drivers/net/usb/usbnet.c' line='799' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_stop'> <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='799' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_start_xmit' mangled-name='usbnet_start_xmit' filepath='drivers/net/usb/usbnet.c' line='1344' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_start_xmit'> - <parameter type-id='0fbf3cfd' name='skb' filepath='drivers/net/usb/usbnet.c' line='1344' column='1'/> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1345' column='1'/> + <function-decl name='usbnet_start_xmit' mangled-name='usbnet_start_xmit' filepath='drivers/net/usb/usbnet.c' line='1346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_start_xmit'> + <parameter type-id='0fbf3cfd' name='skb' filepath='drivers/net/usb/usbnet.c' line='1346' column='1'/> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1347' column='1'/> <return type-id='6849a88c'/> </function-decl> <function-decl name='usbnet_skb_return' mangled-name='usbnet_skb_return' filepath='drivers/net/usb/usbnet.c' line='308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_skb_return'> @@ -97081,64 +97010,64 @@ <parameter type-id='0fbf3cfd' name='skb' filepath='drivers/net/usb/usbnet.c' line='308' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_set_msglevel' mangled-name='usbnet_set_msglevel' filepath='drivers/net/usb/usbnet.c' line='1063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_set_msglevel'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1063' column='1'/> - <parameter type-id='19c2251e' name='level' filepath='drivers/net/usb/usbnet.c' line='1063' column='1'/> + <function-decl name='usbnet_set_msglevel' mangled-name='usbnet_set_msglevel' filepath='drivers/net/usb/usbnet.c' line='1065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_set_msglevel'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1065' column='1'/> + <parameter type-id='19c2251e' name='level' filepath='drivers/net/usb/usbnet.c' line='1065' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_set_link_ksettings' mangled-name='usbnet_set_link_ksettings' filepath='drivers/net/usb/usbnet.c' line='962' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_set_link_ksettings'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='962' column='1'/> - <parameter type-id='b2c34f11' name='cmd' filepath='drivers/net/usb/usbnet.c' line='963' column='1'/> + <function-decl name='usbnet_set_link_ksettings' mangled-name='usbnet_set_link_ksettings' filepath='drivers/net/usb/usbnet.c' line='964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_set_link_ksettings'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='964' column='1'/> + <parameter type-id='b2c34f11' name='cmd' filepath='drivers/net/usb/usbnet.c' line='965' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_resume' mangled-name='usbnet_resume' filepath='drivers/net/usb/usbnet.c' line='1894' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_resume'> - <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1894' column='1'/> + <function-decl name='usbnet_resume' mangled-name='usbnet_resume' filepath='drivers/net/usb/usbnet.c' line='1893' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_resume'> + <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1893' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_read_cmd_nopm' mangled-name='usbnet_read_cmd_nopm' filepath='drivers/net/usb/usbnet.c' line='2090' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_read_cmd_nopm'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> - <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2091' column='1'/> - <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2091' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2091' column='1'/> - <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2091' column='1'/> + <function-decl name='usbnet_read_cmd_nopm' mangled-name='usbnet_read_cmd_nopm' filepath='drivers/net/usb/usbnet.c' line='2089' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_read_cmd_nopm'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2089' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2089' column='1'/> + <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2089' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> + <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> + <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2090' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_read_cmd' mangled-name='usbnet_read_cmd' filepath='drivers/net/usb/usbnet.c' line='2054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_read_cmd'> - <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> - <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> - <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> - <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2055' column='1'/> - <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2055' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2055' column='1'/> - <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2055' column='1'/> + <function-decl name='usbnet_read_cmd' mangled-name='usbnet_read_cmd' filepath='drivers/net/usb/usbnet.c' line='2053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_read_cmd'> + <parameter type-id='12884b9a' name='dev' filepath='drivers/net/usb/usbnet.c' line='2053' column='1'/> + <parameter type-id='f9b06939' name='cmd' filepath='drivers/net/usb/usbnet.c' line='2053' column='1'/> + <parameter type-id='f9b06939' name='reqtype' filepath='drivers/net/usb/usbnet.c' line='2053' column='1'/> + <parameter type-id='1dc6a898' name='value' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> + <parameter type-id='1dc6a898' name='index' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> + <parameter type-id='1dc6a898' name='size' filepath='drivers/net/usb/usbnet.c' line='2054' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_get_drvinfo' mangled-name='usbnet_get_drvinfo' filepath='drivers/net/usb/usbnet.c' line='1043' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_drvinfo'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1043' column='1'/> - <parameter type-id='8c4c4029' name='info' filepath='drivers/net/usb/usbnet.c' line='1043' column='1'/> + <function-decl name='usbnet_get_drvinfo' mangled-name='usbnet_get_drvinfo' filepath='drivers/net/usb/usbnet.c' line='1045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_drvinfo'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1045' column='1'/> + <parameter type-id='8c4c4029' name='info' filepath='drivers/net/usb/usbnet.c' line='1045' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_get_msglevel' mangled-name='usbnet_get_msglevel' filepath='drivers/net/usb/usbnet.c' line='1055' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_msglevel'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1055' column='1'/> + <function-decl name='usbnet_get_msglevel' mangled-name='usbnet_get_msglevel' filepath='drivers/net/usb/usbnet.c' line='1057' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_msglevel'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1057' column='1'/> <return type-id='19c2251e'/> </function-decl> - <function-decl name='usbnet_nway_reset' mangled-name='usbnet_nway_reset' filepath='drivers/net/usb/usbnet.c' line='1032' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_nway_reset'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1032' column='1'/> + <function-decl name='usbnet_nway_reset' mangled-name='usbnet_nway_reset' filepath='drivers/net/usb/usbnet.c' line='1034' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_nway_reset'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1034' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_get_link' mangled-name='usbnet_get_link' filepath='drivers/net/usb/usbnet.c' line='1015' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_link'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1015' column='1'/> + <function-decl name='usbnet_get_link' mangled-name='usbnet_get_link' filepath='drivers/net/usb/usbnet.c' line='1017' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_link'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='1017' column='1'/> <return type-id='19c2251e'/> </function-decl> - <function-decl name='usbnet_get_link_ksettings' mangled-name='usbnet_get_link_ksettings' filepath='drivers/net/usb/usbnet.c' line='948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_link_ksettings'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='948' column='1'/> - <parameter type-id='70de91e2' name='cmd' filepath='drivers/net/usb/usbnet.c' line='949' column='1'/> + <function-decl name='usbnet_get_link_ksettings' mangled-name='usbnet_get_link_ksettings' filepath='drivers/net/usb/usbnet.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_link_ksettings'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='950' column='1'/> + <parameter type-id='70de91e2' name='cmd' filepath='drivers/net/usb/usbnet.c' line='951' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_open' mangled-name='usbnet_open' filepath='drivers/net/usb/usbnet.c' line='859' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_open'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='859' column='1'/> + <function-decl name='usbnet_open' mangled-name='usbnet_open' filepath='drivers/net/usb/usbnet.c' line='861' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_open'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='861' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='usbnet_change_mtu' mangled-name='usbnet_change_mtu' filepath='drivers/net/usb/usbnet.c' line='378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_change_mtu'> @@ -97146,13 +97075,13 @@ <parameter type-id='95e97e5e' name='new_mtu' filepath='drivers/net/usb/usbnet.c' line='378' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usbnet_get_stats64' mangled-name='usbnet_get_stats64' filepath='drivers/net/usb/usbnet.c' line='984' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_stats64'> - <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='984' column='1'/> - <parameter type-id='bd3860fe' name='stats' filepath='drivers/net/usb/usbnet.c' line='984' column='1'/> + <function-decl name='usbnet_get_stats64' mangled-name='usbnet_get_stats64' filepath='drivers/net/usb/usbnet.c' line='986' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_get_stats64'> + <parameter type-id='68a2d05b' name='net' filepath='drivers/net/usb/usbnet.c' line='986' column='1'/> + <parameter type-id='bd3860fe' name='stats' filepath='drivers/net/usb/usbnet.c' line='986' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usbnet_disconnect' mangled-name='usbnet_disconnect' filepath='drivers/net/usb/usbnet.c' line='1590' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_disconnect'> - <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1590' column='1'/> + <function-decl name='usbnet_disconnect' mangled-name='usbnet_disconnect' filepath='drivers/net/usb/usbnet.c' line='1592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_disconnect'> + <parameter type-id='8bf48c31' name='intf' filepath='drivers/net/usb/usbnet.c' line='1592' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='usbnet_defer_kevent' mangled-name='usbnet_defer_kevent' filepath='drivers/net/usb/usbnet.c' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usbnet_defer_kevent'> @@ -97863,64 +97792,64 @@ <pointer-type-def type-id='dfed847a' size-in-bits='64' id='3ba5153c'/> <pointer-type-def type-id='78c7ad97' size-in-bits='64' id='4a4ce85f'/> <pointer-type-def type-id='77aad2d1' size-in-bits='64' id='8179bc49'/> - <function-decl name='nvmem_cell_get' mangled-name='nvmem_cell_get' filepath='drivers/nvmem/core.c' line='833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='833' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='833' column='1'/> + <function-decl name='nvmem_cell_get' mangled-name='nvmem_cell_get' filepath='drivers/nvmem/core.c' line='834' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='834' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='834' column='1'/> <return type-id='4a4ce85f'/> </function-decl> - <function-decl name='of_nvmem_cell_get' mangled-name='of_nvmem_cell_get' filepath='drivers/nvmem/core.c' line='786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_nvmem_cell_get'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/nvmem/core.c' line='786' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='786' column='1'/> + <function-decl name='of_nvmem_cell_get' mangled-name='of_nvmem_cell_get' filepath='drivers/nvmem/core.c' line='787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_nvmem_cell_get'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/nvmem/core.c' line='787' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='787' column='1'/> <return type-id='4a4ce85f'/> </function-decl> - <function-decl name='nvmem_device_write' mangled-name='nvmem_device_write' filepath='drivers/nvmem/core.c' line='1275' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_device_write'> - <parameter type-id='8179bc49' name='nvmem' filepath='drivers/nvmem/core.c' line='1275' column='1'/> - <parameter type-id='f0981eeb' name='offset' filepath='drivers/nvmem/core.c' line='1276' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='drivers/nvmem/core.c' line='1277' column='1'/> - <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1277' column='1'/> + <function-decl name='nvmem_device_write' mangled-name='nvmem_device_write' filepath='drivers/nvmem/core.c' line='1276' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_device_write'> + <parameter type-id='8179bc49' name='nvmem' filepath='drivers/nvmem/core.c' line='1276' column='1'/> + <parameter type-id='f0981eeb' name='offset' filepath='drivers/nvmem/core.c' line='1277' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='drivers/nvmem/core.c' line='1278' column='1'/> + <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1278' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nvmem_device_read' mangled-name='nvmem_device_read' filepath='drivers/nvmem/core.c' line='1247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_device_read'> - <parameter type-id='8179bc49' name='nvmem' filepath='drivers/nvmem/core.c' line='1247' column='1'/> - <parameter type-id='f0981eeb' name='offset' filepath='drivers/nvmem/core.c' line='1248' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='drivers/nvmem/core.c' line='1249' column='1'/> - <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1249' column='1'/> + <function-decl name='nvmem_device_read' mangled-name='nvmem_device_read' filepath='drivers/nvmem/core.c' line='1248' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_device_read'> + <parameter type-id='8179bc49' name='nvmem' filepath='drivers/nvmem/core.c' line='1248' column='1'/> + <parameter type-id='f0981eeb' name='offset' filepath='drivers/nvmem/core.c' line='1249' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='drivers/nvmem/core.c' line='1250' column='1'/> + <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1250' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nvmem_cell_write' mangled-name='nvmem_cell_write' filepath='drivers/nvmem/core.c' line='1076' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_write'> - <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='1076' column='1'/> - <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1076' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='drivers/nvmem/core.c' line='1076' column='1'/> + <function-decl name='nvmem_cell_write' mangled-name='nvmem_cell_write' filepath='drivers/nvmem/core.c' line='1077' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_write'> + <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='1077' column='1'/> + <parameter type-id='eaa32e2f' name='buf' filepath='drivers/nvmem/core.c' line='1077' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='drivers/nvmem/core.c' line='1077' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nvmem_cell_read_u32' mangled-name='nvmem_cell_read_u32' filepath='drivers/nvmem/core.c' line='1150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_read_u32'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='1150' column='1'/> - <parameter type-id='80f4b756' name='cell_id' filepath='drivers/nvmem/core.c' line='1150' column='1'/> - <parameter type-id='f9409001' name='val' filepath='drivers/nvmem/core.c' line='1150' column='1'/> + <function-decl name='nvmem_cell_read_u32' mangled-name='nvmem_cell_read_u32' filepath='drivers/nvmem/core.c' line='1151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_read_u32'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='1151' column='1'/> + <parameter type-id='80f4b756' name='cell_id' filepath='drivers/nvmem/core.c' line='1151' column='1'/> + <parameter type-id='f9409001' name='val' filepath='drivers/nvmem/core.c' line='1151' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nvmem_cell_read' mangled-name='nvmem_cell_read' filepath='drivers/nvmem/core.c' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_read'> - <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='991' column='1'/> - <parameter type-id='78c01427' name='len' filepath='drivers/nvmem/core.c' line='991' column='1'/> + <function-decl name='nvmem_cell_read' mangled-name='nvmem_cell_read' filepath='drivers/nvmem/core.c' line='992' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_read'> + <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='992' column='1'/> + <parameter type-id='78c01427' name='len' filepath='drivers/nvmem/core.c' line='992' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='nvmem_cell_put' mangled-name='nvmem_cell_put' filepath='drivers/nvmem/core.c' line='919' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_put'> - <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='919' column='1'/> + <function-decl name='nvmem_cell_put' mangled-name='nvmem_cell_put' filepath='drivers/nvmem/core.c' line='920' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nvmem_cell_put'> + <parameter type-id='4a4ce85f' name='cell' filepath='drivers/nvmem/core.c' line='920' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='devm_nvmem_register' mangled-name='devm_nvmem_register' filepath='drivers/nvmem/core.c' line='513' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_register'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='513' column='1'/> - <parameter type-id='7bb280fa' name='config' filepath='drivers/nvmem/core.c' line='514' column='1'/> + <function-decl name='devm_nvmem_register' mangled-name='devm_nvmem_register' filepath='drivers/nvmem/core.c' line='514' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_register'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='514' column='1'/> + <parameter type-id='7bb280fa' name='config' filepath='drivers/nvmem/core.c' line='515' column='1'/> <return type-id='8179bc49'/> </function-decl> - <function-decl name='devm_nvmem_device_get' mangled-name='devm_nvmem_device_get' filepath='drivers/nvmem/core.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_device_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='696' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='696' column='1'/> + <function-decl name='devm_nvmem_device_get' mangled-name='devm_nvmem_device_get' filepath='drivers/nvmem/core.c' line='697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_device_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='697' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='697' column='1'/> <return type-id='8179bc49'/> </function-decl> - <function-decl name='devm_nvmem_cell_get' mangled-name='devm_nvmem_cell_get' filepath='drivers/nvmem/core.c' line='866' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_cell_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='866' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='866' column='1'/> + <function-decl name='devm_nvmem_cell_get' mangled-name='devm_nvmem_cell_get' filepath='drivers/nvmem/core.c' line='867' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_nvmem_cell_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/nvmem/core.c' line='867' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/nvmem/core.c' line='867' column='1'/> <return type-id='4a4ce85f'/> </function-decl> <function-type size-in-bits='64' id='dfed847a'> @@ -98174,10 +98103,6 @@ <parameter type-id='b50a4934' name='force_dma' filepath='drivers/of/device.c' line='89' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='of_device_get_match_data' mangled-name='of_device_get_match_data' filepath='drivers/of/device.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_device_get_match_data'> - <parameter type-id='8df61054' name='dev' filepath='drivers/of/device.c' line='188' column='1'/> - <return type-id='eaa32e2f'/> - </function-decl> <function-decl name='of_match_device' mangled-name='of_match_device' filepath='drivers/of/device.c' line='26' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_match_device'> <parameter type-id='e5ce629e' name='matches' filepath='drivers/of/device.c' line='26' column='1'/> <parameter type-id='8df61054' name='dev' filepath='drivers/of/device.c' line='27' column='1'/> @@ -98198,6 +98123,10 @@ <parameter type-id='79a0948f' name='len' filepath='drivers/of/device.c' line='265' column='1'/> <return type-id='79a0948f'/> </function-decl> + <function-decl name='of_device_get_match_data' mangled-name='of_device_get_match_data' filepath='drivers/of/device.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_device_get_match_data'> + <parameter type-id='8df61054' name='dev' filepath='drivers/of/device.c' line='188' column='1'/> + <return type-id='eaa32e2f'/> + </function-decl> <function-decl name='of_dev_put' mangled-name='of_dev_put' filepath='drivers/of/device.c' line='49' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_dev_put'> <parameter type-id='db362995' name='dev' filepath='drivers/of/device.c' line='49' column='1'/> <return type-id='48b5725f'/> @@ -98246,15 +98175,15 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/of/of_mdio.c' language='LANG_C89'> - <function-decl name='of_phy_is_fixed_link' mangled-name='of_phy_is_fixed_link' filepath='drivers/of/of_mdio.c' line='433' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_phy_is_fixed_link'> - <parameter type-id='9a537bbe' name='np' filepath='drivers/of/of_mdio.c' line='433' column='1'/> + <function-decl name='of_phy_is_fixed_link' mangled-name='of_phy_is_fixed_link' filepath='drivers/of/of_mdio.c' line='432' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_phy_is_fixed_link'> + <parameter type-id='9a537bbe' name='np' filepath='drivers/of/of_mdio.c' line='432' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='of_phy_attach' mangled-name='of_phy_attach' filepath='drivers/of/of_mdio.c' line='406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_phy_attach'> - <parameter type-id='68a2d05b' name='dev' filepath='drivers/of/of_mdio.c' line='406' column='1'/> - <parameter type-id='9a537bbe' name='phy_np' filepath='drivers/of/of_mdio.c' line='407' column='1'/> - <parameter type-id='19c2251e' name='flags' filepath='drivers/of/of_mdio.c' line='407' column='1'/> - <parameter type-id='d61bf978' name='iface' filepath='drivers/of/of_mdio.c' line='408' column='1'/> + <function-decl name='of_phy_attach' mangled-name='of_phy_attach' filepath='drivers/of/of_mdio.c' line='405' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_phy_attach'> + <parameter type-id='68a2d05b' name='dev' filepath='drivers/of/of_mdio.c' line='405' column='1'/> + <parameter type-id='9a537bbe' name='phy_np' filepath='drivers/of/of_mdio.c' line='406' column='1'/> + <parameter type-id='19c2251e' name='flags' filepath='drivers/of/of_mdio.c' line='406' column='1'/> + <parameter type-id='d61bf978' name='iface' filepath='drivers/of/of_mdio.c' line='407' column='1'/> <return type-id='7efbcaaf'/> </function-decl> <function-decl name='of_mdiobus_register' mangled-name='of_mdiobus_register' filepath='drivers/of/of_mdio.c' line='199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_mdiobus_register'> @@ -98401,7 +98330,7 @@ <parameter type-id='9a537bbe' name='prev' filepath='drivers/of/property.c' line='597' column='1'/> <return type-id='9a537bbe'/> </function-decl> - <var-decl name='of_fwnode_ops' type-id='2eb8da02' mangled-name='of_fwnode_ops' visibility='default' filepath='drivers/of/property.c' line='1359' column='1' elf-symbol-id='of_fwnode_ops'/> + <var-decl name='of_fwnode_ops' type-id='2eb8da02' mangled-name='of_fwnode_ops' visibility='default' filepath='drivers/of/property.c' line='1357' column='1' elf-symbol-id='of_fwnode_ops'/> <function-decl name='of_property_read_variable_u32_array' mangled-name='of_property_read_variable_u32_array' filepath='drivers/of/property.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_property_read_variable_u32_array'> <parameter type-id='0afa6ea3' name='np' filepath='drivers/of/property.c' line='277' column='1'/> <parameter type-id='80f4b756' name='propname' filepath='drivers/of/property.c' line='278' column='1'/> @@ -98754,6 +98683,9 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/pci/access.c' language='LANG_C89'> + <array-type-def dimensions='1' type-id='acc63fdf' size-in-bits='384' id='21e79dbc'> + <subrange length='6' type-id='7ff19f0f' id='52fa524b'/> + </array-type-def> <qualified-type-def type-id='5c93f9a7' const='yes' id='b86c4e68'/> <pointer-type-def type-id='b86c4e68' size-in-bits='64' id='947f31e6'/> <function-decl name='pcie_capability_write_word' mangled-name='pcie_capability_write_word' filepath='drivers/pci/access.c' line='465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pcie_capability_write_word'> @@ -98812,9 +98744,6 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/pci/bus.c' language='LANG_C89'> - <array-type-def dimensions='1' type-id='acc63fdf' size-in-bits='384' id='21e79dbc'> - <subrange length='6' type-id='7ff19f0f' id='52fa524b'/> - </array-type-def> <qualified-type-def type-id='7e8e008e' const='yes' id='d1ae25b5'/> <pointer-type-def type-id='d1ae25b5' size-in-bits='64' id='b425394d'/> <pointer-type-def type-id='f3404a83' size-in-bits='64' id='82fb5c77'/> @@ -99807,10 +99736,10 @@ <parameter is-variadic='yes'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pci_free_irq' mangled-name='pci_free_irq' filepath='drivers/pci/irq.c' line='122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_free_irq'> - <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/irq.c' line='122' column='1'/> - <parameter type-id='f0981eeb' name='nr' filepath='drivers/pci/irq.c' line='122' column='1'/> - <parameter type-id='eaa32e2f' name='dev_id' filepath='drivers/pci/irq.c' line='122' column='1'/> + <function-decl name='pci_free_irq' mangled-name='pci_free_irq' filepath='drivers/pci/irq.c' line='120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_free_irq'> + <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/irq.c' line='120' column='1'/> + <parameter type-id='f0981eeb' name='nr' filepath='drivers/pci/irq.c' line='120' column='1'/> + <parameter type-id='eaa32e2f' name='dev_id' filepath='drivers/pci/irq.c' line='120' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -100321,9 +100250,9 @@ <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='4196' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pci_select_bars' mangled-name='pci_select_bars' filepath='drivers/pci/pci.c' line='5936' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_select_bars'> - <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='5936' column='1'/> - <parameter type-id='7359adad' name='flags' filepath='drivers/pci/pci.c' line='5936' column='1'/> + <function-decl name='pci_select_bars' mangled-name='pci_select_bars' filepath='drivers/pci/pci.c' line='5942' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_select_bars'> + <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='5942' column='1'/> + <parameter type-id='7359adad' name='flags' filepath='drivers/pci/pci.c' line='5942' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='pci_save_state' mangled-name='pci_save_state' filepath='drivers/pci/pci.c' line='1345' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_save_state'> @@ -100334,8 +100263,8 @@ <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='1456' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pci_reset_function' mangled-name='pci_reset_function' filepath='drivers/pci/pci.c' line='5091' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_reset_function'> - <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='5091' column='1'/> + <function-decl name='pci_reset_function' mangled-name='pci_reset_function' filepath='drivers/pci/pci.c' line='5097' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_reset_function'> + <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='5097' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='pci_request_selected_regions' mangled-name='pci_request_selected_regions' filepath='drivers/pci/pci.c' line='3828' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_request_selected_regions'> @@ -100408,8 +100337,8 @@ <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/pci.c' line='1738' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='pci_device_is_present' mangled-name='pci_device_is_present' filepath='drivers/pci/pci.c' line='6087' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_device_is_present'> - <parameter type-id='85196e3f' name='pdev' filepath='drivers/pci/pci.c' line='6087' column='1'/> + <function-decl name='pci_device_is_present' mangled-name='pci_device_is_present' filepath='drivers/pci/pci.c' line='6093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_device_is_present'> + <parameter type-id='85196e3f' name='pdev' filepath='drivers/pci/pci.c' line='6093' column='1'/> <return type-id='b50a4934'/> </function-decl> <function-decl name='pci_d3cold_disable' mangled-name='pci_d3cold_disable' filepath='drivers/pci/pci.c' line='2791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_d3cold_disable'> @@ -100711,9 +100640,9 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/pci/setup-res.c' language='LANG_C89'> - <function-decl name='pci_assign_resource' mangled-name='pci_assign_resource' filepath='drivers/pci/setup-res.c' line='320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_assign_resource'> - <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/setup-res.c' line='320' column='1'/> - <parameter type-id='95e97e5e' name='resno' filepath='drivers/pci/setup-res.c' line='320' column='1'/> + <function-decl name='pci_assign_resource' mangled-name='pci_assign_resource' filepath='drivers/pci/setup-res.c' line='309' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pci_assign_resource'> + <parameter type-id='85196e3f' name='dev' filepath='drivers/pci/setup-res.c' line='309' column='1'/> + <parameter type-id='95e97e5e' name='resno' filepath='drivers/pci/setup-res.c' line='309' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -102498,70 +102427,70 @@ <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='121' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='devm_power_supply_register' mangled-name='devm_power_supply_register' filepath='drivers/power/supply/power_supply_core.c' line='1331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_power_supply_register'> - <parameter type-id='fa0b179b' name='parent' filepath='drivers/power/supply/power_supply_core.c' line='1331' column='1'/> - <parameter type-id='cb9cd99f' name='desc' filepath='drivers/power/supply/power_supply_core.c' line='1332' column='1'/> - <parameter type-id='048b3ad6' name='cfg' filepath='drivers/power/supply/power_supply_core.c' line='1333' column='1'/> + <function-decl name='devm_power_supply_register' mangled-name='devm_power_supply_register' filepath='drivers/power/supply/power_supply_core.c' line='1326' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_power_supply_register'> + <parameter type-id='fa0b179b' name='parent' filepath='drivers/power/supply/power_supply_core.c' line='1326' column='1'/> + <parameter type-id='cb9cd99f' name='desc' filepath='drivers/power/supply/power_supply_core.c' line='1327' column='1'/> + <parameter type-id='048b3ad6' name='cfg' filepath='drivers/power/supply/power_supply_core.c' line='1328' column='1'/> <return type-id='c0c93c9e'/> </function-decl> - <function-decl name='power_supply_unregister' mangled-name='power_supply_unregister' filepath='drivers/power/supply/power_supply_core.c' line='1395' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_unregister'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='1395' column='1'/> + <function-decl name='power_supply_unregister' mangled-name='power_supply_unregister' filepath='drivers/power/supply/power_supply_core.c' line='1390' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_unregister'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='1390' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='power_supply_unreg_notifier' mangled-name='power_supply_unreg_notifier' filepath='drivers/power/supply/power_supply_core.c' line='989' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_unreg_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='drivers/power/supply/power_supply_core.c' line='989' column='1'/> + <function-decl name='power_supply_unreg_notifier' mangled-name='power_supply_unreg_notifier' filepath='drivers/power/supply/power_supply_core.c' line='984' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_unreg_notifier'> + <parameter type-id='d504f73d' name='nb' filepath='drivers/power/supply/power_supply_core.c' line='984' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='power_supply_temp2resist_simple' mangled-name='power_supply_temp2resist_simple' filepath='drivers/power/supply/power_supply_core.c' line='820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_temp2resist_simple'> - <parameter type-id='1fba25e2' name='table' filepath='drivers/power/supply/power_supply_core.c' line='820' column='1'/> - <parameter type-id='95e97e5e' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='821' column='1'/> - <parameter type-id='95e97e5e' name='temp' filepath='drivers/power/supply/power_supply_core.c' line='821' column='1'/> + <function-decl name='power_supply_temp2resist_simple' mangled-name='power_supply_temp2resist_simple' filepath='drivers/power/supply/power_supply_core.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_temp2resist_simple'> + <parameter type-id='1fba25e2' name='table' filepath='drivers/power/supply/power_supply_core.c' line='815' column='1'/> + <parameter type-id='95e97e5e' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='816' column='1'/> + <parameter type-id='95e97e5e' name='temp' filepath='drivers/power/supply/power_supply_core.c' line='816' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_set_property' mangled-name='power_supply_set_property' filepath='drivers/power/supply/power_supply_core.c' line='938' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_set_property'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='938' column='1'/> - <parameter type-id='5f78aa17' name='psp' filepath='drivers/power/supply/power_supply_core.c' line='939' column='1'/> - <parameter type-id='f3abafd4' name='val' filepath='drivers/power/supply/power_supply_core.c' line='940' column='1'/> + <function-decl name='power_supply_set_property' mangled-name='power_supply_set_property' filepath='drivers/power/supply/power_supply_core.c' line='933' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_set_property'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='933' column='1'/> + <parameter type-id='5f78aa17' name='psp' filepath='drivers/power/supply/power_supply_core.c' line='934' column='1'/> + <parameter type-id='f3abafd4' name='val' filepath='drivers/power/supply/power_supply_core.c' line='935' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_register' mangled-name='power_supply_register' filepath='drivers/power/supply/power_supply_core.c' line='1278' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_register'> - <parameter type-id='fa0b179b' name='parent' filepath='drivers/power/supply/power_supply_core.c' line='1278' column='1'/> - <parameter type-id='cb9cd99f' name='desc' filepath='drivers/power/supply/power_supply_core.c' line='1279' column='1'/> - <parameter type-id='048b3ad6' name='cfg' filepath='drivers/power/supply/power_supply_core.c' line='1280' column='1'/> + <function-decl name='power_supply_register' mangled-name='power_supply_register' filepath='drivers/power/supply/power_supply_core.c' line='1273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_register'> + <parameter type-id='fa0b179b' name='parent' filepath='drivers/power/supply/power_supply_core.c' line='1273' column='1'/> + <parameter type-id='cb9cd99f' name='desc' filepath='drivers/power/supply/power_supply_core.c' line='1274' column='1'/> + <parameter type-id='048b3ad6' name='cfg' filepath='drivers/power/supply/power_supply_core.c' line='1275' column='1'/> <return type-id='c0c93c9e'/> </function-decl> - <function-decl name='power_supply_reg_notifier' mangled-name='power_supply_reg_notifier' filepath='drivers/power/supply/power_supply_core.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_reg_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='drivers/power/supply/power_supply_core.c' line='983' column='1'/> + <function-decl name='power_supply_reg_notifier' mangled-name='power_supply_reg_notifier' filepath='drivers/power/supply/power_supply_core.c' line='978' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_reg_notifier'> + <parameter type-id='d504f73d' name='nb' filepath='drivers/power/supply/power_supply_core.c' line='978' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_put_battery_info' mangled-name='power_supply_put_battery_info' filepath='drivers/power/supply/power_supply_core.c' line='791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_put_battery_info'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='791' column='1'/> - <parameter type-id='78ba63ff' name='info' filepath='drivers/power/supply/power_supply_core.c' line='792' column='1'/> + <function-decl name='power_supply_put_battery_info' mangled-name='power_supply_put_battery_info' filepath='drivers/power/supply/power_supply_core.c' line='786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_put_battery_info'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='786' column='1'/> + <parameter type-id='78ba63ff' name='info' filepath='drivers/power/supply/power_supply_core.c' line='787' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='power_supply_put' mangled-name='power_supply_put' filepath='drivers/power/supply/power_supply_core.c' line='480' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_put'> <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='480' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='power_supply_powers' mangled-name='power_supply_powers' filepath='drivers/power/supply/power_supply_core.c' line='970' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_powers'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='970' column='1'/> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/power/supply/power_supply_core.c' line='970' column='1'/> + <function-decl name='power_supply_powers' mangled-name='power_supply_powers' filepath='drivers/power/supply/power_supply_core.c' line='965' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_powers'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='965' column='1'/> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/power/supply/power_supply_core.c' line='965' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_ocv2cap_simple' mangled-name='power_supply_ocv2cap_simple' filepath='drivers/power/supply/power_supply_core.c' line='858' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_ocv2cap_simple'> - <parameter type-id='be6833bc' name='table' filepath='drivers/power/supply/power_supply_core.c' line='858' column='1'/> - <parameter type-id='95e97e5e' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='859' column='1'/> - <parameter type-id='95e97e5e' name='ocv' filepath='drivers/power/supply/power_supply_core.c' line='859' column='1'/> + <function-decl name='power_supply_ocv2cap_simple' mangled-name='power_supply_ocv2cap_simple' filepath='drivers/power/supply/power_supply_core.c' line='853' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_ocv2cap_simple'> + <parameter type-id='be6833bc' name='table' filepath='drivers/power/supply/power_supply_core.c' line='853' column='1'/> + <parameter type-id='95e97e5e' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='854' column='1'/> + <parameter type-id='95e97e5e' name='ocv' filepath='drivers/power/supply/power_supply_core.c' line='854' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_get_property' mangled-name='power_supply_get_property' filepath='drivers/power/supply/power_supply_core.c' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_get_property'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='924' column='1'/> - <parameter type-id='5f78aa17' name='psp' filepath='drivers/power/supply/power_supply_core.c' line='925' column='1'/> - <parameter type-id='2e53d20f' name='val' filepath='drivers/power/supply/power_supply_core.c' line='926' column='1'/> + <function-decl name='power_supply_get_property' mangled-name='power_supply_get_property' filepath='drivers/power/supply/power_supply_core.c' line='919' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_get_property'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='919' column='1'/> + <parameter type-id='5f78aa17' name='psp' filepath='drivers/power/supply/power_supply_core.c' line='920' column='1'/> + <parameter type-id='2e53d20f' name='val' filepath='drivers/power/supply/power_supply_core.c' line='921' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_get_drvdata' mangled-name='power_supply_get_drvdata' filepath='drivers/power/supply/power_supply_core.c' line='1411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_get_drvdata'> - <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='1411' column='1'/> + <function-decl name='power_supply_get_drvdata' mangled-name='power_supply_get_drvdata' filepath='drivers/power/supply/power_supply_core.c' line='1406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_get_drvdata'> + <parameter type-id='c0c93c9e' name='psy' filepath='drivers/power/supply/power_supply_core.c' line='1406' column='1'/> <return type-id='eaa32e2f'/> </function-decl> <function-decl name='power_supply_get_by_name' mangled-name='power_supply_get_by_name' filepath='drivers/power/supply/power_supply_core.c' line='458' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_get_by_name'> @@ -102573,10 +102502,10 @@ <parameter type-id='78ba63ff' name='info' filepath='drivers/power/supply/power_supply_core.c' line='644' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='power_supply_find_ocv2cap_table' mangled-name='power_supply_find_ocv2cap_table' filepath='drivers/power/supply/power_supply_core.c' line='883' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_find_ocv2cap_table'> - <parameter type-id='78ba63ff' name='info' filepath='drivers/power/supply/power_supply_core.c' line='883' column='1'/> - <parameter type-id='95e97e5e' name='temp' filepath='drivers/power/supply/power_supply_core.c' line='884' column='1'/> - <parameter type-id='7292109c' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='884' column='1'/> + <function-decl name='power_supply_find_ocv2cap_table' mangled-name='power_supply_find_ocv2cap_table' filepath='drivers/power/supply/power_supply_core.c' line='878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='power_supply_find_ocv2cap_table'> + <parameter type-id='78ba63ff' name='info' filepath='drivers/power/supply/power_supply_core.c' line='878' column='1'/> + <parameter type-id='95e97e5e' name='temp' filepath='drivers/power/supply/power_supply_core.c' line='879' column='1'/> + <parameter type-id='7292109c' name='table_len' filepath='drivers/power/supply/power_supply_core.c' line='879' column='1'/> <return type-id='be6833bc'/> </function-decl> <function-decl name='devm_power_supply_get_by_phandle' mangled-name='devm_power_supply_get_by_phandle' filepath='drivers/power/supply/power_supply_core.c' line='619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='devm_power_supply_get_by_phandle'> @@ -104158,32 +104087,32 @@ <pointer-type-def type-id='c1a2f7eb' size-in-bits='64' id='383e66df'/> <pointer-type-def type-id='a7b38e12' size-in-bits='64' id='f14ddf44'/> <pointer-type-def type-id='32efe300' size-in-bits='64' id='17a94daa'/> - <function-decl name='regulator_register' mangled-name='regulator_register' filepath='drivers/regulator/core.c' line='5061' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_register'> - <parameter type-id='5629bd41' name='regulator_desc' filepath='drivers/regulator/core.c' line='5061' column='1'/> - <parameter type-id='661ccd0c' name='cfg' filepath='drivers/regulator/core.c' line='5062' column='1'/> + <function-decl name='regulator_register' mangled-name='regulator_register' filepath='drivers/regulator/core.c' line='5047' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_register'> + <parameter type-id='5629bd41' name='regulator_desc' filepath='drivers/regulator/core.c' line='5047' column='1'/> + <parameter type-id='661ccd0c' name='cfg' filepath='drivers/regulator/core.c' line='5048' column='1'/> <return type-id='43c38462'/> </function-decl> - <function-decl name='regulator_put' mangled-name='regulator_put' filepath='drivers/regulator/core.c' line='2135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_put'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2135' column='1'/> + <function-decl name='regulator_put' mangled-name='regulator_put' filepath='drivers/regulator/core.c' line='2127' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_put'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2127' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='regulator_bulk_enable' mangled-name='regulator_bulk_enable' filepath='drivers/regulator/core.c' line='4531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_bulk_enable'> - <parameter type-id='95e97e5e' name='num_consumers' filepath='drivers/regulator/core.c' line='4531' column='1'/> - <parameter type-id='776946b4' name='consumers' filepath='drivers/regulator/core.c' line='4532' column='1'/> + <function-decl name='regulator_bulk_enable' mangled-name='regulator_bulk_enable' filepath='drivers/regulator/core.c' line='4518' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_bulk_enable'> + <parameter type-id='95e97e5e' name='num_consumers' filepath='drivers/regulator/core.c' line='4518' column='1'/> + <parameter type-id='776946b4' name='consumers' filepath='drivers/regulator/core.c' line='4519' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_bulk_disable' mangled-name='regulator_bulk_disable' filepath='drivers/regulator/core.c' line='4580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_bulk_disable'> - <parameter type-id='95e97e5e' name='num_consumers' filepath='drivers/regulator/core.c' line='4580' column='1'/> - <parameter type-id='776946b4' name='consumers' filepath='drivers/regulator/core.c' line='4581' column='1'/> + <function-decl name='regulator_bulk_disable' mangled-name='regulator_bulk_disable' filepath='drivers/regulator/core.c' line='4567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_bulk_disable'> + <parameter type-id='95e97e5e' name='num_consumers' filepath='drivers/regulator/core.c' line='4567' column='1'/> + <parameter type-id='776946b4' name='consumers' filepath='drivers/regulator/core.c' line='4568' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_unregister_notifier' mangled-name='regulator_unregister_notifier' filepath='drivers/regulator/core.c' line='4444' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_unregister_notifier'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4444' column='1'/> - <parameter type-id='d504f73d' name='nb' filepath='drivers/regulator/core.c' line='4445' column='1'/> + <function-decl name='regulator_unregister_notifier' mangled-name='regulator_unregister_notifier' filepath='drivers/regulator/core.c' line='4431' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_unregister_notifier'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4431' column='1'/> + <parameter type-id='d504f73d' name='nb' filepath='drivers/regulator/core.c' line='4432' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_unregister' mangled-name='regulator_unregister' filepath='drivers/regulator/core.c' line='5308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_unregister'> - <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5308' column='1'/> + <function-decl name='regulator_unregister' mangled-name='regulator_unregister' filepath='drivers/regulator/core.c' line='5289' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_unregister'> + <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5289' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='regulator_lock' mangled-name='regulator_lock' filepath='drivers/regulator/core.c' line='192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_lock'> @@ -104194,121 +104123,121 @@ <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='205' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='regulator_set_voltage_time_sel' mangled-name='regulator_set_voltage_time_sel' filepath='drivers/regulator/core.c' line='3991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_voltage_time_sel'> - <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='3991' column='1'/> - <parameter type-id='f0981eeb' name='old_selector' filepath='drivers/regulator/core.c' line='3992' column='1'/> - <parameter type-id='f0981eeb' name='new_selector' filepath='drivers/regulator/core.c' line='3993' column='1'/> + <function-decl name='regulator_set_voltage_time_sel' mangled-name='regulator_set_voltage_time_sel' filepath='drivers/regulator/core.c' line='3978' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_voltage_time_sel'> + <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='3978' column='1'/> + <parameter type-id='f0981eeb' name='old_selector' filepath='drivers/regulator/core.c' line='3979' column='1'/> + <parameter type-id='f0981eeb' name='new_selector' filepath='drivers/regulator/core.c' line='3980' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_set_voltage' mangled-name='regulator_set_voltage' filepath='drivers/regulator/core.c' line='3830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_voltage'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3830' column='1'/> - <parameter type-id='95e97e5e' name='min_uV' filepath='drivers/regulator/core.c' line='3830' column='1'/> - <parameter type-id='95e97e5e' name='max_uV' filepath='drivers/regulator/core.c' line='3830' column='1'/> + <function-decl name='regulator_set_voltage' mangled-name='regulator_set_voltage' filepath='drivers/regulator/core.c' line='3817' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_voltage'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3817' column='1'/> + <parameter type-id='95e97e5e' name='min_uV' filepath='drivers/regulator/core.c' line='3817' column='1'/> + <parameter type-id='95e97e5e' name='max_uV' filepath='drivers/regulator/core.c' line='3817' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_set_mode' mangled-name='regulator_set_mode' filepath='drivers/regulator/core.c' line='4216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_mode'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4216' column='1'/> - <parameter type-id='f0981eeb' name='mode' filepath='drivers/regulator/core.c' line='4216' column='1'/> + <function-decl name='regulator_set_mode' mangled-name='regulator_set_mode' filepath='drivers/regulator/core.c' line='4203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_mode'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4203' column='1'/> + <parameter type-id='f0981eeb' name='mode' filepath='drivers/regulator/core.c' line='4203' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_set_load' mangled-name='regulator_set_load' filepath='drivers/regulator/core.c' line='4350' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_load'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4350' column='1'/> - <parameter type-id='95e97e5e' name='uA_load' filepath='drivers/regulator/core.c' line='4350' column='1'/> + <function-decl name='regulator_set_load' mangled-name='regulator_set_load' filepath='drivers/regulator/core.c' line='4337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_load'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4337' column='1'/> + <parameter type-id='95e97e5e' name='uA_load' filepath='drivers/regulator/core.c' line='4337' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_set_current_limit' mangled-name='regulator_set_current_limit' filepath='drivers/regulator/core.c' line='4144' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_current_limit'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4144' column='1'/> - <parameter type-id='95e97e5e' name='min_uA' filepath='drivers/regulator/core.c' line='4145' column='1'/> - <parameter type-id='95e97e5e' name='max_uA' filepath='drivers/regulator/core.c' line='4145' column='1'/> + <function-decl name='regulator_set_current_limit' mangled-name='regulator_set_current_limit' filepath='drivers/regulator/core.c' line='4131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_set_current_limit'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4131' column='1'/> + <parameter type-id='95e97e5e' name='min_uA' filepath='drivers/regulator/core.c' line='4132' column='1'/> + <parameter type-id='95e97e5e' name='max_uA' filepath='drivers/regulator/core.c' line='4132' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_register_notifier' mangled-name='regulator_register_notifier' filepath='drivers/regulator/core.c' line='4429' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_register_notifier'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4429' column='1'/> - <parameter type-id='d504f73d' name='nb' filepath='drivers/regulator/core.c' line='4430' column='1'/> + <function-decl name='regulator_register_notifier' mangled-name='regulator_register_notifier' filepath='drivers/regulator/core.c' line='4416' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_register_notifier'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4416' column='1'/> + <parameter type-id='d504f73d' name='nb' filepath='drivers/regulator/core.c' line='4417' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_is_enabled' mangled-name='regulator_is_enabled' filepath='drivers/regulator/core.c' line='2932' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_is_enabled'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2932' column='1'/> + <function-decl name='regulator_notifier_call_chain' mangled-name='regulator_notifier_call_chain' filepath='drivers/regulator/core.c' line='4658' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_notifier_call_chain'> + <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='4658' column='1'/> + <parameter type-id='7359adad' name='event' filepath='drivers/regulator/core.c' line='4659' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='drivers/regulator/core.c' line='4659' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_notifier_call_chain' mangled-name='regulator_notifier_call_chain' filepath='drivers/regulator/core.c' line='4671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_notifier_call_chain'> - <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='4671' column='1'/> - <parameter type-id='7359adad' name='event' filepath='drivers/regulator/core.c' line='4672' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='drivers/regulator/core.c' line='4672' column='1'/> + <function-decl name='regulator_mode_to_status' mangled-name='regulator_mode_to_status' filepath='drivers/regulator/core.c' line='4676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_mode_to_status'> + <parameter type-id='f0981eeb' name='mode' filepath='drivers/regulator/core.c' line='4676' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_mode_to_status' mangled-name='regulator_mode_to_status' filepath='drivers/regulator/core.c' line='4689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_mode_to_status'> - <parameter type-id='f0981eeb' name='mode' filepath='drivers/regulator/core.c' line='4689' column='1'/> + <function-decl name='regulator_list_voltage' mangled-name='regulator_list_voltage' filepath='drivers/regulator/core.c' line='2966' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_list_voltage'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2966' column='1'/> + <parameter type-id='f0981eeb' name='selector' filepath='drivers/regulator/core.c' line='2966' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_list_voltage' mangled-name='regulator_list_voltage' filepath='drivers/regulator/core.c' line='2979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_list_voltage'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2979' column='1'/> - <parameter type-id='f0981eeb' name='selector' filepath='drivers/regulator/core.c' line='2979' column='1'/> + <function-decl name='regulator_is_supported_voltage' mangled-name='regulator_is_supported_voltage' filepath='drivers/regulator/core.c' line='3067' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_is_supported_voltage'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3067' column='1'/> + <parameter type-id='95e97e5e' name='min_uV' filepath='drivers/regulator/core.c' line='3068' column='1'/> + <parameter type-id='95e97e5e' name='max_uV' filepath='drivers/regulator/core.c' line='3068' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_is_supported_voltage' mangled-name='regulator_is_supported_voltage' filepath='drivers/regulator/core.c' line='3080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_is_supported_voltage'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3080' column='1'/> - <parameter type-id='95e97e5e' name='min_uV' filepath='drivers/regulator/core.c' line='3081' column='1'/> - <parameter type-id='95e97e5e' name='max_uV' filepath='drivers/regulator/core.c' line='3081' column='1'/> + <function-decl name='regulator_count_voltages' mangled-name='regulator_count_voltages' filepath='drivers/regulator/core.c' line='2942' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_count_voltages'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2942' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_count_voltages' mangled-name='regulator_count_voltages' filepath='drivers/regulator/core.c' line='2955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_count_voltages'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2955' column='1'/> + <function-decl name='regulator_is_enabled' mangled-name='regulator_is_enabled' filepath='drivers/regulator/core.c' line='2919' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_is_enabled'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2919' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_get_voltage' mangled-name='regulator_get_voltage' filepath='drivers/regulator/core.c' line='4115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_voltage'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4115' column='1'/> + <function-decl name='regulator_get_voltage' mangled-name='regulator_get_voltage' filepath='drivers/regulator/core.c' line='4102' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_voltage'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4102' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_get_optional' mangled-name='regulator_get_optional' filepath='drivers/regulator/core.c' line='2082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_optional'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/core.c' line='2082' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/regulator/core.c' line='2082' column='1'/> + <function-decl name='regulator_get_optional' mangled-name='regulator_get_optional' filepath='drivers/regulator/core.c' line='2074' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_optional'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/core.c' line='2074' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/regulator/core.c' line='2074' column='1'/> <return type-id='850c13f6'/> </function-decl> - <function-decl name='regulator_get_mode' mangled-name='regulator_get_mode' filepath='drivers/regulator/core.c' line='4277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_mode'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4277' column='1'/> + <function-decl name='regulator_get_mode' mangled-name='regulator_get_mode' filepath='drivers/regulator/core.c' line='4264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_mode'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4264' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='regulator_get_linear_step' mangled-name='regulator_get_linear_step' filepath='drivers/regulator/core.c' line='3063' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_linear_step'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3063' column='1'/> + <function-decl name='regulator_get_linear_step' mangled-name='regulator_get_linear_step' filepath='drivers/regulator/core.c' line='3050' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_linear_step'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='3050' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='regulator_get_drvdata' mangled-name='regulator_get_drvdata' filepath='drivers/regulator/core.c' line='5435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_drvdata'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='5435' column='1'/> + <function-decl name='regulator_get_drvdata' mangled-name='regulator_get_drvdata' filepath='drivers/regulator/core.c' line='5417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_drvdata'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='5417' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='regulator_get_current_limit' mangled-name='regulator_get_current_limit' filepath='drivers/regulator/core.c' line='4199' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_current_limit'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4199' column='1'/> + <function-decl name='regulator_get_current_limit' mangled-name='regulator_get_current_limit' filepath='drivers/regulator/core.c' line='4186' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get_current_limit'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='4186' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_get' mangled-name='regulator_get' filepath='drivers/regulator/core.c' line='2029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/core.c' line='2029' column='1'/> - <parameter type-id='80f4b756' name='id' filepath='drivers/regulator/core.c' line='2029' column='1'/> + <function-decl name='regulator_get' mangled-name='regulator_get' filepath='drivers/regulator/core.c' line='2021' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/core.c' line='2021' column='1'/> + <parameter type-id='80f4b756' name='id' filepath='drivers/regulator/core.c' line='2021' column='1'/> <return type-id='850c13f6'/> </function-decl> - <function-decl name='regulator_force_disable' mangled-name='regulator_force_disable' filepath='drivers/regulator/core.c' line='2775' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_force_disable'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2775' column='1'/> + <function-decl name='regulator_force_disable' mangled-name='regulator_force_disable' filepath='drivers/regulator/core.c' line='2762' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_force_disable'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2762' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_enable' mangled-name='regulator_enable' filepath='drivers/regulator/core.c' line='2616' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_enable'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2616' column='1'/> + <function-decl name='regulator_enable' mangled-name='regulator_enable' filepath='drivers/regulator/core.c' line='2603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_enable'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2603' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_disable_deferred' mangled-name='regulator_disable_deferred' filepath='drivers/regulator/core.c' line='2856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_disable_deferred'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2856' column='1'/> - <parameter type-id='95e97e5e' name='ms' filepath='drivers/regulator/core.c' line='2856' column='1'/> + <function-decl name='regulator_disable_deferred' mangled-name='regulator_disable_deferred' filepath='drivers/regulator/core.c' line='2843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_disable_deferred'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2843' column='1'/> + <parameter type-id='95e97e5e' name='ms' filepath='drivers/regulator/core.c' line='2843' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulator_disable' mangled-name='regulator_disable' filepath='drivers/regulator/core.c' line='2726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_disable'> - <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2726' column='1'/> + <function-decl name='regulator_disable' mangled-name='regulator_disable' filepath='drivers/regulator/core.c' line='2713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulator_disable'> + <parameter type-id='850c13f6' name='regulator' filepath='drivers/regulator/core.c' line='2713' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='rdev_get_id' mangled-name='rdev_get_id' filepath='drivers/regulator/core.c' line='5456' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rdev_get_id'> - <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5456' column='1'/> + <function-decl name='rdev_get_id' mangled-name='rdev_get_id' filepath='drivers/regulator/core.c' line='5438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rdev_get_id'> + <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5438' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='rdev_get_drvdata' mangled-name='rdev_get_drvdata' filepath='drivers/regulator/core.c' line='5422' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rdev_get_drvdata'> - <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5422' column='1'/> + <function-decl name='rdev_get_drvdata' mangled-name='rdev_get_drvdata' filepath='drivers/regulator/core.c' line='5404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='rdev_get_drvdata'> + <parameter type-id='43c38462' name='rdev' filepath='drivers/regulator/core.c' line='5404' column='1'/> <return type-id='eaa32e2f'/> </function-decl> <function-type size-in-bits='64' id='46155a72'> @@ -104492,10 +104421,10 @@ </abi-instr> <abi-instr address-size='64' path='drivers/regulator/of_regulator.c' language='LANG_C89'> <pointer-type-def type-id='435002d4' size-in-bits='64' id='d287fe92'/> - <function-decl name='of_get_regulator_init_data' mangled-name='of_get_regulator_init_data' filepath='drivers/regulator/of_regulator.c' line='277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_get_regulator_init_data'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/of_regulator.c' line='277' column='1'/> - <parameter type-id='9a537bbe' name='node' filepath='drivers/regulator/of_regulator.c' line='278' column='1'/> - <parameter type-id='5629bd41' name='desc' filepath='drivers/regulator/of_regulator.c' line='279' column='1'/> + <function-decl name='of_get_regulator_init_data' mangled-name='of_get_regulator_init_data' filepath='drivers/regulator/of_regulator.c' line='273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='of_get_regulator_init_data'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/regulator/of_regulator.c' line='273' column='1'/> + <parameter type-id='9a537bbe' name='node' filepath='drivers/regulator/of_regulator.c' line='274' column='1'/> + <parameter type-id='5629bd41' name='desc' filepath='drivers/regulator/of_regulator.c' line='275' column='1'/> <return type-id='d287fe92'/> </function-decl> </abi-instr> @@ -105525,27 +105454,27 @@ <pointer-type-def type-id='52bea74f' size-in-bits='64' id='3257bfe7'/> <pointer-type-def type-id='6831a786' size-in-bits='64' id='3b3fe200'/> <pointer-type-def type-id='1120d7bb' size-in-bits='64' id='341171ef'/> - <function-decl name='scsi_host_alloc' mangled-name='scsi_host_alloc' filepath='drivers/scsi/hosts.c' line='373' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_host_alloc'> - <parameter type-id='36265581' name='sht' filepath='drivers/scsi/hosts.c' line='373' column='1'/> - <parameter type-id='95e97e5e' name='privsize' filepath='drivers/scsi/hosts.c' line='373' column='1'/> + <function-decl name='scsi_host_alloc' mangled-name='scsi_host_alloc' filepath='drivers/scsi/hosts.c' line='374' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_host_alloc'> + <parameter type-id='36265581' name='sht' filepath='drivers/scsi/hosts.c' line='374' column='1'/> + <parameter type-id='95e97e5e' name='privsize' filepath='drivers/scsi/hosts.c' line='374' column='1'/> <return type-id='a970a64c'/> </function-decl> <function-decl name='scsi_remove_host' mangled-name='scsi_remove_host' filepath='drivers/scsi/hosts.c' line='163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_remove_host'> <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/hosts.c' line='163' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_is_host_device' mangled-name='scsi_is_host_device' filepath='drivers/scsi/hosts.c' line='597' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_is_host_device'> - <parameter type-id='8df61054' name='dev' filepath='drivers/scsi/hosts.c' line='597' column='1'/> + <function-decl name='scsi_is_host_device' mangled-name='scsi_is_host_device' filepath='drivers/scsi/hosts.c' line='598' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_is_host_device'> + <parameter type-id='8df61054' name='dev' filepath='drivers/scsi/hosts.c' line='598' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='scsi_host_put' mangled-name='scsi_host_put' filepath='drivers/scsi/hosts.c' line='580' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_host_put'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/hosts.c' line='580' column='1'/> + <function-decl name='scsi_host_put' mangled-name='scsi_host_put' filepath='drivers/scsi/hosts.c' line='581' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_host_put'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/hosts.c' line='581' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_add_host_with_dma' mangled-name='scsi_add_host_with_dma' filepath='drivers/scsi/hosts.c' line='208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_add_host_with_dma'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/hosts.c' line='208' column='1'/> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/scsi/hosts.c' line='208' column='1'/> - <parameter type-id='fa0b179b' name='dma_dev' filepath='drivers/scsi/hosts.c' line='209' column='1'/> + <function-decl name='scsi_add_host_with_dma' mangled-name='scsi_add_host_with_dma' filepath='drivers/scsi/hosts.c' line='207' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_add_host_with_dma'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/hosts.c' line='207' column='1'/> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/scsi/hosts.c' line='207' column='1'/> + <parameter type-id='fa0b179b' name='dma_dev' filepath='drivers/scsi/hosts.c' line='208' column='1'/> <return type-id='95e97e5e'/> </function-decl> <pointer-type-def type-id='83cec606' size-in-bits='64' id='a970a64c'/> @@ -107083,19 +107012,19 @@ <pointer-type-def type-id='9102a0ad' size-in-bits='64' id='38c41fe1'/> <pointer-type-def type-id='ed6fc6ea' size-in-bits='64' id='36e7f8ac'/> <qualified-type-def type-id='95e97e5e' volatile='yes' id='e024ff18'/> - <function-decl name='scsi_device_put' mangled-name='scsi_device_put' filepath='drivers/scsi/scsi.c' line='563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_put'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi.c' line='563' column='1'/> + <function-decl name='scsi_device_put' mangled-name='scsi_device_put' filepath='drivers/scsi/scsi.c' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_put'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi.c' line='556' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_device_lookup' mangled-name='scsi_device_lookup' filepath='drivers/scsi/scsi.c' line='750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_lookup'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi.c' line='750' column='1'/> - <parameter type-id='6e160b14' name='channel' filepath='drivers/scsi/scsi.c' line='751' column='1'/> - <parameter type-id='6e160b14' name='id' filepath='drivers/scsi/scsi.c' line='751' column='1'/> - <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi.c' line='751' column='1'/> + <function-decl name='scsi_device_lookup' mangled-name='scsi_device_lookup' filepath='drivers/scsi/scsi.c' line='743' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_lookup'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi.c' line='743' column='1'/> + <parameter type-id='6e160b14' name='channel' filepath='drivers/scsi/scsi.c' line='744' column='1'/> + <parameter type-id='6e160b14' name='id' filepath='drivers/scsi/scsi.c' line='744' column='1'/> + <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi.c' line='744' column='1'/> <return type-id='eb572b74'/> </function-decl> - <function-decl name='scsi_device_get' mangled-name='scsi_device_get' filepath='drivers/scsi/scsi.c' line='538' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_get'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi.c' line='538' column='1'/> + <function-decl name='scsi_device_get' mangled-name='scsi_device_get' filepath='drivers/scsi/scsi.c' line='531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_get'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi.c' line='531' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='scsi_change_queue_depth' mangled-name='scsi_change_queue_depth' filepath='drivers/scsi/scsi.c' line='238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_change_queue_depth'> @@ -107103,9 +107032,9 @@ <parameter type-id='95e97e5e' name='depth' filepath='drivers/scsi/scsi.c' line='238' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__scsi_device_lookup_by_target' mangled-name='__scsi_device_lookup_by_target' filepath='drivers/scsi/scsi.c' line='664' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__scsi_device_lookup_by_target'> - <parameter type-id='4cb5819d' name='starget' filepath='drivers/scsi/scsi.c' line='664' column='1'/> - <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi.c' line='665' column='1'/> + <function-decl name='__scsi_device_lookup_by_target' mangled-name='__scsi_device_lookup_by_target' filepath='drivers/scsi/scsi.c' line='657' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__scsi_device_lookup_by_target'> + <parameter type-id='4cb5819d' name='starget' filepath='drivers/scsi/scsi.c' line='657' column='1'/> + <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi.c' line='658' column='1'/> <return type-id='eb572b74'/> </function-decl> <function-type size-in-bits='64' id='369a41ea'> @@ -107412,27 +107341,27 @@ <parameter type-id='7292109c' name='resid' filepath='drivers/scsi/scsi_lib.c' line='252' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='scsi_unblock_requests' mangled-name='scsi_unblock_requests' filepath='drivers/scsi/scsi_lib.c' line='1985' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_unblock_requests'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_lib.c' line='1985' column='1'/> + <function-decl name='scsi_unblock_requests' mangled-name='scsi_unblock_requests' filepath='drivers/scsi/scsi_lib.c' line='1990' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_unblock_requests'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_lib.c' line='1990' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_test_unit_ready' mangled-name='scsi_test_unit_ready' filepath='drivers/scsi/scsi_lib.c' line='2217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_test_unit_ready'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2217' column='1'/> - <parameter type-id='95e97e5e' name='timeout' filepath='drivers/scsi/scsi_lib.c' line='2217' column='1'/> - <parameter type-id='95e97e5e' name='retries' filepath='drivers/scsi/scsi_lib.c' line='2217' column='1'/> - <parameter type-id='991b8213' name='sshdr' filepath='drivers/scsi/scsi_lib.c' line='2218' column='1'/> + <function-decl name='scsi_test_unit_ready' mangled-name='scsi_test_unit_ready' filepath='drivers/scsi/scsi_lib.c' line='2222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_test_unit_ready'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2222' column='1'/> + <parameter type-id='95e97e5e' name='timeout' filepath='drivers/scsi/scsi_lib.c' line='2222' column='1'/> + <parameter type-id='95e97e5e' name='retries' filepath='drivers/scsi/scsi_lib.c' line='2222' column='1'/> + <parameter type-id='991b8213' name='sshdr' filepath='drivers/scsi/scsi_lib.c' line='2223' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='scsi_device_resume' mangled-name='scsi_device_resume' filepath='drivers/scsi/scsi_lib.c' line='2603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_resume'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2603' column='1'/> + <function-decl name='scsi_device_resume' mangled-name='scsi_device_resume' filepath='drivers/scsi/scsi_lib.c' line='2608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_resume'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2608' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_device_quiesce' mangled-name='scsi_device_quiesce' filepath='drivers/scsi/scsi_lib.c' line='2555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_quiesce'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2555' column='1'/> + <function-decl name='scsi_device_quiesce' mangled-name='scsi_device_quiesce' filepath='drivers/scsi/scsi_lib.c' line='2560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_device_quiesce'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_lib.c' line='2560' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='scsi_block_requests' mangled-name='scsi_block_requests' filepath='drivers/scsi/scsi_lib.c' line='1959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_block_requests'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_lib.c' line='1959' column='1'/> + <function-decl name='scsi_block_requests' mangled-name='scsi_block_requests' filepath='drivers/scsi/scsi_lib.c' line='1964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_block_requests'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_lib.c' line='1964' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -107487,30 +107416,30 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/scsi/scsi_scan.c' language='LANG_C89'> - <function-decl name='scsi_scan_host' mangled-name='scsi_scan_host' filepath='drivers/scsi/scsi_scan.c' line='1836' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_scan_host'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1836' column='1'/> + <function-decl name='scsi_scan_host' mangled-name='scsi_scan_host' filepath='drivers/scsi/scsi_scan.c' line='1837' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_scan_host'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1837' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_get_host_dev' mangled-name='scsi_get_host_dev' filepath='drivers/scsi/scsi_scan.c' line='1896' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_get_host_dev'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1896' column='1'/> + <function-decl name='scsi_get_host_dev' mangled-name='scsi_get_host_dev' filepath='drivers/scsi/scsi_scan.c' line='1897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_get_host_dev'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1897' column='1'/> <return type-id='eb572b74'/> </function-decl> - <function-decl name='__scsi_add_device' mangled-name='__scsi_add_device' filepath='drivers/scsi/scsi_scan.c' line='1460' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__scsi_add_device'> - <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1460' column='1'/> - <parameter type-id='6e160b14' name='channel' filepath='drivers/scsi/scsi_scan.c' line='1460' column='1'/> - <parameter type-id='6e160b14' name='id' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1'/> - <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1'/> - <parameter type-id='eaa32e2f' name='hostdata' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1'/> + <function-decl name='__scsi_add_device' mangled-name='__scsi_add_device' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__scsi_add_device'> + <parameter type-id='a970a64c' name='shost' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1'/> + <parameter type-id='6e160b14' name='channel' filepath='drivers/scsi/scsi_scan.c' line='1461' column='1'/> + <parameter type-id='6e160b14' name='id' filepath='drivers/scsi/scsi_scan.c' line='1462' column='1'/> + <parameter type-id='91ce1af9' name='lun' filepath='drivers/scsi/scsi_scan.c' line='1462' column='1'/> + <parameter type-id='eaa32e2f' name='hostdata' filepath='drivers/scsi/scsi_scan.c' line='1462' column='1'/> <return type-id='eb572b74'/> </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/scsi/scsi_sysfs.c' language='LANG_C89'> - <function-decl name='scsi_remove_device' mangled-name='scsi_remove_device' filepath='drivers/scsi/scsi_sysfs.c' line='1474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_remove_device'> - <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_sysfs.c' line='1474' column='1'/> + <function-decl name='scsi_remove_device' mangled-name='scsi_remove_device' filepath='drivers/scsi/scsi_sysfs.c' line='1466' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_remove_device'> + <parameter type-id='eb572b74' name='sdev' filepath='drivers/scsi/scsi_sysfs.c' line='1466' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='scsi_register_interface' mangled-name='scsi_register_interface' filepath='drivers/scsi/scsi_sysfs.c' line='1560' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_register_interface'> - <parameter type-id='ec167ceb' name='intf' filepath='drivers/scsi/scsi_sysfs.c' line='1560' column='1'/> + <function-decl name='scsi_register_interface' mangled-name='scsi_register_interface' filepath='drivers/scsi/scsi_sysfs.c' line='1552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scsi_register_interface'> + <parameter type-id='ec167ceb' name='intf' filepath='drivers/scsi/scsi_sysfs.c' line='1552' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -109345,14 +109274,14 @@ <parameter type-id='19c2251e' name='value' filepath='drivers/soc/qcom/smem_state.c' line='47' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='qcom_smem_state_unregister' mangled-name='qcom_smem_state_unregister' filepath='drivers/soc/qcom/smem_state.c' line='189' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qcom_smem_state_unregister'> - <parameter type-id='01df4674' name='state' filepath='drivers/soc/qcom/smem_state.c' line='189' column='1'/> + <function-decl name='qcom_smem_state_unregister' mangled-name='qcom_smem_state_unregister' filepath='drivers/soc/qcom/smem_state.c' line='188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qcom_smem_state_unregister'> + <parameter type-id='01df4674' name='state' filepath='drivers/soc/qcom/smem_state.c' line='188' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='qcom_smem_state_register' mangled-name='qcom_smem_state_register' filepath='drivers/soc/qcom/smem_state.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qcom_smem_state_register'> - <parameter type-id='9a537bbe' name='of_node' filepath='drivers/soc/qcom/smem_state.c' line='161' column='1'/> - <parameter type-id='b86c9da0' name='ops' filepath='drivers/soc/qcom/smem_state.c' line='162' column='1'/> - <parameter type-id='eaa32e2f' name='priv' filepath='drivers/soc/qcom/smem_state.c' line='163' column='1'/> + <function-decl name='qcom_smem_state_register' mangled-name='qcom_smem_state_register' filepath='drivers/soc/qcom/smem_state.c' line='160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qcom_smem_state_register'> + <parameter type-id='9a537bbe' name='of_node' filepath='drivers/soc/qcom/smem_state.c' line='160' column='1'/> + <parameter type-id='b86c9da0' name='ops' filepath='drivers/soc/qcom/smem_state.c' line='161' column='1'/> + <parameter type-id='eaa32e2f' name='priv' filepath='drivers/soc/qcom/smem_state.c' line='162' column='1'/> <return type-id='01df4674'/> </function-decl> <function-decl name='qcom_smem_state_get' mangled-name='qcom_smem_state_get' filepath='drivers/soc/qcom/smem_state.c' line='88' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='qcom_smem_state_get'> @@ -112079,36 +112008,36 @@ <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/serial_core.h' line='85' column='1'/> </data-member> </class-decl> - <class-decl name='uart_driver' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/serial_core.h' line='327' column='1' id='89f1cbf8'> + <class-decl name='uart_driver' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/serial_core.h' line='310' column='1' id='89f1cbf8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/serial_core.h' line='328' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/serial_core.h' line='311' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='driver_name' type-id='80f4b756' visibility='default' filepath='include/linux/serial_core.h' line='329' column='1'/> + <var-decl name='driver_name' type-id='80f4b756' visibility='default' filepath='include/linux/serial_core.h' line='312' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='dev_name' type-id='80f4b756' visibility='default' filepath='include/linux/serial_core.h' line='330' column='1'/> + <var-decl name='dev_name' type-id='80f4b756' visibility='default' filepath='include/linux/serial_core.h' line='313' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='major' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='331' column='1'/> + <var-decl name='major' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='314' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='minor' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='332' column='1'/> + <var-decl name='minor' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='315' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='nr' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='333' column='1'/> + <var-decl name='nr' type-id='95e97e5e' visibility='default' filepath='include/linux/serial_core.h' line='316' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='cons' type-id='b9aa0100' visibility='default' filepath='include/linux/serial_core.h' line='334' column='1'/> + <var-decl name='cons' type-id='b9aa0100' visibility='default' filepath='include/linux/serial_core.h' line='317' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='state' type-id='533b348b' visibility='default' filepath='include/linux/serial_core.h' line='340' column='1'/> + <var-decl name='state' type-id='533b348b' visibility='default' filepath='include/linux/serial_core.h' line='323' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='tty_driver' type-id='c2b4b27b' visibility='default' filepath='include/linux/serial_core.h' line='341' column='1'/> + <var-decl name='tty_driver' type-id='c2b4b27b' visibility='default' filepath='include/linux/serial_core.h' line='324' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/serial_core.h' line='343' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/serial_core.h' line='326' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='e4af473b' size-in-bits='64' id='aad24a5b'/> @@ -112429,8 +112358,8 @@ </abi-instr> <abi-instr address-size='64' path='drivers/tty/tty_io.c' language='LANG_C89'> <var-decl name='tty_std_termios' type-id='2f8662b5' mangled-name='tty_std_termios' visibility='default' filepath='drivers/tty/tty_io.c' line='121' column='1' elf-symbol-id='tty_std_termios'/> - <function-decl name='tty_kref_put' mangled-name='tty_kref_put' filepath='drivers/tty/tty_io.c' line='1487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_kref_put'> - <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='1487' column='1'/> + <function-decl name='tty_kref_put' mangled-name='tty_kref_put' filepath='drivers/tty/tty_io.c' line='1485' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_kref_put'> + <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='1485' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='tty_wakeup' mangled-name='tty_wakeup' filepath='drivers/tty/tty_io.c' line='527' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_wakeup'> @@ -112441,27 +112370,27 @@ <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='694' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='tty_unregister_driver' mangled-name='tty_unregister_driver' filepath='drivers/tty/tty_io.c' line='3381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_unregister_driver'> - <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3381' column='1'/> + <function-decl name='tty_unregister_driver' mangled-name='tty_unregister_driver' filepath='drivers/tty/tty_io.c' line='3379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_unregister_driver'> + <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3379' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='tty_unregister_device' mangled-name='tty_unregister_device' filepath='drivers/tty/tty_io.c' line='3192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_unregister_device'> - <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3192' column='1'/> - <parameter type-id='f0981eeb' name='index' filepath='drivers/tty/tty_io.c' line='3192' column='1'/> + <function-decl name='tty_unregister_device' mangled-name='tty_unregister_device' filepath='drivers/tty/tty_io.c' line='3190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_unregister_device'> + <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3190' column='1'/> + <parameter type-id='f0981eeb' name='index' filepath='drivers/tty/tty_io.c' line='3190' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='tty_standard_install' mangled-name='tty_standard_install' filepath='drivers/tty/tty_io.c' line='1204' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_standard_install'> - <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='1204' column='1'/> - <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='1204' column='1'/> + <function-decl name='tty_standard_install' mangled-name='tty_standard_install' filepath='drivers/tty/tty_io.c' line='1202' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_standard_install'> + <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='1202' column='1'/> + <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='1202' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='tty_set_operations' mangled-name='tty_set_operations' filepath='drivers/tty/tty_io.c' line='3303' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_set_operations'> - <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3303' column='1'/> - <parameter type-id='f2c18b44' name='op' filepath='drivers/tty/tty_io.c' line='3304' column='1'/> + <function-decl name='tty_set_operations' mangled-name='tty_set_operations' filepath='drivers/tty/tty_io.c' line='3301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_set_operations'> + <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3301' column='1'/> + <parameter type-id='f2c18b44' name='op' filepath='drivers/tty/tty_io.c' line='3302' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='tty_register_driver' mangled-name='tty_register_driver' filepath='drivers/tty/tty_io.c' line='3319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_register_driver'> - <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3319' column='1'/> + <function-decl name='tty_register_driver' mangled-name='tty_register_driver' filepath='drivers/tty/tty_io.c' line='3317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_register_driver'> + <parameter type-id='c2b4b27b' name='driver' filepath='drivers/tty/tty_io.c' line='3317' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='tty_hangup' mangled-name='tty_hangup' filepath='drivers/tty/tty_io.c' line='677' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tty_hangup'> @@ -112476,18 +112405,18 @@ <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='810' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='put_tty_driver' mangled-name='put_tty_driver' filepath='drivers/tty/tty_io.c' line='3310' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='put_tty_driver'> - <parameter type-id='c2b4b27b' name='d' filepath='drivers/tty/tty_io.c' line='3310' column='1'/> + <function-decl name='put_tty_driver' mangled-name='put_tty_driver' filepath='drivers/tty/tty_io.c' line='3308' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='put_tty_driver'> + <parameter type-id='c2b4b27b' name='d' filepath='drivers/tty/tty_io.c' line='3308' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='do_SAK' mangled-name='do_SAK' filepath='drivers/tty/tty_io.c' line='2955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='do_SAK'> - <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='2955' column='1'/> + <function-decl name='do_SAK' mangled-name='do_SAK' filepath='drivers/tty/tty_io.c' line='2953' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='do_SAK'> + <parameter type-id='572fbdca' name='tty' filepath='drivers/tty/tty_io.c' line='2953' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__tty_alloc_driver' mangled-name='__tty_alloc_driver' filepath='drivers/tty/tty_io.c' line='3212' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tty_alloc_driver'> - <parameter type-id='f0981eeb' name='lines' filepath='drivers/tty/tty_io.c' line='3212' column='1'/> - <parameter type-id='2730d015' name='owner' filepath='drivers/tty/tty_io.c' line='3212' column='1'/> - <parameter type-id='7359adad' name='flags' filepath='drivers/tty/tty_io.c' line='3213' column='1'/> + <function-decl name='__tty_alloc_driver' mangled-name='__tty_alloc_driver' filepath='drivers/tty/tty_io.c' line='3210' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__tty_alloc_driver'> + <parameter type-id='f0981eeb' name='lines' filepath='drivers/tty/tty_io.c' line='3210' column='1'/> + <parameter type-id='2730d015' name='owner' filepath='drivers/tty/tty_io.c' line='3210' column='1'/> + <parameter type-id='7359adad' name='flags' filepath='drivers/tty/tty_io.c' line='3211' column='1'/> <return type-id='c2b4b27b'/> </function-decl> </abi-instr> @@ -112833,85 +112762,85 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='drivers/usb/core/driver.c' language='LANG_C89'> - <class-decl name='usb_driver' size-in-bits='2688' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1207' column='1' id='1ab3428c'> + <class-decl name='usb_driver' size-in-bits='2688' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1204' column='1' id='1ab3428c'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/usb.h' line='1208' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/usb.h' line='1205' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='probe' type-id='a324decb' visibility='default' filepath='include/linux/usb.h' line='1210' column='1'/> + <var-decl name='probe' type-id='a324decb' visibility='default' filepath='include/linux/usb.h' line='1207' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='disconnect' type-id='b6566954' visibility='default' filepath='include/linux/usb.h' line='1213' column='1'/> + <var-decl name='disconnect' type-id='b6566954' visibility='default' filepath='include/linux/usb.h' line='1210' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='unlocked_ioctl' type-id='52006477' visibility='default' filepath='include/linux/usb.h' line='1215' column='1'/> + <var-decl name='unlocked_ioctl' type-id='52006477' visibility='default' filepath='include/linux/usb.h' line='1212' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='suspend' type-id='31eb8cc0' visibility='default' filepath='include/linux/usb.h' line='1218' column='1'/> + <var-decl name='suspend' type-id='31eb8cc0' visibility='default' filepath='include/linux/usb.h' line='1215' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='resume' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1219' column='1'/> + <var-decl name='resume' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1216' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='reset_resume' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1220' column='1'/> + <var-decl name='reset_resume' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1217' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='pre_reset' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1222' column='1'/> + <var-decl name='pre_reset' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1219' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='post_reset' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1223' column='1'/> + <var-decl name='post_reset' type-id='46d1c941' visibility='default' filepath='include/linux/usb.h' line='1220' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='id_table' type-id='bc57058f' visibility='default' filepath='include/linux/usb.h' line='1225' column='1'/> + <var-decl name='id_table' type-id='bc57058f' visibility='default' filepath='include/linux/usb.h' line='1222' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='dev_groups' type-id='c97de1ac' visibility='default' filepath='include/linux/usb.h' line='1226' column='1'/> + <var-decl name='dev_groups' type-id='c97de1ac' visibility='default' filepath='include/linux/usb.h' line='1223' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='dynids' type-id='cb08bae1' visibility='default' filepath='include/linux/usb.h' line='1228' column='1'/> + <var-decl name='dynids' type-id='cb08bae1' visibility='default' filepath='include/linux/usb.h' line='1225' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='drvwrap' type-id='33780378' visibility='default' filepath='include/linux/usb.h' line='1229' column='1'/> + <var-decl name='drvwrap' type-id='33780378' visibility='default' filepath='include/linux/usb.h' line='1226' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='no_dynamic_id' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1230' column='1'/> + <var-decl name='no_dynamic_id' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1227' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='supports_autosuspend' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1231' column='1'/> + <var-decl name='supports_autosuspend' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1228' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='disable_hub_initiated_lpm' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1232' column='1'/> + <var-decl name='disable_hub_initiated_lpm' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1229' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='soft_unbind' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1233' column='1'/> + <var-decl name='soft_unbind' type-id='f0981eeb' visibility='default' filepath='include/linux/usb.h' line='1230' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1235' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1232' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2496'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1236' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1233' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2560'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1237' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1234' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2624'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1238' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/usb.h' line='1235' column='1'/> </data-member> </class-decl> - <class-decl name='usb_dynids' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1114' column='1' id='cb08bae1'> + <class-decl name='usb_dynids' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1111' column='1' id='cb08bae1'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1115' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1112' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1116' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/usb.h' line='1113' column='1'/> </data-member> </class-decl> - <class-decl name='usbdrv_wrap' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1136' column='1' id='33780378'> + <class-decl name='usbdrv_wrap' size-in-bits='1472' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1133' column='1' id='33780378'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='driver' type-id='fe007c02' visibility='default' filepath='include/linux/usb.h' line='1137' column='1'/> + <var-decl name='driver' type-id='fe007c02' visibility='default' filepath='include/linux/usb.h' line='1134' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='for_devices' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1138' column='1'/> + <var-decl name='for_devices' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1135' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='4b2a0d9d' size-in-bits='64' id='46d1c941'/> @@ -114382,35 +114311,35 @@ <pointer-type-def type-id='192c003a' size-in-bits='64' id='2dfafd2c'/> </abi-instr> <abi-instr address-size='64' path='drivers/usb/core/hub.c' language='LANG_C89'> - <function-decl name='usb_reset_device' mangled-name='usb_reset_device' filepath='drivers/usb/core/hub.c' line='5955' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_reset_device'> - <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='5955' column='1'/> + <function-decl name='usb_reset_device' mangled-name='usb_reset_device' filepath='drivers/usb/core/hub.c' line='5943' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_reset_device'> + <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='5943' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usb_wakeup_notification' mangled-name='usb_wakeup_notification' filepath='drivers/usb/core/hub.c' line='698' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_wakeup_notification'> - <parameter type-id='25e60cb2' name='hdev' filepath='drivers/usb/core/hub.c' line='698' column='1'/> - <parameter type-id='f0981eeb' name='portnum' filepath='drivers/usb/core/hub.c' line='699' column='1'/> + <function-decl name='usb_wakeup_notification' mangled-name='usb_wakeup_notification' filepath='drivers/usb/core/hub.c' line='695' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_wakeup_notification'> + <parameter type-id='25e60cb2' name='hdev' filepath='drivers/usb/core/hub.c' line='695' column='1'/> + <parameter type-id='f0981eeb' name='portnum' filepath='drivers/usb/core/hub.c' line='696' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usb_wakeup_enabled_descendants' mangled-name='usb_wakeup_enabled_descendants' filepath='drivers/usb/core/hub.c' line='3215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_wakeup_enabled_descendants'> - <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='3215' column='1'/> + <function-decl name='usb_wakeup_enabled_descendants' mangled-name='usb_wakeup_enabled_descendants' filepath='drivers/usb/core/hub.c' line='3213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_wakeup_enabled_descendants'> + <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='3213' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='usb_set_device_state' mangled-name='usb_set_device_state' filepath='drivers/usb/core/hub.c' line='2048' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_set_device_state'> - <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='2048' column='1'/> - <parameter type-id='901a91cb' name='new_state' filepath='drivers/usb/core/hub.c' line='2049' column='1'/> + <function-decl name='usb_set_device_state' mangled-name='usb_set_device_state' filepath='drivers/usb/core/hub.c' line='2045' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_set_device_state'> + <parameter type-id='25e60cb2' name='udev' filepath='drivers/usb/core/hub.c' line='2045' column='1'/> + <parameter type-id='901a91cb' name='new_state' filepath='drivers/usb/core/hub.c' line='2046' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usb_root_hub_lost_power' mangled-name='usb_root_hub_lost_power' filepath='drivers/usb/core/hub.c' line='3833' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_root_hub_lost_power'> - <parameter type-id='25e60cb2' name='rhdev' filepath='drivers/usb/core/hub.c' line='3833' column='1'/> + <function-decl name='usb_root_hub_lost_power' mangled-name='usb_root_hub_lost_power' filepath='drivers/usb/core/hub.c' line='3831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_root_hub_lost_power'> + <parameter type-id='25e60cb2' name='rhdev' filepath='drivers/usb/core/hub.c' line='3831' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usb_hub_find_child' mangled-name='usb_hub_find_child' filepath='drivers/usb/core/hub.c' line='6093' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_hub_find_child'> - <parameter type-id='25e60cb2' name='hdev' filepath='drivers/usb/core/hub.c' line='6093' column='1'/> - <parameter type-id='95e97e5e' name='port1' filepath='drivers/usb/core/hub.c' line='6094' column='1'/> + <function-decl name='usb_hub_find_child' mangled-name='usb_hub_find_child' filepath='drivers/usb/core/hub.c' line='6081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_hub_find_child'> + <parameter type-id='25e60cb2' name='hdev' filepath='drivers/usb/core/hub.c' line='6081' column='1'/> + <parameter type-id='95e97e5e' name='port1' filepath='drivers/usb/core/hub.c' line='6082' column='1'/> <return type-id='25e60cb2'/> </function-decl> - <function-decl name='usb_hub_clear_tt_buffer' mangled-name='usb_hub_clear_tt_buffer' filepath='drivers/usb/core/hub.c' line='867' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_hub_clear_tt_buffer'> - <parameter type-id='ab85b8f2' name='urb' filepath='drivers/usb/core/hub.c' line='867' column='1'/> + <function-decl name='usb_hub_clear_tt_buffer' mangled-name='usb_hub_clear_tt_buffer' filepath='drivers/usb/core/hub.c' line='864' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_hub_clear_tt_buffer'> + <parameter type-id='ab85b8f2' name='urb' filepath='drivers/usb/core/hub.c' line='864' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -114721,33 +114650,33 @@ <var-decl name='wMTU' type-id='23119536' visibility='default' filepath='include/uapi/linux/usb/cdc.h' line='218' column='1'/> </data-member> </class-decl> - <class-decl name='usb_sg_request' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1888' column='1' id='f14efa5e'> + <class-decl name='usb_sg_request' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/linux/usb.h' line='1885' column='1' id='f14efa5e'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1889' column='1'/> + <var-decl name='status' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1886' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='bytes' type-id='b59d7dce' visibility='default' filepath='include/linux/usb.h' line='1890' column='1'/> + <var-decl name='bytes' type-id='b59d7dce' visibility='default' filepath='include/linux/usb.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1896' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/usb.h' line='1893' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='dev' type-id='25e60cb2' visibility='default' filepath='include/linux/usb.h' line='1898' column='1'/> + <var-decl name='dev' type-id='25e60cb2' visibility='default' filepath='include/linux/usb.h' line='1895' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='pipe' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1899' column='1'/> + <var-decl name='pipe' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1896' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='288'> - <var-decl name='entries' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1901' column='1'/> + <var-decl name='entries' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1898' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='urbs' type-id='db81fc08' visibility='default' filepath='include/linux/usb.h' line='1902' column='1'/> + <var-decl name='urbs' type-id='db81fc08' visibility='default' filepath='include/linux/usb.h' line='1899' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1904' column='1'/> + <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/usb.h' line='1901' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='complete' type-id='f9fef04f' visibility='default' filepath='include/linux/usb.h' line='1905' column='1'/> + <var-decl name='complete' type-id='f9fef04f' visibility='default' filepath='include/linux/usb.h' line='1902' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='ab85b8f2' size-in-bits='64' id='db81fc08'/> @@ -114875,6 +114804,10 @@ <parameter type-id='bd300bf3' name='anchor' filepath='drivers/usb/core/urb.c' line='967' column='1'/> <return type-id='ab85b8f2'/> </function-decl> + <function-decl name='usb_scuttle_anchored_urbs' mangled-name='usb_scuttle_anchored_urbs' filepath='drivers/usb/core/urb.c' line='994' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_scuttle_anchored_urbs'> + <parameter type-id='bd300bf3' name='anchor' filepath='drivers/usb/core/urb.c' line='994' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='usb_unanchor_urb' mangled-name='usb_unanchor_urb' filepath='drivers/usb/core/urb.c' line='164' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_unanchor_urb'> <parameter type-id='ab85b8f2' name='urb' filepath='drivers/usb/core/urb.c' line='164' column='1'/> <return type-id='48b5725f'/> @@ -114892,10 +114825,6 @@ <parameter type-id='ab85b8f2' name='urb' filepath='drivers/usb/core/urb.c' line='649' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usb_scuttle_anchored_urbs' mangled-name='usb_scuttle_anchored_urbs' filepath='drivers/usb/core/urb.c' line='994' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_scuttle_anchored_urbs'> - <parameter type-id='bd300bf3' name='anchor' filepath='drivers/usb/core/urb.c' line='994' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='usb_poison_urb' mangled-name='usb_poison_urb' filepath='drivers/usb/core/urb.c' line='735' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_poison_urb'> <parameter type-id='ab85b8f2' name='urb' filepath='drivers/usb/core/urb.c' line='735' column='1'/> <return type-id='48b5725f'/> @@ -116834,9 +116763,9 @@ <pointer-type-def type-id='40fcf9ec' size-in-bits='64' id='143d32b2'/> <pointer-type-def type-id='c598cb04' size-in-bits='64' id='be8d9c5e'/> <pointer-type-def type-id='53f72e39' size-in-bits='64' id='91d6713d'/> - <function-decl name='usb_role_switch_register' mangled-name='usb_role_switch_register' filepath='drivers/usb/roles/class.c' line='288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_register'> - <parameter type-id='fa0b179b' name='parent' filepath='drivers/usb/roles/class.c' line='288' column='1'/> - <parameter type-id='143d32b2' name='desc' filepath='drivers/usb/roles/class.c' line='289' column='1'/> + <function-decl name='usb_role_switch_register' mangled-name='usb_role_switch_register' filepath='drivers/usb/roles/class.c' line='285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_register'> + <parameter type-id='fa0b179b' name='parent' filepath='drivers/usb/roles/class.c' line='285' column='1'/> + <parameter type-id='143d32b2' name='desc' filepath='drivers/usb/roles/class.c' line='286' column='1'/> <return type-id='3e3cd44f'/> </function-decl> <function-decl name='usb_role_switch_set_role' mangled-name='usb_role_switch_set_role' filepath='drivers/usb/roles/class.c' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_set_role'> @@ -116844,16 +116773,16 @@ <parameter type-id='c675b073' name='role' filepath='drivers/usb/roles/class.c' line='42' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='usb_role_switch_get' mangled-name='usb_role_switch_get' filepath='drivers/usb/roles/class.c' line='128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_get'> - <parameter type-id='fa0b179b' name='dev' filepath='drivers/usb/roles/class.c' line='128' column='1'/> + <function-decl name='usb_role_switch_get' mangled-name='usb_role_switch_get' filepath='drivers/usb/roles/class.c' line='125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_get'> + <parameter type-id='fa0b179b' name='dev' filepath='drivers/usb/roles/class.c' line='125' column='1'/> <return type-id='3e3cd44f'/> </function-decl> - <function-decl name='usb_role_switch_unregister' mangled-name='usb_role_switch_unregister' filepath='drivers/usb/roles/class.c' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_unregister'> - <parameter type-id='3e3cd44f' name='sw' filepath='drivers/usb/roles/class.c' line='334' column='1'/> + <function-decl name='usb_role_switch_unregister' mangled-name='usb_role_switch_unregister' filepath='drivers/usb/roles/class.c' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_unregister'> + <parameter type-id='3e3cd44f' name='sw' filepath='drivers/usb/roles/class.c' line='331' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='usb_role_switch_put' mangled-name='usb_role_switch_put' filepath='drivers/usb/roles/class.c' line='172' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_put'> - <parameter type-id='3e3cd44f' name='sw' filepath='drivers/usb/roles/class.c' line='172' column='1'/> + <function-decl name='usb_role_switch_put' mangled-name='usb_role_switch_put' filepath='drivers/usb/roles/class.c' line='169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_put'> + <parameter type-id='3e3cd44f' name='sw' filepath='drivers/usb/roles/class.c' line='169' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='usb_role_switch_get_role' mangled-name='usb_role_switch_get_role' filepath='drivers/usb/roles/class.c' line='68' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='usb_role_switch_get_role'> @@ -116915,15 +116844,15 @@ <var-decl name='driver' type-id='fe007c02' visibility='default' filepath='include/linux/usb/typec_altmode.h' line='146' column='1'/> </data-member> </class-decl> - <class-decl name='typec_device_id' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/mod_devicetable.h' line='799' column='1' id='af73fe5b'> + <class-decl name='typec_device_id' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/mod_devicetable.h' line='801' column='1' id='af73fe5b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='svid' type-id='d315442e' visibility='default' filepath='include/linux/mod_devicetable.h' line='800' column='1'/> + <var-decl name='svid' type-id='d315442e' visibility='default' filepath='include/linux/mod_devicetable.h' line='802' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='mode' type-id='8f048e17' visibility='default' filepath='include/linux/mod_devicetable.h' line='801' column='1'/> + <var-decl name='mode' type-id='8f048e17' visibility='default' filepath='include/linux/mod_devicetable.h' line='803' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='driver_data' type-id='0791d6c8' visibility='default' filepath='include/linux/mod_devicetable.h' line='802' column='1'/> + <var-decl name='driver_data' type-id='0791d6c8' visibility='default' filepath='include/linux/mod_devicetable.h' line='804' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='17a13961' const='yes' id='2974aa72'/> @@ -120783,9 +120712,9 @@ <parameter type-id='ab7bbd67' name='attr' filepath='fs/attr.c' line='61' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='setattr_copy' mangled-name='setattr_copy' filepath='fs/attr.c' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='setattr_copy'> - <parameter type-id='7e666abe' name='inode' filepath='fs/attr.c' line='180' column='1'/> - <parameter type-id='5df17806' name='attr' filepath='fs/attr.c' line='180' column='1'/> + <function-decl name='setattr_copy' mangled-name='setattr_copy' filepath='fs/attr.c' line='178' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='setattr_copy'> + <parameter type-id='7e666abe' name='inode' filepath='fs/attr.c' line='178' column='1'/> + <parameter type-id='5df17806' name='attr' filepath='fs/attr.c' line='178' column='1'/> <return type-id='48b5725f'/> </function-decl> <class-decl name='iattr' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='226' column='1' id='a9ef191f'> @@ -120965,6 +120894,10 @@ <pointer-type-def type-id='4943c066' size-in-bits='64' id='c485c22c'/> <pointer-type-def type-id='c485c22c' size-in-bits='64' id='64906f72'/> <pointer-type-def type-id='4316c9c9' size-in-bits='64' id='05ca8778'/> + <function-decl name='__lock_buffer' mangled-name='__lock_buffer' filepath='fs/buffer.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lock_buffer'> + <parameter type-id='c485c22c' name='bh' filepath='fs/buffer.c' line='65' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='unlock_buffer' mangled-name='unlock_buffer' filepath='fs/buffer.c' line='71' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_buffer'> <parameter type-id='c485c22c' name='bh' filepath='fs/buffer.c' line='71' column='1'/> <return type-id='48b5725f'/> @@ -121077,10 +121010,6 @@ <parameter type-id='c485c22c' name='bh' filepath='fs/buffer.c' line='118' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__lock_buffer' mangled-name='__lock_buffer' filepath='fs/buffer.c' line='65' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lock_buffer'> - <parameter type-id='c485c22c' name='bh' filepath='fs/buffer.c' line='65' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='__getblk_gfp' mangled-name='__getblk_gfp' filepath='fs/buffer.c' line='1316' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__getblk_gfp'> <parameter type-id='b88dd945' name='bdev' filepath='fs/buffer.c' line='1316' column='1'/> <parameter type-id='a42536cd' name='block' filepath='fs/buffer.c' line='1316' column='1'/> @@ -121537,11 +121466,11 @@ <qualified-type-def type-id='8b6b6ef7' const='yes' id='f0f807bc'/> <pointer-type-def type-id='f0f807bc' size-in-bits='64' id='ec73f122'/> <pointer-type-def type-id='f01e85cf' size-in-bits='64' id='62fa2ea7'/> - <function-decl name='debugfs_create_x8' mangled-name='debugfs_create_x8' filepath='fs/debugfs/file.c' line='696' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_x8'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='696' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='696' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='697' column='1'/> - <parameter type-id='8bff8096' name='value' filepath='fs/debugfs/file.c' line='697' column='1'/> + <function-decl name='debugfs_create_x8' mangled-name='debugfs_create_x8' filepath='fs/debugfs/file.c' line='680' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_x8'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='680' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='680' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='681' column='1'/> + <parameter type-id='8bff8096' name='value' filepath='fs/debugfs/file.c' line='681' column='1'/> <return type-id='27675065'/> </function-decl> <function-decl name='debugfs_attr_read' mangled-name='debugfs_attr_read' filepath='fs/debugfs/file.c' line='365' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_attr_read'> @@ -121551,59 +121480,59 @@ <parameter type-id='b53e8dbb' name='ppos' filepath='fs/debugfs/file.c' line='366' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='debugfs_attr_write' mangled-name='debugfs_attr_write' filepath='fs/debugfs/file.c' line='397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_attr_write'> - <parameter type-id='77e79a4b' name='file' filepath='fs/debugfs/file.c' line='397' column='1'/> - <parameter type-id='80f4b756' name='buf' filepath='fs/debugfs/file.c' line='397' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='fs/debugfs/file.c' line='398' column='1'/> - <parameter type-id='b53e8dbb' name='ppos' filepath='fs/debugfs/file.c' line='398' column='1'/> + <function-decl name='debugfs_attr_write' mangled-name='debugfs_attr_write' filepath='fs/debugfs/file.c' line='380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_attr_write'> + <parameter type-id='77e79a4b' name='file' filepath='fs/debugfs/file.c' line='380' column='1'/> + <parameter type-id='80f4b756' name='buf' filepath='fs/debugfs/file.c' line='380' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='fs/debugfs/file.c' line='381' column='1'/> + <parameter type-id='b53e8dbb' name='ppos' filepath='fs/debugfs/file.c' line='381' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='debugfs_create_x32' mangled-name='debugfs_create_x32' filepath='fs/debugfs/file.c' line='732' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_x32'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='732' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='732' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='733' column='1'/> - <parameter type-id='f9409001' name='value' filepath='fs/debugfs/file.c' line='733' column='1'/> + <function-decl name='debugfs_create_x32' mangled-name='debugfs_create_x32' filepath='fs/debugfs/file.c' line='716' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_x32'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='716' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='716' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='717' column='1'/> + <parameter type-id='f9409001' name='value' filepath='fs/debugfs/file.c' line='717' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_create_u64' mangled-name='debugfs_create_u64' filepath='fs/debugfs/file.c' line='602' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_u64'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='602' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='602' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='603' column='1'/> - <parameter type-id='3df9fd28' name='value' filepath='fs/debugfs/file.c' line='603' column='1'/> + <function-decl name='debugfs_create_u64' mangled-name='debugfs_create_u64' filepath='fs/debugfs/file.c' line='586' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_u64'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='586' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='586' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='587' column='1'/> + <parameter type-id='3df9fd28' name='value' filepath='fs/debugfs/file.c' line='587' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_create_u32' mangled-name='debugfs_create_u32' filepath='fs/debugfs/file.c' line='556' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_u32'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='556' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='556' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='557' column='1'/> - <parameter type-id='f9409001' name='value' filepath='fs/debugfs/file.c' line='557' column='1'/> + <function-decl name='debugfs_create_u32' mangled-name='debugfs_create_u32' filepath='fs/debugfs/file.c' line='540' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_u32'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='540' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='540' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='541' column='1'/> + <parameter type-id='f9409001' name='value' filepath='fs/debugfs/file.c' line='541' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_create_size_t' mangled-name='debugfs_create_size_t' filepath='fs/debugfs/file.c' line='784' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_size_t'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='784' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='784' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='785' column='1'/> - <parameter type-id='78c01427' name='value' filepath='fs/debugfs/file.c' line='785' column='1'/> + <function-decl name='debugfs_create_size_t' mangled-name='debugfs_create_size_t' filepath='fs/debugfs/file.c' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_size_t'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='768' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='768' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='769' column='1'/> + <parameter type-id='78c01427' name='value' filepath='fs/debugfs/file.c' line='769' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_create_regset32' mangled-name='debugfs_create_regset32' filepath='fs/debugfs/file.c' line='1162' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_regset32'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='1162' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='1162' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='1163' column='1'/> - <parameter type-id='62fa2ea7' name='regset' filepath='fs/debugfs/file.c' line='1164' column='1'/> + <function-decl name='debugfs_create_regset32' mangled-name='debugfs_create_regset32' filepath='fs/debugfs/file.c' line='1146' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_regset32'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='1146' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='1146' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='1147' column='1'/> + <parameter type-id='62fa2ea7' name='regset' filepath='fs/debugfs/file.c' line='1148' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_create_bool' mangled-name='debugfs_create_bool' filepath='fs/debugfs/file.c' line='917' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_bool'> - <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='917' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='917' column='1'/> - <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='918' column='1'/> - <parameter type-id='d8e6b335' name='value' filepath='fs/debugfs/file.c' line='918' column='1'/> + <function-decl name='debugfs_create_bool' mangled-name='debugfs_create_bool' filepath='fs/debugfs/file.c' line='901' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_bool'> + <parameter type-id='80f4b756' name='name' filepath='fs/debugfs/file.c' line='901' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/debugfs/file.c' line='901' column='1'/> + <parameter type-id='27675065' name='parent' filepath='fs/debugfs/file.c' line='902' column='1'/> + <parameter type-id='d8e6b335' name='value' filepath='fs/debugfs/file.c' line='902' column='1'/> <return type-id='27675065'/> </function-decl> </abi-instr> <abi-instr address-size='64' path='fs/debugfs/inode.c' language='LANG_C89'> - <function-decl name='debugfs_remove_recursive' mangled-name='debugfs_remove_recursive' filepath='fs/debugfs/inode.c' line='780' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_remove_recursive'> - <parameter type-id='27675065' name='dentry' filepath='fs/debugfs/inode.c' line='780' column='1'/> + <function-decl name='debugfs_remove_recursive' mangled-name='debugfs_remove_recursive' filepath='fs/debugfs/inode.c' line='758' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_remove_recursive'> + <parameter type-id='27675065' name='dentry' filepath='fs/debugfs/inode.c' line='758' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='debugfs_create_dir' mangled-name='debugfs_create_dir' filepath='fs/debugfs/inode.c' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_dir'> @@ -121611,11 +121540,11 @@ <parameter type-id='27675065' name='parent' filepath='fs/debugfs/inode.c' line='550' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_rename' mangled-name='debugfs_rename' filepath='fs/debugfs/inode.c' line='859' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_rename'> - <parameter type-id='27675065' name='old_dir' filepath='fs/debugfs/inode.c' line='859' column='1'/> - <parameter type-id='27675065' name='old_dentry' filepath='fs/debugfs/inode.c' line='859' column='1'/> - <parameter type-id='27675065' name='new_dir' filepath='fs/debugfs/inode.c' line='860' column='1'/> - <parameter type-id='80f4b756' name='new_name' filepath='fs/debugfs/inode.c' line='860' column='1'/> + <function-decl name='debugfs_rename' mangled-name='debugfs_rename' filepath='fs/debugfs/inode.c' line='837' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_rename'> + <parameter type-id='27675065' name='old_dir' filepath='fs/debugfs/inode.c' line='837' column='1'/> + <parameter type-id='27675065' name='old_dentry' filepath='fs/debugfs/inode.c' line='837' column='1'/> + <parameter type-id='27675065' name='new_dir' filepath='fs/debugfs/inode.c' line='838' column='1'/> + <parameter type-id='80f4b756' name='new_name' filepath='fs/debugfs/inode.c' line='838' column='1'/> <return type-id='27675065'/> </function-decl> <function-decl name='debugfs_remove' mangled-name='debugfs_remove' filepath='fs/debugfs/inode.c' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_remove'> @@ -121627,7 +121556,7 @@ <parameter type-id='27675065' name='parent' filepath='fs/debugfs/inode.c' line='292' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='debugfs_initialized' mangled-name='debugfs_initialized' filepath='fs/debugfs/inode.c' line='915' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_initialized'> + <function-decl name='debugfs_initialized' mangled-name='debugfs_initialized' filepath='fs/debugfs/inode.c' line='893' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_initialized'> <return type-id='b50a4934'/> </function-decl> <function-decl name='debugfs_create_symlink' mangled-name='debugfs_create_symlink' filepath='fs/debugfs/inode.c' line='643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='debugfs_create_symlink'> @@ -121655,7 +121584,7 @@ </abi-instr> <abi-instr address-size='64' path='fs/direct-io.c' language='LANG_C89'> <typedef-decl name='dio_iodone_t' type-id='7702511a' filepath='include/linux/fs.h' line='94' column='1' id='4904ecea'/> - <typedef-decl name='dio_submit_t' type-id='6d229cce' filepath='include/linux/fs.h' line='3263' column='1' id='27d499b2'/> + <typedef-decl name='dio_submit_t' type-id='6d229cce' filepath='include/linux/fs.h' line='3258' column='1' id='27d499b2'/> <pointer-type-def type-id='4904ecea' size-in-bits='64' id='f0934dcb'/> <pointer-type-def type-id='27d499b2' size-in-bits='64' id='13e0bcaf'/> <function-decl name='__blockdev_direct_IO' mangled-name='__blockdev_direct_IO' filepath='fs/direct-io.c' line='1408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__blockdev_direct_IO'> @@ -121900,19 +121829,19 @@ <parameter type-id='f0981eeb' name='fd' filepath='fs/file.c' line='557' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='iterate_fd' mangled-name='iterate_fd' filepath='fs/file.c' line='1042' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterate_fd'> - <parameter type-id='16c53416' name='files' filepath='fs/file.c' line='1042' column='1'/> - <parameter type-id='f0981eeb' name='n' filepath='fs/file.c' line='1042' column='1'/> - <parameter type-id='d092647b' name='f' filepath='fs/file.c' line='1043' column='1'/> - <parameter type-id='eaa32e2f' name='p' filepath='fs/file.c' line='1044' column='1'/> + <function-decl name='iterate_fd' mangled-name='iterate_fd' filepath='fs/file.c' line='1041' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iterate_fd'> + <parameter type-id='16c53416' name='files' filepath='fs/file.c' line='1041' column='1'/> + <parameter type-id='f0981eeb' name='n' filepath='fs/file.c' line='1041' column='1'/> + <parameter type-id='d092647b' name='f' filepath='fs/file.c' line='1042' column='1'/> + <parameter type-id='eaa32e2f' name='p' filepath='fs/file.c' line='1043' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='get_unused_fd_flags' mangled-name='get_unused_fd_flags' filepath='fs/file.c' line='543' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_unused_fd_flags'> <parameter type-id='f0981eeb' name='flags' filepath='fs/file.c' line='543' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='fget' mangled-name='fget' filepath='fs/file.c' line='783' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fget'> - <parameter type-id='f0981eeb' name='fd' filepath='fs/file.c' line='783' column='1'/> + <function-decl name='fget' mangled-name='fget' filepath='fs/file.c' line='782' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fget'> + <parameter type-id='f0981eeb' name='fd' filepath='fs/file.c' line='782' column='1'/> <return type-id='77e79a4b'/> </function-decl> <function-decl name='fd_install' mangled-name='fd_install' filepath='fs/file.c' line='611' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='fd_install'> @@ -122155,103 +122084,103 @@ <typedef-decl name='ino_t' type-id='4e22818f' filepath='include/linux/types.h' line='17' column='1' id='2aa75eef'/> <typedef-decl name='__kernel_ino_t' type-id='447da2ae' filepath='include/uapi/asm-generic/posix_types.h' line='20' column='1' id='4e22818f'/> <pointer-type-def type-id='805f2c4a' size-in-bits='64' id='1b7a05dc'/> - <function-decl name='get_next_ino' mangled-name='get_next_ino' filepath='fs/inode.c' line='891' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_next_ino'> + <function-decl name='get_next_ino' mangled-name='get_next_ino' filepath='fs/inode.c' line='892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_next_ino'> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='iunique' mangled-name='iunique' filepath='fs/inode.c' line='1272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iunique'> - <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1272' column='1'/> - <parameter type-id='2aa75eef' name='max_reserved' filepath='fs/inode.c' line='1272' column='1'/> + <function-decl name='iunique' mangled-name='iunique' filepath='fs/inode.c' line='1273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iunique'> + <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1273' column='1'/> + <parameter type-id='2aa75eef' name='max_reserved' filepath='fs/inode.c' line='1273' column='1'/> <return type-id='2aa75eef'/> </function-decl> - <function-decl name='iput' mangled-name='iput' filepath='fs/inode.c' line='1583' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iput'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1583' column='1'/> + <function-decl name='iput' mangled-name='iput' filepath='fs/inode.c' line='1584' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iput'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1584' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='new_inode' mangled-name='new_inode' filepath='fs/inode.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='new_inode'> - <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='950' column='1'/> + <function-decl name='new_inode' mangled-name='new_inode' filepath='fs/inode.c' line='951' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='new_inode'> + <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='951' column='1'/> <return type-id='7e666abe'/> </function-decl> - <function-decl name='current_time' mangled-name='current_time' filepath='fs/inode.c' line='2227' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='current_time'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2227' column='1'/> + <function-decl name='current_time' mangled-name='current_time' filepath='fs/inode.c' line='2228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='current_time'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2228' column='1'/> <return type-id='40a816ad'/> </function-decl> - <function-decl name='igrab' mangled-name='igrab' filepath='fs/inode.c' line='1295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='igrab'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1295' column='1'/> + <function-decl name='igrab' mangled-name='igrab' filepath='fs/inode.c' line='1296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='igrab'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1296' column='1'/> <return type-id='7e666abe'/> </function-decl> - <function-decl name='clear_inode' mangled-name='clear_inode' filepath='fs/inode.c' line='521' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clear_inode'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='521' column='1'/> + <function-decl name='clear_inode' mangled-name='clear_inode' filepath='fs/inode.c' line='522' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clear_inode'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='522' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__insert_inode_hash' mangled-name='__insert_inode_hash' filepath='fs/inode.c' line='493' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__insert_inode_hash'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='493' column='1'/> - <parameter type-id='7359adad' name='hashval' filepath='fs/inode.c' line='493' column='1'/> + <function-decl name='__insert_inode_hash' mangled-name='__insert_inode_hash' filepath='fs/inode.c' line='494' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__insert_inode_hash'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='494' column='1'/> + <parameter type-id='7359adad' name='hashval' filepath='fs/inode.c' line='494' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='unlock_new_inode' mangled-name='unlock_new_inode' filepath='fs/inode.c' line='991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_new_inode'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='991' column='1'/> + <function-decl name='unlock_new_inode' mangled-name='unlock_new_inode' filepath='fs/inode.c' line='992' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unlock_new_inode'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='992' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='set_nlink' mangled-name='set_nlink' filepath='fs/inode.c' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_nlink'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='334' column='1'/> - <parameter type-id='f0981eeb' name='nlink' filepath='fs/inode.c' line='334' column='1'/> + <function-decl name='set_nlink' mangled-name='set_nlink' filepath='fs/inode.c' line='335' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_nlink'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='335' column='1'/> + <parameter type-id='f0981eeb' name='nlink' filepath='fs/inode.c' line='335' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='inode_nohighmem' mangled-name='inode_nohighmem' filepath='fs/inode.c' line='2156' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inode_nohighmem'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2156' column='1'/> + <function-decl name='inode_nohighmem' mangled-name='inode_nohighmem' filepath='fs/inode.c' line='2157' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inode_nohighmem'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2157' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='inode_init_once' mangled-name='inode_init_once' filepath='fs/inode.c' line='388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inode_init_once'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='388' column='1'/> + <function-decl name='inode_init_once' mangled-name='inode_init_once' filepath='fs/inode.c' line='389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inode_init_once'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='389' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='init_special_inode' mangled-name='init_special_inode' filepath='fs/inode.c' line='2032' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='init_special_inode'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2032' column='1'/> - <parameter type-id='2594b00f' name='mode' filepath='fs/inode.c' line='2032' column='1'/> - <parameter type-id='8504f260' name='rdev' filepath='fs/inode.c' line='2032' column='1'/> + <function-decl name='init_special_inode' mangled-name='init_special_inode' filepath='fs/inode.c' line='2033' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='init_special_inode'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='2033' column='1'/> + <parameter type-id='2594b00f' name='mode' filepath='fs/inode.c' line='2033' column='1'/> + <parameter type-id='8504f260' name='rdev' filepath='fs/inode.c' line='2033' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='inc_nlink' mangled-name='inc_nlink' filepath='fs/inode.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inc_nlink'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='356' column='1'/> + <function-decl name='inc_nlink' mangled-name='inc_nlink' filepath='fs/inode.c' line='357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='inc_nlink'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='357' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ilookup' mangled-name='ilookup' filepath='fs/inode.c' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ilookup'> - <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1386' column='1'/> - <parameter type-id='7359adad' name='ino' filepath='fs/inode.c' line='1386' column='1'/> + <function-decl name='ilookup' mangled-name='ilookup' filepath='fs/inode.c' line='1387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ilookup'> + <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1387' column='1'/> + <parameter type-id='7359adad' name='ino' filepath='fs/inode.c' line='1387' column='1'/> <return type-id='7e666abe'/> </function-decl> - <function-decl name='ihold' mangled-name='ihold' filepath='fs/inode.c' line='419' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ihold'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='419' column='1'/> + <function-decl name='ihold' mangled-name='ihold' filepath='fs/inode.c' line='420' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ihold'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='420' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='iget_locked' mangled-name='iget_locked' filepath='fs/inode.c' line='1173' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iget_locked'> - <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1173' column='1'/> - <parameter type-id='7359adad' name='ino' filepath='fs/inode.c' line='1173' column='1'/> + <function-decl name='iget_locked' mangled-name='iget_locked' filepath='fs/inode.c' line='1174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iget_locked'> + <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1174' column='1'/> + <parameter type-id='7359adad' name='ino' filepath='fs/inode.c' line='1174' column='1'/> <return type-id='7e666abe'/> </function-decl> - <function-decl name='iget5_locked' mangled-name='iget5_locked' filepath='fs/inode.c' line='1140' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iget5_locked'> - <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1140' column='1'/> - <parameter type-id='7359adad' name='hashval' filepath='fs/inode.c' line='1140' column='1'/> - <parameter type-id='1b7a05dc' name='test' filepath='fs/inode.c' line='1141' column='1'/> - <parameter type-id='1b7a05dc' name='set' filepath='fs/inode.c' line='1142' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='fs/inode.c' line='1142' column='1'/> + <function-decl name='iget5_locked' mangled-name='iget5_locked' filepath='fs/inode.c' line='1141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iget5_locked'> + <parameter type-id='42c8f564' name='sb' filepath='fs/inode.c' line='1141' column='1'/> + <parameter type-id='7359adad' name='hashval' filepath='fs/inode.c' line='1141' column='1'/> + <parameter type-id='1b7a05dc' name='test' filepath='fs/inode.c' line='1142' column='1'/> + <parameter type-id='1b7a05dc' name='set' filepath='fs/inode.c' line='1143' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='fs/inode.c' line='1143' column='1'/> <return type-id='7e666abe'/> </function-decl> - <function-decl name='drop_nlink' mangled-name='drop_nlink' filepath='fs/inode.c' line='300' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drop_nlink'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='300' column='1'/> + <function-decl name='drop_nlink' mangled-name='drop_nlink' filepath='fs/inode.c' line='301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drop_nlink'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='301' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='clear_nlink' mangled-name='clear_nlink' filepath='fs/inode.c' line='317' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clear_nlink'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='317' column='1'/> + <function-decl name='clear_nlink' mangled-name='clear_nlink' filepath='fs/inode.c' line='318' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='clear_nlink'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='318' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bmap' mangled-name='bmap' filepath='fs/inode.c' line='1617' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bmap'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1617' column='1'/> - <parameter type-id='5c39fc92' name='block' filepath='fs/inode.c' line='1617' column='1'/> + <function-decl name='bmap' mangled-name='bmap' filepath='fs/inode.c' line='1618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bmap'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='1618' column='1'/> + <parameter type-id='5c39fc92' name='block' filepath='fs/inode.c' line='1618' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__remove_inode_hash' mangled-name='__remove_inode_hash' filepath='fs/inode.c' line='511' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__remove_inode_hash'> - <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='511' column='1'/> + <function-decl name='__remove_inode_hash' mangled-name='__remove_inode_hash' filepath='fs/inode.c' line='512' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__remove_inode_hash'> + <parameter type-id='7e666abe' name='inode' filepath='fs/inode.c' line='512' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-type size-in-bits='64' id='805f2c4a'> @@ -122291,15 +122220,15 @@ <array-type-def dimensions='1' type-id='bd54fe1a' size-in-bits='256' id='5d4602e8'> <subrange length='4' type-id='7ff19f0f' id='16fe7105'/> </array-type-def> - <class-decl name='tree_descr' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='3442' column='1' id='3f4c2b2f'> + <class-decl name='tree_descr' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='3437' column='1' id='3f4c2b2f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='3442' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='3437' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ops' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='3442' column='1'/> + <var-decl name='ops' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='3437' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='3442' column='1'/> + <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='3437' column='1'/> </data-member> </class-decl> <class-decl name='pseudo_fs_context' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/pseudo_fs.h' line='6' column='1' id='01ded187'> @@ -122331,8 +122260,8 @@ <parameter type-id='80f4b756' name='fmt' filepath='fs/libfs.c' line='822' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='alloc_anon_inode' mangled-name='alloc_anon_inode' filepath='fs/libfs.c' line='1163' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_anon_inode'> - <parameter type-id='42c8f564' name='s' filepath='fs/libfs.c' line='1163' column='1'/> + <function-decl name='alloc_anon_inode' mangled-name='alloc_anon_inode' filepath='fs/libfs.c' line='1147' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_anon_inode'> + <parameter type-id='42c8f564' name='s' filepath='fs/libfs.c' line='1147' column='1'/> <return type-id='7e666abe'/> </function-decl> <function-decl name='simple_fill_super' mangled-name='simple_fill_super' filepath='fs/libfs.c' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_fill_super'> @@ -122378,10 +122307,10 @@ <parameter type-id='77e79a4b' name='file' filepath='fs/libfs.c' line='315' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='simple_get_link' mangled-name='simple_get_link' filepath='fs/libfs.c' line='1224' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_get_link'> - <parameter type-id='27675065' name='dentry' filepath='fs/libfs.c' line='1224' column='1'/> - <parameter type-id='7e666abe' name='inode' filepath='fs/libfs.c' line='1224' column='1'/> - <parameter type-id='26cad514' name='done' filepath='fs/libfs.c' line='1225' column='1'/> + <function-decl name='simple_get_link' mangled-name='simple_get_link' filepath='fs/libfs.c' line='1208' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_get_link'> + <parameter type-id='27675065' name='dentry' filepath='fs/libfs.c' line='1208' column='1'/> + <parameter type-id='7e666abe' name='inode' filepath='fs/libfs.c' line='1208' column='1'/> + <parameter type-id='26cad514' name='done' filepath='fs/libfs.c' line='1209' column='1'/> <return type-id='80f4b756'/> </function-decl> <function-decl name='generic_read_dir' mangled-name='generic_read_dir' filepath='fs/libfs.c' line='223' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_read_dir'> @@ -122391,11 +122320,11 @@ <parameter type-id='b53e8dbb' name='ppos' filepath='fs/libfs.c' line='223' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='simple_attr_write' mangled-name='simple_attr_write' filepath='fs/libfs.c' line='924' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_attr_write'> - <parameter type-id='77e79a4b' name='file' filepath='fs/libfs.c' line='924' column='1'/> - <parameter type-id='80f4b756' name='buf' filepath='fs/libfs.c' line='924' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='fs/libfs.c' line='925' column='1'/> - <parameter type-id='b53e8dbb' name='ppos' filepath='fs/libfs.c' line='925' column='1'/> + <function-decl name='simple_attr_write' mangled-name='simple_attr_write' filepath='fs/libfs.c' line='888' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_attr_write'> + <parameter type-id='77e79a4b' name='file' filepath='fs/libfs.c' line='888' column='1'/> + <parameter type-id='80f4b756' name='buf' filepath='fs/libfs.c' line='888' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='fs/libfs.c' line='889' column='1'/> + <parameter type-id='b53e8dbb' name='ppos' filepath='fs/libfs.c' line='889' column='1'/> <return type-id='79a0948f'/> </function-decl> <function-decl name='simple_attr_release' mangled-name='simple_attr_release' filepath='fs/libfs.c' line='842' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_attr_release'> @@ -122423,27 +122352,27 @@ <parameter type-id='7359adad' name='magic' filepath='fs/libfs.c' line='299' column='1'/> <return type-id='79f85ebf'/> </function-decl> - <function-decl name='generic_file_fsync' mangled-name='generic_file_fsync' filepath='fs/libfs.c' line='1057' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_file_fsync'> - <parameter type-id='77e79a4b' name='file' filepath='fs/libfs.c' line='1057' column='1'/> - <parameter type-id='69bf7bee' name='start' filepath='fs/libfs.c' line='1057' column='1'/> - <parameter type-id='69bf7bee' name='end' filepath='fs/libfs.c' line='1057' column='1'/> - <parameter type-id='95e97e5e' name='datasync' filepath='fs/libfs.c' line='1058' column='1'/> + <function-decl name='generic_file_fsync' mangled-name='generic_file_fsync' filepath='fs/libfs.c' line='1041' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_file_fsync'> + <parameter type-id='77e79a4b' name='file' filepath='fs/libfs.c' line='1041' column='1'/> + <parameter type-id='69bf7bee' name='start' filepath='fs/libfs.c' line='1041' column='1'/> + <parameter type-id='69bf7bee' name='end' filepath='fs/libfs.c' line='1041' column='1'/> + <parameter type-id='95e97e5e' name='datasync' filepath='fs/libfs.c' line='1042' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='generic_fh_to_parent' mangled-name='generic_fh_to_parent' filepath='fs/libfs.c' line='983' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_fh_to_parent'> - <parameter type-id='42c8f564' name='sb' filepath='fs/libfs.c' line='983' column='1'/> - <parameter type-id='f7d748c2' name='fid' filepath='fs/libfs.c' line='983' column='1'/> - <parameter type-id='95e97e5e' name='fh_len' filepath='fs/libfs.c' line='984' column='1'/> - <parameter type-id='95e97e5e' name='fh_type' filepath='fs/libfs.c' line='984' column='1'/> - <parameter type-id='14a7c87f' name='get_inode' filepath='fs/libfs.c' line='984' column='1'/> + <function-decl name='generic_fh_to_parent' mangled-name='generic_fh_to_parent' filepath='fs/libfs.c' line='967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_fh_to_parent'> + <parameter type-id='42c8f564' name='sb' filepath='fs/libfs.c' line='967' column='1'/> + <parameter type-id='f7d748c2' name='fid' filepath='fs/libfs.c' line='967' column='1'/> + <parameter type-id='95e97e5e' name='fh_len' filepath='fs/libfs.c' line='968' column='1'/> + <parameter type-id='95e97e5e' name='fh_type' filepath='fs/libfs.c' line='968' column='1'/> + <parameter type-id='14a7c87f' name='get_inode' filepath='fs/libfs.c' line='968' column='1'/> <return type-id='27675065'/> </function-decl> - <function-decl name='generic_fh_to_dentry' mangled-name='generic_fh_to_dentry' filepath='fs/libfs.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_fh_to_dentry'> - <parameter type-id='42c8f564' name='sb' filepath='fs/libfs.c' line='950' column='1'/> - <parameter type-id='f7d748c2' name='fid' filepath='fs/libfs.c' line='950' column='1'/> - <parameter type-id='95e97e5e' name='fh_len' filepath='fs/libfs.c' line='951' column='1'/> - <parameter type-id='95e97e5e' name='fh_type' filepath='fs/libfs.c' line='951' column='1'/> - <parameter type-id='14a7c87f' name='get_inode' filepath='fs/libfs.c' line='951' column='1'/> + <function-decl name='generic_fh_to_dentry' mangled-name='generic_fh_to_dentry' filepath='fs/libfs.c' line='934' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_fh_to_dentry'> + <parameter type-id='42c8f564' name='sb' filepath='fs/libfs.c' line='934' column='1'/> + <parameter type-id='f7d748c2' name='fid' filepath='fs/libfs.c' line='934' column='1'/> + <parameter type-id='95e97e5e' name='fh_len' filepath='fs/libfs.c' line='935' column='1'/> + <parameter type-id='95e97e5e' name='fh_type' filepath='fs/libfs.c' line='935' column='1'/> + <parameter type-id='14a7c87f' name='get_inode' filepath='fs/libfs.c' line='935' column='1'/> <return type-id='27675065'/> </function-decl> <pointer-type-def type-id='f1fbc58e' size-in-bits='64' id='26cad514'/> @@ -122605,10 +122534,10 @@ <var-decl name='e_gid' type-id='094d8048' visibility='default' filepath='include/linux/posix_acl.h' line='23' column='1'/> </data-member> </union-decl> - <function-decl name='page_get_link' mangled-name='page_get_link' filepath='fs/namei.c' line='4853' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='page_get_link'> - <parameter type-id='27675065' name='dentry' filepath='fs/namei.c' line='4853' column='1'/> - <parameter type-id='7e666abe' name='inode' filepath='fs/namei.c' line='4853' column='1'/> - <parameter type-id='26cad514' name='callback' filepath='fs/namei.c' line='4854' column='1'/> + <function-decl name='page_get_link' mangled-name='page_get_link' filepath='fs/namei.c' line='4851' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='page_get_link'> + <parameter type-id='27675065' name='dentry' filepath='fs/namei.c' line='4851' column='1'/> + <parameter type-id='7e666abe' name='inode' filepath='fs/namei.c' line='4851' column='1'/> + <parameter type-id='26cad514' name='callback' filepath='fs/namei.c' line='4852' column='1'/> <return type-id='80f4b756'/> </function-decl> <function-decl name='lookup_one_len' mangled-name='lookup_one_len' filepath='fs/namei.c' line='2605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lookup_one_len'> @@ -122783,7 +122712,7 @@ <return type-id='77e79a4b'/> </function-decl> <pointer-type-def type-id='5251a03b' size-in-bits='64' id='a77efac3'/> - <typedef-decl name='fl_owner_t' type-id='eaa32e2f' filepath='include/linux/fs.h' line='1062' column='1' id='bc5666d5'/> + <typedef-decl name='fl_owner_t' type-id='eaa32e2f' filepath='include/linux/fs.h' line='1057' column='1' id='bc5666d5'/> <qualified-type-def type-id='b5382ece' const='yes' id='5251a03b'/> </abi-instr> <abi-instr address-size='64' path='fs/pipe.c' language='LANG_C89'> @@ -122904,12 +122833,12 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='fs/proc/proc_sysctl.c' language='LANG_C89'> - <function-decl name='register_sysctl_table' mangled-name='register_sysctl_table' filepath='fs/proc/proc_sysctl.c' line='1638' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_sysctl_table'> - <parameter type-id='631dc3c1' name='table' filepath='fs/proc/proc_sysctl.c' line='1638' column='1'/> + <function-decl name='register_sysctl_table' mangled-name='register_sysctl_table' filepath='fs/proc/proc_sysctl.c' line='1605' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_sysctl_table'> + <parameter type-id='631dc3c1' name='table' filepath='fs/proc/proc_sysctl.c' line='1605' column='1'/> <return type-id='11b101bb'/> </function-decl> - <function-decl name='unregister_sysctl_table' mangled-name='unregister_sysctl_table' filepath='fs/proc/proc_sysctl.c' line='1706' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_sysctl_table'> - <parameter type-id='11b101bb' name='header' filepath='fs/proc/proc_sysctl.c' line='1706' column='1'/> + <function-decl name='unregister_sysctl_table' mangled-name='unregister_sysctl_table' filepath='fs/proc/proc_sysctl.c' line='1673' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_sysctl_table'> + <parameter type-id='11b101bb' name='header' filepath='fs/proc/proc_sysctl.c' line='1673' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -123257,21 +123186,21 @@ <var-decl name='file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs_context.h' line='71' column='1'/> </data-member> </union-decl> - <class-decl name='filename' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2609' column='1' id='63fc6210'> + <class-decl name='filename' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2604' column='1' id='63fc6210'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2610' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='uptr' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2611' column='1'/> + <var-decl name='uptr' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='refcnt' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2612' column='1'/> + <var-decl name='refcnt' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2607' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='aname' type-id='5acb442f' visibility='default' filepath='include/linux/fs.h' line='2613' column='1'/> + <var-decl name='aname' type-id='5acb442f' visibility='default' filepath='include/linux/fs.h' line='2608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='iname' type-id='0904d1cc' visibility='default' filepath='include/linux/fs.h' line='2614' column='1'/> + <var-decl name='iname' type-id='0904d1cc' visibility='default' filepath='include/linux/fs.h' line='2609' column='1'/> </data-member> </class-decl> <class-decl name='fc_log' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/linux/fs_context.h' line='179' column='1' id='fb4c7dfb'> @@ -123447,12 +123376,6 @@ <pointer-type-def type-id='cb71e1ad' size-in-bits='64' id='cb460785'/> <qualified-type-def type-id='d83a2db1' const='yes' id='dbce337a'/> <pointer-type-def type-id='dbce337a' size-in-bits='64' id='559ac6f0'/> - <function-decl name='sysfs_add_file_to_group' mangled-name='sysfs_add_file_to_group' filepath='fs/sysfs/file.c' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_add_file_to_group'> - <parameter type-id='d30bdc51' name='kobj' filepath='fs/sysfs/file.c' line='358' column='1'/> - <parameter type-id='cfe4f8a2' name='attr' filepath='fs/sysfs/file.c' line='359' column='1'/> - <parameter type-id='80f4b756' name='group' filepath='fs/sysfs/file.c' line='359' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='sysfs_create_file_ns' mangled-name='sysfs_create_file_ns' filepath='fs/sysfs/file.c' line='322' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_create_file_ns'> <parameter type-id='d30bdc51' name='kobj' filepath='fs/sysfs/file.c' line='322' column='1'/> <parameter type-id='cfe4f8a2' name='attr' filepath='fs/sysfs/file.c' line='322' column='1'/> @@ -123497,6 +123420,12 @@ <parameter type-id='cb460785' name='ptr' filepath='fs/sysfs/file.c' line='338' column='1'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='sysfs_add_file_to_group' mangled-name='sysfs_add_file_to_group' filepath='fs/sysfs/file.c' line='358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_add_file_to_group'> + <parameter type-id='d30bdc51' name='kobj' filepath='fs/sysfs/file.c' line='358' column='1'/> + <parameter type-id='cfe4f8a2' name='attr' filepath='fs/sysfs/file.c' line='359' column='1'/> + <parameter type-id='80f4b756' name='group' filepath='fs/sysfs/file.c' line='359' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> </abi-instr> <abi-instr address-size='64' path='fs/sysfs/group.c' language='LANG_C89'> <function-decl name='sysfs_remove_group' mangled-name='sysfs_remove_group' filepath='fs/sysfs/group.c' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_remove_group'> @@ -123597,7 +123526,7 @@ <array-type-def dimensions='1' type-id='a84c031d' size-in-bits='infinite' id='e84913bd'> <subrange length='infinite' type-id='7ff19f0f' id='031f2035'/> </array-type-def> - <class-decl name='anon_vma' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/rmap.h' line='29' column='1' id='14f332cc'> + <class-decl name='anon_vma' size-in-bits='704' is-struct='yes' visibility='default' filepath='include/linux/rmap.h' line='29' column='1' id='14f332cc'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='root' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='30' column='1'/> </data-member> @@ -123608,19 +123537,13 @@ <var-decl name='refcount' type-id='49178f86' visibility='default' filepath='include/linux/rmap.h' line='39' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='480'> - <var-decl name='degree' type-id='f0981eeb' visibility='default' filepath='include/linux/rmap.h' line='41' column='1'/> + <var-decl name='degree' type-id='f0981eeb' visibility='default' filepath='include/linux/rmap.h' line='47' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='parent' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='43' column='1'/> + <var-decl name='parent' type-id='a8f86cda' visibility='default' filepath='include/linux/rmap.h' line='49' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='rb_root' type-id='6fe1603d' visibility='default' filepath='include/linux/rmap.h' line='55' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='num_children' type-id='7359adad' visibility='default' filepath='include/linux/rmap.h' line='70' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='num_active_vmas' type-id='7359adad' visibility='default' filepath='include/linux/rmap.h' line='72' column='1'/> + <var-decl name='rb_root' type-id='6fe1603d' visibility='default' filepath='include/linux/rmap.h' line='61' column='1'/> </data-member> </class-decl> <class-decl name='assoc_array_ptr' is-struct='yes' visibility='default' is-declaration-only='yes' id='3249e303'/> @@ -125046,417 +124969,417 @@ <var-decl name='primary_key' type-id='29c3368c' visibility='default' filepath='include/net/neighbour.h' line='166' column='1'/> </data-member> </class-decl> - <class-decl name='net_device' size-in-bits='19456' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1825' column='1' id='5a9929eb'> + <class-decl name='net_device' size-in-bits='19456' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='1823' column='1' id='5a9929eb'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/linux/netdevice.h' line='1826' column='1'/> + <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/linux/netdevice.h' line='1824' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='name_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='1827' column='1'/> + <var-decl name='name_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='1825' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='ifalias' type-id='d81cf24c' visibility='default' filepath='include/linux/netdevice.h' line='1828' column='1'/> + <var-decl name='ifalias' type-id='d81cf24c' visibility='default' filepath='include/linux/netdevice.h' line='1826' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='mem_end' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1833' column='1'/> + <var-decl name='mem_end' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1831' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='mem_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1834' column='1'/> + <var-decl name='mem_start' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1832' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='base_addr' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1835' column='1'/> + <var-decl name='base_addr' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1833' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1836' column='1'/> + <var-decl name='irq' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1834' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1844' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1842' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1846' column='1'/> + <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1844' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='napi_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1847' column='1'/> + <var-decl name='napi_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1845' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='unreg_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1848' column='1'/> + <var-decl name='unreg_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1846' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='close_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1849' column='1'/> + <var-decl name='close_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1847' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='ptype_all' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1850' column='1'/> + <var-decl name='ptype_all' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1848' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='ptype_specific' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1851' column='1'/> + <var-decl name='ptype_specific' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='1849' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='adj_list' type-id='19245258' visibility='default' filepath='include/linux/netdevice.h' line='1856' column='1'/> + <var-decl name='adj_list' type-id='19245258' visibility='default' filepath='include/linux/netdevice.h' line='1854' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1858' column='1'/> + <var-decl name='features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1856' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='hw_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1859' column='1'/> + <var-decl name='hw_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1857' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='wanted_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1860' column='1'/> + <var-decl name='wanted_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1858' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='vlan_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1861' column='1'/> + <var-decl name='vlan_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1859' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='hw_enc_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1862' column='1'/> + <var-decl name='hw_enc_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1860' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='mpls_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1863' column='1'/> + <var-decl name='mpls_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1861' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='gso_partial_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1864' column='1'/> + <var-decl name='gso_partial_features' type-id='f9f4b16f' visibility='default' filepath='include/linux/netdevice.h' line='1862' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='ifindex' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1866' column='1'/> + <var-decl name='ifindex' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1864' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2144'> - <var-decl name='group' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1867' column='1'/> + <var-decl name='group' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='1865' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='stats' type-id='a3566137' visibility='default' filepath='include/linux/netdevice.h' line='1869' column='1'/> + <var-decl name='stats' type-id='a3566137' visibility='default' filepath='include/linux/netdevice.h' line='1867' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3648'> - <var-decl name='rx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1871' column='1'/> + <var-decl name='rx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1869' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3712'> - <var-decl name='tx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1872' column='1'/> + <var-decl name='tx_dropped' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3776'> - <var-decl name='rx_nohandler' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1873' column='1'/> + <var-decl name='rx_nohandler' type-id='f22a8abb' visibility='default' filepath='include/linux/netdevice.h' line='1871' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3840'> - <var-decl name='carrier_up_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1876' column='1'/> + <var-decl name='carrier_up_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1874' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3872'> - <var-decl name='carrier_down_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1877' column='1'/> + <var-decl name='carrier_down_count' type-id='49178f86' visibility='default' filepath='include/linux/netdevice.h' line='1875' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3904'> - <var-decl name='wireless_handlers' type-id='3e2bb973' visibility='default' filepath='include/linux/netdevice.h' line='1880' column='1'/> + <var-decl name='wireless_handlers' type-id='3e2bb973' visibility='default' filepath='include/linux/netdevice.h' line='1878' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3968'> - <var-decl name='wireless_data' type-id='e40f7bda' visibility='default' filepath='include/linux/netdevice.h' line='1881' column='1'/> + <var-decl name='wireless_data' type-id='e40f7bda' visibility='default' filepath='include/linux/netdevice.h' line='1879' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4032'> - <var-decl name='netdev_ops' type-id='a84ec761' visibility='default' filepath='include/linux/netdevice.h' line='1883' column='1'/> + <var-decl name='netdev_ops' type-id='a84ec761' visibility='default' filepath='include/linux/netdevice.h' line='1881' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4096'> - <var-decl name='ethtool_ops' type-id='bdf901f8' visibility='default' filepath='include/linux/netdevice.h' line='1884' column='1'/> + <var-decl name='ethtool_ops' type-id='bdf901f8' visibility='default' filepath='include/linux/netdevice.h' line='1882' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4160'> - <var-decl name='ndisc_ops' type-id='a2e418a6' visibility='default' filepath='include/linux/netdevice.h' line='1889' column='1'/> + <var-decl name='ndisc_ops' type-id='a2e418a6' visibility='default' filepath='include/linux/netdevice.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4224'> - <var-decl name='header_ops' type-id='2d747e78' visibility='default' filepath='include/linux/netdevice.h' line='1900' column='1'/> + <var-decl name='header_ops' type-id='2d747e78' visibility='default' filepath='include/linux/netdevice.h' line='1898' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4288'> - <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1902' column='1'/> + <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1900' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4320'> - <var-decl name='priv_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1903' column='1'/> + <var-decl name='priv_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1901' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4352'> - <var-decl name='gflags' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1905' column='1'/> + <var-decl name='gflags' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1903' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4368'> - <var-decl name='padded' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1906' column='1'/> + <var-decl name='padded' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1904' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4384'> - <var-decl name='operstate' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1908' column='1'/> + <var-decl name='operstate' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1906' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4392'> - <var-decl name='link_mode' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1909' column='1'/> + <var-decl name='link_mode' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1907' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4400'> - <var-decl name='if_port' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1911' column='1'/> + <var-decl name='if_port' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1909' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4408'> - <var-decl name='dma' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1912' column='1'/> + <var-decl name='dma' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1910' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4416'> - <var-decl name='mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1919' column='1'/> + <var-decl name='mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1917' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4448'> - <var-decl name='min_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1920' column='1'/> + <var-decl name='min_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1918' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4480'> - <var-decl name='max_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1921' column='1'/> + <var-decl name='max_mtu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1919' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4512'> - <var-decl name='type' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1922' column='1'/> + <var-decl name='type' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1920' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4528'> - <var-decl name='hard_header_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1923' column='1'/> + <var-decl name='hard_header_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1921' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4544'> - <var-decl name='min_header_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1924' column='1'/> + <var-decl name='min_header_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1922' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4560'> - <var-decl name='needed_headroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1926' column='1'/> + <var-decl name='needed_headroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1924' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4576'> - <var-decl name='needed_tailroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1927' column='1'/> + <var-decl name='needed_tailroom' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1925' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4592'> - <var-decl name='perm_addr' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='1930' column='1'/> + <var-decl name='perm_addr' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='1928' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4848'> - <var-decl name='addr_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1931' column='1'/> + <var-decl name='addr_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1929' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4856'> - <var-decl name='addr_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1932' column='1'/> + <var-decl name='addr_len' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1930' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4864'> - <var-decl name='upper_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1933' column='1'/> + <var-decl name='upper_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1931' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4872'> - <var-decl name='lower_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1934' column='1'/> + <var-decl name='lower_level' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1932' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4880'> - <var-decl name='neigh_priv_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1935' column='1'/> + <var-decl name='neigh_priv_len' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4896'> - <var-decl name='dev_id' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1936' column='1'/> + <var-decl name='dev_id' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4912'> - <var-decl name='dev_port' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1937' column='1'/> + <var-decl name='dev_port' type-id='8efea9e5' visibility='default' filepath='include/linux/netdevice.h' line='1935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='addr_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='1938' column='1'/> + <var-decl name='addr_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='1936' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4960'> - <var-decl name='name_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1939' column='1'/> + <var-decl name='name_assign_type' type-id='002ac4a6' visibility='default' filepath='include/linux/netdevice.h' line='1937' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4968'> - <var-decl name='uc_promisc' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='1940' column='1'/> + <var-decl name='uc_promisc' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='1938' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4992'> - <var-decl name='uc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1941' column='1'/> + <var-decl name='uc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1939' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5184'> - <var-decl name='mc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1942' column='1'/> + <var-decl name='mc' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1940' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5376'> - <var-decl name='dev_addrs' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1943' column='1'/> + <var-decl name='dev_addrs' type-id='44a1ec32' visibility='default' filepath='include/linux/netdevice.h' line='1941' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5568'> - <var-decl name='queues_kset' type-id='89b70200' visibility='default' filepath='include/linux/netdevice.h' line='1946' column='1'/> + <var-decl name='queues_kset' type-id='89b70200' visibility='default' filepath='include/linux/netdevice.h' line='1944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5632'> - <var-decl name='promiscuity' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1948' column='1'/> + <var-decl name='promiscuity' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1946' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5664'> - <var-decl name='allmulti' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1949' column='1'/> + <var-decl name='allmulti' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5696'> - <var-decl name='tipc_ptr' type-id='eeaf504d' visibility='default' filepath='include/linux/netdevice.h' line='1961' column='1'/> + <var-decl name='tipc_ptr' type-id='eeaf504d' visibility='default' filepath='include/linux/netdevice.h' line='1959' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5760'> - <var-decl name='ip_ptr' type-id='fc6f14a9' visibility='default' filepath='include/linux/netdevice.h' line='1966' column='1'/> + <var-decl name='ip_ptr' type-id='fc6f14a9' visibility='default' filepath='include/linux/netdevice.h' line='1964' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5824'> - <var-decl name='ip6_ptr' type-id='f026b16b' visibility='default' filepath='include/linux/netdevice.h' line='1970' column='1'/> + <var-decl name='ip6_ptr' type-id='f026b16b' visibility='default' filepath='include/linux/netdevice.h' line='1968' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5888'> - <var-decl name='ieee80211_ptr' type-id='63c7e8e1' visibility='default' filepath='include/linux/netdevice.h' line='1974' column='1'/> + <var-decl name='ieee80211_ptr' type-id='63c7e8e1' visibility='default' filepath='include/linux/netdevice.h' line='1972' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5952'> - <var-decl name='ieee802154_ptr' type-id='165146ad' visibility='default' filepath='include/linux/netdevice.h' line='1975' column='1'/> + <var-decl name='ieee802154_ptr' type-id='165146ad' visibility='default' filepath='include/linux/netdevice.h' line='1973' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6016'> - <var-decl name='dev_addr' type-id='cf536864' visibility='default' filepath='include/linux/netdevice.h' line='1984' column='1'/> + <var-decl name='dev_addr' type-id='cf536864' visibility='default' filepath='include/linux/netdevice.h' line='1982' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6080'> - <var-decl name='_rx' type-id='31094274' visibility='default' filepath='include/linux/netdevice.h' line='1986' column='1'/> + <var-decl name='_rx' type-id='31094274' visibility='default' filepath='include/linux/netdevice.h' line='1984' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6144'> - <var-decl name='num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1987' column='1'/> + <var-decl name='num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1985' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6176'> - <var-decl name='real_num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1988' column='1'/> + <var-decl name='real_num_rx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='1986' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6208'> - <var-decl name='xdp_prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='1990' column='1'/> + <var-decl name='xdp_prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/netdevice.h' line='1988' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6272'> - <var-decl name='gro_flush_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1991' column='1'/> + <var-decl name='gro_flush_timeout' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='1989' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6336'> - <var-decl name='rx_handler' type-id='da1cb816' visibility='default' filepath='include/linux/netdevice.h' line='1992' column='1'/> + <var-decl name='rx_handler' type-id='da1cb816' visibility='default' filepath='include/linux/netdevice.h' line='1990' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6400'> - <var-decl name='rx_handler_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='1993' column='1'/> + <var-decl name='rx_handler_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='1991' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6464'> - <var-decl name='miniq_ingress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='1996' column='1'/> + <var-decl name='miniq_ingress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='1994' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6528'> - <var-decl name='ingress_queue' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='1998' column='1'/> + <var-decl name='ingress_queue' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='1996' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6592'> - <var-decl name='nf_hooks_ingress' type-id='39a43b40' visibility='default' filepath='include/linux/netdevice.h' line='2000' column='1'/> + <var-decl name='nf_hooks_ingress' type-id='39a43b40' visibility='default' filepath='include/linux/netdevice.h' line='1998' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6656'> - <var-decl name='broadcast' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='2003' column='1'/> + <var-decl name='broadcast' type-id='fc872715' visibility='default' filepath='include/linux/netdevice.h' line='2001' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6912'> - <var-decl name='rx_cpu_rmap' type-id='52baee64' visibility='default' filepath='include/linux/netdevice.h' line='2005' column='1'/> + <var-decl name='rx_cpu_rmap' type-id='52baee64' visibility='default' filepath='include/linux/netdevice.h' line='2003' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6976'> - <var-decl name='index_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='2007' column='1'/> + <var-decl name='index_hlist' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='2005' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7168'> - <var-decl name='_tx' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='2012' column='1'/> + <var-decl name='_tx' type-id='35b28c4f' visibility='default' filepath='include/linux/netdevice.h' line='2010' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7232'> - <var-decl name='num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2013' column='1'/> + <var-decl name='num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2011' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7264'> - <var-decl name='real_num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2014' column='1'/> + <var-decl name='real_num_tx_queues' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2012' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7296'> - <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='2015' column='1'/> + <var-decl name='qdisc' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='2013' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7360'> - <var-decl name='qdisc_hash' type-id='ccfd385f' visibility='default' filepath='include/linux/netdevice.h' line='2017' column='1'/> + <var-decl name='qdisc_hash' type-id='ccfd385f' visibility='default' filepath='include/linux/netdevice.h' line='2015' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8384'> - <var-decl name='tx_queue_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2019' column='1'/> + <var-decl name='tx_queue_len' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2017' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8416'> - <var-decl name='tx_global_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='2020' column='1'/> + <var-decl name='tx_global_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/netdevice.h' line='2018' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8448'> - <var-decl name='watchdog_timeo' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='2021' column='1'/> + <var-decl name='watchdog_timeo' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='2019' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8512'> - <var-decl name='xps_cpus_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2024' column='1'/> + <var-decl name='xps_cpus_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2022' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8576'> - <var-decl name='xps_rxqs_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2025' column='1'/> + <var-decl name='xps_rxqs_map' type-id='bf237056' visibility='default' filepath='include/linux/netdevice.h' line='2023' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8640'> - <var-decl name='miniq_egress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='2028' column='1'/> + <var-decl name='miniq_egress' type-id='b70f37f7' visibility='default' filepath='include/linux/netdevice.h' line='2026' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='watchdog_timer' type-id='abe41e67' visibility='default' filepath='include/linux/netdevice.h' line='2032' column='1'/> + <var-decl name='watchdog_timer' type-id='abe41e67' visibility='default' filepath='include/linux/netdevice.h' line='2030' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='pcpu_refcnt' type-id='7292109c' visibility='default' filepath='include/linux/netdevice.h' line='2034' column='1'/> + <var-decl name='pcpu_refcnt' type-id='7292109c' visibility='default' filepath='include/linux/netdevice.h' line='2032' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9216'> - <var-decl name='todo_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2035' column='1'/> + <var-decl name='todo_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2033' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='link_watch_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2037' column='1'/> + <var-decl name='link_watch_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2035' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='reg_state' type-id='08f5ca17' visibility='default' filepath='include/linux/netdevice.h' line='2045' column='1'/> + <var-decl name='reg_state' type-id='08f5ca17' visibility='default' filepath='include/linux/netdevice.h' line='2043' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9480'> - <var-decl name='dismantle' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2047' column='1'/> + <var-decl name='dismantle' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='rtnl_link_state' type-id='08f5ca18' visibility='default' filepath='include/linux/netdevice.h' line='2052' column='1'/> + <var-decl name='rtnl_link_state' type-id='08f5ca18' visibility='default' filepath='include/linux/netdevice.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9504'> - <var-decl name='needs_free_netdev' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2054' column='1'/> + <var-decl name='needs_free_netdev' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9536'> - <var-decl name='priv_destructor' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='2055' column='1'/> + <var-decl name='priv_destructor' type-id='548eee3a' visibility='default' filepath='include/linux/netdevice.h' line='2053' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9600'> - <var-decl name='nd_net' type-id='c9df1e6c' visibility='default' filepath='include/linux/netdevice.h' line='2061' column='1'/> + <var-decl name='nd_net' type-id='c9df1e6c' visibility='default' filepath='include/linux/netdevice.h' line='2059' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9664'> - <var-decl name='ml_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2064' column='1'/> + <var-decl name='ml_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2062' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9728'> - <var-decl name='ml_priv_type' type-id='9c6bf017' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1'/> + <var-decl name='ml_priv_type' type-id='9c6bf017' visibility='default' filepath='include/linux/netdevice.h' line='2063' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9792'> - <var-decl name='' type-id='ca29cb68' visibility='default' filepath='include/linux/netdevice.h' line='2067' column='1'/> + <var-decl name='' type-id='ca29cb68' visibility='default' filepath='include/linux/netdevice.h' line='2065' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9856'> - <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='include/linux/netdevice.h' line='2080' column='1'/> + <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='include/linux/netdevice.h' line='2078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17344'> - <var-decl name='sysfs_groups' type-id='db1b7234' visibility='default' filepath='include/linux/netdevice.h' line='2081' column='1'/> + <var-decl name='sysfs_groups' type-id='db1b7234' visibility='default' filepath='include/linux/netdevice.h' line='2079' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17600'> - <var-decl name='sysfs_rx_queue_group' type-id='8ff9530e' visibility='default' filepath='include/linux/netdevice.h' line='2082' column='1'/> + <var-decl name='sysfs_rx_queue_group' type-id='8ff9530e' visibility='default' filepath='include/linux/netdevice.h' line='2080' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17664'> - <var-decl name='rtnl_link_ops' type-id='999c8d90' visibility='default' filepath='include/linux/netdevice.h' line='2084' column='1'/> + <var-decl name='rtnl_link_ops' type-id='999c8d90' visibility='default' filepath='include/linux/netdevice.h' line='2082' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17728'> - <var-decl name='gso_max_size' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2088' column='1'/> + <var-decl name='gso_max_size' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2086' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17760'> - <var-decl name='gso_max_segs' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='2090' column='1'/> + <var-decl name='gso_max_segs' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='2088' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17776'> - <var-decl name='num_tc' type-id='9b7e9486' visibility='default' filepath='include/linux/netdevice.h' line='2095' column='1'/> + <var-decl name='num_tc' type-id='9b7e9486' visibility='default' filepath='include/linux/netdevice.h' line='2093' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='17792'> - <var-decl name='tc_to_txq' type-id='b5839634' visibility='default' filepath='include/linux/netdevice.h' line='2096' column='1'/> + <var-decl name='tc_to_txq' type-id='b5839634' visibility='default' filepath='include/linux/netdevice.h' line='2094' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18304'> - <var-decl name='prio_tc_map' type-id='0d8415b5' visibility='default' filepath='include/linux/netdevice.h' line='2097' column='1'/> + <var-decl name='prio_tc_map' type-id='0d8415b5' visibility='default' filepath='include/linux/netdevice.h' line='2095' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18432'> - <var-decl name='phydev' type-id='7efbcaaf' visibility='default' filepath='include/linux/netdevice.h' line='2105' column='1'/> + <var-decl name='phydev' type-id='7efbcaaf' visibility='default' filepath='include/linux/netdevice.h' line='2103' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18496'> - <var-decl name='sfp_bus' type-id='6daf6abd' visibility='default' filepath='include/linux/netdevice.h' line='2106' column='1'/> + <var-decl name='sfp_bus' type-id='6daf6abd' visibility='default' filepath='include/linux/netdevice.h' line='2104' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_tx_busylock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2107' column='1'/> + <var-decl name='qdisc_tx_busylock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2105' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_running_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2108' column='1'/> + <var-decl name='qdisc_running_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2106' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='qdisc_xmit_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2109' column='1'/> + <var-decl name='qdisc_xmit_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2107' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='addr_list_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2110' column='1'/> + <var-decl name='addr_list_lock_key' type-id='47479831' visibility='default' filepath='include/linux/netdevice.h' line='2108' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18560'> - <var-decl name='proto_down' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2111' column='1'/> + <var-decl name='proto_down' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2109' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8'> - <var-decl name='wol_enabled' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2112' column='1'/> + <var-decl name='wol_enabled' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='2110' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18624'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2114' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2112' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18688'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2115' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2113' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18752'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2116' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2114' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18816'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2117' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2115' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18880'> - <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2118' column='1'/> + <var-decl name='android_kabi_reserved5' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2116' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='18944'> - <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2119' column='1'/> + <var-decl name='android_kabi_reserved6' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2117' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='19008'> - <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2120' column='1'/> + <var-decl name='android_kabi_reserved7' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2118' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='19072'> - <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2121' column='1'/> + <var-decl name='android_kabi_reserved8' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2119' column='1'/> </data-member> </class-decl> <class-decl name='net_generic' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/net/netns/generic.h' line='28' column='1' id='8e5f5512'> @@ -125589,9 +125512,9 @@ <var-decl name='inline_name' type-id='e84913bd' visibility='default' filepath='fs/proc/internal.h' line='62' column='1'/> </data-member> </class-decl> - <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3277' column='1' id='ac763c5d'> + <class-decl name='prot_inuse' size-in-bits='2048' is-struct='yes' visibility='default' filepath='net/core/sock.c' line='3261' column='1' id='ac763c5d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3278' column='1'/> + <var-decl name='val' type-id='93e41790' visibility='default' filepath='net/core/sock.c' line='3262' column='1'/> </data-member> </class-decl> <class-decl name='rt6_info' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/net/ip6_fib.h' line='185' column='1' id='384b6d84'> @@ -126095,71 +126018,71 @@ <var-decl name='thrashing_delay_total' type-id='d3130597' visibility='default' filepath='include/uapi/linux/taskstats.h' line='170' column='1'/> </data-member> </class-decl> - <class-decl name='tcp_congestion_ops' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1041' column='1' id='54718f09'> + <class-decl name='tcp_congestion_ops' size-in-bits='1216' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1039' column='1' id='54718f09'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='1042' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='1040' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='key' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1043' column='1'/> + <var-decl name='key' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1041' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1044' column='1'/> + <var-decl name='flags' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1042' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='init' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1047' column='1'/> + <var-decl name='init' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1049' column='1'/> + <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='1047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ssthresh' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1052' column='1'/> + <var-decl name='ssthresh' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='cong_avoid' type-id='ece3af1e' visibility='default' filepath='include/net/tcp.h' line='1054' column='1'/> + <var-decl name='cong_avoid' type-id='ece3af1e' visibility='default' filepath='include/net/tcp.h' line='1052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='set_state' type-id='f5feb7a4' visibility='default' filepath='include/net/tcp.h' line='1056' column='1'/> + <var-decl name='set_state' type-id='f5feb7a4' visibility='default' filepath='include/net/tcp.h' line='1054' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='cwnd_event' type-id='bfacbc7a' visibility='default' filepath='include/net/tcp.h' line='1058' column='1'/> + <var-decl name='cwnd_event' type-id='bfacbc7a' visibility='default' filepath='include/net/tcp.h' line='1056' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='in_ack_event' type-id='815f64bf' visibility='default' filepath='include/net/tcp.h' line='1060' column='1'/> + <var-decl name='in_ack_event' type-id='815f64bf' visibility='default' filepath='include/net/tcp.h' line='1058' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='undo_cwnd' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1062' column='1'/> + <var-decl name='undo_cwnd' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1060' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='pkts_acked' type-id='bffb5883' visibility='default' filepath='include/net/tcp.h' line='1064' column='1'/> + <var-decl name='pkts_acked' type-id='bffb5883' visibility='default' filepath='include/net/tcp.h' line='1062' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='min_tso_segs' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1066' column='1'/> + <var-decl name='min_tso_segs' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1064' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='sndbuf_expand' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1068' column='1'/> + <var-decl name='sndbuf_expand' type-id='8af06487' visibility='default' filepath='include/net/tcp.h' line='1066' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='cong_control' type-id='636d3a20' visibility='default' filepath='include/net/tcp.h' line='1072' column='1'/> + <var-decl name='cong_control' type-id='636d3a20' visibility='default' filepath='include/net/tcp.h' line='1070' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='get_info' type-id='14ca5c08' visibility='default' filepath='include/net/tcp.h' line='1074' column='1'/> + <var-decl name='get_info' type-id='14ca5c08' visibility='default' filepath='include/net/tcp.h' line='1072' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='1077' column='1'/> + <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='1075' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='1078' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='1076' column='1'/> </data-member> </class-decl> - <class-decl name='tcp_fastopen_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1683' column='1' id='f77d4717'> + <class-decl name='tcp_fastopen_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1678' column='1' id='f77d4717'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='key' type-id='5b02a6fc' visibility='default' filepath='include/net/tcp.h' line='1684' column='1'/> + <var-decl name='key' type-id='5b02a6fc' visibility='default' filepath='include/net/tcp.h' line='1679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='num' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1685' column='1'/> + <var-decl name='num' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/tcp.h' line='1686' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/net/tcp.h' line='1681' column='1'/> </data-member> </class-decl> <class-decl name='trace_eval_map' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/tracepoint.h' line='27' column='1' id='49b910cc'> @@ -127148,174 +127071,174 @@ <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='482' column='1'/> </data-member> </class-decl> - <class-decl name='inode' size-in-bits='5312' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='656' column='1' id='fe070fe8'> + <class-decl name='inode' size-in-bits='5312' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='651' column='1' id='fe070fe8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='i_mode' type-id='2594b00f' visibility='default' filepath='include/linux/fs.h' line='657' column='1'/> + <var-decl name='i_mode' type-id='2594b00f' visibility='default' filepath='include/linux/fs.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='i_opflags' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='658' column='1'/> + <var-decl name='i_opflags' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='i_uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='659' column='1'/> + <var-decl name='i_uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='i_gid' type-id='094d8048' visibility='default' filepath='include/linux/fs.h' line='660' column='1'/> + <var-decl name='i_gid' type-id='094d8048' visibility='default' filepath='include/linux/fs.h' line='655' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='i_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='661' column='1'/> + <var-decl name='i_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='i_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='664' column='1'/> + <var-decl name='i_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='659' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='i_default_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='665' column='1'/> + <var-decl name='i_default_acl' type-id='2871909b' visibility='default' filepath='include/linux/fs.h' line='660' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='i_op' type-id='de2c232c' visibility='default' filepath='include/linux/fs.h' line='668' column='1'/> + <var-decl name='i_op' type-id='de2c232c' visibility='default' filepath='include/linux/fs.h' line='663' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='i_sb' type-id='42c8f564' visibility='default' filepath='include/linux/fs.h' line='669' column='1'/> + <var-decl name='i_sb' type-id='42c8f564' visibility='default' filepath='include/linux/fs.h' line='664' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='i_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='670' column='1'/> + <var-decl name='i_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='665' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='i_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='673' column='1'/> + <var-decl name='i_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='668' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='i_ino' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='677' column='1'/> + <var-decl name='i_ino' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='672' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='' type-id='3ee18b51' visibility='default' filepath='include/linux/fs.h' line='685' column='1'/> + <var-decl name='' type-id='3ee18b51' visibility='default' filepath='include/linux/fs.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='i_rdev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='689' column='1'/> + <var-decl name='i_rdev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='684' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='i_size' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='690' column='1'/> + <var-decl name='i_size' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='685' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='i_atime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='691' column='1'/> + <var-decl name='i_atime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='686' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='i_mtime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='692' column='1'/> + <var-decl name='i_mtime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='687' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='i_ctime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='693' column='1'/> + <var-decl name='i_ctime' type-id='40a816ad' visibility='default' filepath='include/linux/fs.h' line='688' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='i_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='694' column='1'/> + <var-decl name='i_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='689' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='i_bytes' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='695' column='1'/> + <var-decl name='i_bytes' type-id='8efea9e5' visibility='default' filepath='include/linux/fs.h' line='690' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1136'> - <var-decl name='i_blkbits' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='696' column='1'/> + <var-decl name='i_blkbits' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='691' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1144'> - <var-decl name='i_write_hint' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='697' column='1'/> + <var-decl name='i_write_hint' type-id='f9b06939' visibility='default' filepath='include/linux/fs.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='i_blocks' type-id='17345459' visibility='default' filepath='include/linux/fs.h' line='698' column='1'/> + <var-decl name='i_blocks' type-id='17345459' visibility='default' filepath='include/linux/fs.h' line='693' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='i_state' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='705' column='1'/> + <var-decl name='i_state' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='700' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='i_rwsem' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='706' column='1'/> + <var-decl name='i_rwsem' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='701' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='dirtied_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='708' column='1'/> + <var-decl name='dirtied_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='703' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='dirtied_time_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='709' column='1'/> + <var-decl name='dirtied_time_when' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='704' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='i_hash' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='711' column='1'/> + <var-decl name='i_hash' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='706' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='i_io_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='712' column='1'/> + <var-decl name='i_io_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='707' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='i_wb' type-id='f885ca7d' visibility='default' filepath='include/linux/fs.h' line='714' column='1'/> + <var-decl name='i_wb' type-id='f885ca7d' visibility='default' filepath='include/linux/fs.h' line='709' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='i_wb_frn_winner' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='717' column='1'/> + <var-decl name='i_wb_frn_winner' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='712' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2144'> - <var-decl name='i_wb_frn_avg_time' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='718' column='1'/> + <var-decl name='i_wb_frn_avg_time' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='713' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2160'> - <var-decl name='i_wb_frn_history' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='719' column='1'/> + <var-decl name='i_wb_frn_history' type-id='1dc6a898' visibility='default' filepath='include/linux/fs.h' line='714' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='i_lru' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='721' column='1'/> + <var-decl name='i_lru' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='716' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='i_sb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='722' column='1'/> + <var-decl name='i_sb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='717' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='i_wb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='723' column='1'/> + <var-decl name='i_wb_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='718' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2560'> - <var-decl name='' type-id='cbd4a95b' visibility='default' filepath='include/linux/fs.h' line='724' column='1'/> + <var-decl name='' type-id='cbd4a95b' visibility='default' filepath='include/linux/fs.h' line='719' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2688'> - <var-decl name='i_version' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='728' column='1'/> + <var-decl name='i_version' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='723' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2752'> - <var-decl name='i_sequence' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='729' column='1'/> + <var-decl name='i_sequence' type-id='28ee064c' visibility='default' filepath='include/linux/fs.h' line='724' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='i_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='730' column='1'/> + <var-decl name='i_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='725' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2848'> - <var-decl name='i_dio_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='731' column='1'/> + <var-decl name='i_dio_count' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='726' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2880'> - <var-decl name='i_writecount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='732' column='1'/> + <var-decl name='i_writecount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='727' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2912'> - <var-decl name='i_readcount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='734' column='1'/> + <var-decl name='i_readcount' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='729' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='' type-id='67f3b119' visibility='default' filepath='include/linux/fs.h' line='736' column='1'/> + <var-decl name='' type-id='67f3b119' visibility='default' filepath='include/linux/fs.h' line='731' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3008'> - <var-decl name='i_flctx' type-id='731257ff' visibility='default' filepath='include/linux/fs.h' line='740' column='1'/> + <var-decl name='i_flctx' type-id='731257ff' visibility='default' filepath='include/linux/fs.h' line='735' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='i_data' type-id='0fd82dc2' visibility='default' filepath='include/linux/fs.h' line='741' column='1'/> + <var-decl name='i_data' type-id='0fd82dc2' visibility='default' filepath='include/linux/fs.h' line='736' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4672'> - <var-decl name='i_devices' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='742' column='1'/> + <var-decl name='i_devices' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='737' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4800'> - <var-decl name='' type-id='d1afa4fe' visibility='default' filepath='include/linux/fs.h' line='743' column='1'/> + <var-decl name='' type-id='d1afa4fe' visibility='default' filepath='include/linux/fs.h' line='738' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4864'> - <var-decl name='i_generation' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='751' column='1'/> + <var-decl name='i_generation' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='746' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4896'> - <var-decl name='i_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='754' column='1'/> + <var-decl name='i_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='749' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='i_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='755' column='1'/> + <var-decl name='i_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='750' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4992'> - <var-decl name='i_crypt_info' type-id='1ea8c5af' visibility='default' filepath='include/linux/fs.h' line='759' column='1'/> + <var-decl name='i_crypt_info' type-id='1ea8c5af' visibility='default' filepath='include/linux/fs.h' line='754' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5056'> - <var-decl name='i_verity_info' type-id='ba18e248' visibility='default' filepath='include/linux/fs.h' line='763' column='1'/> + <var-decl name='i_verity_info' type-id='ba18e248' visibility='default' filepath='include/linux/fs.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5120'> - <var-decl name='i_private' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='766' column='1'/> + <var-decl name='i_private' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5184'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='768' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='763' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5248'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='769' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='764' column='1'/> </data-member> </class-decl> <typedef-decl name='umode_t' type-id='8efea9e5' filepath='include/linux/types.h' line='19' column='1' id='2594b00f'/> @@ -127327,81 +127250,81 @@ </class-decl> <typedef-decl name='gid_t' type-id='b4413cee' filepath='include/linux/types.h' line='33' column='1' id='2bb2b96f'/> <typedef-decl name='__kernel_gid32_t' type-id='f0981eeb' filepath='include/uapi/asm-generic/posix_types.h' line='50' column='1' id='b4413cee'/> - <class-decl name='inode_operations' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1937' column='1' id='5f5aa1ff'> + <class-decl name='inode_operations' size-in-bits='2048' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1932' column='1' id='5f5aa1ff'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lookup' type-id='02f90a61' visibility='default' filepath='include/linux/fs.h' line='1938' column='1'/> + <var-decl name='lookup' type-id='02f90a61' visibility='default' filepath='include/linux/fs.h' line='1933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='get_link' type-id='76ae8e1d' visibility='default' filepath='include/linux/fs.h' line='1939' column='1'/> + <var-decl name='get_link' type-id='76ae8e1d' visibility='default' filepath='include/linux/fs.h' line='1934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='permission' type-id='f4f91b99' visibility='default' filepath='include/linux/fs.h' line='1940' column='1'/> + <var-decl name='permission' type-id='f4f91b99' visibility='default' filepath='include/linux/fs.h' line='1935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='get_acl' type-id='7f30b822' visibility='default' filepath='include/linux/fs.h' line='1941' column='1'/> + <var-decl name='get_acl' type-id='7f30b822' visibility='default' filepath='include/linux/fs.h' line='1936' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='readlink' type-id='a57bd028' visibility='default' filepath='include/linux/fs.h' line='1943' column='1'/> + <var-decl name='readlink' type-id='a57bd028' visibility='default' filepath='include/linux/fs.h' line='1938' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='create' type-id='c9cd0e09' visibility='default' filepath='include/linux/fs.h' line='1945' column='1'/> + <var-decl name='create' type-id='c9cd0e09' visibility='default' filepath='include/linux/fs.h' line='1940' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='link' type-id='4b872e00' visibility='default' filepath='include/linux/fs.h' line='1946' column='1'/> + <var-decl name='link' type-id='4b872e00' visibility='default' filepath='include/linux/fs.h' line='1941' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='unlink' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1947' column='1'/> + <var-decl name='unlink' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1942' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='symlink' type-id='234843b5' visibility='default' filepath='include/linux/fs.h' line='1948' column='1'/> + <var-decl name='symlink' type-id='234843b5' visibility='default' filepath='include/linux/fs.h' line='1943' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='mkdir' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1949' column='1'/> + <var-decl name='mkdir' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='rmdir' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1950' column='1'/> + <var-decl name='rmdir' type-id='7f5be7f6' visibility='default' filepath='include/linux/fs.h' line='1945' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='mknod' type-id='f9e0c0e5' visibility='default' filepath='include/linux/fs.h' line='1951' column='1'/> + <var-decl name='mknod' type-id='f9e0c0e5' visibility='default' filepath='include/linux/fs.h' line='1946' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='rename' type-id='7733ef81' visibility='default' filepath='include/linux/fs.h' line='1952' column='1'/> + <var-decl name='rename' type-id='7733ef81' visibility='default' filepath='include/linux/fs.h' line='1947' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='setattr' type-id='c237e829' visibility='default' filepath='include/linux/fs.h' line='1954' column='1'/> + <var-decl name='setattr' type-id='c237e829' visibility='default' filepath='include/linux/fs.h' line='1949' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='getattr' type-id='0b787edf' visibility='default' filepath='include/linux/fs.h' line='1955' column='1'/> + <var-decl name='getattr' type-id='0b787edf' visibility='default' filepath='include/linux/fs.h' line='1950' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='listxattr' type-id='3494e4bb' visibility='default' filepath='include/linux/fs.h' line='1956' column='1'/> + <var-decl name='listxattr' type-id='3494e4bb' visibility='default' filepath='include/linux/fs.h' line='1951' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='fiemap' type-id='0508acce' visibility='default' filepath='include/linux/fs.h' line='1957' column='1'/> + <var-decl name='fiemap' type-id='0508acce' visibility='default' filepath='include/linux/fs.h' line='1952' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='update_time' type-id='64ecf6a5' visibility='default' filepath='include/linux/fs.h' line='1959' column='1'/> + <var-decl name='update_time' type-id='64ecf6a5' visibility='default' filepath='include/linux/fs.h' line='1954' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='atomic_open' type-id='d3807eb0' visibility='default' filepath='include/linux/fs.h' line='1960' column='1'/> + <var-decl name='atomic_open' type-id='d3807eb0' visibility='default' filepath='include/linux/fs.h' line='1955' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='tmpfile' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1963' column='1'/> + <var-decl name='tmpfile' type-id='98c2d938' visibility='default' filepath='include/linux/fs.h' line='1958' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='set_acl' type-id='820976ef' visibility='default' filepath='include/linux/fs.h' line='1964' column='1'/> + <var-decl name='set_acl' type-id='820976ef' visibility='default' filepath='include/linux/fs.h' line='1959' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1966' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1961' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1967' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1962' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1968' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1963' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1969' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1964' column='1'/> </data-member> </class-decl> <class-decl name='dentry' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/linux/dcache.h' line='90' column='1' id='d6ebca75'> @@ -127577,279 +127500,279 @@ <var-decl name='dentry' type-id='27675065' visibility='default' filepath='include/linux/path.h' line='10' column='1'/> </data-member> </class-decl> - <class-decl name='super_block' size-in-bits='12800' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1478' column='1' id='bc39a8be'> + <class-decl name='super_block' size-in-bits='12800' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1473' column='1' id='bc39a8be'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='s_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1479' column='1'/> + <var-decl name='s_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1474' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='s_dev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='1480' column='1'/> + <var-decl name='s_dev' type-id='8504f260' visibility='default' filepath='include/linux/fs.h' line='1475' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='s_blocksize_bits' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1481' column='1'/> + <var-decl name='s_blocksize_bits' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1476' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='s_blocksize' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1482' column='1'/> + <var-decl name='s_blocksize' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1477' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='s_maxbytes' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1483' column='1'/> + <var-decl name='s_maxbytes' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1478' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='s_type' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='1484' column='1'/> + <var-decl name='s_type' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='1479' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='s_op' type-id='f7c6dcac' visibility='default' filepath='include/linux/fs.h' line='1485' column='1'/> + <var-decl name='s_op' type-id='f7c6dcac' visibility='default' filepath='include/linux/fs.h' line='1480' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='dq_op' type-id='85741a2a' visibility='default' filepath='include/linux/fs.h' line='1486' column='1'/> + <var-decl name='dq_op' type-id='85741a2a' visibility='default' filepath='include/linux/fs.h' line='1481' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='s_qcop' type-id='2cb49514' visibility='default' filepath='include/linux/fs.h' line='1487' column='1'/> + <var-decl name='s_qcop' type-id='2cb49514' visibility='default' filepath='include/linux/fs.h' line='1482' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_export_op' type-id='ab932c45' visibility='default' filepath='include/linux/fs.h' line='1488' column='1'/> + <var-decl name='s_export_op' type-id='ab932c45' visibility='default' filepath='include/linux/fs.h' line='1483' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='s_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1489' column='1'/> + <var-decl name='s_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1484' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='s_iflags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1490' column='1'/> + <var-decl name='s_iflags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1485' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='s_magic' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1491' column='1'/> + <var-decl name='s_magic' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1486' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='s_root' type-id='27675065' visibility='default' filepath='include/linux/fs.h' line='1492' column='1'/> + <var-decl name='s_root' type-id='27675065' visibility='default' filepath='include/linux/fs.h' line='1487' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='s_umount' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='1493' column='1'/> + <var-decl name='s_umount' type-id='f19fdb93' visibility='default' filepath='include/linux/fs.h' line='1488' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='s_count' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1494' column='1'/> + <var-decl name='s_count' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1489' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1312'> - <var-decl name='s_active' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='1495' column='1'/> + <var-decl name='s_active' type-id='49178f86' visibility='default' filepath='include/linux/fs.h' line='1490' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='s_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1497' column='1'/> + <var-decl name='s_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1492' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='s_xattr' type-id='cb49d4b8' visibility='default' filepath='include/linux/fs.h' line='1499' column='1'/> + <var-decl name='s_xattr' type-id='cb49d4b8' visibility='default' filepath='include/linux/fs.h' line='1494' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='s_cop' type-id='8d31a8d6' visibility='default' filepath='include/linux/fs.h' line='1501' column='1'/> + <var-decl name='s_cop' type-id='8d31a8d6' visibility='default' filepath='include/linux/fs.h' line='1496' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='s_master_keys' type-id='204a4632' visibility='default' filepath='include/linux/fs.h' line='1502' column='1'/> + <var-decl name='s_master_keys' type-id='204a4632' visibility='default' filepath='include/linux/fs.h' line='1497' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='s_vop' type-id='e3008443' visibility='default' filepath='include/linux/fs.h' line='1505' column='1'/> + <var-decl name='s_vop' type-id='e3008443' visibility='default' filepath='include/linux/fs.h' line='1500' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='s_encoding' type-id='72835629' visibility='default' filepath='include/linux/fs.h' line='1508' column='1'/> + <var-decl name='s_encoding' type-id='72835629' visibility='default' filepath='include/linux/fs.h' line='1503' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='s_encoding_flags' type-id='d315442e' visibility='default' filepath='include/linux/fs.h' line='1509' column='1'/> + <var-decl name='s_encoding_flags' type-id='d315442e' visibility='default' filepath='include/linux/fs.h' line='1504' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='s_roots' type-id='def98e71' visibility='default' filepath='include/linux/fs.h' line='1511' column='1'/> + <var-decl name='s_roots' type-id='def98e71' visibility='default' filepath='include/linux/fs.h' line='1506' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='s_mounts' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1512' column='1'/> + <var-decl name='s_mounts' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1507' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='s_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='1513' column='1'/> + <var-decl name='s_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='1508' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='s_bdi' type-id='ef4fae1b' visibility='default' filepath='include/linux/fs.h' line='1514' column='1'/> + <var-decl name='s_bdi' type-id='ef4fae1b' visibility='default' filepath='include/linux/fs.h' line='1509' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='s_mtd' type-id='58ed56f5' visibility='default' filepath='include/linux/fs.h' line='1515' column='1'/> + <var-decl name='s_mtd' type-id='58ed56f5' visibility='default' filepath='include/linux/fs.h' line='1510' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='s_instances' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1516' column='1'/> + <var-decl name='s_instances' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1511' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2304'> - <var-decl name='s_quota_types' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1517' column='1'/> + <var-decl name='s_quota_types' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1512' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='s_dquot' type-id='c26e4ad8' visibility='default' filepath='include/linux/fs.h' line='1518' column='1'/> + <var-decl name='s_dquot' type-id='c26e4ad8' visibility='default' filepath='include/linux/fs.h' line='1513' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4928'> - <var-decl name='s_writers' type-id='fb476a2b' visibility='default' filepath='include/linux/fs.h' line='1520' column='1'/> + <var-decl name='s_writers' type-id='fb476a2b' visibility='default' filepath='include/linux/fs.h' line='1515' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8064'> - <var-decl name='s_fs_info' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1527' column='1'/> + <var-decl name='s_fs_info' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='1522' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8128'> - <var-decl name='s_time_gran' type-id='19c2251e' visibility='default' filepath='include/linux/fs.h' line='1530' column='1'/> + <var-decl name='s_time_gran' type-id='19c2251e' visibility='default' filepath='include/linux/fs.h' line='1525' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8192'> - <var-decl name='s_time_min' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1532' column='1'/> + <var-decl name='s_time_min' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1527' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8256'> - <var-decl name='s_time_max' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1533' column='1'/> + <var-decl name='s_time_max' type-id='1afd27ac' visibility='default' filepath='include/linux/fs.h' line='1528' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8320'> - <var-decl name='s_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='1535' column='1'/> + <var-decl name='s_fsnotify_mask' type-id='3f1a6b60' visibility='default' filepath='include/linux/fs.h' line='1530' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8384'> - <var-decl name='s_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='1536' column='1'/> + <var-decl name='s_fsnotify_marks' type-id='994d9d61' visibility='default' filepath='include/linux/fs.h' line='1531' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8448'> - <var-decl name='s_id' type-id='16dc656a' visibility='default' filepath='include/linux/fs.h' line='1539' column='1'/> + <var-decl name='s_id' type-id='16dc656a' visibility='default' filepath='include/linux/fs.h' line='1534' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8704'> - <var-decl name='s_uuid' type-id='ec55eb74' visibility='default' filepath='include/linux/fs.h' line='1540' column='1'/> + <var-decl name='s_uuid' type-id='ec55eb74' visibility='default' filepath='include/linux/fs.h' line='1535' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8832'> - <var-decl name='s_max_links' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1542' column='1'/> + <var-decl name='s_max_links' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1537' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8864'> - <var-decl name='s_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='1543' column='1'/> + <var-decl name='s_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='1538' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='8896'> - <var-decl name='s_vfs_rename_mutex' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1549' column='1'/> + <var-decl name='s_vfs_rename_mutex' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1544' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9152'> - <var-decl name='s_subtype' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='1555' column='1'/> + <var-decl name='s_subtype' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='1550' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9216'> - <var-decl name='s_d_op' type-id='1ee57353' visibility='default' filepath='include/linux/fs.h' line='1557' column='1'/> + <var-decl name='s_d_op' type-id='1ee57353' visibility='default' filepath='include/linux/fs.h' line='1552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9280'> - <var-decl name='cleancache_poolid' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1562' column='1'/> + <var-decl name='cleancache_poolid' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1557' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9344'> - <var-decl name='s_shrink' type-id='27cb404f' visibility='default' filepath='include/linux/fs.h' line='1564' column='1'/> + <var-decl name='s_shrink' type-id='27cb404f' visibility='default' filepath='include/linux/fs.h' line='1559' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9856'> - <var-decl name='s_remove_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1567' column='1'/> + <var-decl name='s_remove_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1562' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9920'> - <var-decl name='s_fsnotify_inode_refs' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1570' column='1'/> + <var-decl name='s_fsnotify_inode_refs' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='1565' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='9984'> - <var-decl name='s_readonly_remount' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1573' column='1'/> + <var-decl name='s_readonly_remount' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1568' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10016'> - <var-decl name='s_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1576' column='1'/> + <var-decl name='s_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1571' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10048'> - <var-decl name='s_dio_done_wq' type-id='242e3d19' visibility='default' filepath='include/linux/fs.h' line='1579' column='1'/> + <var-decl name='s_dio_done_wq' type-id='242e3d19' visibility='default' filepath='include/linux/fs.h' line='1574' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10112'> - <var-decl name='s_pins' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='1580' column='1'/> + <var-decl name='s_pins' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='1575' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10176'> - <var-decl name='s_user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/fs.h' line='1587' column='1'/> + <var-decl name='s_user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/fs.h' line='1582' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10240'> - <var-decl name='s_dentry_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1594' column='1'/> + <var-decl name='s_dentry_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1589' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10496'> - <var-decl name='s_inode_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1595' column='1'/> + <var-decl name='s_inode_lru' type-id='c653aac7' visibility='default' filepath='include/linux/fs.h' line='1590' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10752'> - <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1596' column='1'/> + <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1591' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='10880'> - <var-decl name='destroy_work' type-id='ef9025d0' visibility='default' filepath='include/linux/fs.h' line='1597' column='1'/> + <var-decl name='destroy_work' type-id='ef9025d0' visibility='default' filepath='include/linux/fs.h' line='1592' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11264'> - <var-decl name='s_sync_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1599' column='1'/> + <var-decl name='s_sync_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='1594' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11520'> - <var-decl name='s_stack_depth' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1604' column='1'/> + <var-decl name='s_stack_depth' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11776'> - <var-decl name='s_inode_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1607' column='1'/> + <var-decl name='s_inode_list_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11840'> - <var-decl name='s_inodes' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1608' column='1'/> + <var-decl name='s_inodes' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='11968'> - <var-decl name='s_inode_wblist_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1610' column='1'/> + <var-decl name='s_inode_wblist_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1605' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12032'> - <var-decl name='s_inodes_wb' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1611' column='1'/> + <var-decl name='s_inodes_wb' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12160'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1613' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12224'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1614' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12288'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1615' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1610' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='12352'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1616' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1611' column='1'/> </data-member> </class-decl> <typedef-decl name='dev_t' type-id='8f336000' filepath='include/linux/types.h' line='16' column='1' id='8504f260'/> <typedef-decl name='__kernel_dev_t' type-id='19c2251e' filepath='include/linux/types.h' line='13' column='1' id='8f336000'/> <typedef-decl name='loff_t' type-id='537a730e' filepath='include/linux/types.h' line='46' column='1' id='69bf7bee'/> <typedef-decl name='__kernel_loff_t' type-id='1eb56b1e' filepath='include/uapi/asm-generic/posix_types.h' line='88' column='1' id='537a730e'/> - <class-decl name='file_system_type' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2304' column='1' id='2f5a60be'> + <class-decl name='file_system_type' size-in-bits='832' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2299' column='1' id='2f5a60be'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2305' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/linux/fs.h' line='2300' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fs_flags' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2306' column='1'/> + <var-decl name='fs_flags' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='2301' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='init_fs_context' type-id='57f0383a' visibility='default' filepath='include/linux/fs.h' line='2313' column='1'/> + <var-decl name='init_fs_context' type-id='57f0383a' visibility='default' filepath='include/linux/fs.h' line='2308' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='parameters' type-id='a2fb6348' visibility='default' filepath='include/linux/fs.h' line='2314' column='1'/> + <var-decl name='parameters' type-id='a2fb6348' visibility='default' filepath='include/linux/fs.h' line='2309' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='mount' type-id='d9394db1' visibility='default' filepath='include/linux/fs.h' line='2315' column='1'/> + <var-decl name='mount' type-id='d9394db1' visibility='default' filepath='include/linux/fs.h' line='2310' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='kill_sb' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2317' column='1'/> + <var-decl name='kill_sb' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2312' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='2318' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='2313' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='next' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='2319' column='1'/> + <var-decl name='next' type-id='21e53d44' visibility='default' filepath='include/linux/fs.h' line='2314' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='fs_supers' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='2320' column='1'/> + <var-decl name='fs_supers' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='2315' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2322' column='1'/> + <var-decl name='s_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2317' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_umount_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2323' column='1'/> + <var-decl name='s_umount_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2318' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_vfs_rename_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2324' column='1'/> + <var-decl name='s_vfs_rename_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2319' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='s_writers_key' type-id='9c02e2a6' visibility='default' filepath='include/linux/fs.h' line='2325' column='1'/> + <var-decl name='s_writers_key' type-id='9c02e2a6' visibility='default' filepath='include/linux/fs.h' line='2320' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2327' column='1'/> + <var-decl name='i_lock_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2322' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_mutex_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2328' column='1'/> + <var-decl name='i_mutex_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2323' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='i_mutex_dir_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2329' column='1'/> + <var-decl name='i_mutex_dir_key' type-id='47479831' visibility='default' filepath='include/linux/fs.h' line='2324' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2331' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2326' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2332' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2327' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2333' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2328' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2334' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2329' column='1'/> </data-member> </class-decl> <class-decl name='module' size-in-bits='7168' is-struct='yes' visibility='default' filepath='include/linux/module.h' line='349' column='1' id='29476915'> @@ -128267,199 +128190,199 @@ <var-decl name='mmap' type-id='a02c170c' visibility='default' filepath='include/linux/sysfs.h' line='169' column='1'/> </data-member> </class-decl> - <class-decl name='file' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='967' column='1' id='b4b8adeb'> + <class-decl name='file' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='962' column='1' id='b4b8adeb'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='f_u' type-id='8c8e2781' visibility='default' filepath='include/linux/fs.h' line='971' column='1'/> + <var-decl name='f_u' type-id='8c8e2781' visibility='default' filepath='include/linux/fs.h' line='966' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='f_path' type-id='b5382ece' visibility='default' filepath='include/linux/fs.h' line='972' column='1'/> + <var-decl name='f_path' type-id='b5382ece' visibility='default' filepath='include/linux/fs.h' line='967' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='f_inode' type-id='7e666abe' visibility='default' filepath='include/linux/fs.h' line='973' column='1'/> + <var-decl name='f_inode' type-id='7e666abe' visibility='default' filepath='include/linux/fs.h' line='968' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='f_op' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='974' column='1'/> + <var-decl name='f_op' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='969' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='f_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='980' column='1'/> + <var-decl name='f_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='975' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='f_write_hint' type-id='0d20c3dd' visibility='default' filepath='include/linux/fs.h' line='981' column='1'/> + <var-decl name='f_write_hint' type-id='0d20c3dd' visibility='default' filepath='include/linux/fs.h' line='976' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='f_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='982' column='1'/> + <var-decl name='f_count' type-id='f22a8abb' visibility='default' filepath='include/linux/fs.h' line='977' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='f_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='983' column='1'/> + <var-decl name='f_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='978' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='544'> - <var-decl name='f_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='984' column='1'/> + <var-decl name='f_mode' type-id='2665334e' visibility='default' filepath='include/linux/fs.h' line='979' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='f_pos_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='985' column='1'/> + <var-decl name='f_pos_lock' type-id='925167dc' visibility='default' filepath='include/linux/fs.h' line='980' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='f_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='986' column='1'/> + <var-decl name='f_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='981' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='f_owner' type-id='6b640edd' visibility='default' filepath='include/linux/fs.h' line='987' column='1'/> + <var-decl name='f_owner' type-id='6b640edd' visibility='default' filepath='include/linux/fs.h' line='982' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='f_cred' type-id='bc33861a' visibility='default' filepath='include/linux/fs.h' line='988' column='1'/> + <var-decl name='f_cred' type-id='bc33861a' visibility='default' filepath='include/linux/fs.h' line='983' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='f_ra' type-id='b31f003f' visibility='default' filepath='include/linux/fs.h' line='989' column='1'/> + <var-decl name='f_ra' type-id='b31f003f' visibility='default' filepath='include/linux/fs.h' line='984' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='f_version' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='991' column='1'/> + <var-decl name='f_version' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='986' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='f_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='993' column='1'/> + <var-decl name='f_security' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='988' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='private_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='996' column='1'/> + <var-decl name='private_data' type-id='eaa32e2f' visibility='default' filepath='include/linux/fs.h' line='991' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='f_ep_links' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1000' column='1'/> + <var-decl name='f_ep_links' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='995' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='f_tfile_llink' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1001' column='1'/> + <var-decl name='f_tfile_llink' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='996' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='f_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='1003' column='1'/> + <var-decl name='f_mapping' type-id='f57039f0' visibility='default' filepath='include/linux/fs.h' line='998' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='f_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1004' column='1'/> + <var-decl name='f_wb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='999' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2016'> - <var-decl name='f_sb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1005' column='1'/> + <var-decl name='f_sb_err' type-id='1da55f79' visibility='default' filepath='include/linux/fs.h' line='1000' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1007' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1002' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1008' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1003' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1009' column='1'/> + <var-decl name='android_oem_data1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1004' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__4' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='968' column='1' id='8c8e2781'> + <union-decl name='__anonymous_union__4' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='963' column='1' id='8c8e2781'> <data-member access='public'> - <var-decl name='fu_llist' type-id='c5ccfee8' visibility='default' filepath='include/linux/fs.h' line='969' column='1'/> + <var-decl name='fu_llist' type-id='c5ccfee8' visibility='default' filepath='include/linux/fs.h' line='964' column='1'/> </data-member> <data-member access='public'> - <var-decl name='fu_rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='970' column='1'/> + <var-decl name='fu_rcuhead' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='965' column='1'/> </data-member> </union-decl> - <class-decl name='file_operations' size-in-bits='2304' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1890' column='1' id='7dffcde2'> + <class-decl name='file_operations' size-in-bits='2304' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1885' column='1' id='7dffcde2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='1891' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/linux/fs.h' line='1886' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='llseek' type-id='07ebb4cd' visibility='default' filepath='include/linux/fs.h' line='1892' column='1'/> + <var-decl name='llseek' type-id='07ebb4cd' visibility='default' filepath='include/linux/fs.h' line='1887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='read' type-id='4d8f5625' visibility='default' filepath='include/linux/fs.h' line='1893' column='1'/> + <var-decl name='read' type-id='4d8f5625' visibility='default' filepath='include/linux/fs.h' line='1888' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='write' type-id='5f29549c' visibility='default' filepath='include/linux/fs.h' line='1894' column='1'/> + <var-decl name='write' type-id='5f29549c' visibility='default' filepath='include/linux/fs.h' line='1889' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='read_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1895' column='1'/> + <var-decl name='read_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1890' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='write_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1896' column='1'/> + <var-decl name='write_iter' type-id='227e209d' visibility='default' filepath='include/linux/fs.h' line='1891' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='iopoll' type-id='6c4618be' visibility='default' filepath='include/linux/fs.h' line='1897' column='1'/> + <var-decl name='iopoll' type-id='6c4618be' visibility='default' filepath='include/linux/fs.h' line='1892' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='iterate' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1898' column='1'/> + <var-decl name='iterate' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1893' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='iterate_shared' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1899' column='1'/> + <var-decl name='iterate_shared' type-id='42beb73a' visibility='default' filepath='include/linux/fs.h' line='1894' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='poll' type-id='4d01ede7' visibility='default' filepath='include/linux/fs.h' line='1900' column='1'/> + <var-decl name='poll' type-id='4d01ede7' visibility='default' filepath='include/linux/fs.h' line='1895' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='unlocked_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1901' column='1'/> + <var-decl name='unlocked_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1896' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='compat_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1902' column='1'/> + <var-decl name='compat_ioctl' type-id='fc7daf55' visibility='default' filepath='include/linux/fs.h' line='1897' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='mmap' type-id='8ea2626c' visibility='default' filepath='include/linux/fs.h' line='1903' column='1'/> + <var-decl name='mmap' type-id='8ea2626c' visibility='default' filepath='include/linux/fs.h' line='1898' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='mmap_supported_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1904' column='1'/> + <var-decl name='mmap_supported_flags' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1899' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='open' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1905' column='1'/> + <var-decl name='open' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1900' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='flush' type-id='5ddef2dd' visibility='default' filepath='include/linux/fs.h' line='1906' column='1'/> + <var-decl name='flush' type-id='5ddef2dd' visibility='default' filepath='include/linux/fs.h' line='1901' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='release' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1907' column='1'/> + <var-decl name='release' type-id='47800058' visibility='default' filepath='include/linux/fs.h' line='1902' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='fsync' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1908' column='1'/> + <var-decl name='fsync' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1903' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='fasync' type-id='b94ac371' visibility='default' filepath='include/linux/fs.h' line='1909' column='1'/> + <var-decl name='fasync' type-id='b94ac371' visibility='default' filepath='include/linux/fs.h' line='1904' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='lock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1910' column='1'/> + <var-decl name='lock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1905' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='sendpage' type-id='40da47a8' visibility='default' filepath='include/linux/fs.h' line='1911' column='1'/> + <var-decl name='sendpage' type-id='40da47a8' visibility='default' filepath='include/linux/fs.h' line='1906' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='get_unmapped_area' type-id='d44a8cec' visibility='default' filepath='include/linux/fs.h' line='1912' column='1'/> + <var-decl name='get_unmapped_area' type-id='d44a8cec' visibility='default' filepath='include/linux/fs.h' line='1907' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='check_flags' type-id='7f416e10' visibility='default' filepath='include/linux/fs.h' line='1913' column='1'/> + <var-decl name='check_flags' type-id='7f416e10' visibility='default' filepath='include/linux/fs.h' line='1908' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='flock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1914' column='1'/> + <var-decl name='flock' type-id='12f0ff82' visibility='default' filepath='include/linux/fs.h' line='1909' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='splice_write' type-id='b22f4610' visibility='default' filepath='include/linux/fs.h' line='1915' column='1'/> + <var-decl name='splice_write' type-id='b22f4610' visibility='default' filepath='include/linux/fs.h' line='1910' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='splice_read' type-id='72cd68b0' visibility='default' filepath='include/linux/fs.h' line='1916' column='1'/> + <var-decl name='splice_read' type-id='72cd68b0' visibility='default' filepath='include/linux/fs.h' line='1911' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='setlease' type-id='87e3d3e2' visibility='default' filepath='include/linux/fs.h' line='1917' column='1'/> + <var-decl name='setlease' type-id='87e3d3e2' visibility='default' filepath='include/linux/fs.h' line='1912' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='fallocate' type-id='a53e2328' visibility='default' filepath='include/linux/fs.h' line='1918' column='1'/> + <var-decl name='fallocate' type-id='a53e2328' visibility='default' filepath='include/linux/fs.h' line='1913' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='show_fdinfo' type-id='eda08098' visibility='default' filepath='include/linux/fs.h' line='1920' column='1'/> + <var-decl name='show_fdinfo' type-id='eda08098' visibility='default' filepath='include/linux/fs.h' line='1915' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='copy_file_range' type-id='d0882d6b' visibility='default' filepath='include/linux/fs.h' line='1924' column='1'/> + <var-decl name='copy_file_range' type-id='d0882d6b' visibility='default' filepath='include/linux/fs.h' line='1919' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='remap_file_range' type-id='c1de1086' visibility='default' filepath='include/linux/fs.h' line='1926' column='1'/> + <var-decl name='remap_file_range' type-id='c1de1086' visibility='default' filepath='include/linux/fs.h' line='1921' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='fadvise' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1929' column='1'/> + <var-decl name='fadvise' type-id='31cc9254' visibility='default' filepath='include/linux/fs.h' line='1924' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1931' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1926' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1932' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1927' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1933' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1928' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1934' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1929' column='1'/> </data-member> </class-decl> <class-decl name='kiocb' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='326' column='1' id='da62d64b'> @@ -128546,24 +128469,24 @@ <var-decl name='bv_offset' type-id='f0981eeb' visibility='default' filepath='include/linux/bvec.h' line='21' column='1'/> </data-member> </class-decl> - <class-decl name='fasync_struct' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1378' column='1' id='70c545cd'> + <class-decl name='fasync_struct' size-in-bits='384' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1373' column='1' id='70c545cd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='fa_lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='1379' column='1'/> + <var-decl name='fa_lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='1374' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='magic' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1380' column='1'/> + <var-decl name='magic' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1375' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='fa_fd' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1381' column='1'/> + <var-decl name='fa_fd' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1376' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='fa_next' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1382' column='1'/> + <var-decl name='fa_next' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1377' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='fa_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1383' column='1'/> + <var-decl name='fa_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1378' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='fa_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1384' column='1'/> + <var-decl name='fa_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='1379' column='1'/> </data-member> </class-decl> <typedef-decl name='rwlock_t' type-id='d7ab0a14' filepath='include/linux/rwlock_types.h' line='20' column='1' id='ac16795b'/> @@ -128711,140 +128634,140 @@ <var-decl name='start_idx' type-id='95e97e5e' visibility='default' filepath='include/linux/uio.h' line='49' column='1'/> </data-member> </class-decl> - <class-decl name='dir_context' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1836' column='1' id='d5476b80'> + <class-decl name='dir_context' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1831' column='1' id='d5476b80'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='actor' type-id='262124ef' visibility='default' filepath='include/linux/fs.h' line='1837' column='1'/> + <var-decl name='actor' type-id='262124ef' visibility='default' filepath='include/linux/fs.h' line='1832' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1838' column='1'/> + <var-decl name='pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1833' column='1'/> </data-member> </class-decl> - <typedef-decl name='filldir_t' type-id='78efe913' filepath='include/linux/fs.h' line='1833' column='1' id='262124ef'/> + <typedef-decl name='filldir_t' type-id='78efe913' filepath='include/linux/fs.h' line='1828' column='1' id='262124ef'/> <typedef-decl name='__poll_t' type-id='f0981eeb' filepath='include/uapi/linux/types.h' line='52' column='1' id='8f254b08'/> - <typedef-decl name='fl_owner_t' type-id='eaa32e2f' filepath='include/linux/fs.h' line='1062' column='1' id='bc5666d5'/> - <class-decl name='file_lock' size-in-bits='1984' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1122' column='1' id='23c73eb3'> + <typedef-decl name='fl_owner_t' type-id='eaa32e2f' filepath='include/linux/fs.h' line='1057' column='1' id='bc5666d5'/> + <class-decl name='file_lock' size-in-bits='1984' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1117' column='1' id='23c73eb3'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='fl_blocker' type-id='0343ce83' visibility='default' filepath='include/linux/fs.h' line='1123' column='1'/> + <var-decl name='fl_blocker' type-id='0343ce83' visibility='default' filepath='include/linux/fs.h' line='1118' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fl_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1124' column='1'/> + <var-decl name='fl_list' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1119' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='fl_link' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1125' column='1'/> + <var-decl name='fl_link' type-id='03a4a074' visibility='default' filepath='include/linux/fs.h' line='1120' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='fl_blocked_requests' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1126' column='1'/> + <var-decl name='fl_blocked_requests' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1121' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='fl_blocked_member' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1129' column='1'/> + <var-decl name='fl_blocked_member' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1124' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='fl_owner' type-id='bc5666d5' visibility='default' filepath='include/linux/fs.h' line='1132' column='1'/> + <var-decl name='fl_owner' type-id='bc5666d5' visibility='default' filepath='include/linux/fs.h' line='1127' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='fl_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1133' column='1'/> + <var-decl name='fl_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1128' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='fl_type' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1134' column='1'/> + <var-decl name='fl_type' type-id='002ac4a6' visibility='default' filepath='include/linux/fs.h' line='1129' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='fl_pid' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1135' column='1'/> + <var-decl name='fl_pid' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1130' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='736'> - <var-decl name='fl_link_cpu' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1136' column='1'/> + <var-decl name='fl_link_cpu' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1131' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='fl_wait' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1137' column='1'/> + <var-decl name='fl_wait' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1132' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='fl_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1138' column='1'/> + <var-decl name='fl_file' type-id='77e79a4b' visibility='default' filepath='include/linux/fs.h' line='1133' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='fl_start' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1139' column='1'/> + <var-decl name='fl_start' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1134' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='fl_end' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1140' column='1'/> + <var-decl name='fl_end' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='1135' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='fl_fasync' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1142' column='1'/> + <var-decl name='fl_fasync' type-id='5bb9c75d' visibility='default' filepath='include/linux/fs.h' line='1137' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='fl_break_time' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1144' column='1'/> + <var-decl name='fl_break_time' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1139' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='fl_downgrade_time' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1145' column='1'/> + <var-decl name='fl_downgrade_time' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='1140' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='fl_ops' type-id='dc4077ef' visibility='default' filepath='include/linux/fs.h' line='1147' column='1'/> + <var-decl name='fl_ops' type-id='dc4077ef' visibility='default' filepath='include/linux/fs.h' line='1142' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='fl_lmops' type-id='a548fbc8' visibility='default' filepath='include/linux/fs.h' line='1148' column='1'/> + <var-decl name='fl_lmops' type-id='a548fbc8' visibility='default' filepath='include/linux/fs.h' line='1143' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='fl_u' type-id='ff03d60a' visibility='default' filepath='include/linux/fs.h' line='1157' column='1'/> + <var-decl name='fl_u' type-id='ff03d60a' visibility='default' filepath='include/linux/fs.h' line='1152' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='android_reserved1' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1159' column='1'/> + <var-decl name='android_reserved1' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1154' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1160' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1155' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1161' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1156' column='1'/> </data-member> </class-decl> - <class-decl name='file_lock_operations' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1066' column='1' id='1958bd2a'> + <class-decl name='file_lock_operations' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1061' column='1' id='1958bd2a'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='fl_copy_lock' type-id='7b9768f0' visibility='default' filepath='include/linux/fs.h' line='1067' column='1'/> + <var-decl name='fl_copy_lock' type-id='7b9768f0' visibility='default' filepath='include/linux/fs.h' line='1062' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fl_release_private' type-id='c9e2bc02' visibility='default' filepath='include/linux/fs.h' line='1068' column='1'/> + <var-decl name='fl_release_private' type-id='c9e2bc02' visibility='default' filepath='include/linux/fs.h' line='1063' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1070' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1065' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1071' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1066' column='1'/> </data-member> </class-decl> - <class-decl name='lock_manager_operations' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1074' column='1' id='970ecd31'> + <class-decl name='lock_manager_operations' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1069' column='1' id='970ecd31'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lm_get_owner' type-id='d6e9f1fa' visibility='default' filepath='include/linux/fs.h' line='1075' column='1'/> + <var-decl name='lm_get_owner' type-id='d6e9f1fa' visibility='default' filepath='include/linux/fs.h' line='1070' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='lm_put_owner' type-id='9615a2e0' visibility='default' filepath='include/linux/fs.h' line='1076' column='1'/> + <var-decl name='lm_put_owner' type-id='9615a2e0' visibility='default' filepath='include/linux/fs.h' line='1071' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='lm_notify' type-id='c9e2bc02' visibility='default' filepath='include/linux/fs.h' line='1077' column='1'/> + <var-decl name='lm_notify' type-id='c9e2bc02' visibility='default' filepath='include/linux/fs.h' line='1072' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='lm_grant' type-id='bdada41a' visibility='default' filepath='include/linux/fs.h' line='1078' column='1'/> + <var-decl name='lm_grant' type-id='bdada41a' visibility='default' filepath='include/linux/fs.h' line='1073' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='lm_break' type-id='5fb34715' visibility='default' filepath='include/linux/fs.h' line='1079' column='1'/> + <var-decl name='lm_break' type-id='5fb34715' visibility='default' filepath='include/linux/fs.h' line='1074' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='lm_change' type-id='4817356d' visibility='default' filepath='include/linux/fs.h' line='1080' column='1'/> + <var-decl name='lm_change' type-id='4817356d' visibility='default' filepath='include/linux/fs.h' line='1075' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='lm_setup' type-id='628f3294' visibility='default' filepath='include/linux/fs.h' line='1081' column='1'/> + <var-decl name='lm_setup' type-id='628f3294' visibility='default' filepath='include/linux/fs.h' line='1076' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1083' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1084' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='1079' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__8' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1149' column='1' id='ff03d60a'> + <union-decl name='__anonymous_union__8' size-in-bits='256' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1144' column='1' id='ff03d60a'> <data-member access='public'> - <var-decl name='nfs_fl' type-id='17bacae5' visibility='default' filepath='include/linux/fs.h' line='1150' column='1'/> + <var-decl name='nfs_fl' type-id='17bacae5' visibility='default' filepath='include/linux/fs.h' line='1145' column='1'/> </data-member> <data-member access='public'> - <var-decl name='nfs4_fl' type-id='b811a3f5' visibility='default' filepath='include/linux/fs.h' line='1151' column='1'/> + <var-decl name='nfs4_fl' type-id='b811a3f5' visibility='default' filepath='include/linux/fs.h' line='1146' column='1'/> </data-member> <data-member access='public'> - <var-decl name='afs' type-id='ee4b5026' visibility='default' filepath='include/linux/fs.h' line='1156' column='1'/> + <var-decl name='afs' type-id='ee4b5026' visibility='default' filepath='include/linux/fs.h' line='1151' column='1'/> </data-member> </union-decl> <class-decl name='nfs_lock_info' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/nfs_fs_i.h' line='10' column='1' id='17bacae5'> @@ -128863,15 +128786,15 @@ <var-decl name='owner' type-id='a6f0152c' visibility='default' filepath='include/linux/nfs_fs_i.h' line='18' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__14' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1152' column='1' id='ee4b5026'> + <class-decl name='__anonymous_struct__14' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='1147' column='1' id='ee4b5026'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='link' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1153' column='1'/> + <var-decl name='link' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1148' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='state' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1154' column='1'/> + <var-decl name='state' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1149' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='debug_id' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1155' column='1'/> + <var-decl name='debug_id' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1150' column='1'/> </data-member> </class-decl> <class-decl name='seq_file' size-in-bits='1024' is-struct='yes' visibility='default' filepath='include/linux/seq_file.h' line='16' column='1' id='f3415517'> @@ -128939,24 +128862,24 @@ <enumerator name='WRITE_LIFE_EXTREME' value='5'/> </enum-decl> <typedef-decl name='fmode_t' type-id='f0981eeb' filepath='include/linux/types.h' line='155' column='1' id='2665334e'/> - <class-decl name='fown_struct' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='936' column='1' id='6b640edd'> + <class-decl name='fown_struct' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='931' column='1' id='6b640edd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='937' column='1'/> + <var-decl name='lock' type-id='ac16795b' visibility='default' filepath='include/linux/fs.h' line='932' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='pid' type-id='b94e5398' visibility='default' filepath='include/linux/fs.h' line='938' column='1'/> + <var-decl name='pid' type-id='b94e5398' visibility='default' filepath='include/linux/fs.h' line='933' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='pid_type' type-id='ce78cf46' visibility='default' filepath='include/linux/fs.h' line='939' column='1'/> + <var-decl name='pid_type' type-id='ce78cf46' visibility='default' filepath='include/linux/fs.h' line='934' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='940' column='1'/> + <var-decl name='uid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='euid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='940' column='1'/> + <var-decl name='euid' type-id='d80b72e6' visibility='default' filepath='include/linux/fs.h' line='935' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='signum' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='941' column='1'/> + <var-decl name='signum' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='936' column='1'/> </data-member> </class-decl> <enum-decl name='pid_type' filepath='include/linux/pid.h' line='9' column='1' id='ce78cf46'> @@ -129315,24 +129238,24 @@ <var-decl name='rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/cred.h' line='151' column='1'/> </data-member> </union-decl> - <class-decl name='file_ra_state' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='947' column='1' id='b31f003f'> + <class-decl name='file_ra_state' size-in-bits='256' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='942' column='1' id='b31f003f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='start' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='948' column='1'/> + <var-decl name='start' type-id='7359adad' visibility='default' filepath='include/linux/fs.h' line='943' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='949' column='1'/> + <var-decl name='size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='944' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='async_size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='950' column='1'/> + <var-decl name='async_size' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='945' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='ra_pages' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='953' column='1'/> + <var-decl name='ra_pages' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='948' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='mmap_miss' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='954' column='1'/> + <var-decl name='mmap_miss' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='949' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='prev_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='955' column='1'/> + <var-decl name='prev_pos' type-id='69bf7bee' visibility='default' filepath='include/linux/fs.h' line='950' column='1'/> </data-member> </class-decl> <typedef-decl name='errseq_t' type-id='19c2251e' filepath='include/linux/errseq.h' line='8' column='1' id='1da55f79'/> @@ -130121,96 +130044,96 @@ </data-member> </class-decl> <class-decl name='lock_class_key' is-struct='yes' visibility='default' filepath='include/linux/lockdep.h' line='459' column='1' id='47479831'/> - <class-decl name='super_operations' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2021' column='1' id='874691ab'> + <class-decl name='super_operations' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='2016' column='1' id='874691ab'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='alloc_inode' type-id='e8c4dba4' visibility='default' filepath='include/linux/fs.h' line='2022' column='1'/> + <var-decl name='alloc_inode' type-id='e8c4dba4' visibility='default' filepath='include/linux/fs.h' line='2017' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='destroy_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2023' column='1'/> + <var-decl name='destroy_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2018' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2024' column='1'/> + <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2019' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='dirty_inode' type-id='5f5506f6' visibility='default' filepath='include/linux/fs.h' line='2026' column='1'/> + <var-decl name='dirty_inode' type-id='5f5506f6' visibility='default' filepath='include/linux/fs.h' line='2021' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='write_inode' type-id='fd780be6' visibility='default' filepath='include/linux/fs.h' line='2027' column='1'/> + <var-decl name='write_inode' type-id='fd780be6' visibility='default' filepath='include/linux/fs.h' line='2022' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='drop_inode' type-id='28ba4492' visibility='default' filepath='include/linux/fs.h' line='2028' column='1'/> + <var-decl name='drop_inode' type-id='28ba4492' visibility='default' filepath='include/linux/fs.h' line='2023' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='evict_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2029' column='1'/> + <var-decl name='evict_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='2024' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='put_super' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2030' column='1'/> + <var-decl name='put_super' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2025' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='sync_fs' type-id='dcab5203' visibility='default' filepath='include/linux/fs.h' line='2031' column='1'/> + <var-decl name='sync_fs' type-id='dcab5203' visibility='default' filepath='include/linux/fs.h' line='2026' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='freeze_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2032' column='1'/> + <var-decl name='freeze_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2027' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='freeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2033' column='1'/> + <var-decl name='freeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2028' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='thaw_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2034' column='1'/> + <var-decl name='thaw_super' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2029' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='unfreeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2035' column='1'/> + <var-decl name='unfreeze_fs' type-id='d2f4c704' visibility='default' filepath='include/linux/fs.h' line='2030' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='statfs' type-id='35646c79' visibility='default' filepath='include/linux/fs.h' line='2036' column='1'/> + <var-decl name='statfs' type-id='35646c79' visibility='default' filepath='include/linux/fs.h' line='2031' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='remount_fs' type-id='552c8f87' visibility='default' filepath='include/linux/fs.h' line='2037' column='1'/> + <var-decl name='remount_fs' type-id='552c8f87' visibility='default' filepath='include/linux/fs.h' line='2032' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='umount_begin' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2038' column='1'/> + <var-decl name='umount_begin' type-id='1ff54a45' visibility='default' filepath='include/linux/fs.h' line='2033' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='show_options' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2040' column='1'/> + <var-decl name='show_options' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2035' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='show_devname' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2041' column='1'/> + <var-decl name='show_devname' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2036' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='show_path' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2042' column='1'/> + <var-decl name='show_path' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2037' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='show_stats' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2043' column='1'/> + <var-decl name='show_stats' type-id='c94f6b13' visibility='default' filepath='include/linux/fs.h' line='2038' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='quota_read' type-id='e295c77c' visibility='default' filepath='include/linux/fs.h' line='2045' column='1'/> + <var-decl name='quota_read' type-id='e295c77c' visibility='default' filepath='include/linux/fs.h' line='2040' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='quota_write' type-id='a9b95107' visibility='default' filepath='include/linux/fs.h' line='2046' column='1'/> + <var-decl name='quota_write' type-id='a9b95107' visibility='default' filepath='include/linux/fs.h' line='2041' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='get_dquots' type-id='ae02292a' visibility='default' filepath='include/linux/fs.h' line='2047' column='1'/> + <var-decl name='get_dquots' type-id='ae02292a' visibility='default' filepath='include/linux/fs.h' line='2042' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='bdev_try_to_free_page' type-id='ea44f8d2' visibility='default' filepath='include/linux/fs.h' line='2049' column='1'/> + <var-decl name='bdev_try_to_free_page' type-id='ea44f8d2' visibility='default' filepath='include/linux/fs.h' line='2044' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='nr_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2050' column='1'/> + <var-decl name='nr_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2045' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='free_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2052' column='1'/> + <var-decl name='free_cached_objects' type-id='c4facf61' visibility='default' filepath='include/linux/fs.h' line='2047' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2055' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2056' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2051' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2057' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2058' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/fs.h' line='2053' column='1'/> </data-member> </class-decl> <class-decl name='dquot' size-in-bits='1664' is-struct='yes' visibility='default' filepath='include/linux/quota.h' line='294' column='1' id='691a06da'> @@ -130709,15 +130632,15 @@ <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/quota.h' line='321' column='1'/> </data-member> </class-decl> - <class-decl name='sb_writers' size-in-bits='3136' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1472' column='1' id='fb476a2b'> + <class-decl name='sb_writers' size-in-bits='3136' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1467' column='1' id='fb476a2b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='frozen' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1473' column='1'/> + <var-decl name='frozen' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='1468' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='wait_unfrozen' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1474' column='1'/> + <var-decl name='wait_unfrozen' type-id='b5ab048f' visibility='default' filepath='include/linux/fs.h' line='1469' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='rw_sem' type-id='a09ef5a6' visibility='default' filepath='include/linux/fs.h' line='1475' column='1'/> + <var-decl name='rw_sem' type-id='a09ef5a6' visibility='default' filepath='include/linux/fs.h' line='1470' column='1'/> </data-member> </class-decl> <class-decl name='percpu_rw_semaphore' size-in-bits='960' is-struct='yes' visibility='default' filepath='include/linux/percpu-rwsem.h' line='12' column='1' id='ce848ab1'> @@ -130949,18 +130872,18 @@ <var-decl name='blocks' type-id='91ce1af9' visibility='default' filepath='include/linux/stat.h' line='49' column='1'/> </data-member> </class-decl> - <class-decl name='fiemap_extent_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1812' column='1' id='8ffe5745'> + <class-decl name='fiemap_extent_info' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1807' column='1' id='8ffe5745'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='fi_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1813' column='1'/> + <var-decl name='fi_flags' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1808' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='fi_extents_mapped' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1814' column='1'/> + <var-decl name='fi_extents_mapped' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1809' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='fi_extents_max' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1815' column='1'/> + <var-decl name='fi_extents_max' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='1810' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='fi_extents_start' type-id='d92598ce' visibility='default' filepath='include/linux/fs.h' line='1816' column='1'/> + <var-decl name='fi_extents_start' type-id='d92598ce' visibility='default' filepath='include/linux/fs.h' line='1811' column='1'/> </data-member> </class-decl> <class-decl name='fiemap_extent' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/uapi/linux/fiemap.h' line='17' column='1' id='eab08458'> @@ -130983,59 +130906,59 @@ <var-decl name='fe_reserved' type-id='3fa05d14' visibility='default' filepath='include/uapi/linux/fiemap.h' line='25' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__23' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='685' column='1' id='3ee18b51'> + <union-decl name='__anonymous_union__23' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='680' column='1' id='3ee18b51'> <data-member access='public'> - <var-decl name='i_nlink' type-id='20f5f452' visibility='default' filepath='include/linux/fs.h' line='686' column='1'/> + <var-decl name='i_nlink' type-id='20f5f452' visibility='default' filepath='include/linux/fs.h' line='681' column='1'/> </data-member> <data-member access='public'> - <var-decl name='__i_nlink' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='687' column='1'/> + <var-decl name='__i_nlink' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='682' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='724' column='1' id='cbd4a95b'> + <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='719' column='1' id='cbd4a95b'> <data-member access='public'> - <var-decl name='i_dentry' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='725' column='1'/> + <var-decl name='i_dentry' type-id='e151255a' visibility='default' filepath='include/linux/fs.h' line='720' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='726' column='1'/> + <var-decl name='i_rcu' type-id='e3d8ce29' visibility='default' filepath='include/linux/fs.h' line='721' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__25' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='736' column='1' id='67f3b119'> + <union-decl name='__anonymous_union__25' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='731' column='1' id='67f3b119'> <data-member access='public'> - <var-decl name='i_fop' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='737' column='1'/> + <var-decl name='i_fop' type-id='61758ee5' visibility='default' filepath='include/linux/fs.h' line='732' column='1'/> </data-member> <data-member access='public'> - <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='738' column='1'/> + <var-decl name='free_inode' type-id='4f3d95df' visibility='default' filepath='include/linux/fs.h' line='733' column='1'/> </data-member> </union-decl> - <class-decl name='file_lock_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1164' column='1' id='fb0c2987'> + <class-decl name='file_lock_context' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='1159' column='1' id='fb0c2987'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='flc_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1165' column='1'/> + <var-decl name='flc_lock' type-id='fb4018a0' visibility='default' filepath='include/linux/fs.h' line='1160' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='flc_flock' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1166' column='1'/> + <var-decl name='flc_flock' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1161' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='flc_posix' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1167' column='1'/> + <var-decl name='flc_posix' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1162' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='flc_lease' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1168' column='1'/> + <var-decl name='flc_lease' type-id='72f469ec' visibility='default' filepath='include/linux/fs.h' line='1163' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='743' column='1' id='d1afa4fe'> + <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='738' column='1' id='d1afa4fe'> <data-member access='public'> - <var-decl name='i_pipe' type-id='15d29710' visibility='default' filepath='include/linux/fs.h' line='744' column='1'/> + <var-decl name='i_pipe' type-id='15d29710' visibility='default' filepath='include/linux/fs.h' line='739' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='745' column='1'/> + <var-decl name='i_bdev' type-id='b88dd945' visibility='default' filepath='include/linux/fs.h' line='740' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_cdev' type-id='3e6eb939' visibility='default' filepath='include/linux/fs.h' line='746' column='1'/> + <var-decl name='i_cdev' type-id='3e6eb939' visibility='default' filepath='include/linux/fs.h' line='741' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_link' type-id='26a90f95' visibility='default' filepath='include/linux/fs.h' line='747' column='1'/> + <var-decl name='i_link' type-id='26a90f95' visibility='default' filepath='include/linux/fs.h' line='742' column='1'/> </data-member> <data-member access='public'> - <var-decl name='i_dir_seq' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='748' column='1'/> + <var-decl name='i_dir_seq' type-id='f0981eeb' visibility='default' filepath='include/linux/fs.h' line='743' column='1'/> </data-member> </union-decl> <class-decl name='address_space_operations' size-in-bits='1600' is-struct='yes' visibility='default' filepath='include/linux/fs.h' line='370' column='1' id='66fa8ce5'> @@ -132139,383 +132062,352 @@ <var-decl name='u6_addr32' type-id='30180d4b' visibility='default' filepath='include/uapi/linux/in6.h' line='38' column='1'/> </data-member> </union-decl> - <class-decl name='sk_buff' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1' id='ae8bfcdd'> + <class-decl name='sk_buff' size-in-bits='1920' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='691' column='1' id='ae8bfcdd'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='' type-id='da6f1b1a' visibility='default' filepath='include/linux/skbuff.h' line='694' column='1'/> + <var-decl name='' type-id='da6f1b1a' visibility='default' filepath='include/linux/skbuff.h' line='692' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='' type-id='a6d66544' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1'/> + <var-decl name='' type-id='a6d66544' visibility='default' filepath='include/linux/skbuff.h' line='711' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='' type-id='b24a5a7e' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1'/> + <var-decl name='' type-id='b24a5a7e' visibility='default' filepath='include/linux/skbuff.h' line='716' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='cb' type-id='36d7f119' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1'/> + <var-decl name='cb' type-id='36d7f119' visibility='default' filepath='include/linux/skbuff.h' line='726' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='' type-id='271a40b8' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1'/> + <var-decl name='' type-id='271a40b8' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='_nfct' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='739' column='1'/> + <var-decl name='_nfct' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='737' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='741' column='1'/> + <var-decl name='len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='739' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='928'> - <var-decl name='data_len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='742' column='1'/> + <var-decl name='data_len' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='740' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='mac_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='743' column='1'/> + <var-decl name='mac_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='741' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='976'> - <var-decl name='hdr_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='744' column='1'/> + <var-decl name='hdr_len' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='742' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='992'> - <var-decl name='queue_mapping' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='749' column='1'/> + <var-decl name='queue_mapping' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='747' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1008'> - <var-decl name='__cloned_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='759' column='1'/> + <var-decl name='__cloned_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='757' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='cloned' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='760' column='1'/> + <var-decl name='cloned' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='758' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='nohdr' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='761' column='1'/> + <var-decl name='nohdr' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='759' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='fclone' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/> + <var-decl name='fclone' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='760' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='peeked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='763' column='1'/> + <var-decl name='peeked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='761' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='head_frag' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='764' column='1'/> + <var-decl name='head_frag' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='762' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='pfmemalloc' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='765' column='1'/> + <var-decl name='pfmemalloc' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='763' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1016'> - <var-decl name='active_extensions' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='767' column='1'/> + <var-decl name='active_extensions' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='765' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='headers_start' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='773' column='1'/> + <var-decl name='headers_start' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='771' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='__pkt_type_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='784' column='1'/> + <var-decl name='__pkt_type_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='782' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pkt_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='785' column='1'/> + <var-decl name='pkt_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='783' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='ignore_df' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='786' column='1'/> + <var-decl name='ignore_df' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='784' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='nf_trace' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='787' column='1'/> + <var-decl name='nf_trace' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='785' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='ip_summed' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='788' column='1'/> + <var-decl name='ip_summed' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='786' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='ooo_okay' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='789' column='1'/> + <var-decl name='ooo_okay' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='787' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='l4_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='791' column='1'/> + <var-decl name='l4_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='789' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='sw_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='792' column='1'/> + <var-decl name='sw_hash' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='790' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='wifi_acked_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='793' column='1'/> + <var-decl name='wifi_acked_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='791' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='wifi_acked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='794' column='1'/> + <var-decl name='wifi_acked' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='792' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='no_fcs' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='795' column='1'/> + <var-decl name='no_fcs' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='793' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='encapsulation' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='797' column='1'/> + <var-decl name='encapsulation' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='795' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='encap_hdr_csum' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='798' column='1'/> + <var-decl name='encap_hdr_csum' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='796' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='csum_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='799' column='1'/> + <var-decl name='csum_valid' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='797' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1040'> - <var-decl name='__pkt_vlan_present_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='807' column='1'/> + <var-decl name='__pkt_vlan_present_offset' type-id='167619f6' visibility='default' filepath='include/linux/skbuff.h' line='805' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='vlan_present' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='808' column='1'/> + <var-decl name='vlan_present' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='806' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='csum_complete_sw' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='809' column='1'/> + <var-decl name='csum_complete_sw' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='807' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='csum_level' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='810' column='1'/> + <var-decl name='csum_level' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='808' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='csum_not_inet' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='811' column='1'/> + <var-decl name='csum_not_inet' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='809' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='dst_pending_confirm' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='812' column='1'/> + <var-decl name='dst_pending_confirm' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='810' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='ndisc_nodetype' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='814' column='1'/> + <var-decl name='ndisc_nodetype' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='812' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='ipvs_property' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='817' column='1'/> + <var-decl name='ipvs_property' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='815' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='inner_protocol_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='818' column='1'/> + <var-decl name='inner_protocol_type' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='816' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='remcsum_offload' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='819' column='1'/> + <var-decl name='remcsum_offload' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='817' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='tc_skip_classify' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='825' column='1'/> + <var-decl name='tc_skip_classify' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='823' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='tc_at_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='826' column='1'/> + <var-decl name='tc_at_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='824' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='redirected' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='829' column='1'/> + <var-decl name='redirected' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='827' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='from_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='830' column='1'/> + <var-decl name='from_ingress' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='828' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1056'> - <var-decl name='tc_index' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='837' column='1'/> + <var-decl name='tc_index' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='835' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='' type-id='b4fc55b7' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1'/> + <var-decl name='' type-id='b4fc55b7' visibility='default' filepath='include/linux/skbuff.h' line='838' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1120'> - <var-decl name='priority' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='847' column='1'/> + <var-decl name='priority' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='845' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='skb_iif' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='848' column='1'/> + <var-decl name='skb_iif' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='846' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1184'> - <var-decl name='hash' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='849' column='1'/> + <var-decl name='hash' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='847' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='vlan_proto' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='850' column='1'/> + <var-decl name='vlan_proto' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='848' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1232'> - <var-decl name='vlan_tci' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1'/> + <var-decl name='vlan_tci' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='849' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1248'> - <var-decl name='' type-id='8c3ee840' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1'/> + <var-decl name='' type-id='8c3ee840' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1280'> - <var-decl name='secmark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='859' column='1'/> + <var-decl name='secmark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='857' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1312'> - <var-decl name='' type-id='9c81e675' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1'/> + <var-decl name='' type-id='9c81e675' visibility='default' filepath='include/linux/skbuff.h' line='860' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1344'> - <var-decl name='' type-id='b97daab4' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1'/> + <var-decl name='' type-id='b97daab4' visibility='default' filepath='include/linux/skbuff.h' line='865' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1360'> - <var-decl name='inner_transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='872' column='1'/> + <var-decl name='inner_transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1376'> - <var-decl name='inner_network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='873' column='1'/> + <var-decl name='inner_network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='871' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1392'> - <var-decl name='inner_mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='874' column='1'/> + <var-decl name='inner_mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='872' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1408'> - <var-decl name='protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='876' column='1'/> + <var-decl name='protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='874' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1424'> - <var-decl name='transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='877' column='1'/> + <var-decl name='transport_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='875' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1440'> - <var-decl name='network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='878' column='1'/> + <var-decl name='network_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='876' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1456'> - <var-decl name='mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='879' column='1'/> + <var-decl name='mac_header' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='877' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='headers_end' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='882' column='1'/> + <var-decl name='headers_end' type-id='d5016f6f' visibility='default' filepath='include/linux/skbuff.h' line='880' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1472'> - <var-decl name='' type-id='607684dc' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='883' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='904' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='884' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1600'> - <var-decl name='tail' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='907' column='1'/> + <var-decl name='tail' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='887' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1632'> - <var-decl name='end' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='908' column='1'/> + <var-decl name='end' type-id='5c1abc34' visibility='default' filepath='include/linux/skbuff.h' line='888' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1664'> - <var-decl name='head' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='909' column='1'/> + <var-decl name='head' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='889' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='data' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='910' column='1'/> + <var-decl name='data' type-id='cf536864' visibility='default' filepath='include/linux/skbuff.h' line='890' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='truesize' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='911' column='1'/> + <var-decl name='truesize' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='891' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1824'> - <var-decl name='users' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='912' column='1'/> + <var-decl name='users' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='892' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='extensions' type-id='374692c7' visibility='default' filepath='include/linux/skbuff.h' line='916' column='1'/> + <var-decl name='extensions' type-id='374692c7' visibility='default' filepath='include/linux/skbuff.h' line='896' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__33' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='694' column='1' id='da6f1b1a'> + <union-decl name='__anonymous_union__33' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='692' column='1' id='da6f1b1a'> <data-member access='public'> - <var-decl name='' type-id='fe3b99ac' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1'/> + <var-decl name='' type-id='fe3b99ac' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1'/> </data-member> <data-member access='public'> - <var-decl name='rbnode' type-id='2a8a6332' visibility='default' filepath='include/linux/skbuff.h' line='709' column='1'/> + <var-decl name='rbnode' type-id='2a8a6332' visibility='default' filepath='include/linux/skbuff.h' line='707' column='1'/> </data-member> <data-member access='public'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='710' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='708' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__32' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1' id='fe3b99ac'> + <class-decl name='__anonymous_struct__32' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='693' column='1' id='fe3b99ac'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='697' column='1'/> + <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='695' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1'/> + <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='696' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='' type-id='1285aa79' visibility='default' filepath='include/linux/skbuff.h' line='700' column='1'/> + <var-decl name='' type-id='1285aa79' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='700' column='1' id='1285aa79'> + <union-decl name='__anonymous_union__34' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='698' column='1' id='1285aa79'> <data-member access='public'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/skbuff.h' line='701' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/skbuff.h' line='699' column='1'/> </data-member> <data-member access='public'> - <var-decl name='dev_scratch' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='706' column='1'/> + <var-decl name='dev_scratch' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='704' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1' id='a6d66544'> + <union-decl name='__anonymous_union__35' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='711' column='1' id='a6d66544'> <data-member access='public'> - <var-decl name='sk' type-id='f772df6d' visibility='default' filepath='include/linux/skbuff.h' line='714' column='1'/> + <var-decl name='sk' type-id='f772df6d' visibility='default' filepath='include/linux/skbuff.h' line='712' column='1'/> </data-member> <data-member access='public'> - <var-decl name='ip_defrag_offset' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='715' column='1'/> + <var-decl name='ip_defrag_offset' type-id='95e97e5e' visibility='default' filepath='include/linux/skbuff.h' line='713' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__36' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1' id='b24a5a7e'> + <union-decl name='__anonymous_union__36' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='716' column='1' id='b24a5a7e'> <data-member access='public'> - <var-decl name='tstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='719' column='1'/> + <var-decl name='tstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='717' column='1'/> </data-member> <data-member access='public'> - <var-decl name='skb_mstamp_ns' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='720' column='1'/> + <var-decl name='skb_mstamp_ns' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='718' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__37' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1' id='271a40b8'> + <union-decl name='__anonymous_union__37' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='728' column='1' id='271a40b8'> <data-member access='public'> - <var-decl name='' type-id='710cec71' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1'/> + <var-decl name='' type-id='710cec71' visibility='default' filepath='include/linux/skbuff.h' line='729' column='1'/> </data-member> <data-member access='public'> - <var-decl name='tcp_tsorted_anchor' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='735' column='1'/> + <var-decl name='tcp_tsorted_anchor' type-id='72f469ec' visibility='default' filepath='include/linux/skbuff.h' line='733' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__33' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1' id='710cec71'> + <class-decl name='__anonymous_struct__33' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='729' column='1' id='710cec71'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='_skb_refdst' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='732' column='1'/> + <var-decl name='_skb_refdst' type-id='7359adad' visibility='default' filepath='include/linux/skbuff.h' line='730' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='destructor' type-id='0ef96694' visibility='default' filepath='include/linux/skbuff.h' line='733' column='1'/> + <var-decl name='destructor' type-id='0ef96694' visibility='default' filepath='include/linux/skbuff.h' line='731' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__38' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1' id='b4fc55b7'> + <union-decl name='__anonymous_union__38' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='838' column='1' id='b4fc55b7'> <data-member access='public'> - <var-decl name='csum' type-id='fbd88bba' visibility='default' filepath='include/linux/skbuff.h' line='841' column='1'/> + <var-decl name='csum' type-id='fbd88bba' visibility='default' filepath='include/linux/skbuff.h' line='839' column='1'/> </data-member> <data-member access='public'> - <var-decl name='' type-id='358587ec' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1'/> + <var-decl name='' type-id='358587ec' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1'/> </data-member> </union-decl> <typedef-decl name='__wsum' type-id='3f1a6b60' filepath='include/uapi/linux/types.h' line='37' column='1' id='fbd88bba'/> - <class-decl name='__anonymous_struct__34' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1' id='358587ec'> + <class-decl name='__anonymous_struct__34' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='840' column='1' id='358587ec'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='csum_start' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='843' column='1'/> + <var-decl name='csum_start' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='841' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='csum_offset' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='844' column='1'/> + <var-decl name='csum_offset' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='842' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__39' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1' id='8c3ee840'> + <union-decl name='__anonymous_union__39' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='851' column='1' id='8c3ee840'> <data-member access='public'> - <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='854' column='1'/> + <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='852' column='1'/> </data-member> <data-member access='public'> - <var-decl name='sender_cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='855' column='1'/> + <var-decl name='sender_cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/skbuff.h' line='853' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__40' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1' id='9c81e675'> + <union-decl name='__anonymous_union__40' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='860' column='1' id='9c81e675'> <data-member access='public'> - <var-decl name='mark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='863' column='1'/> + <var-decl name='mark' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='861' column='1'/> </data-member> <data-member access='public'> - <var-decl name='reserved_tailroom' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='864' column='1'/> + <var-decl name='reserved_tailroom' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='862' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__41' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1' id='b97daab4'> + <union-decl name='__anonymous_union__41' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='865' column='1' id='b97daab4'> <data-member access='public'> - <var-decl name='inner_protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='868' column='1'/> + <var-decl name='inner_protocol' type-id='84a5c3d4' visibility='default' filepath='include/linux/skbuff.h' line='866' column='1'/> </data-member> <data-member access='public'> - <var-decl name='inner_ipproto' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='869' column='1'/> + <var-decl name='inner_ipproto' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='867' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__42' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='607684dc'> - <data-member access='public'> - <var-decl name='' type-id='51db537c' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public'> - <var-decl name='' type-id='156952c4' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public'> - <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - </union-decl> - <class-decl name='__anonymous_struct__35' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='51db537c'> + <typedef-decl name='sk_buff_data_t' type-id='f0981eeb' filepath='include/linux/skbuff.h' line='608' column='1' id='5c1abc34'/> + <class-decl name='skb_ext' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='4137' column='1' id='a8c69bdf'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='scm_io_uring' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='8'> - <var-decl name='android_kabi_reserved1_padding1' type-id='8f048e17' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='android_kabi_reserved1_padding2' type-id='d315442e' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> + <var-decl name='refcnt' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='4138' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='android_kabi_reserved1_padding3' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - </class-decl> - <class-decl name='__anonymous_struct__36' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='156952c4'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1'/> - </data-member> - </class-decl> - <union-decl name='__anonymous_union__43' is-anonymous='yes' visibility='default' filepath='include/linux/skbuff.h' line='897' column='1' id='2a125a28'/> - <typedef-decl name='sk_buff_data_t' type-id='f0981eeb' filepath='include/linux/skbuff.h' line='609' column='1' id='5c1abc34'/> - <class-decl name='skb_ext' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='4181' column='1' id='a8c69bdf'> - <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='refcnt' type-id='64615833' visibility='default' filepath='include/linux/skbuff.h' line='4182' column='1'/> - </data-member> - <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='offset' type-id='cf114704' visibility='default' filepath='include/linux/skbuff.h' line='4183' column='1'/> + <var-decl name='offset' type-id='cf114704' visibility='default' filepath='include/linux/skbuff.h' line='4139' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='48'> - <var-decl name='chunks' type-id='f9b06939' visibility='default' filepath='include/linux/skbuff.h' line='4184' column='1'/> + <var-decl name='chunks' type-id='f9b06939' visibility='default' filepath='include/linux/skbuff.h' line='4140' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='data' type-id='e84913bd' visibility='default' filepath='include/linux/skbuff.h' line='4185' column='1'/> + <var-decl name='data' type-id='e84913bd' visibility='default' filepath='include/linux/skbuff.h' line='4141' column='1'/> </data-member> </class-decl> <class-decl name='rhashtable_params' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/linux/rhashtable-types.h' line='56' column='1' id='e4c11782'> @@ -132602,7 +132494,7 @@ </data-member> </class-decl> <typedef-decl name='seqlock_t' type-id='c87ee7e4' filepath='include/linux/seqlock.h' line='414' column='1' id='e6cd5ecf'/> - <class-decl name='__anonymous_struct__37' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='e6cd5ecf' visibility='default' filepath='include/linux/seqlock.h' line='411' column='1' id='c87ee7e4'> + <class-decl name='__anonymous_struct__35' size-in-bits='64' is-struct='yes' is-anonymous='yes' naming-typedef-id='e6cd5ecf' visibility='default' filepath='include/linux/seqlock.h' line='411' column='1' id='c87ee7e4'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='seqcount' type-id='3a74ff0b' visibility='default' filepath='include/linux/seqlock.h' line='412' column='1'/> </data-member> @@ -132630,7 +132522,7 @@ </data-member> </class-decl> <typedef-decl name='siphash_key_t' type-id='a1908dcc' filepath='include/linux/siphash.h' line='22' column='1' id='7799da43'/> - <class-decl name='__anonymous_struct__38' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='7799da43' visibility='default' filepath='include/linux/siphash.h' line='20' column='1' id='a1908dcc'> + <class-decl name='__anonymous_struct__36' size-in-bits='128' is-struct='yes' is-anonymous='yes' naming-typedef-id='7799da43' visibility='default' filepath='include/linux/siphash.h' line='20' column='1' id='a1908dcc'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='key' type-id='24a375b2' visibility='default' filepath='include/linux/siphash.h' line='21' column='1'/> </data-member> @@ -132940,7 +132832,7 @@ <var-decl name='counters' type-id='9f2cce4b' visibility='default' filepath='include/linux/percpu_counter.h' line='26' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__39' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='111' column='1' id='a03c964b'> + <class-decl name='__anonymous_struct__37' size-in-bits='128' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/netns/ipv6.h' line='111' column='1' id='a03c964b'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='head' type-id='e151255a' visibility='default' filepath='include/net/netns/ipv6.h' line='112' column='1'/> </data-member> @@ -133190,18 +133082,18 @@ <var-decl name='fqdir' type-id='943ad75f' visibility='default' filepath='include/net/netns/ipv6.h' line='122' column='1'/> </data-member> </class-decl> - <class-decl name='sk_buff_head' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='292' column='1' id='e61c85d0'> + <class-decl name='sk_buff_head' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='291' column='1' id='e61c85d0'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='294' column='1'/> + <var-decl name='next' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='293' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='295' column='1'/> + <var-decl name='prev' type-id='0fbf3cfd' visibility='default' filepath='include/linux/skbuff.h' line='294' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='qlen' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='297' column='1'/> + <var-decl name='qlen' type-id='3f1a6b60' visibility='default' filepath='include/linux/skbuff.h' line='296' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/skbuff.h' line='298' column='1'/> + <var-decl name='lock' type-id='fb4018a0' visibility='default' filepath='include/linux/skbuff.h' line='297' column='1'/> </data-member> </class-decl> <class-decl name='netns_xfrm' size-in-bits='7168' is-struct='yes' visibility='default' filepath='include/net/netns/xfrm.h' line='33' column='1' id='3d2d291b'> @@ -133472,7 +133364,7 @@ <var-decl name='flags' type-id='f0981eeb' visibility='default' filepath='include/linux/iocontext.h' line='92' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__44' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/iocontext.h' line='83' column='1' id='df248743'> + <union-decl name='__anonymous_union__42' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/iocontext.h' line='83' column='1' id='df248743'> <data-member access='public'> <var-decl name='q_node' type-id='72f469ec' visibility='default' filepath='include/linux/iocontext.h' line='84' column='1'/> </data-member> @@ -133480,7 +133372,7 @@ <var-decl name='__rcu_icq_cache' type-id='f3b4aca8' visibility='default' filepath='include/linux/iocontext.h' line='85' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__45' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/iocontext.h' line='87' column='1' id='eb20ccf0'> + <union-decl name='__anonymous_union__43' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/linux/iocontext.h' line='87' column='1' id='eb20ccf0'> <data-member access='public'> <var-decl name='ioc_node' type-id='03a4a074' visibility='default' filepath='include/linux/iocontext.h' line='88' column='1'/> </data-member> @@ -133502,7 +133394,7 @@ <enumerator name='UTASK_SSTEP_ACK' value='2'/> <enumerator name='UTASK_SSTEP_TRAPPED' value='3'/> </enum-decl> - <union-decl name='__anonymous_union__47' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='64' column='1' id='f5a928fc'> + <union-decl name='__anonymous_union__45' size-in-bits='192' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='64' column='1' id='f5a928fc'> <data-member access='public'> <var-decl name='' type-id='2b31becf' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1'/> </data-member> @@ -133510,7 +133402,7 @@ <var-decl name='' type-id='46982a3f' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1'/> </data-member> </union-decl> - <class-decl name='__anonymous_struct__40' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='2b31becf'> + <class-decl name='__anonymous_struct__38' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='65' column='1' id='2b31becf'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='autask' type-id='79aea64f' visibility='default' filepath='include/linux/uprobes.h' line='66' column='1'/> </data-member> @@ -133519,7 +133411,7 @@ </data-member> </class-decl> <class-decl name='arch_uprobe_task' is-struct='yes' visibility='default' filepath='arch/arm64/include/asm/uprobes.h' line='21' column='1' id='79aea64f'/> - <class-decl name='__anonymous_struct__41' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='46982a3f'> + <class-decl name='__anonymous_struct__39' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/uprobes.h' line='70' column='1' id='46982a3f'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='dup_xol_work' type-id='e3d8ce29' visibility='default' filepath='include/linux/uprobes.h' line='71' column='1'/> </data-member> @@ -135124,7 +135016,7 @@ <abi-instr address-size='64' path='init/main.c' language='LANG_C89'> <type-decl name='bool' size-in-bits='8' id='c894953d'/> <type-decl name='unnamed-enum-underlying-type-32' is-anonymous='yes' size-in-bits='32' alignment-in-bits='32' id='9cac1fee'/> - <enum-decl name='system_states' filepath='include/linux/kernel.h' line='570' column='1' id='2ead22b4'> + <enum-decl name='system_states' filepath='include/linux/kernel.h' line='569' column='1' id='2ead22b4'> <underlying-type type-id='9cac1fee'/> <enumerator name='SYSTEM_BOOTING' value='0'/> <enumerator name='SYSTEM_SCHEDULING' value='1'/> @@ -135343,21 +135235,21 @@ <var-decl name='tg' type-id='3c32f9de' visibility='default' filepath='kernel/sched/sched.h' line='573' column='1'/> </data-member> </class-decl> - <class-decl name='cgroup_namespace' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/cgroup.h' line='867' column='1' id='e54806c5'> + <class-decl name='cgroup_namespace' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/linux/cgroup.h' line='866' column='1' id='e54806c5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='count' type-id='64615833' visibility='default' filepath='include/linux/cgroup.h' line='868' column='1'/> + <var-decl name='count' type-id='64615833' visibility='default' filepath='include/linux/cgroup.h' line='867' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='ns' type-id='99f367f2' visibility='default' filepath='include/linux/cgroup.h' line='869' column='1'/> + <var-decl name='ns' type-id='99f367f2' visibility='default' filepath='include/linux/cgroup.h' line='868' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/cgroup.h' line='870' column='1'/> + <var-decl name='user_ns' type-id='c0ced320' visibility='default' filepath='include/linux/cgroup.h' line='869' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='ucounts' type-id='b1d4934a' visibility='default' filepath='include/linux/cgroup.h' line='871' column='1'/> + <var-decl name='ucounts' type-id='b1d4934a' visibility='default' filepath='include/linux/cgroup.h' line='870' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='root_cset' type-id='85d57723' visibility='default' filepath='include/linux/cgroup.h' line='872' column='1'/> + <var-decl name='root_cset' type-id='85d57723' visibility='default' filepath='include/linux/cgroup.h' line='871' column='1'/> </data-member> </class-decl> <class-decl name='compat_robust_list_head' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/linux/compat.h' line='378' column='1' id='1b9c6d35'> @@ -138787,15 +138679,15 @@ </class-decl> <typedef-decl name='uid_t' type-id='70734f24' filepath='include/linux/types.h' line='32' column='1' id='354978ed'/> <typedef-decl name='__kernel_uid32_t' type-id='f0981eeb' filepath='include/uapi/asm-generic/posix_types.h' line='49' column='1' id='70734f24'/> - <class-decl name='seccomp' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/seccomp.h' line='31' column='1' id='298af459'> + <class-decl name='seccomp' size-in-bits='128' is-struct='yes' visibility='default' filepath='include/linux/seccomp.h' line='30' column='1' id='298af459'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/seccomp.h' line='32' column='1'/> + <var-decl name='mode' type-id='95e97e5e' visibility='default' filepath='include/linux/seccomp.h' line='31' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='filter_count' type-id='49178f86' visibility='default' filepath='include/linux/seccomp.h' line='33' column='1'/> + <var-decl name='filter_count' type-id='49178f86' visibility='default' filepath='include/linux/seccomp.h' line='32' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='filter' type-id='2a128f5a' visibility='default' filepath='include/linux/seccomp.h' line='34' column='1'/> + <var-decl name='filter' type-id='2a128f5a' visibility='default' filepath='include/linux/seccomp.h' line='33' column='1'/> </data-member> </class-decl> <class-decl name='wake_q_node' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/sched.h' line='632' column='1' id='69970be2'> @@ -139288,7 +139180,7 @@ </function-type> </abi-instr> <abi-instr address-size='64' path='kernel/bpf/core.c' language='LANG_C89'> - <var-decl name='bpf_stats_enabled_key' type-id='237c0d27' mangled-name='bpf_stats_enabled_key' visibility='default' filepath='kernel/bpf/core.c' line='2162' column='1' elf-symbol-id='bpf_stats_enabled_key'/> + <var-decl name='bpf_stats_enabled_key' type-id='237c0d27' mangled-name='bpf_stats_enabled_key' visibility='default' filepath='kernel/bpf/core.c' line='2163' column='1' elf-symbol-id='bpf_stats_enabled_key'/> <var-decl name='__tracepoint_xdp_exception' type-id='4ca0c298' mangled-name='__tracepoint_xdp_exception' visibility='default' filepath='include/trace/events/xdp.h' line='28' column='1' elf-symbol-id='__tracepoint_xdp_exception'/> </abi-instr> <abi-instr address-size='64' path='kernel/bpf/syscall.c' language='LANG_C89'> @@ -139859,12 +139751,12 @@ <parameter type-id='2bf16f59' name='event' filepath='kernel/events/core.c' line='4688' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='perf_event_create_kernel_counter' mangled-name='perf_event_create_kernel_counter' filepath='kernel/events/core.c' line='11436' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='perf_event_create_kernel_counter'> - <parameter type-id='20862e61' name='attr' filepath='kernel/events/core.c' line='11436' column='1'/> - <parameter type-id='95e97e5e' name='cpu' filepath='kernel/events/core.c' line='11436' column='1'/> - <parameter type-id='f23e2572' name='task' filepath='kernel/events/core.c' line='11437' column='1'/> - <parameter type-id='20a2e4e6' name='overflow_handler' filepath='kernel/events/core.c' line='11438' column='1'/> - <parameter type-id='eaa32e2f' name='context' filepath='kernel/events/core.c' line='11439' column='1'/> + <function-decl name='perf_event_create_kernel_counter' mangled-name='perf_event_create_kernel_counter' filepath='kernel/events/core.c' line='11434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='perf_event_create_kernel_counter'> + <parameter type-id='20862e61' name='attr' filepath='kernel/events/core.c' line='11434' column='1'/> + <parameter type-id='95e97e5e' name='cpu' filepath='kernel/events/core.c' line='11434' column='1'/> + <parameter type-id='f23e2572' name='task' filepath='kernel/events/core.c' line='11435' column='1'/> + <parameter type-id='20a2e4e6' name='overflow_handler' filepath='kernel/events/core.c' line='11436' column='1'/> + <parameter type-id='eaa32e2f' name='context' filepath='kernel/events/core.c' line='11437' column='1'/> <return type-id='2bf16f59'/> </function-decl> <function-decl name='perf_event_disable' mangled-name='perf_event_disable' filepath='kernel/events/core.c' line='2281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='perf_event_disable'> @@ -139960,13 +139852,13 @@ </array-type-def> </abi-instr> <abi-instr address-size='64' path='kernel/exit.c' language='LANG_C89'> - <function-decl name='do_exit' mangled-name='do_exit' filepath='kernel/exit.c' line='762' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='do_exit'> - <parameter type-id='bd54fe1a' name='code' filepath='kernel/exit.c' line='762' column='1'/> + <function-decl name='do_exit' mangled-name='do_exit' filepath='kernel/exit.c' line='715' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='do_exit'> + <parameter type-id='bd54fe1a' name='code' filepath='kernel/exit.c' line='715' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='complete_and_exit' mangled-name='complete_and_exit' filepath='kernel/exit.c' line='940' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='complete_and_exit'> - <parameter type-id='389faaf7' name='comp' filepath='kernel/exit.c' line='940' column='1'/> - <parameter type-id='bd54fe1a' name='code' filepath='kernel/exit.c' line='940' column='1'/> + <function-decl name='complete_and_exit' mangled-name='complete_and_exit' filepath='kernel/exit.c' line='868' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='complete_and_exit'> + <parameter type-id='389faaf7' name='comp' filepath='kernel/exit.c' line='868' column='1'/> + <parameter type-id='bd54fe1a' name='code' filepath='kernel/exit.c' line='868' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -140145,24 +140037,24 @@ <pointer-type-def type-id='17f2d2f2' size-in-bits='64' id='c5c535b4'/> <pointer-type-def type-id='2376c3ec' size-in-bits='64' id='8912440a'/> <pointer-type-def type-id='0d029111' size-in-bits='64' id='4616a179'/> - <function-decl name='__mmdrop' mangled-name='__mmdrop' filepath='kernel/fork.c' line='692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mmdrop'> - <parameter type-id='df4b7819' name='mm' filepath='kernel/fork.c' line='692' column='1'/> + <function-decl name='__mmdrop' mangled-name='__mmdrop' filepath='kernel/fork.c' line='689' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__mmdrop'> + <parameter type-id='df4b7819' name='mm' filepath='kernel/fork.c' line='689' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__put_task_struct' mangled-name='__put_task_struct' filepath='kernel/fork.c' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__put_task_struct'> - <parameter type-id='f23e2572' name='tsk' filepath='kernel/fork.c' line='741' column='1'/> + <function-decl name='__put_task_struct' mangled-name='__put_task_struct' filepath='kernel/fork.c' line='738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__put_task_struct'> + <parameter type-id='f23e2572' name='tsk' filepath='kernel/fork.c' line='738' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='mmput' mangled-name='mmput' filepath='kernel/fork.c' line='1109' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmput'> - <parameter type-id='df4b7819' name='mm' filepath='kernel/fork.c' line='1109' column='1'/> + <function-decl name='mmput' mangled-name='mmput' filepath='kernel/fork.c' line='1106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='mmput'> + <parameter type-id='df4b7819' name='mm' filepath='kernel/fork.c' line='1106' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='get_task_mm' mangled-name='get_task_mm' filepath='kernel/fork.c' line='1216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_task_mm'> - <parameter type-id='f23e2572' name='task' filepath='kernel/fork.c' line='1216' column='1'/> + <function-decl name='get_task_mm' mangled-name='get_task_mm' filepath='kernel/fork.c' line='1213' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_task_mm'> + <parameter type-id='f23e2572' name='task' filepath='kernel/fork.c' line='1213' column='1'/> <return type-id='df4b7819'/> </function-decl> - <function-decl name='get_task_exe_file' mangled-name='get_task_exe_file' filepath='kernel/fork.c' line='1191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_task_exe_file'> - <parameter type-id='f23e2572' name='task' filepath='kernel/fork.c' line='1191' column='1'/> + <function-decl name='get_task_exe_file' mangled-name='get_task_exe_file' filepath='kernel/fork.c' line='1188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_task_exe_file'> + <parameter type-id='f23e2572' name='task' filepath='kernel/fork.c' line='1188' column='1'/> <return type-id='77e79a4b'/> </function-decl> <function-type size-in-bits='64' id='28cb132f'> @@ -141303,21 +141195,21 @@ <pointer-type-def type-id='4dd76d14' size-in-bits='64' id='16575f26'/> <pointer-type-def type-id='4b8eb833' size-in-bits='64' id='f34cc61f'/> <var-decl name='nr_irqs' type-id='95e97e5e' mangled-name='nr_irqs' visibility='default' filepath='kernel/irq/irqdesc.c' line='130' column='1' elf-symbol-id='nr_irqs'/> - <function-decl name='irq_to_desc' mangled-name='irq_to_desc' filepath='kernel/irq/irqdesc.c' line='354' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_to_desc'> - <parameter type-id='f0981eeb' name='irq' filepath='kernel/irq/irqdesc.c' line='354' column='1'/> + <function-decl name='irq_to_desc' mangled-name='irq_to_desc' filepath='kernel/irq/irqdesc.c' line='351' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_to_desc'> + <parameter type-id='f0981eeb' name='irq' filepath='kernel/irq/irqdesc.c' line='351' column='1'/> <return type-id='76c7d88b'/> </function-decl> - <function-decl name='generic_handle_irq' mangled-name='generic_handle_irq' filepath='kernel/irq/irqdesc.c' line='643' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_handle_irq'> - <parameter type-id='f0981eeb' name='irq' filepath='kernel/irq/irqdesc.c' line='643' column='1'/> + <function-decl name='generic_handle_irq' mangled-name='generic_handle_irq' filepath='kernel/irq/irqdesc.c' line='640' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_handle_irq'> + <parameter type-id='f0981eeb' name='irq' filepath='kernel/irq/irqdesc.c' line='640' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__irq_alloc_descs' mangled-name='__irq_alloc_descs' filepath='kernel/irq/irqdesc.c' line='771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__irq_alloc_descs'> - <parameter type-id='95e97e5e' name='irq' filepath='kernel/irq/irqdesc.c' line='771' column='1'/> - <parameter type-id='f0981eeb' name='from' filepath='kernel/irq/irqdesc.c' line='771' column='1'/> - <parameter type-id='f0981eeb' name='cnt' filepath='kernel/irq/irqdesc.c' line='771' column='1'/> - <parameter type-id='95e97e5e' name='node' filepath='kernel/irq/irqdesc.c' line='771' column='1'/> - <parameter type-id='2730d015' name='owner' filepath='kernel/irq/irqdesc.c' line='772' column='1'/> - <parameter type-id='07779cd9' name='affinity' filepath='kernel/irq/irqdesc.c' line='772' column='1'/> + <function-decl name='__irq_alloc_descs' mangled-name='__irq_alloc_descs' filepath='kernel/irq/irqdesc.c' line='768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__irq_alloc_descs'> + <parameter type-id='95e97e5e' name='irq' filepath='kernel/irq/irqdesc.c' line='768' column='1'/> + <parameter type-id='f0981eeb' name='from' filepath='kernel/irq/irqdesc.c' line='768' column='1'/> + <parameter type-id='f0981eeb' name='cnt' filepath='kernel/irq/irqdesc.c' line='768' column='1'/> + <parameter type-id='95e97e5e' name='node' filepath='kernel/irq/irqdesc.c' line='768' column='1'/> + <parameter type-id='2730d015' name='owner' filepath='kernel/irq/irqdesc.c' line='769' column='1'/> + <parameter type-id='07779cd9' name='affinity' filepath='kernel/irq/irqdesc.c' line='769' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='4852a8ec'> @@ -141473,139 +141365,139 @@ </abi-instr> <abi-instr address-size='64' path='kernel/irq/irqdomain.c' language='LANG_C89'> <pointer-type-def type-id='88370ce9' size-in-bits='64' id='ebc26324'/> - <function-decl name='irq_domain_remove' mangled-name='irq_domain_remove' filepath='kernel/irq/irqdomain.c' line='267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_remove'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='267' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='irq_find_mapping' mangled-name='irq_find_mapping' filepath='kernel/irq/irqdomain.c' line='954' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_find_mapping'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='954' column='1'/> - <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='955' column='1'/> - <return type-id='f0981eeb'/> - </function-decl> - <function-decl name='irq_domain_set_info' mangled-name='irq_domain_set_info' filepath='kernel/irq/irqdomain.c' line='1286' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_set_info'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1286' column='1'/> - <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1286' column='1'/> - <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='1287' column='1'/> - <parameter type-id='8846a616' name='chip' filepath='kernel/irq/irqdomain.c' line='1287' column='1'/> - <parameter type-id='eaa32e2f' name='chip_data' filepath='kernel/irq/irqdomain.c' line='1288' column='1'/> - <parameter type-id='cdb741d3' name='handler' filepath='kernel/irq/irqdomain.c' line='1288' column='1'/> - <parameter type-id='eaa32e2f' name='handler_data' filepath='kernel/irq/irqdomain.c' line='1289' column='1'/> - <parameter type-id='80f4b756' name='handler_name' filepath='kernel/irq/irqdomain.c' line='1289' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='irq_find_matching_fwspec' mangled-name='irq_find_matching_fwspec' filepath='kernel/irq/irqdomain.c' line='409' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_find_matching_fwspec'> - <parameter type-id='2869bb38' name='fwspec' filepath='kernel/irq/irqdomain.c' line='409' column='1'/> - <parameter type-id='385b8018' name='bus_token' filepath='kernel/irq/irqdomain.c' line='410' column='1'/> + <function-decl name='__irq_domain_add' mangled-name='__irq_domain_add' filepath='kernel/irq/irqdomain.c' line='130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__irq_domain_add'> + <parameter type-id='4a935625' name='fwnode' filepath='kernel/irq/irqdomain.c' line='130' column='1'/> + <parameter type-id='95e97e5e' name='size' filepath='kernel/irq/irqdomain.c' line='130' column='1'/> + <parameter type-id='88370ce9' name='hwirq_max' filepath='kernel/irq/irqdomain.c' line='131' column='1'/> + <parameter type-id='95e97e5e' name='direct_max' filepath='kernel/irq/irqdomain.c' line='131' column='1'/> + <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='132' column='1'/> + <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='133' column='1'/> <return type-id='7544e824'/> </function-decl> - <function-decl name='irq_domain_xlate_twocell' mangled-name='irq_domain_xlate_twocell' filepath='kernel/irq/irqdomain.c' line='1007' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_twocell'> - <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='1007' column='1'/> - <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='1007' column='1'/> - <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='1008' column='1'/> - <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='1008' column='1'/> - <parameter type-id='ebc26324' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='1009' column='1'/> - <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='1009' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='irq_domain_xlate_onetwocell' mangled-name='irq_domain_xlate_onetwocell' filepath='kernel/irq/irqdomain.c' line='1029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_onetwocell'> - <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='1029' column='1'/> - <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='1030' column='1'/> - <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='1031' column='1'/> - <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='1031' column='1'/> - <parameter type-id='1d2c2b85' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='1032' column='1'/> - <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='1032' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='irq_domain_xlate_onecell' mangled-name='irq_domain_xlate_onecell' filepath='kernel/irq/irqdomain.c' line='988' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_onecell'> - <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='988' column='1'/> - <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='988' column='1'/> - <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='989' column='1'/> - <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='989' column='1'/> - <parameter type-id='1d2c2b85' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='990' column='1'/> - <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='990' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='irq_domain_update_bus_token' mangled-name='irq_domain_update_bus_token' filepath='kernel/irq/irqdomain.c' line='293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_update_bus_token'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='293' column='1'/> - <parameter type-id='385b8018' name='bus_token' filepath='kernel/irq/irqdomain.c' line='294' column='1'/> + <function-decl name='irq_domain_remove' mangled-name='irq_domain_remove' filepath='kernel/irq/irqdomain.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_remove'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='243' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='irq_domain_set_hwirq_and_chip' mangled-name='irq_domain_set_hwirq_and_chip' filepath='kernel/irq/irqdomain.c' line='1258' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_set_hwirq_and_chip'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1258' column='1'/> - <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1258' column='1'/> - <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='1259' column='1'/> - <parameter type-id='8846a616' name='chip' filepath='kernel/irq/irqdomain.c' line='1259' column='1'/> - <parameter type-id='eaa32e2f' name='chip_data' filepath='kernel/irq/irqdomain.c' line='1260' column='1'/> + <function-decl name='irq_find_mapping' mangled-name='irq_find_mapping' filepath='kernel/irq/irqdomain.c' line='897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_find_mapping'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='897' column='1'/> + <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='898' column='1'/> + <return type-id='f0981eeb'/> + </function-decl> + <function-decl name='irq_domain_set_info' mangled-name='irq_domain_set_info' filepath='kernel/irq/irqdomain.c' line='1226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_set_info'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1226' column='1'/> + <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1226' column='1'/> + <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='1227' column='1'/> + <parameter type-id='8846a616' name='chip' filepath='kernel/irq/irqdomain.c' line='1227' column='1'/> + <parameter type-id='eaa32e2f' name='chip_data' filepath='kernel/irq/irqdomain.c' line='1228' column='1'/> + <parameter type-id='cdb741d3' name='handler' filepath='kernel/irq/irqdomain.c' line='1228' column='1'/> + <parameter type-id='eaa32e2f' name='handler_data' filepath='kernel/irq/irqdomain.c' line='1229' column='1'/> + <parameter type-id='80f4b756' name='handler_name' filepath='kernel/irq/irqdomain.c' line='1229' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='irq_find_matching_fwspec' mangled-name='irq_find_matching_fwspec' filepath='kernel/irq/irqdomain.c' line='385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_find_matching_fwspec'> + <parameter type-id='2869bb38' name='fwspec' filepath='kernel/irq/irqdomain.c' line='385' column='1'/> + <parameter type-id='385b8018' name='bus_token' filepath='kernel/irq/irqdomain.c' line='386' column='1'/> + <return type-id='7544e824'/> + </function-decl> + <function-decl name='irq_domain_xlate_twocell' mangled-name='irq_domain_xlate_twocell' filepath='kernel/irq/irqdomain.c' line='950' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_twocell'> + <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='950' column='1'/> + <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='950' column='1'/> + <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='951' column='1'/> + <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='951' column='1'/> + <parameter type-id='ebc26324' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='952' column='1'/> + <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='952' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='irq_domain_get_irq_data' mangled-name='irq_domain_get_irq_data' filepath='kernel/irq/irqdomain.c' line='1236' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_get_irq_data'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1236' column='1'/> - <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1237' column='1'/> + <function-decl name='irq_domain_xlate_onetwocell' mangled-name='irq_domain_xlate_onetwocell' filepath='kernel/irq/irqdomain.c' line='972' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_onetwocell'> + <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='972' column='1'/> + <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='973' column='1'/> + <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='974' column='1'/> + <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='974' column='1'/> + <parameter type-id='1d2c2b85' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='975' column='1'/> + <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='975' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> + <function-decl name='irq_domain_xlate_onecell' mangled-name='irq_domain_xlate_onecell' filepath='kernel/irq/irqdomain.c' line='931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_xlate_onecell'> + <parameter type-id='7544e824' name='d' filepath='kernel/irq/irqdomain.c' line='931' column='1'/> + <parameter type-id='9a537bbe' name='ctrlr' filepath='kernel/irq/irqdomain.c' line='931' column='1'/> + <parameter type-id='aded214c' name='intspec' filepath='kernel/irq/irqdomain.c' line='932' column='1'/> + <parameter type-id='f0981eeb' name='intsize' filepath='kernel/irq/irqdomain.c' line='932' column='1'/> + <parameter type-id='1d2c2b85' name='out_hwirq' filepath='kernel/irq/irqdomain.c' line='933' column='1'/> + <parameter type-id='807869d3' name='out_type' filepath='kernel/irq/irqdomain.c' line='933' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> + <function-decl name='irq_domain_update_bus_token' mangled-name='irq_domain_update_bus_token' filepath='kernel/irq/irqdomain.c' line='269' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_update_bus_token'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='269' column='1'/> + <parameter type-id='385b8018' name='bus_token' filepath='kernel/irq/irqdomain.c' line='270' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='irq_domain_set_hwirq_and_chip' mangled-name='irq_domain_set_hwirq_and_chip' filepath='kernel/irq/irqdomain.c' line='1198' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_set_hwirq_and_chip'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1198' column='1'/> + <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1198' column='1'/> + <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='1199' column='1'/> + <parameter type-id='8846a616' name='chip' filepath='kernel/irq/irqdomain.c' line='1199' column='1'/> + <parameter type-id='eaa32e2f' name='chip_data' filepath='kernel/irq/irqdomain.c' line='1200' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> + <function-decl name='irq_domain_get_irq_data' mangled-name='irq_domain_get_irq_data' filepath='kernel/irq/irqdomain.c' line='1176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_get_irq_data'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1176' column='1'/> + <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1177' column='1'/> <return type-id='1c475548'/> </function-decl> - <function-decl name='irq_domain_free_irqs_parent' mangled-name='irq_domain_free_irqs_parent' filepath='kernel/irq/irqdomain.c' line='1679' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_free_irqs_parent'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1679' column='1'/> - <parameter type-id='f0981eeb' name='irq_base' filepath='kernel/irq/irqdomain.c' line='1680' column='1'/> - <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1680' column='1'/> + <function-decl name='irq_domain_free_irqs_parent' mangled-name='irq_domain_free_irqs_parent' filepath='kernel/irq/irqdomain.c' line='1609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_free_irqs_parent'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1609' column='1'/> + <parameter type-id='f0981eeb' name='irq_base' filepath='kernel/irq/irqdomain.c' line='1610' column='1'/> + <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1610' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='irq_domain_free_irqs_common' mangled-name='irq_domain_free_irqs_common' filepath='kernel/irq/irqdomain.c' line='1315' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_free_irqs_common'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1315' column='1'/> - <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1315' column='1'/> - <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1316' column='1'/> + <function-decl name='irq_domain_free_irqs_common' mangled-name='irq_domain_free_irqs_common' filepath='kernel/irq/irqdomain.c' line='1255' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_free_irqs_common'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1255' column='1'/> + <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='1255' column='1'/> + <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1256' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='irq_domain_create_hierarchy' mangled-name='irq_domain_create_hierarchy' filepath='kernel/irq/irqdomain.c' line='1110' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_create_hierarchy'> - <parameter type-id='7544e824' name='parent' filepath='kernel/irq/irqdomain.c' line='1110' column='1'/> - <parameter type-id='f0981eeb' name='flags' filepath='kernel/irq/irqdomain.c' line='1111' column='1'/> - <parameter type-id='f0981eeb' name='size' filepath='kernel/irq/irqdomain.c' line='1112' column='1'/> - <parameter type-id='4a935625' name='fwnode' filepath='kernel/irq/irqdomain.c' line='1113' column='1'/> - <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='1114' column='1'/> - <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='1115' column='1'/> + <function-decl name='irq_domain_create_hierarchy' mangled-name='irq_domain_create_hierarchy' filepath='kernel/irq/irqdomain.c' line='1053' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_create_hierarchy'> + <parameter type-id='7544e824' name='parent' filepath='kernel/irq/irqdomain.c' line='1053' column='1'/> + <parameter type-id='f0981eeb' name='flags' filepath='kernel/irq/irqdomain.c' line='1054' column='1'/> + <parameter type-id='f0981eeb' name='size' filepath='kernel/irq/irqdomain.c' line='1055' column='1'/> + <parameter type-id='4a935625' name='fwnode' filepath='kernel/irq/irqdomain.c' line='1056' column='1'/> + <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='1057' column='1'/> + <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='1058' column='1'/> <return type-id='7544e824'/> </function-decl> - <function-decl name='irq_domain_alloc_irqs_parent' mangled-name='irq_domain_alloc_irqs_parent' filepath='kernel/irq/irqdomain.c' line='1659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_alloc_irqs_parent'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1659' column='1'/> - <parameter type-id='f0981eeb' name='irq_base' filepath='kernel/irq/irqdomain.c' line='1660' column='1'/> - <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1660' column='1'/> - <parameter type-id='eaa32e2f' name='arg' filepath='kernel/irq/irqdomain.c' line='1661' column='1'/> + <function-decl name='irq_domain_alloc_irqs_parent' mangled-name='irq_domain_alloc_irqs_parent' filepath='kernel/irq/irqdomain.c' line='1589' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_alloc_irqs_parent'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='1589' column='1'/> + <parameter type-id='f0981eeb' name='irq_base' filepath='kernel/irq/irqdomain.c' line='1590' column='1'/> + <parameter type-id='f0981eeb' name='nr_irqs' filepath='kernel/irq/irqdomain.c' line='1590' column='1'/> + <parameter type-id='eaa32e2f' name='arg' filepath='kernel/irq/irqdomain.c' line='1591' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='irq_domain_add_simple' mangled-name='irq_domain_add_simple' filepath='kernel/irq/irqdomain.c' line='343' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_add_simple'> - <parameter type-id='9a537bbe' name='of_node' filepath='kernel/irq/irqdomain.c' line='343' column='1'/> - <parameter type-id='f0981eeb' name='size' filepath='kernel/irq/irqdomain.c' line='344' column='1'/> - <parameter type-id='f0981eeb' name='first_irq' filepath='kernel/irq/irqdomain.c' line='345' column='1'/> - <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='346' column='1'/> - <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='347' column='1'/> + <function-decl name='irq_domain_add_simple' mangled-name='irq_domain_add_simple' filepath='kernel/irq/irqdomain.c' line='319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_domain_add_simple'> + <parameter type-id='9a537bbe' name='of_node' filepath='kernel/irq/irqdomain.c' line='319' column='1'/> + <parameter type-id='f0981eeb' name='size' filepath='kernel/irq/irqdomain.c' line='320' column='1'/> + <parameter type-id='f0981eeb' name='first_irq' filepath='kernel/irq/irqdomain.c' line='321' column='1'/> + <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='322' column='1'/> + <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='323' column='1'/> <return type-id='7544e824'/> </function-decl> - <function-decl name='irq_dispose_mapping' mangled-name='irq_dispose_mapping' filepath='kernel/irq/irqdomain.c' line='928' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_dispose_mapping'> - <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='928' column='1'/> + <function-decl name='irq_dispose_mapping' mangled-name='irq_dispose_mapping' filepath='kernel/irq/irqdomain.c' line='871' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_dispose_mapping'> + <parameter type-id='f0981eeb' name='virq' filepath='kernel/irq/irqdomain.c' line='871' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='irq_create_of_mapping' mangled-name='irq_create_of_mapping' filepath='kernel/irq/irqdomain.c' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_of_mapping'> - <parameter type-id='51a94113' name='irq_data' filepath='kernel/irq/irqdomain.c' line='913' column='1'/> + <function-decl name='irq_create_of_mapping' mangled-name='irq_create_of_mapping' filepath='kernel/irq/irqdomain.c' line='856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_of_mapping'> + <parameter type-id='51a94113' name='irq_data' filepath='kernel/irq/irqdomain.c' line='856' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='irq_create_fwspec_mapping' mangled-name='irq_create_fwspec_mapping' filepath='kernel/irq/irqdomain.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_fwspec_mapping'> - <parameter type-id='2869bb38' name='fwspec' filepath='kernel/irq/irqdomain.c' line='815' column='1'/> + <function-decl name='irq_create_fwspec_mapping' mangled-name='irq_create_fwspec_mapping' filepath='kernel/irq/irqdomain.c' line='765' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_fwspec_mapping'> + <parameter type-id='2869bb38' name='fwspec' filepath='kernel/irq/irqdomain.c' line='765' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='irq_create_mapping_affinity' mangled-name='irq_create_mapping_affinity' filepath='kernel/irq/irqdomain.c' line='718' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_mapping_affinity'> - <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='718' column='1'/> - <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='719' column='1'/> - <parameter type-id='07779cd9' name='affinity' filepath='kernel/irq/irqdomain.c' line='720' column='1'/> + <function-decl name='irq_create_mapping_affinity' mangled-name='irq_create_mapping_affinity' filepath='kernel/irq/irqdomain.c' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='irq_create_mapping_affinity'> + <parameter type-id='7544e824' name='domain' filepath='kernel/irq/irqdomain.c' line='652' column='1'/> + <parameter type-id='88370ce9' name='hwirq' filepath='kernel/irq/irqdomain.c' line='653' column='1'/> + <parameter type-id='07779cd9' name='affinity' filepath='kernel/irq/irqdomain.c' line='654' column='1'/> <return type-id='f0981eeb'/> </function-decl> - <function-decl name='__irq_domain_add' mangled-name='__irq_domain_add' filepath='kernel/irq/irqdomain.c' line='243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__irq_domain_add'> - <parameter type-id='4a935625' name='fwnode' filepath='kernel/irq/irqdomain.c' line='243' column='1'/> - <parameter type-id='f0981eeb' name='size' filepath='kernel/irq/irqdomain.c' line='243' column='1'/> - <parameter type-id='88370ce9' name='hwirq_max' filepath='kernel/irq/irqdomain.c' line='244' column='1'/> - <parameter type-id='95e97e5e' name='direct_max' filepath='kernel/irq/irqdomain.c' line='244' column='1'/> - <parameter type-id='2c202856' name='ops' filepath='kernel/irq/irqdomain.c' line='245' column='1'/> - <parameter type-id='eaa32e2f' name='host_data' filepath='kernel/irq/irqdomain.c' line='246' column='1'/> - <return type-id='7544e824'/> - </function-decl> </abi-instr> <abi-instr address-size='64' path='kernel/irq/manage.c' language='LANG_C89'> <function-decl name='enable_percpu_irq' mangled-name='enable_percpu_irq' filepath='kernel/irq/manage.c' line='2249' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='enable_percpu_irq'> @@ -142215,12 +142107,12 @@ <parameter type-id='eaa32e2f' name='addr' filepath='kernel/module.c' line='1092' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='module_layout' mangled-name='module_layout' filepath='kernel/module.c' line='4746' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='module_layout'> - <parameter type-id='2730d015' name='mod' filepath='kernel/module.c' line='4746' column='1'/> - <parameter type-id='3a498c74' name='ver' filepath='kernel/module.c' line='4747' column='1'/> - <parameter type-id='a7c6e908' name='kp' filepath='kernel/module.c' line='4748' column='1'/> - <parameter type-id='eefd7061' name='ks' filepath='kernel/module.c' line='4749' column='1'/> - <parameter type-id='e525e121' name='tp' filepath='kernel/module.c' line='4750' column='1'/> + <function-decl name='module_layout' mangled-name='module_layout' filepath='kernel/module.c' line='4730' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='module_layout'> + <parameter type-id='2730d015' name='mod' filepath='kernel/module.c' line='4730' column='1'/> + <parameter type-id='3a498c74' name='ver' filepath='kernel/module.c' line='4731' column='1'/> + <parameter type-id='a7c6e908' name='kp' filepath='kernel/module.c' line='4732' column='1'/> + <parameter type-id='eefd7061' name='ks' filepath='kernel/module.c' line='4733' column='1'/> + <parameter type-id='e525e121' name='tp' filepath='kernel/module.c' line='4734' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='__module_get' mangled-name='__module_get' filepath='kernel/module.c' line='1121' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__module_get'> @@ -142362,19 +142254,19 @@ <typedef-decl name='notifier_fn_t' type-id='38a7cb79' filepath='include/linux/notifier.h' line='51' column='1' id='0ec8c658'/> <pointer-type-def type-id='294be38d' size-in-bits='64' id='38a7cb79'/> <pointer-type-def type-id='9b08f7cd' size-in-bits='64' id='d504f73d'/> - <var-decl name='panic_timeout' type-id='95e97e5e' mangled-name='panic_timeout' visibility='default' filepath='kernel/panic.c' line='50' column='1' elf-symbol-id='panic_timeout'/> - <var-decl name='panic_notifier_list' type-id='dbd58f6e' mangled-name='panic_notifier_list' visibility='default' filepath='kernel/panic.c' line='61' column='1' elf-symbol-id='panic_notifier_list'/> - <function-decl name='panic' mangled-name='panic' filepath='kernel/panic.c' line='221' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='panic'> - <parameter type-id='80f4b756' name='fmt' filepath='kernel/panic.c' line='221' column='1'/> + <var-decl name='panic_timeout' type-id='95e97e5e' mangled-name='panic_timeout' visibility='default' filepath='kernel/panic.c' line='48' column='1' elf-symbol-id='panic_timeout'/> + <var-decl name='panic_notifier_list' type-id='dbd58f6e' mangled-name='panic_notifier_list' visibility='default' filepath='kernel/panic.c' line='59' column='1' elf-symbol-id='panic_notifier_list'/> + <function-decl name='panic' mangled-name='panic' filepath='kernel/panic.c' line='167' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='panic'> + <parameter type-id='80f4b756' name='fmt' filepath='kernel/panic.c' line='167' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__warn_printk' mangled-name='__warn_printk' filepath='kernel/panic.c' line='676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__warn_printk'> - <parameter type-id='80f4b756' name='fmt' filepath='kernel/panic.c' line='676' column='1'/> + <function-decl name='__warn_printk' mangled-name='__warn_printk' filepath='kernel/panic.c' line='621' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__warn_printk'> + <parameter type-id='80f4b756' name='fmt' filepath='kernel/panic.c' line='621' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__stack_chk_fail' mangled-name='__stack_chk_fail' filepath='kernel/panic.c' line='720' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__stack_chk_fail'> + <function-decl name='__stack_chk_fail' mangled-name='__stack_chk_fail' filepath='kernel/panic.c' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__stack_chk_fail'> <return type-id='48b5725f'/> </function-decl> <function-type size-in-bits='64' id='294be38d'> @@ -143928,32 +143820,32 @@ <pointer-type-def type-id='ca7f7878' size-in-bits='64' id='9d640202'/> <pointer-type-def type-id='504855b3' size-in-bits='64' id='db9d03e3'/> <pointer-type-def type-id='fe794aa9' size-in-bits='64' id='ba9aa326'/> - <var-decl name='kstat' type-id='153750ef' mangled-name='kstat' visibility='default' filepath='kernel/sched/core.c' line='3742' column='1' elf-symbol-id='kstat'/> - <var-decl name='kernel_cpustat' type-id='7b5f27b3' mangled-name='kernel_cpustat' visibility='default' filepath='kernel/sched/core.c' line='3743' column='1' elf-symbol-id='kernel_cpustat'/> - <function-decl name='set_cpus_allowed_ptr' mangled-name='set_cpus_allowed_ptr' filepath='kernel/sched/core.c' line='1909' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cpus_allowed_ptr'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='1909' column='1'/> - <parameter type-id='5f8a1ac4' name='new_mask' filepath='kernel/sched/core.c' line='1909' column='1'/> + <var-decl name='kstat' type-id='153750ef' mangled-name='kstat' visibility='default' filepath='kernel/sched/core.c' line='3739' column='1' elf-symbol-id='kstat'/> + <var-decl name='kernel_cpustat' type-id='7b5f27b3' mangled-name='kernel_cpustat' visibility='default' filepath='kernel/sched/core.c' line='3740' column='1' elf-symbol-id='kernel_cpustat'/> + <function-decl name='set_cpus_allowed_ptr' mangled-name='set_cpus_allowed_ptr' filepath='kernel/sched/core.c' line='1906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_cpus_allowed_ptr'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='1906' column='1'/> + <parameter type-id='5f8a1ac4' name='new_mask' filepath='kernel/sched/core.c' line='1906' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='preempt_schedule_notrace' mangled-name='preempt_schedule_notrace' filepath='kernel/sched/core.c' line='4500' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preempt_schedule_notrace'> + <function-decl name='preempt_schedule_notrace' mangled-name='preempt_schedule_notrace' filepath='kernel/sched/core.c' line='4498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preempt_schedule_notrace'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='schedule' mangled-name='schedule' filepath='kernel/sched/core.c' line='4368' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='schedule'> + <function-decl name='schedule' mangled-name='schedule' filepath='kernel/sched/core.c' line='4366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='schedule'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='set_user_nice' mangled-name='set_user_nice' filepath='kernel/sched/core.c' line='4726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_user_nice'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='4726' column='1'/> - <parameter type-id='bd54fe1a' name='nice' filepath='kernel/sched/core.c' line='4726' column='1'/> + <function-decl name='set_user_nice' mangled-name='set_user_nice' filepath='kernel/sched/core.c' line='4724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_user_nice'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='4724' column='1'/> + <parameter type-id='bd54fe1a' name='nice' filepath='kernel/sched/core.c' line='4724' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='yield' mangled-name='yield' filepath='kernel/sched/core.c' line='5895' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='yield'> + <function-decl name='yield' mangled-name='yield' filepath='kernel/sched/core.c' line='5893' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='yield'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='preempt_schedule' mangled-name='preempt_schedule' filepath='kernel/sched/core.c' line='4472' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preempt_schedule'> + <function-decl name='preempt_schedule' mangled-name='preempt_schedule' filepath='kernel/sched/core.c' line='4470' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='preempt_schedule'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='wake_up_process' mangled-name='wake_up_process' filepath='kernel/sched/core.c' line='2880' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wake_up_process'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='2880' column='1'/> + <function-decl name='wake_up_process' mangled-name='wake_up_process' filepath='kernel/sched/core.c' line='2877' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wake_up_process'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='2877' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='uclamp_eff_value' mangled-name='uclamp_eff_value' filepath='kernel/sched/core.c' line='1026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='uclamp_eff_value'> @@ -143961,39 +143853,39 @@ <parameter type-id='db819146' name='clamp_id' filepath='kernel/sched/core.c' line='1026' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='task_sched_runtime' mangled-name='task_sched_runtime' filepath='kernel/sched/core.c' line='3770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='task_sched_runtime'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='3770' column='1'/> + <function-decl name='task_sched_runtime' mangled-name='task_sched_runtime' filepath='kernel/sched/core.c' line='3767' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='task_sched_runtime'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='3767' column='1'/> <return type-id='3a47d82b'/> </function-decl> - <function-decl name='sched_show_task' mangled-name='sched_show_task' filepath='kernel/sched/core.c' line='6143' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_show_task'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='6143' column='1'/> + <function-decl name='sched_show_task' mangled-name='sched_show_task' filepath='kernel/sched/core.c' line='6141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_show_task'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='6141' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='sched_setscheduler_nocheck' mangled-name='sched_setscheduler_nocheck' filepath='kernel/sched/core.c' line='5304' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler_nocheck'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5304' column='1'/> - <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5304' column='1'/> - <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5305' column='1'/> + <function-decl name='sched_setscheduler_nocheck' mangled-name='sched_setscheduler_nocheck' filepath='kernel/sched/core.c' line='5302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler_nocheck'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5302' column='1'/> + <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5302' column='1'/> + <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5303' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5272' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5272' column='1'/> - <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5272' column='1'/> - <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5273' column='1'/> + <function-decl name='sched_setscheduler' mangled-name='sched_setscheduler' filepath='kernel/sched/core.c' line='5270' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setscheduler'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5270' column='1'/> + <parameter type-id='95e97e5e' name='policy' filepath='kernel/sched/core.c' line='5270' column='1'/> + <parameter type-id='36fca399' name='param' filepath='kernel/sched/core.c' line='5271' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'> - <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5279' column='1'/> - <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5279' column='1'/> + <function-decl name='sched_setattr' mangled-name='sched_setattr' filepath='kernel/sched/core.c' line='5277' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sched_setattr'> + <parameter type-id='f23e2572' name='p' filepath='kernel/sched/core.c' line='5277' column='1'/> + <parameter type-id='8abbb6c3' name='attr' filepath='kernel/sched/core.c' line='5277' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='io_schedule' mangled-name='io_schedule' filepath='kernel/sched/core.c' line='6008' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='io_schedule'> + <function-decl name='io_schedule' mangled-name='io_schedule' filepath='kernel/sched/core.c' line='6006' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='io_schedule'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='default_wake_function' mangled-name='default_wake_function' filepath='kernel/sched/core.c' line='4566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='default_wake_function'> - <parameter type-id='ba9aa326' name='curr' filepath='kernel/sched/core.c' line='4566' column='1'/> - <parameter type-id='f0981eeb' name='mode' filepath='kernel/sched/core.c' line='4566' column='1'/> - <parameter type-id='95e97e5e' name='wake_flags' filepath='kernel/sched/core.c' line='4566' column='1'/> - <parameter type-id='eaa32e2f' name='key' filepath='kernel/sched/core.c' line='4567' column='1'/> + <function-decl name='default_wake_function' mangled-name='default_wake_function' filepath='kernel/sched/core.c' line='4564' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='default_wake_function'> + <parameter type-id='ba9aa326' name='curr' filepath='kernel/sched/core.c' line='4564' column='1'/> + <parameter type-id='f0981eeb' name='mode' filepath='kernel/sched/core.c' line='4564' column='1'/> + <parameter type-id='95e97e5e' name='wake_flags' filepath='kernel/sched/core.c' line='4564' column='1'/> + <parameter type-id='eaa32e2f' name='key' filepath='kernel/sched/core.c' line='4565' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='2d2d4460'> @@ -147902,6 +147794,7 @@ <var-decl name='value' type-id='91ce1af9' visibility='default' filepath='include/linux/blk_types.h' line='115' column='1'/> </data-member> </class-decl> + <union-decl name='__anonymous_union__12' is-anonymous='yes' visibility='default' filepath='include/linux/blk_types.h' line='186' column='1' id='2a125a28'/> <class-decl name='pmu' size-in-bits='2240' is-struct='yes' visibility='default' filepath='include/linux/perf_event.h' line='255' column='1' id='e205b6f1'> <data-member access='public' layout-offset-in-bits='0'> <var-decl name='entry' type-id='72f469ec' visibility='default' filepath='include/linux/perf_event.h' line='256' column='1'/> @@ -150877,49 +150770,49 @@ <pointer-type-def type-id='6d06c6cd' size-in-bits='64' id='9e33b18d'/> <pointer-type-def type-id='4993d1b5' size-in-bits='64' id='34fd0229'/> <pointer-type-def type-id='a628efab' size-in-bits='64' id='1f93431f'/> - <function-decl name='ktime_get_real_ts64' mangled-name='ktime_get_real_ts64' filepath='kernel/time/timekeeping.c' line='728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_real_ts64'> - <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='728' column='1'/> + <function-decl name='ktime_get_real_ts64' mangled-name='ktime_get_real_ts64' filepath='kernel/time/timekeeping.c' line='727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_real_ts64'> + <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='727' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ktime_get_with_offset' mangled-name='ktime_get_with_offset' filepath='kernel/time/timekeeping.c' line='792' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_with_offset'> - <parameter type-id='73bb584e' name='offs' filepath='kernel/time/timekeeping.c' line='792' column='1'/> + <function-decl name='ktime_get_with_offset' mangled-name='ktime_get_with_offset' filepath='kernel/time/timekeeping.c' line='791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_with_offset'> + <parameter type-id='73bb584e' name='offs' filepath='kernel/time/timekeeping.c' line='791' column='1'/> <return type-id='fbc017ef'/> </function-decl> - <function-decl name='ktime_get_ts64' mangled-name='ktime_get_ts64' filepath='kernel/time/timekeeping.c' line='882' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_ts64'> - <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='882' column='1'/> + <function-decl name='ktime_get_ts64' mangled-name='ktime_get_ts64' filepath='kernel/time/timekeeping.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_ts64'> + <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='881' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ktime_get_seconds' mangled-name='ktime_get_seconds' filepath='kernel/time/timekeeping.c' line='914' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_seconds'> + <function-decl name='ktime_get_seconds' mangled-name='ktime_get_seconds' filepath='kernel/time/timekeeping.c' line='913' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_seconds'> <return type-id='1afd27ac'/> </function-decl> - <function-decl name='ktime_get_real_seconds' mangled-name='ktime_get_real_seconds' filepath='kernel/time/timekeeping.c' line='934' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_real_seconds'> + <function-decl name='ktime_get_real_seconds' mangled-name='ktime_get_real_seconds' filepath='kernel/time/timekeeping.c' line='933' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_real_seconds'> <return type-id='1afd27ac'/> </function-decl> - <function-decl name='ktime_get_raw_ts64' mangled-name='ktime_get_raw_ts64' filepath='kernel/time/timekeeping.c' line='1421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_raw_ts64'> - <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='1421' column='1'/> + <function-decl name='ktime_get_raw_ts64' mangled-name='ktime_get_raw_ts64' filepath='kernel/time/timekeeping.c' line='1418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_raw_ts64'> + <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='1418' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ktime_get_raw' mangled-name='ktime_get_raw' filepath='kernel/time/timekeeping.c' line='856' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_raw'> + <function-decl name='ktime_get_raw' mangled-name='ktime_get_raw' filepath='kernel/time/timekeeping.c' line='855' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_raw'> <return type-id='fbc017ef'/> </function-decl> - <function-decl name='ktime_get_mono_fast_ns' mangled-name='ktime_get_mono_fast_ns' filepath='kernel/time/timekeeping.c' line='474' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_mono_fast_ns'> + <function-decl name='ktime_get_mono_fast_ns' mangled-name='ktime_get_mono_fast_ns' filepath='kernel/time/timekeeping.c' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_mono_fast_ns'> <return type-id='91ce1af9'/> </function-decl> - <function-decl name='ktime_get_boot_fast_ns' mangled-name='ktime_get_boot_fast_ns' filepath='kernel/time/timekeeping.c' line='507' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_boot_fast_ns'> + <function-decl name='ktime_get_boot_fast_ns' mangled-name='ktime_get_boot_fast_ns' filepath='kernel/time/timekeeping.c' line='506' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get_boot_fast_ns'> <return type-id='91ce1af9'/> </function-decl> - <function-decl name='ktime_get' mangled-name='ktime_get' filepath='kernel/time/timekeeping.c' line='749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get'> + <function-decl name='ktime_get' mangled-name='ktime_get' filepath='kernel/time/timekeeping.c' line='748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ktime_get'> <return type-id='fbc017ef'/> </function-decl> - <function-decl name='getboottime64' mangled-name='getboottime64' filepath='kernel/time/timekeeping.c' line='2153' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getboottime64'> - <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='2153' column='1'/> + <function-decl name='getboottime64' mangled-name='getboottime64' filepath='kernel/time/timekeeping.c' line='2150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='getboottime64'> + <parameter type-id='4151733d' name='ts' filepath='kernel/time/timekeeping.c' line='2150' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='get_device_system_crosststamp' mangled-name='get_device_system_crosststamp' filepath='kernel/time/timekeeping.c' line='1118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_device_system_crosststamp'> - <parameter type-id='d5d36d38' name='get_time_fn' filepath='kernel/time/timekeeping.c' line='1118' column='1'/> - <parameter type-id='eaa32e2f' name='ctx' filepath='kernel/time/timekeeping.c' line='1122' column='1'/> - <parameter type-id='9e33b18d' name='history_begin' filepath='kernel/time/timekeeping.c' line='1123' column='1'/> - <parameter type-id='587b4de3' name='xtstamp' filepath='kernel/time/timekeeping.c' line='1124' column='1'/> + <function-decl name='get_device_system_crosststamp' mangled-name='get_device_system_crosststamp' filepath='kernel/time/timekeeping.c' line='1117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_device_system_crosststamp'> + <parameter type-id='d5d36d38' name='get_time_fn' filepath='kernel/time/timekeeping.c' line='1117' column='1'/> + <parameter type-id='eaa32e2f' name='ctx' filepath='kernel/time/timekeeping.c' line='1121' column='1'/> + <parameter type-id='9e33b18d' name='history_begin' filepath='kernel/time/timekeeping.c' line='1122' column='1'/> + <parameter type-id='587b4de3' name='xtstamp' filepath='kernel/time/timekeeping.c' line='1123' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='27fe31c0'> @@ -151012,42 +150905,88 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='kernel/trace/bpf_trace.c' language='LANG_C89'> - <function-decl name='bpf_trace_run1' mangled-name='bpf_trace_run1' filepath='kernel/trace/bpf_trace.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run1'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <function-decl name='bpf_trace_run1' mangled-name='bpf_trace_run1' filepath='kernel/trace/bpf_trace.c' line='1375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run1'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1375' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1375' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run2' mangled-name='bpf_trace_run2' filepath='kernel/trace/bpf_trace.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run2'> + <function-decl name='bpf_trace_run2' mangled-name='bpf_trace_run2' filepath='kernel/trace/bpf_trace.c' line='1376' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run2'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1376' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1376' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1376' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='bpf_trace_run3' mangled-name='bpf_trace_run3' filepath='kernel/trace/bpf_trace.c' line='1377' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run3'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1377' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1377' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1377' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1377' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='bpf_trace_run4' mangled-name='bpf_trace_run4' filepath='kernel/trace/bpf_trace.c' line='1378' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run4'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1378' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='bpf_trace_run5' mangled-name='bpf_trace_run5' filepath='kernel/trace/bpf_trace.c' line='1379' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run5'> <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> + <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> + <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1379' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run3' mangled-name='bpf_trace_run3' filepath='kernel/trace/bpf_trace.c' line='1380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run3'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <function-decl name='bpf_trace_run9' mangled-name='bpf_trace_run9' filepath='kernel/trace/bpf_trace.c' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run9'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> + <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run4' mangled-name='bpf_trace_run4' filepath='kernel/trace/bpf_trace.c' line='1381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run4'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> - <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='bpf_trace_run5' mangled-name='bpf_trace_run5' filepath='kernel/trace/bpf_trace.c' line='1382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run5'> + <function-decl name='bpf_trace_run8' mangled-name='bpf_trace_run8' filepath='kernel/trace/bpf_trace.c' line='1382' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run8'> <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> + <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> + <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> + <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1382' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run9' mangled-name='bpf_trace_run9' filepath='kernel/trace/bpf_trace.c' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run9'> + <function-decl name='bpf_trace_run7' mangled-name='bpf_trace_run7' filepath='kernel/trace/bpf_trace.c' line='1381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run7'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1381' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='bpf_trace_run6' mangled-name='bpf_trace_run6' filepath='kernel/trace/bpf_trace.c' line='1380' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run6'> + <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1380' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='bpf_trace_run12' mangled-name='bpf_trace_run12' filepath='kernel/trace/bpf_trace.c' line='1386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run12'> <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> @@ -151058,9 +150997,12 @@ <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> + <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> + <parameter type-id='91ce1af9' name='arg10' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> + <parameter type-id='91ce1af9' name='arg11' filepath='kernel/trace/bpf_trace.c' line='1386' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run8' mangled-name='bpf_trace_run8' filepath='kernel/trace/bpf_trace.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run8'> + <function-decl name='bpf_trace_run11' mangled-name='bpf_trace_run11' filepath='kernel/trace/bpf_trace.c' line='1385' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run11'> <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> @@ -151070,9 +151012,12 @@ <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> + <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> + <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> + <parameter type-id='91ce1af9' name='arg10' filepath='kernel/trace/bpf_trace.c' line='1385' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='bpf_trace_run7' mangled-name='bpf_trace_run7' filepath='kernel/trace/bpf_trace.c' line='1384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run7'> + <function-decl name='bpf_trace_run10' mangled-name='bpf_trace_run10' filepath='kernel/trace/bpf_trace.c' line='1384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run10'> <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> @@ -151081,61 +151026,9 @@ <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='bpf_trace_run6' mangled-name='bpf_trace_run6' filepath='kernel/trace/bpf_trace.c' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run6'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1383' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='bpf_trace_run12' mangled-name='bpf_trace_run12' filepath='kernel/trace/bpf_trace.c' line='1389' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run12'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg10' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <parameter type-id='91ce1af9' name='arg11' filepath='kernel/trace/bpf_trace.c' line='1389' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='bpf_trace_run11' mangled-name='bpf_trace_run11' filepath='kernel/trace/bpf_trace.c' line='1388' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run11'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <parameter type-id='91ce1af9' name='arg10' filepath='kernel/trace/bpf_trace.c' line='1388' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='bpf_trace_run10' mangled-name='bpf_trace_run10' filepath='kernel/trace/bpf_trace.c' line='1387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_trace_run10'> - <parameter type-id='bdcee7ae' name='prog' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg0' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg1' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg2' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg3' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg4' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg5' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg6' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> - <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1387' column='1'/> + <parameter type-id='91ce1af9' name='arg7' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> + <parameter type-id='91ce1af9' name='arg8' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> + <parameter type-id='91ce1af9' name='arg9' filepath='kernel/trace/bpf_trace.c' line='1384' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -151365,15 +151258,15 @@ <pointer-type-def type-id='3dbb7e50' size-in-bits='64' id='0f294852'/> <pointer-type-def type-id='c64b743f' size-in-bits='64' id='578c706b'/> <pointer-type-def type-id='b44140ca' size-in-bits='64' id='29bf40b4'/> - <function-decl name='trace_event_buffer_commit' mangled-name='trace_event_buffer_commit' filepath='kernel/trace/trace.c' line='2618' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_buffer_commit'> - <parameter type-id='9f548f9a' name='fbuffer' filepath='kernel/trace/trace.c' line='2618' column='1'/> + <function-decl name='trace_event_buffer_commit' mangled-name='trace_event_buffer_commit' filepath='kernel/trace/trace.c' line='2604' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_buffer_commit'> + <parameter type-id='9f548f9a' name='fbuffer' filepath='kernel/trace/trace.c' line='2604' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='tracing_off' mangled-name='tracing_off' filepath='kernel/trace/trace.c' line='1273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tracing_off'> + <function-decl name='tracing_off' mangled-name='tracing_off' filepath='kernel/trace/trace.c' line='1267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tracing_off'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='trace_handle_return' mangled-name='trace_handle_return' filepath='kernel/trace/trace.c' line='2361' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_handle_return'> - <parameter type-id='fc932690' name='s' filepath='kernel/trace/trace.c' line='2361' column='1'/> + <function-decl name='trace_handle_return' mangled-name='trace_handle_return' filepath='kernel/trace/trace.c' line='2347' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_handle_return'> + <parameter type-id='fc932690' name='s' filepath='kernel/trace/trace.c' line='2347' column='1'/> <return type-id='b1a0a119'/> </function-decl> <function-decl name='__trace_puts' mangled-name='__trace_puts' filepath='kernel/trace/trace.c' line='838' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__trace_puts'> @@ -151443,8 +151336,8 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='kernel/trace/trace_events.c' language='LANG_C89'> - <function-decl name='trace_event_ignore_this_pid' mangled-name='trace_event_ignore_this_pid' filepath='kernel/trace/trace_events.c' line='231' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_ignore_this_pid'> - <parameter type-id='3d4ca6d2' name='trace_file' filepath='kernel/trace/trace_events.c' line='231' column='1'/> + <function-decl name='trace_event_ignore_this_pid' mangled-name='trace_event_ignore_this_pid' filepath='kernel/trace/trace_events.c' line='230' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_ignore_this_pid'> + <parameter type-id='3d4ca6d2' name='trace_file' filepath='kernel/trace/trace_events.c' line='230' column='1'/> <return type-id='b50a4934'/> </function-decl> <function-decl name='trace_define_field' mangled-name='trace_define_field' filepath='kernel/trace/trace_events.c' line='132' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_define_field'> @@ -151457,26 +151350,26 @@ <parameter type-id='95e97e5e' name='filter_type' filepath='kernel/trace/trace_events.c' line='134' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='trace_set_clr_event' mangled-name='trace_set_clr_event' filepath='kernel/trace/trace_events.c' line='845' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_set_clr_event'> - <parameter type-id='80f4b756' name='system' filepath='kernel/trace/trace_events.c' line='845' column='1'/> - <parameter type-id='80f4b756' name='event' filepath='kernel/trace/trace_events.c' line='845' column='1'/> - <parameter type-id='95e97e5e' name='set' filepath='kernel/trace/trace_events.c' line='845' column='1'/> + <function-decl name='trace_set_clr_event' mangled-name='trace_set_clr_event' filepath='kernel/trace/trace_events.c' line='844' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_set_clr_event'> + <parameter type-id='80f4b756' name='system' filepath='kernel/trace/trace_events.c' line='844' column='1'/> + <parameter type-id='80f4b756' name='event' filepath='kernel/trace/trace_events.c' line='844' column='1'/> + <parameter type-id='95e97e5e' name='set' filepath='kernel/trace/trace_events.c' line='844' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='trace_event_reg' mangled-name='trace_event_reg' filepath='kernel/trace/trace_events.c' line='281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_reg'> - <parameter type-id='23d6768c' name='call' filepath='kernel/trace/trace_events.c' line='281' column='1'/> - <parameter type-id='7fa6eeb8' name='type' filepath='kernel/trace/trace_events.c' line='282' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='kernel/trace/trace_events.c' line='282' column='1'/> + <function-decl name='trace_event_reg' mangled-name='trace_event_reg' filepath='kernel/trace/trace_events.c' line='280' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_reg'> + <parameter type-id='23d6768c' name='call' filepath='kernel/trace/trace_events.c' line='280' column='1'/> + <parameter type-id='7fa6eeb8' name='type' filepath='kernel/trace/trace_events.c' line='281' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='kernel/trace/trace_events.c' line='281' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='trace_event_raw_init' mangled-name='trace_event_raw_init' filepath='kernel/trace/trace_events.c' line='219' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_raw_init'> - <parameter type-id='23d6768c' name='call' filepath='kernel/trace/trace_events.c' line='219' column='1'/> + <function-decl name='trace_event_raw_init' mangled-name='trace_event_raw_init' filepath='kernel/trace/trace_events.c' line='218' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_raw_init'> + <parameter type-id='23d6768c' name='call' filepath='kernel/trace/trace_events.c' line='218' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='trace_event_buffer_reserve' mangled-name='trace_event_buffer_reserve' filepath='kernel/trace/trace_events.c' line='247' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_buffer_reserve'> - <parameter type-id='9f548f9a' name='fbuffer' filepath='kernel/trace/trace_events.c' line='247' column='1'/> - <parameter type-id='3d4ca6d2' name='trace_file' filepath='kernel/trace/trace_events.c' line='248' column='1'/> - <parameter type-id='7359adad' name='len' filepath='kernel/trace/trace_events.c' line='249' column='1'/> + <function-decl name='trace_event_buffer_reserve' mangled-name='trace_event_buffer_reserve' filepath='kernel/trace/trace_events.c' line='246' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='trace_event_buffer_reserve'> + <parameter type-id='9f548f9a' name='fbuffer' filepath='kernel/trace/trace_events.c' line='246' column='1'/> + <parameter type-id='3d4ca6d2' name='trace_file' filepath='kernel/trace/trace_events.c' line='247' column='1'/> + <parameter type-id='7359adad' name='len' filepath='kernel/trace/trace_events.c' line='248' column='1'/> <return type-id='eaa32e2f'/> </function-decl> </abi-instr> @@ -151787,12 +151680,12 @@ <var-decl name='no_numa' type-id='b50a4934' visibility='default' filepath='include/linux/workqueue.h' line='161' column='1'/> </data-member> </class-decl> - <class-decl name='wq_device' size-in-bits='7552' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5370' column='1' id='a88ecfc8'> + <class-decl name='wq_device' size-in-bits='7552' is-struct='yes' visibility='default' filepath='kernel/workqueue.c' line='5372' column='1' id='a88ecfc8'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5371' column='1'/> + <var-decl name='wq' type-id='242e3d19' visibility='default' filepath='kernel/workqueue.c' line='5373' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5372' column='1'/> + <var-decl name='dev' type-id='66e487eb' visibility='default' filepath='kernel/workqueue.c' line='5374' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='5ad6e0ef' size-in-bits='64' id='1a7ee447'/> @@ -151802,10 +151695,10 @@ <pointer-type-def type-id='2fe6f208' size-in-bits='64' id='cfd15e7e'/> <pointer-type-def type-id='a88ecfc8' size-in-bits='64' id='5cebc26e'/> <pointer-type-def type-id='c8eb0f4f' size-in-bits='64' id='ec037527'/> - <function-decl name='alloc_workqueue' mangled-name='alloc_workqueue' filepath='kernel/workqueue.c' line='4255' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_workqueue'> - <parameter type-id='80f4b756' name='fmt' filepath='kernel/workqueue.c' line='4255' column='1'/> - <parameter type-id='f0981eeb' name='flags' filepath='kernel/workqueue.c' line='4256' column='1'/> - <parameter type-id='95e97e5e' name='max_active' filepath='kernel/workqueue.c' line='4257' column='1'/> + <function-decl name='alloc_workqueue' mangled-name='alloc_workqueue' filepath='kernel/workqueue.c' line='4257' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_workqueue'> + <parameter type-id='80f4b756' name='fmt' filepath='kernel/workqueue.c' line='4257' column='1'/> + <parameter type-id='f0981eeb' name='flags' filepath='kernel/workqueue.c' line='4258' column='1'/> + <parameter type-id='95e97e5e' name='max_active' filepath='kernel/workqueue.c' line='4259' column='1'/> <parameter is-variadic='yes'/> <return type-id='242e3d19'/> </function-decl> @@ -151815,16 +151708,16 @@ <var-decl name='system_unbound_wq' type-id='242e3d19' mangled-name='system_unbound_wq' visibility='default' filepath='kernel/workqueue.c' line='352' column='1' elf-symbol-id='system_unbound_wq'/> <var-decl name='system_freezable_wq' type-id='242e3d19' mangled-name='system_freezable_wq' visibility='default' filepath='kernel/workqueue.c' line='354' column='1' elf-symbol-id='system_freezable_wq'/> <var-decl name='system_power_efficient_wq' type-id='242e3d19' mangled-name='system_power_efficient_wq' visibility='default' filepath='kernel/workqueue.c' line='356' column='1' elf-symbol-id='system_power_efficient_wq'/> - <function-decl name='destroy_workqueue' mangled-name='destroy_workqueue' filepath='kernel/workqueue.c' line='4358' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='destroy_workqueue'> - <parameter type-id='242e3d19' name='wq' filepath='kernel/workqueue.c' line='4358' column='1'/> + <function-decl name='destroy_workqueue' mangled-name='destroy_workqueue' filepath='kernel/workqueue.c' line='4360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='destroy_workqueue'> + <parameter type-id='242e3d19' name='wq' filepath='kernel/workqueue.c' line='4360' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='flush_workqueue' mangled-name='flush_workqueue' filepath='kernel/workqueue.c' line='2786' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='flush_workqueue'> <parameter type-id='242e3d19' name='wq' filepath='kernel/workqueue.c' line='2786' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='work_busy' mangled-name='work_busy' filepath='kernel/workqueue.c' line='4563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='work_busy'> - <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='4563' column='1'/> + <function-decl name='work_busy' mangled-name='work_busy' filepath='kernel/workqueue.c' line='4565' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='work_busy'> + <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='4565' column='1'/> <return type-id='f0981eeb'/> </function-decl> <function-decl name='queue_work_on' mangled-name='queue_work_on' filepath='kernel/workqueue.c' line='1528' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='queue_work_on'> @@ -151847,12 +151740,12 @@ <parameter type-id='7359adad' name='delay' filepath='kernel/workqueue.c' line='1723' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='flush_work' mangled-name='flush_work' filepath='kernel/workqueue.c' line='3081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='flush_work'> - <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='3081' column='1'/> + <function-decl name='flush_work' mangled-name='flush_work' filepath='kernel/workqueue.c' line='3083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='flush_work'> + <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='3083' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='flush_delayed_work' mangled-name='flush_delayed_work' filepath='kernel/workqueue.c' line='3201' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='flush_delayed_work'> - <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3201' column='1'/> + <function-decl name='flush_delayed_work' mangled-name='flush_delayed_work' filepath='kernel/workqueue.c' line='3203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='flush_delayed_work'> + <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3203' column='1'/> <return type-id='b50a4934'/> </function-decl> <function-decl name='drain_workqueue' mangled-name='drain_workqueue' filepath='kernel/workqueue.c' line='2948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='drain_workqueue'> @@ -151863,19 +151756,19 @@ <parameter type-id='9248e67f' name='t' filepath='kernel/workqueue.c' line='1630' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='current_work' mangled-name='current_work' filepath='kernel/workqueue.c' line='4487' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='current_work'> + <function-decl name='current_work' mangled-name='current_work' filepath='kernel/workqueue.c' line='4489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='current_work'> <return type-id='83c1bde6'/> </function-decl> - <function-decl name='cancel_work_sync' mangled-name='cancel_work_sync' filepath='kernel/workqueue.c' line='3183' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_work_sync'> - <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='3183' column='1'/> + <function-decl name='cancel_work_sync' mangled-name='cancel_work_sync' filepath='kernel/workqueue.c' line='3185' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_work_sync'> + <parameter type-id='83c1bde6' name='work' filepath='kernel/workqueue.c' line='3185' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='cancel_delayed_work_sync' mangled-name='cancel_delayed_work_sync' filepath='kernel/workqueue.c' line='3279' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_delayed_work_sync'> - <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3279' column='1'/> + <function-decl name='cancel_delayed_work_sync' mangled-name='cancel_delayed_work_sync' filepath='kernel/workqueue.c' line='3281' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_delayed_work_sync'> + <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3281' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='cancel_delayed_work' mangled-name='cancel_delayed_work' filepath='kernel/workqueue.c' line='3264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_delayed_work'> - <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3264' column='1'/> + <function-decl name='cancel_delayed_work' mangled-name='cancel_delayed_work' filepath='kernel/workqueue.c' line='3266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cancel_delayed_work'> + <parameter type-id='1a7ee447' name='dwork' filepath='kernel/workqueue.c' line='3266' column='1'/> <return type-id='b50a4934'/> </function-decl> </abi-instr> @@ -153087,7 +152980,7 @@ <var-decl name='twsk_destructor' type-id='841969d0' visibility='default' filepath='include/net/timewait_sock.h' line='20' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__18' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1198' column='1' id='adf5bf47'> + <union-decl name='__anonymous_union__16' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='1198' column='1' id='adf5bf47'> <data-member access='public'> <var-decl name='hashinfo' type-id='d7a1e3c2' visibility='default' filepath='include/net/sock.h' line='1199' column='1'/> </data-member> @@ -153109,7 +153002,7 @@ <var-decl name='ht' type-id='e151255a' visibility='default' filepath='include/net/smc.h' line='18' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__19' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='199' column='1' id='56935795'> + <union-decl name='__anonymous_union__17' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='199' column='1' id='56935795'> <data-member access='public'> <var-decl name='skc_flags' type-id='7359adad' visibility='default' filepath='include/net/sock.h' line='200' column='1'/> </data-member> @@ -153120,7 +153013,7 @@ <var-decl name='skc_tw_dr' type-id='b7ab21fc' visibility='default' filepath='include/net/sock.h' line='202' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__20' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='211' column='1' id='38f5bda8'> + <union-decl name='__anonymous_union__18' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='211' column='1' id='38f5bda8'> <data-member access='public'> <var-decl name='skc_node' type-id='03a4a074' visibility='default' filepath='include/net/sock.h' line='212' column='1'/> </data-member> @@ -153128,7 +153021,7 @@ <var-decl name='skc_nulls_node' type-id='5bd248e7' visibility='default' filepath='include/net/sock.h' line='213' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__21' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='219' column='1' id='9e121764'> + <union-decl name='__anonymous_union__19' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='219' column='1' id='9e121764'> <data-member access='public'> <var-decl name='skc_incoming_cpu' type-id='95e97e5e' visibility='default' filepath='include/net/sock.h' line='220' column='1'/> </data-member> @@ -153139,7 +153032,7 @@ <var-decl name='skc_tw_rcv_nxt' type-id='19c2251e' visibility='default' filepath='include/net/sock.h' line='222' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__22' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='228' column='1' id='5547e6b1'> + <union-decl name='__anonymous_union__20' size-in-bits='32' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='228' column='1' id='5547e6b1'> <data-member access='public'> <var-decl name='skc_rxhash' type-id='19c2251e' visibility='default' filepath='include/net/sock.h' line='229' column='1'/> </data-member> @@ -153187,7 +153080,7 @@ <var-decl name='prog' type-id='bdcee7ae' visibility='default' filepath='include/linux/filter.h' line='571' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__25' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='397' column='1' id='a29f8367'> + <union-decl name='__anonymous_union__23' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='397' column='1' id='a29f8367'> <data-member access='public'> <var-decl name='sk_wq' type-id='99f34ac1' visibility='default' filepath='include/net/sock.h' line='398' column='1'/> </data-member> @@ -153235,7 +153128,7 @@ <var-decl name='data' type-id='167619f6' visibility='default' filepath='include/net/lwtunnel.h' line='33' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='413' column='1' id='fc714247'> + <union-decl name='__anonymous_union__24' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='413' column='1' id='fc714247'> <data-member access='public'> <var-decl name='sk_send_head' type-id='0fbf3cfd' visibility='default' filepath='include/net/sock.h' line='414' column='1'/> </data-member> @@ -153368,7 +153261,7 @@ <var-decl name='error' type-id='95e97e5e' visibility='default' filepath='include/linux/fs.h' line='364' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__28' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='360' column='1' id='8dda450b'> + <union-decl name='__anonymous_union__26' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/fs.h' line='360' column='1' id='8dda450b'> <data-member access='public'> <var-decl name='buf' type-id='26a90f95' visibility='default' filepath='include/linux/fs.h' line='361' column='1'/> </data-member> @@ -153382,7 +153275,7 @@ <var-decl name='' type-id='de05b94c' visibility='default' filepath='include/linux/cgroup-defs.h' line='798' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__29' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/cgroup-defs.h' line='798' column='1' id='de05b94c'> + <union-decl name='__anonymous_union__27' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/cgroup-defs.h' line='798' column='1' id='de05b94c'> <data-member access='public'> <var-decl name='' type-id='16b0d6e5' visibility='default' filepath='include/linux/cgroup-defs.h' line='800' column='1'/> </data-member> @@ -153410,7 +153303,7 @@ <var-decl name='classid' type-id='19c2251e' visibility='default' filepath='include/linux/cgroup-defs.h' line='806' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='526' column='1' id='b3414a3c'> + <union-decl name='__anonymous_union__28' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='526' column='1' id='b3414a3c'> <data-member access='public'> <var-decl name='sk_peer_lock' type-id='fb4018a0' visibility='default' filepath='include/net/sock.h' line='526' column='1'/> </data-member> @@ -153421,7 +153314,12 @@ <var-decl name='' type-id='2a125a28' visibility='default' filepath='include/net/sock.h' line='526' column='1'/> </data-member> </union-decl> - <union-decl name='__anonymous_union__32' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ip.h' line='127' column='1' id='4fa91678'> + <class-decl name='__anonymous_struct__8' size-in-bits='64' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/sock.h' line='526' column='1' id='156952c4'> + <data-member access='public' layout-offset-in-bits='0'> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/net/sock.h' line='526' column='1'/> + </data-member> + </class-decl> + <union-decl name='__anonymous_union__30' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ip.h' line='127' column='1' id='4fa91678'> <data-member access='public'> <var-decl name='destructor' type-id='841969d0' visibility='default' filepath='include/net/ip.h' line='128' column='1'/> </data-member> @@ -153889,23 +153787,23 @@ <qualified-type-def type-id='002ac4a6' volatile='yes' id='75a392dc'/> <pointer-type-def type-id='ccf6c819' size-in-bits='64' id='ae4d1761'/> <pointer-type-def type-id='cb961c68' size-in-bits='64' id='328dda6e'/> - <function-decl name='__dynamic_pr_debug' mangled-name='__dynamic_pr_debug' filepath='lib/dynamic_debug.c' line='555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_pr_debug'> - <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='555' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='555' column='1'/> + <function-decl name='__dynamic_pr_debug' mangled-name='__dynamic_pr_debug' filepath='lib/dynamic_debug.c' line='552' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_pr_debug'> + <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='552' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='552' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__dynamic_netdev_dbg' mangled-name='__dynamic_netdev_dbg' filepath='lib/dynamic_debug.c' line='606' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_netdev_dbg'> - <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='606' column='1'/> - <parameter type-id='2ce52478' name='dev' filepath='lib/dynamic_debug.c' line='607' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='607' column='1'/> + <function-decl name='__dynamic_netdev_dbg' mangled-name='__dynamic_netdev_dbg' filepath='lib/dynamic_debug.c' line='603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_netdev_dbg'> + <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='603' column='1'/> + <parameter type-id='2ce52478' name='dev' filepath='lib/dynamic_debug.c' line='604' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='604' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__dynamic_dev_dbg' mangled-name='__dynamic_dev_dbg' filepath='lib/dynamic_debug.c' line='575' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_dev_dbg'> - <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='575' column='1'/> - <parameter type-id='8df61054' name='dev' filepath='lib/dynamic_debug.c' line='576' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='576' column='1'/> + <function-decl name='__dynamic_dev_dbg' mangled-name='__dynamic_dev_dbg' filepath='lib/dynamic_debug.c' line='572' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dynamic_dev_dbg'> + <parameter type-id='7c67ab39' name='descriptor' filepath='lib/dynamic_debug.c' line='572' column='1'/> + <parameter type-id='8df61054' name='dev' filepath='lib/dynamic_debug.c' line='573' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/dynamic_debug.c' line='573' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> @@ -154815,22 +154713,22 @@ <abi-instr address-size='64' path='lib/iov_iter.c' language='LANG_C89'> <pointer-type-def type-id='0f042891' size-in-bits='64' id='cc4b1be9'/> <pointer-type-def type-id='cc4b1be9' size-in-bits='64' id='5d3cb3f9'/> - <function-decl name='_copy_from_iter_full' mangled-name='_copy_from_iter_full' filepath='lib/iov_iter.c' line='747' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_from_iter_full'> - <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='747' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='747' column='1'/> - <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='747' column='1'/> + <function-decl name='_copy_from_iter_full' mangled-name='_copy_from_iter_full' filepath='lib/iov_iter.c' line='761' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_from_iter_full'> + <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='761' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='761' column='1'/> + <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='761' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='_copy_to_iter' mangled-name='_copy_to_iter' filepath='lib/iov_iter.c' line='593' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_to_iter'> - <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='593' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='593' column='1'/> - <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='593' column='1'/> + <function-decl name='_copy_to_iter' mangled-name='_copy_to_iter' filepath='lib/iov_iter.c' line='607' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_to_iter'> + <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='607' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='607' column='1'/> + <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='607' column='1'/> <return type-id='b59d7dce'/> </function-decl> - <function-decl name='_copy_from_iter' mangled-name='_copy_from_iter' filepath='lib/iov_iter.c' line='727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_from_iter'> - <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='727' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='727' column='1'/> - <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='727' column='1'/> + <function-decl name='_copy_from_iter' mangled-name='_copy_from_iter' filepath='lib/iov_iter.c' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='_copy_from_iter'> + <parameter type-id='eaa32e2f' name='addr' filepath='lib/iov_iter.c' line='741' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='lib/iov_iter.c' line='741' column='1'/> + <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='741' column='1'/> <return type-id='b59d7dce'/> </function-decl> <function-decl name='iov_iter_init' mangled-name='iov_iter_init' filepath='lib/iov_iter.c' line='437' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='iov_iter_init'> @@ -154841,13 +154739,13 @@ <parameter type-id='b59d7dce' name='count' filepath='lib/iov_iter.c' line='439' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='import_iovec' mangled-name='import_iovec' filepath='lib/iov_iter.c' line='1635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='import_iovec'> - <parameter type-id='95e97e5e' name='type' filepath='lib/iov_iter.c' line='1635' column='1'/> - <parameter type-id='2c556848' name='uvector' filepath='lib/iov_iter.c' line='1635' column='1'/> - <parameter type-id='f0981eeb' name='nr_segs' filepath='lib/iov_iter.c' line='1636' column='1'/> - <parameter type-id='f0981eeb' name='fast_segs' filepath='lib/iov_iter.c' line='1636' column='1'/> - <parameter type-id='5d3cb3f9' name='iov' filepath='lib/iov_iter.c' line='1637' column='1'/> - <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='1637' column='1'/> + <function-decl name='import_iovec' mangled-name='import_iovec' filepath='lib/iov_iter.c' line='1649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='import_iovec'> + <parameter type-id='95e97e5e' name='type' filepath='lib/iov_iter.c' line='1649' column='1'/> + <parameter type-id='2c556848' name='uvector' filepath='lib/iov_iter.c' line='1649' column='1'/> + <parameter type-id='f0981eeb' name='nr_segs' filepath='lib/iov_iter.c' line='1650' column='1'/> + <parameter type-id='f0981eeb' name='fast_segs' filepath='lib/iov_iter.c' line='1650' column='1'/> + <parameter type-id='5d3cb3f9' name='iov' filepath='lib/iov_iter.c' line='1651' column='1'/> + <parameter type-id='4fa10f9e' name='i' filepath='lib/iov_iter.c' line='1651' column='1'/> <return type-id='79a0948f'/> </function-decl> </abi-instr> @@ -155138,8 +155036,8 @@ <parameter type-id='e84b031a' name='next' filepath='lib/list_debug.c' line='21' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='__list_del_entry_valid' mangled-name='__list_del_entry_valid' filepath='lib/list_debug.c' line='42' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__list_del_entry_valid'> - <parameter type-id='e84b031a' name='entry' filepath='lib/list_debug.c' line='42' column='1'/> + <function-decl name='__list_del_entry_valid' mangled-name='__list_del_entry_valid' filepath='lib/list_debug.c' line='38' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__list_del_entry_valid'> + <parameter type-id='e84b031a' name='entry' filepath='lib/list_debug.c' line='38' column='1'/> <return type-id='b50a4934'/> </function-decl> </abi-instr> @@ -155169,8 +155067,8 @@ </abi-instr> <abi-instr address-size='64' path='lib/lockref.c' language='LANG_C89'> <pointer-type-def type-id='60efdfd3' size-in-bits='64' id='5bfdb453'/> - <function-decl name='lockref_get' mangled-name='lockref_get' filepath='lib/lockref.c' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lockref_get'> - <parameter type-id='5bfdb453' name='lockref' filepath='lib/lockref.c' line='43' column='1'/> + <function-decl name='lockref_get' mangled-name='lockref_get' filepath='lib/lockref.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lockref_get'> + <parameter type-id='5bfdb453' name='lockref' filepath='lib/lockref.c' line='44' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -155259,47 +155157,47 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='lib/nlattr.c' language='LANG_C89'> - <function-decl name='nla_strlcpy' mangled-name='nla_strlcpy' filepath='lib/nlattr.c' line='519' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_strlcpy'> - <parameter type-id='26a90f95' name='dst' filepath='lib/nlattr.c' line='519' column='1'/> - <parameter type-id='0f2a7ce5' name='nla' filepath='lib/nlattr.c' line='519' column='1'/> - <parameter type-id='b59d7dce' name='dstsize' filepath='lib/nlattr.c' line='519' column='1'/> + <function-decl name='nla_strlcpy' mangled-name='nla_strlcpy' filepath='lib/nlattr.c' line='516' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_strlcpy'> + <parameter type-id='26a90f95' name='dst' filepath='lib/nlattr.c' line='516' column='1'/> + <parameter type-id='0f2a7ce5' name='nla' filepath='lib/nlattr.c' line='516' column='1'/> + <parameter type-id='b59d7dce' name='dstsize' filepath='lib/nlattr.c' line='516' column='1'/> <return type-id='b59d7dce'/> </function-decl> - <function-decl name='nla_put_nohdr' mangled-name='nla_put_nohdr' filepath='lib/nlattr.c' line='879' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put_nohdr'> - <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='879' column='1'/> - <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='879' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='879' column='1'/> + <function-decl name='nla_put_nohdr' mangled-name='nla_put_nohdr' filepath='lib/nlattr.c' line='876' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put_nohdr'> + <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='876' column='1'/> + <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='876' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='876' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nla_put_64bit' mangled-name='nla_put_64bit' filepath='lib/nlattr.c' line='853' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put_64bit'> - <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='853' column='1'/> - <parameter type-id='95e97e5e' name='attrtype' filepath='lib/nlattr.c' line='853' column='1'/> - <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='853' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='854' column='1'/> - <parameter type-id='95e97e5e' name='padattr' filepath='lib/nlattr.c' line='854' column='1'/> + <function-decl name='nla_put_64bit' mangled-name='nla_put_64bit' filepath='lib/nlattr.c' line='850' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put_64bit'> + <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='850' column='1'/> + <parameter type-id='95e97e5e' name='attrtype' filepath='lib/nlattr.c' line='850' column='1'/> + <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='850' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='851' column='1'/> + <parameter type-id='95e97e5e' name='padattr' filepath='lib/nlattr.c' line='851' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nla_put' mangled-name='nla_put' filepath='lib/nlattr.c' line='832' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put'> - <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='832' column='1'/> - <parameter type-id='95e97e5e' name='attrtype' filepath='lib/nlattr.c' line='832' column='1'/> - <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='832' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='832' column='1'/> + <function-decl name='nla_put' mangled-name='nla_put' filepath='lib/nlattr.c' line='829' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_put'> + <parameter type-id='0fbf3cfd' name='skb' filepath='lib/nlattr.c' line='829' column='1'/> + <parameter type-id='95e97e5e' name='attrtype' filepath='lib/nlattr.c' line='829' column='1'/> + <parameter type-id='95e97e5e' name='attrlen' filepath='lib/nlattr.c' line='829' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='lib/nlattr.c' line='829' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='nla_memcpy' mangled-name='nla_memcpy' filepath='lib/nlattr.c' line='573' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_memcpy'> - <parameter type-id='eaa32e2f' name='dest' filepath='lib/nlattr.c' line='573' column='1'/> - <parameter type-id='0f2a7ce5' name='src' filepath='lib/nlattr.c' line='573' column='1'/> - <parameter type-id='95e97e5e' name='count' filepath='lib/nlattr.c' line='573' column='1'/> + <function-decl name='nla_memcpy' mangled-name='nla_memcpy' filepath='lib/nlattr.c' line='570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='nla_memcpy'> + <parameter type-id='eaa32e2f' name='dest' filepath='lib/nlattr.c' line='570' column='1'/> + <parameter type-id='0f2a7ce5' name='src' filepath='lib/nlattr.c' line='570' column='1'/> + <parameter type-id='95e97e5e' name='count' filepath='lib/nlattr.c' line='570' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__nla_parse' mangled-name='__nla_parse' filepath='lib/nlattr.c' line='476' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__nla_parse'> - <parameter type-id='30864cdc' name='tb' filepath='lib/nlattr.c' line='476' column='1'/> - <parameter type-id='95e97e5e' name='maxtype' filepath='lib/nlattr.c' line='476' column='1'/> - <parameter type-id='0f2a7ce5' name='head' filepath='lib/nlattr.c' line='477' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='lib/nlattr.c' line='477' column='1'/> - <parameter type-id='109cdb66' name='policy' filepath='lib/nlattr.c' line='478' column='1'/> - <parameter type-id='f0981eeb' name='validate' filepath='lib/nlattr.c' line='478' column='1'/> - <parameter type-id='5799dc94' name='extack' filepath='lib/nlattr.c' line='479' column='1'/> + <function-decl name='__nla_parse' mangled-name='__nla_parse' filepath='lib/nlattr.c' line='473' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__nla_parse'> + <parameter type-id='30864cdc' name='tb' filepath='lib/nlattr.c' line='473' column='1'/> + <parameter type-id='95e97e5e' name='maxtype' filepath='lib/nlattr.c' line='473' column='1'/> + <parameter type-id='0f2a7ce5' name='head' filepath='lib/nlattr.c' line='474' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='lib/nlattr.c' line='474' column='1'/> + <parameter type-id='109cdb66' name='policy' filepath='lib/nlattr.c' line='475' column='1'/> + <parameter type-id='f0981eeb' name='validate' filepath='lib/nlattr.c' line='475' column='1'/> + <parameter type-id='5799dc94' name='extack' filepath='lib/nlattr.c' line='476' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -155848,153 +155746,147 @@ <abi-instr address-size='64' path='lib/string.c' language='LANG_C89'> <qualified-type-def type-id='26a90f95' restrict='yes' id='266fe297'/> <qualified-type-def type-id='80f4b756' restrict='yes' id='9d26089a'/> - <function-decl name='strsep' mangled-name='strsep' filepath='lib/string.c' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strsep'> - <parameter type-id='9b23c9ad' name='s' filepath='lib/string.c' line='660' column='1'/> - <parameter type-id='80f4b756' name='ct' filepath='lib/string.c' line='660' column='1'/> + <function-decl name='strsep' mangled-name='strsep' filepath='lib/string.c' line='659' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strsep'> + <parameter type-id='9b23c9ad' name='s' filepath='lib/string.c' line='659' column='1'/> + <parameter type-id='80f4b756' name='ct' filepath='lib/string.c' line='659' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strcasecmp' mangled-name='strcasecmp' filepath='lib/string.c' line='70' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcasecmp'> - <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='70' column='1'/> - <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='70' column='1'/> + <function-decl name='strcasecmp' mangled-name='strcasecmp' filepath='lib/string.c' line='69' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcasecmp'> + <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='69' column='1'/> + <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='69' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='bcmp' mangled-name='bcmp' filepath='lib/string.c' line='945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bcmp'> - <parameter type-id='eaa32e2f' name='a' filepath='lib/string.c' line='945' column='1'/> - <parameter type-id='eaa32e2f' name='b' filepath='lib/string.c' line='945' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='945' column='1'/> + <function-decl name='bcmp' mangled-name='bcmp' filepath='lib/string.c' line='929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bcmp'> + <parameter type-id='eaa32e2f' name='a' filepath='lib/string.c' line='929' column='1'/> + <parameter type-id='eaa32e2f' name='b' filepath='lib/string.c' line='929' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='929' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='memchr_inv' mangled-name='memchr_inv' filepath='lib/string.c' line='1070' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memchr_inv'> - <parameter type-id='eaa32e2f' name='start' filepath='lib/string.c' line='1070' column='1'/> - <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='1070' column='1'/> - <parameter type-id='b59d7dce' name='bytes' filepath='lib/string.c' line='1070' column='1'/> + <function-decl name='memchr_inv' mangled-name='memchr_inv' filepath='lib/string.c' line='1054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memchr_inv'> + <parameter type-id='eaa32e2f' name='start' filepath='lib/string.c' line='1054' column='1'/> + <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='1054' column='1'/> + <parameter type-id='b59d7dce' name='bytes' filepath='lib/string.c' line='1054' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='strscpy_pad' mangled-name='strscpy_pad' filepath='lib/string.c' line='262' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy_pad'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='262' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='262' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='262' column='1'/> - <return type-id='79a0948f'/> - </function-decl> - <function-decl name='strlcat' mangled-name='strlcat' filepath='lib/string.c' line='356' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcat'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='356' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='356' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='356' column='1'/> + <function-decl name='strlcat' mangled-name='strlcat' filepath='lib/string.c' line='355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcat'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='355' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='355' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='355' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='strim' mangled-name='strim' filepath='lib/string.c' line='525' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strim'> - <parameter type-id='26a90f95' name='s' filepath='lib/string.c' line='525' column='1'/> + <function-decl name='strim' mangled-name='strim' filepath='lib/string.c' line='524' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strim'> + <parameter type-id='26a90f95' name='s' filepath='lib/string.c' line='524' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='sysfs_streq' mangled-name='sysfs_streq' filepath='lib/string.c' line='687' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_streq'> - <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='687' column='1'/> - <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='687' column='1'/> + <function-decl name='sysfs_streq' mangled-name='sysfs_streq' filepath='lib/string.c' line='686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sysfs_streq'> + <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='686' column='1'/> + <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='686' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='strscpy' mangled-name='strscpy' filepath='lib/string.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='181' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='181' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='181' column='1'/> + <function-decl name='strscpy' mangled-name='strscpy' filepath='lib/string.c' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strscpy'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='180' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='180' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='180' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='strreplace' mangled-name='strreplace' filepath='lib/string.c' line='1124' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strreplace'> - <parameter type-id='26a90f95' name='s' filepath='lib/string.c' line='1124' column='1'/> - <parameter type-id='a84c031d' name='old' filepath='lib/string.c' line='1124' column='1'/> - <parameter type-id='a84c031d' name='new' filepath='lib/string.c' line='1124' column='1'/> + <function-decl name='strreplace' mangled-name='strreplace' filepath='lib/string.c' line='1108' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strreplace'> + <parameter type-id='26a90f95' name='s' filepath='lib/string.c' line='1108' column='1'/> + <parameter type-id='a84c031d' name='old' filepath='lib/string.c' line='1108' column='1'/> + <parameter type-id='a84c031d' name='new' filepath='lib/string.c' line='1108' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strpbrk' mangled-name='strpbrk' filepath='lib/string.c' line='633' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strpbrk'> - <parameter type-id='80f4b756' name='cs' filepath='lib/string.c' line='633' column='1'/> - <parameter type-id='80f4b756' name='ct' filepath='lib/string.c' line='633' column='1'/> + <function-decl name='strpbrk' mangled-name='strpbrk' filepath='lib/string.c' line='632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strpbrk'> + <parameter type-id='80f4b756' name='cs' filepath='lib/string.c' line='632' column='1'/> + <parameter type-id='80f4b756' name='ct' filepath='lib/string.c' line='632' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strnstr' mangled-name='strnstr' filepath='lib/string.c' line='1009' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnstr'> - <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='1009' column='1'/> - <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='1009' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='1009' column='1'/> + <function-decl name='strnstr' mangled-name='strnstr' filepath='lib/string.c' line='993' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnstr'> + <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='993' column='1'/> + <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='993' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='993' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strncpy' mangled-name='strncpy' filepath='lib/string.c' line='115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncpy'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='115' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='115' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='115' column='1'/> + <function-decl name='strncpy' mangled-name='strncpy' filepath='lib/string.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncpy'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='114' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='114' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='114' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strnchr' mangled-name='strnchr' filepath='lib/string.c' line='490' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnchr'> - <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='490' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='490' column='1'/> - <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='490' column='1'/> + <function-decl name='strnchr' mangled-name='strnchr' filepath='lib/string.c' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strnchr'> + <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='489' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='489' column='1'/> + <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='489' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strncat' mangled-name='strncat' filepath='lib/string.c' line='330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncat'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='330' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='330' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='330' column='1'/> + <function-decl name='strncat' mangled-name='strncat' filepath='lib/string.c' line='329' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncat'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='329' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='329' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='329' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strncasecmp' mangled-name='strncasecmp' filepath='lib/string.c' line='44' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncasecmp'> - <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='44' column='1'/> - <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='44' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='44' column='1'/> + <function-decl name='strncasecmp' mangled-name='strncasecmp' filepath='lib/string.c' line='43' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strncasecmp'> + <parameter type-id='80f4b756' name='s1' filepath='lib/string.c' line='43' column='1'/> + <parameter type-id='80f4b756' name='s2' filepath='lib/string.c' line='43' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='lib/string.c' line='43' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='strlcpy' mangled-name='strlcpy' filepath='lib/string.c' line='142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcpy'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='142' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='142' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='lib/string.c' line='142' column='1'/> + <function-decl name='strlcpy' mangled-name='strlcpy' filepath='lib/string.c' line='141' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strlcpy'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='141' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='141' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='lib/string.c' line='141' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='strcspn' mangled-name='strcspn' filepath='lib/string.c' line='609' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcspn'> - <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='609' column='1'/> - <parameter type-id='80f4b756' name='reject' filepath='lib/string.c' line='609' column='1'/> + <function-decl name='strcspn' mangled-name='strcspn' filepath='lib/string.c' line='608' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcspn'> + <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='608' column='1'/> + <parameter type-id='80f4b756' name='reject' filepath='lib/string.c' line='608' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='strcpy' mangled-name='strcpy' filepath='lib/string.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcpy'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='90' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='90' column='1'/> + <function-decl name='strcpy' mangled-name='strcpy' filepath='lib/string.c' line='89' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcpy'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='89' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='89' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strchrnul' mangled-name='strchrnul' filepath='lib/string.c' line='453' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strchrnul'> - <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='453' column='1'/> - <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='453' column='1'/> + <function-decl name='strchrnul' mangled-name='strchrnul' filepath='lib/string.c' line='452' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strchrnul'> + <parameter type-id='80f4b756' name='s' filepath='lib/string.c' line='452' column='1'/> + <parameter type-id='95e97e5e' name='c' filepath='lib/string.c' line='452' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='strcat' mangled-name='strcat' filepath='lib/string.c' line='307' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcat'> - <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='307' column='1'/> - <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='307' column='1'/> + <function-decl name='strcat' mangled-name='strcat' filepath='lib/string.c' line='306' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='strcat'> + <parameter type-id='26a90f95' name='dest' filepath='lib/string.c' line='306' column='1'/> + <parameter type-id='80f4b756' name='src' filepath='lib/string.c' line='306' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='stpcpy' mangled-name='stpcpy' filepath='lib/string.c' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stpcpy'> - <parameter type-id='266fe297' name='dest' filepath='lib/string.c' line='292' column='1'/> - <parameter type-id='9d26089a' name='src' filepath='lib/string.c' line='292' column='1'/> + <function-decl name='stpcpy' mangled-name='stpcpy' filepath='lib/string.c' line='291' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='stpcpy'> + <parameter type-id='266fe297' name='dest' filepath='lib/string.c' line='291' column='1'/> + <parameter type-id='9d26089a' name='src' filepath='lib/string.c' line='291' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='skip_spaces' mangled-name='skip_spaces' filepath='lib/string.c' line='509' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skip_spaces'> - <parameter type-id='80f4b756' name='str' filepath='lib/string.c' line='509' column='1'/> + <function-decl name='skip_spaces' mangled-name='skip_spaces' filepath='lib/string.c' line='508' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skip_spaces'> + <parameter type-id='80f4b756' name='str' filepath='lib/string.c' line='508' column='1'/> <return type-id='26a90f95'/> </function-decl> - <function-decl name='memset64' mangled-name='memset64' filepath='lib/string.c' line='831' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memset64'> - <parameter type-id='5d6479ae' name='s' filepath='lib/string.c' line='831' column='1'/> - <parameter type-id='9c313c2d' name='v' filepath='lib/string.c' line='831' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='831' column='1'/> + <function-decl name='memset64' mangled-name='memset64' filepath='lib/string.c' line='830' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memset64'> + <parameter type-id='5d6479ae' name='s' filepath='lib/string.c' line='830' column='1'/> + <parameter type-id='9c313c2d' name='v' filepath='lib/string.c' line='830' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='830' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='memset32' mangled-name='memset32' filepath='lib/string.c' line='809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memset32'> - <parameter type-id='90421557' name='s' filepath='lib/string.c' line='809' column='1'/> - <parameter type-id='8f92235e' name='v' filepath='lib/string.c' line='809' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='809' column='1'/> + <function-decl name='memset32' mangled-name='memset32' filepath='lib/string.c' line='808' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memset32'> + <parameter type-id='90421557' name='s' filepath='lib/string.c' line='808' column='1'/> + <parameter type-id='8f92235e' name='v' filepath='lib/string.c' line='808' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='lib/string.c' line='808' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='match_string' mangled-name='match_string' filepath='lib/string.c' line='713' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='match_string'> - <parameter type-id='13956559' name='array' filepath='lib/string.c' line='713' column='1'/> - <parameter type-id='b59d7dce' name='n' filepath='lib/string.c' line='713' column='1'/> - <parameter type-id='80f4b756' name='string' filepath='lib/string.c' line='713' column='1'/> + <function-decl name='match_string' mangled-name='match_string' filepath='lib/string.c' line='712' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='match_string'> + <parameter type-id='13956559' name='array' filepath='lib/string.c' line='712' column='1'/> + <parameter type-id='b59d7dce' name='n' filepath='lib/string.c' line='712' column='1'/> + <parameter type-id='80f4b756' name='string' filepath='lib/string.c' line='712' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__sysfs_match_string' mangled-name='__sysfs_match_string' filepath='lib/string.c' line='739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sysfs_match_string'> - <parameter type-id='13956559' name='array' filepath='lib/string.c' line='739' column='1'/> - <parameter type-id='b59d7dce' name='n' filepath='lib/string.c' line='739' column='1'/> - <parameter type-id='80f4b756' name='str' filepath='lib/string.c' line='739' column='1'/> + <function-decl name='__sysfs_match_string' mangled-name='__sysfs_match_string' filepath='lib/string.c' line='738' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sysfs_match_string'> + <parameter type-id='13956559' name='array' filepath='lib/string.c' line='738' column='1'/> + <parameter type-id='b59d7dce' name='n' filepath='lib/string.c' line='738' column='1'/> + <parameter type-id='80f4b756' name='str' filepath='lib/string.c' line='738' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -156039,74 +155931,74 @@ <var-decl name='uuid_null' type-id='21109a44' mangled-name='uuid_null' visibility='default' filepath='lib/uuid.c' line='18' column='1' elf-symbol-id='uuid_null'/> </abi-instr> <abi-instr address-size='64' path='lib/vsprintf.c' language='LANG_C89'> - <function-decl name='snprintf' mangled-name='snprintf' filepath='lib/vsprintf.c' line='2728' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2728' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2728' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2728' column='1'/> + <function-decl name='snprintf' mangled-name='snprintf' filepath='lib/vsprintf.c' line='2722' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2722' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2722' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2722' column='1'/> <parameter is-variadic='yes'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='simple_strtoul' mangled-name='simple_strtoul' filepath='lib/vsprintf.c' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtoul'> - <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='104' column='1'/> - <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='104' column='1'/> - <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='104' column='1'/> + <function-decl name='simple_strtoul' mangled-name='simple_strtoul' filepath='lib/vsprintf.c' line='100' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtoul'> + <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='100' column='1'/> + <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='100' column='1'/> + <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='100' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='simple_strtol' mangled-name='simple_strtol' filepath='lib/vsprintf.c' line='118' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtol'> - <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='118' column='1'/> - <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='118' column='1'/> - <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='118' column='1'/> + <function-decl name='simple_strtol' mangled-name='simple_strtol' filepath='lib/vsprintf.c' line='114' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtol'> + <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='114' column='1'/> + <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='114' column='1'/> + <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='114' column='1'/> <return type-id='bd54fe1a'/> </function-decl> - <function-decl name='sscanf' mangled-name='sscanf' filepath='lib/vsprintf.c' line='3490' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'> - <parameter type-id='80f4b756' name='buf' filepath='lib/vsprintf.c' line='3490' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='3490' column='1'/> + <function-decl name='sscanf' mangled-name='sscanf' filepath='lib/vsprintf.c' line='3484' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sscanf'> + <parameter type-id='80f4b756' name='buf' filepath='lib/vsprintf.c' line='3484' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='3484' column='1'/> <parameter is-variadic='yes'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='vsnprintf' mangled-name='vsnprintf' filepath='lib/vsprintf.c' line='2531' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsnprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2531' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2531' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2531' column='1'/> - <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2531' column='1'/> + <function-decl name='vsnprintf' mangled-name='vsnprintf' filepath='lib/vsprintf.c' line='2525' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsnprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2525' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2525' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2525' column='1'/> + <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2525' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sprintf' mangled-name='sprintf' filepath='lib/vsprintf.c' line='2797' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2797' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2797' column='1'/> + <function-decl name='sprintf' mangled-name='sprintf' filepath='lib/vsprintf.c' line='2791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2791' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2791' column='1'/> <parameter is-variadic='yes'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='scnprintf' mangled-name='scnprintf' filepath='lib/vsprintf.c' line='2752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scnprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2752' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2752' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2752' column='1'/> + <function-decl name='scnprintf' mangled-name='scnprintf' filepath='lib/vsprintf.c' line='2746' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='scnprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2746' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2746' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2746' column='1'/> <parameter is-variadic='yes'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='simple_strtoull' mangled-name='simple_strtoull' filepath='lib/vsprintf.c' line='90' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtoull'> - <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='90' column='1'/> - <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='90' column='1'/> - <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='90' column='1'/> + <function-decl name='simple_strtoull' mangled-name='simple_strtoull' filepath='lib/vsprintf.c' line='86' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='simple_strtoull'> + <parameter type-id='80f4b756' name='cp' filepath='lib/vsprintf.c' line='86' column='1'/> + <parameter type-id='9b23c9ad' name='endp' filepath='lib/vsprintf.c' line='86' column='1'/> + <parameter type-id='f0981eeb' name='base' filepath='lib/vsprintf.c' line='86' column='1'/> <return type-id='3a47d82b'/> </function-decl> - <function-decl name='vsscanf' mangled-name='vsscanf' filepath='lib/vsprintf.c' line='3215' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsscanf'> - <parameter type-id='80f4b756' name='buf' filepath='lib/vsprintf.c' line='3215' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='3215' column='1'/> - <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='3215' column='1'/> + <function-decl name='vsscanf' mangled-name='vsscanf' filepath='lib/vsprintf.c' line='3209' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsscanf'> + <parameter type-id='80f4b756' name='buf' filepath='lib/vsprintf.c' line='3209' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='3209' column='1'/> + <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='3209' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='vsprintf' mangled-name='vsprintf' filepath='lib/vsprintf.c' line='2779' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2779' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2779' column='1'/> - <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2779' column='1'/> + <function-decl name='vsprintf' mangled-name='vsprintf' filepath='lib/vsprintf.c' line='2773' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2773' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2773' column='1'/> + <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2773' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='vscnprintf' mangled-name='vscnprintf' filepath='lib/vsprintf.c' line='2700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscnprintf'> - <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2700' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2700' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2700' column='1'/> - <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2700' column='1'/> + <function-decl name='vscnprintf' mangled-name='vscnprintf' filepath='lib/vsprintf.c' line='2694' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vscnprintf'> + <parameter type-id='26a90f95' name='buf' filepath='lib/vsprintf.c' line='2694' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='lib/vsprintf.c' line='2694' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='lib/vsprintf.c' line='2694' column='1'/> + <parameter type-id='2aee9912' name='args' filepath='lib/vsprintf.c' line='2694' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -156337,26 +156229,26 @@ <qualified-type-def type-id='a25ce1be' const='yes' id='3d71d2d7'/> <pointer-type-def type-id='3d71d2d7' size-in-bits='64' id='b72f2447'/> <pointer-type-def type-id='135de8a2' size-in-bits='64' id='0b3f2e4c'/> - <function-decl name='cma_alloc' mangled-name='cma_alloc' filepath='mm/cma.c' line='412' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_alloc'> - <parameter type-id='6f67b38a' name='cma' filepath='mm/cma.c' line='412' column='1'/> - <parameter type-id='b59d7dce' name='count' filepath='mm/cma.c' line='412' column='1'/> - <parameter type-id='f0981eeb' name='align' filepath='mm/cma.c' line='412' column='1'/> - <parameter type-id='b50a4934' name='no_warn' filepath='mm/cma.c' line='413' column='1'/> + <function-decl name='cma_alloc' mangled-name='cma_alloc' filepath='mm/cma.c' line='411' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_alloc'> + <parameter type-id='6f67b38a' name='cma' filepath='mm/cma.c' line='411' column='1'/> + <parameter type-id='b59d7dce' name='count' filepath='mm/cma.c' line='411' column='1'/> + <parameter type-id='f0981eeb' name='align' filepath='mm/cma.c' line='411' column='1'/> + <parameter type-id='b50a4934' name='no_warn' filepath='mm/cma.c' line='412' column='1'/> <return type-id='02f11ed4'/> </function-decl> - <function-decl name='cma_release' mangled-name='cma_release' filepath='mm/cma.c' line='510' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_release'> - <parameter type-id='6f67b38a' name='cma' filepath='mm/cma.c' line='510' column='1'/> - <parameter type-id='b72f2447' name='pages' filepath='mm/cma.c' line='510' column='1'/> - <parameter type-id='f0981eeb' name='count' filepath='mm/cma.c' line='510' column='1'/> + <function-decl name='cma_release' mangled-name='cma_release' filepath='mm/cma.c' line='508' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_release'> + <parameter type-id='6f67b38a' name='cma' filepath='mm/cma.c' line='508' column='1'/> + <parameter type-id='b72f2447' name='pages' filepath='mm/cma.c' line='508' column='1'/> + <parameter type-id='f0981eeb' name='count' filepath='mm/cma.c' line='508' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='cma_get_name' mangled-name='cma_get_name' filepath='mm/cma.c' line='54' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_get_name'> - <parameter type-id='4605de5b' name='cma' filepath='mm/cma.c' line='54' column='1'/> + <function-decl name='cma_get_name' mangled-name='cma_get_name' filepath='mm/cma.c' line='53' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_get_name'> + <parameter type-id='4605de5b' name='cma' filepath='mm/cma.c' line='53' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='cma_for_each_area' mangled-name='cma_for_each_area' filepath='mm/cma.c' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_for_each_area'> - <parameter type-id='0b3f2e4c' name='it' filepath='mm/cma.c' line='534' column='1'/> - <parameter type-id='eaa32e2f' name='data' filepath='mm/cma.c' line='534' column='1'/> + <function-decl name='cma_for_each_area' mangled-name='cma_for_each_area' filepath='mm/cma.c' line='532' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cma_for_each_area'> + <parameter type-id='0b3f2e4c' name='it' filepath='mm/cma.c' line='532' column='1'/> + <parameter type-id='eaa32e2f' name='data' filepath='mm/cma.c' line='532' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='135de8a2'> @@ -156497,12 +156389,6 @@ <parameter type-id='4fa10f9e' name='from' filepath='mm/filemap.c' line='3463' column='1'/> <return type-id='79a0948f'/> </function-decl> - <function-decl name='filemap_fdatawait_range' mangled-name='filemap_fdatawait_range' filepath='mm/filemap.c' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='filemap_fdatawait_range'> - <parameter type-id='f57039f0' name='mapping' filepath='mm/filemap.c' line='550' column='1'/> - <parameter type-id='69bf7bee' name='start_byte' filepath='mm/filemap.c' line='550' column='1'/> - <parameter type-id='69bf7bee' name='end_byte' filepath='mm/filemap.c' line='551' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='generic_file_read_iter' mangled-name='generic_file_read_iter' filepath='mm/filemap.c' line='2293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='generic_file_read_iter'> <parameter type-id='80f25feb' name='iocb' filepath='mm/filemap.c' line='2293' column='1'/> <parameter type-id='4fa10f9e' name='iter' filepath='mm/filemap.c' line='2293' column='1'/> @@ -156519,6 +156405,12 @@ <parameter type-id='69bf7bee' name='end' filepath='mm/filemap.c' line='439' column='1'/> <return type-id='95e97e5e'/> </function-decl> + <function-decl name='filemap_fdatawait_range' mangled-name='filemap_fdatawait_range' filepath='mm/filemap.c' line='550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='filemap_fdatawait_range'> + <parameter type-id='f57039f0' name='mapping' filepath='mm/filemap.c' line='550' column='1'/> + <parameter type-id='69bf7bee' name='start_byte' filepath='mm/filemap.c' line='550' column='1'/> + <parameter type-id='69bf7bee' name='end_byte' filepath='mm/filemap.c' line='551' column='1'/> + <return type-id='95e97e5e'/> + </function-decl> <function-decl name='__lock_page' mangled-name='__lock_page' filepath='mm/filemap.c' line='1398' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__lock_page'> <parameter type-id='02f11ed4' name='__page' filepath='mm/filemap.c' line='1398' column='1'/> <return type-id='48b5725f'/> @@ -156548,6 +156440,10 @@ </data-member> </class-decl> <pointer-type-def type-id='df80a1e0' size-in-bits='64' id='d9fbdc06'/> + <function-decl name='put_vaddr_frames' mangled-name='put_vaddr_frames' filepath='mm/frame_vector.c' line='123' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='put_vaddr_frames'> + <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='123' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='get_vaddr_frames' mangled-name='get_vaddr_frames' filepath='mm/frame_vector.c' line='34' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_vaddr_frames'> <parameter type-id='7359adad' name='start' filepath='mm/frame_vector.c' line='34' column='1'/> <parameter type-id='f0981eeb' name='nr_frames' filepath='mm/frame_vector.c' line='34' column='1'/> @@ -156555,61 +156451,57 @@ <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='35' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='put_vaddr_frames' mangled-name='put_vaddr_frames' filepath='mm/frame_vector.c' line='104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='put_vaddr_frames'> - <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='104' column='1'/> + <function-decl name='frame_vector_to_pfns' mangled-name='frame_vector_to_pfns' filepath='mm/frame_vector.c' line='180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_to_pfns'> + <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='180' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='frame_vector_to_pfns' mangled-name='frame_vector_to_pfns' filepath='mm/frame_vector.c' line='161' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_to_pfns'> - <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='161' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='frame_vector_to_pages' mangled-name='frame_vector_to_pages' filepath='mm/frame_vector.c' line='135' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_to_pages'> - <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='135' column='1'/> + <function-decl name='frame_vector_to_pages' mangled-name='frame_vector_to_pages' filepath='mm/frame_vector.c' line='154' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_to_pages'> + <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='154' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='frame_vector_destroy' mangled-name='frame_vector_destroy' filepath='mm/frame_vector.c' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_destroy'> - <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='216' column='1'/> + <function-decl name='frame_vector_destroy' mangled-name='frame_vector_destroy' filepath='mm/frame_vector.c' line='235' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_destroy'> + <parameter type-id='d9fbdc06' name='vec' filepath='mm/frame_vector.c' line='235' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='frame_vector_create' mangled-name='frame_vector_create' filepath='mm/frame_vector.c' line='184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_create'> - <parameter type-id='f0981eeb' name='nr_frames' filepath='mm/frame_vector.c' line='184' column='1'/> + <function-decl name='frame_vector_create' mangled-name='frame_vector_create' filepath='mm/frame_vector.c' line='203' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='frame_vector_create'> + <parameter type-id='f0981eeb' name='nr_frames' filepath='mm/frame_vector.c' line='203' column='1'/> <return type-id='d9fbdc06'/> </function-decl> </abi-instr> <abi-instr address-size='64' path='mm/gup.c' language='LANG_C89'> <pointer-type-def type-id='2ae08426' size-in-bits='64' id='8b6fdee4'/> - <function-decl name='get_user_pages_fast' mangled-name='get_user_pages_fast' filepath='mm/gup.c' line='2454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages_fast'> - <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='2454' column='1'/> - <parameter type-id='95e97e5e' name='nr_pages' filepath='mm/gup.c' line='2454' column='1'/> - <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='2455' column='1'/> - <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='2455' column='1'/> + <function-decl name='get_user_pages_fast' mangled-name='get_user_pages_fast' filepath='mm/gup.c' line='2443' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages_fast'> + <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='2443' column='1'/> + <parameter type-id='95e97e5e' name='nr_pages' filepath='mm/gup.c' line='2443' column='1'/> + <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='2444' column='1'/> + <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='2444' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='get_user_pages_remote' mangled-name='get_user_pages_remote' filepath='mm/gup.c' line='1205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages_remote'> - <parameter type-id='f23e2572' name='tsk' filepath='mm/gup.c' line='1205' column='1'/> - <parameter type-id='df4b7819' name='mm' filepath='mm/gup.c' line='1205' column='1'/> - <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1206' column='1'/> - <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1206' column='1'/> - <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1207' column='1'/> - <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1207' column='1'/> - <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1208' column='1'/> - <parameter type-id='7292109c' name='locked' filepath='mm/gup.c' line='1208' column='1'/> + <function-decl name='get_user_pages_remote' mangled-name='get_user_pages_remote' filepath='mm/gup.c' line='1194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages_remote'> + <parameter type-id='f23e2572' name='tsk' filepath='mm/gup.c' line='1194' column='1'/> + <parameter type-id='df4b7819' name='mm' filepath='mm/gup.c' line='1194' column='1'/> + <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1195' column='1'/> + <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1195' column='1'/> + <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1196' column='1'/> + <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1196' column='1'/> + <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1197' column='1'/> + <parameter type-id='7292109c' name='locked' filepath='mm/gup.c' line='1197' column='1'/> <return type-id='bd54fe1a'/> </function-decl> - <function-decl name='get_user_pages' mangled-name='get_user_pages' filepath='mm/gup.c' line='1663' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages'> - <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1663' column='1'/> - <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1663' column='1'/> - <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1664' column='1'/> - <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1664' column='1'/> - <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1665' column='1'/> + <function-decl name='get_user_pages' mangled-name='get_user_pages' filepath='mm/gup.c' line='1652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_user_pages'> + <parameter type-id='7359adad' name='start' filepath='mm/gup.c' line='1652' column='1'/> + <parameter type-id='7359adad' name='nr_pages' filepath='mm/gup.c' line='1652' column='1'/> + <parameter type-id='f0981eeb' name='gup_flags' filepath='mm/gup.c' line='1653' column='1'/> + <parameter type-id='9f93c9da' name='pages' filepath='mm/gup.c' line='1653' column='1'/> + <parameter type-id='8b6fdee4' name='vmas' filepath='mm/gup.c' line='1654' column='1'/> <return type-id='bd54fe1a'/> </function-decl> </abi-instr> <abi-instr address-size='64' path='mm/memblock.c' language='LANG_C89'> <var-decl name='contig_page_data' type-id='54406315' mangled-name='contig_page_data' visibility='default' filepath='mm/memblock.c' line='99' column='1' elf-symbol-id='contig_page_data'/> - <function-decl name='memblock_free' mangled-name='memblock_free' filepath='mm/memblock.c' line='801' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memblock_free'> - <parameter type-id='2522883d' name='base' filepath='mm/memblock.c' line='801' column='1'/> - <parameter type-id='2522883d' name='size' filepath='mm/memblock.c' line='801' column='1'/> + <function-decl name='memblock_free' mangled-name='memblock_free' filepath='mm/memblock.c' line='787' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='memblock_free'> + <parameter type-id='2522883d' name='base' filepath='mm/memblock.c' line='787' column='1'/> + <parameter type-id='2522883d' name='size' filepath='mm/memblock.c' line='787' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -156673,11 +156565,11 @@ <parameter type-id='02f11ed4' name='page' filepath='mm/memory.c' line='1540' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='unmap_mapping_range' mangled-name='unmap_mapping_range' filepath='mm/memory.c' line='2875' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unmap_mapping_range'> - <parameter type-id='f57039f0' name='mapping' filepath='mm/memory.c' line='2875' column='1'/> - <parameter type-id='bf352dfe' name='holebegin' filepath='mm/memory.c' line='2876' column='1'/> - <parameter type-id='bf352dfe' name='holelen' filepath='mm/memory.c' line='2876' column='1'/> - <parameter type-id='95e97e5e' name='even_cows' filepath='mm/memory.c' line='2876' column='1'/> + <function-decl name='unmap_mapping_range' mangled-name='unmap_mapping_range' filepath='mm/memory.c' line='2867' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unmap_mapping_range'> + <parameter type-id='f57039f0' name='mapping' filepath='mm/memory.c' line='2867' column='1'/> + <parameter type-id='bf352dfe' name='holebegin' filepath='mm/memory.c' line='2868' column='1'/> + <parameter type-id='bf352dfe' name='holelen' filepath='mm/memory.c' line='2868' column='1'/> + <parameter type-id='95e97e5e' name='even_cows' filepath='mm/memory.c' line='2868' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -156744,34 +156636,24 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='mm/mmap.c' language='LANG_C89'> - <function-decl name='get_unmapped_area' mangled-name='get_unmapped_area' filepath='mm/mmap.c' line='2197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_unmapped_area'> - <parameter type-id='77e79a4b' name='file' filepath='mm/mmap.c' line='2197' column='1'/> - <parameter type-id='7359adad' name='addr' filepath='mm/mmap.c' line='2197' column='1'/> - <parameter type-id='7359adad' name='len' filepath='mm/mmap.c' line='2197' column='1'/> - <parameter type-id='7359adad' name='pgoff' filepath='mm/mmap.c' line='2198' column='1'/> - <parameter type-id='7359adad' name='flags' filepath='mm/mmap.c' line='2198' column='1'/> + <function-decl name='get_unmapped_area' mangled-name='get_unmapped_area' filepath='mm/mmap.c' line='2194' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_unmapped_area'> + <parameter type-id='77e79a4b' name='file' filepath='mm/mmap.c' line='2194' column='1'/> + <parameter type-id='7359adad' name='addr' filepath='mm/mmap.c' line='2194' column='1'/> + <parameter type-id='7359adad' name='len' filepath='mm/mmap.c' line='2194' column='1'/> + <parameter type-id='7359adad' name='pgoff' filepath='mm/mmap.c' line='2195' column='1'/> + <parameter type-id='7359adad' name='flags' filepath='mm/mmap.c' line='2195' column='1'/> <return type-id='7359adad'/> </function-decl> <function-decl name='vm_get_page_prot' mangled-name='vm_get_page_prot' filepath='mm/mmap.c' line='106' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vm_get_page_prot'> <parameter type-id='7359adad' name='vm_flags' filepath='mm/mmap.c' line='106' column='1'/> <return type-id='2e2dcbd3'/> </function-decl> - <function-decl name='find_vma' mangled-name='find_vma' filepath='mm/mmap.c' line='2241' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='find_vma'> - <parameter type-id='df4b7819' name='mm' filepath='mm/mmap.c' line='2241' column='1'/> - <parameter type-id='7359adad' name='addr' filepath='mm/mmap.c' line='2241' column='1'/> + <function-decl name='find_vma' mangled-name='find_vma' filepath='mm/mmap.c' line='2238' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='find_vma'> + <parameter type-id='df4b7819' name='mm' filepath='mm/mmap.c' line='2238' column='1'/> + <parameter type-id='7359adad' name='addr' filepath='mm/mmap.c' line='2238' column='1'/> <return type-id='2ae08426'/> </function-decl> </abi-instr> - <abi-instr address-size='64' path='mm/oom_kill.c' language='LANG_C89'> - <function-decl name='unregister_oom_notifier' mangled-name='unregister_oom_notifier' filepath='mm/oom_kill.c' line='1028' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_oom_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='mm/oom_kill.c' line='1028' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - <function-decl name='register_oom_notifier' mangled-name='register_oom_notifier' filepath='mm/oom_kill.c' line='1022' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_oom_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='mm/oom_kill.c' line='1022' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> - </abi-instr> <abi-instr address-size='64' path='mm/page-writeback.c' language='LANG_C89'> <function-decl name='set_page_dirty' mangled-name='set_page_dirty' filepath='mm/page-writeback.c' line='2549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='set_page_dirty'> <parameter type-id='02f11ed4' name='page' filepath='mm/page-writeback.c' line='2549' column='1'/> @@ -156833,29 +156715,29 @@ <pointer-type-def type-id='6a7d16bb' size-in-bits='64' id='f461c050'/> <pointer-type-def type-id='3c95971e' size-in-bits='64' id='0f561784'/> <var-decl name='_totalram_pages' type-id='f22a8abb' mangled-name='_totalram_pages' visibility='default' filepath='mm/page_alloc.c' line='132' column='1' elf-symbol-id='_totalram_pages'/> - <function-decl name='__alloc_pages_nodemask' mangled-name='__alloc_pages_nodemask' filepath='mm/page_alloc.c' line='4860' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__alloc_pages_nodemask'> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4860' column='1'/> - <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4860' column='1'/> - <parameter type-id='95e97e5e' name='preferred_nid' filepath='mm/page_alloc.c' line='4860' column='1'/> - <parameter type-id='f461c050' name='nodemask' filepath='mm/page_alloc.c' line='4861' column='1'/> + <function-decl name='__alloc_pages_nodemask' mangled-name='__alloc_pages_nodemask' filepath='mm/page_alloc.c' line='4826' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__alloc_pages_nodemask'> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4826' column='1'/> + <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4826' column='1'/> + <parameter type-id='95e97e5e' name='preferred_nid' filepath='mm/page_alloc.c' line='4826' column='1'/> + <parameter type-id='f461c050' name='nodemask' filepath='mm/page_alloc.c' line='4827' column='1'/> <return type-id='02f11ed4'/> </function-decl> - <function-decl name='free_pages' mangled-name='free_pages' filepath='mm/page_alloc.c' line='4963' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_pages'> - <parameter type-id='7359adad' name='addr' filepath='mm/page_alloc.c' line='4963' column='1'/> - <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4963' column='1'/> + <function-decl name='free_pages' mangled-name='free_pages' filepath='mm/page_alloc.c' line='4929' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_pages'> + <parameter type-id='7359adad' name='addr' filepath='mm/page_alloc.c' line='4929' column='1'/> + <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4929' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='free_pages_exact' mangled-name='free_pages_exact' filepath='mm/page_alloc.c' line='5174' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_pages_exact'> - <parameter type-id='eaa32e2f' name='virt' filepath='mm/page_alloc.c' line='5174' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='mm/page_alloc.c' line='5174' column='1'/> + <function-decl name='free_pages_exact' mangled-name='free_pages_exact' filepath='mm/page_alloc.c' line='5128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_pages_exact'> + <parameter type-id='eaa32e2f' name='virt' filepath='mm/page_alloc.c' line='5128' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='mm/page_alloc.c' line='5128' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__free_pages' mangled-name='__free_pages' filepath='mm/page_alloc.c' line='4956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__free_pages'> - <parameter type-id='02f11ed4' name='page' filepath='mm/page_alloc.c' line='4956' column='1'/> - <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4956' column='1'/> + <function-decl name='__free_pages' mangled-name='__free_pages' filepath='mm/page_alloc.c' line='4922' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__free_pages'> + <parameter type-id='02f11ed4' name='page' filepath='mm/page_alloc.c' line='4922' column='1'/> + <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4922' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='si_mem_available' mangled-name='si_mem_available' filepath='mm/page_alloc.c' line='5252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='si_mem_available'> + <function-decl name='si_mem_available' mangled-name='si_mem_available' filepath='mm/page_alloc.c' line='5206' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='si_mem_available'> <return type-id='bd54fe1a'/> </function-decl> <function-decl name='split_page' mangled-name='split_page' filepath='mm/page_alloc.c' line='3188' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='split_page'> @@ -156863,27 +156745,27 @@ <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='3188' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='si_meminfo' mangled-name='si_meminfo' filepath='mm/page_alloc.c' line='5298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='si_meminfo'> - <parameter type-id='0f561784' name='val' filepath='mm/page_alloc.c' line='5298' column='1'/> + <function-decl name='si_meminfo' mangled-name='si_meminfo' filepath='mm/page_alloc.c' line='5252' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='si_meminfo'> + <parameter type-id='0f561784' name='val' filepath='mm/page_alloc.c' line='5252' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='get_zeroed_page' mangled-name='get_zeroed_page' filepath='mm/page_alloc.c' line='4942' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_zeroed_page'> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4942' column='1'/> + <function-decl name='get_zeroed_page' mangled-name='get_zeroed_page' filepath='mm/page_alloc.c' line='4908' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='get_zeroed_page'> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4908' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='alloc_pages_exact' mangled-name='alloc_pages_exact' filepath='mm/page_alloc.c' line='5128' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_pages_exact'> - <parameter type-id='b59d7dce' name='size' filepath='mm/page_alloc.c' line='5128' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='5128' column='1'/> + <function-decl name='alloc_pages_exact' mangled-name='alloc_pages_exact' filepath='mm/page_alloc.c' line='5082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_pages_exact'> + <parameter type-id='b59d7dce' name='size' filepath='mm/page_alloc.c' line='5082' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='5082' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='adjust_managed_page_count' mangled-name='adjust_managed_page_count' filepath='mm/page_alloc.c' line='7648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adjust_managed_page_count'> - <parameter type-id='02f11ed4' name='page' filepath='mm/page_alloc.c' line='7648' column='1'/> - <parameter type-id='bd54fe1a' name='count' filepath='mm/page_alloc.c' line='7648' column='1'/> + <function-decl name='adjust_managed_page_count' mangled-name='adjust_managed_page_count' filepath='mm/page_alloc.c' line='7603' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='adjust_managed_page_count'> + <parameter type-id='02f11ed4' name='page' filepath='mm/page_alloc.c' line='7603' column='1'/> + <parameter type-id='bd54fe1a' name='count' filepath='mm/page_alloc.c' line='7603' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__get_free_pages' mangled-name='__get_free_pages' filepath='mm/page_alloc.c' line='4931' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__get_free_pages'> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4931' column='1'/> - <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4931' column='1'/> + <function-decl name='__get_free_pages' mangled-name='__get_free_pages' filepath='mm/page_alloc.c' line='4897' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__get_free_pages'> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='mm/page_alloc.c' line='4897' column='1'/> + <parameter type-id='f0981eeb' name='order' filepath='mm/page_alloc.c' line='4897' column='1'/> <return type-id='7359adad'/> </function-decl> </abi-instr> @@ -158383,24 +158265,24 @@ <pointer-type-def type-id='cfd6c72c' size-in-bits='64' id='d634cc76'/> <pointer-type-def type-id='1ca1bfac' size-in-bits='64' id='c0a08bbe'/> <pointer-type-def type-id='6071dd22' size-in-bits='64' id='ba77b4f4'/> - <function-decl name='hci_alloc_dev' mangled-name='hci_alloc_dev' filepath='net/bluetooth/hci_core.c' line='3192' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_alloc_dev'> + <function-decl name='hci_alloc_dev' mangled-name='hci_alloc_dev' filepath='net/bluetooth/hci_core.c' line='3191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_alloc_dev'> <return type-id='9ad862e7'/> </function-decl> - <function-decl name='hci_unregister_dev' mangled-name='hci_unregister_dev' filepath='net/bluetooth/hci_core.c' line='3402' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_unregister_dev'> - <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3402' column='1'/> + <function-decl name='hci_unregister_dev' mangled-name='hci_unregister_dev' filepath='net/bluetooth/hci_core.c' line='3401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_unregister_dev'> + <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3401' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='hci_register_dev' mangled-name='hci_register_dev' filepath='net/bluetooth/hci_core.c' line='3296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_register_dev'> - <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3296' column='1'/> + <function-decl name='hci_register_dev' mangled-name='hci_register_dev' filepath='net/bluetooth/hci_core.c' line='3295' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_register_dev'> + <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3295' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='hci_recv_frame' mangled-name='hci_recv_frame' filepath='net/bluetooth/hci_core.c' line='3504' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_recv_frame'> - <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3504' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/bluetooth/hci_core.c' line='3504' column='1'/> + <function-decl name='hci_recv_frame' mangled-name='hci_recv_frame' filepath='net/bluetooth/hci_core.c' line='3503' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_recv_frame'> + <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3503' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/bluetooth/hci_core.c' line='3503' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='hci_free_dev' mangled-name='hci_free_dev' filepath='net/bluetooth/hci_core.c' line='3288' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_free_dev'> - <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3288' column='1'/> + <function-decl name='hci_free_dev' mangled-name='hci_free_dev' filepath='net/bluetooth/hci_core.c' line='3287' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='hci_free_dev'> + <parameter type-id='9ad862e7' name='hdev' filepath='net/bluetooth/hci_core.c' line='3287' column='1'/> <return type-id='48b5725f'/> </function-decl> <pointer-type-def type-id='5433b7f7' size-in-bits='64' id='6a6a70e7'/> @@ -158477,14 +158359,6 @@ <return type-id='48b5725f'/> </function-decl> </abi-instr> - <abi-instr address-size='64' path='net/bridge/br_fdb.c' language='LANG_C89'> - <function-decl name='br_fdb_find_port' mangled-name='br_fdb_find_port' filepath='net/bridge/br_fdb.c' line='119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='br_fdb_find_port'> - <parameter type-id='2ce52478' name='br_dev' filepath='net/bridge/br_fdb.c' line='119' column='1'/> - <parameter type-id='354f7eb9' name='addr' filepath='net/bridge/br_fdb.c' line='120' column='1'/> - <parameter type-id='d315442e' name='vid' filepath='net/bridge/br_fdb.c' line='121' column='1'/> - <return type-id='68a2d05b'/> - </function-decl> - </abi-instr> <abi-instr address-size='64' path='net/core/datagram.c' language='LANG_C89'> <function-decl name='skb_copy_datagram_iter' mangled-name='skb_copy_datagram_iter' filepath='net/core/datagram.c' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy_datagram_iter'> <parameter type-id='11f4a000' name='skb' filepath='net/core/datagram.c' line='533' column='1'/> @@ -158581,92 +158455,92 @@ <var-decl name='dist' type-id='1dc6a898' visibility='default' filepath='include/linux/cpu_rmap.h' line='30' column='1'/> </data-member> </class-decl> - <class-decl name='softnet_data' size-in-bits='5632' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='3065' column='1' id='035aa62d'> + <class-decl name='softnet_data' size-in-bits='5632' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='3063' column='1' id='035aa62d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='3066' column='1'/> + <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='3064' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='process_queue' type-id='e61c85d0' visibility='default' filepath='include/linux/netdevice.h' line='3067' column='1'/> + <var-decl name='process_queue' type-id='e61c85d0' visibility='default' filepath='include/linux/netdevice.h' line='3065' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='processed' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3070' column='1'/> + <var-decl name='processed' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3068' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='time_squeeze' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3071' column='1'/> + <var-decl name='time_squeeze' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3069' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='received_rps' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3072' column='1'/> + <var-decl name='received_rps' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3070' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='rps_ipi_list' type-id='80c9c0cd' visibility='default' filepath='include/linux/netdevice.h' line='3074' column='1'/> + <var-decl name='rps_ipi_list' type-id='80c9c0cd' visibility='default' filepath='include/linux/netdevice.h' line='3072' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='flow_limit' type-id='4c83bbe7' visibility='default' filepath='include/linux/netdevice.h' line='3077' column='1'/> + <var-decl name='flow_limit' type-id='4c83bbe7' visibility='default' filepath='include/linux/netdevice.h' line='3075' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='output_queue' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='3079' column='1'/> + <var-decl name='output_queue' type-id='ee406209' visibility='default' filepath='include/linux/netdevice.h' line='3077' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='output_queue_tailp' type-id='325a7d19' visibility='default' filepath='include/linux/netdevice.h' line='3080' column='1'/> + <var-decl name='output_queue_tailp' type-id='325a7d19' visibility='default' filepath='include/linux/netdevice.h' line='3078' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='completion_queue' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='3081' column='1'/> + <var-decl name='completion_queue' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='3079' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='xmit' type-id='75fc4829' visibility='default' filepath='include/linux/netdevice.h' line='3089' column='1'/> + <var-decl name='xmit' type-id='75fc4829' visibility='default' filepath='include/linux/netdevice.h' line='3087' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='input_queue_head' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3094' column='1'/> + <var-decl name='input_queue_head' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3092' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1536'> - <var-decl name='csd' type-id='223a68bd' visibility='default' filepath='include/linux/netdevice.h' line='3097' column='1'/> + <var-decl name='csd' type-id='223a68bd' visibility='default' filepath='include/linux/netdevice.h' line='3095' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1792'> - <var-decl name='rps_ipi_next' type-id='80c9c0cd' visibility='default' filepath='include/linux/netdevice.h' line='3098' column='1'/> + <var-decl name='rps_ipi_next' type-id='80c9c0cd' visibility='default' filepath='include/linux/netdevice.h' line='3096' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1856'> - <var-decl name='cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3099' column='1'/> + <var-decl name='cpu' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3097' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1888'> - <var-decl name='input_queue_tail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3100' column='1'/> + <var-decl name='input_queue_tail' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3098' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1920'> - <var-decl name='dropped' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3102' column='1'/> + <var-decl name='dropped' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3100' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='input_pkt_queue' type-id='e61c85d0' visibility='default' filepath='include/linux/netdevice.h' line='3103' column='1'/> + <var-decl name='input_pkt_queue' type-id='e61c85d0' visibility='default' filepath='include/linux/netdevice.h' line='3101' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='backlog' type-id='291e3bb5' visibility='default' filepath='include/linux/netdevice.h' line='3104' column='1'/> + <var-decl name='backlog' type-id='291e3bb5' visibility='default' filepath='include/linux/netdevice.h' line='3102' column='1'/> </data-member> </class-decl> - <class-decl name='sd_flow_limit' size-in-bits='2176' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='3051' column='1' id='7ba771af'> + <class-decl name='sd_flow_limit' size-in-bits='2176' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='3049' column='1' id='7ba771af'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='count' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='3052' column='1'/> + <var-decl name='count' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='3050' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='num_buckets' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3053' column='1'/> + <var-decl name='num_buckets' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3051' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='history_head' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3054' column='1'/> + <var-decl name='history_head' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='3052' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='history' type-id='13faf778' visibility='default' filepath='include/linux/netdevice.h' line='3055' column='1'/> + <var-decl name='history' type-id='13faf778' visibility='default' filepath='include/linux/netdevice.h' line='3053' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='buckets' type-id='29c3368c' visibility='default' filepath='include/linux/netdevice.h' line='3056' column='1'/> + <var-decl name='buckets' type-id='29c3368c' visibility='default' filepath='include/linux/netdevice.h' line='3054' column='1'/> </data-member> </class-decl> - <class-decl name='__anonymous_struct__2' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='3086' column='1' id='75fc4829'> + <class-decl name='__anonymous_struct__2' size-in-bits='32' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/linux/netdevice.h' line='3084' column='1' id='75fc4829'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='recursion' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='3087' column='1'/> + <var-decl name='recursion' type-id='1dc6a898' visibility='default' filepath='include/linux/netdevice.h' line='3085' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='more' type-id='f9b06939' visibility='default' filepath='include/linux/netdevice.h' line='3088' column='1'/> + <var-decl name='more' type-id='f9b06939' visibility='default' filepath='include/linux/netdevice.h' line='3086' column='1'/> </data-member> </class-decl> - <typedef-decl name='gro_result_t' type-id='3facc5aa' filepath='include/linux/netdevice.h' line='384' column='1' id='dc1b1685'/> - <enum-decl name='gro_result' filepath='include/linux/netdevice.h' line='376' column='1' id='3facc5aa'> + <typedef-decl name='gro_result_t' type-id='3facc5aa' filepath='include/linux/netdevice.h' line='382' column='1' id='dc1b1685'/> + <enum-decl name='gro_result' filepath='include/linux/netdevice.h' line='374' column='1' id='3facc5aa'> <underlying-type type-id='9cac1fee'/> <enumerator name='GRO_MERGED' value='0'/> <enumerator name='GRO_MERGED_FREE' value='1'/> @@ -158675,47 +158549,47 @@ <enumerator name='GRO_DROP' value='4'/> <enumerator name='GRO_CONSUMED' value='5'/> </enum-decl> - <enum-decl name='skb_free_reason' filepath='include/linux/netdevice.h' line='3665' column='1' id='1f17c6b4'> + <enum-decl name='skb_free_reason' filepath='include/linux/netdevice.h' line='3663' column='1' id='1f17c6b4'> <underlying-type type-id='9cac1fee'/> <enumerator name='SKB_REASON_CONSUMED' value='0'/> <enumerator name='SKB_REASON_DROPPED' value='1'/> </enum-decl> - <class-decl name='packet_type' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2433' column='1' id='164a08b2'> + <class-decl name='packet_type' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='2431' column='1' id='164a08b2'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='type' type-id='84a5c3d4' visibility='default' filepath='include/linux/netdevice.h' line='2434' column='1'/> + <var-decl name='type' type-id='84a5c3d4' visibility='default' filepath='include/linux/netdevice.h' line='2432' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='16'> - <var-decl name='ignore_outgoing' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2435' column='1'/> + <var-decl name='ignore_outgoing' type-id='b50a4934' visibility='default' filepath='include/linux/netdevice.h' line='2433' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='2436' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='2434' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='func' type-id='29242f3e' visibility='default' filepath='include/linux/netdevice.h' line='2437' column='1'/> + <var-decl name='func' type-id='29242f3e' visibility='default' filepath='include/linux/netdevice.h' line='2435' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='list_func' type-id='af0e0afc' visibility='default' filepath='include/linux/netdevice.h' line='2441' column='1'/> + <var-decl name='list_func' type-id='af0e0afc' visibility='default' filepath='include/linux/netdevice.h' line='2439' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='id_match' type-id='ca97eb2a' visibility='default' filepath='include/linux/netdevice.h' line='2444' column='1'/> + <var-decl name='id_match' type-id='ca97eb2a' visibility='default' filepath='include/linux/netdevice.h' line='2442' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='af_packet_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2446' column='1'/> + <var-decl name='af_packet_priv' type-id='eaa32e2f' visibility='default' filepath='include/linux/netdevice.h' line='2444' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2447' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='2445' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2449' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2447' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2450' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2448' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2451' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2449' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2452' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='2450' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='b95a5ed3' size-in-bits='64' id='3a639063'/> @@ -158737,38 +158611,38 @@ <parameter type-id='f0981eeb' name='rxq' filepath='net/core/dev.c' line='2627' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netdev_rx_handler_unregister' mangled-name='netdev_rx_handler_unregister' filepath='net/core/dev.c' line='4700' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_rx_handler_unregister'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='4700' column='1'/> + <function-decl name='netdev_rx_handler_unregister' mangled-name='netdev_rx_handler_unregister' filepath='net/core/dev.c' line='4697' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_rx_handler_unregister'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='4697' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netif_napi_add' mangled-name='netif_napi_add' filepath='net/core/dev.c' line='6267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_napi_add'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='6267' column='1'/> - <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6267' column='1'/> - <parameter type-id='f07d90b4' name='poll' filepath='net/core/dev.c' line='6268' column='1'/> - <parameter type-id='95e97e5e' name='weight' filepath='net/core/dev.c' line='6268' column='1'/> + <function-decl name='netif_napi_add' mangled-name='netif_napi_add' filepath='net/core/dev.c' line='6264' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_napi_add'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='6264' column='1'/> + <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6264' column='1'/> + <parameter type-id='f07d90b4' name='poll' filepath='net/core/dev.c' line='6265' column='1'/> + <parameter type-id='95e97e5e' name='weight' filepath='net/core/dev.c' line='6265' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_upper_dev_unlink' mangled-name='netdev_upper_dev_unlink' filepath='net/core/dev.c' line='7438' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_upper_dev_unlink'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7438' column='1'/> - <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7439' column='1'/> + <function-decl name='netdev_upper_dev_unlink' mangled-name='netdev_upper_dev_unlink' filepath='net/core/dev.c' line='7435' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_upper_dev_unlink'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7435' column='1'/> + <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7436' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_lower_state_changed' mangled-name='netdev_lower_state_changed' filepath='net/core/dev.c' line='7671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_lower_state_changed'> - <parameter type-id='68a2d05b' name='lower_dev' filepath='net/core/dev.c' line='7671' column='1'/> - <parameter type-id='eaa32e2f' name='lower_state_info' filepath='net/core/dev.c' line='7672' column='1'/> + <function-decl name='netdev_lower_state_changed' mangled-name='netdev_lower_state_changed' filepath='net/core/dev.c' line='7668' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_lower_state_changed'> + <parameter type-id='68a2d05b' name='lower_dev' filepath='net/core/dev.c' line='7668' column='1'/> + <parameter type-id='eaa32e2f' name='lower_state_info' filepath='net/core/dev.c' line='7669' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='register_netdevice' mangled-name='register_netdevice' filepath='net/core/dev.c' line='9083' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_netdevice'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9083' column='1'/> + <function-decl name='register_netdevice' mangled-name='register_netdevice' filepath='net/core/dev.c' line='9080' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_netdevice'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9080' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='unregister_netdevice_queue' mangled-name='unregister_netdevice_queue' filepath='net/core/dev.c' line='9750' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdevice_queue'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9750' column='1'/> - <parameter type-id='e84b031a' name='head' filepath='net/core/dev.c' line='9750' column='1'/> + <function-decl name='unregister_netdevice_queue' mangled-name='unregister_netdevice_queue' filepath='net/core/dev.c' line='9747' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdevice_queue'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9747' column='1'/> + <parameter type-id='e84b031a' name='head' filepath='net/core/dev.c' line='9747' column='1'/> <return type-id='48b5725f'/> </function-decl> <var-decl name='softnet_data' type-id='035aa62d' mangled-name='softnet_data' visibility='default' filepath='net/core/dev.c' line='278' column='1' elf-symbol-id='softnet_data'/> - <var-decl name='rps_needed' type-id='237c0d27' mangled-name='rps_needed' visibility='default' filepath='net/core/dev.c' line='3911' column='1' elf-symbol-id='rps_needed'/> + <var-decl name='rps_needed' type-id='237c0d27' mangled-name='rps_needed' visibility='default' filepath='net/core/dev.c' line='3908' column='1' elf-symbol-id='rps_needed'/> <function-decl name='register_netdevice_notifier' mangled-name='register_netdevice_notifier' filepath='net/core/dev.c' line='1557' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_netdevice_notifier'> <parameter type-id='d504f73d' name='nb' filepath='net/core/dev.c' line='1557' column='1'/> <return type-id='95e97e5e'/> @@ -158778,57 +158652,61 @@ <parameter type-id='95e97e5e' name='ifindex' filepath='net/core/dev.c' line='784' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <function-decl name='netdev_warn' mangled-name='netdev_warn' filepath='net/core/dev.c' line='10137' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_warn'> - <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10137' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10137' column='1'/> + <function-decl name='netdev_warn' mangled-name='netdev_warn' filepath='net/core/dev.c' line='10134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_warn'> + <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10134' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10134' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='alloc_netdev_mqs' mangled-name='alloc_netdev_mqs' filepath='net/core/dev.c' line='9570' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_netdev_mqs'> - <parameter type-id='95e97e5e' name='sizeof_priv' filepath='net/core/dev.c' line='9570' column='1'/> - <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='9570' column='1'/> - <parameter type-id='002ac4a6' name='name_assign_type' filepath='net/core/dev.c' line='9571' column='1'/> - <parameter type-id='548eee3a' name='setup' filepath='net/core/dev.c' line='9572' column='1'/> - <parameter type-id='f0981eeb' name='txqs' filepath='net/core/dev.c' line='9573' column='1'/> - <parameter type-id='f0981eeb' name='rxqs' filepath='net/core/dev.c' line='9573' column='1'/> + <function-decl name='alloc_netdev_mqs' mangled-name='alloc_netdev_mqs' filepath='net/core/dev.c' line='9567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_netdev_mqs'> + <parameter type-id='95e97e5e' name='sizeof_priv' filepath='net/core/dev.c' line='9567' column='1'/> + <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='9567' column='1'/> + <parameter type-id='002ac4a6' name='name_assign_type' filepath='net/core/dev.c' line='9568' column='1'/> + <parameter type-id='548eee3a' name='setup' filepath='net/core/dev.c' line='9569' column='1'/> + <parameter type-id='f0981eeb' name='txqs' filepath='net/core/dev.c' line='9570' column='1'/> + <parameter type-id='f0981eeb' name='rxqs' filepath='net/core/dev.c' line='9570' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <function-decl name='free_netdev' mangled-name='free_netdev' filepath='net/core/dev.c' line='9686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_netdev'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9686' column='1'/> + <function-decl name='free_netdev' mangled-name='free_netdev' filepath='net/core/dev.c' line='9683' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='free_netdev'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9683' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='__skb_gso_segment' mangled-name='__skb_gso_segment' filepath='net/core/dev.c' line='3005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__skb_gso_segment'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3005' column='1'/> - <parameter type-id='f9f4b16f' name='features' filepath='net/core/dev.c' line='3006' column='1'/> - <parameter type-id='b50a4934' name='tx_path' filepath='net/core/dev.c' line='3006' column='1'/> + <function-decl name='__skb_gso_segment' mangled-name='__skb_gso_segment' filepath='net/core/dev.c' line='3003' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__skb_gso_segment'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3003' column='1'/> + <parameter type-id='f9f4b16f' name='features' filepath='net/core/dev.c' line='3004' column='1'/> + <parameter type-id='b50a4934' name='tx_path' filepath='net/core/dev.c' line='3004' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='napi_disable' mangled-name='napi_disable' filepath='net/core/dev.c' line='6293' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_disable'> - <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='6293' column='1'/> + <function-decl name='napi_disable' mangled-name='napi_disable' filepath='net/core/dev.c' line='6290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_disable'> + <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='6290' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netif_napi_del' mangled-name='netif_napi_del' filepath='net/core/dev.c' line='6323' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_napi_del'> - <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6323' column='1'/> + <function-decl name='netif_napi_del' mangled-name='netif_napi_del' filepath='net/core/dev.c' line='6320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_napi_del'> + <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6320' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_checksum_help' mangled-name='skb_checksum_help' filepath='net/core/dev.c' line='2844' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_checksum_help'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='2844' column='1'/> + <function-decl name='skb_checksum_help' mangled-name='skb_checksum_help' filepath='net/core/dev.c' line='2842' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_checksum_help'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='2842' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='napi_gro_receive' mangled-name='napi_gro_receive' filepath='net/core/dev.c' line='5675' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_gro_receive'> - <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='5675' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='5675' column='1'/> + <function-decl name='napi_gro_receive' mangled-name='napi_gro_receive' filepath='net/core/dev.c' line='5672' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_gro_receive'> + <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='5672' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='5672' column='1'/> <return type-id='dc1b1685'/> </function-decl> - <function-decl name='napi_complete_done' mangled-name='napi_complete_done' filepath='net/core/dev.c' line='6010' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_complete_done'> - <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='6010' column='1'/> - <parameter type-id='95e97e5e' name='work_done' filepath='net/core/dev.c' line='6010' column='1'/> + <function-decl name='napi_complete_done' mangled-name='napi_complete_done' filepath='net/core/dev.c' line='6007' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_complete_done'> + <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='6007' column='1'/> + <parameter type-id='95e97e5e' name='work_done' filepath='net/core/dev.c' line='6007' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='napi_schedule_prep' mangled-name='napi_schedule_prep' filepath='net/core/dev.c' line='5967' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_schedule_prep'> - <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='5967' column='1'/> + <function-decl name='napi_schedule_prep' mangled-name='napi_schedule_prep' filepath='net/core/dev.c' line='5964' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_schedule_prep'> + <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='5964' column='1'/> <return type-id='b50a4934'/> </function-decl> + <function-decl name='__napi_schedule' mangled-name='__napi_schedule' filepath='net/core/dev.c' line='5945' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__napi_schedule'> + <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='5945' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='dev_get_by_name' mangled-name='dev_get_by_name' filepath='net/core/dev.c' line='710' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_get_by_name'> <parameter type-id='a2bff676' name='net' filepath='net/core/dev.c' line='710' column='1'/> <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='710' column='1'/> @@ -158839,28 +158717,28 @@ <parameter type-id='95e97e5e' name='ifindex' filepath='net/core/dev.c' line='759' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <function-decl name='netif_receive_skb' mangled-name='netif_receive_skb' filepath='net/core/dev.c' line='5217' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_receive_skb'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='5217' column='1'/> + <function-decl name='netif_receive_skb' mangled-name='netif_receive_skb' filepath='net/core/dev.c' line='5214' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_receive_skb'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='5214' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='netif_tx_wake_queue' mangled-name='netif_tx_wake_queue' filepath='net/core/dev.c' line='2704' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_tx_wake_queue'> <parameter type-id='35b28c4f' name='dev_queue' filepath='net/core/dev.c' line='2704' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_info' mangled-name='netdev_info' filepath='net/core/dev.c' line='10139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_info'> - <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10139' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10139' column='1'/> + <function-decl name='netdev_info' mangled-name='netdev_info' filepath='net/core/dev.c' line='10136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_info'> + <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10136' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10136' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netif_rx' mangled-name='netif_rx' filepath='net/core/dev.c' line='4468' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_rx'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='4468' column='1'/> + <function-decl name='netif_rx' mangled-name='netif_rx' filepath='net/core/dev.c' line='4465' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_rx'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='4465' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='dev_set_mac_address' mangled-name='dev_set_mac_address' filepath='net/core/dev.c' line='8169' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_set_mac_address'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8169' column='1'/> - <parameter type-id='5c0abad8' name='sa' filepath='net/core/dev.c' line='8169' column='1'/> - <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='8170' column='1'/> + <function-decl name='dev_set_mac_address' mangled-name='dev_set_mac_address' filepath='net/core/dev.c' line='8166' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_set_mac_address'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8166' column='1'/> + <parameter type-id='5c0abad8' name='sa' filepath='net/core/dev.c' line='8166' column='1'/> + <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='8167' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='__dev_get_by_name' mangled-name='__dev_get_by_name' filepath='net/core/dev.c' line='660' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dev_get_by_name'> @@ -158868,8 +158746,8 @@ <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='660' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <function-decl name='netdev_update_features' mangled-name='netdev_update_features' filepath='net/core/dev.c' line='8893' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_update_features'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8893' column='1'/> + <function-decl name='netdev_update_features' mangled-name='netdev_update_features' filepath='net/core/dev.c' line='8890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_update_features'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8890' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='unregister_netdevice_notifier' mangled-name='unregister_netdevice_notifier' filepath='net/core/dev.c' line='1627' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdevice_notifier'> @@ -158881,31 +158759,39 @@ <parameter type-id='1f17c6b4' name='reason' filepath='net/core/dev.c' line='2717' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='napi_hash_del' mangled-name='napi_hash_del' filepath='net/core/dev.c' line='6225' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_hash_del'> - <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6225' column='1'/> + <function-decl name='napi_hash_del' mangled-name='napi_hash_del' filepath='net/core/dev.c' line='6222' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_hash_del'> + <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='6222' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='netdev_err' mangled-name='netdev_err' filepath='net/core/dev.c' line='10136' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_err'> - <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10136' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10136' column='1'/> + <function-decl name='netdev_err' mangled-name='netdev_err' filepath='net/core/dev.c' line='10133' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_err'> + <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10133' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10133' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netif_rx_ni' mangled-name='netif_rx_ni' filepath='net/core/dev.c' line='4481' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_rx_ni'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='4481' column='1'/> + <function-decl name='netif_rx_ni' mangled-name='netif_rx_ni' filepath='net/core/dev.c' line='4478' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_rx_ni'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='4478' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='unregister_netdevice_many' mangled-name='unregister_netdevice_many' filepath='net/core/dev.c' line='9771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdevice_many'> - <parameter type-id='e84b031a' name='head' filepath='net/core/dev.c' line='9771' column='1'/> + <function-decl name='unregister_netdevice_many' mangled-name='unregister_netdevice_many' filepath='net/core/dev.c' line='9768' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdevice_many'> + <parameter type-id='e84b031a' name='head' filepath='net/core/dev.c' line='9768' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_printk' mangled-name='netdev_printk' filepath='net/core/dev.c' line='10099' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_printk'> - <parameter type-id='80f4b756' name='level' filepath='net/core/dev.c' line='10099' column='1'/> - <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10099' column='1'/> - <parameter type-id='80f4b756' name='format' filepath='net/core/dev.c' line='10100' column='1'/> + <function-decl name='netdev_printk' mangled-name='netdev_printk' filepath='net/core/dev.c' line='10096' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_printk'> + <parameter type-id='80f4b756' name='level' filepath='net/core/dev.c' line='10096' column='1'/> + <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10096' column='1'/> + <parameter type-id='80f4b756' name='format' filepath='net/core/dev.c' line='10097' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> + <function-decl name='netif_device_detach' mangled-name='netif_device_detach' filepath='net/core/dev.c' line='2755' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_device_detach'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='2755' column='1'/> + <return type-id='48b5725f'/> + </function-decl> + <function-decl name='netif_device_attach' mangled-name='netif_device_attach' filepath='net/core/dev.c' line='2770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_device_attach'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='2770' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='netif_schedule_queue' mangled-name='netif_schedule_queue' filepath='net/core/dev.c' line='2692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_schedule_queue'> <parameter type-id='35b28c4f' name='txq' filepath='net/core/dev.c' line='2692' column='1'/> <return type-id='48b5725f'/> @@ -158915,111 +158801,103 @@ <parameter type-id='80f4b756' name='name' filepath='net/core/dev.c' line='685' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <function-decl name='unregister_netdev' mangled-name='unregister_netdev' filepath='net/core/dev.c' line='9795' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdev'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9795' column='1'/> + <function-decl name='unregister_netdev' mangled-name='unregister_netdev' filepath='net/core/dev.c' line='9792' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_netdev'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9792' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='synchronize_net' mangled-name='synchronize_net' filepath='net/core/dev.c' line='9727' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='synchronize_net'> + <function-decl name='synchronize_net' mangled-name='synchronize_net' filepath='net/core/dev.c' line='9724' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='synchronize_net'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='register_netdev' mangled-name='register_netdev' filepath='net/core/dev.c' line='9301' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_netdev'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9301' column='1'/> + <function-decl name='register_netdev' mangled-name='register_netdev' filepath='net/core/dev.c' line='9298' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_netdev'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9298' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='passthru_features_check' mangled-name='passthru_features_check' filepath='net/core/dev.c' line='3122' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='passthru_features_check'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3122' column='1'/> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='3123' column='1'/> - <parameter type-id='f9f4b16f' name='features' filepath='net/core/dev.c' line='3124' column='1'/> + <function-decl name='passthru_features_check' mangled-name='passthru_features_check' filepath='net/core/dev.c' line='3120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='passthru_features_check'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3120' column='1'/> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='3121' column='1'/> + <parameter type-id='f9f4b16f' name='features' filepath='net/core/dev.c' line='3122' column='1'/> <return type-id='f9f4b16f'/> </function-decl> - <function-decl name='netif_tx_stop_all_queues' mangled-name='netif_tx_stop_all_queues' filepath='net/core/dev.c' line='9029' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_tx_stop_all_queues'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9029' column='1'/> + <function-decl name='netif_tx_stop_all_queues' mangled-name='netif_tx_stop_all_queues' filepath='net/core/dev.c' line='9026' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_tx_stop_all_queues'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9026' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netif_stacked_transfer_operstate' mangled-name='netif_stacked_transfer_operstate' filepath='net/core/dev.c' line='8926' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_stacked_transfer_operstate'> - <parameter type-id='2ce52478' name='rootdev' filepath='net/core/dev.c' line='8926' column='1'/> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8927' column='1'/> + <function-decl name='netif_stacked_transfer_operstate' mangled-name='netif_stacked_transfer_operstate' filepath='net/core/dev.c' line='8923' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_stacked_transfer_operstate'> + <parameter type-id='2ce52478' name='rootdev' filepath='net/core/dev.c' line='8923' column='1'/> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8924' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_pick_tx' mangled-name='netdev_pick_tx' filepath='net/core/dev.c' line='3632' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_pick_tx'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='3632' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3632' column='1'/> - <parameter type-id='68a2d05b' name='sb_dev' filepath='net/core/dev.c' line='3633' column='1'/> + <function-decl name='netdev_pick_tx' mangled-name='netdev_pick_tx' filepath='net/core/dev.c' line='3630' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_pick_tx'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='3630' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3630' column='1'/> + <parameter type-id='68a2d05b' name='sb_dev' filepath='net/core/dev.c' line='3631' column='1'/> <return type-id='1dc6a898'/> </function-decl> - <function-decl name='netif_device_detach' mangled-name='netif_device_detach' filepath='net/core/dev.c' line='2757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_device_detach'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='2757' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='netif_device_attach' mangled-name='netif_device_attach' filepath='net/core/dev.c' line='2772' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netif_device_attach'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='2772' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='netdev_upper_dev_link' mangled-name='netdev_upper_dev_link' filepath='net/core/dev.c' line='7397' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_upper_dev_link'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7397' column='1'/> - <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7398' column='1'/> - <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='7399' column='1'/> + <function-decl name='netdev_upper_dev_link' mangled-name='netdev_upper_dev_link' filepath='net/core/dev.c' line='7394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_upper_dev_link'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7394' column='1'/> + <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7395' column='1'/> + <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='7396' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netdev_set_default_ethtool_ops' mangled-name='netdev_set_default_ethtool_ops' filepath='net/core/dev.c' line='9542' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_set_default_ethtool_ops'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9542' column='1'/> - <parameter type-id='bdf901f8' name='ops' filepath='net/core/dev.c' line='9543' column='1'/> + <function-decl name='netdev_set_default_ethtool_ops' mangled-name='netdev_set_default_ethtool_ops' filepath='net/core/dev.c' line='9539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_set_default_ethtool_ops'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9539' column='1'/> + <parameter type-id='bdf901f8' name='ops' filepath='net/core/dev.c' line='9540' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_rx_handler_register' mangled-name='netdev_rx_handler_register' filepath='net/core/dev.c' line='4674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_rx_handler_register'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='4674' column='1'/> - <parameter type-id='da1cb816' name='rx_handler' filepath='net/core/dev.c' line='4675' column='1'/> - <parameter type-id='eaa32e2f' name='rx_handler_data' filepath='net/core/dev.c' line='4676' column='1'/> + <function-decl name='netdev_rx_handler_register' mangled-name='netdev_rx_handler_register' filepath='net/core/dev.c' line='4671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_rx_handler_register'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='4671' column='1'/> + <parameter type-id='da1cb816' name='rx_handler' filepath='net/core/dev.c' line='4672' column='1'/> + <parameter type-id='eaa32e2f' name='rx_handler_data' filepath='net/core/dev.c' line='4673' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='netdev_notify_peers' mangled-name='netdev_notify_peers' filepath='net/core/dev.c' line='1290' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_notify_peers'> <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='1290' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_master_upper_dev_link' mangled-name='netdev_master_upper_dev_link' filepath='net/core/dev.c' line='7420' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_master_upper_dev_link'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7420' column='1'/> - <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7421' column='1'/> - <parameter type-id='eaa32e2f' name='upper_priv' filepath='net/core/dev.c' line='7422' column='1'/> - <parameter type-id='eaa32e2f' name='upper_info' filepath='net/core/dev.c' line='7422' column='1'/> - <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='7423' column='1'/> + <function-decl name='netdev_master_upper_dev_link' mangled-name='netdev_master_upper_dev_link' filepath='net/core/dev.c' line='7417' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_master_upper_dev_link'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='7417' column='1'/> + <parameter type-id='68a2d05b' name='upper_dev' filepath='net/core/dev.c' line='7418' column='1'/> + <parameter type-id='eaa32e2f' name='upper_priv' filepath='net/core/dev.c' line='7419' column='1'/> + <parameter type-id='eaa32e2f' name='upper_info' filepath='net/core/dev.c' line='7419' column='1'/> + <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='7420' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netdev_increment_features' mangled-name='netdev_increment_features' filepath='net/core/dev.c' line='10002' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_increment_features'> - <parameter type-id='f9f4b16f' name='all' filepath='net/core/dev.c' line='10002' column='1'/> - <parameter type-id='f9f4b16f' name='one' filepath='net/core/dev.c' line='10003' column='1'/> - <parameter type-id='f9f4b16f' name='mask' filepath='net/core/dev.c' line='10003' column='1'/> + <function-decl name='netdev_increment_features' mangled-name='netdev_increment_features' filepath='net/core/dev.c' line='9999' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_increment_features'> + <parameter type-id='f9f4b16f' name='all' filepath='net/core/dev.c' line='9999' column='1'/> + <parameter type-id='f9f4b16f' name='one' filepath='net/core/dev.c' line='10000' column='1'/> + <parameter type-id='f9f4b16f' name='mask' filepath='net/core/dev.c' line='10000' column='1'/> <return type-id='f9f4b16f'/> </function-decl> - <function-decl name='netdev_change_features' mangled-name='netdev_change_features' filepath='net/core/dev.c' line='8910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_change_features'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8910' column='1'/> + <function-decl name='netdev_change_features' mangled-name='netdev_change_features' filepath='net/core/dev.c' line='8907' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_change_features'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8907' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netdev_alert' mangled-name='netdev_alert' filepath='net/core/dev.c' line='10134' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_alert'> - <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10134' column='1'/> - <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10134' column='1'/> + <function-decl name='netdev_alert' mangled-name='netdev_alert' filepath='net/core/dev.c' line='10131' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_alert'> + <parameter type-id='2ce52478' name='dev' filepath='net/core/dev.c' line='10131' column='1'/> + <parameter type-id='80f4b756' name='fmt' filepath='net/core/dev.c' line='10131' column='1'/> <parameter is-variadic='yes'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='napi_gro_flush' mangled-name='napi_gro_flush' filepath='net/core/dev.c' line='5386' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_gro_flush'> - <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='5386' column='1'/> - <parameter type-id='b50a4934' name='flush_old' filepath='net/core/dev.c' line='5386' column='1'/> + <function-decl name='napi_gro_flush' mangled-name='napi_gro_flush' filepath='net/core/dev.c' line='5383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='napi_gro_flush'> + <parameter type-id='c50361c5' name='napi' filepath='net/core/dev.c' line='5383' column='1'/> + <parameter type-id='b50a4934' name='flush_old' filepath='net/core/dev.c' line='5383' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='init_dummy_netdev' mangled-name='init_dummy_netdev' filepath='net/core/dev.c' line='9254' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='init_dummy_netdev'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9254' column='1'/> + <function-decl name='init_dummy_netdev' mangled-name='init_dummy_netdev' filepath='net/core/dev.c' line='9251' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='init_dummy_netdev'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9251' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='dev_set_mtu' mangled-name='dev_set_mtu' filepath='net/core/dev.c' line='8084' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_set_mtu'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8084' column='1'/> - <parameter type-id='95e97e5e' name='new_mtu' filepath='net/core/dev.c' line='8084' column='1'/> + <function-decl name='dev_set_mtu' mangled-name='dev_set_mtu' filepath='net/core/dev.c' line='8081' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_set_mtu'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='8081' column='1'/> + <parameter type-id='95e97e5e' name='new_mtu' filepath='net/core/dev.c' line='8081' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='dev_remove_pack' mangled-name='dev_remove_pack' filepath='net/core/dev.c' line='387' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_remove_pack'> <parameter type-id='1c079e60' name='pt' filepath='net/core/dev.c' line='387' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='dev_queue_xmit' mangled-name='dev_queue_xmit' filepath='net/core/dev.c' line='3823' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_queue_xmit'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3823' column='1'/> + <function-decl name='dev_queue_xmit' mangled-name='dev_queue_xmit' filepath='net/core/dev.c' line='3820' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_queue_xmit'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/dev.c' line='3820' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='dev_open' mangled-name='dev_open' filepath='net/core/dev.c' line='1355' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_open'> @@ -159027,9 +158905,9 @@ <parameter type-id='5799dc94' name='extack' filepath='net/core/dev.c' line='1355' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='dev_get_stats' mangled-name='dev_get_stats' filepath='net/core/dev.c' line='9502' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_get_stats'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9502' column='1'/> - <parameter type-id='bd3860fe' name='storage' filepath='net/core/dev.c' line='9503' column='1'/> + <function-decl name='dev_get_stats' mangled-name='dev_get_stats' filepath='net/core/dev.c' line='9499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_get_stats'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/dev.c' line='9499' column='1'/> + <parameter type-id='bd3860fe' name='storage' filepath='net/core/dev.c' line='9500' column='1'/> <return type-id='bd3860fe'/> </function-decl> <function-decl name='dev_close' mangled-name='dev_close' filepath='net/core/dev.c' line='1455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='dev_close'> @@ -159057,12 +158935,8 @@ <parameter type-id='b50a4934' name='is_rxqs_map' filepath='net/core/dev.c' line='2244' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__napi_schedule_irqoff' mangled-name='__napi_schedule_irqoff' filepath='net/core/dev.c' line='6001' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__napi_schedule_irqoff'> - <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='6001' column='1'/> - <return type-id='48b5725f'/> - </function-decl> - <function-decl name='__napi_schedule' mangled-name='__napi_schedule' filepath='net/core/dev.c' line='5948' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__napi_schedule'> - <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='5948' column='1'/> + <function-decl name='__napi_schedule_irqoff' mangled-name='__napi_schedule_irqoff' filepath='net/core/dev.c' line='5998' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__napi_schedule_irqoff'> + <parameter type-id='c50361c5' name='n' filepath='net/core/dev.c' line='5998' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='__dev_kfree_skb_any' mangled-name='__dev_kfree_skb_any' filepath='net/core/dev.c' line='2739' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__dev_kfree_skb_any'> @@ -159075,60 +158949,60 @@ <parameter type-id='95e97e5e' name='ifindex' filepath='net/core/dev.c' line='735' column='1'/> <return type-id='68a2d05b'/> </function-decl> - <class-decl name='napi_struct' size-in-bits='3392' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='324' column='1' id='291e3bb5'> + <class-decl name='napi_struct' size-in-bits='3392' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='322' column='1' id='291e3bb5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='331' column='1'/> + <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='329' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='333' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='331' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='weight' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='334' column='1'/> + <var-decl name='weight' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='gro_bitmask' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='335' column='1'/> + <var-decl name='gro_bitmask' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='333' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='poll' type-id='f07d90b4' visibility='default' filepath='include/linux/netdevice.h' line='336' column='1'/> + <var-decl name='poll' type-id='f07d90b4' visibility='default' filepath='include/linux/netdevice.h' line='334' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='340' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='338' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='gro_hash' type-id='91671be8' visibility='default' filepath='include/linux/netdevice.h' line='341' column='1'/> + <var-decl name='gro_hash' type-id='91671be8' visibility='default' filepath='include/linux/netdevice.h' line='339' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='skb' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='342' column='1'/> + <var-decl name='skb' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='340' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='rx_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='343' column='1'/> + <var-decl name='rx_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='rx_count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='344' column='1'/> + <var-decl name='rx_count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='342' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='timer' type-id='b6993efc' visibility='default' filepath='include/linux/netdevice.h' line='345' column='1'/> + <var-decl name='timer' type-id='b6993efc' visibility='default' filepath='include/linux/netdevice.h' line='343' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='346' column='1'/> + <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='napi_hash_node' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='347' column='1'/> + <var-decl name='napi_hash_node' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='345' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='348' column='1'/> + <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='346' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='350' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='348' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='351' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='349' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='352' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='350' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3328'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='353' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='351' column='1'/> </data-member> </class-decl> <function-type size-in-bits='64' id='3a60b114'> @@ -159154,12 +159028,12 @@ <array-type-def dimensions='1' type-id='b9535066' size-in-bits='1536' id='91671be8'> <subrange length='8' type-id='7ff19f0f' id='56e0c0b1'/> </array-type-def> - <class-decl name='gro_list' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='310' column='1' id='b9535066'> + <class-decl name='gro_list' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='308' column='1' id='b9535066'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='311' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='309' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='312' column='1'/> + <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='310' column='1'/> </data-member> </class-decl> </abi-instr> @@ -159288,21 +159162,21 @@ </class-decl> <pointer-type-def type-id='175944cd' size-in-bits='64' id='38ed603d'/> <pointer-type-def type-id='eb0d6f26' size-in-bits='64' id='8e35a44c'/> - <function-decl name='bpf_warn_invalid_xdp_action' mangled-name='bpf_warn_invalid_xdp_action' filepath='net/core/filter.c' line='6969' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_warn_invalid_xdp_action'> - <parameter type-id='19c2251e' name='act' filepath='net/core/filter.c' line='6969' column='1'/> + <function-decl name='bpf_warn_invalid_xdp_action' mangled-name='bpf_warn_invalid_xdp_action' filepath='net/core/filter.c' line='6956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_warn_invalid_xdp_action'> + <parameter type-id='19c2251e' name='act' filepath='net/core/filter.c' line='6956' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='bpf_prog_destroy' mangled-name='bpf_prog_destroy' filepath='net/core/filter.c' line='1426' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_prog_destroy'> <parameter type-id='bdcee7ae' name='fp' filepath='net/core/filter.c' line='1426' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='xdp_do_flush_map' mangled-name='xdp_do_flush_map' filepath='net/core/filter.c' line='3561' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xdp_do_flush_map'> + <function-decl name='xdp_do_flush_map' mangled-name='xdp_do_flush_map' filepath='net/core/filter.c' line='3549' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xdp_do_flush_map'> <return type-id='48b5725f'/> </function-decl> - <function-decl name='xdp_do_redirect' mangled-name='xdp_do_redirect' filepath='net/core/filter.c' line='3646' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xdp_do_redirect'> - <parameter type-id='68a2d05b' name='dev' filepath='net/core/filter.c' line='3646' column='1'/> - <parameter type-id='38ed603d' name='xdp' filepath='net/core/filter.c' line='3646' column='1'/> - <parameter type-id='bdcee7ae' name='xdp_prog' filepath='net/core/filter.c' line='3647' column='1'/> + <function-decl name='xdp_do_redirect' mangled-name='xdp_do_redirect' filepath='net/core/filter.c' line='3634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xdp_do_redirect'> + <parameter type-id='68a2d05b' name='dev' filepath='net/core/filter.c' line='3634' column='1'/> + <parameter type-id='38ed603d' name='xdp' filepath='net/core/filter.c' line='3634' column='1'/> + <parameter type-id='bdcee7ae' name='xdp_prog' filepath='net/core/filter.c' line='3635' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='bpf_prog_create' mangled-name='bpf_prog_create' filepath='net/core/filter.c' line='1338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='bpf_prog_create'> @@ -160440,8 +160314,8 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='net/core/neighbour.c' language='LANG_C89'> - <function-decl name='neigh_destroy' mangled-name='neigh_destroy' filepath='net/core/neighbour.c' line='859' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='neigh_destroy'> - <parameter type-id='3c330066' name='neigh' filepath='net/core/neighbour.c' line='859' column='1'/> + <function-decl name='neigh_destroy' mangled-name='neigh_destroy' filepath='net/core/neighbour.c' line='834' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='neigh_destroy'> + <parameter type-id='3c330066' name='neigh' filepath='net/core/neighbour.c' line='834' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -160475,24 +160349,24 @@ <pointer-type-def type-id='6ddd203f' size-in-bits='64' id='9b92b29b'/> <var-decl name='net_namespace_list' type-id='72f469ec' mangled-name='net_namespace_list' visibility='default' filepath='net/core/net_namespace.c' line='35' column='1' elf-symbol-id='net_namespace_list'/> <var-decl name='init_net' type-id='bd965180' mangled-name='init_net' visibility='default' filepath='net/core/net_namespace.c' line='46' column='1' elf-symbol-id='init_net'/> - <function-decl name='__put_net' mangled-name='__put_net' filepath='net/core/net_namespace.c' line='652' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__put_net'> - <parameter type-id='a2bff676' name='net' filepath='net/core/net_namespace.c' line='652' column='1'/> + <function-decl name='__put_net' mangled-name='__put_net' filepath='net/core/net_namespace.c' line='645' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__put_net'> + <parameter type-id='a2bff676' name='net' filepath='net/core/net_namespace.c' line='645' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='register_pernet_subsys' mangled-name='register_pernet_subsys' filepath='net/core/net_namespace.c' line='1273' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_pernet_subsys'> - <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1273' column='1'/> + <function-decl name='register_pernet_subsys' mangled-name='register_pernet_subsys' filepath='net/core/net_namespace.c' line='1266' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_pernet_subsys'> + <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1266' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='register_pernet_device' mangled-name='register_pernet_device' filepath='net/core/net_namespace.c' line='1319' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_pernet_device'> - <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1319' column='1'/> + <function-decl name='register_pernet_device' mangled-name='register_pernet_device' filepath='net/core/net_namespace.c' line='1312' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_pernet_device'> + <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1312' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='unregister_pernet_device' mangled-name='unregister_pernet_device' filepath='net/core/net_namespace.c' line='1340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_pernet_device'> - <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1340' column='1'/> + <function-decl name='unregister_pernet_device' mangled-name='unregister_pernet_device' filepath='net/core/net_namespace.c' line='1333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_pernet_device'> + <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1333' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='unregister_pernet_subsys' mangled-name='unregister_pernet_subsys' filepath='net/core/net_namespace.c' line='1292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_pernet_subsys'> - <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1292' column='1'/> + <function-decl name='unregister_pernet_subsys' mangled-name='unregister_pernet_subsys' filepath='net/core/net_namespace.c' line='1285' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='unregister_pernet_subsys'> + <parameter type-id='d6907f4c' name='ops' filepath='net/core/net_namespace.c' line='1285' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-type size-in-bits='64' id='0790750c'> @@ -160572,73 +160446,73 @@ <array-type-def dimensions='1' type-id='b9535066' size-in-bits='1536' id='91671be8'> <subrange length='8' type-id='7ff19f0f' id='56e0c0b1'/> </array-type-def> - <class-decl name='napi_struct' size-in-bits='3392' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='324' column='1' id='291e3bb5'> + <class-decl name='napi_struct' size-in-bits='3392' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='322' column='1' id='291e3bb5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='331' column='1'/> + <var-decl name='poll_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='329' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='333' column='1'/> + <var-decl name='state' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='331' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='weight' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='334' column='1'/> + <var-decl name='weight' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='332' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='gro_bitmask' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='335' column='1'/> + <var-decl name='gro_bitmask' type-id='7359adad' visibility='default' filepath='include/linux/netdevice.h' line='333' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='poll' type-id='f07d90b4' visibility='default' filepath='include/linux/netdevice.h' line='336' column='1'/> + <var-decl name='poll' type-id='f07d90b4' visibility='default' filepath='include/linux/netdevice.h' line='334' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='340' column='1'/> + <var-decl name='dev' type-id='68a2d05b' visibility='default' filepath='include/linux/netdevice.h' line='338' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='gro_hash' type-id='91671be8' visibility='default' filepath='include/linux/netdevice.h' line='341' column='1'/> + <var-decl name='gro_hash' type-id='91671be8' visibility='default' filepath='include/linux/netdevice.h' line='339' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='skb' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='342' column='1'/> + <var-decl name='skb' type-id='0fbf3cfd' visibility='default' filepath='include/linux/netdevice.h' line='340' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2048'> - <var-decl name='rx_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='343' column='1'/> + <var-decl name='rx_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='341' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2176'> - <var-decl name='rx_count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='344' column='1'/> + <var-decl name='rx_count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='342' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='timer' type-id='b6993efc' visibility='default' filepath='include/linux/netdevice.h' line='345' column='1'/> + <var-decl name='timer' type-id='b6993efc' visibility='default' filepath='include/linux/netdevice.h' line='343' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2816'> - <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='346' column='1'/> + <var-decl name='dev_list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='344' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2944'> - <var-decl name='napi_hash_node' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='347' column='1'/> + <var-decl name='napi_hash_node' type-id='03a4a074' visibility='default' filepath='include/linux/netdevice.h' line='345' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3072'> - <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='348' column='1'/> + <var-decl name='napi_id' type-id='f0981eeb' visibility='default' filepath='include/linux/netdevice.h' line='346' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3136'> - <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='350' column='1'/> + <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='348' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3200'> - <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='351' column='1'/> + <var-decl name='android_kabi_reserved2' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='349' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3264'> - <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='352' column='1'/> + <var-decl name='android_kabi_reserved3' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='350' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3328'> - <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='353' column='1'/> + <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/linux/netdevice.h' line='351' column='1'/> </data-member> </class-decl> - <class-decl name='gro_list' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='310' column='1' id='b9535066'> + <class-decl name='gro_list' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/linux/netdevice.h' line='308' column='1' id='b9535066'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='311' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/linux/netdevice.h' line='309' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='312' column='1'/> + <var-decl name='count' type-id='95e97e5e' visibility='default' filepath='include/linux/netdevice.h' line='310' column='1'/> </data-member> </class-decl> - <class-decl name='skb_shared_hwtstamps' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='419' column='1' id='c148e595'> + <class-decl name='skb_shared_hwtstamps' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/linux/skbuff.h' line='418' column='1' id='c148e595'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='hwtstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='420' column='1'/> + <var-decl name='hwtstamp' type-id='fbc017ef' visibility='default' filepath='include/linux/skbuff.h' line='419' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='016b3662' size-in-bits='64' id='f07d90b4'/> @@ -160656,50 +160530,50 @@ <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='701' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_queue_tail' mangled-name='skb_queue_tail' filepath='net/core/skbuff.c' line='3171' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_tail'> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3171' column='1'/> - <parameter type-id='0fbf3cfd' name='newsk' filepath='net/core/skbuff.c' line='3171' column='1'/> + <function-decl name='skb_queue_tail' mangled-name='skb_queue_tail' filepath='net/core/skbuff.c' line='3160' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_tail'> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3160' column='1'/> + <parameter type-id='0fbf3cfd' name='newsk' filepath='net/core/skbuff.c' line='3160' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pskb_expand_head' mangled-name='pskb_expand_head' filepath='net/core/skbuff.c' line='1631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pskb_expand_head'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1631' column='1'/> - <parameter type-id='95e97e5e' name='nhead' filepath='net/core/skbuff.c' line='1631' column='1'/> - <parameter type-id='95e97e5e' name='ntail' filepath='net/core/skbuff.c' line='1631' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1632' column='1'/> + <function-decl name='pskb_expand_head' mangled-name='pskb_expand_head' filepath='net/core/skbuff.c' line='1623' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pskb_expand_head'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1623' column='1'/> + <parameter type-id='95e97e5e' name='nhead' filepath='net/core/skbuff.c' line='1623' column='1'/> + <parameter type-id='95e97e5e' name='ntail' filepath='net/core/skbuff.c' line='1623' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1624' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='skb_dequeue' mangled-name='skb_dequeue' filepath='net/core/skbuff.c' line='3065' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_dequeue'> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3065' column='1'/> + <function-decl name='skb_dequeue' mangled-name='skb_dequeue' filepath='net/core/skbuff.c' line='3054' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_dequeue'> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3054' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> <function-decl name='consume_skb' mangled-name='consume_skb' filepath='net/core/skbuff.c' line='843' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='consume_skb'> <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='843' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_copy' mangled-name='skb_copy' filepath='net/core/skbuff.c' line='1528' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy'> - <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='1528' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1528' column='1'/> + <function-decl name='skb_copy' mangled-name='skb_copy' filepath='net/core/skbuff.c' line='1520' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy'> + <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='1520' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1520' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_queue_purge' mangled-name='skb_queue_purge' filepath='net/core/skbuff.c' line='3105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_purge'> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3105' column='1'/> + <function-decl name='skb_queue_purge' mangled-name='skb_queue_purge' filepath='net/core/skbuff.c' line='3094' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_purge'> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3094' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_clone' mangled-name='skb_clone' filepath='net/core/skbuff.c' line='1449' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_clone'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1449' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1449' column='1'/> + <function-decl name='skb_clone' mangled-name='skb_clone' filepath='net/core/skbuff.c' line='1441' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_clone'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1441' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1441' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_queue_head' mangled-name='skb_queue_head' filepath='net/core/skbuff.c' line='3150' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_head'> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3150' column='1'/> - <parameter type-id='0fbf3cfd' name='newsk' filepath='net/core/skbuff.c' line='3150' column='1'/> + <function-decl name='skb_queue_head' mangled-name='skb_queue_head' filepath='net/core/skbuff.c' line='3139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_queue_head'> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3139' column='1'/> + <parameter type-id='0fbf3cfd' name='newsk' filepath='net/core/skbuff.c' line='3139' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_copy_bits' mangled-name='skb_copy_bits' filepath='net/core/skbuff.c' line='2216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy_bits'> - <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='2216' column='1'/> - <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2216' column='1'/> - <parameter type-id='eaa32e2f' name='to' filepath='net/core/skbuff.c' line='2216' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2216' column='1'/> + <function-decl name='skb_copy_bits' mangled-name='skb_copy_bits' filepath='net/core/skbuff.c' line='2205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy_bits'> + <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='2205' column='1'/> + <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2205' column='1'/> + <parameter type-id='eaa32e2f' name='to' filepath='net/core/skbuff.c' line='2205' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2205' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='skb_cow_data' mangled-name='skb_cow_data' filepath='net/core/skbuff.c' line='4447' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_cow_data'> @@ -160713,19 +160587,19 @@ <parameter type-id='b50a4934' name='xnet' filepath='net/core/skbuff.c' line='5260' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='___pskb_trim' mangled-name='___pskb_trim' filepath='net/core/skbuff.c' line='1944' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='___pskb_trim'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1944' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1944' column='1'/> + <function-decl name='___pskb_trim' mangled-name='___pskb_trim' filepath='net/core/skbuff.c' line='1936' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='___pskb_trim'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1936' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1936' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__pskb_pull_tail' mangled-name='__pskb_pull_tail' filepath='net/core/skbuff.c' line='2075' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pskb_pull_tail'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2075' column='1'/> - <parameter type-id='95e97e5e' name='delta' filepath='net/core/skbuff.c' line='2075' column='1'/> + <function-decl name='__pskb_pull_tail' mangled-name='__pskb_pull_tail' filepath='net/core/skbuff.c' line='2067' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pskb_pull_tail'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2067' column='1'/> + <parameter type-id='95e97e5e' name='delta' filepath='net/core/skbuff.c' line='2067' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='skb_pull_rcsum' mangled-name='skb_pull_rcsum' filepath='net/core/skbuff.c' line='3648' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_pull_rcsum'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3648' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='3648' column='1'/> + <function-decl name='skb_pull_rcsum' mangled-name='skb_pull_rcsum' filepath='net/core/skbuff.c' line='3649' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_pull_rcsum'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3649' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='3649' column='1'/> <return type-id='eaa32e2f'/> </function-decl> <function-decl name='__netdev_alloc_skb' mangled-name='__netdev_alloc_skb' filepath='net/core/skbuff.c' line='425' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__netdev_alloc_skb'> @@ -160734,11 +160608,11 @@ <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='426' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='__pskb_copy_fclone' mangled-name='__pskb_copy_fclone' filepath='net/core/skbuff.c' line='1567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pskb_copy_fclone'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1567' column='1'/> - <parameter type-id='95e97e5e' name='headroom' filepath='net/core/skbuff.c' line='1567' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1568' column='1'/> - <parameter type-id='b50a4934' name='fclone' filepath='net/core/skbuff.c' line='1568' column='1'/> + <function-decl name='__pskb_copy_fclone' mangled-name='__pskb_copy_fclone' filepath='net/core/skbuff.c' line='1559' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__pskb_copy_fclone'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1559' column='1'/> + <parameter type-id='95e97e5e' name='headroom' filepath='net/core/skbuff.c' line='1559' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1560' column='1'/> + <parameter type-id='b50a4934' name='fclone' filepath='net/core/skbuff.c' line='1560' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> <function-decl name='__napi_alloc_skb' mangled-name='__napi_alloc_skb' filepath='net/core/skbuff.c' line='501' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__napi_alloc_skb'> @@ -160747,11 +160621,11 @@ <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='502' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_copy_expand' mangled-name='skb_copy_expand' filepath='net/core/skbuff.c' line='1757' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy_expand'> - <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='1757' column='1'/> - <parameter type-id='95e97e5e' name='newheadroom' filepath='net/core/skbuff.c' line='1758' column='1'/> - <parameter type-id='95e97e5e' name='newtailroom' filepath='net/core/skbuff.c' line='1758' column='1'/> - <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1759' column='1'/> + <function-decl name='skb_copy_expand' mangled-name='skb_copy_expand' filepath='net/core/skbuff.c' line='1749' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_copy_expand'> + <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='1749' column='1'/> + <parameter type-id='95e97e5e' name='newheadroom' filepath='net/core/skbuff.c' line='1750' column='1'/> + <parameter type-id='95e97e5e' name='newtailroom' filepath='net/core/skbuff.c' line='1750' column='1'/> + <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='1751' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> <function-decl name='alloc_skb_with_frags' mangled-name='alloc_skb_with_frags' filepath='net/core/skbuff.c' line='5791' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='alloc_skb_with_frags'> @@ -160762,9 +160636,9 @@ <parameter type-id='3eb7c31c' name='gfp_mask' filepath='net/core/skbuff.c' line='5795' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_unlink' mangled-name='skb_unlink' filepath='net/core/skbuff.c' line='3191' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_unlink'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3191' column='1'/> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3191' column='1'/> + <function-decl name='skb_unlink' mangled-name='skb_unlink' filepath='net/core/skbuff.c' line='3180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_unlink'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3180' column='1'/> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3180' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='skb_tstamp_tx' mangled-name='skb_tstamp_tx' filepath='net/core/skbuff.c' line='4763' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_tstamp_tx'> @@ -160776,9 +160650,9 @@ <parameter type-id='374692c7' name='ext' filepath='net/core/skbuff.c' line='6248' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='skb_trim' mangled-name='skb_trim' filepath='net/core/skbuff.c' line='1934' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_trim'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1934' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1934' column='1'/> + <function-decl name='skb_trim' mangled-name='skb_trim' filepath='net/core/skbuff.c' line='1926' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_trim'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1926' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1926' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='skb_to_sgvec_nomark' mangled-name='skb_to_sgvec_nomark' filepath='net/core/skbuff.c' line='4421' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_to_sgvec_nomark'> @@ -160795,31 +160669,31 @@ <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='4389' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='skb_store_bits' mangled-name='skb_store_bits' filepath='net/core/skbuff.c' line='2578' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_store_bits'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2578' column='1'/> - <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2578' column='1'/> - <parameter type-id='eaa32e2f' name='from' filepath='net/core/skbuff.c' line='2578' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2578' column='1'/> + <function-decl name='skb_store_bits' mangled-name='skb_store_bits' filepath='net/core/skbuff.c' line='2567' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_store_bits'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2567' column='1'/> + <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2567' column='1'/> + <parameter type-id='eaa32e2f' name='from' filepath='net/core/skbuff.c' line='2567' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2567' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='skb_realloc_headroom' mangled-name='skb_realloc_headroom' filepath='net/core/skbuff.c' line='1720' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_realloc_headroom'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1720' column='1'/> - <parameter type-id='f0981eeb' name='headroom' filepath='net/core/skbuff.c' line='1720' column='1'/> + <function-decl name='skb_realloc_headroom' mangled-name='skb_realloc_headroom' filepath='net/core/skbuff.c' line='1712' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_realloc_headroom'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1712' column='1'/> + <parameter type-id='f0981eeb' name='headroom' filepath='net/core/skbuff.c' line='1712' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_put' mangled-name='skb_put' filepath='net/core/skbuff.c' line='1878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_put'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1878' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1878' column='1'/> + <function-decl name='skb_put' mangled-name='skb_put' filepath='net/core/skbuff.c' line='1870' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_put'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1870' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1870' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='skb_push' mangled-name='skb_push' filepath='net/core/skbuff.c' line='1899' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_push'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1899' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1899' column='1'/> + <function-decl name='skb_push' mangled-name='skb_push' filepath='net/core/skbuff.c' line='1891' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_push'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1891' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1891' column='1'/> <return type-id='eaa32e2f'/> </function-decl> - <function-decl name='skb_pull' mangled-name='skb_pull' filepath='net/core/skbuff.c' line='1919' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_pull'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1919' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1919' column='1'/> + <function-decl name='skb_pull' mangled-name='skb_pull' filepath='net/core/skbuff.c' line='1911' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_pull'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1911' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='1911' column='1'/> <return type-id='eaa32e2f'/> </function-decl> <function-decl name='skb_partial_csum_set' mangled-name='skb_partial_csum_set' filepath='net/core/skbuff.c' line='4809' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_partial_csum_set'> @@ -160833,8 +160707,8 @@ <parameter type-id='95e97e5e' name='write_len' filepath='net/core/skbuff.c' line='5491' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='skb_dequeue_tail' mangled-name='skb_dequeue_tail' filepath='net/core/skbuff.c' line='3085' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_dequeue_tail'> - <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3085' column='1'/> + <function-decl name='skb_dequeue_tail' mangled-name='skb_dequeue_tail' filepath='net/core/skbuff.c' line='3074' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_dequeue_tail'> + <parameter type-id='03c386c6' name='list' filepath='net/core/skbuff.c' line='3074' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> <function-decl name='skb_complete_wifi_ack' mangled-name='skb_complete_wifi_ack' filepath='net/core/skbuff.c' line='4771' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_complete_wifi_ack'> @@ -160853,18 +160727,18 @@ <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='4626' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='skb_checksum' mangled-name='skb_checksum' filepath='net/core/skbuff.c' line='2740' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_checksum'> - <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='2740' column='1'/> - <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2740' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2741' column='1'/> - <parameter type-id='fbd88bba' name='csum' filepath='net/core/skbuff.c' line='2741' column='1'/> + <function-decl name='skb_checksum' mangled-name='skb_checksum' filepath='net/core/skbuff.c' line='2729' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_checksum'> + <parameter type-id='11f4a000' name='skb' filepath='net/core/skbuff.c' line='2729' column='1'/> + <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='2729' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='net/core/skbuff.c' line='2730' column='1'/> + <parameter type-id='fbd88bba' name='csum' filepath='net/core/skbuff.c' line='2730' column='1'/> <return type-id='fbd88bba'/> </function-decl> - <function-decl name='skb_append_pagefrags' mangled-name='skb_append_pagefrags' filepath='net/core/skbuff.c' line='3619' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_append_pagefrags'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3619' column='1'/> - <parameter type-id='02f11ed4' name='page' filepath='net/core/skbuff.c' line='3619' column='1'/> - <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='3620' column='1'/> - <parameter type-id='b59d7dce' name='size' filepath='net/core/skbuff.c' line='3620' column='1'/> + <function-decl name='skb_append_pagefrags' mangled-name='skb_append_pagefrags' filepath='net/core/skbuff.c' line='3620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_append_pagefrags'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='3620' column='1'/> + <parameter type-id='02f11ed4' name='page' filepath='net/core/skbuff.c' line='3620' column='1'/> + <parameter type-id='95e97e5e' name='offset' filepath='net/core/skbuff.c' line='3621' column='1'/> + <parameter type-id='b59d7dce' name='size' filepath='net/core/skbuff.c' line='3621' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='skb_add_rx_frag' mangled-name='skb_add_rx_frag' filepath='net/core/skbuff.c' line='553' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_add_rx_frag'> @@ -160876,9 +160750,9 @@ <parameter type-id='f0981eeb' name='truesize' filepath='net/core/skbuff.c' line='554' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='pskb_trim_rcsum_slow' mangled-name='pskb_trim_rcsum_slow' filepath='net/core/skbuff.c' line='2031' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pskb_trim_rcsum_slow'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2031' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='2031' column='1'/> + <function-decl name='pskb_trim_rcsum_slow' mangled-name='pskb_trim_rcsum_slow' filepath='net/core/skbuff.c' line='2023' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='pskb_trim_rcsum_slow'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='2023' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/core/skbuff.c' line='2023' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='netdev_alloc_frag' mangled-name='netdev_alloc_frag' filepath='net/core/skbuff.c' line='394' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netdev_alloc_frag'> @@ -160899,10 +160773,10 @@ <parameter type-id='f0981eeb' name='frag_size' filepath='net/core/skbuff.c' line='325' column='1'/> <return type-id='0fbf3cfd'/> </function-decl> - <function-decl name='__skb_pad' mangled-name='__skb_pad' filepath='net/core/skbuff.c' line='1811' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__skb_pad'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1811' column='1'/> - <parameter type-id='95e97e5e' name='pad' filepath='net/core/skbuff.c' line='1811' column='1'/> - <parameter type-id='b50a4934' name='free_on_error' filepath='net/core/skbuff.c' line='1811' column='1'/> + <function-decl name='__skb_pad' mangled-name='__skb_pad' filepath='net/core/skbuff.c' line='1803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__skb_pad'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/core/skbuff.c' line='1803' column='1'/> + <parameter type-id='95e97e5e' name='pad' filepath='net/core/skbuff.c' line='1803' column='1'/> + <parameter type-id='b50a4934' name='free_on_error' filepath='net/core/skbuff.c' line='1803' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='016b3662'> @@ -161001,7 +160875,7 @@ <var-decl name='' type-id='ba169a6c' visibility='default' filepath='include/net/inet_hashtables.h' line='115' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__15' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/inet_hashtables.h' line='115' column='1' id='ba169a6c'> + <union-decl name='__anonymous_union__13' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/inet_hashtables.h' line='115' column='1' id='ba169a6c'> <data-member access='public'> <var-decl name='head' type-id='e151255a' visibility='default' filepath='include/net/inet_hashtables.h' line='116' column='1'/> </data-member> @@ -161056,7 +160930,7 @@ </data-member> </class-decl> <typedef-decl name='xfrm_address_t' type-id='eba8a6fd' filepath='include/uapi/linux/xfrm.h' line='19' column='1' id='c210d497'/> - <union-decl name='__anonymous_union__21' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/xfrm.h' line='15' column='1' id='eba8a6fd'> + <union-decl name='__anonymous_union__19' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/uapi/linux/xfrm.h' line='15' column='1' id='eba8a6fd'> <data-member access='public'> <var-decl name='a4' type-id='78a133c2' visibility='default' filepath='include/uapi/linux/xfrm.h' line='16' column='1'/> </data-member> @@ -161189,7 +161063,7 @@ <var-decl name='proto' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/xfrm.h' line='28' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__22' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/xfrm.h' line='149' column='1' id='fc320d58'> + <union-decl name='__anonymous_union__20' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/xfrm.h' line='149' column='1' id='fc320d58'> <data-member access='public'> <var-decl name='gclist' type-id='03a4a074' visibility='default' filepath='include/net/xfrm.h' line='150' column='1'/> </data-member> @@ -161467,7 +161341,7 @@ <var-decl name='xmit' type-id='231269da' visibility='default' filepath='include/net/xfrm.h' line='418' column='1'/> </data-member> </class-decl> - <enum-decl name='tcp_ca_event' filepath='include/net/tcp.h' line='979' column='1' id='5f51e977'> + <enum-decl name='tcp_ca_event' filepath='include/net/tcp.h' line='977' column='1' id='5f51e977'> <underlying-type type-id='9cac1fee'/> <enumerator name='CA_EVENT_TX_START' value='0'/> <enumerator name='CA_EVENT_CWND_RESTART' value='1'/> @@ -161476,56 +161350,56 @@ <enumerator name='CA_EVENT_ECN_NO_CE' value='4'/> <enumerator name='CA_EVENT_ECN_IS_CE' value='5'/> </enum-decl> - <class-decl name='ack_sample' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1011' column='1' id='cd7d3c9d'> + <class-decl name='ack_sample' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1009' column='1' id='cd7d3c9d'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='pkts_acked' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1012' column='1'/> + <var-decl name='pkts_acked' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1010' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='rtt_us' type-id='a7832498' visibility='default' filepath='include/net/tcp.h' line='1013' column='1'/> + <var-decl name='rtt_us' type-id='a7832498' visibility='default' filepath='include/net/tcp.h' line='1011' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='in_flight' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1014' column='1'/> + <var-decl name='in_flight' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1012' column='1'/> </data-member> </class-decl> - <class-decl name='rate_sample' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1025' column='1' id='a084c932'> + <class-decl name='rate_sample' size-in-bits='448' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='1023' column='1' id='a084c932'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='prior_mstamp' type-id='91ce1af9' visibility='default' filepath='include/net/tcp.h' line='1026' column='1'/> + <var-decl name='prior_mstamp' type-id='91ce1af9' visibility='default' filepath='include/net/tcp.h' line='1024' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='prior_delivered' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1027' column='1'/> + <var-decl name='prior_delivered' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1025' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='delivered' type-id='a7832498' visibility='default' filepath='include/net/tcp.h' line='1028' column='1'/> + <var-decl name='delivered' type-id='a7832498' visibility='default' filepath='include/net/tcp.h' line='1026' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='interval_us' type-id='bd54fe1a' visibility='default' filepath='include/net/tcp.h' line='1029' column='1'/> + <var-decl name='interval_us' type-id='bd54fe1a' visibility='default' filepath='include/net/tcp.h' line='1027' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='snd_interval_us' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1030' column='1'/> + <var-decl name='snd_interval_us' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1028' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='rcv_interval_us' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1031' column='1'/> + <var-decl name='rcv_interval_us' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1029' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='rtt_us' type-id='bd54fe1a' visibility='default' filepath='include/net/tcp.h' line='1032' column='1'/> + <var-decl name='rtt_us' type-id='bd54fe1a' visibility='default' filepath='include/net/tcp.h' line='1030' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='losses' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1033' column='1'/> + <var-decl name='losses' type-id='95e97e5e' visibility='default' filepath='include/net/tcp.h' line='1031' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='352'> - <var-decl name='acked_sacked' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1034' column='1'/> + <var-decl name='acked_sacked' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1032' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='prior_in_flight' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1035' column='1'/> + <var-decl name='prior_in_flight' type-id='19c2251e' visibility='default' filepath='include/net/tcp.h' line='1033' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='416'> - <var-decl name='is_app_limited' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1036' column='1'/> + <var-decl name='is_app_limited' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1034' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='424'> - <var-decl name='is_retrans' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1037' column='1'/> + <var-decl name='is_retrans' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1035' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='432'> - <var-decl name='is_ack_delayed' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1038' column='1'/> + <var-decl name='is_ack_delayed' type-id='b50a4934' visibility='default' filepath='include/net/tcp.h' line='1036' column='1'/> </data-member> </class-decl> <class-decl name='fib6_node' size-in-bits='576' is-struct='yes' visibility='default' filepath='include/net/ip6_fib.h' line='73' column='1' id='9f30e4ad'> @@ -161560,7 +161434,7 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/net/ip6_fib.h' line='88' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__23' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip6_fib.h' line='151' column='1' id='faf198da'> + <union-decl name='__anonymous_union__21' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip6_fib.h' line='151' column='1' id='faf198da'> <data-member access='public'> <var-decl name='fib6_siblings' type-id='72f469ec' visibility='default' filepath='include/net/ip6_fib.h' line='152' column='1'/> </data-member> @@ -161639,7 +161513,7 @@ <var-decl name='nhc_exceptions' type-id='09c59e98' visibility='default' filepath='include/net/ip_fib.h' line='100' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__24' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip_fib.h' line='89' column='1' id='37def4b7'> + <union-decl name='__anonymous_union__22' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/ip_fib.h' line='89' column='1' id='37def4b7'> <data-member access='public'> <var-decl name='ipv4' type-id='78a133c2' visibility='default' filepath='include/net/ip_fib.h' line='90' column='1'/> </data-member> @@ -161688,7 +161562,7 @@ <var-decl name='rt_uncached_list' type-id='e9bf5d35' visibility='default' filepath='include/net/route.h' line='72' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__25' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/route.h' line='62' column='1' id='77077303'> + <union-decl name='__anonymous_union__23' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/route.h' line='62' column='1' id='77077303'> <data-member access='public'> <var-decl name='rt_gw4' type-id='78a133c2' visibility='default' filepath='include/net/route.h' line='63' column='1'/> </data-member> @@ -161797,13 +161671,13 @@ <pointer-type-def type-id='f9cce85e' size-in-bits='64' id='47541e34'/> <pointer-type-def type-id='b3f5c5f7' size-in-bits='64' id='71411b0f'/> <pointer-type-def type-id='cddfb84e' size-in-bits='64' id='b07c2494'/> - <function-decl name='lock_sock_nested' mangled-name='lock_sock_nested' filepath='net/core/sock.c' line='2989' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lock_sock_nested'> - <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2989' column='1'/> - <parameter type-id='95e97e5e' name='subclass' filepath='net/core/sock.c' line='2989' column='1'/> + <function-decl name='lock_sock_nested' mangled-name='lock_sock_nested' filepath='net/core/sock.c' line='2973' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='lock_sock_nested'> + <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2973' column='1'/> + <parameter type-id='95e97e5e' name='subclass' filepath='net/core/sock.c' line='2973' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='release_sock' mangled-name='release_sock' filepath='net/core/sock.c' line='3005' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='release_sock'> - <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='3005' column='1'/> + <function-decl name='release_sock' mangled-name='release_sock' filepath='net/core/sock.c' line='2989' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='release_sock'> + <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2989' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='sk_alloc' mangled-name='sk_alloc' filepath='net/core/sock.c' line='1671' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sk_alloc'> @@ -161814,6 +161688,11 @@ <parameter type-id='95e97e5e' name='kern' filepath='net/core/sock.c' line='1672' column='1'/> <return type-id='f772df6d'/> </function-decl> + <function-decl name='sock_init_data' mangled-name='sock_init_data' filepath='net/core/sock.c' line='2890' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_init_data'> + <parameter type-id='13103032' name='sock' filepath='net/core/sock.c' line='2890' column='1'/> + <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2890' column='1'/> + <return type-id='48b5725f'/> + </function-decl> <function-decl name='skb_page_frag_refill' mangled-name='skb_page_frag_refill' filepath='net/core/sock.c' line='2375' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='skb_page_frag_refill'> <parameter type-id='f0981eeb' name='sz' filepath='net/core/sock.c' line='2375' column='1'/> <parameter type-id='a8d434b7' name='pfrag' filepath='net/core/sock.c' line='2375' column='1'/> @@ -161825,8 +161704,8 @@ <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2006' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='proto_unregister' mangled-name='proto_unregister' filepath='net/core/sock.c' line='3498' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proto_unregister'> - <parameter type-id='d2524501' name='prot' filepath='net/core/sock.c' line='3498' column='1'/> + <function-decl name='proto_unregister' mangled-name='proto_unregister' filepath='net/core/sock.c' line='3482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proto_unregister'> + <parameter type-id='d2524501' name='prot' filepath='net/core/sock.c' line='3482' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='__sk_receive_skb' mangled-name='__sk_receive_skb' filepath='net/core/sock.c' line='499' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__sk_receive_skb'> @@ -161837,9 +161716,9 @@ <parameter type-id='b50a4934' name='refcounted' filepath='net/core/sock.c' line='500' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='proto_register' mangled-name='proto_register' filepath='net/core/sock.c' line='3434' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proto_register'> - <parameter type-id='d2524501' name='prot' filepath='net/core/sock.c' line='3434' column='1'/> - <parameter type-id='95e97e5e' name='alloc_slab' filepath='net/core/sock.c' line='3434' column='1'/> + <function-decl name='proto_register' mangled-name='proto_register' filepath='net/core/sock.c' line='3418' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='proto_register'> + <parameter type-id='d2524501' name='prot' filepath='net/core/sock.c' line='3418' column='1'/> + <parameter type-id='95e97e5e' name='alloc_slab' filepath='net/core/sock.c' line='3418' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='sock_no_sendpage' mangled-name='sock_no_sendpage' filepath='net/core/sock.c' line='2770' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_no_sendpage'> @@ -161948,11 +161827,6 @@ <parameter type-id='b50a4934' name='kern' filepath='net/core/sock.c' line='2678' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='sock_init_data' mangled-name='sock_init_data' filepath='net/core/sock.c' line='2979' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_init_data'> - <parameter type-id='13103032' name='sock' filepath='net/core/sock.c' line='2979' column='1'/> - <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2979' column='1'/> - <return type-id='48b5725f'/> - </function-decl> <function-decl name='sock_i_uid' mangled-name='sock_i_uid' filepath='net/core/sock.c' line='2082' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_i_uid'> <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2082' column='1'/> <return type-id='d80b72e6'/> @@ -161961,11 +161835,11 @@ <parameter type-id='f772df6d' name='sk' filepath='net/core/sock.c' line='2093' column='1'/> <return type-id='7359adad'/> </function-decl> - <function-decl name='sock_gettstamp' mangled-name='sock_gettstamp' filepath='net/core/sock.c' line='3060' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_gettstamp'> - <parameter type-id='13103032' name='sock' filepath='net/core/sock.c' line='3060' column='1'/> - <parameter type-id='eaa32e2f' name='userstamp' filepath='net/core/sock.c' line='3060' column='1'/> - <parameter type-id='b50a4934' name='timeval' filepath='net/core/sock.c' line='3061' column='1'/> - <parameter type-id='b50a4934' name='time32' filepath='net/core/sock.c' line='3061' column='1'/> + <function-decl name='sock_gettstamp' mangled-name='sock_gettstamp' filepath='net/core/sock.c' line='3044' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_gettstamp'> + <parameter type-id='13103032' name='sock' filepath='net/core/sock.c' line='3044' column='1'/> + <parameter type-id='eaa32e2f' name='userstamp' filepath='net/core/sock.c' line='3044' column='1'/> + <parameter type-id='b50a4934' name='timeval' filepath='net/core/sock.c' line='3045' column='1'/> + <parameter type-id='b50a4934' name='time32' filepath='net/core/sock.c' line='3045' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='sock_efree' mangled-name='sock_efree' filepath='net/core/sock.c' line='2076' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='sock_efree'> @@ -162144,10 +162018,6 @@ <parameter type-id='b50a4934' name='pseudohdr' filepath='net/core/utils.c' line='426' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='in_aton' mangled-name='in_aton' filepath='net/core/utils.c' line='50' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='in_aton'> - <parameter type-id='80f4b756' name='str' filepath='net/core/utils.c' line='50' column='1'/> - <return type-id='78a133c2'/> - </function-decl> <function-decl name='in6_pton' mangled-name='in6_pton' filepath='net/core/utils.c' line='184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='in6_pton'> <parameter type-id='80f4b756' name='src' filepath='net/core/utils.c' line='184' column='1'/> <parameter type-id='95e97e5e' name='srclen' filepath='net/core/utils.c' line='184' column='1'/> @@ -162630,7 +162500,7 @@ <var-decl name='ipi6_ifindex' type-id='95e97e5e' visibility='default' filepath='include/uapi/linux/ipv6.h' line='23' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__23' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/ipv6.h' line='255' column='1' id='23d43bd5'> + <union-decl name='__anonymous_union__21' size-in-bits='16' is-anonymous='yes' visibility='default' filepath='include/linux/ipv6.h' line='255' column='1' id='23d43bd5'> <data-member access='public'> <var-decl name='bits' type-id='9ebd5abd' visibility='default' filepath='include/linux/ipv6.h' line='273' column='1'/> </data-member> @@ -162830,7 +162700,7 @@ <var-decl name='segments_left' type-id='8f048e17' visibility='default' filepath='include/uapi/linux/ipv6.h' line='52' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__24' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ipv6.h' line='321' column='1' id='f3980da2'> + <union-decl name='__anonymous_union__22' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/net/ipv6.h' line='321' column='1' id='f3980da2'> <data-member access='public'> <var-decl name='pid' type-id='b94e5398' visibility='default' filepath='include/net/ipv6.h' line='322' column='1'/> </data-member> @@ -163090,30 +162960,30 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/net/inet_connection_sock.h' line='63' column='1'/> </data-member> </class-decl> - <class-decl name='tcp_ulp_ops' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='2162' column='1' id='fccb029f'> + <class-decl name='tcp_ulp_ops' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/net/tcp.h' line='2157' column='1' id='fccb029f'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='2163' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/net/tcp.h' line='2158' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='init' type-id='55530c47' visibility='default' filepath='include/net/tcp.h' line='2166' column='1'/> + <var-decl name='init' type-id='55530c47' visibility='default' filepath='include/net/tcp.h' line='2161' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='update' type-id='58220cf1' visibility='default' filepath='include/net/tcp.h' line='2168' column='1'/> + <var-decl name='update' type-id='58220cf1' visibility='default' filepath='include/net/tcp.h' line='2163' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='2171' column='1'/> + <var-decl name='release' type-id='841969d0' visibility='default' filepath='include/net/tcp.h' line='2166' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='get_info' type-id='684afc90' visibility='default' filepath='include/net/tcp.h' line='2173' column='1'/> + <var-decl name='get_info' type-id='684afc90' visibility='default' filepath='include/net/tcp.h' line='2168' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='get_info_size' type-id='08a11828' visibility='default' filepath='include/net/tcp.h' line='2174' column='1'/> + <var-decl name='get_info_size' type-id='08a11828' visibility='default' filepath='include/net/tcp.h' line='2169' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='2176' column='1'/> + <var-decl name='name' type-id='ac1fa8c0' visibility='default' filepath='include/net/tcp.h' line='2171' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='2177' column='1'/> + <var-decl name='owner' type-id='2730d015' visibility='default' filepath='include/net/tcp.h' line='2172' column='1'/> </data-member> </class-decl> <class-decl name='__anonymous_struct__1' size-in-bits='192' is-struct='yes' is-anonymous='yes' visibility='default' filepath='include/net/inet_connection_sock.h' line='118' column='1' id='a2193a7c'> @@ -164484,8 +164354,8 @@ <pointer-type-def type-id='c5b77cb3' size-in-bits='64' id='88850643'/> <pointer-type-def type-id='70a034c7' size-in-bits='64' id='901b6973'/> <pointer-type-def type-id='679f0c08' size-in-bits='64' id='7d671c0a'/> - <function-decl name='l2tp_tunnel_delete' mangled-name='l2tp_tunnel_delete' filepath='net/l2tp/l2tp_core.c' line='1563' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_delete'> - <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1563' column='1'/> + <function-decl name='l2tp_tunnel_delete' mangled-name='l2tp_tunnel_delete' filepath='net/l2tp/l2tp_core.c' line='1555' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_delete'> + <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1555' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='l2tp_xmit_skb' mangled-name='l2tp_xmit_skb' filepath='net/l2tp/l2tp_core.c' line='1058' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_xmit_skb'> @@ -164504,14 +164374,14 @@ <parameter type-id='19c2251e' name='session_id' filepath='net/l2tp/l2tp_core.c' line='203' column='1'/> <return type-id='d35aee0a'/> </function-decl> - <function-decl name='l2tp_session_free' mangled-name='l2tp_session_free' filepath='net/l2tp/l2tp_core.c' line='1574' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_free'> - <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1574' column='1'/> + <function-decl name='l2tp_session_free' mangled-name='l2tp_session_free' filepath='net/l2tp/l2tp_core.c' line='1566' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_free'> + <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1566' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='l2tp_tunnel_register' mangled-name='l2tp_tunnel_register' filepath='net/l2tp/l2tp_core.c' line='1477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_register'> - <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1477' column='1'/> - <parameter type-id='a2bff676' name='net' filepath='net/l2tp/l2tp_core.c' line='1477' column='1'/> - <parameter type-id='88850643' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1478' column='1'/> + <function-decl name='l2tp_tunnel_register' mangled-name='l2tp_tunnel_register' filepath='net/l2tp/l2tp_core.c' line='1475' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_register'> + <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1475' column='1'/> + <parameter type-id='a2bff676' name='net' filepath='net/l2tp/l2tp_core.c' line='1475' column='1'/> + <parameter type-id='88850643' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1476' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='l2tp_tunnel_get_nth' mangled-name='l2tp_tunnel_get_nth' filepath='net/l2tp/l2tp_core.c' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_get_nth'> @@ -164528,19 +164398,19 @@ <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='154' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='l2tp_tunnel_create' mangled-name='l2tp_tunnel_create' filepath='net/l2tp/l2tp_core.c' line='1408' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_create'> - <parameter type-id='a2bff676' name='net' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='95e97e5e' name='fd' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='95e97e5e' name='version' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='19c2251e' name='tunnel_id' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='19c2251e' name='peer_tunnel_id' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='88850643' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> - <parameter type-id='383758d6' name='tunnelp' filepath='net/l2tp/l2tp_core.c' line='1408' column='1'/> + <function-decl name='l2tp_tunnel_create' mangled-name='l2tp_tunnel_create' filepath='net/l2tp/l2tp_core.c' line='1406' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_tunnel_create'> + <parameter type-id='a2bff676' name='net' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='95e97e5e' name='fd' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='95e97e5e' name='version' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='19c2251e' name='tunnel_id' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='19c2251e' name='peer_tunnel_id' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='88850643' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> + <parameter type-id='383758d6' name='tunnelp' filepath='net/l2tp/l2tp_core.c' line='1406' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='l2tp_session_set_header_len' mangled-name='l2tp_session_set_header_len' filepath='net/l2tp/l2tp_core.c' line='1639' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_set_header_len'> - <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1639' column='1'/> - <parameter type-id='95e97e5e' name='version' filepath='net/l2tp/l2tp_core.c' line='1639' column='1'/> + <function-decl name='l2tp_session_set_header_len' mangled-name='l2tp_session_set_header_len' filepath='net/l2tp/l2tp_core.c' line='1631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_set_header_len'> + <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1631' column='1'/> + <parameter type-id='95e97e5e' name='version' filepath='net/l2tp/l2tp_core.c' line='1631' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='l2tp_session_register' mangled-name='l2tp_session_register' filepath='net/l2tp/l2tp_core.c' line='296' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_register'> @@ -164553,16 +164423,16 @@ <parameter type-id='95e97e5e' name='nth' filepath='net/l2tp/l2tp_core.c' line='245' column='1'/> <return type-id='d35aee0a'/> </function-decl> - <function-decl name='l2tp_session_delete' mangled-name='l2tp_session_delete' filepath='net/l2tp/l2tp_core.c' line='1620' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_delete'> - <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1620' column='1'/> + <function-decl name='l2tp_session_delete' mangled-name='l2tp_session_delete' filepath='net/l2tp/l2tp_core.c' line='1612' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_delete'> + <parameter type-id='d35aee0a' name='session' filepath='net/l2tp/l2tp_core.c' line='1612' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='l2tp_session_create' mangled-name='l2tp_session_create' filepath='net/l2tp/l2tp_core.c' line='1655' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_create'> - <parameter type-id='95e97e5e' name='priv_size' filepath='net/l2tp/l2tp_core.c' line='1655' column='1'/> - <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1655' column='1'/> - <parameter type-id='19c2251e' name='session_id' filepath='net/l2tp/l2tp_core.c' line='1655' column='1'/> - <parameter type-id='19c2251e' name='peer_session_id' filepath='net/l2tp/l2tp_core.c' line='1655' column='1'/> - <parameter type-id='0357a19d' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1655' column='1'/> + <function-decl name='l2tp_session_create' mangled-name='l2tp_session_create' filepath='net/l2tp/l2tp_core.c' line='1647' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='l2tp_session_create'> + <parameter type-id='95e97e5e' name='priv_size' filepath='net/l2tp/l2tp_core.c' line='1647' column='1'/> + <parameter type-id='2d83a1b8' name='tunnel' filepath='net/l2tp/l2tp_core.c' line='1647' column='1'/> + <parameter type-id='19c2251e' name='session_id' filepath='net/l2tp/l2tp_core.c' line='1647' column='1'/> + <parameter type-id='19c2251e' name='peer_session_id' filepath='net/l2tp/l2tp_core.c' line='1647' column='1'/> + <parameter type-id='0357a19d' name='cfg' filepath='net/l2tp/l2tp_core.c' line='1647' column='1'/> <return type-id='d35aee0a'/> </function-decl> <function-type size-in-bits='64' id='368f1cf0'> @@ -166716,8 +166586,8 @@ <parameter type-id='80f4b756' name='requested_name' filepath='net/mac80211/main.c' line='509' column='1'/> <return type-id='1905517d'/> </function-decl> - <function-decl name='ieee80211_unregister_hw' mangled-name='ieee80211_unregister_hw' filepath='net/mac80211/main.c' line='1327' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_unregister_hw'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/main.c' line='1327' column='1'/> + <function-decl name='ieee80211_unregister_hw' mangled-name='ieee80211_unregister_hw' filepath='net/mac80211/main.c' line='1325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_unregister_hw'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/main.c' line='1325' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='ieee80211_restart_hw' mangled-name='ieee80211_restart_hw' filepath='net/mac80211/main.c' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_restart_hw'> @@ -166728,8 +166598,8 @@ <parameter type-id='1905517d' name='hw' filepath='net/mac80211/main.c' line='862' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ieee80211_free_hw' mangled-name='ieee80211_free_hw' filepath='net/mac80211/main.c' line='1383' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_free_hw'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/main.c' line='1383' column='1'/> + <function-decl name='ieee80211_free_hw' mangled-name='ieee80211_free_hw' filepath='net/mac80211/main.c' line='1381' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_free_hw'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/main.c' line='1381' column='1'/> <return type-id='48b5725f'/> </function-decl> <pointer-type-def type-id='e07d69c8' size-in-bits='64' id='0953fbfe'/> @@ -167901,38 +167771,38 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='net/mac80211/scan.c' language='LANG_C89'> - <function-decl name='ieee80211_sched_scan_stopped' mangled-name='ieee80211_sched_scan_stopped' filepath='net/mac80211/scan.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sched_scan_stopped'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='1404' column='1'/> + <function-decl name='ieee80211_sched_scan_stopped' mangled-name='ieee80211_sched_scan_stopped' filepath='net/mac80211/scan.c' line='1401' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sched_scan_stopped'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='1401' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ieee80211_sched_scan_results' mangled-name='ieee80211_sched_scan_results' filepath='net/mac80211/scan.c' line='1366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sched_scan_results'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='1366' column='1'/> + <function-decl name='ieee80211_sched_scan_results' mangled-name='ieee80211_sched_scan_results' filepath='net/mac80211/scan.c' line='1363' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sched_scan_results'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='1363' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ieee80211_scan_completed' mangled-name='ieee80211_scan_completed' filepath='net/mac80211/scan.c' line='480' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_scan_completed'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='480' column='1'/> - <parameter type-id='40cd17b4' name='info' filepath='net/mac80211/scan.c' line='481' column='1'/> + <function-decl name='ieee80211_scan_completed' mangled-name='ieee80211_scan_completed' filepath='net/mac80211/scan.c' line='477' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_scan_completed'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/scan.c' line='477' column='1'/> + <parameter type-id='40cd17b4' name='info' filepath='net/mac80211/scan.c' line='478' column='1'/> <return type-id='48b5725f'/> </function-decl> <pointer-type-def type-id='b1493ece' size-in-bits='64' id='40cd17b4'/> </abi-instr> <abi-instr address-size='64' path='net/mac80211/sta_info.c' language='LANG_C89'> - <function-decl name='ieee80211_sta_register_airtime' mangled-name='ieee80211_sta_register_airtime' filepath='net/mac80211/sta_info.c' line='1893' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sta_register_airtime'> - <parameter type-id='f27bb1b0' name='pubsta' filepath='net/mac80211/sta_info.c' line='1893' column='1'/> - <parameter type-id='f9b06939' name='tid' filepath='net/mac80211/sta_info.c' line='1893' column='1'/> - <parameter type-id='19c2251e' name='tx_airtime' filepath='net/mac80211/sta_info.c' line='1894' column='1'/> - <parameter type-id='19c2251e' name='rx_airtime' filepath='net/mac80211/sta_info.c' line='1894' column='1'/> + <function-decl name='ieee80211_sta_register_airtime' mangled-name='ieee80211_sta_register_airtime' filepath='net/mac80211/sta_info.c' line='1892' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_sta_register_airtime'> + <parameter type-id='f27bb1b0' name='pubsta' filepath='net/mac80211/sta_info.c' line='1892' column='1'/> + <parameter type-id='f9b06939' name='tid' filepath='net/mac80211/sta_info.c' line='1892' column='1'/> + <parameter type-id='19c2251e' name='tx_airtime' filepath='net/mac80211/sta_info.c' line='1893' column='1'/> + <parameter type-id='19c2251e' name='rx_airtime' filepath='net/mac80211/sta_info.c' line='1893' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='ieee80211_find_sta_by_ifaddr' mangled-name='ieee80211_find_sta_by_ifaddr' filepath='net/mac80211/sta_info.c' line='1243' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_find_sta_by_ifaddr'> - <parameter type-id='1905517d' name='hw' filepath='net/mac80211/sta_info.c' line='1243' column='1'/> - <parameter type-id='bbaf3419' name='addr' filepath='net/mac80211/sta_info.c' line='1244' column='1'/> - <parameter type-id='bbaf3419' name='localaddr' filepath='net/mac80211/sta_info.c' line='1245' column='1'/> + <function-decl name='ieee80211_find_sta_by_ifaddr' mangled-name='ieee80211_find_sta_by_ifaddr' filepath='net/mac80211/sta_info.c' line='1242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_find_sta_by_ifaddr'> + <parameter type-id='1905517d' name='hw' filepath='net/mac80211/sta_info.c' line='1242' column='1'/> + <parameter type-id='bbaf3419' name='addr' filepath='net/mac80211/sta_info.c' line='1243' column='1'/> + <parameter type-id='bbaf3419' name='localaddr' filepath='net/mac80211/sta_info.c' line='1244' column='1'/> <return type-id='f27bb1b0'/> </function-decl> - <function-decl name='ieee80211_find_sta' mangled-name='ieee80211_find_sta' filepath='net/mac80211/sta_info.c' line='1268' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_find_sta'> - <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/sta_info.c' line='1268' column='1'/> - <parameter type-id='bbaf3419' name='addr' filepath='net/mac80211/sta_info.c' line='1269' column='1'/> + <function-decl name='ieee80211_find_sta' mangled-name='ieee80211_find_sta' filepath='net/mac80211/sta_info.c' line='1267' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ieee80211_find_sta'> + <parameter type-id='3a1577c5' name='vif' filepath='net/mac80211/sta_info.c' line='1267' column='1'/> + <parameter type-id='bbaf3419' name='addr' filepath='net/mac80211/sta_info.c' line='1268' column='1'/> <return type-id='f27bb1b0'/> </function-decl> </abi-instr> @@ -167963,7 +167833,7 @@ <var-decl name='' type-id='8e7917c8' visibility='default' filepath='include/net/mac80211.h' line='1015' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__10' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='include/net/mac80211.h' line='1015' column='1' id='8e7917c8'> + <union-decl name='__anonymous_union__8' size-in-bits='320' is-anonymous='yes' visibility='default' filepath='include/net/mac80211.h' line='1015' column='1' id='8e7917c8'> <data-member access='public'> <var-decl name='control' type-id='e261a812' visibility='default' filepath='include/net/mac80211.h' line='1037' column='1'/> </data-member> @@ -168000,7 +167870,7 @@ <var-decl name='enqueue_time' type-id='989b7c52' visibility='default' filepath='include/net/mac80211.h' line='1036' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__11' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/mac80211.h' line='1017' column='1' id='780d16e3'> + <union-decl name='__anonymous_union__9' size-in-bits='128' is-anonymous='yes' visibility='default' filepath='include/net/mac80211.h' line='1017' column='1' id='780d16e3'> <data-member access='public'> <var-decl name='' type-id='d4e4741c' visibility='default' filepath='include/net/mac80211.h' line='1019' column='1'/> </data-member> @@ -168604,7 +168474,7 @@ <var-decl name='hotdrop' type-id='b50a4934' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='41' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__10' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='31' column='1' id='3db026b2'> + <union-decl name='__anonymous_union__8' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='31' column='1' id='3db026b2'> <data-member access='public'> <var-decl name='match' type-id='1ecd1044' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='32' column='1'/> </data-member> @@ -168702,7 +168572,7 @@ <var-decl name='family' type-id='892641a4' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='111' column='1'/> </data-member> </class-decl> - <union-decl name='__anonymous_union__11' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='35' column='1' id='71be3d11'> + <union-decl name='__anonymous_union__9' size-in-bits='64' is-anonymous='yes' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='35' column='1' id='71be3d11'> <data-member access='public'> <var-decl name='matchinfo' type-id='eaa32e2f' visibility='default' filepath='include/linux/netfilter/x_tables.h' line='36' column='1'/> </data-member> @@ -168894,69 +168764,69 @@ <pointer-type-def type-id='f7a1d399' size-in-bits='64' id='8438f281'/> <pointer-type-def type-id='64a9bab2' size-in-bits='64' id='bfc146e4'/> <pointer-type-def type-id='5ae55c68' size-in-bits='64' id='493b1d22'/> - <function-decl name='netlink_unicast' mangled-name='netlink_unicast' filepath='net/netlink/af_netlink.c' line='1330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_unicast'> - <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='1330' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='1330' column='1'/> - <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='1331' column='1'/> - <parameter type-id='95e97e5e' name='nonblock' filepath='net/netlink/af_netlink.c' line='1331' column='1'/> + <function-decl name='netlink_unicast' mangled-name='netlink_unicast' filepath='net/netlink/af_netlink.c' line='1321' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_unicast'> + <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='1321' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='1321' column='1'/> + <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='1322' column='1'/> + <parameter type-id='95e97e5e' name='nonblock' filepath='net/netlink/af_netlink.c' line='1322' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netlink_has_listeners' mangled-name='netlink_has_listeners' filepath='net/netlink/af_netlink.c' line='1366' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_has_listeners'> - <parameter type-id='f772df6d' name='sk' filepath='net/netlink/af_netlink.c' line='1366' column='1'/> - <parameter type-id='f0981eeb' name='group' filepath='net/netlink/af_netlink.c' line='1366' column='1'/> + <function-decl name='netlink_has_listeners' mangled-name='netlink_has_listeners' filepath='net/netlink/af_netlink.c' line='1357' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_has_listeners'> + <parameter type-id='f772df6d' name='sk' filepath='net/netlink/af_netlink.c' line='1357' column='1'/> + <parameter type-id='f0981eeb' name='group' filepath='net/netlink/af_netlink.c' line='1357' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__netlink_kernel_create' mangled-name='__netlink_kernel_create' filepath='net/netlink/af_netlink.c' line='2050' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__netlink_kernel_create'> - <parameter type-id='a2bff676' name='net' filepath='net/netlink/af_netlink.c' line='2050' column='1'/> - <parameter type-id='95e97e5e' name='unit' filepath='net/netlink/af_netlink.c' line='2050' column='1'/> - <parameter type-id='2730d015' name='module' filepath='net/netlink/af_netlink.c' line='2050' column='1'/> - <parameter type-id='8438f281' name='cfg' filepath='net/netlink/af_netlink.c' line='2051' column='1'/> + <function-decl name='__netlink_kernel_create' mangled-name='__netlink_kernel_create' filepath='net/netlink/af_netlink.c' line='2040' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__netlink_kernel_create'> + <parameter type-id='a2bff676' name='net' filepath='net/netlink/af_netlink.c' line='2040' column='1'/> + <parameter type-id='95e97e5e' name='unit' filepath='net/netlink/af_netlink.c' line='2040' column='1'/> + <parameter type-id='2730d015' name='module' filepath='net/netlink/af_netlink.c' line='2040' column='1'/> + <parameter type-id='8438f281' name='cfg' filepath='net/netlink/af_netlink.c' line='2041' column='1'/> <return type-id='f772df6d'/> </function-decl> - <function-decl name='netlink_kernel_release' mangled-name='netlink_kernel_release' filepath='net/netlink/af_netlink.c' line='2125' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_kernel_release'> - <parameter type-id='f772df6d' name='sk' filepath='net/netlink/af_netlink.c' line='2125' column='1'/> + <function-decl name='netlink_kernel_release' mangled-name='netlink_kernel_release' filepath='net/netlink/af_netlink.c' line='2115' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_kernel_release'> + <parameter type-id='f772df6d' name='sk' filepath='net/netlink/af_netlink.c' line='2115' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='netlink_capable' mangled-name='netlink_capable' filepath='net/netlink/af_netlink.c' line='896' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_capable'> - <parameter type-id='11f4a000' name='skb' filepath='net/netlink/af_netlink.c' line='896' column='1'/> - <parameter type-id='95e97e5e' name='cap' filepath='net/netlink/af_netlink.c' line='896' column='1'/> + <function-decl name='netlink_capable' mangled-name='netlink_capable' filepath='net/netlink/af_netlink.c' line='894' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_capable'> + <parameter type-id='11f4a000' name='skb' filepath='net/netlink/af_netlink.c' line='894' column='1'/> + <parameter type-id='95e97e5e' name='cap' filepath='net/netlink/af_netlink.c' line='894' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='netlink_net_capable' mangled-name='netlink_net_capable' filepath='net/netlink/af_netlink.c' line='912' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_net_capable'> - <parameter type-id='11f4a000' name='skb' filepath='net/netlink/af_netlink.c' line='912' column='1'/> - <parameter type-id='95e97e5e' name='cap' filepath='net/netlink/af_netlink.c' line='912' column='1'/> + <function-decl name='netlink_net_capable' mangled-name='netlink_net_capable' filepath='net/netlink/af_netlink.c' line='910' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_net_capable'> + <parameter type-id='11f4a000' name='skb' filepath='net/netlink/af_netlink.c' line='910' column='1'/> + <parameter type-id='95e97e5e' name='cap' filepath='net/netlink/af_netlink.c' line='910' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='__netlink_dump_start' mangled-name='__netlink_dump_start' filepath='net/netlink/af_netlink.c' line='2330' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__netlink_dump_start'> - <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='2330' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='2330' column='1'/> - <parameter type-id='390fbe8f' name='nlh' filepath='net/netlink/af_netlink.c' line='2331' column='1'/> - <parameter type-id='6984e365' name='control' filepath='net/netlink/af_netlink.c' line='2332' column='1'/> + <function-decl name='__netlink_dump_start' mangled-name='__netlink_dump_start' filepath='net/netlink/af_netlink.c' line='2320' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__netlink_dump_start'> + <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='2320' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='2320' column='1'/> + <parameter type-id='390fbe8f' name='nlh' filepath='net/netlink/af_netlink.c' line='2321' column='1'/> + <parameter type-id='6984e365' name='control' filepath='net/netlink/af_netlink.c' line='2322' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netlink_unregister_notifier' mangled-name='netlink_unregister_notifier' filepath='net/netlink/af_netlink.c' line='2692' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_unregister_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='net/netlink/af_netlink.c' line='2692' column='1'/> + <function-decl name='netlink_unregister_notifier' mangled-name='netlink_unregister_notifier' filepath='net/netlink/af_netlink.c' line='2682' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_unregister_notifier'> + <parameter type-id='d504f73d' name='nb' filepath='net/netlink/af_netlink.c' line='2682' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netlink_register_notifier' mangled-name='netlink_register_notifier' filepath='net/netlink/af_netlink.c' line='2686' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_register_notifier'> - <parameter type-id='d504f73d' name='nb' filepath='net/netlink/af_netlink.c' line='2686' column='1'/> + <function-decl name='netlink_register_notifier' mangled-name='netlink_register_notifier' filepath='net/netlink/af_netlink.c' line='2676' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_register_notifier'> + <parameter type-id='d504f73d' name='nb' filepath='net/netlink/af_netlink.c' line='2676' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='netlink_broadcast' mangled-name='netlink_broadcast' filepath='net/netlink/af_netlink.c' line='1550' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_broadcast'> - <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='1550' column='1'/> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='1550' column='1'/> - <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='1550' column='1'/> - <parameter type-id='19c2251e' name='group' filepath='net/netlink/af_netlink.c' line='1551' column='1'/> - <parameter type-id='3eb7c31c' name='allocation' filepath='net/netlink/af_netlink.c' line='1551' column='1'/> + <function-decl name='netlink_broadcast' mangled-name='netlink_broadcast' filepath='net/netlink/af_netlink.c' line='1541' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='netlink_broadcast'> + <parameter type-id='f772df6d' name='ssk' filepath='net/netlink/af_netlink.c' line='1541' column='1'/> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='1541' column='1'/> + <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='1541' column='1'/> + <parameter type-id='19c2251e' name='group' filepath='net/netlink/af_netlink.c' line='1542' column='1'/> + <parameter type-id='3eb7c31c' name='allocation' filepath='net/netlink/af_netlink.c' line='1542' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='__nlmsg_put' mangled-name='__nlmsg_put' filepath='net/netlink/af_netlink.c' line='2190' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__nlmsg_put'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> - <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> - <parameter type-id='19c2251e' name='seq' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> - <parameter type-id='95e97e5e' name='type' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> - <parameter type-id='95e97e5e' name='len' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> - <parameter type-id='95e97e5e' name='flags' filepath='net/netlink/af_netlink.c' line='2190' column='1'/> + <function-decl name='__nlmsg_put' mangled-name='__nlmsg_put' filepath='net/netlink/af_netlink.c' line='2180' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='__nlmsg_put'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> + <parameter type-id='19c2251e' name='portid' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> + <parameter type-id='19c2251e' name='seq' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> + <parameter type-id='95e97e5e' name='type' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> + <parameter type-id='95e97e5e' name='len' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> + <parameter type-id='95e97e5e' name='flags' filepath='net/netlink/af_netlink.c' line='2180' column='1'/> <return type-id='c2074578'/> </function-decl> <function-type size-in-bits='64' id='339a9d49'> @@ -169649,29 +169519,29 @@ <parameter type-id='72666d3f' name='func' filepath='net/sched/cls_api.c' line='203' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='tcf_exts_validate' mangled-name='tcf_exts_validate' filepath='net/sched/cls_api.c' line='3013' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_validate'> - <parameter type-id='a2bff676' name='net' filepath='net/sched/cls_api.c' line='3013' column='1'/> - <parameter type-id='6dca061b' name='tp' filepath='net/sched/cls_api.c' line='3013' column='1'/> - <parameter type-id='30864cdc' name='tb' filepath='net/sched/cls_api.c' line='3013' column='1'/> - <parameter type-id='6fcaf91e' name='rate_tlv' filepath='net/sched/cls_api.c' line='3014' column='1'/> - <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3014' column='1'/> - <parameter type-id='b50a4934' name='ovr' filepath='net/sched/cls_api.c' line='3014' column='1'/> - <parameter type-id='b50a4934' name='rtnl_held' filepath='net/sched/cls_api.c' line='3015' column='1'/> - <parameter type-id='5799dc94' name='extack' filepath='net/sched/cls_api.c' line='3015' column='1'/> + <function-decl name='tcf_exts_validate' mangled-name='tcf_exts_validate' filepath='net/sched/cls_api.c' line='3012' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_validate'> + <parameter type-id='a2bff676' name='net' filepath='net/sched/cls_api.c' line='3012' column='1'/> + <parameter type-id='6dca061b' name='tp' filepath='net/sched/cls_api.c' line='3012' column='1'/> + <parameter type-id='30864cdc' name='tb' filepath='net/sched/cls_api.c' line='3012' column='1'/> + <parameter type-id='6fcaf91e' name='rate_tlv' filepath='net/sched/cls_api.c' line='3013' column='1'/> + <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3013' column='1'/> + <parameter type-id='b50a4934' name='ovr' filepath='net/sched/cls_api.c' line='3013' column='1'/> + <parameter type-id='b50a4934' name='rtnl_held' filepath='net/sched/cls_api.c' line='3014' column='1'/> + <parameter type-id='5799dc94' name='extack' filepath='net/sched/cls_api.c' line='3014' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='tcf_exts_dump_stats' mangled-name='tcf_exts_dump_stats' filepath='net/sched/cls_api.c' line='3120' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_dump_stats'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/cls_api.c' line='3120' column='1'/> - <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3120' column='1'/> + <function-decl name='tcf_exts_dump_stats' mangled-name='tcf_exts_dump_stats' filepath='net/sched/cls_api.c' line='3119' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_dump_stats'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/cls_api.c' line='3119' column='1'/> + <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3119' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='tcf_exts_dump' mangled-name='tcf_exts_dump' filepath='net/sched/cls_api.c' line='3079' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_dump'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/cls_api.c' line='3079' column='1'/> - <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3079' column='1'/> + <function-decl name='tcf_exts_dump' mangled-name='tcf_exts_dump' filepath='net/sched/cls_api.c' line='3078' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_dump'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/sched/cls_api.c' line='3078' column='1'/> + <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3078' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='tcf_exts_destroy' mangled-name='tcf_exts_destroy' filepath='net/sched/cls_api.c' line='3001' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_destroy'> - <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3001' column='1'/> + <function-decl name='tcf_exts_destroy' mangled-name='tcf_exts_destroy' filepath='net/sched/cls_api.c' line='3000' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='tcf_exts_destroy'> + <parameter type-id='6c257353' name='exts' filepath='net/sched/cls_api.c' line='3000' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='register_tcf_proto_ops' mangled-name='register_tcf_proto_ops' filepath='net/sched/cls_api.c' line='159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='register_tcf_proto_ops'> @@ -170007,12 +169877,6 @@ </data-member> </class-decl> <typedef-decl name='u_int8_t' type-id='f9b06939' filepath='include/linux/types.h' line='98' column='1' id='892641a4'/> - <enum-decl name='sock_shutdown_cmd' filepath='include/linux/net.h' line='90' column='1' id='45c08bac'> - <underlying-type type-id='9cac1fee'/> - <enumerator name='SHUT_RD' value='0'/> - <enumerator name='SHUT_WR' value='1'/> - <enumerator name='SHUT_RDWR' value='2'/> - </enum-decl> <qualified-type-def type-id='bcc5cab3' const='yes' id='208298e3'/> <pointer-type-def type-id='208298e3' size-in-bits='64' id='f696846b'/> <qualified-type-def type-id='0c842ad9' const='yes' id='afa36b70'/> @@ -170052,11 +169916,6 @@ <parameter type-id='1a7bb5c8' name='res' filepath='net/socket.c' line='1475' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='kernel_sock_shutdown' mangled-name='kernel_sock_shutdown' filepath='net/socket.c' line='3794' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='kernel_sock_shutdown'> - <parameter type-id='13103032' name='sock' filepath='net/socket.c' line='3794' column='1'/> - <parameter type-id='45c08bac' name='how' filepath='net/socket.c' line='3794' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='kernel_sendmsg' mangled-name='kernel_sendmsg' filepath='net/socket.c' line='674' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='kernel_sendmsg'> <parameter type-id='13103032' name='sock' filepath='net/socket.c' line='674' column='1'/> <parameter type-id='6b9b777a' name='msg' filepath='net/socket.c' line='674' column='1'/> @@ -170364,17 +170223,17 @@ <pointer-type-def type-id='f0c6a3fa' size-in-bits='64' id='ecb0ce18'/> <pointer-type-def type-id='5e9a41e1' size-in-bits='64' id='c777e389'/> <pointer-type-def type-id='19810f43' size-in-bits='64' id='6f074813'/> - <function-decl name='vsock_core_unregister' mangled-name='vsock_core_unregister' filepath='net/vmw_vsock/af_vsock.c' line='2205' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsock_core_unregister'> - <parameter type-id='c6c5bd96' name='t' filepath='net/vmw_vsock/af_vsock.c' line='2205' column='1'/> + <function-decl name='vsock_core_unregister' mangled-name='vsock_core_unregister' filepath='net/vmw_vsock/af_vsock.c' line='2197' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsock_core_unregister'> + <parameter type-id='c6c5bd96' name='t' filepath='net/vmw_vsock/af_vsock.c' line='2197' column='1'/> <return type-id='48b5725f'/> </function-decl> <function-decl name='vsock_for_each_connected_socket' mangled-name='vsock_for_each_connected_socket' filepath='net/vmw_vsock/af_vsock.c' line='334' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsock_for_each_connected_socket'> <parameter type-id='841969d0' name='fn' filepath='net/vmw_vsock/af_vsock.c' line='334' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='vsock_core_register' mangled-name='vsock_core_register' filepath='net/vmw_vsock/af_vsock.c' line='2159' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsock_core_register'> - <parameter type-id='c6c5bd96' name='t' filepath='net/vmw_vsock/af_vsock.c' line='2159' column='1'/> - <parameter type-id='95e97e5e' name='features' filepath='net/vmw_vsock/af_vsock.c' line='2159' column='1'/> + <function-decl name='vsock_core_register' mangled-name='vsock_core_register' filepath='net/vmw_vsock/af_vsock.c' line='2151' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='vsock_core_register'> + <parameter type-id='c6c5bd96' name='t' filepath='net/vmw_vsock/af_vsock.c' line='2151' column='1'/> + <parameter type-id='95e97e5e' name='features' filepath='net/vmw_vsock/af_vsock.c' line='2151' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-type size-in-bits='64' id='24e53f78'> @@ -176160,32 +176019,32 @@ <qualified-type-def type-id='a9d5f761' const='yes' id='d5bf2678'/> <pointer-type-def type-id='d5bf2678' size-in-bits='64' id='cde95316'/> <pointer-type-def type-id='5c28f25e' size-in-bits='64' id='c24e05b4'/> - <function-decl name='wiphy_apply_custom_regulatory' mangled-name='wiphy_apply_custom_regulatory' filepath='net/wireless/reg.c' line='2346' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wiphy_apply_custom_regulatory'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='2346' column='1'/> - <parameter type-id='4e819401' name='regd' filepath='net/wireless/reg.c' line='2347' column='1'/> + <function-decl name='wiphy_apply_custom_regulatory' mangled-name='wiphy_apply_custom_regulatory' filepath='net/wireless/reg.c' line='2340' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='wiphy_apply_custom_regulatory'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='2340' column='1'/> + <parameter type-id='4e819401' name='regd' filepath='net/wireless/reg.c' line='2341' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='regulatory_set_wiphy_regd' mangled-name='regulatory_set_wiphy_regd' filepath='net/wireless/reg.c' line='3748' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_set_wiphy_regd'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3748' column='1'/> - <parameter type-id='c24e05b4' name='rd' filepath='net/wireless/reg.c' line='3749' column='1'/> + <function-decl name='regulatory_set_wiphy_regd' mangled-name='regulatory_set_wiphy_regd' filepath='net/wireless/reg.c' line='3742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_set_wiphy_regd'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3742' column='1'/> + <parameter type-id='c24e05b4' name='rd' filepath='net/wireless/reg.c' line='3743' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='regulatory_pre_cac_allowed' mangled-name='regulatory_pre_cac_allowed' filepath='net/wireless/reg.c' line='3878' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_pre_cac_allowed'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3878' column='1'/> + <function-decl name='regulatory_pre_cac_allowed' mangled-name='regulatory_pre_cac_allowed' filepath='net/wireless/reg.c' line='3872' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_pre_cac_allowed'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3872' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='regulatory_hint' mangled-name='regulatory_hint' filepath='net/wireless/reg.c' line='3017' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_hint'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3017' column='1'/> - <parameter type-id='80f4b756' name='alpha2' filepath='net/wireless/reg.c' line='3017' column='1'/> + <function-decl name='regulatory_hint' mangled-name='regulatory_hint' filepath='net/wireless/reg.c' line='3011' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='regulatory_hint'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='3011' column='1'/> + <parameter type-id='80f4b756' name='alpha2' filepath='net/wireless/reg.c' line='3011' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='reg_initiator_name' mangled-name='reg_initiator_name' filepath='net/wireless/reg.c' line='1642' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='reg_initiator_name'> - <parameter type-id='790cc131' name='initiator' filepath='net/wireless/reg.c' line='1642' column='1'/> + <function-decl name='reg_initiator_name' mangled-name='reg_initiator_name' filepath='net/wireless/reg.c' line='1636' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='reg_initiator_name'> + <parameter type-id='790cc131' name='initiator' filepath='net/wireless/reg.c' line='1636' column='1'/> <return type-id='80f4b756'/> </function-decl> - <function-decl name='freq_reg_info' mangled-name='freq_reg_info' filepath='net/wireless/reg.c' line='1635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freq_reg_info'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='1635' column='1'/> - <parameter type-id='19c2251e' name='center_freq' filepath='net/wireless/reg.c' line='1636' column='1'/> + <function-decl name='freq_reg_info' mangled-name='freq_reg_info' filepath='net/wireless/reg.c' line='1629' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='freq_reg_info'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/reg.c' line='1629' column='1'/> + <parameter type-id='19c2251e' name='center_freq' filepath='net/wireless/reg.c' line='1630' column='1'/> <return type-id='cde95316'/> </function-decl> </abi-instr> @@ -176661,48 +176520,48 @@ <pointer-type-def type-id='616d6efe' size-in-bits='64' id='6ff43814'/> <pointer-type-def type-id='b1493ece' size-in-bits='64' id='40cd17b4'/> <pointer-type-def type-id='1aa7b3b9' size-in-bits='64' id='57a568d1'/> - <function-decl name='cfg80211_sched_scan_stopped_rtnl' mangled-name='cfg80211_sched_scan_stopped_rtnl' filepath='net/wireless/scan.c' line='654' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_stopped_rtnl'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='654' column='1'/> - <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='654' column='1'/> + <function-decl name='cfg80211_sched_scan_stopped_rtnl' mangled-name='cfg80211_sched_scan_stopped_rtnl' filepath='net/wireless/scan.c' line='653' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_stopped_rtnl'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='653' column='1'/> + <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='653' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_put_bss' mangled-name='cfg80211_put_bss' filepath='net/wireless/scan.c' line='1975' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_put_bss'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1975' column='1'/> - <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1975' column='1'/> + <function-decl name='cfg80211_put_bss' mangled-name='cfg80211_put_bss' filepath='net/wireless/scan.c' line='1972' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_put_bss'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1972' column='1'/> + <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1972' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_unlink_bss' mangled-name='cfg80211_unlink_bss' filepath='net/wireless/scan.c' line='1991' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_unlink_bss'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1991' column='1'/> - <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1991' column='1'/> + <function-decl name='cfg80211_unlink_bss' mangled-name='cfg80211_unlink_bss' filepath='net/wireless/scan.c' line='1988' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_unlink_bss'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1988' column='1'/> + <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1988' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_sched_scan_stopped' mangled-name='cfg80211_sched_scan_stopped' filepath='net/wireless/scan.c' line='666' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_stopped'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='666' column='1'/> - <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='666' column='1'/> + <function-decl name='cfg80211_sched_scan_stopped' mangled-name='cfg80211_sched_scan_stopped' filepath='net/wireless/scan.c' line='665' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_stopped'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='665' column='1'/> + <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='665' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_sched_scan_results' mangled-name='cfg80211_sched_scan_results' filepath='net/wireless/scan.c' line='636' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_results'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='636' column='1'/> - <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='636' column='1'/> + <function-decl name='cfg80211_sched_scan_results' mangled-name='cfg80211_sched_scan_results' filepath='net/wireless/scan.c' line='635' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_sched_scan_results'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='635' column='1'/> + <parameter type-id='91ce1af9' name='reqid' filepath='net/wireless/scan.c' line='635' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_scan_done' mangled-name='cfg80211_scan_done' filepath='net/wireless/scan.c' line='534' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_scan_done'> - <parameter type-id='a9e8b173' name='request' filepath='net/wireless/scan.c' line='534' column='1'/> - <parameter type-id='40cd17b4' name='info' filepath='net/wireless/scan.c' line='535' column='1'/> + <function-decl name='cfg80211_scan_done' mangled-name='cfg80211_scan_done' filepath='net/wireless/scan.c' line='533' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_scan_done'> + <parameter type-id='a9e8b173' name='request' filepath='net/wireless/scan.c' line='533' column='1'/> + <parameter type-id='40cd17b4' name='info' filepath='net/wireless/scan.c' line='534' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_ref_bss' mangled-name='cfg80211_ref_bss' filepath='net/wireless/scan.c' line='1959' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ref_bss'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1959' column='1'/> - <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1959' column='1'/> + <function-decl name='cfg80211_ref_bss' mangled-name='cfg80211_ref_bss' filepath='net/wireless/scan.c' line='1956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_ref_bss'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1956' column='1'/> + <parameter type-id='bda81d86' name='pub' filepath='net/wireless/scan.c' line='1956' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_merge_profile' mangled-name='cfg80211_merge_profile' filepath='net/wireless/scan.c' line='1539' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_merge_profile'> - <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/scan.c' line='1539' column='1'/> - <parameter type-id='b59d7dce' name='ielen' filepath='net/wireless/scan.c' line='1539' column='1'/> - <parameter type-id='aa7ca86a' name='mbssid_elem' filepath='net/wireless/scan.c' line='1540' column='1'/> - <parameter type-id='aa7ca86a' name='sub_elem' filepath='net/wireless/scan.c' line='1541' column='1'/> - <parameter type-id='8bff8096' name='merged_ie' filepath='net/wireless/scan.c' line='1542' column='1'/> - <parameter type-id='b59d7dce' name='max_copy_len' filepath='net/wireless/scan.c' line='1542' column='1'/> + <function-decl name='cfg80211_merge_profile' mangled-name='cfg80211_merge_profile' filepath='net/wireless/scan.c' line='1536' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_merge_profile'> + <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/scan.c' line='1536' column='1'/> + <parameter type-id='b59d7dce' name='ielen' filepath='net/wireless/scan.c' line='1536' column='1'/> + <parameter type-id='aa7ca86a' name='mbssid_elem' filepath='net/wireless/scan.c' line='1537' column='1'/> + <parameter type-id='aa7ca86a' name='sub_elem' filepath='net/wireless/scan.c' line='1538' column='1'/> + <parameter type-id='8bff8096' name='merged_ie' filepath='net/wireless/scan.c' line='1539' column='1'/> + <parameter type-id='b59d7dce' name='max_copy_len' filepath='net/wireless/scan.c' line='1539' column='1'/> <return type-id='b59d7dce'/> </function-decl> <function-decl name='cfg80211_is_element_inherited' mangled-name='cfg80211_is_element_inherited' filepath='net/wireless/scan.c' line='176' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_is_element_inherited'> @@ -176710,51 +176569,51 @@ <parameter type-id='aa7ca86a' name='non_inherit_elem' filepath='net/wireless/scan.c' line='177' column='1'/> <return type-id='b50a4934'/> </function-decl> - <function-decl name='cfg80211_inform_bss_frame_data' mangled-name='cfg80211_inform_bss_frame_data' filepath='net/wireless/scan.c' line='1909' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_inform_bss_frame_data'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1909' column='1'/> - <parameter type-id='6ff43814' name='data' filepath='net/wireless/scan.c' line='1910' column='1'/> - <parameter type-id='57a568d1' name='mgmt' filepath='net/wireless/scan.c' line='1911' column='1'/> - <parameter type-id='b59d7dce' name='len' filepath='net/wireless/scan.c' line='1911' column='1'/> - <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/scan.c' line='1912' column='1'/> + <function-decl name='cfg80211_inform_bss_frame_data' mangled-name='cfg80211_inform_bss_frame_data' filepath='net/wireless/scan.c' line='1906' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_inform_bss_frame_data'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1906' column='1'/> + <parameter type-id='6ff43814' name='data' filepath='net/wireless/scan.c' line='1907' column='1'/> + <parameter type-id='57a568d1' name='mgmt' filepath='net/wireless/scan.c' line='1908' column='1'/> + <parameter type-id='b59d7dce' name='len' filepath='net/wireless/scan.c' line='1908' column='1'/> + <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/scan.c' line='1909' column='1'/> <return type-id='bda81d86'/> </function-decl> - <function-decl name='cfg80211_inform_bss_data' mangled-name='cfg80211_inform_bss_data' filepath='net/wireless/scan.c' line='1688' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_inform_bss_data'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1688' column='1'/> - <parameter type-id='6ff43814' name='data' filepath='net/wireless/scan.c' line='1689' column='1'/> - <parameter type-id='b556f108' name='ftype' filepath='net/wireless/scan.c' line='1690' column='1'/> - <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/scan.c' line='1691' column='1'/> - <parameter type-id='91ce1af9' name='tsf' filepath='net/wireless/scan.c' line='1691' column='1'/> - <parameter type-id='1dc6a898' name='capability' filepath='net/wireless/scan.c' line='1691' column='1'/> - <parameter type-id='1dc6a898' name='beacon_interval' filepath='net/wireless/scan.c' line='1692' column='1'/> - <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/scan.c' line='1692' column='1'/> - <parameter type-id='b59d7dce' name='ielen' filepath='net/wireless/scan.c' line='1692' column='1'/> - <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/scan.c' line='1693' column='1'/> + <function-decl name='cfg80211_inform_bss_data' mangled-name='cfg80211_inform_bss_data' filepath='net/wireless/scan.c' line='1685' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_inform_bss_data'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='1685' column='1'/> + <parameter type-id='6ff43814' name='data' filepath='net/wireless/scan.c' line='1686' column='1'/> + <parameter type-id='b556f108' name='ftype' filepath='net/wireless/scan.c' line='1687' column='1'/> + <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/scan.c' line='1688' column='1'/> + <parameter type-id='91ce1af9' name='tsf' filepath='net/wireless/scan.c' line='1688' column='1'/> + <parameter type-id='1dc6a898' name='capability' filepath='net/wireless/scan.c' line='1688' column='1'/> + <parameter type-id='1dc6a898' name='beacon_interval' filepath='net/wireless/scan.c' line='1689' column='1'/> + <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/scan.c' line='1689' column='1'/> + <parameter type-id='b59d7dce' name='ielen' filepath='net/wireless/scan.c' line='1689' column='1'/> + <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/scan.c' line='1690' column='1'/> <return type-id='bda81d86'/> </function-decl> - <function-decl name='cfg80211_get_bss' mangled-name='cfg80211_get_bss' filepath='net/wireless/scan.c' line='922' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_get_bss'> - <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='922' column='1'/> - <parameter type-id='ec00acfb' name='channel' filepath='net/wireless/scan.c' line='923' column='1'/> - <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/scan.c' line='924' column='1'/> - <parameter type-id='bbaf3419' name='ssid' filepath='net/wireless/scan.c' line='925' column='1'/> - <parameter type-id='b59d7dce' name='ssid_len' filepath='net/wireless/scan.c' line='925' column='1'/> - <parameter type-id='cb952348' name='bss_type' filepath='net/wireless/scan.c' line='926' column='1'/> - <parameter type-id='d2b455cb' name='privacy' filepath='net/wireless/scan.c' line='927' column='1'/> + <function-decl name='cfg80211_get_bss' mangled-name='cfg80211_get_bss' filepath='net/wireless/scan.c' line='921' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_get_bss'> + <parameter type-id='666fb412' name='wiphy' filepath='net/wireless/scan.c' line='921' column='1'/> + <parameter type-id='ec00acfb' name='channel' filepath='net/wireless/scan.c' line='922' column='1'/> + <parameter type-id='bbaf3419' name='bssid' filepath='net/wireless/scan.c' line='923' column='1'/> + <parameter type-id='bbaf3419' name='ssid' filepath='net/wireless/scan.c' line='924' column='1'/> + <parameter type-id='b59d7dce' name='ssid_len' filepath='net/wireless/scan.c' line='924' column='1'/> + <parameter type-id='cb952348' name='bss_type' filepath='net/wireless/scan.c' line='925' column='1'/> + <parameter type-id='d2b455cb' name='privacy' filepath='net/wireless/scan.c' line='926' column='1'/> <return type-id='bda81d86'/> </function-decl> - <function-decl name='cfg80211_find_vendor_elem' mangled-name='cfg80211_find_vendor_elem' filepath='net/wireless/scan.c' line='742' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_find_vendor_elem'> - <parameter type-id='f0981eeb' name='oui' filepath='net/wireless/scan.c' line='742' column='1'/> - <parameter type-id='95e97e5e' name='oui_type' filepath='net/wireless/scan.c' line='742' column='1'/> - <parameter type-id='bbaf3419' name='ies' filepath='net/wireless/scan.c' line='743' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/wireless/scan.c' line='744' column='1'/> + <function-decl name='cfg80211_find_vendor_elem' mangled-name='cfg80211_find_vendor_elem' filepath='net/wireless/scan.c' line='741' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_find_vendor_elem'> + <parameter type-id='f0981eeb' name='oui' filepath='net/wireless/scan.c' line='741' column='1'/> + <parameter type-id='95e97e5e' name='oui_type' filepath='net/wireless/scan.c' line='741' column='1'/> + <parameter type-id='bbaf3419' name='ies' filepath='net/wireless/scan.c' line='742' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/wireless/scan.c' line='743' column='1'/> <return type-id='aa7ca86a'/> </function-decl> - <function-decl name='cfg80211_find_elem_match' mangled-name='cfg80211_find_elem_match' filepath='net/wireless/scan.c' line='726' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_find_elem_match'> - <parameter type-id='f9b06939' name='eid' filepath='net/wireless/scan.c' line='726' column='1'/> - <parameter type-id='bbaf3419' name='ies' filepath='net/wireless/scan.c' line='726' column='1'/> - <parameter type-id='f0981eeb' name='len' filepath='net/wireless/scan.c' line='726' column='1'/> - <parameter type-id='bbaf3419' name='match' filepath='net/wireless/scan.c' line='727' column='1'/> - <parameter type-id='f0981eeb' name='match_len' filepath='net/wireless/scan.c' line='727' column='1'/> - <parameter type-id='f0981eeb' name='match_offset' filepath='net/wireless/scan.c' line='728' column='1'/> + <function-decl name='cfg80211_find_elem_match' mangled-name='cfg80211_find_elem_match' filepath='net/wireless/scan.c' line='725' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_find_elem_match'> + <parameter type-id='f9b06939' name='eid' filepath='net/wireless/scan.c' line='725' column='1'/> + <parameter type-id='bbaf3419' name='ies' filepath='net/wireless/scan.c' line='725' column='1'/> + <parameter type-id='f0981eeb' name='len' filepath='net/wireless/scan.c' line='725' column='1'/> + <parameter type-id='bbaf3419' name='match' filepath='net/wireless/scan.c' line='726' column='1'/> + <parameter type-id='f0981eeb' name='match_len' filepath='net/wireless/scan.c' line='726' column='1'/> + <parameter type-id='f0981eeb' name='match_offset' filepath='net/wireless/scan.c' line='727' column='1'/> <return type-id='aa7ca86a'/> </function-decl> <pointer-type-def type-id='e8ce2004' size-in-bits='64' id='aa7ca86a'/> @@ -176874,25 +176733,25 @@ </enum-decl> <pointer-type-def type-id='77e8064c' size-in-bits='64' id='b1d9990a'/> <pointer-type-def type-id='883d1dc6' size-in-bits='64' id='e88825dc'/> - <function-decl name='cfg80211_roamed' mangled-name='cfg80211_roamed' filepath='net/wireless/sme.c' line='968' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_roamed'> - <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='968' column='1'/> - <parameter type-id='e88825dc' name='info' filepath='net/wireless/sme.c' line='968' column='1'/> - <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='969' column='1'/> + <function-decl name='cfg80211_roamed' mangled-name='cfg80211_roamed' filepath='net/wireless/sme.c' line='956' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_roamed'> + <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='956' column='1'/> + <parameter type-id='e88825dc' name='info' filepath='net/wireless/sme.c' line='956' column='1'/> + <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='957' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_disconnected' mangled-name='cfg80211_disconnected' filepath='net/wireless/sme.c' line='1142' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_disconnected'> - <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='1142' column='1'/> - <parameter type-id='1dc6a898' name='reason' filepath='net/wireless/sme.c' line='1142' column='1'/> - <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/sme.c' line='1143' column='1'/> - <parameter type-id='b59d7dce' name='ie_len' filepath='net/wireless/sme.c' line='1143' column='1'/> - <parameter type-id='b50a4934' name='locally_generated' filepath='net/wireless/sme.c' line='1144' column='1'/> - <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='1144' column='1'/> + <function-decl name='cfg80211_disconnected' mangled-name='cfg80211_disconnected' filepath='net/wireless/sme.c' line='1130' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_disconnected'> + <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='1130' column='1'/> + <parameter type-id='1dc6a898' name='reason' filepath='net/wireless/sme.c' line='1130' column='1'/> + <parameter type-id='bbaf3419' name='ie' filepath='net/wireless/sme.c' line='1131' column='1'/> + <parameter type-id='b59d7dce' name='ie_len' filepath='net/wireless/sme.c' line='1131' column='1'/> + <parameter type-id='b50a4934' name='locally_generated' filepath='net/wireless/sme.c' line='1132' column='1'/> + <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='1132' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='cfg80211_connect_done' mangled-name='cfg80211_connect_done' filepath='net/wireless/sme.c' line='800' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_connect_done'> - <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='800' column='1'/> - <parameter type-id='b1d9990a' name='params' filepath='net/wireless/sme.c' line='801' column='1'/> - <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='802' column='1'/> + <function-decl name='cfg80211_connect_done' mangled-name='cfg80211_connect_done' filepath='net/wireless/sme.c' line='788' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='cfg80211_connect_done'> + <parameter type-id='68a2d05b' name='dev' filepath='net/wireless/sme.c' line='788' column='1'/> + <parameter type-id='b1d9990a' name='params' filepath='net/wireless/sme.c' line='789' column='1'/> + <parameter type-id='3eb7c31c' name='gfp' filepath='net/wireless/sme.c' line='790' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -177177,16 +177036,16 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='net/xfrm/xfrm_input.c' language='LANG_C89'> - <function-decl name='xfrm_input' mangled-name='xfrm_input' filepath='net/xfrm/xfrm_input.c' line='454' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_input'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/xfrm/xfrm_input.c' line='454' column='1'/> - <parameter type-id='95e97e5e' name='nexthdr' filepath='net/xfrm/xfrm_input.c' line='454' column='1'/> - <parameter type-id='78a133c2' name='spi' filepath='net/xfrm/xfrm_input.c' line='454' column='1'/> - <parameter type-id='95e97e5e' name='encap_type' filepath='net/xfrm/xfrm_input.c' line='454' column='1'/> + <function-decl name='xfrm_input' mangled-name='xfrm_input' filepath='net/xfrm/xfrm_input.c' line='455' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_input'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/xfrm/xfrm_input.c' line='455' column='1'/> + <parameter type-id='95e97e5e' name='nexthdr' filepath='net/xfrm/xfrm_input.c' line='455' column='1'/> + <parameter type-id='78a133c2' name='spi' filepath='net/xfrm/xfrm_input.c' line='455' column='1'/> + <parameter type-id='95e97e5e' name='encap_type' filepath='net/xfrm/xfrm_input.c' line='455' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='xfrm_input_resume' mangled-name='xfrm_input_resume' filepath='net/xfrm/xfrm_input.c' line='752' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_input_resume'> - <parameter type-id='0fbf3cfd' name='skb' filepath='net/xfrm/xfrm_input.c' line='752' column='1'/> - <parameter type-id='95e97e5e' name='nexthdr' filepath='net/xfrm/xfrm_input.c' line='752' column='1'/> + <function-decl name='xfrm_input_resume' mangled-name='xfrm_input_resume' filepath='net/xfrm/xfrm_input.c' line='753' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_input_resume'> + <parameter type-id='0fbf3cfd' name='skb' filepath='net/xfrm/xfrm_input.c' line='753' column='1'/> + <parameter type-id='95e97e5e' name='nexthdr' filepath='net/xfrm/xfrm_input.c' line='753' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -177201,12 +177060,12 @@ <parameter type-id='0fbf3cfd' name='skb' filepath='net/xfrm/xfrm_ipcomp.c' line='106' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ipcomp_init_state' mangled-name='ipcomp_init_state' filepath='net/xfrm/xfrm_ipcomp.c' line='338' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipcomp_init_state'> - <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_ipcomp.c' line='338' column='1'/> + <function-decl name='ipcomp_init_state' mangled-name='ipcomp_init_state' filepath='net/xfrm/xfrm_ipcomp.c' line='337' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipcomp_init_state'> + <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_ipcomp.c' line='337' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='ipcomp_destroy' mangled-name='ipcomp_destroy' filepath='net/xfrm/xfrm_ipcomp.c' line='325' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipcomp_destroy'> - <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_ipcomp.c' line='325' column='1'/> + <function-decl name='ipcomp_destroy' mangled-name='ipcomp_destroy' filepath='net/xfrm/xfrm_ipcomp.c' line='324' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='ipcomp_destroy'> + <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_ipcomp.c' line='324' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -177317,8 +177176,8 @@ <parameter type-id='a2bff676' name='net' filepath='net/xfrm/xfrm_state.c' line='610' column='1'/> <return type-id='328dda6e'/> </function-decl> - <function-decl name='xfrm_init_state' mangled-name='xfrm_init_state' filepath='net/xfrm/xfrm_state.c' line='2631' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_init_state'> - <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_state.c' line='2631' column='1'/> + <function-decl name='xfrm_init_state' mangled-name='xfrm_init_state' filepath='net/xfrm/xfrm_state.c' line='2634' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='xfrm_init_state'> + <parameter type-id='328dda6e' name='x' filepath='net/xfrm/xfrm_state.c' line='2634' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -177388,11 +177247,11 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='security/keys/request_key.c' language='LANG_C89'> - <function-decl name='request_key_tag' mangled-name='request_key_tag' filepath='security/keys/request_key.c' line='693' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='request_key_tag'> - <parameter type-id='d0a699d1' name='type' filepath='security/keys/request_key.c' line='693' column='1'/> - <parameter type-id='80f4b756' name='description' filepath='security/keys/request_key.c' line='694' column='1'/> - <parameter type-id='fce14c5f' name='domain_tag' filepath='security/keys/request_key.c' line='695' column='1'/> - <parameter type-id='80f4b756' name='callout_info' filepath='security/keys/request_key.c' line='696' column='1'/> + <function-decl name='request_key_tag' mangled-name='request_key_tag' filepath='security/keys/request_key.c' line='690' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='request_key_tag'> + <parameter type-id='d0a699d1' name='type' filepath='security/keys/request_key.c' line='690' column='1'/> + <parameter type-id='80f4b756' name='description' filepath='security/keys/request_key.c' line='691' column='1'/> + <parameter type-id='fce14c5f' name='domain_tag' filepath='security/keys/request_key.c' line='692' column='1'/> + <parameter type-id='80f4b756' name='callout_info' filepath='security/keys/request_key.c' line='693' column='1'/> <return type-id='204a4632'/> </function-decl> </abi-instr> @@ -177596,14 +177455,14 @@ </class-decl> <pointer-type-def type-id='2117397c' size-in-bits='64' id='b1fd62ba'/> <pointer-type-def type-id='ee14fd94' size-in-bits='64' id='13103032'/> - <function-decl name='security_sock_graft' mangled-name='security_sock_graft' filepath='security/security.c' line='2117' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sock_graft'> - <parameter type-id='f772df6d' name='sk' filepath='security/security.c' line='2117' column='1'/> - <parameter type-id='13103032' name='parent' filepath='security/security.c' line='2117' column='1'/> + <function-decl name='security_sock_graft' mangled-name='security_sock_graft' filepath='security/security.c' line='2116' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sock_graft'> + <parameter type-id='f772df6d' name='sk' filepath='security/security.c' line='2116' column='1'/> + <parameter type-id='13103032' name='parent' filepath='security/security.c' line='2116' column='1'/> <return type-id='48b5725f'/> </function-decl> - <function-decl name='security_sk_classify_flow' mangled-name='security_sk_classify_flow' filepath='security/security.c' line='2105' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sk_classify_flow'> - <parameter type-id='f772df6d' name='sk' filepath='security/security.c' line='2105' column='1'/> - <parameter type-id='b1fd62ba' name='fl' filepath='security/security.c' line='2105' column='1'/> + <function-decl name='security_sk_classify_flow' mangled-name='security_sk_classify_flow' filepath='security/security.c' line='2104' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='security_sk_classify_flow'> + <parameter type-id='f772df6d' name='sk' filepath='security/security.c' line='2104' column='1'/> + <parameter type-id='b1fd62ba' name='fl' filepath='security/security.c' line='2104' column='1'/> <return type-id='48b5725f'/> </function-decl> </abi-instr> @@ -179565,9 +179424,9 @@ </class-decl> <qualified-type-def type-id='8288ae2e' const='yes' id='720a6415'/> <pointer-type-def type-id='720a6415' size-in-bits='64' id='c55bcf2d'/> - <function-decl name='snd_pci_quirk_lookup' mangled-name='snd_pci_quirk_lookup' filepath='sound/core/misc.c' line='139' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_pci_quirk_lookup'> - <parameter type-id='85196e3f' name='pci' filepath='sound/core/misc.c' line='139' column='1'/> - <parameter type-id='c55bcf2d' name='list' filepath='sound/core/misc.c' line='139' column='1'/> + <function-decl name='snd_pci_quirk_lookup' mangled-name='snd_pci_quirk_lookup' filepath='sound/core/misc.c' line='138' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_pci_quirk_lookup'> + <parameter type-id='85196e3f' name='pci' filepath='sound/core/misc.c' line='138' column='1'/> + <parameter type-id='c55bcf2d' name='list' filepath='sound/core/misc.c' line='138' column='1'/> <return type-id='c55bcf2d'/> </function-decl> </abi-instr> @@ -180463,36 +180322,36 @@ <parameter type-id='4f22192a' name='slave_config' filepath='sound/core/pcm_dmaengine.c' line='54' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_trigger' mangled-name='snd_dmaengine_pcm_trigger' filepath='sound/core/pcm_dmaengine.c' line='184' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_trigger'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='184' column='1'/> - <parameter type-id='95e97e5e' name='cmd' filepath='sound/core/pcm_dmaengine.c' line='184' column='1'/> + <function-decl name='snd_dmaengine_pcm_trigger' mangled-name='snd_dmaengine_pcm_trigger' filepath='sound/core/pcm_dmaengine.c' line='182' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_trigger'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='182' column='1'/> + <parameter type-id='95e97e5e' name='cmd' filepath='sound/core/pcm_dmaengine.c' line='182' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_pointer_no_residue' mangled-name='snd_dmaengine_pcm_pointer_no_residue' filepath='sound/core/pcm_dmaengine.c' line='228' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_pointer_no_residue'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='228' column='1'/> + <function-decl name='snd_dmaengine_pcm_pointer_no_residue' mangled-name='snd_dmaengine_pcm_pointer_no_residue' filepath='sound/core/pcm_dmaengine.c' line='226' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_pointer_no_residue'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='226' column='1'/> <return type-id='df412e35'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_pointer' mangled-name='snd_dmaengine_pcm_pointer' filepath='sound/core/pcm_dmaengine.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_pointer'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='242' column='1'/> + <function-decl name='snd_dmaengine_pcm_pointer' mangled-name='snd_dmaengine_pcm_pointer' filepath='sound/core/pcm_dmaengine.c' line='240' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_pointer'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='240' column='1'/> <return type-id='df412e35'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_open_request_chan' mangled-name='snd_dmaengine_pcm_open_request_chan' filepath='sound/core/pcm_dmaengine.c' line='333' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_open_request_chan'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='333' column='1'/> - <parameter type-id='55f53546' name='filter_fn' filepath='sound/core/pcm_dmaengine.c' line='334' column='1'/> - <parameter type-id='eaa32e2f' name='filter_data' filepath='sound/core/pcm_dmaengine.c' line='334' column='1'/> + <function-decl name='snd_dmaengine_pcm_open_request_chan' mangled-name='snd_dmaengine_pcm_open_request_chan' filepath='sound/core/pcm_dmaengine.c' line='331' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_open_request_chan'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='331' column='1'/> + <parameter type-id='55f53546' name='filter_fn' filepath='sound/core/pcm_dmaengine.c' line='332' column='1'/> + <parameter type-id='eaa32e2f' name='filter_data' filepath='sound/core/pcm_dmaengine.c' line='332' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_open' mangled-name='snd_dmaengine_pcm_open' filepath='sound/core/pcm_dmaengine.c' line='294' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_open'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='294' column='1'/> - <parameter type-id='27f3f5d8' name='chan' filepath='sound/core/pcm_dmaengine.c' line='295' column='1'/> + <function-decl name='snd_dmaengine_pcm_open' mangled-name='snd_dmaengine_pcm_open' filepath='sound/core/pcm_dmaengine.c' line='292' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_open'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='292' column='1'/> + <parameter type-id='27f3f5d8' name='chan' filepath='sound/core/pcm_dmaengine.c' line='293' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_dmaengine_pcm_get_chan' mangled-name='snd_dmaengine_pcm_get_chan' filepath='sound/core/pcm_dmaengine.c' line='35' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_get_chan'> <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='35' column='1'/> <return type-id='27f3f5d8'/> </function-decl> - <function-decl name='snd_dmaengine_pcm_close_release_chan' mangled-name='snd_dmaengine_pcm_close_release_chan' filepath='sound/core/pcm_dmaengine.c' line='362' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_close_release_chan'> - <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='362' column='1'/> + <function-decl name='snd_dmaengine_pcm_close_release_chan' mangled-name='snd_dmaengine_pcm_close_release_chan' filepath='sound/core/pcm_dmaengine.c' line='360' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_dmaengine_pcm_close_release_chan'> + <parameter type-id='06b2cd14' name='substream' filepath='sound/core/pcm_dmaengine.c' line='360' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr> @@ -180615,12 +180474,6 @@ <parameter type-id='7359adad' name='step' filepath='sound/core/pcm_lib.c' line='1436' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_pcm_hw_constraint_pow2' mangled-name='snd_pcm_hw_constraint_pow2' filepath='sound/core/pcm_lib.c' line='1464' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_pcm_hw_constraint_pow2'> - <parameter type-id='17a05af6' name='runtime' filepath='sound/core/pcm_lib.c' line='1464' column='1'/> - <parameter type-id='f0981eeb' name='cond' filepath='sound/core/pcm_lib.c' line='1465' column='1'/> - <parameter type-id='6b55ba25' name='var' filepath='sound/core/pcm_lib.c' line='1466' column='1'/> - <return type-id='95e97e5e'/> - </function-decl> <function-decl name='snd_pcm_hw_constraint_msbits' mangled-name='snd_pcm_hw_constraint_msbits' filepath='sound/core/pcm_lib.c' line='1404' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_pcm_hw_constraint_msbits'> <parameter type-id='17a05af6' name='runtime' filepath='sound/core/pcm_lib.c' line='1404' column='1'/> <parameter type-id='f0981eeb' name='cond' filepath='sound/core/pcm_lib.c' line='1405' column='1'/> @@ -181033,39 +180886,39 @@ <var-decl name='debugfs_prefix' type-id='80f4b756' visibility='default' filepath='include/sound/soc-component.h' line='150' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_context' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='668' column='1' id='95201ae5'> + <class-decl name='snd_soc_dapm_context' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='665' column='1' id='95201ae5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='669' column='1'/> + <var-decl name='bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='666' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='idle_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='670' column='1'/> + <var-decl name='idle_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='667' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='suspend_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='672' column='1'/> + <var-decl name='suspend_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='669' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/sound/soc-dapm.h' line='674' column='1'/> + <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/sound/soc-dapm.h' line='671' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='component' type-id='807b7702' visibility='default' filepath='include/sound/soc-dapm.h' line='675' column='1'/> + <var-decl name='component' type-id='807b7702' visibility='default' filepath='include/sound/soc-dapm.h' line='672' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='card' type-id='3059cd0b' visibility='default' filepath='include/sound/soc-dapm.h' line='676' column='1'/> + <var-decl name='card' type-id='3059cd0b' visibility='default' filepath='include/sound/soc-dapm.h' line='673' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='target_bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='679' column='1'/> + <var-decl name='target_bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='676' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='680' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='677' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='path_sink_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='682' column='1'/> + <var-decl name='path_sink_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='path_source_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='683' column='1'/> + <var-decl name='path_source_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='debugfs_dapm' type-id='27675065' visibility='default' filepath='include/sound/soc-dapm.h' line='686' column='1'/> + <var-decl name='debugfs_dapm' type-id='27675065' visibility='default' filepath='include/sound/soc-dapm.h' line='683' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='215ec542' size-in-bits='64' id='f030c2b8'/> @@ -181274,9 +181127,9 @@ <var-decl name='android_kabi_reserved4' type-id='91ce1af9' visibility='default' filepath='include/sound/soc.h' line='1118' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_wcache' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='663' column='1' id='27dc472b'> + <class-decl name='snd_soc_dapm_wcache' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='660' column='1' id='27dc472b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='widget' type-id='810606ec' visibility='default' filepath='include/sound/soc-dapm.h' line='664' column='1'/> + <var-decl name='widget' type-id='810606ec' visibility='default' filepath='include/sound/soc-dapm.h' line='661' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='9f6de273' const='yes' id='215ec542'/> @@ -181403,15 +181256,15 @@ <var-decl name='be_pcm_base' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-component.h' line='105' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_stats' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='696' column='1' id='fef29e19'> + <class-decl name='snd_soc_dapm_stats' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='693' column='1' id='fef29e19'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='power_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='697' column='1'/> + <var-decl name='power_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='694' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='path_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='698' column='1'/> + <var-decl name='path_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='695' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='neighbour_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='699' column='1'/> + <var-decl name='neighbour_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='696' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='e0f88742' size-in-bits='64' id='8f3d28b8'/> @@ -181562,146 +181415,146 @@ <var-decl name='android_kabi_reserved1' type-id='91ce1af9' visibility='default' filepath='include/sound/soc.h' line='872' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_update' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='652' column='1' id='b6a3f4d3'> + <class-decl name='snd_soc_dapm_update' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='649' column='1' id='b6a3f4d3'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='kcontrol' type-id='7a5054b7' visibility='default' filepath='include/sound/soc-dapm.h' line='653' column='1'/> + <var-decl name='kcontrol' type-id='7a5054b7' visibility='default' filepath='include/sound/soc-dapm.h' line='650' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='654' column='1'/> + <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='651' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='mask' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='655' column='1'/> + <var-decl name='mask' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='val' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='656' column='1'/> + <var-decl name='val' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='reg2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='657' column='1'/> + <var-decl name='reg2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='mask2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='658' column='1'/> + <var-decl name='mask2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='655' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='val2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='659' column='1'/> + <var-decl name='val2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='has_second_set' type-id='b50a4934' visibility='default' filepath='include/sound/soc-dapm.h' line='660' column='1'/> + <var-decl name='has_second_set' type-id='b50a4934' visibility='default' filepath='include/sound/soc-dapm.h' line='657' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_widget' size-in-bits='2560' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='597' column='1' id='f780d556'> + <class-decl name='snd_soc_dapm_widget' size-in-bits='2560' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='594' column='1' id='f780d556'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='68bb1ec5' visibility='default' filepath='include/sound/soc-dapm.h' line='598' column='1'/> + <var-decl name='id' type-id='68bb1ec5' visibility='default' filepath='include/sound/soc-dapm.h' line='595' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='599' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='596' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='sname' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='600' column='1'/> + <var-decl name='sname' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='601' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='598' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='dapm' type-id='70d004a5' visibility='default' filepath='include/sound/soc-dapm.h' line='602' column='1'/> + <var-decl name='dapm' type-id='70d004a5' visibility='default' filepath='include/sound/soc-dapm.h' line='599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/sound/soc-dapm.h' line='604' column='1'/> + <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/sound/soc-dapm.h' line='601' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='regulator' type-id='850c13f6' visibility='default' filepath='include/sound/soc-dapm.h' line='605' column='1'/> + <var-decl name='regulator' type-id='850c13f6' visibility='default' filepath='include/sound/soc-dapm.h' line='602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='pinctrl' type-id='73ea90c5' visibility='default' filepath='include/sound/soc-dapm.h' line='606' column='1'/> + <var-decl name='pinctrl' type-id='73ea90c5' visibility='default' filepath='include/sound/soc-dapm.h' line='603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='609' column='1'/> + <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='shift' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='610' column='1'/> + <var-decl name='shift' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='607' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='611' column='1'/> + <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='on_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='612' column='1'/> + <var-decl name='on_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='off_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='613' column='1'/> + <var-decl name='off_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='610' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='614' column='1'/> + <var-decl name='power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='611' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='active' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='615' column='1'/> + <var-decl name='active' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='612' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='connected' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='616' column='1'/> + <var-decl name='connected' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='new' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='617' column='1'/> + <var-decl name='new' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='614' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='force' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='618' column='1'/> + <var-decl name='force' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='615' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='ignore_suspend' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='619' column='1'/> + <var-decl name='ignore_suspend' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='616' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='new_power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='620' column='1'/> + <var-decl name='new_power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='617' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='power_checked' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='621' column='1'/> + <var-decl name='power_checked' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='618' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='is_supply' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='622' column='1'/> + <var-decl name='is_supply' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='619' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='is_ep' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='623' column='1'/> + <var-decl name='is_ep' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='620' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='subseq' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='624' column='1'/> + <var-decl name='subseq' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='power_check' type-id='3fccea10' visibility='default' filepath='include/sound/soc-dapm.h' line='626' column='1'/> + <var-decl name='power_check' type-id='3fccea10' visibility='default' filepath='include/sound/soc-dapm.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='event_flags' type-id='8efea9e5' visibility='default' filepath='include/sound/soc-dapm.h' line='629' column='1'/> + <var-decl name='event_flags' type-id='8efea9e5' visibility='default' filepath='include/sound/soc-dapm.h' line='626' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='event' type-id='af92413d' visibility='default' filepath='include/sound/soc-dapm.h' line='630' column='1'/> + <var-decl name='event' type-id='af92413d' visibility='default' filepath='include/sound/soc-dapm.h' line='627' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='num_kcontrols' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='633' column='1'/> + <var-decl name='num_kcontrols' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='630' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='kcontrol_news' type-id='31e035f7' visibility='default' filepath='include/sound/soc-dapm.h' line='634' column='1'/> + <var-decl name='kcontrol_news' type-id='31e035f7' visibility='default' filepath='include/sound/soc-dapm.h' line='631' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='kcontrols' type-id='29753327' visibility='default' filepath='include/sound/soc-dapm.h' line='635' column='1'/> + <var-decl name='kcontrols' type-id='29753327' visibility='default' filepath='include/sound/soc-dapm.h' line='632' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='636' column='1'/> + <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='633' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='edges' type-id='e4f16420' visibility='default' filepath='include/sound/soc-dapm.h' line='639' column='1'/> + <var-decl name='edges' type-id='e4f16420' visibility='default' filepath='include/sound/soc-dapm.h' line='636' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='work_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='642' column='1'/> + <var-decl name='work_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='639' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='power_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='643' column='1'/> + <var-decl name='power_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='640' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='dirty' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='644' column='1'/> + <var-decl name='dirty' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='endpoints' type-id='e4266c7e' visibility='default' filepath='include/sound/soc-dapm.h' line='645' column='1'/> + <var-decl name='endpoints' type-id='e4266c7e' visibility='default' filepath='include/sound/soc-dapm.h' line='642' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='clk' type-id='7d0bc0eb' visibility='default' filepath='include/sound/soc-dapm.h' line='647' column='1'/> + <var-decl name='clk' type-id='7d0bc0eb' visibility='default' filepath='include/sound/soc-dapm.h' line='644' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2496'> - <var-decl name='channel' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='649' column='1'/> + <var-decl name='channel' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='646' column='1'/> </data-member> </class-decl> <pointer-type-def type-id='9625db14' size-in-bits='64' id='9b98229a'/> @@ -181731,21 +181584,21 @@ <var-decl name='dai_name' type-id='80f4b756' visibility='default' filepath='include/sound/soc.h' line='766' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_route' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='553' column='1' id='4a91f65b'> + <class-decl name='snd_soc_dapm_route' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='550' column='1' id='4a91f65b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sink' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='554' column='1'/> + <var-decl name='sink' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='551' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='control' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='555' column='1'/> + <var-decl name='control' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='source' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='556' column='1'/> + <var-decl name='source' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='553' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='connected' type-id='4b433675' visibility='default' filepath='include/sound/soc-dapm.h' line='559' column='1'/> + <var-decl name='connected' type-id='4b433675' visibility='default' filepath='include/sound/soc-dapm.h' line='556' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='562' column='1'/> + <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='559' column='1'/> </data-member> </class-decl> <class-decl name='snd_soc_dobj' size-in-bits='512' is-struct='yes' visibility='default' filepath='include/sound/soc-topology.h' line='64' column='1' id='01edcafc'> @@ -181772,7 +181625,7 @@ <pointer-type-def type-id='abf99950' size-in-bits='64' id='33ec9b0e'/> <pointer-type-def type-id='b276f0c8' size-in-bits='64' id='d33d33c6'/> <pointer-type-def type-id='8dc7c255' size-in-bits='64' id='b0772ded'/> - <enum-decl name='snd_soc_dapm_type' filepath='include/sound/soc-dapm.h' line='498' column='1' id='68bb1ec5'> + <enum-decl name='snd_soc_dapm_type' filepath='include/sound/soc-dapm.h' line='495' column='1' id='68bb1ec5'> <underlying-type type-id='9cac1fee'/> <enumerator name='snd_soc_dapm_input' value='0'/> <enumerator name='snd_soc_dapm_output' value='1'/> @@ -182652,39 +182505,39 @@ <enumerator name='SND_SOC_PCM_CLASS_PCM' value='0'/> <enumerator name='SND_SOC_PCM_CLASS_BE' value='1'/> </enum-decl> - <class-decl name='snd_soc_dapm_context' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='668' column='1' id='95201ae5'> + <class-decl name='snd_soc_dapm_context' size-in-bits='640' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='665' column='1' id='95201ae5'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='669' column='1'/> + <var-decl name='bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='666' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='idle_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='670' column='1'/> + <var-decl name='idle_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='667' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='suspend_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='672' column='1'/> + <var-decl name='suspend_bias_off' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='669' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/sound/soc-dapm.h' line='674' column='1'/> + <var-decl name='dev' type-id='fa0b179b' visibility='default' filepath='include/sound/soc-dapm.h' line='671' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='component' type-id='807b7702' visibility='default' filepath='include/sound/soc-dapm.h' line='675' column='1'/> + <var-decl name='component' type-id='807b7702' visibility='default' filepath='include/sound/soc-dapm.h' line='672' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='card' type-id='3059cd0b' visibility='default' filepath='include/sound/soc-dapm.h' line='676' column='1'/> + <var-decl name='card' type-id='3059cd0b' visibility='default' filepath='include/sound/soc-dapm.h' line='673' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='target_bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='679' column='1'/> + <var-decl name='target_bias_level' type-id='f078c744' visibility='default' filepath='include/sound/soc-dapm.h' line='676' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='680' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='677' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='path_sink_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='682' column='1'/> + <var-decl name='path_sink_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='679' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='path_source_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='683' column='1'/> + <var-decl name='path_source_cache' type-id='27dc472b' visibility='default' filepath='include/sound/soc-dapm.h' line='680' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='debugfs_dapm' type-id='27675065' visibility='default' filepath='include/sound/soc-dapm.h' line='686' column='1'/> + <var-decl name='debugfs_dapm' type-id='27675065' visibility='default' filepath='include/sound/soc-dapm.h' line='683' column='1'/> </data-member> </class-decl> <enum-decl name='snd_soc_bias_level' filepath='include/sound/soc.h' line='389' column='1' id='f078c744'> @@ -182875,123 +182728,123 @@ <var-decl name='be_pcm_base' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-component.h' line='105' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_widget' size-in-bits='2560' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='597' column='1' id='f780d556'> + <class-decl name='snd_soc_dapm_widget' size-in-bits='2560' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='594' column='1' id='f780d556'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='id' type-id='68bb1ec5' visibility='default' filepath='include/sound/soc-dapm.h' line='598' column='1'/> + <var-decl name='id' type-id='68bb1ec5' visibility='default' filepath='include/sound/soc-dapm.h' line='595' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='599' column='1'/> + <var-decl name='name' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='596' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='sname' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='600' column='1'/> + <var-decl name='sname' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='597' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='601' column='1'/> + <var-decl name='list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='598' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='320'> - <var-decl name='dapm' type-id='70d004a5' visibility='default' filepath='include/sound/soc-dapm.h' line='602' column='1'/> + <var-decl name='dapm' type-id='70d004a5' visibility='default' filepath='include/sound/soc-dapm.h' line='599' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='384'> - <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/sound/soc-dapm.h' line='604' column='1'/> + <var-decl name='priv' type-id='eaa32e2f' visibility='default' filepath='include/sound/soc-dapm.h' line='601' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='448'> - <var-decl name='regulator' type-id='850c13f6' visibility='default' filepath='include/sound/soc-dapm.h' line='605' column='1'/> + <var-decl name='regulator' type-id='850c13f6' visibility='default' filepath='include/sound/soc-dapm.h' line='602' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='512'> - <var-decl name='pinctrl' type-id='73ea90c5' visibility='default' filepath='include/sound/soc-dapm.h' line='606' column='1'/> + <var-decl name='pinctrl' type-id='73ea90c5' visibility='default' filepath='include/sound/soc-dapm.h' line='603' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='576'> - <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='609' column='1'/> + <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='606' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='608'> - <var-decl name='shift' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='610' column='1'/> + <var-decl name='shift' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='607' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='640'> - <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='611' column='1'/> + <var-decl name='mask' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='608' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='672'> - <var-decl name='on_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='612' column='1'/> + <var-decl name='on_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='609' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='704'> - <var-decl name='off_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='613' column='1'/> + <var-decl name='off_val' type-id='f0981eeb' visibility='default' filepath='include/sound/soc-dapm.h' line='610' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='614' column='1'/> + <var-decl name='power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='611' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='active' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='615' column='1'/> + <var-decl name='active' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='612' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2'> - <var-decl name='connected' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='616' column='1'/> + <var-decl name='connected' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='613' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='3'> - <var-decl name='new' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='617' column='1'/> + <var-decl name='new' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='614' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='4'> - <var-decl name='force' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='618' column='1'/> + <var-decl name='force' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='615' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='5'> - <var-decl name='ignore_suspend' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='619' column='1'/> + <var-decl name='ignore_suspend' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='616' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='6'> - <var-decl name='new_power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='620' column='1'/> + <var-decl name='new_power' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='617' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='7'> - <var-decl name='power_checked' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='621' column='1'/> + <var-decl name='power_checked' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='618' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='is_supply' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='622' column='1'/> + <var-decl name='is_supply' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='619' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1'> - <var-decl name='is_ep' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='623' column='1'/> + <var-decl name='is_ep' type-id='002ac4a6' visibility='default' filepath='include/sound/soc-dapm.h' line='620' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='768'> - <var-decl name='subseq' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='624' column='1'/> + <var-decl name='subseq' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='621' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='832'> - <var-decl name='power_check' type-id='3fccea10' visibility='default' filepath='include/sound/soc-dapm.h' line='626' column='1'/> + <var-decl name='power_check' type-id='3fccea10' visibility='default' filepath='include/sound/soc-dapm.h' line='623' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='896'> - <var-decl name='event_flags' type-id='8efea9e5' visibility='default' filepath='include/sound/soc-dapm.h' line='629' column='1'/> + <var-decl name='event_flags' type-id='8efea9e5' visibility='default' filepath='include/sound/soc-dapm.h' line='626' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='960'> - <var-decl name='event' type-id='af92413d' visibility='default' filepath='include/sound/soc-dapm.h' line='630' column='1'/> + <var-decl name='event' type-id='af92413d' visibility='default' filepath='include/sound/soc-dapm.h' line='627' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1024'> - <var-decl name='num_kcontrols' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='633' column='1'/> + <var-decl name='num_kcontrols' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='630' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1088'> - <var-decl name='kcontrol_news' type-id='31e035f7' visibility='default' filepath='include/sound/soc-dapm.h' line='634' column='1'/> + <var-decl name='kcontrol_news' type-id='31e035f7' visibility='default' filepath='include/sound/soc-dapm.h' line='631' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1152'> - <var-decl name='kcontrols' type-id='29753327' visibility='default' filepath='include/sound/soc-dapm.h' line='635' column='1'/> + <var-decl name='kcontrols' type-id='29753327' visibility='default' filepath='include/sound/soc-dapm.h' line='632' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1216'> - <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='636' column='1'/> + <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='633' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1728'> - <var-decl name='edges' type-id='e4f16420' visibility='default' filepath='include/sound/soc-dapm.h' line='639' column='1'/> + <var-decl name='edges' type-id='e4f16420' visibility='default' filepath='include/sound/soc-dapm.h' line='636' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='1984'> - <var-decl name='work_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='642' column='1'/> + <var-decl name='work_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='639' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2112'> - <var-decl name='power_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='643' column='1'/> + <var-decl name='power_list' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='640' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2240'> - <var-decl name='dirty' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='644' column='1'/> + <var-decl name='dirty' type-id='72f469ec' visibility='default' filepath='include/sound/soc-dapm.h' line='641' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2368'> - <var-decl name='endpoints' type-id='e4266c7e' visibility='default' filepath='include/sound/soc-dapm.h' line='645' column='1'/> + <var-decl name='endpoints' type-id='e4266c7e' visibility='default' filepath='include/sound/soc-dapm.h' line='642' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2432'> - <var-decl name='clk' type-id='7d0bc0eb' visibility='default' filepath='include/sound/soc-dapm.h' line='647' column='1'/> + <var-decl name='clk' type-id='7d0bc0eb' visibility='default' filepath='include/sound/soc-dapm.h' line='644' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='2496'> - <var-decl name='channel' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='649' column='1'/> + <var-decl name='channel' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='646' column='1'/> </data-member> </class-decl> - <enum-decl name='snd_soc_dapm_type' filepath='include/sound/soc-dapm.h' line='498' column='1' id='68bb1ec5'> + <enum-decl name='snd_soc_dapm_type' filepath='include/sound/soc-dapm.h' line='495' column='1' id='68bb1ec5'> <underlying-type type-id='9cac1fee'/> <enumerator name='snd_soc_dapm_input' value='0'/> <enumerator name='snd_soc_dapm_output' value='1'/> @@ -183186,21 +183039,21 @@ <var-decl name='mute' type-id='2f162548' visibility='default' filepath='include/uapi/sound/asoc.h' line='248' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_route' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='553' column='1' id='4a91f65b'> + <class-decl name='snd_soc_dapm_route' size-in-bits='768' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='550' column='1' id='4a91f65b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='sink' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='554' column='1'/> + <var-decl name='sink' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='551' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='control' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='555' column='1'/> + <var-decl name='control' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='552' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='source' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='556' column='1'/> + <var-decl name='source' type-id='80f4b756' visibility='default' filepath='include/sound/soc-dapm.h' line='553' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='connected' type-id='4b433675' visibility='default' filepath='include/sound/soc-dapm.h' line='559' column='1'/> + <var-decl name='connected' type-id='4b433675' visibility='default' filepath='include/sound/soc-dapm.h' line='556' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='562' column='1'/> + <var-decl name='dobj' type-id='01edcafc' visibility='default' filepath='include/sound/soc-dapm.h' line='559' column='1'/> </data-member> </class-decl> <class-decl name='snd_soc_tplg_dapm_widget' size-in-bits='1056' is-struct='yes' visibility='default' filepath='include/uapi/sound/asoc.h' line='478' column='1' id='b1e3bc3e'> @@ -184181,9 +184034,9 @@ <var-decl name='jack_zones' type-id='72f469ec' visibility='default' filepath='include/sound/soc.h' line='718' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_wcache' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='663' column='1' id='27dc472b'> + <class-decl name='snd_soc_dapm_wcache' size-in-bits='64' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='660' column='1' id='27dc472b'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='widget' type-id='810606ec' visibility='default' filepath='include/sound/soc-dapm.h' line='664' column='1'/> + <var-decl name='widget' type-id='810606ec' visibility='default' filepath='include/sound/soc-dapm.h' line='661' column='1'/> </data-member> </class-decl> <class-decl name='snd_soc_codec_conf' size-in-bits='192' is-struct='yes' visibility='default' filepath='include/sound/soc.h' line='974' column='1' id='7082c248'> @@ -184205,41 +184058,41 @@ <var-decl name='init' type-id='48cf6abe' visibility='default' filepath='include/sound/soc.h' line='997' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_stats' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='696' column='1' id='fef29e19'> + <class-decl name='snd_soc_dapm_stats' size-in-bits='96' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='693' column='1' id='fef29e19'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='power_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='697' column='1'/> + <var-decl name='power_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='694' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='32'> - <var-decl name='path_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='698' column='1'/> + <var-decl name='path_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='695' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='neighbour_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='699' column='1'/> + <var-decl name='neighbour_checks' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='696' column='1'/> </data-member> </class-decl> - <class-decl name='snd_soc_dapm_update' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='652' column='1' id='b6a3f4d3'> + <class-decl name='snd_soc_dapm_update' size-in-bits='320' is-struct='yes' visibility='default' filepath='include/sound/soc-dapm.h' line='649' column='1' id='b6a3f4d3'> <data-member access='public' layout-offset-in-bits='0'> - <var-decl name='kcontrol' type-id='7a5054b7' visibility='default' filepath='include/sound/soc-dapm.h' line='653' column='1'/> + <var-decl name='kcontrol' type-id='7a5054b7' visibility='default' filepath='include/sound/soc-dapm.h' line='650' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='64'> - <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='654' column='1'/> + <var-decl name='reg' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='651' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='96'> - <var-decl name='mask' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='655' column='1'/> + <var-decl name='mask' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='652' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='128'> - <var-decl name='val' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='656' column='1'/> + <var-decl name='val' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='653' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='160'> - <var-decl name='reg2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='657' column='1'/> + <var-decl name='reg2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='654' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='192'> - <var-decl name='mask2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='658' column='1'/> + <var-decl name='mask2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='655' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='224'> - <var-decl name='val2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='659' column='1'/> + <var-decl name='val2' type-id='95e97e5e' visibility='default' filepath='include/sound/soc-dapm.h' line='656' column='1'/> </data-member> <data-member access='public' layout-offset-in-bits='256'> - <var-decl name='has_second_set' type-id='b50a4934' visibility='default' filepath='include/sound/soc-dapm.h' line='660' column='1'/> + <var-decl name='has_second_set' type-id='b50a4934' visibility='default' filepath='include/sound/soc-dapm.h' line='657' column='1'/> </data-member> </class-decl> <qualified-type-def type-id='33d73f3b' const='yes' id='9625db14'/> @@ -185224,9 +185077,9 @@ </function-decl> </abi-instr> <abi-instr address-size='64' path='sound/soc/soc-ops.c' language='LANG_C89'> - <function-decl name='snd_soc_put_xr_sx' mangled-name='snd_soc_put_xr_sx' filepath='sound/soc/soc-ops.c' line='930' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_xr_sx'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='930' column='1'/> - <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='931' column='1'/> + <function-decl name='snd_soc_put_xr_sx' mangled-name='snd_soc_put_xr_sx' filepath='sound/soc/soc-ops.c' line='923' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_xr_sx'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='923' column='1'/> + <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='924' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_put_volsw_sx' mangled-name='snd_soc_put_volsw_sx' filepath='sound/soc/soc-ops.c' line='428' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_volsw_sx'> @@ -185234,9 +185087,9 @@ <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='429' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_put_volsw_range' mangled-name='snd_soc_put_volsw_range' filepath='sound/soc/soc-ops.c' line='519' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_volsw_range'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='519' column='1'/> - <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='520' column='1'/> + <function-decl name='snd_soc_put_volsw_range' mangled-name='snd_soc_put_volsw_range' filepath='sound/soc/soc-ops.c' line='512' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_volsw_range'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='512' column='1'/> + <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='513' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_put_volsw' mangled-name='snd_soc_put_volsw' filepath='sound/soc/soc-ops.c' line='302' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_put_volsw'> @@ -185249,9 +185102,9 @@ <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='94' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_info_xr_sx' mangled-name='snd_soc_info_xr_sx' filepath='sound/soc/soc-ops.c' line='854' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_xr_sx'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='854' column='1'/> - <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='855' column='1'/> + <function-decl name='snd_soc_info_xr_sx' mangled-name='snd_soc_info_xr_sx' filepath='sound/soc/soc-ops.c' line='847' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_xr_sx'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='847' column='1'/> + <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='848' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_info_volsw_sx' mangled-name='snd_soc_info_volsw_sx' filepath='sound/soc/soc-ops.c' line='216' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_volsw_sx'> @@ -185259,9 +185112,9 @@ <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='217' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_info_volsw_range' mangled-name='snd_soc_info_volsw_range' filepath='sound/soc/soc-ops.c' line='489' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_volsw_range'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='489' column='1'/> - <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='490' column='1'/> + <function-decl name='snd_soc_info_volsw_range' mangled-name='snd_soc_info_volsw_range' filepath='sound/soc/soc-ops.c' line='482' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_volsw_range'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='482' column='1'/> + <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='483' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_info_volsw' mangled-name='snd_soc_info_volsw' filepath='sound/soc/soc-ops.c' line='181' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_info_volsw'> @@ -185274,9 +185127,9 @@ <parameter type-id='0e291009' name='uinfo' filepath='sound/soc/soc-ops.c' line='41' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_get_xr_sx' mangled-name='snd_soc_get_xr_sx' filepath='sound/soc/soc-ops.c' line='881' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_xr_sx'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='881' column='1'/> - <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='882' column='1'/> + <function-decl name='snd_soc_get_xr_sx' mangled-name='snd_soc_get_xr_sx' filepath='sound/soc/soc-ops.c' line='874' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_xr_sx'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='874' column='1'/> + <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='875' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_get_volsw_sx' mangled-name='snd_soc_get_volsw_sx' filepath='sound/soc/soc-ops.c' line='384' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_volsw_sx'> @@ -185284,9 +185137,9 @@ <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='385' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_get_volsw_range' mangled-name='snd_soc_get_volsw_range' filepath='sound/soc/soc-ops.c' line='592' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_volsw_range'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='592' column='1'/> - <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='593' column='1'/> + <function-decl name='snd_soc_get_volsw_range' mangled-name='snd_soc_get_volsw_range' filepath='sound/soc/soc-ops.c' line='585' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_volsw_range'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='585' column='1'/> + <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='586' column='1'/> <return type-id='95e97e5e'/> </function-decl> <function-decl name='snd_soc_get_volsw' mangled-name='snd_soc_get_volsw' filepath='sound/soc/soc-ops.c' line='242' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_get_volsw'> @@ -185299,16 +185152,16 @@ <parameter type-id='144a5d4c' name='ucontrol' filepath='sound/soc/soc-ops.c' line='60' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_bytes_tlv_callback' mangled-name='snd_soc_bytes_tlv_callback' filepath='sound/soc/soc-ops.c' line='822' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_bytes_tlv_callback'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='822' column='1'/> - <parameter type-id='95e97e5e' name='op_flag' filepath='sound/soc/soc-ops.c' line='822' column='1'/> - <parameter type-id='f0981eeb' name='size' filepath='sound/soc/soc-ops.c' line='823' column='1'/> - <parameter type-id='807869d3' name='tlv' filepath='sound/soc/soc-ops.c' line='823' column='1'/> + <function-decl name='snd_soc_bytes_tlv_callback' mangled-name='snd_soc_bytes_tlv_callback' filepath='sound/soc/soc-ops.c' line='815' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_bytes_tlv_callback'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='815' column='1'/> + <parameter type-id='95e97e5e' name='op_flag' filepath='sound/soc/soc-ops.c' line='815' column='1'/> + <parameter type-id='f0981eeb' name='size' filepath='sound/soc/soc-ops.c' line='816' column='1'/> + <parameter type-id='807869d3' name='tlv' filepath='sound/soc/soc-ops.c' line='816' column='1'/> <return type-id='95e97e5e'/> </function-decl> - <function-decl name='snd_soc_bytes_info_ext' mangled-name='snd_soc_bytes_info_ext' filepath='sound/soc/soc-ops.c' line='810' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_bytes_info_ext'> - <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='810' column='1'/> - <parameter type-id='0e291009' name='ucontrol' filepath='sound/soc/soc-ops.c' line='811' column='1'/> + <function-decl name='snd_soc_bytes_info_ext' mangled-name='snd_soc_bytes_info_ext' filepath='sound/soc/soc-ops.c' line='803' column='1' visibility='default' binding='global' size-in-bits='64' elf-symbol-id='snd_soc_bytes_info_ext'> + <parameter type-id='7a5054b7' name='kcontrol' filepath='sound/soc/soc-ops.c' line='803' column='1'/> + <parameter type-id='0e291009' name='ucontrol' filepath='sound/soc/soc-ops.c' line='804' column='1'/> <return type-id='95e97e5e'/> </function-decl> </abi-instr>
diff --git a/android/abi_gki_aarch64_db845c b/android/abi_gki_aarch64_db845c index 31ab911..3973684 100644 --- a/android/abi_gki_aarch64_db845c +++ b/android/abi_gki_aarch64_db845c
@@ -401,7 +401,6 @@ strlcpy strlen strncpy - strscpy_pad __sw_hweight32 __sw_hweight64 synchronize_irq
diff --git a/android/abi_gki_aarch64_telechips b/android/abi_gki_aarch64_telechips index 808453c..1ac02fb 100644 --- a/android/abi_gki_aarch64_telechips +++ b/android/abi_gki_aarch64_telechips
@@ -477,7 +477,6 @@ mfd_add_devices mfd_remove_devices regmap_del_irq_chip - regmap_irq_chip_get_base # required by da9062-regulator.ko devm_regmap_field_alloc @@ -995,7 +994,6 @@ # required by tcc_adma_pcm.ko snd_pcm_lib_preallocate_free_for_all snd_pcm_lib_preallocate_pages_for_all - snd_pcm_hw_constraint_pow2 # required by tcc_audio_chmux.ko sysfs_create_files @@ -1236,15 +1234,3 @@ __of_reset_control_get platform_device_register reset_control_put - -# required by tcc-clk.ko - of_clk_parent_fill - -# required by mali_kbase.ko - register_oom_notifier - unregister_oom_notifier - dma_resv_get_fences_rcu - -# required by sdhci-tcc.ko - sdhci_execute_tuning - sdhci_set_uhs_signaling
diff --git a/android/abi_gki_aarch64_unisoc b/android/abi_gki_aarch64_unisoc index cd4ee51..93145fa 100644 --- a/android/abi_gki_aarch64_unisoc +++ b/android/abi_gki_aarch64_unisoc
@@ -137,8 +137,6 @@ __crypto_xor csum_ipv6_magic csum_partial - debugfs_attr_read - debugfs_attr_write debugfs_create_bool debugfs_create_dir debugfs_create_file @@ -459,7 +457,6 @@ kernel_kobj kernel_neon_begin kernel_neon_end - kernel_sock_shutdown kern_mount kern_unmount __kfifo_alloc @@ -575,7 +572,6 @@ of_device_is_available of_device_is_compatible of_dev_put - of_dma_is_coherent of_find_compatible_node of_find_device_by_node of_find_node_by_name @@ -1949,7 +1945,6 @@ unregister_netdev # required by sfp_core.ko - br_fdb_find_port csum_tcpudp_nofold dev_get_by_index_rcu ip_send_check @@ -2790,7 +2785,6 @@ # required by wcn_bsp.ko gpiod_set_value - in_aton memdup_user pci_disable_device pci_disable_msi
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S index c27d012..2e09248 100644 --- a/arch/alpha/kernel/entry.S +++ b/arch/alpha/kernel/entry.S
@@ -469,10 +469,8 @@ #ifdef CONFIG_AUDITSYSCALL lda $6, _TIF_SYSCALL_TRACE | _TIF_SYSCALL_AUDIT and $3, $6, $3 - bne $3, strace -#else - blbs $3, strace /* check for SYSCALL_TRACE in disguise */ #endif + bne $3, strace beq $4, 1f ldq $27, 0($5) 1: jsr $26, ($27), sys_ni_syscall
diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c index b19a8aa..ac110ae 100644 --- a/arch/alpha/kernel/module.c +++ b/arch/alpha/kernel/module.c
@@ -146,8 +146,10 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, base = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr; symtab = (Elf64_Sym *)sechdrs[symindex].sh_addr; + /* The small sections were sorted to the end of the segment. + The following should definitely cover them. */ + gp = (u64)me->core_layout.base + me->core_layout.size - 0x8000; got = sechdrs[me->arch.gotsecindex].sh_addr; - gp = got + 0x8000; for (i = 0; i < n; i++) { unsigned long r_sym = ELF64_R_SYM (rela[i].r_info);
diff --git a/arch/alpha/kernel/traps.c b/arch/alpha/kernel/traps.c index 1a0a98c..f6b9664 100644 --- a/arch/alpha/kernel/traps.c +++ b/arch/alpha/kernel/traps.c
@@ -192,7 +192,7 @@ die_if_kernel(char * str, struct pt_regs *regs, long err, unsigned long *r9_15) local_irq_enable(); while (1); } - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } #ifndef CONFIG_MATHEMU @@ -235,21 +235,7 @@ do_entIF(unsigned long type, struct pt_regs *regs) { int signo, code; - if (type == 3) { /* FEN fault */ - /* Irritating users can call PAL_clrfen to disable the - FPU for the process. The kernel will then trap in - do_switch_stack and undo_switch_stack when we try - to save and restore the FP registers. - - Given that GCC by default generates code that uses the - FP registers, PAL_clrfen is not useful except for DoS - attacks. So turn the bleeding FPU back on and be done - with it. */ - current_thread_info()->pcb.flags |= 1; - __reload_thread(¤t_thread_info()->pcb); - return; - } - if (!user_mode(regs)) { + if ((regs->ps & ~IPL_MAX) == 0) { if (type == 1) { const unsigned int *data = (const unsigned int *) regs->pc; @@ -382,6 +368,20 @@ do_entIF(unsigned long type, struct pt_regs *regs) } break; + case 3: /* FEN fault */ + /* Irritating users can call PAL_clrfen to disable the + FPU for the process. The kernel will then trap in + do_switch_stack and undo_switch_stack when we try + to save and restore the FP registers. + + Given that GCC by default generates code that uses the + FP registers, PAL_clrfen is not useful except for DoS + attacks. So turn the bleeding FPU back on and be done + with it. */ + current_thread_info()->pcb.flags |= 1; + __reload_thread(¤t_thread_info()->pcb); + return; + case 5: /* illoc */ default: /* unexpected instruction-fault type */ ; @@ -577,7 +577,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, printk("Bad unaligned kernel access at %016lx: %p %lx %lu\n", pc, va, opcode, reg); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); got_exception: /* Ok, we caught the exception, but we don't want it. Is there @@ -632,7 +632,7 @@ do_entUna(void * va, unsigned long opcode, unsigned long reg, local_irq_enable(); while (1); } - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } /*
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c index 687d3df..c2d7b6d 100644 --- a/arch/alpha/mm/fault.c +++ b/arch/alpha/mm/fault.c
@@ -206,7 +206,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, printk(KERN_ALERT "Unable to handle kernel paging request at " "virtual address %016lx\n", address); die_if_kernel("Oops", regs, cause, (unsigned long*)regs - 16); - make_task_dead(SIGKILL); + do_exit(SIGKILL); /* We ran out of memory, or some other thing happened to us that made us unable to handle the page fault gracefully. */
diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h index 94ef71b..72f7929 100644 --- a/arch/arc/include/asm/io.h +++ b/arch/arc/include/asm/io.h
@@ -32,7 +32,7 @@ static inline void ioport_unmap(void __iomem *addr) { } -extern void iounmap(const volatile void __iomem *addr); +extern void iounmap(const void __iomem *addr); #define ioremap_nocache(phy, sz) ioremap(phy, sz) #define ioremap_wc(phy, sz) ioremap(phy, sz)
diff --git a/arch/arc/mm/dma.c b/arch/arc/mm/dma.c index c399f51..4726906 100644 --- a/arch/arc/mm/dma.c +++ b/arch/arc/mm/dma.c
@@ -48,8 +48,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) * upper layer functions (in include/linux/dma-mapping.h) */ -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_TO_DEVICE: @@ -69,8 +69,8 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_TO_DEVICE:
diff --git a/arch/arc/mm/ioremap.c b/arch/arc/mm/ioremap.c index d3b1ea1..95c649f 100644 --- a/arch/arc/mm/ioremap.c +++ b/arch/arc/mm/ioremap.c
@@ -93,7 +93,7 @@ void __iomem *ioremap_prot(phys_addr_t paddr, unsigned long size, EXPORT_SYMBOL(ioremap_prot); -void iounmap(const volatile void __iomem *addr) +void iounmap(const void __iomem *addr) { /* weird double cast to handle phys_addr_t > 32 bits */ if (arc_uncached_addr_space((phys_addr_t)(u32)addr))
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f574365..6694ae8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig
@@ -1850,6 +1850,7 @@ choice prompt "Kernel command line type" if CMDLINE != "" default CMDLINE_FROM_BOOTLOADER + depends on ATAGS config CMDLINE_FROM_BOOTLOADER bool "Use bootloader kernel arguments if available"
diff --git a/arch/arm/boot/dts/am335x-baltos.dtsi b/arch/arm/boot/dts/am335x-baltos.dtsi index ee84155..ed235f2 100644 --- a/arch/arm/boot/dts/am335x-baltos.dtsi +++ b/arch/arm/boot/dts/am335x-baltos.dtsi
@@ -381,7 +381,7 @@ &mmc2 { status = "okay"; vmmc-supply = <&wl12xx_vmmc>; - non-removable; + ti,non-removable; bus-width = <4>; cap-power-off-card; pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/am335x-boneblack-common.dtsi b/arch/arm/boot/dts/am335x-boneblack-common.dtsi index dd93222..91f93bc 100644 --- a/arch/arm/boot/dts/am335x-boneblack-common.dtsi +++ b/arch/arm/boot/dts/am335x-boneblack-common.dtsi
@@ -22,7 +22,6 @@ pinctrl-0 = <&emmc_pins>; bus-width = <8>; status = "okay"; - non-removable; }; &am33xx_pinmux {
diff --git a/arch/arm/boot/dts/am335x-boneblack-wireless.dts b/arch/arm/boot/dts/am335x-boneblack-wireless.dts index e07dd79..3124d94 100644 --- a/arch/arm/boot/dts/am335x-boneblack-wireless.dts +++ b/arch/arm/boot/dts/am335x-boneblack-wireless.dts
@@ -75,6 +75,7 @@ bus-width = <4>; non-removable; cap-power-off-card; + ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
diff --git a/arch/arm/boot/dts/am335x-boneblue.dts b/arch/arm/boot/dts/am335x-boneblue.dts index 30b62de..2f6652e 100644 --- a/arch/arm/boot/dts/am335x-boneblue.dts +++ b/arch/arm/boot/dts/am335x-boneblue.dts
@@ -389,6 +389,7 @@ bus-width = <4>; non-removable; cap-power-off-card; + ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
diff --git a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts index 609c8db..4092cd1 100644 --- a/arch/arm/boot/dts/am335x-bonegreen-wireless.dts +++ b/arch/arm/boot/dts/am335x-bonegreen-wireless.dts
@@ -75,6 +75,7 @@ bus-width = <4>; non-removable; cap-power-off-card; + ti,needs-special-hs-handling; keep-power-in-suspend; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wl18xx_pins>;
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts index af25b42..a001457 100644 --- a/arch/arm/boot/dts/am335x-evm.dts +++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -782,7 +782,8 @@ bus-width = <4>; pinctrl-names = "default"; pinctrl-0 = <&mmc3_pins &wlan_pins>; - non-removable; + ti,non-removable; + ti,needs-special-hs-handling; cap-power-off-card; keep-power-in-suspend;
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts index 7805b06..e28a5b8 100644 --- a/arch/arm/boot/dts/am335x-evmsk.dts +++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -700,7 +700,7 @@ &mmc2 { status = "okay"; vmmc-supply = <&wl12xx_vmmc>; - non-removable; + ti,non-removable; bus-width = <4>; cap-power-off-card; keep-power-in-suspend;
diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts index c3bfd8e..a8005e9 100644 --- a/arch/arm/boot/dts/am335x-lxm.dts +++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -361,7 +361,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; - non-removable; + ti,non-removable; status = "okay"; };
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi index 7749122..671d4a5 100644 --- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi +++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -176,7 +176,7 @@ vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; pinctrl-0 = <&mmc1_pins_default>; - non-removable; + ti,non-removable; status = "okay"; };
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts index 66a5c09..783d411 100644 --- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts +++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
@@ -473,7 +473,7 @@ vmmc-supply = <&vmmcsd_fixed>; bus-width = <8>; pinctrl-0 = <&mmc2_pins_default>; - non-removable; + ti,non-removable; status = "okay"; };
diff --git a/arch/arm/boot/dts/am335x-pcm-953.dtsi b/arch/arm/boot/dts/am335x-pcm-953.dtsi index f2d9145..9bfa032 100644 --- a/arch/arm/boot/dts/am335x-pcm-953.dtsi +++ b/arch/arm/boot/dts/am335x-pcm-953.dtsi
@@ -12,20 +12,22 @@ compatible = "phytec,am335x-pcm-953", "phytec,am335x-phycore-som", "ti,am33xx"; /* Power */ - vcc3v3: fixedregulator1 { - compatible = "regulator-fixed"; - regulator-name = "vcc3v3"; - regulator-min-microvolt = <3300000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - }; + regulators { + vcc3v3: fixedregulator@1 { + compatible = "regulator-fixed"; + regulator-name = "vcc3v3"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-boot-on; + }; - vcc1v8: fixedregulator2 { - compatible = "regulator-fixed"; - regulator-name = "vcc1v8"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <1800000>; - regulator-boot-on; + vcc1v8: fixedregulator@2 { + compatible = "regulator-fixed"; + regulator-name = "vcc1v8"; + regulator-min-microvolt = <1800000>; + regulator-max-microvolt = <1800000>; + regulator-boot-on; + }; }; /* User IO */
diff --git a/arch/arm/boot/dts/am335x-pepper.dts b/arch/arm/boot/dts/am335x-pepper.dts index 03852ef..e7764ec 100644 --- a/arch/arm/boot/dts/am335x-pepper.dts +++ b/arch/arm/boot/dts/am335x-pepper.dts
@@ -341,7 +341,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&ldo3_reg>; bus-width = <8>; - non-removable; + ti,non-removable; }; &mmc3 { @@ -351,7 +351,7 @@ pinctrl-0 = <&wireless_pins>; vmmmc-supply = <&v3v3c_reg>; bus-width = <4>; - non-removable; + ti,non-removable; dmas = <&edma_xbar 12 0 1 &edma_xbar 13 0 2>; dma-names = "tx", "rx";
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi index 7e46b4c..3d0672b 100644 --- a/arch/arm/boot/dts/am335x-phycore-som.dtsi +++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -69,7 +69,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmc_reg>; bus-width = <8>; - non-removable; + ti,non-removable; status = "disabled"; };
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi index cacd564..7a9eb2b 100644 --- a/arch/arm/boot/dts/am33xx-l4.dtsi +++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -1333,9 +1333,12 @@ ranges = <0x0 0x60000 0x1000>; mmc1: mmc@0 { - compatible = "ti,am335-sdhci"; + compatible = "ti,omap4-hsmmc"; + ti,dual-volt; ti,needs-special-reset; - dmas = <&edma 24 0>, <&edma 25 0>; + ti,needs-special-hs-handling; + dmas = <&edma_xbar 24 0 0 + &edma_xbar 25 0 0>; dma-names = "tx", "rx"; interrupts = <64>; reg = <0x0 0x1000>; @@ -1824,7 +1827,7 @@ ranges = <0x0 0xd8000 0x1000>; mmc2: mmc@0 { - compatible = "ti,am335-sdhci"; + compatible = "ti,omap4-hsmmc"; ti,needs-special-reset; dmas = <&edma 2 0 &edma 3 0>;
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index efe36f3..77fa7c0 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -259,11 +259,10 @@ ranges = <0x0 0x47810000 0x1000>; mmc3: mmc@0 { - compatible = "ti,am335-sdhci"; + compatible = "ti,omap4-hsmmc"; ti,needs-special-reset; interrupts = <29>; reg = <0x0 0x1000>; - status = "disabled"; }; };
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index c5b6799..14bbc43 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi
@@ -250,11 +250,10 @@ ranges = <0x0 0x47810000 0x1000>; mmc3: mmc@0 { - compatible = "ti,am437-sdhci"; + compatible = "ti,omap4-hsmmc"; ti,needs-special-reset; interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>; reg = <0x0 0x1000>; - status = "disabled"; }; };
diff --git a/arch/arm/boot/dts/am437x-cm-t43.dts b/arch/arm/boot/dts/am437x-cm-t43.dts index a6b4fca..063113a 100644 --- a/arch/arm/boot/dts/am437x-cm-t43.dts +++ b/arch/arm/boot/dts/am437x-cm-t43.dts
@@ -291,7 +291,7 @@ pinctrl-0 = <&emmc_pins>; vmmc-supply = <&vmmc_3v3>; bus-width = <8>; - non-removable; + ti,non-removable; }; &spi0 {
diff --git a/arch/arm/boot/dts/am437x-gp-evm.dts b/arch/arm/boot/dts/am437x-gp-evm.dts index 4488537..126965a 100644 --- a/arch/arm/boot/dts/am437x-gp-evm.dts +++ b/arch/arm/boot/dts/am437x-gp-evm.dts
@@ -872,7 +872,7 @@ pinctrl-names = "default", "sleep"; pinctrl-0 = <&emmc_pins_default>; pinctrl-1 = <&emmc_pins_sleep>; - non-removable; + ti,non-removable; }; &mmc3 { @@ -889,7 +889,7 @@ pinctrl-1 = <&mmc3_pins_sleep>; cap-power-off-card; keep-power-in-suspend; - non-removable; + ti,non-removable; #address-cells = <1>; #size-cells = <0>;
diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi index 8c9e7e7..64fdd50 100644 --- a/arch/arm/boot/dts/am437x-l4.dtsi +++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -1104,8 +1104,9 @@ ranges = <0x0 0x60000 0x1000>; mmc1: mmc@0 { - compatible = "ti,am437-sdhci"; + compatible = "ti,omap4-hsmmc"; reg = <0x0 0x1000>; + ti,dual-volt; ti,needs-special-reset; dmas = <&edma 24 0>, <&edma 25 0>; @@ -1640,7 +1641,7 @@ ranges = <0x0 0xd8000 0x1000>; mmc2: mmc@0 { - compatible = "ti,am437-sdhci"; + compatible = "ti,omap4-hsmmc"; reg = <0x0 0x1000>; ti,needs-special-reset; dmas = <&edma 2 0>,
diff --git a/arch/arm/boot/dts/am437x-sk-evm.dts b/arch/arm/boot/dts/am437x-sk-evm.dts index 292153c..74eaa6a 100644 --- a/arch/arm/boot/dts/am437x-sk-evm.dts +++ b/arch/arm/boot/dts/am437x-sk-evm.dts
@@ -694,7 +694,7 @@ pinctrl-1 = <&mmc3_pins_sleep>; cap-power-off-card; keep-power-in-suspend; - non-removable; + ti,non-removable; #address-cells = <1>; #size-cells = <0>;
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index c042c41..46e6d3e 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -74,7 +74,7 @@ pcie2: pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x80000 0 0x2000>; + assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi index 230f6dd..2932a29 100644 --- a/arch/arm/boot/dts/armada-375.dtsi +++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -584,7 +584,7 @@ pcie1: pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-380.dtsi b/arch/arm/boot/dts/armada-380.dtsi index 7146cc8..cff1269 100644 --- a/arch/arm/boot/dts/armada-380.dtsi +++ b/arch/arm/boot/dts/armada-380.dtsi
@@ -79,7 +79,7 @@ /* x1 port */ pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x40000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -98,7 +98,7 @@ /* x1 port */ pcie@3,0 { device_type = "pci"; - assigned-addresses = <0x82001800 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-385-turris-omnia.dts b/arch/arm/boot/dts/armada-385-turris-omnia.dts index 320c759..fde4c30 100644 --- a/arch/arm/boot/dts/armada-385-turris-omnia.dts +++ b/arch/arm/boot/dts/armada-385-turris-omnia.dts
@@ -22,12 +22,6 @@ stdout-path = &uart0; }; - aliases { - ethernet0 = ð0; - ethernet1 = ð1; - ethernet2 = ð2; - }; - memory { device_type = "memory"; reg = <0x00000000 0x40000000>; /* 1024 MB */ @@ -297,17 +291,7 @@ }; }; - ports@6 { - reg = <6>; - label = "cpu"; - ethernet = <ð0>; - phy-mode = "rgmii-id"; - - fixed-link { - speed = <1000>; - full-duplex; - }; - }; + /* port 6 is connected to eth0 */ }; }; }; @@ -323,7 +307,7 @@ marvell,function = "spi0"; }; - spi0cs2_pins: spi0cs2-pins { + spi0cs1_pins: spi0cs1-pins { marvell,pins = "mpp26"; marvell,function = "spi0"; }; @@ -358,7 +342,7 @@ }; }; - /* MISO, MOSI, SCLK and CS2 are routed to pin header CN11 */ + /* MISO, MOSI, SCLK and CS1 are routed to pin header CN11 */ }; &uart0 {
diff --git a/arch/arm/boot/dts/armada-385.dtsi b/arch/arm/boot/dts/armada-385.dtsi index f081f7c..f0022d1 100644 --- a/arch/arm/boot/dts/armada-385.dtsi +++ b/arch/arm/boot/dts/armada-385.dtsi
@@ -84,7 +84,7 @@ /* x1 port */ pcie2: pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x40000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -103,7 +103,7 @@ /* x1 port */ pcie3: pcie@3,0 { device_type = "pci"; - assigned-addresses = <0x82001800 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -125,7 +125,7 @@ */ pcie4: pcie@4,0 { device_type = "pci"; - assigned-addresses = <0x82002000 0 0x48000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x2000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-39x.dtsi b/arch/arm/boot/dts/armada-39x.dtsi index cd7a46c..b1b8693 100644 --- a/arch/arm/boot/dts/armada-39x.dtsi +++ b/arch/arm/boot/dts/armada-39x.dtsi
@@ -457,7 +457,7 @@ /* x1 port */ pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x40000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x40000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -476,7 +476,7 @@ /* x1 port */ pcie@3,0 { device_type = "pci"; - assigned-addresses = <0x82001800 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -498,7 +498,7 @@ */ pcie@4,0 { device_type = "pci"; - assigned-addresses = <0x82002000 0 0x48000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x2000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi index d55fe16..8558bf6 100644 --- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -97,7 +97,7 @@ pcie2: pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -115,7 +115,7 @@ pcie3: pcie@3,0 { device_type = "pci"; - assigned-addresses = <0x82001800 0 0x48000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x1800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -133,7 +133,7 @@ pcie4: pcie@4,0 { device_type = "pci"; - assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>; reg = <0x2000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -151,7 +151,7 @@ pcie5: pcie@5,0 { device_type = "pci"; - assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; reg = <0x2800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi index fdcc818..2d85fe8 100644 --- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi +++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -112,7 +112,7 @@ pcie2: pcie@2,0 { device_type = "pci"; - assigned-addresses = <0x82001000 0 0x44000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x44000 0 0x2000>; reg = <0x1000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -130,7 +130,7 @@ pcie3: pcie@3,0 { device_type = "pci"; - assigned-addresses = <0x82001800 0 0x48000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x48000 0 0x2000>; reg = <0x1800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -148,7 +148,7 @@ pcie4: pcie@4,0 { device_type = "pci"; - assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>; reg = <0x2000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -166,7 +166,7 @@ pcie5: pcie@5,0 { device_type = "pci"; - assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x80000 0 0x2000>; reg = <0x2800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -184,7 +184,7 @@ pcie6: pcie@6,0 { device_type = "pci"; - assigned-addresses = <0x82003000 0 0x84000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x84000 0 0x2000>; reg = <0x3000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -202,7 +202,7 @@ pcie7: pcie@7,0 { device_type = "pci"; - assigned-addresses = <0x82003800 0 0x88000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x88000 0 0x2000>; reg = <0x3800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -220,7 +220,7 @@ pcie8: pcie@8,0 { device_type = "pci"; - assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x8c000 0 0x2000>; reg = <0x4000 0 0 0 0>; #address-cells = <3>; #size-cells = <2>; @@ -238,7 +238,7 @@ pcie9: pcie@9,0 { device_type = "pci"; - assigned-addresses = <0x82004800 0 0x42000 0 0x2000>; + assigned-addresses = <0x82000800 0 0x42000 0 0x2000>; reg = <0x4800 0 0 0 0>; #address-cells = <3>; #size-cells = <2>;
diff --git a/arch/arm/boot/dts/aspeed-ast2500-evb.dts b/arch/arm/boot/dts/aspeed-ast2500-evb.dts index 9db4d42..c9d88c9 100644 --- a/arch/arm/boot/dts/aspeed-ast2500-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2500-evb.dts
@@ -5,7 +5,7 @@ / { model = "AST2500 EVB"; - compatible = "aspeed,ast2500-evb", "aspeed,ast2500"; + compatible = "aspeed,ast2500"; aliases { serial4 = &uart5;
diff --git a/arch/arm/boot/dts/aspeed-ast2600-evb.dts b/arch/arm/boot/dts/aspeed-ast2600-evb.dts index f00b19a..9870553 100644 --- a/arch/arm/boot/dts/aspeed-ast2600-evb.dts +++ b/arch/arm/boot/dts/aspeed-ast2600-evb.dts
@@ -7,7 +7,7 @@ / { model = "AST2600 EVB"; - compatible = "aspeed,ast2600-evb-a1", "aspeed,ast2600"; + compatible = "aspeed,ast2600"; aliases { serial4 = &uart5;
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 3d694b6..287566e 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi
@@ -38,13 +38,6 @@ }; - usb1 { - pinctrl_usb1_vbus_gpio: usb1_vbus_gpio { - atmel,pins = - <AT91_PIOC 5 AT91_PERIPH_GPIO AT91_PINCTRL_DEGLITCH>; /* PC5 GPIO */ - }; - }; - mmc0_slot1 { pinctrl_board_mmc0_slot1: mmc0_slot1-board { atmel,pins = @@ -90,8 +83,6 @@ }; usb1: gadget@fffa4000 { - pinctrl-0 = <&pinctrl_usb1_vbus_gpio>; - pinctrl-names = "default"; atmel,vbus-gpio = <&pioC 5 GPIO_ACTIVE_HIGH>; status = "okay"; };
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi index 347624e..2e8a397 100644 --- a/arch/arm/boot/dts/dove.dtsi +++ b/arch/arm/boot/dts/dove.dtsi
@@ -129,7 +129,7 @@ pcie1: pcie@2 { device_type = "pci"; status = "disabled"; - assigned-addresses = <0x82001000 0 0x80000 0 0x2000>; + assigned-addresses = <0x82002800 0 0x80000 0 0x2000>; reg = <0x1000 0 0 0 0>; clocks = <&gate_clk 5>; marvell,pcie-port = <1>;
diff --git a/arch/arm/boot/dts/exynos3250-rinato.dts b/arch/arm/boot/dts/exynos3250-rinato.dts index 72d6b7c..468932f 100644 --- a/arch/arm/boot/dts/exynos3250-rinato.dts +++ b/arch/arm/boot/dts/exynos3250-rinato.dts
@@ -239,7 +239,7 @@ i80-if-timings { cs-setup = <0>; wr-setup = <0>; - wr-active = <1>; + wr-act = <1>; wr-hold = <0>; }; };
diff --git a/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi b/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi index 27a1a89..021d9fc 100644 --- a/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi +++ b/arch/arm/boot/dts/exynos4-cpu-thermal.dtsi
@@ -10,7 +10,7 @@ / { thermal-zones { cpu_thermal: cpu-thermal { - thermal-sensors = <&tmu>; + thermal-sensors = <&tmu 0>; polling-delay-passive = <0>; polling-delay = <0>; trips {
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index 1dd009c..433f109 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -605,7 +605,7 @@ status = "disabled"; hdmi_i2c_phy: hdmiphy@38 { - compatible = "samsung,exynos4210-hdmiphy"; + compatible = "exynos4210-hdmiphy"; reg = <0x38>; }; };
diff --git a/arch/arm/boot/dts/exynos4412-midas.dtsi b/arch/arm/boot/dts/exynos4412-midas.dtsi index 3538739..fedb213 100644 --- a/arch/arm/boot/dts/exynos4412-midas.dtsi +++ b/arch/arm/boot/dts/exynos4412-midas.dtsi
@@ -534,7 +534,7 @@ clocks = <&camera 1>; clock-names = "extclk"; samsung,camclk-out = <1>; - gpios = <&gpm1 6 GPIO_ACTIVE_LOW>; + gpios = <&gpm1 6 GPIO_ACTIVE_HIGH>; port { is_s5k6a3_ep: endpoint {
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts index c6678c1..ecd14b2 100644 --- a/arch/arm/boot/dts/exynos4412-origen.dts +++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -86,7 +86,7 @@ }; &ehci { - samsung,vbus-gpio = <&gpx3 5 GPIO_ACTIVE_HIGH>; + samsung,vbus-gpio = <&gpx3 5 1>; status = "okay"; phys = <&exynos_usbphy 2>, <&exynos_usbphy 3>; phy-names = "hsic0", "hsic1";
diff --git a/arch/arm/boot/dts/exynos5410-odroidxu.dts b/arch/arm/boot/dts/exynos5410-odroidxu.dts index 51b1a7f..f68baaf 100644 --- a/arch/arm/boot/dts/exynos5410-odroidxu.dts +++ b/arch/arm/boot/dts/exynos5410-odroidxu.dts
@@ -116,6 +116,7 @@ }; &cpu0_thermal { + thermal-sensors = <&tmu_cpu0 0>; polling-delay-passive = <0>; polling-delay = <0>;
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi index 5da434c..7d51e0f 100644 --- a/arch/arm/boot/dts/exynos5420.dtsi +++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -539,7 +539,7 @@ }; mipi_phy: mipi-video-phy { - compatible = "samsung,exynos5420-mipi-video-phy"; + compatible = "samsung,s5pv210-mipi-video-phy"; syscon = <&pmu_system_controller>; #phy-cells = <1>; };
diff --git a/arch/arm/boot/dts/imx53-ppd.dts b/arch/arm/boot/dts/imx53-ppd.dts index c01dc57..c80d170 100644 --- a/arch/arm/boot/dts/imx53-ppd.dts +++ b/arch/arm/boot/dts/imx53-ppd.dts
@@ -461,7 +461,7 @@ scl-gpios = <&gpio3 21 GPIO_ACTIVE_HIGH>; status = "okay"; - i2c-mux@70 { + i2c-switch@70 { compatible = "nxp,pca9547"; #address-cells = <1>; #size-cells = <0>;
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi index 4bde980..2ed1031 100644 --- a/arch/arm/boot/dts/imx6dl.dtsi +++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -81,9 +81,6 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; - ranges = <0 0x00900000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6QDL_CLK_OCRAM>; };
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 013080e..d038f41 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -158,9 +158,6 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x40000>; - ranges = <0 0x00900000 0x40000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6QDL_CLK_OCRAM>; };
diff --git a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi index c951834..e8e36df 100644 --- a/arch/arm/boot/dts/imx6qdl-gw560x.dtsi +++ b/arch/arm/boot/dts/imx6qdl-gw560x.dtsi
@@ -464,6 +464,7 @@ &uart1 { pinctrl-names = "default"; pinctrl-0 = <&pinctrl_uart1>; + uart-has-rtscts; rts-gpios = <&gpio7 1 GPIO_ACTIVE_HIGH>; status = "okay"; };
diff --git a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi index 5e454a6..eea317b 100644 --- a/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi +++ b/arch/arm/boot/dts/imx6qdl-kontron-samx6i.dtsi
@@ -51,6 +51,16 @@ vin-supply = <®_3p3v_s5>; }; + reg_3p3v_s0: regulator-3p3v-s0 { + compatible = "regulator-fixed"; + regulator-name = "V_3V3_S0"; + regulator-min-microvolt = <3300000>; + regulator-max-microvolt = <3300000>; + regulator-always-on; + regulator-boot-on; + vin-supply = <®_3p3v_s5>; + }; + reg_3p3v_s5: regulator-3p3v-s5 { compatible = "regulator-fixed"; regulator-name = "V_3V3_S5";
diff --git a/arch/arm/boot/dts/imx6qp.dtsi b/arch/arm/boot/dts/imx6qp.dtsi index 3633383..d91f92f 100644 --- a/arch/arm/boot/dts/imx6qp.dtsi +++ b/arch/arm/boot/dts/imx6qp.dtsi
@@ -9,18 +9,12 @@ ocram2: sram@940000 { compatible = "mmio-sram"; reg = <0x00940000 0x20000>; - ranges = <0 0x00940000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6QDL_CLK_OCRAM>; }; ocram3: sram@960000 { compatible = "mmio-sram"; reg = <0x00960000 0x20000>; - ranges = <0 0x00960000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6QDL_CLK_OCRAM>; };
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi index 852f669..540880f 100644 --- a/arch/arm/boot/dts/imx6sl.dtsi +++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -121,9 +121,6 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; - ranges = <0 0x00900000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6SL_CLK_OCRAM>; };
diff --git a/arch/arm/boot/dts/imx6sll.dtsi b/arch/arm/boot/dts/imx6sll.dtsi index 39500b8..13c7ba7 100644 --- a/arch/arm/boot/dts/imx6sll.dtsi +++ b/arch/arm/boot/dts/imx6sll.dtsi
@@ -123,9 +123,6 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; - ranges = <0 0x00900000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; }; intc: interrupt-controller@a01000 {
diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi index b3e24d8..531a52c 100644 --- a/arch/arm/boot/dts/imx6sx.dtsi +++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -163,18 +163,12 @@ ocram_s: sram@8f8000 { compatible = "mmio-sram"; reg = <0x008f8000 0x4000>; - ranges = <0 0x008f8000 0x4000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6SX_CLK_OCRAM_S>; }; ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; - ranges = <0 0x00900000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; clocks = <&clks IMX6SX_CLK_OCRAM>; };
diff --git a/arch/arm/boot/dts/imx6ul.dtsi b/arch/arm/boot/dts/imx6ul.dtsi index ae0722b..f008036 100644 --- a/arch/arm/boot/dts/imx6ul.dtsi +++ b/arch/arm/boot/dts/imx6ul.dtsi
@@ -62,18 +62,20 @@ clock-frequency = <696000000>; clock-latency = <61036>; /* two CLK32 periods */ #cooling-cells = <2>; - operating-points = + operating-points = < /* kHz uV */ - <696000 1275000>, - <528000 1175000>, - <396000 1025000>, - <198000 950000>; - fsl,soc-operating-points = + 696000 1275000 + 528000 1175000 + 396000 1025000 + 198000 950000 + >; + fsl,soc-operating-points = < /* KHz uV */ - <696000 1275000>, - <528000 1175000>, - <396000 1175000>, - <198000 1175000>; + 696000 1275000 + 528000 1175000 + 396000 1175000 + 198000 1175000 + >; clocks = <&clks IMX6UL_CLK_ARM>, <&clks IMX6UL_CLK_PLL2_BUS>, <&clks IMX6UL_CLK_PLL2_PFD2>, @@ -155,9 +157,6 @@ ocram: sram@900000 { compatible = "mmio-sram"; reg = <0x00900000 0x20000>; - ranges = <0 0x00900000 0x20000>; - #address-cells = <1>; - #size-cells = <1>; }; intc: interrupt-controller@a01000 { @@ -967,7 +966,7 @@ }; csi: csi@21c4000 { - compatible = "fsl,imx6ul-csi"; + compatible = "fsl,imx6ul-csi", "fsl,imx7-csi"; reg = <0x021c4000 0x4000>; interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_CSI>; @@ -976,7 +975,7 @@ }; lcdif: lcdif@21c8000 { - compatible = "fsl,imx6ul-lcdif", "fsl,imx6sx-lcdif"; + compatible = "fsl,imx6ul-lcdif", "fsl,imx28-lcdif"; reg = <0x021c8000 0x4000>; interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clks IMX6UL_CLK_LCDIF_PIX>, @@ -997,7 +996,7 @@ qspi: spi@21e0000 { #address-cells = <1>; #size-cells = <0>; - compatible = "fsl,imx6ul-qspi"; + compatible = "fsl,imx6ul-qspi", "fsl,imx6sx-qspi"; reg = <0x021e0000 0x4000>, <0x60000000 0x10000000>; reg-names = "QuadSPI", "QuadSPI-memory"; interrupts = <GIC_SPI 107 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm/boot/dts/imx7d-sdb.dts b/arch/arm/boot/dts/imx7d-sdb.dts index 363d1f5..a97cda1 100644 --- a/arch/arm/boot/dts/imx7d-sdb.dts +++ b/arch/arm/boot/dts/imx7d-sdb.dts
@@ -177,7 +177,12 @@ interrupt-parent = <&gpio2>; interrupts = <29 0>; pendown-gpio = <&gpio2 29 GPIO_ACTIVE_HIGH>; - touchscreen-max-pressure = <255>; + ti,x-min = /bits/ 16 <0>; + ti,x-max = /bits/ 16 <0>; + ti,y-min = /bits/ 16 <0>; + ti,y-max = /bits/ 16 <0>; + ti,pressure-max = /bits/ 16 <0>; + ti,x-plate-ohms = /bits/ 16 <400>; wakeup-source; }; };
diff --git a/arch/arm/boot/dts/imx7s.dtsi b/arch/arm/boot/dts/imx7s.dtsi index 1ef076b..e2e604d 100644 --- a/arch/arm/boot/dts/imx7s.dtsi +++ b/arch/arm/boot/dts/imx7s.dtsi
@@ -504,7 +504,7 @@ mux: mux-controller { compatible = "mmio-mux"; - #mux-control-cells = <1>; + #mux-control-cells = <0>; mux-reg-masks = <0x14 0x00000010>; };
diff --git a/arch/arm/boot/dts/integratorap.dts b/arch/arm/boot/dts/integratorap.dts index e6c5a99..94d2ff9 100644 --- a/arch/arm/boot/dts/integratorap.dts +++ b/arch/arm/boot/dts/integratorap.dts
@@ -155,7 +155,6 @@ pci: pciv3@62000000 { compatible = "arm,integrator-ap-pci", "v3,v360epc-pci"; - device_type = "pci"; #interrupt-cells = <1>; #size-cells = <2>; #address-cells = <3>;
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi index 88b70ba..7b151ac 100644 --- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi +++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -10,11 +10,6 @@ ocp@f1000000 { pinctrl: pin-controller@10000 { - /* Non-default UART pins */ - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp4", "mpp5"; - }; - pmx_power_hdd: pmx-power-hdd { marvell,pins = "mpp10"; marvell,function = "gpo"; @@ -218,11 +213,22 @@ &mdio { status = "okay"; + ethphy0: ethernet-phy@0 { + reg = <0>; + }; + ethphy1: ethernet-phy@8 { reg = <8>; }; }; +ð0 { + status = "okay"; + ethernet0-port@0 { + phy-handle = <ðphy0>; + }; +}; + ð1 { status = "okay"; ethernet1-port@0 {
diff --git a/arch/arm/boot/dts/moxart-uc7112lx.dts b/arch/arm/boot/dts/moxart-uc7112lx.dts index e07b807..eb5291b 100644 --- a/arch/arm/boot/dts/moxart-uc7112lx.dts +++ b/arch/arm/boot/dts/moxart-uc7112lx.dts
@@ -79,7 +79,7 @@ clocks = <&ref12>; }; -&mmc { +&sdhci { status = "okay"; };
diff --git a/arch/arm/boot/dts/moxart.dtsi b/arch/arm/boot/dts/moxart.dtsi index 764832d..f5f070a 100644 --- a/arch/arm/boot/dts/moxart.dtsi +++ b/arch/arm/boot/dts/moxart.dtsi
@@ -93,8 +93,8 @@ clock-names = "PCLK"; }; - mmc: mmc@98e00000 { - compatible = "moxa,moxart-mmc"; + sdhci: sdhci@98e00000 { + compatible = "moxa,moxart-sdhci"; reg = <0x98e00000 0x5C>; interrupts = <5 IRQ_TYPE_LEVEL_HIGH>; clocks = <&clk_apb>;
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 8c8a576..764984c 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi
@@ -1570,7 +1570,7 @@ }; etb@1a01000 { - compatible = "arm,coresight-etb10", "arm,primecell"; + compatible = "coresight-etb10", "arm,primecell"; reg = <0x1a01000 0x1000>; clocks = <&rpmcc RPM_QDSS_CLK>;
diff --git a/arch/arm/boot/dts/qcom-mdm9615.dtsi b/arch/arm/boot/dts/qcom-mdm9615.dtsi index ffb4dcd..356e953 100644 --- a/arch/arm/boot/dts/qcom-mdm9615.dtsi +++ b/arch/arm/boot/dts/qcom-mdm9615.dtsi
@@ -323,7 +323,6 @@ pmicgpio: gpio@150 { compatible = "qcom,pm8018-gpio", "qcom,ssbi-gpio"; - reg = <0x150>; interrupt-controller; #interrupt-cells = <2>; gpio-controller;
diff --git a/arch/arm/boot/dts/qcom-pm8841.dtsi b/arch/arm/boot/dts/qcom-pm8841.dtsi index c73e5b1..2fd59c4 100644 --- a/arch/arm/boot/dts/qcom-pm8841.dtsi +++ b/arch/arm/boot/dts/qcom-pm8841.dtsi
@@ -25,7 +25,6 @@ compatible = "qcom,spmi-temp-alarm"; reg = <0x2400>; interrupts = <4 0x24 0 IRQ_TYPE_EDGE_RISING>; - #thermal-sensor-cells = <0>; }; };
diff --git a/arch/arm/boot/dts/rk3036-evb.dts b/arch/arm/boot/dts/rk3036-evb.dts index ea23ba9..2a7e662 100644 --- a/arch/arm/boot/dts/rk3036-evb.dts +++ b/arch/arm/boot/dts/rk3036-evb.dts
@@ -31,7 +31,7 @@ &i2c1 { status = "okay"; - hym8563: rtc@51 { + hym8563: hym8563@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/rk3188-radxarock.dts b/arch/arm/boot/dts/rk3188-radxarock.dts index f8e51ca..c9a7f54 100644 --- a/arch/arm/boot/dts/rk3188-radxarock.dts +++ b/arch/arm/boot/dts/rk3188-radxarock.dts
@@ -67,7 +67,7 @@ #sound-dai-cells = <0>; }; - ir_recv: ir-receiver { + ir_recv: gpio-ir-receiver { compatible = "gpio-ir-receiver"; gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>; pinctrl-names = "default";
diff --git a/arch/arm/boot/dts/rk3188.dtsi b/arch/arm/boot/dts/rk3188.dtsi index 5e8ba80..ee8a24a 100644 --- a/arch/arm/boot/dts/rk3188.dtsi +++ b/arch/arm/boot/dts/rk3188.dtsi
@@ -404,7 +404,7 @@ rockchip,pins = <2 RK_PD3 1 &pcfg_pull_none>; }; - lcdc1_rgb24: lcdc1-rgb24 { + lcdc1_rgb24: ldcd1-rgb24 { rockchip,pins = <2 RK_PA0 1 &pcfg_pull_none>, <2 RK_PA1 1 &pcfg_pull_none>, <2 RK_PA2 1 &pcfg_pull_none>, @@ -632,6 +632,7 @@ &global_timer { interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; + status = "disabled"; }; &local_timer {
diff --git a/arch/arm/boot/dts/rk3288-evb-act8846.dts b/arch/arm/boot/dts/rk3288-evb-act8846.dts index 9ac40c1..8008076 100644 --- a/arch/arm/boot/dts/rk3288-evb-act8846.dts +++ b/arch/arm/boot/dts/rk3288-evb-act8846.dts
@@ -53,7 +53,7 @@ vin-supply = <&vcc_sys>; }; - rtc@51 { + hym8563@51 { compatible = "haoyu,hym8563"; reg = <0x51>;
diff --git a/arch/arm/boot/dts/rk3288-firefly.dtsi b/arch/arm/boot/dts/rk3288-firefly.dtsi index 8d41888..5e0a190 100644 --- a/arch/arm/boot/dts/rk3288-firefly.dtsi +++ b/arch/arm/boot/dts/rk3288-firefly.dtsi
@@ -233,7 +233,7 @@ vin-supply = <&vcc_sys>; }; - hym8563: rtc@51 { + hym8563: hym8563@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/rk3288-miqi.dts b/arch/arm/boot/dts/rk3288-miqi.dts index bf8f3f9..c41d012 100644 --- a/arch/arm/boot/dts/rk3288-miqi.dts +++ b/arch/arm/boot/dts/rk3288-miqi.dts
@@ -145,7 +145,7 @@ vin-supply = <&vcc_sys>; }; - hym8563: rtc@51 { + hym8563: hym8563@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/rk3288-rock2-square.dts b/arch/arm/boot/dts/rk3288-rock2-square.dts index 7220de1..cdcdc92 100644 --- a/arch/arm/boot/dts/rk3288-rock2-square.dts +++ b/arch/arm/boot/dts/rk3288-rock2-square.dts
@@ -165,7 +165,7 @@ }; &i2c0 { - hym8563: rtc@51 { + hym8563: hym8563@51 { compatible = "haoyu,hym8563"; reg = <0x51>; #clock-cells = <0>;
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi index 36f943a..7dcafd0 100644 --- a/arch/arm/boot/dts/rk3288.dtsi +++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -942,7 +942,7 @@ status = "disabled"; }; - spdif: sound@ff8b0000 { + spdif: sound@ff88b0000 { compatible = "rockchip,rk3288-spdif", "rockchip,rk3066-spdif"; reg = <0x0 0xff8b0000 0x0 0x10000>; #sound-dai-cells = <0>; @@ -1188,7 +1188,6 @@ clock-names = "dp", "pclk"; phys = <&edp_phy>; phy-names = "dp"; - power-domains = <&power RK3288_PD_VIO>; resets = <&cru SRST_EDP>; reset-names = "dp"; rockchip,grf = <&grf>;
diff --git a/arch/arm/boot/dts/rk3xxx.dtsi b/arch/arm/boot/dts/rk3xxx.dtsi index 0580eea..bce0b05 100644 --- a/arch/arm/boot/dts/rk3xxx.dtsi +++ b/arch/arm/boot/dts/rk3xxx.dtsi
@@ -108,13 +108,6 @@ reg = <0x1013c200 0x20>; interrupts = <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>; clocks = <&cru CORE_PERI>; - status = "disabled"; - /* The clock source and the sched_clock provided by the arm_global_timer - * on Rockchip rk3066a/rk3188 are quite unstable because their rates - * depend on the CPU frequency. - * Keep the arm_global_timer disabled in order to have the - * DW_APB_TIMER (rk3066a) or ROCKCHIP_TIMER (rk3188) selected by default. - */ }; local_timer: local-timer@1013c600 {
diff --git a/arch/arm/boot/dts/spear320-hmi.dts b/arch/arm/boot/dts/spear320-hmi.dts index 5c562fb..367ba48 100644 --- a/arch/arm/boot/dts/spear320-hmi.dts +++ b/arch/arm/boot/dts/spear320-hmi.dts
@@ -242,7 +242,7 @@ irq-trigger = <0x1>; stmpegpio: stmpe-gpio { - compatible = "st,stmpe-gpio"; + compatible = "stmpe,gpio"; reg = <0>; gpio-controller; #gpio-cells = <2>;
diff --git a/arch/arm/boot/dts/spear600.dtsi b/arch/arm/boot/dts/spear600.dtsi index 9d5a04a..fd41243 100644 --- a/arch/arm/boot/dts/spear600.dtsi +++ b/arch/arm/boot/dts/spear600.dtsi
@@ -47,7 +47,7 @@ compatible = "arm,pl110", "arm,primecell"; reg = <0xfc200000 0x1000>; interrupt-parent = <&vic1>; - interrupts = <13>; + interrupts = <12>; status = "disabled"; };
diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi index 049ca94..60a588c 100644 --- a/arch/arm/boot/dts/uniphier-pxs2.dtsi +++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -585,8 +585,8 @@ compatible = "socionext,uniphier-dwc3", "snps,dwc3"; status = "disabled"; reg = <0x65a00000 0xcd00>; - interrupt-names = "dwc_usb3"; - interrupts = <0 134 4>; + interrupt-names = "host", "peripheral"; + interrupts = <0 134 4>, <0 135 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>; clock-names = "ref", "bus_early", "suspend"; @@ -681,8 +681,8 @@ compatible = "socionext,uniphier-dwc3", "snps,dwc3"; status = "disabled"; reg = <0x65c00000 0xcd00>; - interrupt-names = "dwc_usb3"; - interrupts = <0 137 4>; + interrupt-names = "host", "peripheral"; + interrupts = <0 137 4>, <0 138 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>; clock-names = "ref", "bus_early", "suspend";
diff --git a/arch/arm/include/asm/perf_event.h b/arch/arm/include/asm/perf_event.h index bdbc1e5..fe87397 100644 --- a/arch/arm/include/asm/perf_event.h +++ b/arch/arm/include/asm/perf_event.h
@@ -17,7 +17,7 @@ extern unsigned long perf_misc_flags(struct pt_regs *regs); #define perf_arch_fetch_caller_regs(regs, __ip) { \ (regs)->ARM_pc = (__ip); \ - frame_pointer((regs)) = (unsigned long) __builtin_frame_address(0); \ + (regs)->ARM_fp = (unsigned long) __builtin_frame_address(0); \ (regs)->ARM_sp = current_stack_pointer; \ (regs)->ARM_cpsr = SVC_MODE; \ }
diff --git a/arch/arm/include/asm/pgtable-nommu.h b/arch/arm/include/asm/pgtable-nommu.h index e8ac2f9..010fa1a 100644 --- a/arch/arm/include/asm/pgtable-nommu.h +++ b/arch/arm/include/asm/pgtable-nommu.h
@@ -52,6 +52,12 @@ typedef pte_t *pte_addr_t; /* + * ZERO_PAGE is a global shared page that is always zero: used + * for zero-mapped memory areas etc.. + */ +#define ZERO_PAGE(vaddr) (virt_to_page(0)) + +/* * Mark the prot value as uncacheable and unbufferable. */ #define pgprot_noncached(prot) (prot)
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h index ecfd6e7..3ae120c 100644 --- a/arch/arm/include/asm/pgtable.h +++ b/arch/arm/include/asm/pgtable.h
@@ -10,15 +10,6 @@ #include <linux/const.h> #include <asm/proc-fns.h> -#ifndef __ASSEMBLY__ -/* - * ZERO_PAGE is a global shared page that is always zero: used - * for zero-mapped memory areas etc.. - */ -extern struct page *empty_zero_page; -#define ZERO_PAGE(vaddr) (empty_zero_page) -#endif - #ifndef CONFIG_MMU #include <asm-generic/4level-fixup.h> @@ -175,6 +166,13 @@ extern pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, #define __S111 __PAGE_SHARED_EXEC #ifndef __ASSEMBLY__ +/* + * ZERO_PAGE is a global shared page that is always zero: used + * for zero-mapped memory areas etc.. + */ +extern struct page *empty_zero_page; +#define ZERO_PAGE(vaddr) (empty_zero_page) + extern pgd_t swapper_pg_dir[PTRS_PER_PGD];
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index 4d39720..757991b 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c
@@ -354,7 +354,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, int signr) if (panic_on_oops) panic("Fatal exception"); if (signr) - make_task_dead(signr); + do_exit(signr); } /*
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S index 7fd3600..b5e8b9a 100644 --- a/arch/arm/lib/findbit.S +++ b/arch/arm/lib/findbit.S
@@ -40,8 +40,8 @@ * Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset) */ ENTRY(_find_next_zero_bit_le) - cmp r2, r1 - bhs 3b + teq r1, #0 + beq 3b ands ip, r2, #7 beq 1b @ If new byte, goto old routine ARM( ldrb r3, [r0, r2, lsr #3] ) @@ -81,8 +81,8 @@ * Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset) */ ENTRY(_find_next_bit_le) - cmp r2, r1 - bhs 3b + teq r1, #0 + beq 3b ands ip, r2, #7 beq 1b @ If new byte, goto old routine ARM( ldrb r3, [r0, r2, lsr #3] ) @@ -115,8 +115,8 @@ ENDPROC(_find_first_zero_bit_be) ENTRY(_find_next_zero_bit_be) - cmp r2, r1 - bhs 3b + teq r1, #0 + beq 3b ands ip, r2, #7 beq 1b @ If new byte, goto old routine eor r3, r2, #0x18 @ big endian byte ordering @@ -149,8 +149,8 @@ ENDPROC(_find_first_bit_be) ENTRY(_find_next_bit_be) - cmp r2, r1 - bhs 3b + teq r1, #0 + beq 3b ands ip, r2, #7 beq 1b @ If new byte, goto old routine eor r3, r2, #0x18 @ big endian byte ordering
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index 9175c13..541e850 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c
@@ -54,7 +54,6 @@ int __init bcm_kona_smc_init(void) return -ENODEV; prop_val = of_get_address(node, 0, &prop_size, NULL); - of_node_put(node); if (!prop_val) return -EINVAL;
diff --git a/arch/arm/mach-imx/cpu-imx25.c b/arch/arm/mach-imx/cpu-imx25.c index 2ee2d28..b2e1963 100644 --- a/arch/arm/mach-imx/cpu-imx25.c +++ b/arch/arm/mach-imx/cpu-imx25.c
@@ -23,7 +23,6 @@ static int mx25_read_cpu_rev(void) np = of_find_compatible_node(NULL, NULL, "fsl,imx25-iim"); iim_base = of_iomap(np, 0); - of_node_put(np); BUG_ON(!iim_base); rev = readl(iim_base + MXC_IIMSREV); iounmap(iim_base);
diff --git a/arch/arm/mach-imx/cpu-imx27.c b/arch/arm/mach-imx/cpu-imx27.c index 1d28939..a969aa7 100644 --- a/arch/arm/mach-imx/cpu-imx27.c +++ b/arch/arm/mach-imx/cpu-imx27.c
@@ -9,7 +9,6 @@ */ #include <linux/io.h> -#include <linux/of_address.h> #include <linux/module.h> #include "hardware.h" @@ -18,24 +17,16 @@ static int mx27_cpu_rev = -1; static int mx27_cpu_partnumber; #define SYS_CHIP_ID 0x00 /* The offset of CHIP ID register */ -#define SYSCTRL_OFFSET 0x800 /* Offset from CCM base address */ static int mx27_read_cpu_rev(void) { - void __iomem *ccm_base; - struct device_node *np; u32 val; - - np = of_find_compatible_node(NULL, NULL, "fsl,imx27-ccm"); - ccm_base = of_iomap(np, 0); - of_node_put(np); - BUG_ON(!ccm_base); /* * now we have access to the IO registers. As we need * the silicon revision very early we read it here to * avoid any further hooks */ - val = imx_readl(ccm_base + SYSCTRL_OFFSET + SYS_CHIP_ID); + val = imx_readl(MX27_IO_ADDRESS(MX27_SYSCTRL_BASE_ADDR + SYS_CHIP_ID)); mx27_cpu_partnumber = (int)((val >> 12) & 0xFFFF);
diff --git a/arch/arm/mach-imx/cpu-imx31.c b/arch/arm/mach-imx/cpu-imx31.c index 35c5449..3ee684b 100644 --- a/arch/arm/mach-imx/cpu-imx31.c +++ b/arch/arm/mach-imx/cpu-imx31.c
@@ -6,7 +6,6 @@ */ #include <linux/module.h> -#include <linux/of_address.h> #include <linux/io.h> #include "common.h" @@ -33,17 +32,10 @@ static struct { static int mx31_read_cpu_rev(void) { - void __iomem *iim_base; - struct device_node *np; u32 i, srev; - np = of_find_compatible_node(NULL, NULL, "fsl,imx31-iim"); - iim_base = of_iomap(np, 0); - of_node_put(np); - BUG_ON(!iim_base); - /* read SREV register from IIM module */ - srev = imx_readl(iim_base + MXC_IIMSREV); + srev = imx_readl(MX31_IO_ADDRESS(MX31_IIM_BASE_ADDR + MXC_IIMSREV)); srev &= 0xff; for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++)
diff --git a/arch/arm/mach-imx/cpu-imx35.c b/arch/arm/mach-imx/cpu-imx35.c index 1fe75b3..ebb3cda 100644 --- a/arch/arm/mach-imx/cpu-imx35.c +++ b/arch/arm/mach-imx/cpu-imx35.c
@@ -5,7 +5,6 @@ * Copyright (c) 2009 Daniel Mack <daniel@caiaq.de> */ #include <linux/module.h> -#include <linux/of_address.h> #include <linux/io.h> #include "hardware.h" @@ -15,16 +14,9 @@ static int mx35_cpu_rev = -1; static int mx35_read_cpu_rev(void) { - void __iomem *iim_base; - struct device_node *np; u32 rev; - np = of_find_compatible_node(NULL, NULL, "fsl,imx35-iim"); - iim_base = of_iomap(np, 0); - of_node_put(np); - BUG_ON(!iim_base); - - rev = imx_readl(iim_base + MXC_IIMSREV); + rev = imx_readl(MX35_IO_ADDRESS(MX35_IIM_BASE_ADDR + MXC_IIMSREV)); switch (rev) { case 0x00: return IMX_CHIP_REVISION_1_0;
diff --git a/arch/arm/mach-imx/cpu-imx5.c b/arch/arm/mach-imx/cpu-imx5.c index a67c89b..ad56263 100644 --- a/arch/arm/mach-imx/cpu-imx5.c +++ b/arch/arm/mach-imx/cpu-imx5.c
@@ -28,7 +28,6 @@ static u32 imx5_read_srev_reg(const char *compat) np = of_find_compatible_node(NULL, NULL, compat); iim_base = of_iomap(np, 0); - of_node_put(np); WARN_ON(!iim_base); srev = readl(iim_base + IIM_SREV) & 0xff;
diff --git a/arch/arm/mach-imx/mmdc.c b/arch/arm/mach-imx/mmdc.c index b9efe9d..af12668 100644 --- a/arch/arm/mach-imx/mmdc.c +++ b/arch/arm/mach-imx/mmdc.c
@@ -99,7 +99,6 @@ struct mmdc_pmu { cpumask_t cpu; struct hrtimer hrtimer; unsigned int active_events; - int id; struct device *dev; struct perf_event *mmdc_events[MMDC_NUM_COUNTERS]; struct hlist_node node; @@ -434,6 +433,8 @@ static enum hrtimer_restart mmdc_pmu_timer_handler(struct hrtimer *hrtimer) static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, void __iomem *mmdc_base, struct device *dev) { + int mmdc_num; + *pmu_mmdc = (struct mmdc_pmu) { .pmu = (struct pmu) { .task_ctx_nr = perf_invalid_context, @@ -451,16 +452,15 @@ static int mmdc_pmu_init(struct mmdc_pmu *pmu_mmdc, .active_events = 0, }; - pmu_mmdc->id = ida_simple_get(&mmdc_ida, 0, 0, GFP_KERNEL); + mmdc_num = ida_simple_get(&mmdc_ida, 0, 0, GFP_KERNEL); - return pmu_mmdc->id; + return mmdc_num; } static int imx_mmdc_remove(struct platform_device *pdev) { struct mmdc_pmu *pmu_mmdc = platform_get_drvdata(pdev); - ida_simple_remove(&mmdc_ida, pmu_mmdc->id); cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node); perf_pmu_unregister(&pmu_mmdc->pmu); iounmap(pmu_mmdc->mmdc_base); @@ -474,6 +474,7 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b { struct mmdc_pmu *pmu_mmdc; char *name; + int mmdc_num; int ret; const struct of_device_id *of_id = of_match_device(imx_mmdc_dt_ids, &pdev->dev); @@ -496,14 +497,14 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b cpuhp_mmdc_state = ret; } - ret = mmdc_pmu_init(pmu_mmdc, mmdc_base, &pdev->dev); - if (ret < 0) - goto pmu_free; - - name = devm_kasprintf(&pdev->dev, - GFP_KERNEL, "mmdc%d", ret); - + mmdc_num = mmdc_pmu_init(pmu_mmdc, mmdc_base, &pdev->dev); pmu_mmdc->mmdc_ipg_clk = mmdc_ipg_clk; + if (mmdc_num == 0) + name = "mmdc"; + else + name = devm_kasprintf(&pdev->dev, + GFP_KERNEL, "mmdc%d", mmdc_num); + pmu_mmdc->devtype_data = (struct fsl_mmdc_devtype_data *)of_id->data; hrtimer_init(&pmu_mmdc->hrtimer, CLOCK_MONOTONIC, @@ -524,7 +525,6 @@ static int imx_mmdc_perf_init(struct platform_device *pdev, void __iomem *mmdc_b pmu_register_err: pr_warn("MMDC Perf PMU failed (%d), disabled\n", ret); - ida_simple_remove(&mmdc_ida, pmu_mmdc->id); cpuhp_state_remove_instance_nocalls(cpuhp_mmdc_state, &pmu_mmdc->node); hrtimer_cancel(&pmu_mmdc->hrtimer); pmu_free:
diff --git a/arch/arm/mach-mmp/time.c b/arch/arm/mach-mmp/time.c index 0bdb872..483df32 100644 --- a/arch/arm/mach-mmp/time.c +++ b/arch/arm/mach-mmp/time.c
@@ -44,21 +44,18 @@ static void __iomem *mmp_timer_base = TIMERS_VIRT_BASE; /* - * Read the timer through the CVWR register. Delay is required after requesting - * a read. The CR register cannot be directly read due to metastability issues - * documented in the PXA168 software manual. + * FIXME: the timer needs some delay to stablize the counter capture */ static inline uint32_t timer_read(void) { - uint32_t val; - int delay = 3; + int delay = 100; __raw_writel(1, mmp_timer_base + TMR_CVWR(1)); while (delay--) - val = __raw_readl(mmp_timer_base + TMR_CVWR(1)); + cpu_relax(); - return val; + return __raw_readl(mmp_timer_base + TMR_CVWR(1)); } static u64 notrace mmp_read_sched_clock(void)
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c index a687e83..c109f47 100644 --- a/arch/arm/mach-mxs/mach-mxs.c +++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -387,10 +387,8 @@ static void __init mxs_machine_init(void) root = of_find_node_by_path("/"); ret = of_property_read_string(root, "model", &soc_dev_attr->machine); - if (ret) { - kfree(soc_dev_attr); + if (ret) return; - } soc_dev_attr->family = "Freescale MXS Family"; soc_dev_attr->soc_id = mxs_get_soc_id();
diff --git a/arch/arm/mach-omap1/timer.c b/arch/arm/mach-omap1/timer.c index 291bc37..4447210 100644 --- a/arch/arm/mach-omap1/timer.c +++ b/arch/arm/mach-omap1/timer.c
@@ -165,7 +165,7 @@ static int __init omap1_dm_timer_init(void) kfree(pdata); err_free_pdev: - platform_device_put(pdev); + platform_device_unregister(pdev); return ret; }
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 1de2516..1bd64f6 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c
@@ -211,7 +211,6 @@ static int __init omapdss_init_fbdev(void) node = of_find_node_by_name(NULL, "omap4_padconf_global"); if (node) omap4_dsi_mux_syscon = syscon_node_to_regmap(node); - of_node_put(node); return 0; } @@ -260,13 +259,11 @@ static int __init omapdss_init_of(void) if (!pdev) { pr_err("Unable to find DSS platform device\n"); - of_node_put(node); return -ENODEV; } r = of_platform_populate(node, NULL, NULL, &pdev->dev); put_device(&pdev->dev); - of_node_put(node); if (r) { pr_err("Unable to populate DSS submodule devices\n"); return r;
diff --git a/arch/arm/mach-omap2/prm3xxx.c b/arch/arm/mach-omap2/prm3xxx.c index 63e73e9..1b442b1 100644 --- a/arch/arm/mach-omap2/prm3xxx.c +++ b/arch/arm/mach-omap2/prm3xxx.c
@@ -708,7 +708,6 @@ static int omap3xxx_prm_late_init(void) } irq_num = of_irq_get(np, 0); - of_node_put(np); if (irq_num == -EPROBE_DEFER) return irq_num;
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 15217c0..b92cb1e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c
@@ -649,7 +649,6 @@ static void __init realtime_counter_init(void) } rate = clk_get_rate(sys_clk); - clk_put(sys_clk); if (soc_is_dra7xx()) { /*
diff --git a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c index ba44cec..09ef73b 100644 --- a/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c +++ b/arch/arm/mach-shmobile/regulator-quirk-rcar-gen2.c
@@ -125,7 +125,6 @@ static int regulator_quirk_notify(struct notifier_block *nb, list_for_each_entry_safe(pos, tmp, &quirk_list, list) { list_del(&pos->list); - of_node_put(pos->np); kfree(pos); } @@ -175,12 +174,11 @@ static int __init rcar_gen2_regulator_quirk(void) memcpy(&quirk->i2c_msg, id->data, sizeof(quirk->i2c_msg)); quirk->id = id; - quirk->np = of_node_get(np); + quirk->np = np; quirk->i2c_msg.addr = addr; ret = of_irq_parse_one(np, 0, argsa); if (ret) { /* Skip invalid entry and continue */ - of_node_put(np); kfree(quirk); continue; } @@ -227,7 +225,6 @@ static int __init rcar_gen2_regulator_quirk(void) err_mem: list_for_each_entry_safe(pos, tmp, &quirk_list, list) { list_del(&pos->list); - of_node_put(pos->np); kfree(pos); }
diff --git a/arch/arm/mach-zynq/common.c b/arch/arm/mach-zynq/common.c index 25530dd..3a4248f 100644 --- a/arch/arm/mach-zynq/common.c +++ b/arch/arm/mach-zynq/common.c
@@ -77,7 +77,6 @@ static int __init zynq_get_revision(void) } zynq_devcfg_base = of_iomap(np, 0); - of_node_put(np); if (!zynq_devcfg_base) { pr_err("%s: Unable to map I/O memory\n", __func__); return -1;
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c index 9765b3f..3770761 100644 --- a/arch/arm/mach-zynq/slcr.c +++ b/arch/arm/mach-zynq/slcr.c
@@ -213,7 +213,6 @@ int __init zynq_early_slcr_init(void) zynq_slcr_regmap = syscon_regmap_lookup_by_compatible("xlnx,zynq-slcr"); if (IS_ERR(zynq_slcr_regmap)) { pr_err("%s: failed to find zynq-slcr\n", __func__); - of_node_put(np); return -ENODEV; }
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index 70700c2..b1f4423 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c
@@ -2337,15 +2337,15 @@ void arch_teardown_dma_ops(struct device *dev) } #ifdef CONFIG_SWIOTLB -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_page_cpu_to_dev(phys_to_page(paddr), paddr & (PAGE_SIZE - 1), size, dir); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_page_dev_to_cpu(phys_to_page(paddr), paddr & (PAGE_SIZE - 1), size, dir);
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c index 5203659..d592417 100644 --- a/arch/arm/mm/fault.c +++ b/arch/arm/mm/fault.c
@@ -165,7 +165,7 @@ __do_kernel_fault(struct mm_struct *mm, unsigned long addr, unsigned int fsr, show_pte(KERN_ALERT, mm, addr); die("Oops", regs, fsr); bust_spinlocks(0); - make_task_dead(SIGKILL); + do_exit(SIGKILL); } #ifdef CONFIG_AMLOGIC_USER_FAULT
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c index 7ff78de..d75ace0 100644 --- a/arch/arm/mm/mmu.c +++ b/arch/arm/mm/mmu.c
@@ -321,11 +321,7 @@ static struct mem_type mem_types[] __ro_after_init = { .prot_pte = L_PTE_PRESENT | L_PTE_YOUNG | L_PTE_DIRTY | L_PTE_XN | L_PTE_RDONLY, .prot_l1 = PMD_TYPE_TABLE, -#ifdef CONFIG_ARM_LPAE - .prot_sect = PMD_TYPE_SECT | L_PMD_SECT_RDONLY | PMD_SECT_AP2, -#else .prot_sect = PMD_TYPE_SECT, -#endif .domain = DOMAIN_KERNEL, }, [MT_ROM] = {
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c index 74a24e6..24ecf8d 100644 --- a/arch/arm/mm/nommu.c +++ b/arch/arm/mm/nommu.c
@@ -26,13 +26,6 @@ unsigned long vectors_base; -/* - * empty_zero_page is a special page that is used for - * zero-initialized data and COW. - */ -struct page *empty_zero_page; -EXPORT_SYMBOL(empty_zero_page); - #ifdef CONFIG_ARM_MPU struct mpu_rgn_info mpu_rgn_info; #endif @@ -155,21 +148,9 @@ void __init adjust_lowmem_bounds(void) */ void __init paging_init(const struct machine_desc *mdesc) { - void *zero_page; - early_trap_init((void *)vectors_base); mpu_setup(); - - /* allocate the zero page. */ - zero_page = (void *)memblock_alloc(PAGE_SIZE, PAGE_SIZE); - if (!zero_page) - panic("%s: Failed to allocate %lu bytes align=0x%lx\n", - __func__, PAGE_SIZE, PAGE_SIZE); - bootmem_init(); - - empty_zero_page = virt_to_page(zero_page); - flush_dcache_page(empty_zero_page); } /*
diff --git a/arch/arm/nwfpe/Makefile b/arch/arm/nwfpe/Makefile index 2aec85a..303400f 100644 --- a/arch/arm/nwfpe/Makefile +++ b/arch/arm/nwfpe/Makefile
@@ -11,9 +11,3 @@ entry.o nwfpe-$(CONFIG_FPE_NWFPE_XP) += extended_cpdo.o - -# Try really hard to avoid generating calls to __aeabi_uldivmod() from -# float64_rem() due to loop elision. -ifdef CONFIG_CC_IS_CLANG -CFLAGS_softfloat.o += -mllvm -replexitval=never -endif
diff --git a/arch/arm/xen/mm.c b/arch/arm/xen/mm.c index a6a2514..38fa917 100644 --- a/arch/arm/xen/mm.c +++ b/arch/arm/xen/mm.c
@@ -70,20 +70,20 @@ static void dma_cache_maint(dma_addr_t handle, size_t size, u32 op) * pfn_valid returns true the pages is local and we can use the native * dma-direct functions, otherwise we call the Xen specific version. */ -void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, enum dma_data_direction dir) { if (pfn_valid(PFN_DOWN(handle))) - arch_sync_dma_for_cpu(paddr, size, dir); + arch_sync_dma_for_cpu(dev, paddr, size, dir); else if (dir != DMA_TO_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); } -void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, enum dma_data_direction dir) { if (pfn_valid(PFN_DOWN(handle))) - arch_sync_dma_for_device(paddr, size, dir); + arch_sync_dma_for_device(dev, paddr, size, dir); else if (dir == DMA_FROM_DEVICE) dma_cache_maint(handle, size, GNTTAB_CACHE_INVAL); else
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index 92f1b26..9f479b8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig
@@ -582,22 +582,6 @@ If unsure, say Y. -config ARM64_ERRATUM_1742098 - bool "Cortex-A57/A72: 1742098: ELR recorded incorrectly on interrupt taken between cryptographic instructions in a sequence" - depends on COMPAT - default y - help - This option removes the AES hwcap for aarch32 user-space to - workaround erratum 1742098 on Cortex-A57 and Cortex-A72. - - Affected parts may corrupt the AES state if an interrupt is - taken between a pair of AES instructions. These instructions - are only present if the cryptography extensions are present. - All software should have a fallback implementation for CPUs - that don't implement the cryptography extensions. - - If unsure, say Y. - config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts index 963a7c5..a0db025 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
@@ -78,7 +78,7 @@ leds { compatible = "gpio-leds"; - led-0 { + status { label = "orangepi:green:status"; gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */ };
diff --git a/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h b/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h index 35a60b0..93b44ef 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h +++ b/arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h
@@ -585,7 +585,7 @@ #define MX8MM_IOMUXC_UART1_RXD_GPIO5_IO22 0x234 0x49C 0x000 0x5 0x0 #define MX8MM_IOMUXC_UART1_RXD_TPSMP_HDATA24 0x234 0x49C 0x000 0x7 0x0 #define MX8MM_IOMUXC_UART1_TXD_UART1_DCE_TX 0x238 0x4A0 0x000 0x0 0x0 -#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x1 +#define MX8MM_IOMUXC_UART1_TXD_UART1_DTE_RX 0x238 0x4A0 0x4F4 0x0 0x0 #define MX8MM_IOMUXC_UART1_TXD_ECSPI3_MOSI 0x238 0x4A0 0x000 0x1 0x0 #define MX8MM_IOMUXC_UART1_TXD_GPIO5_IO23 0x238 0x4A0 0x000 0x5 0x0 #define MX8MM_IOMUXC_UART1_TXD_TPSMP_HDATA25 0x238 0x4A0 0x000 0x7 0x0
diff --git a/arch/arm64/boot/dts/freescale/imx8mm.dtsi b/arch/arm64/boot/dts/freescale/imx8mm.dtsi index 3043996..7b178a7 100644 --- a/arch/arm64/boot/dts/freescale/imx8mm.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mm.dtsi
@@ -838,10 +838,10 @@ clocks = <&clk IMX8MM_CLK_NAND_USDHC_BUS_RAWNAND_CLK>; }; - gpmi: nand-controller@33002000 { + gpmi: nand-controller@33002000{ compatible = "fsl,imx8mm-gpmi-nand", "fsl,imx7d-gpmi-nand"; #address-cells = <1>; - #size-cells = <0>; + #size-cells = <1>; reg = <0x33002000 0x2000>, <0x33004000 0x4000>; reg-names = "gpmi-nand", "bch"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi index 31c0177..546511b 100644 --- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi +++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -695,7 +695,7 @@ gpmi: nand-controller@33002000 { compatible = "fsl,imx8mn-gpmi-nand", "fsl,imx7d-gpmi-nand"; #address-cells = <1>; - #size-cells = <0>; + #size-cells = <1>; reg = <0x33002000 0x2000>, <0x33004000 0x4000>; reg-names = "gpmi-nand", "bch"; interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
diff --git a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts index 351e211..2e8239d 100644 --- a/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts +++ b/arch/arm64/boot/dts/marvell/armada-3720-turris-mox.dts
@@ -122,12 +122,9 @@ /delete-property/ mrvl,i2c-fast-mode; status = "okay"; - /* MCP7940MT-I/MNY RTC */ rtc@6f { compatible = "microchip,mcp7940x"; reg = <0x6f>; - interrupt-parent = <&gpiosb>; - interrupts = <5 0>; /* GPIO2_5 */ }; };
diff --git a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts index 45e37aa..2b91daf 100644 --- a/arch/arm64/boot/dts/mediatek/mt2712-evb.dts +++ b/arch/arm64/boot/dts/mediatek/mt2712-evb.dts
@@ -26,14 +26,14 @@ stdout-path = "serial0:921600n8"; }; - cpus_fixed_vproc0: regulator-vproc-buck0 { + cpus_fixed_vproc0: fixedregulator@0 { compatible = "regulator-fixed"; regulator-name = "vproc_buck0"; regulator-min-microvolt = <1000000>; regulator-max-microvolt = <1000000>; }; - cpus_fixed_vproc1: regulator-vproc-buck1 { + cpus_fixed_vproc1: fixedregulator@1 { compatible = "regulator-fixed"; regulator-name = "vproc_buck1"; regulator-min-microvolt = <1000000>; @@ -50,7 +50,7 @@ id-gpio = <&pio 14 GPIO_ACTIVE_HIGH>; }; - usb_p0_vbus: regulator-usb-p0-vbus { + usb_p0_vbus: regulator@2 { compatible = "regulator-fixed"; regulator-name = "p0_vbus"; regulator-min-microvolt = <5000000>; @@ -59,7 +59,7 @@ enable-active-high; }; - usb_p1_vbus: regulator-usb-p1-vbus { + usb_p1_vbus: regulator@3 { compatible = "regulator-fixed"; regulator-name = "p1_vbus"; regulator-min-microvolt = <5000000>; @@ -68,7 +68,7 @@ enable-active-high; }; - usb_p2_vbus: regulator-usb-p2-vbus { + usb_p2_vbus: regulator@4 { compatible = "regulator-fixed"; regulator-name = "p2_vbus"; regulator-min-microvolt = <5000000>; @@ -77,7 +77,7 @@ enable-active-high; }; - usb_p3_vbus: regulator-usb-p3-vbus { + usb_p3_vbus: regulator@5 { compatible = "regulator-fixed"; regulator-name = "p3_vbus"; regulator-min-microvolt = <5000000>;
diff --git a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi index 3b12bb3..43307ba 100644 --- a/arch/arm64/boot/dts/mediatek/mt2712e.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt2712e.dtsi
@@ -160,70 +160,70 @@ #clock-cells = <0>; }; - clk26m: oscillator-26m { + clk26m: oscillator@0 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>; clock-output-names = "clk26m"; }; - clk32k: oscillator-32k { + clk32k: oscillator@1 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <32768>; clock-output-names = "clk32k"; }; - clkfpc: oscillator-50m { + clkfpc: oscillator@2 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <50000000>; clock-output-names = "clkfpc"; }; - clkaud_ext_i_0: oscillator-aud0 { + clkaud_ext_i_0: oscillator@3 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <6500000>; clock-output-names = "clkaud_ext_i_0"; }; - clkaud_ext_i_1: oscillator-aud1 { + clkaud_ext_i_1: oscillator@4 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <196608000>; clock-output-names = "clkaud_ext_i_1"; }; - clkaud_ext_i_2: oscillator-aud2 { + clkaud_ext_i_2: oscillator@5 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <180633600>; clock-output-names = "clkaud_ext_i_2"; }; - clki2si0_mck_i: oscillator-i2s0 { + clki2si0_mck_i: oscillator@6 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <30000000>; clock-output-names = "clki2si0_mck_i"; }; - clki2si1_mck_i: oscillator-i2s1 { + clki2si1_mck_i: oscillator@7 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <30000000>; clock-output-names = "clki2si1_mck_i"; }; - clki2si2_mck_i: oscillator-i2s2 { + clki2si2_mck_i: oscillator@8 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <30000000>; clock-output-names = "clki2si2_mck_i"; }; - clktdmin_mclk_i: oscillator-mclk { + clktdmin_mclk_i: oscillator@9 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <30000000>; @@ -266,7 +266,7 @@ reg = <0 0x10005000 0 0x1000>; }; - pio: pinctrl@1000b000 { + pio: pinctrl@10005000 { compatible = "mediatek,mt2712-pinctrl"; reg = <0 0x1000b000 0 0x1000>; mediatek,pctl-regmap = <&syscfg_pctl_a>;
diff --git a/arch/arm64/boot/dts/mediatek/mt6797.dtsi b/arch/arm64/boot/dts/mediatek/mt6797.dtsi index d4c78c9..2b2a69c 100644 --- a/arch/arm64/boot/dts/mediatek/mt6797.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt6797.dtsi
@@ -102,7 +102,7 @@ }; }; - clk26m: oscillator-26m { + clk26m: oscillator@0 { compatible = "fixed-clock"; #clock-cells = <0>; clock-frequency = <26000000>;
diff --git a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts index 81215cc..83e1059 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts +++ b/arch/arm64/boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts
@@ -49,7 +49,7 @@ wps { label = "wps"; linux,code = <KEY_WPS_BUTTON>; - gpios = <&pio 102 GPIO_ACTIVE_LOW>; + gpios = <&pio 102 GPIO_ACTIVE_HIGH>; }; };
diff --git a/arch/arm64/boot/dts/mediatek/mt7622.dtsi b/arch/arm64/boot/dts/mediatek/mt7622.dtsi index 3bfe9f5..e7e002d 100644 --- a/arch/arm64/boot/dts/mediatek/mt7622.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7622.dtsi
@@ -428,7 +428,6 @@ pwm: pwm@11006000 { compatible = "mediatek,mt7622-pwm"; reg = <0 0x11006000 0 0x1000>; - #pwm-cells = <2>; interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_LOW>; clocks = <&topckgen CLK_TOP_PWM_SEL>, <&pericfg CLK_PERI_PWM_PD>,
diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi index 1e9fa04..7822592 100644 --- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi +++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -253,7 +253,7 @@ status = "disabled"; }; - qpic_nand: nand-controller@79b0000 { + qpic_nand: nand@79b0000 { compatible = "qcom,ipq8074-nand"; reg = <0x79b0000 0x10000>; #address-cells = <1>;
diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi index 1eb51b1..a97eeb4 100644 --- a/arch/arm64/boot/dts/qcom/qcs404.dtsi +++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -533,7 +533,7 @@ clocks = <&gcc GCC_PCIE_0_PIPE_CLK>; resets = <&gcc GCC_PCIEPHY_0_PHY_BCR>, - <&gcc GCC_PCIE_0_PIPE_ARES>; + <&gcc 21>; reset-names = "phy", "pipe"; clock-output-names = "pcie_0_pipe_clk"; @@ -991,12 +991,12 @@ <&gcc GCC_PCIE_0_SLV_AXI_CLK>; clock-names = "iface", "aux", "master_bus", "slave_bus"; - resets = <&gcc GCC_PCIE_0_AXI_MASTER_ARES>, - <&gcc GCC_PCIE_0_AXI_SLAVE_ARES>, - <&gcc GCC_PCIE_0_AXI_MASTER_STICKY_ARES>, - <&gcc GCC_PCIE_0_CORE_STICKY_ARES>, + resets = <&gcc 18>, + <&gcc 17>, + <&gcc 15>, + <&gcc 19>, <&gcc GCC_PCIE_0_BCR>, - <&gcc GCC_PCIE_0_AHB_ARES>; + <&gcc 16>; reset-names = "axi_m", "axi_s", "axi_m_sticky",
diff --git a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi index 2b7923f..99a28d6 100644 --- a/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +++ b/arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi
@@ -1310,7 +1310,7 @@ config { pins = "gpio126"; function = "gpio"; - bias-disable; + bias-no-pull; drive-strength = <2>; output-low; }; @@ -1320,7 +1320,7 @@ config { pins = "gpio126"; function = "gpio"; - bias-disable; + bias-no-pull; drive-strength = <2>; output-high; };
diff --git a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts index 5eb8f01..840d6b9 100644 --- a/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts +++ b/arch/arm64/boot/dts/qcom/sdm850-lenovo-yoga-c630.dts
@@ -298,10 +298,8 @@ }; &qup_i2c12_default { - pinmux { - drive-strength = <2>; - bias-disable; - }; + drive-strength = <2>; + bias-disable; }; &qup_uart6_default {
diff --git a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts index fbd942b..6c3368f 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts
@@ -90,6 +90,7 @@ linux,default-trigger = "heartbeat"; gpios = <&rk805 1 GPIO_ACTIVE_LOW>; default-state = "on"; + mode = <0x23>; }; user { @@ -97,6 +98,7 @@ linux,default-trigger = "mmc1"; gpios = <&rk805 0 GPIO_ACTIVE_LOW>; default-state = "off"; + mode = <0x05>; }; }; };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts index 5863513..a9f4d6d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-bob.dts
@@ -77,8 +77,3 @@ }; }; }; - -&wlan_host_wake_l { - /* Kevin has an external pull up, but Bob does not. */ - rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_up>; -};
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi index 7416db3..7cd6d47 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-gru-chromebook.dtsi
@@ -237,14 +237,6 @@ &edp { status = "okay"; - /* - * eDP PHY/clk don't sync reliably at anything other than 24 MHz. Only - * set this here, because rk3399-gru.dtsi ensures we can generate this - * off GPLL=600MHz, whereas some other RK3399 boards may not. - */ - assigned-clocks = <&cru PCLK_EDP>; - assigned-clock-rates = <24000000>; - ports { edp_out: port@1 { reg = <1>; @@ -405,7 +397,6 @@ }; wlan_host_wake_l: wlan-host-wake-l { - /* Kevin has an external pull up, but Bob does not */ rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>; }; };
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts index d29937e..d80d6b7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma-haikou.dts
@@ -203,7 +203,7 @@ cap-sd-highspeed; cd-gpios = <&gpio0 RK_PA7 GPIO_ACTIVE_LOW>; disable-wp; - max-frequency = <40000000>; + max-frequency = <150000000>; pinctrl-names = "default"; pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_cd &sdmmc_bus4>; vmmc-supply = <&vcc3v3_baseboard>;
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi index 365fa9a..390b86e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi
@@ -102,6 +102,7 @@ vcc5v0_host: vcc5v0-host-regulator { compatible = "regulator-fixed"; gpio = <&gpio4 RK_PA3 GPIO_ACTIVE_LOW>; + enable-active-low; pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_host_en>; regulator-name = "vcc5v0_host";
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts index 79d04a6..da3b031 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dts
@@ -441,6 +441,7 @@ &i2s1 { rockchip,playback-channels = <2>; rockchip,capture-channels = <2>; + status = "okay"; }; &i2s2 {
diff --git a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi index b793a43..6537c69 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi +++ b/arch/arm64/boot/dts/socionext/uniphier-pxs3.dtsi
@@ -544,8 +544,8 @@ compatible = "socionext,uniphier-dwc3", "snps,dwc3"; status = "disabled"; reg = <0x65a00000 0xcd00>; - interrupt-names = "dwc_usb3"; - interrupts = <0 134 4>; + interrupt-names = "host", "peripheral"; + interrupts = <0 134 4>, <0 135 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb0>, <&pinctrl_usb2>; clock-names = "ref", "bus_early", "suspend"; @@ -646,8 +646,8 @@ compatible = "socionext,uniphier-dwc3", "snps,dwc3"; status = "disabled"; reg = <0x65c00000 0xcd00>; - interrupt-names = "dwc_usb3"; - interrupts = <0 137 4>; + interrupt-names = "host", "peripheral"; + interrupts = <0 137 4>, <0 138 4>; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usb1>, <&pinctrl_usb3>; clock-names = "ref", "bus_early", "suspend";
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig index 06d6b34..1e7eee7 100644 --- a/arch/arm64/configs/gki_defconfig +++ b/arch/arm64/configs/gki_defconfig
@@ -221,6 +221,7 @@ CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y +CONFIG_NET_CLS_TCINDEX=y CONFIG_NET_CLS_FW=y CONFIG_NET_CLS_U32=y CONFIG_NET_CLS_BPF=y @@ -341,7 +342,6 @@ # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y # CONFIG_SERIAL_8250_EXAR is not set -CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_AMBA_PL011=y @@ -472,7 +472,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_LEDS_CLASS_FLASH=y -CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_EDAC=y CONFIG_RTC_CLASS=y @@ -634,7 +633,6 @@ CONFIG_PANIC_TIMEOUT=-1 CONFIG_SCHEDSTATS=y # CONFIG_DEBUG_PREEMPT is not set -CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y
diff --git a/arch/arm64/crypto/Kconfig b/arch/arm64/crypto/Kconfig index ea34fae..30d9b24 100644 --- a/arch/arm64/crypto/Kconfig +++ b/arch/arm64/crypto/Kconfig
@@ -59,7 +59,6 @@ select CRYPTO_HASH select CRYPTO_GF128MUL select CRYPTO_LIB_AES - select CRYPTO_AEAD config CRYPTO_CRCT10DIF_ARM64_CE tristate "CRCT10DIF digest algorithm using PMULL instructions"
diff --git a/arch/arm64/include/asm/atomic_ll_sc.h b/arch/arm64/include/asm/atomic_ll_sc.h index abd302e..7b01214 100644 --- a/arch/arm64/include/asm/atomic_ll_sc.h +++ b/arch/arm64/include/asm/atomic_ll_sc.h
@@ -12,6 +12,19 @@ #include <linux/stringify.h> +#if IS_ENABLED(CONFIG_ARM64_LSE_ATOMICS) && IS_ENABLED(CONFIG_AS_LSE) +#define __LL_SC_FALLBACK(asm_ops) \ +" b 3f\n" \ +" .subsection 1\n" \ +"3:\n" \ +asm_ops "\n" \ +" b 4f\n" \ +" .previous\n" \ +"4:\n" +#else +#define __LL_SC_FALLBACK(asm_ops) asm_ops +#endif + #ifndef CONFIG_CC_HAS_K_CONSTRAINT #define K #endif @@ -30,11 +43,12 @@ __ll_sc_atomic_##op(int i, atomic_t *v) \ int result; \ \ asm volatile("// atomic_" #op "\n" \ - " prfm pstl1strm, %2\n" \ - "1: ldxr %w0, %2\n" \ - " " #asm_op " %w0, %w0, %w3\n" \ - " stxr %w1, %w0, %2\n" \ - " cbnz %w1, 1b\n" \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %2\n" \ +"1: ldxr %w0, %2\n" \ +" " #asm_op " %w0, %w0, %w3\n" \ +" stxr %w1, %w0, %2\n" \ +" cbnz %w1, 1b\n") \ : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i)); \ } @@ -47,12 +61,13 @@ __ll_sc_atomic_##op##_return##name(int i, atomic_t *v) \ int result; \ \ asm volatile("// atomic_" #op "_return" #name "\n" \ - " prfm pstl1strm, %2\n" \ - "1: ld" #acq "xr %w0, %2\n" \ - " " #asm_op " %w0, %w0, %w3\n" \ - " st" #rel "xr %w1, %w0, %2\n" \ - " cbnz %w1, 1b\n" \ - " " #mb \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %2\n" \ +"1: ld" #acq "xr %w0, %2\n" \ +" " #asm_op " %w0, %w0, %w3\n" \ +" st" #rel "xr %w1, %w0, %2\n" \ +" cbnz %w1, 1b\n" \ +" " #mb ) \ : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i) \ : cl); \ @@ -68,12 +83,13 @@ __ll_sc_atomic_fetch_##op##name(int i, atomic_t *v) \ int val, result; \ \ asm volatile("// atomic_fetch_" #op #name "\n" \ - " prfm pstl1strm, %3\n" \ - "1: ld" #acq "xr %w0, %3\n" \ - " " #asm_op " %w1, %w0, %w4\n" \ - " st" #rel "xr %w2, %w1, %3\n" \ - " cbnz %w2, 1b\n" \ - " " #mb \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %3\n" \ +"1: ld" #acq "xr %w0, %3\n" \ +" " #asm_op " %w1, %w0, %w4\n" \ +" st" #rel "xr %w2, %w1, %3\n" \ +" cbnz %w2, 1b\n" \ +" " #mb ) \ : "=&r" (result), "=&r" (val), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i) \ : cl); \ @@ -126,11 +142,12 @@ __ll_sc_atomic64_##op(s64 i, atomic64_t *v) \ unsigned long tmp; \ \ asm volatile("// atomic64_" #op "\n" \ - " prfm pstl1strm, %2\n" \ - "1: ldxr %0, %2\n" \ - " " #asm_op " %0, %0, %3\n" \ - " stxr %w1, %0, %2\n" \ - " cbnz %w1, 1b" \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %2\n" \ +"1: ldxr %0, %2\n" \ +" " #asm_op " %0, %0, %3\n" \ +" stxr %w1, %0, %2\n" \ +" cbnz %w1, 1b") \ : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i)); \ } @@ -143,12 +160,13 @@ __ll_sc_atomic64_##op##_return##name(s64 i, atomic64_t *v) \ unsigned long tmp; \ \ asm volatile("// atomic64_" #op "_return" #name "\n" \ - " prfm pstl1strm, %2\n" \ - "1: ld" #acq "xr %0, %2\n" \ - " " #asm_op " %0, %0, %3\n" \ - " st" #rel "xr %w1, %0, %2\n" \ - " cbnz %w1, 1b\n" \ - " " #mb \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %2\n" \ +"1: ld" #acq "xr %0, %2\n" \ +" " #asm_op " %0, %0, %3\n" \ +" st" #rel "xr %w1, %0, %2\n" \ +" cbnz %w1, 1b\n" \ +" " #mb ) \ : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i) \ : cl); \ @@ -158,18 +176,19 @@ __ll_sc_atomic64_##op##_return##name(s64 i, atomic64_t *v) \ #define ATOMIC64_FETCH_OP(name, mb, acq, rel, cl, op, asm_op, constraint)\ static inline long \ -__ll_sc_atomic64_fetch_##op##name(s64 i, atomic64_t *v) \ +__ll_sc_atomic64_fetch_##op##name(s64 i, atomic64_t *v) \ { \ s64 result, val; \ unsigned long tmp; \ \ asm volatile("// atomic64_fetch_" #op #name "\n" \ - " prfm pstl1strm, %3\n" \ - "1: ld" #acq "xr %0, %3\n" \ - " " #asm_op " %1, %0, %4\n" \ - " st" #rel "xr %w2, %1, %3\n" \ - " cbnz %w2, 1b\n" \ - " " #mb \ + __LL_SC_FALLBACK( \ +" prfm pstl1strm, %3\n" \ +"1: ld" #acq "xr %0, %3\n" \ +" " #asm_op " %1, %0, %4\n" \ +" st" #rel "xr %w2, %1, %3\n" \ +" cbnz %w2, 1b\n" \ +" " #mb ) \ : "=&r" (result), "=&r" (val), "=&r" (tmp), "+Q" (v->counter) \ : __stringify(constraint) "r" (i) \ : cl); \ @@ -221,14 +240,15 @@ __ll_sc_atomic64_dec_if_positive(atomic64_t *v) unsigned long tmp; asm volatile("// atomic64_dec_if_positive\n" - " prfm pstl1strm, %2\n" - "1: ldxr %0, %2\n" - " subs %0, %0, #1\n" - " b.lt 2f\n" - " stlxr %w1, %0, %2\n" - " cbnz %w1, 1b\n" - " dmb ish\n" - "2:" + __LL_SC_FALLBACK( +" prfm pstl1strm, %2\n" +"1: ldxr %0, %2\n" +" subs %0, %0, #1\n" +" b.lt 2f\n" +" stlxr %w1, %0, %2\n" +" cbnz %w1, 1b\n" +" dmb ish\n" +"2:") : "=&r" (result), "=&r" (tmp), "+Q" (v->counter) : : "cc", "memory"); @@ -254,6 +274,7 @@ __ll_sc__cmpxchg_case_##name##sz(volatile void *ptr, \ old = (u##sz)old; \ \ asm volatile( \ + __LL_SC_FALLBACK( \ " prfm pstl1strm, %[v]\n" \ "1: ld" #acq "xr" #sfx "\t%" #w "[oldval], %[v]\n" \ " eor %" #w "[tmp], %" #w "[oldval], %" #w "[old]\n" \ @@ -261,7 +282,7 @@ __ll_sc__cmpxchg_case_##name##sz(volatile void *ptr, \ " st" #rel "xr" #sfx "\t%w[tmp], %" #w "[new], %[v]\n" \ " cbnz %w[tmp], 1b\n" \ " " #mb "\n" \ - "2:" \ + "2:") \ : [tmp] "=&r" (tmp), [oldval] "=&r" (oldval), \ [v] "+Q" (*(u##sz *)ptr) \ : [old] __stringify(constraint) "r" (old), [new] "r" (new) \ @@ -305,6 +326,7 @@ __ll_sc__cmpxchg_double##name(unsigned long old1, \ unsigned long tmp, ret; \ \ asm volatile("// __cmpxchg_double" #name "\n" \ + __LL_SC_FALLBACK( \ " prfm pstl1strm, %2\n" \ "1: ldxp %0, %1, %2\n" \ " eor %0, %0, %3\n" \ @@ -314,8 +336,8 @@ __ll_sc__cmpxchg_double##name(unsigned long old1, \ " st" #rel "xp %w0, %5, %6, %2\n" \ " cbnz %w0, 1b\n" \ " " #mb "\n" \ - "2:" \ - : "=&r" (tmp), "=&r" (ret), "+Q" (*(__uint128_t *)ptr) \ + "2:") \ + : "=&r" (tmp), "=&r" (ret), "+Q" (*(unsigned long *)ptr) \ : "r" (old1), "r" (old2), "r" (new1), "r" (new2) \ : cl); \ \
diff --git a/arch/arm64/include/asm/atomic_lse.h b/arch/arm64/include/asm/atomic_lse.h index 28e9611..da3280f 100644 --- a/arch/arm64/include/asm/atomic_lse.h +++ b/arch/arm64/include/asm/atomic_lse.h
@@ -11,11 +11,11 @@ #define __ASM_ATOMIC_LSE_H #define ATOMIC_OP(op, asm_op) \ -static inline void __lse_atomic_##op(int i, atomic_t *v) \ +static inline void __lse_atomic_##op(int i, atomic_t *v) \ { \ asm volatile( \ __LSE_PREAMBLE \ - " " #asm_op " %w[i], %[v]\n" \ +" " #asm_op " %w[i], %[v]\n" \ : [i] "+r" (i), [v] "+Q" (v->counter) \ : "r" (v)); \ } @@ -32,7 +32,7 @@ static inline int __lse_atomic_fetch_##op##name(int i, atomic_t *v) \ { \ asm volatile( \ __LSE_PREAMBLE \ - " " #asm_op #mb " %w[i], %w[i], %[v]" \ +" " #asm_op #mb " %w[i], %w[i], %[v]" \ : [i] "+r" (i), [v] "+Q" (v->counter) \ : "r" (v) \ : cl); \ @@ -130,7 +130,7 @@ static inline int __lse_atomic_sub_return##name(int i, atomic_t *v) \ " add %w[i], %w[i], %w[tmp]" \ : [i] "+&r" (i), [v] "+Q" (v->counter), [tmp] "=&r" (tmp) \ : "r" (v) \ - : cl); \ + : cl); \ \ return i; \ } @@ -168,7 +168,7 @@ static inline void __lse_atomic64_##op(s64 i, atomic64_t *v) \ { \ asm volatile( \ __LSE_PREAMBLE \ - " " #asm_op " %[i], %[v]\n" \ +" " #asm_op " %[i], %[v]\n" \ : [i] "+r" (i), [v] "+Q" (v->counter) \ : "r" (v)); \ } @@ -185,7 +185,7 @@ static inline long __lse_atomic64_fetch_##op##name(s64 i, atomic64_t *v)\ { \ asm volatile( \ __LSE_PREAMBLE \ - " " #asm_op #mb " %[i], %[i], %[v]" \ +" " #asm_op #mb " %[i], %[i], %[v]" \ : [i] "+r" (i), [v] "+Q" (v->counter) \ : "r" (v) \ : cl); \ @@ -272,7 +272,7 @@ static inline void __lse_atomic64_sub(s64 i, atomic64_t *v) } #define ATOMIC64_OP_SUB_RETURN(name, mb, cl...) \ -static inline long __lse_atomic64_sub_return##name(s64 i, atomic64_t *v)\ +static inline long __lse_atomic64_sub_return##name(s64 i, atomic64_t *v) \ { \ unsigned long tmp; \ \ @@ -403,7 +403,7 @@ __lse__cmpxchg_double##name(unsigned long old1, \ " eor %[old2], %[old2], %[oldval2]\n" \ " orr %[old1], %[old1], %[old2]" \ : [old1] "+&r" (x0), [old2] "+&r" (x1), \ - [v] "+Q" (*(__uint128_t *)ptr) \ + [v] "+Q" (*(unsigned long *)ptr) \ : [new1] "r" (x2), [new2] "r" (x3), [ptr] "r" (x4), \ [oldval1] "r" (oldval1), [oldval2] "r" (oldval2) \ : cl); \
diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index 5cc8141..b817f83 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h
@@ -57,9 +57,8 @@ #define ARM64_WORKAROUND_1542419 47 #define ARM64_HAS_AMU_EXTN 48 #define ARM64_SPECTRE_BHB 49 -#define ARM64_WORKAROUND_1742098 50 -/* kabi: reserve 51 - 62 for future cpu capabilities */ +/* kabi: reserve 50 - 62 for future cpu capabilities */ #define ARM64_NCAPS 62 #endif /* __ASM_CPUCAPS_H */
diff --git a/arch/arm64/include/asm/efi.h b/arch/arm64/include/asm/efi.h index 743a1d3..b54d3a8 100644 --- a/arch/arm64/include/asm/efi.h +++ b/arch/arm64/include/asm/efi.h
@@ -25,7 +25,6 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); ({ \ efi_virtmap_load(); \ __efi_fpsimd_begin(); \ - spin_lock(&efi_rt_lock); \ }) #define arch_efi_call_virt(p, f, args...) \ @@ -37,12 +36,10 @@ int efi_set_mapping_permissions(struct mm_struct *mm, efi_memory_desc_t *md); #define arch_efi_call_virt_teardown() \ ({ \ - spin_unlock(&efi_rt_lock); \ __efi_fpsimd_end(); \ efi_virtmap_unload(); \ }) -extern spinlock_t efi_rt_lock; efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...); #define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)
diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 4a4c20a..f65ff6b 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h
@@ -378,26 +378,8 @@ static inline int kvm_vcpu_sys_get_rt(struct kvm_vcpu *vcpu) static inline bool kvm_is_write_fault(struct kvm_vcpu *vcpu) { - if (kvm_vcpu_abt_iss1tw(vcpu)) { - /* - * Only a permission fault on a S1PTW should be - * considered as a write. Otherwise, page tables baked - * in a read-only memslot will result in an exception - * being delivered in the guest. - * - * The drawback is that we end-up faulting twice if the - * guest is using any of HW AF/DB: a translation fault - * to map the page containing the PT (read only at - * first), then a permission fault to allow the flags - * to be set. - */ - switch (kvm_vcpu_trap_get_fault_type(vcpu)) { - case ESR_ELx_FSC_PERM: - return true; - default: - return false; - } - } + if (kvm_vcpu_abt_iss1tw(vcpu)) + return true; if (kvm_vcpu_trap_is_iabt(vcpu)) return false;
diff --git a/arch/arm64/include/asm/processor.h b/arch/arm64/include/asm/processor.h index 2d750fe..53e1f13 100644 --- a/arch/arm64/include/asm/processor.h +++ b/arch/arm64/include/asm/processor.h
@@ -186,9 +186,8 @@ void tls_preserve_current_state(void); static inline void start_thread_common(struct pt_regs *regs, unsigned long pc) { - s32 previous_syscall = regs->syscallno; memset(regs, 0, sizeof(*regs)); - regs->syscallno = previous_syscall; + forget_syscall(regs); regs->pc = pc; if (system_uses_irq_prio_masking())
diff --git a/arch/arm64/include/asm/syscall_wrapper.h b/arch/arm64/include/asm/syscall_wrapper.h index 43a2088..06d880b 100644 --- a/arch/arm64/include/asm/syscall_wrapper.h +++ b/arch/arm64/include/asm/syscall_wrapper.h
@@ -8,7 +8,7 @@ #ifndef __ASM_SYSCALL_WRAPPER_H #define __ASM_SYSCALL_WRAPPER_H -#include <asm/ptrace.h> +struct pt_regs; #define SC_ARM64_REGS_TO_ARGS(x, ...) \ __MAP(x,__SC_ARGS \
diff --git a/arch/arm64/kernel/cacheinfo.c b/arch/arm64/kernel/cacheinfo.c index 97c42be..587543c 100644 --- a/arch/arm64/kernel/cacheinfo.c +++ b/arch/arm64/kernel/cacheinfo.c
@@ -45,8 +45,7 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, int init_cache_level(unsigned int cpu) { - unsigned int ctype, level, leaves; - int fw_level; + unsigned int ctype, level, leaves, fw_level; struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu); for (level = 1, leaves = 0; level <= MAX_CACHE_LEVEL; level++) { @@ -64,9 +63,6 @@ int init_cache_level(unsigned int cpu) else fw_level = acpi_find_last_cache_level(cpu); - if (fw_level < 0) - return fw_level; - if (level < fw_level) { /* * some external caches not specified in CLIDR_EL1
diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index b18f307..33b3341 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c
@@ -170,12 +170,9 @@ static void install_bp_hardening_cb(bp_hardening_cb_t fn, __copy_hyp_vect_bpi(slot, hyp_vecs_start, hyp_vecs_end); } - if (fn != __this_cpu_read(bp_hardening_data.fn)) { - __this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot); - __this_cpu_write(bp_hardening_data.fn, fn); - __this_cpu_write(bp_hardening_data.template_start, - hyp_vecs_start); - } + __this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot); + __this_cpu_write(bp_hardening_data.fn, fn); + __this_cpu_write(bp_hardening_data.template_start, hyp_vecs_start); raw_spin_unlock(&bp_lock); } #else @@ -820,14 +817,6 @@ static const struct arm64_cpu_capabilities erratum_843419_list[] = { }; #endif -#ifdef CONFIG_ARM64_ERRATUM_1742098 -static struct midr_range broken_aarch32_aes[] = { - MIDR_RANGE(MIDR_CORTEX_A57, 0, 1, 0xf, 0xf), - MIDR_ALL_VERSIONS(MIDR_CORTEX_A72), - {}, -}; -#endif - const struct arm64_cpu_capabilities arm64_errata[] = { #ifdef CONFIG_ARM64_WORKAROUND_CLEAN_CACHE { @@ -1009,14 +998,6 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .cpu_enable = cpu_enable_trap_ctr_access, }, #endif -#ifdef CONFIG_ARM64_ERRATUM_1742098 - { - .desc = "ARM erratum 1742098", - .capability = ARM64_WORKAROUND_1742098, - CAP_MIDR_RANGE_LIST(broken_aarch32_aes), - .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, - }, -#endif { } }; @@ -1323,11 +1304,8 @@ static void kvm_setup_bhb_slot(const char *hyp_vecs_start) __copy_hyp_vect_bpi(slot, hyp_vecs_start, hyp_vecs_end); } - if (hyp_vecs_start != __this_cpu_read(bp_hardening_data.template_start)) { - __this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot); - __this_cpu_write(bp_hardening_data.template_start, - hyp_vecs_start); - } + __this_cpu_write(bp_hardening_data.hyp_vectors_slot, slot); + __this_cpu_write(bp_hardening_data.template_start, hyp_vecs_start); raw_spin_unlock(&bp_lock); } #else @@ -1363,13 +1341,7 @@ void spectre_bhb_enable_mitigation(const struct arm64_cpu_capabilities *entry) } else if (spectre_bhb_loop_affected(SCOPE_LOCAL_CPU)) { switch (spectre_bhb_loop_affected(SCOPE_SYSTEM)) { case 8: - /* - * A57/A72-r0 will already have selected the - * spectre-indirect vector, which is sufficient - * for BHB too. - */ - if (!__this_cpu_read(bp_hardening_data.fn)) - kvm_setup_bhb_slot(__spectre_bhb_loop_k8_start); + kvm_setup_bhb_slot(__spectre_bhb_loop_k8_start); break; case 24: kvm_setup_bhb_slot(__spectre_bhb_loop_k24_start);
diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c index 4a64632..c0ee797 100644 --- a/arch/arm64/kernel/cpufeature.c +++ b/arch/arm64/kernel/cpufeature.c
@@ -21,7 +21,6 @@ #include <asm/cpufeature.h> #include <asm/cpu_ops.h> #include <asm/fpsimd.h> -#include <asm/hwcap.h> #include <asm/mmu_context.h> #include <asm/processor.h> #include <asm/sysreg.h> @@ -1329,14 +1328,6 @@ static bool can_use_gic_priorities(const struct arm64_cpu_capabilities *entry, } #endif -static void elf_hwcap_fixup(void) -{ -#ifdef CONFIG_ARM64_ERRATUM_1742098 - if (cpus_have_const_cap(ARM64_WORKAROUND_1742098)) - compat_elf_hwcap2 &= ~COMPAT_HWCAP2_AES; -#endif /* ARM64_ERRATUM_1742098 */ -} - static const struct arm64_cpu_capabilities arm64_features[] = { { .desc = "GIC system register CPU interface", @@ -2178,10 +2169,8 @@ void __init setup_cpu_features(void) mark_const_caps_ready(); setup_elf_hwcaps(arm64_elf_hwcaps); - if (system_supports_32bit_el0()) { + if (system_supports_32bit_el0()) setup_elf_hwcaps(compat_elf_hwcaps); - elf_hwcap_fixup(); - } if (system_uses_ttbr0_pan()) pr_info("emulated: Privileged Access Never (PAN) using TTBR0_EL1 switching\n");
diff --git a/arch/arm64/kernel/efi-rt-wrapper.S b/arch/arm64/kernel/efi-rt-wrapper.S index 806059c..62f0260 100644 --- a/arch/arm64/kernel/efi-rt-wrapper.S +++ b/arch/arm64/kernel/efi-rt-wrapper.S
@@ -4,7 +4,6 @@ */ #include <linux/linkage.h> -#include <asm/assembler.h> ENTRY(__efi_rt_asm_wrapper) stp x29, x30, [sp, #-32]! @@ -17,12 +16,6 @@ */ stp x1, x18, [sp, #16] - ldr_l x16, efi_rt_stack_top - mov sp, x16 -#ifdef CONFIG_SHADOW_CALL_STACK - str x18, [sp, #-16]! -#endif - /* * We are lucky enough that no EFI runtime services take more than * 5 arguments, so all are passed in registers rather than via the @@ -36,22 +29,19 @@ mov x4, x6 blr x8 - mov sp, x29 ldp x1, x2, [sp, #16] cmp x2, x18 ldp x29, x30, [sp], #32 b.ne 0f ret 0: +#ifdef CONFIG_SHADOW_CALL_STACK /* * Restore x18 before returning to instrumented code. This is * safe because the wrapper is called with preemption disabled and * a separate shadow stack is used for interrupts. */ -#ifdef CONFIG_SHADOW_CALL_STACK - ldr_l x18, efi_rt_stack_top - ldr x18, [x18, #-16] + mov x18, x2 #endif - b efi_handle_corrupted_x18 // tail call ENDPROC(__efi_rt_asm_wrapper)
diff --git a/arch/arm64/kernel/efi.c b/arch/arm64/kernel/efi.c index ba5358f..d0cf596 100644 --- a/arch/arm64/kernel/efi.c +++ b/arch/arm64/kernel/efi.c
@@ -12,14 +12,6 @@ #include <asm/efi.h> -static bool region_is_misaligned(const efi_memory_desc_t *md) -{ - if (PAGE_SIZE == EFI_PAGE_SIZE) - return false; - return !PAGE_ALIGNED(md->phys_addr) || - !PAGE_ALIGNED(md->num_pages << EFI_PAGE_SHIFT); -} - /* * Only regions of type EFI_RUNTIME_SERVICES_CODE need to be * executable, everything else can be mapped with the XN bits @@ -33,22 +25,14 @@ static __init pteval_t create_mapping_protection(efi_memory_desc_t *md) if (type == EFI_MEMORY_MAPPED_IO) return PROT_DEVICE_nGnRE; - if (region_is_misaligned(md)) { - static bool __initdata code_is_misaligned; - + if (WARN_ONCE(!PAGE_ALIGNED(md->phys_addr), + "UEFI Runtime regions are not aligned to 64 KB -- buggy firmware?")) /* - * Regions that are not aligned to the OS page size cannot be - * mapped with strict permissions, as those might interfere - * with the permissions that are needed by the adjacent - * region's mapping. However, if we haven't encountered any - * misaligned runtime code regions so far, we can safely use - * non-executable permissions for non-code regions. + * If the region is not aligned to the page size of the OS, we + * can not use strict permissions, since that would also affect + * the mapping attributes of the adjacent regions. */ - code_is_misaligned |= (type == EFI_RUNTIME_SERVICES_CODE); - - return code_is_misaligned ? pgprot_val(PAGE_KERNEL_EXEC) - : pgprot_val(PAGE_KERNEL); - } + return pgprot_val(PAGE_KERNEL_EXEC); /* R-- */ if ((attr & (EFI_MEMORY_XP | EFI_MEMORY_RO)) == @@ -78,16 +62,19 @@ int __init efi_create_mapping(struct mm_struct *mm, efi_memory_desc_t *md) bool page_mappings_only = (md->type == EFI_RUNTIME_SERVICES_CODE || md->type == EFI_RUNTIME_SERVICES_DATA); - /* - * If this region is not aligned to the page size used by the OS, the - * mapping will be rounded outwards, and may end up sharing a page - * frame with an adjacent runtime memory region. Given that the page - * table descriptor covering the shared page will be rewritten when the - * adjacent region gets mapped, we must avoid block mappings here so we - * don't have to worry about splitting them when that happens. - */ - if (region_is_misaligned(md)) + if (!PAGE_ALIGNED(md->phys_addr) || + !PAGE_ALIGNED(md->num_pages << EFI_PAGE_SHIFT)) { + /* + * If the end address of this region is not aligned to page + * size, the mapping is rounded up, and may end up sharing a + * page frame with the next UEFI memory region. If we create + * a block entry now, we may need to split it again when mapping + * the next region, and support for that is going to be removed + * from the MMU routines. So avoid block mappings altogether in + * that case. + */ page_mappings_only = true; + } create_pgd_mapping(mm, md->phys_addr, md->virt_addr, md->num_pages << EFI_PAGE_SHIFT, @@ -114,9 +101,6 @@ int __init efi_set_mapping_permissions(struct mm_struct *mm, BUG_ON(md->type != EFI_RUNTIME_SERVICES_CODE && md->type != EFI_RUNTIME_SERVICES_DATA); - if (region_is_misaligned(md)) - return 0; - /* * Calling apply_to_page_range() is only safe on regions that are * guaranteed to be mapped down to pages. Since we are only called @@ -143,31 +127,3 @@ asmlinkage efi_status_t efi_handle_corrupted_x18(efi_status_t s, const char *f) pr_err_ratelimited(FW_BUG "register x18 corrupted by EFI %s\n", f); return s; } - -DEFINE_SPINLOCK(efi_rt_lock); - -asmlinkage u64 *efi_rt_stack_top __ro_after_init; - -/* EFI requires 8 KiB of stack space for runtime services */ -static_assert(THREAD_SIZE >= SZ_8K); - -static int __init arm64_efi_rt_init(void) -{ - void *p; - - if (!efi_enabled(EFI_RUNTIME_SERVICES)) - return 0; - - p = __vmalloc_node_range(THREAD_SIZE, THREAD_ALIGN, VMALLOC_START, - VMALLOC_END, GFP_KERNEL, PAGE_KERNEL, 0, - NUMA_NO_NODE, &&l); -l: if (!p) { - pr_warn("Failed to allocate EFI runtime stack\n"); - clear_bit(EFI_RUNTIME_SERVICES, &efi.flags); - return -ENOMEM; - } - - efi_rt_stack_top = p + THREAD_SIZE; - return 0; -} -core_initcall(arm64_efi_rt_init);
diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 3d3a673..4b0686d 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c
@@ -21,6 +21,48 @@ #include <asm/cputype.h> #include <asm/topology.h> +void store_cpu_topology(unsigned int cpuid) +{ + struct cpu_topology *cpuid_topo = &cpu_topology[cpuid]; + u64 mpidr; + + if (cpuid_topo->package_id != -1) + goto topology_populated; + + mpidr = read_cpuid_mpidr(); + + /* Uniprocessor systems can rely on default topology values */ + if (mpidr & MPIDR_UP_BITMASK) + return; + + /* + * This would be the place to create cpu topology based on MPIDR. + * + * However, it cannot be trusted to depict the actual topology; some + * pieces of the architecture enforce an artificial cap on Aff0 values + * (e.g. GICv3's ICC_SGI1R_EL1 limits it to 15), leading to an + * artificial cycling of Aff1, Aff2 and Aff3 values. IOW, these end up + * having absolutely no relationship to the actual underlying system + * topology, and cannot be reasonably used as core / package ID. + * + * If the MT bit is set, Aff0 *could* be used to define a thread ID, but + * we still wouldn't be able to obtain a sane core ID. This means we + * need to entirely ignore MPIDR for any topology deduction. + */ + cpuid_topo->thread_id = -1; + cpuid_topo->core_id = cpuid; + cpuid_topo->package_id = cpu_to_node(cpuid); + +#ifndef CONFIG_AMLOGIC_MODIFY + pr_debug("CPU%u: cluster %d core %d thread %d mpidr %#016llx\n", + cpuid, cpuid_topo->package_id, cpuid_topo->core_id, + cpuid_topo->thread_id, mpidr); +#endif + +topology_populated: + update_siblings_masks(cpuid); +} + #ifdef CONFIG_ACPI static bool __init acpi_cpu_is_threaded(int cpu) {
diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 5804f78..74ac4dd 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c
@@ -242,7 +242,7 @@ void die(const char *str, struct pt_regs *regs, int err) raw_spin_unlock_irqrestore(&die_lock, flags); if (ret != NOTIFY_STOP) - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } #ifdef CONFIG_AMLOGIC_USER_FAULT
diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index c5ac984..7b054c6 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S
@@ -228,8 +228,6 @@ * - dir - DMA direction */ ENTRY(__dma_map_area) - cmp w2, #DMA_FROM_DEVICE - b.eq __dma_flush_area b __dma_clean_area ENDPIPROC(__dma_map_area)
diff --git a/arch/arm64/mm/dma-mapping.c b/arch/arm64/mm/dma-mapping.c index f06f8f9..7c1fb46 100644 --- a/arch/arm64/mm/dma-mapping.c +++ b/arch/arm64/mm/dma-mapping.c
@@ -13,14 +13,14 @@ #include <asm/cacheflush.h> -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_map_area(phys_to_virt(paddr), size, dir); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_unmap_area(phys_to_virt(paddr), size, dir); }
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index e587bc3..1a7e55b 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c
@@ -301,7 +301,7 @@ static void die_kernel_fault(const char *msg, unsigned long addr, show_pte(addr); die("Oops", regs, esr); bust_spinlocks(0); - make_task_dead(SIGKILL); + do_exit(SIGKILL); } static void __do_kernel_fault(unsigned long addr, unsigned int esr,
diff --git a/arch/c6x/mm/dma-coherent.c b/arch/c6x/mm/dma-coherent.c index a590909..b319808 100644 --- a/arch/c6x/mm/dma-coherent.c +++ b/arch/c6x/mm/dma-coherent.c
@@ -140,7 +140,7 @@ void __init coherent_mem_init(phys_addr_t start, u32 size) sizeof(long)); } -static void c6x_dma_sync(phys_addr_t paddr, size_t size, +static void c6x_dma_sync(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction dir) { BUG_ON(!valid_dma_direction(dir)); @@ -160,14 +160,14 @@ static void c6x_dma_sync(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { - return c6x_dma_sync(paddr, size, dir); + return c6x_dma_sync(dev, paddr, size, dir); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { - return c6x_dma_sync(paddr, size, dir); + return c6x_dma_sync(dev, paddr, size, dir); }
diff --git a/arch/csky/abiv1/alignment.c b/arch/csky/abiv1/alignment.c index 2df115d..cb2a0d9 100644 --- a/arch/csky/abiv1/alignment.c +++ b/arch/csky/abiv1/alignment.c
@@ -294,7 +294,7 @@ void csky_alignment(struct pt_regs *regs) __func__, opcode, rz, rx, imm, addr); show_regs(regs); bust_spinlocks(0); - make_task_dead(SIGKILL); + do_exit(SIGKILL); } force_sig_fault(SIGBUS, BUS_ADRALN, (void __user *)addr);
diff --git a/arch/csky/kernel/traps.c b/arch/csky/kernel/traps.c index 8cdbbcb..63715cb 100644 --- a/arch/csky/kernel/traps.c +++ b/arch/csky/kernel/traps.c
@@ -85,7 +85,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, int nr) pr_err("%s: %08x\n", str, nr); show_regs(regs); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } void buserr(struct pt_regs *regs)
diff --git a/arch/csky/mm/dma-mapping.c b/arch/csky/mm/dma-mapping.c index 8f6571a..06e85b5 100644 --- a/arch/csky/mm/dma-mapping.c +++ b/arch/csky/mm/dma-mapping.c
@@ -58,8 +58,8 @@ void arch_dma_prep_coherent(struct page *page, size_t size) cache_op(page_to_phys(page), size, dma_wbinv_set_zero_range); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_TO_DEVICE: @@ -74,8 +74,8 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_TO_DEVICE:
diff --git a/arch/h8300/kernel/traps.c b/arch/h8300/kernel/traps.c index 090adae..e47a9e0 100644 --- a/arch/h8300/kernel/traps.c +++ b/arch/h8300/kernel/traps.c
@@ -17,7 +17,6 @@ #include <linux/types.h> #include <linux/sched.h> #include <linux/sched/debug.h> -#include <linux/sched/task.h> #include <linux/mm_types.h> #include <linux/kernel.h> #include <linux/errno.h> @@ -111,7 +110,7 @@ void die(const char *str, struct pt_regs *fp, unsigned long err) dump(fp); spin_unlock_irq(&die_lock); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } static int kstack_depth_to_print = 24;
diff --git a/arch/h8300/mm/fault.c b/arch/h8300/mm/fault.c index 573825c..fabffb8 100644 --- a/arch/h8300/mm/fault.c +++ b/arch/h8300/mm/fault.c
@@ -52,7 +52,7 @@ asmlinkage int do_page_fault(struct pt_regs *regs, unsigned long address, printk(" at virtual address %08lx\n", address); if (!user_mode(regs)) die("Oops", regs, error_code); - make_task_dead(SIGKILL); + do_exit(SIGKILL); return 1; }
diff --git a/arch/hexagon/kernel/dma.c b/arch/hexagon/kernel/dma.c index 25f388d..f561b12 100644 --- a/arch/hexagon/kernel/dma.c +++ b/arch/hexagon/kernel/dma.c
@@ -55,8 +55,8 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, gen_pool_free(coherent_pool, (unsigned long) vaddr, size); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { void *addr = phys_to_virt(paddr);
diff --git a/arch/hexagon/kernel/traps.c b/arch/hexagon/kernel/traps.c index f69eae3..69c623b 100644 --- a/arch/hexagon/kernel/traps.c +++ b/arch/hexagon/kernel/traps.c
@@ -221,7 +221,7 @@ int die(const char *str, struct pt_regs *regs, long err) panic("Fatal exception"); oops_exit(); - make_task_dead(err); + do_exit(err); return 0; }
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 6a6036f..1671447 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig
@@ -360,7 +360,7 @@ depends on PROC_KCORE config IA64_MCA_RECOVERY - bool "MCA recovery from errors other than TLB." + tristate "MCA recovery from errors other than TLB." config PERFMON bool "Performance monitor support"
diff --git a/arch/ia64/include/asm/processor.h b/arch/ia64/include/asm/processor.h index 0025f89..95a2ec3 100644 --- a/arch/ia64/include/asm/processor.h +++ b/arch/ia64/include/asm/processor.h
@@ -552,7 +552,7 @@ ia64_get_irr(unsigned int vector) { unsigned int reg = vector / 64; unsigned int bit = vector % 64; - unsigned long irr; + u64 irr; switch (reg) { case 0: irr = ia64_getreg(_IA64_REG_CR_IRR0); break;
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c index c8a8779..2a40268 100644 --- a/arch/ia64/kernel/mca_drv.c +++ b/arch/ia64/kernel/mca_drv.c
@@ -12,7 +12,6 @@ #include <linux/types.h> #include <linux/init.h> #include <linux/sched.h> -#include <linux/sched/task.h> #include <linux/interrupt.h> #include <linux/irq.h> #include <linux/kallsyms.h> @@ -177,7 +176,7 @@ mca_handler_bh(unsigned long paddr, void *iip, unsigned long ipsr) spin_unlock(&mca_bh_lock); /* This process is about to be killed itself */ - make_task_dead(SIGKILL); + do_exit(SIGKILL); } /**
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c index 7536423..e13cb90 100644 --- a/arch/ia64/kernel/traps.c +++ b/arch/ia64/kernel/traps.c
@@ -85,7 +85,7 @@ die (const char *str, struct pt_regs *regs, long err) if (panic_on_oops) panic("Fatal exception"); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); return 0; }
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c index 3b0ca22..30d0c1f 100644 --- a/arch/ia64/mm/fault.c +++ b/arch/ia64/mm/fault.c
@@ -271,7 +271,7 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re regs = NULL; bust_spinlocks(0); if (regs) - make_task_dead(SIGKILL); + do_exit(SIGKILL); return; out_of_memory:
diff --git a/arch/ia64/mm/init.c b/arch/ia64/mm/init.c index df6d3df..ee50506 100644 --- a/arch/ia64/mm/init.c +++ b/arch/ia64/mm/init.c
@@ -73,8 +73,8 @@ __ia64_sync_icache_dcache (pte_t pte) * DMA can be marked as "clean" so that lazy_mmu_prot_update() doesn't have to * flush them when they get mapped into an executable vm-area. */ -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { unsigned long pfn = PHYS_PFN(paddr);
diff --git a/arch/m68k/68000/entry.S b/arch/m68k/68000/entry.S index 94abf3d..259b366 100644 --- a/arch/m68k/68000/entry.S +++ b/arch/m68k/68000/entry.S
@@ -47,8 +47,6 @@ jbsr syscall_trace_enter RESTORE_SWITCH_STACK addql #4,%sp - addql #1,%d0 - jeq ret_from_exception movel %sp@(PT_OFF_ORIG_D0),%d1 movel #-ENOSYS,%d0 cmpl #NR_syscalls,%d1
diff --git a/arch/m68k/Kconfig.devices b/arch/m68k/Kconfig.devices index 6fb693b..3e9b0b8 100644 --- a/arch/m68k/Kconfig.devices +++ b/arch/m68k/Kconfig.devices
@@ -19,7 +19,6 @@ # We have a dedicated heartbeat LED. :-) config PROC_HARDWARE bool "/proc/hardware support" - depends on PROC_FS help Say Y here to support the /proc/hardware file, which gives you access to information about the machine you're running on,
diff --git a/arch/m68k/coldfire/entry.S b/arch/m68k/coldfire/entry.S index fb3b065..52d312d 100644 --- a/arch/m68k/coldfire/entry.S +++ b/arch/m68k/coldfire/entry.S
@@ -92,8 +92,6 @@ jbsr syscall_trace_enter RESTORE_SWITCH_STACK addql #4,%sp - addql #1,%d0 - jeq ret_from_exception movel %d3,%a0 jbsr %a0@ movel %d0,%sp@(PT_OFF_D0) /* save the return value */
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c index 871a0e1..3fab684 100644 --- a/arch/m68k/kernel/dma.c +++ b/arch/m68k/kernel/dma.c
@@ -61,8 +61,8 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, #endif /* CONFIG_MMU && !CONFIG_COLDFIRE */ -void arch_sync_dma_for_device(phys_addr_t handle, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t handle, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_BIDIRECTIONAL:
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S index 9a66657..97cd3ea 100644 --- a/arch/m68k/kernel/entry.S +++ b/arch/m68k/kernel/entry.S
@@ -160,12 +160,9 @@ jbsr syscall_trace RESTORE_SWITCH_STACK addql #4,%sp - addql #1,%d0 | optimization for cmpil #-1,%d0 - jeq ret_from_syscall movel %sp@(PT_OFF_ORIG_D0),%d0 cmpl #NR_syscalls,%d0 jcs syscall - jra ret_from_syscall badsys: movel #-ENOSYS,%sp@(PT_OFF_D0) jra ret_from_syscall
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index 5bf3148..344f93d 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c
@@ -30,7 +30,6 @@ #include <linux/init.h> #include <linux/ptrace.h> #include <linux/kallsyms.h> -#include <linux/extable.h> #include <asm/setup.h> #include <asm/fpu.h> @@ -551,8 +550,7 @@ static inline void bus_error030 (struct frame *fp) errorcode |= 2; if (mmusr & (MMU_I | MMU_WP)) { - /* We might have an exception table for this PC */ - if (ssw & 4 && !search_exception_tables(fp->ptregs.pc)) { + if (ssw & 4) { pr_err("Data %s fault at %#010lx in %s (pc=%#lx)\n", ssw & RW ? "read" : "write", fp->un.fmtb.daddr, @@ -1141,7 +1139,7 @@ void die_if_kernel (char *str, struct pt_regs *fp, int nr) pr_crit("%s: %08x\n", str, nr); show_registers(fp); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } asmlinkage void set_esp0(unsigned long ssp)
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c index 4d3e301..f7afb98 100644 --- a/arch/m68k/mm/fault.c +++ b/arch/m68k/mm/fault.c
@@ -48,7 +48,7 @@ int send_fault_sig(struct pt_regs *regs) pr_alert("Unable to handle kernel access"); pr_cont(" at virtual address %p\n", addr); die_if_kernel("Oops", regs, 0 /*error_code*/); - make_task_dead(SIGKILL); + do_exit(SIGKILL); } return 1;
diff --git a/arch/microblaze/kernel/dma.c b/arch/microblaze/kernel/dma.c index d7bebd0..a89c2d4 100644 --- a/arch/microblaze/kernel/dma.c +++ b/arch/microblaze/kernel/dma.c
@@ -15,7 +15,7 @@ #include <linux/bug.h> #include <asm/cacheflush.h> -static void __dma_sync(phys_addr_t paddr, size_t size, +static void __dma_sync(struct device *dev, phys_addr_t paddr, size_t size, enum dma_data_direction direction) { switch (direction) { @@ -31,14 +31,14 @@ static void __dma_sync(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { - __dma_sync(paddr, size, dir); + __dma_sync(dev, paddr, size, dir); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { - __dma_sync(paddr, size, dir); + __dma_sync(dev, paddr, size, dir); }
diff --git a/arch/microblaze/kernel/exceptions.c b/arch/microblaze/kernel/exceptions.c index 6d3a6a6..cf99c41 100644 --- a/arch/microblaze/kernel/exceptions.c +++ b/arch/microblaze/kernel/exceptions.c
@@ -44,10 +44,10 @@ void die(const char *str, struct pt_regs *fp, long err) pr_warn("Oops: %s, sig: %ld\n", str, err); show_regs(fp); spin_unlock_irq(&die_lock); - /* make_task_dead() should take care of panic'ing from an interrupt + /* do_exit() should take care of panic'ing from an interrupt * context so we don't handle it here */ - make_task_dead(err); + do_exit(err); } /* for user application debugging */
diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c index d26d9a6..135a540 100644 --- a/arch/mips/bcm47xx/prom.c +++ b/arch/mips/bcm47xx/prom.c
@@ -85,7 +85,7 @@ static __init void prom_init_mem(void) pr_debug("Assume 128MB RAM\n"); break; } - if (!memcmp((void *)prom_init, (void *)prom_init + mem, 32)) + if (!memcmp(prom_init, prom_init + mem, 32)) break; } lowmem = mem; @@ -162,7 +162,7 @@ void __init bcm47xx_prom_highmem_init(void) off = EXTVBASE + __pa(off); for (extmem = 128 << 20; extmem < 512 << 20; extmem <<= 1) { - if (!memcmp((void *)prom_init, (void *)(off + extmem), 16)) + if (!memcmp(prom_init, (void *)(off + extmem), 16)) break; } extmem -= lowmem;
diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c index f183c45..dcfa0ea 100644 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c
@@ -361,8 +361,6 @@ static struct clk clk_periph = { */ int clk_enable(struct clk *clk) { - if (!clk) - return 0; mutex_lock(&clocks_mutex); clk_enable_unlocked(clk); mutex_unlock(&clocks_mutex);
diff --git a/arch/mips/bmips/dma.c b/arch/mips/bmips/dma.c index 98d3958..3d13c77 100644 --- a/arch/mips/bmips/dma.c +++ b/arch/mips/bmips/dma.c
@@ -64,9 +64,7 @@ phys_addr_t __dma_to_phys(struct device *dev, dma_addr_t dma_addr) return dma_addr; } -bool bmips_rac_flush_disable; - -void arch_sync_dma_for_cpu_all(void) +void arch_sync_dma_for_cpu_all(struct device *dev) { void __iomem *cbr = BMIPS_GET_CBR(); u32 cfg; @@ -76,9 +74,6 @@ void arch_sync_dma_for_cpu_all(void) boot_cpu_type() != CPU_BMIPS4380) return; - if (unlikely(bmips_rac_flush_disable)) - return; - /* Flush stale data out of the readahead cache */ cfg = __raw_readl(cbr + BMIPS_RAC_CONFIG); __raw_writel(cfg | 0x100, cbr + BMIPS_RAC_CONFIG);
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c index 36fbedc..7aee9ff 100644 --- a/arch/mips/bmips/setup.c +++ b/arch/mips/bmips/setup.c
@@ -34,8 +34,6 @@ #define REG_BCM6328_OTP ((void __iomem *)CKSEG1ADDR(0x1000062c)) #define BCM6328_TP1_DISABLED BIT(9) -extern bool bmips_rac_flush_disable; - static const unsigned long kbase = VMLINUX_LOAD_ADDRESS & 0xfff00000; struct bmips_quirk { @@ -105,12 +103,6 @@ static void bcm6358_quirks(void) * disable SMP for now */ bmips_smp_enabled = 0; - - /* - * RAC flush causes kernel panics on BCM6358 when booting from TP1 - * because the bootloader is not initializing it properly. - */ - bmips_rac_flush_disable = !!(read_c0_brcm_cmt_local() & (1 << 31)); } static void bcm6368_quirks(void)
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c index 601afad..2e2d45b 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper-board.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper-board.c
@@ -211,7 +211,7 @@ cvmx_helper_link_info_t __cvmx_helper_board_link_get(int ipd_port) { cvmx_helper_link_info_t result; - WARN_ONCE(!octeon_is_simulation(), + WARN(!octeon_is_simulation(), "Using deprecated link status - please update your DT"); /* Unless we fix it later, all links are defaulted to down */
diff --git a/arch/mips/cavium-octeon/executive/cvmx-helper.c b/arch/mips/cavium-octeon/executive/cvmx-helper.c index 89a397c7..de39154 100644 --- a/arch/mips/cavium-octeon/executive/cvmx-helper.c +++ b/arch/mips/cavium-octeon/executive/cvmx-helper.c
@@ -1100,7 +1100,7 @@ cvmx_helper_link_info_t cvmx_helper_link_get(int ipd_port) if (index == 0) result = __cvmx_helper_rgmii_link_get(ipd_port); else { - WARN_ONCE(1, "Using deprecated link status - please update your DT"); + WARN(1, "Using deprecated link status - please update your DT"); result.s.full_duplex = 1; result.s.link_up = 1; result.s.speed = 1000;
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 2d5e7b2..3ad1f76 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -127,16 +127,6 @@ static void octeon_irq_free_cd(struct irq_domain *d, unsigned int irq) static int octeon_irq_force_ciu_mapping(struct irq_domain *domain, int irq, int line, int bit) { - struct device_node *of_node; - int ret; - - of_node = irq_domain_get_of_node(domain); - if (!of_node) - return -EINVAL; - ret = irq_alloc_desc_at(irq, of_node_to_nid(of_node)); - if (ret < 0) - return ret; - return irq_domain_associate(domain, irq, line << 6 | bit); }
diff --git a/arch/mips/cavium-octeon/octeon-platform.c b/arch/mips/cavium-octeon/octeon-platform.c index 04bc347..c214fe4 100644 --- a/arch/mips/cavium-octeon/octeon-platform.c +++ b/arch/mips/cavium-octeon/octeon-platform.c
@@ -86,12 +86,11 @@ static void octeon2_usb_clocks_start(struct device *dev) "refclk-frequency", &clock_rate); if (i) { dev_err(dev, "No UCTL \"refclk-frequency\"\n"); - of_node_put(uctl_node); goto exit; } i = of_property_read_string(uctl_node, "refclk-type", &clock_type); - of_node_put(uctl_node); + if (!i && strcmp("crystal", clock_type) == 0) is_crystal_clock = true; }
diff --git a/arch/mips/include/asm/fw/fw.h b/arch/mips/include/asm/fw/fw.h index d0494ce..d0ef8b4 100644 --- a/arch/mips/include/asm/fw/fw.h +++ b/arch/mips/include/asm/fw/fw.h
@@ -26,6 +26,6 @@ extern char *fw_getcmdline(void); extern void fw_meminit(void); extern char *fw_getenv(char *name); extern unsigned long fw_getenvl(char *name); -extern void fw_init_early_console(void); +extern void fw_init_early_console(char port); #endif /* __ASM_FW_H_ */
diff --git a/arch/mips/include/asm/mach-rc32434/pci.h b/arch/mips/include/asm/mach-rc32434/pci.h index 1ff8a98..6f40d15 100644 --- a/arch/mips/include/asm/mach-rc32434/pci.h +++ b/arch/mips/include/asm/mach-rc32434/pci.h
@@ -377,7 +377,7 @@ struct pci_msu { PCI_CFG04_STAT_SSE | \ PCI_CFG04_STAT_PE) -#define KORINA_CNFG1 (KORINA_STAT | KORINA_CMD) +#define KORINA_CNFG1 ((KORINA_STAT<<16)|KORINA_CMD) #define KORINA_REVID 0 #define KORINA_CLASS_CODE 0
diff --git a/arch/mips/include/asm/syscall.h b/arch/mips/include/asm/syscall.h index ebdf4d9..25fa651 100644 --- a/arch/mips/include/asm/syscall.h +++ b/arch/mips/include/asm/syscall.h
@@ -38,7 +38,7 @@ static inline bool mips_syscall_is_indirect(struct task_struct *task, static inline long syscall_get_nr(struct task_struct *task, struct pt_regs *regs) { - return task_thread_info(task)->syscall; + return current_thread_info()->syscall; } static inline void mips_syscall_update_nr(struct task_struct *task,
diff --git a/arch/mips/include/asm/vpe.h b/arch/mips/include/asm/vpe.h index 0127315..80e70db 100644 --- a/arch/mips/include/asm/vpe.h +++ b/arch/mips/include/asm/vpe.h
@@ -104,6 +104,7 @@ struct vpe_control { struct list_head tc_list; /* Thread contexts */ }; +extern unsigned long physical_memsize; extern struct vpe_control vpecontrol; extern const struct file_operations vpe_fops;
diff --git a/arch/mips/jazz/jazzdma.c b/arch/mips/jazz/jazzdma.c index c64a297..a01e149 100644 --- a/arch/mips/jazz/jazzdma.c +++ b/arch/mips/jazz/jazzdma.c
@@ -592,7 +592,7 @@ static dma_addr_t jazz_dma_map_page(struct device *dev, struct page *page, phys_addr_t phys = page_to_phys(page) + offset; if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - arch_sync_dma_for_device(phys, size, dir); + arch_sync_dma_for_device(dev, phys, size, dir); return vdma_alloc(phys, size); } @@ -600,7 +600,7 @@ static void jazz_dma_unmap_page(struct device *dev, dma_addr_t dma_addr, size_t size, enum dma_data_direction dir, unsigned long attrs) { if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - arch_sync_dma_for_cpu(vdma_log2phys(dma_addr), size, dir); + arch_sync_dma_for_cpu(dev, vdma_log2phys(dma_addr), size, dir); vdma_free(dma_addr); } @@ -612,7 +612,7 @@ static int jazz_dma_map_sg(struct device *dev, struct scatterlist *sglist, for_each_sg(sglist, sg, nents, i) { if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - arch_sync_dma_for_device(sg_phys(sg), sg->length, + arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir); sg->dma_address = vdma_alloc(sg_phys(sg), sg->length); if (sg->dma_address == DMA_MAPPING_ERROR) @@ -631,7 +631,8 @@ static void jazz_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, for_each_sg(sglist, sg, nents, i) { if (!(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - arch_sync_dma_for_cpu(sg_phys(sg), sg->length, dir); + arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, + dir); vdma_free(sg->dma_address); } } @@ -639,13 +640,13 @@ static void jazz_dma_unmap_sg(struct device *dev, struct scatterlist *sglist, static void jazz_dma_sync_single_for_device(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { - arch_sync_dma_for_device(vdma_log2phys(addr), size, dir); + arch_sync_dma_for_device(dev, vdma_log2phys(addr), size, dir); } static void jazz_dma_sync_single_for_cpu(struct device *dev, dma_addr_t addr, size_t size, enum dma_data_direction dir) { - arch_sync_dma_for_cpu(vdma_log2phys(addr), size, dir); + arch_sync_dma_for_cpu(dev, vdma_log2phys(addr), size, dir); } static void jazz_dma_sync_sg_for_device(struct device *dev, @@ -655,7 +656,7 @@ static void jazz_dma_sync_sg_for_device(struct device *dev, int i; for_each_sg(sgl, sg, nents, i) - arch_sync_dma_for_device(sg_phys(sg), sg->length, dir); + arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir); } static void jazz_dma_sync_sg_for_cpu(struct device *dev, @@ -665,7 +666,7 @@ static void jazz_dma_sync_sg_for_cpu(struct device *dev, int i; for_each_sg(sgl, sg, nents, i) - arch_sync_dma_for_cpu(sg_phys(sg), sg->length, dir); + arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir); } const struct dma_map_ops jazz_dma_ops = {
diff --git a/arch/mips/kernel/jump_label.c b/arch/mips/kernel/jump_label.c index 9f5b124..662c8db 100644 --- a/arch/mips/kernel/jump_label.c +++ b/arch/mips/kernel/jump_label.c
@@ -56,7 +56,7 @@ void arch_jump_label_transform(struct jump_entry *e, * The branch offset must fit in the instruction's 26 * bit field. */ - WARN_ON((offset >= (long)BIT(25)) || + WARN_ON((offset >= BIT(25)) || (offset < -(long)BIT(25))); insn.j_format.opcode = bc6_op;
diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c index d408b3a..f8d3671 100644 --- a/arch/mips/kernel/proc.c +++ b/arch/mips/kernel/proc.c
@@ -168,7 +168,7 @@ static void *c_start(struct seq_file *m, loff_t *pos) { unsigned long i = *pos; - return i < nr_cpu_ids ? (void *) (i + 1) : NULL; + return i < NR_CPUS ? (void *) (i + 1) : NULL; } static void *c_next(struct seq_file *m, void *v, loff_t *pos)
diff --git a/arch/mips/kernel/smp-cps.c b/arch/mips/kernel/smp-cps.c index f659adb..dbb3f1f 100644 --- a/arch/mips/kernel/smp-cps.c +++ b/arch/mips/kernel/smp-cps.c
@@ -423,11 +423,9 @@ static void cps_shutdown_this_cpu(enum cpu_death death) wmb(); } } else { - if (IS_ENABLED(CONFIG_HOTPLUG_CPU)) { - pr_debug("Gating power to core %d\n", core); - /* Power down the core */ - cps_pm_enter_state(CPS_PM_POWER_GATED); - } + pr_debug("Gating power to core %d\n", core); + /* Power down the core */ + cps_pm_enter_state(CPS_PM_POWER_GATED); } }
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c index 5a491ec..749089c 100644 --- a/arch/mips/kernel/traps.c +++ b/arch/mips/kernel/traps.c
@@ -415,7 +415,7 @@ void __noreturn die(const char *str, struct pt_regs *regs) if (regs && kexec_should_crash(current)) crash_kexec(regs); - make_task_dead(sig); + do_exit(sig); } extern struct exception_table_entry __start___dbe_table[];
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S index 6f62c1a..faf98f2 100644 --- a/arch/mips/kernel/vmlinux.lds.S +++ b/arch/mips/kernel/vmlinux.lds.S
@@ -10,8 +10,6 @@ */ #define BSS_FIRST_SECTIONS *(.bss..swapper_pg_dir) -#define RUNTIME_DISCARD_EXIT - #include <asm-generic/vmlinux.lds.h> #undef mips
diff --git a/arch/mips/kernel/vpe-cmp.c b/arch/mips/kernel/vpe-cmp.c index 903c07b..9268ebc 100644 --- a/arch/mips/kernel/vpe-cmp.c +++ b/arch/mips/kernel/vpe-cmp.c
@@ -75,6 +75,7 @@ ATTRIBUTE_GROUPS(vpe); static void vpe_device_release(struct device *cd) { + kfree(cd); } static struct class vpe_class = { @@ -156,7 +157,6 @@ int __init vpe_module_init(void) device_del(&vpe_device); out_class: - put_device(&vpe_device); class_unregister(&vpe_class); out_chrdev: @@ -169,7 +169,7 @@ void __exit vpe_module_exit(void) { struct vpe *v, *n; - device_unregister(&vpe_device); + device_del(&vpe_device); class_unregister(&vpe_class); unregister_chrdev(major, VPE_MODULE_NAME);
diff --git a/arch/mips/kernel/vpe-mt.c b/arch/mips/kernel/vpe-mt.c index 496ed8f..2e003b1 100644 --- a/arch/mips/kernel/vpe-mt.c +++ b/arch/mips/kernel/vpe-mt.c
@@ -92,11 +92,12 @@ int vpe_run(struct vpe *v) write_tc_c0_tchalt(read_tc_c0_tchalt() & ~TCHALT_H); /* - * We don't pass the memsize here, so VPE programs need to be - * compiled with DFLT_STACK_SIZE and DFLT_HEAP_SIZE defined. + * The sde-kit passes 'memsize' to __start in $a3, so set something + * here... Or set $a3 to zero and define DFLT_STACK_SIZE and + * DFLT_HEAP_SIZE when you compile your program */ - mttgpr(7, 0); mttgpr(6, v->ntcs); + mttgpr(7, physical_memsize); /* set up VPE1 */ /* @@ -312,6 +313,7 @@ ATTRIBUTE_GROUPS(vpe); static void vpe_device_release(struct device *cd) { + kfree(cd); } static struct class vpe_class = { @@ -495,7 +497,6 @@ int __init vpe_module_init(void) device_del(&vpe_device); out_class: - put_device(&vpe_device); class_unregister(&vpe_class); out_chrdev: @@ -508,7 +509,7 @@ void __exit vpe_module_exit(void) { struct vpe *v, *n; - device_unregister(&vpe_device); + device_del(&vpe_device); class_unregister(&vpe_class); unregister_chrdev(major, VPE_MODULE_NAME);
diff --git a/arch/mips/lantiq/clk.c b/arch/mips/lantiq/clk.c index 2d5a0bc..7a62368 100644 --- a/arch/mips/lantiq/clk.c +++ b/arch/mips/lantiq/clk.c
@@ -50,7 +50,6 @@ struct clk *clk_get_io(void) { return &cpu_clk_generic[2]; } -EXPORT_SYMBOL_GPL(clk_get_io); struct clk *clk_get_ppe(void) {
diff --git a/arch/mips/lantiq/prom.c b/arch/mips/lantiq/prom.c index 2729a4b..3f568f5 100644 --- a/arch/mips/lantiq/prom.c +++ b/arch/mips/lantiq/prom.c
@@ -23,6 +23,12 @@ DEFINE_SPINLOCK(ebu_lock); EXPORT_SYMBOL_GPL(ebu_lock); /* + * This is needed by the VPE loader code, just set it to 0 and assume + * that the firmware hardcodes this value to something useful. + */ +unsigned long physical_memsize = 0L; + +/* * this struct is filled by the soc specific detection code and holds * information about the specific soc type, revision and name */
diff --git a/arch/mips/lasat/picvue_proc.c b/arch/mips/lasat/picvue_proc.c index 6b01991..8126f15 100644 --- a/arch/mips/lasat/picvue_proc.c +++ b/arch/mips/lasat/picvue_proc.c
@@ -39,7 +39,7 @@ static void pvc_display(unsigned long data) pvc_write_string(pvc_lines[i], 0, i); } -static DECLARE_TASKLET_OLD(pvc_display_tasklet, &pvc_display); +static DECLARE_TASKLET(pvc_display_tasklet, &pvc_display, 0); static int pvc_line_proc_show(struct seq_file *m, void *v) {
diff --git a/arch/mips/loongson32/common/platform.c b/arch/mips/loongson32/common/platform.c index 311dc15..794c96c 100644 --- a/arch/mips/loongson32/common/platform.c +++ b/arch/mips/loongson32/common/platform.c
@@ -98,7 +98,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) if (plat_dat->bus_id) { __raw_writel(__raw_readl(LS1X_MUX_CTRL0) | GMAC1_USE_UART1 | GMAC1_USE_UART0, LS1X_MUX_CTRL0); - switch (plat_dat->phy_interface) { + switch (plat_dat->interface) { case PHY_INTERFACE_MODE_RGMII: val &= ~(GMAC1_USE_TXCLK | GMAC1_USE_PWM23); break; @@ -107,12 +107,12 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) break; default: pr_err("unsupported mii mode %d\n", - plat_dat->phy_interface); + plat_dat->interface); return -ENOTSUPP; } val &= ~GMAC1_SHUT; } else { - switch (plat_dat->phy_interface) { + switch (plat_dat->interface) { case PHY_INTERFACE_MODE_RGMII: val &= ~(GMAC0_USE_TXCLK | GMAC0_USE_PWM01); break; @@ -121,7 +121,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) break; default: pr_err("unsupported mii mode %d\n", - plat_dat->phy_interface); + plat_dat->interface); return -ENOTSUPP; } val &= ~GMAC0_SHUT; @@ -131,7 +131,7 @@ int ls1x_eth_mux_init(struct platform_device *pdev, void *priv) plat_dat = dev_get_platdata(&pdev->dev); val &= ~PHY_INTF_SELI; - if (plat_dat->phy_interface == PHY_INTERFACE_MODE_RMII) + if (plat_dat->interface == PHY_INTERFACE_MODE_RMII) val |= 0x4 << PHY_INTF_SELI_SHIFT; __raw_writel(val, LS1X_MUX_CTRL1); @@ -146,9 +146,9 @@ static struct plat_stmmacenet_data ls1x_eth0_pdata = { .bus_id = 0, .phy_addr = -1, #if defined(CONFIG_LOONGSON1_LS1B) - .phy_interface = PHY_INTERFACE_MODE_MII, + .interface = PHY_INTERFACE_MODE_MII, #elif defined(CONFIG_LOONGSON1_LS1C) - .phy_interface = PHY_INTERFACE_MODE_RMII, + .interface = PHY_INTERFACE_MODE_RMII, #endif .mdio_bus_data = &ls1x_mdio_bus_data, .dma_cfg = &ls1x_eth_dma_cfg, @@ -186,7 +186,7 @@ struct platform_device ls1x_eth0_pdev = { static struct plat_stmmacenet_data ls1x_eth1_pdata = { .bus_id = 1, .phy_addr = -1, - .phy_interface = PHY_INTERFACE_MODE_MII, + .interface = PHY_INTERFACE_MODE_MII, .mdio_bus_data = &ls1x_mdio_bus_data, .dma_cfg = &ls1x_eth_dma_cfg, .has_gmac = 1,
diff --git a/arch/mips/loongson32/ls1c/board.c b/arch/mips/loongson32/ls1c/board.c index 9dcfe9d..e9de6da 100644 --- a/arch/mips/loongson32/ls1c/board.c +++ b/arch/mips/loongson32/ls1c/board.c
@@ -15,6 +15,7 @@ static struct platform_device *ls1c_platform_devices[] __initdata = { static int __init ls1c_platform_init(void) { ls1x_serial_set_uartclk(&ls1x_uart_pdev); + ls1x_rtc_set_extclk(&ls1x_rtc_pdev); return platform_add_devices(ls1c_platform_devices, ARRAY_SIZE(ls1c_platform_devices));
diff --git a/arch/mips/mm/dma-noncoherent.c b/arch/mips/mm/dma-noncoherent.c index edbfa38..35cfcf9 100644 --- a/arch/mips/mm/dma-noncoherent.c +++ b/arch/mips/mm/dma-noncoherent.c
@@ -27,7 +27,7 @@ * R10000 and R12000 are used in such systems, the SGI IP28 Indigo² rsp. * SGI IP32 aka O2. */ -static inline bool cpu_needs_post_dma_flush(void) +static inline bool cpu_needs_post_dma_flush(struct device *dev) { switch (boot_cpu_type()) { case CPU_R10000: @@ -118,17 +118,17 @@ static inline void dma_sync_phys(phys_addr_t paddr, size_t size, } while (left); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { dma_sync_phys(paddr, size, dir); } #ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { - if (cpu_needs_post_dma_flush()) + if (cpu_needs_post_dma_flush(dev)) dma_sync_phys(paddr, size, dir); } #endif
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c index 061dc5c..547d813 100644 --- a/arch/mips/mm/tlbex.c +++ b/arch/mips/mm/tlbex.c
@@ -629,7 +629,7 @@ static __maybe_unused void build_convert_pte_to_entrylo(u32 **p, return; } - if (cpu_has_rixi && _PAGE_NO_EXEC != 0) { + if (cpu_has_rixi && !!_PAGE_NO_EXEC) { if (fill_includes_sw_bits) { UASM_i_ROTR(p, reg, reg, ilog2(_PAGE_GLOBAL)); } else { @@ -2568,7 +2568,7 @@ static void check_pabits(void) unsigned long entry; unsigned pabits, fillbits; - if (!cpu_has_rixi || _PAGE_NO_EXEC == 0) { + if (!cpu_has_rixi || !_PAGE_NO_EXEC) { /* * We'll only be making use of the fact that we can rotate bits * into the fill if the CPU supports RIXI, so don't bother
diff --git a/arch/mips/pic32/pic32mzda/early_console.c b/arch/mips/pic32/pic32mzda/early_console.c index 5d48408..8c23673 100644 --- a/arch/mips/pic32/pic32mzda/early_console.c +++ b/arch/mips/pic32/pic32mzda/early_console.c
@@ -27,7 +27,7 @@ #define U_BRG(x) (UART_BASE(x) + 0x40) static void __iomem *uart_base; -static int console_port = -1; +static char console_port = -1; static int __init configure_uart_pins(int port) { @@ -47,7 +47,7 @@ static int __init configure_uart_pins(int port) return 0; } -static void __init configure_uart(int port, int baud) +static void __init configure_uart(char port, int baud) { u32 pbclk; @@ -60,7 +60,7 @@ static void __init configure_uart(int port, int baud) uart_base + PIC32_SET(U_STA(port))); } -static void __init setup_early_console(int port, int baud) +static void __init setup_early_console(char port, int baud) { if (configure_uart_pins(port)) return; @@ -130,15 +130,16 @@ static int __init get_baud_from_cmdline(char *arch_cmdline) return baud; } -void __init fw_init_early_console(void) +void __init fw_init_early_console(char port) { char *arch_cmdline = pic32_getcmdline(); - int baud, port; + int baud = -1; uart_base = ioremap_nocache(PIC32_BASE_UART, 0xc00); baud = get_baud_from_cmdline(arch_cmdline); - port = get_port_from_cmdline(arch_cmdline); + if (port == -1) + port = get_port_from_cmdline(arch_cmdline); if (port == -1) port = EARLY_CONSOLE_PORT;
diff --git a/arch/mips/pic32/pic32mzda/init.c b/arch/mips/pic32/pic32mzda/init.c index 488c0be..f232c77 100644 --- a/arch/mips/pic32/pic32mzda/init.c +++ b/arch/mips/pic32/pic32mzda/init.c
@@ -60,7 +60,7 @@ void __init plat_mem_setup(void) strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE); #ifdef CONFIG_EARLY_PRINTK - fw_init_early_console(); + fw_init_early_console(-1); #endif pic32_config_init(); }
diff --git a/arch/nds32/kernel/dma.c b/arch/nds32/kernel/dma.c index 69d7621..4206d4b 100644 --- a/arch/nds32/kernel/dma.c +++ b/arch/nds32/kernel/dma.c
@@ -46,8 +46,8 @@ static inline void cache_op(phys_addr_t paddr, size_t size, } while (left); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_FROM_DEVICE: @@ -61,8 +61,8 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_TO_DEVICE:
diff --git a/arch/nds32/kernel/fpu.c b/arch/nds32/kernel/fpu.c index 26c62d5..62bdafb 100644 --- a/arch/nds32/kernel/fpu.c +++ b/arch/nds32/kernel/fpu.c
@@ -223,7 +223,7 @@ inline void handle_fpu_exception(struct pt_regs *regs) } } else if (fpcsr & FPCSR_mskRIT) { if (!user_mode(regs)) - make_task_dead(SIGILL); + do_exit(SIGILL); si_signo = SIGILL; }
diff --git a/arch/nds32/kernel/traps.c b/arch/nds32/kernel/traps.c index 5787071..160c0fd 100644 --- a/arch/nds32/kernel/traps.c +++ b/arch/nds32/kernel/traps.c
@@ -184,7 +184,7 @@ void __noreturn die(const char *str, struct pt_regs *regs, int err) bust_spinlocks(0); spin_unlock_irq(&die_lock); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } EXPORT_SYMBOL(die); @@ -288,7 +288,7 @@ void unhandled_interruption(struct pt_regs *regs) pr_emerg("unhandled_interruption\n"); show_regs(regs); if (!user_mode(regs)) - make_task_dead(SIGKILL); + do_exit(SIGKILL); force_sig(SIGKILL); } @@ -299,7 +299,7 @@ void unhandled_exceptions(unsigned long entry, unsigned long addr, addr, type); show_regs(regs); if (!user_mode(regs)) - make_task_dead(SIGKILL); + do_exit(SIGKILL); force_sig(SIGKILL); } @@ -326,7 +326,7 @@ void do_revinsn(struct pt_regs *regs) pr_emerg("Reserved Instruction\n"); show_regs(regs); if (!user_mode(regs)) - make_task_dead(SIGILL); + do_exit(SIGILL); force_sig(SIGILL); }
diff --git a/arch/nios2/boot/Makefile b/arch/nios2/boot/Makefile index 0b704c1..37dfc7e 100644 --- a/arch/nios2/boot/Makefile +++ b/arch/nios2/boot/Makefile
@@ -20,7 +20,7 @@ $(obj)/vmlinux.gz: $(obj)/vmlinux.bin FORCE $(call if_changed,gzip) -$(obj)/vmImage: $(obj)/vmlinux.gz FORCE +$(obj)/vmImage: $(obj)/vmlinux.gz $(call if_changed,uimage) @$(kecho) 'Kernel: $@ is ready'
diff --git a/arch/nios2/include/asm/entry.h b/arch/nios2/include/asm/entry.h index bafb7b2..cf37f55 100644 --- a/arch/nios2/include/asm/entry.h +++ b/arch/nios2/include/asm/entry.h
@@ -50,8 +50,7 @@ stw r13, PT_R13(sp) stw r14, PT_R14(sp) stw r15, PT_R15(sp) - movi r24, -1 - stw r24, PT_ORIG_R2(sp) + stw r2, PT_ORIG_R2(sp) stw r7, PT_ORIG_R7(sp) stw ra, PT_RA(sp)
diff --git a/arch/nios2/include/asm/ptrace.h b/arch/nios2/include/asm/ptrace.h index 9da34c3..6424621 100644 --- a/arch/nios2/include/asm/ptrace.h +++ b/arch/nios2/include/asm/ptrace.h
@@ -74,8 +74,6 @@ extern void show_regs(struct pt_regs *); ((struct pt_regs *)((unsigned long)current_thread_info() + THREAD_SIZE)\ - 1) -#define force_successful_syscall_return() (current_pt_regs()->orig_r2 = -1) - int do_syscall_trace_enter(void); void do_syscall_trace_exit(void); #endif /* __ASSEMBLY__ */
diff --git a/arch/nios2/kernel/entry.S b/arch/nios2/kernel/entry.S index af55658..1e515cc 100644 --- a/arch/nios2/kernel/entry.S +++ b/arch/nios2/kernel/entry.S
@@ -185,7 +185,6 @@ ldw r5, PT_R5(sp) local_restart: - stw r2, PT_ORIG_R2(sp) /* Check that the requested system call is within limits */ movui r1, __NR_syscalls bgeu r2, r1, ret_invsyscall @@ -193,6 +192,7 @@ movhi r11, %hiadj(sys_call_table) add r1, r1, r11 ldw r1, %lo(sys_call_table)(r1) + beq r1, r0, ret_invsyscall /* Check if we are being traced */ GET_THREAD_INFO r11 @@ -213,9 +213,6 @@ translate_rc_and_ret: movi r1, 0 bge r2, zero, 3f - ldw r1, PT_ORIG_R2(sp) - addi r1, r1, 1 - beq r1, zero, 3f sub r2, zero, r2 movi r1, 1 3: @@ -258,9 +255,9 @@ ldw r6, PT_R6(sp) ldw r7, PT_R7(sp) - /* Fetch the syscall function. */ - movui r1, __NR_syscalls - bgeu r2, r1, traced_invsyscall + /* Fetch the syscall function, we don't need to check the boundaries + * since this is already done. + */ slli r1, r2, 2 movhi r11,%hiadj(sys_call_table) add r1, r1, r11 @@ -279,9 +276,6 @@ translate_rc_and_ret2: movi r1, 0 bge r2, zero, 4f - ldw r1, PT_ORIG_R2(sp) - addi r1, r1, 1 - beq r1, zero, 4f sub r2, zero, r2 movi r1, 1 4: @@ -293,11 +287,6 @@ RESTORE_SWITCH_STACK br ret_from_exception - /* If the syscall number was invalid return ENOSYS */ -traced_invsyscall: - movi r2, -ENOSYS - br translate_rc_and_ret2 - Luser_return: GET_THREAD_INFO r11 /* get thread_info pointer */ ldw r10, TI_FLAGS(r11) /* get thread_info->flags */ @@ -347,6 +336,9 @@ /* skip if no interrupt is pending */ beq r12, r0, ret_from_interrupt + movi r24, -1 + stw r24, PT_ORIG_R2(sp) + /* * Process an external hardware interrupt. */
diff --git a/arch/nios2/kernel/signal.c b/arch/nios2/kernel/signal.c index bfb2082..a42dd09 100644 --- a/arch/nios2/kernel/signal.c +++ b/arch/nios2/kernel/signal.c
@@ -240,7 +240,7 @@ static int do_signal(struct pt_regs *regs) /* * If we were from a system call, check for system call restarting... */ - if (regs->orig_r2 >= 0 && regs->r1) { + if (regs->orig_r2 >= 0) { continue_addr = regs->ea; restart_addr = continue_addr - 4; retval = regs->r2; @@ -261,7 +261,6 @@ static int do_signal(struct pt_regs *regs) regs->ea = restart_addr; break; } - regs->orig_r2 = -1; } if (get_signal(&ksig)) {
diff --git a/arch/nios2/kernel/syscall_table.c b/arch/nios2/kernel/syscall_table.c index c2875a6..6176d63 100644 --- a/arch/nios2/kernel/syscall_table.c +++ b/arch/nios2/kernel/syscall_table.c
@@ -13,6 +13,5 @@ #define __SYSCALL(nr, call) [nr] = (call), void *sys_call_table[__NR_syscalls] = { - [0 ... __NR_syscalls-1] = sys_ni_syscall, #include <asm/unistd.h> };
diff --git a/arch/nios2/kernel/traps.c b/arch/nios2/kernel/traps.c index 8e192d6..486db79 100644 --- a/arch/nios2/kernel/traps.c +++ b/arch/nios2/kernel/traps.c
@@ -37,10 +37,10 @@ void die(const char *str, struct pt_regs *regs, long err) show_regs(regs); spin_unlock_irq(&die_lock); /* - * make_task_dead() should take care of panic'ing from an interrupt + * do_exit() should take care of panic'ing from an interrupt * context so we don't handle it here */ - make_task_dead(err); + do_exit(err); } void _exception(int signo, struct pt_regs *regs, int code, unsigned long addr)
diff --git a/arch/nios2/mm/dma-mapping.c b/arch/nios2/mm/dma-mapping.c index 0ed711e..9cb2386 100644 --- a/arch/nios2/mm/dma-mapping.c +++ b/arch/nios2/mm/dma-mapping.c
@@ -18,8 +18,8 @@ #include <linux/cache.h> #include <asm/cacheflush.h> -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { void *vaddr = phys_to_virt(paddr); @@ -42,8 +42,8 @@ void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { void *vaddr = phys_to_virt(paddr);
diff --git a/arch/openrisc/kernel/dma.c b/arch/openrisc/kernel/dma.c index adec711..4d5b8bd 100644 --- a/arch/openrisc/kernel/dma.c +++ b/arch/openrisc/kernel/dma.c
@@ -125,7 +125,7 @@ arch_dma_free(struct device *dev, size_t size, void *vaddr, free_pages_exact(vaddr, size); } -void arch_sync_dma_for_device(phys_addr_t addr, size_t size, +void arch_sync_dma_for_device(struct device *dev, phys_addr_t addr, size_t size, enum dma_data_direction dir) { unsigned long cl;
diff --git a/arch/openrisc/kernel/traps.c b/arch/openrisc/kernel/traps.c index 85ba2ab..817e4ca 100644 --- a/arch/openrisc/kernel/traps.c +++ b/arch/openrisc/kernel/traps.c
@@ -218,7 +218,7 @@ void __noreturn die(const char *str, struct pt_regs *regs, long err) __asm__ __volatile__("l.nop 1"); do {} while (1); #endif - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } /* This is normally the 'Oops' routine */
diff --git a/arch/parisc/include/asm/hardware.h b/arch/parisc/include/asm/hardware.h index a005ebc..9d3d773 100644 --- a/arch/parisc/include/asm/hardware.h +++ b/arch/parisc/include/asm/hardware.h
@@ -10,12 +10,12 @@ #define SVERSION_ANY_ID PA_SVERSION_ANY_ID struct hp_hardware { - unsigned int hw_type:8; /* HPHW_xxx */ - unsigned int hversion:12; - unsigned int sversion:12; - unsigned char opt; - unsigned char name[59]; /* The hardware description */ -} __packed; + unsigned short hw_type:5; /* HPHW_xxx */ + unsigned short hversion; + unsigned long sversion:28; + unsigned short opt; + const char name[80]; /* The hardware description */ +}; struct parisc_device;
diff --git a/arch/parisc/include/uapi/asm/mman.h b/arch/parisc/include/uapi/asm/mman.h index 6b5da7b..6fd8871 100644 --- a/arch/parisc/include/uapi/asm/mman.h +++ b/arch/parisc/include/uapi/asm/mman.h
@@ -48,27 +48,28 @@ #define MADV_DONTFORK 10 /* don't inherit across fork */ #define MADV_DOFORK 11 /* do inherit across fork */ -#define MADV_MERGEABLE 12 /* KSM may merge identical pages */ -#define MADV_UNMERGEABLE 13 /* KSM may not merge identical pages */ - -#define MADV_HUGEPAGE 14 /* Worth backing with hugepages */ -#define MADV_NOHUGEPAGE 15 /* Not worth backing with hugepages */ - -#define MADV_DONTDUMP 16 /* Explicity exclude from the core dump, - overrides the coredump filter bits */ -#define MADV_DODUMP 17 /* Clear the MADV_NODUMP flag */ - -#define MADV_WIPEONFORK 18 /* Zero memory on fork, child only */ -#define MADV_KEEPONFORK 19 /* Undo MADV_WIPEONFORK */ - #define MADV_COLD 20 /* deactivate these pages */ #define MADV_PAGEOUT 21 /* reclaim these pages */ +#define MADV_MERGEABLE 65 /* KSM may merge identical pages */ +#define MADV_UNMERGEABLE 66 /* KSM may not merge identical pages */ + +#define MADV_HUGEPAGE 67 /* Worth backing with hugepages */ +#define MADV_NOHUGEPAGE 68 /* Not worth backing with hugepages */ + +#define MADV_DONTDUMP 69 /* Explicity exclude from the core dump, + overrides the coredump filter bits */ +#define MADV_DODUMP 70 /* Clear the MADV_NODUMP flag */ + +#define MADV_WIPEONFORK 71 /* Zero memory on fork, child only */ +#define MADV_KEEPONFORK 72 /* Undo MADV_WIPEONFORK */ + #define MADV_HWPOISON 100 /* poison a page for testing */ #define MADV_SOFT_OFFLINE 101 /* soft offline page for testing */ /* compatibility flags */ #define MAP_FILE 0 +#define MAP_VARIABLE 0 #define PKEY_DISABLE_ACCESS 0x1 #define PKEY_DISABLE_WRITE 0x2
diff --git a/arch/parisc/kernel/drivers.c b/arch/parisc/kernel/drivers.c index a147667..a5f3e50 100644 --- a/arch/parisc/kernel/drivers.c +++ b/arch/parisc/kernel/drivers.c
@@ -520,6 +520,7 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) dev->id.hversion_rev = iodc_data[1] & 0x0f; dev->id.sversion = ((iodc_data[4] & 0x0f) << 16) | (iodc_data[5] << 8) | iodc_data[6]; + dev->hpa.name = parisc_pathname(dev); dev->hpa.start = hpa; /* This is awkward. The STI spec says that gfx devices may occupy * 32MB or 64MB. Unfortunately, we don't know how to tell whether @@ -533,10 +534,10 @@ alloc_pa_dev(unsigned long hpa, struct hardware_path *mod_path) dev->hpa.end = hpa + 0xfff; } dev->hpa.flags = IORESOURCE_MEM; - dev->hpa.name = dev->name; - name = parisc_hardware_description(&dev->id) ? : "unknown"; - snprintf(dev->name, sizeof(dev->name), "%s [%s]", - name, parisc_pathname(dev)); + name = parisc_hardware_description(&dev->id); + if (name) { + strlcpy(dev->name, name, sizeof(dev->name)); + } /* Silently fail things like mouse ports which are subsumed within * the keyboard controller @@ -882,13 +883,15 @@ void __init walk_central_bus(void) &root); } -static __init void print_parisc_device(struct parisc_device *dev) +static void print_parisc_device(struct parisc_device *dev) { - static int count __initdata; + char hw_path[64]; + static int count; - pr_info("%d. %s at %pap { type:%d, hv:%#x, sv:%#x, rev:%#x }", - ++count, dev->name, &(dev->hpa.start), dev->id.hw_type, - dev->id.hversion, dev->id.sversion, dev->id.hversion_rev); + print_pa_hwpath(dev, hw_path); + pr_info("%d. %s at %pap [%s] { %d, 0x%x, 0x%.3x, 0x%.5x }", + ++count, dev->name, &(dev->hpa.start), hw_path, dev->id.hw_type, + dev->id.hversion_rev, dev->id.hversion, dev->id.sversion); if (dev->num_addrs) { int k; @@ -1077,7 +1080,7 @@ static __init int qemu_print_iodc_data(struct device *lin_dev, void *data) -static __init int print_one_device(struct device * dev, void * data) +static int print_one_device(struct device * dev, void * data) { struct parisc_device * pdev = to_parisc_device(dev);
diff --git a/arch/parisc/kernel/firmware.c b/arch/parisc/kernel/firmware.c index 2496cb2..1d976f2 100644 --- a/arch/parisc/kernel/firmware.c +++ b/arch/parisc/kernel/firmware.c
@@ -1229,7 +1229,7 @@ static char __attribute__((aligned(64))) iodc_dbuf[4096]; */ int pdc_iodc_print(const unsigned char *str, unsigned count) { - unsigned int i, found = 0; + unsigned int i; unsigned long flags; for (i = 0; i < count;) { @@ -1238,7 +1238,6 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) iodc_dbuf[i+0] = '\r'; iodc_dbuf[i+1] = '\n'; i += 2; - found = 1; goto print; default: iodc_dbuf[i] = str[i]; @@ -1255,7 +1254,7 @@ int pdc_iodc_print(const unsigned char *str, unsigned count) __pa(iodc_retbuf), 0, __pa(iodc_dbuf), i, 0); spin_unlock_irqrestore(&pdc_lock, flags); - return i - found; + return i; } #if !defined(BOOTLOADER)
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index b59a0c3..951a339 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S
@@ -22,7 +22,7 @@ #include <linux/linkage.h> #include <linux/init.h> - .level 1.1 + .level PA_ASM_LEVEL __INITDATA ENTRY(boot_args) @@ -69,47 +69,6 @@ stw,ma %arg2,4(%r1) stw,ma %arg3,4(%r1) -#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20) - /* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU - * and halt kernel if we detect a PA1.x CPU. */ - ldi 32,%r10 - mtctl %r10,%cr11 - .level 2.0 - mfctl,w %cr11,%r10 - .level 1.1 - comib,<>,n 0,%r10,$cpu_ok - - load32 PA(msg1),%arg0 - ldi msg1_end-msg1,%arg1 -$iodc_panic: - copy %arg0, %r10 - copy %arg1, %r11 - load32 PA(init_stack),%sp -#define MEM_CONS 0x3A0 - ldw MEM_CONS+32(%r0),%arg0 // HPA - ldi ENTRY_IO_COUT,%arg1 - ldw MEM_CONS+36(%r0),%arg2 // SPA - ldw MEM_CONS+8(%r0),%arg3 // layers - load32 PA(__bss_start),%r1 - stw %r1,-52(%sp) // arg4 - stw %r0,-56(%sp) // arg5 - stw %r10,-60(%sp) // arg6 = ptr to text - stw %r11,-64(%sp) // arg7 = len - stw %r0,-68(%sp) // arg8 - load32 PA(.iodc_panic_ret), %rp - ldw MEM_CONS+40(%r0),%r1 // ENTRY_IODC - bv,n (%r1) -.iodc_panic_ret: - b . /* wait endless with ... */ - or %r10,%r10,%r10 /* qemu idle sleep */ -msg1: .ascii "Can't boot kernel which was built for PA8x00 CPUs on this machine.\r\n" -msg1_end: - -$cpu_ok: -#endif - - .level PA_ASM_LEVEL - /* Initialize startup VM. Just map first 16/32 MB of memory */ load32 PA(swapper_pg_dir),%r4 mtctl %r4,%cr24 /* Initialize kernel root pointer */
diff --git a/arch/parisc/kernel/pci-dma.c b/arch/parisc/kernel/pci-dma.c index a60d47f..ca35d9a 100644 --- a/arch/parisc/kernel/pci-dma.c +++ b/arch/parisc/kernel/pci-dma.c
@@ -439,14 +439,14 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, free_pages((unsigned long)__va(dma_handle), order); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { flush_kernel_dcache_range((unsigned long)phys_to_virt(paddr), size); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { flush_kernel_dcache_range((unsigned long)phys_to_virt(paddr), size); }
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c index 7407fee..9f6ff7b 100644 --- a/arch/parisc/kernel/ptrace.c +++ b/arch/parisc/kernel/ptrace.c
@@ -128,12 +128,6 @@ long arch_ptrace(struct task_struct *child, long request, unsigned long tmp; long ret = -EIO; - unsigned long user_regs_struct_size = sizeof(struct user_regs_struct); -#ifdef CONFIG_64BIT - if (is_compat_task()) - user_regs_struct_size /= 2; -#endif - switch (request) { /* Read the word at location addr in the USER area. For ptraced @@ -189,14 +183,14 @@ long arch_ptrace(struct task_struct *child, long request, return copy_regset_to_user(child, task_user_regset_view(current), REGSET_GENERAL, - 0, user_regs_struct_size, + 0, sizeof(struct user_regs_struct), datap); case PTRACE_SETREGS: /* Set all gp regs in the child. */ return copy_regset_from_user(child, task_user_regset_view(current), REGSET_GENERAL, - 0, user_regs_struct_size, + 0, sizeof(struct user_regs_struct), datap); case PTRACE_GETFPREGS: /* Get the child FPU state. */ @@ -310,11 +304,6 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, } } break; - case PTRACE_GETREGS: - case PTRACE_SETREGS: - case PTRACE_GETFPREGS: - case PTRACE_SETFPREGS: - return arch_ptrace(child, request, addr, data); default: ret = compat_ptrace_request(child, request, addr, data);
diff --git a/arch/parisc/kernel/sys_parisc.c b/arch/parisc/kernel/sys_parisc.c index a795ce7..5d458a4 100644 --- a/arch/parisc/kernel/sys_parisc.c +++ b/arch/parisc/kernel/sys_parisc.c
@@ -373,30 +373,3 @@ long parisc_personality(unsigned long personality) return err; } - -/* - * madvise() wrapper - * - * Up to kernel v6.1 parisc has different values than all other - * platforms for the MADV_xxx flags listed below. - * To keep binary compatibility with existing userspace programs - * translate the former values to the new values. - * - * XXX: Remove this wrapper in year 2025 (or later) - */ - -asmlinkage notrace long parisc_madvise(unsigned long start, size_t len_in, int behavior) -{ - switch (behavior) { - case 65: behavior = MADV_MERGEABLE; break; - case 66: behavior = MADV_UNMERGEABLE; break; - case 67: behavior = MADV_HUGEPAGE; break; - case 68: behavior = MADV_NOHUGEPAGE; break; - case 69: behavior = MADV_DONTDUMP; break; - case 70: behavior = MADV_DODUMP; break; - case 71: behavior = MADV_WIPEONFORK; break; - case 72: behavior = MADV_KEEPONFORK; break; - } - - return sys_madvise(start, len_in, behavior); -}
diff --git a/arch/parisc/kernel/syscalls/syscall.tbl b/arch/parisc/kernel/syscalls/syscall.tbl index 2b0a317..a22d7bd 100644 --- a/arch/parisc/kernel/syscalls/syscall.tbl +++ b/arch/parisc/kernel/syscalls/syscall.tbl
@@ -131,7 +131,7 @@ 116 common sysinfo sys_sysinfo compat_sys_sysinfo 117 common shutdown sys_shutdown 118 common fsync sys_fsync -119 common madvise parisc_madvise +119 common madvise sys_madvise 120 common clone sys_clone_wrapper 121 common setdomainname sys_setdomainname 122 common sendfile sys_sendfile compat_sys_sendfile @@ -413,7 +413,7 @@ 412 32 utimensat_time64 sys_utimensat sys_utimensat 413 32 pselect6_time64 sys_pselect6 compat_sys_pselect6_time64 414 32 ppoll_time64 sys_ppoll compat_sys_ppoll_time64 -416 32 io_pgetevents_time64 sys_io_pgetevents compat_sys_io_pgetevents_time64 +416 32 io_pgetevents_time64 sys_io_pgetevents sys_io_pgetevents 417 32 recvmmsg_time64 sys_recvmmsg compat_sys_recvmmsg_time64 418 32 mq_timedsend_time64 sys_mq_timedsend sys_mq_timedsend 419 32 mq_timedreceive_time64 sys_mq_timedreceive sys_mq_timedreceive
diff --git a/arch/parisc/kernel/traps.c b/arch/parisc/kernel/traps.c index 37988f7..2a1060d 100644 --- a/arch/parisc/kernel/traps.c +++ b/arch/parisc/kernel/traps.c
@@ -268,7 +268,7 @@ void die_if_kernel(char *str, struct pt_regs *regs, long err) panic("Fatal exception"); oops_exit(); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } /* gdb uses break 4,8 */
diff --git a/arch/parisc/kernel/unaligned.c b/arch/parisc/kernel/unaligned.c index cc6ed74..286cec4 100644 --- a/arch/parisc/kernel/unaligned.c +++ b/arch/parisc/kernel/unaligned.c
@@ -107,7 +107,7 @@ #define R1(i) (((i)>>21)&0x1f) #define R2(i) (((i)>>16)&0x1f) #define R3(i) ((i)&0x1f) -#define FR3(i) ((((i)&0x1f)<<1)|(((i)>>6)&1)) +#define FR3(i) ((((i)<<1)&0x1f)|(((i)>>6)&1)) #define IM(i,n) (((i)>>1&((1<<(n-1))-1))|((i)&1?((0-1L)<<(n-1)):0)) #define IM5_2(i) IM((i)>>16,5) #define IM5_3(i) IM((i),5)
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile index 6c32ea6..b9d2fcf 100644 --- a/arch/powerpc/Makefile +++ b/arch/powerpc/Makefile
@@ -17,6 +17,23 @@ # Set default 32 bits cross compilers for vdso and boot wrapper CROSS32_COMPILE ?= +ifeq ($(HAS_BIARCH),y) +ifeq ($(CROSS32_COMPILE),) +ifdef CONFIG_PPC32 +# These options will be overridden by any -mcpu option that the CPU +# or platform code sets later on the command line, but they are needed +# to set a sane 32-bit cpu target for the 64-bit cross compiler which +# may default to the wrong ISA. +KBUILD_CFLAGS += -mcpu=powerpc +KBUILD_AFLAGS += -mcpu=powerpc +endif +endif +endif + +ifdef CONFIG_PPC_BOOK3S_32 +KBUILD_CFLAGS += -mcpu=powerpc +endif + # If we're on a ppc/ppc64/ppc64le machine use that defconfig, otherwise just use # ppc64_defconfig because we have nothing better to go on. uname := $(shell uname -m) @@ -93,7 +110,7 @@ ifeq ($(HAS_BIARCH),y) KBUILD_CFLAGS += -m$(BITS) -KBUILD_AFLAGS += -m$(BITS) +KBUILD_AFLAGS += -m$(BITS) -Wl,-a$(BITS) KBUILD_LDFLAGS += -m elf$(BITS)$(LDEMULATION) endif @@ -155,7 +172,7 @@ CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power9,-mtune=power8) else CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,$(call cc-option,-mtune=power5)) -CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=power4 +CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mcpu=power5,-mcpu=power4) endif else ifdef CONFIG_PPC_BOOK3E_64 CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64 @@ -175,7 +192,6 @@ endif CFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU)) -AFLAGS-$(CONFIG_TARGET_CPU_BOOL) += $(call cc-option,-mcpu=$(CONFIG_TARGET_CPU)) # Altivec option not allowed with e500mc64 in GCC. ifdef CONFIG_ALTIVEC @@ -186,6 +202,14 @@ CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU) CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU)) +ifdef CONFIG_PPC32 +ifdef CONFIG_PPC_E500MC +CFLAGS-y += $(call cc-option,-mcpu=e500mc,-mcpu=powerpc) +else +CFLAGS-$(CONFIG_E500) += $(call cc-option,-mcpu=8540 -msoft-float,-mcpu=powerpc) +endif +endif + asinstr := $(call as-instr,lis 9$(comma)foo@high,-DHAVE_AS_ATHIGH=1) KBUILD_CPPFLAGS += -I $(srctree)/arch/$(ARCH) $(asinstr)
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile index 0db276f..8c69bd0 100644 --- a/arch/powerpc/boot/Makefile +++ b/arch/powerpc/boot/Makefile
@@ -30,7 +30,6 @@ BOOTCFLAGS := -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs \ -fno-strict-aliasing -O2 -msoft-float -mno-altivec -mno-vsx \ - $(call cc-option,-mno-spe) $(call cc-option,-mspe=no) \ -pipe -fomit-frame-pointer -fno-builtin -fPIC -nostdinc \ $(LINUXINCLUDE)
diff --git a/arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi b/arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi deleted file mode 100644 index 7e2a90c..0000000 --- a/arch/powerpc/boot/dts/fsl/e500v1_power_isa.dtsi +++ /dev/null
@@ -1,51 +0,0 @@ -/* - * e500v1 Power ISA Device Tree Source (include) - * - * Copyright 2012 Freescale Semiconductor Inc. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of Freescale Semiconductor nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * - * ALTERNATIVELY, this software may be distributed under the terms of the - * GNU General Public License ("GPL") as published by the Free Software - * Foundation, either version 2 of that License or (at your option) any - * later version. - * - * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/ { - cpus { - power-isa-version = "2.03"; - power-isa-b; // Base - power-isa-e; // Embedded - power-isa-atb; // Alternate Time Base - power-isa-cs; // Cache Specification - power-isa-e.le; // Embedded.Little-Endian - power-isa-e.pm; // Embedded.Performance Monitor - power-isa-ecl; // Embedded Cache Locking - power-isa-mmc; // Memory Coherence - power-isa-sp; // Signal Processing Engine - power-isa-sp.fs; // SPE.Embedded Float Scalar Single - power-isa-sp.fv; // SPE.Embedded Float Vector - mmu-type = "power-embedded"; - }; -};
diff --git a/arch/powerpc/boot/dts/fsl/mpc8540ads.dts b/arch/powerpc/boot/dts/fsl/mpc8540ads.dts index e03ae13..18a8851 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8540ads.dts +++ b/arch/powerpc/boot/dts/fsl/mpc8540ads.dts
@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "e500v1_power_isa.dtsi" +/include/ "e500v2_power_isa.dtsi" / { model = "MPC8540ADS";
diff --git a/arch/powerpc/boot/dts/fsl/mpc8541cds.dts b/arch/powerpc/boot/dts/fsl/mpc8541cds.dts index a2a6c5c..ac381e7 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8541cds.dts +++ b/arch/powerpc/boot/dts/fsl/mpc8541cds.dts
@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "e500v1_power_isa.dtsi" +/include/ "e500v2_power_isa.dtsi" / { model = "MPC8541CDS";
diff --git a/arch/powerpc/boot/dts/fsl/mpc8555cds.dts b/arch/powerpc/boot/dts/fsl/mpc8555cds.dts index 901b6ff..9f58db2 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8555cds.dts +++ b/arch/powerpc/boot/dts/fsl/mpc8555cds.dts
@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "e500v1_power_isa.dtsi" +/include/ "e500v2_power_isa.dtsi" / { model = "MPC8555CDS";
diff --git a/arch/powerpc/boot/dts/fsl/mpc8560ads.dts b/arch/powerpc/boot/dts/fsl/mpc8560ads.dts index c2f9aea..a24722c 100644 --- a/arch/powerpc/boot/dts/fsl/mpc8560ads.dts +++ b/arch/powerpc/boot/dts/fsl/mpc8560ads.dts
@@ -7,7 +7,7 @@ /dts-v1/; -/include/ "e500v1_power_isa.dtsi" +/include/ "e500v2_power_isa.dtsi" / { model = "MPC8560ADS";
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi deleted file mode 100644 index 437dab3..0000000 --- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-2.dtsi +++ /dev/null
@@ -1,44 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later -/* - * QorIQ FMan v3 10g port #2 device tree stub [ controller @ offset 0x400000 ] - * - * Copyright 2022 Sean Anderson <sean.anderson@seco.com> - * Copyright 2012 - 2015 Freescale Semiconductor Inc. - */ - -fman@400000 { - fman0_rx_0x08: port@88000 { - cell-index = <0x8>; - compatible = "fsl,fman-v3-port-rx"; - reg = <0x88000 0x1000>; - fsl,fman-10g-port; - }; - - fman0_tx_0x28: port@a8000 { - cell-index = <0x28>; - compatible = "fsl,fman-v3-port-tx"; - reg = <0xa8000 0x1000>; - fsl,fman-10g-port; - }; - - ethernet@e0000 { - cell-index = <0>; - compatible = "fsl,fman-memac"; - reg = <0xe0000 0x1000>; - fsl,fman-ports = <&fman0_rx_0x08 &fman0_tx_0x28>; - ptp-timer = <&ptp_timer0>; - pcsphy-handle = <&pcsphy0>; - }; - - mdio@e1000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; - reg = <0xe1000 0x1000>; - fsl,erratum-a011043; /* must ignore read errors */ - - pcsphy0: ethernet-phy@0 { - reg = <0x0>; - }; - }; -};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi deleted file mode 100644 index ad116b1..0000000 --- a/arch/powerpc/boot/dts/fsl/qoriq-fman3-0-10g-3.dtsi +++ /dev/null
@@ -1,44 +0,0 @@ -// SPDX-License-Identifier: BSD-3-Clause OR GPL-2.0-or-later -/* - * QorIQ FMan v3 10g port #3 device tree stub [ controller @ offset 0x400000 ] - * - * Copyright 2022 Sean Anderson <sean.anderson@seco.com> - * Copyright 2012 - 2015 Freescale Semiconductor Inc. - */ - -fman@400000 { - fman0_rx_0x09: port@89000 { - cell-index = <0x9>; - compatible = "fsl,fman-v3-port-rx"; - reg = <0x89000 0x1000>; - fsl,fman-10g-port; - }; - - fman0_tx_0x29: port@a9000 { - cell-index = <0x29>; - compatible = "fsl,fman-v3-port-tx"; - reg = <0xa9000 0x1000>; - fsl,fman-10g-port; - }; - - ethernet@e2000 { - cell-index = <1>; - compatible = "fsl,fman-memac"; - reg = <0xe2000 0x1000>; - fsl,fman-ports = <&fman0_rx_0x09 &fman0_tx_0x29>; - ptp-timer = <&ptp_timer0>; - pcsphy-handle = <&pcsphy1>; - }; - - mdio@e3000 { - #address-cells = <1>; - #size-cells = <0>; - compatible = "fsl,fman-memac-mdio", "fsl,fman-xmdio"; - reg = <0xe3000 0x1000>; - fsl,erratum-a011043; /* must ignore read errors */ - - pcsphy1: ethernet-phy@0 { - reg = <0x0>; - }; - }; -};
diff --git a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi index 27714dc..ecbb447 100644 --- a/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi +++ b/arch/powerpc/boot/dts/fsl/t2081si-post.dtsi
@@ -609,8 +609,8 @@ /include/ "qoriq-bman1.dtsi" /include/ "qoriq-fman3-0.dtsi" -/include/ "qoriq-fman3-0-10g-2.dtsi" -/include/ "qoriq-fman3-0-10g-3.dtsi" +/include/ "qoriq-fman3-0-1g-0.dtsi" +/include/ "qoriq-fman3-0-1g-1.dtsi" /include/ "qoriq-fman3-0-1g-2.dtsi" /include/ "qoriq-fman3-0-1g-3.dtsi" /include/ "qoriq-fman3-0-1g-4.dtsi" @@ -659,19 +659,3 @@ interrupts = <16 2 1 9>; }; }; - -&fman0_rx_0x08 { - /delete-property/ fsl,fman-10g-port; -}; - -&fman0_tx_0x28 { - /delete-property/ fsl,fman-10g-port; -}; - -&fman0_rx_0x09 { - /delete-property/ fsl,fman-10g-port; -}; - -&fman0_tx_0x29 { - /delete-property/ fsl,fman-10g-port; -};
diff --git a/arch/powerpc/include/asm/imc-pmu.h b/arch/powerpc/include/asm/imc-pmu.h index 11d2da6..4da4fcb 100644 --- a/arch/powerpc/include/asm/imc-pmu.h +++ b/arch/powerpc/include/asm/imc-pmu.h
@@ -132,7 +132,7 @@ struct imc_pmu { * are inited. */ struct imc_pmu_ref { - spinlock_t lock; + struct mutex lock; unsigned int id; int refc; };
diff --git a/arch/powerpc/kernel/eeh_driver.c b/arch/powerpc/kernel/eeh_driver.c index 68decc2..4fd7efd 100644 --- a/arch/powerpc/kernel/eeh_driver.c +++ b/arch/powerpc/kernel/eeh_driver.c
@@ -1072,46 +1072,45 @@ void eeh_handle_normal_event(struct eeh_pe *pe) } pr_info("EEH: Recovery successful.\n"); - goto out; - } + } else { + /* + * About 90% of all real-life EEH failures in the field + * are due to poorly seated PCI cards. Only 10% or so are + * due to actual, failed cards. + */ + pr_err("EEH: Unable to recover from failure from PHB#%x-PE#%x.\n" + "Please try reseating or replacing it\n", + pe->phb->global_number, pe->addr); - /* - * About 90% of all real-life EEH failures in the field - * are due to poorly seated PCI cards. Only 10% or so are - * due to actual, failed cards. - */ - pr_err("EEH: Unable to recover from failure from PHB#%x-PE#%x.\n" - "Please try reseating or replacing it\n", - pe->phb->global_number, pe->addr); + eeh_slot_error_detail(pe, EEH_LOG_PERM); - eeh_slot_error_detail(pe, EEH_LOG_PERM); + /* Notify all devices that they're about to go down. */ + eeh_set_channel_state(pe, pci_channel_io_perm_failure); + eeh_set_irq_state(pe, false); + eeh_pe_report("error_detected(permanent failure)", pe, + eeh_report_failure, NULL); - /* Notify all devices that they're about to go down. */ - eeh_set_irq_state(pe, false); - eeh_pe_report("error_detected(permanent failure)", pe, - eeh_report_failure, NULL); - eeh_set_channel_state(pe, pci_channel_io_perm_failure); + /* Mark the PE to be removed permanently */ + eeh_pe_state_mark(pe, EEH_PE_REMOVED); - /* Mark the PE to be removed permanently */ - eeh_pe_state_mark(pe, EEH_PE_REMOVED); + /* + * Shut down the device drivers for good. We mark + * all removed devices correctly to avoid access + * the their PCI config any more. + */ + if (pe->type & EEH_PE_VF) { + eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL); + eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); + } else { + eeh_pe_state_clear(pe, EEH_PE_PRI_BUS, true); + eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); - /* - * Shut down the device drivers for good. We mark - * all removed devices correctly to avoid access - * the their PCI config any more. - */ - if (pe->type & EEH_PE_VF) { - eeh_pe_dev_traverse(pe, eeh_rmv_device, NULL); - eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); - } else { - eeh_pe_state_clear(pe, EEH_PE_PRI_BUS, true); - eeh_pe_dev_mode_mark(pe, EEH_DEV_REMOVED); - - pci_lock_rescan_remove(); - pci_hp_remove_devices(bus); - pci_unlock_rescan_remove(); - /* The passed PE should no longer be used */ - return; + pci_lock_rescan_remove(); + pci_hp_remove_devices(bus); + pci_unlock_rescan_remove(); + /* The passed PE should no longer be used */ + return; + } } out: @@ -1207,10 +1206,10 @@ void eeh_handle_special_event(void) /* Notify all devices to be down */ eeh_pe_state_clear(pe, EEH_PE_PRI_BUS, true); + eeh_set_channel_state(pe, pci_channel_io_perm_failure); eeh_pe_report( "error_detected(permanent failure)", pe, eeh_report_failure, NULL); - eeh_set_channel_state(pe, pci_channel_io_perm_failure); pci_lock_rescan_remove(); list_for_each_entry(hose, &hose_list, list_node) {
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c index b9cb9fa..a2c258a 100644 --- a/arch/powerpc/kernel/pci-common.c +++ b/arch/powerpc/kernel/pci-common.c
@@ -66,35 +66,23 @@ void set_pci_dma_ops(const struct dma_map_ops *dma_ops) pci_dma_ops = dma_ops; } +/* + * This function should run under locking protection, specifically + * hose_spinlock. + */ static int get_phb_number(struct device_node *dn) { int ret, phb_id = -1; + u32 prop_32; u64 prop; /* * Try fixed PHB numbering first, by checking archs and reading - * the respective device-tree properties. Firstly, try reading - * standard "linux,pci-domain", then try reading "ibm,opal-phbid" - * (only present in powernv OPAL environment), then try device-tree - * alias and as the last try to use lower bits of "reg" property. + * the respective device-tree properties. Firstly, try powernv by + * reading "ibm,opal-phbid", only present in OPAL environment. */ - ret = of_get_pci_domain_nr(dn); - if (ret >= 0) { - prop = ret; - ret = 0; - } - if (ret) - ret = of_property_read_u64(dn, "ibm,opal-phbid", &prop); - + ret = of_property_read_u64(dn, "ibm,opal-phbid", &prop); if (ret) { - ret = of_alias_get_id(dn, "pci"); - if (ret >= 0) { - prop = ret; - ret = 0; - } - } - if (ret) { - u32 prop_32; ret = of_property_read_u32_index(dn, "reg", 1, &prop_32); prop = prop_32; } @@ -102,20 +90,18 @@ static int get_phb_number(struct device_node *dn) if (!ret) phb_id = (int)(prop & (MAX_PHBS - 1)); - spin_lock(&hose_spinlock); - /* We need to be sure to not use the same PHB number twice. */ if ((phb_id >= 0) && !test_and_set_bit(phb_id, phb_bitmap)) - goto out_unlock; + return phb_id; - /* If everything fails then fallback to dynamic PHB numbering. */ + /* + * If not pseries nor powernv, or if fixed PHB numbering tried to add + * the same PHB number twice, then fallback to dynamic PHB numbering. + */ phb_id = find_first_zero_bit(phb_bitmap, MAX_PHBS); BUG_ON(phb_id >= MAX_PHBS); set_bit(phb_id, phb_bitmap); -out_unlock: - spin_unlock(&hose_spinlock); - return phb_id; } @@ -126,13 +112,10 @@ struct pci_controller *pcibios_alloc_controller(struct device_node *dev) phb = zalloc_maybe_bootmem(sizeof(struct pci_controller), GFP_KERNEL); if (phb == NULL) return NULL; - - phb->global_number = get_phb_number(dev); - spin_lock(&hose_spinlock); + phb->global_number = get_phb_number(dev); list_add_tail(&phb->list_node, &hose_list); spin_unlock(&hose_spinlock); - phb->dn = dev; phb->is_dynamic = slab_is_available(); #ifdef CONFIG_PPC64
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c index d28433f..d876eda 100644 --- a/arch/powerpc/kernel/pci_dn.c +++ b/arch/powerpc/kernel/pci_dn.c
@@ -325,7 +325,6 @@ struct pci_dn *pci_add_device_node_info(struct pci_controller *hose, INIT_LIST_HEAD(&pdn->list); parent = of_get_parent(dn); pdn->parent = parent ? PCI_DN(parent) : NULL; - of_node_put(parent); if (pdn->parent) list_add_tail(&pdn->list, &pdn->parent->child_list);
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c index d1ba175..537142b 100644 --- a/arch/powerpc/kernel/prom.c +++ b/arch/powerpc/kernel/prom.c
@@ -740,13 +740,6 @@ void __init early_init_devtree(void *params) of_scan_flat_dt(early_init_dt_scan_root, NULL); of_scan_flat_dt(early_init_dt_scan_memory_ppc, NULL); - /* - * As generic code authors expect to be able to use static keys - * in early_param() handlers, we initialize the static keys just - * before parsing early params (it's fine to call jump_label_init() - * more than once). - */ - jump_label_init(); parse_early_param(); /* make sure we've parsed cmdline for mem= before this */
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c index ee810df..35e246e 100644 --- a/arch/powerpc/kernel/rtas.c +++ b/arch/powerpc/kernel/rtas.c
@@ -51,10 +51,10 @@ struct rtas_t rtas = { EXPORT_SYMBOL(rtas); DEFINE_SPINLOCK(rtas_data_buf_lock); -EXPORT_SYMBOL_GPL(rtas_data_buf_lock); +EXPORT_SYMBOL(rtas_data_buf_lock); -char rtas_data_buf[RTAS_DATA_BUF_SIZE] __aligned(SZ_4K); -EXPORT_SYMBOL_GPL(rtas_data_buf); +char rtas_data_buf[RTAS_DATA_BUF_SIZE] __cacheline_aligned; +EXPORT_SYMBOL(rtas_data_buf); unsigned long rtas_rmo_buf; @@ -63,7 +63,7 @@ unsigned long rtas_rmo_buf; * This is done like this so rtas_flash can be a module. */ void (*rtas_flash_term_hook)(int); -EXPORT_SYMBOL_GPL(rtas_flash_term_hook); +EXPORT_SYMBOL(rtas_flash_term_hook); /* RTAS use home made raw locking instead of spin_lock_irqsave * because those can be called from within really nasty contexts @@ -311,7 +311,7 @@ void rtas_progress(char *s, unsigned short hex) spin_unlock(&progress_lock); } -EXPORT_SYMBOL_GPL(rtas_progress); /* needed by rtas_flash module */ +EXPORT_SYMBOL(rtas_progress); /* needed by rtas_flash module */ int rtas_token(const char *service) { @@ -321,7 +321,7 @@ int rtas_token(const char *service) tokp = of_get_property(rtas.dev, service, NULL); return tokp ? be32_to_cpu(*tokp) : RTAS_UNKNOWN_SERVICE; } -EXPORT_SYMBOL_GPL(rtas_token); +EXPORT_SYMBOL(rtas_token); int rtas_service_present(const char *service) { @@ -481,7 +481,7 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...) } return ret; } -EXPORT_SYMBOL_GPL(rtas_call); +EXPORT_SYMBOL(rtas_call); /* For RTAS_BUSY (-2), delay for 1 millisecond. For an extended busy status * code of 990n, perform the hinted delay of 10^n (last digit) milliseconds. @@ -516,7 +516,7 @@ unsigned int rtas_busy_delay(int status) return ms; } -EXPORT_SYMBOL_GPL(rtas_busy_delay); +EXPORT_SYMBOL(rtas_busy_delay); static int rtas_error_rc(int rtas_rc) { @@ -562,7 +562,7 @@ int rtas_get_power_level(int powerdomain, int *level) return rtas_error_rc(rc); return rc; } -EXPORT_SYMBOL_GPL(rtas_get_power_level); +EXPORT_SYMBOL(rtas_get_power_level); int rtas_set_power_level(int powerdomain, int level, int *setlevel) { @@ -580,7 +580,7 @@ int rtas_set_power_level(int powerdomain, int level, int *setlevel) return rtas_error_rc(rc); return rc; } -EXPORT_SYMBOL_GPL(rtas_set_power_level); +EXPORT_SYMBOL(rtas_set_power_level); int rtas_get_sensor(int sensor, int index, int *state) { @@ -598,7 +598,7 @@ int rtas_get_sensor(int sensor, int index, int *state) return rtas_error_rc(rc); return rc; } -EXPORT_SYMBOL_GPL(rtas_get_sensor); +EXPORT_SYMBOL(rtas_get_sensor); int rtas_get_sensor_fast(int sensor, int index, int *state) { @@ -659,7 +659,7 @@ int rtas_set_indicator(int indicator, int index, int new_value) return rtas_error_rc(rc); return rc; } -EXPORT_SYMBOL_GPL(rtas_set_indicator); +EXPORT_SYMBOL(rtas_set_indicator); /* * Ignoring RTAS extended delay @@ -714,7 +714,6 @@ void __noreturn rtas_halt(void) /* Must be in the RMO region, so we place it here */ static char rtas_os_term_buf[2048]; -static s32 ibm_os_term_token = RTAS_UNKNOWN_SERVICE; void rtas_os_term(char *str) { @@ -726,20 +725,16 @@ void rtas_os_term(char *str) * this property may terminate the partition which we want to avoid * since it interferes with panic_timeout. */ - if (ibm_os_term_token == RTAS_UNKNOWN_SERVICE) + if (RTAS_UNKNOWN_SERVICE == rtas_token("ibm,os-term") || + RTAS_UNKNOWN_SERVICE == rtas_token("ibm,extended-os-term")) return; snprintf(rtas_os_term_buf, 2048, "OS panic: %s", str); - /* - * Keep calling as long as RTAS returns a "try again" status, - * but don't use rtas_busy_delay(), which potentially - * schedules. - */ do { - status = rtas_call(ibm_os_term_token, 1, 1, NULL, + status = rtas_call(rtas_token("ibm,os-term"), 1, 1, NULL, __pa(rtas_os_term_buf)); - } while (rtas_busy_delay_time(status)); + } while (rtas_busy_delay(status)); if (status != 0) printk(KERN_EMERG "ibm,os-term call failed %d\n", status); @@ -1220,13 +1215,6 @@ void __init rtas_initialize(void) no_entry = of_property_read_u32(rtas.dev, "linux,rtas-entry", &entry); rtas.entry = no_entry ? rtas.base : entry; - /* - * Discover these now to avoid device tree lookups in the - * panic path. - */ - if (of_property_read_bool(rtas.dev, "ibm,extended-os-term")) - ibm_os_term_token = rtas_token("ibm,os-term"); - /* If RTAS was found, allocate the RMO buffer for it and look for * the stop-self token if any */
diff --git a/arch/powerpc/kernel/systbl.S b/arch/powerpc/kernel/systbl.S index 4a8f352..5b905a2 100644 --- a/arch/powerpc/kernel/systbl.S +++ b/arch/powerpc/kernel/systbl.S
@@ -25,7 +25,6 @@ #include <asm/syscall_table_64.h> #undef __SYSCALL #else - .p2align 2 #define __SYSCALL(nr, entry) .long entry #include <asm/syscall_table_32.h> #undef __SYSCALL
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c index 70b9924..ecfa460 100644 --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c
@@ -246,7 +246,7 @@ static void oops_end(unsigned long flags, struct pt_regs *regs, if (panic_on_oops) panic("Fatal exception"); - make_task_dead(signr); + do_exit(signr); } NOKPROBE_SYMBOL(oops_end);
diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S index 46dfb37..3ea360c 100644 --- a/arch/powerpc/kernel/vmlinux.lds.S +++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -6,7 +6,6 @@ #endif #define BSS_FIRST_SECTIONS *(.bss.prominit) -#define RUNTIME_DISCARD_EXIT #include <asm/page.h> #include <asm-generic/vmlinux.lds.h> @@ -395,12 +394,9 @@ DISCARDS /DISCARD/ : { *(*.EMB.apuinfo) - *(.glink .iplt .plt .comment) + *(.glink .iplt .plt .rela* .comment) *(.gnu.version*) *(.gnu.attributes) *(.eh_frame) -#ifndef CONFIG_RELOCATABLE - *(.rela*) -#endif } }
diff --git a/arch/powerpc/math-emu/math_efp.c b/arch/powerpc/math-emu/math_efp.c index 90111c9..0a05e51 100644 --- a/arch/powerpc/math-emu/math_efp.c +++ b/arch/powerpc/math-emu/math_efp.c
@@ -17,7 +17,6 @@ #include <linux/types.h> #include <linux/prctl.h> -#include <linux/module.h> #include <linux/uaccess.h> #include <asm/reg.h>
diff --git a/arch/powerpc/mm/dma-noncoherent.c b/arch/powerpc/mm/dma-noncoherent.c index 5ab4f86..2a82984 100644 --- a/arch/powerpc/mm/dma-noncoherent.c +++ b/arch/powerpc/mm/dma-noncoherent.c
@@ -104,14 +104,14 @@ static void __dma_sync_page(phys_addr_t paddr, size_t size, int dir) #endif } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_sync_page(paddr, size, dir); } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { __dma_sync_page(paddr, size, dir); }
diff --git a/arch/powerpc/mm/ptdump/shared.c b/arch/powerpc/mm/ptdump/shared.c index f10f215..784f8df 100644 --- a/arch/powerpc/mm/ptdump/shared.c +++ b/arch/powerpc/mm/ptdump/shared.c
@@ -17,9 +17,9 @@ static const struct flag_info flag_array[] = { .clear = " ", }, { .mask = _PAGE_RW, - .val = 0, - .set = "r ", - .clear = "rw", + .val = _PAGE_RW, + .set = "rw", + .clear = "r ", }, { .mask = _PAGE_EXEC, .val = _PAGE_EXEC,
diff --git a/arch/powerpc/perf/callchain.c b/arch/powerpc/perf/callchain.c index 4c9aaed..c84bbd4 100644 --- a/arch/powerpc/perf/callchain.c +++ b/arch/powerpc/perf/callchain.c
@@ -64,7 +64,6 @@ perf_callchain_kernel(struct perf_callchain_entry_ctx *entry, struct pt_regs *re next_sp = fp[0]; if (next_sp == sp + STACK_INT_FRAME_SIZE && - validate_sp(sp, current, STACK_INT_FRAME_SIZE) && fp[STACK_FRAME_MARKER] == STACK_FRAME_REGS_MARKER) { /* * This looks like an interrupt frame for an
diff --git a/arch/powerpc/perf/hv-gpci-requests.h b/arch/powerpc/perf/hv-gpci-requests.h index 5e86371..8965b44 100644 --- a/arch/powerpc/perf/hv-gpci-requests.h +++ b/arch/powerpc/perf/hv-gpci-requests.h
@@ -79,7 +79,6 @@ REQUEST(__field(0, 8, partition_id) ) #include I(REQUEST_END) -#ifdef ENABLE_EVENTS_COUNTERINFO_V6 /* * Not available for counter_info_version >= 0x8, use * run_instruction_cycles_by_partition(0x100) instead. @@ -93,7 +92,6 @@ REQUEST(__field(0, 8, partition_id) __count(0x10, 8, cycles) ) #include I(REQUEST_END) -#endif #define REQUEST_NAME system_performance_capabilities #define REQUEST_NUM 0x40 @@ -105,7 +103,6 @@ REQUEST(__field(0, 1, perf_collect_privileged) ) #include I(REQUEST_END) -#ifdef ENABLE_EVENTS_COUNTERINFO_V6 #define REQUEST_NAME processor_bus_utilization_abc_links #define REQUEST_NUM 0x50 #define REQUEST_IDX_KIND "hw_chip_id=?" @@ -197,7 +194,6 @@ REQUEST(__field(0, 4, phys_processor_idx) __count(0x28, 8, instructions_completed) ) #include I(REQUEST_END) -#endif /* Processor_core_power_mode (0x95) skipped, no counters */ /* Affinity_domain_information_by_virtual_processor (0xA0) skipped,
diff --git a/arch/powerpc/perf/hv-gpci.c b/arch/powerpc/perf/hv-gpci.c index ac3f3df..732cfc5 100644 --- a/arch/powerpc/perf/hv-gpci.c +++ b/arch/powerpc/perf/hv-gpci.c
@@ -70,7 +70,7 @@ static struct attribute_group format_group = { static struct attribute_group event_group = { .name = "events", - /* .attrs is set in init */ + .attrs = hv_gpci_event_attrs, }; #define HV_CAPS_ATTR(_name, _format) \ @@ -280,7 +280,6 @@ static int hv_gpci_init(void) int r; unsigned long hret; struct hv_perf_caps caps; - struct hv_gpci_request_buffer *arg; hv_gpci_assert_offsets_correct(); @@ -299,36 +298,6 @@ static int hv_gpci_init(void) /* sampling not supported */ h_gpci_pmu.capabilities |= PERF_PMU_CAP_NO_INTERRUPT; - arg = (void *)get_cpu_var(hv_gpci_reqb); - memset(arg, 0, HGPCI_REQ_BUFFER_SIZE); - - /* - * hcall H_GET_PERF_COUNTER_INFO populates the output - * counter_info_version value based on the system hypervisor. - * Pass the counter request 0x10 corresponds to request type - * 'Dispatch_timebase_by_processor', to get the supported - * counter_info_version. - */ - arg->params.counter_request = cpu_to_be32(0x10); - - r = plpar_hcall_norets(H_GET_PERF_COUNTER_INFO, - virt_to_phys(arg), HGPCI_REQ_BUFFER_SIZE); - if (r) { - pr_devel("hcall failed, can't get supported counter_info_version: 0x%x\n", r); - arg->params.counter_info_version_out = 0x8; - } - - /* - * Use counter_info_version_out value to assign - * required hv-gpci event list. - */ - if (arg->params.counter_info_version_out >= 0x8) - event_group.attrs = hv_gpci_event_attrs; - else - event_group.attrs = hv_gpci_event_attrs_v6; - - put_cpu_var(hv_gpci_reqb); - r = perf_pmu_register(&h_gpci_pmu, h_gpci_pmu.name, -1); if (r) return r;
diff --git a/arch/powerpc/perf/hv-gpci.h b/arch/powerpc/perf/hv-gpci.h index 060e464..a3053ed 100644 --- a/arch/powerpc/perf/hv-gpci.h +++ b/arch/powerpc/perf/hv-gpci.h
@@ -53,7 +53,6 @@ enum { #define REQUEST_FILE "../hv-gpci-requests.h" #define NAME_LOWER hv_gpci #define NAME_UPPER HV_GPCI -#define ENABLE_EVENTS_COUNTERINFO_V6 #include "req-gen/perf.h" #undef REQUEST_FILE #undef NAME_LOWER
diff --git a/arch/powerpc/perf/imc-pmu.c b/arch/powerpc/perf/imc-pmu.c index d42f2e0..d76e800 100644 --- a/arch/powerpc/perf/imc-pmu.c +++ b/arch/powerpc/perf/imc-pmu.c
@@ -13,7 +13,6 @@ #include <asm/cputhreads.h> #include <asm/smp.h> #include <linux/string.h> -#include <linux/spinlock.h> /* Nest IMC data structures and variables */ @@ -50,7 +49,7 @@ static int trace_imc_mem_size; * core and trace-imc */ static struct imc_pmu_ref imc_global_refc = { - .lock = __SPIN_LOCK_INITIALIZER(imc_global_refc.lock), + .lock = __MUTEX_INITIALIZER(imc_global_refc.lock), .id = 0, .refc = 0, }; @@ -394,7 +393,7 @@ static int ppc_nest_imc_cpu_offline(unsigned int cpu) get_hard_smp_processor_id(cpu)); /* * If this is the last cpu in this chip then, skip the reference - * count lock and make the reference count on this chip zero. + * count mutex lock and make the reference count on this chip zero. */ ref = get_nest_pmu_ref(cpu); if (!ref) @@ -456,15 +455,15 @@ static void nest_imc_counters_release(struct perf_event *event) /* * See if we need to disable the nest PMU. * If no events are currently in use, then we have to take a - * lock to ensure that we don't race with another task doing + * mutex to ensure that we don't race with another task doing * enable or disable the nest counters. */ ref = get_nest_pmu_ref(event->cpu); if (!ref) return; - /* Take the lock for this node and then decrement the reference count */ - spin_lock(&ref->lock); + /* Take the mutex lock for this node and then decrement the reference count */ + mutex_lock(&ref->lock); if (ref->refc == 0) { /* * The scenario where this is true is, when perf session is @@ -476,7 +475,7 @@ static void nest_imc_counters_release(struct perf_event *event) * an OPAL call to disable the engine in that node. * */ - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); return; } ref->refc--; @@ -484,7 +483,7 @@ static void nest_imc_counters_release(struct perf_event *event) rc = opal_imc_counters_stop(OPAL_IMC_COUNTERS_NEST, get_hard_smp_processor_id(event->cpu)); if (rc) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("nest-imc: Unable to stop the counters for core %d\n", node_id); return; } @@ -492,7 +491,7 @@ static void nest_imc_counters_release(struct perf_event *event) WARN(1, "nest-imc: Invalid event reference count\n"); ref->refc = 0; } - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); } static int nest_imc_event_init(struct perf_event *event) @@ -551,25 +550,26 @@ static int nest_imc_event_init(struct perf_event *event) /* * Get the imc_pmu_ref struct for this node. - * Take the lock and then increment the count of nest pmu events inited. + * Take the mutex lock and then increment the count of nest pmu events + * inited. */ ref = get_nest_pmu_ref(event->cpu); if (!ref) return -EINVAL; - spin_lock(&ref->lock); + mutex_lock(&ref->lock); if (ref->refc == 0) { rc = opal_imc_counters_start(OPAL_IMC_COUNTERS_NEST, get_hard_smp_processor_id(event->cpu)); if (rc) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("nest-imc: Unable to start the counters for node %d\n", node_id); return rc; } } ++ref->refc; - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); event->destroy = nest_imc_counters_release; return 0; @@ -605,8 +605,9 @@ static int core_imc_mem_init(int cpu, int size) return -ENOMEM; mem_info->vbase = page_address(page); + /* Init the mutex */ core_imc_refc[core_id].id = core_id; - spin_lock_init(&core_imc_refc[core_id].lock); + mutex_init(&core_imc_refc[core_id].lock); rc = opal_imc_counters_init(OPAL_IMC_COUNTERS_CORE, __pa((void *)mem_info->vbase), @@ -695,8 +696,9 @@ static int ppc_core_imc_cpu_offline(unsigned int cpu) perf_pmu_migrate_context(&core_imc_pmu->pmu, cpu, ncpu); } else { /* - * If this is the last cpu in this core then skip taking reference - * count lock for this core and directly zero "refc" for this core. + * If this is the last cpu in this core then, skip taking refernce + * count mutex lock for this core and directly zero "refc" for + * this core. */ opal_imc_counters_stop(OPAL_IMC_COUNTERS_CORE, get_hard_smp_processor_id(cpu)); @@ -711,11 +713,11 @@ static int ppc_core_imc_cpu_offline(unsigned int cpu) * last cpu in this core and core-imc event running * in this cpu. */ - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); if (imc_global_refc.id == IMC_DOMAIN_CORE) imc_global_refc.refc--; - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); } return 0; } @@ -730,7 +732,7 @@ static int core_imc_pmu_cpumask_init(void) static void reset_global_refc(struct perf_event *event) { - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); imc_global_refc.refc--; /* @@ -742,7 +744,7 @@ static void reset_global_refc(struct perf_event *event) imc_global_refc.refc = 0; imc_global_refc.id = 0; } - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); } static void core_imc_counters_release(struct perf_event *event) @@ -755,17 +757,17 @@ static void core_imc_counters_release(struct perf_event *event) /* * See if we need to disable the IMC PMU. * If no events are currently in use, then we have to take a - * lock to ensure that we don't race with another task doing + * mutex to ensure that we don't race with another task doing * enable or disable the core counters. */ core_id = event->cpu / threads_per_core; - /* Take the lock and decrement the refernce count for this core */ + /* Take the mutex lock and decrement the refernce count for this core */ ref = &core_imc_refc[core_id]; if (!ref) return; - spin_lock(&ref->lock); + mutex_lock(&ref->lock); if (ref->refc == 0) { /* * The scenario where this is true is, when perf session is @@ -777,7 +779,7 @@ static void core_imc_counters_release(struct perf_event *event) * an OPAL call to disable the engine in that core. * */ - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); return; } ref->refc--; @@ -785,7 +787,7 @@ static void core_imc_counters_release(struct perf_event *event) rc = opal_imc_counters_stop(OPAL_IMC_COUNTERS_CORE, get_hard_smp_processor_id(event->cpu)); if (rc) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("IMC: Unable to stop the counters for core %d\n", core_id); return; } @@ -793,7 +795,7 @@ static void core_imc_counters_release(struct perf_event *event) WARN(1, "core-imc: Invalid event reference count\n"); ref->refc = 0; } - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); reset_global_refc(event); } @@ -831,6 +833,7 @@ static int core_imc_event_init(struct perf_event *event) if ((!pcmi->vbase)) return -ENODEV; + /* Get the core_imc mutex for this core */ ref = &core_imc_refc[core_id]; if (!ref) return -EINVAL; @@ -838,22 +841,22 @@ static int core_imc_event_init(struct perf_event *event) /* * Core pmu units are enabled only when it is used. * See if this is triggered for the first time. - * If yes, take the lock and enable the core counters. + * If yes, take the mutex lock and enable the core counters. * If not, just increment the count in core_imc_refc struct. */ - spin_lock(&ref->lock); + mutex_lock(&ref->lock); if (ref->refc == 0) { rc = opal_imc_counters_start(OPAL_IMC_COUNTERS_CORE, get_hard_smp_processor_id(event->cpu)); if (rc) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("core-imc: Unable to start the counters for core %d\n", core_id); return rc; } } ++ref->refc; - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); /* * Since the system can run either in accumulation or trace-mode @@ -864,7 +867,7 @@ static int core_imc_event_init(struct perf_event *event) * to know whether any other trace/thread imc * events are running. */ - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); if (imc_global_refc.id == 0 || imc_global_refc.id == IMC_DOMAIN_CORE) { /* * No other trace/thread imc events are running in @@ -873,10 +876,10 @@ static int core_imc_event_init(struct perf_event *event) imc_global_refc.id = IMC_DOMAIN_CORE; imc_global_refc.refc++; } else { - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); return -EBUSY; } - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); event->hw.event_base = (u64)pcmi->vbase + (config & IMC_EVENT_OFFSET_MASK); event->destroy = core_imc_counters_release; @@ -948,10 +951,10 @@ static int ppc_thread_imc_cpu_offline(unsigned int cpu) mtspr(SPRN_LDBAR, (mfspr(SPRN_LDBAR) & (~(1UL << 63)))); /* Reduce the refc if thread-imc event running on this cpu */ - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); if (imc_global_refc.id == IMC_DOMAIN_THREAD) imc_global_refc.refc--; - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); return 0; } @@ -991,7 +994,7 @@ static int thread_imc_event_init(struct perf_event *event) if (!target) return -EINVAL; - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); /* * Check if any other trace/core imc events are running in the * system, if not set the global id to thread-imc. @@ -1000,10 +1003,10 @@ static int thread_imc_event_init(struct perf_event *event) imc_global_refc.id = IMC_DOMAIN_THREAD; imc_global_refc.refc++; } else { - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); return -EBUSY; } - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); event->pmu->task_ctx_nr = perf_sw_context; event->destroy = reset_global_refc; @@ -1125,25 +1128,25 @@ static int thread_imc_event_add(struct perf_event *event, int flags) /* * imc pmus are enabled only when it is used. * See if this is triggered for the first time. - * If yes, take the lock and enable the counters. + * If yes, take the mutex lock and enable the counters. * If not, just increment the count in ref count struct. */ ref = &core_imc_refc[core_id]; if (!ref) return -EINVAL; - spin_lock(&ref->lock); + mutex_lock(&ref->lock); if (ref->refc == 0) { if (opal_imc_counters_start(OPAL_IMC_COUNTERS_CORE, get_hard_smp_processor_id(smp_processor_id()))) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("thread-imc: Unable to start the counter\ for core %d\n", core_id); return -EINVAL; } } ++ref->refc; - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); return 0; } @@ -1160,12 +1163,12 @@ static void thread_imc_event_del(struct perf_event *event, int flags) return; } - spin_lock(&ref->lock); + mutex_lock(&ref->lock); ref->refc--; if (ref->refc == 0) { if (opal_imc_counters_stop(OPAL_IMC_COUNTERS_CORE, get_hard_smp_processor_id(smp_processor_id()))) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("thread-imc: Unable to stop the counters\ for core %d\n", core_id); return; @@ -1173,7 +1176,7 @@ static void thread_imc_event_del(struct perf_event *event, int flags) } else if (ref->refc < 0) { ref->refc = 0; } - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); /* Set bit 0 of LDBAR to zero, to stop posting updates to memory */ mtspr(SPRN_LDBAR, (mfspr(SPRN_LDBAR) & (~(1UL << 63)))); @@ -1214,8 +1217,9 @@ static int trace_imc_mem_alloc(int cpu_id, int size) } } + /* Init the mutex, if not already */ trace_imc_refc[core_id].id = core_id; - spin_lock_init(&trace_imc_refc[core_id].lock); + mutex_init(&trace_imc_refc[core_id].lock); mtspr(SPRN_LDBAR, 0); return 0; @@ -1235,10 +1239,10 @@ static int ppc_trace_imc_cpu_offline(unsigned int cpu) * Reduce the refc if any trace-imc event running * on this cpu. */ - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); if (imc_global_refc.id == IMC_DOMAIN_TRACE) imc_global_refc.refc--; - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); return 0; } @@ -1341,17 +1345,17 @@ static int trace_imc_event_add(struct perf_event *event, int flags) } mtspr(SPRN_LDBAR, ldbar_value); - spin_lock(&ref->lock); + mutex_lock(&ref->lock); if (ref->refc == 0) { if (opal_imc_counters_start(OPAL_IMC_COUNTERS_TRACE, get_hard_smp_processor_id(smp_processor_id()))) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("trace-imc: Unable to start the counters for core %d\n", core_id); return -EINVAL; } } ++ref->refc; - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); return 0; } @@ -1384,19 +1388,19 @@ static void trace_imc_event_del(struct perf_event *event, int flags) return; } - spin_lock(&ref->lock); + mutex_lock(&ref->lock); ref->refc--; if (ref->refc == 0) { if (opal_imc_counters_stop(OPAL_IMC_COUNTERS_TRACE, get_hard_smp_processor_id(smp_processor_id()))) { - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); pr_err("trace-imc: Unable to stop the counters for core %d\n", core_id); return; } } else if (ref->refc < 0) { ref->refc = 0; } - spin_unlock(&ref->lock); + mutex_unlock(&ref->lock); trace_imc_event_stop(event, flags); } @@ -1420,7 +1424,7 @@ static int trace_imc_event_init(struct perf_event *event) * no other thread is running any core/thread imc * events */ - spin_lock(&imc_global_refc.lock); + mutex_lock(&imc_global_refc.lock); if (imc_global_refc.id == 0 || imc_global_refc.id == IMC_DOMAIN_TRACE) { /* * No core/thread imc events are running in the @@ -1429,10 +1433,10 @@ static int trace_imc_event_init(struct perf_event *event) imc_global_refc.id = IMC_DOMAIN_TRACE; imc_global_refc.refc++; } else { - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); return -EBUSY; } - spin_unlock(&imc_global_refc.lock); + mutex_unlock(&imc_global_refc.lock); event->hw.idx = -1; target = event->hw.target; @@ -1505,10 +1509,10 @@ static int init_nest_pmu_ref(void) i = 0; for_each_node(nid) { /* - * Take the lock to avoid races while tracking the number of + * Mutex lock to avoid races while tracking the number of * sessions using the chip's nest pmu units. */ - spin_lock_init(&nest_imc_refc[i].lock); + mutex_init(&nest_imc_refc[i].lock); /* * Loop to init the "id" with the node_id. Variable "i" initialized to
diff --git a/arch/powerpc/perf/req-gen/perf.h b/arch/powerpc/perf/req-gen/perf.h index 6b2a59f..fa9bc80 100644 --- a/arch/powerpc/perf/req-gen/perf.h +++ b/arch/powerpc/perf/req-gen/perf.h
@@ -139,26 +139,6 @@ PMU_EVENT_ATTR_STRING( \ #define REQUEST_(r_name, r_value, r_idx_1, r_fields) \ r_fields -/* Generate event list for platforms with counter_info_version 0x6 or below */ -static __maybe_unused struct attribute *hv_gpci_event_attrs_v6[] = { -#include REQUEST_FILE - NULL -}; - -/* - * Based on getPerfCountInfo v1.018 documentation, some of the hv-gpci - * events were deprecated for platform firmware that supports - * counter_info_version 0x8 or above. - * Those deprecated events are still part of platform firmware that - * support counter_info_version 0x6 and below. As per the getPerfCountInfo - * v1.018 documentation there is no counter_info_version 0x7. - * Undefining macro ENABLE_EVENTS_COUNTERINFO_V6, to disable the addition of - * deprecated events in "hv_gpci_event_attrs" attribute group, for platforms - * that supports counter_info_version 0x8 or above. - */ -#undef ENABLE_EVENTS_COUNTERINFO_V6 - -/* Generate event list for platforms with counter_info_version 0x8 or above*/ static __maybe_unused struct attribute *hv_gpci_event_attrs[] = { #include REQUEST_FILE NULL
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c index 22e264b..05e1947 100644 --- a/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c +++ b/arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c
@@ -530,7 +530,6 @@ static int mpc52xx_lpbfifo_probe(struct platform_device *op) err_bcom_rx_irq: bcom_gen_bd_rx_release(lpbfifo.bcom_rx_task); err_bcom_rx: - free_irq(lpbfifo.irq, &lpbfifo); err_irq: iounmap(lpbfifo.regs); lpbfifo.regs = NULL;
diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index b635405..4588ce6 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c
@@ -107,7 +107,7 @@ static int __init of_fsl_spi_probe(char *type, char *compatible, u32 sysclk, goto next; unreg: - platform_device_put(pdev); + platform_device_del(pdev); err: pr_err("%pOF: registration failed\n", np); next:
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype index 325dc8b..f0330ce 100644 --- a/arch/powerpc/platforms/Kconfig.cputype +++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -118,9 +118,9 @@ depends on PPC64 && CPU_LITTLE_ENDIAN select ARCH_HAS_FAST_MULTIPLIER -config POWERPC_CPU +config GENERIC_CPU bool "Generic 32 bits powerpc" - depends on PPC32 && !PPC_8xx && !PPC_85xx + depends on PPC32 && !PPC_8xx config CELL_CPU bool "Cell Broadband Engine" @@ -151,11 +151,11 @@ config E5500_CPU bool "Freescale e5500" - depends on PPC64 && E500 + depends on E500 config E6500_CPU bool "Freescale e6500" - depends on PPC64 && E500 + depends on E500 config 860_CPU bool "8xx family" @@ -174,23 +174,11 @@ depends on PPC_BOOK3S_32 select ALTIVEC -config E500_CPU - bool "e500 (8540)" - depends on PPC_85xx && !PPC_E500MC - -config E500MC_CPU - bool "e500mc" - depends on PPC_85xx && PPC_E500MC - -config TOOLCHAIN_DEFAULT_CPU - bool "Rely on the toolchain's implicit default CPU" - depends on PPC32 - endchoice config TARGET_CPU_BOOL bool - default !GENERIC_CPU && !TOOLCHAIN_DEFAULT_CPU + default !GENERIC_CPU config TARGET_CPU string @@ -205,9 +193,6 @@ default "e300c2" if E300C2_CPU default "e300c3" if E300C3_CPU default "G4" if G4_CPU - default "8540" if E500_CPU - default "e500mc" if E500MC_CPU - default "powerpc" if POWERPC_CPU config PPC_BOOK3S def_bool y
diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c index ba33140..57c4e0e 100644 --- a/arch/powerpc/platforms/cell/axon_msi.c +++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -226,7 +226,6 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg) if (!prop) { dev_dbg(&dev->dev, "axon_msi: no msi-address-(32|64) properties found\n"); - of_node_put(dn); return -ENOENT; }
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c index 99e6884..2dd452a 100644 --- a/arch/powerpc/platforms/cell/spufs/inode.c +++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -671,7 +671,6 @@ spufs_init_isolated_loader(void) return; loader = of_get_property(dn, "loader", &size); - of_node_put(dn); if (!loader) return;
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c index c3f9684..38e9027 100644 --- a/arch/powerpc/platforms/powernv/opal.c +++ b/arch/powerpc/platforms/powernv/opal.c
@@ -776,7 +776,6 @@ static void opal_export_attrs(void) kobj = kobject_create_and_add("exports", opal_kobj); if (!kobj) { pr_warn("kobject_create_and_add() of exports failed\n"); - of_node_put(np); return; }
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c index df4457e..0582232 100644 --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -3008,8 +3008,7 @@ static void pnv_ioda_setup_pe_res(struct pnv_ioda_pe *pe, int index; int64_t rc; - if (!res || !res->flags || res->start > res->end || - res->flags & IORESOURCE_UNSET) + if (!res || !res->flags || res->start > res->end) return; if (res->flags & IORESOURCE_IO) {
diff --git a/arch/powerpc/platforms/powernv/rng.c b/arch/powerpc/platforms/powernv/rng.c index ace6497..7186e17 100644 --- a/arch/powerpc/platforms/powernv/rng.c +++ b/arch/powerpc/platforms/powernv/rng.c
@@ -63,8 +63,6 @@ int powernv_get_random_real_mode(unsigned long *v) struct powernv_rng *rng; rng = raw_cpu_read(powernv_rng); - if (!rng) - return 0; *v = rng_whiten(rng, __raw_rm_readq(rng->regs_real));
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 55af0e4..c93b9a3 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -1416,22 +1416,22 @@ static inline void __init check_lp_set_hblkrm(unsigned int lp, void __init pseries_lpar_read_hblkrm_characteristics(void) { - const s32 token = rtas_token("ibm,get-system-parameter"); unsigned char local_buffer[SPLPAR_TLB_BIC_MAXLENGTH]; int call_status, len, idx, bpsize; if (!firmware_has_feature(FW_FEATURE_BLOCK_REMOVE)) return; - do { - spin_lock(&rtas_data_buf_lock); - memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE); - call_status = rtas_call(token, 3, 1, NULL, SPLPAR_TLB_BIC_TOKEN, - __pa(rtas_data_buf), RTAS_DATA_BUF_SIZE); - memcpy(local_buffer, rtas_data_buf, SPLPAR_TLB_BIC_MAXLENGTH); - local_buffer[SPLPAR_TLB_BIC_MAXLENGTH - 1] = '\0'; - spin_unlock(&rtas_data_buf_lock); - } while (rtas_busy_delay(call_status)); + spin_lock(&rtas_data_buf_lock); + memset(rtas_data_buf, 0, RTAS_DATA_BUF_SIZE); + call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1, + NULL, + SPLPAR_TLB_BIC_TOKEN, + __pa(rtas_data_buf), + RTAS_DATA_BUF_SIZE); + memcpy(local_buffer, rtas_data_buf, SPLPAR_TLB_BIC_MAXLENGTH); + local_buffer[SPLPAR_TLB_BIC_MAXLENGTH - 1] = '\0'; + spin_unlock(&rtas_data_buf_lock); if (call_status != 0) { pr_warn("%s %s Error calling get-system-parameter (0x%x)\n",
diff --git a/arch/powerpc/platforms/pseries/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c index e12cf62..38c3065 100644 --- a/arch/powerpc/platforms/pseries/lparcfg.c +++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -289,7 +289,6 @@ static void parse_mpp_x_data(struct seq_file *m) */ static void parse_system_parameter_string(struct seq_file *m) { - const s32 token = rtas_token("ibm,get-system-parameter"); int call_status; unsigned char *local_buffer = kmalloc(SPLPAR_MAXLENGTH, GFP_KERNEL); @@ -299,15 +298,16 @@ static void parse_system_parameter_string(struct seq_file *m) return; } - do { - spin_lock(&rtas_data_buf_lock); - memset(rtas_data_buf, 0, SPLPAR_MAXLENGTH); - call_status = rtas_call(token, 3, 1, NULL, SPLPAR_CHARACTERISTICS_TOKEN, - __pa(rtas_data_buf), RTAS_DATA_BUF_SIZE); - memcpy(local_buffer, rtas_data_buf, SPLPAR_MAXLENGTH); - local_buffer[SPLPAR_MAXLENGTH - 1] = '\0'; - spin_unlock(&rtas_data_buf_lock); - } while (rtas_busy_delay(call_status)); + spin_lock(&rtas_data_buf_lock); + memset(rtas_data_buf, 0, SPLPAR_MAXLENGTH); + call_status = rtas_call(rtas_token("ibm,get-system-parameter"), 3, 1, + NULL, + SPLPAR_CHARACTERISTICS_TOKEN, + __pa(rtas_data_buf), + RTAS_DATA_BUF_SIZE); + memcpy(local_buffer, rtas_data_buf, SPLPAR_MAXLENGTH); + local_buffer[SPLPAR_MAXLENGTH - 1] = '\0'; + spin_unlock(&rtas_data_buf_lock); if (call_status != 0) { printk(KERN_INFO
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c index d276c5e..808e711 100644 --- a/arch/powerpc/sysdev/fsl_msi.c +++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -211,10 +211,8 @@ static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) dev_err(&pdev->dev, "node %pOF has an invalid fsl,msi phandle %u\n", hose->dn, np->phandle); - of_node_put(np); return -EINVAL; } - of_node_put(np); } for_each_pci_msi_entry(entry, pdev) {
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 6adf2fd..ff0e2b1 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -520,7 +520,6 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary) struct resource rsrc; const int *bus_range; u8 hdr_type, progif; - u32 class_code; struct device_node *dev; struct ccsr_pci __iomem *pci; u16 temp; @@ -594,13 +593,6 @@ int fsl_add_bridge(struct platform_device *pdev, int is_primary) PPC_INDIRECT_TYPE_SURPRESS_PRIMARY_BUS; if (fsl_pcie_check_link(hose)) hose->indirect_type |= PPC_INDIRECT_TYPE_NO_PCIE_LINK; - /* Fix Class Code to PCI_CLASS_BRIDGE_PCI_NORMAL for pre-3.0 controller */ - if (in_be32(&pci->block_rev1) < PCIE_IP_REV_3_0) { - early_read_config_dword(hose, 0, 0, PCIE_FSL_CSR_CLASSCODE, &class_code); - class_code &= 0xff; - class_code |= PCI_CLASS_BRIDGE_PCI_NORMAL << 8; - early_write_config_dword(hose, 0, 0, PCIE_FSL_CSR_CLASSCODE, class_code); - } } else { /* * Set PBFR(PCI Bus Function Register)[10] = 1 to
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h index 5ffaa60..1d7a412 100644 --- a/arch/powerpc/sysdev/fsl_pci.h +++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -18,7 +18,6 @@ struct platform_device; #define PCIE_LTSSM 0x0404 /* PCIE Link Training and Status */ #define PCIE_LTSSM_L0 0x16 /* L0 state */ -#define PCIE_FSL_CSR_CLASSCODE 0x474 /* FSL GPEX CSR */ #define PCIE_IP_REV_2_2 0x02080202 /* PCIE IP block version Rev2.2 */ #define PCIE_IP_REV_3_0 0x02080300 /* PCIE IP block version Rev3.0 */ #define PIWAR_EN 0x80000000 /* Enable */
diff --git a/arch/powerpc/sysdev/xive/spapr.c b/arch/powerpc/sysdev/xive/spapr.c index e6788bc..3f15615 100644 --- a/arch/powerpc/sysdev/xive/spapr.c +++ b/arch/powerpc/sysdev/xive/spapr.c
@@ -422,7 +422,6 @@ static int xive_spapr_populate_irq_data(u32 hw_irq, struct xive_irq_data *data) data->trig_mmio = ioremap(data->trig_page, 1u << data->esb_shift); if (!data->trig_mmio) { - iounmap(data->eoi_mmio); pr_err("Failed to map trigger page for irq 0x%x\n", hw_irq); return -ENOMEM; } @@ -684,7 +683,6 @@ static bool xive_get_max_prio(u8 *max_prio) } reg = of_get_property(rootdn, "ibm,plat-res-int-priorities", &len); - of_node_put(rootdn); if (!reg) { pr_err("Failed to read 'ibm,plat-res-int-priorities' property\n"); return false;
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig index e0a77af..b21549a 100644 --- a/arch/riscv/Kconfig +++ b/arch/riscv/Kconfig
@@ -51,7 +51,7 @@ select PCI_MSI if PCI select RISCV_TIMER select GENERIC_IRQ_MULTI_HANDLER - select GENERIC_ARCH_TOPOLOGY + select GENERIC_ARCH_TOPOLOGY if SMP select ARCH_HAS_PTE_SPECIAL select ARCH_HAS_MMIOWB select HAVE_EBPF_JIT if 64BIT
diff --git a/arch/riscv/Makefile b/arch/riscv/Makefile index 1641d82..d1a9615 100644 --- a/arch/riscv/Makefile +++ b/arch/riscv/Makefile
@@ -35,7 +35,6 @@ endif ifeq ($(CONFIG_LD_IS_LLD),y) -ifeq ($(shell test $(CONFIG_LLD_VERSION) -lt 150000; echo $$?),0) KBUILD_CFLAGS += -mno-relax KBUILD_AFLAGS += -mno-relax ifneq ($(LLVM_IAS),1) @@ -43,7 +42,6 @@ KBUILD_AFLAGS += -Wa,-mno-relax endif endif -endif # ISA string setting riscv-march-$(CONFIG_ARCH_RV32I) := rv32ima @@ -75,9 +73,6 @@ KBUILD_CFLAGS += -fno-omit-frame-pointer endif -# Avoid generating .eh_frame sections. -KBUILD_CFLAGS += -fno-asynchronous-unwind-tables -fno-unwind-tables - KBUILD_CFLAGS_MODULE += $(call cc-option,-mno-relax) KBUILD_AFLAGS_MODULE += $(call as-option,-Wa$(comma)-mno-relax)
diff --git a/arch/riscv/include/asm/io.h b/arch/riscv/include/asm/io.h index 2dc5b01..3ba4d93 100644 --- a/arch/riscv/include/asm/io.h +++ b/arch/riscv/include/asm/io.h
@@ -252,9 +252,9 @@ __io_reads_ins(reads, u32, l, __io_br(), __io_ar(addr)) __io_reads_ins(ins, u8, b, __io_pbr(), __io_par(addr)) __io_reads_ins(ins, u16, w, __io_pbr(), __io_par(addr)) __io_reads_ins(ins, u32, l, __io_pbr(), __io_par(addr)) -#define insb(addr, buffer, count) __insb(PCI_IOBASE + (addr), buffer, count) -#define insw(addr, buffer, count) __insw(PCI_IOBASE + (addr), buffer, count) -#define insl(addr, buffer, count) __insl(PCI_IOBASE + (addr), buffer, count) +#define insb(addr, buffer, count) __insb((void __iomem *)(long)addr, buffer, count) +#define insw(addr, buffer, count) __insw((void __iomem *)(long)addr, buffer, count) +#define insl(addr, buffer, count) __insl((void __iomem *)(long)addr, buffer, count) __io_writes_outs(writes, u8, b, __io_bw(), __io_aw()) __io_writes_outs(writes, u16, w, __io_bw(), __io_aw()) @@ -266,22 +266,22 @@ __io_writes_outs(writes, u32, l, __io_bw(), __io_aw()) __io_writes_outs(outs, u8, b, __io_pbw(), __io_paw()) __io_writes_outs(outs, u16, w, __io_pbw(), __io_paw()) __io_writes_outs(outs, u32, l, __io_pbw(), __io_paw()) -#define outsb(addr, buffer, count) __outsb(PCI_IOBASE + (addr), buffer, count) -#define outsw(addr, buffer, count) __outsw(PCI_IOBASE + (addr), buffer, count) -#define outsl(addr, buffer, count) __outsl(PCI_IOBASE + (addr), buffer, count) +#define outsb(addr, buffer, count) __outsb((void __iomem *)(long)addr, buffer, count) +#define outsw(addr, buffer, count) __outsw((void __iomem *)(long)addr, buffer, count) +#define outsl(addr, buffer, count) __outsl((void __iomem *)(long)addr, buffer, count) #ifdef CONFIG_64BIT __io_reads_ins(reads, u64, q, __io_br(), __io_ar(addr)) #define readsq(addr, buffer, count) __readsq(addr, buffer, count) __io_reads_ins(ins, u64, q, __io_pbr(), __io_par(addr)) -#define insq(addr, buffer, count) __insq(PCI_IOBASE + (addr), buffer, count) +#define insq(addr, buffer, count) __insq((void __iomem *)addr, buffer, count) __io_writes_outs(writes, u64, q, __io_bw(), __io_aw()) #define writesq(addr, buffer, count) __writesq(addr, buffer, count) __io_writes_outs(outs, u64, q, __io_pbr(), __io_paw()) -#define outsq(addr, buffer, count) __outsq(PCI_IOBASE + (addr), buffer, count) +#define outsq(addr, buffer, count) __outsq((void __iomem *)addr, buffer, count) #endif #include <asm-generic/io.h>
diff --git a/arch/riscv/include/asm/uaccess.h b/arch/riscv/include/asm/uaccess.h index 20f0cc9..e076437 100644 --- a/arch/riscv/include/asm/uaccess.h +++ b/arch/riscv/include/asm/uaccess.h
@@ -235,7 +235,7 @@ do { \ might_fault(); \ access_ok(__p, sizeof(*__p)) ? \ __get_user((x), __p) : \ - ((x) = (__force __typeof__(x))0, -EFAULT); \ + ((x) = 0, -EFAULT); \ }) #define __put_user_asm(insn, x, ptr, err) \
diff --git a/arch/riscv/include/uapi/asm/setup.h b/arch/riscv/include/uapi/asm/setup.h deleted file mode 100644 index 66b13a5..0000000 --- a/arch/riscv/include/uapi/asm/setup.h +++ /dev/null
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ - -#ifndef _UAPI_ASM_RISCV_SETUP_H -#define _UAPI_ASM_RISCV_SETUP_H - -#define COMMAND_LINE_SIZE 1024 - -#endif /* _UAPI_ASM_RISCV_SETUP_H */
diff --git a/arch/riscv/kernel/process.c b/arch/riscv/kernel/process.c index 9d4b409..330b347 100644 --- a/arch/riscv/kernel/process.c +++ b/arch/riscv/kernel/process.c
@@ -104,8 +104,6 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long usp, { struct pt_regs *childregs = task_pt_regs(p); - memset(&p->thread.s, 0, sizeof(p->thread.s)); - /* p->thread holds context to be restored by __switch_to() */ if (unlikely(p->flags & PF_KTHREAD)) { /* Kernel thread */
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c index 0576a6b..261f408 100644 --- a/arch/riscv/kernel/smpboot.c +++ b/arch/riscv/kernel/smpboot.c
@@ -46,8 +46,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus) { int cpuid; - store_cpu_topology(smp_processor_id()); - /* This covers non-smp usecase mandated by "nosmp" option */ if (max_cpus == 0) return; @@ -144,8 +142,8 @@ asmlinkage __visible void __init smp_callin(void) current->active_mm = mm; trap_init(); - store_cpu_topology(smp_processor_id()); notify_cpu_starting(smp_processor_id()); + update_siblings_masks(smp_processor_id()); set_cpu_online(smp_processor_id(), 1); /* * Remote TLB flushes are ignored while the CPU is offline, so emit
diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c index 5ba4d23..19e46f4 100644 --- a/arch/riscv/kernel/stacktrace.c +++ b/arch/riscv/kernel/stacktrace.c
@@ -89,7 +89,7 @@ void notrace walk_stackframe(struct task_struct *task, while (!kstack_end(ksp)) { if (__kernel_text_address(pc) && unlikely(fn(pc, arg))) break; - pc = READ_ONCE_NOCHECK(*ksp++) - 0x4; + pc = (*ksp++) - 0x4; } }
diff --git a/arch/riscv/kernel/sys_riscv.c b/arch/riscv/kernel/sys_riscv.c index bb40268..12f8a7f 100644 --- a/arch/riscv/kernel/sys_riscv.c +++ b/arch/riscv/kernel/sys_riscv.c
@@ -18,6 +18,10 @@ static long riscv_sys_mmap(unsigned long addr, unsigned long len, if (unlikely(offset & (~PAGE_MASK >> page_shift_offset))) return -EINVAL; + if ((prot & PROT_WRITE) && (prot & PROT_EXEC)) + if (unlikely(!(prot & PROT_READ))) + return -EINVAL; + return ksys_mmap_pgoff(addr, len, prot, flags, fd, offset >> (PAGE_SHIFT - page_shift_offset)); }
diff --git a/arch/riscv/kernel/time.c b/arch/riscv/kernel/time.c index 726860a..8aa70b5 100644 --- a/arch/riscv/kernel/time.c +++ b/arch/riscv/kernel/time.c
@@ -5,7 +5,6 @@ */ #include <linux/of_clk.h> -#include <linux/clockchips.h> #include <linux/clocksource.h> #include <linux/delay.h> #include <asm/sbi.h> @@ -29,6 +28,4 @@ void __init time_init(void) of_clk_init(NULL); timer_probe(); - - tick_setup_hrtimer_broadcast(); }
diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c index c28d4de..473de3a 100644 --- a/arch/riscv/kernel/traps.c +++ b/arch/riscv/kernel/traps.c
@@ -15,7 +15,6 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/irq.h> -#include <linux/kexec.h> #include <asm/processor.h> #include <asm/ptrace.h> @@ -44,9 +43,6 @@ void die(struct pt_regs *regs, const char *str) ret = notify_die(DIE_OOPS, str, regs, 0, regs->scause, SIGSEGV); - if (regs && kexec_should_crash(current)) - crash_kexec(regs); - bust_spinlocks(0); add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); spin_unlock_irq(&die_lock); @@ -57,7 +53,7 @@ void die(struct pt_regs *regs, const char *str) if (panic_on_oops) panic("Fatal exception"); if (ret != NOTIFY_STOP) - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } void do_trap(struct pt_regs *regs, int signo, int code, unsigned long addr)
diff --git a/arch/riscv/kernel/vdso/Makefile b/arch/riscv/kernel/vdso/Makefile index c533ac8..a4ee3a0 100644 --- a/arch/riscv/kernel/vdso/Makefile +++ b/arch/riscv/kernel/vdso/Makefile
@@ -20,9 +20,6 @@ obj-y += vdso.o vdso-syms.o CPPFLAGS_vdso.lds += -P -C -U$(ARCH) -ifneq ($(filter vgettimeofday, $(vdso-syms)),) -CPPFLAGS_vdso.lds += -DHAS_VGETTIMEOFDAY -endif # Disable gcov profiling for VDSO code GCOV_PROFILE := n
diff --git a/arch/riscv/kernel/vdso/vdso.lds.S b/arch/riscv/kernel/vdso/vdso.lds.S index 4c45adf..f66a091 100644 --- a/arch/riscv/kernel/vdso/vdso.lds.S +++ b/arch/riscv/kernel/vdso/vdso.lds.S
@@ -62,11 +62,9 @@ LINUX_4.15 { global: __vdso_rt_sigreturn; -#ifdef HAS_VGETTIMEOFDAY __vdso_gettimeofday; __vdso_clock_gettime; __vdso_clock_getres; -#endif __vdso_getcpu; __vdso_flush_icache; local: *;
diff --git a/arch/riscv/mm/cacheflush.c b/arch/riscv/mm/cacheflush.c index 9d1ec8c..c54bd3c 100644 --- a/arch/riscv/mm/cacheflush.c +++ b/arch/riscv/mm/cacheflush.c
@@ -71,8 +71,6 @@ void flush_icache_pte(pte_t pte) { struct page *page = pte_page(pte); - if (!test_bit(PG_dcache_clean, &page->flags)) { + if (!test_and_set_bit(PG_dcache_clean, &page->flags)) flush_icache_all(); - set_bit(PG_dcache_clean, &page->flags); - } }
diff --git a/arch/riscv/mm/fault.c b/arch/riscv/mm/fault.c index 069d65f..c0dd526 100644 --- a/arch/riscv/mm/fault.c +++ b/arch/riscv/mm/fault.c
@@ -184,7 +184,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs) (addr < PAGE_SIZE) ? "NULL pointer dereference" : "paging request", addr); die(regs, "Oops"); - make_task_dead(SIGKILL); + do_exit(SIGKILL); /* * We ran out of memory, call the OOM killer, and return the userspace
diff --git a/arch/s390/boot/compressed/decompressor.c b/arch/s390/boot/compressed/decompressor.c index c42ab33..4504663 100644 --- a/arch/s390/boot/compressed/decompressor.c +++ b/arch/s390/boot/compressed/decompressor.c
@@ -80,6 +80,6 @@ void *decompress_kernel(void) void *output = (void *)decompress_offset; __decompress(_compressed_start, _compressed_end - _compressed_start, - NULL, NULL, output, vmlinux.image_size, NULL, error); + NULL, NULL, output, 0, NULL, error); return output; }
diff --git a/arch/s390/boot/ipl_report.c b/arch/s390/boot/ipl_report.c index 88bacf4..0b49655 100644 --- a/arch/s390/boot/ipl_report.c +++ b/arch/s390/boot/ipl_report.c
@@ -57,19 +57,11 @@ static unsigned long find_bootdata_space(struct ipl_rb_components *comps, if (IS_ENABLED(CONFIG_BLK_DEV_INITRD) && INITRD_START && INITRD_SIZE && intersects(INITRD_START, INITRD_SIZE, safe_addr, size)) safe_addr = INITRD_START + INITRD_SIZE; - if (intersects(safe_addr, size, (unsigned long)comps, comps->len)) { - safe_addr = (unsigned long)comps + comps->len; - goto repeat; - } for_each_rb_entry(comp, comps) if (intersects(safe_addr, size, comp->addr, comp->len)) { safe_addr = comp->addr + comp->len; goto repeat; } - if (intersects(safe_addr, size, (unsigned long)certs, certs->len)) { - safe_addr = (unsigned long)certs + certs->len; - goto repeat; - } for_each_rb_entry(cert, certs) if (intersects(safe_addr, size, cert->addr, cert->len)) { safe_addr = cert->addr + cert->len;
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c index 6511d15..f0bc4dc 100644 --- a/arch/s390/hypfs/hypfs_diag.c +++ b/arch/s390/hypfs/hypfs_diag.c
@@ -437,7 +437,7 @@ __init int hypfs_diag_init(void) int rc; if (diag204_probe()) { - pr_info("The hardware system does not support hypfs\n"); + pr_err("The hardware system does not support hypfs\n"); return -ENODATA; }
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index ca4fc66..70139d0 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c
@@ -501,9 +501,9 @@ static int __init hypfs_init(void) hypfs_vm_exit(); fail_hypfs_diag_exit: hypfs_diag_exit(); - pr_err("Initialization of hypfs failed with rc=%i\n", rc); fail_dbfs_exit: hypfs_dbfs_exit(); + pr_err("Initialization of hypfs failed with rc=%i\n", rc); return rc; } device_initcall(hypfs_init)
diff --git a/arch/s390/include/asm/debug.h b/arch/s390/include/asm/debug.h index 54f4bc5..3101340 100644 --- a/arch/s390/include/asm/debug.h +++ b/arch/s390/include/asm/debug.h
@@ -4,8 +4,8 @@ * * Copyright IBM Corp. 1999, 2000 */ -#ifndef _ASM_S390_DEBUG_H -#define _ASM_S390_DEBUG_H +#ifndef DEBUG_H +#define DEBUG_H #include <linux/string.h> #include <linux/spinlock.h> @@ -416,4 +416,4 @@ int debug_unregister_view(debug_info_t *id, struct debug_view *view); #define PRINT_FATAL(x...) printk(KERN_DEBUG PRINTK_HEADER x) #endif /* DASD_DEBUG */ -#endif /* _ASM_S390_DEBUG_H */ +#endif /* DEBUG_H */
diff --git a/arch/s390/include/asm/futex.h b/arch/s390/include/asm/futex.h index 7837c79..5e97a43 100644 --- a/arch/s390/include/asm/futex.h +++ b/arch/s390/include/asm/futex.h
@@ -16,8 +16,7 @@ "3: jl 1b\n" \ " lhi %0,0\n" \ "4: sacf 768\n" \ - EX_TABLE(0b,4b) EX_TABLE(1b,4b) \ - EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ + EX_TABLE(0b,4b) EX_TABLE(2b,4b) EX_TABLE(3b,4b) \ : "=d" (ret), "=&d" (oldval), "=&d" (newval), \ "=m" (*uaddr) \ : "0" (-EFAULT), "d" (oparg), "a" (uaddr), \
diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h index 487725e..de8f0bf 100644 --- a/arch/s390/include/asm/hugetlb.h +++ b/arch/s390/include/asm/hugetlb.h
@@ -35,11 +35,9 @@ static inline bool is_hugepage_only_range(struct mm_struct *mm, static inline int prepare_hugepage_range(struct file *file, unsigned long addr, unsigned long len) { - struct hstate *h = hstate_file(file); - - if (len & ~huge_page_mask(h)) + if (len & ~HPAGE_MASK) return -EINVAL; - if (addr & ~huge_page_mask(h)) + if (addr & ~HPAGE_MASK) return -EINVAL; return 0; }
diff --git a/arch/s390/include/asm/percpu.h b/arch/s390/include/asm/percpu.h index 5e26e2c..918f0ba 100644 --- a/arch/s390/include/asm/percpu.h +++ b/arch/s390/include/asm/percpu.h
@@ -31,7 +31,7 @@ pcp_op_T__ *ptr__; \ preempt_disable_notrace(); \ ptr__ = raw_cpu_ptr(&(pcp)); \ - prev__ = READ_ONCE(*ptr__); \ + prev__ = *ptr__; \ do { \ old__ = prev__; \ new__ = old__ op (val); \
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c index 01d7c28..f96a585 100644 --- a/arch/s390/kernel/crash_dump.c +++ b/arch/s390/kernel/crash_dump.c
@@ -44,7 +44,7 @@ struct save_area { u64 fprs[16]; u32 fpc; u32 prefix; - u32 todpreg; + u64 todpreg; u64 timer; u64 todcmp; u64 vxrs_low[16];
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c index 7d5e348..7f53367 100644 --- a/arch/s390/kernel/dumpstack.c +++ b/arch/s390/kernel/dumpstack.c
@@ -210,5 +210,5 @@ void __noreturn die(struct pt_regs *regs, const char *str) if (panic_on_oops) panic("Fatal exception: panic_on_oops"); oops_exit(); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); }
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index a97c175..6f13883 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c
@@ -255,7 +255,6 @@ static void pop_kprobe(struct kprobe_ctlblk *kcb) { __this_cpu_write(current_kprobe, kcb->prev_kprobe.kp); kcb->kprobe_status = kcb->prev_kprobe.status; - kcb->prev_kprobe.kp = NULL; } NOKPROBE_SYMBOL(pop_kprobe); @@ -510,11 +509,12 @@ static int post_kprobe_handler(struct pt_regs *regs) if (!p) return 0; - resume_execution(p, regs); if (kcb->kprobe_status != KPROBE_REENTER && p->post_handler) { kcb->kprobe_status = KPROBE_HIT_SSDONE; p->post_handler(p, regs, 0); } + + resume_execution(p, regs); pop_kprobe(kcb); preempt_enable_no_resched();
diff --git a/arch/s390/kernel/machine_kexec_file.c b/arch/s390/kernel/machine_kexec_file.c index bf05967..76cd098 100644 --- a/arch/s390/kernel/machine_kexec_file.c +++ b/arch/s390/kernel/machine_kexec_file.c
@@ -29,7 +29,6 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) const unsigned long marker_len = sizeof(MODULE_SIG_STRING) - 1; struct module_signature *ms; unsigned long sig_len; - int ret; /* Skip signature verification when not secure IPLed. */ if (!ipl_secure_flag) @@ -64,18 +63,11 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) return -EBADMSG; } - ret = verify_pkcs7_signature(kernel, kernel_len, - kernel + kernel_len, sig_len, - VERIFY_USE_SECONDARY_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); - if (ret == -ENOKEY && IS_ENABLED(CONFIG_INTEGRITY_PLATFORM_KEYRING)) - ret = verify_pkcs7_signature(kernel, kernel_len, - kernel + kernel_len, sig_len, - VERIFY_USE_PLATFORM_KEYRING, - VERIFYING_MODULE_SIGNATURE, - NULL, NULL); - return ret; + return verify_pkcs7_signature(kernel, kernel_len, + kernel + kernel_len, sig_len, + VERIFY_USE_PLATFORM_KEYRING, + VERIFYING_MODULE_SIGNATURE, + NULL, NULL); } #endif /* CONFIG_KEXEC_SIG */ @@ -185,6 +177,8 @@ static int kexec_file_add_ipl_report(struct kimage *image, data->memsz = ALIGN(data->memsz, PAGE_SIZE); buf.mem = data->memsz; + if (image->type == KEXEC_TYPE_CRASH) + buf.mem += crashk_res.start; ptr = (void *)ipl_cert_list_addr; end = ptr + ipl_cert_list_size; @@ -221,9 +215,6 @@ static int kexec_file_add_ipl_report(struct kimage *image, data->kernel_buf + offsetof(struct lowcore, ipl_parmblock_ptr); *lc_ipl_parmblock_ptr = (__u32)buf.mem; - if (image->type == KEXEC_TYPE_CRASH) - buf.mem += crashk_res.start; - ret = kexec_add_buffer(&buf); out: return ret;
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c index d895127..0a487fa 100644 --- a/arch/s390/kernel/nmi.c +++ b/arch/s390/kernel/nmi.c
@@ -179,7 +179,7 @@ void s390_handle_mcck(void) "malfunction (code 0x%016lx).\n", mcck.mcck_code); printk(KERN_EMERG "mcck: task: %s, pid: %d.\n", current->comm, current->pid); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } } EXPORT_SYMBOL_GPL(s390_handle_mcck);
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c index fdd5f37..4e6299e 100644 --- a/arch/s390/kernel/process.c +++ b/arch/s390/kernel/process.c
@@ -76,18 +76,6 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src) memcpy(dst, src, arch_task_struct_size); dst->thread.fpu.regs = dst->thread.fpu.fprs; - - /* - * Don't transfer over the runtime instrumentation or the guarded - * storage control block pointers. These fields are cleared here instead - * of in copy_thread() to avoid premature freeing of associated memory - * on fork() failure. Wait to clear the RI flag because ->stack still - * refers to the source thread. - */ - dst->thread.ri_cb = NULL; - dst->thread.gs_cb = NULL; - dst->thread.gs_bc_cb = NULL; - return 0; } @@ -145,11 +133,13 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long new_stackp, frame->childregs.flags = 0; if (new_stackp) frame->childregs.gprs[15] = new_stackp; - /* - * Clear the runtime instrumentation flag after the above childregs - * copy. The CB pointer was already cleared in arch_dup_task_struct(). - */ + + /* Don't copy runtime instrumentation info */ + p->thread.ri_cb = NULL; frame->childregs.psw.mask &= ~PSW_MASK_RI; + /* Don't copy guarded storage control block */ + p->thread.gs_cb = NULL; + p->thread.gs_bc_cb = NULL; /* Set a new TLS ? */ if (clone_flags & CLONE_SETTLS) {
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c index 34ca344..ad74472 100644 --- a/arch/s390/kernel/ptrace.c +++ b/arch/s390/kernel/ptrace.c
@@ -502,7 +502,9 @@ long arch_ptrace(struct task_struct *child, long request, } return 0; case PTRACE_GET_LAST_BREAK: - return put_user(child->thread.last_break, (unsigned long __user *)data); + put_user(child->thread.last_break, + (unsigned long __user *) data); + return 0; case PTRACE_ENABLE_TE: if (!MACHINE_HAS_TE) return -EIO; @@ -854,7 +856,9 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request, } return 0; case PTRACE_GET_LAST_BREAK: - return put_user(child->thread.last_break, (unsigned int __user *)data); + put_user(child->thread.last_break, + (unsigned int __user *) data); + return 0; } return compat_ptrace_request(child, request, addr, data); }
diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index f8cc4e8..7e0eb40 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S
@@ -15,8 +15,6 @@ /* Handle ro_after_init data on our own. */ #define RO_AFTER_INIT_DATA -#define RUNTIME_DISCARD_EXIT - #include <asm-generic/vmlinux.lds.h> #include <asm/vmlinux.lds.h> @@ -126,7 +124,6 @@ /* * Table with the patch locations to undo expolines */ - . = ALIGN(4); .nospec_call_table : { __nospec_call_start = . ; *(.s390_indirect*) @@ -191,6 +188,5 @@ DISCARDS /DISCARD/ : { *(.eh_frame) - *(.interp) } }
diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index a180fe5..8be5750 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c
@@ -81,9 +81,8 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id) struct esca_block *sca = vcpu->kvm->arch.sca; union esca_sigp_ctrl *sigp_ctrl = &(sca->cpu[vcpu->vcpu_id].sigp_ctrl); - union esca_sigp_ctrl new_val = {0}, old_val; + union esca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl; - old_val = READ_ONCE(*sigp_ctrl); new_val.scn = src_id; new_val.c = 1; old_val.c = 0; @@ -94,9 +93,8 @@ static int sca_inject_ext_call(struct kvm_vcpu *vcpu, int src_id) struct bsca_block *sca = vcpu->kvm->arch.sca; union bsca_sigp_ctrl *sigp_ctrl = &(sca->cpu[vcpu->vcpu_id].sigp_ctrl); - union bsca_sigp_ctrl new_val = {0}, old_val; + union bsca_sigp_ctrl new_val = {0}, old_val = *sigp_ctrl; - old_val = READ_ONCE(*sigp_ctrl); new_val.scn = src_id; new_val.c = 1; old_val.c = 0; @@ -126,18 +124,16 @@ static void sca_clear_ext_call(struct kvm_vcpu *vcpu) struct esca_block *sca = vcpu->kvm->arch.sca; union esca_sigp_ctrl *sigp_ctrl = &(sca->cpu[vcpu->vcpu_id].sigp_ctrl); - union esca_sigp_ctrl old; + union esca_sigp_ctrl old = *sigp_ctrl; - old = READ_ONCE(*sigp_ctrl); expect = old.value; rc = cmpxchg(&sigp_ctrl->value, old.value, 0); } else { struct bsca_block *sca = vcpu->kvm->arch.sca; union bsca_sigp_ctrl *sigp_ctrl = &(sca->cpu[vcpu->vcpu_id].sigp_ctrl); - union bsca_sigp_ctrl old; + union bsca_sigp_ctrl old = *sigp_ctrl; - old = READ_ONCE(*sigp_ctrl); expect = old.value; rc = cmpxchg(&sigp_ctrl->value, old.value, 0); }
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 9ade970..49dc00d 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c
@@ -4527,22 +4527,6 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, if (mem->guest_phys_addr + mem->memory_size > kvm->arch.mem_limit) return -EINVAL; - if (!kvm->arch.migration_mode) - return 0; - - /* - * Turn off migration mode when: - * - userspace creates a new memslot with dirty logging off, - * - userspace modifies an existing memslot (MOVE or FLAGS_ONLY) and - * dirty logging is turned off. - * Migration mode expects dirty page logging being enabled to store - * its dirty bitmap. - */ - if (change != KVM_MR_DELETE && - !(mem->flags & KVM_MEM_LOG_DIRTY_PAGES)) - WARN(kvm_s390_vm_stop_migration(kvm), - "Failed to stop migration mode"); - return 0; }
diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 2021946..4f6c22d 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c
@@ -540,10 +540,8 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) if (test_kvm_cpu_feat(vcpu->kvm, KVM_S390_VM_CPU_FEAT_CEI)) scb_s->eca |= scb_o->eca & ECA_CEI; /* Epoch Extension */ - if (test_kvm_facility(vcpu->kvm, 139)) { + if (test_kvm_facility(vcpu->kvm, 139)) scb_s->ecd |= scb_o->ecd & ECD_MEF; - scb_s->epdx = scb_o->epdx; - } /* etoken */ if (test_kvm_facility(vcpu->kvm, 156))
diff --git a/arch/s390/lib/uaccess.c b/arch/s390/lib/uaccess.c index fcfd78f..0267405 100644 --- a/arch/s390/lib/uaccess.c +++ b/arch/s390/lib/uaccess.c
@@ -339,7 +339,7 @@ static inline unsigned long clear_user_mvcos(void __user *to, unsigned long size "4: slgr %0,%0\n" "5:\n" EX_TABLE(0b,2b) EX_TABLE(3b,5b) - : "+&a" (size), "+&a" (to), "+a" (tmp1), "=&a" (tmp2) + : "+a" (size), "+a" (to), "+a" (tmp1), "=a" (tmp2) : "a" (empty_zero_page), "d" (reg0) : "cc", "memory"); return size; }
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c index 7d2e183..4a41a72 100644 --- a/arch/s390/mm/fault.c +++ b/arch/s390/mm/fault.c
@@ -430,9 +430,7 @@ static inline vm_fault_t do_exception(struct pt_regs *regs, int access) flags = FAULT_FLAG_DEFAULT; if (user_mode(regs)) flags |= FAULT_FLAG_USER; - if ((trans_exc_code & store_indication) == 0x400) - access = VM_WRITE; - if (access == VM_WRITE) + if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400) flags |= FAULT_FLAG_WRITE; down_read(&mm->mmap_sem);
diff --git a/arch/s390/pci/pci_mmio.c b/arch/s390/pci/pci_mmio.c index a4d5048..921f0fc 100644 --- a/arch/s390/pci/pci_mmio.c +++ b/arch/s390/pci/pci_mmio.c
@@ -64,7 +64,7 @@ static inline int __pcistg_mio_inuser( asm volatile ( " sacf 256\n" "0: llgc %[tmp],0(%[src])\n" - "4: sllg %[val],%[val],8\n" + " sllg %[val],%[val],8\n" " aghi %[src],1\n" " ogr %[val],%[tmp]\n" " brctg %[cnt],0b\n" @@ -72,7 +72,7 @@ static inline int __pcistg_mio_inuser( "2: ipm %[cc]\n" " srl %[cc],28\n" "3: sacf 768\n" - EX_TABLE(0b, 3b) EX_TABLE(4b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) + EX_TABLE(0b, 3b) EX_TABLE(1b, 3b) EX_TABLE(2b, 3b) : [src] "+a" (src), [cnt] "+d" (cnt), [val] "+d" (val), [tmp] "=d" (tmp), @@ -220,10 +220,10 @@ static inline int __pcilg_mio_inuser( "2: ahi %[shift],-8\n" " srlg %[tmp],%[val],0(%[shift])\n" "3: stc %[tmp],0(%[dst])\n" - "5: aghi %[dst],1\n" + " aghi %[dst],1\n" " brctg %[cnt],2b\n" "4: sacf 768\n" - EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) EX_TABLE(5b, 4b) + EX_TABLE(0b, 4b) EX_TABLE(1b, 4b) EX_TABLE(3b, 4b) : [cc] "+d" (cc), [val] "=d" (val), [len] "+d" (len), [dst] "+a" (dst), [cnt] "+d" (cnt), [tmp] "=d" (tmp),
diff --git a/arch/sh/include/asm/processor_32.h b/arch/sh/include/asm/processor_32.h index 58ae979..0e0ecc0 100644 --- a/arch/sh/include/asm/processor_32.h +++ b/arch/sh/include/asm/processor_32.h
@@ -51,7 +51,6 @@ #define SR_FD 0x00008000 #define SR_MD 0x40000000 -#define SR_USER_MASK 0x00000303 // M, Q, S, T bits /* * DSP structure and data */
diff --git a/arch/sh/include/asm/sections.h b/arch/sh/include/asm/sections.h index 0cb0ca1..8edb824 100644 --- a/arch/sh/include/asm/sections.h +++ b/arch/sh/include/asm/sections.h
@@ -4,7 +4,7 @@ #include <asm-generic/sections.h> -extern char __machvec_start[], __machvec_end[]; +extern long __machvec_start, __machvec_end; extern char __uncached_start, __uncached_end; extern char __start_eh_frame[], __stop_eh_frame[];
diff --git a/arch/sh/kernel/dma-coherent.c b/arch/sh/kernel/dma-coherent.c index eeb25a4..b175146 100644 --- a/arch/sh/kernel/dma-coherent.c +++ b/arch/sh/kernel/dma-coherent.c
@@ -25,7 +25,7 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, * Pages from the page allocator may have data present in * cache. So flush the cache before using uncached memory. */ - arch_sync_dma_for_device(virt_to_phys(ret), size, + arch_sync_dma_for_device(dev, virt_to_phys(ret), size, DMA_BIDIRECTIONAL); ret_nocache = (void __force *)ioremap_nocache(virt_to_phys(ret), size); @@ -59,8 +59,8 @@ void arch_dma_free(struct device *dev, size_t size, void *vaddr, iounmap(vaddr); } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { void *addr = sh_cacheop_vaddr(phys_to_virt(paddr));
diff --git a/arch/sh/kernel/machvec.c b/arch/sh/kernel/machvec.c index 3e0a430..beadbbd 100644 --- a/arch/sh/kernel/machvec.c +++ b/arch/sh/kernel/machvec.c
@@ -19,8 +19,8 @@ #define MV_NAME_SIZE 32 #define for_each_mv(mv) \ - for ((mv) = (struct sh_machine_vector *)__machvec_start; \ - (mv) && (unsigned long)(mv) < (unsigned long)__machvec_end; \ + for ((mv) = (struct sh_machine_vector *)&__machvec_start; \ + (mv) && (unsigned long)(mv) < (unsigned long)&__machvec_end; \ (mv)++) static struct sh_machine_vector * __init get_mv_byname(const char *name) @@ -86,8 +86,8 @@ void __init sh_mv_setup(void) if (!machvec_selected) { unsigned long machvec_size; - machvec_size = ((unsigned long)__machvec_end - - (unsigned long)__machvec_start); + machvec_size = ((unsigned long)&__machvec_end - + (unsigned long)&__machvec_start); /* * Sanity check for machvec section alignment. Ensure @@ -101,7 +101,7 @@ void __init sh_mv_setup(void) * vector (usually the only one) from .machvec.init. */ if (machvec_size >= sizeof(struct sh_machine_vector)) - sh_mv = *(struct sh_machine_vector *)__machvec_start; + sh_mv = *(struct sh_machine_vector *)&__machvec_start; } printk(KERN_NOTICE "Booting machvec: %s\n", get_system_type());
diff --git a/arch/sh/kernel/signal_32.c b/arch/sh/kernel/signal_32.c index f6e1a47..24473fa 100644 --- a/arch/sh/kernel/signal_32.c +++ b/arch/sh/kernel/signal_32.c
@@ -116,7 +116,6 @@ static int restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p) { unsigned int err = 0; - unsigned int sr = regs->sr & ~SR_USER_MASK; #define COPY(x) err |= __get_user(regs->x, &sc->sc_##x) COPY(regs[1]); @@ -132,8 +131,6 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, int *r0_p COPY(sr); COPY(pc); #undef COPY - regs->sr = (regs->sr & SR_USER_MASK) | sr; - #ifdef CONFIG_SH_FPU if (boot_cpu_data.flags & CPU_HAS_FPU) { int owned_fp;
diff --git a/arch/sh/kernel/traps.c b/arch/sh/kernel/traps.c index fe79598..6751332 100644 --- a/arch/sh/kernel/traps.c +++ b/arch/sh/kernel/traps.c
@@ -57,7 +57,7 @@ void __noreturn die(const char *str, struct pt_regs *regs, long err) if (panic_on_oops) panic("Fatal exception"); - make_task_dead(SIGSEGV); + do_exit(SIGSEGV); } void die_if_kernel(const char *str, struct pt_regs *regs, long err)
diff --git a/arch/sh/kernel/vmlinux.lds.S b/arch/sh/kernel/vmlinux.lds.S index ec3bae1..77a59d8 100644 --- a/arch/sh/kernel/vmlinux.lds.S +++ b/arch/sh/kernel/vmlinux.lds.S
@@ -10,7 +10,6 @@ #define LOAD_OFFSET 0 OUTPUT_ARCH(sh) #endif -#define RUNTIME_DISCARD_EXIT #include <asm/thread_info.h> #include <asm/cache.h>
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig index 8cb5bb0..349e277 100644 --- a/arch/sparc/Kconfig +++ b/arch/sparc/Kconfig
@@ -321,7 +321,7 @@ This config option is actually maximum order plus one. For example, a value of 13 means that the largest free memory block is 2^12 pages. -if SPARC64 || COMPILE_TEST +if SPARC64 source "kernel/power/Kconfig" endif
diff --git a/arch/sparc/kernel/ioport.c b/arch/sparc/kernel/ioport.c index 9d723c5..b87e000 100644 --- a/arch/sparc/kernel/ioport.c +++ b/arch/sparc/kernel/ioport.c
@@ -368,8 +368,8 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr, /* IIep is write-through, not flushing on cpu to device transfer. */ -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { if (dir != PCI_DMA_TODEVICE) dma_make_coherent(paddr, PAGE_ALIGN(size));
diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c index dbf068a..4ceecad 100644 --- a/arch/sparc/kernel/traps_32.c +++ b/arch/sparc/kernel/traps_32.c
@@ -86,7 +86,9 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs) } printk("Instruction DUMP:"); instruction_dump ((unsigned long *) regs->pc); - make_task_dead((regs->psr & PSR_PS) ? SIGKILL : SIGSEGV); + if(regs->psr & PSR_PS) + do_exit(SIGKILL); + do_exit(SIGSEGV); } void do_hw_interrupt(struct pt_regs *regs, unsigned long type)
diff --git a/arch/sparc/kernel/traps_64.c b/arch/sparc/kernel/traps_64.c index 1776868..f2b22c4 100644 --- a/arch/sparc/kernel/traps_64.c +++ b/arch/sparc/kernel/traps_64.c
@@ -2564,7 +2564,9 @@ void __noreturn die_if_kernel(char *str, struct pt_regs *regs) } if (panic_on_oops) panic("Fatal exception"); - make_task_dead((regs->tstate & TSTATE_PRIV)? SIGKILL : SIGSEGV); + if (regs->tstate & TSTATE_PRIV) + do_exit(SIGKILL); + do_exit(SIGSEGV); } EXPORT_SYMBOL(die_if_kernel);
diff --git a/arch/um/Makefile b/arch/um/Makefile index 773120b..275f5ff 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile
@@ -132,18 +132,10 @@ # The wrappers will select whether using "malloc" or the kernel allocator. LINK_WRAPS = -Wl,--wrap,malloc -Wl,--wrap,free -Wl,--wrap,calloc -# Avoid binutils 2.39+ warnings by marking the stack non-executable and -# ignorning warnings for the kallsyms sections. -LDFLAGS_EXECSTACK = -z noexecstack -ifeq ($(CONFIG_LD_IS_BFD),y) -LDFLAGS_EXECSTACK += $(call ld-option,--no-warn-rwx-segments) -endif - LD_FLAGS_CMDLINE = $(foreach opt,$(KBUILD_LDFLAGS),-Wl,$(opt)) # Used by link-vmlinux.sh which has special support for um link export CFLAGS_vmlinux := $(LINK-y) $(LINK_WRAPS) $(LD_FLAGS_CMDLINE) -export LDFLAGS_vmlinux := $(LDFLAGS_EXECSTACK) # When cleaning we don't include .config, so we don't include # TT or skas makefiles and don't clean skas_ptregs.h.
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c index eb9dba8..769ffbd 100644 --- a/arch/um/drivers/vector_kern.c +++ b/arch/um/drivers/vector_kern.c
@@ -746,7 +746,6 @@ static int vector_config(char *str, char **error_out) if (parsed == NULL) { *error_out = "vector_config failed to parse parameters"; - kfree(params); return -EINVAL; }
diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 640c8e1..0f40ecc 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c
@@ -77,7 +77,7 @@ static int show_cpuinfo(struct seq_file *m, void *v) static void *c_start(struct seq_file *m, loff_t *pos) { - return *pos < nr_cpu_ids ? cpu_data + *pos : NULL; + return *pos < NR_CPUS ? cpu_data + *pos : NULL; } static void *c_next(struct seq_file *m, void *v, loff_t *pos)
diff --git a/arch/um/kernel/vmlinux.lds.S b/arch/um/kernel/vmlinux.lds.S index 53d719c..16e49bf 100644 --- a/arch/um/kernel/vmlinux.lds.S +++ b/arch/um/kernel/vmlinux.lds.S
@@ -1,4 +1,4 @@ -#define RUNTIME_DISCARD_EXIT + KERNEL_STACK_SIZE = 4096 * (1 << CONFIG_KERNEL_STACK_ORDER); #ifdef CONFIG_LD_SCRIPT_STATIC
diff --git a/arch/um/os-Linux/skas/process.c b/arch/um/os-Linux/skas/process.c index 0571cc0..4fb877b 100644 --- a/arch/um/os-Linux/skas/process.c +++ b/arch/um/os-Linux/skas/process.c
@@ -5,7 +5,6 @@ */ #include <stdlib.h> -#include <stdbool.h> #include <unistd.h> #include <sched.h> #include <errno.h> @@ -642,24 +641,10 @@ void halt_skas(void) UML_LONGJMP(&initial_jmpbuf, INIT_JMP_HALT); } -static bool noreboot; - -static int __init noreboot_cmd_param(char *str, int *add) -{ - noreboot = true; - return 0; -} - -__uml_setup("noreboot", noreboot_cmd_param, -"noreboot\n" -" Rather than rebooting, exit always, akin to QEMU's -no-reboot option.\n" -" This is useful if you're using CONFIG_PANIC_TIMEOUT in order to catch\n" -" crashes in CI\n"); - void reboot_skas(void) { block_signals_trace(); - UML_LONGJMP(&initial_jmpbuf, noreboot ? INIT_JMP_HALT : INIT_JMP_REBOOT); + UML_LONGJMP(&initial_jmpbuf, INIT_JMP_REBOOT); } void __switch_mm(struct mm_id *mm_idp)
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile index 8250096..6539c50 100644 --- a/arch/x86/boot/Makefile +++ b/arch/x86/boot/Makefile
@@ -100,7 +100,7 @@ AFLAGS_header.o += -I$(objtree)/$(obj) $(obj)/header.o: $(obj)/zoffset.h -LDFLAGS_setup.elf := -m elf_i386 -z noexecstack -T +LDFLAGS_setup.elf := -m elf_i386 -T $(obj)/setup.elf: $(src)/setup.ld $(SETUP_OBJS) FORCE $(call if_changed,ld)
diff --git a/arch/x86/boot/bioscall.S b/arch/x86/boot/bioscall.S index aa9b964..5521ea1 100644 --- a/arch/x86/boot/bioscall.S +++ b/arch/x86/boot/bioscall.S
@@ -32,7 +32,7 @@ movw %dx, %si movw %sp, %di movw $11, %cx - rep; movsl + rep; movsd /* Pop full state from the stack */ popal @@ -67,7 +67,7 @@ jz 4f movw %sp, %si movw $11, %cx - rep; movsl + rep; movsd 4: addw $44, %sp /* Restore state and return */
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile index 0fe293d..aef6604 100644 --- a/arch/x86/boot/compressed/Makefile +++ b/arch/x86/boot/compressed/Makefile
@@ -60,10 +60,6 @@ ifeq ($(CONFIG_RELOCATABLE), y) KBUILD_LDFLAGS += -z notext endif - -KBUILD_LDFLAGS += -z noexecstack -KBUILD_LDFLAGS += $(call ld-option,--no-warn-rwx-segments) - LDFLAGS_vmlinux := -T hostprogs-y := mkpiggy
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig index b3017ca..114221d 100644 --- a/arch/x86/configs/gki_defconfig +++ b/arch/x86/configs/gki_defconfig
@@ -196,6 +196,7 @@ CONFIG_NET_SCH_TBF=y CONFIG_NET_SCH_INGRESS=y CONFIG_NET_CLS_BASIC=y +CONFIG_NET_CLS_TCINDEX=y CONFIG_NET_CLS_FW=y CONFIG_NET_CLS_U32=y CONFIG_NET_CLS_BPF=y @@ -310,7 +311,6 @@ CONFIG_SERIAL_8250=y # CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set CONFIG_SERIAL_8250_CONSOLE=y -CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_RUNTIME_UARTS=0 CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_DEV_BUS=y @@ -417,7 +417,6 @@ CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_LEDS_CLASS_FLASH=y -CONFIG_LEDS_CLASS_MULTICOLOR=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_RTC_CLASS=y CONFIG_DMABUF_HEAPS=y @@ -557,7 +556,6 @@ CONFIG_PANIC_ON_OOPS=y CONFIG_PANIC_TIMEOUT=5 CONFIG_SCHEDSTATS=y -CONFIG_FUNCTION_ERROR_INJECTION=y CONFIG_BUG_ON_DATA_CORRUPTION=y CONFIG_UBSAN=y CONFIG_UBSAN_TRAP=y
diff --git a/arch/x86/crypto/ghash-clmulni-intel_glue.c b/arch/x86/crypto/ghash-clmulni-intel_glue.c index c9864ac..04d72a5 100644 --- a/arch/x86/crypto/ghash-clmulni-intel_glue.c +++ b/arch/x86/crypto/ghash-clmulni-intel_glue.c
@@ -19,7 +19,6 @@ #include <crypto/internal/simd.h> #include <asm/cpu_device_id.h> #include <asm/simd.h> -#include <asm/unaligned.h> #define GHASH_BLOCK_SIZE 16 #define GHASH_DIGEST_SIZE 16 @@ -55,6 +54,7 @@ static int ghash_setkey(struct crypto_shash *tfm, const u8 *key, unsigned int keylen) { struct ghash_ctx *ctx = crypto_shash_ctx(tfm); + be128 *x = (be128 *)key; u64 a, b; if (keylen != GHASH_BLOCK_SIZE) { @@ -63,8 +63,8 @@ static int ghash_setkey(struct crypto_shash *tfm, } /* perform multiplication by 'x' in GF(2^128) */ - a = get_unaligned_be64(key); - b = get_unaligned_be64(key + 8); + a = be64_to_cpu(x->a); + b = be64_to_cpu(x->b); ctx->shash.a = (b << 1) | (a >> 63); ctx->shash.b = (a << 1) | (b >> 63);
diff --git a/arch/x86/entry/calling.h b/arch/x86/entry/calling.h index 29e5675..b3f1214 100644 --- a/arch/x86/entry/calling.h +++ b/arch/x86/entry/calling.h
@@ -6,8 +6,6 @@ #include <asm/percpu.h> #include <asm/asm-offsets.h> #include <asm/processor-flags.h> -#include <asm/msr.h> -#include <asm/nospec-branch.h> /* @@ -148,19 +146,27 @@ For 32-bit we have the following conventions - kernel is built with .endm -.macro POP_REGS pop_rdi=1 +.macro POP_REGS pop_rdi=1 skip_r11rcx=0 popq %r15 popq %r14 popq %r13 popq %r12 popq %rbp popq %rbx + .if \skip_r11rcx + popq %rsi + .else popq %r11 + .endif popq %r10 popq %r9 popq %r8 popq %rax + .if \skip_r11rcx + popq %rsi + .else popq %rcx + .endif popq %rdx popq %rsi .if \pop_rdi @@ -311,62 +317,6 @@ For 32-bit we have the following conventions - kernel is built with #endif /* - * IBRS kernel mitigation for Spectre_v2. - * - * Assumes full context is established (PUSH_REGS, CR3 and GS) and it clobbers - * the regs it uses (AX, CX, DX). Must be called before the first RET - * instruction (NOTE! UNTRAIN_RET includes a RET instruction) - * - * The optional argument is used to save/restore the current value, - * which is used on the paranoid paths. - * - * Assumes x86_spec_ctrl_{base,current} to have SPEC_CTRL_IBRS set. - */ -.macro IBRS_ENTER save_reg - ALTERNATIVE "jmp .Lend_\@", "", X86_FEATURE_KERNEL_IBRS - movl $MSR_IA32_SPEC_CTRL, %ecx - -.ifnb \save_reg - rdmsr - shl $32, %rdx - or %rdx, %rax - mov %rax, \save_reg - test $SPEC_CTRL_IBRS, %eax - jz .Ldo_wrmsr_\@ - lfence - jmp .Lend_\@ -.Ldo_wrmsr_\@: -.endif - - movq PER_CPU_VAR(x86_spec_ctrl_current), %rdx - movl %edx, %eax - shr $32, %rdx - wrmsr -.Lend_\@: -.endm - -/* - * Similar to IBRS_ENTER, requires KERNEL GS,CR3 and clobbers (AX, CX, DX) - * regs. Must be called after the last RET. - */ -.macro IBRS_EXIT save_reg - ALTERNATIVE "jmp .Lend_\@", "", X86_FEATURE_KERNEL_IBRS - movl $MSR_IA32_SPEC_CTRL, %ecx - -.ifnb \save_reg - mov \save_reg, %rdx -.else - movq PER_CPU_VAR(x86_spec_ctrl_current), %rdx - andl $(~SPEC_CTRL_IBRS), %edx -.endif - - movl %edx, %eax - shr $32, %rdx - wrmsr -.Lend_\@: -.endm - -/* * Mitigate Spectre v1 for conditional swapgs code paths. * * FENCE_SWAPGS_USER_ENTRY is used in the user entry swapgs code path, to
diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 740df9c..bde3e0f 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S
@@ -750,6 +750,7 @@ movl %ebx, PER_CPU_VAR(stack_canary)+stack_canary_offset #endif +#ifdef CONFIG_RETPOLINE /* * When switching from a shallower to a deeper call stack * the RSB may either underflow or use entries populated @@ -758,6 +759,7 @@ * speculative execution to prevent attack. */ FILL_RETURN_BUFFER %ebx, RSB_CLEAR_LOOPS, X86_FEATURE_RSB_CTXSW +#endif /* restore callee-saved registers */ popfl @@ -1659,13 +1661,13 @@ END(async_page_fault) #endif -ENTRY(rewind_stack_and_make_dead) +ENTRY(rewind_stack_do_exit) /* Prevent any naive code from trying to unwind to our caller. */ xorl %ebp, %ebp movl PER_CPU_VAR(cpu_current_top_of_stack), %esi leal -TOP_OF_KERNEL_STACK_PADDING-PTREGS_SIZE(%esi), %esp - call make_task_dead + call do_exit 1: jmp 1b -END(rewind_stack_and_make_dead) +END(rewind_stack_do_exit)
diff --git a/arch/x86/entry/entry_64.S b/arch/x86/entry/entry_64.S index bd7a4ad..2ba3d53 100644 --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S
@@ -172,10 +172,6 @@ /* IRQs are off. */ movq %rax, %rdi movq %rsp, %rsi - - /* clobbers %rax, make sure it is after saving the syscall nr */ - IBRS_ENTER - call do_syscall_64 /* returns with IRQs disabled */ TRACE_IRQS_IRETQ /* we're about to change IF */ @@ -252,8 +248,8 @@ * perf profiles. Nothing jumps here. */ syscall_return_via_sysret: - IBRS_EXIT - POP_REGS pop_rdi=0 + /* rcx and r11 are already restored (see code above) */ + POP_REGS pop_rdi=0 skip_r11rcx=1 /* * Now all regs are restored except RSP and RDI. @@ -305,6 +301,7 @@ movq %rbx, PER_CPU_VAR(fixed_percpu_data) + stack_canary_offset #endif +#ifdef CONFIG_RETPOLINE /* * When switching from a shallower to a deeper call stack * the RSB may either underflow or use entries populated @@ -313,6 +310,7 @@ * speculative execution to prevent attack. */ FILL_RETURN_BUFFER %r12, RSB_CLEAR_LOOPS, X86_FEATURE_RSB_CTXSW +#endif /* restore callee-saved registers */ popq %r15 @@ -624,7 +622,6 @@ TRACE_IRQS_IRETQ GLOBAL(swapgs_restore_regs_and_return_to_usermode) - IBRS_EXIT #ifdef CONFIG_DEBUG_ENTRY /* Assert that pt_regs indicates user mode. */ testb $3, CS(%rsp) @@ -1251,13 +1248,7 @@ */ FENCE_SWAPGS_KERNEL_ENTRY - /* - * Once we have CR3 and %GS setup save and set SPEC_CTRL. Just like - * CR3 above, keep the old value in a callee saved register. - */ - IBRS_ENTER save_reg=%r15 - - RET + ret END(paranoid_entry) /* @@ -1285,20 +1276,12 @@ jmp .Lparanoid_exit_restore .Lparanoid_exit_no_swapgs: TRACE_IRQS_IRETQ_DEBUG - - /* - * Must restore IBRS state before both CR3 and %GS since we need access - * to the per-CPU x86_spec_ctrl_shadow variable. - */ - IBRS_EXIT save_reg=%r15 - /* Always restore stashed CR3 value (see paranoid_entry) */ RESTORE_CR3 scratch_reg=%rbx save_reg=%r14 .Lparanoid_exit_restore: jmp restore_regs_and_return_to_kernel END(paranoid_exit) - /* * Save all registers in pt_regs, and switch GS if needed. */ @@ -1318,7 +1301,6 @@ FENCE_SWAPGS_USER_ENTRY /* We have user CR3. Change to kernel CR3. */ SWITCH_TO_KERNEL_CR3 scratch_reg=%rax - IBRS_ENTER .Lerror_entry_from_usermode_after_swapgs: /* Put us onto the real thread stack. */ @@ -1374,7 +1356,6 @@ SWAPGS FENCE_SWAPGS_USER_ENTRY SWITCH_TO_KERNEL_CR3 scratch_reg=%rax - IBRS_ENTER /* * Pretend that the exception came from user mode: set up pt_regs @@ -1480,8 +1461,6 @@ PUSH_AND_CLEAR_REGS rdx=(%rdx) ENCODE_FRAME_POINTER - IBRS_ENTER - /* * At this point we no longer need to worry about stack damage * due to nesting -- we're on the normal thread stack and we're @@ -1705,9 +1684,6 @@ movq $-1, %rsi call do_nmi - /* Always restore stashed SPEC_CTRL value (see paranoid_entry) */ - IBRS_EXIT save_reg=%r15 - /* Always restore stashed CR3 value (see paranoid_entry) */ RESTORE_CR3 scratch_reg=%r15 save_reg=%r14 @@ -1757,7 +1733,7 @@ END(ignore_sysret) #endif -ENTRY(rewind_stack_and_make_dead) +ENTRY(rewind_stack_do_exit) UNWIND_HINT_FUNC /* Prevent any naive code from trying to unwind to our caller. */ xorl %ebp, %ebp @@ -1766,5 +1742,5 @@ leaq -PTREGS_SIZE(%rax), %rsp UNWIND_HINT_REGS - call make_task_dead -END(rewind_stack_and_make_dead) + call do_exit +END(rewind_stack_do_exit)
diff --git a/arch/x86/entry/entry_64_compat.S b/arch/x86/entry/entry_64_compat.S index c3c4ea4..3991377 100644 --- a/arch/x86/entry/entry_64_compat.S +++ b/arch/x86/entry/entry_64_compat.S
@@ -4,6 +4,7 @@ * * Copyright 2000-2002 Andi Kleen, SuSE Labs. */ +#include "calling.h" #include <asm/asm-offsets.h> #include <asm/current.h> #include <asm/errno.h> @@ -16,8 +17,6 @@ #include <linux/linkage.h> #include <linux/err.h> -#include "calling.h" - .section .entry.text, "ax" /* @@ -107,8 +106,6 @@ xorl %r15d, %r15d /* nospec r15 */ cld - IBRS_ENTER - /* * SYSENTER doesn't filter flags, so we need to clear NT and AC * ourselves. To save a few cycles, we can check whether @@ -256,8 +253,6 @@ */ TRACE_IRQS_OFF - IBRS_ENTER - movq %rsp, %rdi call do_fast_syscall_32 /* XEN PV guests always use IRET path */ @@ -272,9 +267,6 @@ */ STACKLEAK_ERASE TRACE_IRQS_ON /* User mode traces as IRQs on. */ - - IBRS_EXIT - movq RBX(%rsp), %rbx /* pt_regs->rbx */ movq RBP(%rsp), %rbp /* pt_regs->rbp */ movq EFLAGS(%rsp), %r11 /* pt_regs->flags (in r11) */ @@ -416,7 +408,6 @@ * gate turned them off. */ TRACE_IRQS_OFF - IBRS_ENTER movq %rsp, %rdi call do_int80_syscall_32
diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile index beb4214..a3d4cf5 100644 --- a/arch/x86/entry/vdso/Makefile +++ b/arch/x86/entry/vdso/Makefile
@@ -178,7 +178,7 @@ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' VDSO_LDFLAGS = -shared --hash-style=both --build-id \ - $(call ld-option, --eh-frame-hdr) -Bsymbolic -z noexecstack + $(call ld-option, --eh-frame-hdr) -Bsymbolic GCOV_PROFILE := n quiet_cmd_vdso_and_check = VDSO $@
diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c index c3555e5..3ea8056 100644 --- a/arch/x86/events/amd/core.c +++ b/arch/x86/events/amd/core.c
@@ -969,7 +969,7 @@ static int __init amd_core_pmu_init(void) * numbered counter following it. */ for (i = 0; i < x86_pmu.num_counters - 1; i += 2) - even_ctr_mask |= BIT_ULL(i); + even_ctr_mask |= 1 << i; pair_constraint = (struct event_constraint) __EVENT_CONSTRAINT(0, even_ctr_mask, 0,
diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 287c6dd..bba40f7 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c
@@ -4010,7 +4010,6 @@ static const struct x86_cpu_desc isolation_ucodes[] = { INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 5, 0x00000000), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 6, 0x00000000), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 7, 0x00000000), - INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X, 11, 0x00000000), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_L, 3, 0x0000007c), INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE, 3, 0x0000007c), INTEL_CPU_DESC(INTEL_FAM6_KABYLAKE, 9, 0x0000004e),
diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index 6da90c6..5965d34 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c
@@ -852,13 +852,8 @@ struct event_constraint intel_icl_pebs_event_constraints[] = { INTEL_FLAGS_UEVENT_CONSTRAINT(0x0400, 0x800000000ULL), /* SLOTS */ INTEL_PLD_CONSTRAINT(0x1cd, 0xff), /* MEM_TRANS_RETIRED.LOAD_LATENCY */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x11d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_LOADS */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x12d0, 0xf), /* MEM_INST_RETIRED.STLB_MISS_STORES */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x21d0, 0xf), /* MEM_INST_RETIRED.LOCK_LOADS */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x41d0, 0xf), /* MEM_INST_RETIRED.SPLIT_LOADS */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x42d0, 0xf), /* MEM_INST_RETIRED.SPLIT_STORES */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x81d0, 0xf), /* MEM_INST_RETIRED.ALL_LOADS */ - INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x82d0, 0xf), /* MEM_INST_RETIRED.ALL_STORES */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_LD(0x1d0, 0xf), /* MEM_INST_RETIRED.LOAD */ + INTEL_FLAGS_UEVENT_CONSTRAINT_DATALA_ST(0x2d0, 0xf), /* MEM_INST_RETIRED.STORE */ INTEL_FLAGS_EVENT_CONSTRAINT_DATALA_LD_RANGE(0xd1, 0xd4, 0xf), /* MEM_LOAD_*_RETIRED.* */
diff --git a/arch/x86/events/intel/uncore_snb.c b/arch/x86/events/intel/uncore_snb.c index 0258e00..aec6e63 100644 --- a/arch/x86/events/intel/uncore_snb.c +++ b/arch/x86/events/intel/uncore_snb.c
@@ -575,22 +575,6 @@ int snb_pci2phy_map_init(int devid) return 0; } -static u64 snb_uncore_imc_read_counter(struct intel_uncore_box *box, struct perf_event *event) -{ - struct hw_perf_event *hwc = &event->hw; - - /* - * SNB IMC counters are 32-bit and are laid out back to back - * in MMIO space. Therefore we must use a 32-bit accessor function - * using readq() from uncore_mmio_read_counter() causes problems - * because it is reading 64-bit at a time. This is okay for the - * uncore_perf_event_update() function because it drops the upper - * 32-bits but not okay for plain uncore_read_counter() as invoked - * in uncore_pmu_event_start(). - */ - return (u64)readl(box->io_addr + hwc->event_base); -} - static struct pmu snb_uncore_imc_pmu = { .task_ctx_nr = perf_invalid_context, .event_init = snb_uncore_imc_event_init, @@ -610,7 +594,7 @@ static struct intel_uncore_ops snb_uncore_imc_ops = { .disable_event = snb_uncore_imc_disable_event, .enable_event = snb_uncore_imc_enable_event, .hw_config = snb_uncore_imc_hw_config, - .read_counter = snb_uncore_imc_read_counter, + .read_counter = uncore_mmio_read_counter, }; static struct intel_uncore_type snb_uncore_imc = {
diff --git a/arch/x86/events/intel/uncore_snbep.c b/arch/x86/events/intel/uncore_snbep.c index fe2edc7..0f61f46 100644 --- a/arch/x86/events/intel/uncore_snbep.c +++ b/arch/x86/events/intel/uncore_snbep.c
@@ -2762,7 +2762,6 @@ static bool hswep_has_limit_sbox(unsigned int device) return false; pci_read_config_dword(dev, HSWEP_PCU_CAPID4_OFFET, &capid4); - pci_dev_put(dev); if (!hswep_get_chop(capid4)) return true;
diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index 37b36a8..9bb71ab 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c
@@ -140,7 +140,6 @@ static int load_aout_binary(struct linux_binprm *bprm) set_personality_ia32(false); setup_new_exec(bprm); - install_exec_creds(bprm); regs->cs = __USER32_CS; regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 = @@ -157,6 +156,8 @@ static int load_aout_binary(struct linux_binprm *bprm) if (retval < 0) return retval; + install_exec_creds(bprm); + if (N_MAGIC(ex) == OMAGIC) { unsigned long text_addr, map_size;
diff --git a/arch/x86/include/asm/cpu_device_id.h b/arch/x86/include/asm/cpu_device_id.h index cdf39de..0c814cd 100644 --- a/arch/x86/include/asm/cpu_device_id.h +++ b/arch/x86/include/asm/cpu_device_id.h
@@ -5,22 +5,15 @@ /* * Declare drivers belonging to specific x86 CPUs * Similar in spirit to pci_device_id and related PCI functions - * - * The wildcard initializers are in mod_devicetable.h because - * file2alias needs them. Sigh. */ -#include <linux/mod_devicetable.h> -/* Get the INTEL_FAM* model defines */ -#include <asm/intel-family.h> -/* And the X86_VENDOR_* ones */ -#include <asm/processor.h> -/* Centaur FAM6 models */ -#define X86_CENTAUR_FAM6_C7_A 0xa +#include <linux/mod_devicetable.h> + #define X86_CENTAUR_FAM6_C7_D 0xd #define X86_CENTAUR_FAM6_NANO 0xf #define X86_STEPPINGS(mins, maxs) GENMASK(maxs, mins) + /** * X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE - Base macro for CPU matching * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY @@ -33,11 +26,8 @@ * format is unsigned long. The supplied value, pointer * etc. is casted to unsigned long internally. * - * Use only if you need all selectors. Otherwise use one of the shorter - * macros of the X86_MATCH_* family. If there is no matching shorthand - * macro, consider to add one. If you really need to wrap one of the macros - * into another macro at the usage site for good reasons, then please - * start this local macro with X86_MATCH to allow easy grepping. + * Backport version to keep the SRBDS pile consistant. No shorter variants + * required for this. */ #define X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(_vendor, _family, _model, \ _steppings, _feature, _data) { \ @@ -49,120 +39,6 @@ .driver_data = (unsigned long) _data \ } -/** - * X86_MATCH_VENDOR_FAM_MODEL_FEATURE - Macro for CPU matching - * @_vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY - * The name is expanded to X86_VENDOR_@_vendor - * @_family: The family number or X86_FAMILY_ANY - * @_model: The model number, model constant or X86_MODEL_ANY - * @_feature: A X86_FEATURE bit or X86_FEATURE_ANY - * @_data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * The steppings arguments of X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE() is - * set to wildcards. - */ -#define X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(vendor, family, model, \ - X86_STEPPING_ANY, feature, data) - -/** - * X86_MATCH_VENDOR_FAM_FEATURE - Macro for matching vendor, family and CPU feature - * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY - * The name is expanded to X86_VENDOR_@vendor - * @family: The family number or X86_FAMILY_ANY - * @feature: A X86_FEATURE bit - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are - * set to wildcards. - */ -#define X86_MATCH_VENDOR_FAM_FEATURE(vendor, family, feature, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, \ - X86_MODEL_ANY, feature, data) - -/** - * X86_MATCH_VENDOR_FEATURE - Macro for matching vendor and CPU feature - * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY - * The name is expanded to X86_VENDOR_@vendor - * @feature: A X86_FEATURE bit - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are - * set to wildcards. - */ -#define X86_MATCH_VENDOR_FEATURE(vendor, feature, data) \ - X86_MATCH_VENDOR_FAM_FEATURE(vendor, X86_FAMILY_ANY, feature, data) - -/** - * X86_MATCH_FEATURE - Macro for matching a CPU feature - * @feature: A X86_FEATURE bit - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are - * set to wildcards. - */ -#define X86_MATCH_FEATURE(feature, data) \ - X86_MATCH_VENDOR_FEATURE(ANY, feature, data) - -/* Transitional to keep the existing code working */ -#define X86_FEATURE_MATCH(feature) X86_MATCH_FEATURE(feature, NULL) - -/** - * X86_MATCH_VENDOR_FAM_MODEL - Match vendor, family and model - * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY - * The name is expanded to X86_VENDOR_@vendor - * @family: The family number or X86_FAMILY_ANY - * @model: The model number, model constant or X86_MODEL_ANY - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * All other missing arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are - * set to wildcards. - */ -#define X86_MATCH_VENDOR_FAM_MODEL(vendor, family, model, data) \ - X86_MATCH_VENDOR_FAM_MODEL_FEATURE(vendor, family, model, \ - X86_FEATURE_ANY, data) - -/** - * X86_MATCH_VENDOR_FAM - Match vendor and family - * @vendor: The vendor name, e.g. INTEL, AMD, HYGON, ..., ANY - * The name is expanded to X86_VENDOR_@vendor - * @family: The family number or X86_FAMILY_ANY - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * All other missing arguments to X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are - * set of wildcards. - */ -#define X86_MATCH_VENDOR_FAM(vendor, family, data) \ - X86_MATCH_VENDOR_FAM_MODEL(vendor, family, X86_MODEL_ANY, data) - -/** - * X86_MATCH_INTEL_FAM6_MODEL - Match vendor INTEL, family 6 and model - * @model: The model name without the INTEL_FAM6_ prefix or ANY - * The model name is expanded to INTEL_FAM6_@model internally - * @data: Driver specific data or NULL. The internal storage - * format is unsigned long. The supplied value, pointer - * etc. is casted to unsigned long internally. - * - * The vendor is set to INTEL, the family to 6 and all other missing - * arguments of X86_MATCH_VENDOR_FAM_MODEL_FEATURE() are set to wildcards. - * - * See X86_MATCH_VENDOR_FAM_MODEL_FEATURE() for further information. - */ -#define X86_MATCH_INTEL_FAM6_MODEL(model, data) \ - X86_MATCH_VENDOR_FAM_MODEL(INTEL, 6, INTEL_FAM6_##model, data) - /* * Match specific microcode revisions. *
diff --git a/arch/x86/include/asm/cpu_entry_area.h b/arch/x86/include/asm/cpu_entry_area.h index 0d1d37d..ea866c7 100644 --- a/arch/x86/include/asm/cpu_entry_area.h +++ b/arch/x86/include/asm/cpu_entry_area.h
@@ -133,7 +133,7 @@ extern void cea_set_pte(void *cea_vaddr, phys_addr_t pa, pgprot_t flags); extern struct cpu_entry_area *get_cpu_entry_area(int cpu); -static __always_inline struct entry_stack *cpu_entry_stack(int cpu) +static inline struct entry_stack *cpu_entry_stack(int cpu) { return &get_cpu_entry_area(cpu)->entry_stack_page.stack; }
diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 3e360dc..a3e32bc 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h
@@ -203,8 +203,8 @@ #define X86_FEATURE_PROC_FEEDBACK ( 7*32+ 9) /* AMD ProcFeedbackInterface */ #define X86_FEATURE_SME ( 7*32+10) /* AMD Secure Memory Encryption */ #define X86_FEATURE_PTI ( 7*32+11) /* Kernel Page Table Isolation enabled */ -#define X86_FEATURE_KERNEL_IBRS ( 7*32+12) /* "" Set/clear IBRS on kernel entry/exit */ -#define X86_FEATURE_RSB_VMEXIT ( 7*32+13) /* "" Fill RSB on VM-Exit */ +#define X86_FEATURE_RETPOLINE ( 7*32+12) /* "" Generic Retpoline mitigation for Spectre variant 2 */ +#define X86_FEATURE_RETPOLINE_LFENCE ( 7*32+13) /* "" Use LFENCE for Spectre variant 2 */ #define X86_FEATURE_INTEL_PPIN ( 7*32+14) /* Intel Processor Inventory Number */ #define X86_FEATURE_CDP_L2 ( 7*32+15) /* Code and Data Prioritization L2 */ #define X86_FEATURE_MSR_SPEC_CTRL ( 7*32+16) /* "" MSR SPEC_CTRL is implemented */ @@ -286,11 +286,7 @@ #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */ #define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */ #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */ -#define X86_FEATURE_RRSBA_CTRL (11*32+11) /* "" RET prediction control */ -#define X86_FEATURE_RETPOLINE (11*32+12) /* "" Generic Retpoline mitigation for Spectre variant 2 */ -#define X86_FEATURE_RETPOLINE_LFENCE (11*32+13) /* "" Use LFENCE for Spectre variant 2 */ -#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17) /* "" Fill RSB on VM exit when EIBRS is enabled */ -#define X86_FEATURE_MSR_TSX_CTRL (11*32+18) /* "" MSR IA32_TSX_CTRL (Intel) implemented */ +#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+ 6) /* "" Fill RSB on VM exit when EIBRS is enabled */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */ @@ -307,7 +303,6 @@ #define X86_FEATURE_AMD_SSBD (13*32+24) /* "" Speculative Store Bypass Disable */ #define X86_FEATURE_VIRT_SSBD (13*32+25) /* Virtualized Speculative Store Bypass Disable */ #define X86_FEATURE_AMD_SSB_NO (13*32+26) /* "" Speculative Store Bypass is fixed in hardware. */ -#define X86_FEATURE_BTC_NO (13*32+29) /* "" Not vulnerable to Branch Type Confusion */ /* Thermal and Power Management Leaf, CPUID level 0x00000006 (EAX), word 14 */ #define X86_FEATURE_DTHERM (14*32+ 0) /* Digital Thermal Sensor */ @@ -412,8 +407,6 @@ #define X86_BUG_ITLB_MULTIHIT X86_BUG(23) /* CPU may incur MCE during certain page attribute changes */ #define X86_BUG_SRBDS X86_BUG(24) /* CPU may leak RNG bits if not mitigated */ #define X86_BUG_MMIO_STALE_DATA X86_BUG(25) /* CPU is affected by Processor MMIO Stale Data vulnerabilities */ -#define X86_BUG_RETBLEED X86_BUG(26) /* CPU is affected by RETBleed */ -#define X86_BUG_EIBRS_PBRSB X86_BUG(27) /* EIBRS is vulnerable to Post Barrier RSB Predictions */ -#define X86_BUG_MMIO_UNKNOWN X86_BUG(28) /* CPU is too old and its MMIO Stale Data status is unknown */ +#define X86_BUG_EIBRS_PBRSB X86_BUG(26) /* EIBRS is vulnerable to Post Barrier RSB Predictions */ #endif /* _ASM_X86_CPUFEATURES_H */
diff --git a/arch/x86/include/asm/hyperv-tlfs.h b/arch/x86/include/asm/hyperv-tlfs.h index 333e61e..7741e21 100644 --- a/arch/x86/include/asm/hyperv-tlfs.h +++ b/arch/x86/include/asm/hyperv-tlfs.h
@@ -721,7 +721,7 @@ struct hv_enlightened_vmcs { u64 guest_rip; u32 hv_clean_fields; - u32 padding32_1; + u32 hv_padding_32; u32 hv_synthetic_controls; struct { u32 nested_flush_hypercall:1; @@ -729,7 +729,7 @@ struct hv_enlightened_vmcs { u32 reserved:30; } __packed hv_enlightenments_control; u32 hv_vp_id; - u32 padding32_2; + u64 hv_vm_id; u64 partition_assist_page; u64 padding64_4[4];
diff --git a/arch/x86/include/asm/intel-family.h b/arch/x86/include/asm/intel-family.h index c1d6d8b..5b07573 100644 --- a/arch/x86/include/asm/intel-family.h +++ b/arch/x86/include/asm/intel-family.h
@@ -35,9 +35,6 @@ * The #define line may optionally include a comment including platform names. */ -/* Wildcard match for FAM6 so X86_MATCH_INTEL_FAM6_MODEL(ANY) works */ -#define INTEL_FAM6_ANY X86_MODEL_ANY - #define INTEL_FAM6_CORE_YONAH 0x0E #define INTEL_FAM6_CORE2_MEROM 0x0F @@ -129,9 +126,6 @@ #define INTEL_FAM6_XEON_PHI_KNL 0x57 /* Knights Landing */ #define INTEL_FAM6_XEON_PHI_KNM 0x85 /* Knights Mill */ -/* Family 5 */ -#define INTEL_FAM5_QUARK_X1000 0x09 /* Quark X1000 SoC */ - /* Useful macros */ #define INTEL_CPU_FAM_ANY(_family, _model, _driver_data) \ { \
diff --git a/arch/x86/include/asm/microcode.h b/arch/x86/include/asm/microcode.h index 509cc02..91a06ce 100644 --- a/arch/x86/include/asm/microcode.h +++ b/arch/x86/include/asm/microcode.h
@@ -9,7 +9,6 @@ struct ucode_patch { struct list_head plist; void *data; /* Intel uses only this one */ - unsigned int size; u32 patch_id; u16 equiv_cpu; }; @@ -131,7 +130,7 @@ static inline unsigned int x86_cpuid_family(void) int __init microcode_init(void); extern void __init load_ucode_bsp(void); extern void load_ucode_ap(void); -void reload_early_microcode(unsigned int cpu); +void reload_early_microcode(void); extern bool get_builtin_firmware(struct cpio_data *cd, const char *name); extern bool initrd_gone; void microcode_bsp_resume(void); @@ -139,7 +138,7 @@ void microcode_bsp_resume(void); static inline int __init microcode_init(void) { return 0; }; static inline void __init load_ucode_bsp(void) { } static inline void load_ucode_ap(void) { } -static inline void reload_early_microcode(unsigned int cpu) { } +static inline void reload_early_microcode(void) { } static inline void microcode_bsp_resume(void) { } static inline bool get_builtin_firmware(struct cpio_data *cd, const char *name) { return false; }
diff --git a/arch/x86/include/asm/microcode_amd.h b/arch/x86/include/asm/microcode_amd.h index a645b25..5c524d4 100644 --- a/arch/x86/include/asm/microcode_amd.h +++ b/arch/x86/include/asm/microcode_amd.h
@@ -47,12 +47,12 @@ struct microcode_amd { extern void __init load_ucode_amd_bsp(unsigned int family); extern void load_ucode_amd_ap(unsigned int family); extern int __init save_microcode_in_initrd_amd(unsigned int family); -void reload_ucode_amd(unsigned int cpu); +void reload_ucode_amd(void); #else static inline void __init load_ucode_amd_bsp(unsigned int family) {} static inline void load_ucode_amd_ap(unsigned int family) {} static inline int __init save_microcode_in_initrd_amd(unsigned int family) { return -EINVAL; } -static inline void reload_ucode_amd(unsigned int cpu) {} +void reload_ucode_amd(void) {} #endif #endif /* _ASM_X86_MICROCODE_AMD_H */
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h index 67d4364..cef4eba 100644 --- a/arch/x86/include/asm/msr-index.h +++ b/arch/x86/include/asm/msr-index.h
@@ -47,12 +47,6 @@ #define SPEC_CTRL_STIBP BIT(SPEC_CTRL_STIBP_SHIFT) /* STIBP mask */ #define SPEC_CTRL_SSBD_SHIFT 2 /* Speculative Store Bypass Disable bit */ #define SPEC_CTRL_SSBD BIT(SPEC_CTRL_SSBD_SHIFT) /* Speculative Store Bypass Disable */ -#define SPEC_CTRL_RRSBA_DIS_S_SHIFT 6 /* Disable RRSBA behavior */ -#define SPEC_CTRL_RRSBA_DIS_S BIT(SPEC_CTRL_RRSBA_DIS_S_SHIFT) - -/* A mask for bits which the kernel toggles when controlling mitigations */ -#define SPEC_CTRL_MITIGATIONS_MASK (SPEC_CTRL_IBRS | SPEC_CTRL_STIBP | SPEC_CTRL_SSBD \ - | SPEC_CTRL_RRSBA_DIS_S) #define MSR_IA32_PRED_CMD 0x00000049 /* Prediction Command */ #define PRED_CMD_IBPB BIT(0) /* Indirect Branch Prediction Barrier */ @@ -88,7 +82,6 @@ #define MSR_IA32_ARCH_CAPABILITIES 0x0000010a #define ARCH_CAP_RDCL_NO BIT(0) /* Not susceptible to Meltdown */ #define ARCH_CAP_IBRS_ALL BIT(1) /* Enhanced IBRS support */ -#define ARCH_CAP_RSBA BIT(2) /* RET may use alternative branch predictors */ #define ARCH_CAP_SKIP_VMENTRY_L1DFLUSH BIT(3) /* Skip L1D flush on vmentry */ #define ARCH_CAP_SSB_NO BIT(4) /* * Not susceptible to Speculative Store Bypass @@ -136,13 +129,6 @@ * bit available to control VERW * behavior. */ -#define ARCH_CAP_RRSBA BIT(19) /* - * Indicates RET may use predictors - * other than the RSB. With eIBRS - * enabled predictions in kernel mode - * are restricted to targets in - * kernel. - */ #define ARCH_CAP_PBRSB_NO BIT(24) /* * Not susceptible to Post-Barrier * Return Stack Buffer Predictions. @@ -458,11 +444,6 @@ #define MSR_AMD64_OSVW_STATUS 0xc0010141 #define MSR_AMD64_LS_CFG 0xc0011020 #define MSR_AMD64_DC_CFG 0xc0011022 - -#define MSR_AMD64_DE_CFG 0xc0011029 -#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1 -#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE BIT_ULL(MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT) - #define MSR_AMD64_BU_CFG2 0xc001102a #define MSR_AMD64_IBSFETCHCTL 0xc0011030 #define MSR_AMD64_IBSFETCHLINAD 0xc0011031 @@ -531,6 +512,9 @@ #define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL #define FAM10H_MMIO_CONF_BASE_SHIFT 20 #define MSR_FAM10H_NODE_ID 0xc001100c +#define MSR_F10H_DECFG 0xc0011029 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT 1 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE BIT_ULL(MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT) /* K8 MSRs */ #define MSR_K8_TOP_MEM1 0xc001001a
diff --git a/arch/x86/include/asm/nospec-branch.h b/arch/x86/include/asm/nospec-branch.h index c881935..1e5df3c 100644 --- a/arch/x86/include/asm/nospec-branch.h +++ b/arch/x86/include/asm/nospec-branch.h
@@ -4,14 +4,11 @@ #define _ASM_X86_NOSPEC_BRANCH_H_ #include <linux/static_key.h> -#include <linux/frame.h> #include <asm/alternative.h> #include <asm/alternative-asm.h> #include <asm/cpufeatures.h> #include <asm/msr-index.h> -#include <asm/unwind_hints.h> -#include <asm/percpu.h> /* * This should be used immediately before a retpoline alternative. It tells @@ -47,7 +44,6 @@ * the optimal version — two calls, each with their own speculation * trap should their return address end up getting used, in a loop. */ -#ifdef CONFIG_X86_64 #define __FILL_RETURN_BUFFER(reg, nr, sp) \ mov $(nr/2), reg; \ 771: \ @@ -63,24 +59,18 @@ lfence; \ jmp 775b; \ 774: \ - add $(BITS_PER_LONG/8) * 2, sp; \ dec reg; \ jnz 771b; \ + add $(BITS_PER_LONG/8) * nr, sp; \ /* barrier for jnz misprediction */ \ lfence; -#else -/* - * i386 doesn't unconditionally have LFENCE, as such it can't - * do a loop. - */ -#define __FILL_RETURN_BUFFER(reg, nr, sp) \ - .rept nr; \ - call 772f; \ + +#define __ISSUE_UNBALANCED_RET_GUARD(sp) \ + call 881f; \ int3; \ -772:; \ - .endr; \ - add $(BITS_PER_LONG/8) * nr, sp; -#endif +881: \ + add $(BITS_PER_LONG/8), sp; \ + lfence; #ifdef __ASSEMBLY__ @@ -151,28 +141,26 @@ #endif .endm -.macro ISSUE_UNBALANCED_RET_GUARD - call .Lunbalanced_ret_guard_\@ - int3 -.Lunbalanced_ret_guard_\@: - add $(BITS_PER_LONG/8), %_ASM_SP - lfence +.macro ISSUE_UNBALANCED_RET_GUARD ftr:req + ANNOTATE_NOSPEC_ALTERNATIVE + ALTERNATIVE "jmp .Lskip_pbrsb_\@", \ + __stringify(__ISSUE_UNBALANCED_RET_GUARD(%_ASM_SP)) \ + \ftr +.Lskip_pbrsb_\@: .endm /* * A simpler FILL_RETURN_BUFFER macro. Don't make people use the CPP * monstrosity above, manually. */ -.macro FILL_RETURN_BUFFER reg:req nr:req ftr:req ftr2 -.ifb \ftr2 - ALTERNATIVE "jmp .Lskip_rsb_\@", "", \ftr -.else - ALTERNATIVE_2 "jmp .Lskip_rsb_\@", "", \ftr, "jmp .Lunbalanced_\@", \ftr2 -.endif - __FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP) -.Lunbalanced_\@: - ISSUE_UNBALANCED_RET_GUARD +.macro FILL_RETURN_BUFFER reg:req nr:req ftr:req +#ifdef CONFIG_RETPOLINE + ANNOTATE_NOSPEC_ALTERNATIVE + ALTERNATIVE "jmp .Lskip_rsb_\@", \ + __stringify(__FILL_RETURN_BUFFER(\reg,\nr,%_ASM_SP)) \ + \ftr .Lskip_rsb_\@: +#endif .endm #else /* __ASSEMBLY__ */ @@ -247,7 +235,6 @@ enum spectre_v2_mitigation { SPECTRE_V2_EIBRS, SPECTRE_V2_EIBRS_RETPOLINE, SPECTRE_V2_EIBRS_LFENCE, - SPECTRE_V2_IBRS, }; /* The indirect branch speculation control variants */ @@ -311,9 +298,6 @@ static inline void indirect_branch_prediction_barrier(void) /* The Intel SPEC CTRL MSR base value cache */ extern u64 x86_spec_ctrl_base; -DECLARE_PER_CPU(u64, x86_spec_ctrl_current); -extern void update_spec_ctrl_cond(u64 val); -extern u64 spec_ctrl_current(void); /* * With retpoline, we must use IBRS to restrict branch prediction @@ -323,16 +307,18 @@ extern u64 spec_ctrl_current(void); */ #define firmware_restrict_branch_speculation_start() \ do { \ + u64 val = x86_spec_ctrl_base | SPEC_CTRL_IBRS; \ + \ preempt_disable(); \ - alternative_msr_write(MSR_IA32_SPEC_CTRL, \ - spec_ctrl_current() | SPEC_CTRL_IBRS, \ + alternative_msr_write(MSR_IA32_SPEC_CTRL, val, \ X86_FEATURE_USE_IBRS_FW); \ } while (0) #define firmware_restrict_branch_speculation_end() \ do { \ - alternative_msr_write(MSR_IA32_SPEC_CTRL, \ - spec_ctrl_current(), \ + u64 val = x86_spec_ctrl_base; \ + \ + alternative_msr_write(MSR_IA32_SPEC_CTRL, val, \ X86_FEATURE_USE_IBRS_FW); \ preempt_enable(); \ } while (0)
diff --git a/arch/x86/include/asm/reboot.h b/arch/x86/include/asm/reboot.h index bc5b4d7..04c17be 100644 --- a/arch/x86/include/asm/reboot.h +++ b/arch/x86/include/asm/reboot.h
@@ -25,8 +25,6 @@ void __noreturn machine_real_restart(unsigned int type); #define MRR_BIOS 0 #define MRR_APM 1 -void cpu_emergency_disable_virtualization(void); - typedef void (*nmi_shootdown_cb)(int, struct pt_regs*); void nmi_panic_self_stop(struct pt_regs *regs); void nmi_shootdown_cpus(nmi_shootdown_cb callback);
diff --git a/arch/x86/include/asm/resctrl_sched.h b/arch/x86/include/asm/resctrl_sched.h index 79b6487..f6b7fe2 100644 --- a/arch/x86/include/asm/resctrl_sched.h +++ b/arch/x86/include/asm/resctrl_sched.h
@@ -51,27 +51,24 @@ DECLARE_STATIC_KEY_FALSE(rdt_mon_enable_key); * simple as possible. * Must be called with preemption disabled. */ -static inline void __resctrl_sched_in(struct task_struct *tsk) +static void __resctrl_sched_in(void) { struct resctrl_pqr_state *state = this_cpu_ptr(&pqr_state); u32 closid = state->default_closid; u32 rmid = state->default_rmid; - u32 tmp; /* * If this task has a closid/rmid assigned, use it. * Else use the closid/rmid assigned to this cpu. */ if (static_branch_likely(&rdt_alloc_enable_key)) { - tmp = READ_ONCE(tsk->closid); - if (tmp) - closid = tmp; + if (current->closid) + closid = current->closid; } if (static_branch_likely(&rdt_mon_enable_key)) { - tmp = READ_ONCE(tsk->rmid); - if (tmp) - rmid = tmp; + if (current->rmid) + rmid = current->rmid; } if (closid != state->cur_closid || rmid != state->cur_rmid) { @@ -81,15 +78,15 @@ static inline void __resctrl_sched_in(struct task_struct *tsk) } } -static inline void resctrl_sched_in(struct task_struct *tsk) +static inline void resctrl_sched_in(void) { if (static_branch_likely(&rdt_enable_key)) - __resctrl_sched_in(tsk); + __resctrl_sched_in(); } #else -static inline void resctrl_sched_in(struct task_struct *tsk) {} +static inline void resctrl_sched_in(void) {} #endif /* CONFIG_X86_CPU_RESCTRL */
diff --git a/arch/x86/include/asm/virtext.h b/arch/x86/include/asm/virtext.h index 8eefa33..fda3e77 100644 --- a/arch/x86/include/asm/virtext.h +++ b/arch/x86/include/asm/virtext.h
@@ -120,21 +120,7 @@ static inline void cpu_svm_disable(void) wrmsrl(MSR_VM_HSAVE_PA, 0); rdmsrl(MSR_EFER, efer); - if (efer & EFER_SVME) { - /* - * Force GIF=1 prior to disabling SVM to ensure INIT and NMI - * aren't blocked, e.g. if a fatal error occurred between CLGI - * and STGI. Note, STGI may #UD if SVM is disabled from NMI - * context between reading EFER and executing STGI. In that - * case, GIF must already be set, otherwise the NMI would have - * been blocked, so just eat the fault. - */ - asm_volatile_goto("1: stgi\n\t" - _ASM_EXTABLE(1b, %l[fault]) - ::: "memory" : fault); -fault: - wrmsrl(MSR_EFER, efer & ~EFER_SVME); - } + wrmsrl(MSR_EFER, efer & ~EFER_SVME); } /** Makes sure SVM is disabled, if it is supported on the CPU
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index d716fe9..1835767 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h
@@ -19,8 +19,8 @@ /* * Definitions of Primary Processor-Based VM-Execution Controls. */ -#define CPU_BASED_INTR_WINDOW_EXITING 0x00000004 -#define CPU_BASED_USE_TSC_OFFSETTING 0x00000008 +#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 +#define CPU_BASED_USE_TSC_OFFSETING 0x00000008 #define CPU_BASED_HLT_EXITING 0x00000080 #define CPU_BASED_INVLPG_EXITING 0x00000200 #define CPU_BASED_MWAIT_EXITING 0x00000400 @@ -31,7 +31,7 @@ #define CPU_BASED_CR8_LOAD_EXITING 0x00080000 #define CPU_BASED_CR8_STORE_EXITING 0x00100000 #define CPU_BASED_TPR_SHADOW 0x00200000 -#define CPU_BASED_NMI_WINDOW_EXITING 0x00400000 +#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000 #define CPU_BASED_MOV_DR_EXITING 0x00800000 #define CPU_BASED_UNCOND_IO_EXITING 0x01000000 #define CPU_BASED_USE_IO_BITMAPS 0x02000000
diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h index e95b72e..3eb8411 100644 --- a/arch/x86/include/uapi/asm/vmx.h +++ b/arch/x86/include/uapi/asm/vmx.h
@@ -33,7 +33,7 @@ #define EXIT_REASON_TRIPLE_FAULT 2 #define EXIT_REASON_INIT_SIGNAL 3 -#define EXIT_REASON_INTERRUPT_WINDOW 7 +#define EXIT_REASON_PENDING_INTERRUPT 7 #define EXIT_REASON_NMI_WINDOW 8 #define EXIT_REASON_TASK_SWITCH 9 #define EXIT_REASON_CPUID 10 @@ -94,7 +94,7 @@ { EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \ { EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \ { EXIT_REASON_INIT_SIGNAL, "INIT_SIGNAL" }, \ - { EXIT_REASON_INTERRUPT_WINDOW, "INTERRUPT_WINDOW" }, \ + { EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \ { EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \ { EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \ { EXIT_REASON_CPUID, "CPUID" }, \
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index b212771..88cef97 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c
@@ -205,15 +205,6 @@ static void init_amd_k6(struct cpuinfo_x86 *c) return; } #endif - /* - * Work around Erratum 1386. The XSAVES instruction malfunctions in - * certain circumstances on Zen1/2 uarch, and not all parts have had - * updated microcode at the time of writing (March 2023). - * - * Affected parts all have no supervisor XSAVE states, meaning that - * the XSAVEC instruction (which works fine) is equivalent. - */ - clear_cpu_cap(c, X86_FEATURE_XSAVES); } static void init_amd_k7(struct cpuinfo_x86 *c) @@ -803,6 +794,8 @@ static void init_amd_gh(struct cpuinfo_x86 *c) set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); } +#define MSR_AMD64_DE_CFG 0xC0011029 + static void init_amd_ln(struct cpuinfo_x86 *c) { /* @@ -901,21 +894,12 @@ static void init_amd_zn(struct cpuinfo_x86 *c) node_reclaim_distance = 32; #endif - /* Fix up CPUID bits, but only if not virtualised. */ - if (!cpu_has(c, X86_FEATURE_HYPERVISOR)) { - - /* Erratum 1076: CPB feature bit not being set in CPUID. */ - if (!cpu_has(c, X86_FEATURE_CPB)) - set_cpu_cap(c, X86_FEATURE_CPB); - - /* - * Zen3 (Fam19 model < 0x10) parts are not susceptible to - * Branch Type Confusion, but predate the allocation of the - * BTC_NO bit. - */ - if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO)) - set_cpu_cap(c, X86_FEATURE_BTC_NO); - } + /* + * Fix erratum 1076: CPB feature bit not being set in CPUID. + * Always set it, except when running under a hypervisor. + */ + if (!cpu_has(c, X86_FEATURE_HYPERVISOR) && !cpu_has(c, X86_FEATURE_CPB)) + set_cpu_cap(c, X86_FEATURE_CPB); } static void init_amd(struct cpuinfo_x86 *c) @@ -972,8 +956,8 @@ static void init_amd(struct cpuinfo_x86 *c) * msr_set_bit() uses the safe accessors, too, even if the MSR * is not present. */ - msr_set_bit(MSR_AMD64_DE_CFG, - MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT); + msr_set_bit(MSR_F10H_DECFG, + MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT); /* A serializing LFENCE stops RDTSC speculation */ set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index 75ca28b..57efa90 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c
@@ -37,8 +37,6 @@ static void __init spectre_v1_select_mitigation(void); static void __init spectre_v2_select_mitigation(void); -static void __init retbleed_select_mitigation(void); -static void __init spectre_v2_user_select_mitigation(void); static void __init ssb_select_mitigation(void); static void __init l1tf_select_mitigation(void); static void __init mds_select_mitigation(void); @@ -48,47 +46,16 @@ static void __init taa_select_mitigation(void); static void __init mmio_select_mitigation(void); static void __init srbds_select_mitigation(void); -/* The base value of the SPEC_CTRL MSR without task-specific bits set */ +/* The base value of the SPEC_CTRL MSR that always has to be preserved. */ u64 x86_spec_ctrl_base; EXPORT_SYMBOL_GPL(x86_spec_ctrl_base); - -/* The current value of the SPEC_CTRL MSR with task-specific bits set */ -DEFINE_PER_CPU(u64, x86_spec_ctrl_current); -EXPORT_SYMBOL_GPL(x86_spec_ctrl_current); - static DEFINE_MUTEX(spec_ctrl_mutex); -/* Update SPEC_CTRL MSR and its cached copy unconditionally */ -static void update_spec_ctrl(u64 val) -{ - this_cpu_write(x86_spec_ctrl_current, val); - wrmsrl(MSR_IA32_SPEC_CTRL, val); -} - /* - * Keep track of the SPEC_CTRL MSR value for the current task, which may differ - * from x86_spec_ctrl_base due to STIBP/SSB in __speculation_ctrl_update(). + * The vendor and possibly platform specific bits which can be modified in + * x86_spec_ctrl_base. */ -void update_spec_ctrl_cond(u64 val) -{ - if (this_cpu_read(x86_spec_ctrl_current) == val) - return; - - this_cpu_write(x86_spec_ctrl_current, val); - - /* - * When KERNEL_IBRS this MSR is written on return-to-user, unless - * forced the update can be delayed until that time. - */ - if (!cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS)) - wrmsrl(MSR_IA32_SPEC_CTRL, val); -} - -u64 spec_ctrl_current(void) -{ - return this_cpu_read(x86_spec_ctrl_current); -} -EXPORT_SYMBOL_GPL(spec_ctrl_current); +static u64 __ro_after_init x86_spec_ctrl_mask = SPEC_CTRL_IBRS; /* * AMD specific MSR info for Speculative Store Bypass control. @@ -135,32 +102,16 @@ void __init check_bugs(void) * have unknown values. AMD64_LS_CFG MSR is cached in the early AMD * init code as it is not enumerated and depends on the family. */ - if (cpu_feature_enabled(X86_FEATURE_MSR_SPEC_CTRL)) { + if (boot_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) rdmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); - /* - * Previously running kernel (kexec), may have some controls - * turned ON. Clear them and let the mitigations setup below - * rediscover them based on configuration. - */ - x86_spec_ctrl_base &= ~SPEC_CTRL_MITIGATIONS_MASK; - } + /* Allow STIBP in MSR_SPEC_CTRL if supported */ + if (boot_cpu_has(X86_FEATURE_STIBP)) + x86_spec_ctrl_mask |= SPEC_CTRL_STIBP; /* Select the proper CPU mitigations before patching alternatives: */ spectre_v1_select_mitigation(); spectre_v2_select_mitigation(); - /* - * retbleed_select_mitigation() relies on the state set by - * spectre_v2_select_mitigation(); specifically it wants to know about - * spectre_v2=ibrs. - */ - retbleed_select_mitigation(); - /* - * spectre_v2_user_select_mitigation() relies on the state set by - * retbleed_select_mitigation(); specifically the STIBP selection is - * forced for UNRET. - */ - spectre_v2_user_select_mitigation(); ssb_select_mitigation(); l1tf_select_mitigation(); md_clear_select_mitigation(); @@ -200,17 +151,31 @@ void __init check_bugs(void) #endif } -/* - * NOTE: For VMX, this function is not called in the vmexit path. - * It uses vmx_spec_ctrl_restore_host() instead. - */ void x86_virt_spec_ctrl(u64 guest_spec_ctrl, u64 guest_virt_spec_ctrl, bool setguest) { - u64 msrval, guestval = guest_spec_ctrl, hostval = spec_ctrl_current(); + u64 msrval, guestval, hostval = x86_spec_ctrl_base; struct thread_info *ti = current_thread_info(); + /* Is MSR_SPEC_CTRL implemented ? */ if (static_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) { + /* + * Restrict guest_spec_ctrl to supported values. Clear the + * modifiable bits in the host base value and or the + * modifiable bits from the guest value. + */ + guestval = hostval & ~x86_spec_ctrl_mask; + guestval |= guest_spec_ctrl & x86_spec_ctrl_mask; + + /* SSBD controlled in MSR_SPEC_CTRL */ + if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD) || + static_cpu_has(X86_FEATURE_AMD_SSBD)) + hostval |= ssbd_tif_to_spec_ctrl(ti->flags); + + /* Conditional STIBP enabled? */ + if (static_branch_unlikely(&switch_to_cond_stibp)) + hostval |= stibp_tif_to_spec_ctrl(ti->flags); + if (hostval != guestval) { msrval = setguest ? guestval : hostval; wrmsrl(MSR_IA32_SPEC_CTRL, msrval); @@ -431,8 +396,7 @@ static void __init mmio_select_mitigation(void) u64 ia32_cap; if (!boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA) || - boot_cpu_has_bug(X86_BUG_MMIO_UNKNOWN) || - cpu_mitigations_off()) { + cpu_mitigations_off()) { mmio_mitigation = MMIO_MITIGATION_OFF; return; } @@ -537,8 +501,6 @@ static void __init md_clear_update_mitigation(void) pr_info("TAA: %s\n", taa_strings[taa_mitigation]); if (boot_cpu_has_bug(X86_BUG_MMIO_STALE_DATA)) pr_info("MMIO Stale Data: %s\n", mmio_strings[mmio_mitigation]); - else if (boot_cpu_has_bug(X86_BUG_MMIO_UNKNOWN)) - pr_info("MMIO Stale Data: Unknown: No mitigations\n"); } static void __init md_clear_select_mitigation(void) @@ -740,103 +702,12 @@ static int __init nospectre_v1_cmdline(char *str) } early_param("nospectre_v1", nospectre_v1_cmdline); -static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = - SPECTRE_V2_NONE; - -#undef pr_fmt -#define pr_fmt(fmt) "RETBleed: " fmt - -enum retbleed_mitigation { - RETBLEED_MITIGATION_NONE, - RETBLEED_MITIGATION_IBRS, - RETBLEED_MITIGATION_EIBRS, -}; - -enum retbleed_mitigation_cmd { - RETBLEED_CMD_OFF, - RETBLEED_CMD_AUTO, -}; - -const char * const retbleed_strings[] = { - [RETBLEED_MITIGATION_NONE] = "Vulnerable", - [RETBLEED_MITIGATION_IBRS] = "Mitigation: IBRS", - [RETBLEED_MITIGATION_EIBRS] = "Mitigation: Enhanced IBRS", -}; - -static enum retbleed_mitigation retbleed_mitigation __ro_after_init = - RETBLEED_MITIGATION_NONE; -static enum retbleed_mitigation_cmd retbleed_cmd __ro_after_init = - RETBLEED_CMD_AUTO; - -static int __init retbleed_parse_cmdline(char *str) -{ - if (!str) - return -EINVAL; - - if (!strcmp(str, "off")) - retbleed_cmd = RETBLEED_CMD_OFF; - else if (!strcmp(str, "auto")) - retbleed_cmd = RETBLEED_CMD_AUTO; - else - pr_err("Unknown retbleed option (%s). Defaulting to 'auto'\n", str); - - return 0; -} -early_param("retbleed", retbleed_parse_cmdline); - -#define RETBLEED_UNTRAIN_MSG "WARNING: BTB untrained return thunk mitigation is only effective on AMD/Hygon!\n" -#define RETBLEED_COMPILER_MSG "WARNING: kernel not compiled with RETPOLINE or -mfunction-return capable compiler!\n" -#define RETBLEED_INTEL_MSG "WARNING: Spectre v2 mitigation leaves CPU vulnerable to RETBleed attacks, data leaks possible!\n" - -static void __init retbleed_select_mitigation(void) -{ - if (!boot_cpu_has_bug(X86_BUG_RETBLEED) || cpu_mitigations_off()) - return; - - switch (retbleed_cmd) { - case RETBLEED_CMD_OFF: - return; - - case RETBLEED_CMD_AUTO: - default: - /* - * The Intel mitigation (IBRS) was already selected in - * spectre_v2_select_mitigation(). - */ - - break; - } - - switch (retbleed_mitigation) { - default: - break; - } - - /* - * Let IBRS trump all on Intel without affecting the effects of the - * retbleed= cmdline option. - */ - if (boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) { - switch (spectre_v2_enabled) { - case SPECTRE_V2_IBRS: - retbleed_mitigation = RETBLEED_MITIGATION_IBRS; - break; - case SPECTRE_V2_EIBRS: - case SPECTRE_V2_EIBRS_RETPOLINE: - case SPECTRE_V2_EIBRS_LFENCE: - retbleed_mitigation = RETBLEED_MITIGATION_EIBRS; - break; - default: - pr_err(RETBLEED_INTEL_MSG); - } - } - - pr_info("%s\n", retbleed_strings[retbleed_mitigation]); -} - #undef pr_fmt #define pr_fmt(fmt) "Spectre V2 : " fmt +static enum spectre_v2_mitigation spectre_v2_enabled __ro_after_init = + SPECTRE_V2_NONE; + static enum spectre_v2_user_mitigation spectre_v2_user_stibp __ro_after_init = SPECTRE_V2_USER_NONE; static enum spectre_v2_user_mitigation spectre_v2_user_ibpb __ro_after_init = @@ -866,7 +737,6 @@ static inline const char *spectre_v2_module_string(void) { return ""; } #define SPECTRE_V2_LFENCE_MSG "WARNING: LFENCE mitigation is not recommended for this CPU, data leaks possible!\n" #define SPECTRE_V2_EIBRS_EBPF_MSG "WARNING: Unprivileged eBPF is enabled with eIBRS on, data leaks possible via Spectre v2 BHB attacks!\n" #define SPECTRE_V2_EIBRS_LFENCE_EBPF_SMT_MSG "WARNING: Unprivileged eBPF is enabled with eIBRS+LFENCE mitigation and SMT, data leaks possible via Spectre v2 BHB attacks!\n" -#define SPECTRE_V2_IBRS_PERF_MSG "WARNING: IBRS mitigation selected on Enhanced IBRS CPU, this may cause unnecessary performance loss\n" #ifdef CONFIG_BPF_SYSCALL void unpriv_ebpf_notify(int new_state) @@ -908,7 +778,6 @@ enum spectre_v2_mitigation_cmd { SPECTRE_V2_CMD_EIBRS, SPECTRE_V2_CMD_EIBRS_RETPOLINE, SPECTRE_V2_CMD_EIBRS_LFENCE, - SPECTRE_V2_CMD_IBRS, }; enum spectre_v2_user_cmd { @@ -949,15 +818,13 @@ static void __init spec_v2_user_print_cond(const char *reason, bool secure) pr_info("spectre_v2_user=%s forced on command line.\n", reason); } -static __ro_after_init enum spectre_v2_mitigation_cmd spectre_v2_cmd; - static enum spectre_v2_user_cmd __init -spectre_v2_parse_user_cmdline(void) +spectre_v2_parse_user_cmdline(enum spectre_v2_mitigation_cmd v2_cmd) { char arg[20]; int ret, i; - switch (spectre_v2_cmd) { + switch (v2_cmd) { case SPECTRE_V2_CMD_NONE: return SPECTRE_V2_USER_CMD_NONE; case SPECTRE_V2_CMD_FORCE: @@ -985,18 +852,13 @@ spectre_v2_parse_user_cmdline(void) static inline bool spectre_v2_in_eibrs_mode(enum spectre_v2_mitigation mode) { - return mode == SPECTRE_V2_EIBRS || - mode == SPECTRE_V2_EIBRS_RETPOLINE || - mode == SPECTRE_V2_EIBRS_LFENCE; -} - -static inline bool spectre_v2_in_ibrs_mode(enum spectre_v2_mitigation mode) -{ - return spectre_v2_in_eibrs_mode(mode) || mode == SPECTRE_V2_IBRS; + return (mode == SPECTRE_V2_EIBRS || + mode == SPECTRE_V2_EIBRS_RETPOLINE || + mode == SPECTRE_V2_EIBRS_LFENCE); } static void __init -spectre_v2_user_select_mitigation(void) +spectre_v2_user_select_mitigation(enum spectre_v2_mitigation_cmd v2_cmd) { enum spectre_v2_user_mitigation mode = SPECTRE_V2_USER_NONE; bool smt_possible = IS_ENABLED(CONFIG_SMP); @@ -1009,7 +871,7 @@ spectre_v2_user_select_mitigation(void) cpu_smt_control == CPU_SMT_NOT_SUPPORTED) smt_possible = false; - cmd = spectre_v2_parse_user_cmdline(); + cmd = spectre_v2_parse_user_cmdline(v2_cmd); switch (cmd) { case SPECTRE_V2_USER_CMD_NONE: goto set_mode; @@ -1057,15 +919,8 @@ spectre_v2_user_select_mitigation(void) } /* - * If no STIBP, enhanced IBRS is enabled, or SMT impossible, STIBP - * is not required. - * - * Enhanced IBRS also protects against cross-thread branch target - * injection in user-mode as the IBRS bit remains always set which - * implicitly enables cross-thread protections. However, in legacy IBRS - * mode, the IBRS bit is set only on kernel entry and cleared on return - * to userspace. This disables the implicit cross-thread protection, - * so allow for STIBP to be selected in that case. + * If no STIBP, enhanced IBRS is enabled or SMT impossible, STIBP is not + * required. */ if (!boot_cpu_has(X86_FEATURE_STIBP) || !smt_possible || @@ -1094,7 +949,6 @@ static const char * const spectre_v2_strings[] = { [SPECTRE_V2_EIBRS] = "Mitigation: Enhanced IBRS", [SPECTRE_V2_EIBRS_LFENCE] = "Mitigation: Enhanced IBRS + LFENCE", [SPECTRE_V2_EIBRS_RETPOLINE] = "Mitigation: Enhanced IBRS + Retpolines", - [SPECTRE_V2_IBRS] = "Mitigation: IBRS", }; static const struct { @@ -1112,7 +966,6 @@ static const struct { { "eibrs,lfence", SPECTRE_V2_CMD_EIBRS_LFENCE, false }, { "eibrs,retpoline", SPECTRE_V2_CMD_EIBRS_RETPOLINE, false }, { "auto", SPECTRE_V2_CMD_AUTO, false }, - { "ibrs", SPECTRE_V2_CMD_IBRS, false }, }; static void __init spec_v2_print_cond(const char *reason, bool secure) @@ -1175,24 +1028,6 @@ static enum spectre_v2_mitigation_cmd __init spectre_v2_parse_cmdline(void) return SPECTRE_V2_CMD_AUTO; } - if (cmd == SPECTRE_V2_CMD_IBRS && boot_cpu_data.x86_vendor != X86_VENDOR_INTEL) { - pr_err("%s selected but not Intel CPU. Switching to AUTO select\n", - mitigation_options[i].option); - return SPECTRE_V2_CMD_AUTO; - } - - if (cmd == SPECTRE_V2_CMD_IBRS && !boot_cpu_has(X86_FEATURE_IBRS)) { - pr_err("%s selected but CPU doesn't have IBRS. Switching to AUTO select\n", - mitigation_options[i].option); - return SPECTRE_V2_CMD_AUTO; - } - - if (cmd == SPECTRE_V2_CMD_IBRS && boot_cpu_has(X86_FEATURE_XENPV)) { - pr_err("%s selected but running as XenPV guest. Switching to AUTO select\n", - mitigation_options[i].option); - return SPECTRE_V2_CMD_AUTO; - } - spec_v2_print_cond(mitigation_options[i].option, mitigation_options[i].secure); return cmd; @@ -1208,22 +1043,6 @@ static enum spectre_v2_mitigation __init spectre_v2_select_retpoline(void) return SPECTRE_V2_RETPOLINE; } -/* Disable in-kernel use of non-RSB RET predictors */ -static void __init spec_ctrl_disable_kernel_rrsba(void) -{ - u64 ia32_cap; - - if (!boot_cpu_has(X86_FEATURE_RRSBA_CTRL)) - return; - - ia32_cap = x86_read_arch_cap_msr(); - - if (ia32_cap & ARCH_CAP_RRSBA) { - x86_spec_ctrl_base |= SPEC_CTRL_RRSBA_DIS_S; - update_spec_ctrl(x86_spec_ctrl_base); - } -} - static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_mitigation mode) { /* @@ -1248,6 +1067,10 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_ */ switch (mode) { case SPECTRE_V2_NONE: + /* These modes already fill RSB at vmexit */ + case SPECTRE_V2_LFENCE: + case SPECTRE_V2_RETPOLINE: + case SPECTRE_V2_EIBRS_RETPOLINE: return; case SPECTRE_V2_EIBRS_LFENCE: @@ -1257,14 +1080,6 @@ static void __init spectre_v2_determine_rsb_fill_type_at_vmexit(enum spectre_v2_ pr_info("Spectre v2 / PBRSB-eIBRS: Retire a single CALL on VMEXIT\n"); } return; - - case SPECTRE_V2_EIBRS_RETPOLINE: - case SPECTRE_V2_RETPOLINE: - case SPECTRE_V2_LFENCE: - case SPECTRE_V2_IBRS: - setup_force_cpu_cap(X86_FEATURE_RSB_VMEXIT); - pr_info("Spectre v2 / SpectreRSB : Filling RSB on VMEXIT\n"); - return; } pr_warn_once("Unknown Spectre v2 mode, disabling RSB mitigation at VM exit"); @@ -1295,14 +1110,6 @@ static void __init spectre_v2_select_mitigation(void) break; } - if (boot_cpu_has_bug(X86_BUG_RETBLEED) && - retbleed_cmd != RETBLEED_CMD_OFF && - boot_cpu_has(X86_FEATURE_IBRS) && - boot_cpu_data.x86_vendor == X86_VENDOR_INTEL) { - mode = SPECTRE_V2_IBRS; - break; - } - mode = spectre_v2_select_retpoline(); break; @@ -1319,10 +1126,6 @@ static void __init spectre_v2_select_mitigation(void) mode = spectre_v2_select_retpoline(); break; - case SPECTRE_V2_CMD_IBRS: - mode = SPECTRE_V2_IBRS; - break; - case SPECTRE_V2_CMD_EIBRS: mode = SPECTRE_V2_EIBRS; break; @@ -1339,9 +1142,10 @@ static void __init spectre_v2_select_mitigation(void) if (mode == SPECTRE_V2_EIBRS && unprivileged_ebpf_enabled()) pr_err(SPECTRE_V2_EIBRS_EBPF_MSG); - if (spectre_v2_in_ibrs_mode(mode)) { + if (spectre_v2_in_eibrs_mode(mode)) { + /* Force it so VMEXIT will restore correctly */ x86_spec_ctrl_base |= SPEC_CTRL_IBRS; - update_spec_ctrl(x86_spec_ctrl_base); + wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); } switch (mode) { @@ -1349,12 +1153,6 @@ static void __init spectre_v2_select_mitigation(void) case SPECTRE_V2_EIBRS: break; - case SPECTRE_V2_IBRS: - setup_force_cpu_cap(X86_FEATURE_KERNEL_IBRS); - if (boot_cpu_has(X86_FEATURE_IBRS_ENHANCED)) - pr_warn(SPECTRE_V2_IBRS_PERF_MSG); - break; - case SPECTRE_V2_LFENCE: case SPECTRE_V2_EIBRS_LFENCE: setup_force_cpu_cap(X86_FEATURE_RETPOLINE_LFENCE); @@ -1366,56 +1164,16 @@ static void __init spectre_v2_select_mitigation(void) break; } - /* - * Disable alternate RSB predictions in kernel when indirect CALLs and - * JMPs gets protection against BHI and Intramode-BTI, but RET - * prediction from a non-RSB predictor is still a risk. - */ - if (mode == SPECTRE_V2_EIBRS_LFENCE || - mode == SPECTRE_V2_EIBRS_RETPOLINE || - mode == SPECTRE_V2_RETPOLINE) - spec_ctrl_disable_kernel_rrsba(); - spectre_v2_enabled = mode; pr_info("%s\n", spectre_v2_strings[mode]); /* - * If Spectre v2 protection has been enabled, fill the RSB during a - * context switch. In general there are two types of RSB attacks - * across context switches, for which the CALLs/RETs may be unbalanced. + * If spectre v2 protection has been enabled, unconditionally fill + * RSB during a context switch; this protects against two independent + * issues: * - * 1) RSB underflow - * - * Some Intel parts have "bottomless RSB". When the RSB is empty, - * speculated return targets may come from the branch predictor, - * which could have a user-poisoned BTB or BHB entry. - * - * AMD has it even worse: *all* returns are speculated from the BTB, - * regardless of the state of the RSB. - * - * When IBRS or eIBRS is enabled, the "user -> kernel" attack - * scenario is mitigated by the IBRS branch prediction isolation - * properties, so the RSB buffer filling wouldn't be necessary to - * protect against this type of attack. - * - * The "user -> user" attack scenario is mitigated by RSB filling. - * - * 2) Poisoned RSB entry - * - * If the 'next' in-kernel return stack is shorter than 'prev', - * 'next' could be tricked into speculating with a user-poisoned RSB - * entry. - * - * The "user -> kernel" attack scenario is mitigated by SMEP and - * eIBRS. - * - * The "user -> user" scenario, also known as SpectreBHB, requires - * RSB clearing. - * - * So to mitigate all cases, unconditionally fill RSB on context - * switches. - * - * FIXME: Is this pointless for retbleed-affected AMD? + * - RSB underflow (and switch to BTB) on Skylake+ + * - SpectreRSB variant of spectre v2 on X86_BUG_SPECTRE_V2 CPUs */ setup_force_cpu_cap(X86_FEATURE_RSB_CTXSW); pr_info("Spectre v2 / SpectreRSB mitigation: Filling RSB on context switch\n"); @@ -1423,29 +1181,28 @@ static void __init spectre_v2_select_mitigation(void) spectre_v2_determine_rsb_fill_type_at_vmexit(mode); /* - * Retpoline protects the kernel, but doesn't protect firmware. IBRS - * and Enhanced IBRS protect firmware too, so enable IBRS around - * firmware calls only when IBRS / Enhanced IBRS aren't otherwise - * enabled. + * Retpoline means the kernel is safe because it has no indirect + * branches. Enhanced IBRS protects firmware too, so, enable restricted + * speculation around firmware calls only when Enhanced IBRS isn't + * supported. * * Use "mode" to check Enhanced IBRS instead of boot_cpu_has(), because * the user might select retpoline on the kernel command line and if * the CPU supports Enhanced IBRS, kernel might un-intentionally not * enable IBRS around firmware calls. */ - if (boot_cpu_has(X86_FEATURE_IBRS) && !spectre_v2_in_ibrs_mode(mode)) { + if (boot_cpu_has(X86_FEATURE_IBRS) && !spectre_v2_in_eibrs_mode(mode)) { setup_force_cpu_cap(X86_FEATURE_USE_IBRS_FW); pr_info("Enabling Restricted Speculation for firmware calls\n"); } /* Set up IBPB and STIBP depending on the general spectre V2 command */ - spectre_v2_cmd = cmd; + spectre_v2_user_select_mitigation(cmd); } static void update_stibp_msr(void * __unused) { - u64 val = spec_ctrl_current() | (x86_spec_ctrl_base & SPEC_CTRL_STIBP); - update_spec_ctrl(val); + wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); } /* Update x86_spec_ctrl_base in case SMT state changed. */ @@ -1662,6 +1419,16 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) } /* + * If SSBD is controlled by the SPEC_CTRL MSR, then set the proper + * bit in the mask to allow guests to use the mitigation even in the + * case where the host does not enable it. + */ + if (static_cpu_has(X86_FEATURE_SPEC_CTRL_SSBD) || + static_cpu_has(X86_FEATURE_AMD_SSBD)) { + x86_spec_ctrl_mask |= SPEC_CTRL_SSBD; + } + + /* * We have three CPU feature flags that are in play here: * - X86_BUG_SPEC_STORE_BYPASS - CPU is susceptible. * - X86_FEATURE_SSBD - CPU is able to turn off speculative store bypass @@ -1678,7 +1445,7 @@ static enum ssb_mitigation __init __ssb_select_mitigation(void) x86_amd_ssb_disable(); } else { x86_spec_ctrl_base |= SPEC_CTRL_SSBD; - update_spec_ctrl(x86_spec_ctrl_base); + wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); } } @@ -1806,8 +1573,6 @@ static int ib_prctl_set(struct task_struct *task, unsigned long ctrl) if (ctrl == PR_SPEC_FORCE_DISABLE) task_set_spec_ib_force_disable(task); task_update_spec_tif(task); - if (task == current) - indirect_branch_prediction_barrier(); break; default: return -ERANGE; @@ -1897,7 +1662,7 @@ int arch_prctl_spec_ctrl_get(struct task_struct *task, unsigned long which) void x86_spec_ctrl_setup_ap(void) { if (boot_cpu_has(X86_FEATURE_MSR_SPEC_CTRL)) - update_spec_ctrl(x86_spec_ctrl_base); + wrmsrl(MSR_IA32_SPEC_CTRL, x86_spec_ctrl_base); if (ssb_mode == SPEC_STORE_BYPASS_DISABLE) x86_amd_ssb_disable(); @@ -2115,9 +1880,6 @@ static ssize_t tsx_async_abort_show_state(char *buf) static ssize_t mmio_stale_data_show_state(char *buf) { - if (boot_cpu_has_bug(X86_BUG_MMIO_UNKNOWN)) - return sysfs_emit(buf, "Unknown: No mitigations\n"); - if (mmio_mitigation == MMIO_MITIGATION_OFF) return sysfs_emit(buf, "%s\n", mmio_strings[mmio_mitigation]); @@ -2166,7 +1928,7 @@ static char *pbrsb_eibrs_state(void) { if (boot_cpu_has_bug(X86_BUG_EIBRS_PBRSB)) { if (boot_cpu_has(X86_FEATURE_RSB_VMEXIT_LITE) || - boot_cpu_has(X86_FEATURE_RSB_VMEXIT)) + boot_cpu_has(X86_FEATURE_RETPOLINE)) return ", PBRSB-eIBRS: SW sequence"; else return ", PBRSB-eIBRS: Vulnerable"; @@ -2202,11 +1964,6 @@ static ssize_t srbds_show_state(char *buf) return sprintf(buf, "%s\n", srbds_strings[srbds_mitigation]); } -static ssize_t retbleed_show_state(char *buf) -{ - return sprintf(buf, "%s\n", retbleed_strings[retbleed_mitigation]); -} - static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr, char *buf, unsigned int bug) { @@ -2250,12 +2007,8 @@ static ssize_t cpu_show_common(struct device *dev, struct device_attribute *attr return srbds_show_state(buf); case X86_BUG_MMIO_STALE_DATA: - case X86_BUG_MMIO_UNKNOWN: return mmio_stale_data_show_state(buf); - case X86_BUG_RETBLEED: - return retbleed_show_state(buf); - default: break; } @@ -2310,14 +2063,6 @@ ssize_t cpu_show_srbds(struct device *dev, struct device_attribute *attr, char * ssize_t cpu_show_mmio_stale_data(struct device *dev, struct device_attribute *attr, char *buf) { - if (boot_cpu_has_bug(X86_BUG_MMIO_UNKNOWN)) - return cpu_show_common(dev, attr, buf, X86_BUG_MMIO_UNKNOWN); - else - return cpu_show_common(dev, attr, buf, X86_BUG_MMIO_STALE_DATA); -} - -ssize_t cpu_show_retbleed(struct device *dev, struct device_attribute *attr, char *buf) -{ - return cpu_show_common(dev, attr, buf, X86_BUG_RETBLEED); + return cpu_show_common(dev, attr, buf, X86_BUG_MMIO_STALE_DATA); } #endif
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 5e1e32f..b926b72 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c
@@ -1026,7 +1026,6 @@ static void identify_cpu_without_cpuid(struct cpuinfo_x86 *c) #define NO_ITLB_MULTIHIT BIT(7) #define NO_SPECTRE_V2 BIT(8) #define NO_EIBRS_PBRSB BIT(9) -#define NO_MMIO BIT(10) #define VULNWL(_vendor, _family, _model, _whitelist) \ { X86_VENDOR_##_vendor, _family, _model, X86_FEATURE_ANY, _whitelist } @@ -1047,11 +1046,6 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { VULNWL(NSC, 5, X86_MODEL_ANY, NO_SPECULATION), /* Intel Family 6 */ - VULNWL_INTEL(TIGERLAKE, NO_MMIO), - VULNWL_INTEL(TIGERLAKE_L, NO_MMIO), - VULNWL_INTEL(ALDERLAKE, NO_MMIO), - VULNWL_INTEL(ALDERLAKE_L, NO_MMIO), - VULNWL_INTEL(ATOM_SALTWELL, NO_SPECULATION | NO_ITLB_MULTIHIT), VULNWL_INTEL(ATOM_SALTWELL_TABLET, NO_SPECULATION | NO_ITLB_MULTIHIT), VULNWL_INTEL(ATOM_SALTWELL_MID, NO_SPECULATION | NO_ITLB_MULTIHIT), @@ -1070,9 +1064,9 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { VULNWL_INTEL(ATOM_AIRMONT_MID, NO_L1TF | MSBDS_ONLY | NO_SWAPGS | NO_ITLB_MULTIHIT), VULNWL_INTEL(ATOM_AIRMONT_NP, NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT), - VULNWL_INTEL(ATOM_GOLDMONT, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_INTEL(ATOM_GOLDMONT_D, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_INTEL(ATOM_GOLDMONT_PLUS, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO | NO_EIBRS_PBRSB), + VULNWL_INTEL(ATOM_GOLDMONT, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_INTEL(ATOM_GOLDMONT_D, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_INTEL(ATOM_GOLDMONT_PLUS, NO_MDS | NO_L1TF | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_EIBRS_PBRSB), /* * Technically, swapgs isn't serializing on AMD (despite it previously @@ -1087,75 +1081,63 @@ static const __initconst struct x86_cpu_id cpu_vuln_whitelist[] = { VULNWL_INTEL(ATOM_TREMONT_D, NO_ITLB_MULTIHIT | NO_EIBRS_PBRSB), /* AMD Family 0xf - 0x12 */ - VULNWL_AMD(0x0f, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_AMD(0x10, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_AMD(0x11, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_AMD(0x12, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), + VULNWL_AMD(0x0f, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_AMD(0x10, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_AMD(0x11, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_AMD(0x12, NO_MELTDOWN | NO_SSB | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), /* FAMILY_ANY must be last, otherwise 0x0f - 0x12 matches won't work */ - VULNWL_AMD(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), - VULNWL_HYGON(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT | NO_MMIO), + VULNWL_AMD(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), + VULNWL_HYGON(X86_FAMILY_ANY, NO_MELTDOWN | NO_L1TF | NO_MDS | NO_SWAPGS | NO_ITLB_MULTIHIT), /* Zhaoxin Family 7 */ - VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2 | NO_MMIO), - VULNWL(ZHAOXIN, 7, X86_MODEL_ANY, NO_SPECTRE_V2 | NO_MMIO), + VULNWL(CENTAUR, 7, X86_MODEL_ANY, NO_SPECTRE_V2), + VULNWL(ZHAOXIN, 7, X86_MODEL_ANY, NO_SPECTRE_V2), {} }; -#define VULNBL(vendor, family, model, blacklist) \ - X86_MATCH_VENDOR_FAM_MODEL(vendor, family, model, blacklist) - #define VULNBL_INTEL_STEPPINGS(model, steppings, issues) \ X86_MATCH_VENDOR_FAM_MODEL_STEPPINGS_FEATURE(INTEL, 6, \ INTEL_FAM6_##model, steppings, \ X86_FEATURE_ANY, issues) -#define VULNBL_AMD(family, blacklist) \ - VULNBL(AMD, family, X86_MODEL_ANY, blacklist) - -#define VULNBL_HYGON(family, blacklist) \ - VULNBL(HYGON, family, X86_MODEL_ANY, blacklist) - #define SRBDS BIT(0) /* CPU is affected by X86_BUG_MMIO_STALE_DATA */ #define MMIO BIT(1) /* CPU is affected by Shared Buffers Data Sampling (SBDS), a variant of X86_BUG_MMIO_STALE_DATA */ #define MMIO_SBDS BIT(2) -/* CPU is affected by RETbleed, speculating where you would not expect it */ -#define RETBLEED BIT(3) static const struct x86_cpu_id cpu_vuln_blacklist[] __initconst = { VULNBL_INTEL_STEPPINGS(IVYBRIDGE, X86_STEPPING_ANY, SRBDS), VULNBL_INTEL_STEPPINGS(HASWELL, X86_STEPPING_ANY, SRBDS), VULNBL_INTEL_STEPPINGS(HASWELL_L, X86_STEPPING_ANY, SRBDS), VULNBL_INTEL_STEPPINGS(HASWELL_G, X86_STEPPING_ANY, SRBDS), - VULNBL_INTEL_STEPPINGS(HASWELL_X, X86_STEPPING_ANY, MMIO), - VULNBL_INTEL_STEPPINGS(BROADWELL_D, X86_STEPPING_ANY, MMIO), + VULNBL_INTEL_STEPPINGS(HASWELL_X, BIT(2) | BIT(4), MMIO), + VULNBL_INTEL_STEPPINGS(BROADWELL_D, X86_STEPPINGS(0x3, 0x5), MMIO), VULNBL_INTEL_STEPPINGS(BROADWELL_G, X86_STEPPING_ANY, SRBDS), VULNBL_INTEL_STEPPINGS(BROADWELL_X, X86_STEPPING_ANY, MMIO), VULNBL_INTEL_STEPPINGS(BROADWELL, X86_STEPPING_ANY, SRBDS), - VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(SKYLAKE_X, X86_STEPPING_ANY, MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPING_ANY, SRBDS | MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(CANNONLAKE_L, X86_STEPPING_ANY, RETBLEED), - VULNBL_INTEL_STEPPINGS(ICELAKE_L, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), - VULNBL_INTEL_STEPPINGS(ICELAKE_D, X86_STEPPING_ANY, MMIO), - VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPING_ANY, MMIO), - VULNBL_INTEL_STEPPINGS(COMETLAKE, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), - VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPINGS(0x0, 0x0), MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), - VULNBL_INTEL_STEPPINGS(LAKEFIELD, X86_STEPPING_ANY, MMIO | MMIO_SBDS | RETBLEED), - VULNBL_INTEL_STEPPINGS(ROCKETLAKE, X86_STEPPING_ANY, MMIO | RETBLEED), - VULNBL_INTEL_STEPPINGS(ATOM_TREMONT, X86_STEPPING_ANY, MMIO | MMIO_SBDS), + VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPINGS(0x3, 0x3), SRBDS | MMIO), + VULNBL_INTEL_STEPPINGS(SKYLAKE_L, X86_STEPPING_ANY, SRBDS), + VULNBL_INTEL_STEPPINGS(SKYLAKE_X, BIT(3) | BIT(4) | BIT(6) | + BIT(7) | BIT(0xB), MMIO), + VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPINGS(0x3, 0x3), SRBDS | MMIO), + VULNBL_INTEL_STEPPINGS(SKYLAKE, X86_STEPPING_ANY, SRBDS), + VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPINGS(0x9, 0xC), SRBDS | MMIO), + VULNBL_INTEL_STEPPINGS(KABYLAKE_L, X86_STEPPINGS(0x0, 0x8), SRBDS), + VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPINGS(0x9, 0xD), SRBDS | MMIO), + VULNBL_INTEL_STEPPINGS(KABYLAKE, X86_STEPPINGS(0x0, 0x8), SRBDS), + VULNBL_INTEL_STEPPINGS(ICELAKE_L, X86_STEPPINGS(0x5, 0x5), MMIO | MMIO_SBDS), + VULNBL_INTEL_STEPPINGS(ICELAKE_D, X86_STEPPINGS(0x1, 0x1), MMIO), + VULNBL_INTEL_STEPPINGS(ICELAKE_X, X86_STEPPINGS(0x4, 0x6), MMIO), + VULNBL_INTEL_STEPPINGS(COMETLAKE, BIT(2) | BIT(3) | BIT(5), MMIO | MMIO_SBDS), + VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPINGS(0x1, 0x1), MMIO | MMIO_SBDS), + VULNBL_INTEL_STEPPINGS(COMETLAKE_L, X86_STEPPINGS(0x0, 0x0), MMIO), + VULNBL_INTEL_STEPPINGS(LAKEFIELD, X86_STEPPINGS(0x1, 0x1), MMIO | MMIO_SBDS), + VULNBL_INTEL_STEPPINGS(ROCKETLAKE, X86_STEPPINGS(0x1, 0x1), MMIO), + VULNBL_INTEL_STEPPINGS(ATOM_TREMONT, X86_STEPPINGS(0x1, 0x1), MMIO | MMIO_SBDS), VULNBL_INTEL_STEPPINGS(ATOM_TREMONT_D, X86_STEPPING_ANY, MMIO), - VULNBL_INTEL_STEPPINGS(ATOM_TREMONT_L, X86_STEPPING_ANY, MMIO | MMIO_SBDS), - - VULNBL_AMD(0x15, RETBLEED), - VULNBL_AMD(0x16, RETBLEED), - VULNBL_AMD(0x17, RETBLEED), - VULNBL_HYGON(0x18, RETBLEED), + VULNBL_INTEL_STEPPINGS(ATOM_TREMONT_L, X86_STEPPINGS(0x0, 0x0), MMIO | MMIO_SBDS), {} }; @@ -1252,21 +1234,10 @@ static void __init cpu_set_bug_bits(struct cpuinfo_x86 *c) * Affected CPU list is generally enough to enumerate the vulnerability, * but for virtualization case check for ARCH_CAP MSR bits also, VMM may * not want the guest to enumerate the bug. - * - * Set X86_BUG_MMIO_UNKNOWN for CPUs that are neither in the blacklist, - * nor in the whitelist and also don't enumerate MSR ARCH_CAP MMIO bits. */ - if (!arch_cap_mmio_immune(ia32_cap)) { - if (cpu_matches(cpu_vuln_blacklist, MMIO)) - setup_force_cpu_bug(X86_BUG_MMIO_STALE_DATA); - else if (!cpu_matches(cpu_vuln_whitelist, NO_MMIO)) - setup_force_cpu_bug(X86_BUG_MMIO_UNKNOWN); - } - - if (!cpu_has(c, X86_FEATURE_BTC_NO)) { - if (cpu_matches(cpu_vuln_blacklist, RETBLEED) || (ia32_cap & ARCH_CAP_RSBA)) - setup_force_cpu_bug(X86_BUG_RETBLEED); - } + if (cpu_matches(cpu_vuln_blacklist, MMIO) && + !arch_cap_mmio_immune(ia32_cap)) + setup_force_cpu_bug(X86_BUG_MMIO_STALE_DATA); if (cpu_has(c, X86_FEATURE_IBRS_ENHANCED) && !cpu_matches(cpu_vuln_whitelist, NO_EIBRS_PBRSB) &&
diff --git a/arch/x86/kernel/cpu/hygon.c b/arch/x86/kernel/cpu/hygon.c index 232c9d6..b232bd0 100644 --- a/arch/x86/kernel/cpu/hygon.c +++ b/arch/x86/kernel/cpu/hygon.c
@@ -335,8 +335,8 @@ static void init_hygon(struct cpuinfo_x86 *c) * msr_set_bit() uses the safe accessors, too, even if the MSR * is not present. */ - msr_set_bit(MSR_AMD64_DE_CFG, - MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT); + msr_set_bit(MSR_F10H_DECFG, + MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT); /* A serializing LFENCE stops RDTSC speculation */ set_cpu_cap(c, X86_FEATURE_LFENCE_RDTSC);
diff --git a/arch/x86/kernel/cpu/match.c b/arch/x86/kernel/cpu/match.c index ad67760..2f163e6 100644 --- a/arch/x86/kernel/cpu/match.c +++ b/arch/x86/kernel/cpu/match.c
@@ -16,17 +16,12 @@ * respective wildcard entries. * * A typical table entry would be to match a specific CPU - * - * X86_MATCH_VENDOR_FAM_MODEL_FEATURE(INTEL, 6, INTEL_FAM6_BROADWELL, - * X86_FEATURE_ANY, NULL); + * { X86_VENDOR_INTEL, 6, 0x12 } + * or to match a specific CPU feature + * { X86_FEATURE_MATCH(X86_FEATURE_FOOBAR) } * * Fields can be wildcarded with %X86_VENDOR_ANY, %X86_FAMILY_ANY, - * %X86_MODEL_ANY, %X86_FEATURE_ANY (except for vendor) - * - * asm/cpu_device_id.h contains a set of useful macros which are shortcuts - * for various common selections. The above can be shortened to: - * - * X86_MATCH_INTEL_FAM6_MODEL(BROADWELL, NULL); + * %X86_MODEL_ANY, %X86_FEATURE_ANY or 0 (except for vendor) * * Arrays used to match for this should also be declared using * MODULE_DEVICE_TABLE(x86cpu, ...)
diff --git a/arch/x86/kernel/cpu/microcode/amd.c b/arch/x86/kernel/cpu/microcode/amd.c index 7fff0af..a0e52bd 100644 --- a/arch/x86/kernel/cpu/microcode/amd.c +++ b/arch/x86/kernel/cpu/microcode/amd.c
@@ -55,9 +55,7 @@ struct cont_desc { }; static u32 ucode_new_rev; - -/* One blob per node. */ -static u8 amd_ucode_patch[MAX_NUMNODES][PATCH_MAX_SIZE]; +static u8 amd_ucode_patch[PATCH_MAX_SIZE]; /* * Microcode patch container file is prepended to the initrd in cpio @@ -431,7 +429,7 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_p patch = (u8 (*)[PATCH_MAX_SIZE])__pa_nodebug(&amd_ucode_patch); #else new_rev = &ucode_new_rev; - patch = &amd_ucode_patch[0]; + patch = &amd_ucode_patch; #endif desc.cpuid_1_eax = cpuid_1_eax; @@ -443,13 +441,7 @@ apply_microcode_early_amd(u32 cpuid_1_eax, void *ucode, size_t size, bool save_p return ret; native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); - - /* - * Allow application of the same revision to pick up SMT-specific - * changes even if the revision of the other SMT thread is already - * up-to-date. - */ - if (rev > mc->hdr.patch_id) + if (rev >= mc->hdr.patch_id) return ret; if (!__apply_microcode_amd(mc)) { @@ -531,12 +523,8 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) native_rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); - /* - * Check whether a new patch has been saved already. Also, allow application of - * the same revision in order to pick up SMT-thread-specific configuration even - * if the sibling SMT thread already has an up-to-date revision. - */ - if (*new_rev && rev <= mc->hdr.patch_id) { + /* Check whether we have saved a new patch already: */ + if (*new_rev && rev < mc->hdr.patch_id) { if (!__apply_microcode_amd(mc)) { *new_rev = mc->hdr.patch_id; return; @@ -550,7 +538,8 @@ void load_ucode_amd_ap(unsigned int cpuid_1_eax) apply_microcode_early_amd(cpuid_1_eax, cp.data, cp.size, false); } -static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size); +static enum ucode_state +load_microcode_amd(bool save, u8 family, const u8 *data, size_t size); int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) { @@ -568,19 +557,19 @@ int __init save_microcode_in_initrd_amd(unsigned int cpuid_1_eax) if (!desc.mc) return -EINVAL; - ret = load_microcode_amd(x86_family(cpuid_1_eax), desc.data, desc.size); + ret = load_microcode_amd(true, x86_family(cpuid_1_eax), desc.data, desc.size); if (ret > UCODE_UPDATED) return -EINVAL; return 0; } -void reload_ucode_amd(unsigned int cpu) +void reload_ucode_amd(void) { - u32 rev, dummy; struct microcode_amd *mc; + u32 rev, dummy; - mc = (struct microcode_amd *)amd_ucode_patch[cpu_to_node(cpu)]; + mc = (struct microcode_amd *)amd_ucode_patch; rdmsr(MSR_AMD64_PATCH_LEVEL, rev, dummy); @@ -794,7 +783,6 @@ static int verify_and_add_patch(u8 family, u8 *fw, unsigned int leftover, kfree(patch); return -EINVAL; } - patch->size = *patch_size; mc_hdr = (struct microcode_header_amd *)(fw + SECTION_HDR_SIZE); proc_id = mc_hdr->processor_rev_id; @@ -846,10 +834,9 @@ static enum ucode_state __load_microcode_amd(u8 family, const u8 *data, return UCODE_OK; } -static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t size) +static enum ucode_state +load_microcode_amd(bool save, u8 family, const u8 *data, size_t size) { - struct cpuinfo_x86 *c; - unsigned int nid, cpu; struct ucode_patch *p; enum ucode_state ret; @@ -862,23 +849,23 @@ static enum ucode_state load_microcode_amd(u8 family, const u8 *data, size_t siz return ret; } - for_each_node(nid) { - cpu = cpumask_first(cpumask_of_node(nid)); - c = &cpu_data(cpu); - - p = find_patch(cpu); - if (!p) - continue; - - if (c->microcode >= p->patch_id) - continue; + p = find_patch(0); + if (!p) { + return ret; + } else { + if (boot_cpu_data.microcode >= p->patch_id) + return ret; ret = UCODE_NEW; - - memset(&amd_ucode_patch[nid], 0, PATCH_MAX_SIZE); - memcpy(&amd_ucode_patch[nid], p->data, min_t(u32, p->size, PATCH_MAX_SIZE)); } + /* save BSP's matching patch for early load */ + if (!save) + return ret; + + memset(amd_ucode_patch, 0, PATCH_MAX_SIZE); + memcpy(amd_ucode_patch, p->data, min_t(u32, ksize(p->data), PATCH_MAX_SIZE)); + return ret; } @@ -903,11 +890,12 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, { char fw_name[36] = "amd-ucode/microcode_amd.bin"; struct cpuinfo_x86 *c = &cpu_data(cpu); + bool bsp = c->cpu_index == boot_cpu_data.cpu_index; enum ucode_state ret = UCODE_NFOUND; const struct firmware *fw; /* reload ucode container only on the boot cpu */ - if (!refresh_fw) + if (!refresh_fw || !bsp) return UCODE_OK; if (c->x86 >= 0x15) @@ -922,7 +910,7 @@ static enum ucode_state request_microcode_amd(int cpu, struct device *device, if (!verify_container(fw->data, fw->size, false)) goto fw_release; - ret = load_microcode_amd(c->x86, fw->data, fw->size); + ret = load_microcode_amd(bsp, c->x86, fw->data, fw->size); fw_release: release_firmware(fw);
diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c index 834c5f7..c95a275 100644 --- a/arch/x86/kernel/cpu/microcode/core.c +++ b/arch/x86/kernel/cpu/microcode/core.c
@@ -322,7 +322,7 @@ struct cpio_data find_microcode_in_initrd(const char *path, bool use_pa) #endif } -void reload_early_microcode(unsigned int cpu) +void reload_early_microcode(void) { int vendor, family; @@ -336,7 +336,7 @@ void reload_early_microcode(unsigned int cpu) break; case X86_VENDOR_AMD: if (family >= 0x10) - reload_ucode_amd(cpu); + reload_ucode_amd(); break; default: break; @@ -782,7 +782,7 @@ void microcode_bsp_resume(void) if (uci->valid && uci->mc) microcode_ops->apply_microcode(cpu); else if (!uci->mc) - reload_early_microcode(cpu); + reload_early_microcode(); } static struct syscore_ops mc_syscore_ops = {
diff --git a/arch/x86/kernel/cpu/microcode/intel.c b/arch/x86/kernel/cpu/microcode/intel.c index 896f456..b224d4d 100644 --- a/arch/x86/kernel/cpu/microcode/intel.c +++ b/arch/x86/kernel/cpu/microcode/intel.c
@@ -659,6 +659,7 @@ void load_ucode_intel_ap(void) else iup = &intel_ucode_patch; +reget: if (!*iup) { patch = __load_ucode_intel(&uci); if (!patch) @@ -669,7 +670,12 @@ void load_ucode_intel_ap(void) uci.mc = *iup; - apply_microcode_early(&uci, true); + if (apply_microcode_early(&uci, true)) { + /* Mixed-silicon system? Try to refetch the proper patch: */ + *iup = NULL; + + goto reget; + } } static struct microcode_intel *find_patch(struct ucode_cpu_info *uci)
diff --git a/arch/x86/kernel/cpu/mtrr/mtrr.c b/arch/x86/kernel/cpu/mtrr/mtrr.c index 4482819..507039c 100644 --- a/arch/x86/kernel/cpu/mtrr/mtrr.c +++ b/arch/x86/kernel/cpu/mtrr/mtrr.c
@@ -794,6 +794,8 @@ void mtrr_ap_init(void) if (!use_intel() || mtrr_aps_delayed_init) return; + rcu_cpu_starting(smp_processor_id()); + /* * Ideally we should hold mtrr_mutex here to avoid mtrr entries * changed, but this routine will be called in cpu boot time,
diff --git a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c index f186470..d7623e1 100644 --- a/arch/x86/kernel/cpu/resctrl/pseudo_lock.c +++ b/arch/x86/kernel/cpu/resctrl/pseudo_lock.c
@@ -416,7 +416,6 @@ static int pseudo_lock_fn(void *_rdtgrp) struct pseudo_lock_region *plr = rdtgrp->plr; u32 rmid_p, closid_p; unsigned long i; - u64 saved_msr; #ifdef CONFIG_KASAN /* * The registers used for local register variables are also used @@ -460,7 +459,6 @@ static int pseudo_lock_fn(void *_rdtgrp) * the buffer and evict pseudo-locked memory read earlier from the * cache. */ - saved_msr = __rdmsr(MSR_MISC_FEATURE_CONTROL); __wrmsr(MSR_MISC_FEATURE_CONTROL, prefetch_disable_bits, 0x0); closid_p = this_cpu_read(pqr_state.cur_closid); rmid_p = this_cpu_read(pqr_state.cur_rmid); @@ -512,7 +510,7 @@ static int pseudo_lock_fn(void *_rdtgrp) __wrmsr(IA32_PQR_ASSOC, rmid_p, closid_p); /* Re-enable the hardware prefetcher(s) */ - wrmsrl(MSR_MISC_FEATURE_CONTROL, saved_msr); + wrmsr(MSR_MISC_FEATURE_CONTROL, 0x0, 0x0); local_irq_enable(); plr->thread_done = 1; @@ -869,7 +867,6 @@ bool rdtgroup_pseudo_locked_in_hierarchy(struct rdt_domain *d) static int measure_cycles_lat_fn(void *_plr) { struct pseudo_lock_region *plr = _plr; - u32 saved_low, saved_high; unsigned long i; u64 start, end; void *mem_r; @@ -878,7 +875,6 @@ static int measure_cycles_lat_fn(void *_plr) /* * Disable hardware prefetchers. */ - rdmsr(MSR_MISC_FEATURE_CONTROL, saved_low, saved_high); wrmsr(MSR_MISC_FEATURE_CONTROL, prefetch_disable_bits, 0x0); mem_r = READ_ONCE(plr->kmem); /* @@ -895,7 +891,7 @@ static int measure_cycles_lat_fn(void *_plr) end = rdtsc_ordered(); trace_pseudo_lock_mem_latency((u32)(end - start)); } - wrmsr(MSR_MISC_FEATURE_CONTROL, saved_low, saved_high); + wrmsr(MSR_MISC_FEATURE_CONTROL, 0x0, 0x0); local_irq_enable(); plr->thread_done = 1; wake_up_interruptible(&plr->lock_thread_wq); @@ -940,7 +936,6 @@ static int measure_residency_fn(struct perf_event_attr *miss_attr, u64 hits_before = 0, hits_after = 0, miss_before = 0, miss_after = 0; struct perf_event *miss_event, *hit_event; int hit_pmcnum, miss_pmcnum; - u32 saved_low, saved_high; unsigned int line_size; unsigned int size; unsigned long i; @@ -974,7 +969,6 @@ static int measure_residency_fn(struct perf_event_attr *miss_attr, /* * Disable hardware prefetchers. */ - rdmsr(MSR_MISC_FEATURE_CONTROL, saved_low, saved_high); wrmsr(MSR_MISC_FEATURE_CONTROL, prefetch_disable_bits, 0x0); /* Initialize rest of local variables */ @@ -1033,7 +1027,7 @@ static int measure_residency_fn(struct perf_event_attr *miss_attr, */ rmb(); /* Re-enable hardware prefetchers */ - wrmsr(MSR_MISC_FEATURE_CONTROL, saved_low, saved_high); + wrmsr(MSR_MISC_FEATURE_CONTROL, 0x0, 0x0); local_irq_enable(); out_hit: perf_event_release_kernel(hit_event);
diff --git a/arch/x86/kernel/cpu/resctrl/rdtgroup.c b/arch/x86/kernel/cpu/resctrl/rdtgroup.c index 0e4f14d..28f7862 100644 --- a/arch/x86/kernel/cpu/resctrl/rdtgroup.c +++ b/arch/x86/kernel/cpu/resctrl/rdtgroup.c
@@ -311,7 +311,7 @@ static void update_cpu_closid_rmid(void *info) * executing task might have its own closid selected. Just reuse * the context switch code. */ - resctrl_sched_in(current); + resctrl_sched_in(); } /* @@ -532,7 +532,7 @@ static void _update_task_closid_rmid(void *task) * Otherwise, the MSR is updated when the task is scheduled in. */ if (task == current) - resctrl_sched_in(task); + resctrl_sched_in(); } static void update_task_closid_rmid(struct task_struct *t) @@ -563,11 +563,11 @@ static int __rdtgroup_move_task(struct task_struct *tsk, */ if (rdtgrp->type == RDTCTRL_GROUP) { - WRITE_ONCE(tsk->closid, rdtgrp->closid); - WRITE_ONCE(tsk->rmid, rdtgrp->mon.rmid); + tsk->closid = rdtgrp->closid; + tsk->rmid = rdtgrp->mon.rmid; } else if (rdtgrp->type == RDTMON_GROUP) { if (rdtgrp->mon.parent->closid == tsk->closid) { - WRITE_ONCE(tsk->rmid, rdtgrp->mon.rmid); + tsk->rmid = rdtgrp->mon.rmid; } else { rdt_last_cmd_puts("Can't move task to different control group\n"); return -EINVAL; @@ -577,10 +577,8 @@ static int __rdtgroup_move_task(struct task_struct *tsk, /* * Ensure the task's closid and rmid are written before determining if * the task is current that will decide if it will be interrupted. - * This pairs with the full barrier between the rq->curr update and - * resctrl_sched_in() during context switch. */ - smp_mb(); + barrier(); /* * By now, the task's closid and rmid are set. If the task is current @@ -2177,26 +2175,22 @@ static void rdt_move_group_tasks(struct rdtgroup *from, struct rdtgroup *to, for_each_process_thread(p, t) { if (!from || is_closid_match(t, from) || is_rmid_match(t, from)) { - WRITE_ONCE(t->closid, to->closid); - WRITE_ONCE(t->rmid, to->mon.rmid); + t->closid = to->closid; + t->rmid = to->mon.rmid; +#ifdef CONFIG_SMP /* - * Order the closid/rmid stores above before the loads - * in task_curr(). This pairs with the full barrier - * between the rq->curr update and resctrl_sched_in() - * during context switch. - */ - smp_mb(); - - /* - * If the task is on a CPU, set the CPU in the mask. - * The detection is inaccurate as tasks might move or - * schedule before the smp function call takes place. - * In such a case the function call is pointless, but + * This is safe on x86 w/o barriers as the ordering + * of writing to task_cpu() and t->on_cpu is + * reverse to the reading here. The detection is + * inaccurate as tasks might move or schedule + * before the smp function call takes place. In + * such a case the function call is pointless, but * there is no other side effect. */ - if (IS_ENABLED(CONFIG_SMP) && mask && task_curr(t)) + if (mask && t->on_cpu) cpumask_set_cpu(task_cpu(t), mask); +#endif } } read_unlock(&tasklist_lock);
diff --git a/arch/x86/kernel/cpu/scattered.c b/arch/x86/kernel/cpu/scattered.c index a03e309..53004db 100644 --- a/arch/x86/kernel/cpu/scattered.c +++ b/arch/x86/kernel/cpu/scattered.c
@@ -26,7 +26,6 @@ struct cpuid_bit { static const struct cpuid_bit cpuid_bits[] = { { X86_FEATURE_APERFMPERF, CPUID_ECX, 0, 0x00000006, 0 }, { X86_FEATURE_EPB, CPUID_ECX, 3, 0x00000006, 0 }, - { X86_FEATURE_RRSBA_CTRL, CPUID_EDX, 2, 0x00000007, 2 }, { X86_FEATURE_CQM_LLC, CPUID_EDX, 1, 0x0000000f, 0 }, { X86_FEATURE_CQM_OCCUP_LLC, CPUID_EDX, 0, 0x0000000f, 1 }, { X86_FEATURE_CQM_MBM_TOTAL, CPUID_EDX, 1, 0x0000000f, 1 },
diff --git a/arch/x86/kernel/cpu/tsx.c b/arch/x86/kernel/cpu/tsx.c index 88a553e..032509a 100644 --- a/arch/x86/kernel/cpu/tsx.c +++ b/arch/x86/kernel/cpu/tsx.c
@@ -55,6 +55,24 @@ void tsx_enable(void) wrmsrl(MSR_IA32_TSX_CTRL, tsx); } +static bool __init tsx_ctrl_is_supported(void) +{ + u64 ia32_cap = x86_read_arch_cap_msr(); + + /* + * TSX is controlled via MSR_IA32_TSX_CTRL. However, support for this + * MSR is enumerated by ARCH_CAP_TSX_MSR bit in MSR_IA32_ARCH_CAPABILITIES. + * + * TSX control (aka MSR_IA32_TSX_CTRL) is only available after a + * microcode update on CPUs that have their MSR_IA32_ARCH_CAPABILITIES + * bit MDS_NO=1. CPUs with MDS_NO=0 are not planned to get + * MSR_IA32_TSX_CTRL support even after a microcode update. Thus, + * tsx= cmdline requests will do nothing on CPUs without + * MSR_IA32_TSX_CTRL support. + */ + return !!(ia32_cap & ARCH_CAP_TSX_CTRL_MSR); +} + static enum tsx_ctrl_states x86_get_tsx_auto_mode(void) { if (boot_cpu_has_bug(X86_BUG_TAA)) @@ -68,22 +86,9 @@ void __init tsx_init(void) char arg[5] = {}; int ret; - /* - * TSX is controlled via MSR_IA32_TSX_CTRL. However, support for this - * MSR is enumerated by ARCH_CAP_TSX_MSR bit in MSR_IA32_ARCH_CAPABILITIES. - * - * TSX control (aka MSR_IA32_TSX_CTRL) is only available after a - * microcode update on CPUs that have their MSR_IA32_ARCH_CAPABILITIES - * bit MDS_NO=1. CPUs with MDS_NO=0 are not planned to get - * MSR_IA32_TSX_CTRL support even after a microcode update. Thus, - * tsx= cmdline requests will do nothing on CPUs without - * MSR_IA32_TSX_CTRL support. - */ - if (!(x86_read_arch_cap_msr() & ARCH_CAP_TSX_CTRL_MSR)) + if (!tsx_ctrl_is_supported()) return; - setup_force_cpu_cap(X86_FEATURE_MSR_TSX_CTRL); - ret = cmdline_find_option(boot_command_line, "tsx", arg, sizeof(arg)); if (ret >= 0) { if (!strcmp(arg, "on")) {
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 539d8cf..0c319d0 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c
@@ -37,6 +37,7 @@ #include <linux/kdebug.h> #include <asm/cpu.h> #include <asm/reboot.h> +#include <asm/virtext.h> #include <asm/intel_pt.h> #include <asm/crash.h> #include <asm/cmdline.h> @@ -93,6 +94,15 @@ static void kdump_nmi_callback(int cpu, struct pt_regs *regs) */ cpu_crash_vmclear_loaded_vmcss(); + /* Disable VMX or SVM if needed. + * + * We need to disable virtualization on all CPUs. + * Having VMX or SVM enabled on any CPU may break rebooting + * after the kdump kernel has finished its task. + */ + cpu_emergency_vmxoff(); + cpu_emergency_svm_disable(); + /* * Disable Intel PT to stop its logging */ @@ -151,7 +161,12 @@ void native_machine_crash_shutdown(struct pt_regs *regs) */ cpu_crash_vmclear_loaded_vmcss(); - cpu_emergency_disable_virtualization(); + /* Booting kdump kernel with VMX or SVM enabled won't work, + * because (among other limitations) we can't disable paging + * with the virt flags. + */ + cpu_emergency_vmxoff(); + cpu_emergency_svm_disable(); /* * Disable Intel PT to stop its logging
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index e72042d..e07424e 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c
@@ -326,7 +326,7 @@ unsigned long oops_begin(void) } NOKPROBE_SYMBOL(oops_begin); -void __noreturn rewind_stack_and_make_dead(int signr); +void __noreturn rewind_stack_do_exit(int signr); void oops_end(unsigned long flags, struct pt_regs *regs, int signr) { @@ -361,7 +361,7 @@ void oops_end(unsigned long flags, struct pt_regs *regs, int signr) * reuse the task stack and that existing poisons are invalid. */ kasan_unpoison_task_stack(current); - rewind_stack_and_make_dead(signr); + rewind_stack_do_exit(signr); } NOKPROBE_SYMBOL(oops_end);
diff --git a/arch/x86/kernel/fpu/init.c b/arch/x86/kernel/fpu/init.c index 17d092e..b271da0 100644 --- a/arch/x86/kernel/fpu/init.c +++ b/arch/x86/kernel/fpu/init.c
@@ -139,6 +139,9 @@ static void __init fpu__init_system_generic(void) unsigned int fpu_kernel_xstate_size; EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size); +/* Get alignment of the TYPE. */ +#define TYPE_ALIGN(TYPE) offsetof(struct { char x; TYPE test; }, test) + /* * Enforce that 'MEMBER' is the last field of 'TYPE'. * @@ -146,8 +149,8 @@ EXPORT_SYMBOL_GPL(fpu_kernel_xstate_size); * because that's how C aligns structs. */ #define CHECK_MEMBER_AT_END_OF(TYPE, MEMBER) \ - BUILD_BUG_ON(sizeof(TYPE) != \ - ALIGN(offsetofend(TYPE, MEMBER), _Alignof(TYPE))) + BUILD_BUG_ON(sizeof(TYPE) != ALIGN(offsetofend(TYPE, MEMBER), \ + TYPE_ALIGN(TYPE))) /* * We append the 'struct fpu' to the task_struct:
diff --git a/arch/x86/kernel/i8259.c b/arch/x86/kernel/i8259.c index 8821d0a..fe52269 100644 --- a/arch/x86/kernel/i8259.c +++ b/arch/x86/kernel/i8259.c
@@ -114,7 +114,6 @@ static void make_8259A_irq(unsigned int irq) disable_irq_nosync(irq); io_apic_irqs &= ~(1<<irq); irq_set_chip_and_handler(irq, &i8259A_chip, handle_level_irq); - irq_set_status_flags(irq, IRQ_LEVEL); enable_irq(irq); lapic_assign_legacy_vector(irq, true); }
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index faed27c..16919a9 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c
@@ -72,10 +72,8 @@ void __init init_ISA_irqs(void) legacy_pic->init(0); - for (i = 0; i < nr_legacy_irqs(); i++) { + for (i = 0; i < nr_legacy_irqs(); i++) irq_set_chip_and_handler(i, chip, handle_level_irq); - irq_set_status_flags(i, IRQ_LEVEL); - } } void __init init_IRQ(void)
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 90d41b2..b348dd5 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c
@@ -43,8 +43,8 @@ unsigned long __recover_optprobed_insn(kprobe_opcode_t *buf, unsigned long addr) /* This function only handles jump-optimized kprobe */ if (kp && kprobe_optimized(kp)) { op = container_of(kp, struct optimized_kprobe, kp); - /* If op is optimized or under unoptimizing */ - if (list_empty(&op->list) || optprobe_queued_unopt(op)) + /* If op->list is not empty, op is under optimizing */ + if (list_empty(&op->list)) goto found; } } @@ -314,7 +314,7 @@ int arch_check_optimized_kprobe(struct optimized_kprobe *op) for (i = 1; i < op->optinsn.size; i++) { p = get_kprobe(op->kp.addr + i); - if (p && !kprobe_disarmed(p)) + if (p && !kprobe_disabled(p)) return -EEXIST; }
diff --git a/arch/x86/kernel/pmem.c b/arch/x86/kernel/pmem.c index 23154d2..6b07faa 100644 --- a/arch/x86/kernel/pmem.c +++ b/arch/x86/kernel/pmem.c
@@ -27,11 +27,6 @@ static __init int register_e820_pmem(void) * simply here to trigger the module to load on demand. */ pdev = platform_device_alloc("e820_pmem", -1); - - rc = platform_device_add(pdev); - if (rc) - platform_device_put(pdev); - - return rc; + return platform_device_add(pdev); } device_initcall(register_e820_pmem);
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index b8de27b..571e38c 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c
@@ -449,7 +449,7 @@ static __always_inline void __speculation_ctrl_update(unsigned long tifp, } if (updmsr) - update_spec_ctrl_cond(msr); + wrmsrl(MSR_IA32_SPEC_CTRL, msr); } static unsigned long speculation_ctrl_update_tif(struct task_struct *tsk) @@ -659,10 +659,6 @@ static void amd_e400_idle(void) */ static int prefer_mwait_c1_over_halt(const struct cpuinfo_x86 *c) { - /* User has disallowed the use of MWAIT. Fallback to HALT */ - if (boot_option_idle_override == IDLE_NOMWAIT) - return 0; - if (c->x86_vendor != X86_VENDOR_INTEL) return 0; @@ -773,8 +769,9 @@ static int __init idle_setup(char *str) } else if (!strcmp(str, "nomwait")) { /* * If the boot option of "idle=nomwait" is added, - * it means that mwait will be disabled for CPU C1/C2/C3 - * states. + * it means that mwait will be disabled for CPU C2/C3 + * states. In such case it won't touch the variable + * of boot_option_idle_override. */ boot_option_idle_override = IDLE_NOMWAIT; } else
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 8ef71fa..352f876 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c
@@ -293,7 +293,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) switch_fpu_finish(next_p); /* Load the Intel cache allocation PQR MSR. */ - resctrl_sched_in(next_p); + resctrl_sched_in(); return prev_p; }
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index b77f0d9..6337883 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c
@@ -610,7 +610,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) } /* Load the Intel cache allocation PQR MSR. */ - resctrl_sched_in(next_p); + resctrl_sched_in(); return prev_p; }
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index 6fede2f..fdef27a 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c
@@ -528,29 +528,33 @@ static inline void kb_wait(void) } } -static inline void nmi_shootdown_cpus_on_restart(void); +static void vmxoff_nmi(int cpu, struct pt_regs *regs) +{ + cpu_emergency_vmxoff(); +} -static void emergency_reboot_disable_virtualization(void) +/* Use NMIs as IPIs to tell all CPUs to disable virtualization */ +static void emergency_vmx_disable_all(void) { /* Just make sure we won't change CPUs while doing this */ local_irq_disable(); /* - * Disable virtualization on all CPUs before rebooting to avoid hanging - * the system, as VMX and SVM block INIT when running in the host. + * Disable VMX on all CPUs before rebooting, otherwise we risk hanging + * the machine, because the CPU blocks INIT when it's in VMX root. * * We can't take any locks and we may be on an inconsistent state, so - * use NMIs as IPIs to tell the other CPUs to disable VMX/SVM and halt. + * use NMIs as IPIs to tell the other CPUs to exit VMX root and halt. * - * Do the NMI shootdown even if virtualization is off on _this_ CPU, as - * other CPUs may have virtualization enabled. + * Do the NMI shootdown even if VMX if off on _this_ CPU, as that + * doesn't prevent a different CPU from being in VMX root operation. */ - if (cpu_has_vmx() || cpu_has_svm(NULL)) { - /* Safely force _this_ CPU out of VMX/SVM operation. */ - cpu_emergency_disable_virtualization(); + if (cpu_has_vmx()) { + /* Safely force _this_ CPU out of VMX root operation. */ + __cpu_emergency_vmxoff(); - /* Disable VMX/SVM and halt on other CPUs. */ - nmi_shootdown_cpus_on_restart(); + /* Halt and exit VMX root operation on the other CPUs. */ + nmi_shootdown_cpus(vmxoff_nmi); } } @@ -587,7 +591,7 @@ static void native_machine_emergency_restart(void) unsigned short mode; if (reboot_emergency) - emergency_reboot_disable_virtualization(); + emergency_vmx_disable_all(); tboot_shutdown(TB_SHUTDOWN_REBOOT); @@ -792,17 +796,6 @@ void machine_crash_shutdown(struct pt_regs *regs) /* This is the CPU performing the emergency shutdown work. */ int crashing_cpu = -1; -/* - * Disable virtualization, i.e. VMX or SVM, to ensure INIT is recognized during - * reboot. VMX blocks INIT if the CPU is post-VMXON, and SVM blocks INIT if - * GIF=0, i.e. if the crash occurred between CLGI and STGI. - */ -void cpu_emergency_disable_virtualization(void) -{ - cpu_emergency_vmxoff(); - cpu_emergency_svm_disable(); -} - #if defined(CONFIG_SMP) static nmi_shootdown_cb shootdown_callback; @@ -825,14 +818,7 @@ static int crash_nmi_callback(unsigned int val, struct pt_regs *regs) return NMI_HANDLED; local_irq_disable(); - if (shootdown_callback) - shootdown_callback(cpu, regs); - - /* - * Prepare the CPU for reboot _after_ invoking the callback so that the - * callback can safely use virtualization instructions, e.g. VMCLEAR. - */ - cpu_emergency_disable_virtualization(); + shootdown_callback(cpu, regs); atomic_dec(&waiting_for_crash_ipi); /* Assume hlt works */ @@ -843,32 +829,18 @@ static int crash_nmi_callback(unsigned int val, struct pt_regs *regs) return NMI_HANDLED; } -/** - * nmi_shootdown_cpus - Stop other CPUs via NMI - * @callback: Optional callback to be invoked from the NMI handler +/* + * Halt all other CPUs, calling the specified function on each of them * - * The NMI handler on the remote CPUs invokes @callback, if not - * NULL, first and then disables virtualization to ensure that - * INIT is recognized during reboot. - * - * nmi_shootdown_cpus() can only be invoked once. After the first - * invocation all other CPUs are stuck in crash_nmi_callback() and - * cannot respond to a second NMI. + * This function can be used to halt all other CPUs on crash + * or emergency reboot time. The function passed as parameter + * will be called inside a NMI handler on all CPUs. */ void nmi_shootdown_cpus(nmi_shootdown_cb callback) { unsigned long msecs; - local_irq_disable(); - /* - * Avoid certain doom if a shootdown already occurred; re-registering - * the NMI handler will cause list corruption, modifying the callback - * will do who knows what, etc... - */ - if (WARN_ON_ONCE(crash_ipi_issued)) - return; - /* Make a note of crashing cpu. Will be used in NMI callback. */ crashing_cpu = safe_smp_processor_id(); @@ -896,17 +868,7 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) msecs--; } - /* - * Leave the nmi callback set, shootdown is a one-time thing. Clearing - * the callback could result in a NULL pointer dereference if a CPU - * (finally) responds after the timeout expires. - */ -} - -static inline void nmi_shootdown_cpus_on_restart(void) -{ - if (!crash_ipi_issued) - nmi_shootdown_cpus(NULL); + /* Leave the nmi callback set */ } /* @@ -936,8 +898,6 @@ void nmi_shootdown_cpus(nmi_shootdown_cb callback) /* No other CPUs to shoot down */ } -static inline void nmi_shootdown_cpus_on_restart(void) { } - void run_crash_ipi_callback(struct pt_regs *regs) { }
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index 31ee37f..b8d4e9c 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c
@@ -31,7 +31,7 @@ #include <asm/mce.h> #include <asm/trace/irq_vectors.h> #include <asm/kexec.h> -#include <asm/reboot.h> +#include <asm/virtext.h> /* * Some notes on x86 processor bugs affecting SMP operation: @@ -121,7 +121,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs) if (raw_smp_processor_id() == atomic_read(&stopping_cpu)) return NMI_HANDLED; - cpu_emergency_disable_virtualization(); + cpu_emergency_vmxoff(); stop_this_cpu(NULL); return NMI_HANDLED; @@ -134,7 +134,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs) asmlinkage __visible void smp_reboot_interrupt(void) { ipi_entering_ack_irq(); - cpu_emergency_disable_virtualization(); + cpu_emergency_vmxoff(); stop_this_cpu(NULL); irq_exit(); }
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 1699d18..8367bd7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c
@@ -224,7 +224,6 @@ static void notrace start_secondary(void *unused) #endif load_current_idt(); cpu_init(); - rcu_cpu_starting(raw_smp_processor_id()); x86_cpuinit.early_percpu_clock_init(); preempt_disable(); smp_callin();
diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c index fff04d2..653b7f6 100644 --- a/arch/x86/kernel/sysfb_efi.c +++ b/arch/x86/kernel/sysfb_efi.c
@@ -264,22 +264,6 @@ static const struct dmi_system_id efifb_dmi_swap_width_height[] __initconst = { "Lenovo ideapad D330-10IGM"), }, }, - { - /* Lenovo IdeaPad Duet 3 10IGL5 with 1200x1920 portrait screen */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, - "IdeaPad Duet 3 10IGL5"), - }, - }, - { - /* Lenovo Yoga Book X91F / X91L */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), - /* Non exact match to match F + L versions */ - DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), - }, - }, {}, };
diff --git a/arch/x86/kernel/unwind_orc.c b/arch/x86/kernel/unwind_orc.c index c856341..b934f9f 100644 --- a/arch/x86/kernel/unwind_orc.c +++ b/arch/x86/kernel/unwind_orc.c
@@ -90,27 +90,22 @@ static struct orc_entry *orc_find(unsigned long ip); static struct orc_entry *orc_ftrace_find(unsigned long ip) { struct ftrace_ops *ops; - unsigned long tramp_addr, offset; + unsigned long caller; ops = ftrace_ops_trampoline(ip); if (!ops) return NULL; - /* Set tramp_addr to the start of the code copied by the trampoline */ if (ops->flags & FTRACE_OPS_FL_SAVE_REGS) - tramp_addr = (unsigned long)ftrace_regs_caller; + caller = (unsigned long)ftrace_regs_call; else - tramp_addr = (unsigned long)ftrace_caller; - - /* Now place tramp_addr to the location within the trampoline ip is at */ - offset = ip - ops->trampoline; - tramp_addr += offset; + caller = (unsigned long)ftrace_call; /* Prevent unlikely recursion */ - if (ip == tramp_addr) + if (ip == caller) return NULL; - return orc_find(tramp_addr); + return orc_find(caller); } #else static struct orc_entry *orc_ftrace_find(unsigned long ip) @@ -687,7 +682,7 @@ void __unwind_start(struct unwind_state *state, struct task_struct *task, /* Otherwise, skip ahead to the user-specified starting frame: */ while (!unwind_done(state) && (!on_stack(&state->stack_info, first_frame, sizeof(long)) || - state->sp <= (unsigned long)first_frame)) + state->sp < (unsigned long)first_frame)) unwind_next_frame(state); return;
diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c index f51fc7f..fae5b00 100644 --- a/arch/x86/kernel/uprobes.c +++ b/arch/x86/kernel/uprobes.c
@@ -722,9 +722,8 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn) switch (opc1) { case 0xeb: /* jmp 8 */ case 0xe9: /* jmp 32 */ - break; case 0x90: /* prefix* + nop; same as jmp with .offs = 0 */ - goto setup; + break; case 0xe8: /* call relative */ branch_clear_offset(auprobe, insn); @@ -754,7 +753,6 @@ static int branch_setup_xol_ops(struct arch_uprobe *auprobe, struct insn *insn) return -ENOTSUPP; } -setup: auprobe->branch.opc1 = opc1; auprobe->branch.ilen = insn->length; auprobe->branch.offs = insn->immediate.value;
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 7aee4ba..1f82257 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S
@@ -21,8 +21,6 @@ #define LOAD_OFFSET __START_KERNEL_map #endif -#define RUNTIME_DISCARD_EXIT - #include <asm-generic/vmlinux.lds.h> #include <asm/asm-offsets.h> #include <asm/thread_info.h>
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index db38386..62c7f77 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c
@@ -759,7 +759,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, g_phys_as = phys_as; entry->eax = g_phys_as | (virt_as << 8); - entry->ecx &= ~(GENMASK(31, 16) | GENMASK(11, 8)); entry->edx = 0; entry->ebx &= kvm_cpuid_8000_0008_ebx_x86_features; cpuid_mask(&entry->ebx, CPUID_8000_0008_EBX); @@ -792,9 +791,6 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, entry->ecx = entry->edx = 0; break; case 0x8000001a: - entry->eax &= GENMASK(2, 0); - entry->ebx = entry->ecx = entry->edx = 0; - break; case 0x8000001e: break; /*Add support for Centaur's CPUID instruction*/
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c index 1a9fa29..ea48a2f 100644 --- a/arch/x86/kvm/emulate.c +++ b/arch/x86/kvm/emulate.c
@@ -776,7 +776,8 @@ static int linearize(struct x86_emulate_ctxt *ctxt, ctxt->mode, linear); } -static inline int assign_eip(struct x86_emulate_ctxt *ctxt, ulong dst) +static inline int assign_eip(struct x86_emulate_ctxt *ctxt, ulong dst, + enum x86emul_mode mode) { ulong linear; int rc; @@ -786,71 +787,41 @@ static inline int assign_eip(struct x86_emulate_ctxt *ctxt, ulong dst) if (ctxt->op_bytes != sizeof(unsigned long)) addr.ea = dst & ((1UL << (ctxt->op_bytes << 3)) - 1); - rc = __linearize(ctxt, addr, &max_size, 1, false, true, ctxt->mode, &linear); + rc = __linearize(ctxt, addr, &max_size, 1, false, true, mode, &linear); if (rc == X86EMUL_CONTINUE) ctxt->_eip = addr.ea; return rc; } -static inline int emulator_recalc_and_set_mode(struct x86_emulate_ctxt *ctxt) -{ - u64 efer; - struct desc_struct cs; - u16 selector; - u32 base3; - - ctxt->ops->get_msr(ctxt, MSR_EFER, &efer); - - if (!(ctxt->ops->get_cr(ctxt, 0) & X86_CR0_PE)) { - /* Real mode. cpu must not have long mode active */ - if (efer & EFER_LMA) - return X86EMUL_UNHANDLEABLE; - ctxt->mode = X86EMUL_MODE_REAL; - return X86EMUL_CONTINUE; - } - - if (ctxt->eflags & X86_EFLAGS_VM) { - /* Protected/VM86 mode. cpu must not have long mode active */ - if (efer & EFER_LMA) - return X86EMUL_UNHANDLEABLE; - ctxt->mode = X86EMUL_MODE_VM86; - return X86EMUL_CONTINUE; - } - - if (!ctxt->ops->get_segment(ctxt, &selector, &cs, &base3, VCPU_SREG_CS)) - return X86EMUL_UNHANDLEABLE; - - if (efer & EFER_LMA) { - if (cs.l) { - /* Proper long mode */ - ctxt->mode = X86EMUL_MODE_PROT64; - } else if (cs.d) { - /* 32 bit compatibility mode*/ - ctxt->mode = X86EMUL_MODE_PROT32; - } else { - ctxt->mode = X86EMUL_MODE_PROT16; - } - } else { - /* Legacy 32 bit / 16 bit mode */ - ctxt->mode = cs.d ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16; - } - - return X86EMUL_CONTINUE; -} - static inline int assign_eip_near(struct x86_emulate_ctxt *ctxt, ulong dst) { - return assign_eip(ctxt, dst); + return assign_eip(ctxt, dst, ctxt->mode); } -static int assign_eip_far(struct x86_emulate_ctxt *ctxt, ulong dst) +static int assign_eip_far(struct x86_emulate_ctxt *ctxt, ulong dst, + const struct desc_struct *cs_desc) { - int rc = emulator_recalc_and_set_mode(ctxt); + enum x86emul_mode mode = ctxt->mode; + int rc; - if (rc != X86EMUL_CONTINUE) - return rc; +#ifdef CONFIG_X86_64 + if (ctxt->mode >= X86EMUL_MODE_PROT16) { + if (cs_desc->l) { + u64 efer = 0; - return assign_eip(ctxt, dst); + ctxt->ops->get_msr(ctxt, MSR_EFER, &efer); + if (efer & EFER_LMA) + mode = X86EMUL_MODE_PROT64; + } else + mode = X86EMUL_MODE_PROT32; /* temporary value */ + } +#endif + if (mode == X86EMUL_MODE_PROT16 || mode == X86EMUL_MODE_PROT32) + mode = cs_desc->d ? X86EMUL_MODE_PROT32 : X86EMUL_MODE_PROT16; + rc = assign_eip(ctxt, dst, mode); + if (rc == X86EMUL_CONTINUE) + ctxt->mode = mode; + return rc; } static inline int jmp_rel(struct x86_emulate_ctxt *ctxt, int rel) @@ -1782,6 +1753,16 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, case VCPU_SREG_TR: if (seg_desc.s || (seg_desc.type != 1 && seg_desc.type != 9)) goto exception; + if (!seg_desc.p) { + err_vec = NP_VECTOR; + goto exception; + } + old_desc = seg_desc; + seg_desc.type |= 2; /* busy */ + ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc, + sizeof(seg_desc), &ctxt->exception); + if (ret != X86EMUL_CONTINUE) + return ret; break; case VCPU_SREG_LDTR: if (seg_desc.s || seg_desc.type != 2) @@ -1819,17 +1800,8 @@ static int __load_segment_descriptor(struct x86_emulate_ctxt *ctxt, if (ret != X86EMUL_CONTINUE) return ret; if (emul_is_noncanonical_address(get_desc_base(&seg_desc) | - ((u64)base3 << 32), ctxt)) - return emulate_gp(ctxt, err_code); - } - - if (seg == VCPU_SREG_TR) { - old_desc = seg_desc; - seg_desc.type |= 2; /* busy */ - ret = ctxt->ops->cmpxchg_emulated(ctxt, desc_addr, &old_desc, &seg_desc, - sizeof(seg_desc), &ctxt->exception); - if (ret != X86EMUL_CONTINUE) - return ret; + ((u64)base3 << 32), ctxt)) + return emulate_gp(ctxt, 0); } load: ctxt->ops->set_segment(ctxt, selector, &seg_desc, base3, seg); @@ -2049,7 +2021,7 @@ static int em_pop_sreg(struct x86_emulate_ctxt *ctxt) if (rc != X86EMUL_CONTINUE) return rc; - if (seg == VCPU_SREG_SS) + if (ctxt->modrm_reg == VCPU_SREG_SS) ctxt->interruptibility = KVM_X86_SHADOW_INT_MOV_SS; if (ctxt->op_bytes > 2) rsp_increment(ctxt, ctxt->op_bytes - 2); @@ -2266,7 +2238,7 @@ static int em_jmp_far(struct x86_emulate_ctxt *ctxt) if (rc != X86EMUL_CONTINUE) return rc; - rc = assign_eip_far(ctxt, ctxt->src.val); + rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc); /* Error handling is not implemented. */ if (rc != X86EMUL_CONTINUE) return X86EMUL_UNHANDLEABLE; @@ -2347,7 +2319,7 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt) &new_desc); if (rc != X86EMUL_CONTINUE) return rc; - rc = assign_eip_far(ctxt, eip); + rc = assign_eip_far(ctxt, eip, &new_desc); /* Error handling is not implemented. */ if (rc != X86EMUL_CONTINUE) return X86EMUL_UNHANDLEABLE; @@ -2982,7 +2954,6 @@ static int em_sysexit(struct x86_emulate_ctxt *ctxt) ops->set_segment(ctxt, ss_sel, &ss, 0, VCPU_SREG_SS); ctxt->_eip = rdx; - ctxt->mode = usermode; *reg_write(ctxt, VCPU_REGS_RSP) = rcx; return X86EMUL_CONTINUE; @@ -3579,7 +3550,7 @@ static int em_call_far(struct x86_emulate_ctxt *ctxt) if (rc != X86EMUL_CONTINUE) return rc; - rc = assign_eip_far(ctxt, ctxt->src.val); + rc = assign_eip_far(ctxt, ctxt->src.val, &new_desc); if (rc != X86EMUL_CONTINUE) goto fail; @@ -3726,25 +3697,11 @@ static int em_movbe(struct x86_emulate_ctxt *ctxt) static int em_cr_write(struct x86_emulate_ctxt *ctxt) { - int cr_num = ctxt->modrm_reg; - int r; - - if (ctxt->ops->set_cr(ctxt, cr_num, ctxt->src.val)) + if (ctxt->ops->set_cr(ctxt, ctxt->modrm_reg, ctxt->src.val)) return emulate_gp(ctxt, 0); /* Disable writeback. */ ctxt->dst.type = OP_NONE; - - if (cr_num == 0) { - /* - * CR0 write might have updated CR0.PE and/or CR0.PG - * which can affect the cpu's execution mode. - */ - r = emulator_recalc_and_set_mode(ctxt); - if (r != X86EMUL_CONTINUE) - return r; - } - return X86EMUL_CONTINUE; }
diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index f9603df..ca66459 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c
@@ -309,9 +309,6 @@ static int synic_set_irq(struct kvm_vcpu_hv_synic *synic, u32 sint) struct kvm_lapic_irq irq; int ret, vector; - if (KVM_BUG_ON(!lapic_in_kernel(vcpu), vcpu->kvm)) - return -EINVAL; - if (sint >= ARRAY_SIZE(synic->sint)) return -EINVAL;
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c index 23480d8..3696b4d 100644 --- a/arch/x86/kvm/lapic.c +++ b/arch/x86/kvm/lapic.c
@@ -955,10 +955,6 @@ bool kvm_irq_delivery_to_apic_fast(struct kvm *kvm, struct kvm_lapic *src, *r = -1; if (irq->shorthand == APIC_DEST_SELF) { - if (KVM_BUG_ON(!src, kvm)) { - *r = 0; - return true; - } *r = kvm_apic_set_irq(src->vcpu, irq, dest_map); return true; }
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index c5a9de8..1259702 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c
@@ -47,7 +47,6 @@ #include <asm/kvm_para.h> #include <asm/irq_remapping.h> #include <asm/spec-ctrl.h> -#include <asm/cpu_device_id.h> #include <asm/virtext.h> #include "trace.h" @@ -4180,9 +4179,9 @@ static int svm_get_msr_feature(struct kvm_msr_entry *msr) msr->data = 0; switch (msr->index) { - case MSR_AMD64_DE_CFG: - if (cpu_feature_enabled(X86_FEATURE_LFENCE_RDTSC)) - msr->data |= MSR_AMD64_DE_CFG_LFENCE_SERIALIZE; + case MSR_F10H_DECFG: + if (boot_cpu_has(X86_FEATURE_LFENCE_RDTSC)) + msr->data |= MSR_F10H_DECFG_LFENCE_SERIALIZE; break; default: return 1; @@ -4284,7 +4283,7 @@ static int svm_get_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info) msr_info->data = 0x1E; } break; - case MSR_AMD64_DE_CFG: + case MSR_F10H_DECFG: msr_info->data = svm->msr_decfg; break; default: @@ -4451,7 +4450,7 @@ static int svm_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr) case MSR_VM_IGNNE: vcpu_unimpl(vcpu, "unimplemented wrmsr: 0x%x data 0x%llx\n", ecx, data); break; - case MSR_AMD64_DE_CFG: { + case MSR_F10H_DECFG: { struct kvm_msr_entry msr_entry; msr_entry.index = msr->index; @@ -5138,6 +5137,8 @@ static void svm_set_irq(struct kvm_vcpu *vcpu) { struct vcpu_svm *svm = to_svm(vcpu); + BUG_ON(!(gif_set(svm))); + trace_kvm_inj_virq(vcpu->arch.interrupt.nr); ++vcpu->stat.irq_injections;
diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index cd96c31..9f61ae6 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c
@@ -11,7 +11,6 @@ #include "mmu.h" #include "nested.h" #include "trace.h" -#include "vmx.h" #include "x86.h" static bool __read_mostly enable_shadow_vmcs = 1; @@ -1061,7 +1060,7 @@ static int vmx_restore_vmx_basic(struct vcpu_vmx *vmx, u64 data) BIT_ULL(49) | BIT_ULL(54) | BIT_ULL(55) | /* reserved */ BIT_ULL(31) | GENMASK_ULL(47, 45) | GENMASK_ULL(63, 56); - u64 vmx_basic = vmcs_config.nested.basic; + u64 vmx_basic = vmx->nested.msrs.basic; if (!is_bitwise_subset(vmx_basic, data, feature_and_reserved)) return -EINVAL; @@ -1084,42 +1083,36 @@ static int vmx_restore_vmx_basic(struct vcpu_vmx *vmx, u64 data) return 0; } -static void vmx_get_control_msr(struct nested_vmx_msrs *msrs, u32 msr_index, - u32 **low, u32 **high) +static int +vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) { + u64 supported; + u32 *lowp, *highp; + switch (msr_index) { case MSR_IA32_VMX_TRUE_PINBASED_CTLS: - *low = &msrs->pinbased_ctls_low; - *high = &msrs->pinbased_ctls_high; + lowp = &vmx->nested.msrs.pinbased_ctls_low; + highp = &vmx->nested.msrs.pinbased_ctls_high; break; case MSR_IA32_VMX_TRUE_PROCBASED_CTLS: - *low = &msrs->procbased_ctls_low; - *high = &msrs->procbased_ctls_high; + lowp = &vmx->nested.msrs.procbased_ctls_low; + highp = &vmx->nested.msrs.procbased_ctls_high; break; case MSR_IA32_VMX_TRUE_EXIT_CTLS: - *low = &msrs->exit_ctls_low; - *high = &msrs->exit_ctls_high; + lowp = &vmx->nested.msrs.exit_ctls_low; + highp = &vmx->nested.msrs.exit_ctls_high; break; case MSR_IA32_VMX_TRUE_ENTRY_CTLS: - *low = &msrs->entry_ctls_low; - *high = &msrs->entry_ctls_high; + lowp = &vmx->nested.msrs.entry_ctls_low; + highp = &vmx->nested.msrs.entry_ctls_high; break; case MSR_IA32_VMX_PROCBASED_CTLS2: - *low = &msrs->secondary_ctls_low; - *high = &msrs->secondary_ctls_high; + lowp = &vmx->nested.msrs.secondary_ctls_low; + highp = &vmx->nested.msrs.secondary_ctls_high; break; default: BUG(); } -} - -static int -vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) -{ - u32 *lowp, *highp; - u64 supported; - - vmx_get_control_msr(&vmcs_config.nested, msr_index, &lowp, &highp); supported = vmx_control_msr(*lowp, *highp); @@ -1131,7 +1124,6 @@ vmx_restore_control_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) if (!is_bitwise_subset(supported, data, GENMASK_ULL(63, 32))) return -EINVAL; - vmx_get_control_msr(&vmx->nested.msrs, msr_index, &lowp, &highp); *lowp = data; *highp = data >> 32; return 0; @@ -1145,8 +1137,10 @@ static int vmx_restore_vmx_misc(struct vcpu_vmx *vmx, u64 data) BIT_ULL(28) | BIT_ULL(29) | BIT_ULL(30) | /* reserved */ GENMASK_ULL(13, 9) | BIT_ULL(31); - u64 vmx_misc = vmx_control_msr(vmcs_config.nested.misc_low, - vmcs_config.nested.misc_high); + u64 vmx_misc; + + vmx_misc = vmx_control_msr(vmx->nested.msrs.misc_low, + vmx->nested.msrs.misc_high); if (!is_bitwise_subset(vmx_misc, data, feature_and_reserved_bits)) return -EINVAL; @@ -1174,8 +1168,10 @@ static int vmx_restore_vmx_misc(struct vcpu_vmx *vmx, u64 data) static int vmx_restore_vmx_ept_vpid_cap(struct vcpu_vmx *vmx, u64 data) { - u64 vmx_ept_vpid_cap = vmx_control_msr(vmcs_config.nested.ept_caps, - vmcs_config.nested.vpid_caps); + u64 vmx_ept_vpid_cap; + + vmx_ept_vpid_cap = vmx_control_msr(vmx->nested.msrs.ept_caps, + vmx->nested.msrs.vpid_caps); /* Every bit is either reserved or a feature bit. */ if (!is_bitwise_subset(vmx_ept_vpid_cap, data, -1ULL)) @@ -1186,21 +1182,20 @@ static int vmx_restore_vmx_ept_vpid_cap(struct vcpu_vmx *vmx, u64 data) return 0; } -static u64 *vmx_get_fixed0_msr(struct nested_vmx_msrs *msrs, u32 msr_index) +static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) { + u64 *msr; + switch (msr_index) { case MSR_IA32_VMX_CR0_FIXED0: - return &msrs->cr0_fixed0; + msr = &vmx->nested.msrs.cr0_fixed0; + break; case MSR_IA32_VMX_CR4_FIXED0: - return &msrs->cr4_fixed0; + msr = &vmx->nested.msrs.cr4_fixed0; + break; default: BUG(); } -} - -static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) -{ - const u64 *msr = vmx_get_fixed0_msr(&vmcs_config.nested, msr_index); /* * 1 bits (which indicates bits which "must-be-1" during VMX operation) @@ -1209,7 +1204,7 @@ static int vmx_restore_fixed0_msr(struct vcpu_vmx *vmx, u32 msr_index, u64 data) if (!is_bitwise_subset(data, *msr, -1ULL)) return -EINVAL; - *vmx_get_fixed0_msr(&vmx->nested.msrs, msr_index) = data; + *msr = data; return 0; } @@ -1270,7 +1265,7 @@ int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data) vmx->nested.msrs.vmcs_enum = data; return 0; case MSR_IA32_VMX_VMFUNC: - if (data & ~vmcs_config.nested.vmfunc_controls) + if (data & ~vmx->nested.msrs.vmfunc_controls) return -EINVAL; vmx->nested.msrs.vmfunc_controls = data; return 0; @@ -2073,8 +2068,8 @@ static void prepare_vmcs02_early(struct vcpu_vmx *vmx, struct vmcs12 *vmcs12) * EXEC CONTROLS */ exec_control = vmx_exec_control(vmx); /* L0's desires */ - exec_control &= ~CPU_BASED_INTR_WINDOW_EXITING; - exec_control &= ~CPU_BASED_NMI_WINDOW_EXITING; + exec_control &= ~CPU_BASED_VIRTUAL_INTR_PENDING; + exec_control &= ~CPU_BASED_VIRTUAL_NMI_PENDING; exec_control &= ~CPU_BASED_TPR_SHADOW; exec_control |= vmcs12->cpu_based_vm_exec_control; @@ -2459,7 +2454,7 @@ static int nested_vmx_check_nmi_controls(struct vmcs12 *vmcs12) return -EINVAL; if (CC(!nested_cpu_has_virtual_nmis(vmcs12) && - nested_cpu_has(vmcs12, CPU_BASED_NMI_WINDOW_EXITING))) + nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING))) return -EINVAL; return 0; @@ -2779,7 +2774,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, u32 *exit_qual) { - bool ia32e = !!(vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE); + bool ia32e; *exit_qual = ENTRY_FAIL_DEFAULT; @@ -2796,13 +2791,6 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, return -EINVAL; } - if (CC((vmcs12->guest_cr0 & (X86_CR0_PG | X86_CR0_PE)) == X86_CR0_PG)) - return -EINVAL; - - if (CC(ia32e && !(vmcs12->guest_cr4 & X86_CR4_PAE)) || - CC(ia32e && !(vmcs12->guest_cr0 & X86_CR0_PG))) - return -EINVAL; - /* * If the load IA32_EFER VM-entry control is 1, the following checks * are performed on the field for the IA32_EFER MSR: @@ -2814,6 +2802,7 @@ static int nested_vmx_check_guest_state(struct kvm_vcpu *vcpu, */ if (to_vmx(vcpu)->nested.nested_run_pending && (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)) { + ia32e = (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE) != 0; if (CC(!kvm_valid_efer(vcpu, vmcs12->guest_ia32_efer)) || CC(ia32e != !!(vmcs12->guest_ia32_efer & EFER_LMA)) || CC(((vmcs12->guest_cr0 & X86_CR0_PG) && @@ -2870,8 +2859,35 @@ static int nested_vmx_check_vmentry_hw(struct kvm_vcpu *vcpu) vmx->loaded_vmcs->host_state.cr4 = cr4; } - vm_fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs, - __vmx_vcpu_run_flags(vmx)); + asm( + "sub $%c[wordsize], %%" _ASM_SP "\n\t" /* temporarily adjust RSP for CALL */ + "cmp %%" _ASM_SP ", %c[host_state_rsp](%[loaded_vmcs]) \n\t" + "je 1f \n\t" + __ex("vmwrite %%" _ASM_SP ", %[HOST_RSP]") "\n\t" + "mov %%" _ASM_SP ", %c[host_state_rsp](%[loaded_vmcs]) \n\t" + "1: \n\t" + "add $%c[wordsize], %%" _ASM_SP "\n\t" /* un-adjust RSP */ + + /* Check if vmlaunch or vmresume is needed */ + "cmpb $0, %c[launched](%[loaded_vmcs])\n\t" + + /* + * VMLAUNCH and VMRESUME clear RFLAGS.{CF,ZF} on VM-Exit, set + * RFLAGS.CF on VM-Fail Invalid and set RFLAGS.ZF on VM-Fail + * Valid. vmx_vmenter() directly "returns" RFLAGS, and so the + * results of VM-Enter is captured via CC_{SET,OUT} to vm_fail. + */ + "call vmx_vmenter\n\t" + + CC_SET(be) + : ASM_CALL_CONSTRAINT, CC_OUT(be) (vm_fail) + : [HOST_RSP]"r"((unsigned long)HOST_RSP), + [loaded_vmcs]"r"(vmx->loaded_vmcs), + [launched]"i"(offsetof(struct loaded_vmcs, launched)), + [host_state_rsp]"i"(offsetof(struct loaded_vmcs, host_state.rsp)), + [wordsize]"i"(sizeof(ulong)) + : "memory" + ); if (vmx->msr_autoload.host.nr) vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.host.nr); @@ -3045,16 +3061,14 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, u32 exit_qual; evaluate_pending_interrupts = exec_controls_get(vmx) & - (CPU_BASED_INTR_WINDOW_EXITING | CPU_BASED_NMI_WINDOW_EXITING); + (CPU_BASED_VIRTUAL_INTR_PENDING | CPU_BASED_VIRTUAL_NMI_PENDING); if (likely(!evaluate_pending_interrupts) && kvm_vcpu_apicv_active(vcpu)) evaluate_pending_interrupts |= vmx_has_apicv_interrupt(vcpu); - if (!vmx->nested.nested_run_pending || - !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS)) + if (!(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_DEBUG_CONTROLS)) vmx->nested.vmcs01_debugctl = vmcs_read64(GUEST_IA32_DEBUGCTL); if (kvm_mpx_supported() && - (!vmx->nested.nested_run_pending || - !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS))) + !(vmcs12->vm_entry_controls & VM_ENTRY_LOAD_BNDCFGS)) vmx->nested.vmcs01_guest_bndcfgs = vmcs_read64(GUEST_BNDCFGS); /* @@ -3096,7 +3110,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, } enter_guest_mode(vcpu); - if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING) + if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING) vcpu->arch.tsc_offset += vmcs12->tsc_offset; if (prepare_vmcs02(vcpu, vmcs12, &exit_qual)) @@ -3160,7 +3174,7 @@ enum nvmx_vmentry_status nested_vmx_enter_non_root_mode(struct kvm_vcpu *vcpu, * 26.7 "VM-entry failures during or after loading guest state". */ vmentry_fail_vmexit_guest_mode: - if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING) + if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING) vcpu->arch.tsc_offset -= vmcs12->tsc_offset; leave_guest_mode(vcpu); @@ -3273,8 +3287,8 @@ static int nested_vmx_run(struct kvm_vcpu *vcpu, bool launch) */ if ((vmcs12->guest_activity_state == GUEST_ACTIVITY_HLT) && !(vmcs12->vm_entry_intr_info_field & INTR_INFO_VALID_MASK) && - !(vmcs12->cpu_based_vm_exec_control & CPU_BASED_NMI_WINDOW_EXITING) && - !((vmcs12->cpu_based_vm_exec_control & CPU_BASED_INTR_WINDOW_EXITING) && + !(vmcs12->cpu_based_vm_exec_control & CPU_BASED_VIRTUAL_NMI_PENDING) && + !((vmcs12->cpu_based_vm_exec_control & CPU_BASED_VIRTUAL_INTR_PENDING) && (vmcs12->guest_rflags & X86_EFLAGS_IF))) { vmx->nested.nested_run_pending = 0; return kvm_vcpu_halt(vcpu); @@ -3433,16 +3447,7 @@ static void nested_vmx_inject_exception_vmexit(struct kvm_vcpu *vcpu, u32 intr_info = nr | INTR_INFO_VALID_MASK; if (vcpu->arch.exception.has_error_code) { - /* - * Intel CPUs do not generate error codes with bits 31:16 set, - * and more importantly VMX disallows setting bits 31:16 in the - * injected error code for VM-Entry. Drop the bits to mimic - * hardware and avoid inducing failure on nested VM-Entry if L1 - * chooses to inject the exception back to L2. AMD CPUs _do_ - * generate "full" 32-bit error codes, so KVM allows userspace - * to inject exception error codes with bits 31:16 set. - */ - vmcs12->vm_exit_intr_error_code = (u16)vcpu->arch.exception.error_code; + vmcs12->vm_exit_intr_error_code = vcpu->arch.exception.error_code; intr_info |= INTR_INFO_DELIVER_CODE_MASK; } @@ -3777,6 +3782,14 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, nested_vmx_abort(vcpu, VMX_ABORT_SAVE_GUEST_MSR_FAIL); } + + /* + * Drop what we picked up for L2 via vmx_complete_interrupts. It is + * preserved above and would only end up incorrectly in L1. + */ + vcpu->arch.nmi_injected = false; + kvm_clear_exception_queue(vcpu); + kvm_clear_interrupt_queue(vcpu); } /* @@ -4079,7 +4092,7 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, if (nested_cpu_has_preemption_timer(vmcs12)) hrtimer_cancel(&to_vmx(vcpu)->nested.preemption_timer); - if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING) + if (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING) vcpu->arch.tsc_offset -= vmcs12->tsc_offset; if (likely(!vmx->fail)) { @@ -4111,30 +4124,8 @@ void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, WARN_ON_ONCE(nested_early_check); } - /* - * Drop events/exceptions that were queued for re-injection to L2 - * (picked up via vmx_complete_interrupts()), as well as exceptions - * that were pending for L2. Note, this must NOT be hoisted above - * prepare_vmcs12(), events/exceptions queued for re-injection need to - * be captured in vmcs12 (see vmcs12_save_pending_event()). - */ - vcpu->arch.nmi_injected = false; - kvm_clear_exception_queue(vcpu); - kvm_clear_interrupt_queue(vcpu); - vmx_switch_vmcs(vcpu, &vmx->vmcs01); - /* - * If IBRS is advertised to the vCPU, KVM must flush the indirect - * branch predictors when transitioning from L2 to L1, as L1 expects - * hardware (KVM in this case) to provide separate predictor modes. - * Bare metal isolates VMX root (host) from VMX non-root (guest), but - * doesn't isolate different VMCSs, i.e. in this case, doesn't provide - * separate modes for L2 vs L1. - */ - if (guest_cpuid_has(vcpu, X86_FEATURE_SPEC_CTRL)) - indirect_branch_prediction_barrier(); - /* Update any VMCS fields that might have changed while L2 ran */ vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, vmx->msr_autoload.host.nr); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, vmx->msr_autoload.guest.nr); @@ -5393,10 +5384,10 @@ bool nested_vmx_exit_reflected(struct kvm_vcpu *vcpu, u32 exit_reason) return false; case EXIT_REASON_TRIPLE_FAULT: return true; - case EXIT_REASON_INTERRUPT_WINDOW: - return nested_cpu_has(vmcs12, CPU_BASED_INTR_WINDOW_EXITING); + case EXIT_REASON_PENDING_INTERRUPT: + return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_INTR_PENDING); case EXIT_REASON_NMI_WINDOW: - return nested_cpu_has(vmcs12, CPU_BASED_NMI_WINDOW_EXITING); + return nested_cpu_has(vmcs12, CPU_BASED_VIRTUAL_NMI_PENDING); case EXIT_REASON_TASK_SWITCH: return true; case EXIT_REASON_CPUID: @@ -5886,8 +5877,8 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) msrs->procbased_ctls_low = CPU_BASED_ALWAYSON_WITHOUT_TRUE_MSR; msrs->procbased_ctls_high &= - CPU_BASED_INTR_WINDOW_EXITING | - CPU_BASED_NMI_WINDOW_EXITING | CPU_BASED_USE_TSC_OFFSETTING | + CPU_BASED_VIRTUAL_INTR_PENDING | + CPU_BASED_VIRTUAL_NMI_PENDING | CPU_BASED_USE_TSC_OFFSETING | CPU_BASED_HLT_EXITING | CPU_BASED_INVLPG_EXITING | CPU_BASED_MWAIT_EXITING | CPU_BASED_CR3_LOAD_EXITING | CPU_BASED_CR3_STORE_EXITING | @@ -5933,8 +5924,7 @@ void nested_vmx_setup_ctls_msrs(struct nested_vmx_msrs *msrs, u32 ept_caps) SECONDARY_EXEC_RDRAND_EXITING | SECONDARY_EXEC_ENABLE_INVPCID | SECONDARY_EXEC_RDSEED_EXITING | - SECONDARY_EXEC_XSAVES | - SECONDARY_EXEC_ENABLE_USR_WAIT_PAUSE; + SECONDARY_EXEC_XSAVES; /* * We can emulate "VMCS shadowing," even if the hardware
diff --git a/arch/x86/kvm/vmx/run_flags.h b/arch/x86/kvm/vmx/run_flags.h deleted file mode 100644 index edc3f16..0000000 --- a/arch/x86/kvm/vmx/run_flags.h +++ /dev/null
@@ -1,8 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __KVM_X86_VMX_RUN_FLAGS_H -#define __KVM_X86_VMX_RUN_FLAGS_H - -#define VMX_RUN_VMRESUME (1 << 0) -#define VMX_RUN_SAVE_SPEC_CTRL (1 << 1) - -#endif /* __KVM_X86_VMX_RUN_FLAGS_H */
diff --git a/arch/x86/kvm/vmx/vmenter.S b/arch/x86/kvm/vmx/vmenter.S index 2850670..946d920 100644 --- a/arch/x86/kvm/vmx/vmenter.S +++ b/arch/x86/kvm/vmx/vmenter.S
@@ -4,7 +4,6 @@ #include <asm/bitsperlong.h> #include <asm/kvm_vcpu_regs.h> #include <asm/nospec-branch.h> -#include "run_flags.h" #define WORD_SIZE (BITS_PER_LONG / 8) @@ -31,11 +30,77 @@ .text /** + * vmx_vmenter - VM-Enter the current loaded VMCS + * + * %RFLAGS.ZF: !VMCS.LAUNCHED, i.e. controls VMLAUNCH vs. VMRESUME + * + * Returns: + * %RFLAGS.CF is set on VM-Fail Invalid + * %RFLAGS.ZF is set on VM-Fail Valid + * %RFLAGS.{CF,ZF} are cleared on VM-Success, i.e. VM-Exit + * + * Note that VMRESUME/VMLAUNCH fall-through and return directly if + * they VM-Fail, whereas a successful VM-Enter + VM-Exit will jump + * to vmx_vmexit. + */ +ENTRY(vmx_vmenter) + /* EFLAGS.ZF is set if VMCS.LAUNCHED == 0 */ + je 2f + +1: vmresume + ret + +2: vmlaunch + ret + +3: cmpb $0, kvm_rebooting + je 4f + ret +4: ud2 + + .pushsection .fixup, "ax" +5: jmp 3b + .popsection + + _ASM_EXTABLE(1b, 5b) + _ASM_EXTABLE(2b, 5b) + +ENDPROC(vmx_vmenter) + +/** + * vmx_vmexit - Handle a VMX VM-Exit + * + * Returns: + * %RFLAGS.{CF,ZF} are cleared on VM-Success, i.e. VM-Exit + * + * This is vmx_vmenter's partner in crime. On a VM-Exit, control will jump + * here after hardware loads the host's state, i.e. this is the destination + * referred to by VMCS.HOST_RIP. + */ +ENTRY(vmx_vmexit) +#ifdef CONFIG_RETPOLINE + ALTERNATIVE "jmp .Lvmexit_skip_rsb", "", X86_FEATURE_RETPOLINE + /* Preserve guest's RAX, it's used to stuff the RSB. */ + push %_ASM_AX + + /* IMPORTANT: Stuff the RSB immediately after VM-Exit, before RET! */ + FILL_RETURN_BUFFER %_ASM_AX, RSB_CLEAR_LOOPS, X86_FEATURE_RETPOLINE + + /* Clear RFLAGS.CF and RFLAGS.ZF to preserve VM-Exit, i.e. !VM-Fail. */ + or $1, %_ASM_AX + + pop %_ASM_AX +.Lvmexit_skip_rsb: +#endif + ISSUE_UNBALANCED_RET_GUARD X86_FEATURE_RSB_VMEXIT_LITE + ret +ENDPROC(vmx_vmexit) + +/** * __vmx_vcpu_run - Run a vCPU via a transition to VMX guest mode - * @vmx: struct vcpu_vmx * + * @vmx: struct vcpu_vmx * (forwarded to vmx_update_host_rsp) * @regs: unsigned long * (to guest registers) - * @flags: VMX_RUN_VMRESUME: use VMRESUME instead of VMLAUNCH - * VMX_RUN_SAVE_SPEC_CTRL: save guest SPEC_CTRL into vmx->spec_ctrl + * @launched: %true if the VMCS has been launched * * Returns: * 0 on VM-Exit, 1 on VM-Fail @@ -54,29 +119,24 @@ #endif push %_ASM_BX - /* Save @vmx for SPEC_CTRL handling */ - push %_ASM_ARG1 - - /* Save @flags for SPEC_CTRL handling */ - push %_ASM_ARG3 - /* * Save @regs, _ASM_ARG2 may be modified by vmx_update_host_rsp() and * @regs is needed after VM-Exit to save the guest's register values. */ push %_ASM_ARG2 - /* Copy @flags to BL, _ASM_ARG3 is volatile. */ + /* Copy @launched to BL, _ASM_ARG3 is volatile. */ mov %_ASM_ARG3B, %bl - lea (%_ASM_SP), %_ASM_ARG2 + /* Adjust RSP to account for the CALL to vmx_vmenter(). */ + lea -WORD_SIZE(%_ASM_SP), %_ASM_ARG2 call vmx_update_host_rsp /* Load @regs to RAX. */ mov (%_ASM_SP), %_ASM_AX /* Check if vmlaunch or vmresume is needed */ - testb $VMX_RUN_VMRESUME, %bl + cmpb $0, %bl /* Load guest registers. Don't clobber flags. */ mov VCPU_RBX(%_ASM_AX), %_ASM_BX @@ -98,25 +158,11 @@ /* Load guest RAX. This kills the @regs pointer! */ mov VCPU_RAX(%_ASM_AX), %_ASM_AX - /* Check EFLAGS.ZF from 'testb' above */ - jz .Lvmlaunch + /* Enter guest mode */ + call vmx_vmenter -/* - * If VMRESUME/VMLAUNCH and corresponding vmexit succeed, execution resumes at - * the 'vmx_vmexit' label below. - */ -.Lvmresume: - vmresume - jmp .Lvmfail - -.Lvmlaunch: - vmlaunch - jmp .Lvmfail - - _ASM_EXTABLE(.Lvmresume, .Lfixup) - _ASM_EXTABLE(.Lvmlaunch, .Lfixup) - -SYM_INNER_LABEL(vmx_vmexit, SYM_L_GLOBAL) + /* Jump on VM-Fail. */ + jbe 2f /* Temporarily save guest's RAX. */ push %_ASM_AX @@ -143,21 +189,19 @@ mov %r15, VCPU_R15(%_ASM_AX) #endif - /* Clear return value to indicate VM-Exit (as opposed to VM-Fail). */ - xor %ebx, %ebx + /* Clear RAX to indicate VM-Exit (as opposed to VM-Fail). */ + xor %eax, %eax -.Lclear_regs: /* - * Clear all general purpose registers except RSP and RBX to prevent + * Clear all general purpose registers except RSP and RAX to prevent * speculative use of the guest's values, even those that are reloaded * via the stack. In theory, an L1 cache miss when restoring registers * could lead to speculative execution with the guest's values. * Zeroing XORs are dirt cheap, i.e. the extra paranoia is essentially * free. RSP and RAX are exempt as RSP is restored by hardware during - * VM-Exit and RBX is explicitly loaded with 0 or 1 to hold the return - * value. + * VM-Exit and RAX is explicitly loaded with 0 or 1 to return VM-Fail. */ - xor %eax, %eax +1: xor %ebx, %ebx xor %ecx, %ecx xor %edx, %edx xor %esi, %esi @@ -176,32 +220,8 @@ /* "POP" @regs. */ add $WORD_SIZE, %_ASM_SP - - /* - * IMPORTANT: RSB filling and SPEC_CTRL handling must be done before - * the first unbalanced RET after vmexit! - * - * For retpoline or IBRS, RSB filling is needed to prevent poisoned RSB - * entries and (in some cases) RSB underflow. - * - * eIBRS has its own protection against poisoned RSB, so it doesn't - * need the RSB filling sequence. But it does need to be enabled, and a - * single call to retire, before the first unbalanced RET. - */ - - FILL_RETURN_BUFFER %_ASM_CX, RSB_CLEAR_LOOPS, X86_FEATURE_RSB_VMEXIT,\ - X86_FEATURE_RSB_VMEXIT_LITE - - - pop %_ASM_ARG2 /* @flags */ - pop %_ASM_ARG1 /* @vmx */ - - call vmx_spec_ctrl_restore_host - - /* Put return value in AX */ - mov %_ASM_BX, %_ASM_AX - pop %_ASM_BX + #ifdef CONFIG_X86_64 pop %r12 pop %r13 @@ -214,20 +234,11 @@ pop %_ASM_BP ret -.Lfixup: - cmpb $0, kvm_rebooting - jne .Lvmfail - ud2 -.Lvmfail: - /* VM-Fail: set return value to 1 */ - mov $1, %_ASM_BX - jmp .Lclear_regs - + /* VM-Fail. Out-of-line to avoid a taken Jcc after VM-Exit. */ +2: mov $1, %eax + jmp 1b ENDPROC(__vmx_vcpu_run) - -.section .text, "ax" - /** * vmread_error_trampoline - Trampoline from inline asm to vmread_error() * @field: VMCS field encoding that failed
diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index e6dd6a7..4bd1bf6 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c
@@ -31,7 +31,6 @@ #include <asm/apic.h> #include <asm/asm.h> #include <asm/cpu.h> -#include <asm/cpu_device_id.h> #include <asm/debugreg.h> #include <asm/desc.h> #include <asm/fpu/internal.h> @@ -359,9 +358,9 @@ static __always_inline void vmx_disable_fb_clear(struct vcpu_vmx *vmx) if (!vmx->disable_fb_clear) return; - msr = __rdmsr(MSR_IA32_MCU_OPT_CTRL); + rdmsrl(MSR_IA32_MCU_OPT_CTRL, msr); msr |= FB_CLEAR_DIS; - native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr); + wrmsrl(MSR_IA32_MCU_OPT_CTRL, msr); /* Cache the MSR value to avoid reading it later */ vmx->msr_ia32_mcu_opt_ctrl = msr; } @@ -372,7 +371,7 @@ static __always_inline void vmx_enable_fb_clear(struct vcpu_vmx *vmx) return; vmx->msr_ia32_mcu_opt_ctrl &= ~FB_CLEAR_DIS; - native_wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl); + wrmsrl(MSR_IA32_MCU_OPT_CTRL, vmx->msr_ia32_mcu_opt_ctrl); } static void vmx_update_fb_clear_dis(struct kvm_vcpu *vcpu, struct vcpu_vmx *vmx) @@ -863,24 +862,6 @@ static bool msr_write_intercepted(struct vcpu_vmx *vmx, u32 msr) return true; } -unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx) -{ - unsigned int flags = 0; - - if (vmx->loaded_vmcs->launched) - flags |= VMX_RUN_VMRESUME; - - /* - * If writes to the SPEC_CTRL MSR aren't intercepted, the guest is free - * to change it directly without causing a vmexit. In that case read - * it after vmexit and store it in vmx->spec_ctrl. - */ - if (unlikely(!msr_write_intercepted(vmx, MSR_IA32_SPEC_CTRL))) - flags |= VMX_RUN_SAVE_SPEC_CTRL; - - return flags; -} - static void clear_atomic_switch_msr_special(struct vcpu_vmx *vmx, unsigned long entry, unsigned long exit) { @@ -1397,10 +1378,8 @@ void vmx_vcpu_load_vmcs(struct kvm_vcpu *vcpu, int cpu, /* * No indirect branch prediction barrier needed when switching - * the active VMCS within a vCPU, unless IBRS is advertised to - * the vCPU. To minimize the number of IBPBs executed, KVM - * performs IBPB on nested VM-Exit (a single nested transition - * may switch the active VMCS multiple times). + * the active VMCS within a guest, e.g. on nested VM-Enter. + * The L1 VMM can protect itself with retpolines, IBPB or IBRS. */ if (!buddy || WARN_ON_ONCE(buddy->vmcs != prev)) indirect_branch_prediction_barrier(); @@ -1678,17 +1657,7 @@ static void vmx_queue_exception(struct kvm_vcpu *vcpu) kvm_deliver_exception_payload(vcpu); if (has_error_code) { - /* - * Despite the error code being architecturally defined as 32 - * bits, and the VMCS field being 32 bits, Intel CPUs and thus - * VMX don't actually supporting setting bits 31:16. Hardware - * will (should) never provide a bogus error code, but AMD CPUs - * do generate error codes with bits 31:16 set, and so KVM's - * ABI lets userspace shove in arbitrary 32-bit values. Drop - * the upper bits to avoid VM-Fail, losing information that - * does't really exist is preferable to killing the VM. - */ - vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, (u16)error_code); + vmcs_write32(VM_ENTRY_EXCEPTION_ERROR_CODE, error_code); intr_info |= INTR_INFO_DELIVER_CODE_MASK; } @@ -1782,7 +1751,7 @@ static u64 vmx_read_l1_tsc_offset(struct kvm_vcpu *vcpu) struct vmcs12 *vmcs12 = get_vmcs12(vcpu); if (is_guest_mode(vcpu) && - (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING)) + (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING)) return vcpu->arch.tsc_offset - vmcs12->tsc_offset; return vcpu->arch.tsc_offset; @@ -1800,7 +1769,7 @@ static u64 vmx_write_l1_tsc_offset(struct kvm_vcpu *vcpu, u64 offset) * to the newly set TSC to get L2's TSC. */ if (is_guest_mode(vcpu) && - (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETTING)) + (vmcs12->cpu_based_vm_exec_control & CPU_BASED_USE_TSC_OFFSETING)) g_tsc_offset = vmcs12->tsc_offset; trace_kvm_write_tsc_offset(vcpu->vcpu_id, @@ -2427,7 +2396,7 @@ static __init int setup_vmcs_config(struct vmcs_config *vmcs_conf, CPU_BASED_CR3_STORE_EXITING | CPU_BASED_UNCOND_IO_EXITING | CPU_BASED_MOV_DR_EXITING | - CPU_BASED_USE_TSC_OFFSETTING | + CPU_BASED_USE_TSC_OFFSETING | CPU_BASED_MWAIT_EXITING | CPU_BASED_MONITOR_EXITING | CPU_BASED_INVLPG_EXITING | @@ -3243,15 +3212,18 @@ static u32 vmx_segment_access_rights(struct kvm_segment *var) { u32 ar; - ar = var->type & 15; - ar |= (var->s & 1) << 4; - ar |= (var->dpl & 3) << 5; - ar |= (var->present & 1) << 7; - ar |= (var->avl & 1) << 12; - ar |= (var->l & 1) << 13; - ar |= (var->db & 1) << 14; - ar |= (var->g & 1) << 15; - ar |= (var->unusable || !var->present) << 16; + if (var->unusable || !var->present) + ar = 1 << 16; + else { + ar = var->type & 15; + ar |= (var->s & 1) << 4; + ar |= (var->dpl & 3) << 5; + ar |= (var->present & 1) << 7; + ar |= (var->avl & 1) << 12; + ar |= (var->l & 1) << 13; + ar |= (var->db & 1) << 14; + ar |= (var->g & 1) << 15; + } return ar; } @@ -4457,7 +4429,7 @@ static void vmx_vcpu_reset(struct kvm_vcpu *vcpu, bool init_event) static void enable_irq_window(struct kvm_vcpu *vcpu) { - exec_controls_setbit(to_vmx(vcpu), CPU_BASED_INTR_WINDOW_EXITING); + exec_controls_setbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_INTR_PENDING); } static void enable_nmi_window(struct kvm_vcpu *vcpu) @@ -4468,7 +4440,7 @@ static void enable_nmi_window(struct kvm_vcpu *vcpu) return; } - exec_controls_setbit(to_vmx(vcpu), CPU_BASED_NMI_WINDOW_EXITING); + exec_controls_setbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_NMI_PENDING); } static void vmx_inject_irq(struct kvm_vcpu *vcpu) @@ -4801,7 +4773,7 @@ static int handle_exception_nmi(struct kvm_vcpu *vcpu) return 0; } -static __always_inline int handle_external_interrupt(struct kvm_vcpu *vcpu) +static int handle_external_interrupt(struct kvm_vcpu *vcpu) { ++vcpu->stat.irq_exits; return 1; @@ -5073,6 +5045,21 @@ static void vmx_set_dr7(struct kvm_vcpu *vcpu, unsigned long val) vmcs_writel(GUEST_DR7, val); } +static int handle_cpuid(struct kvm_vcpu *vcpu) +{ + return kvm_emulate_cpuid(vcpu); +} + +static int handle_rdmsr(struct kvm_vcpu *vcpu) +{ + return kvm_emulate_rdmsr(vcpu); +} + +static int handle_wrmsr(struct kvm_vcpu *vcpu) +{ + return kvm_emulate_wrmsr(vcpu); +} + static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu) { kvm_apic_update_ppr(vcpu); @@ -5081,7 +5068,7 @@ static int handle_tpr_below_threshold(struct kvm_vcpu *vcpu) static int handle_interrupt_window(struct kvm_vcpu *vcpu) { - exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_INTR_WINDOW_EXITING); + exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_INTR_PENDING); kvm_make_request(KVM_REQ_EVENT, vcpu); @@ -5089,6 +5076,11 @@ static int handle_interrupt_window(struct kvm_vcpu *vcpu) return 1; } +static int handle_halt(struct kvm_vcpu *vcpu) +{ + return kvm_emulate_halt(vcpu); +} + static int handle_vmcall(struct kvm_vcpu *vcpu) { return kvm_emulate_hypercall(vcpu); @@ -5294,7 +5286,7 @@ static int handle_ept_misconfig(struct kvm_vcpu *vcpu) static int handle_nmi_window(struct kvm_vcpu *vcpu) { WARN_ON_ONCE(!enable_vnmi); - exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_NMI_WINDOW_EXITING); + exec_controls_clearbit(to_vmx(vcpu), CPU_BASED_VIRTUAL_NMI_PENDING); ++vcpu->stat.nmi_window_exits; kvm_make_request(KVM_REQ_EVENT, vcpu); @@ -5315,7 +5307,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu) WARN_ON_ONCE(vmx->emulation_required && vmx->nested.nested_run_pending); intr_window_requested = exec_controls_get(vmx) & - CPU_BASED_INTR_WINDOW_EXITING; + CPU_BASED_VIRTUAL_INTR_PENDING; while (vmx->emulation_required && count-- != 0) { if (intr_window_requested && vmx_interrupt_allowed(vcpu)) @@ -5636,11 +5628,11 @@ static int (*kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = { [EXIT_REASON_IO_INSTRUCTION] = handle_io, [EXIT_REASON_CR_ACCESS] = handle_cr, [EXIT_REASON_DR_ACCESS] = handle_dr, - [EXIT_REASON_CPUID] = kvm_emulate_cpuid, - [EXIT_REASON_MSR_READ] = kvm_emulate_rdmsr, - [EXIT_REASON_MSR_WRITE] = kvm_emulate_wrmsr, - [EXIT_REASON_INTERRUPT_WINDOW] = handle_interrupt_window, - [EXIT_REASON_HLT] = kvm_emulate_halt, + [EXIT_REASON_CPUID] = handle_cpuid, + [EXIT_REASON_MSR_READ] = handle_rdmsr, + [EXIT_REASON_MSR_WRITE] = handle_wrmsr, + [EXIT_REASON_PENDING_INTERRUPT] = handle_interrupt_window, + [EXIT_REASON_HLT] = handle_halt, [EXIT_REASON_INVD] = handle_invd, [EXIT_REASON_INVLPG] = handle_invlpg, [EXIT_REASON_RDPMC] = handle_rdpmc, @@ -6014,23 +6006,9 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu) } if (exit_reason < kvm_vmx_max_exit_handlers - && kvm_vmx_exit_handlers[exit_reason]) { -#ifdef CONFIG_RETPOLINE - if (exit_reason == EXIT_REASON_MSR_WRITE) - return kvm_emulate_wrmsr(vcpu); - else if (exit_reason == EXIT_REASON_PREEMPTION_TIMER) - return handle_preemption_timer(vcpu); - else if (exit_reason == EXIT_REASON_INTERRUPT_WINDOW) - return handle_interrupt_window(vcpu); - else if (exit_reason == EXIT_REASON_EXTERNAL_INTERRUPT) - return handle_external_interrupt(vcpu); - else if (exit_reason == EXIT_REASON_HLT) - return kvm_emulate_halt(vcpu); - else if (exit_reason == EXIT_REASON_EPT_MISCONFIG) - return handle_ept_misconfig(vcpu); -#endif + && kvm_vmx_exit_handlers[exit_reason]) return kvm_vmx_exit_handlers[exit_reason](vcpu); - } else { + else { vcpu_unimpl(vcpu, "vmx: unexpected exit reason 0x%x\n", exit_reason); dump_vmcs(); @@ -6561,30 +6539,7 @@ void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp) } } -void noinstr vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx, - unsigned int flags) -{ - u64 hostval = this_cpu_read(x86_spec_ctrl_current); - - if (!cpu_feature_enabled(X86_FEATURE_MSR_SPEC_CTRL)) - return; - - if (flags & VMX_RUN_SAVE_SPEC_CTRL) - vmx->spec_ctrl = __rdmsr(MSR_IA32_SPEC_CTRL); - - /* - * If the guest/host SPEC_CTRL values differ, restore the host value. - * - * For legacy IBRS, the IBRS bit always needs to be written after - * transitioning from a less privileged predictor mode, regardless of - * whether the guest/host values differ. - */ - if (cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS) || - vmx->spec_ctrl != hostval) - native_wrmsrl(MSR_IA32_SPEC_CTRL, hostval); - - barrier_nospec(); -} +bool __vmx_vcpu_run(struct vcpu_vmx *vmx, unsigned long *regs, bool launched); static void vmx_vcpu_run(struct kvm_vcpu *vcpu) { @@ -6673,12 +6628,32 @@ static void vmx_vcpu_run(struct kvm_vcpu *vcpu) write_cr2(vcpu->arch.cr2); vmx->fail = __vmx_vcpu_run(vmx, (unsigned long *)&vcpu->arch.regs, - __vmx_vcpu_run_flags(vmx)); + vmx->loaded_vmcs->launched); vcpu->arch.cr2 = read_cr2(); vmx_enable_fb_clear(vmx); + /* + * We do not use IBRS in the kernel. If this vCPU has used the + * SPEC_CTRL MSR it may have left it on; save the value and + * turn it off. This is much more efficient than blindly adding + * it to the atomic save/restore list. Especially as the former + * (Saving guest MSRs on vmexit) doesn't even exist in KVM. + * + * For non-nested case: + * If the L01 MSR bitmap does not intercept the MSR, then we need to + * save it. + * + * For nested case: + * If the L02 MSR bitmap does not intercept the MSR, then we need to + * save it. + */ + if (unlikely(!msr_write_intercepted(vmx, MSR_IA32_SPEC_CTRL))) + vmx->spec_ctrl = native_read_msr(MSR_IA32_SPEC_CTRL); + + x86_spec_ctrl_restore_host(vmx->spec_ctrl, 0); + /* All fields are clean at this point */ if (static_branch_unlikely(&enable_evmcs)) current_evmcs->hv_clean_fields |=
diff --git a/arch/x86/kvm/vmx/vmx.h b/arch/x86/kvm/vmx/vmx.h index 4d5be46..7a3362a 100644 --- a/arch/x86/kvm/vmx/vmx.h +++ b/arch/x86/kvm/vmx/vmx.h
@@ -10,7 +10,6 @@ #include "capabilities.h" #include "ops.h" #include "vmcs.h" -#include "run_flags.h" extern const u32 vmx_msr_index[]; extern u64 host_efer; @@ -337,10 +336,6 @@ void vmx_set_virtual_apic_mode(struct kvm_vcpu *vcpu); struct shared_msr_entry *find_msr_entry(struct vcpu_vmx *vmx, u32 msr); void pt_update_intercept_for_msr(struct vcpu_vmx *vmx); void vmx_update_host_rsp(struct vcpu_vmx *vmx, unsigned long host_rsp); -void vmx_spec_ctrl_restore_host(struct vcpu_vmx *vmx, unsigned int flags); -unsigned int __vmx_vcpu_run_flags(struct vcpu_vmx *vmx); -bool __vmx_vcpu_run(struct vcpu_vmx *vmx, unsigned long *regs, - unsigned int flags); #define POSTED_INTR_ON 0 #define POSTED_INTR_SN 1
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index f5e9590..d0b2975 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c
@@ -1337,7 +1337,7 @@ static const u32 msr_based_features_all[] = { MSR_IA32_VMX_EPT_VPID_CAP, MSR_IA32_VMX_VMFUNC, - MSR_AMD64_DE_CFG, + MSR_F10H_DECFG, MSR_IA32_UCODE_REV, MSR_IA32_ARCH_CAPABILITIES, }; @@ -3948,11 +3948,12 @@ static void kvm_vcpu_ioctl_x86_get_debugregs(struct kvm_vcpu *vcpu, { unsigned long val; - memset(dbgregs, 0, sizeof(*dbgregs)); memcpy(dbgregs->db, vcpu->arch.db, sizeof(vcpu->arch.db)); kvm_get_dr(vcpu, 6, &val); dbgregs->dr6 = val; dbgregs->dr7 = vcpu->arch.dr7; + dbgregs->flags = 0; + memset(&dbgregs->reserved, 0, sizeof(dbgregs->reserved)); } static int kvm_vcpu_ioctl_x86_set_debugregs(struct kvm_vcpu *vcpu, @@ -6787,9 +6788,7 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, write_fault_to_spt, emulation_type)) return 1; - - if (ctxt->have_exception && - !(emulation_type & EMULTYPE_SKIP)) { + if (ctxt->have_exception) { /* * #UD should result in just EMULATION_FAILED, and trap-like * exception should not be encountered during decode. @@ -10330,9 +10329,9 @@ void kvm_arch_end_assignment(struct kvm *kvm) } EXPORT_SYMBOL_GPL(kvm_arch_end_assignment); -bool noinstr kvm_arch_has_assigned_device(struct kvm *kvm) +bool kvm_arch_has_assigned_device(struct kvm *kvm) { - return arch_atomic_read(&kvm->arch.assigned_device_count); + return atomic_read(&kvm->arch.assigned_device_count); } EXPORT_SYMBOL_GPL(kvm_arch_has_assigned_device);
diff --git a/arch/x86/lib/iomap_copy_64.S b/arch/x86/lib/iomap_copy_64.S index 1329d7c..a9bdf08 100644 --- a/arch/x86/lib/iomap_copy_64.S +++ b/arch/x86/lib/iomap_copy_64.S
@@ -10,6 +10,6 @@ */ ENTRY(__iowrite32_copy) movl %edx,%ecx - rep movsl + rep movsd ret ENDPROC(__iowrite32_copy)
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 137714d..a353f88 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c
@@ -214,14 +214,8 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size, * Mappings have to be page-aligned */ offset = phys_addr & ~PAGE_MASK; - phys_addr &= PAGE_MASK; - size = PAGE_ALIGN(last_addr+1) - phys_addr; - - /* - * Mask out any bits not part of the actual physical - * address, like memory encryption bits. - */ phys_addr &= PHYSICAL_PAGE_MASK; + size = PAGE_ALIGN(last_addr+1) - phys_addr; retval = reserve_memtype(phys_addr, (u64)phys_addr + size, pcm, &new_pcm);
diff --git a/arch/x86/mm/kaslr.c b/arch/x86/mm/kaslr.c index a37c287..dc6182e 100644 --- a/arch/x86/mm/kaslr.c +++ b/arch/x86/mm/kaslr.c
@@ -182,11 +182,11 @@ static void __meminit init_trampoline_pud(void) set_p4d(p4d_tramp, __p4d(_KERNPG_TABLE | __pa(pud_page_tramp))); - trampoline_pgd_entry = - __pgd(_KERNPG_TABLE | __pa(p4d_page_tramp)); + set_pgd(&trampoline_pgd_entry, + __pgd(_KERNPG_TABLE | __pa(p4d_page_tramp))); } else { - trampoline_pgd_entry = - __pgd(_KERNPG_TABLE | __pa(pud_page_tramp)); + set_pgd(&trampoline_pgd_entry, + __pgd(_KERNPG_TABLE | __pa(pud_page_tramp))); } }
diff --git a/arch/x86/mm/mem_encrypt_identity.c b/arch/x86/mm/mem_encrypt_identity.c index 77d4aa5..ebc8e3a 100644 --- a/arch/x86/mm/mem_encrypt_identity.c +++ b/arch/x86/mm/mem_encrypt_identity.c
@@ -579,8 +579,7 @@ void __init sme_enable(struct boot_params *bp) cmdline_ptr = (const char *)((u64)bp->hdr.cmd_line_ptr | ((u64)bp->ext_cmd_line_ptr << 32)); - if (cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)) < 0) - return; + cmdline_find_option(cmdline_ptr, cmdline_arg, buffer, sizeof(buffer)); if (!strncmp(buffer, cmdline_on, sizeof(buffer))) sme_me_mask = me_mask;
diff --git a/arch/x86/mm/numa.c b/arch/x86/mm/numa.c index eac8988..7ec5eb6 100644 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c
@@ -822,7 +822,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable) return; } mask = node_to_cpumask_map[node]; - if (!cpumask_available(mask)) { + if (!mask) { pr_err("node_to_cpumask_map[%i] NULL\n", node); dump_stack(); return; @@ -868,7 +868,7 @@ const struct cpumask *cpumask_of_node(int node) dump_stack(); return cpu_none_mask; } - if (!cpumask_available(node_to_cpumask_map[node])) { + if (node_to_cpumask_map[node] == NULL) { printk(KERN_WARNING "cpumask_of_node(%d): no node_to_cpumask_map!\n", node);
diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index 94291e0..76959a7 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c
@@ -7,7 +7,6 @@ #include <linux/dmi.h> #include <linux/pci.h> #include <linux/vgaarb.h> -#include <asm/amd_nb.h> #include <asm/hpet.h> #include <asm/pci_x86.h> @@ -825,23 +824,3 @@ static void rs690_fix_64bit_dma(struct pci_dev *pdev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x7910, rs690_fix_64bit_dma); #endif - -#ifdef CONFIG_AMD_NB - -#define AMD_15B8_RCC_DEV2_EPF0_STRAP2 0x10136008 -#define AMD_15B8_RCC_DEV2_EPF0_STRAP2_NO_SOFT_RESET_DEV2_F0_MASK 0x00000080L - -static void quirk_clear_strap_no_soft_reset_dev2_f0(struct pci_dev *dev) -{ - u32 data; - - if (!amd_smn_read(0, AMD_15B8_RCC_DEV2_EPF0_STRAP2, &data)) { - data &= ~AMD_15B8_RCC_DEV2_EPF0_STRAP2_NO_SOFT_RESET_DEV2_F0_MASK; - if (amd_smn_write(0, AMD_15B8_RCC_DEV2_EPF0_STRAP2, data)) - pci_err(dev, "Failed to write data 0x%x\n", data); - } else { - pci_err(dev, "Failed to read data\n"); - } -} -DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, 0x15b8, quirk_clear_strap_no_soft_reset_dev2_f0); -#endif
diff --git a/arch/x86/platform/olpc/olpc-xo1-sci.c b/arch/x86/platform/olpc/olpc-xo1-sci.c index 9073589..99a28ce 100644 --- a/arch/x86/platform/olpc/olpc-xo1-sci.c +++ b/arch/x86/platform/olpc/olpc-xo1-sci.c
@@ -81,7 +81,7 @@ static void send_ebook_state(void) return; } - if (test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == !!state) + if (!!test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == state) return; /* Nothing new to report. */ input_report_switch(ebook_switch_idev, SW_TABLET_MODE, state);
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c index c09931c..d1ebdae 100644 --- a/arch/x86/power/cpu.c +++ b/arch/x86/power/cpu.c
@@ -535,23 +535,15 @@ static int pm_cpu_check(const struct x86_cpu_id *c) static void pm_save_spec_msr(void) { - struct msr_enumeration { - u32 msr_no; - u32 feature; - } msr_enum[] = { - { MSR_IA32_SPEC_CTRL, X86_FEATURE_MSR_SPEC_CTRL }, - { MSR_IA32_TSX_CTRL, X86_FEATURE_MSR_TSX_CTRL }, - { MSR_TSX_FORCE_ABORT, X86_FEATURE_TSX_FORCE_ABORT }, - { MSR_IA32_MCU_OPT_CTRL, X86_FEATURE_SRBDS_CTRL }, - { MSR_AMD64_LS_CFG, X86_FEATURE_LS_CFG_SSBD }, - { MSR_AMD64_DE_CFG, X86_FEATURE_LFENCE_RDTSC }, + u32 spec_msr_id[] = { + MSR_IA32_SPEC_CTRL, + MSR_IA32_TSX_CTRL, + MSR_TSX_FORCE_ABORT, + MSR_IA32_MCU_OPT_CTRL, + MSR_AMD64_LS_CFG, }; - int i; - for (i = 0; i < ARRAY_SIZE(msr_enum); i++) { - if (boot_cpu_has(msr_enum[i].feature)) - msr_build_context(&msr_enum[i].msr_no, 1); - } + msr_build_context(spec_msr_id, ARRAY_SIZE(spec_msr_id)); } static int pm_check_save_msr(void)
diff --git a/arch/x86/purgatory/Makefile b/arch/x86/purgatory/Makefile index 969d2b2..9733d1c 100644 --- a/arch/x86/purgatory/Makefile +++ b/arch/x86/purgatory/Makefile
@@ -27,7 +27,7 @@ # make up the standalone purgatory.ro PURGATORY_CFLAGS_REMOVE := -mcmodel=kernel -PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss -g0 +PURGATORY_CFLAGS := -mcmodel=large -ffreestanding -fno-zero-initialized-in-bss PURGATORY_CFLAGS += $(DISABLE_STACKLEAK_PLUGIN) -DDISABLE_BRANCH_PROFILING # Default KBUILD_CFLAGS can have -pg option set when FTRACE is enabled. That @@ -58,9 +58,6 @@ CFLAGS_REMOVE_string.o += $(PURGATORY_CFLAGS_REMOVE) CFLAGS_string.o += $(PURGATORY_CFLAGS) -AFLAGS_REMOVE_setup-x86_$(BITS).o += -g -Wa,-gdwarf-2 -AFLAGS_REMOVE_entry64.o += -g -Wa,-gdwarf-2 - $(obj)/purgatory.ro: $(PURGATORY_OBJS) FORCE $(call if_changed,ld)
diff --git a/arch/x86/um/shared/sysdep/syscalls_32.h b/arch/x86/um/shared/sysdep/syscalls_32.h index f6e9f84..68fd2cf 100644 --- a/arch/x86/um/shared/sysdep/syscalls_32.h +++ b/arch/x86/um/shared/sysdep/syscalls_32.h
@@ -6,9 +6,10 @@ #include <asm/unistd.h> #include <sysdep/ptrace.h> -typedef long syscall_handler_t(struct syscall_args); +typedef long syscall_handler_t(struct pt_regs); extern syscall_handler_t *sys_call_table[]; #define EXECUTE_SYSCALL(syscall, regs) \ - ((*sys_call_table[syscall]))(SYSCALL_ARGS(®s->regs)) + ((long (*)(struct syscall_args)) \ + (*sys_call_table[syscall]))(SYSCALL_ARGS(®s->regs))
diff --git a/arch/x86/um/tls_32.c b/arch/x86/um/tls_32.c index 66162ea..ac8eee0 100644 --- a/arch/x86/um/tls_32.c +++ b/arch/x86/um/tls_32.c
@@ -65,6 +65,9 @@ static int get_free_idx(struct task_struct* task) struct thread_struct *t = &task->thread; int idx; + if (!t->arch.tls_array) + return GDT_ENTRY_TLS_MIN; + for (idx = 0; idx < GDT_ENTRY_TLS_ENTRIES; idx++) if (!t->arch.tls_array[idx].present) return idx + GDT_ENTRY_TLS_MIN; @@ -237,6 +240,9 @@ static int get_tls_entry(struct task_struct *task, struct user_desc *info, { struct thread_struct *t = &task->thread; + if (!t->arch.tls_array) + goto clear; + if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL;
diff --git a/arch/x86/um/vdso/Makefile b/arch/x86/um/vdso/Makefile index bec1150..0caddd6 100644 --- a/arch/x86/um/vdso/Makefile +++ b/arch/x86/um/vdso/Makefile
@@ -62,7 +62,7 @@ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \ sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@' -VDSO_LDFLAGS = -fPIC -shared -Wl,--hash-style=sysv -z noexecstack +VDSO_LDFLAGS = -fPIC -shared -Wl,--hash-style=sysv GCOV_PROFILE := n #
diff --git a/arch/x86/um/vdso/um_vdso.c b/arch/x86/um/vdso/um_vdso.c index 6d52690..8918687 100644 --- a/arch/x86/um/vdso/um_vdso.c +++ b/arch/x86/um/vdso/um_vdso.c
@@ -17,10 +17,8 @@ int __vdso_clock_gettime(clockid_t clock, struct timespec *ts) { long ret; - asm("syscall" - : "=a" (ret) - : "0" (__NR_clock_gettime), "D" (clock), "S" (ts) - : "rcx", "r11", "memory"); + asm("syscall" : "=a" (ret) : + "0" (__NR_clock_gettime), "D" (clock), "S" (ts) : "memory"); return ret; } @@ -31,10 +29,8 @@ int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz) { long ret; - asm("syscall" - : "=a" (ret) - : "0" (__NR_gettimeofday), "D" (tv), "S" (tz) - : "rcx", "r11", "memory"); + asm("syscall" : "=a" (ret) : + "0" (__NR_gettimeofday), "D" (tv), "S" (tz) : "memory"); return ret; }
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index a1cc855..7a43b2a 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c
@@ -32,30 +32,30 @@ static irqreturn_t xen_reschedule_interrupt(int irq, void *dev_id) void xen_smp_intr_free(unsigned int cpu) { - kfree(per_cpu(xen_resched_irq, cpu).name); - per_cpu(xen_resched_irq, cpu).name = NULL; if (per_cpu(xen_resched_irq, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_resched_irq, cpu).irq, NULL); per_cpu(xen_resched_irq, cpu).irq = -1; + kfree(per_cpu(xen_resched_irq, cpu).name); + per_cpu(xen_resched_irq, cpu).name = NULL; } - kfree(per_cpu(xen_callfunc_irq, cpu).name); - per_cpu(xen_callfunc_irq, cpu).name = NULL; if (per_cpu(xen_callfunc_irq, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_callfunc_irq, cpu).irq, NULL); per_cpu(xen_callfunc_irq, cpu).irq = -1; + kfree(per_cpu(xen_callfunc_irq, cpu).name); + per_cpu(xen_callfunc_irq, cpu).name = NULL; } - kfree(per_cpu(xen_debug_irq, cpu).name); - per_cpu(xen_debug_irq, cpu).name = NULL; if (per_cpu(xen_debug_irq, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu).irq, NULL); per_cpu(xen_debug_irq, cpu).irq = -1; + kfree(per_cpu(xen_debug_irq, cpu).name); + per_cpu(xen_debug_irq, cpu).name = NULL; } - kfree(per_cpu(xen_callfuncsingle_irq, cpu).name); - per_cpu(xen_callfuncsingle_irq, cpu).name = NULL; if (per_cpu(xen_callfuncsingle_irq, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu).irq, NULL); per_cpu(xen_callfuncsingle_irq, cpu).irq = -1; + kfree(per_cpu(xen_callfuncsingle_irq, cpu).name); + per_cpu(xen_callfuncsingle_irq, cpu).name = NULL; } } @@ -65,7 +65,6 @@ int xen_smp_intr_init(unsigned int cpu) char *resched_name, *callfunc_name, *debug_name; resched_name = kasprintf(GFP_KERNEL, "resched%d", cpu); - per_cpu(xen_resched_irq, cpu).name = resched_name; rc = bind_ipi_to_irqhandler(XEN_RESCHEDULE_VECTOR, cpu, xen_reschedule_interrupt, @@ -75,9 +74,9 @@ int xen_smp_intr_init(unsigned int cpu) if (rc < 0) goto fail; per_cpu(xen_resched_irq, cpu).irq = rc; + per_cpu(xen_resched_irq, cpu).name = resched_name; callfunc_name = kasprintf(GFP_KERNEL, "callfunc%d", cpu); - per_cpu(xen_callfunc_irq, cpu).name = callfunc_name; rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_VECTOR, cpu, xen_call_function_interrupt, @@ -87,21 +86,18 @@ int xen_smp_intr_init(unsigned int cpu) if (rc < 0) goto fail; per_cpu(xen_callfunc_irq, cpu).irq = rc; + per_cpu(xen_callfunc_irq, cpu).name = callfunc_name; - if (!xen_fifo_events) { - debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu); - per_cpu(xen_debug_irq, cpu).name = debug_name; - rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, - xen_debug_interrupt, - IRQF_PERCPU | IRQF_NOBALANCING, - debug_name, NULL); - if (rc < 0) - goto fail; - per_cpu(xen_debug_irq, cpu).irq = rc; - } + debug_name = kasprintf(GFP_KERNEL, "debug%d", cpu); + rc = bind_virq_to_irqhandler(VIRQ_DEBUG, cpu, xen_debug_interrupt, + IRQF_PERCPU | IRQF_NOBALANCING, + debug_name, NULL); + if (rc < 0) + goto fail; + per_cpu(xen_debug_irq, cpu).irq = rc; + per_cpu(xen_debug_irq, cpu).name = debug_name; callfunc_name = kasprintf(GFP_KERNEL, "callfuncsingle%d", cpu); - per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name; rc = bind_ipi_to_irqhandler(XEN_CALL_FUNCTION_SINGLE_VECTOR, cpu, xen_call_function_single_interrupt, @@ -111,6 +107,7 @@ int xen_smp_intr_init(unsigned int cpu) if (rc < 0) goto fail; per_cpu(xen_callfuncsingle_irq, cpu).irq = rc; + per_cpu(xen_callfuncsingle_irq, cpu).name = callfunc_name; return 0;
diff --git a/arch/x86/xen/smp_pv.c b/arch/x86/xen/smp_pv.c index 928fbe6..9d9777d 100644 --- a/arch/x86/xen/smp_pv.c +++ b/arch/x86/xen/smp_pv.c
@@ -98,18 +98,18 @@ asmlinkage __visible void cpu_bringup_and_idle(void) void xen_smp_intr_free_pv(unsigned int cpu) { - kfree(per_cpu(xen_irq_work, cpu).name); - per_cpu(xen_irq_work, cpu).name = NULL; if (per_cpu(xen_irq_work, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_irq_work, cpu).irq, NULL); per_cpu(xen_irq_work, cpu).irq = -1; + kfree(per_cpu(xen_irq_work, cpu).name); + per_cpu(xen_irq_work, cpu).name = NULL; } - kfree(per_cpu(xen_pmu_irq, cpu).name); - per_cpu(xen_pmu_irq, cpu).name = NULL; if (per_cpu(xen_pmu_irq, cpu).irq >= 0) { unbind_from_irqhandler(per_cpu(xen_pmu_irq, cpu).irq, NULL); per_cpu(xen_pmu_irq, cpu).irq = -1; + kfree(per_cpu(xen_pmu_irq, cpu).name); + per_cpu(xen_pmu_irq, cpu).name = NULL; } } @@ -119,7 +119,6 @@ int xen_smp_intr_init_pv(unsigned int cpu) char *callfunc_name, *pmu_name; callfunc_name = kasprintf(GFP_KERNEL, "irqwork%d", cpu); - per_cpu(xen_irq_work, cpu).name = callfunc_name; rc = bind_ipi_to_irqhandler(XEN_IRQ_WORK_VECTOR, cpu, xen_irq_work_interrupt, @@ -129,10 +128,10 @@ int xen_smp_intr_init_pv(unsigned int cpu) if (rc < 0) goto fail; per_cpu(xen_irq_work, cpu).irq = rc; + per_cpu(xen_irq_work, cpu).name = callfunc_name; if (is_xen_pmu) { pmu_name = kasprintf(GFP_KERNEL, "pmu%d", cpu); - per_cpu(xen_pmu_irq, cpu).name = pmu_name; rc = bind_virq_to_irqhandler(VIRQ_XENPMU, cpu, xen_pmu_irq_handler, IRQF_PERCPU|IRQF_NOBALANCING, @@ -140,6 +139,7 @@ int xen_smp_intr_init_pv(unsigned int cpu) if (rc < 0) goto fail; per_cpu(xen_pmu_irq, cpu).irq = rc; + per_cpu(xen_pmu_irq, cpu).name = pmu_name; } return 0;
diff --git a/arch/x86/xen/spinlock.c b/arch/x86/xen/spinlock.c index 00d2ec7..d817b7c 100644 --- a/arch/x86/xen/spinlock.c +++ b/arch/x86/xen/spinlock.c
@@ -75,7 +75,6 @@ void xen_init_lock_cpu(int cpu) cpu, per_cpu(lock_kicker_irq, cpu)); name = kasprintf(GFP_KERNEL, "spinlock%d", cpu); - per_cpu(irq_name, cpu) = name; irq = bind_ipi_to_irqhandler(XEN_SPIN_UNLOCK_VECTOR, cpu, dummy_handler, @@ -86,6 +85,7 @@ void xen_init_lock_cpu(int cpu) if (irq >= 0) { disable_irq(irq); /* make sure it's never delivered */ per_cpu(lock_kicker_irq, cpu) = irq; + per_cpu(irq_name, cpu) = name; } printk("cpu %d spinlock event irq %d\n", cpu, irq); @@ -98,8 +98,6 @@ void xen_uninit_lock_cpu(int cpu) if (!xen_pvspin) return; - kfree(per_cpu(irq_name, cpu)); - per_cpu(irq_name, cpu) = NULL; /* * When booting the kernel with 'mitigations=auto,nosmt', the secondary * CPUs are not activated, and lock_kicker_irq is not initialized. @@ -110,6 +108,8 @@ void xen_uninit_lock_cpu(int cpu) unbind_from_irqhandler(irq, NULL); per_cpu(lock_kicker_irq, cpu) = -1; + kfree(per_cpu(irq_name, cpu)); + per_cpu(irq_name, cpu) = NULL; } PV_CALLEE_SAVE_REGS_THUNK(xen_vcpu_stolen);
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 120e2bc..45a441c 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h
@@ -30,8 +30,6 @@ extern struct start_info *xen_start_info; extern struct shared_info xen_dummy_shared_info; extern struct shared_info *HYPERVISOR_shared_info; -extern bool xen_fifo_events; - void xen_setup_mfn_list_list(void); void xen_build_mfn_list_list(void); void xen_setup_machphys_mapping(void);
diff --git a/arch/xtensa/kernel/pci-dma.c b/arch/xtensa/kernel/pci-dma.c index 2b86a2a..154979d 100644 --- a/arch/xtensa/kernel/pci-dma.c +++ b/arch/xtensa/kernel/pci-dma.c
@@ -44,8 +44,8 @@ static void do_cache_op(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_BIDIRECTIONAL: @@ -62,8 +62,8 @@ void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, } } -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir) { switch (dir) { case DMA_BIDIRECTIONAL:
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c index 330d265..8c0aa07 100644 --- a/arch/xtensa/kernel/traps.c +++ b/arch/xtensa/kernel/traps.c
@@ -543,5 +543,5 @@ void __noreturn die(const char * str, struct pt_regs * regs, long err) if (panic_on_oops) panic("Fatal exception"); - make_task_dead(err); + do_exit(err); }
diff --git a/block/bfq-cgroup.c b/block/bfq-cgroup.c index 59fd1b1..09d721b 100644 --- a/block/bfq-cgroup.c +++ b/block/bfq-cgroup.c
@@ -594,10 +594,6 @@ struct bfq_group *bfq_bio_bfqg(struct bfq_data *bfqd, struct bio *bio) struct bfq_group *bfqg; while (blkg) { - if (!blkg->online) { - blkg = blkg->parent; - continue; - } bfqg = blkg_to_bfqg(blkg); if (bfqg->online) { bio_associate_blkg_from_css(bio, &blkg->blkcg->css);
diff --git a/block/bfq-iosched.c b/block/bfq-iosched.c index c73c8b0..962701d 100644 --- a/block/bfq-iosched.c +++ b/block/bfq-iosched.c
@@ -420,8 +420,6 @@ static struct bfq_io_cq *bfq_bic_lookup(struct bfq_data *bfqd, */ void bfq_schedule_dispatch(struct bfq_data *bfqd) { - lockdep_assert_held(&bfqd->lock); - if (bfqd->queued != 0) { bfq_log(bfqd, "schedule dispatch"); blk_mq_run_hw_queues(bfqd->queue, true); @@ -6259,8 +6257,8 @@ bfq_idle_slice_timer_body(struct bfq_data *bfqd, struct bfq_queue *bfqq) bfq_bfqq_expire(bfqd, bfqq, true, reason); schedule_dispatch: - bfq_schedule_dispatch(bfqd); spin_unlock_irqrestore(&bfqd->lock, flags); + bfq_schedule_dispatch(bfqd); } /*
diff --git a/block/bio-integrity.c b/block/bio-integrity.c index b23d962..aafc596 100644 --- a/block/bio-integrity.c +++ b/block/bio-integrity.c
@@ -427,7 +427,6 @@ int bio_integrity_clone(struct bio *bio, struct bio *bio_src, bip->bip_vcnt = bip_src->bip_vcnt; bip->bip_iter = bip_src->bip_iter; - bip->bip_flags = bip_src->bip_flags & ~BIP_BLOCK_INTEGRITY; return 0; }
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index cd085a0..dde8d0a 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c
@@ -1445,10 +1445,6 @@ int blkcg_activate_policy(struct request_queue *q, list_for_each_entry_reverse(blkg, &q->blkg_list, q_node) pol->pd_init_fn(blkg->pd[pol->plid]); - if (pol->pd_online_fn) - list_for_each_entry_reverse(blkg, &q->blkg_list, q_node) - pol->pd_online_fn(blkg->pd[pol->plid]); - __set_bit(pol->plid, q->blkcg_pols); ret = 0;
diff --git a/block/blk-core.c b/block/blk-core.c index 5646c70..4fe7cd5 100644 --- a/block/blk-core.c +++ b/block/blk-core.c
@@ -802,7 +802,10 @@ static inline bool bio_check_ro(struct bio *bio, struct hd_struct *part) if (op_is_flush(bio->bi_opf) && !bio_sectors(bio)) return false; - pr_warn("Trying to write to read-only block-device %s (partno %d)\n", + + WARN_ONCE(1, + "generic_make_request: Trying to write " + "to read-only block-device %s (partno %d)\n", bio_devname(bio, b), part->partno); /* Older lvm-tools actually trigger this */ return false; @@ -1456,13 +1459,6 @@ bool blk_update_request(struct request *req, blk_status_t error, req->q->integrity.profile->complete_fn(req, nr_bytes); #endif - /* - * Upper layers may call blk_crypto_evict_key() anytime after the last - * bio_endio(). Therefore, the keyslot must be released before that. - */ - if (blk_crypto_rq_has_keyslot(req) && nr_bytes >= blk_rq_bytes(req)) - __blk_crypto_rq_put_keyslot(req); - if (unlikely(error && !blk_rq_is_passthrough(req) && !(req->rq_flags & RQF_QUIET))) print_req_error(req, error, __func__);
diff --git a/block/blk-crypto-internal.h b/block/blk-crypto-internal.h index 8e08345..0d36aae 100644 --- a/block/blk-crypto-internal.h +++ b/block/blk-crypto-internal.h
@@ -60,11 +60,6 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq) return rq->crypt_ctx; } -static inline bool blk_crypto_rq_has_keyslot(struct request *rq) -{ - return rq->crypt_keyslot; -} - #else /* CONFIG_BLK_INLINE_ENCRYPTION */ static inline bool bio_crypt_rq_ctx_compatible(struct request *rq, @@ -98,11 +93,6 @@ static inline bool blk_crypto_rq_is_encrypted(struct request *rq) return false; } -static inline bool blk_crypto_rq_has_keyslot(struct request *rq) -{ - return false; -} - #endif /* CONFIG_BLK_INLINE_ENCRYPTION */ void __bio_crypt_advance(struct bio *bio, unsigned int bytes); @@ -137,21 +127,14 @@ static inline bool blk_crypto_bio_prep(struct bio **bio_ptr) return true; } -blk_status_t __blk_crypto_rq_get_keyslot(struct request *rq); -static inline blk_status_t blk_crypto_rq_get_keyslot(struct request *rq) +blk_status_t __blk_crypto_init_request(struct request *rq); +static inline blk_status_t blk_crypto_init_request(struct request *rq) { if (blk_crypto_rq_is_encrypted(rq)) - return __blk_crypto_rq_get_keyslot(rq); + return __blk_crypto_init_request(rq); return BLK_STS_OK; } -void __blk_crypto_rq_put_keyslot(struct request *rq); -static inline void blk_crypto_rq_put_keyslot(struct request *rq) -{ - if (blk_crypto_rq_has_keyslot(rq)) - __blk_crypto_rq_put_keyslot(rq); -} - void __blk_crypto_free_request(struct request *rq); static inline void blk_crypto_free_request(struct request *rq) { @@ -190,7 +173,7 @@ static inline blk_status_t blk_crypto_insert_cloned_request(struct request *rq) { if (blk_crypto_rq_is_encrypted(rq)) - return blk_crypto_rq_get_keyslot(rq); + return blk_crypto_init_request(rq); return BLK_STS_OK; }
diff --git a/block/blk-crypto.c b/block/blk-crypto.c index 8ef7e20..1ea84ab 100644 --- a/block/blk-crypto.c +++ b/block/blk-crypto.c
@@ -13,7 +13,6 @@ #include <linux/blkdev.h> #include <linux/keyslot-manager.h> #include <linux/module.h> -#include <linux/ratelimit.h> #include <linux/slab.h> #include "blk-crypto-internal.h" @@ -218,26 +217,26 @@ static bool bio_crypt_check_alignment(struct bio *bio) return true; } -blk_status_t __blk_crypto_rq_get_keyslot(struct request *rq) +blk_status_t __blk_crypto_init_request(struct request *rq) { return blk_ksm_get_slot_for_key(rq->q->ksm, rq->crypt_ctx->bc_key, &rq->crypt_keyslot); } -void __blk_crypto_rq_put_keyslot(struct request *rq) -{ - blk_ksm_put_slot(rq->crypt_keyslot); - rq->crypt_keyslot = NULL; -} - +/** + * __blk_crypto_free_request - Uninitialize the crypto fields of a request. + * + * @rq: The request whose crypto fields to uninitialize. + * + * Completely uninitializes the crypto fields of a request. If a keyslot has + * been programmed into some inline encryption hardware, that keyslot is + * released. The rq->crypt_ctx is also freed. + */ void __blk_crypto_free_request(struct request *rq) { - /* The keyslot, if one was needed, should have been released earlier. */ - if (WARN_ON_ONCE(rq->crypt_keyslot)) - __blk_crypto_rq_put_keyslot(rq); - + blk_ksm_put_slot(rq->crypt_keyslot); mempool_free(rq->crypt_ctx, bio_crypt_ctx_pool); - rq->crypt_ctx = NULL; + blk_crypto_rq_set_defaults(rq); } /** @@ -410,39 +409,29 @@ int blk_crypto_start_using_key(const struct blk_crypto_key *key, EXPORT_SYMBOL_GPL(blk_crypto_start_using_key); /** - * blk_crypto_evict_key() - Evict a blk_crypto_key from a request_queue - * @q: a request_queue on which I/O using the key may have been done - * @key: the key to evict + * blk_crypto_evict_key() - Evict a key from any inline encryption hardware + * it may have been programmed into + * @q: The request queue who's associated inline encryption hardware this key + * might have been programmed into + * @key: The key to evict * - * For a given request_queue, this function removes the given blk_crypto_key - * from the keyslot management structures and evicts it from any underlying - * hardware keyslot(s) or blk-crypto-fallback keyslot it may have been - * programmed into. + * Upper layers (filesystems) must call this function to ensure that a key is + * evicted from any hardware that it might have been programmed into. The key + * must not be in use by any in-flight IO when this function is called. * - * Upper layers must call this before freeing the blk_crypto_key. It must be - * called for every request_queue the key may have been used on. The key must - * no longer be in use by any I/O when this function is called. - * - * Context: May sleep. + * Return: 0 on success or if key is not present in the q's ksm, -err on error. */ -void blk_crypto_evict_key(struct request_queue *q, - const struct blk_crypto_key *key) +int blk_crypto_evict_key(struct request_queue *q, + const struct blk_crypto_key *key) { - int err; - if (blk_ksm_crypto_cfg_supported(q->ksm, &key->crypto_cfg)) - err = blk_ksm_evict_key(q->ksm, key); - else - err = blk_crypto_fallback_evict_key(key); + return blk_ksm_evict_key(q->ksm, key); + /* - * An error can only occur here if the key failed to be evicted from a - * keyslot (due to a hardware or driver issue) or is allegedly still in - * use by I/O (due to a kernel bug). Even in these cases, the key is - * still unlinked from the keyslot management structures, and the caller - * is allowed and expected to free it right away. There's nothing - * callers can do to handle errors, so just log them and return void. + * If the request queue's associated inline encryption hardware didn't + * have support for the key, then the key might have been programmed + * into the fallback keyslot manager, so try to evict from there. */ - if (err) - pr_warn_ratelimited("error %d evicting key\n", err); + return blk_crypto_fallback_evict_key(key); } EXPORT_SYMBOL_GPL(blk_crypto_evict_key);
diff --git a/block/blk-flush.c b/block/blk-flush.c index 672d04a..f66ff16 100644 --- a/block/blk-flush.c +++ b/block/blk-flush.c
@@ -254,11 +254,6 @@ static void flush_end_io(struct request *flush_rq, blk_status_t error) spin_unlock_irqrestore(&fq->mq_flush_lock, flags); } -bool is_flush_rq(struct request *rq) -{ - return rq->end_io == flush_end_io; -} - /** * blk_kick_flush - consider issuing flush request * @q: request_queue being kicked
diff --git a/block/blk-iocost.c b/block/blk-iocost.c index 4fdc885..ef287c3 100644 --- a/block/blk-iocost.c +++ b/block/blk-iocost.c
@@ -785,14 +785,9 @@ static void calc_lcoefs(u64 bps, u64 seqiops, u64 randiops, *page = *seqio = *randio = 0; - if (bps) { - u64 bps_pages = DIV_ROUND_UP_ULL(bps, IOC_PAGE_SIZE); - - if (bps_pages) - *page = DIV64_U64_ROUND_UP(VTIME_PER_SEC, bps_pages); - else - *page = 1; - } + if (bps) + *page = DIV64_U64_ROUND_UP(VTIME_PER_SEC, + DIV_ROUND_UP_ULL(bps, IOC_PAGE_SIZE)); if (seqiops) { v = DIV64_U64_ROUND_UP(VTIME_PER_SEC, seqiops);
diff --git a/block/blk-merge.c b/block/blk-merge.c index d869ff4..3e26a92 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c
@@ -823,8 +823,6 @@ static struct request *attempt_merge(struct request_queue *q, if (!blk_discard_mergable(req)) elv_merge_requests(q, req, next); - blk_crypto_rq_put_keyslot(next); - /* * 'next' is going away, so update stats accordingly */
diff --git a/block/blk-mq-debugfs.c b/block/blk-mq-debugfs.c index 772a6c6..121f4c1 100644 --- a/block/blk-mq-debugfs.c +++ b/block/blk-mq-debugfs.c
@@ -883,9 +883,6 @@ void blk_mq_debugfs_register_hctx(struct request_queue *q, char name[20]; int i; - if (!q->debugfs_dir) - return; - snprintf(name, sizeof(name), "hctx%u", hctx->queue_num); hctx->debugfs_dir = debugfs_create_dir(name, q->debugfs_dir);
diff --git a/block/blk-mq-sched.c b/block/blk-mq-sched.c index 126a9a6..f422c7f 100644 --- a/block/blk-mq-sched.c +++ b/block/blk-mq-sched.c
@@ -59,7 +59,8 @@ void blk_mq_sched_assign_ioc(struct request *rq) } /* - * Mark a hardware queue as needing a restart. + * Mark a hardware queue as needing a restart. For shared queues, maintain + * a count of how many hardware queues are marked for restart. */ void blk_mq_sched_mark_restart_hctx(struct blk_mq_hw_ctx *hctx) { @@ -91,17 +92,13 @@ void blk_mq_sched_restart(struct blk_mq_hw_ctx *hctx) /* * Only SCSI implements .get_budget and .put_budget, and SCSI restarts * its queue by itself in its completion handler, so we don't need to - * restart queue if .get_budget() fails to get the budget. - * - * Returns -EAGAIN if hctx->dispatch was found non-empty and run_work has to - * be run again. This is necessary to avoid starving flushes. + * restart queue if .get_budget() returns BLK_STS_NO_RESOURCE. */ -static int blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) +static void blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) { struct request_queue *q = hctx->queue; struct elevator_queue *e = q->elevator; LIST_HEAD(rq_list); - int ret = 0; do { struct request *rq; @@ -109,11 +106,6 @@ static int blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) if (e->type->ops.has_work && !e->type->ops.has_work(hctx)) break; - if (!list_empty_careful(&hctx->dispatch)) { - ret = -EAGAIN; - break; - } - if (!blk_mq_get_dispatch_budget(hctx)) break; @@ -130,8 +122,6 @@ static int blk_mq_do_dispatch_sched(struct blk_mq_hw_ctx *hctx) */ list_add(&rq->queuelist, &rq_list); } while (blk_mq_dispatch_rq_list(q, &rq_list, true)); - - return ret; } static struct blk_mq_ctx *blk_mq_next_ctx(struct blk_mq_hw_ctx *hctx, @@ -148,26 +138,17 @@ static struct blk_mq_ctx *blk_mq_next_ctx(struct blk_mq_hw_ctx *hctx, /* * Only SCSI implements .get_budget and .put_budget, and SCSI restarts * its queue by itself in its completion handler, so we don't need to - * restart queue if .get_budget() fails to get the budget. - * - * Returns -EAGAIN if hctx->dispatch was found non-empty and run_work has to - * to be run again. This is necessary to avoid starving flushes. + * restart queue if .get_budget() returns BLK_STS_NO_RESOURCE. */ -static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) +static void blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) { struct request_queue *q = hctx->queue; LIST_HEAD(rq_list); struct blk_mq_ctx *ctx = READ_ONCE(hctx->dispatch_from); - int ret = 0; do { struct request *rq; - if (!list_empty_careful(&hctx->dispatch)) { - ret = -EAGAIN; - break; - } - if (!sbitmap_any_bit_set(&hctx->ctx_map)) break; @@ -193,17 +174,21 @@ static int blk_mq_do_dispatch_ctx(struct blk_mq_hw_ctx *hctx) } while (blk_mq_dispatch_rq_list(q, &rq_list, true)); WRITE_ONCE(hctx->dispatch_from, ctx); - return ret; } -int __blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) +void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) { struct request_queue *q = hctx->queue; struct elevator_queue *e = q->elevator; const bool has_sched_dispatch = e && e->type->ops.dispatch_request; - int ret = 0; LIST_HEAD(rq_list); + /* RCU or SRCU read lock is needed before checking quiesced flag */ + if (unlikely(blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q))) + return; + + hctx->run++; + /* * If we have previous entries on our dispatch list, grab them first for * more fair dispatch. @@ -232,41 +217,19 @@ int __blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) blk_mq_sched_mark_restart_hctx(hctx); if (blk_mq_dispatch_rq_list(q, &rq_list, false)) { if (has_sched_dispatch) - ret = blk_mq_do_dispatch_sched(hctx); + blk_mq_do_dispatch_sched(hctx); else - ret = blk_mq_do_dispatch_ctx(hctx); + blk_mq_do_dispatch_ctx(hctx); } } else if (has_sched_dispatch) { - ret = blk_mq_do_dispatch_sched(hctx); + blk_mq_do_dispatch_sched(hctx); } else if (hctx->dispatch_busy) { /* dequeue request one by one from sw queue if queue is busy */ - ret = blk_mq_do_dispatch_ctx(hctx); + blk_mq_do_dispatch_ctx(hctx); } else { blk_mq_flush_busy_ctxs(hctx, &rq_list); blk_mq_dispatch_rq_list(q, &rq_list, false); } - - return ret; -} - -void blk_mq_sched_dispatch_requests(struct blk_mq_hw_ctx *hctx) -{ - struct request_queue *q = hctx->queue; - - /* RCU or SRCU read lock is needed before checking quiesced flag */ - if (unlikely(blk_mq_hctx_stopped(hctx) || blk_queue_quiesced(q))) - return; - - hctx->run++; - - /* - * A return of -EAGAIN is an indication that hctx->dispatch is not - * empty and we must run again in order to avoid starving flushes. - */ - if (__blk_mq_sched_dispatch_requests(hctx) == -EAGAIN) { - if (__blk_mq_sched_dispatch_requests(hctx) == -EAGAIN) - blk_mq_run_hw_queue(hctx, true); - } } bool blk_mq_sched_try_merge(struct request_queue *q, struct bio *bio,
diff --git a/block/blk-mq-sysfs.c b/block/blk-mq-sysfs.c index 7abd66d..5dafd7a 100644 --- a/block/blk-mq-sysfs.c +++ b/block/blk-mq-sysfs.c
@@ -250,7 +250,7 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) { struct request_queue *q = hctx->queue; struct blk_mq_ctx *ctx; - int i, j, ret; + int i, ret; if (!hctx->nr_ctx) return 0; @@ -262,16 +262,9 @@ static int blk_mq_register_hctx(struct blk_mq_hw_ctx *hctx) hctx_for_each_ctx(hctx, ctx, i) { ret = kobject_add(&ctx->kobj, &hctx->kobj, "cpu%u", ctx->cpu); if (ret) - goto out; + break; } - return 0; -out: - hctx_for_each_ctx(hctx, ctx, j) { - if (j < i) - kobject_del(&ctx->kobj); - } - kobject_del(&hctx->kobj); return ret; }
diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c index e5d8949..008388e 100644 --- a/block/blk-mq-tag.c +++ b/block/blk-mq-tag.c
@@ -212,22 +212,6 @@ struct bt_iter_data { bool reserved; }; -static struct request *blk_mq_find_and_get_req(struct blk_mq_tags *tags, - unsigned int bitnr) -{ - struct request *rq; - unsigned long flags; - struct ext_blk_mq_tags *etags; - - etags = container_of(tags, struct ext_blk_mq_tags, tags); - spin_lock_irqsave(&etags->lock, flags); - rq = tags->rqs[bitnr]; - if (!rq || !refcount_inc_not_zero(&rq->ref)) - rq = NULL; - spin_unlock_irqrestore(&etags->lock, flags); - return rq; -} - static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) { struct bt_iter_data *iter_data = data; @@ -235,23 +219,18 @@ static bool bt_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) struct blk_mq_tags *tags = hctx->tags; bool reserved = iter_data->reserved; struct request *rq; - bool ret = true; if (!reserved) bitnr += tags->nr_reserved_tags; + rq = tags->rqs[bitnr]; /* * We can hit rq == NULL here, because the tagging functions * test and set the bit before assigning ->rqs[]. */ - rq = blk_mq_find_and_get_req(tags, bitnr); - if (!rq) - return true; - - if (rq->q == hctx->queue && rq->mq_hctx == hctx) - ret = iter_data->fn(hctx, rq, iter_data->data, reserved); - blk_mq_put_rq_ref(rq); - return ret; + if (rq && rq->q == hctx->queue) + return iter_data->fn(hctx, rq, iter_data->data, reserved); + return true; } /** @@ -294,7 +273,6 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) struct blk_mq_tags *tags = iter_data->tags; bool reserved = iter_data->reserved; struct request *rq; - bool ret = true; if (!reserved) bitnr += tags->nr_reserved_tags; @@ -303,13 +281,11 @@ static bool bt_tags_iter(struct sbitmap *bitmap, unsigned int bitnr, void *data) * We can hit rq == NULL here, because the tagging functions * test and set the bit before assining ->rqs[]. */ - rq = blk_mq_find_and_get_req(tags, bitnr); - if (!rq) - return true; - if (blk_mq_request_started(rq)) - ret = iter_data->fn(rq, iter_data->data, reserved); - blk_mq_put_rq_ref(rq); - return ret; + rq = tags->rqs[bitnr]; + if (rq && blk_mq_request_started(rq)) + return iter_data->fn(rq, iter_data->data, reserved); + + return true; } /** @@ -366,9 +342,6 @@ static void blk_mq_all_tag_busy_iter(struct blk_mq_tags *tags, * indicates whether or not @rq is a reserved request. Return * true to continue iterating tags, false to stop. * @priv: Will be passed as second argument to @fn. - * - * We grab one request reference before calling @fn and release it after - * @fn returns. */ void blk_mq_tagset_busy_iter(struct blk_mq_tag_set *tagset, busy_tag_iter_fn *fn, void *priv) @@ -492,21 +465,18 @@ struct blk_mq_tags *blk_mq_init_tags(unsigned int total_tags, int node, int alloc_policy) { struct blk_mq_tags *tags; - struct ext_blk_mq_tags *etags; if (total_tags > BLK_MQ_TAG_MAX) { pr_err("blk-mq: tag depth too large\n"); return NULL; } - etags = kzalloc_node(sizeof(*etags), GFP_KERNEL, node); - if (!etags) + tags = kzalloc_node(sizeof(*tags), GFP_KERNEL, node); + if (!tags) return NULL; - tags = &etags->tags; tags->nr_tags = total_tags; tags->nr_reserved_tags = reserved_tags; - spin_lock_init(&etags->lock); return blk_mq_init_bitmap_tags(tags, node, alloc_policy); }
diff --git a/block/blk-mq-tag.h b/block/blk-mq-tag.h index df34511..61deab0 100644 --- a/block/blk-mq-tag.h +++ b/block/blk-mq-tag.h
@@ -21,21 +21,6 @@ struct blk_mq_tags { struct list_head page_list; }; -/* - * Extended tag address space map. This was needed - * to add a spinlock to blk_mq_tags in a KMI compliant - * way (no changes could be made to struct blk_mq_tags). - */ -struct ext_blk_mq_tags { - struct blk_mq_tags tags; - - /* - * used to clear request reference in rqs[] before freeing one - * request pool - */ - spinlock_t lock; -}; - extern struct blk_mq_tags *blk_mq_init_tags(unsigned int nr_tags, unsigned int reserved_tags, int node, int alloc_policy); extern void blk_mq_free_tags(struct blk_mq_tags *tags);
diff --git a/block/blk-mq.c b/block/blk-mq.c index 4f20046..0ebcf39 100644 --- a/block/blk-mq.c +++ b/block/blk-mq.c
@@ -888,14 +888,6 @@ static bool blk_mq_req_expired(struct request *rq, unsigned long *next) return false; } -void blk_mq_put_rq_ref(struct request *rq) -{ - if (is_flush_rq(rq)) - rq->end_io(rq, 0); - else if (refcount_dec_and_test(&rq->ref)) - __blk_mq_free_request(rq); -} - static bool blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, struct request *rq, void *priv, bool reserved) { @@ -929,7 +921,11 @@ static bool blk_mq_check_expired(struct blk_mq_hw_ctx *hctx, if (blk_mq_req_expired(rq, next)) blk_mq_rq_timed_out(rq, reserved); - blk_mq_put_rq_ref(rq); + if (is_flush_rq(rq, hctx)) + rq->end_io(rq, 0); + else if (refcount_dec_and_test(&rq->ref)) + __blk_mq_free_request(rq); + return true; } @@ -1119,7 +1115,7 @@ static int blk_mq_dispatch_wake(wait_queue_entry_t *wait, unsigned mode, static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, struct request *rq) { - struct sbitmap_queue *sbq; + struct sbitmap_queue *sbq = &hctx->tags->bitmap_tags; struct wait_queue_head *wq; wait_queue_entry_t *wait; bool ret; @@ -1142,10 +1138,6 @@ static bool blk_mq_mark_tag_wait(struct blk_mq_hw_ctx *hctx, if (!list_empty_careful(&wait->entry)) return false; - if (blk_mq_tag_is_reserved(rq->mq_hctx->sched_tags, rq->internal_tag)) - sbq = &hctx->tags->breserved_tags; - else - sbq = &hctx->tags->bitmap_tags; wq = &bt_wait_ptr(sbq, hctx)->wait; spin_lock_irq(&wq->lock); @@ -1987,47 +1979,6 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) } } -static size_t order_to_size(unsigned int order) -{ - return (size_t)PAGE_SIZE << order; -} - -/* called before freeing request pool in @tags */ -static void blk_mq_clear_rq_mapping(struct blk_mq_tag_set *set, - struct blk_mq_tags *tags, unsigned int hctx_idx) -{ - struct blk_mq_tags *drv_tags = set->tags[hctx_idx]; - struct ext_blk_mq_tags *drv_etags; - struct page *page; - unsigned long flags; - - list_for_each_entry(page, &tags->page_list, lru) { - unsigned long start = (unsigned long)page_address(page); - unsigned long end = start + order_to_size(page->private); - int i; - - for (i = 0; i < set->queue_depth; i++) { - struct request *rq = drv_tags->rqs[i]; - unsigned long rq_addr = (unsigned long)rq; - - if (rq_addr >= start && rq_addr < end) { - WARN_ON_ONCE(refcount_read(&rq->ref) != 0); - cmpxchg(&drv_tags->rqs[i], rq, NULL); - } - } - } - - /* - * Wait until all pending iteration is done. - * - * Request reference is cleared and it is guaranteed to be observed - * after the ->lock is released. - */ - drv_etags = container_of(drv_tags, struct ext_blk_mq_tags, tags); - spin_lock_irqsave(&drv_etags->lock, flags); - spin_unlock_irqrestore(&drv_etags->lock, flags); -} - static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) { const int is_sync = op_is_sync(bio->bi_opf); @@ -2072,7 +2023,7 @@ static blk_qc_t blk_mq_make_request(struct request_queue *q, struct bio *bio) blk_mq_bio_to_request(rq, bio, nr_segs); - ret = blk_crypto_rq_get_keyslot(rq); + ret = blk_crypto_init_request(rq); if (ret != BLK_STS_OK) { bio->bi_status = ret; bio_endio(bio); @@ -2162,8 +2113,6 @@ void blk_mq_free_rqs(struct blk_mq_tag_set *set, struct blk_mq_tags *tags, } } - blk_mq_clear_rq_mapping(set, tags, hctx_idx); - while (!list_empty(&tags->page_list)) { page = list_first_entry(&tags->page_list, struct page, lru); list_del_init(&page->lru); @@ -2223,6 +2172,11 @@ struct blk_mq_tags *blk_mq_alloc_rq_map(struct blk_mq_tag_set *set, return tags; } +static size_t order_to_size(unsigned int order) +{ + return (size_t)PAGE_SIZE << order; +} + static int blk_mq_init_request(struct blk_mq_tag_set *set, struct request *rq, unsigned int hctx_idx, int node) { @@ -2355,51 +2309,16 @@ static void blk_mq_remove_cpuhp(struct blk_mq_hw_ctx *hctx) &hctx->cpuhp_dead); } -/* - * Before freeing hw queue, clearing the flush request reference in - * tags->rqs[] for avoiding potential UAF. - */ -static void blk_mq_clear_flush_rq_mapping(struct blk_mq_tags *tags, - unsigned int queue_depth, struct request *flush_rq) -{ - int i; - unsigned long flags; - struct ext_blk_mq_tags *etags; - - /* The hw queue may not be mapped yet */ - if (!tags) - return; - - WARN_ON_ONCE(refcount_read(&flush_rq->ref) != 0); - - for (i = 0; i < queue_depth; i++) - cmpxchg(&tags->rqs[i], flush_rq, NULL); - - /* - * Wait until all pending iteration is done. - * - * Request reference is cleared and it is guaranteed to be observed - * after the ->lock is released. - */ - etags = container_of(tags, struct ext_blk_mq_tags, tags); - spin_lock_irqsave(&etags->lock, flags); - spin_unlock_irqrestore(&etags->lock, flags); -} - /* hctx->ctxs will be freed in queue's release handler */ static void blk_mq_exit_hctx(struct request_queue *q, struct blk_mq_tag_set *set, struct blk_mq_hw_ctx *hctx, unsigned int hctx_idx) { - struct request *flush_rq = hctx->fq->flush_rq; - if (blk_mq_hw_queue_mapped(hctx)) blk_mq_tag_idle(hctx); - blk_mq_clear_flush_rq_mapping(set->tags[hctx_idx], - set->queue_depth, flush_rq); if (set->ops->exit_request) - set->ops->exit_request(set, flush_rq, hctx_idx); + set->ops->exit_request(set, hctx->fq->flush_rq, hctx_idx); if (set->ops->exit_hctx) set->ops->exit_hctx(hctx, hctx_idx);
diff --git a/block/blk-mq.h b/block/blk-mq.h index 8fa8a57..f207597 100644 --- a/block/blk-mq.h +++ b/block/blk-mq.h
@@ -47,7 +47,6 @@ void blk_mq_flush_busy_ctxs(struct blk_mq_hw_ctx *hctx, struct list_head *list); bool blk_mq_get_driver_tag(struct request *rq); struct request *blk_mq_dequeue_from_ctx(struct blk_mq_hw_ctx *hctx, struct blk_mq_ctx *start); -void blk_mq_put_rq_ref(struct request *rq); /* * Internal helpers for allocating/freeing the request map
diff --git a/block/blk.h b/block/blk.h index fe521ee..b8920c0 100644 --- a/block/blk.h +++ b/block/blk.h
@@ -51,7 +51,11 @@ static inline void __blk_get_queue(struct request_queue *q) kobject_get(&q->kobj); } -bool is_flush_rq(struct request *req); +static inline bool +is_flush_rq(struct request *req, struct blk_mq_hw_ctx *hctx) +{ + return hctx->fq->flush_rq == req; +} struct blk_flush_queue *blk_alloc_flush_queue(struct request_queue *q, int node, int cmd_size, gfp_t flags);
diff --git a/block/keyslot-manager.c b/block/keyslot-manager.c index 88c821f..2f741be 100644 --- a/block/keyslot-manager.c +++ b/block/keyslot-manager.c
@@ -350,16 +350,25 @@ bool blk_ksm_crypto_cfg_supported(struct blk_keyslot_manager *ksm, return true; } -/* - * This is an internal function that evicts a key from an inline encryption - * device that can be either a real device or the blk-crypto-fallback "device". - * It is used only by blk_crypto_evict_key(); see that function for details. +/** + * blk_ksm_evict_key() - Evict a key from the lower layer device. + * @ksm: The keyslot manager to evict from + * @key: The key to evict + * + * Find the keyslot that the specified key was programmed into, and evict that + * slot from the lower layer device. The slot must not be in use by any + * in-flight IO when this function is called. + * + * Context: Process context. Takes and releases ksm->lock. + * Return: 0 on success or if there's no keyslot with the specified key, -EBUSY + * if the keyslot is still in use, or another -errno value on other + * error. */ int blk_ksm_evict_key(struct blk_keyslot_manager *ksm, const struct blk_crypto_key *key) { struct blk_ksm_keyslot *slot; - int err; + int err = 0; if (blk_ksm_is_passthrough(ksm)) { if (ksm->ksm_ll_ops.keyslot_evict) { @@ -373,30 +382,22 @@ int blk_ksm_evict_key(struct blk_keyslot_manager *ksm, blk_ksm_hw_enter(ksm); slot = blk_ksm_find_keyslot(ksm, key); - if (!slot) { - /* - * Not an error, since a key not in use by I/O is not guaranteed - * to be in a keyslot. There can be more keys than keyslots. - */ - err = 0; - goto out; - } + if (!slot) + goto out_unlock; if (WARN_ON_ONCE(atomic_read(&slot->slot_refs) != 0)) { - /* BUG: key is still in use by I/O */ err = -EBUSY; - goto out_remove; + goto out_unlock; } err = ksm->ksm_ll_ops.keyslot_evict(ksm, key, blk_ksm_get_slot_idx(slot)); -out_remove: - /* - * Callers free the key even on error, so unlink the key from the hash - * table and clear slot->key even on error. - */ + if (err) + goto out_unlock; + hlist_del(&slot->hash_node); slot->key = NULL; -out: + err = 0; +out_unlock: blk_ksm_hw_exit(ksm); return err; }
diff --git a/block/partition-generic.c b/block/partition-generic.c index 17a58be..31bff3f 100644 --- a/block/partition-generic.c +++ b/block/partition-generic.c
@@ -272,7 +272,6 @@ void delete_partition(struct gendisk *disk, int partno) struct disk_part_tbl *ptbl = rcu_dereference_protected(disk->part_tbl, 1); struct hd_struct *part; - struct block_device *bdev; if (partno >= ptbl->len) return; @@ -293,12 +292,6 @@ void delete_partition(struct gendisk *disk, int partno) * "in-use" until we really free the gendisk. */ blk_invalidate_devt(part_devt(part)); - - bdev = bdget(part_devt(part)); - if (bdev) { - remove_inode_hash(bdev->bd_inode); - bdput(bdev); - } hd_struct_kill(part); }
diff --git a/block/sed-opal.c b/block/sed-opal.c index 401d33a..b4c7619 100644 --- a/block/sed-opal.c +++ b/block/sed-opal.c
@@ -88,8 +88,8 @@ struct opal_dev { u64 lowest_lba; size_t pos; - u8 *cmd; - u8 *resp; + u8 cmd[IO_BUFFER_LENGTH]; + u8 resp[IO_BUFFER_LENGTH]; struct parsed_resp parsed; size_t prev_d_len; @@ -2019,8 +2019,6 @@ void free_opal_dev(struct opal_dev *dev) return; clean_opal_dev(dev); - kfree(dev->resp); - kfree(dev->cmd); kfree(dev); } EXPORT_SYMBOL(free_opal_dev); @@ -2033,39 +2031,17 @@ struct opal_dev *init_opal_dev(void *data, sec_send_recv *send_recv) if (!dev) return NULL; - /* - * Presumably DMA-able buffers must be cache-aligned. Kmalloc makes - * sure the allocated buffer is DMA-safe in that regard. - */ - dev->cmd = kmalloc(IO_BUFFER_LENGTH, GFP_KERNEL); - if (!dev->cmd) - goto err_free_dev; - - dev->resp = kmalloc(IO_BUFFER_LENGTH, GFP_KERNEL); - if (!dev->resp) - goto err_free_cmd; - INIT_LIST_HEAD(&dev->unlk_lst); mutex_init(&dev->dev_lock); dev->data = data; dev->send_recv = send_recv; if (check_opal_support(dev) != 0) { pr_debug("Opal is not supported on this device\n"); - goto err_free_resp; + kfree(dev); + return NULL; } return dev; - -err_free_resp: - kfree(dev->resp); - -err_free_cmd: - kfree(dev->cmd); - -err_free_dev: - kfree(dev); - - return NULL; } EXPORT_SYMBOL(init_opal_dev);
diff --git a/crypto/akcipher.c b/crypto/akcipher.c index ceb0c2f..7d5cf49 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c
@@ -119,12 +119,6 @@ static int akcipher_default_op(struct akcipher_request *req) return -ENOSYS; } -static int akcipher_default_set_key(struct crypto_akcipher *tfm, - const void *key, unsigned int keylen) -{ - return -ENOSYS; -} - int crypto_register_akcipher(struct akcipher_alg *alg) { struct crypto_alg *base = &alg->base; @@ -137,8 +131,6 @@ int crypto_register_akcipher(struct akcipher_alg *alg) alg->encrypt = akcipher_default_op; if (!alg->decrypt) alg->decrypt = akcipher_default_op; - if (!alg->set_priv_key) - alg->set_priv_key = akcipher_default_set_key; akcipher_prepare_alg(alg); return crypto_register_alg(base);
diff --git a/crypto/asymmetric_keys/pkcs7_verify.c b/crypto/asymmetric_keys/pkcs7_verify.c index 01e5445..ce49820 100644 --- a/crypto/asymmetric_keys/pkcs7_verify.c +++ b/crypto/asymmetric_keys/pkcs7_verify.c
@@ -79,16 +79,16 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, } if (sinfo->msgdigest_len != sig->digest_size) { - pr_warn("Sig %u: Invalid digest size (%u)\n", - sinfo->index, sinfo->msgdigest_len); + pr_debug("Sig %u: Invalid digest size (%u)\n", + sinfo->index, sinfo->msgdigest_len); ret = -EBADMSG; goto error; } if (memcmp(sig->digest, sinfo->msgdigest, sinfo->msgdigest_len) != 0) { - pr_warn("Sig %u: Message digest doesn't match\n", - sinfo->index); + pr_debug("Sig %u: Message digest doesn't match\n", + sinfo->index); ret = -EKEYREJECTED; goto error; } @@ -488,7 +488,7 @@ int pkcs7_supply_detached_data(struct pkcs7_message *pkcs7, const void *data, size_t datalen) { if (pkcs7->data) { - pr_warn("Data already supplied\n"); + pr_debug("Data already supplied\n"); return -EINVAL; } pkcs7->data = data;
diff --git a/crypto/asymmetric_keys/verify_pefile.c b/crypto/asymmetric_keys/verify_pefile.c index 0701bb1..cc9dbce 100644 --- a/crypto/asymmetric_keys/verify_pefile.c +++ b/crypto/asymmetric_keys/verify_pefile.c
@@ -74,7 +74,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen, break; default: - pr_warn("Unknown PEOPT magic = %04hx\n", pe32->magic); + pr_debug("Unknown PEOPT magic = %04hx\n", pe32->magic); return -ELIBBAD; } @@ -95,7 +95,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen, ctx->certs_size = ddir->certs.size; if (!ddir->certs.virtual_address || !ddir->certs.size) { - pr_warn("Unsigned PE binary\n"); + pr_debug("Unsigned PE binary\n"); return -ENODATA; } @@ -127,7 +127,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, unsigned len; if (ctx->sig_len < sizeof(wrapper)) { - pr_warn("Signature wrapper too short\n"); + pr_debug("Signature wrapper too short\n"); return -ELIBBAD; } @@ -135,23 +135,19 @@ static int pefile_strip_sig_wrapper(const void *pebuf, pr_debug("sig wrapper = { %x, %x, %x }\n", wrapper.length, wrapper.revision, wrapper.cert_type); - /* sbsign rounds up the length of certificate table (in optional - * header data directories) to 8 byte alignment. However, the PE - * specification states that while entries are 8-byte aligned, this is - * not included in their length, and as a result, pesign has not - * rounded up since 0.110. + /* Both pesign and sbsign round up the length of certificate table + * (in optional header data directories) to 8 byte alignment. */ - if (wrapper.length > ctx->sig_len) { - pr_warn("Signature wrapper bigger than sig len (%x > %x)\n", - ctx->sig_len, wrapper.length); + if (round_up(wrapper.length, 8) != ctx->sig_len) { + pr_debug("Signature wrapper len wrong\n"); return -ELIBBAD; } if (wrapper.revision != WIN_CERT_REVISION_2_0) { - pr_warn("Signature is not revision 2.0\n"); + pr_debug("Signature is not revision 2.0\n"); return -ENOTSUPP; } if (wrapper.cert_type != WIN_CERT_TYPE_PKCS_SIGNED_DATA) { - pr_warn("Signature certificate type is not PKCS\n"); + pr_debug("Signature certificate type is not PKCS\n"); return -ENOTSUPP; } @@ -164,7 +160,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, ctx->sig_offset += sizeof(wrapper); ctx->sig_len -= sizeof(wrapper); if (ctx->sig_len < 4) { - pr_warn("Signature data missing\n"); + pr_debug("Signature data missing\n"); return -EKEYREJECTED; } @@ -198,7 +194,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, return 0; } not_pkcs7: - pr_warn("Signature data not PKCS#7\n"); + pr_debug("Signature data not PKCS#7\n"); return -ELIBBAD; } @@ -341,8 +337,8 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen, digest_size = crypto_shash_digestsize(tfm); if (digest_size != ctx->digest_len) { - pr_warn("Digest size mismatch (%zx != %x)\n", - digest_size, ctx->digest_len); + pr_debug("Digest size mismatch (%zx != %x)\n", + digest_size, ctx->digest_len); ret = -EBADMSG; goto error_no_desc; } @@ -373,7 +369,7 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen, * PKCS#7 certificate. */ if (memcmp(digest, ctx->digest, ctx->digest_len) != 0) { - pr_warn("Digest mismatch\n"); + pr_debug("Digest mismatch\n"); ret = -EKEYREJECTED; } else { pr_debug("The digests match!\n");
diff --git a/crypto/essiv.c b/crypto/essiv.c index aa6b89e..a8befc8 100644 --- a/crypto/essiv.c +++ b/crypto/essiv.c
@@ -188,12 +188,8 @@ static void essiv_aead_done(struct crypto_async_request *areq, int err) struct aead_request *req = areq->data; struct essiv_aead_request_ctx *rctx = aead_request_ctx(req); - if (err == -EINPROGRESS) - goto out; - - kfree(rctx->assoc); - -out: + if (rctx->assoc) + kfree(rctx->assoc); aead_request_complete(req, err); } @@ -269,7 +265,7 @@ static int essiv_aead_crypt(struct aead_request *req, bool enc) err = enc ? crypto_aead_encrypt(subreq) : crypto_aead_decrypt(subreq); - if (rctx->assoc && err != -EINPROGRESS && err != -EBUSY) + if (rctx->assoc && err != -EINPROGRESS) kfree(rctx->assoc); return err; }
diff --git a/crypto/rsa-pkcs1pad.c b/crypto/rsa-pkcs1pad.c index 5b4b12b..9cbafaf 100644 --- a/crypto/rsa-pkcs1pad.c +++ b/crypto/rsa-pkcs1pad.c
@@ -213,14 +213,16 @@ static void pkcs1pad_encrypt_sign_complete_cb( struct crypto_async_request *child_async_req, int err) { struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; if (err == -EINPROGRESS) - goto out; + return; - err = pkcs1pad_encrypt_sign_complete(req, err); - -out: - akcipher_request_complete(req, err); + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, + pkcs1pad_encrypt_sign_complete(req, err)); } static int pkcs1pad_encrypt(struct akcipher_request *req) @@ -329,14 +331,15 @@ static void pkcs1pad_decrypt_complete_cb( struct crypto_async_request *child_async_req, int err) { struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; if (err == -EINPROGRESS) - goto out; + return; - err = pkcs1pad_decrypt_complete(req, err); - -out: - akcipher_request_complete(req, err); + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, pkcs1pad_decrypt_complete(req, err)); } static int pkcs1pad_decrypt(struct akcipher_request *req) @@ -508,14 +511,15 @@ static void pkcs1pad_verify_complete_cb( struct crypto_async_request *child_async_req, int err) { struct akcipher_request *req = child_async_req->data; + struct crypto_async_request async_req; if (err == -EINPROGRESS) - goto out; + return; - err = pkcs1pad_verify_complete(req, err); - -out: - akcipher_request_complete(req, err); + async_req.data = req->base.data; + async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req)); + async_req.flags = child_async_req->flags; + req->base.complete(&async_req, pkcs1pad_verify_complete(req, err)); } /*
diff --git a/crypto/seqiv.c b/crypto/seqiv.c index ae1d67d..96d222c 100644 --- a/crypto/seqiv.c +++ b/crypto/seqiv.c
@@ -25,7 +25,7 @@ static void seqiv_aead_encrypt_complete2(struct aead_request *req, int err) struct aead_request *subreq = aead_request_ctx(req); struct crypto_aead *geniv; - if (err == -EINPROGRESS || err == -EBUSY) + if (err == -EINPROGRESS) return; if (err)
diff --git a/crypto/tcrypt.c b/crypto/tcrypt.c index 12dab10..0cece1f 100644 --- a/crypto/tcrypt.c +++ b/crypto/tcrypt.c
@@ -1281,6 +1281,15 @@ static void test_mb_skcipher_speed(const char *algo, int enc, int secs, goto out_free_tfm; } + + for (i = 0; i < num_mb; ++i) + if (testmgr_alloc_buf(data[i].xbuf)) { + while (i--) + testmgr_free_buf(data[i].xbuf); + goto out_free_tfm; + } + + for (i = 0; i < num_mb; ++i) { data[i].req = skcipher_request_alloc(tfm, GFP_KERNEL); if (!data[i].req) {
diff --git a/drivers/acpi/acpi_extlog.c b/drivers/acpi/acpi_extlog.c index 4c05c38..91d0b0f 100644 --- a/drivers/acpi/acpi_extlog.c +++ b/drivers/acpi/acpi_extlog.c
@@ -12,7 +12,6 @@ #include <linux/ratelimit.h> #include <linux/edac.h> #include <linux/ras.h> -#include <acpi/ghes.h> #include <asm/cpu.h> #include <asm/mce.h> @@ -141,8 +140,8 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, int cpu = mce->extcpu; struct acpi_hest_generic_status *estatus, *tmp; struct acpi_hest_generic_data *gdata; - const guid_t *fru_id; - char *fru_text; + const guid_t *fru_id = &guid_null; + char *fru_text = ""; guid_t *sec_type; static u32 err_seq; @@ -163,23 +162,17 @@ static int extlog_print(struct notifier_block *nb, unsigned long val, /* log event via trace */ err_seq++; - apei_estatus_for_each_section(tmp, gdata) { - if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID) - fru_id = (guid_t *)gdata->fru_id; - else - fru_id = &guid_null; - if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) - fru_text = gdata->fru_text; - else - fru_text = ""; - sec_type = (guid_t *)gdata->section_type; - if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { - struct cper_sec_mem_err *mem = (void *)(gdata + 1); - - if (gdata->error_data_length >= sizeof(*mem)) - trace_extlog_mem_event(mem, err_seq, fru_id, fru_text, - (u8)gdata->error_severity); - } + gdata = (struct acpi_hest_generic_data *)(tmp + 1); + if (gdata->validation_bits & CPER_SEC_VALID_FRU_ID) + fru_id = (guid_t *)gdata->fru_id; + if (gdata->validation_bits & CPER_SEC_VALID_FRU_TEXT) + fru_text = gdata->fru_text; + sec_type = (guid_t *)gdata->section_type; + if (guid_equal(sec_type, &CPER_SEC_PLATFORM_MEM)) { + struct cper_sec_mem_err *mem = (void *)(gdata + 1); + if (gdata->error_data_length >= sizeof(*mem)) + trace_extlog_mem_event(mem, err_seq, fru_id, fru_text, + (u8)gdata->error_severity); } out:
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c index b939a67..751ed38 100644 --- a/drivers/acpi/acpi_lpss.c +++ b/drivers/acpi/acpi_lpss.c
@@ -401,9 +401,6 @@ static int register_device_clock(struct acpi_device *adev, if (!lpss_clk_dev) lpt_register_clock_device(); - if (IS_ERR(lpss_clk_dev)) - return PTR_ERR(lpss_clk_dev); - clk_data = platform_get_drvdata(lpss_clk_dev); if (!clk_data) return -ENODEV;
diff --git a/drivers/acpi/acpi_video.c b/drivers/acpi/acpi_video.c index bf18efd..81cd47d 100644 --- a/drivers/acpi/acpi_video.c +++ b/drivers/acpi/acpi_video.c
@@ -498,22 +498,6 @@ static const struct dmi_system_id video_dmi_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE R830"), }, }, - { - .callback = video_disable_backlight_sysfs_if, - .ident = "Toshiba Satellite Z830", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE Z830"), - }, - }, - { - .callback = video_disable_backlight_sysfs_if, - .ident = "Toshiba Portege Z830", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "PORTEGE Z830"), - }, - }, /* * Some machine's _DOD IDs don't have bit 31(Device ID Scheme) set * but the IDs actually follow the Device ID Scheme.
diff --git a/drivers/acpi/acpica/Makefile b/drivers/acpi/acpica/Makefile index f919811..5970043 100644 --- a/drivers/acpi/acpica/Makefile +++ b/drivers/acpi/acpica/Makefile
@@ -3,7 +3,7 @@ # Makefile for ACPICA Core interpreter # -ccflags-y := -D_LINUX -DBUILDING_ACPICA +ccflags-y := -Os -D_LINUX -DBUILDING_ACPICA ccflags-$(CONFIG_ACPI_DEBUG) += -DACPI_DEBUG_OUTPUT # use acpi.o to put all files here into acpi.o modparam namespace
diff --git a/drivers/acpi/acpica/dsmethod.c b/drivers/acpi/acpica/dsmethod.c index 603483f..f59b4d9 100644 --- a/drivers/acpi/acpica/dsmethod.c +++ b/drivers/acpi/acpica/dsmethod.c
@@ -517,7 +517,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, info = ACPI_ALLOCATE_ZEROED(sizeof(struct acpi_evaluate_info)); if (!info) { status = AE_NO_MEMORY; - goto pop_walk_state; + goto cleanup; } info->parameters = &this_walk_state->operands[0]; @@ -529,7 +529,7 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, ACPI_FREE(info); if (ACPI_FAILURE(status)) { - goto pop_walk_state; + goto cleanup; } next_walk_state->method_nesting_depth = @@ -575,12 +575,6 @@ acpi_ds_call_control_method(struct acpi_thread_state *thread, return_ACPI_STATUS(status); -pop_walk_state: - - /* On error, pop the walk state to be deleted from thread */ - - acpi_ds_pop_walk_state(thread); - cleanup: /* On error, we must terminate the method properly */
diff --git a/drivers/acpi/acpica/hwvalid.c b/drivers/acpi/acpica/hwvalid.c index f1495b8..cd57615 100644 --- a/drivers/acpi/acpica/hwvalid.c +++ b/drivers/acpi/acpica/hwvalid.c
@@ -23,8 +23,8 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width); * * The table is used to implement the Microsoft port access rules that * first appeared in Windows XP. Some ports are always illegal, and some - * ports are only illegal if the BIOS calls _OSI with nothing newer than - * the specific _OSI strings. + * ports are only illegal if the BIOS calls _OSI with a win_XP string or + * later (meaning that the BIOS itelf is post-XP.) * * This provides ACPICA with the desired port protections and * Microsoft compatibility. @@ -145,8 +145,7 @@ acpi_hw_validate_io_request(acpi_io_address address, u32 bit_width) /* Port illegality may depend on the _OSI calls made by the BIOS */ - if (port_info->osi_dependency == ACPI_ALWAYS_ILLEGAL || - acpi_gbl_osi_data == port_info->osi_dependency) { + if (acpi_gbl_osi_data >= port_info->osi_dependency) { ACPI_DEBUG_PRINT((ACPI_DB_VALUES, "Denied AML access to port 0x%8.8X%8.8X/%X (%s 0x%.4X-0x%.4X)\n", ACPI_FORMAT_UINT64(address),
diff --git a/drivers/acpi/acpica/nsrepair.c b/drivers/acpi/acpica/nsrepair.c index 57e6488..be86fea 100644 --- a/drivers/acpi/acpica/nsrepair.c +++ b/drivers/acpi/acpica/nsrepair.c
@@ -181,9 +181,8 @@ acpi_ns_simple_repair(struct acpi_evaluate_info *info, * Try to fix if there was no return object. Warning if failed to fix. */ if (!return_object) { - if (expected_btypes) { - if (!(expected_btypes & ACPI_RTYPE_NONE) && - package_index != ACPI_NOT_PACKAGE_ELEMENT) { + if (expected_btypes && (!(expected_btypes & ACPI_RTYPE_NONE))) { + if (package_index != ACPI_NOT_PACKAGE_ELEMENT) { ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, ACPI_WARN_ALWAYS, @@ -197,15 +196,14 @@ acpi_ns_simple_repair(struct acpi_evaluate_info *info, if (ACPI_SUCCESS(status)) { return (AE_OK); /* Repair was successful */ } - } - - if (expected_btypes != ACPI_RTYPE_NONE) { + } else { ACPI_WARN_PREDEFINED((AE_INFO, info->full_pathname, ACPI_WARN_ALWAYS, "Missing expected return value")); - return (AE_AML_NO_RETURN_VALUE); } + + return (AE_AML_NO_RETURN_VALUE); } }
diff --git a/drivers/acpi/acpica/utcopy.c b/drivers/acpi/acpica/utcopy.c index 9c0b94d..1fb8327 100644 --- a/drivers/acpi/acpica/utcopy.c +++ b/drivers/acpi/acpica/utcopy.c
@@ -916,6 +916,13 @@ acpi_ut_copy_ipackage_to_ipackage(union acpi_operand_object *source_obj, status = acpi_ut_walk_package_tree(source_obj, dest_obj, acpi_ut_copy_ielement_to_ielement, walk_state); + if (ACPI_FAILURE(status)) { + + /* On failure, delete the destination package object */ + + acpi_ut_remove_reference(dest_obj); + } + return_ACPI_STATUS(status); }
diff --git a/drivers/acpi/battery.c b/drivers/acpi/battery.c index a49a09e..974c2df 100644 --- a/drivers/acpi/battery.c +++ b/drivers/acpi/battery.c
@@ -465,7 +465,7 @@ static int extract_package(struct acpi_battery *battery, u8 *ptr = (u8 *)battery + offsets[i].offset; if (element->type == ACPI_TYPE_STRING || element->type == ACPI_TYPE_BUFFER) - strscpy(ptr, element->string.pointer, 32); + strncpy(ptr, element->string.pointer, 32); else if (element->type == ACPI_TYPE_INTEGER) { strncpy(ptr, (u8 *)&element->integer.value, sizeof(u64));
diff --git a/drivers/acpi/cppc_acpi.c b/drivers/acpi/cppc_acpi.c index d24cbba..0521b1d 100644 --- a/drivers/acpi/cppc_acpi.c +++ b/drivers/acpi/cppc_acpi.c
@@ -626,6 +626,33 @@ int pcc_data_alloc(int pcc_ss_id) return 0; } +/* Check if CPPC revision + num_ent combination is supported */ +static bool is_cppc_supported(int revision, int num_ent) +{ + int expected_num_ent; + + switch (revision) { + case CPPC_V2_REV: + expected_num_ent = CPPC_V2_NUM_ENT; + break; + case CPPC_V3_REV: + expected_num_ent = CPPC_V3_NUM_ENT; + break; + default: + pr_debug("Firmware exports unsupported CPPC revision: %d\n", + revision); + return false; + } + + if (expected_num_ent != num_ent) { + pr_debug("Firmware exports %d entries. Expected: %d for CPPC rev:%d\n", + num_ent, expected_num_ent, revision); + return false; + } + + return true; +} + /* * An example CPC table looks like the following. * @@ -721,6 +748,7 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) cpc_obj->type); goto out_free; } + cpc_ptr->num_entries = num_ent; /* Second entry should be revision. */ cpc_obj = &out_obj->package.elements[1]; @@ -731,33 +759,11 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) cpc_obj->type); goto out_free; } - - if (cpc_rev < CPPC_V2_REV) { - pr_debug("Unsupported _CPC Revision (%d) for CPU:%d\n", cpc_rev, - pr->id); - goto out_free; - } - - /* - * Disregard _CPC if the number of entries in the return pachage is not - * as expected, but support future revisions being proper supersets of - * the v3 and only causing more entries to be returned by _CPC. - */ - if ((cpc_rev == CPPC_V2_REV && num_ent != CPPC_V2_NUM_ENT) || - (cpc_rev == CPPC_V3_REV && num_ent != CPPC_V3_NUM_ENT) || - (cpc_rev > CPPC_V3_REV && num_ent <= CPPC_V3_NUM_ENT)) { - pr_debug("Unexpected number of _CPC return package entries (%d) for CPU:%d\n", - num_ent, pr->id); - goto out_free; - } - if (cpc_rev > CPPC_V3_REV) { - num_ent = CPPC_V3_NUM_ENT; - cpc_rev = CPPC_V3_REV; - } - - cpc_ptr->num_entries = num_ent; cpc_ptr->version = cpc_rev; + if (!is_cppc_supported(cpc_rev, num_ent)) + goto out_free; + /* Iterate through remaining entries in _CPC */ for (i = 2; i < num_ent; i++) { cpc_obj = &out_obj->package.elements[i];
diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c index defc579..e5b9295 100644 --- a/drivers/acpi/ec.c +++ b/drivers/acpi/ec.c
@@ -2119,6 +2119,13 @@ static const struct dmi_system_id acpi_ec_no_wakeup[] = { }, }, { + .ident = "ThinkPad X1 Carbon 6th", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_FAMILY, "ThinkPad X1 Carbon 6th"), + }, + }, + { .ident = "ThinkPad X1 Yoga 3rd", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c index 793b8d9..0fe4f3e 100644 --- a/drivers/acpi/nfit/core.c +++ b/drivers/acpi/nfit/core.c
@@ -3599,8 +3599,8 @@ void acpi_nfit_shutdown(void *data) mutex_lock(&acpi_desc->init_mutex); set_bit(ARS_CANCEL, &acpi_desc->scrub_flags); - mutex_unlock(&acpi_desc->init_mutex); cancel_delayed_work_sync(&acpi_desc->dwork); + mutex_unlock(&acpi_desc->init_mutex); /* * Bounce the nvdimm bus lock to make sure any in-flight
diff --git a/drivers/acpi/pci_mcfg.c b/drivers/acpi/pci_mcfg.c index ed2f880..47e43c9 100644 --- a/drivers/acpi/pci_mcfg.c +++ b/drivers/acpi/pci_mcfg.c
@@ -41,8 +41,6 @@ struct mcfg_fixup { static struct mcfg_fixup mcfg_quirks[] = { /* { OEM_ID, OEM_TABLE_ID, REV, SEGMENT, BUS_RANGE, ops, cfgres }, */ -#ifdef CONFIG_ARM64 - #define AL_ECAM(table_id, rev, seg, ops) \ { "AMAZON", table_id, rev, seg, MCFG_BUS_ANY, ops } @@ -164,7 +162,6 @@ static struct mcfg_fixup mcfg_quirks[] = { ALTRA_ECAM_QUIRK(1, 13), ALTRA_ECAM_QUIRK(1, 14), ALTRA_ECAM_QUIRK(1, 15), -#endif /* ARM64 */ }; static char mcfg_oem_id[ACPI_OEM_ID_SIZE];
diff --git a/drivers/acpi/processor_thermal.c b/drivers/acpi/processor_thermal.c index 458b4d9..41feb88 100644 --- a/drivers/acpi/processor_thermal.c +++ b/drivers/acpi/processor_thermal.c
@@ -150,7 +150,7 @@ void acpi_thermal_cpufreq_exit(struct cpufreq_policy *policy) unsigned int cpu; for_each_cpu(cpu, policy->related_cpus) { - struct acpi_processor *pr = per_cpu(processors, cpu); + struct acpi_processor *pr = per_cpu(processors, policy->cpu); if (pr) freq_qos_remove_request(&pr->thermal_req);
diff --git a/drivers/acpi/property.c b/drivers/acpi/property.c index 479856c..1b0aeb8 100644 --- a/drivers/acpi/property.c +++ b/drivers/acpi/property.c
@@ -152,10 +152,10 @@ static bool acpi_nondev_subnode_ok(acpi_handle scope, return acpi_nondev_subnode_data_ok(handle, link, list, parent); } -static bool acpi_add_nondev_subnodes(acpi_handle scope, - const union acpi_object *links, - struct list_head *list, - struct fwnode_handle *parent) +static int acpi_add_nondev_subnodes(acpi_handle scope, + const union acpi_object *links, + struct list_head *list, + struct fwnode_handle *parent) { bool ret = false; int i;
diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index b9d2035..3496612 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c
@@ -361,14 +361,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "80E3"), }, }, - { - .callback = init_nvs_save_s3, - .ident = "Lenovo G40-45", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "80E1"), - }, - }, /* * ThinkPad X1 Tablet(2016) cannot do suspend-to-idle using * the Low Power S0 Idle firmware interface (see
diff --git a/drivers/acpi/video_detect.c b/drivers/acpi/video_detect.c index ef40cd7..3b972ca 100644 --- a/drivers/acpi/video_detect.c +++ b/drivers/acpi/video_detect.c
@@ -316,7 +316,7 @@ static const struct dmi_system_id video_detect_dmi_table[] = { .ident = "Lenovo Ideapad Z570", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Ideapad Z570"), + DMI_MATCH(DMI_PRODUCT_NAME, "102434U"), }, }, { @@ -464,70 +464,6 @@ static const struct dmi_system_id video_detect_dmi_table[] = { }, }, /* - * More Tongfang devices with the same issue as the Clevo NL5xRU and - * NL5xNU/TUXEDO Aura 15 Gen1 and Gen2. See the description above. - */ - { - .callback = video_detect_force_native, - .ident = "TongFang GKxNRxx", - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "GKxNRxx"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GKxNRxx", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "POLARIS1501A1650TI"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GKxNRxx", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "POLARIS1501A2060"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GKxNRxx", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "POLARIS1701A1650TI"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GKxNRxx", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "POLARIS1701A2060"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GMxNGxx", - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "GMxNGxx"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GMxZGxx", - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "GMxZGxx"), - }, - }, - { - .callback = video_detect_force_native, - .ident = "TongFang GMxRGxx", - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"), - }, - }, - /* * Desktops which falsely report a backlight and which our heuristics * for this do not catch. */
diff --git a/drivers/amlogic/drm/meson_crtc.c b/drivers/amlogic/drm/meson_crtc.c index 1e4e822..31bd972 100644 --- a/drivers/amlogic/drm/meson_crtc.c +++ b/drivers/amlogic/drm/meson_crtc.c
@@ -2,7 +2,6 @@ /* * Copyright (c) 2019 Amlogic, Inc. All rights reserved. */ -#include <linux/sync_file.h> #include "meson_crtc.h" #include "meson_vpu_pipeline.h" @@ -78,95 +77,6 @@ static void meson_crtc_reset(struct drm_crtc *crtc) meson_crtc_init_hdr_preference(meson_crtc_state); } -static const char *meson_crtc_fence_get_driver_name(struct dma_fence *fence) -{ - return "meson"; -} - -static const char *meson_crtc_fence_get_timeline_name(struct dma_fence *fence) -{ - return "present_fence"; -} - -static const struct dma_fence_ops meson_crtc_fence_ops = { - .get_driver_name = meson_crtc_fence_get_driver_name, - .get_timeline_name = meson_crtc_fence_get_timeline_name, -}; - -struct dma_fence *meson_crtc_create_fence(spinlock_t *lock) -{ - struct dma_fence *fence; - - fence = kzalloc(sizeof(*fence), GFP_KERNEL); - if (!fence) - return NULL; - - dma_fence_init(fence, &meson_crtc_fence_ops, lock, - 0, 0); - - return fence; -} - -int meson_crtc_creat_present_fence_ioctl(struct drm_device *dev, - void *data, struct drm_file *file_priv) -{ - struct drm_meson_present_fence *arg = data; - struct am_meson_crtc_present_fence *pre_fence; - struct am_meson_crtc *amcrtc; - struct drm_crtc *crtc; - struct dma_fence *fence; - struct sync_file *sync_file; - int fd, ret; - - if (arg->crtc_idx >= dev->num_crtcs) - return -EINVAL; - - crtc = drm_crtc_from_index(dev, arg->crtc_idx); - if (!crtc) - return -EINVAL; - - amcrtc = to_am_meson_crtc(crtc); - pre_fence = &amcrtc->present_fence; - - if (pre_fence->fence) { - DRM_DEBUG("fence already created, return!"); - return -EEXIST; - } - - fence = meson_crtc_create_fence(&pre_fence->lock); - if (!fence) - return -ENOMEM; - - fd = get_unused_fd_flags(O_CLOEXEC); - if (fd < 0) { - ret = fd; - goto err_put_fence; - } - - sync_file = sync_file_create(fence); - //dma_fence_put(fence); - if (!sync_file) { - ret = -ENOMEM; - goto err_put_fd; - } - - fd_install(fd, sync_file->file); - arg->fd = fd; - pre_fence->fd = fd; - pre_fence->fence = fence; - pre_fence->sync_file = sync_file; - DRM_DEBUG("%s fd=%d, fence=%px\n", __func__, - pre_fence->fd, pre_fence->fence); - - return 0; - -err_put_fd: - put_unused_fd(fd); -err_put_fence: - dma_fence_put(fence); - return ret; -} - static int meson_crtc_atomic_get_property(struct drm_crtc *crtc, const struct drm_crtc_state *state, struct drm_property *property, @@ -534,7 +444,7 @@ int am_meson_crtc_create(struct am_meson_crtc *amcrtc) drm_mode_crtc_set_gamma_size(crtc, gamma_lut_size); drm_crtc_enable_color_mgmt(crtc, 0, true, gamma_lut_size); #endif - spin_lock_init(&amcrtc->present_fence.lock); + amcrtc->pipeline = pipeline; pipeline->crtc = crtc; strcpy(amcrtc->osddump_path, OSD_DUMP_PATH);
diff --git a/drivers/amlogic/drm/meson_crtc.h b/drivers/amlogic/drm/meson_crtc.h index 1841a5f..5e505cd 100644 --- a/drivers/amlogic/drm/meson_crtc.h +++ b/drivers/amlogic/drm/meson_crtc.h
@@ -25,14 +25,6 @@ enum { HDMI_EOTF_MESON_DOLBYVISION_LL, }; -struct am_meson_crtc_present_fence { - u32 fd; - struct dma_fence *fence; - struct sync_file *sync_file; - /* lock to protect process context and interrupt context */ - spinlock_t lock; -}; - struct am_meson_crtc_state { struct drm_crtc_state base; @@ -63,9 +55,6 @@ struct am_meson_crtc { int dump_index; char osddump_path[64]; - /*present fence*/ - struct am_meson_crtc_present_fence present_fence; - int vpp_crc_enable; }; @@ -75,8 +64,6 @@ struct am_meson_crtc { struct am_meson_crtc_state, base) int am_meson_crtc_create(struct am_meson_crtc *amcrtc); -int meson_crtc_creat_present_fence_ioctl(struct drm_device *dev, - void *data, struct drm_file *file_priv); #ifdef CONFIG_AMLOGIC_MEDIA_ENHANCEMENT_DOLBYVISION void set_dolby_vision_policy(int policy);
diff --git a/drivers/amlogic/drm/meson_drv.c b/drivers/amlogic/drm/meson_drv.c index fb5b5de..0480a3c 100644 --- a/drivers/amlogic/drm/meson_drv.c +++ b/drivers/amlogic/drm/meson_drv.c
@@ -479,8 +479,6 @@ static const struct drm_ioctl_desc meson_ioctls[] = { DRM_IOCTL_DEF_DRV(MESON_GEM_CREATE, am_meson_gem_create_ioctl, DRM_UNLOCKED | DRM_AUTH | DRM_RENDER_ALLOW), #endif - DRM_IOCTL_DEF_DRV(MESON_CREAT_PRESENT_FENCE, - meson_crtc_creat_present_fence_ioctl, 0), }; #endif
diff --git a/drivers/amlogic/drm/meson_vpu.c b/drivers/amlogic/drm/meson_vpu.c index 70241e6..09705e9 100644 --- a/drivers/amlogic/drm/meson_vpu.c +++ b/drivers/amlogic/drm/meson_vpu.c
@@ -17,7 +17,6 @@ #include <linux/of_reserved_mem.h> #include <linux/dma-contiguous.h> #include <linux/cma.h> -#include <linux/sync_file.h> #ifdef CONFIG_DRM_MESON_USE_ION #include <ion/ion_private.h> #endif @@ -112,19 +111,6 @@ static void meson_drm_handle_vpp_crc(struct am_meson_crtc *amcrtc) } } -static void meson_drm_signal_present_fence(struct am_meson_crtc *amcrtc) -{ - struct am_meson_crtc_present_fence *pre_fence = &amcrtc->present_fence; - - if (pre_fence->fence) { - DRM_DEBUG("%s fd=%d, fence=%px\n", __func__, - pre_fence->fd, pre_fence->fence); - dma_fence_signal(pre_fence->fence); - dma_fence_put(pre_fence->fence); - pre_fence->fence = NULL; - } -} - void am_meson_crtc_handle_vsync(struct am_meson_crtc *amcrtc) { unsigned long flags; @@ -140,7 +126,6 @@ void am_meson_crtc_handle_vsync(struct am_meson_crtc *amcrtc) } spin_unlock_irqrestore(&crtc->dev->event_lock, flags); - meson_drm_signal_present_fence(amcrtc); meson_drm_handle_vpp_crc(amcrtc); }
diff --git a/drivers/amlogic/input/ir/meson_ir_main.c b/drivers/amlogic/input/ir/meson_ir_main.c index cb1a0de..f9d2fb3 100644 --- a/drivers/amlogic/input/ir/meson_ir_main.c +++ b/drivers/amlogic/input/ir/meson_ir_main.c
@@ -30,7 +30,7 @@ #include <linux/amlogic/gki_module.h> static void meson_ir_tasklet(unsigned long data); -DECLARE_TASKLET_DISABLED_OLD(tasklet, meson_ir_tasklet); +DECLARE_TASKLET_DISABLED(tasklet, meson_ir_tasklet, 0); static int disable_ir; static int get_irenv(char *str)
diff --git a/drivers/amlogic/irblaster/irblaster-meson.c b/drivers/amlogic/irblaster/irblaster-meson.c index c7773de..e567229 100644 --- a/drivers/amlogic/irblaster/irblaster-meson.c +++ b/drivers/amlogic/irblaster/irblaster-meson.c
@@ -91,7 +91,7 @@ struct meson_irblaster_dev { #define IROUTDebug(fmt, x...) static void meson_irblaster_tasklet(unsigned long data); -DECLARE_TASKLET_DISABLED_OLD(irblaster_tasklet, meson_irblaster_tasklet); +DECLARE_TASKLET_DISABLED(irblaster_tasklet, meson_irblaster_tasklet, 0); static struct meson_irblaster_dev * to_meson_irblaster(struct irblaster_chip *chip)
diff --git a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c index 00e2cd7..40af607 100644 --- a/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c +++ b/drivers/amlogic/media/vout/hdmitx/hdmi_tx_20/hw/hdmi_tx_hw.c
@@ -5046,12 +5046,6 @@ static void config_hdmi20_tx(enum hdmi_vic vic, hdmitx_wr_reg(HDMITX_DWC_FC_AVICONF1, 0x8); hdmitx_wr_reg(HDMITX_DWC_FC_AVICONF2, 0); - /* refer to 861-H, Page 83, A Source shall always explicitly signal - * the RGB Quantization Range as either Limited Range (Q=1)or Full - * Range (Q=2). - */ - if (output_color_format == COLORSPACE_RGB444) - hdmitx_set_reg_bits(HDMITX_DWC_FC_AVICONF2, 1, 2, 2); /* set Aspect Ratio in AVIInfo */ switch (para->vic) {
diff --git a/drivers/amlogic/memory_ext/aml_cma.c b/drivers/amlogic/memory_ext/aml_cma.c index 04773e3..37ea7a0 100644 --- a/drivers/amlogic/memory_ext/aml_cma.c +++ b/drivers/amlogic/memory_ext/aml_cma.c
@@ -601,6 +601,7 @@ int aml_cma_alloc_range(unsigned long start, unsigned long end) unsigned long outer_start, outer_end; int ret = 0, order; int try_times = 0; + int boost_ok = 0; struct compact_control cc = { .nr_migratepages = 0, @@ -632,6 +633,7 @@ int aml_cma_alloc_range(unsigned long start, unsigned long end) get_online_cpus(); ret = cma_alloc_contig_boost(start, end - start); put_online_cpus(); + boost_ok = !ret ? 1 : 0; } else { ret = aml_alloc_contig_migrate_range(&cc, start, end, 0); } @@ -642,9 +644,10 @@ int aml_cma_alloc_range(unsigned long start, unsigned long end) } ret = 0; - - lru_add_drain_all(); - drain_all_pages(cc.zone); + if (!boost_ok) { + lru_add_drain_all(); + drain_all_pages(cc.zone); + } order = 0; outer_start = start; while (!PageBuddy(pfn_to_page(outer_start))) {
diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 1649527..43d0ae1 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c
@@ -2042,23 +2042,24 @@ static void binder_deferred_fd_close(int fd) static void binder_transaction_buffer_release(struct binder_proc *proc, struct binder_thread *thread, struct binder_buffer *buffer, - binder_size_t off_end_offset, + binder_size_t failed_at, bool is_failure) { int debug_id = buffer->debug_id; - binder_size_t off_start_offset, buffer_offset; + binder_size_t off_start_offset, buffer_offset, off_end_offset; binder_debug(BINDER_DEBUG_TRANSACTION, "%d buffer release %d, size %zd-%zd, failed at %llx\n", proc->pid, buffer->debug_id, buffer->data_size, buffer->offsets_size, - (unsigned long long)off_end_offset); + (unsigned long long)failed_at); if (buffer->target_node) binder_dec_node(buffer->target_node, 1, 0); off_start_offset = ALIGN(buffer->data_size, sizeof(void *)); - + off_end_offset = is_failure && failed_at ? failed_at : + off_start_offset + buffer->offsets_size; for (buffer_offset = off_start_offset; buffer_offset < off_end_offset; buffer_offset += sizeof(binder_size_t)) { struct binder_object_header *hdr; @@ -2218,21 +2219,6 @@ static void binder_transaction_buffer_release(struct binder_proc *proc, } } -/* Clean up all the objects in the buffer */ -static inline void binder_release_entire_buffer(struct binder_proc *proc, - struct binder_thread *thread, - struct binder_buffer *buffer, - bool is_failure) -{ - binder_size_t off_end_offset; - - off_end_offset = ALIGN(buffer->data_size, sizeof(void *)); - off_end_offset += buffer->offsets_size; - - binder_transaction_buffer_release(proc, thread, buffer, - off_end_offset, is_failure); -} - static int binder_translate_binder(struct flat_binder_object *fp, struct binder_transaction *t, struct binder_thread *thread) @@ -2928,7 +2914,7 @@ static int binder_proc_transaction(struct binder_transaction *t, t_outdated->buffer = NULL; buffer->transaction = NULL; trace_binder_transaction_update_buffer_release(buffer); - binder_release_entire_buffer(proc, NULL, buffer, false); + binder_transaction_buffer_release(proc, NULL, buffer, 0, 0); binder_alloc_free_buf(&proc->alloc, buffer); kfree(t_outdated); binder_stats_deleted(BINDER_STAT_TRANSACTION); @@ -3848,7 +3834,7 @@ binder_free_buf(struct binder_proc *proc, binder_node_inner_unlock(buf_node); } trace_binder_transaction_buffer_release(buffer); - binder_release_entire_buffer(proc, thread, buffer, is_failure); + binder_transaction_buffer_release(proc, thread, buffer, 0, is_failure); binder_alloc_free_buf(&proc->alloc, buffer); }
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 4069c2a..6f57296 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c
@@ -81,7 +81,6 @@ enum board_ids { static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent); static void ahci_remove_one(struct pci_dev *dev); static void ahci_shutdown_one(struct pci_dev *dev); -static void ahci_intel_pcs_quirk(struct pci_dev *pdev, struct ahci_host_priv *hpriv); static int ahci_vt8251_hardreset(struct ata_link *link, unsigned int *class, unsigned long deadline); static int ahci_avn_hardreset(struct ata_link *link, unsigned int *class, @@ -640,25 +639,6 @@ static void ahci_pci_save_initial_config(struct pci_dev *pdev, ahci_save_initial_config(&pdev->dev, hpriv); } -static int ahci_pci_reset_controller(struct ata_host *host) -{ - struct pci_dev *pdev = to_pci_dev(host->dev); - struct ahci_host_priv *hpriv = host->private_data; - int rc; - - rc = ahci_reset_controller(host); - if (rc) - return rc; - - /* - * If platform firmware failed to enable ports, try to enable - * them here. - */ - ahci_intel_pcs_quirk(pdev, hpriv); - - return 0; -} - static void ahci_pci_init_controller(struct ata_host *host) { struct ahci_host_priv *hpriv = host->private_data; @@ -861,7 +841,7 @@ static int ahci_pci_device_runtime_resume(struct device *dev) struct ata_host *host = pci_get_drvdata(pdev); int rc; - rc = ahci_pci_reset_controller(host); + rc = ahci_reset_controller(host); if (rc) return rc; ahci_pci_init_controller(host); @@ -896,7 +876,7 @@ static int ahci_pci_device_resume(struct device *dev) ahci_mcp89_apple_enable(pdev); if (pdev->dev.power.power_state.event == PM_EVENT_SUSPEND) { - rc = ahci_pci_reset_controller(host); + rc = ahci_reset_controller(host); if (rc) return rc; @@ -1761,6 +1741,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) /* save initial config */ ahci_pci_save_initial_config(pdev, hpriv); + /* + * If platform firmware failed to enable ports, try to enable + * them here. + */ + ahci_intel_pcs_quirk(pdev, hpriv); + /* prepare host */ if (hpriv->cap & HOST_CAP_NCQ) { pi.flags |= ATA_FLAG_NCQ; @@ -1870,7 +1856,7 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) if (rc) return rc; - rc = ahci_pci_reset_controller(host); + rc = ahci_reset_controller(host); if (rc) return rc;
diff --git a/drivers/ata/ahci.h b/drivers/ata/ahci.h index 0d76315..732912c 100644 --- a/drivers/ata/ahci.h +++ b/drivers/ata/ahci.h
@@ -254,7 +254,7 @@ enum { PCS_7 = 0x94, /* 7+ port PCS (Denverton) */ /* em constants */ - EM_MAX_SLOTS = SATA_PMP_MAX_PORTS, + EM_MAX_SLOTS = 8, EM_MAX_RETRY = 5, /* em_ctl bits */
diff --git a/drivers/ata/ahci_imx.c b/drivers/ata/ahci_imx.c index 8460b46..bfc617c 100644 --- a/drivers/ata/ahci_imx.c +++ b/drivers/ata/ahci_imx.c
@@ -1239,4 +1239,4 @@ module_platform_driver(imx_ahci_driver); MODULE_DESCRIPTION("Freescale i.MX AHCI SATA platform driver"); MODULE_AUTHOR("Richard Zhu <Hong-Xing.Zhu@freescale.com>"); MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:" DRV_NAME); +MODULE_ALIAS("ahci:imx");
diff --git a/drivers/ata/libahci_platform.c b/drivers/ata/libahci_platform.c index c0ac25b..8a963d2 100644 --- a/drivers/ata/libahci_platform.c +++ b/drivers/ata/libahci_platform.c
@@ -451,24 +451,14 @@ struct ahci_host_priv *ahci_platform_get_resources(struct platform_device *pdev, } } - /* - * Too many sub-nodes most likely means having something wrong with - * the firmware. - */ - child_nodes = of_get_child_count(dev->of_node); - if (child_nodes > AHCI_MAX_PORTS) { - rc = -EINVAL; - goto err_out; - } + hpriv->nports = child_nodes = of_get_child_count(dev->of_node); /* * If no sub-node was found, we still need to set nports to * one in order to be able to use the * ahci_platform_[en|dis]able_[phys|regulators] functions. */ - if (child_nodes) - hpriv->nports = child_nodes; - else + if (!child_nodes) hpriv->nports = 1; hpriv->phys = devm_kcalloc(dev, hpriv->nports, sizeof(*hpriv->phys), GFP_KERNEL);
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index c06f618..fc37e07 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c
@@ -3096,7 +3096,7 @@ int sata_down_spd_limit(struct ata_link *link, u32 spd_limit) */ if (spd > 1) mask &= (1 << (spd - 1)) - 1; - else if (link->sata_spd) + else return -EINVAL; /* were we already at the bottom? */ @@ -4542,10 +4542,6 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { { "PIONEER DVD-RW DVR-212D", NULL, ATA_HORKAGE_NOSETXFER }, { "PIONEER DVD-RW DVR-216D", NULL, ATA_HORKAGE_NOSETXFER }, - /* These specific Pioneer models have LPM issues */ - { "PIONEER BD-RW BDR-207M", NULL, ATA_HORKAGE_NOLPM }, - { "PIONEER BD-RW BDR-205", NULL, ATA_HORKAGE_NOLPM }, - /* Crucial BX100 SSD 500GB has broken LPM support */ { "CT500BX100SSD1", NULL, ATA_HORKAGE_NOLPM },
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c index 5c91183..c6a21a7 100644 --- a/drivers/ata/libata-eh.c +++ b/drivers/ata/libata-eh.c
@@ -2329,7 +2329,6 @@ const char *ata_get_cmd_descript(u8 command) { ATA_CMD_WRITE_QUEUED_FUA_EXT, "WRITE DMA QUEUED FUA EXT" }, { ATA_CMD_FPDMA_READ, "READ FPDMA QUEUED" }, { ATA_CMD_FPDMA_WRITE, "WRITE FPDMA QUEUED" }, - { ATA_CMD_NCQ_NON_DATA, "NCQ NON-DATA" }, { ATA_CMD_FPDMA_SEND, "SEND FPDMA QUEUED" }, { ATA_CMD_FPDMA_RECV, "RECEIVE FPDMA QUEUED" }, { ATA_CMD_PIO_READ, "READ SECTOR(S)" },
diff --git a/drivers/ata/libata-transport.c b/drivers/ata/libata-transport.c index 1069cda..c4f3631 100644 --- a/drivers/ata/libata-transport.c +++ b/drivers/ata/libata-transport.c
@@ -317,6 +317,7 @@ int ata_tport_add(struct device *parent, tport_err: transport_destroy_device(dev); put_device(dev); + ata_host_put(ap->host); return error; }
diff --git a/drivers/ata/pata_ixp4xx_cf.c b/drivers/ata/pata_ixp4xx_cf.c index 43215a4..abc0e87 100644 --- a/drivers/ata/pata_ixp4xx_cf.c +++ b/drivers/ata/pata_ixp4xx_cf.c
@@ -135,12 +135,12 @@ static void ixp4xx_setup_port(struct ata_port *ap, static int ixp4xx_pata_probe(struct platform_device *pdev) { + unsigned int irq; struct resource *cs0, *cs1; struct ata_host *host; struct ata_port *ap; struct ixp4xx_pata_data *data = dev_get_platdata(&pdev->dev); int ret; - int irq; cs0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); cs1 = platform_get_resource(pdev, IORESOURCE_MEM, 1);
diff --git a/drivers/ata/pata_legacy.c b/drivers/ata/pata_legacy.c index 4405d25..d91ba47 100644 --- a/drivers/ata/pata_legacy.c +++ b/drivers/ata/pata_legacy.c
@@ -278,10 +278,9 @@ static void pdc20230_set_piomode(struct ata_port *ap, struct ata_device *adev) outb(inb(0x1F4) & 0x07, 0x1F4); rt = inb(0x1F3); - rt &= ~(0x07 << (3 * !adev->devno)); + rt &= 0x07 << (3 * adev->devno); if (pio) - rt |= (1 + 3 * pio) << (3 * !adev->devno); - outb(rt, 0x1F3); + rt |= (1 + 3 * pio) << (3 * adev->devno); udelay(100); outb(inb(0x1F2) | 0x01, 0x1F2);
diff --git a/drivers/atm/idt77252.c b/drivers/atm/idt77252.c index c606111..363073e 100644 --- a/drivers/atm/idt77252.c +++ b/drivers/atm/idt77252.c
@@ -2914,7 +2914,6 @@ close_card_oam(struct idt77252_dev *card) recycle_rx_pool_skb(card, &vc->rcv.rx_pool); } - kfree(vc); } } } @@ -2958,15 +2957,6 @@ open_card_ubr0(struct idt77252_dev *card) return 0; } -static void -close_card_ubr0(struct idt77252_dev *card) -{ - struct vc_map *vc = card->vcs[0]; - - free_scq(card, vc->scq); - kfree(vc); -} - static int idt77252_dev_open(struct idt77252_dev *card) { @@ -3016,7 +3006,6 @@ static void idt77252_dev_close(struct atm_dev *dev) struct idt77252_dev *card = dev->dev_data; u32 conf; - close_card_ubr0(card); close_card_oam(card); conf = SAR_CFG_RXPTH | /* enable receive path */ @@ -3777,7 +3766,6 @@ static void __exit idt77252_exit(void) card = idt77252_chain; dev = card->atmdev; idt77252_chain = card->next; - del_timer_sync(&card->tst_timer); if (dev->phy->stop) dev->phy->stop(dev);
diff --git a/drivers/base/arch_topology.c b/drivers/base/arch_topology.c index d777f8a..a3bd02a 100644 --- a/drivers/base/arch_topology.c +++ b/drivers/base/arch_topology.c
@@ -567,23 +567,4 @@ void __init init_cpu_topology(void) else if (of_have_populated_dt() && parse_dt_topology()) reset_cpu_topology(); } - -void store_cpu_topology(unsigned int cpuid) -{ - struct cpu_topology *cpuid_topo = &cpu_topology[cpuid]; - - if (cpuid_topo->package_id != -1) - goto topology_populated; - - cpuid_topo->thread_id = -1; - cpuid_topo->core_id = cpuid; - cpuid_topo->package_id = cpu_to_node(cpuid); - - pr_debug("CPU%u: package %d core %d thread %d\n", - cpuid, cpuid_topo->package_id, cpuid_topo->core_id, - cpuid_topo->thread_id); - -topology_populated: - update_siblings_masks(cpuid); -} #endif
diff --git a/drivers/base/class.c b/drivers/base/class.c index 6178450..d8a6a58 100644 --- a/drivers/base/class.c +++ b/drivers/base/class.c
@@ -191,11 +191,6 @@ int __class_register(struct class *cls, struct lock_class_key *key) } error = class_add_groups(class_get(cls), cls->class_groups); class_put(cls); - if (error) { - kobject_del(&cp->subsys.kobj); - kfree_const(cp->subsys.kobj.name); - kfree(cp); - } return error; } EXPORT_SYMBOL_GPL(__class_register);
diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c index 7000c83..9b5edf1 100644 --- a/drivers/base/cpu.c +++ b/drivers/base/cpu.c
@@ -574,12 +574,6 @@ ssize_t __weak cpu_show_mmio_stale_data(struct device *dev, return sysfs_emit(buf, "Not affected\n"); } -ssize_t __weak cpu_show_retbleed(struct device *dev, - struct device_attribute *attr, char *buf) -{ - return sysfs_emit(buf, "Not affected\n"); -} - static DEVICE_ATTR(meltdown, 0444, cpu_show_meltdown, NULL); static DEVICE_ATTR(spectre_v1, 0444, cpu_show_spectre_v1, NULL); static DEVICE_ATTR(spectre_v2, 0444, cpu_show_spectre_v2, NULL); @@ -590,7 +584,6 @@ static DEVICE_ATTR(tsx_async_abort, 0444, cpu_show_tsx_async_abort, NULL); static DEVICE_ATTR(itlb_multihit, 0444, cpu_show_itlb_multihit, NULL); static DEVICE_ATTR(srbds, 0444, cpu_show_srbds, NULL); static DEVICE_ATTR(mmio_stale_data, 0444, cpu_show_mmio_stale_data, NULL); -static DEVICE_ATTR(retbleed, 0444, cpu_show_retbleed, NULL); static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_meltdown.attr, @@ -603,7 +596,6 @@ static struct attribute *cpu_root_vulnerabilities_attrs[] = { &dev_attr_itlb_multihit.attr, &dev_attr_srbds.attr, &dev_attr_mmio_stale_data.attr, - &dev_attr_retbleed.attr, NULL };
diff --git a/drivers/base/dd.c b/drivers/base/dd.c index 96bc953..8427489 100644 --- a/drivers/base/dd.c +++ b/drivers/base/dd.c
@@ -843,11 +843,6 @@ static int __device_attach_driver(struct device_driver *drv, void *_data) } else if (ret == -EPROBE_DEFER) { dev_dbg(dev, "Device match requests probe deferral\n"); driver_deferred_probe_add(dev); - /* - * Device can't match with a driver right now, so don't attempt - * to match or bind with other drivers on the bus. - */ - return ret; } else if (ret < 0) { dev_dbg(dev, "Bus failed to match device: %d", ret); return ret; @@ -1067,7 +1062,6 @@ static void __driver_attach_async_helper(void *_dev, async_cookie_t cookie) static int __driver_attach(struct device *dev, void *data) { struct device_driver *drv = data; - bool async = false; int ret; /* @@ -1087,18 +1081,9 @@ static int __driver_attach(struct device *dev, void *data) } else if (ret == -EPROBE_DEFER) { dev_dbg(dev, "Device match requests probe deferral\n"); driver_deferred_probe_add(dev); - /* - * Driver could not match with device, but may match with - * another device on the bus. - */ - return 0; } else if (ret < 0) { - dev_dbg(dev, "Bus failed to match device: %d\n", ret); - /* - * Driver could not match with device, but may match with - * another device on the bus. - */ - return 0; + dev_dbg(dev, "Bus failed to match device: %d", ret); + return ret; } /* ret > 0 means positive match */ if (driver_allows_async_probing(drv)) { @@ -1114,11 +1099,9 @@ static int __driver_attach(struct device *dev, void *data) if (!dev->driver) { get_device(dev); dev->p->async_driver = drv; - async = true; + async_schedule_dev(__driver_attach_async_helper, dev); } device_unlock(dev); - if (async) - async_schedule_dev(__driver_attach_async_helper, dev); return 0; }
diff --git a/drivers/base/power/domain.c b/drivers/base/power/domain.c index c4a21dc..34c9ec5 100644 --- a/drivers/base/power/domain.c +++ b/drivers/base/power/domain.c
@@ -2623,10 +2623,6 @@ static int genpd_iterate_idle_states(struct device_node *dn, np = it.node; if (!of_match_node(idle_state_match, np)) continue; - - if (!of_device_is_available(np)) - continue; - if (states) { ret = genpd_parse_state(&states[i], np); if (ret) {
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 9ee58bf..8fbd376 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c
@@ -446,10 +446,7 @@ static int rpm_idle(struct device *dev, int rpmflags) /* Pending requests need to be canceled. */ dev->power.request = RPM_REQ_NONE; - callback = RPM_GET_CALLBACK(dev, runtime_idle); - - /* If no callback assume success. */ - if (!callback || dev->power.no_callbacks) + if (dev->power.no_callbacks) goto out; /* Carry out an asynchronous or a synchronous idle notification. */ @@ -465,17 +462,10 @@ static int rpm_idle(struct device *dev, int rpmflags) dev->power.idle_notification = true; - if (dev->power.irq_safe) - spin_unlock(&dev->power.lock); - else - spin_unlock_irq(&dev->power.lock); + callback = RPM_GET_CALLBACK(dev, runtime_idle); - retval = callback(dev); - - if (dev->power.irq_safe) - spin_lock(&dev->power.lock); - else - spin_lock_irq(&dev->power.lock); + if (callback) + retval = __rpm_callback(callback, dev); dev->power.idle_notification = false; wake_up_all(&dev->power.wait_queue);
diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c index c157a91..3bb7beb 100644 --- a/drivers/base/test/test_async_driver_probe.c +++ b/drivers/base/test/test_async_driver_probe.c
@@ -146,7 +146,7 @@ static int __init test_async_probe_init(void) calltime = ktime_get(); for_each_online_cpu(cpu) { nid = cpu_to_node(cpu); - pdev = &async_dev[async_id]; + pdev = &sync_dev[sync_id]; *pdev = test_platform_device_register_node("test_async_driver", async_id,
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index f3a96c7..5ece2fd 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c
@@ -2778,7 +2778,7 @@ static int init_submitter(struct drbd_device *device) enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsigned int minor) { struct drbd_resource *resource = adm_ctx->resource; - struct drbd_connection *connection, *n; + struct drbd_connection *connection; struct drbd_device *device; struct drbd_peer_device *peer_device, *tmp_peer_device; struct gendisk *disk; @@ -2906,7 +2906,7 @@ enum drbd_ret_code drbd_create_device(struct drbd_config_context *adm_ctx, unsig out_idr_remove_vol: idr_remove(&connection->peer_devices, vnr); out_idr_remove_from_resource: - for_each_connection_safe(connection, n, resource) { + for_each_connection(connection, resource) { peer_device = idr_remove(&connection->peer_devices, vnr); if (peer_device) kref_put(&connection->kref, drbd_destroy_connection);
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index a8b8351..aca9c5e 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c
@@ -1449,11 +1449,6 @@ loop_get_status(struct loop_device *lo, struct loop_info64 *info) info->lo_number = lo->lo_number; info->lo_offset = lo->lo_offset; info->lo_sizelimit = lo->lo_sizelimit; - - /* loff_t vars have been assigned __u64 */ - if (lo->lo_offset < 0 || lo->lo_sizelimit < 0) - return -EOVERFLOW; - info->lo_flags = lo->lo_flags; memcpy(info->lo_file_name, lo->lo_file_name, LO_NAME_SIZE); memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE);
diff --git a/drivers/block/nbd.c b/drivers/block/nbd.c index 610dc6a..09323b0 100644 --- a/drivers/block/nbd.c +++ b/drivers/block/nbd.c
@@ -1327,12 +1327,10 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd, struct block_device *b mutex_unlock(&nbd->config_lock); ret = wait_event_interruptible(config->recv_wq, atomic_read(&config->recv_threads) == 0); - if (ret) { + if (ret) sock_shutdown(nbd); - nbd_clear_que(nbd); - } - flush_workqueue(nbd->recv_workq); + mutex_lock(&nbd->config_lock); nbd_bdev_reset(bdev); /* user requested, ignore socket errors */
diff --git a/drivers/block/null_blk_main.c b/drivers/block/null_blk_main.c index 5f16ff4..75a7dd7 100644 --- a/drivers/block/null_blk_main.c +++ b/drivers/block/null_blk_main.c
@@ -1739,13 +1739,8 @@ static int null_add_dev(struct nullb_device *dev) blk_queue_flag_clear(QUEUE_FLAG_ADD_RANDOM, nullb->q); mutex_lock(&lock); - rv = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL); - if (rv < 0) { - mutex_unlock(&lock); - goto out_cleanup_zone; - } - nullb->index = rv; - dev->index = rv; + nullb->index = ida_simple_get(&nullb_indexes, 0, 0, GFP_KERNEL); + dev->index = nullb->index; mutex_unlock(&lock); blk_queue_logical_block_size(nullb->q, dev->blocksize); @@ -1757,16 +1752,13 @@ static int null_add_dev(struct nullb_device *dev) rv = null_gendisk_register(nullb); if (rv) - goto out_ida_free; + goto out_cleanup_zone; mutex_lock(&lock); list_add_tail(&nullb->list, &nullb_list); mutex_unlock(&lock); return 0; - -out_ida_free: - ida_free(&nullb_indexes, nullb->index); out_cleanup_zone: if (dev->zoned) null_zone_exit(dev);
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 0c74daf..55745d6 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c
@@ -5529,7 +5529,8 @@ static void rbd_dev_release(struct device *dev) module_put(THIS_MODULE); } -static struct rbd_device *__rbd_dev_create(struct rbd_spec *spec) +static struct rbd_device *__rbd_dev_create(struct rbd_client *rbdc, + struct rbd_spec *spec) { struct rbd_device *rbd_dev; @@ -5574,6 +5575,9 @@ static struct rbd_device *__rbd_dev_create(struct rbd_spec *spec) rbd_dev->dev.parent = &rbd_root_dev; device_initialize(&rbd_dev->dev); + rbd_dev->rbd_client = rbdc; + rbd_dev->spec = spec; + return rbd_dev; } @@ -5586,10 +5590,12 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, { struct rbd_device *rbd_dev; - rbd_dev = __rbd_dev_create(spec); + rbd_dev = __rbd_dev_create(rbdc, spec); if (!rbd_dev) return NULL; + rbd_dev->opts = opts; + /* get an id and fill in device name */ rbd_dev->dev_id = ida_simple_get(&rbd_dev_id_ida, 0, minor_to_rbd_dev_id(1 << MINORBITS), @@ -5606,10 +5612,6 @@ static struct rbd_device *rbd_dev_create(struct rbd_client *rbdc, /* we have a ref from do_rbd_add() */ __module_get(THIS_MODULE); - rbd_dev->rbd_client = rbdc; - rbd_dev->spec = spec; - rbd_dev->opts = opts; - dout("%s rbd_dev %p dev_id %d\n", __func__, rbd_dev, rbd_dev->dev_id); return rbd_dev; @@ -6825,7 +6827,7 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) goto out_err; } - parent = __rbd_dev_create(rbd_dev->parent_spec); + parent = __rbd_dev_create(rbd_dev->rbd_client, rbd_dev->parent_spec); if (!parent) { ret = -ENOMEM; goto out_err; @@ -6835,8 +6837,8 @@ static int rbd_dev_probe_parent(struct rbd_device *rbd_dev, int depth) * Images related by parent/child relationships always share * rbd_client and spec/parent_spec, so bump their refcounts. */ - parent->rbd_client = __rbd_get_client(rbd_dev->rbd_client); - parent->spec = rbd_spec_get(rbd_dev->parent_spec); + __rbd_get_client(rbd_dev->rbd_client); + rbd_spec_get(rbd_dev->parent_spec); ret = rbd_dev_image_probe(parent, depth); if (ret < 0)
diff --git a/drivers/block/sunvdc.c b/drivers/block/sunvdc.c index 6622dd1..6b2fd63 100644 --- a/drivers/block/sunvdc.c +++ b/drivers/block/sunvdc.c
@@ -983,8 +983,6 @@ static int vdc_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) print_version(); hp = mdesc_grab(); - if (!hp) - return -ENODEV; err = -ENODEV; if ((vdev->dev_no << PARTITION_SHIFT) & ~(u64)MINORMASK) {
diff --git a/drivers/bluetooth/btqcomsmd.c b/drivers/bluetooth/btqcomsmd.c index 11c7e04..2acb719 100644 --- a/drivers/bluetooth/btqcomsmd.c +++ b/drivers/bluetooth/btqcomsmd.c
@@ -122,21 +122,6 @@ static int btqcomsmd_setup(struct hci_dev *hdev) return 0; } -static int btqcomsmd_set_bdaddr(struct hci_dev *hdev, const bdaddr_t *bdaddr) -{ - int ret; - - ret = qca_set_bdaddr_rome(hdev, bdaddr); - if (ret) - return ret; - - /* The firmware stops responding for a while after setting the bdaddr, - * causing timeouts for subsequent commands. Sleep a bit to avoid this. - */ - usleep_range(1000, 10000); - return 0; -} - static int btqcomsmd_probe(struct platform_device *pdev) { struct btqcomsmd *btq; @@ -177,7 +162,7 @@ static int btqcomsmd_probe(struct platform_device *pdev) hdev->close = btqcomsmd_close; hdev->send = btqcomsmd_send; hdev->setup = btqcomsmd_setup; - hdev->set_bdaddr = btqcomsmd_set_bdaddr; + hdev->set_bdaddr = qca_set_bdaddr_rome; ret = hci_register_dev(hdev); if (ret < 0)
diff --git a/drivers/bluetooth/btsdio.c b/drivers/bluetooth/btsdio.c index 81125fb..fd9571d 100644 --- a/drivers/bluetooth/btsdio.c +++ b/drivers/bluetooth/btsdio.c
@@ -343,7 +343,6 @@ static void btsdio_remove(struct sdio_func *func) BT_DBG("func %p", func); - cancel_work_sync(&data->work); if (!data) return;
diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 79f7731..c8f2b99 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c
@@ -563,13 +563,13 @@ static inline void btusb_free_frags(struct btusb_data *data) spin_lock_irqsave(&data->rxlock, flags); - dev_kfree_skb_irq(data->evt_skb); + kfree_skb(data->evt_skb); data->evt_skb = NULL; - dev_kfree_skb_irq(data->acl_skb); + kfree_skb(data->acl_skb); data->acl_skb = NULL; - dev_kfree_skb_irq(data->sco_skb); + kfree_skb(data->sco_skb); data->sco_skb = NULL; spin_unlock_irqrestore(&data->rxlock, flags);
diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c index 8055f63..cf4a560 100644 --- a/drivers/bluetooth/hci_bcsp.c +++ b/drivers/bluetooth/hci_bcsp.c
@@ -378,7 +378,7 @@ static void bcsp_pkt_cull(struct bcsp_struct *bcsp) i++; __skb_unlink(skb, &bcsp->unack); - dev_kfree_skb_irq(skb); + kfree_skb(skb); } if (skb_queue_empty(&bcsp->unack))
diff --git a/drivers/bluetooth/hci_h5.c b/drivers/bluetooth/hci_h5.c index e77da59..bf3e231 100644 --- a/drivers/bluetooth/hci_h5.c +++ b/drivers/bluetooth/hci_h5.c
@@ -298,7 +298,7 @@ static void h5_pkt_cull(struct h5 *h5) break; __skb_unlink(skb, &h5->unack); - dev_kfree_skb_irq(skb); + kfree_skb(skb); } if (skb_queue_empty(&h5->unack))
diff --git a/drivers/bluetooth/hci_intel.c b/drivers/bluetooth/hci_intel.c index 02c96c6..31f2515 100644 --- a/drivers/bluetooth/hci_intel.c +++ b/drivers/bluetooth/hci_intel.c
@@ -1230,11 +1230,7 @@ static struct platform_driver intel_driver = { int __init intel_init(void) { - int err; - - err = platform_driver_register(&intel_driver); - if (err) - return err; + platform_driver_register(&intel_driver); return hci_uart_register_proto(&intel_proto); }
diff --git a/drivers/bluetooth/hci_ll.c b/drivers/bluetooth/hci_ll.c index aeb3e67..d9a4c6c 100644 --- a/drivers/bluetooth/hci_ll.c +++ b/drivers/bluetooth/hci_ll.c
@@ -345,7 +345,7 @@ static int ll_enqueue(struct hci_uart *hu, struct sk_buff *skb) default: BT_ERR("illegal hcill state: %ld (losing packet)", ll->hcill_state); - dev_kfree_skb_irq(skb); + kfree_skb(skb); break; }
diff --git a/drivers/bluetooth/hci_qca.c b/drivers/bluetooth/hci_qca.c index 475d0ec..bbd290f 100644 --- a/drivers/bluetooth/hci_qca.c +++ b/drivers/bluetooth/hci_qca.c
@@ -816,7 +816,7 @@ static int qca_enqueue(struct hci_uart *hu, struct sk_buff *skb) default: BT_ERR("Illegal tx state: %d (losing packet)", qca->tx_ibs_state); - dev_kfree_skb_irq(skb); + kfree_skb(skb); break; }
diff --git a/drivers/bus/hisi_lpc.c b/drivers/bus/hisi_lpc.c index 0922cbe..2e9252d 100644 --- a/drivers/bus/hisi_lpc.c +++ b/drivers/bus/hisi_lpc.c
@@ -504,13 +504,13 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) { struct acpi_device *adev = ACPI_COMPANION(hostdev); struct acpi_device *child; - struct platform_device *pdev; int ret; /* Only consider the children of the host */ list_for_each_entry(child, &adev->children, node) { const char *hid = acpi_device_hid(child); const struct hisi_lpc_acpi_cell *cell; + struct platform_device *pdev; const struct resource *res; bool found = false; int num_res; @@ -572,24 +572,22 @@ static int hisi_lpc_acpi_probe(struct device *hostdev) ret = platform_device_add_resources(pdev, res, num_res); if (ret) - goto fail_put_device; + goto fail; ret = platform_device_add_data(pdev, cell->pdata, cell->pdata_size); if (ret) - goto fail_put_device; + goto fail; ret = platform_device_add(pdev); if (ret) - goto fail_put_device; + goto fail; acpi_device_set_enumerated(child); } return 0; -fail_put_device: - platform_device_put(pdev); fail: hisi_lpc_acpi_remove(hostdev); return ret;
diff --git a/drivers/bus/imx-weim.c b/drivers/bus/imx-weim.c index 2017678..28bb65a 100644 --- a/drivers/bus/imx-weim.c +++ b/drivers/bus/imx-weim.c
@@ -192,8 +192,8 @@ static int weim_parse_dt(struct platform_device *pdev, void __iomem *base) const struct of_device_id *of_id = of_match_device(weim_id_table, &pdev->dev); const struct imx_weim_devtype *devtype = of_id->data; - int ret = 0, have_child = 0; struct device_node *child; + int ret, have_child = 0; struct cs_timing_state ts = {}; u32 reg;
diff --git a/drivers/bus/sunxi-rsb.c b/drivers/bus/sunxi-rsb.c index 98cbb18..9b1a5e6 100644 --- a/drivers/bus/sunxi-rsb.c +++ b/drivers/bus/sunxi-rsb.c
@@ -268,9 +268,6 @@ EXPORT_SYMBOL_GPL(sunxi_rsb_driver_register); /* common code that starts a transfer */ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) { - u32 int_mask, status; - bool timeout; - if (readl(rsb->regs + RSB_CTRL) & RSB_CTRL_START_TRANS) { dev_dbg(rsb->dev, "RSB transfer still in progress\n"); return -EBUSY; @@ -278,23 +275,13 @@ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) reinit_completion(&rsb->complete); - int_mask = RSB_INTS_LOAD_BSY | RSB_INTS_TRANS_ERR | RSB_INTS_TRANS_OVER; - writel(int_mask, rsb->regs + RSB_INTE); + writel(RSB_INTS_LOAD_BSY | RSB_INTS_TRANS_ERR | RSB_INTS_TRANS_OVER, + rsb->regs + RSB_INTE); writel(RSB_CTRL_START_TRANS | RSB_CTRL_GLOBAL_INT_ENB, rsb->regs + RSB_CTRL); - if (irqs_disabled()) { - timeout = readl_poll_timeout_atomic(rsb->regs + RSB_INTS, - status, (status & int_mask), - 10, 100000); - writel(status, rsb->regs + RSB_INTS); - } else { - timeout = !wait_for_completion_io_timeout(&rsb->complete, - msecs_to_jiffies(100)); - status = rsb->status; - } - - if (timeout) { + if (!wait_for_completion_io_timeout(&rsb->complete, + msecs_to_jiffies(100))) { dev_dbg(rsb->dev, "RSB timeout\n"); /* abort the transfer */ @@ -306,18 +293,18 @@ static int _sunxi_rsb_run_xfer(struct sunxi_rsb *rsb) return -ETIMEDOUT; } - if (status & RSB_INTS_LOAD_BSY) { + if (rsb->status & RSB_INTS_LOAD_BSY) { dev_dbg(rsb->dev, "RSB busy\n"); return -EBUSY; } - if (status & RSB_INTS_TRANS_ERR) { - if (status & RSB_INTS_TRANS_ERR_ACK) { + if (rsb->status & RSB_INTS_TRANS_ERR) { + if (rsb->status & RSB_INTS_TRANS_ERR_ACK) { dev_dbg(rsb->dev, "RSB slave nack\n"); return -EINVAL; } - if (status & RSB_INTS_TRANS_ERR_DATA) { + if (rsb->status & RSB_INTS_TRANS_ERR_DATA) { dev_dbg(rsb->dev, "RSB transfer data error\n"); return -EIO; } @@ -781,13 +768,7 @@ static int __init sunxi_rsb_init(void) return ret; } - ret = platform_driver_register(&sunxi_rsb_driver); - if (ret) { - bus_unregister(&sunxi_rsb_bus); - return ret; - } - - return 0; + return platform_driver_register(&sunxi_rsb_driver); } module_init(sunxi_rsb_init);
diff --git a/drivers/char/hw_random/amd-rng.c b/drivers/char/hw_random/amd-rng.c index db3dd46..9959c76 100644 --- a/drivers/char/hw_random/amd-rng.c +++ b/drivers/char/hw_random/amd-rng.c
@@ -143,19 +143,15 @@ static int __init mod_init(void) found: err = pci_read_config_dword(pdev, 0x58, &pmbase); if (err) - goto put_dev; + return err; pmbase &= 0x0000FF00; - if (pmbase == 0) { - err = -EIO; - goto put_dev; - } + if (pmbase == 0) + return -EIO; priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) { - err = -ENOMEM; - goto put_dev; - } + if (!priv) + return -ENOMEM; if (!request_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE, DRV_NAME)) { dev_err(&pdev->dev, DRV_NAME " region 0x%x already in use!\n", @@ -189,8 +185,6 @@ static int __init mod_init(void) release_region(pmbase + PMBASE_OFFSET, PMBASE_SIZE); out: kfree(priv); -put_dev: - pci_dev_put(pdev); return err; } @@ -206,8 +200,6 @@ static void __exit mod_exit(void) release_region(priv->pmbase + PMBASE_OFFSET, PMBASE_SIZE); - pci_dev_put(priv->pcidev); - kfree(priv); }
diff --git a/drivers/char/hw_random/geode-rng.c b/drivers/char/hw_random/geode-rng.c index 2072729..e1d421a 100644 --- a/drivers/char/hw_random/geode-rng.c +++ b/drivers/char/hw_random/geode-rng.c
@@ -51,10 +51,6 @@ static const struct pci_device_id pci_tbl[] = { }; MODULE_DEVICE_TABLE(pci, pci_tbl); -struct amd_geode_priv { - struct pci_dev *pcidev; - void __iomem *membase; -}; static int geode_rng_data_read(struct hwrng *rng, u32 *data) { @@ -94,7 +90,6 @@ static int __init mod_init(void) const struct pci_device_id *ent; void __iomem *mem; unsigned long rng_base; - struct amd_geode_priv *priv; for_each_pci_dev(pdev) { ent = pci_match_id(pci_tbl, pdev); @@ -102,26 +97,17 @@ static int __init mod_init(void) goto found; } /* Device not found. */ - return err; + goto out; found: - priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) { - err = -ENOMEM; - goto put_dev; - } - rng_base = pci_resource_start(pdev, 0); if (rng_base == 0) - goto free_priv; + goto out; err = -ENOMEM; mem = ioremap(rng_base, 0x58); if (!mem) - goto free_priv; - - geode_rng.priv = (unsigned long)priv; - priv->membase = mem; - priv->pcidev = pdev; + goto out; + geode_rng.priv = (unsigned long)mem; pr_info("AMD Geode RNG detected\n"); err = hwrng_register(&geode_rng); @@ -130,26 +116,20 @@ static int __init mod_init(void) err); goto err_unmap; } +out: return err; err_unmap: iounmap(mem); -free_priv: - kfree(priv); -put_dev: - pci_dev_put(pdev); - return err; + goto out; } static void __exit mod_exit(void) { - struct amd_geode_priv *priv; + void __iomem *mem = (void __iomem *)geode_rng.priv; - priv = (struct amd_geode_priv *)geode_rng.priv; hwrng_unregister(&geode_rng); - iounmap(priv->membase); - pci_dev_put(priv->pcidev); - kfree(priv); + iounmap(mem); } module_init(mod_init);
diff --git a/drivers/char/hw_random/virtio-rng.c b/drivers/char/hw_random/virtio-rng.c index 23149e9..718d8c0 100644 --- a/drivers/char/hw_random/virtio-rng.c +++ b/drivers/char/hw_random/virtio-rng.c
@@ -17,20 +17,13 @@ static DEFINE_IDA(rng_index_ida); struct virtrng_info { struct hwrng hwrng; struct virtqueue *vq; + struct completion have_data; char name[25]; + unsigned int data_avail; int index; bool busy; bool hwrng_register_done; bool hwrng_removed; - /* data transfer */ - struct completion have_data; - unsigned int data_avail; - /* minimal size returned by rng_buffer_size() */ -#if SMP_CACHE_BYTES < 32 - u8 data[32]; -#else - u8 data[SMP_CACHE_BYTES]; -#endif }; static void random_recv_done(struct virtqueue *vq) @@ -45,14 +38,14 @@ static void random_recv_done(struct virtqueue *vq) } /* The host will fill any buffer we give it with sweet, sweet randomness. */ -static void register_buffer(struct virtrng_info *vi) +static void register_buffer(struct virtrng_info *vi, u8 *buf, size_t size) { struct scatterlist sg; - sg_init_one(&sg, vi->data, sizeof(vi->data)); + sg_init_one(&sg, buf, size); /* There should always be room for one buffer. */ - virtqueue_add_inbuf(vi->vq, &sg, 1, vi->data, GFP_KERNEL); + virtqueue_add_inbuf(vi->vq, &sg, 1, buf, GFP_KERNEL); virtqueue_kick(vi->vq); } @@ -61,8 +54,6 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) { int ret; struct virtrng_info *vi = (struct virtrng_info *)rng->priv; - unsigned int chunk; - size_t read; if (vi->hwrng_removed) return -ENODEV; @@ -70,33 +61,19 @@ static int virtio_read(struct hwrng *rng, void *buf, size_t size, bool wait) if (!vi->busy) { vi->busy = true; reinit_completion(&vi->have_data); - register_buffer(vi); + register_buffer(vi, buf, size); } if (!wait) return 0; - read = 0; - while (size != 0) { - ret = wait_for_completion_killable(&vi->have_data); - if (ret < 0) - return ret; - - chunk = min_t(unsigned int, size, vi->data_avail); - memcpy(buf + read, vi->data, chunk); - read += chunk; - size -= chunk; - vi->data_avail = 0; - - if (size != 0) { - reinit_completion(&vi->have_data); - register_buffer(vi); - } - } + ret = wait_for_completion_killable(&vi->have_data); + if (ret < 0) + return ret; vi->busy = false; - return read; + return vi->data_avail; } static void virtio_cleanup(struct hwrng *rng)
diff --git a/drivers/char/ipmi/ipmi_msghandler.c b/drivers/char/ipmi/ipmi_msghandler.c index 0833a2a..7369703 100644 --- a/drivers/char/ipmi/ipmi_msghandler.c +++ b/drivers/char/ipmi/ipmi_msghandler.c
@@ -1298,7 +1298,6 @@ static void _ipmi_destroy_user(struct ipmi_user *user) unsigned long flags; struct cmd_rcvr *rcvr; struct cmd_rcvr *rcvrs = NULL; - struct module *owner; if (!acquire_ipmi_user(user, &i)) { /* @@ -1359,9 +1358,8 @@ static void _ipmi_destroy_user(struct ipmi_user *user) kfree(rcvr); } - owner = intf->owner; kref_put(&intf->refcount, intf_free); - module_put(owner); + module_put(intf->owner); } int ipmi_destroy_user(struct ipmi_user *user) @@ -3537,16 +3535,12 @@ static void deliver_smi_err_response(struct ipmi_smi *intf, struct ipmi_smi_msg *msg, unsigned char err) { - int rv; msg->rsp[0] = msg->data[0] | 4; msg->rsp[1] = msg->data[1]; msg->rsp[2] = err; msg->rsp_size = 3; - - /* This will never requeue, but it may ask us to free the message. */ - rv = handle_one_recv_msg(intf, msg); - if (rv == 0) - ipmi_free_smi_msg(msg); + /* It's an error, so it will never requeue, no need to check return. */ + handle_one_recv_msg(intf, msg); } static void cleanup_smi_msgs(struct ipmi_smi *intf)
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c index 2879b52..b6e7df9 100644 --- a/drivers/char/ipmi/ipmi_si_intf.c +++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2157,20 +2157,6 @@ static int __init init_ipmi_si(void) } module_init(init_ipmi_si); -static void wait_msg_processed(struct smi_info *smi_info) -{ - unsigned long jiffies_now; - long time_diff; - - while (smi_info->curr_msg || (smi_info->si_state != SI_NORMAL)) { - jiffies_now = jiffies; - time_diff = (((long)jiffies_now - (long)smi_info->last_timeout_jiffies) - * SI_USEC_PER_JIFFY); - smi_event_handler(smi_info, time_diff); - schedule_timeout_uninterruptible(1); - } -} - static void shutdown_smi(void *send_info) { struct smi_info *smi_info = send_info; @@ -2205,13 +2191,16 @@ static void shutdown_smi(void *send_info) * in the BMC. Note that timers and CPU interrupts are off, * so no need for locks. */ - wait_msg_processed(smi_info); - + while (smi_info->curr_msg || (smi_info->si_state != SI_NORMAL)) { + poll(smi_info); + schedule_timeout_uninterruptible(1); + } if (smi_info->handlers) disable_si_irq(smi_info); - - wait_msg_processed(smi_info); - + while (smi_info->curr_msg || (smi_info->si_state != SI_NORMAL)) { + poll(smi_info); + schedule_timeout_uninterruptible(1); + } if (smi_info->handlers) smi_info->handlers->cleanup(smi_info->si_sm);
diff --git a/drivers/char/ipmi/ipmi_ssif.c b/drivers/char/ipmi/ipmi_ssif.c index d5f068a..60fb6c6 100644 --- a/drivers/char/ipmi/ipmi_ssif.c +++ b/drivers/char/ipmi/ipmi_ssif.c
@@ -79,8 +79,7 @@ /* * Timer values */ -#define SSIF_MSG_USEC 60000 /* 60ms between message tries (T3). */ -#define SSIF_REQ_RETRY_USEC 60000 /* 60ms between send retries (T6). */ +#define SSIF_MSG_USEC 20000 /* 20ms between message tries. */ #define SSIF_MSG_PART_USEC 5000 /* 5ms for a message part */ /* How many times to we retry sending/receiving the message. */ @@ -88,9 +87,7 @@ #define SSIF_RECV_RETRIES 250 #define SSIF_MSG_MSEC (SSIF_MSG_USEC / 1000) -#define SSIF_REQ_RETRY_MSEC (SSIF_REQ_RETRY_USEC / 1000) #define SSIF_MSG_JIFFIES ((SSIF_MSG_USEC * 1000) / TICK_NSEC) -#define SSIF_REQ_RETRY_JIFFIES ((SSIF_REQ_RETRY_USEC * 1000) / TICK_NSEC) #define SSIF_MSG_PART_JIFFIES ((SSIF_MSG_PART_USEC * 1000) / TICK_NSEC) /* @@ -100,7 +97,7 @@ #define SSIF_WATCH_WATCHDOG_TIMEOUT msecs_to_jiffies(250) enum ssif_intf_state { - SSIF_IDLE, + SSIF_NORMAL, SSIF_GETTING_FLAGS, SSIF_GETTING_EVENTS, SSIF_CLEARING_FLAGS, @@ -108,8 +105,8 @@ enum ssif_intf_state { /* FIXME - add watchdog stuff. */ }; -#define IS_SSIF_IDLE(ssif) ((ssif)->ssif_state == SSIF_IDLE \ - && (ssif)->curr_msg == NULL) +#define SSIF_IDLE(ssif) ((ssif)->ssif_state == SSIF_NORMAL \ + && (ssif)->curr_msg == NULL) /* * Indexes into stats[] in ssif_info below. @@ -239,9 +236,6 @@ struct ssif_info { bool got_alert; bool waiting_alert; - /* Used to inform the timeout that it should do a resend. */ - bool do_resend; - /* * If set to true, this will request events the next time the * state machine is idle. @@ -254,6 +248,12 @@ struct ssif_info { */ bool req_flags; + /* + * Used to perform timer operations when run-to-completion + * mode is on. This is a countdown timer. + */ + int rtc_us_timer; + /* Used for sending/receiving data. +1 for the length. */ unsigned char data[IPMI_MAX_MSG_LENGTH + 1]; unsigned int data_len; @@ -353,9 +353,9 @@ static void return_hosed_msg(struct ssif_info *ssif_info, /* * Must be called with the message lock held. This will release the - * message lock. Note that the caller will check IS_SSIF_IDLE and - * start a new operation, so there is no need to check for new - * messages to start in here. + * message lock. Note that the caller will check SSIF_IDLE and start a + * new operation, so there is no need to check for new messages to + * start in here. */ static void start_clear_flags(struct ssif_info *ssif_info, unsigned long *flags) { @@ -372,7 +372,7 @@ static void start_clear_flags(struct ssif_info *ssif_info, unsigned long *flags) if (start_send(ssif_info, msg, 3) != 0) { /* Error, just go to normal state. */ - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; } } @@ -387,7 +387,7 @@ static void start_flag_fetch(struct ssif_info *ssif_info, unsigned long *flags) mb[0] = (IPMI_NETFN_APP_REQUEST << 2); mb[1] = IPMI_GET_MSG_FLAGS_CMD; if (start_send(ssif_info, mb, 2) != 0) - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; } static void check_start_send(struct ssif_info *ssif_info, unsigned long *flags, @@ -398,7 +398,7 @@ static void check_start_send(struct ssif_info *ssif_info, unsigned long *flags, flags = ipmi_ssif_lock_cond(ssif_info, &oflags); ssif_info->curr_msg = NULL; - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); ipmi_free_smi_msg(msg); } @@ -412,7 +412,7 @@ static void start_event_fetch(struct ssif_info *ssif_info, unsigned long *flags) msg = ipmi_alloc_smi_msg(); if (!msg) { - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); return; } @@ -435,7 +435,7 @@ static void start_recv_msg_fetch(struct ssif_info *ssif_info, msg = ipmi_alloc_smi_msg(); if (!msg) { - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); return; } @@ -453,9 +453,9 @@ static void start_recv_msg_fetch(struct ssif_info *ssif_info, /* * Must be called with the message lock held. This will release the - * message lock. Note that the caller will check IS_SSIF_IDLE and - * start a new operation, so there is no need to check for new - * messages to start in here. + * message lock. Note that the caller will check SSIF_IDLE and start a + * new operation, so there is no need to check for new messages to + * start in here. */ static void handle_flags(struct ssif_info *ssif_info, unsigned long *flags) { @@ -471,7 +471,7 @@ static void handle_flags(struct ssif_info *ssif_info, unsigned long *flags) /* Events available. */ start_event_fetch(ssif_info, flags); else { - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); } } @@ -515,7 +515,7 @@ static int ipmi_ssif_thread(void *data) return 0; } -static void ssif_i2c_send(struct ssif_info *ssif_info, +static int ssif_i2c_send(struct ssif_info *ssif_info, ssif_i2c_done handler, int read_write, int command, unsigned char *data, unsigned int size) @@ -527,6 +527,7 @@ static void ssif_i2c_send(struct ssif_info *ssif_info, ssif_info->i2c_data = data; ssif_info->i2c_size = size; complete(&ssif_info->wake_thread); + return 0; } @@ -535,35 +536,40 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, static void start_get(struct ssif_info *ssif_info) { + int rv; + + ssif_info->rtc_us_timer = 0; ssif_info->multi_pos = 0; - ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ, - SSIF_IPMI_RESPONSE, - ssif_info->recv, I2C_SMBUS_BLOCK_DATA); -} + rv = ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ, + SSIF_IPMI_RESPONSE, + ssif_info->recv, I2C_SMBUS_BLOCK_DATA); + if (rv < 0) { + /* request failed, just return the error. */ + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "Error from i2c_non_blocking_op(5)\n"); -static void start_resend(struct ssif_info *ssif_info); + msg_done_handler(ssif_info, -EIO, NULL, 0); + } +} static void retry_timeout(struct timer_list *t) { struct ssif_info *ssif_info = from_timer(ssif_info, t, retry_timer); unsigned long oflags, *flags; - bool waiting, resend; + bool waiting; if (ssif_info->stopping) return; flags = ipmi_ssif_lock_cond(ssif_info, &oflags); - resend = ssif_info->do_resend; - ssif_info->do_resend = false; waiting = ssif_info->waiting_alert; ssif_info->waiting_alert = false; ipmi_ssif_unlock_cond(ssif_info, flags); if (waiting) start_get(ssif_info); - if (resend) - start_resend(ssif_info); } static void watch_timeout(struct timer_list *t) @@ -578,7 +584,7 @@ static void watch_timeout(struct timer_list *t) if (ssif_info->watch_timeout) { mod_timer(&ssif_info->watch_timer, jiffies + ssif_info->watch_timeout); - if (IS_SSIF_IDLE(ssif_info)) { + if (SSIF_IDLE(ssif_info)) { start_flag_fetch(ssif_info, flags); /* Releases lock */ return; } @@ -612,11 +618,14 @@ static void ssif_alert(struct i2c_client *client, enum i2c_alert_protocol type, start_get(ssif_info); } +static int start_resend(struct ssif_info *ssif_info); + static void msg_done_handler(struct ssif_info *ssif_info, int result, unsigned char *data, unsigned int len) { struct ipmi_smi_msg *msg; unsigned long oflags, *flags; + int rv; /* * We are single-threaded here, so no need for a lock until we @@ -630,6 +639,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, flags = ipmi_ssif_lock_cond(ssif_info, &oflags); ssif_info->waiting_alert = true; + ssif_info->rtc_us_timer = SSIF_MSG_USEC; if (!ssif_info->stopping) mod_timer(&ssif_info->retry_timer, jiffies + SSIF_MSG_JIFFIES); @@ -661,10 +671,17 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, ssif_info->multi_len = len; ssif_info->multi_pos = 1; - ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ, - SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE, - ssif_info->recv, I2C_SMBUS_BLOCK_DATA); - return; + rv = ssif_i2c_send(ssif_info, msg_done_handler, I2C_SMBUS_READ, + SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE, + ssif_info->recv, I2C_SMBUS_BLOCK_DATA); + if (rv < 0) { + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "Error from i2c_non_blocking_op(1)\n"); + + result = -EIO; + } else + return; } else if (ssif_info->multi_pos) { /* Middle of multi-part read. Start the next transaction. */ int i; @@ -726,12 +743,19 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, ssif_info->multi_pos++; - ssif_i2c_send(ssif_info, msg_done_handler, - I2C_SMBUS_READ, - SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE, - ssif_info->recv, - I2C_SMBUS_BLOCK_DATA); - return; + rv = ssif_i2c_send(ssif_info, msg_done_handler, + I2C_SMBUS_READ, + SSIF_IPMI_MULTI_PART_RESPONSE_MIDDLE, + ssif_info->recv, + I2C_SMBUS_BLOCK_DATA); + if (rv < 0) { + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "Error from ssif_i2c_send\n"); + + result = -EIO; + } else + return; } } @@ -763,7 +787,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, } switch (ssif_info->ssif_state) { - case SSIF_IDLE: + case SSIF_NORMAL: ipmi_ssif_unlock_cond(ssif_info, flags); if (!msg) break; @@ -781,7 +805,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, * Error fetching flags, or invalid length, * just give up for now. */ - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); dev_warn(&ssif_info->client->dev, "Error getting flags: %d %d, %x\n", @@ -816,7 +840,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, "Invalid response clearing flags: %x %x\n", data[0], data[1]); } - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; ipmi_ssif_unlock_cond(ssif_info, flags); break; @@ -894,7 +918,7 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, } flags = ipmi_ssif_lock_cond(ssif_info, &oflags); - if (IS_SSIF_IDLE(ssif_info) && !ssif_info->stopping) { + if (SSIF_IDLE(ssif_info) && !ssif_info->stopping) { if (ssif_info->req_events) start_event_fetch(ssif_info, flags); else if (ssif_info->req_flags) @@ -912,27 +936,37 @@ static void msg_done_handler(struct ssif_info *ssif_info, int result, static void msg_written_handler(struct ssif_info *ssif_info, int result, unsigned char *data, unsigned int len) { + int rv; + /* We are single-threaded here, so no need for a lock. */ if (result < 0) { ssif_info->retries_left--; if (ssif_info->retries_left > 0) { - /* - * Wait the retry timeout time per the spec, - * then redo the send. - */ - ssif_info->do_resend = true; - mod_timer(&ssif_info->retry_timer, - jiffies + SSIF_REQ_RETRY_JIFFIES); + if (!start_resend(ssif_info)) { + ssif_inc_stat(ssif_info, send_retries); + return; + } + /* request failed, just return the error. */ + ssif_inc_stat(ssif_info, send_errors); + + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "%s: Out of retries\n", __func__); + msg_done_handler(ssif_info, -EIO, NULL, 0); return; } ssif_inc_stat(ssif_info, send_errors); + /* + * Got an error on transmit, let the done routine + * handle it. + */ if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) dev_dbg(&ssif_info->client->dev, - "%s: Out of retries\n", __func__); + "%s: Error %d\n", __func__, result); - msg_done_handler(ssif_info, -EIO, NULL, 0); + msg_done_handler(ssif_info, result, NULL, 0); return; } @@ -966,9 +1000,18 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, ssif_info->multi_data = NULL; } - ssif_i2c_send(ssif_info, msg_written_handler, - I2C_SMBUS_WRITE, cmd, - data_to_send, I2C_SMBUS_BLOCK_DATA); + rv = ssif_i2c_send(ssif_info, msg_written_handler, + I2C_SMBUS_WRITE, cmd, + data_to_send, I2C_SMBUS_BLOCK_DATA); + if (rv < 0) { + /* request failed, just return the error. */ + ssif_inc_stat(ssif_info, send_errors); + + if (ssif_info->ssif_debug & SSIF_DEBUG_MSG) + dev_dbg(&ssif_info->client->dev, + "Error from i2c_non_blocking_op(3)\n"); + msg_done_handler(ssif_info, -EIO, NULL, 0); + } } else { /* Ready to request the result. */ unsigned long oflags, *flags; @@ -986,6 +1029,7 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, /* Wait a jiffie then request the next message */ ssif_info->waiting_alert = true; ssif_info->retries_left = SSIF_RECV_RETRIES; + ssif_info->rtc_us_timer = SSIF_MSG_PART_USEC; if (!ssif_info->stopping) mod_timer(&ssif_info->retry_timer, jiffies + SSIF_MSG_PART_JIFFIES); @@ -994,8 +1038,9 @@ static void msg_written_handler(struct ssif_info *ssif_info, int result, } } -static void start_resend(struct ssif_info *ssif_info) +static int start_resend(struct ssif_info *ssif_info) { + int rv; int command; ssif_info->got_alert = false; @@ -1017,8 +1062,12 @@ static void start_resend(struct ssif_info *ssif_info) ssif_info->data[0] = ssif_info->data_len; } - ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE, - command, ssif_info->data, I2C_SMBUS_BLOCK_DATA); + rv = ssif_i2c_send(ssif_info, msg_written_handler, I2C_SMBUS_WRITE, + command, ssif_info->data, I2C_SMBUS_BLOCK_DATA); + if (rv && (ssif_info->ssif_debug & SSIF_DEBUG_MSG)) + dev_dbg(&ssif_info->client->dev, + "Error from i2c_non_blocking_op(4)\n"); + return rv; } static int start_send(struct ssif_info *ssif_info, @@ -1033,8 +1082,7 @@ static int start_send(struct ssif_info *ssif_info, ssif_info->retries_left = SSIF_SEND_RETRIES; memcpy(ssif_info->data + 1, data, len); ssif_info->data_len = len; - start_resend(ssif_info); - return 0; + return start_resend(ssif_info); } /* Must be called with the message lock held. */ @@ -1044,7 +1092,7 @@ static void start_next_msg(struct ssif_info *ssif_info, unsigned long *flags) unsigned long oflags; restart: - if (!IS_SSIF_IDLE(ssif_info)) { + if (!SSIF_IDLE(ssif_info)) { ipmi_ssif_unlock_cond(ssif_info, flags); return; } @@ -1267,7 +1315,7 @@ static void shutdown_ssif(void *send_info) dev_set_drvdata(&ssif_info->client->dev, NULL); /* make sure the driver is not looking for flags any more. */ - while (ssif_info->ssif_state != SSIF_IDLE) + while (ssif_info->ssif_state != SSIF_NORMAL) schedule_timeout(1); ssif_info->stopping = true; @@ -1334,10 +1382,8 @@ static int do_cmd(struct i2c_client *client, int len, unsigned char *msg, ret = i2c_smbus_write_block_data(client, SSIF_IPMI_REQUEST, len, msg); if (ret) { retry_cnt--; - if (retry_cnt > 0) { - msleep(SSIF_REQ_RETRY_MSEC); + if (retry_cnt > 0) goto retry1; - } return -ENODEV; } @@ -1477,10 +1523,8 @@ static int start_multipart_test(struct i2c_client *client, 32, msg); if (ret) { retry_cnt--; - if (retry_cnt > 0) { - msleep(SSIF_REQ_RETRY_MSEC); + if (retry_cnt > 0) goto retry_write; - } dev_err(&client->dev, "Could not write multi-part start, though the BMC said it could handle it. Just limit sends to one part.\n"); return ret; } @@ -1842,7 +1886,7 @@ static int ssif_probe(struct i2c_client *client, const struct i2c_device_id *id) } spin_lock_init(&ssif_info->lock); - ssif_info->ssif_state = SSIF_IDLE; + ssif_info->ssif_state = SSIF_NORMAL; timer_setup(&ssif_info->retry_timer, retry_timeout, 0); timer_setup(&ssif_info->watch_timer, watch_timeout, 0);
diff --git a/drivers/char/ipmi/ipmi_watchdog.c b/drivers/char/ipmi/ipmi_watchdog.c index ccb62c4..72ad7ff 100644 --- a/drivers/char/ipmi/ipmi_watchdog.c +++ b/drivers/char/ipmi/ipmi_watchdog.c
@@ -498,7 +498,7 @@ static void panic_halt_ipmi_heartbeat(void) msg.cmd = IPMI_WDOG_RESET_TIMER; msg.data = NULL; msg.data_len = 0; - atomic_add(2, &panic_done_count); + atomic_add(1, &panic_done_count); rv = ipmi_request_supply_msgs(watchdog_user, (struct ipmi_addr *) &addr, 0, @@ -508,7 +508,7 @@ static void panic_halt_ipmi_heartbeat(void) &panic_halt_heartbeat_recv_msg, 1); if (rv) - atomic_sub(2, &panic_done_count); + atomic_sub(1, &panic_done_count); } static struct ipmi_smi_msg panic_halt_smi_msg = { @@ -532,12 +532,12 @@ static void panic_halt_ipmi_set_timeout(void) /* Wait for the messages to be free. */ while (atomic_read(&panic_done_count) != 0) ipmi_poll_interface(watchdog_user); - atomic_add(2, &panic_done_count); + atomic_add(1, &panic_done_count); rv = __ipmi_set_timeout(&panic_halt_smi_msg, &panic_halt_recv_msg, &send_heartbeat_now); if (rv) { - atomic_sub(2, &panic_done_count); + atomic_sub(1, &panic_done_count); pr_warn("Unable to extend the watchdog timeout\n"); } else { if (send_heartbeat_now)
diff --git a/drivers/char/random.c b/drivers/char/random.c index fdb144a..fe69415 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c
@@ -890,23 +890,20 @@ void __init add_bootloader_randomness(const void *buf, size_t len) } struct fast_pool { + struct work_struct mix; unsigned long pool[4]; unsigned long last; unsigned int count; - struct timer_list mix; }; -static void mix_interrupt_randomness(struct timer_list *work); - static DEFINE_PER_CPU(struct fast_pool, irq_randomness) = { #ifdef CONFIG_64BIT #define FASTMIX_PERM SIPHASH_PERMUTATION - .pool = { SIPHASH_CONST_0, SIPHASH_CONST_1, SIPHASH_CONST_2, SIPHASH_CONST_3 }, + .pool = { SIPHASH_CONST_0, SIPHASH_CONST_1, SIPHASH_CONST_2, SIPHASH_CONST_3 } #else #define FASTMIX_PERM HSIPHASH_PERMUTATION - .pool = { HSIPHASH_CONST_0, HSIPHASH_CONST_1, HSIPHASH_CONST_2, HSIPHASH_CONST_3 }, + .pool = { HSIPHASH_CONST_0, HSIPHASH_CONST_1, HSIPHASH_CONST_2, HSIPHASH_CONST_3 } #endif - .mix = __TIMER_INITIALIZER(mix_interrupt_randomness, 0) }; /* @@ -948,7 +945,7 @@ int __cold random_online_cpu(unsigned int cpu) } #endif -static void mix_interrupt_randomness(struct timer_list *work) +static void mix_interrupt_randomness(struct work_struct *work) { struct fast_pool *fast_pool = container_of(work, struct fast_pool, mix); /* @@ -979,7 +976,7 @@ static void mix_interrupt_randomness(struct timer_list *work) local_irq_enable(); mix_pool_bytes(pool, sizeof(pool)); - credit_init_bits(clamp_t(unsigned int, (count & U16_MAX) / 64, 1, sizeof(pool) * 8)); + credit_init_bits(max(1u, (count & U16_MAX) / 64)); memzero_explicit(pool, sizeof(pool)); } @@ -1002,11 +999,10 @@ void add_interrupt_randomness(int irq) if (new_count < 1024 && !time_is_before_jiffies(fast_pool->last + HZ)) return; + if (unlikely(!fast_pool->mix.func)) + INIT_WORK(&fast_pool->mix, mix_interrupt_randomness); fast_pool->count |= MIX_INFLIGHT; - if (!timer_pending(&fast_pool->mix)) { - fast_pool->mix.expires = jiffies; - add_timer_on(&fast_pool->mix, raw_smp_processor_id()); - } + queue_work_on(raw_smp_processor_id(), system_highpri_wq, &fast_pool->mix); } EXPORT_SYMBOL_GPL(add_interrupt_randomness); @@ -1299,7 +1295,7 @@ static ssize_t random_read_iter(struct kiocb *kiocb, struct iov_iter *iter) int ret; if (!crng_ready() && - ((kiocb->ki_flags & IOCB_NOWAIT) || + ((kiocb->ki_flags & (IOCB_NOWAIT | IOCB_NOIO)) || (kiocb->ki_filp->f_flags & O_NONBLOCK))) return -EAGAIN;
diff --git a/drivers/char/tpm/tpm-interface.c b/drivers/char/tpm/tpm-interface.c index 7736c63..b86ee5b 100644 --- a/drivers/char/tpm/tpm-interface.c +++ b/drivers/char/tpm/tpm-interface.c
@@ -396,14 +396,13 @@ int tpm_pm_suspend(struct device *dev) if (chip->flags & TPM_CHIP_FLAG_ALWAYS_POWERED) return 0; - rc = tpm_try_get_ops(chip); - if (!rc) { + if (!tpm_chip_start(chip)) { if (chip->flags & TPM_CHIP_FLAG_TPM2) tpm2_shutdown(chip, TPM2_SU_STATE); else rc = tpm1_pm_suspend(chip, tpm_suspend_pcr); - tpm_put_ops(chip); + tpm_chip_stop(chip); } return rc;
diff --git a/drivers/char/tpm/tpm_crb.c b/drivers/char/tpm/tpm_crb.c index 5fe52a6..a9dcf31 100644 --- a/drivers/char/tpm/tpm_crb.c +++ b/drivers/char/tpm/tpm_crb.c
@@ -252,7 +252,7 @@ static int __crb_relinquish_locality(struct device *dev, iowrite32(CRB_LOC_CTRL_RELINQUISH, &priv->regs_h->loc_ctrl); if (!crb_wait_for_reg_32(&priv->regs_h->loc_state, mask, value, TPM2_TIMEOUT_C)) { - dev_warn(dev, "TPM_LOC_STATE_x.Relinquish timed out\n"); + dev_warn(dev, "TPM_LOC_STATE_x.requestAccess timed out\n"); return -ETIME; } @@ -676,16 +676,12 @@ static int crb_acpi_add(struct acpi_device *device) /* Should the FIFO driver handle this? */ sm = buf->start_method; - if (sm == ACPI_TPM2_MEMORY_MAPPED) { - rc = -ENODEV; - goto out; - } + if (sm == ACPI_TPM2_MEMORY_MAPPED) + return -ENODEV; priv = devm_kzalloc(dev, sizeof(struct crb_priv), GFP_KERNEL); - if (!priv) { - rc = -ENOMEM; - goto out; - } + if (!priv) + return -ENOMEM; if (sm == ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC) { if (buf->header.length < (sizeof(*buf) + sizeof(*crb_smc))) { @@ -693,8 +689,7 @@ static int crb_acpi_add(struct acpi_device *device) FW_BUG "TPM2 ACPI table has wrong size %u for start method type %d\n", buf->header.length, ACPI_TPM2_COMMAND_BUFFER_WITH_ARM_SMC); - rc = -EINVAL; - goto out; + return -EINVAL; } crb_smc = ACPI_ADD_PTR(struct tpm2_crb_smc, buf, sizeof(*buf)); priv->smc_func_id = crb_smc->smc_func_id; @@ -705,23 +700,17 @@ static int crb_acpi_add(struct acpi_device *device) rc = crb_map_io(device, priv, buf); if (rc) - goto out; + return rc; chip = tpmm_chip_alloc(dev, &tpm_crb); - if (IS_ERR(chip)) { - rc = PTR_ERR(chip); - goto out; - } + if (IS_ERR(chip)) + return PTR_ERR(chip); dev_set_drvdata(&chip->dev, priv); chip->acpi_dev_handle = device->handle; chip->flags = TPM_CHIP_FLAG_TPM2; - rc = tpm_chip_register(chip); - -out: - acpi_put_table((struct acpi_table_header *)buf); - return rc; + return tpm_chip_register(chip); } static int crb_acpi_remove(struct acpi_device *device)
diff --git a/drivers/char/tpm/tpm_tis.c b/drivers/char/tpm/tpm_tis.c index 9c61be2..c722e3b 100644 --- a/drivers/char/tpm/tpm_tis.c +++ b/drivers/char/tpm/tpm_tis.c
@@ -125,7 +125,6 @@ static int check_acpi_tpm2(struct device *dev) const struct acpi_device_id *aid = acpi_match_device(tpm_acpi_tbl, dev); struct acpi_table_tpm2 *tbl; acpi_status st; - int ret = 0; if (!aid || aid->driver_data != DEVICE_IS_TPM2) return 0; @@ -133,7 +132,8 @@ static int check_acpi_tpm2(struct device *dev) /* If the ACPI TPM2 signature is matched then a global ACPI_SIG_TPM2 * table is mandatory */ - st = acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl); + st = + acpi_get_table(ACPI_SIG_TPM2, 1, (struct acpi_table_header **)&tbl); if (ACPI_FAILURE(st) || tbl->header.length < sizeof(*tbl)) { dev_err(dev, FW_BUG "failed to get TPM2 ACPI table\n"); return -EINVAL; @@ -141,10 +141,9 @@ static int check_acpi_tpm2(struct device *dev) /* The tpm2_crb driver handles this device */ if (tbl->start_method != ACPI_TPM2_MEMORY_MAPPED) - ret = -ENODEV; + return -ENODEV; - acpi_put_table((struct acpi_table_header *)tbl); - return ret; + return 0; } #else static int check_acpi_tpm2(struct device *dev)
diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig index cc871ae..c44247d 100644 --- a/drivers/clk/Kconfig +++ b/drivers/clk/Kconfig
@@ -63,7 +63,7 @@ config COMMON_CLK_HI655X tristate "Clock driver for Hi655x" if EXPERT depends on (MFD_HI655X_PMIC || COMPILE_TEST) - select REGMAP + depends on REGMAP default MFD_HI655X_PMIC ---help--- This driver supports the hi655x PMIC clock. This
diff --git a/drivers/clk/bcm/clk-bcm2835.c b/drivers/clk/bcm/clk-bcm2835.c index b4e6a79..e637bd6 100644 --- a/drivers/clk/bcm/clk-bcm2835.c +++ b/drivers/clk/bcm/clk-bcm2835.c
@@ -967,9 +967,9 @@ static u32 bcm2835_clock_choose_div(struct clk_hw *hw, return div; } -static unsigned long bcm2835_clock_rate_from_divisor(struct bcm2835_clock *clock, - unsigned long parent_rate, - u32 div) +static long bcm2835_clock_rate_from_divisor(struct bcm2835_clock *clock, + unsigned long parent_rate, + u32 div) { const struct bcm2835_clock_data *data = clock->data; u64 temp; @@ -1756,7 +1756,7 @@ static const struct bcm2835_clk_desc clk_desc_array[] = { .load_mask = CM_PLLC_LOADPER, .hold_mask = CM_PLLC_HOLDPER, .fixed_divider = 1, - .flags = CLK_IS_CRITICAL | CLK_SET_RATE_PARENT), + .flags = CLK_SET_RATE_PARENT), /* * PLLD is the display PLL, used to drive DSI display panels.
diff --git a/drivers/clk/bcm/clk-iproc-pll.c b/drivers/clk/bcm/clk-iproc-pll.c index 8f0619f..274441e 100644 --- a/drivers/clk/bcm/clk-iproc-pll.c +++ b/drivers/clk/bcm/clk-iproc-pll.c
@@ -736,7 +736,6 @@ void iproc_pll_clk_setup(struct device_node *node, const char *parent_name; struct iproc_clk *iclk_array; struct clk_hw_onecell_data *clk_data; - const char *clk_name; if (WARN_ON(!pll_ctrl) || WARN_ON(!clk_ctrl)) return; @@ -784,12 +783,7 @@ void iproc_pll_clk_setup(struct device_node *node, iclk = &iclk_array[0]; iclk->pll = pll; - ret = of_property_read_string_index(node, "clock-output-names", - 0, &clk_name); - if (WARN_ON(ret)) - goto err_pll_register; - - init.name = clk_name; + init.name = node->name; init.ops = &iproc_pll_ops; init.flags = 0; parent_name = of_clk_get_parent_name(node, 0); @@ -809,11 +803,13 @@ void iproc_pll_clk_setup(struct device_node *node, goto err_pll_register; clk_data->hws[0] = &iclk->hw; - parent_name = clk_name; /* now initialize and register all leaf clocks */ for (i = 1; i < num_clks; i++) { + const char *clk_name; + memset(&init, 0, sizeof(init)); + parent_name = node->name; ret = of_property_read_string_index(node, "clock-output-names", i, &clk_name);
diff --git a/drivers/clk/bcm/clk-raspberrypi.c b/drivers/clk/bcm/clk-raspberrypi.c index a790a8c..1654fd0 100644 --- a/drivers/clk/bcm/clk-raspberrypi.c +++ b/drivers/clk/bcm/clk-raspberrypi.c
@@ -113,7 +113,7 @@ static unsigned long raspberrypi_fw_pll_get_rate(struct clk_hw *hw, RPI_FIRMWARE_ARM_CLK_ID, &val); if (ret) - return 0; + return ret; return val * RPI_FIRMWARE_PLLB_ARM_DIV_RATE; }
diff --git a/drivers/clk/berlin/bg2.c b/drivers/clk/berlin/bg2.c index 67a9edb..bccdfa0 100644 --- a/drivers/clk/berlin/bg2.c +++ b/drivers/clk/berlin/bg2.c
@@ -500,15 +500,12 @@ static void __init berlin2_clock_setup(struct device_node *np) int n, ret; clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL); - if (!clk_data) { - of_node_put(parent_np); + if (!clk_data) return; - } clk_data->num = MAX_CLKS; hws = clk_data->hws; gbase = of_iomap(parent_np, 0); - of_node_put(parent_np); if (!gbase) return;
diff --git a/drivers/clk/berlin/bg2q.c b/drivers/clk/berlin/bg2q.c index dd2784b..e9518d3 100644 --- a/drivers/clk/berlin/bg2q.c +++ b/drivers/clk/berlin/bg2q.c
@@ -286,23 +286,19 @@ static void __init berlin2q_clock_setup(struct device_node *np) int n, ret; clk_data = kzalloc(struct_size(clk_data, hws, MAX_CLKS), GFP_KERNEL); - if (!clk_data) { - of_node_put(parent_np); + if (!clk_data) return; - } clk_data->num = MAX_CLKS; hws = clk_data->hws; gbase = of_iomap(parent_np, 0); if (!gbase) { - of_node_put(parent_np); pr_err("%pOF: Unable to map global base\n", np); return; } /* BG2Q CPU PLL is not part of global registers */ cpupll_base = of_iomap(parent_np, 1); - of_node_put(parent_np); if (!cpupll_base) { pr_err("%pOF: Unable to map cpupll base\n", np); iounmap(gbase);
diff --git a/drivers/clk/clk-ast2600.c b/drivers/clk/clk-ast2600.c index 8a6c6b9..48122f5 100644 --- a/drivers/clk/clk-ast2600.c +++ b/drivers/clk/clk-ast2600.c
@@ -579,7 +579,7 @@ static int aspeed_g6_clk_probe(struct platform_device *pdev) regmap_write(map, 0x308, 0x12000); /* 3x3 = 9 */ /* P-Bus (BCLK) clock divider */ - hw = clk_hw_register_divider_table(dev, "bclk", "epll", 0, + hw = clk_hw_register_divider_table(dev, "bclk", "hpll", 0, scu_g6_base + ASPEED_G6_CLK_SELECTION1, 20, 3, 0, ast2600_div_table, &aspeed_g6_clk_lock);
diff --git a/drivers/clk/clk-devres.c b/drivers/clk/clk-devres.c index 4fb4fd4..f9d5b73 100644 --- a/drivers/clk/clk-devres.c +++ b/drivers/clk/clk-devres.c
@@ -4,101 +4,42 @@ #include <linux/export.h> #include <linux/gfp.h> -struct devm_clk_state { - struct clk *clk; - void (*exit)(struct clk *clk); -}; - static void devm_clk_release(struct device *dev, void *res) { - struct devm_clk_state *state = res; - - if (state->exit) - state->exit(state->clk); - - clk_put(state->clk); -} - -static struct clk *__devm_clk_get(struct device *dev, const char *id, - struct clk *(*get)(struct device *dev, const char *id), - int (*init)(struct clk *clk), - void (*exit)(struct clk *clk)) -{ - struct devm_clk_state *state; - struct clk *clk; - int ret; - - state = devres_alloc(devm_clk_release, sizeof(*state), GFP_KERNEL); - if (!state) - return ERR_PTR(-ENOMEM); - - clk = get(dev, id); - if (IS_ERR(clk)) { - ret = PTR_ERR(clk); - goto err_clk_get; - } - - if (init) { - ret = init(clk); - if (ret) - goto err_clk_init; - } - - state->clk = clk; - state->exit = exit; - - devres_add(dev, state); - - return clk; - -err_clk_init: - - clk_put(clk); -err_clk_get: - - devres_free(state); - return ERR_PTR(ret); + clk_put(*(struct clk **)res); } struct clk *devm_clk_get(struct device *dev, const char *id) { - return __devm_clk_get(dev, id, clk_get, NULL, NULL); + struct clk **ptr, *clk; + + ptr = devres_alloc(devm_clk_release, sizeof(*ptr), GFP_KERNEL); + if (!ptr) + return ERR_PTR(-ENOMEM); + + clk = clk_get(dev, id); + if (!IS_ERR(clk)) { + *ptr = clk; + devres_add(dev, ptr); + } else { + devres_free(ptr); + } + + return clk; } EXPORT_SYMBOL(devm_clk_get); -struct clk *devm_clk_get_prepared(struct device *dev, const char *id) -{ - return __devm_clk_get(dev, id, clk_get, clk_prepare, clk_unprepare); -} -EXPORT_SYMBOL_GPL(devm_clk_get_prepared); - -struct clk *devm_clk_get_enabled(struct device *dev, const char *id) -{ - return __devm_clk_get(dev, id, clk_get, - clk_prepare_enable, clk_disable_unprepare); -} -EXPORT_SYMBOL_GPL(devm_clk_get_enabled); - struct clk *devm_clk_get_optional(struct device *dev, const char *id) { - return __devm_clk_get(dev, id, clk_get_optional, NULL, NULL); + struct clk *clk = devm_clk_get(dev, id); + + if (clk == ERR_PTR(-ENOENT)) + return NULL; + + return clk; } EXPORT_SYMBOL(devm_clk_get_optional); -struct clk *devm_clk_get_optional_prepared(struct device *dev, const char *id) -{ - return __devm_clk_get(dev, id, clk_get_optional, - clk_prepare, clk_unprepare); -} -EXPORT_SYMBOL_GPL(devm_clk_get_optional_prepared); - -struct clk *devm_clk_get_optional_enabled(struct device *dev, const char *id) -{ - return __devm_clk_get(dev, id, clk_get_optional, - clk_prepare_enable, clk_disable_unprepare); -} -EXPORT_SYMBOL_GPL(devm_clk_get_optional_enabled); - struct clk_bulk_devres { struct clk_bulk_data *clks; int num_clks;
diff --git a/drivers/clk/clk-oxnas.c b/drivers/clk/clk-oxnas.c index 2fe36f5..78d5ea6 100644 --- a/drivers/clk/clk-oxnas.c +++ b/drivers/clk/clk-oxnas.c
@@ -207,7 +207,7 @@ static const struct of_device_id oxnas_stdclk_dt_ids[] = { static int oxnas_stdclk_probe(struct platform_device *pdev) { - struct device_node *np = pdev->dev.of_node, *parent_np; + struct device_node *np = pdev->dev.of_node; const struct oxnas_stdclk_data *data; const struct of_device_id *id; struct regmap *regmap; @@ -219,9 +219,7 @@ static int oxnas_stdclk_probe(struct platform_device *pdev) return -ENODEV; data = id->data; - parent_np = of_get_parent(np); - regmap = syscon_node_to_regmap(parent_np); - of_node_put(parent_np); + regmap = syscon_node_to_regmap(of_get_parent(np)); if (IS_ERR(regmap)) { dev_err(&pdev->dev, "failed to have parent regmap\n"); return PTR_ERR(regmap);
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c index e09c76e..16d62d6 100644 --- a/drivers/clk/clk.c +++ b/drivers/clk/clk.c
@@ -253,17 +253,6 @@ static bool clk_core_is_enabled(struct clk_core *core) } } - /* - * This could be called with the enable lock held, or from atomic - * context. If the parent isn't enabled already, we can't do - * anything here. We can also assume this clock isn't enabled. - */ - if ((core->flags & CLK_OPS_PARENT_ENABLE) && core->parent) - if (!clk_core_is_enabled(core->parent)) { - ret = false; - goto done; - } - ret = core->ops->is_enabled(core->hw); done: if (core->rpm_enabled) @@ -865,9 +854,10 @@ static void clk_core_unprepare(struct clk_core *core) if (core->ops->unprepare) core->ops->unprepare(core->hw); + clk_pm_runtime_put(core); + trace_clk_unprepare_complete(core); clk_core_unprepare(core->parent); - clk_pm_runtime_put(core); } static void clk_core_unprepare_lock(struct clk_core *core)
diff --git a/drivers/clk/imx/clk-imx6sx.c b/drivers/clk/imx/clk-imx6sx.c index 579b638..c4685c0 100644 --- a/drivers/clk/imx/clk-imx6sx.c +++ b/drivers/clk/imx/clk-imx6sx.c
@@ -287,13 +287,13 @@ static void __init imx6sx_clocks_init(struct device_node *ccm_node) hws[IMX6SX_CLK_SSI3_SEL] = imx_clk_hw_mux("ssi3_sel", base + 0x1c, 14, 2, ssi_sels, ARRAY_SIZE(ssi_sels)); hws[IMX6SX_CLK_SSI2_SEL] = imx_clk_hw_mux("ssi2_sel", base + 0x1c, 12, 2, ssi_sels, ARRAY_SIZE(ssi_sels)); hws[IMX6SX_CLK_SSI1_SEL] = imx_clk_hw_mux("ssi1_sel", base + 0x1c, 10, 2, ssi_sels, ARRAY_SIZE(ssi_sels)); - hws[IMX6SX_CLK_QSPI1_SEL] = imx_clk_hw_mux("qspi1_sel", base + 0x1c, 7, 3, qspi1_sels, ARRAY_SIZE(qspi1_sels)); + hws[IMX6SX_CLK_QSPI1_SEL] = imx_clk_hw_mux_flags("qspi1_sel", base + 0x1c, 7, 3, qspi1_sels, ARRAY_SIZE(qspi1_sels), CLK_SET_RATE_PARENT); hws[IMX6SX_CLK_PERCLK_SEL] = imx_clk_hw_mux("perclk_sel", base + 0x1c, 6, 1, perclk_sels, ARRAY_SIZE(perclk_sels)); hws[IMX6SX_CLK_VID_SEL] = imx_clk_hw_mux("vid_sel", base + 0x20, 21, 3, vid_sels, ARRAY_SIZE(vid_sels)); hws[IMX6SX_CLK_ESAI_SEL] = imx_clk_hw_mux("esai_sel", base + 0x20, 19, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_CAN_SEL] = imx_clk_hw_mux("can_sel", base + 0x20, 8, 2, can_sels, ARRAY_SIZE(can_sels)); hws[IMX6SX_CLK_UART_SEL] = imx_clk_hw_mux("uart_sel", base + 0x24, 6, 1, uart_sels, ARRAY_SIZE(uart_sels)); - hws[IMX6SX_CLK_QSPI2_SEL] = imx_clk_hw_mux("qspi2_sel", base + 0x2c, 15, 3, qspi2_sels, ARRAY_SIZE(qspi2_sels)); + hws[IMX6SX_CLK_QSPI2_SEL] = imx_clk_hw_mux_flags("qspi2_sel", base + 0x2c, 15, 3, qspi2_sels, ARRAY_SIZE(qspi2_sels), CLK_SET_RATE_PARENT); hws[IMX6SX_CLK_SPDIF_SEL] = imx_clk_hw_mux("spdif_sel", base + 0x30, 20, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_AUDIO_SEL] = imx_clk_hw_mux("audio_sel", base + 0x30, 7, 2, audio_sels, ARRAY_SIZE(audio_sels)); hws[IMX6SX_CLK_ENET_PRE_SEL] = imx_clk_hw_mux("enet_pre_sel", base + 0x34, 15, 3, enet_pre_sels, ARRAY_SIZE(enet_pre_sels));
diff --git a/drivers/clk/imx/clk-imx8mn.c b/drivers/clk/imx/clk-imx8mn.c index 9d33321..882b42e 100644 --- a/drivers/clk/imx/clk-imx8mn.c +++ b/drivers/clk/imx/clk-imx8mn.c
@@ -189,27 +189,27 @@ static const char * const imx8mn_disp_pixel_sels[] = {"osc_24m", "video_pll1_out "sys_pll3_out", "clk_ext4", }; static const char * const imx8mn_sai2_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai3_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai5_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_sai6_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_sai7_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext3", "clk_ext4", }; static const char * const imx8mn_spdif1_sels[] = {"osc_24m", "audio_pll1_out", "audio_pll2_out", - "video_pll1_out", "sys_pll1_133m", "dummy", + "video_pll1_out", "sys_pll1_133m", "osc_hdmi", "clk_ext2", "clk_ext3", }; static const char * const imx8mn_enet_ref_sels[] = {"osc_24m", "sys_pll2_125m", "sys_pll2_50m", @@ -582,7 +582,7 @@ static int imx8mn_clocks_probe(struct platform_device *pdev) clks[IMX8MN_CLK_UART2_ROOT] = imx_clk_gate4("uart2_root_clk", "uart2", base + 0x44a0, 0); clks[IMX8MN_CLK_UART3_ROOT] = imx_clk_gate4("uart3_root_clk", "uart3", base + 0x44b0, 0); clks[IMX8MN_CLK_UART4_ROOT] = imx_clk_gate4("uart4_root_clk", "uart4", base + 0x44c0, 0); - clks[IMX8MN_CLK_USB1_CTRL_ROOT] = imx_clk_gate4("usb1_ctrl_root_clk", "usb_bus", base + 0x44d0, 0); + clks[IMX8MN_CLK_USB1_CTRL_ROOT] = imx_clk_gate4("usb1_ctrl_root_clk", "usb_core_ref", base + 0x44d0, 0); clks[IMX8MN_CLK_GPU_CORE_ROOT] = imx_clk_gate4("gpu_core_root_clk", "gpu_core_div", base + 0x44f0, 0); clks[IMX8MN_CLK_USDHC1_ROOT] = imx_clk_gate4("usdhc1_root_clk", "usdhc1", base + 0x4510, 0); clks[IMX8MN_CLK_USDHC2_ROOT] = imx_clk_gate4("usdhc2_root_clk", "usdhc2", base + 0x4520, 0);
diff --git a/drivers/clk/ingenic/tcu.c b/drivers/clk/ingenic/tcu.c index d873987..926696f 100644 --- a/drivers/clk/ingenic/tcu.c +++ b/drivers/clk/ingenic/tcu.c
@@ -100,11 +100,15 @@ static bool ingenic_tcu_enable_regs(struct clk_hw *hw) bool enabled = false; /* - * According to the programming manual, a timer channel's registers can - * only be accessed when the channel's stop bit is clear. + * If the SoC has no global TCU clock, we must ungate the channel's + * clock to be able to access its registers. + * If we have a TCU clock, it will be enabled automatically as it has + * been attached to the regmap. */ - enabled = !!ingenic_tcu_is_enabled(hw); - regmap_write(tcu->map, TCU_REG_TSCR, BIT(info->gate_bit)); + if (!tcu->clk) { + enabled = !!ingenic_tcu_is_enabled(hw); + regmap_write(tcu->map, TCU_REG_TSCR, BIT(info->gate_bit)); + } return enabled; } @@ -115,7 +119,8 @@ static void ingenic_tcu_disable_regs(struct clk_hw *hw) const struct ingenic_tcu_clk_info *info = tcu_clk->info; struct ingenic_tcu *tcu = tcu_clk->tcu; - regmap_write(tcu->map, TCU_REG_TSSR, BIT(info->gate_bit)); + if (!tcu->clk) + regmap_write(tcu->map, TCU_REG_TSSR, BIT(info->gate_bit)); } static u8 ingenic_tcu_get_parent(struct clk_hw *hw)
diff --git a/drivers/clk/mediatek/clk-mt8183-mfgcfg.c b/drivers/clk/mediatek/clk-mt8183-mfgcfg.c index 3a33014..37b4162 100644 --- a/drivers/clk/mediatek/clk-mt8183-mfgcfg.c +++ b/drivers/clk/mediatek/clk-mt8183-mfgcfg.c
@@ -18,9 +18,9 @@ static const struct mtk_gate_regs mfg_cg_regs = { .sta_ofs = 0x0, }; -#define GATE_MFG(_id, _name, _parent, _shift) \ - GATE_MTK_FLAGS(_id, _name, _parent, &mfg_cg_regs, _shift, \ - &mtk_clk_gate_ops_setclr, CLK_SET_RATE_PARENT) +#define GATE_MFG(_id, _name, _parent, _shift) \ + GATE_MTK(_id, _name, _parent, &mfg_cg_regs, _shift, \ + &mtk_clk_gate_ops_setclr) static const struct mtk_gate mfg_clks[] = { GATE_MFG(CLK_MFG_BG3D, "mfg_bg3d", "mfg_sel", 0)
diff --git a/drivers/clk/mediatek/reset.c b/drivers/clk/mediatek/reset.c index 89916ac..cb939c0 100644 --- a/drivers/clk/mediatek/reset.c +++ b/drivers/clk/mediatek/reset.c
@@ -25,7 +25,7 @@ static int mtk_reset_assert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); unsigned int reg = data->regofs + ((id / 32) << 4); - return regmap_write(data->regmap, reg, BIT(id % 32)); + return regmap_write(data->regmap, reg, 1); } static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev, @@ -34,7 +34,7 @@ static int mtk_reset_deassert_set_clr(struct reset_controller_dev *rcdev, struct mtk_reset *data = container_of(rcdev, struct mtk_reset, rcdev); unsigned int reg = data->regofs + ((id / 32) << 4) + 0x4; - return regmap_write(data->regmap, reg, BIT(id % 32)); + return regmap_write(data->regmap, reg, 1); } static int mtk_reset_assert(struct reset_controller_dev *rcdev,
diff --git a/drivers/clk/meson/meson-aoclk.c b/drivers/clk/meson/meson-aoclk.c index 6c7110a..bf8bea6 100644 --- a/drivers/clk/meson/meson-aoclk.c +++ b/drivers/clk/meson/meson-aoclk.c
@@ -36,7 +36,6 @@ int meson_aoclkc_probe(struct platform_device *pdev) struct meson_aoclk_reset_controller *rstc; struct meson_aoclk_data *data; struct device *dev = &pdev->dev; - struct device_node *np; struct regmap *regmap; int ret, clkid; @@ -48,9 +47,7 @@ int meson_aoclkc_probe(struct platform_device *pdev) if (!rstc) return -ENOMEM; - np = of_get_parent(dev->of_node); - regmap = syscon_node_to_regmap(np); - of_node_put(np); + regmap = syscon_node_to_regmap(of_get_parent(dev->of_node)); if (IS_ERR(regmap)) { dev_err(dev, "failed to get regmap\n"); return PTR_ERR(regmap);
diff --git a/drivers/clk/meson/meson-eeclk.c b/drivers/clk/meson/meson-eeclk.c index 18ae387..a7cb1e7 100644 --- a/drivers/clk/meson/meson-eeclk.c +++ b/drivers/clk/meson/meson-eeclk.c
@@ -17,7 +17,6 @@ int meson_eeclkc_probe(struct platform_device *pdev) { const struct meson_eeclkc_data *data; struct device *dev = &pdev->dev; - struct device_node *np; struct regmap *map; int ret, i; @@ -26,9 +25,7 @@ int meson_eeclkc_probe(struct platform_device *pdev) return -EINVAL; /* Get the hhi system controller node */ - np = of_get_parent(dev->of_node); - map = syscon_node_to_regmap(np); - of_node_put(np); + map = syscon_node_to_regmap(of_get_parent(dev->of_node)); if (IS_ERR(map)) { dev_err(dev, "failed to get HHI regmap\n");
diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index efddf0d..082178a 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c
@@ -3684,16 +3684,13 @@ static void __init meson8b_clkc_init_common(struct device_node *np, struct clk_hw_onecell_data *clk_hw_onecell_data) { struct meson8b_clk_reset *rstc; - struct device_node *parent_np; const char *notifier_clk_name; struct clk *notifier_clk; void __iomem *clk_base; struct regmap *map; int i, ret; - parent_np = of_get_parent(np); - map = syscon_node_to_regmap(parent_np); - of_node_put(parent_np); + map = syscon_node_to_regmap(of_get_parent(np)); if (IS_ERR(map)) { pr_info("failed to get HHI regmap - Trying obsolete regs\n");
diff --git a/drivers/clk/qcom/camcc-sdm845.c b/drivers/clk/qcom/camcc-sdm845.c index a8a2cfa..1b2cefe 100644 --- a/drivers/clk/qcom/camcc-sdm845.c +++ b/drivers/clk/qcom/camcc-sdm845.c
@@ -1521,8 +1521,6 @@ static struct clk_branch cam_cc_sys_tmr_clk = { }, }; -static struct gdsc titan_top_gdsc; - static struct gdsc bps_gdsc = { .gdscr = 0x6004, .pd = { @@ -1556,7 +1554,6 @@ static struct gdsc ife_0_gdsc = { .name = "ife_0_gdsc", }, .flags = POLL_CFG_GDSCR, - .parent = &titan_top_gdsc.pd, .pwrsts = PWRSTS_OFF_ON, }; @@ -1566,7 +1563,6 @@ static struct gdsc ife_1_gdsc = { .name = "ife_1_gdsc", }, .flags = POLL_CFG_GDSCR, - .parent = &titan_top_gdsc.pd, .pwrsts = PWRSTS_OFF_ON, };
diff --git a/drivers/clk/qcom/clk-krait.c b/drivers/clk/qcom/clk-krait.c index e74fc81..59f1af4 100644 --- a/drivers/clk/qcom/clk-krait.c +++ b/drivers/clk/qcom/clk-krait.c
@@ -32,16 +32,11 @@ static void __krait_mux_set_sel(struct krait_mux_clk *mux, int sel) regval |= (sel & mux->mask) << (mux->shift + LPL_SHIFT); } krait_set_l2_indirect_reg(mux->offset, regval); + spin_unlock_irqrestore(&krait_clock_reg_lock, flags); /* Wait for switch to complete. */ mb(); udelay(1); - - /* - * Unlock now to make sure the mux register is not - * modified while switching to the new parent. - */ - spin_unlock_irqrestore(&krait_clock_reg_lock, flags); } static int krait_mux_set_parent(struct clk_hw *hw, u8 index) @@ -98,8 +93,6 @@ static int krait_div2_set_rate(struct clk_hw *hw, unsigned long rate, if (d->lpl) mask = mask << (d->shift + LPL_SHIFT) | mask << d->shift; - else - mask <<= d->shift; spin_lock_irqsave(&krait_clock_reg_lock, flags); val = krait_get_l2_indirect_reg(d->offset);
diff --git a/drivers/clk/qcom/gcc-ipq8074.c b/drivers/clk/qcom/gcc-ipq8074.c index e9835db..de48ba7 100644 --- a/drivers/clk/qcom/gcc-ipq8074.c +++ b/drivers/clk/qcom/gcc-ipq8074.c
@@ -667,7 +667,6 @@ static struct clk_branch gcc_sleep_clk_src = { }, .num_parents = 1, .ops = &clk_branch2_ops, - .flags = CLK_IS_CRITICAL, }, }, }; @@ -1789,10 +1788,8 @@ static struct clk_regmap_div nss_port4_tx_div_clk_src = { static const struct freq_tbl ftbl_nss_port5_rx_clk_src[] = { F(19200000, P_XO, 1, 0, 0), F(25000000, P_UNIPHY1_RX, 12.5, 0, 0), - F(25000000, P_UNIPHY0_RX, 5, 0, 0), F(78125000, P_UNIPHY1_RX, 4, 0, 0), F(125000000, P_UNIPHY1_RX, 2.5, 0, 0), - F(125000000, P_UNIPHY0_RX, 1, 0, 0), F(156250000, P_UNIPHY1_RX, 2, 0, 0), F(312500000, P_UNIPHY1_RX, 1, 0, 0), { } @@ -1831,10 +1828,8 @@ static struct clk_regmap_div nss_port5_rx_div_clk_src = { static const struct freq_tbl ftbl_nss_port5_tx_clk_src[] = { F(19200000, P_XO, 1, 0, 0), F(25000000, P_UNIPHY1_TX, 12.5, 0, 0), - F(25000000, P_UNIPHY0_TX, 5, 0, 0), F(78125000, P_UNIPHY1_TX, 4, 0, 0), F(125000000, P_UNIPHY1_TX, 2.5, 0, 0), - F(125000000, P_UNIPHY0_TX, 1, 0, 0), F(156250000, P_UNIPHY1_TX, 2, 0, 0), F(312500000, P_UNIPHY1_TX, 1, 0, 0), { } @@ -1872,10 +1867,8 @@ static struct clk_regmap_div nss_port5_tx_div_clk_src = { static const struct freq_tbl ftbl_nss_port6_rx_clk_src[] = { F(19200000, P_XO, 1, 0, 0), - F(25000000, P_UNIPHY2_RX, 5, 0, 0), F(25000000, P_UNIPHY2_RX, 12.5, 0, 0), F(78125000, P_UNIPHY2_RX, 4, 0, 0), - F(125000000, P_UNIPHY2_RX, 1, 0, 0), F(125000000, P_UNIPHY2_RX, 2.5, 0, 0), F(156250000, P_UNIPHY2_RX, 2, 0, 0), F(312500000, P_UNIPHY2_RX, 1, 0, 0), @@ -1914,10 +1907,8 @@ static struct clk_regmap_div nss_port6_rx_div_clk_src = { static const struct freq_tbl ftbl_nss_port6_tx_clk_src[] = { F(19200000, P_XO, 1, 0, 0), - F(25000000, P_UNIPHY2_TX, 5, 0, 0), F(25000000, P_UNIPHY2_TX, 12.5, 0, 0), F(78125000, P_UNIPHY2_TX, 4, 0, 0), - F(125000000, P_UNIPHY2_TX, 1, 0, 0), F(125000000, P_UNIPHY2_TX, 2.5, 0, 0), F(156250000, P_UNIPHY2_TX, 2, 0, 0), F(312500000, P_UNIPHY2_TX, 1, 0, 0), @@ -3355,7 +3346,6 @@ static struct clk_branch gcc_nssnoc_ubi1_ahb_clk = { static struct clk_branch gcc_ubi0_ahb_clk = { .halt_reg = 0x6820c, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x6820c, .enable_mask = BIT(0), @@ -3373,7 +3363,6 @@ static struct clk_branch gcc_ubi0_ahb_clk = { static struct clk_branch gcc_ubi0_axi_clk = { .halt_reg = 0x68200, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68200, .enable_mask = BIT(0), @@ -3391,7 +3380,6 @@ static struct clk_branch gcc_ubi0_axi_clk = { static struct clk_branch gcc_ubi0_nc_axi_clk = { .halt_reg = 0x68204, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68204, .enable_mask = BIT(0), @@ -3409,7 +3397,6 @@ static struct clk_branch gcc_ubi0_nc_axi_clk = { static struct clk_branch gcc_ubi0_core_clk = { .halt_reg = 0x68210, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68210, .enable_mask = BIT(0), @@ -3427,7 +3414,6 @@ static struct clk_branch gcc_ubi0_core_clk = { static struct clk_branch gcc_ubi0_mpt_clk = { .halt_reg = 0x68208, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68208, .enable_mask = BIT(0), @@ -3445,7 +3431,6 @@ static struct clk_branch gcc_ubi0_mpt_clk = { static struct clk_branch gcc_ubi1_ahb_clk = { .halt_reg = 0x6822c, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x6822c, .enable_mask = BIT(0), @@ -3463,7 +3448,6 @@ static struct clk_branch gcc_ubi1_ahb_clk = { static struct clk_branch gcc_ubi1_axi_clk = { .halt_reg = 0x68220, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68220, .enable_mask = BIT(0), @@ -3481,7 +3465,6 @@ static struct clk_branch gcc_ubi1_axi_clk = { static struct clk_branch gcc_ubi1_nc_axi_clk = { .halt_reg = 0x68224, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68224, .enable_mask = BIT(0), @@ -3499,7 +3482,6 @@ static struct clk_branch gcc_ubi1_nc_axi_clk = { static struct clk_branch gcc_ubi1_core_clk = { .halt_reg = 0x68230, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68230, .enable_mask = BIT(0), @@ -3517,7 +3499,6 @@ static struct clk_branch gcc_ubi1_core_clk = { static struct clk_branch gcc_ubi1_mpt_clk = { .halt_reg = 0x68228, - .halt_check = BRANCH_HALT_DELAY, .clkr = { .enable_reg = 0x68228, .enable_mask = BIT(0),
diff --git a/drivers/clk/qcom/gcc-qcs404.c b/drivers/clk/qcom/gcc-qcs404.c index 5982253..bd32212 100644 --- a/drivers/clk/qcom/gcc-qcs404.c +++ b/drivers/clk/qcom/gcc-qcs404.c
@@ -25,9 +25,11 @@ enum { P_CORE_BI_PLL_TEST_SE, P_DSI0_PHY_PLL_OUT_BYTECLK, P_DSI0_PHY_PLL_OUT_DSICLK, + P_GPLL0_OUT_AUX, P_GPLL0_OUT_MAIN, P_GPLL1_OUT_MAIN, P_GPLL3_OUT_MAIN, + P_GPLL4_OUT_AUX, P_GPLL4_OUT_MAIN, P_GPLL6_OUT_AUX, P_HDMI_PHY_PLL_CLK, @@ -107,24 +109,28 @@ static const char * const gcc_parent_names_4[] = { static const struct parent_map gcc_parent_map_5[] = { { P_XO, 0 }, { P_DSI0_PHY_PLL_OUT_BYTECLK, 1 }, + { P_GPLL0_OUT_AUX, 2 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_5[] = { "cxo", - "dsi0pllbyte", + "dsi0pll_byteclk_src", + "gpll0_out_aux", "core_bi_pll_test_se", }; static const struct parent_map gcc_parent_map_6[] = { { P_XO, 0 }, { P_DSI0_PHY_PLL_OUT_BYTECLK, 2 }, + { P_GPLL0_OUT_AUX, 3 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_6[] = { "cxo", - "dsi0pllbyte", + "dsi0_phy_pll_out_byteclk", + "gpll0_out_aux", "core_bi_pll_test_se", }; @@ -133,6 +139,7 @@ static const struct parent_map gcc_parent_map_7[] = { { P_GPLL0_OUT_MAIN, 1 }, { P_GPLL3_OUT_MAIN, 2 }, { P_GPLL6_OUT_AUX, 3 }, + { P_GPLL4_OUT_AUX, 4 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; @@ -141,6 +148,7 @@ static const char * const gcc_parent_names_7[] = { "gpll0_out_main", "gpll3_out_main", "gpll6_out_aux", + "gpll4_out_aux", "core_bi_pll_test_se", }; @@ -167,7 +175,7 @@ static const struct parent_map gcc_parent_map_9[] = { static const char * const gcc_parent_names_9[] = { "cxo", "gpll0_out_main", - "dsi0pll", + "dsi0_phy_pll_out_dsiclk", "gpll6_out_aux", "core_bi_pll_test_se", }; @@ -199,12 +207,14 @@ static const char * const gcc_parent_names_11[] = { static const struct parent_map gcc_parent_map_12[] = { { P_XO, 0 }, { P_DSI0_PHY_PLL_OUT_DSICLK, 1 }, + { P_GPLL0_OUT_AUX, 2 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_12[] = { "cxo", - "dsi0pll", + "dsi0pll_pclk_src", + "gpll0_out_aux", "core_bi_pll_test_se", }; @@ -227,34 +237,40 @@ static const char * const gcc_parent_names_13[] = { static const struct parent_map gcc_parent_map_14[] = { { P_XO, 0 }, { P_GPLL0_OUT_MAIN, 1 }, + { P_GPLL4_OUT_AUX, 2 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_14[] = { "cxo", "gpll0_out_main", + "gpll4_out_aux", "core_bi_pll_test_se", }; static const struct parent_map gcc_parent_map_15[] = { { P_XO, 0 }, + { P_GPLL0_OUT_AUX, 2 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_15[] = { "cxo", + "gpll0_out_aux", "core_bi_pll_test_se", }; static const struct parent_map gcc_parent_map_16[] = { { P_XO, 0 }, { P_GPLL0_OUT_MAIN, 1 }, + { P_GPLL0_OUT_AUX, 2 }, { P_CORE_BI_PLL_TEST_SE, 7 }, }; static const char * const gcc_parent_names_16[] = { "cxo", "gpll0_out_main", + "gpll0_out_aux", "core_bi_pll_test_se", };
diff --git a/drivers/clk/qcom/gpucc-sdm845.c b/drivers/clk/qcom/gpucc-sdm845.c index 58133c5..9aa30cd 100644 --- a/drivers/clk/qcom/gpucc-sdm845.c +++ b/drivers/clk/qcom/gpucc-sdm845.c
@@ -22,6 +22,8 @@ #define CX_GMU_CBCR_SLEEP_SHIFT 4 #define CX_GMU_CBCR_WAKE_MASK 0xf #define CX_GMU_CBCR_WAKE_SHIFT 8 +#define CLK_DIS_WAIT_SHIFT 12 +#define CLK_DIS_WAIT_MASK (0xf << CLK_DIS_WAIT_SHIFT) enum { P_BI_TCXO, @@ -122,7 +124,6 @@ static struct clk_branch gpu_cc_cxo_clk = { static struct gdsc gpu_cx_gdsc = { .gdscr = 0x106c, .gds_hw_ctrl = 0x1540, - .clk_dis_wait_val = 0x8, .pd = { .name = "gpu_cx_gdsc", }, @@ -220,6 +221,10 @@ static int gpu_cc_sdm845_probe(struct platform_device *pdev) value = 0xf << CX_GMU_CBCR_WAKE_SHIFT | 0xf << CX_GMU_CBCR_SLEEP_SHIFT; regmap_update_bits(regmap, 0x1098, mask, value); + /* Configure clk_dis_wait for gpu_cx_gdsc */ + regmap_update_bits(regmap, 0x106c, CLK_DIS_WAIT_MASK, + 8 << CLK_DIS_WAIT_SHIFT); + return qcom_cc_really_probe(pdev, &gpu_cc_sdm845_desc, regmap); }
diff --git a/drivers/clk/renesas/r7s9210-cpg-mssr.c b/drivers/clk/renesas/r7s9210-cpg-mssr.c index 2772eb0..cf65d4e 100644 --- a/drivers/clk/renesas/r7s9210-cpg-mssr.c +++ b/drivers/clk/renesas/r7s9210-cpg-mssr.c
@@ -213,7 +213,7 @@ const struct cpg_mssr_info r7s9210_cpg_mssr_info __initconst = { .cpg_clk_register = rza2_cpg_clk_register, /* RZ/A2 has Standby Control Registers */ - .reg_layout = CLK_REG_LAYOUT_RZ_A, + .stbyctrl = true, }; static void __init r7s9210_cpg_mssr_early_init(struct device_node *np)
diff --git a/drivers/clk/renesas/r9a06g032-clocks.c b/drivers/clk/renesas/r9a06g032-clocks.c index 75954ac..f2dc625 100644 --- a/drivers/clk/renesas/r9a06g032-clocks.c +++ b/drivers/clk/renesas/r9a06g032-clocks.c
@@ -286,8 +286,8 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { .name = "uart_group_012", .type = K_BITSEL, .source = 1 + R9A06G032_DIV_UART, - /* R9A06G032_SYSCTRL_REG_PWRCTRL_PG0_0 */ - .dual.sel = ((0x34 / 4) << 5) | 30, + /* R9A06G032_SYSCTRL_REG_PWRCTRL_PG1_PR2 */ + .dual.sel = ((0xec / 4) << 5) | 24, .dual.group = 0, }, { @@ -295,8 +295,8 @@ static const struct r9a06g032_clkdesc r9a06g032_clocks[] = { .name = "uart_group_34567", .type = K_BITSEL, .source = 1 + R9A06G032_DIV_P2_PG, - /* R9A06G032_SYSCTRL_REG_PWRCTRL_PG1_PR2 */ - .dual.sel = ((0xec / 4) << 5) | 24, + /* R9A06G032_SYSCTRL_REG_PWRCTRL_PG0_0 */ + .dual.sel = ((0x34 / 4) << 5) | 30, .dual.group = 1, }, D_UGATE(CLK_UART0, "clk_uart0", UART_GROUP_012, 0, 0, 0x1b2, 0x1b3, 0x1b4, 0x1b5), @@ -386,7 +386,7 @@ static int r9a06g032_attach_dev(struct generic_pm_domain *pd, int error; int index; - while (!of_parse_phandle_with_args(np, "clocks", "#clock-cells", i++, + while (!of_parse_phandle_with_args(np, "clocks", "#clock-cells", i, &clkspec)) { if (clkspec.np != pd->dev.of_node) continue; @@ -399,6 +399,7 @@ static int r9a06g032_attach_dev(struct generic_pm_domain *pd, if (error) return error; } + i++; } return 0;
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.c b/drivers/clk/renesas/renesas-cpg-mssr.c index d0ccb52..6f9612c 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.c +++ b/drivers/clk/renesas/renesas-cpg-mssr.c
@@ -111,12 +111,12 @@ static const u16 srcr[] = { * @rcdev: Optional reset controller entity * @dev: CPG/MSSR device * @base: CPG/MSSR register block base address - * @reg_layout: CPG/MSSR register layout * @rmw_lock: protects RMW register accesses * @np: Device node in DT for this CPG/MSSR module * @num_core_clks: Number of Core Clocks in clks[] * @num_mod_clks: Number of Module Clocks in clks[] * @last_dt_core_clk: ID of the last Core Clock exported to DT + * @stbyctrl: This device has Standby Control Registers * @notifiers: Notifier chain to save/restore clock state for system resume * @smstpcr_saved[].mask: Mask of SMSTPCR[] bits under our control * @smstpcr_saved[].val: Saved values of SMSTPCR[] @@ -128,13 +128,13 @@ struct cpg_mssr_priv { #endif struct device *dev; void __iomem *base; - enum clk_reg_layout reg_layout; spinlock_t rmw_lock; struct device_node *np; unsigned int num_core_clks; unsigned int num_mod_clks; unsigned int last_dt_core_clk; + bool stbyctrl; struct raw_notifier_head notifiers; struct { @@ -177,7 +177,7 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable) enable ? "ON" : "OFF"); spin_lock_irqsave(&priv->rmw_lock, flags); - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) { + if (priv->stbyctrl) { value = readb(priv->base + STBCR(reg)); if (enable) value &= ~bitmask; @@ -199,7 +199,7 @@ static int cpg_mstp_clock_endisable(struct clk_hw *hw, bool enable) spin_unlock_irqrestore(&priv->rmw_lock, flags); - if (!enable || priv->reg_layout == CLK_REG_LAYOUT_RZ_A) + if (!enable || priv->stbyctrl) return 0; for (i = 1000; i > 0; --i) { @@ -233,7 +233,7 @@ static int cpg_mstp_clock_is_enabled(struct clk_hw *hw) struct cpg_mssr_priv *priv = clock->priv; u32 value; - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) + if (priv->stbyctrl) value = readb(priv->base + STBCR(clock->index / 32)); else value = readl(priv->base + MSTPSR(clock->index / 32)); @@ -272,7 +272,7 @@ struct clk *cpg_mssr_clk_src_twocell_get(struct of_phandle_args *clkspec, case CPG_MOD: type = "module"; - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) { + if (priv->stbyctrl) { idx = MOD_CLK_PACK_10(clkidx); range_check = 7 - (clkidx % 10); } else { @@ -800,8 +800,7 @@ static int cpg_mssr_suspend_noirq(struct device *dev) /* Save module registers with bits under our control */ for (reg = 0; reg < ARRAY_SIZE(priv->smstpcr_saved); reg++) { if (priv->smstpcr_saved[reg].mask) - priv->smstpcr_saved[reg].val = - priv->reg_layout == CLK_REG_LAYOUT_RZ_A ? + priv->smstpcr_saved[reg].val = priv->stbyctrl ? readb(priv->base + STBCR(reg)) : readl(priv->base + SMSTPCR(reg)); } @@ -831,7 +830,7 @@ static int cpg_mssr_resume_noirq(struct device *dev) if (!mask) continue; - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) + if (priv->stbyctrl) oldval = readb(priv->base + STBCR(reg)); else oldval = readl(priv->base + SMSTPCR(reg)); @@ -840,7 +839,7 @@ static int cpg_mssr_resume_noirq(struct device *dev) if (newval == oldval) continue; - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) { + if (priv->stbyctrl) { writeb(newval, priv->base + STBCR(reg)); /* dummy read to ensure write has completed */ readb(priv->base + STBCR(reg)); @@ -862,7 +861,8 @@ static int cpg_mssr_resume_noirq(struct device *dev) } if (!i) - dev_warn(dev, "Failed to enable SMSTP%u[0x%x]\n", reg, + dev_warn(dev, "Failed to enable %s%u[0x%x]\n", + priv->stbyctrl ? "STB" : "SMSTP", reg, oldval & mask); } @@ -907,11 +907,12 @@ static int __init cpg_mssr_common_init(struct device *dev, goto out_err; } + cpg_mssr_priv = priv; priv->num_core_clks = info->num_total_core_clks; priv->num_mod_clks = info->num_hw_mod_clks; priv->last_dt_core_clk = info->last_dt_core_clk; RAW_INIT_NOTIFIER_HEAD(&priv->notifiers); - priv->reg_layout = info->reg_layout; + priv->stbyctrl = info->stbyctrl; for (i = 0; i < nclks; i++) priv->clks[i] = ERR_PTR(-ENOENT); @@ -920,8 +921,6 @@ static int __init cpg_mssr_common_init(struct device *dev, if (error) goto out_err; - cpg_mssr_priv = priv; - return 0; out_err: @@ -991,7 +990,7 @@ static int __init cpg_mssr_probe(struct platform_device *pdev) return error; /* Reset Controller not supported for Standby Control SoCs */ - if (priv->reg_layout == CLK_REG_LAYOUT_RZ_A) + if (info->stbyctrl) return 0; error = cpg_mssr_reset_controller_register(priv);
diff --git a/drivers/clk/renesas/renesas-cpg-mssr.h b/drivers/clk/renesas/renesas-cpg-mssr.h index f05521b..4ddcdf3 100644 --- a/drivers/clk/renesas/renesas-cpg-mssr.h +++ b/drivers/clk/renesas/renesas-cpg-mssr.h
@@ -85,11 +85,6 @@ struct mssr_mod_clk { struct device_node; -enum clk_reg_layout { - CLK_REG_LAYOUT_RCAR_GEN2_AND_GEN3 = 0, - CLK_REG_LAYOUT_RZ_A, -}; - /** * SoC-specific CPG/MSSR Description * @@ -110,7 +105,6 @@ enum clk_reg_layout { * @crit_mod_clks: Array with Module Clock IDs of critical clocks that * should not be disabled without a knowledgeable driver * @num_crit_mod_clks: Number of entries in crit_mod_clks[] - * @reg_layout: CPG/MSSR register layout from enum clk_reg_layout * * @core_pm_clks: Array with IDs of Core Clocks that are suitable for Power * Management, in addition to Module Clocks @@ -118,6 +112,10 @@ enum clk_reg_layout { * * @init: Optional callback to perform SoC-specific initialization * @cpg_clk_register: Optional callback to handle special Core Clock types + * + * @stbyctrl: This device has Standby Control Registers which are 8-bits + * wide, no status registers (MSTPSR) and have different address + * offsets. */ struct cpg_mssr_info { @@ -132,7 +130,7 @@ struct cpg_mssr_info { unsigned int num_core_clks; unsigned int last_dt_core_clk; unsigned int num_total_core_clks; - enum clk_reg_layout reg_layout; + bool stbyctrl; /* Module Clocks */ const struct mssr_mod_clk *mod_clks;
diff --git a/drivers/clk/rockchip/clk-pll.c b/drivers/clk/rockchip/clk-pll.c index aa8a299..198417d 100644 --- a/drivers/clk/rockchip/clk-pll.c +++ b/drivers/clk/rockchip/clk-pll.c
@@ -963,7 +963,6 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx, return mux_clk; err_pll: - kfree(pll->rate_table); clk_unregister(mux_clk); mux_clk = pll_clk; err_mux:
diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c index 730020f..77aebfb 100644 --- a/drivers/clk/rockchip/clk-rk3188.c +++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -751,7 +751,6 @@ static const char *const rk3188_critical_clocks[] __initconst = { "pclk_peri", "hclk_cpubus", "hclk_vio_bus", - "sclk_mac_lbtest", }; static struct rockchip_clk_provider *__init rk3188_common_clk_init(struct device_node *np)
diff --git a/drivers/clk/samsung/clk-pll.c b/drivers/clk/samsung/clk-pll.c index 33df20f..ac70ad7 100644 --- a/drivers/clk/samsung/clk-pll.c +++ b/drivers/clk/samsung/clk-pll.c
@@ -1390,7 +1390,6 @@ static void __init _samsung_clk_register_pll(struct samsung_clk_provider *ctx, if (ret) { pr_err("%s: failed to register pll clock %s : %d\n", __func__, pll_clk->name, ret); - kfree(pll->rate_table); kfree(pll); return; }
diff --git a/drivers/clk/socfpga/clk-gate.c b/drivers/clk/socfpga/clk-gate.c index ee2a2d2..cf94a12 100644 --- a/drivers/clk/socfpga/clk-gate.c +++ b/drivers/clk/socfpga/clk-gate.c
@@ -174,24 +174,21 @@ void __init socfpga_gate_init(struct device_node *node) u32 div_reg[3]; u32 clk_phase[2]; u32 fixed_div; - struct clk_hw *hw_clk; + struct clk *clk; struct socfpga_gate_clk *socfpga_clk; const char *clk_name = node->name; const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; struct clk_ops *ops; int rc; - int err; socfpga_clk = kzalloc(sizeof(*socfpga_clk), GFP_KERNEL); if (WARN_ON(!socfpga_clk)) return; ops = kmemdup(&gateclk_ops, sizeof(gateclk_ops), GFP_KERNEL); - if (WARN_ON(!ops)) { - kfree(socfpga_clk); + if (WARN_ON(!ops)) return; - } rc = of_property_read_u32_array(node, "clk-gate", clk_gate, 2); if (rc) @@ -241,15 +238,12 @@ void __init socfpga_gate_init(struct device_node *node) init.parent_names = parent_name; socfpga_clk->hw.hw.init = &init; - hw_clk = &socfpga_clk->hw.hw; - - err = clk_hw_register(NULL, hw_clk); - if (err) { - kfree(ops); + clk = clk_register(NULL, &socfpga_clk->hw.hw); + if (WARN_ON(IS_ERR(clk))) { kfree(socfpga_clk); return; } - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); + rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); if (WARN_ON(rc)) return; }
diff --git a/drivers/clk/socfpga/clk-periph.c b/drivers/clk/socfpga/clk-periph.c index 43707e2..5e0c4b4 100644 --- a/drivers/clk/socfpga/clk-periph.c +++ b/drivers/clk/socfpga/clk-periph.c
@@ -51,7 +51,7 @@ static __init void __socfpga_periph_init(struct device_node *node, const struct clk_ops *ops) { u32 reg; - struct clk_hw *hw_clk; + struct clk *clk; struct socfpga_periph_clk *periph_clk; const char *clk_name = node->name; const char *parent_name[SOCFPGA_MAX_PARENTS]; @@ -94,13 +94,13 @@ static __init void __socfpga_periph_init(struct device_node *node, init.parent_names = parent_name; periph_clk->hw.hw.init = &init; - hw_clk = &periph_clk->hw.hw; - if (clk_hw_register(NULL, hw_clk)) { + clk = clk_register(NULL, &periph_clk->hw.hw); + if (WARN_ON(IS_ERR(clk))) { kfree(periph_clk); return; } - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); + rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); } void __init socfpga_periph_init(struct device_node *node)
diff --git a/drivers/clk/socfpga/clk-pll.c b/drivers/clk/socfpga/clk-pll.c index 004e196..dc65cc0 100644 --- a/drivers/clk/socfpga/clk-pll.c +++ b/drivers/clk/socfpga/clk-pll.c
@@ -70,18 +70,17 @@ static struct clk_ops clk_pll_ops = { .get_parent = clk_pll_get_parent, }; -static __init struct clk_hw *__socfpga_pll_init(struct device_node *node, +static __init struct clk *__socfpga_pll_init(struct device_node *node, const struct clk_ops *ops) { u32 reg; - struct clk_hw *hw_clk; + struct clk *clk; struct socfpga_pll *pll_clk; const char *clk_name = node->name; const char *parent_name[SOCFPGA_MAX_PARENTS]; struct clk_init_data init; struct device_node *clkmgr_np; int rc; - int err; of_property_read_u32(node, "reg", ®); @@ -109,15 +108,13 @@ static __init struct clk_hw *__socfpga_pll_init(struct device_node *node, clk_pll_ops.enable = clk_gate_ops.enable; clk_pll_ops.disable = clk_gate_ops.disable; - hw_clk = &pll_clk->hw.hw; - - err = clk_hw_register(NULL, hw_clk); - if (err) { + clk = clk_register(NULL, &pll_clk->hw.hw); + if (WARN_ON(IS_ERR(clk))) { kfree(pll_clk); - return ERR_PTR(err); + return NULL; } - rc = of_clk_add_provider(node, of_clk_src_simple_get, hw_clk); - return hw_clk; + rc = of_clk_add_provider(node, of_clk_src_simple_get, clk); + return clk; } void __init socfpga_pll_init(struct device_node *node)
diff --git a/drivers/clk/st/clkgen-fsyn.c b/drivers/clk/st/clkgen-fsyn.c index 9eff053..a156bd0 100644 --- a/drivers/clk/st/clkgen-fsyn.c +++ b/drivers/clk/st/clkgen-fsyn.c
@@ -943,10 +943,9 @@ static void __init st_of_quadfs_setup(struct device_node *np, clk = st_clk_register_quadfs_pll(pll_name, clk_parent_name, data, reg, lock); - if (IS_ERR(clk)) { - kfree(lock); + if (IS_ERR(clk)) goto err_exit; - } else + else pr_debug("%s: parent %s rate %u\n", __clk_get_name(clk), __clk_get_name(clk_get_parent(clk)),
diff --git a/drivers/clk/tegra/clk-tegra114.c b/drivers/clk/tegra/clk-tegra114.c index 586b091..4efcaaf 100644 --- a/drivers/clk/tegra/clk-tegra114.c +++ b/drivers/clk/tegra/clk-tegra114.c
@@ -1337,7 +1337,6 @@ static void __init tegra114_clock_init(struct device_node *np) } pmc_base = of_iomap(node, 0); - of_node_put(node); if (!pmc_base) { pr_err("Can't map pmc registers\n"); WARN_ON(1);
diff --git a/drivers/clk/tegra/clk-tegra20.c b/drivers/clk/tegra/clk-tegra20.c index 3e0f04f..bcd8711 100644 --- a/drivers/clk/tegra/clk-tegra20.c +++ b/drivers/clk/tegra/clk-tegra20.c
@@ -1151,7 +1151,6 @@ static void __init tegra20_clock_init(struct device_node *np) } pmc_base = of_iomap(node, 0); - of_node_put(node); if (!pmc_base) { pr_err("Can't map pmc registers\n"); BUG();
diff --git a/drivers/clk/tegra/clk-tegra210.c b/drivers/clk/tegra/clk-tegra210.c index 34155b5..df172d5 100644 --- a/drivers/clk/tegra/clk-tegra210.c +++ b/drivers/clk/tegra/clk-tegra210.c
@@ -3523,7 +3523,6 @@ static void __init tegra210_clock_init(struct device_node *np) } pmc_base = of_iomap(node, 0); - of_node_put(node); if (!pmc_base) { pr_err("Can't map pmc registers\n"); WARN_ON(1);
diff --git a/drivers/clk/ti/clk-dra7-atl.c b/drivers/clk/ti/clk-dra7-atl.c index 62ea790..f65e16c 100644 --- a/drivers/clk/ti/clk-dra7-atl.c +++ b/drivers/clk/ti/clk-dra7-atl.c
@@ -252,16 +252,14 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev) if (rc) { pr_err("%s: failed to lookup atl clock %d\n", __func__, i); - ret = -EINVAL; - goto pm_put; + return -EINVAL; } clk = of_clk_get_from_provider(&clkspec); if (IS_ERR(clk)) { pr_err("%s: failed to get atl clock %d from provider\n", __func__, i); - ret = PTR_ERR(clk); - goto pm_put; + return PTR_ERR(clk); } cdesc = to_atl_desc(__clk_get_hw(clk)); @@ -294,9 +292,8 @@ static int of_dra7_atl_clk_probe(struct platform_device *pdev) if (cdesc->enabled) atl_clk_enable(__clk_get_hw(clk)); } - -pm_put: pm_runtime_put_sync(cinfo->dev); + return ret; }
diff --git a/drivers/clk/zynqmp/clkc.c b/drivers/clk/zynqmp/clkc.c index 4ef201a..6f057ab 100644 --- a/drivers/clk/zynqmp/clkc.c +++ b/drivers/clk/zynqmp/clkc.c
@@ -679,13 +679,6 @@ static void zynqmp_get_clock_info(void) FIELD_PREP(CLK_ATTR_NODE_INDEX, i); zynqmp_pm_clock_get_name(clock[i].clk_id, &name); - - /* - * Terminate with NULL character in case name provided by firmware - * is longer and truncated due to size limit. - */ - name.name[sizeof(name.name) - 1] = '\0'; - if (!strcmp(name.name, RESERVED_CLK_NAME)) continue; strncpy(clock[i].clk_name, name.name, MAX_NAME_LEN);
diff --git a/drivers/clk/zynqmp/pll.c b/drivers/clk/zynqmp/pll.c index 3a2a694..18fee82 100644 --- a/drivers/clk/zynqmp/pll.c +++ b/drivers/clk/zynqmp/pll.c
@@ -98,25 +98,26 @@ static long zynqmp_pll_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *prate) { u32 fbdiv; - u32 mult, div; + long rate_div, f; - /* Let rate fall inside the range PS_PLL_VCO_MIN ~ PS_PLL_VCO_MAX */ - if (rate > PS_PLL_VCO_MAX) { - div = DIV_ROUND_UP(rate, PS_PLL_VCO_MAX); - rate = rate / div; - } - if (rate < PS_PLL_VCO_MIN) { - mult = DIV_ROUND_UP(PS_PLL_VCO_MIN, rate); - rate = rate * mult; + /* Enable the fractional mode if needed */ + rate_div = (rate * FRAC_DIV) / *prate; + f = rate_div % FRAC_DIV; + if (f) { + if (rate > PS_PLL_VCO_MAX) { + fbdiv = rate / PS_PLL_VCO_MAX; + rate = rate / (fbdiv + 1); + } + if (rate < PS_PLL_VCO_MIN) { + fbdiv = DIV_ROUND_UP(PS_PLL_VCO_MIN, rate); + rate = rate * fbdiv; + } + return rate; } fbdiv = DIV_ROUND_CLOSEST(rate, *prate); - if (fbdiv < PLL_FBDIV_MIN || fbdiv > PLL_FBDIV_MAX) { - fbdiv = clamp_t(u32, fbdiv, PLL_FBDIV_MIN, PLL_FBDIV_MAX); - rate = *prate * fbdiv; - } - - return rate; + fbdiv = clamp_t(u32, fbdiv, PLL_FBDIV_MIN, PLL_FBDIV_MAX); + return *prate * fbdiv; } /**
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index b1ec79d..a057021 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c
@@ -231,8 +231,6 @@ static const struct sh_cmt_info sh_cmt_info[] = { #define CMCNT 1 /* channel register */ #define CMCOR 2 /* channel register */ -#define CMCLKE 0x1000 /* CLK Enable Register (R-Car Gen2) */ - static inline u32 sh_cmt_read_cmstr(struct sh_cmt_channel *ch) { if (ch->iostart) @@ -847,7 +845,6 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, unsigned int index, unsigned int hwidx, bool clockevent, bool clocksource, struct sh_cmt_device *cmt) { - u32 value; int ret; /* Skip unused channels. */ @@ -877,11 +874,6 @@ static int sh_cmt_setup_channel(struct sh_cmt_channel *ch, unsigned int index, ch->iostart = cmt->mapbase + ch->hwidx * 0x100; ch->ioctrl = ch->iostart + 0x10; ch->timer_bit = 0; - - /* Enable the clock supply to the channel */ - value = ioread32(cmt->mapbase + CMCLKE); - value |= BIT(hwidx); - iowrite32(value, cmt->mapbase + CMCLKE); break; } @@ -1014,10 +1006,12 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) else cmt->rate = clk_get_rate(cmt->clk) / 8; + clk_disable(cmt->clk); + /* Map the memory resource(s). */ ret = sh_cmt_map_memory(cmt); if (ret < 0) - goto err_clk_disable; + goto err_clk_unprepare; /* Allocate and setup the channels. */ cmt->num_channels = hweight8(cmt->hw_channels); @@ -1045,8 +1039,6 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) mask &= ~(1 << hwidx); } - clk_disable(cmt->clk); - platform_set_drvdata(pdev, cmt); return 0; @@ -1054,8 +1046,6 @@ static int sh_cmt_setup(struct sh_cmt_device *cmt, struct platform_device *pdev) err_unmap: kfree(cmt->channels); iounmap(cmt->mapbase); -err_clk_disable: - clk_disable(cmt->clk); err_clk_unprepare: clk_unprepare(cmt->clk); err_clk_put:
diff --git a/drivers/clocksource/timer-riscv.c b/drivers/clocksource/timer-riscv.c index 4b04ffb..e3be5c2 100644 --- a/drivers/clocksource/timer-riscv.c +++ b/drivers/clocksource/timer-riscv.c
@@ -26,7 +26,7 @@ static int riscv_clock_next_event(unsigned long delta, static DEFINE_PER_CPU(struct clock_event_device, riscv_clock_event) = { .name = "riscv_timer_clockevent", - .features = CLOCK_EVT_FEAT_ONESHOT, + .features = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_C3STOP, .rating = 100, .set_next_event = riscv_clock_next_event, };
diff --git a/drivers/counter/stm32-lptimer-cnt.c b/drivers/counter/stm32-lptimer-cnt.c index 95f8f2e..bbc930a 100644 --- a/drivers/counter/stm32-lptimer-cnt.c +++ b/drivers/counter/stm32-lptimer-cnt.c
@@ -69,7 +69,7 @@ static int stm32_lptim_set_enable_state(struct stm32_lptim_cnt *priv, /* ensure CMP & ARR registers are properly written */ ret = regmap_read_poll_timeout(priv->regmap, STM32_LPTIM_ISR, val, - (val & STM32_LPTIM_CMPOK_ARROK) == STM32_LPTIM_CMPOK_ARROK, + (val & STM32_LPTIM_CMPOK_ARROK), 100, 1000); if (ret) return ret;
diff --git a/drivers/cpufreq/acpi-cpufreq.c b/drivers/cpufreq/acpi-cpufreq.c index cf7ebe3..4195834 100644 --- a/drivers/cpufreq/acpi-cpufreq.c +++ b/drivers/cpufreq/acpi-cpufreq.c
@@ -30,7 +30,6 @@ #include <asm/msr.h> #include <asm/processor.h> #include <asm/cpufeature.h> -#include <asm/cpu_device_id.h> MODULE_AUTHOR("Paul Diefenbaugh, Dominik Brodowski"); MODULE_DESCRIPTION("ACPI Processor P-States Driver");
diff --git a/drivers/cpufreq/amd_freq_sensitivity.c b/drivers/cpufreq/amd_freq_sensitivity.c index 72fd06f..e2df9d1 100644 --- a/drivers/cpufreq/amd_freq_sensitivity.c +++ b/drivers/cpufreq/amd_freq_sensitivity.c
@@ -18,7 +18,6 @@ #include <asm/msr.h> #include <asm/cpufeature.h> -#include <asm/cpu_device_id.h> #include "cpufreq_ondemand.h" @@ -124,8 +123,6 @@ static int __init amd_freq_sensitivity_init(void) if (!pcidev) { if (!boot_cpu_has(X86_FEATURE_PROC_FEEDBACK)) return -ENODEV; - } else { - pci_dev_put(pcidev); } if (rdmsrl_safe(MSR_AMD64_FREQ_SENSITIVITY_ACTUAL, &val))
diff --git a/drivers/cpufreq/armada-37xx-cpufreq.c b/drivers/cpufreq/armada-37xx-cpufreq.c index f0be8a4..2de7fd1 100644 --- a/drivers/cpufreq/armada-37xx-cpufreq.c +++ b/drivers/cpufreq/armada-37xx-cpufreq.c
@@ -443,7 +443,7 @@ static int __init armada37xx_cpufreq_driver_init(void) return -ENODEV; } - clk = clk_get(cpu_dev, NULL); + clk = clk_get(cpu_dev, 0); if (IS_ERR(clk)) { dev_err(cpu_dev, "Cannot get clock for CPU0\n"); return PTR_ERR(clk);
diff --git a/drivers/cpufreq/cpufreq-dt-platdev.c b/drivers/cpufreq/cpufreq-dt-platdev.c index 73e6ae3..12a45eb 100644 --- a/drivers/cpufreq/cpufreq-dt-platdev.c +++ b/drivers/cpufreq/cpufreq-dt-platdev.c
@@ -126,7 +126,6 @@ static const struct of_device_id blacklist[] __initconst = { { .compatible = "nvidia,tegra124", }, { .compatible = "nvidia,tegra210", }, - { .compatible = "nvidia,tegra234", }, { .compatible = "qcom,apq8096", }, { .compatible = "qcom,msm8996", },
diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c index 18f8001..27304b4 100644 --- a/drivers/cpufreq/cpufreq.c +++ b/drivers/cpufreq/cpufreq.c
@@ -1221,7 +1221,6 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) if (!zalloc_cpumask_var(&policy->real_cpus, GFP_KERNEL)) goto err_free_rcpumask; - init_completion(&policy->kobj_unregister); ret = kobject_init_and_add(&policy->kobj, &ktype_cpufreq, cpufreq_global_kobject, "policy%u", cpu); if (ret) { @@ -1260,6 +1259,7 @@ static struct cpufreq_policy *cpufreq_policy_alloc(unsigned int cpu) init_rwsem(&policy->rwsem); spin_lock_init(&policy->transition_lock); init_waitqueue_head(&policy->transition_wait); + init_completion(&policy->kobj_unregister); INIT_WORK(&policy->update, handle_update); policy->cpu = cpu;
diff --git a/drivers/cpuidle/dt_idle_states.c b/drivers/cpuidle/dt_idle_states.c index 7470206..d06d21a 100644 --- a/drivers/cpuidle/dt_idle_states.c +++ b/drivers/cpuidle/dt_idle_states.c
@@ -224,6 +224,6 @@ int dt_init_idle_driver(struct cpuidle_driver *drv, * also be 0 on platforms with missing DT idle states or legacy DT * configuration predating the DT idle states bindings. */ - return state_idx - start_idx; + return i; } EXPORT_SYMBOL_GPL(dt_init_idle_driver);
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c index b58f21d..230e890 100644 --- a/drivers/crypto/amcc/crypto4xx_core.c +++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -521,6 +521,7 @@ static void crypto4xx_cipher_done(struct crypto4xx_device *dev, { struct skcipher_request *req; struct scatterlist *dst; + dma_addr_t addr; req = skcipher_request_cast(pd_uinfo->async_req); @@ -529,8 +530,8 @@ static void crypto4xx_cipher_done(struct crypto4xx_device *dev, req->cryptlen, req->dst); } else { dst = pd_uinfo->dest_va; - dma_unmap_page(dev->core_dev->device, pd->dest, dst->length, - DMA_FROM_DEVICE); + addr = dma_map_page(dev->core_dev->device, sg_page(dst), + dst->offset, dst->length, DMA_FROM_DEVICE); } if (pd_uinfo->sa_va->sa_command_0.bf.save_iv == SA_SAVE_IV) { @@ -555,9 +556,10 @@ static void crypto4xx_ahash_done(struct crypto4xx_device *dev, struct ahash_request *ahash_req; ahash_req = ahash_request_cast(pd_uinfo->async_req); - ctx = crypto_ahash_ctx(crypto_ahash_reqtfm(ahash_req)); + ctx = crypto_tfm_ctx(ahash_req->base.tfm); - crypto4xx_copy_digest_to_dst(ahash_req->result, pd_uinfo, ctx); + crypto4xx_copy_digest_to_dst(ahash_req->result, pd_uinfo, + crypto_tfm_ctx(ahash_req->base.tfm)); crypto4xx_ret_sg_desc(dev, pd_uinfo); if (pd_uinfo->state & PD_ENTRY_BUSY)
diff --git a/drivers/crypto/cavium/cpt/cptpf_main.c b/drivers/crypto/cavium/cpt/cptpf_main.c index d936219..7819490 100644 --- a/drivers/crypto/cavium/cpt/cptpf_main.c +++ b/drivers/crypto/cavium/cpt/cptpf_main.c
@@ -254,7 +254,6 @@ static int cpt_ucode_load_fw(struct cpt_device *cpt, const u8 *fw, bool is_ae) const struct firmware *fw_entry; struct device *dev = &cpt->pdev->dev; struct ucode_header *ucode; - unsigned int code_length; struct microcode *mcode; int j, ret = 0; @@ -265,12 +264,11 @@ static int cpt_ucode_load_fw(struct cpt_device *cpt, const u8 *fw, bool is_ae) ucode = (struct ucode_header *)fw_entry->data; mcode = &cpt->mcode[cpt->next_mc_idx]; memcpy(mcode->version, (u8 *)fw_entry->data, CPT_UCODE_VERSION_SZ); - code_length = ntohl(ucode->code_length); - if (code_length == 0 || code_length >= INT_MAX / 2) { + mcode->code_size = ntohl(ucode->code_length) * 2; + if (!mcode->code_size) { ret = -EINVAL; goto fw_release; } - mcode->code_size = code_length * 2; mcode->is_ae = is_ae; mcode->core_mask = 0ULL;
diff --git a/drivers/crypto/ccp/ccp-dmaengine.c b/drivers/crypto/ccp/ccp-dmaengine.c index e416456..b3eea32 100644 --- a/drivers/crypto/ccp/ccp-dmaengine.c +++ b/drivers/crypto/ccp/ccp-dmaengine.c
@@ -642,27 +642,11 @@ static void ccp_dma_release(struct ccp_device *ccp) for (i = 0; i < ccp->cmd_q_count; i++) { chan = ccp->ccp_dma_chan + i; dma_chan = &chan->dma_chan; - tasklet_kill(&chan->cleanup_tasklet); list_del_rcu(&dma_chan->device_node); } } -static void ccp_dma_release_channels(struct ccp_device *ccp) -{ - struct ccp_dma_chan *chan; - struct dma_chan *dma_chan; - unsigned int i; - - for (i = 0; i < ccp->cmd_q_count; i++) { - chan = ccp->ccp_dma_chan + i; - dma_chan = &chan->dma_chan; - - if (dma_chan->client_count) - dma_release_channel(dma_chan); - } -} - int ccp_dmaengine_register(struct ccp_device *ccp) { struct ccp_dma_chan *chan; @@ -783,7 +767,6 @@ void ccp_dmaengine_unregister(struct ccp_device *ccp) if (!dmaengine) return; - ccp_dma_release_channels(ccp); dma_async_device_unregister(dma_dev); ccp_dma_release(ccp);
diff --git a/drivers/crypto/ccree/cc_debugfs.c b/drivers/crypto/ccree/cc_debugfs.c index 47077dd..5669997 100644 --- a/drivers/crypto/ccree/cc_debugfs.c +++ b/drivers/crypto/ccree/cc_debugfs.c
@@ -59,7 +59,7 @@ void __init cc_debugfs_global_init(void) cc_debugfs_dir = debugfs_create_dir("ccree", NULL); } -void cc_debugfs_global_fini(void) +void __exit cc_debugfs_global_fini(void) { debugfs_remove(cc_debugfs_dir); }
diff --git a/drivers/crypto/ccree/cc_driver.c b/drivers/crypto/ccree/cc_driver.c index 3d59fef..8b8eee5 100644 --- a/drivers/crypto/ccree/cc_driver.c +++ b/drivers/crypto/ccree/cc_driver.c
@@ -653,17 +653,10 @@ static struct platform_driver ccree_driver = { static int __init ccree_init(void) { - int rc; - + cc_hash_global_init(); cc_debugfs_global_init(); - rc = platform_driver_register(&ccree_driver); - if (rc) { - cc_debugfs_global_fini(); - return rc; - } - - return 0; + return platform_driver_register(&ccree_driver); } module_init(ccree_init);
diff --git a/drivers/crypto/ccree/cc_hash.c b/drivers/crypto/ccree/cc_hash.c index 9f67df0..bc71bdf 100644 --- a/drivers/crypto/ccree/cc_hash.c +++ b/drivers/crypto/ccree/cc_hash.c
@@ -39,19 +39,12 @@ static const u32 cc_sha256_init[] = { SHA256_H3, SHA256_H2, SHA256_H1, SHA256_H0 }; static const u32 cc_digest_len_sha512_init[] = { 0x00000080, 0x00000000, 0x00000000, 0x00000000 }; - -/* - * Due to the way the HW works, every double word in the SHA384 and SHA512 - * larval hashes must be stored in hi/lo order - */ -#define hilo(x) upper_32_bits(x), lower_32_bits(x) -static const u32 cc_sha384_init[] = { - hilo(SHA384_H7), hilo(SHA384_H6), hilo(SHA384_H5), hilo(SHA384_H4), - hilo(SHA384_H3), hilo(SHA384_H2), hilo(SHA384_H1), hilo(SHA384_H0) }; -static const u32 cc_sha512_init[] = { - hilo(SHA512_H7), hilo(SHA512_H6), hilo(SHA512_H5), hilo(SHA512_H4), - hilo(SHA512_H3), hilo(SHA512_H2), hilo(SHA512_H1), hilo(SHA512_H0) }; - +static u64 cc_sha384_init[] = { + SHA384_H7, SHA384_H6, SHA384_H5, SHA384_H4, + SHA384_H3, SHA384_H2, SHA384_H1, SHA384_H0 }; +static u64 cc_sha512_init[] = { + SHA512_H7, SHA512_H6, SHA512_H5, SHA512_H4, + SHA512_H3, SHA512_H2, SHA512_H1, SHA512_H0 }; static const u32 cc_sm3_init[] = { SM3_IVH, SM3_IVG, SM3_IVF, SM3_IVE, SM3_IVD, SM3_IVC, SM3_IVB, SM3_IVA }; @@ -1955,8 +1948,8 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata) } if (large_sha_supported) { - cc_set_sram_desc(cc_sha384_init, sram_buff_ofs, - ARRAY_SIZE(cc_sha384_init), larval_seq, + cc_set_sram_desc((u32 *)cc_sha384_init, sram_buff_ofs, + (ARRAY_SIZE(cc_sha384_init) * 2), larval_seq, &larval_seq_len); rc = send_request_init(drvdata, larval_seq, larval_seq_len); if (rc) @@ -1964,8 +1957,8 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata) sram_buff_ofs += sizeof(cc_sha384_init); larval_seq_len = 0; - cc_set_sram_desc(cc_sha512_init, sram_buff_ofs, - ARRAY_SIZE(cc_sha512_init), larval_seq, + cc_set_sram_desc((u32 *)cc_sha512_init, sram_buff_ofs, + (ARRAY_SIZE(cc_sha512_init) * 2), larval_seq, &larval_seq_len); rc = send_request_init(drvdata, larval_seq, larval_seq_len); if (rc) @@ -1976,6 +1969,28 @@ int cc_init_hash_sram(struct cc_drvdata *drvdata) return rc; } +static void __init cc_swap_dwords(u32 *buf, unsigned long size) +{ + int i; + u32 tmp; + + for (i = 0; i < size; i += 2) { + tmp = buf[i]; + buf[i] = buf[i + 1]; + buf[i + 1] = tmp; + } +} + +/* + * Due to the way the HW works we need to swap every + * double word in the SHA384 and SHA512 larval hashes + */ +void __init cc_hash_global_init(void) +{ + cc_swap_dwords((u32 *)&cc_sha384_init, (ARRAY_SIZE(cc_sha384_init) * 2)); + cc_swap_dwords((u32 *)&cc_sha512_init, (ARRAY_SIZE(cc_sha512_init) * 2)); +} + int cc_hash_alloc(struct cc_drvdata *drvdata) { struct cc_hash_handle *hash_handle;
diff --git a/drivers/crypto/ccree/cc_hash.h b/drivers/crypto/ccree/cc_hash.h index 3dbd0ab..0d6dc61 100644 --- a/drivers/crypto/ccree/cc_hash.h +++ b/drivers/crypto/ccree/cc_hash.h
@@ -104,4 +104,6 @@ cc_digest_len_addr(void *drvdata, u32 mode); */ cc_sram_addr_t cc_larval_digest_addr(void *drvdata, u32 mode); +void cc_hash_global_init(void); + #endif /*__CC_HASH_H__*/
diff --git a/drivers/crypto/hisilicon/sec/sec_algs.c b/drivers/crypto/hisilicon/sec/sec_algs.c index 2402941..4ad4ffd 100644 --- a/drivers/crypto/hisilicon/sec/sec_algs.c +++ b/drivers/crypto/hisilicon/sec/sec_algs.c
@@ -449,7 +449,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp, */ } - spin_lock_bh(&ctx->queue->queuelock); + mutex_lock(&ctx->queue->queuelock); /* Put the IV in place for chained cases */ switch (ctx->cipher_alg) { case SEC_C_AES_CBC_128: @@ -509,7 +509,7 @@ static void sec_skcipher_alg_callback(struct sec_bd_info *sec_resp, list_del(&backlog_req->backlog_head); } } - spin_unlock_bh(&ctx->queue->queuelock); + mutex_unlock(&ctx->queue->queuelock); mutex_lock(&sec_req->lock); list_del(&sec_req_el->head); @@ -798,7 +798,7 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, */ /* Grab a big lock for a long time to avoid concurrency issues */ - spin_lock_bh(&queue->queuelock); + mutex_lock(&queue->queuelock); /* * Can go on to queue if we have space in either: @@ -814,15 +814,15 @@ static int sec_alg_skcipher_crypto(struct skcipher_request *skreq, ret = -EBUSY; if ((skreq->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)) { list_add_tail(&sec_req->backlog_head, &ctx->backlog); - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); goto out; } - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); goto err_free_elements; } ret = sec_send_request(sec_req, queue); - spin_unlock_bh(&queue->queuelock); + mutex_unlock(&queue->queuelock); if (ret) goto err_free_elements; @@ -881,7 +881,7 @@ static int sec_alg_skcipher_init(struct crypto_skcipher *tfm) if (IS_ERR(ctx->queue)) return PTR_ERR(ctx->queue); - spin_lock_init(&ctx->queue->queuelock); + mutex_init(&ctx->queue->queuelock); ctx->queue->havesoftqueue = false; return 0;
diff --git a/drivers/crypto/hisilicon/sec/sec_drv.h b/drivers/crypto/hisilicon/sec/sec_drv.h index 0bf4d7c..4d9063a 100644 --- a/drivers/crypto/hisilicon/sec/sec_drv.h +++ b/drivers/crypto/hisilicon/sec/sec_drv.h
@@ -347,7 +347,7 @@ struct sec_queue { DECLARE_BITMAP(unprocessed, SEC_QUEUE_LEN); DECLARE_KFIFO_PTR(softqueue, typeof(struct sec_request_el *)); bool havesoftqueue; - spinlock_t queuelock; + struct mutex queuelock; void *shadow[SEC_QUEUE_LEN]; };
diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c index 17cc44f..fe4cc8b 100644 --- a/drivers/crypto/img-hash.c +++ b/drivers/crypto/img-hash.c
@@ -356,16 +356,12 @@ static int img_hash_dma_init(struct img_hash_dev *hdev) static void img_hash_dma_task(unsigned long d) { struct img_hash_dev *hdev = (struct img_hash_dev *)d; - struct img_hash_request_ctx *ctx; + struct img_hash_request_ctx *ctx = ahash_request_ctx(hdev->req); u8 *addr; size_t nbytes, bleft, wsend, len, tbc; struct scatterlist tsg; - if (!hdev->req) - return; - - ctx = ahash_request_ctx(hdev->req); - if (!ctx->sg) + if (!hdev->req || !ctx->sg) return; addr = sg_virt(ctx->sg);
diff --git a/drivers/crypto/inside-secure/safexcel.c b/drivers/crypto/inside-secure/safexcel.c index 9534f52..4d9d97c 100644 --- a/drivers/crypto/inside-secure/safexcel.c +++ b/drivers/crypto/inside-secure/safexcel.c
@@ -1658,8 +1658,6 @@ static const struct of_device_id safexcel_of_match_table[] = { {}, }; -MODULE_DEVICE_TABLE(of, safexcel_of_match_table); - static struct platform_driver crypto_safexcel = { .probe = safexcel_probe, .remove = safexcel_remove,
diff --git a/drivers/crypto/n2_core.c b/drivers/crypto/n2_core.c index 8012734..dc15b06 100644 --- a/drivers/crypto/n2_core.c +++ b/drivers/crypto/n2_core.c
@@ -1278,7 +1278,6 @@ struct n2_hash_tmpl { const u32 *hash_init; u8 hw_op_hashsz; u8 digest_size; - u8 statesize; u8 block_size; u8 auth_type; u8 hmac_type; @@ -1310,7 +1309,6 @@ static const struct n2_hash_tmpl hash_tmpls[] = { .hmac_type = AUTH_TYPE_HMAC_MD5, .hw_op_hashsz = MD5_DIGEST_SIZE, .digest_size = MD5_DIGEST_SIZE, - .statesize = sizeof(struct md5_state), .block_size = MD5_HMAC_BLOCK_SIZE }, { .name = "sha1", .hash_zero = sha1_zero_message_hash, @@ -1319,7 +1317,6 @@ static const struct n2_hash_tmpl hash_tmpls[] = { .hmac_type = AUTH_TYPE_HMAC_SHA1, .hw_op_hashsz = SHA1_DIGEST_SIZE, .digest_size = SHA1_DIGEST_SIZE, - .statesize = sizeof(struct sha1_state), .block_size = SHA1_BLOCK_SIZE }, { .name = "sha256", .hash_zero = sha256_zero_message_hash, @@ -1328,7 +1325,6 @@ static const struct n2_hash_tmpl hash_tmpls[] = { .hmac_type = AUTH_TYPE_HMAC_SHA256, .hw_op_hashsz = SHA256_DIGEST_SIZE, .digest_size = SHA256_DIGEST_SIZE, - .statesize = sizeof(struct sha256_state), .block_size = SHA256_BLOCK_SIZE }, { .name = "sha224", .hash_zero = sha224_zero_message_hash, @@ -1337,7 +1333,6 @@ static const struct n2_hash_tmpl hash_tmpls[] = { .hmac_type = AUTH_TYPE_RESERVED, .hw_op_hashsz = SHA256_DIGEST_SIZE, .digest_size = SHA224_DIGEST_SIZE, - .statesize = sizeof(struct sha256_state), .block_size = SHA224_BLOCK_SIZE }, }; #define NUM_HASH_TMPLS ARRAY_SIZE(hash_tmpls) @@ -1479,7 +1474,6 @@ static int __n2_register_one_ahash(const struct n2_hash_tmpl *tmpl) halg = &ahash->halg; halg->digestsize = tmpl->digest_size; - halg->statesize = tmpl->statesize; base = &halg->base; snprintf(base->cra_name, CRYPTO_MAX_ALG_NAME, "%s", tmpl->name);
diff --git a/drivers/crypto/omap-sham.c b/drivers/crypto/omap-sham.c index dbab9e3..f8a1465 100644 --- a/drivers/crypto/omap-sham.c +++ b/drivers/crypto/omap-sham.c
@@ -2141,7 +2141,7 @@ static int omap_sham_probe(struct platform_device *pdev) pm_runtime_enable(dev); pm_runtime_irq_safe(dev); - err = pm_runtime_resume_and_get(dev); + err = pm_runtime_get_sync(dev); if (err < 0) { dev_err(dev, "failed to get sync: %d\n", err); goto err_pm;
diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c index d07bceb..c9aa15f 100644 --- a/drivers/dio/dio.c +++ b/drivers/dio/dio.c
@@ -110,12 +110,6 @@ static char dio_no_name[] = { 0 }; #endif /* CONFIG_DIO_CONSTANTS */ -static void dio_dev_release(struct device *dev) -{ - struct dio_dev *ddev = container_of(dev, typeof(struct dio_dev), dev); - kfree(ddev); -} - int __init dio_find(int deviceid) { /* Called to find a DIO device before the full bus scan has run. @@ -228,7 +222,6 @@ static int __init dio_init(void) dev->bus = &dio_bus; dev->dev.parent = &dio_bus.dev; dev->dev.bus = &dio_bus_type; - dev->dev.release = dio_dev_release; dev->scode = scode; dev->resource.start = pa; dev->resource.end = pa + DIO_SIZE(scode, va); @@ -256,7 +249,6 @@ static int __init dio_init(void) if (error) { pr_err("DIO: Error registering device %s\n", dev->name); - put_device(&dev->dev); continue; } error = dio_create_sysfs_dev_files(dev);
diff --git a/drivers/dma-buf/heaps/system_heap.c b/drivers/dma-buf/heaps/system_heap.c index 32b74e2..b945ffe 100644 --- a/drivers/dma-buf/heaps/system_heap.c +++ b/drivers/dma-buf/heaps/system_heap.c
@@ -50,8 +50,6 @@ struct dma_heap_attachment { bool uncached; }; -#define LOW_ORDER_GFP (GFP_HIGHUSER | __GFP_ZERO | __GFP_COMP) -#define MID_ORDER_GFP (LOW_ORDER_GFP | __GFP_NOWARN) #define HIGH_ORDER_GFP (((GFP_HIGHUSER | __GFP_ZERO | __GFP_NOWARN \ | __GFP_NORETRY) & ~__GFP_RECLAIM) \ | __GFP_COMP) @@ -63,7 +61,7 @@ static gfp_t order_flags[] = {HIGH_ORDER_GFP, LOW_ORDER_GFP, LOW_ORDER_GFP}; static const unsigned int orders[] = {8, 6, 4, 2, 0}; #else -static gfp_t order_flags[] = {HIGH_ORDER_GFP, MID_ORDER_GFP, LOW_ORDER_GFP}; +static gfp_t order_flags[] = {HIGH_ORDER_GFP, LOW_ORDER_GFP, LOW_ORDER_GFP}; /* * The selection of the orders used for allocation (1MB, 64K, 4K) is designed * to match with the sizes often found in IOMMUs. Using order 4 pages instead
diff --git a/drivers/dma-buf/udmabuf.c b/drivers/dma-buf/udmabuf.c index 80ccdf9..c6e9b7b 100644 --- a/drivers/dma-buf/udmabuf.c +++ b/drivers/dma-buf/udmabuf.c
@@ -287,23 +287,7 @@ static struct miscdevice udmabuf_misc = { static int __init udmabuf_dev_init(void) { - int ret; - - ret = misc_register(&udmabuf_misc); - if (ret < 0) { - pr_err("Could not initialize udmabuf device\n"); - return ret; - } - - ret = dma_coerce_mask_and_coherent(udmabuf_misc.this_device, - DMA_BIT_MASK(64)); - if (ret < 0) { - pr_err("Could not setup DMA mask for udmabuf device\n"); - misc_deregister(&udmabuf_misc); - return ret; - } - - return 0; + return misc_register(&udmabuf_misc); } static void __exit udmabuf_dev_exit(void)
diff --git a/drivers/dma/at_hdmac.c b/drivers/dma/at_hdmac.c index a430975..303bc3e 100644 --- a/drivers/dma/at_hdmac.c +++ b/drivers/dma/at_hdmac.c
@@ -246,8 +246,6 @@ static void atc_dostart(struct at_dma_chan *atchan, struct at_desc *first) ATC_SPIP_BOUNDARY(first->boundary)); channel_writel(atchan, DPIP, ATC_DPIP_HOLE(first->dst_hole) | ATC_DPIP_BOUNDARY(first->boundary)); - /* Don't allow CPU to reorder channel enable. */ - wmb(); dma_writel(atdma, CHER, atchan->mask); vdbg_dump_regs(atchan); @@ -308,8 +306,7 @@ static int atc_get_bytes_left(struct dma_chan *chan, dma_cookie_t cookie) struct at_desc *desc_first = atc_first_active(atchan); struct at_desc *desc; int ret; - u32 ctrla, dscr; - unsigned int i; + u32 ctrla, dscr, trials; /* * If the cookie doesn't match to the currently running transfer then @@ -379,7 +376,7 @@ static int atc_get_bytes_left(struct dma_chan *chan, dma_cookie_t cookie) dscr = channel_readl(atchan, DSCR); rmb(); /* ensure DSCR is read before CTRLA */ ctrla = channel_readl(atchan, CTRLA); - for (i = 0; i < ATC_MAX_DSCR_TRIALS; ++i) { + for (trials = 0; trials < ATC_MAX_DSCR_TRIALS; ++trials) { u32 new_dscr; rmb(); /* ensure DSCR is read after CTRLA */ @@ -405,7 +402,7 @@ static int atc_get_bytes_left(struct dma_chan *chan, dma_cookie_t cookie) rmb(); /* ensure DSCR is read before CTRLA */ ctrla = channel_readl(atchan, CTRLA); } - if (unlikely(i == ATC_MAX_DSCR_TRIALS)) + if (unlikely(trials >= ATC_MAX_DSCR_TRIALS)) return -ETIMEDOUT; /* for the first descriptor we can be more accurate */ @@ -553,6 +550,10 @@ static void atc_handle_error(struct at_dma_chan *atchan) bad_desc = atc_first_active(atchan); list_del_init(&bad_desc->desc_node); + /* As we are stopped, take advantage to push queued descriptors + * in active_list */ + list_splice_init(&atchan->queue, atchan->active_list.prev); + /* Try to restart the controller */ if (!list_empty(&atchan->active_list)) atc_dostart(atchan, atc_first_active(atchan)); @@ -673,11 +674,19 @@ static dma_cookie_t atc_tx_submit(struct dma_async_tx_descriptor *tx) spin_lock_irqsave(&atchan->lock, flags); cookie = dma_cookie_assign(tx); - list_add_tail(&desc->desc_node, &atchan->queue); + if (list_empty(&atchan->active_list)) { + dev_vdbg(chan2dev(tx->chan), "tx_submit: started %u\n", + desc->txd.cookie); + atc_dostart(atchan, desc); + list_add_tail(&desc->desc_node, &atchan->active_list); + } else { + dev_vdbg(chan2dev(tx->chan), "tx_submit: queued %u\n", + desc->txd.cookie); + list_add_tail(&desc->desc_node, &atchan->queue); + } + spin_unlock_irqrestore(&atchan->lock, flags); - dev_vdbg(chan2dev(tx->chan), "tx_submit: queued %u\n", - desc->txd.cookie); return cookie; } @@ -1948,11 +1957,7 @@ static int __init at_dma_probe(struct platform_device *pdev) dma_has_cap(DMA_SLAVE, atdma->dma_common.cap_mask) ? "slave " : "", plat_dat->nr_channels); - err = dma_async_device_register(&atdma->dma_common); - if (err) { - dev_err(&pdev->dev, "Unable to register: %d.\n", err); - goto err_dma_async_device_register; - } + dma_async_device_register(&atdma->dma_common); /* * Do not return an error if the dmac node is not present in order to @@ -1972,7 +1977,6 @@ static int __init at_dma_probe(struct platform_device *pdev) err_of_dma_controller_register: dma_async_device_unregister(&atdma->dma_common); -err_dma_async_device_register: dma_pool_destroy(atdma->memset_pool); err_memset_pool_create: dma_pool_destroy(atdma->dma_desc_pool);
diff --git a/drivers/dma/at_hdmac_regs.h b/drivers/dma/at_hdmac_regs.h index 65fa3e3..fe8a585 100644 --- a/drivers/dma/at_hdmac_regs.h +++ b/drivers/dma/at_hdmac_regs.h
@@ -164,13 +164,13 @@ /* LLI == Linked List Item; aka DMA buffer descriptor */ struct at_lli { /* values that are not changed by hardware */ - u32 saddr; - u32 daddr; + dma_addr_t saddr; + dma_addr_t daddr; /* value that may get written back: */ - u32 ctrla; + u32 ctrla; /* more values that are not changed by hardware */ - u32 ctrlb; - u32 dscr; /* chain to next lli */ + u32 ctrlb; + dma_addr_t dscr; /* chain to next lli */ }; /**
diff --git a/drivers/dma/dmaengine.c b/drivers/dma/dmaengine.c index a8996fa..4b60408 100644 --- a/drivers/dma/dmaengine.c +++ b/drivers/dma/dmaengine.c
@@ -212,8 +212,7 @@ static int dma_chan_get(struct dma_chan *chan) /* The channel is already in use, update client count */ if (chan->client_count) { __module_get(owner); - chan->client_count++; - return 0; + goto out; } if (!try_module_get(owner)) @@ -226,11 +225,11 @@ static int dma_chan_get(struct dma_chan *chan) goto err_out; } - chan->client_count++; - if (!dma_has_cap(DMA_PRIVATE, chan->device->cap_mask)) balance_ref_count(chan); +out: + chan->client_count++; return 0; err_out:
diff --git a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c index 0b970b9..a1ce307 100644 --- a/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c +++ b/drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c
@@ -551,11 +551,6 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) /* The bad descriptor currently is in the head of vc list */ vd = vchan_next_desc(&chan->vc); - if (!vd) { - dev_err(chan2dev(chan), "BUG: %s, IRQ with no descriptors\n", - axi_chan_name(chan)); - goto out; - } /* Remove the completed descriptor from issued list */ list_del(&vd->node); @@ -570,7 +565,6 @@ static noinline void axi_chan_handle_err(struct axi_dma_chan *chan, u32 status) /* Try to restart the controller */ axi_chan_start_first_queued(chan); -out: spin_unlock_irqrestore(&chan->vc.lock, flags); }
diff --git a/drivers/dma/imx-sdma.c b/drivers/dma/imx-sdma.c index 8dbff2f..8ec7a70 100644 --- a/drivers/dma/imx-sdma.c +++ b/drivers/dma/imx-sdma.c
@@ -1360,12 +1360,10 @@ static struct sdma_desc *sdma_transfer_init(struct sdma_channel *sdmac, sdma_config_ownership(sdmac, false, true, false); if (sdma_load_context(sdmac)) - goto err_bd_out; + goto err_desc_out; return desc; -err_bd_out: - sdma_free_bd(desc); err_desc_out: kfree(desc); err_out:
diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 997839c..8e2a4d1 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c
@@ -653,7 +653,7 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) if (active - i == 0) { dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n", __func__); - mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); } /* microsecond delay by sysfs variable per pending descriptor */ @@ -679,7 +679,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan) if (chanerr & (IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) { - mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); ioat_eh(ioat_chan); } } @@ -876,7 +876,7 @@ static void check_active(struct ioatdma_chan *ioat_chan) } if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state)) - mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); } void ioat_timer_event(struct timer_list *t)
diff --git a/drivers/dma/mv_xor_v2.c b/drivers/dma/mv_xor_v2.c index 3fa8841..889a94a 100644 --- a/drivers/dma/mv_xor_v2.c +++ b/drivers/dma/mv_xor_v2.c
@@ -895,7 +895,6 @@ static int mv_xor_v2_remove(struct platform_device *pdev) tasklet_kill(&xor_dev->irq_tasklet); clk_disable_unprepare(xor_dev->clk); - clk_disable_unprepare(xor_dev->reg_clk); return 0; }
diff --git a/drivers/dma/pxa_dma.c b/drivers/dma/pxa_dma.c index 68d9d60..b4ef4f1 100644 --- a/drivers/dma/pxa_dma.c +++ b/drivers/dma/pxa_dma.c
@@ -1249,14 +1249,14 @@ static int pxad_init_phys(struct platform_device *op, return -ENOMEM; for (i = 0; i < nb_phy_chans; i++) - if (platform_get_irq_optional(op, i) > 0) + if (platform_get_irq(op, i) > 0) nr_irq++; for (i = 0; i < nb_phy_chans; i++) { phy = &pdev->phys[i]; phy->base = pdev->base; phy->idx = i; - irq = platform_get_irq_optional(op, i); + irq = platform_get_irq(op, i); if ((nr_irq > 1) && (irq > 0)) ret = devm_request_irq(&op->dev, irq, pxad_chan_handler,
diff --git a/drivers/dma/sh/rcar-dmac.c b/drivers/dma/sh/rcar-dmac.c index 10a8a6d..eba9424 100644 --- a/drivers/dma/sh/rcar-dmac.c +++ b/drivers/dma/sh/rcar-dmac.c
@@ -1824,10 +1824,7 @@ static int rcar_dmac_probe(struct platform_device *pdev) dmac->dev = &pdev->dev; platform_set_drvdata(pdev, dmac); dmac->dev->dma_parms = &dmac->parms; - ret = dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); - if (ret) - return ret; - + dma_set_max_seg_size(dmac->dev, RCAR_DMATCR_MASK); ret = dma_set_mask_and_coherent(dmac->dev, DMA_BIT_MASK(40)); if (ret) return ret;
diff --git a/drivers/dma/sprd-dma.c b/drivers/dma/sprd-dma.c index 46b5184..8464da7 100644 --- a/drivers/dma/sprd-dma.c +++ b/drivers/dma/sprd-dma.c
@@ -1238,8 +1238,11 @@ static int sprd_dma_remove(struct platform_device *pdev) { struct sprd_dma_dev *sdev = platform_get_drvdata(pdev); struct sprd_dma_chn *c, *cn; + int ret; - pm_runtime_get_sync(&pdev->dev); + ret = pm_runtime_get_sync(&pdev->dev); + if (ret < 0) + return ret; /* explicitly free the irq */ if (sdev->irq > 0)
diff --git a/drivers/dma/tegra210-adma.c b/drivers/dma/tegra210-adma.c index d82c251..9068591 100644 --- a/drivers/dma/tegra210-adma.c +++ b/drivers/dma/tegra210-adma.c
@@ -224,7 +224,7 @@ static int tegra_adma_init(struct tegra_adma *tdma) int ret; /* Clear any interrupts */ - tdma_write(tdma, tdma->cdata->ch_base_offset + tdma->cdata->global_int_clear, 0x1); + tdma_write(tdma, tdma->cdata->global_int_clear, 0x1); /* Assert soft reset */ tdma_write(tdma, ADMA_GLOBAL_SOFT_RESET, 0x1);
diff --git a/drivers/dma/xilinx/xilinx_dma.c b/drivers/dma/xilinx/xilinx_dma.c index be44c86..7729b8d 100644 --- a/drivers/dma/xilinx/xilinx_dma.c +++ b/drivers/dma/xilinx/xilinx_dma.c
@@ -2626,6 +2626,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) struct device_node *node = pdev->dev.of_node; struct xilinx_dma_device *xdev; struct device_node *child, *np = pdev->dev.of_node; + struct resource *io; u32 num_frames, addr_width, len_width; int i, err; @@ -2651,11 +2652,11 @@ static int xilinx_dma_probe(struct platform_device *pdev) return err; /* Request and map I/O memory */ - xdev->regs = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(xdev->regs)) { - err = PTR_ERR(xdev->regs); - goto disable_clks; - } + io = platform_get_resource(pdev, IORESOURCE_MEM, 0); + xdev->regs = devm_ioremap_resource(&pdev->dev, io); + if (IS_ERR(xdev->regs)) + return PTR_ERR(xdev->regs); + /* Retrieve the DMA engine properties from the device tree */ xdev->max_buffer_len = GENMASK(XILINX_DMA_MAX_TRANS_LEN_MAX - 1, 0); @@ -2682,7 +2683,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) if (err < 0) { dev_err(xdev->dev, "missing xlnx,num-fstores property\n"); - goto disable_clks; + return err; } err = of_property_read_u32(node, "xlnx,flush-fsync", @@ -2702,11 +2703,7 @@ static int xilinx_dma_probe(struct platform_device *pdev) xdev->ext_addr = false; /* Set the dma mask bits */ - err = dma_set_mask_and_coherent(xdev->dev, DMA_BIT_MASK(addr_width)); - if (err < 0) { - dev_err(xdev->dev, "DMA mask error %d\n", err); - goto disable_clks; - } + dma_set_mask_and_coherent(xdev->dev, DMA_BIT_MASK(addr_width)); /* Initialize the DMA engine */ xdev->common.dev = &pdev->dev; @@ -2747,10 +2744,8 @@ static int xilinx_dma_probe(struct platform_device *pdev) /* Initialize the channels */ for_each_child_of_node(node, child) { err = xilinx_dma_child_probe(xdev, child); - if (err < 0) { - of_node_put(child); - goto error; - } + if (err < 0) + goto disable_clks; } if (xdev->dma_config->dmatype == XDMA_TYPE_VDMA) { @@ -2783,12 +2778,12 @@ static int xilinx_dma_probe(struct platform_device *pdev) return 0; +disable_clks: + xdma_disable_allclks(xdev); error: for (i = 0; i < xdev->nr_channels; i++) if (xdev->chan[i]) xilinx_dma_chan_remove(xdev->chan[i]); -disable_clks: - xdma_disable_allclks(xdev); return err; }
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c index 0ac6c49..65cf2b9 100644 --- a/drivers/edac/edac_device.c +++ b/drivers/edac/edac_device.c
@@ -34,9 +34,6 @@ static DEFINE_MUTEX(device_ctls_mutex); static LIST_HEAD(edac_device_list); -/* Default workqueue processing interval on this instance, in msecs */ -#define DEFAULT_POLL_INTERVAL 1000 - #ifdef CONFIG_EDAC_DEBUG static void edac_device_dump_device(struct edac_device_ctl_info *edac_dev) { @@ -369,7 +366,7 @@ static void edac_device_workq_function(struct work_struct *work_req) * whole one second to save timers firing all over the period * between integral seconds */ - if (edac_dev->poll_msec == DEFAULT_POLL_INTERVAL) + if (edac_dev->poll_msec == 1000) edac_queue_work(&edac_dev->work, round_jiffies_relative(edac_dev->delay)); else edac_queue_work(&edac_dev->work, edac_dev->delay); @@ -399,7 +396,7 @@ static void edac_device_workq_setup(struct edac_device_ctl_info *edac_dev, * timers firing on sub-second basis, while they are happy * to fire together on the 1 second exactly */ - if (edac_dev->poll_msec == DEFAULT_POLL_INTERVAL) + if (edac_dev->poll_msec == 1000) edac_queue_work(&edac_dev->work, round_jiffies_relative(edac_dev->delay)); else edac_queue_work(&edac_dev->work, edac_dev->delay); @@ -427,16 +424,17 @@ static void edac_device_workq_teardown(struct edac_device_ctl_info *edac_dev) * Then restart the workq on the new delay */ void edac_device_reset_delay_period(struct edac_device_ctl_info *edac_dev, - unsigned long msec) + unsigned long value) { - edac_dev->poll_msec = msec; - edac_dev->delay = msecs_to_jiffies(msec); + unsigned long jiffs = msecs_to_jiffies(value); - /* See comment in edac_device_workq_setup() above */ - if (edac_dev->poll_msec == DEFAULT_POLL_INTERVAL) - edac_mod_work(&edac_dev->work, round_jiffies_relative(edac_dev->delay)); - else - edac_mod_work(&edac_dev->work, edac_dev->delay); + if (value == 1000) + jiffs = round_jiffies_relative(value); + + edac_dev->poll_msec = value; + edac_dev->delay = jiffs; + + edac_mod_work(&edac_dev->work, jiffs); } int edac_device_alloc_index(void) @@ -475,7 +473,11 @@ int edac_device_add_device(struct edac_device_ctl_info *edac_dev) /* This instance is NOW RUNNING */ edac_dev->op_state = OP_RUNNING_POLL; - edac_device_workq_setup(edac_dev, edac_dev->poll_msec ?: DEFAULT_POLL_INTERVAL); + /* + * enable workq processing on this instance, + * default = 1000 msec + */ + edac_device_workq_setup(edac_dev, 1000); } else { edac_dev->op_state = OP_RUNNING_INTERRUPT; }
diff --git a/drivers/edac/edac_module.h b/drivers/edac/edac_module.h index 2369a56..388427d 100644 --- a/drivers/edac/edac_module.h +++ b/drivers/edac/edac_module.h
@@ -57,7 +57,7 @@ bool edac_stop_work(struct delayed_work *work); bool edac_mod_work(struct delayed_work *work, unsigned long delay); extern void edac_device_reset_delay_period(struct edac_device_ctl_info - *edac_dev, unsigned long msec); + *edac_dev, unsigned long value); extern void edac_mc_reset_delay_period(unsigned long value); extern void *edac_align_ptr(void **p, unsigned size, int n_elems);
diff --git a/drivers/edac/highbank_mc_edac.c b/drivers/edac/highbank_mc_edac.c index 19fba25..61b76ec 100644 --- a/drivers/edac/highbank_mc_edac.c +++ b/drivers/edac/highbank_mc_edac.c
@@ -174,10 +174,8 @@ static int highbank_mc_probe(struct platform_device *pdev) drvdata = mci->pvt_info; platform_set_drvdata(pdev, mci); - if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) { - res = -ENOMEM; - goto free; - } + if (!devres_open_group(&pdev->dev, NULL, GFP_KERNEL)) + return -ENOMEM; r = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!r) { @@ -245,7 +243,6 @@ static int highbank_mc_probe(struct platform_device *pdev) edac_mc_del_mc(&pdev->dev); err: devres_release_group(&pdev->dev, NULL); -free: edac_mc_free(mci); return res; }
diff --git a/drivers/edac/i10nm_base.c b/drivers/edac/i10nm_base.c index a887c33..2957692 100644 --- a/drivers/edac/i10nm_base.c +++ b/drivers/edac/i10nm_base.c
@@ -53,10 +53,11 @@ static struct pci_dev *pci_get_dev_wrapper(int dom, unsigned int bus, if (unlikely(pci_enable_device(pdev) < 0)) { edac_dbg(2, "Failed to enable device %02x:%02x.%x\n", bus, dev, fun); - pci_dev_put(pdev); return NULL; } + pci_dev_get(pdev); + return pdev; }
diff --git a/drivers/edac/qcom_edac.c b/drivers/edac/qcom_edac.c index c45519f..97a27e4 100644 --- a/drivers/edac/qcom_edac.c +++ b/drivers/edac/qcom_edac.c
@@ -252,7 +252,7 @@ dump_syn_reg_values(struct llcc_drv_data *drv, u32 bank, int err_type) static int dump_syn_reg(struct edac_device_ctl_info *edev_ctl, int err_type, u32 bank) { - struct llcc_drv_data *drv = edev_ctl->dev->platform_data; + struct llcc_drv_data *drv = edev_ctl->pvt_info; int ret; ret = dump_syn_reg_values(drv, bank, err_type); @@ -289,7 +289,7 @@ static irqreturn_t llcc_ecc_irq_handler(int irq, void *edev_ctl) { struct edac_device_ctl_info *edac_dev_ctl = edev_ctl; - struct llcc_drv_data *drv = edac_dev_ctl->dev->platform_data; + struct llcc_drv_data *drv = edac_dev_ctl->pvt_info; irqreturn_t irq_rc = IRQ_NONE; u32 drp_error, trp_error, i; int ret; @@ -358,6 +358,7 @@ static int qcom_llcc_edac_probe(struct platform_device *pdev) edev_ctl->dev_name = dev_name(dev); edev_ctl->ctl_name = "llcc"; edev_ctl->panic_on_ue = LLCC_ERP_PANIC_ON_UE; + edev_ctl->pvt_info = llcc_driv_data; rc = edac_device_add_device(edev_ctl); if (rc)
diff --git a/drivers/firewire/core-cdev.c b/drivers/firewire/core-cdev.c index 4fe36d5..3a43e5d 100644 --- a/drivers/firewire/core-cdev.c +++ b/drivers/firewire/core-cdev.c
@@ -818,10 +818,8 @@ static int ioctl_send_response(struct client *client, union ioctl_arg *arg) r = container_of(resource, struct inbound_transaction_resource, resource); - if (is_fcp_request(r->request)) { - kfree(r->data); + if (is_fcp_request(r->request)) goto out; - } if (a->length != fw_get_response_length(r->request)) { ret = -EINVAL;
diff --git a/drivers/firmware/arm_scmi/driver.c b/drivers/firmware/arm_scmi/driver.c index 9dae841..f0b055b 100644 --- a/drivers/firmware/arm_scmi/driver.c +++ b/drivers/firmware/arm_scmi/driver.c
@@ -737,39 +737,6 @@ static int scmi_mailbox_check(struct device_node *np, int idx) idx, NULL); } -static int scmi_mailbox_chan_validate(struct device *cdev) -{ - int num_mb, num_sh, ret = 0; - struct device_node *np = cdev->of_node; - - num_mb = of_count_phandle_with_args(np, "mboxes", "#mbox-cells"); - num_sh = of_count_phandle_with_args(np, "shmem", NULL); - /* Bail out if mboxes and shmem descriptors are inconsistent */ - if (num_mb <= 0 || num_sh > 2 || num_mb != num_sh) { - dev_warn(cdev, "Invalid channel descriptor for '%s'\n", - of_node_full_name(np)); - return -EINVAL; - } - - if (num_sh > 1) { - struct device_node *np_tx, *np_rx; - - np_tx = of_parse_phandle(np, "shmem", 0); - np_rx = of_parse_phandle(np, "shmem", 1); - /* SCMI Tx and Rx shared mem areas have to be distinct */ - if (!np_tx || !np_rx || np_tx == np_rx) { - dev_warn(cdev, "Invalid shmem descriptor for '%s'\n", - of_node_full_name(np)); - ret = -EINVAL; - } - - of_node_put(np_tx); - of_node_put(np_rx); - } - - return ret; -} - static int scmi_mbox_chan_setup(struct scmi_info *info, struct device *dev, int prot_id, bool tx) { @@ -793,10 +760,6 @@ static int scmi_mbox_chan_setup(struct scmi_info *info, struct device *dev, goto idr_alloc; } - ret = scmi_mailbox_chan_validate(dev); - if (ret) - return ret; - cinfo = devm_kzalloc(info->dev, sizeof(*cinfo), GFP_KERNEL); if (!cinfo) return -ENOMEM;
diff --git a/drivers/firmware/arm_scmi/scmi_pm_domain.c b/drivers/firmware/arm_scmi/scmi_pm_domain.c index b0c8962..177874a 100644 --- a/drivers/firmware/arm_scmi/scmi_pm_domain.c +++ b/drivers/firmware/arm_scmi/scmi_pm_domain.c
@@ -106,28 +106,9 @@ static int scmi_pm_domain_probe(struct scmi_device *sdev) scmi_pd_data->domains = domains; scmi_pd_data->num_domains = num_domains; - dev_set_drvdata(dev, scmi_pd_data); - return of_genpd_add_provider_onecell(np, scmi_pd_data); } -static void scmi_pm_domain_remove(struct scmi_device *sdev) -{ - int i; - struct genpd_onecell_data *scmi_pd_data; - struct device *dev = &sdev->dev; - struct device_node *np = dev->of_node; - - of_genpd_del_provider(np); - - scmi_pd_data = dev_get_drvdata(dev); - for (i = 0; i < scmi_pd_data->num_domains; i++) { - if (!scmi_pd_data->domains[i]) - continue; - pm_genpd_remove(scmi_pd_data->domains[i]); - } -} - static const struct scmi_device_id scmi_id_table[] = { { SCMI_PROTOCOL_POWER }, { }, @@ -137,7 +118,6 @@ MODULE_DEVICE_TABLE(scmi, scmi_id_table); static struct scmi_driver scmi_power_domain_driver = { .name = "scmi-power-domain", .probe = scmi_pm_domain_probe, - .remove = scmi_pm_domain_remove, .id_table = scmi_id_table, }; module_scmi_driver(scmi_power_domain_driver);
diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c index 72634e9..e2995ec 100644 --- a/drivers/firmware/arm_scpi.c +++ b/drivers/firmware/arm_scpi.c
@@ -815,7 +815,7 @@ static int scpi_init_versions(struct scpi_drvinfo *info) info->firmware_version = le32_to_cpu(caps.platform_version); } /* Ignore error if not implemented */ - if (info->is_legacy && ret == -EOPNOTSUPP) + if (scpi_info->is_legacy && ret == -EOPNOTSUPP) return 0; return ret; @@ -905,14 +905,13 @@ static int scpi_probe(struct platform_device *pdev) struct resource res; struct device *dev = &pdev->dev; struct device_node *np = dev->of_node; - struct scpi_drvinfo *scpi_drvinfo; - scpi_drvinfo = devm_kzalloc(dev, sizeof(*scpi_drvinfo), GFP_KERNEL); - if (!scpi_drvinfo) + scpi_info = devm_kzalloc(dev, sizeof(*scpi_info), GFP_KERNEL); + if (!scpi_info) return -ENOMEM; if (of_match_device(legacy_scpi_of_match, &pdev->dev)) - scpi_drvinfo->is_legacy = true; + scpi_info->is_legacy = true; count = of_count_phandle_with_args(np, "mboxes", "#mbox-cells"); if (count < 0) { @@ -920,19 +919,19 @@ static int scpi_probe(struct platform_device *pdev) return -ENODEV; } - scpi_drvinfo->channels = - devm_kcalloc(dev, count, sizeof(struct scpi_chan), GFP_KERNEL); - if (!scpi_drvinfo->channels) + scpi_info->channels = devm_kcalloc(dev, count, sizeof(struct scpi_chan), + GFP_KERNEL); + if (!scpi_info->channels) return -ENOMEM; - ret = devm_add_action(dev, scpi_free_channels, scpi_drvinfo); + ret = devm_add_action(dev, scpi_free_channels, scpi_info); if (ret) return ret; - for (; scpi_drvinfo->num_chans < count; scpi_drvinfo->num_chans++) { + for (; scpi_info->num_chans < count; scpi_info->num_chans++) { resource_size_t size; - int idx = scpi_drvinfo->num_chans; - struct scpi_chan *pchan = scpi_drvinfo->channels + idx; + int idx = scpi_info->num_chans; + struct scpi_chan *pchan = scpi_info->channels + idx; struct mbox_client *cl = &pchan->cl; struct device_node *shmem = of_parse_phandle(np, "shmem", idx); @@ -976,53 +975,45 @@ static int scpi_probe(struct platform_device *pdev) return ret; } - scpi_drvinfo->commands = scpi_std_commands; + scpi_info->commands = scpi_std_commands; - platform_set_drvdata(pdev, scpi_drvinfo); + platform_set_drvdata(pdev, scpi_info); - if (scpi_drvinfo->is_legacy) { + if (scpi_info->is_legacy) { /* Replace with legacy variants */ scpi_ops.clk_set_val = legacy_scpi_clk_set_val; - scpi_drvinfo->commands = scpi_legacy_commands; + scpi_info->commands = scpi_legacy_commands; /* Fill priority bitmap */ for (idx = 0; idx < ARRAY_SIZE(legacy_hpriority_cmds); idx++) set_bit(legacy_hpriority_cmds[idx], - scpi_drvinfo->cmd_priority); + scpi_info->cmd_priority); } - scpi_info = scpi_drvinfo; - - ret = scpi_init_versions(scpi_drvinfo); + ret = scpi_init_versions(scpi_info); if (ret) { dev_err(dev, "incorrect or no SCP firmware found\n"); - scpi_info = NULL; return ret; } - if (scpi_drvinfo->is_legacy && !scpi_drvinfo->protocol_version && - !scpi_drvinfo->firmware_version) + if (scpi_info->is_legacy && !scpi_info->protocol_version && + !scpi_info->firmware_version) dev_info(dev, "SCP Protocol legacy pre-1.0 firmware\n"); else dev_info(dev, "SCP Protocol %lu.%lu Firmware %lu.%lu.%lu version\n", FIELD_GET(PROTO_REV_MAJOR_MASK, - scpi_drvinfo->protocol_version), + scpi_info->protocol_version), FIELD_GET(PROTO_REV_MINOR_MASK, - scpi_drvinfo->protocol_version), + scpi_info->protocol_version), FIELD_GET(FW_REV_MAJOR_MASK, - scpi_drvinfo->firmware_version), + scpi_info->firmware_version), FIELD_GET(FW_REV_MINOR_MASK, - scpi_drvinfo->firmware_version), + scpi_info->firmware_version), FIELD_GET(FW_REV_PATCH_MASK, - scpi_drvinfo->firmware_version)); + scpi_info->firmware_version)); + scpi_info->scpi_ops = &scpi_ops; - scpi_drvinfo->scpi_ops = &scpi_ops; - - ret = devm_of_platform_populate(dev); - if (ret) - scpi_info = NULL; - - return ret; + return devm_of_platform_populate(dev); } static const struct of_device_id scpi_of_match[] = {
diff --git a/drivers/firmware/efi/capsule-loader.c b/drivers/firmware/efi/capsule-loader.c index b82cc8b..b139513 100644 --- a/drivers/firmware/efi/capsule-loader.c +++ b/drivers/firmware/efi/capsule-loader.c
@@ -242,6 +242,29 @@ static ssize_t efi_capsule_write(struct file *file, const char __user *buff, } /** + * efi_capsule_flush - called by file close or file flush + * @file: file pointer + * @id: not used + * + * If a capsule is being partially uploaded then calling this function + * will be treated as upload termination and will free those completed + * buffer pages and -ECANCELED will be returned. + **/ +static int efi_capsule_flush(struct file *file, fl_owner_t id) +{ + int ret = 0; + struct capsule_info *cap_info = file->private_data; + + if (cap_info->index > 0) { + pr_err("capsule upload not complete\n"); + efi_free_all_buff_pages(cap_info); + ret = -ECANCELED; + } + + return ret; +} + +/** * efi_capsule_release - called by file close * @inode: not used * @file: file pointer @@ -253,13 +276,6 @@ static int efi_capsule_release(struct inode *inode, struct file *file) { struct capsule_info *cap_info = file->private_data; - if (cap_info->index > 0 && - (cap_info->header.headersize == 0 || - cap_info->count < cap_info->total_size)) { - pr_err("capsule upload not complete\n"); - efi_free_all_buff_pages(cap_info); - } - kfree(cap_info->pages); kfree(cap_info->phys); kfree(file->private_data); @@ -307,6 +323,7 @@ static const struct file_operations efi_capsule_fops = { .owner = THIS_MODULE, .open = efi_capsule_open, .write = efi_capsule_write, + .flush = efi_capsule_flush, .release = efi_capsule_release, .llseek = no_llseek, };
diff --git a/drivers/firmware/efi/efi.c b/drivers/firmware/efi/efi.c index ed31b08..8fd74a7 100644 --- a/drivers/firmware/efi/efi.c +++ b/drivers/firmware/efi/efi.c
@@ -345,8 +345,8 @@ static int __init efisubsys_init(void) efi_kobj = kobject_create_and_add("efi", firmware_kobj); if (!efi_kobj) { pr_err("efi: Firmware registration failed.\n"); - error = -ENOMEM; - goto err_destroy_wq; + destroy_workqueue(efi_rts_wq); + return -ENOMEM; } error = generic_ops_register(); @@ -382,10 +382,7 @@ static int __init efisubsys_init(void) generic_ops_unregister(); err_put: kobject_put(efi_kobj); -err_destroy_wq: - if (efi_rts_wq) - destroy_workqueue(efi_rts_wq); - + destroy_workqueue(efi_rts_wq); return error; } @@ -549,7 +546,7 @@ int __init efi_config_parse_tables(void *config_tables, int count, int sz, seed = early_memremap(efi.rng_seed, sizeof(*seed)); if (seed != NULL) { - size = min(seed->size, EFI_RANDOM_SEED_SIZE); + size = READ_ONCE(seed->size); early_memunmap(seed, sizeof(*seed)); } else { pr_err("Could not map UEFI random seed!\n"); @@ -1022,8 +1019,6 @@ int __ref efi_mem_reserve_persistent(phys_addr_t addr, u64 size) /* first try to find a slot in an existing linked list entry */ for (prsv = efi_memreserve_root->next; prsv; ) { rsv = memremap(prsv, sizeof(*rsv), MEMREMAP_WB); - if (!rsv) - return -ENOMEM; index = atomic_fetch_add_unless(&rsv->count, 1, rsv->size); if (index < rsv->size) { rsv->entry[index].base = addr;
diff --git a/drivers/firmware/efi/libstub/fdt.c b/drivers/firmware/efi/libstub/fdt.c index 9d9a3b6..0bf0190 100644 --- a/drivers/firmware/efi/libstub/fdt.c +++ b/drivers/firmware/efi/libstub/fdt.c
@@ -291,6 +291,14 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, goto fail; } + /* + * Now that we have done our final memory allocation (and free) + * we can get the memory map key needed for exit_boot_services(). + */ + status = efi_get_memory_map(sys_table, &map); + if (status != EFI_SUCCESS) + goto fail_free_new_fdt; + status = update_fdt(sys_table, (void *)fdt_addr, fdt_size, (void *)*new_fdt_addr, MAX_FDT_SIZE, cmdline_ptr, initrd_addr, initrd_size);
diff --git a/drivers/firmware/efi/libstub/secureboot.c b/drivers/firmware/efi/libstub/secureboot.c index c8a1ef8..edba5e7 100644 --- a/drivers/firmware/efi/libstub/secureboot.c +++ b/drivers/firmware/efi/libstub/secureboot.c
@@ -19,7 +19,7 @@ static const efi_char16_t efi_SetupMode_name[] = L"SetupMode"; /* SHIM variables */ static const efi_guid_t shim_guid = EFI_SHIM_LOCK_GUID; -static const efi_char16_t shim_MokSBState_name[] = L"MokSBStateRT"; +static const efi_char16_t shim_MokSBState_name[] = L"MokSBState"; #define get_efi_var(name, vendor, ...) \ efi_call_runtime(get_variable, \ @@ -58,8 +58,8 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) /* * See if a user has put the shim into insecure mode. If so, and if the - * variable doesn't have the non-volatile attribute set, we might as - * well honor that. + * variable doesn't have the runtime attribute set, we might as well + * honor that. */ size = sizeof(moksbstate); status = get_efi_var(shim_MokSBState_name, &shim_guid, @@ -68,7 +68,7 @@ enum efi_secureboot_mode efi_get_secureboot(efi_system_table_t *sys_table_arg) /* If it fails, we don't care why. Default to secure */ if (status != EFI_SUCCESS) goto secure_boot_enabled; - if (!(attr & EFI_VARIABLE_NON_VOLATILE) && moksbstate == 1) + if (!(attr & EFI_VARIABLE_RUNTIME_ACCESS) && moksbstate == 1) return efi_secureboot_mode_disabled; secure_boot_enabled:
diff --git a/drivers/firmware/efi/memattr.c b/drivers/firmware/efi/memattr.c index 5f57735..5d343dc 100644 --- a/drivers/firmware/efi/memattr.c +++ b/drivers/firmware/efi/memattr.c
@@ -32,7 +32,7 @@ int __init efi_memattr_init(void) return -ENOMEM; } - if (tbl->version > 2) { + if (tbl->version > 1) { pr_warn("Unexpected EFI Memory Attributes table version %d\n", tbl->version); goto unmap;
diff --git a/drivers/firmware/efi/runtime-wrappers.c b/drivers/firmware/efi/runtime-wrappers.c index a6735f1..136b9c7 100644 --- a/drivers/firmware/efi/runtime-wrappers.c +++ b/drivers/firmware/efi/runtime-wrappers.c
@@ -62,7 +62,6 @@ struct efi_runtime_work efi_rts_work; \ if (!efi_enabled(EFI_RUNTIME_SERVICES)) { \ pr_warn_once("EFI Runtime Services are disabled!\n"); \ - efi_rts_work.status = EFI_DEVICE_ERROR; \ goto exit; \ } \ \
diff --git a/drivers/firmware/google/coreboot_table.c b/drivers/firmware/google/coreboot_table.c index 5680741..8d132e4 100644 --- a/drivers/firmware/google/coreboot_table.c +++ b/drivers/firmware/google/coreboot_table.c
@@ -152,22 +152,20 @@ static int coreboot_table_probe(struct platform_device *pdev) if (!ptr) return -ENOMEM; - ret = coreboot_table_populate(dev, ptr); - + ret = bus_register(&coreboot_bus_type); + if (!ret) { + ret = coreboot_table_populate(dev, ptr); + if (ret) + bus_unregister(&coreboot_bus_type); + } memunmap(ptr); return ret; } -static int __cb_dev_unregister(struct device *dev, void *dummy) -{ - device_unregister(dev); - return 0; -} - static int coreboot_table_remove(struct platform_device *pdev) { - bus_for_each_dev(&coreboot_bus_type, NULL, NULL, __cb_dev_unregister); + bus_unregister(&coreboot_bus_type); return 0; } @@ -197,32 +195,6 @@ static struct platform_driver coreboot_table_driver = { .of_match_table = of_match_ptr(coreboot_of_match), }, }; - -static int __init coreboot_table_driver_init(void) -{ - int ret; - - ret = bus_register(&coreboot_bus_type); - if (ret) - return ret; - - ret = platform_driver_register(&coreboot_table_driver); - if (ret) { - bus_unregister(&coreboot_bus_type); - return ret; - } - - return 0; -} - -static void __exit coreboot_table_driver_exit(void) -{ - platform_driver_unregister(&coreboot_table_driver); - bus_unregister(&coreboot_bus_type); -} - -module_init(coreboot_table_driver_init); -module_exit(coreboot_table_driver_exit); - +module_platform_driver(coreboot_table_driver); MODULE_AUTHOR("Google, Inc."); MODULE_LICENSE("GPL");
diff --git a/drivers/firmware/google/framebuffer-coreboot.c b/drivers/firmware/google/framebuffer-coreboot.c index 922c079..916f26a 100644 --- a/drivers/firmware/google/framebuffer-coreboot.c +++ b/drivers/firmware/google/framebuffer-coreboot.c
@@ -43,7 +43,9 @@ static int framebuffer_probe(struct coreboot_device *dev) fb->green_mask_pos == formats[i].green.offset && fb->green_mask_size == formats[i].green.length && fb->blue_mask_pos == formats[i].blue.offset && - fb->blue_mask_size == formats[i].blue.length) + fb->blue_mask_size == formats[i].blue.length && + fb->reserved_mask_pos == formats[i].transp.offset && + fb->reserved_mask_size == formats[i].transp.length) pdata.format = formats[i].name; } if (!pdata.format)
diff --git a/drivers/firmware/google/gsmi.c b/drivers/firmware/google/gsmi.c index 94753ad..edaa4e5 100644 --- a/drivers/firmware/google/gsmi.c +++ b/drivers/firmware/google/gsmi.c
@@ -359,10 +359,9 @@ static efi_status_t gsmi_get_variable(efi_char16_t *name, memcpy(data, gsmi_dev.data_buf->start, *data_size); /* All variables are have the following attributes */ - if (attr) - *attr = EFI_VARIABLE_NON_VOLATILE | - EFI_VARIABLE_BOOTSERVICE_ACCESS | - EFI_VARIABLE_RUNTIME_ACCESS; + *attr = EFI_VARIABLE_NON_VOLATILE | + EFI_VARIABLE_BOOTSERVICE_ACCESS | + EFI_VARIABLE_RUNTIME_ACCESS; } spin_unlock_irqrestore(&gsmi_dev.lock, flags); @@ -680,15 +679,6 @@ static struct notifier_block gsmi_die_notifier = { static int gsmi_panic_callback(struct notifier_block *nb, unsigned long reason, void *arg) { - - /* - * Panic callbacks are executed with all other CPUs stopped, - * so we must not attempt to spin waiting for gsmi_dev.lock - * to be released. - */ - if (spin_is_locked(&gsmi_dev.lock)) - return NOTIFY_DONE; - gsmi_shutdown_reason(GSMI_SHUTDOWN_PANIC); return NOTIFY_DONE; }
diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera-pr-ip-core.c index 75b4b3e..2cf25fd 100644 --- a/drivers/fpga/altera-pr-ip-core.c +++ b/drivers/fpga/altera-pr-ip-core.c
@@ -108,7 +108,7 @@ static int alt_pr_fpga_write(struct fpga_manager *mgr, const char *buf, u32 *buffer_32 = (u32 *)buf; size_t i = 0; - if (!count) + if (count <= 0) return -EINVAL; /* Write out the complete 32-bit chunks */
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c index 0445252..559839a 100644 --- a/drivers/fpga/stratix10-soc.c +++ b/drivers/fpga/stratix10-soc.c
@@ -218,9 +218,9 @@ static int s10_ops_write_init(struct fpga_manager *mgr, /* Allocate buffers from the service layer's pool. */ for (i = 0; i < NUM_SVC_BUFS; i++) { kbuf = stratix10_svc_allocate_memory(priv->chan, SVC_BUF_SIZE); - if (IS_ERR(kbuf)) { + if (!kbuf) { s10_free_buffers(mgr); - ret = PTR_ERR(kbuf); + ret = -ENOMEM; goto init_done; }
diff --git a/drivers/fsi/fsi-core.c b/drivers/fsi/fsi-core.c index 09e5715..cb980a6 100644 --- a/drivers/fsi/fsi-core.c +++ b/drivers/fsi/fsi-core.c
@@ -1271,9 +1271,6 @@ int fsi_master_register(struct fsi_master *master) mutex_init(&master->scan_lock); master->idx = ida_simple_get(&master_ida, 0, INT_MAX, GFP_KERNEL); - if (master->idx < 0) - return master->idx; - dev_set_name(&master->dev, "fsi%d", master->idx); rc = device_register(&master->dev);
diff --git a/drivers/fsi/fsi-sbefifo.c b/drivers/fsi/fsi-sbefifo.c index 84a60d2..c8ccc99 100644 --- a/drivers/fsi/fsi-sbefifo.c +++ b/drivers/fsi/fsi-sbefifo.c
@@ -640,7 +640,7 @@ static void sbefifo_collect_async_ffdc(struct sbefifo *sbefifo) } ffdc_iov.iov_base = ffdc; ffdc_iov.iov_len = SBEFIFO_MAX_FFDC_SIZE; - iov_iter_kvec(&ffdc_iter, READ, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE); + iov_iter_kvec(&ffdc_iter, WRITE, &ffdc_iov, 1, SBEFIFO_MAX_FFDC_SIZE); cmd[0] = cpu_to_be32(2); cmd[1] = cpu_to_be32(SBEFIFO_CMD_GET_SBE_FFDC); rc = sbefifo_do_command(sbefifo, cmd, 2, &ffdc_iter); @@ -737,7 +737,7 @@ int sbefifo_submit(struct device *dev, const __be32 *command, size_t cmd_len, rbytes = (*resp_len) * sizeof(__be32); resp_iov.iov_base = response; resp_iov.iov_len = rbytes; - iov_iter_kvec(&resp_iter, READ, &resp_iov, 1, rbytes); + iov_iter_kvec(&resp_iter, WRITE, &resp_iov, 1, rbytes); /* Perform the command */ mutex_lock(&sbefifo->lock); @@ -817,7 +817,7 @@ static ssize_t sbefifo_user_read(struct file *file, char __user *buf, /* Prepare iov iterator */ resp_iov.iov_base = buf; resp_iov.iov_len = len; - iov_iter_init(&resp_iter, READ, &resp_iov, 1, len); + iov_iter_init(&resp_iter, WRITE, &resp_iov, 1, len); /* Perform the command */ mutex_lock(&sbefifo->lock);
diff --git a/drivers/gpio/gpio-amd8111.c b/drivers/gpio/gpio-amd8111.c index 68d9505..fdcebe5 100644 --- a/drivers/gpio/gpio-amd8111.c +++ b/drivers/gpio/gpio-amd8111.c
@@ -231,10 +231,7 @@ static int __init amd_gpio_init(void) ioport_unmap(gp.pm); goto out; } - return 0; - out: - pci_dev_put(pdev); return err; } @@ -242,7 +239,6 @@ static void __exit amd_gpio_exit(void) { gpiochip_remove(&gp.chip); ioport_unmap(gp.pm); - pci_dev_put(gp.pdev); } module_init(amd_gpio_init);
diff --git a/drivers/gpio/gpio-davinci.c b/drivers/gpio/gpio-davinci.c index 576cb2d..e0b0256 100644 --- a/drivers/gpio/gpio-davinci.c +++ b/drivers/gpio/gpio-davinci.c
@@ -333,7 +333,7 @@ static struct irq_chip gpio_irqchip = { .irq_enable = gpio_irq_enable, .irq_disable = gpio_irq_disable, .irq_set_type = gpio_irq_type, - .flags = IRQCHIP_SET_TYPE_MASKED | IRQCHIP_SKIP_SET_WAKE, + .flags = IRQCHIP_SET_TYPE_MASKED, }; static void gpio_irq_handler(struct irq_desc *desc)
diff --git a/drivers/gpio/gpio-mpc8xxx.c b/drivers/gpio/gpio-mpc8xxx.c index f3bf82e..d72a3a5 100644 --- a/drivers/gpio/gpio-mpc8xxx.c +++ b/drivers/gpio/gpio-mpc8xxx.c
@@ -190,7 +190,6 @@ static int mpc8xxx_irq_set_type(struct irq_data *d, unsigned int flow_type) switch (flow_type) { case IRQ_TYPE_EDGE_FALLING: - case IRQ_TYPE_LEVEL_LOW: raw_spin_lock_irqsave(&mpc8xxx_gc->lock, flags); gc->write_reg(mpc8xxx_gc->regs + GPIO_ICR, gc->read_reg(mpc8xxx_gc->regs + GPIO_ICR)
diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c index 2e4b6b1..c77d474 100644 --- a/drivers/gpio/gpio-mxc.c +++ b/drivers/gpio/gpio-mxc.c
@@ -229,7 +229,7 @@ static int gpio_set_irq_type(struct irq_data *d, u32 type) writel(1 << gpio_idx, port->base + GPIO_ISR); - return port->gc.direction_input(&port->gc, gpio_idx); + return 0; } static void mxc_flip_edge(struct mxc_gpio_port *port, u32 gpio)
diff --git a/drivers/gpio/gpio-pca953x.c b/drivers/gpio/gpio-pca953x.c index c81d73d..317f54f 100644 --- a/drivers/gpio/gpio-pca953x.c +++ b/drivers/gpio/gpio-pca953x.c
@@ -1198,9 +1198,7 @@ static int pca953x_suspend(struct device *dev) { struct pca953x_chip *chip = dev_get_drvdata(dev); - mutex_lock(&chip->i2c_lock); regcache_cache_only(chip->regmap, true); - mutex_unlock(&chip->i2c_lock); if (atomic_read(&chip->wakeup_path)) device_set_wakeup_path(dev); @@ -1223,17 +1221,13 @@ static int pca953x_resume(struct device *dev) } } - mutex_lock(&chip->i2c_lock); regcache_cache_only(chip->regmap, false); regcache_mark_dirty(chip->regmap); ret = pca953x_regcache_sync(dev); - if (ret) { - mutex_unlock(&chip->i2c_lock); + if (ret) return ret; - } ret = regcache_sync(chip->regmap); - mutex_unlock(&chip->i2c_lock); if (ret) { dev_err(dev, "Failed to restore register map: %d\n", ret); return ret;
diff --git a/drivers/gpio/gpio-vf610.c b/drivers/gpio/gpio-vf610.c index 396a687..1ae612c 100644 --- a/drivers/gpio/gpio-vf610.c +++ b/drivers/gpio/gpio-vf610.c
@@ -304,7 +304,7 @@ static int vf610_gpio_probe(struct platform_device *pdev) gc = &port->gc; gc->of_node = np; gc->parent = dev; - gc->label = dev_name(dev); + gc->label = "vf610-gpio"; gc->ngpio = VF610_GPIO_PER_PORT; gc->base = of_alias_get_id(np, "gpio") * VF610_GPIO_PER_PORT;
diff --git a/drivers/gpio/gpiolib-of.c b/drivers/gpio/gpiolib-of.c index 73807c8..b1dcd2d 100644 --- a/drivers/gpio/gpiolib-of.c +++ b/drivers/gpio/gpiolib-of.c
@@ -734,8 +734,7 @@ int of_mm_gpiochip_add_data(struct device_node *np, if (mm_gc->save_regs) mm_gc->save_regs(mm_gc); - of_node_put(mm_gc->gc.of_node); - mm_gc->gc.of_node = of_node_get(np); + mm_gc->gc.of_node = np; ret = gpiochip_add_data(gc, data); if (ret) @@ -743,7 +742,6 @@ int of_mm_gpiochip_add_data(struct device_node *np, return 0; err2: - of_node_put(np); iounmap(mm_gc->regs); err1: kfree(gc->label);
diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index fc6c4f8..649f17d 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig
@@ -27,7 +27,6 @@ config DRM_MIPI_DBI tristate depends on DRM - select DRM_KMS_HELPER config DRM_MIPI_DSI bool
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c index ba60498..b1172d9 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c
@@ -313,7 +313,6 @@ static bool amdgpu_atrm_get_bios(struct amdgpu_device *adev) if (!found) return false; - pci_dev_put(pdev); adev->bios = kmalloc(size, GFP_KERNEL); if (!adev->bios) {
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c index fac43a9..0e1cacf 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c
@@ -316,10 +316,8 @@ static void amdgpu_connector_get_edid(struct drm_connector *connector) if (!amdgpu_connector->edid) { /* some laptops provide a hardcoded edid in rom for LCDs */ if (((connector->connector_type == DRM_MODE_CONNECTOR_LVDS) || - (connector->connector_type == DRM_MODE_CONNECTOR_eDP))) { + (connector->connector_type == DRM_MODE_CONNECTOR_eDP))) amdgpu_connector->edid = amdgpu_connector_get_hardcoded_edid(adev); - drm_connector_update_edid_property(connector, amdgpu_connector->edid); - } } } @@ -1648,12 +1646,10 @@ amdgpu_connector_add(struct amdgpu_device *adev, adev->mode_info.dither_property, AMDGPU_FMT_DITHER_DISABLE); - if (amdgpu_audio != 0) { + if (amdgpu_audio != 0) drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); - amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; - } subpixel_order = SubPixelHorizontalRGB; connector->interlace_allowed = true; @@ -1775,7 +1771,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); - amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property, @@ -1829,7 +1824,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); - amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property, @@ -1880,7 +1874,6 @@ amdgpu_connector_add(struct amdgpu_device *adev, drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.audio_property, AMDGPU_AUDIO_AUTO); - amdgpu_connector->audio = AMDGPU_AUDIO_AUTO; } drm_object_attach_property(&amdgpu_connector->base.base, adev->mode_info.dither_property,
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index 858e2a8..9d61d1b 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c
@@ -329,9 +329,11 @@ int amdgpu_gem_userptr_ioctl(struct drm_device *dev, void *data, if (r) goto release_object; - r = amdgpu_mn_register(bo, args->addr); - if (r) - goto release_object; + if (args->flags & AMDGPU_GEM_USERPTR_REGISTER) { + r = amdgpu_mn_register(bo, args->addr); + if (r) + goto release_object; + } if (args->flags & AMDGPU_GEM_USERPTR_VALIDATE) { r = amdgpu_ttm_tt_get_user_pages(bo, bo->tbo.ttm->pages);
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index fc50892..4cc0dd4 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
@@ -892,10 +892,6 @@ int amdgpu_bo_pin_restricted(struct amdgpu_bo *bo, u32 domain, if (WARN_ON_ONCE(min_offset > max_offset)) return -EINVAL; - /* Check domain to be pinned to against preferred domains */ - if (bo->preferred_domains & domain) - domain = bo->preferred_domains & domain; - /* A shared bo cannot be migrated to VRAM */ if (bo->prime_shared_count) { if (domain & AMDGPU_GEM_DOMAIN_GTT)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c index 685a2df..5906a89 100644 --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c
@@ -2472,8 +2472,7 @@ static void gfx_v9_0_constants_init(struct amdgpu_device *adev) gfx_v9_0_tiling_mode_table_init(adev); - if (adev->gfx.num_gfx_rings) - gfx_v9_0_setup_rb(adev); + gfx_v9_0_setup_rb(adev); gfx_v9_0_get_cu_info(adev, &adev->gfx.cu_info); adev->gfx.config.db_debug2 = RREG32_SOC15(GC, 0, mmDB_DEBUG2);
diff --git a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c index e60157f..641f125 100644 --- a/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c +++ b/drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c
@@ -182,7 +182,6 @@ static void mmhub_v1_0_init_cache_regs(struct amdgpu_device *adev) tmp = REG_SET_FIELD(tmp, VM_L2_CNTL2, INVALIDATE_L2_CACHE, 1); WREG32_SOC15(MMHUB, 0, mmVM_L2_CNTL2, tmp); - tmp = mmVM_L2_CNTL3_DEFAULT; if (adev->gmc.translate_further) { tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3, BANK_SELECT, 12); tmp = REG_SET_FIELD(tmp, VM_L2_CNTL3,
diff --git a/drivers/gpu/drm/amd/amdkfd/kfd_events.c b/drivers/gpu/drm/amd/amdkfd/kfd_events.c index 4fd7dce..adbb2fe 100644 --- a/drivers/gpu/drm/amd/amdkfd/kfd_events.c +++ b/drivers/gpu/drm/amd/amdkfd/kfd_events.c
@@ -529,13 +529,16 @@ static struct kfd_event_waiter *alloc_event_waiters(uint32_t num_events) struct kfd_event_waiter *event_waiters; uint32_t i; - event_waiters = kcalloc(num_events, sizeof(struct kfd_event_waiter), - GFP_KERNEL); + event_waiters = kmalloc_array(num_events, + sizeof(struct kfd_event_waiter), + GFP_KERNEL); if (!event_waiters) return NULL; - for (i = 0; i < num_events; i++) + for (i = 0; (event_waiters) && (i < num_events) ; i++) { init_wait(&event_waiters[i].wait); + event_waiters[i].activated = false; + } return event_waiters; }
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c index 1e7083b..de33864 100644 --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1206,14 +1206,12 @@ static int dm_resume(void *handle) list_for_each_entry(connector, &ddev->mode_config.connector_list, head) { aconnector = to_amdgpu_dm_connector(connector); - if (!aconnector->dc_link) - continue; - /* * this is the case when traversing through already created * MST connectors, should be skipped */ - if (aconnector->dc_link->type == dc_connection_mst_branch) + if (aconnector->dc_link && + aconnector->dc_link->type == dc_connection_mst_branch) continue; mutex_lock(&aconnector->hpd_lock); @@ -1438,12 +1436,13 @@ amdgpu_dm_update_connector_after_detect(struct amdgpu_dm_connector *aconnector) aconnector->edid = (struct edid *)sink->dc_edid.raw_edid; + drm_connector_update_edid_property(connector, + aconnector->edid); if (aconnector->dc_link->aux_mode) drm_dp_cec_set_edid(&aconnector->dm_dp_aux.aux, aconnector->edid); } - drm_connector_update_edid_property(connector, aconnector->edid); amdgpu_dm_update_freesync_caps(connector, aconnector->edid); } else { @@ -7411,8 +7410,8 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev, goto fail; } - if (dm_old_con_state->abm_level != dm_new_con_state->abm_level || - dm_old_con_state->scaling != dm_new_con_state->scaling) + if (dm_old_con_state->abm_level != + dm_new_con_state->abm_level) new_crtc_state->connectors_changed = true; }
diff --git a/drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c b/drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c index 2d46bc5..6ca288f 100644 --- a/drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c +++ b/drivers/gpu/drm/amd/display/dc/calcs/bw_fixed.c
@@ -26,12 +26,12 @@ #include "bw_fixed.h" +#define MIN_I64 \ + (int64_t)(-(1LL << 63)) + #define MAX_I64 \ (int64_t)((1ULL << 63) - 1) -#define MIN_I64 \ - (-MAX_I64 - 1) - #define FRACTIONAL_PART_MASK \ ((1ULL << BW_FIXED_BITS_PER_FRACTIONAL_PART) - 1)
diff --git a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c index 940aa62..c026b39 100644 --- a/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c +++ b/drivers/gpu/drm/amd/display/dc/core/dc_hw_sequencer.c
@@ -92,8 +92,8 @@ static const struct out_csc_color_matrix_type output_csc_matrix[] = { { 0xE00, 0xF349, 0xFEB7, 0x1000, 0x6CE, 0x16E3, 0x24F, 0x200, 0xFCCB, 0xF535, 0xE00, 0x1000} }, { COLOR_SPACE_YCBCR2020_TYPE, - { 0x1000, 0xF149, 0xFEB7, 0x1004, 0x0868, 0x15B2, - 0x01E6, 0x201, 0xFB88, 0xF478, 0x1000, 0x1004} }, + { 0x1000, 0xF149, 0xFEB7, 0x0000, 0x0868, 0x15B2, + 0x01E6, 0x0000, 0xFB88, 0xF478, 0x1000, 0x0000} }, { COLOR_SPACE_YCBCR709_BLACK_TYPE, { 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0x0000, 0x0000, 0x0200, 0x0000, 0x0000, 0x0000, 0x1000} },
diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c index 721be82..eca67d5 100644 --- a/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_clock_source.c
@@ -546,11 +546,9 @@ static void dce112_get_pix_clk_dividers_helper ( switch (pix_clk_params->color_depth) { case COLOR_DEPTH_101010: actual_pixel_clock_100hz = (actual_pixel_clock_100hz * 5) >> 2; - actual_pixel_clock_100hz -= actual_pixel_clock_100hz % 10; break; case COLOR_DEPTH_121212: actual_pixel_clock_100hz = (actual_pixel_clock_100hz * 6) >> 2; - actual_pixel_clock_100hz -= actual_pixel_clock_100hz % 10; break; case COLOR_DEPTH_161616: actual_pixel_clock_100hz = actual_pixel_clock_100hz * 2;
diff --git a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c index 3c096ad..7c52f7f 100644 --- a/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c +++ b/drivers/gpu/drm/amd/display/dc/dce120/dce120_resource.c
@@ -340,8 +340,7 @@ static const struct dce_audio_registers audio_regs[] = { audio_regs(2), audio_regs(3), audio_regs(4), - audio_regs(5), - audio_regs(6), + audio_regs(5) }; #define DCE120_AUD_COMMON_MASK_SH_LIST(mask_sh)\
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c index 068e79f..8b2f29f 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_mpc.c
@@ -118,12 +118,6 @@ struct mpcc *mpc1_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) while (tmp_mpcc != NULL) { if (tmp_mpcc->dpp_id == dpp_id) return tmp_mpcc; - - /* avoid circular linked list */ - ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot); - if (tmp_mpcc == tmp_mpcc->mpcc_bot) - break; - tmp_mpcc = tmp_mpcc->mpcc_bot; } return NULL;
diff --git a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c index 4b0200e..e74a07d 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.c
@@ -425,11 +425,6 @@ void optc1_enable_optc_clock(struct timing_generator *optc, bool enable) OTG_CLOCK_ON, 1, 1, 1000); } else { - - //last chance to clear underflow, otherwise, it will always there due to clock is off. - if (optc->funcs->is_optc_underflow_occurred(optc) == true) - optc->funcs->clear_optc_underflow(optc); - REG_UPDATE_2(OTG_CLOCK_CONTROL, OTG_CLOCK_GATE_DIS, 0, OTG_CLOCK_EN, 0);
diff --git a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c index 0a00bd8..5a188b2 100644 --- a/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c +++ b/drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c
@@ -488,12 +488,6 @@ struct mpcc *mpc2_get_mpcc_for_dpp(struct mpc_tree *tree, int dpp_id) while (tmp_mpcc != NULL) { if (tmp_mpcc->dpp_id == 0xf || tmp_mpcc->dpp_id == dpp_id) return tmp_mpcc; - - /* avoid circular linked list */ - ASSERT(tmp_mpcc != tmp_mpcc->mpcc_bot); - if (tmp_mpcc == tmp_mpcc->mpcc_bot) - break; - tmp_mpcc = tmp_mpcc->mpcc_bot; } return NULL;
diff --git a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c index 22d1056..e042d8c 100644 --- a/drivers/gpu/drm/amd/display/modules/color/color_gamma.c +++ b/drivers/gpu/drm/amd/display/modules/color/color_gamma.c
@@ -1486,7 +1486,6 @@ static void interpolate_user_regamma(uint32_t hw_points_num, struct fixed31_32 lut2; struct fixed31_32 delta_lut; struct fixed31_32 delta_index; - const struct fixed31_32 one = dc_fixpt_from_int(1); i = 0; /* fixed_pt library has problems handling too small values */ @@ -1515,9 +1514,6 @@ static void interpolate_user_regamma(uint32_t hw_points_num, } else hw_x = coordinates_x[i].x; - if (dc_fixpt_le(one, hw_x)) - hw_x = one; - norm_x = dc_fixpt_mul(norm_factor, hw_x); index = dc_fixpt_floor(norm_x); if (index < 0 || index > 255)
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c index d499add..947e4fa 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c
@@ -2894,8 +2894,7 @@ static int vega20_odn_edit_dpm_table(struct pp_hwmgr *hwmgr, data->od8_settings.od8_settings_array; OverDriveTable_t *od_table = &(data->smc_state_table.overdrive_table); - int32_t input_clk, input_vol, i; - uint32_t input_index; + int32_t input_index, input_clk, input_vol, i; int od8_id; int ret;
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511.h b/drivers/gpu/drm/bridge/adv7511/adv7511.h index 90a7212..52b2adf 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511.h +++ b/drivers/gpu/drm/bridge/adv7511/adv7511.h
@@ -384,7 +384,10 @@ void adv7511_cec_irq_process(struct adv7511 *adv7511, unsigned int irq1); #else static inline int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) { - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, + unsigned int offset = adv7511->type == ADV7533 ? + ADV7533_REG_CEC_OFFSET : 0; + + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, ADV7511_CEC_CTRL_POWER_DOWN); return 0; }
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c index ddd1305..a20a45c 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_cec.c
@@ -316,7 +316,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) goto err_cec_alloc; } - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, 0); + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, 0); /* cec soft reset */ regmap_write(adv7511->regmap_cec, ADV7511_REG_CEC_SOFT_RESET + offset, 0x01); @@ -343,7 +343,7 @@ int adv7511_cec_init(struct device *dev, struct adv7511 *adv7511) dev_info(dev, "Initializing CEC failed with error %d, disabling CEC\n", ret); err_cec_parse_dt: - regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL, + regmap_write(adv7511->regmap, ADV7511_REG_CEC_CTRL + offset, ADV7511_CEC_CTRL_POWER_DOWN); return ret == -EPROBE_DEFER ? ret : 0; }
diff --git a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c index eae584a..2363e60 100644 --- a/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c +++ b/drivers/gpu/drm/bridge/adv7511/adv7511_drv.c
@@ -988,10 +988,6 @@ static int adv7511_init_cec_regmap(struct adv7511 *adv) ADV7511_CEC_I2C_ADDR_DEFAULT); if (IS_ERR(adv->i2c_cec)) return PTR_ERR(adv->i2c_cec); - - regmap_write(adv->regmap, ADV7511_REG_CEC_I2C_ADDR, - adv->i2c_cec->addr << 1); - i2c_set_clientdata(adv->i2c_cec, adv); adv->regmap_cec = devm_regmap_init_i2c(adv->i2c_cec, @@ -1196,6 +1192,9 @@ static int adv7511_probe(struct i2c_client *i2c, const struct i2c_device_id *id) if (ret) goto err_i2c_unregister_packet; + regmap_write(adv7511->regmap, ADV7511_REG_CEC_I2C_ADDR, + adv7511->i2c_cec->addr << 1); + INIT_WORK(&adv7511->hpd_work, adv7511_hpd_work); if (i2c->irq) { @@ -1305,21 +1304,10 @@ static struct i2c_driver adv7511_driver = { static int __init adv7511_init(void) { - int ret; + if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) + mipi_dsi_driver_register(&adv7533_dsi_driver); - if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) { - ret = mipi_dsi_driver_register(&adv7533_dsi_driver); - if (ret) - return ret; - } - - ret = i2c_add_driver(&adv7511_driver); - if (ret) { - if (IS_ENABLED(CONFIG_DRM_MIPI_DSI)) - mipi_dsi_driver_unregister(&adv7533_dsi_driver); - } - - return ret; + return i2c_add_driver(&adv7511_driver); } module_init(adv7511_init);
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c index df606a5..c6a51d1 100644 --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_core.c
@@ -1823,6 +1823,12 @@ EXPORT_SYMBOL_GPL(analogix_dp_remove); int analogix_dp_suspend(struct analogix_dp_device *dp) { clk_disable_unprepare(dp->clock); + + if (dp->plat_data->panel) { + if (drm_panel_unprepare(dp->plat_data->panel)) + DRM_ERROR("failed to turnoff the panel\n"); + } + return 0; } EXPORT_SYMBOL_GPL(analogix_dp_suspend); @@ -1837,6 +1843,13 @@ int analogix_dp_resume(struct analogix_dp_device *dp) return ret; } + if (dp->plat_data->panel) { + if (drm_panel_prepare(dp->plat_data->panel)) { + DRM_ERROR("failed to setup the panel\n"); + return -EBUSY; + } + } + return 0; } EXPORT_SYMBOL_GPL(analogix_dp_resume);
diff --git a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c index 14d578f..5302dd9 100644 --- a/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c +++ b/drivers/gpu/drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c
@@ -279,9 +279,7 @@ static void ge_b850v3_lvds_remove(void) * This check is to avoid both the drivers * removing the bridge in their remove() function */ - if (!ge_b850v3_lvds_ptr || - !ge_b850v3_lvds_ptr->stdp2690_i2c || - !ge_b850v3_lvds_ptr->stdp4028_i2c) + if (!ge_b850v3_lvds_ptr) goto out; drm_bridge_remove(&ge_b850v3_lvds_ptr->bridge); @@ -426,11 +424,7 @@ static int __init stdpxxxx_ge_b850v3_init(void) if (ret) return ret; - ret = i2c_add_driver(&stdp2690_ge_b850v3_fw_driver); - if (ret) - i2c_del_driver(&stdp4028_ge_b850v3_fw_driver); - - return ret; + return i2c_add_driver(&stdp2690_ge_b850v3_fw_driver); } module_init(stdpxxxx_ge_b850v3_init);
diff --git a/drivers/gpu/drm/bridge/sil-sii8620.c b/drivers/gpu/drm/bridge/sil-sii8620.c index 970bc00..fb0b64c 100644 --- a/drivers/gpu/drm/bridge/sil-sii8620.c +++ b/drivers/gpu/drm/bridge/sil-sii8620.c
@@ -604,7 +604,7 @@ static void *sii8620_burst_get_tx_buf(struct sii8620 *ctx, int len) u8 *buf = &ctx->burst.tx_buf[ctx->burst.tx_count]; int size = len + 2; - if (ctx->burst.tx_count + size >= ARRAY_SIZE(ctx->burst.tx_buf)) { + if (ctx->burst.tx_count + size > ARRAY_SIZE(ctx->burst.tx_buf)) { dev_err(ctx->dev, "TX-BLK buffer exhausted\n"); ctx->error = -EINVAL; return NULL; @@ -621,7 +621,7 @@ static u8 *sii8620_burst_get_rx_buf(struct sii8620 *ctx, int len) u8 *buf = &ctx->burst.rx_buf[ctx->burst.rx_count]; int size = len + 1; - if (ctx->burst.rx_count + size >= ARRAY_SIZE(ctx->burst.rx_buf)) { + if (ctx->burst.tx_count + size > ARRAY_SIZE(ctx->burst.tx_buf)) { dev_err(ctx->dev, "RX-BLK buffer exhausted\n"); ctx->error = -EINVAL; return NULL;
diff --git a/drivers/gpu/drm/bridge/ti-sn65dsi86.c b/drivers/gpu/drm/bridge/ti-sn65dsi86.c index 20ea1c6..dbb4a37 100644 --- a/drivers/gpu/drm/bridge/ti-sn65dsi86.c +++ b/drivers/gpu/drm/bridge/ti-sn65dsi86.c
@@ -460,9 +460,9 @@ static void ti_sn_bridge_set_video_timings(struct ti_sn_bridge *pdata) &pdata->bridge.encoder->crtc->state->adjusted_mode; u8 hsync_polarity = 0, vsync_polarity = 0; - if (mode->flags & DRM_MODE_FLAG_NHSYNC) + if (mode->flags & DRM_MODE_FLAG_PHSYNC) hsync_polarity = CHA_HSYNC_POLARITY; - if (mode->flags & DRM_MODE_FLAG_NVSYNC) + if (mode->flags & DRM_MODE_FLAG_PVSYNC) vsync_polarity = CHA_VSYNC_POLARITY; ti_sn_bridge_write_u16(pdata, SN_CHA_ACTIVE_LINE_LENGTH_LOW_REG,
diff --git a/drivers/gpu/drm/drm_atomic.c b/drivers/gpu/drm/drm_atomic.c index 2fc0f22..14aeaf7 100644 --- a/drivers/gpu/drm/drm_atomic.c +++ b/drivers/gpu/drm/drm_atomic.c
@@ -1006,7 +1006,6 @@ static void drm_atomic_connector_print_state(struct drm_printer *p, drm_printf(p, "connector[%u]: %s\n", connector->base.id, connector->name); drm_printf(p, "\tcrtc=%s\n", state->crtc ? state->crtc->name : "(null)"); drm_printf(p, "\tself_refresh_aware=%d\n", state->self_refresh_aware); - drm_printf(p, "\tmax_requested_bpc=%d\n", state->max_requested_bpc); if (connector->connector_type == DRM_MODE_CONNECTOR_WRITEBACK) if (state->writeback_job && state->writeback_job->fb)
diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index e262b1f..c0380c3 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c
@@ -474,9 +474,6 @@ void drm_connector_cleanup(struct drm_connector *connector) mutex_destroy(&connector->mutex); memset(connector, 0, sizeof(*connector)); - - if (dev->registered) - drm_sysfs_hotplug_event(dev); } EXPORT_SYMBOL(drm_connector_cleanup);
diff --git a/drivers/gpu/drm/drm_fourcc.c b/drivers/gpu/drm/drm_fourcc.c index d88a312..c630064 100644 --- a/drivers/gpu/drm/drm_fourcc.c +++ b/drivers/gpu/drm/drm_fourcc.c
@@ -178,10 +178,6 @@ const struct drm_format_info *__drm_format_info(u32 format) { .format = DRM_FORMAT_BGRA5551, .depth = 15, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1, .has_alpha = true }, { .format = DRM_FORMAT_RGB565, .depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 }, { .format = DRM_FORMAT_BGR565, .depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 }, -#ifdef __BIG_ENDIAN - { .format = DRM_FORMAT_XRGB1555 | DRM_FORMAT_BIG_ENDIAN, .depth = 15, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 }, - { .format = DRM_FORMAT_RGB565 | DRM_FORMAT_BIG_ENDIAN, .depth = 16, .num_planes = 1, .cpp = { 2, 0, 0 }, .hsub = 1, .vsub = 1 }, -#endif { .format = DRM_FORMAT_RGB888, .depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, .hsub = 1, .vsub = 1 }, { .format = DRM_FORMAT_BGR888, .depth = 24, .num_planes = 1, .cpp = { 3, 0, 0 }, .hsub = 1, .vsub = 1 }, { .format = DRM_FORMAT_XRGB8888, .depth = 24, .num_planes = 1, .cpp = { 4, 0, 0 }, .hsub = 1, .vsub = 1 },
diff --git a/drivers/gpu/drm/drm_gem.c b/drivers/gpu/drm/drm_gem.c index d6a72f3..1fdc85a 100644 --- a/drivers/gpu/drm/drm_gem.c +++ b/drivers/gpu/drm/drm_gem.c
@@ -167,6 +167,21 @@ void drm_gem_private_object_init(struct drm_device *dev, } EXPORT_SYMBOL(drm_gem_private_object_init); +static void +drm_gem_remove_prime_handles(struct drm_gem_object *obj, struct drm_file *filp) +{ + /* + * Note: obj->dma_buf can't disappear as long as we still hold a + * handle reference in obj->handle_count. + */ + mutex_lock(&filp->prime.lock); + if (obj->dma_buf) { + drm_prime_remove_buf_handle_locked(&filp->prime, + obj->dma_buf); + } + mutex_unlock(&filp->prime.lock); +} + /** * drm_gem_object_handle_free - release resources bound to userspace handles * @obj: GEM object to clean up. @@ -240,7 +255,7 @@ drm_gem_object_release_handle(int id, void *ptr, void *data) else if (dev->driver->gem_close_object) dev->driver->gem_close_object(obj, file_priv); - drm_prime_remove_buf_handle(&file_priv->prime, id); + drm_gem_remove_prime_handles(obj, file_priv); drm_vma_node_revoke(&obj->vma_node, file_priv); drm_gem_object_handle_put_unlocked(obj); @@ -1277,7 +1292,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, ret = dma_resv_lock_slow_interruptible(obj->resv, acquire_ctx); if (ret) { - ww_acquire_fini(acquire_ctx); + ww_acquire_done(acquire_ctx); return ret; } } @@ -1302,7 +1317,7 @@ drm_gem_lock_reservations(struct drm_gem_object **objs, int count, goto retry; } - ww_acquire_fini(acquire_ctx); + ww_acquire_done(acquire_ctx); return ret; } }
diff --git a/drivers/gpu/drm/drm_gem_shmem_helper.c b/drivers/gpu/drm/drm_gem_shmem_helper.c index d266fbb..d88f423 100644 --- a/drivers/gpu/drm/drm_gem_shmem_helper.c +++ b/drivers/gpu/drm/drm_gem_shmem_helper.c
@@ -554,8 +554,10 @@ int drm_gem_shmem_mmap(struct file *filp, struct vm_area_struct *vma) shmem = to_drm_gem_shmem_obj(vma->vm_private_data); ret = drm_gem_shmem_get_pages(shmem); - if (ret) + if (ret) { + drm_gem_vm_close(vma); return ret; + } /* VM_PFNMAP was set by drm_gem_mmap() */ vma->vm_flags &= ~VM_PFNMAP;
diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h index 41a9a9b..51a2055 100644 --- a/drivers/gpu/drm/drm_internal.h +++ b/drivers/gpu/drm/drm_internal.h
@@ -59,8 +59,8 @@ int drm_prime_fd_to_handle_ioctl(struct drm_device *dev, void *data, void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv); void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); -void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, - uint32_t handle); +void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, + struct dma_buf *dma_buf); /* drm_drv.c */ struct drm_minor *drm_minor_acquire(unsigned int minor_id);
diff --git a/drivers/gpu/drm/drm_ioctl.c b/drivers/gpu/drm/drm_ioctl.c index 378891e..57a85eb 100644 --- a/drivers/gpu/drm/drm_ioctl.c +++ b/drivers/gpu/drm/drm_ioctl.c
@@ -473,13 +473,7 @@ EXPORT_SYMBOL(drm_invalid_op); */ static int drm_copy_field(char __user *buf, size_t *buf_len, const char *value) { - 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; - } + int len; /* don't overflow userbuf */ len = strlen(value);
diff --git a/drivers/gpu/drm/drm_mipi_dbi.c b/drivers/gpu/drm/drm_mipi_dbi.c index 2a7ef10..4042f5b 100644 --- a/drivers/gpu/drm/drm_mipi_dbi.c +++ b/drivers/gpu/drm/drm_mipi_dbi.c
@@ -1156,13 +1156,6 @@ int mipi_dbi_spi_transfer(struct spi_device *spi, u32 speed_hz, size_t chunk; int ret; - /* In __spi_validate, there's a validation that no partial transfers - * are accepted (xfer->len % w_size must be zero). - * Here we align max_chunk to multiple of 2 (16bits), - * to prevent transfers from being rejected. - */ - max_chunk = ALIGN_DOWN(max_chunk, 2); - spi_message_init_with_transfers(&m, &tr, 1); while (len) {
diff --git a/drivers/gpu/drm/drm_mipi_dsi.c b/drivers/gpu/drm/drm_mipi_dsi.c index 7d3f98a..edaec70 100644 --- a/drivers/gpu/drm/drm_mipi_dsi.c +++ b/drivers/gpu/drm/drm_mipi_dsi.c
@@ -300,7 +300,6 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) { struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev); - mipi_dsi_detach(dsi); mipi_dsi_device_unregister(dsi); return 0; @@ -1092,58 +1091,6 @@ int mipi_dsi_dcs_get_display_brightness(struct mipi_dsi_device *dsi, } EXPORT_SYMBOL(mipi_dsi_dcs_get_display_brightness); -/** - * mipi_dsi_dcs_set_display_brightness_large() - sets the 16-bit brightness value - * of the display - * @dsi: DSI peripheral device - * @brightness: brightness value - * - * Return: 0 on success or a negative error code on failure. - */ -int mipi_dsi_dcs_set_display_brightness_large(struct mipi_dsi_device *dsi, - u16 brightness) -{ - u8 payload[2] = { brightness >> 8, brightness & 0xff }; - ssize_t err; - - err = mipi_dsi_dcs_write(dsi, MIPI_DCS_SET_DISPLAY_BRIGHTNESS, - payload, sizeof(payload)); - if (err < 0) - return err; - - return 0; -} -EXPORT_SYMBOL(mipi_dsi_dcs_set_display_brightness_large); - -/** - * mipi_dsi_dcs_get_display_brightness_large() - gets the current 16-bit - * brightness value of the display - * @dsi: DSI peripheral device - * @brightness: brightness value - * - * Return: 0 on success or a negative error code on failure. - */ -int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi, - u16 *brightness) -{ - u8 brightness_be[2]; - ssize_t err; - - err = mipi_dsi_dcs_read(dsi, MIPI_DCS_GET_DISPLAY_BRIGHTNESS, - brightness_be, sizeof(brightness_be)); - if (err <= 0) { - if (err == 0) - err = -ENODATA; - - return err; - } - - *brightness = (brightness_be[0] << 8) | brightness_be[1]; - - return 0; -} -EXPORT_SYMBOL(mipi_dsi_dcs_get_display_brightness_large); - static int mipi_dsi_drv_probe(struct device *dev) { struct mipi_dsi_driver *drv = to_mipi_dsi_driver(dev->driver);
diff --git a/drivers/gpu/drm/drm_panel_orientation_quirks.c b/drivers/gpu/drm/drm_panel_orientation_quirks.c index 6106fa7..f5ab891 100644 --- a/drivers/gpu/drm/drm_panel_orientation_quirks.c +++ b/drivers/gpu/drm/drm_panel_orientation_quirks.c
@@ -128,18 +128,6 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "One S1003"), }, .driver_data = (void *)&lcd800x1280_rightside_up, - }, { /* Acer Switch V 10 (SW5-017) */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "SW5-017"), - }, - .driver_data = (void *)&lcd800x1280_rightside_up, - }, { /* Anbernic Win600 */ - .matches = { - DMI_EXACT_MATCH(DMI_BOARD_VENDOR, "Anbernic"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "Win600"), - }, - .driver_data = (void *)&lcd720x1280_rightside_up, }, { /* Asus T100HA */ .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), @@ -272,29 +260,10 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad D330-10IGM"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, - }, { /* Lenovo Ideapad D330-10IGL (HD) */ + }, { /* Lenovo Yoga Book X90F / X91F / X91L */ .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "Lenovo ideapad D330-10IGL"), - }, - .driver_data = (void *)&lcd800x1280_rightside_up, - }, { /* Lenovo IdeaPad Duet 3 10IGL5 */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "IdeaPad Duet 3 10IGL5"), - }, - .driver_data = (void *)&lcd1200x1920_rightside_up, - }, { /* Lenovo Yoga Book X90F / X90L */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"), - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"), - }, - .driver_data = (void *)&lcd1200x1920_rightside_up, - }, { /* Lenovo Yoga Book X91F / X91L */ - .matches = { - /* Non exact match to match F + L versions */ - DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), + /* Non exact match to match all versions */ + DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9"), }, .driver_data = (void *)&lcd1200x1920_rightside_up, }, { /* OneGX1 Pro */
diff --git a/drivers/gpu/drm/drm_prime.c b/drivers/gpu/drm/drm_prime.c index 8fbbd8c..f9f60de 100644 --- a/drivers/gpu/drm/drm_prime.c +++ b/drivers/gpu/drm/drm_prime.c
@@ -187,33 +187,29 @@ static int drm_prime_lookup_buf_handle(struct drm_prime_file_private *prime_fpri return -ENOENT; } -void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, - uint32_t handle) +void drm_prime_remove_buf_handle_locked(struct drm_prime_file_private *prime_fpriv, + struct dma_buf *dma_buf) { struct rb_node *rb; - mutex_lock(&prime_fpriv->lock); - - rb = prime_fpriv->handles.rb_node; + rb = prime_fpriv->dmabufs.rb_node; while (rb) { struct drm_prime_member *member; - member = rb_entry(rb, struct drm_prime_member, handle_rb); - if (member->handle == handle) { + member = rb_entry(rb, struct drm_prime_member, dmabuf_rb); + if (member->dma_buf == dma_buf) { rb_erase(&member->handle_rb, &prime_fpriv->handles); rb_erase(&member->dmabuf_rb, &prime_fpriv->dmabufs); - dma_buf_put(member->dma_buf); + dma_buf_put(dma_buf); kfree(member); - break; - } else if (member->handle < handle) { + return; + } else if (member->dma_buf < dma_buf) { rb = rb->rb_right; } else { rb = rb->rb_left; } } - - mutex_unlock(&prime_fpriv->lock); } void drm_prime_init_file_private(struct drm_prime_file_private *prime_fpriv)
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem.c b/drivers/gpu/drm/etnaviv/etnaviv_gem.c index 5107a0f..5199486 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem.c
@@ -27,7 +27,7 @@ static void etnaviv_gem_scatter_map(struct etnaviv_gem_object *etnaviv_obj) * because display controller, GPU, etc. are not coherent. */ if (etnaviv_obj->flags & ETNA_BO_CACHE_MASK) - dma_map_sgtable(dev->dev, sgt, DMA_BIDIRECTIONAL, 0); + dma_map_sg(dev->dev, sgt->sgl, sgt->nents, DMA_BIDIRECTIONAL); } static void etnaviv_gem_scatterlist_unmap(struct etnaviv_gem_object *etnaviv_obj) @@ -51,7 +51,7 @@ static void etnaviv_gem_scatterlist_unmap(struct etnaviv_gem_object *etnaviv_obj * discard those writes. */ if (etnaviv_obj->flags & ETNA_BO_CACHE_MASK) - dma_unmap_sgtable(dev->dev, sgt, DMA_BIDIRECTIONAL, 0); + dma_unmap_sg(dev->dev, sgt->sgl, sgt->nents, DMA_BIDIRECTIONAL); } /* called with etnaviv_obj->lock held */ @@ -403,8 +403,9 @@ int etnaviv_gem_cpu_prep(struct drm_gem_object *obj, u32 op, } if (etnaviv_obj->flags & ETNA_BO_CACHED) { - dma_sync_sgtable_for_cpu(dev->dev, etnaviv_obj->sgt, - etnaviv_op_to_dma_dir(op)); + dma_sync_sg_for_cpu(dev->dev, etnaviv_obj->sgt->sgl, + etnaviv_obj->sgt->nents, + etnaviv_op_to_dma_dir(op)); etnaviv_obj->last_cpu_prep_op = op; } @@ -419,7 +420,8 @@ int etnaviv_gem_cpu_fini(struct drm_gem_object *obj) if (etnaviv_obj->flags & ETNA_BO_CACHED) { /* fini without a prep is almost certainly a userspace error */ WARN_ON(etnaviv_obj->last_cpu_prep_op == 0); - dma_sync_sgtable_for_device(dev->dev, etnaviv_obj->sgt, + dma_sync_sg_for_device(dev->dev, etnaviv_obj->sgt->sgl, + etnaviv_obj->sgt->nents, etnaviv_op_to_dma_dir(etnaviv_obj->last_cpu_prep_op)); etnaviv_obj->last_cpu_prep_op = 0; }
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c index fe7817e..f24dd21 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c
@@ -93,15 +93,7 @@ static void *etnaviv_gem_prime_vmap_impl(struct etnaviv_gem_object *etnaviv_obj) static int etnaviv_gem_prime_mmap_obj(struct etnaviv_gem_object *etnaviv_obj, struct vm_area_struct *vma) { - int ret; - - ret = dma_buf_mmap(etnaviv_obj->base.dma_buf, vma, 0); - if (!ret) { - /* Drop the reference acquired by drm_gem_mmap_obj(). */ - drm_gem_object_put(&etnaviv_obj->base); - } - - return ret; + return dma_buf_mmap(etnaviv_obj->base.dma_buf, vma, 0); } static const struct etnaviv_gem_ops etnaviv_gem_prime_ops = {
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 8c6f975..db35736 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c
@@ -392,12 +392,6 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) if (gpu->identity.model == chipModel_GC700) gpu->identity.features &= ~chipFeatures_FAST_CLEAR; - /* These models/revisions don't have the 2D pipe bit */ - if ((gpu->identity.model == chipModel_GC500 && - gpu->identity.revision <= 2) || - gpu->identity.model == chipModel_GC300) - gpu->identity.features |= chipFeatures_PIPE_2D; - if ((gpu->identity.model == chipModel_GC500 && gpu->identity.revision < 2) || (gpu->identity.model == chipModel_GC300 && @@ -431,9 +425,8 @@ static void etnaviv_hw_identify(struct etnaviv_gpu *gpu) gpu_read(gpu, VIVS_HI_CHIP_MINOR_FEATURE_5); } - /* GC600/300 idle register reports zero bits where modules aren't present */ - if (gpu->identity.model == chipModel_GC600 || - gpu->identity.model == chipModel_GC300) + /* GC600 idle register reports zero bits where modules aren't present */ + if (gpu->identity.model == chipModel_GC600) gpu->idle_mask = VIVS_HI_IDLE_STATE_TX | VIVS_HI_IDLE_STATE_RA | VIVS_HI_IDLE_STATE_SE |
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c index 44fbc0a..790cbb2 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_mmu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_mmu.c
@@ -73,17 +73,17 @@ static int etnaviv_iommu_map(struct etnaviv_iommu_context *context, u32 iova, struct sg_table *sgt, unsigned len, int prot) { struct scatterlist *sg; unsigned int da = iova; - unsigned int i; + unsigned int i, j; int ret; if (!context || !sgt) return -EINVAL; - for_each_sgtable_dma_sg(sgt, sg, i) { - phys_addr_t pa = sg_dma_address(sg) - sg->offset; + for_each_sg(sgt->sgl, sg, sgt->nents, i) { + u32 pa = sg_dma_address(sg) - sg->offset; size_t bytes = sg_dma_len(sg) + sg->offset; - VERB("map[%d]: %08x %pap(%zx)", i, iova, &pa, bytes); + VERB("map[%d]: %08x %08x(%zx)", i, iova, pa, bytes); ret = etnaviv_context_map(context, da, pa, bytes, prot); if (ret) @@ -95,7 +95,14 @@ static int etnaviv_iommu_map(struct etnaviv_iommu_context *context, u32 iova, return 0; fail: - etnaviv_context_unmap(context, iova, da - iova); + da = iova; + + for_each_sg(sgt->sgl, sg, i, j) { + size_t bytes = sg_dma_len(sg) + sg->offset; + + etnaviv_context_unmap(context, da, bytes); + da += bytes; + } return ret; } @@ -106,7 +113,7 @@ static void etnaviv_iommu_unmap(struct etnaviv_iommu_context *context, u32 iova, unsigned int da = iova; int i; - for_each_sgtable_dma_sg(sgt, sg, i) { + for_each_sg(sgt->sgl, sg, sgt->nents, i) { size_t bytes = sg_dma_len(sg) + sg->offset; etnaviv_context_unmap(context, da, bytes);
diff --git a/drivers/gpu/drm/exynos/exynos7_drm_decon.c b/drivers/gpu/drm/exynos/exynos7_drm_decon.c index afca5fc..6fd4041 100644 --- a/drivers/gpu/drm/exynos/exynos7_drm_decon.c +++ b/drivers/gpu/drm/exynos/exynos7_drm_decon.c
@@ -800,40 +800,31 @@ static int exynos7_decon_resume(struct device *dev) if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the pclk [%d]\n", ret); - goto err_pclk_enable; + return ret; } ret = clk_prepare_enable(ctx->aclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the aclk [%d]\n", ret); - goto err_aclk_enable; + return ret; } ret = clk_prepare_enable(ctx->eclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the eclk [%d]\n", ret); - goto err_eclk_enable; + return ret; } ret = clk_prepare_enable(ctx->vclk); if (ret < 0) { DRM_DEV_ERROR(dev, "Failed to prepare_enable the vclk [%d]\n", ret); - goto err_vclk_enable; + return ret; } return 0; - -err_vclk_enable: - clk_disable_unprepare(ctx->eclk); -err_eclk_enable: - clk_disable_unprepare(ctx->aclk); -err_aclk_enable: - clk_disable_unprepare(ctx->pclk); -err_pclk_enable: - return ret; } #endif
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c index 8de9bc8..a92fd6c 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c
@@ -70,9 +70,8 @@ static int fsl_dcu_drm_connector_get_modes(struct drm_connector *connector) return drm_panel_get_modes(fsl_connector->panel); } -static enum drm_mode_status -fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int fsl_dcu_drm_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { if (mode->hdisplay & 0xf) return MODE_ERROR;
diff --git a/drivers/gpu/drm/i915/display/intel_quirks.c b/drivers/gpu/drm/i915/display/intel_quirks.c index 59f02f3..399b154 100644 --- a/drivers/gpu/drm/i915/display/intel_quirks.c +++ b/drivers/gpu/drm/i915/display/intel_quirks.c
@@ -146,11 +146,6 @@ static struct intel_quirk intel_quirks[] = { /* ASRock ITX*/ { 0x3185, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, { 0x3184, 0x1849, 0x2212, quirk_increase_ddi_disabled_time }, - /* ECS Liva Q2 */ - { 0x3185, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time }, - { 0x3184, 0x1019, 0xa94d, quirk_increase_ddi_disabled_time }, - /* HP Notebook - 14-r206nv */ - { 0x0f31, 0x103c, 0x220f, quirk_invert_brightness }, }; void intel_init_quirks(struct drm_i915_private *i915)
diff --git a/drivers/gpu/drm/i915/display/intel_sdvo.c b/drivers/gpu/drm/i915/display/intel_sdvo.c index 4d09b24..adeb1c8 100644 --- a/drivers/gpu/drm/i915/display/intel_sdvo.c +++ b/drivers/gpu/drm/i915/display/intel_sdvo.c
@@ -2693,10 +2693,13 @@ intel_sdvo_dvi_init(struct intel_sdvo *intel_sdvo, int device) if (!intel_sdvo_connector) return false; - if (device == 0) + if (device == 0) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS0; intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS0; - else if (device == 1) + } else if (device == 1) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_TMDS1; intel_sdvo_connector->output_flag = SDVO_OUTPUT_TMDS1; + } intel_connector = &intel_sdvo_connector->base; connector = &intel_connector->base; @@ -2750,6 +2753,7 @@ intel_sdvo_tv_init(struct intel_sdvo *intel_sdvo, int type) encoder->encoder_type = DRM_MODE_ENCODER_TVDAC; connector->connector_type = DRM_MODE_CONNECTOR_SVIDEO; + intel_sdvo->controlled_output |= type; intel_sdvo_connector->output_flag = type; if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { @@ -2790,10 +2794,13 @@ intel_sdvo_analog_init(struct intel_sdvo *intel_sdvo, int device) encoder->encoder_type = DRM_MODE_ENCODER_DAC; connector->connector_type = DRM_MODE_CONNECTOR_VGA; - if (device == 0) + if (device == 0) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB0; intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB0; - else if (device == 1) + } else if (device == 1) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_RGB1; intel_sdvo_connector->output_flag = SDVO_OUTPUT_RGB1; + } if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { kfree(intel_sdvo_connector); @@ -2823,10 +2830,13 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) encoder->encoder_type = DRM_MODE_ENCODER_LVDS; connector->connector_type = DRM_MODE_CONNECTOR_LVDS; - if (device == 0) + if (device == 0) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS0; intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS0; - else if (device == 1) + } else if (device == 1) { + intel_sdvo->controlled_output |= SDVO_OUTPUT_LVDS1; intel_sdvo_connector->output_flag = SDVO_OUTPUT_LVDS1; + } if (intel_sdvo_connector_init(intel_sdvo_connector, intel_sdvo) < 0) { kfree(intel_sdvo_connector); @@ -2859,39 +2869,16 @@ intel_sdvo_lvds_init(struct intel_sdvo *intel_sdvo, int device) return false; } -static u16 intel_sdvo_filter_output_flags(u16 flags) -{ - flags &= SDVO_OUTPUT_MASK; - - /* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/ - if (!(flags & SDVO_OUTPUT_TMDS0)) - flags &= ~SDVO_OUTPUT_TMDS1; - - if (!(flags & SDVO_OUTPUT_RGB0)) - flags &= ~SDVO_OUTPUT_RGB1; - - if (!(flags & SDVO_OUTPUT_LVDS0)) - flags &= ~SDVO_OUTPUT_LVDS1; - - return flags; -} - static bool intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) { - struct drm_i915_private *i915 = to_i915(intel_sdvo->base.base.dev); - - flags = intel_sdvo_filter_output_flags(flags); - - intel_sdvo->controlled_output = flags; - - intel_sdvo_select_ddc_bus(i915, intel_sdvo); + /* SDVO requires XXX1 function may not exist unless it has XXX0 function.*/ if (flags & SDVO_OUTPUT_TMDS0) if (!intel_sdvo_dvi_init(intel_sdvo, 0)) return false; - if (flags & SDVO_OUTPUT_TMDS1) + if ((flags & SDVO_TMDS_MASK) == SDVO_TMDS_MASK) if (!intel_sdvo_dvi_init(intel_sdvo, 1)) return false; @@ -2912,7 +2899,7 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) if (!intel_sdvo_analog_init(intel_sdvo, 0)) return false; - if (flags & SDVO_OUTPUT_RGB1) + if ((flags & SDVO_RGB_MASK) == SDVO_RGB_MASK) if (!intel_sdvo_analog_init(intel_sdvo, 1)) return false; @@ -2920,13 +2907,14 @@ intel_sdvo_output_setup(struct intel_sdvo *intel_sdvo, u16 flags) if (!intel_sdvo_lvds_init(intel_sdvo, 0)) return false; - if (flags & SDVO_OUTPUT_LVDS1) + if ((flags & SDVO_LVDS_MASK) == SDVO_LVDS_MASK) if (!intel_sdvo_lvds_init(intel_sdvo, 1)) return false; - if (flags == 0) { + if ((flags & SDVO_OUTPUT_MASK) == 0) { unsigned char bytes[2]; + intel_sdvo->controlled_output = 0; memcpy(bytes, &intel_sdvo->caps.output_flags, 2); DRM_DEBUG_KMS("%s: Unknown SDVO output type (0x%02x%02x)\n", SDVO_NAME(intel_sdvo), @@ -3333,6 +3321,8 @@ bool intel_sdvo_init(struct drm_i915_private *dev_priv, */ intel_sdvo->base.cloneable = 0; + intel_sdvo_select_ddc_bus(dev_priv, intel_sdvo); + /* Set the input timing to the screen. Assume always input 0. */ if (!intel_sdvo_set_target_input(intel_sdvo)) goto err_output;
diff --git a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index 8826358..96ce95c 100644 --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c
@@ -36,13 +36,13 @@ static struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachme goto err_unpin_pages; } - ret = sg_alloc_table(st, obj->mm.pages->orig_nents, GFP_KERNEL); + ret = sg_alloc_table(st, obj->mm.pages->nents, GFP_KERNEL); if (ret) goto err_free; src = obj->mm.pages->sgl; dst = st->sgl; - for (i = 0; i < obj->mm.pages->orig_nents; i++) { + for (i = 0; i < obj->mm.pages->nents; i++) { sg_set_page(dst, sg_page(src), src->length, 0); dst = sg_next(dst); src = sg_next(src);
diff --git a/drivers/gpu/drm/i915/gt/intel_gt.c b/drivers/gpu/drm/i915/gt/intel_gt.c index b1ba08e..f6d7f5d 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt.c +++ b/drivers/gpu/drm/i915/gt/intel_gt.c
@@ -348,10 +348,6 @@ void intel_gt_invalidate_tlbs(struct intel_gt *gt) if (!i915_mmio_reg_offset(rb.reg)) continue; - if (INTEL_GEN(i915) == 12 && (engine->class == VIDEO_DECODE_CLASS || - engine->class == VIDEO_ENHANCEMENT_CLASS)) - rb.bit = _MASKED_BIT_ENABLE(rb.bit); - intel_uncore_write_fw(uncore, rb.reg, rb.bit); }
diff --git a/drivers/gpu/drm/i915/gt/intel_reset.c b/drivers/gpu/drm/i915/gt/intel_reset.c index 48aed34..8cea423 100644 --- a/drivers/gpu/drm/i915/gt/intel_reset.c +++ b/drivers/gpu/drm/i915/gt/intel_reset.c
@@ -257,7 +257,6 @@ static int ironlake_do_reset(struct intel_gt *gt, static int gen6_hw_domain_reset(struct intel_gt *gt, u32 hw_domain_mask) { struct intel_uncore *uncore = gt->uncore; - int loops = 2; int err; /* @@ -265,38 +264,17 @@ static int gen6_hw_domain_reset(struct intel_gt *gt, u32 hw_domain_mask) * for fifo space for the write or forcewake the chip for * the read */ - do { - intel_uncore_write_fw(uncore, GEN6_GDRST, hw_domain_mask); + intel_uncore_write_fw(uncore, GEN6_GDRST, hw_domain_mask); - /* - * Wait for the device to ack the reset requests. - * - * On some platforms, e.g. Jasperlake, we see that the - * engine register state is not cleared until shortly after - * GDRST reports completion, causing a failure as we try - * to immediately resume while the internal state is still - * in flux. If we immediately repeat the reset, the second - * reset appears to serialise with the first, and since - * it is a no-op, the registers should retain their reset - * value. However, there is still a concern that upon - * leaving the second reset, the internal engine state - * is still in flux and not ready for resuming. - */ - err = __intel_wait_for_register_fw(uncore, GEN6_GDRST, - hw_domain_mask, 0, - 2000, 0, - NULL); - } while (err == 0 && --loops); + /* Wait for the device to ack the reset requests */ + err = __intel_wait_for_register_fw(uncore, + GEN6_GDRST, hw_domain_mask, 0, + 500, 0, + NULL); if (err) DRM_DEBUG_DRIVER("Wait for 0x%08x engines reset failed\n", hw_domain_mask); - /* - * As we have observed that the engine state is still volatile - * after GDRST is acked, impose a small delay to let everything settle. - */ - udelay(50); - return err; }
diff --git a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c index 125f7bb..eee9fcb 100644 --- a/drivers/gpu/drm/i915/gt/intel_ringbuffer.c +++ b/drivers/gpu/drm/i915/gt/intel_ringbuffer.c
@@ -1208,7 +1208,7 @@ int intel_ring_pin(struct intel_ring *ring) if (unlikely(ret)) goto err_unpin; - if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) + if (i915_vma_is_map_and_fenceable(vma)) addr = (void __force *)i915_vma_pin_iomap(vma); else addr = i915_gem_object_pin_map(vma->obj, @@ -1252,7 +1252,7 @@ void intel_ring_unpin(struct intel_ring *ring) intel_ring_reset(ring, ring->emit); i915_vma_unset_ggtt_write(vma); - if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915)) + if (i915_vma_is_map_and_fenceable(vma)) i915_vma_unpin_iomap(vma); else i915_gem_object_unpin_map(vma->obj); @@ -1268,11 +1268,10 @@ static struct i915_vma *create_ring_vma(struct i915_ggtt *ggtt, int size) { struct i915_address_space *vm = &ggtt->vm; struct drm_i915_private *i915 = vm->i915; - struct drm_i915_gem_object *obj = NULL; + struct drm_i915_gem_object *obj; struct i915_vma *vma; - if (!HAS_LLC(i915)) - obj = i915_gem_object_create_stolen(i915, size); + obj = i915_gem_object_create_stolen(i915, size); if (!obj) obj = i915_gem_object_create_internal(i915, size); if (IS_ERR(obj))
diff --git a/drivers/gpu/drm/i915/gvt/gtt.c b/drivers/gpu/drm/i915/gvt/gtt.c index a791341..7dc7bb8 100644 --- a/drivers/gpu/drm/i915/gvt/gtt.c +++ b/drivers/gpu/drm/i915/gvt/gtt.c
@@ -1186,8 +1186,10 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu, for_each_shadow_entry(sub_spt, &sub_se, sub_index) { ret = intel_gvt_hypervisor_dma_map_guest_page(vgpu, start_gfn + sub_index, PAGE_SIZE, &dma_addr); - if (ret) - goto err; + if (ret) { + ppgtt_invalidate_spt(spt); + return ret; + } sub_se.val64 = se->val64; /* Copy the PAT field from PDE. */ @@ -1206,17 +1208,6 @@ static int split_2MB_gtt_entry(struct intel_vgpu *vgpu, ops->set_pfn(se, sub_spt->shadow_page.mfn); ppgtt_set_shadow_entry(spt, se, index); return 0; -err: - /* Cancel the existing addess mappings of DMA addr. */ - for_each_present_shadow_entry(sub_spt, &sub_se, sub_index) { - gvt_vdbg_mm("invalidate 4K entry\n"); - ppgtt_invalidate_pte(sub_spt, &sub_se); - } - /* Release the new allocated spt. */ - trace_spt_change(sub_spt->vgpu->id, "release", sub_spt, - sub_spt->guest_page.gfn, sub_spt->shadow_page.type); - ppgtt_free_spt(sub_spt); - return ret; } static int split_64KB_gtt_entry(struct intel_vgpu *vgpu,
diff --git a/drivers/gpu/drm/i915/gvt/handlers.c b/drivers/gpu/drm/i915/gvt/handlers.c index 45ffccd..245c20d 100644 --- a/drivers/gpu/drm/i915/gvt/handlers.c +++ b/drivers/gpu/drm/i915/gvt/handlers.c
@@ -654,7 +654,7 @@ static int update_fdi_rx_iir_status(struct intel_vgpu *vgpu, else if (FDI_RX_IMR_TO_PIPE(offset) != INVALID_INDEX) index = FDI_RX_IMR_TO_PIPE(offset); else { - gvt_vgpu_err("Unsupported registers %x\n", offset); + gvt_vgpu_err("Unsupport registers %x\n", offset); return -EINVAL; }
diff --git a/drivers/gpu/drm/i915/gvt/scheduler.c b/drivers/gpu/drm/i915/gvt/scheduler.c index c1dc225..058dcd5 100644 --- a/drivers/gpu/drm/i915/gvt/scheduler.c +++ b/drivers/gpu/drm/i915/gvt/scheduler.c
@@ -632,7 +632,6 @@ static int prepare_workload(struct intel_vgpu_workload *workload) if (workload->shadow_mm->type != INTEL_GVT_MM_PPGTT || !workload->shadow_mm->ppgtt_mm.shadowed) { - intel_vgpu_unpin_mm(workload->shadow_mm); gvt_vgpu_err("workload shadow ppgtt isn't ready\n"); return -EINVAL; }
diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c index b3f0c20..1974e4c 100644 --- a/drivers/gpu/drm/i915/i915_pci.c +++ b/drivers/gpu/drm/i915/i915_pci.c
@@ -418,8 +418,7 @@ static const struct intel_device_info intel_sandybridge_m_gt2_info = { .has_coherent_ggtt = true, \ .has_llc = 1, \ .has_rc6 = 1, \ - /* snb does support rc6p, but enabling it causes various issues */ \ - .has_rc6p = 0, \ + .has_rc6p = 1, \ .has_rps = true, \ .ppgtt_type = INTEL_PPGTT_FULL, \ .ppgtt_size = 31, \
diff --git a/drivers/gpu/drm/imx/imx-tve.c b/drivers/gpu/drm/imx/imx-tve.c index cc300ed..f91c3eb 100644 --- a/drivers/gpu/drm/imx/imx-tve.c +++ b/drivers/gpu/drm/imx/imx-tve.c
@@ -237,9 +237,8 @@ static int imx_tve_connector_get_modes(struct drm_connector *connector) return ret; } -static enum drm_mode_status -imx_tve_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int imx_tve_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { struct imx_tve *tve = con_to_tve(connector); unsigned long rate;
diff --git a/drivers/gpu/drm/mcde/mcde_dsi.c b/drivers/gpu/drm/mcde/mcde_dsi.c index a580b9c..8c8c92f 100644 --- a/drivers/gpu/drm/mcde/mcde_dsi.c +++ b/drivers/gpu/drm/mcde/mcde_dsi.c
@@ -942,7 +942,6 @@ static int mcde_dsi_bind(struct device *dev, struct device *master, bridge = of_drm_find_bridge(child); if (!bridge) { dev_err(dev, "failed to find bridge\n"); - of_node_put(child); return -EINVAL; } }
diff --git a/drivers/gpu/drm/mediatek/mtk_dpi.c b/drivers/gpu/drm/mediatek/mtk_dpi.c index 7c68a39..48de07e 100644 --- a/drivers/gpu/drm/mediatek/mtk_dpi.c +++ b/drivers/gpu/drm/mediatek/mtk_dpi.c
@@ -50,7 +50,13 @@ enum mtk_dpi_out_channel_swap { }; enum mtk_dpi_out_color_format { - MTK_DPI_COLOR_FORMAT_RGB + MTK_DPI_COLOR_FORMAT_RGB, + MTK_DPI_COLOR_FORMAT_RGB_FULL, + MTK_DPI_COLOR_FORMAT_YCBCR_444, + MTK_DPI_COLOR_FORMAT_YCBCR_422, + MTK_DPI_COLOR_FORMAT_XV_YCC, + MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL, + MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL }; struct mtk_dpi { @@ -349,11 +355,24 @@ static void mtk_dpi_config_disable_edge(struct mtk_dpi *dpi) static void mtk_dpi_config_color_format(struct mtk_dpi *dpi, enum mtk_dpi_out_color_format format) { - /* only support RGB888 */ - mtk_dpi_config_yuv422_enable(dpi, false); - mtk_dpi_config_csc_enable(dpi, false); - mtk_dpi_config_swap_input(dpi, false); - mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); + if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_444) || + (format == MTK_DPI_COLOR_FORMAT_YCBCR_444_FULL)) { + mtk_dpi_config_yuv422_enable(dpi, false); + mtk_dpi_config_csc_enable(dpi, true); + mtk_dpi_config_swap_input(dpi, false); + mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_BGR); + } else if ((format == MTK_DPI_COLOR_FORMAT_YCBCR_422) || + (format == MTK_DPI_COLOR_FORMAT_YCBCR_422_FULL)) { + mtk_dpi_config_yuv422_enable(dpi, true); + mtk_dpi_config_csc_enable(dpi, true); + mtk_dpi_config_swap_input(dpi, true); + mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); + } else { + mtk_dpi_config_yuv422_enable(dpi, false); + mtk_dpi_config_csc_enable(dpi, false); + mtk_dpi_config_swap_input(dpi, false); + mtk_dpi_config_channel_swap(dpi, MTK_DPI_OUT_CHANNEL_SWAP_RGB); + } } static void mtk_dpi_power_off(struct mtk_dpi *dpi) @@ -364,6 +383,9 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi) if (--dpi->refcount != 0) return; + if (dpi->pinctrl && dpi->pins_gpio) + pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio); + mtk_dpi_disable(dpi); clk_disable_unprepare(dpi->pixel_clk); clk_disable_unprepare(dpi->engine_clk); @@ -388,6 +410,10 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi) goto err_pixel; } + if (dpi->pinctrl && dpi->pins_dpi) + pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi); + + mtk_dpi_enable(dpi); return 0; err_pixel: @@ -523,21 +549,14 @@ static void mtk_dpi_encoder_disable(struct drm_encoder *encoder) struct mtk_dpi *dpi = mtk_dpi_from_encoder(encoder); mtk_dpi_power_off(dpi); - - if (dpi->pinctrl && dpi->pins_gpio) - pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio); } static void mtk_dpi_encoder_enable(struct drm_encoder *encoder) { struct mtk_dpi *dpi = mtk_dpi_from_encoder(encoder); - if (dpi->pinctrl && dpi->pins_dpi) - pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi); - mtk_dpi_power_on(dpi); mtk_dpi_set_display_mode(dpi, &dpi->mode); - mtk_dpi_enable(dpi); } static int mtk_dpi_atomic_check(struct drm_encoder *encoder,
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 5569454..f98bb2e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c
@@ -417,7 +417,6 @@ static int mtk_drm_bind(struct device *dev) err_deinit: mtk_drm_kms_deinit(drm); err_free: - private->drm = NULL; drm_dev_put(drm); return ret; }
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_gem.c b/drivers/gpu/drm/mediatek/mtk_drm_gem.c index 2fa4322..ca672f1 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_gem.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_gem.c
@@ -142,6 +142,8 @@ static int mtk_drm_gem_object_mmap(struct drm_gem_object *obj, ret = dma_mmap_attrs(priv->dma_dev, vma, mtk_gem->cookie, mtk_gem->dma_addr, obj->size, mtk_gem->dma_attrs); + if (ret) + drm_gem_vm_close(vma); return ret; } @@ -269,7 +271,7 @@ void *mtk_drm_gem_prime_vmap(struct drm_gem_object *obj) pgprot_writecombine(PAGE_KERNEL)); out: - kfree(sgt); + kfree((void *)sgt); return mtk_gem->kvaddr; } @@ -282,6 +284,6 @@ void mtk_drm_gem_prime_vunmap(struct drm_gem_object *obj, void *vaddr) return; vunmap(vaddr); - mtk_gem->kvaddr = NULL; - kfree(mtk_gem->pages); + mtk_gem->kvaddr = 0; + kfree((void *)mtk_gem->pages); }
diff --git a/drivers/gpu/drm/mediatek/mtk_dsi.c b/drivers/gpu/drm/mediatek/mtk_dsi.c index e82705a..224afb6 100644 --- a/drivers/gpu/drm/mediatek/mtk_dsi.c +++ b/drivers/gpu/drm/mediatek/mtk_dsi.c
@@ -645,8 +645,6 @@ static void mtk_dsi_poweroff(struct mtk_dsi *dsi) mtk_dsi_reset_engine(dsi); mtk_dsi_lane0_ulp_mode_enter(dsi); mtk_dsi_clk_ulp_mode_enter(dsi); - /* set the lane number as 0 to pull down mipi */ - writel(0, dsi->regs + DSI_TXRX_CTRL); mtk_dsi_disable(dsi);
diff --git a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c index 593b8d8..e3579e5 100644 --- a/drivers/gpu/drm/msm/adreno/a5xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a5xx_gpu.c
@@ -135,8 +135,8 @@ static void a5xx_submit(struct msm_gpu *gpu, struct msm_gem_submit *submit, OUT_RING(ring, 1); /* Enable local preemption for finegrain preemption */ - OUT_PKT7(ring, CP_PREEMPT_ENABLE_LOCAL, 1); - OUT_RING(ring, 0x1); + OUT_PKT7(ring, CP_PREEMPT_ENABLE_GLOBAL, 1); + OUT_RING(ring, 0x02); /* Allow CP_CONTEXT_SWITCH_YIELD packets in the IB2 */ OUT_PKT7(ring, CP_YIELD_ENABLE, 1);
diff --git a/drivers/gpu/drm/msm/adreno/adreno_gpu.h b/drivers/gpu/drm/msm/adreno/adreno_gpu.h index e1a8989..c7441fb 100644 --- a/drivers/gpu/drm/msm/adreno/adreno_gpu.h +++ b/drivers/gpu/drm/msm/adreno/adreno_gpu.h
@@ -47,9 +47,11 @@ enum { ADRENO_FW_MAX, }; -#define ADRENO_QUIRK_TWO_PASS_USE_WFI BIT(0) -#define ADRENO_QUIRK_FAULT_DETECT_MASK BIT(1) -#define ADRENO_QUIRK_LMLOADKILL_DISABLE BIT(2) +enum adreno_quirks { + ADRENO_QUIRK_TWO_PASS_USE_WFI = 1, + ADRENO_QUIRK_FAULT_DETECT_MASK = 2, + ADRENO_QUIRK_LMLOADKILL_DISABLE = 3, +}; struct adreno_rev { uint8_t core; @@ -72,7 +74,7 @@ struct adreno_info { const char *name; const char *fw[ADRENO_FW_MAX]; uint32_t gmem; - u64 quirks; + enum adreno_quirks quirks; struct msm_gpu *(*init)(struct drm_device *dev); const char *zapfw; u32 inactive_period;
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 2e28db6..4aed5e9 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c
@@ -651,10 +651,7 @@ static void dpu_crtc_reset(struct drm_crtc *crtc) if (crtc->state) dpu_crtc_destroy_state(crtc, crtc->state); - if (cstate) - __drm_atomic_helper_crtc_reset(crtc, &cstate->base); - else - __drm_atomic_helper_crtc_reset(crtc, NULL); + __drm_atomic_helper_crtc_reset(crtc, &cstate->base); } /** @@ -836,8 +833,6 @@ static int dpu_crtc_atomic_check(struct drm_crtc *crtc, } pstates = kzalloc(sizeof(*pstates) * DPU_STAGE_MAX * 4, GFP_KERNEL); - if (!pstates) - return -ENOMEM; dpu_crtc = to_dpu_crtc(crtc); cstate = to_dpu_crtc_state(state);
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index a74f8ae..c08c673 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c
@@ -596,10 +596,12 @@ static void _dpu_kms_hw_destroy(struct dpu_kms *dpu_kms) _dpu_kms_mmu_destroy(dpu_kms); if (dpu_kms->catalog) { - for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { - if (dpu_kms->hw_vbif[i]) { - dpu_hw_vbif_destroy(dpu_kms->hw_vbif[i]); - dpu_kms->hw_vbif[i] = NULL; + for (i = 0; i < dpu_kms->catalog->vbif_count; i++) { + u32 vbif_idx = dpu_kms->catalog->vbif[i].id; + + if ((vbif_idx < VBIF_MAX) && dpu_kms->hw_vbif[vbif_idx]) { + dpu_hw_vbif_destroy(dpu_kms->hw_vbif[vbif_idx]); + dpu_kms->hw_vbif[vbif_idx] = NULL; } } } @@ -897,7 +899,7 @@ static int dpu_kms_hw_init(struct msm_kms *kms) for (i = 0; i < dpu_kms->catalog->vbif_count; i++) { u32 vbif_idx = dpu_kms->catalog->vbif[i].id; - dpu_kms->hw_vbif[vbif_idx] = dpu_hw_vbif_init(vbif_idx, + dpu_kms->hw_vbif[i] = dpu_hw_vbif_init(vbif_idx, dpu_kms->vbif[vbif_idx], dpu_kms->catalog); if (IS_ERR_OR_NULL(dpu_kms->hw_vbif[vbif_idx])) { rc = PTR_ERR(dpu_kms->hw_vbif[vbif_idx]);
diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c index 5e6bb2f..8d24b79 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_vbif.c
@@ -11,14 +11,6 @@ #include "dpu_hw_vbif.h" #include "dpu_trace.h" -static struct dpu_hw_vbif *dpu_get_vbif(struct dpu_kms *dpu_kms, enum dpu_vbif vbif_idx) -{ - if (vbif_idx < ARRAY_SIZE(dpu_kms->hw_vbif)) - return dpu_kms->hw_vbif[vbif_idx]; - - return NULL; -} - /** * _dpu_vbif_wait_for_xin_halt - wait for the xin to halt * @vbif: Pointer to hardware vbif driver @@ -156,11 +148,11 @@ static u32 _dpu_vbif_get_ot_limit(struct dpu_hw_vbif *vbif, void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, struct dpu_vbif_set_ot_params *params) { - struct dpu_hw_vbif *vbif; + struct dpu_hw_vbif *vbif = NULL; struct dpu_hw_mdp *mdp; bool forced_on = false; u32 ot_lim; - int ret; + int ret, i; if (!dpu_kms) { DPU_ERROR("invalid arguments\n"); @@ -168,7 +160,12 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, } mdp = dpu_kms->hw_mdp; - vbif = dpu_get_vbif(dpu_kms, params->vbif_idx); + for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { + if (dpu_kms->hw_vbif[i] && + dpu_kms->hw_vbif[i]->idx == params->vbif_idx) + vbif = dpu_kms->hw_vbif[i]; + } + if (!vbif || !mdp) { DPU_DEBUG("invalid arguments vbif %d mdp %d\n", vbif != 0, mdp != 0); @@ -211,7 +208,7 @@ void dpu_vbif_set_ot_limit(struct dpu_kms *dpu_kms, void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, struct dpu_vbif_set_qos_params *params) { - struct dpu_hw_vbif *vbif; + struct dpu_hw_vbif *vbif = NULL; struct dpu_hw_mdp *mdp; bool forced_on = false; const struct dpu_vbif_qos_tbl *qos_tbl; @@ -223,7 +220,13 @@ void dpu_vbif_set_qos_remap(struct dpu_kms *dpu_kms, } mdp = dpu_kms->hw_mdp; - vbif = dpu_get_vbif(dpu_kms, params->vbif_idx); + for (i = 0; i < ARRAY_SIZE(dpu_kms->hw_vbif); i++) { + if (dpu_kms->hw_vbif[i] && + dpu_kms->hw_vbif[i]->idx == params->vbif_idx) { + vbif = dpu_kms->hw_vbif[i]; + break; + } + } if (!vbif || !vbif->cap) { DPU_ERROR("invalid vbif %d\n", params->vbif_idx);
diff --git a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c index bdcc3e9..9262ed2 100644 --- a/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c +++ b/drivers/gpu/drm/msm/disp/mdp4/mdp4_lvds_connector.c
@@ -61,9 +61,8 @@ static int mdp4_lvds_connector_get_modes(struct drm_connector *connector) return ret; } -static enum drm_mode_status -mdp4_lvds_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int mdp4_lvds_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { struct mdp4_lvds_connector *mdp4_lvds_connector = to_mdp4_lvds_connector(connector);
diff --git a/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c b/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c index e4b8a78..a4f5cb9 100644 --- a/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c +++ b/drivers/gpu/drm/msm/disp/mdp5/mdp5_pipe.c
@@ -123,13 +123,12 @@ int mdp5_pipe_release(struct drm_atomic_state *s, struct mdp5_hw_pipe *hwpipe) { struct msm_drm_private *priv = s->dev->dev_private; struct mdp5_kms *mdp5_kms = to_mdp5_kms(to_mdp_kms(priv->kms)); - struct mdp5_global_state *state; + struct mdp5_global_state *state = mdp5_get_global_state(s); struct mdp5_hw_pipe_state *new_state; if (!hwpipe) return 0; - state = mdp5_get_global_state(s); if (IS_ERR(state)) return PTR_ERR(state);
diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index fedade8..1619497 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c
@@ -203,12 +203,6 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, struct drm_device *dev, return -EINVAL; priv = dev->dev_private; - - if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { - DRM_DEV_ERROR(dev->dev, "too many bridges\n"); - return -ENOSPC; - } - msm_dsi->dev = dev; ret = msm_dsi_host_modeset_init(msm_dsi->host, dev);
diff --git a/drivers/gpu/drm/msm/dsi/dsi_cfg.c b/drivers/gpu/drm/msm/dsi/dsi_cfg.c index 726c881..b7b7c1a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_cfg.c +++ b/drivers/gpu/drm/msm/dsi/dsi_cfg.c
@@ -97,7 +97,7 @@ static const char * const dsi_8996_bus_clk_names[] = { static const struct msm_dsi_config msm8996_dsi_cfg = { .io_offset = DSI_6G_REG_SHIFT, .reg_cfg = { - .num = 3, + .num = 2, .regs = { {"vdda", 18160, 1 }, /* 1.25 V */ {"vcca", 17000, 32 }, /* 0.925 V */
diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c index c59764f..743142e 100644 --- a/drivers/gpu/drm/msm/dsi/dsi_host.c +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c
@@ -1877,9 +1877,6 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi) /* setup workqueue */ msm_host->workqueue = alloc_ordered_workqueue("dsi_drm_work", 0); - if (!msm_host->workqueue) - return -ENOMEM; - INIT_WORK(&msm_host->err_work, dsi_err_worker); INIT_WORK(&msm_host->hpd_work, dsi_hpd_worker);
diff --git a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c index 08a95c3..60d5064 100644 --- a/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c +++ b/drivers/gpu/drm/msm/dsi/phy/dsi_phy.c
@@ -347,7 +347,7 @@ int msm_dsi_dphy_timing_calc_v3(struct msm_dsi_dphy_timing *timing, } else { timing->shared_timings.clk_pre = linear_inter(tmax, tmin, pcnt2, 0, false); - timing->shared_timings.clk_pre_inc_by_2 = 0; + timing->shared_timings.clk_pre_inc_by_2 = 0; } timing->ta_go = 3;
diff --git a/drivers/gpu/drm/msm/hdmi/hdmi.c b/drivers/gpu/drm/msm/hdmi/hdmi.c index 74b806b..e4c9ff9 100644 --- a/drivers/gpu/drm/msm/hdmi/hdmi.c +++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
@@ -248,10 +248,6 @@ static struct hdmi *msm_hdmi_init(struct platform_device *pdev) pm_runtime_enable(&pdev->dev); hdmi->workq = alloc_ordered_workqueue("msm_hdmi", 0); - if (!hdmi->workq) { - ret = -ENOMEM; - goto fail; - } hdmi->i2c = msm_hdmi_i2c_init(hdmi); if (IS_ERR(hdmi->i2c)) { @@ -297,11 +293,6 @@ int msm_hdmi_modeset_init(struct hdmi *hdmi, struct platform_device *pdev = hdmi->pdev; int ret; - if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) { - DRM_DEV_ERROR(dev->dev, "too many bridges\n"); - return -ENOSPC; - } - hdmi->dev = dev; hdmi->encoder = encoder;
diff --git a/drivers/gpu/drm/msm/msm_fence.c b/drivers/gpu/drm/msm/msm_fence.c index 50a25c1..cd59a59 100644 --- a/drivers/gpu/drm/msm/msm_fence.c +++ b/drivers/gpu/drm/msm/msm_fence.c
@@ -20,7 +20,7 @@ msm_fence_context_alloc(struct drm_device *dev, const char *name) return ERR_PTR(-ENOMEM); fctx->dev = dev; - strscpy(fctx->name, name, sizeof(fctx->name)); + strncpy(fctx->name, name, sizeof(fctx->name)); fctx->context = dma_fence_context_alloc(1); init_waitqueue_head(&fctx->event); spin_lock_init(&fctx->spinlock);
diff --git a/drivers/gpu/drm/msm/msm_rd.c b/drivers/gpu/drm/msm/msm_rd.c index a6b024b..c7832a9 100644 --- a/drivers/gpu/drm/msm/msm_rd.c +++ b/drivers/gpu/drm/msm/msm_rd.c
@@ -191,9 +191,6 @@ static int rd_open(struct inode *inode, struct file *file) file->private_data = rd; rd->open = true; - /* Reset fifo to clear any previously unread data: */ - rd->fifo.head = rd->fifo.tail = 0; - /* the parsing tools need to know gpu-id to know which * register database to load. */
diff --git a/drivers/gpu/drm/mxsfb/Kconfig b/drivers/gpu/drm/mxsfb/Kconfig index e8cb028..33916b7 100644 --- a/drivers/gpu/drm/mxsfb/Kconfig +++ b/drivers/gpu/drm/mxsfb/Kconfig
@@ -8,7 +8,6 @@ tristate "i.MX23/i.MX28/i.MX6SX MXSFB LCD controller" depends on DRM && OF depends on COMMON_CLK - depends on ARCH_MXS || ARCH_MXC || COMPILE_TEST select DRM_MXS select DRM_KMS_HELPER select DRM_KMS_CMA_HELPER
diff --git a/drivers/gpu/drm/nouveau/nouveau_bo.c b/drivers/gpu/drm/nouveau/nouveau_bo.c index 9f9c707..f7603be 100644 --- a/drivers/gpu/drm/nouveau/nouveau_bo.c +++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
@@ -276,10 +276,8 @@ nouveau_bo_alloc(struct nouveau_cli *cli, u64 *size, int *align, u32 flags, break; } - if (WARN_ON(pi < 0)) { - kfree(nvbo); + if (WARN_ON(pi < 0)) return ERR_PTR(-EINVAL); - } /* Disable compression if suitable settings couldn't be found. */ if (nvbo->comp && !vmm->page[pi].comp) {
diff --git a/drivers/gpu/drm/nouveau/nouveau_prime.c b/drivers/gpu/drm/nouveau/nouveau_prime.c index 25cbe4e..f9ee562 100644 --- a/drivers/gpu/drm/nouveau/nouveau_prime.c +++ b/drivers/gpu/drm/nouveau/nouveau_prime.c
@@ -90,6 +90,7 @@ struct drm_gem_object *nouveau_gem_prime_import_sg_table(struct drm_device *dev, ret = nouveau_bo_init(nvbo, size, align, flags, sg, robj); if (ret) { + nouveau_bo_ref(NULL, &nvbo); obj = ERR_PTR(ret); goto unlock; }
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c index f0368d9..8bff14a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c
@@ -33,7 +33,7 @@ nvbios_addr(struct nvkm_bios *bios, u32 *addr, u8 size) { u32 p = *addr; - if (*addr >= bios->image0_size && bios->imaged_addr) { + if (*addr > bios->image0_size && bios->imaged_addr) { *addr -= bios->image0_size; *addr += bios->imaged_addr; }
diff --git a/drivers/gpu/drm/omapdrm/dss/dsi.c b/drivers/gpu/drm/omapdrm/dss/dsi.c index 993d48f..b30fcaa 100644 --- a/drivers/gpu/drm/omapdrm/dss/dsi.c +++ b/drivers/gpu/drm/omapdrm/dss/dsi.c
@@ -1444,26 +1444,22 @@ static int dsi_dump_dsi_irqs(struct seq_file *s, void *p) { struct dsi_data *dsi = s->private; unsigned long flags; - struct dsi_irq_stats *stats; - - stats = kmalloc(sizeof(*stats), GFP_KERNEL); - if (!stats) - return -ENOMEM; + struct dsi_irq_stats stats; spin_lock_irqsave(&dsi->irq_stats_lock, flags); - *stats = dsi->irq_stats; + stats = dsi->irq_stats; memset(&dsi->irq_stats, 0, sizeof(dsi->irq_stats)); dsi->irq_stats.last_reset = jiffies; spin_unlock_irqrestore(&dsi->irq_stats_lock, flags); seq_printf(s, "period %u ms\n", - jiffies_to_msecs(jiffies - stats->last_reset)); + jiffies_to_msecs(jiffies - stats.last_reset)); - seq_printf(s, "irqs %d\n", stats->irq_count); + seq_printf(s, "irqs %d\n", stats.irq_count); #define PIS(x) \ - seq_printf(s, "%-20s %10d\n", #x, stats->dsi_irqs[ffs(DSI_IRQ_##x)-1]); + seq_printf(s, "%-20s %10d\n", #x, stats.dsi_irqs[ffs(DSI_IRQ_##x)-1]); seq_printf(s, "-- DSI%d interrupts --\n", dsi->module_id + 1); PIS(VC0); @@ -1487,10 +1483,10 @@ static int dsi_dump_dsi_irqs(struct seq_file *s, void *p) #define PIS(x) \ seq_printf(s, "%-20s %10d %10d %10d %10d\n", #x, \ - stats->vc_irqs[0][ffs(DSI_VC_IRQ_##x)-1], \ - stats->vc_irqs[1][ffs(DSI_VC_IRQ_##x)-1], \ - stats->vc_irqs[2][ffs(DSI_VC_IRQ_##x)-1], \ - stats->vc_irqs[3][ffs(DSI_VC_IRQ_##x)-1]); + stats.vc_irqs[0][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[1][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[2][ffs(DSI_VC_IRQ_##x)-1], \ + stats.vc_irqs[3][ffs(DSI_VC_IRQ_##x)-1]); seq_printf(s, "-- VC interrupts --\n"); PIS(CS); @@ -1506,7 +1502,7 @@ static int dsi_dump_dsi_irqs(struct seq_file *s, void *p) #define PIS(x) \ seq_printf(s, "%-20s %10d\n", #x, \ - stats->cio_irqs[ffs(DSI_CIO_IRQ_##x)-1]); + stats.cio_irqs[ffs(DSI_CIO_IRQ_##x)-1]); seq_printf(s, "-- CIO interrupts --\n"); PIS(ERRSYNCESC1); @@ -1531,8 +1527,6 @@ static int dsi_dump_dsi_irqs(struct seq_file *s, void *p) PIS(ULPSACTIVENOT_ALL1); #undef PIS - kfree(stats); - return 0; } #endif
diff --git a/drivers/gpu/drm/omapdrm/dss/dss.c b/drivers/gpu/drm/omapdrm/dss/dss.c index 7f1d0a9..ac93dae 100644 --- a/drivers/gpu/drm/omapdrm/dss/dss.c +++ b/drivers/gpu/drm/omapdrm/dss/dss.c
@@ -1173,7 +1173,6 @@ static void __dss_uninit_ports(struct dss_device *dss, unsigned int num_ports) default: break; } - of_node_put(port); } } @@ -1206,13 +1205,11 @@ static int dss_init_ports(struct dss_device *dss) default: break; } - of_node_put(port); } return 0; error: - of_node_put(port); __dss_uninit_ports(dss, i); return r; }
diff --git a/drivers/gpu/drm/panel/panel-sitronix-st7701.c b/drivers/gpu/drm/panel/panel-sitronix-st7701.c index 638f605..09c5d9a 100644 --- a/drivers/gpu/drm/panel/panel-sitronix-st7701.c +++ b/drivers/gpu/drm/panel/panel-sitronix-st7701.c
@@ -392,15 +392,7 @@ static int st7701_dsi_probe(struct mipi_dsi_device *dsi) st7701->dsi = dsi; st7701->desc = desc; - ret = mipi_dsi_attach(dsi); - if (ret) - goto err_attach; - - return 0; - -err_attach: - drm_panel_remove(&st7701->panel); - return ret; + return mipi_dsi_attach(dsi); } static int st7701_dsi_remove(struct mipi_dsi_device *dsi)
diff --git a/drivers/gpu/drm/panfrost/Kconfig b/drivers/gpu/drm/panfrost/Kconfig index 77f4d32..86cdc0c 100644 --- a/drivers/gpu/drm/panfrost/Kconfig +++ b/drivers/gpu/drm/panfrost/Kconfig
@@ -3,8 +3,7 @@ config DRM_PANFROST tristate "Panfrost (DRM support for ARM Mali Midgard/Bifrost GPUs)" depends on DRM - depends on ARM || ARM64 || COMPILE_TEST - depends on !GENERIC_ATOMIC64 # for IOMMU_IO_PGTABLE_LPAE + depends on ARM || ARM64 || (COMPILE_TEST && !GENERIC_ATOMIC64) depends on MMU select DRM_SCHED select IOMMU_SUPPORT
diff --git a/drivers/gpu/drm/panfrost/panfrost_mmu.c b/drivers/gpu/drm/panfrost/panfrost_mmu.c index b17f302..8a014dc 100644 --- a/drivers/gpu/drm/panfrost/panfrost_mmu.c +++ b/drivers/gpu/drm/panfrost/panfrost_mmu.c
@@ -233,7 +233,7 @@ static void panfrost_mmu_flush_range(struct panfrost_device *pfdev, if (pm_runtime_active(pfdev->dev)) mmu_hw_do_operation(pfdev, mmu, iova, size, AS_COMMAND_FLUSH_PT); - pm_runtime_put_autosuspend(pfdev->dev); + pm_runtime_put_sync_autosuspend(pfdev->dev); } static int mmu_map_sg(struct panfrost_device *pfdev, struct panfrost_mmu *mmu, @@ -502,7 +502,6 @@ static int panfrost_mmu_map_fault_addr(struct panfrost_device *pfdev, int as, if (IS_ERR(pages[i])) { mutex_unlock(&bo->base.pages_lock); ret = PTR_ERR(pages[i]); - pages[i] = NULL; goto err_pages; } }
diff --git a/drivers/gpu/drm/radeon/atombios_encoders.c b/drivers/gpu/drm/radeon/atombios_encoders.c index 857fdf7..92ffed5 100644 --- a/drivers/gpu/drm/radeon/atombios_encoders.c +++ b/drivers/gpu/drm/radeon/atombios_encoders.c
@@ -2192,12 +2192,11 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx) /* * On DCE32 any encoder can drive any block so usually just use crtc id, - * but Apple thinks different at least on iMac10,1 and iMac11,2, so there use linkb, + * but Apple thinks different at least on iMac10,1, so there use linkb, * otherwise the internal eDP panel will stay dark. */ if (ASIC_IS_DCE32(rdev)) { - if (dmi_match(DMI_PRODUCT_NAME, "iMac10,1") || - dmi_match(DMI_PRODUCT_NAME, "iMac11,2")) + if (dmi_match(DMI_PRODUCT_NAME, "iMac10,1")) enc_idx = (dig->linkb) ? 1 : 0; else enc_idx = radeon_crtc->crtc_id;
diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c index 288ec30..bd2e577 100644 --- a/drivers/gpu/drm/radeon/ni_dpm.c +++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -2740,10 +2740,10 @@ static int ni_set_mc_special_registers(struct radeon_device *rdev, table->mc_reg_table_entry[k].mc_data[j] |= 0x100; } j++; + if (j > SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE) + return -EINVAL; break; case MC_SEQ_RESERVE_M >> 2: - if (j >= SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE) - return -EINVAL; temp_reg = RREG32(MC_PMG_CMD_MRS1); table->mc_reg_address[j].s1 = MC_PMG_CMD_MRS1 >> 2; table->mc_reg_address[j].s0 = MC_SEQ_PMG_CMD_MRS1_LP >> 2; @@ -2752,6 +2752,8 @@ static int ni_set_mc_special_registers(struct radeon_device *rdev, (temp_reg & 0xffff0000) | (table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff); j++; + if (j > SMC_NISLANDS_MC_REGISTER_ARRAY_SIZE) + return -EINVAL; break; default: break;
diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c index 8c8e13e..756a50e 100644 --- a/drivers/gpu/drm/radeon/radeon_bios.c +++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -227,7 +227,6 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev) if (!found) return false; - pci_dev_put(pdev); rdev->bios = kmalloc(size, GFP_KERNEL); if (!rdev->bios) { @@ -613,14 +612,13 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) acpi_size tbl_size; UEFI_ACPI_VFCT *vfct; unsigned offset; - bool r = false; if (!ACPI_SUCCESS(acpi_get_table("VFCT", 1, &hdr))) return false; tbl_size = hdr->length; if (tbl_size < sizeof(UEFI_ACPI_VFCT)) { DRM_ERROR("ACPI VFCT table present but broken (too short #1)\n"); - goto out; + return false; } vfct = (UEFI_ACPI_VFCT *)hdr; @@ -633,13 +631,13 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) offset += sizeof(VFCT_IMAGE_HEADER); if (offset > tbl_size) { DRM_ERROR("ACPI VFCT image header truncated\n"); - goto out; + return false; } offset += vhdr->ImageLength; if (offset > tbl_size) { DRM_ERROR("ACPI VFCT image truncated\n"); - goto out; + return false; } if (vhdr->ImageLength && @@ -651,18 +649,15 @@ static bool radeon_acpi_vfct_bios(struct radeon_device *rdev) rdev->bios = kmemdup(&vbios->VbiosContent, vhdr->ImageLength, GFP_KERNEL); - if (rdev->bios) - r = true; - goto out; + if (!rdev->bios) + return false; + return true; } } DRM_ERROR("ACPI VFCT table present but broken (too short #2)\n"); - -out: - acpi_put_table(hdr); - return r; + return false; } #else static inline bool radeon_acpi_vfct_bios(struct radeon_device *rdev)
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 0d0ae89..5d017f0 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c
@@ -1022,7 +1022,6 @@ void radeon_atombios_fini(struct radeon_device *rdev) { if (rdev->mode_info.atom_context) { kfree(rdev->mode_info.atom_context->scratch); - kfree(rdev->mode_info.atom_context->iio); } kfree(rdev->mode_info.atom_context); rdev->mode_info.atom_context = NULL; @@ -1624,9 +1623,6 @@ int radeon_suspend_kms(struct drm_device *dev, bool suspend, if (r) { /* delay GPU reset to resume */ radeon_fence_driver_force_completion(rdev, i); - } else { - /* finish executing delayed work */ - flush_delayed_work(&rdev->fence_drv[i].lockup_work); } }
diff --git a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c index 48281e2..ce98c08 100644 --- a/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c +++ b/drivers/gpu/drm/rockchip/analogix_dp-rockchip.c
@@ -401,15 +401,7 @@ static int rockchip_dp_probe(struct platform_device *pdev) if (IS_ERR(dp->adp)) return PTR_ERR(dp->adp); - ret = component_add(dev, &rockchip_dp_component_ops); - if (ret) - goto err_dp_remove; - - return 0; - -err_dp_remove: - analogix_dp_remove(dp->adp); - return ret; + return component_add(dev, &rockchip_dp_component_ops); } static int rockchip_dp_remove(struct platform_device *pdev)
diff --git a/drivers/gpu/drm/rockchip/cdn-dp-core.c b/drivers/gpu/drm/rockchip/cdn-dp-core.c index 2ea672f..8f299d7 100644 --- a/drivers/gpu/drm/rockchip/cdn-dp-core.c +++ b/drivers/gpu/drm/rockchip/cdn-dp-core.c
@@ -275,9 +275,8 @@ static int cdn_dp_connector_get_modes(struct drm_connector *connector) return ret; } -static enum drm_mode_status -cdn_dp_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int cdn_dp_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { struct cdn_dp_device *dp = connector_to_dp(connector); struct drm_display_info *display_info = &dp->connector.display_info; @@ -563,7 +562,7 @@ static void cdn_dp_encoder_mode_set(struct drm_encoder *encoder, video->v_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NVSYNC); video->h_sync_polarity = !!(mode->flags & DRM_MODE_FLAG_NHSYNC); - drm_mode_copy(&dp->mode, adjusted); + memcpy(&dp->mode, adjusted, sizeof(*mode)); } static bool cdn_dp_check_link_status(struct cdn_dp_device *dp)
diff --git a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c index 8e2f841..f7191ae 100644 --- a/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
@@ -1123,11 +1123,5 @@ struct platform_driver dw_mipi_dsi_rockchip_driver = { .of_match_table = dw_mipi_dsi_rockchip_dt_ids, .pm = &dw_mipi_dsi_rockchip_pm_ops, .name = "dw-mipi-dsi-rockchip", - /* - * For dual-DSI display, one DSI pokes at the other DSI's - * drvdata in dw_mipi_dsi_rockchip_find_second(). This is not - * safe for asynchronous probe. - */ - .probe_type = PROBE_FORCE_SYNCHRONOUS, }, };
diff --git a/drivers/gpu/drm/rockchip/inno_hdmi.c b/drivers/gpu/drm/rockchip/inno_hdmi.c index f2e2cc6..ed344a7 100644 --- a/drivers/gpu/drm/rockchip/inno_hdmi.c +++ b/drivers/gpu/drm/rockchip/inno_hdmi.c
@@ -487,7 +487,7 @@ static void inno_hdmi_encoder_mode_set(struct drm_encoder *encoder, inno_hdmi_setup(hdmi, adj_mode); /* Store the display mode for plugin/DPMS poweron events */ - drm_mode_copy(&hdmi->previous_mode, adj_mode); + memcpy(&hdmi->previous_mode, adj_mode, sizeof(hdmi->previous_mode)); } static void inno_hdmi_encoder_enable(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/rockchip/rk3066_hdmi.c b/drivers/gpu/drm/rockchip/rk3066_hdmi.c index 4a81c5c..85fc5f0 100644 --- a/drivers/gpu/drm/rockchip/rk3066_hdmi.c +++ b/drivers/gpu/drm/rockchip/rk3066_hdmi.c
@@ -382,7 +382,7 @@ rk3066_hdmi_encoder_mode_set(struct drm_encoder *encoder, struct rk3066_hdmi *hdmi = to_rk3066_hdmi(encoder); /* Store the display mode for plugin/DPMS poweron events. */ - drm_mode_copy(&hdmi->previous_mode, adj_mode); + memcpy(&hdmi->previous_mode, adj_mode, sizeof(hdmi->previous_mode)); } static void rk3066_hdmi_encoder_enable(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c index 57e0396..2e4e193 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -1288,9 +1288,6 @@ static struct drm_crtc_state *vop_crtc_duplicate_state(struct drm_crtc *crtc) { struct rockchip_crtc_state *rockchip_state; - if (WARN_ON(!crtc->state)) - return NULL; - rockchip_state = kzalloc(sizeof(*rockchip_state), GFP_KERNEL); if (!rockchip_state) return NULL;
diff --git a/drivers/gpu/drm/sti/sti_dvo.c b/drivers/gpu/drm/sti/sti_dvo.c index d0f1384..e558701 100644 --- a/drivers/gpu/drm/sti/sti_dvo.c +++ b/drivers/gpu/drm/sti/sti_dvo.c
@@ -287,7 +287,7 @@ static void sti_dvo_set_mode(struct drm_bridge *bridge, DRM_DEBUG_DRIVER("\n"); - drm_mode_copy(&dvo->mode, mode); + memcpy(&dvo->mode, mode, sizeof(struct drm_display_mode)); /* According to the path used (main or aux), the dvo clocks should * have a different parent clock. */ @@ -345,9 +345,8 @@ static int sti_dvo_connector_get_modes(struct drm_connector *connector) #define CLK_TOLERANCE_HZ 50 -static enum drm_mode_status -sti_dvo_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int sti_dvo_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { int target = mode->clock * 1000; int target_min = target - CLK_TOLERANCE_HZ;
diff --git a/drivers/gpu/drm/sti/sti_hda.c b/drivers/gpu/drm/sti/sti_hda.c index b321e55..94e404f 100644 --- a/drivers/gpu/drm/sti/sti_hda.c +++ b/drivers/gpu/drm/sti/sti_hda.c
@@ -522,7 +522,7 @@ static void sti_hda_set_mode(struct drm_bridge *bridge, DRM_DEBUG_DRIVER("\n"); - drm_mode_copy(&hda->mode, mode); + memcpy(&hda->mode, mode, sizeof(struct drm_display_mode)); if (!hda_get_mode_idx(hda->mode, &mode_idx)) { DRM_ERROR("Undefined mode\n"); @@ -600,9 +600,8 @@ static int sti_hda_connector_get_modes(struct drm_connector *connector) #define CLK_TOLERANCE_HZ 50 -static enum drm_mode_status -sti_hda_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int sti_hda_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { int target = mode->clock * 1000; int target_min = target - CLK_TOLERANCE_HZ;
diff --git a/drivers/gpu/drm/sti/sti_hdmi.c b/drivers/gpu/drm/sti/sti_hdmi.c index c5547fe..9862c32 100644 --- a/drivers/gpu/drm/sti/sti_hdmi.c +++ b/drivers/gpu/drm/sti/sti_hdmi.c
@@ -933,7 +933,7 @@ static void sti_hdmi_set_mode(struct drm_bridge *bridge, DRM_DEBUG_DRIVER("\n"); /* Copy the drm display mode in the connector local structure */ - drm_mode_copy(&hdmi->mode, mode); + memcpy(&hdmi->mode, mode, sizeof(struct drm_display_mode)); /* Update clock framerate according to the selected mode */ ret = clk_set_rate(hdmi->clk_pix, mode->clock * 1000); @@ -996,9 +996,8 @@ static int sti_hdmi_connector_get_modes(struct drm_connector *connector) #define CLK_TOLERANCE_HZ 50 -static enum drm_mode_status -sti_hdmi_connector_mode_valid(struct drm_connector *connector, - struct drm_display_mode *mode) +static int sti_hdmi_connector_mode_valid(struct drm_connector *connector, + struct drm_display_mode *mode) { int target = mode->clock * 1000; int target_min = target - CLK_TOLERANCE_HZ;
diff --git a/drivers/gpu/drm/tegra/dc.c b/drivers/gpu/drm/tegra/dc.c index 923899b..c410221 100644 --- a/drivers/gpu/drm/tegra/dc.c +++ b/drivers/gpu/drm/tegra/dc.c
@@ -2458,10 +2458,8 @@ static int tegra_dc_probe(struct platform_device *pdev) usleep_range(2000, 4000); err = reset_control_assert(dc->rst); - if (err < 0) { - clk_disable_unprepare(dc->clk); + if (err < 0) return err; - } usleep_range(2000, 4000);
diff --git a/drivers/gpu/drm/vc4/vc4_dpi.c b/drivers/gpu/drm/vc4/vc4_dpi.c index 9ea2e7b..8a27a6a 100644 --- a/drivers/gpu/drm/vc4/vc4_dpi.c +++ b/drivers/gpu/drm/vc4/vc4_dpi.c
@@ -151,45 +151,35 @@ static void vc4_dpi_encoder_enable(struct drm_encoder *encoder) } drm_connector_list_iter_end(&conn_iter); - if (connector) { - if (connector->display_info.num_bus_formats) { - u32 bus_format = connector->display_info.bus_formats[0]; + if (connector && connector->display_info.num_bus_formats) { + u32 bus_format = connector->display_info.bus_formats[0]; - switch (bus_format) { - case MEDIA_BUS_FMT_RGB888_1X24: - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, - DPI_FORMAT); - break; - case MEDIA_BUS_FMT_BGR888_1X24: - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, - DPI_FORMAT); - dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, - DPI_ORDER); - break; - case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, - DPI_FORMAT); - break; - case MEDIA_BUS_FMT_RGB666_1X18: - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, - DPI_FORMAT); - break; - case MEDIA_BUS_FMT_RGB565_1X16: - dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_1, - DPI_FORMAT); - break; - default: - DRM_ERROR("Unknown media bus format %d\n", - bus_format); - break; - } + switch (bus_format) { + case MEDIA_BUS_FMT_RGB888_1X24: + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, + DPI_FORMAT); + break; + case MEDIA_BUS_FMT_BGR888_1X24: + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, + DPI_FORMAT); + dpi_c |= VC4_SET_FIELD(DPI_ORDER_BGR, DPI_ORDER); + break; + case MEDIA_BUS_FMT_RGB666_1X24_CPADHI: + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_2, + DPI_FORMAT); + break; + case MEDIA_BUS_FMT_RGB666_1X18: + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_18BIT_666_RGB_1, + DPI_FORMAT); + break; + case MEDIA_BUS_FMT_RGB565_1X16: + dpi_c |= VC4_SET_FIELD(DPI_FORMAT_16BIT_565_RGB_3, + DPI_FORMAT); + break; + default: + DRM_ERROR("Unknown media bus format %d\n", bus_format); + break; } - - if (connector->display_info.bus_flags & DRM_BUS_FLAG_PIXDATA_DRIVE_NEGEDGE) - dpi_c |= DPI_PIXEL_CLK_INVERT; - - if (connector->display_info.bus_flags & DRM_BUS_FLAG_DE_LOW) - dpi_c |= DPI_OUTPUT_ENABLE_INVERT; } else { /* Default to 24bit if no connector found. */ dpi_c |= VC4_SET_FIELD(DPI_FORMAT_24BIT_888_RGB, DPI_FORMAT);
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 36688a5..0d78ba0 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -392,12 +392,7 @@ static int __init vc4_drm_register(void) if (ret) return ret; - ret = platform_driver_register(&vc4_platform_driver); - if (ret) - platform_unregister_drivers(component_drivers, - ARRAY_SIZE(component_drivers)); - - return ret; + return platform_driver_register(&vc4_platform_driver); } static void __exit vc4_drm_unregister(void)
diff --git a/drivers/gpu/drm/vc4/vc4_dsi.c b/drivers/gpu/drm/vc4/vc4_dsi.c index e249ab3..0983949 100644 --- a/drivers/gpu/drm/vc4/vc4_dsi.c +++ b/drivers/gpu/drm/vc4/vc4_dsi.c
@@ -791,9 +791,11 @@ static bool vc4_dsi_encoder_mode_fixup(struct drm_encoder *encoder, /* Find what divider gets us a faster clock than the requested * pixel clock. */ - for (divider = 1; divider < 255; divider++) { - if (parent_rate / (divider + 1) < pll_clock) + for (divider = 1; divider < 8; divider++) { + if (parent_rate / divider < pll_clock) { + divider--; break; + } } /* Now that we've picked a PLL divider, calculate back to its
diff --git a/drivers/gpu/drm/vc4/vc4_plane.c b/drivers/gpu/drm/vc4/vc4_plane.c index cdcd196..363f456 100644 --- a/drivers/gpu/drm/vc4/vc4_plane.c +++ b/drivers/gpu/drm/vc4/vc4_plane.c
@@ -288,16 +288,16 @@ static int vc4_plane_margins_adj(struct drm_plane_state *pstate) adjhdisplay, crtc_state->mode.hdisplay); vc4_pstate->crtc_x += left; - if (vc4_pstate->crtc_x > crtc_state->mode.hdisplay - right) - vc4_pstate->crtc_x = crtc_state->mode.hdisplay - right; + if (vc4_pstate->crtc_x > crtc_state->mode.hdisplay - left) + vc4_pstate->crtc_x = crtc_state->mode.hdisplay - left; adjvdisplay = crtc_state->mode.vdisplay - (top + bottom); vc4_pstate->crtc_y = DIV_ROUND_CLOSEST(vc4_pstate->crtc_y * adjvdisplay, crtc_state->mode.vdisplay); vc4_pstate->crtc_y += top; - if (vc4_pstate->crtc_y > crtc_state->mode.vdisplay - bottom) - vc4_pstate->crtc_y = crtc_state->mode.vdisplay - bottom; + if (vc4_pstate->crtc_y > crtc_state->mode.vdisplay - top) + vc4_pstate->crtc_y = crtc_state->mode.vdisplay - top; vc4_pstate->crtc_w = DIV_ROUND_CLOSEST(vc4_pstate->crtc_w * adjhdisplay, @@ -317,6 +317,7 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) struct vc4_plane_state *vc4_state = to_vc4_plane_state(state); struct drm_framebuffer *fb = state->fb; struct drm_gem_cma_object *bo = drm_fb_cma_get_gem_obj(fb, 0); + u32 subpixel_src_mask = (1 << 16) - 1; int num_planes = fb->format->num_planes; struct drm_crtc_state *crtc_state; u32 h_subsample = fb->format->hsub; @@ -338,15 +339,18 @@ static int vc4_plane_setup_clipping_and_scaling(struct drm_plane_state *state) for (i = 0; i < num_planes; i++) vc4_state->offsets[i] = bo->paddr + fb->offsets[i]; - /* - * We don't support subpixel source positioning for scaling, - * but fractional coordinates can be generated by clipping - * so just round for now - */ - vc4_state->src_x = DIV_ROUND_CLOSEST(state->src.x1, 1 << 16); - vc4_state->src_y = DIV_ROUND_CLOSEST(state->src.y1, 1 << 16); - vc4_state->src_w[0] = DIV_ROUND_CLOSEST(state->src.x2, 1 << 16) - vc4_state->src_x; - vc4_state->src_h[0] = DIV_ROUND_CLOSEST(state->src.y2, 1 << 16) - vc4_state->src_y; + /* We don't support subpixel source positioning for scaling. */ + if ((state->src.x1 & subpixel_src_mask) || + (state->src.x2 & subpixel_src_mask) || + (state->src.y1 & subpixel_src_mask) || + (state->src.y2 & subpixel_src_mask)) { + return -EINVAL; + } + + vc4_state->src_x = state->src.x1 >> 16; + vc4_state->src_y = state->src.y1 >> 16; + vc4_state->src_w[0] = (state->src.x2 - state->src.x1) >> 16; + vc4_state->src_h[0] = (state->src.y2 - state->src.y1) >> 16; vc4_state->crtc_x = state->dst.x1; vc4_state->crtc_y = state->dst.y1;
diff --git a/drivers/gpu/drm/vc4/vc4_vec.c b/drivers/gpu/drm/vc4/vc4_vec.c index 0c764fd..7402bc7 100644 --- a/drivers/gpu/drm/vc4/vc4_vec.c +++ b/drivers/gpu/drm/vc4/vc4_vec.c
@@ -256,7 +256,7 @@ static void vc4_vec_ntsc_j_mode_set(struct vc4_vec *vec) static const struct drm_display_mode ntsc_mode = { DRM_MODE("720x480", DRM_MODE_TYPE_DRIVER, 13500, 720, 720 + 14, 720 + 14 + 64, 720 + 14 + 64 + 60, 0, - 480, 480 + 7, 480 + 7 + 6, 525, 0, + 480, 480 + 3, 480 + 3 + 3, 480 + 3 + 3 + 16, 0, DRM_MODE_FLAG_INTERLACE) }; @@ -278,7 +278,7 @@ static void vc4_vec_pal_m_mode_set(struct vc4_vec *vec) static const struct drm_display_mode pal_mode = { DRM_MODE("720x576", DRM_MODE_TYPE_DRIVER, 13500, 720, 720 + 20, 720 + 20 + 64, 720 + 20 + 64 + 60, 0, - 576, 576 + 4, 576 + 4 + 6, 625, 0, + 576, 576 + 2, 576 + 2 + 3, 576 + 2 + 3 + 20, 0, DRM_MODE_FLAG_INTERLACE) };
diff --git a/drivers/gpu/drm/virtio/virtgpu_ioctl.c b/drivers/gpu/drm/virtio/virtgpu_ioctl.c index 5ae132e..0a88ef1 100644 --- a/drivers/gpu/drm/virtio/virtgpu_ioctl.c +++ b/drivers/gpu/drm/virtio/virtgpu_ioctl.c
@@ -327,18 +327,10 @@ static int virtio_gpu_resource_create_ioctl(struct drm_device *dev, void *data, drm_gem_object_release(obj); return ret; } + drm_gem_object_put_unlocked(obj); rc->res_handle = qobj->hw_res_handle; /* similiar to a VM address */ rc->bo_handle = handle; - - /* - * The handle owns the reference now. But we must drop our - * remaining reference *after* we no longer need to dereference - * the obj. Otherwise userspace could guess the handle and - * race closing it from another thread. - */ - drm_gem_object_put_unlocked(obj); - return 0; }
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c index 2492d3a..0b800c3 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -182,8 +182,7 @@ void vmw_kms_cursor_snoop(struct vmw_surface *srf, if (cmd->dma.guest.ptr.offset % PAGE_SIZE || box->x != 0 || box->y != 0 || box->z != 0 || box->srcx != 0 || box->srcy != 0 || box->srcz != 0 || - box->d != 1 || box_count != 1 || - box->w > 64 || box->h > 64) { + box->d != 1 || box_count != 1) { /* TODO handle none page aligned offsets */ /* TODO handle more dst & src != 0 */ /* TODO handle more then one copy */
diff --git a/drivers/gpu/host1x/hw/syncpt_hw.c b/drivers/gpu/host1x/hw/syncpt_hw.c index 8cf35b2..dd39d67 100644 --- a/drivers/gpu/host1x/hw/syncpt_hw.c +++ b/drivers/gpu/host1x/hw/syncpt_hw.c
@@ -106,6 +106,9 @@ static void syncpt_assign_to_channel(struct host1x_syncpt *sp, #if HOST1X_HW >= 6 struct host1x *host = sp->host; + if (!host->hv_regs) + return; + host1x_sync_writel(host, HOST1X_SYNC_SYNCPT_CH_APP_CH(ch ? ch->id : 0xff), HOST1X_SYNC_SYNCPT_CH_APP(sp->id));
diff --git a/drivers/gpu/ipu-v3/ipu-common.c b/drivers/gpu/ipu-v3/ipu-common.c index 528812b..b3dae9e 100644 --- a/drivers/gpu/ipu-v3/ipu-common.c +++ b/drivers/gpu/ipu-v3/ipu-common.c
@@ -1235,7 +1235,6 @@ static int ipu_add_client_devices(struct ipu_soc *ipu, unsigned long ipu_base) pdev = platform_device_alloc(reg->name, id++); if (!pdev) { ret = -ENOMEM; - of_node_put(of_node); goto err_register; }
diff --git a/drivers/hid/hid-alps.c b/drivers/hid/hid-alps.c index 464a489..2477b2a 100644 --- a/drivers/hid/hid-alps.c +++ b/drivers/hid/hid-alps.c
@@ -832,8 +832,6 @@ static const struct hid_device_id alps_id[] = { { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1) }, { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, - USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_U1_UNICORN_LEGACY) }, - { HID_DEVICE(HID_BUS_ANY, HID_GROUP_ANY, USB_VENDOR_ID_ALPS_JP, HID_DEVICE_ID_ALPS_T4_BTNLESS) }, { } };
diff --git a/drivers/hid/hid-asus.c b/drivers/hid/hid-asus.c index e15ba7f..7f84ed0 100644 --- a/drivers/hid/hid-asus.c +++ b/drivers/hid/hid-asus.c
@@ -40,9 +40,7 @@ MODULE_AUTHOR("Frederik Wenigwieser <frederik.wenigwieser@gmail.com>"); MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define T100_TPAD_INTF 2 -#define MEDION_E1239T_TPAD_INTF 1 -#define E1239T_TP_TOGGLE_REPORT_ID 0x05 #define T100CHI_MOUSE_REPORT_ID 0x06 #define FEATURE_REPORT_ID 0x0d #define INPUT_REPORT_ID 0x5d @@ -79,7 +77,6 @@ MODULE_DESCRIPTION("Asus HID Keyboard and TouchPad"); #define QUIRK_G752_KEYBOARD BIT(8) #define QUIRK_T101HA_DOCK BIT(9) #define QUIRK_T90CHI BIT(10) -#define QUIRK_MEDION_E1239T BIT(11) #define I2C_KEYBOARD_QUIRKS (QUIRK_FIX_NOTEBOOK_REPORT | \ QUIRK_NO_INIT_REPORTS | \ @@ -95,7 +92,6 @@ struct asus_kbd_leds { struct hid_device *hdev; struct work_struct work; unsigned int brightness; - spinlock_t lock; bool removed; }; @@ -106,14 +102,12 @@ struct asus_touchpad_info { int res_y; int contact_size; int max_contacts; - int report_size; }; struct asus_drvdata { unsigned long quirks; struct hid_device *hdev; struct input_dev *input; - struct input_dev *tp_kbd_input; struct asus_kbd_leds *kbd_backlight; const struct asus_touchpad_info *tp; bool enable_backlight; @@ -132,7 +126,6 @@ static const struct asus_touchpad_info asus_i2c_tp = { .max_y = 1758, .contact_size = 5, .max_contacts = 5, - .report_size = 28 /* 2 byte header + 5 * 5 + 1 byte footer */, }; static const struct asus_touchpad_info asus_t100ta_tp = { @@ -142,7 +135,6 @@ static const struct asus_touchpad_info asus_t100ta_tp = { .res_y = 27, /* units/mm */ .contact_size = 5, .max_contacts = 5, - .report_size = 28 /* 2 byte header + 5 * 5 + 1 byte footer */, }; static const struct asus_touchpad_info asus_t100ha_tp = { @@ -152,7 +144,6 @@ static const struct asus_touchpad_info asus_t100ha_tp = { .res_y = 29, /* units/mm */ .contact_size = 5, .max_contacts = 5, - .report_size = 28 /* 2 byte header + 5 * 5 + 1 byte footer */, }; static const struct asus_touchpad_info asus_t200ta_tp = { @@ -162,7 +153,6 @@ static const struct asus_touchpad_info asus_t200ta_tp = { .res_y = 28, /* units/mm */ .contact_size = 5, .max_contacts = 5, - .report_size = 28 /* 2 byte header + 5 * 5 + 1 byte footer */, }; static const struct asus_touchpad_info asus_t100chi_tp = { @@ -172,17 +162,6 @@ static const struct asus_touchpad_info asus_t100chi_tp = { .res_y = 29, /* units/mm */ .contact_size = 3, .max_contacts = 4, - .report_size = 15 /* 2 byte header + 3 * 4 + 1 byte footer */, -}; - -static const struct asus_touchpad_info medion_e1239t_tp = { - .max_x = 2640, - .max_y = 1380, - .res_x = 29, /* units/mm */ - .res_y = 28, /* units/mm */ - .contact_size = 5, - .max_contacts = 5, - .report_size = 32 /* 2 byte header + 5 * 5 + 5 byte footer */, }; static void asus_report_contact_down(struct asus_drvdata *drvdat, @@ -250,7 +229,7 @@ static int asus_report_input(struct asus_drvdata *drvdat, u8 *data, int size) int i, toolType = MT_TOOL_FINGER; u8 *contactData = data + 2; - if (size != drvdat->tp->report_size) + if (size != 3 + drvdat->tp->contact_size * drvdat->tp->max_contacts) return 0; for (i = 0; i < drvdat->tp->max_contacts; i++) { @@ -278,34 +257,6 @@ static int asus_report_input(struct asus_drvdata *drvdat, u8 *data, int size) return 1; } -static int asus_e1239t_event(struct asus_drvdata *drvdat, u8 *data, int size) -{ - if (size != 3) - return 0; - - /* Handle broken mute key which only sends press events */ - if (!drvdat->tp && - data[0] == 0x02 && data[1] == 0xe2 && data[2] == 0x00) { - input_report_key(drvdat->input, KEY_MUTE, 1); - input_sync(drvdat->input); - input_report_key(drvdat->input, KEY_MUTE, 0); - input_sync(drvdat->input); - return 1; - } - - /* Handle custom touchpad toggle key which only sends press events */ - if (drvdat->tp_kbd_input && - data[0] == 0x05 && data[1] == 0x02 && data[2] == 0x28) { - input_report_key(drvdat->tp_kbd_input, KEY_F21, 1); - input_sync(drvdat->tp_kbd_input); - input_report_key(drvdat->tp_kbd_input, KEY_F21, 0); - input_sync(drvdat->tp_kbd_input); - return 1; - } - - return 0; -} - static int asus_event(struct hid_device *hdev, struct hid_field *field, struct hid_usage *usage, __s32 value) { @@ -330,9 +281,6 @@ static int asus_raw_event(struct hid_device *hdev, if (drvdata->tp && data[0] == INPUT_REPORT_ID) return asus_report_input(drvdata, data, size); - if (drvdata->quirks & QUIRK_MEDION_E1239T) - return asus_e1239t_event(drvdata, data, size); - return 0; } @@ -398,42 +346,24 @@ static int asus_kbd_get_functions(struct hid_device *hdev, return ret; } -static void asus_schedule_work(struct asus_kbd_leds *led) -{ - unsigned long flags; - - spin_lock_irqsave(&led->lock, flags); - if (!led->removed) - schedule_work(&led->work); - spin_unlock_irqrestore(&led->lock, flags); -} - static void asus_kbd_backlight_set(struct led_classdev *led_cdev, enum led_brightness brightness) { struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds, cdev); - unsigned long flags; + if (led->brightness == brightness) + return; - spin_lock_irqsave(&led->lock, flags); led->brightness = brightness; - spin_unlock_irqrestore(&led->lock, flags); - - asus_schedule_work(led); + schedule_work(&led->work); } static enum led_brightness asus_kbd_backlight_get(struct led_classdev *led_cdev) { struct asus_kbd_leds *led = container_of(led_cdev, struct asus_kbd_leds, cdev); - enum led_brightness brightness; - unsigned long flags; - spin_lock_irqsave(&led->lock, flags); - brightness = led->brightness; - spin_unlock_irqrestore(&led->lock, flags); - - return brightness; + return led->brightness; } static void asus_kbd_backlight_work(struct work_struct *work) @@ -441,11 +371,11 @@ static void asus_kbd_backlight_work(struct work_struct *work) struct asus_kbd_leds *led = container_of(work, struct asus_kbd_leds, work); u8 buf[] = { FEATURE_KBD_REPORT_ID, 0xba, 0xc5, 0xc4, 0x00 }; int ret; - unsigned long flags; - spin_lock_irqsave(&led->lock, flags); + if (led->removed) + return; + buf[4] = led->brightness; - spin_unlock_irqrestore(&led->lock, flags); ret = asus_kbd_set_report(led->hdev, buf, sizeof(buf)); if (ret < 0) @@ -507,7 +437,6 @@ static int asus_kbd_register_leds(struct hid_device *hdev) drvdata->kbd_backlight->cdev.brightness_set = asus_kbd_backlight_set; drvdata->kbd_backlight->cdev.brightness_get = asus_kbd_backlight_get; INIT_WORK(&drvdata->kbd_backlight->work, asus_kbd_backlight_work); - spin_lock_init(&drvdata->kbd_backlight->lock); ret = devm_led_classdev_register(&hdev->dev, &drvdata->kbd_backlight->cdev); if (ret < 0) { @@ -686,21 +615,6 @@ static int asus_input_configured(struct hid_device *hdev, struct hid_input *hi) hi->report->id != T100CHI_MOUSE_REPORT_ID) return 0; - /* Handle MULTI_INPUT on E1239T mouse/touchpad USB interface */ - if (drvdata->tp && (drvdata->quirks & QUIRK_MEDION_E1239T)) { - switch (hi->report->id) { - case E1239T_TP_TOGGLE_REPORT_ID: - input_set_capability(input, EV_KEY, KEY_F21); - input->name = "Asus Touchpad Keys"; - drvdata->tp_kbd_input = input; - return 0; - case INPUT_REPORT_ID: - break; /* Touchpad report, handled below */ - default: - return 0; /* Ignore other reports */ - } - } - if (drvdata->tp) { int ret; @@ -780,6 +694,7 @@ static int asus_input_mapping(struct hid_device *hdev, /* ASUS-specific keyboard hotkeys */ if ((usage->hid & HID_USAGE_PAGE) == 0xff310000) { + set_bit(EV_REP, hi->input->evbit); switch (usage->hid & HID_USAGE) { case 0x10: asus_map_key_clear(KEY_BRIGHTNESSDOWN); break; case 0x20: asus_map_key_clear(KEY_BRIGHTNESSUP); break; @@ -822,11 +737,11 @@ static int asus_input_mapping(struct hid_device *hdev, if (drvdata->quirks & QUIRK_USE_KBD_BACKLIGHT) drvdata->enable_backlight = true; - set_bit(EV_REP, hi->input->evbit); return 1; } if ((usage->hid & HID_USAGE_PAGE) == HID_UP_MSVENDOR) { + set_bit(EV_REP, hi->input->evbit); switch (usage->hid & HID_USAGE) { case 0xff01: asus_map_key_clear(BTN_1); break; case 0xff02: asus_map_key_clear(BTN_2); break; @@ -849,7 +764,6 @@ static int asus_input_mapping(struct hid_device *hdev, return 0; } - set_bit(EV_REP, hi->input->evbit); return 1; } @@ -868,16 +782,6 @@ static int asus_input_mapping(struct hid_device *hdev, } } - /* - * The mute button is broken and only sends press events, we - * deal with this in our raw_event handler, so do not map it. - */ - if ((drvdata->quirks & QUIRK_MEDION_E1239T) && - usage->hid == (HID_UP_CONSUMER | 0xe2)) { - input_set_capability(hi->input, EV_KEY, KEY_MUTE); - return -1; - } - return 0; } @@ -973,19 +877,6 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) drvdata->tp = &asus_t100chi_tp; } - if ((drvdata->quirks & QUIRK_MEDION_E1239T) && - hid_is_using_ll_driver(hdev, &usb_hid_driver)) { - struct usb_host_interface *alt = - to_usb_interface(hdev->dev.parent)->altsetting; - - if (alt->desc.bInterfaceNumber == MEDION_E1239T_TPAD_INTF) { - /* For separate input-devs for tp and tp toggle key */ - hdev->quirks |= HID_QUIRK_MULTI_INPUT; - drvdata->quirks |= QUIRK_SKIP_INPUT_MAPPING; - drvdata->tp = &medion_e1239t_tp; - } - } - if (drvdata->quirks & QUIRK_NO_INIT_REPORTS) hdev->quirks |= HID_QUIRK_NO_INIT_REPORTS; @@ -1044,13 +935,9 @@ static int asus_probe(struct hid_device *hdev, const struct hid_device_id *id) static void asus_remove(struct hid_device *hdev) { struct asus_drvdata *drvdata = hid_get_drvdata(hdev); - unsigned long flags; if (drvdata->kbd_backlight) { - spin_lock_irqsave(&drvdata->kbd_backlight->lock, flags); drvdata->kbd_backlight->removed = true; - spin_unlock_irqrestore(&drvdata->kbd_backlight->lock, flags); - cancel_work_sync(&drvdata->kbd_backlight->work); } @@ -1169,8 +1056,7 @@ static const struct hid_device_id asus_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_JESS, USB_DEVICE_ID_ASUS_MD_5112) }, { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_ASUSTEK, USB_DEVICE_ID_ASUSTEK_T100CHI_KEYBOARD), QUIRK_T100CHI }, - { HID_USB_DEVICE(USB_VENDOR_ID_ITE, USB_DEVICE_ID_ITE_MEDION_E1239T), - QUIRK_MEDION_E1239T }, + { } }; MODULE_DEVICE_TABLE(hid, asus_devices);
diff --git a/drivers/hid/hid-betopff.c b/drivers/hid/hid-betopff.c index 25ed7b9..467d789 100644 --- a/drivers/hid/hid-betopff.c +++ b/drivers/hid/hid-betopff.c
@@ -60,6 +60,7 @@ static int betopff_init(struct hid_device *hid) struct list_head *report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; struct input_dev *dev; + int field_count = 0; int error; int i, j; @@ -85,21 +86,19 @@ static int betopff_init(struct hid_device *hid) * ----------------------------------------- * Do init them with default value. */ - if (report->maxfield < 4) { - hid_err(hid, "not enough fields in the report: %d\n", - report->maxfield); - return -ENODEV; - } for (i = 0; i < report->maxfield; i++) { - if (report->field[i]->report_count < 1) { - hid_err(hid, "no values in the field\n"); - return -ENODEV; - } for (j = 0; j < report->field[i]->report_count; j++) { report->field[i]->value[j] = 0x00; + field_count++; } } + if (field_count < 4) { + hid_err(hid, "not enough fields in the report: %d\n", + field_count); + return -ENODEV; + } + betopff = kzalloc(sizeof(*betopff), GFP_KERNEL); if (!betopff) return -ENOMEM;
diff --git a/drivers/hid/hid-bigbenff.c b/drivers/hid/hid-bigbenff.c index a02cb51..e8c5e3a 100644 --- a/drivers/hid/hid-bigbenff.c +++ b/drivers/hid/hid-bigbenff.c
@@ -174,7 +174,6 @@ static __u8 pid0902_rdesc_fixed[] = { struct bigben_device { struct hid_device *hid; struct hid_report *report; - spinlock_t lock; bool removed; u8 led_state; /* LED1 = 1 .. LED4 = 8 */ u8 right_motor_on; /* right motor off/on 0/1 */ @@ -185,39 +184,18 @@ struct bigben_device { struct work_struct worker; }; -static inline void bigben_schedule_work(struct bigben_device *bigben) -{ - unsigned long flags; - - spin_lock_irqsave(&bigben->lock, flags); - if (!bigben->removed) - schedule_work(&bigben->worker); - spin_unlock_irqrestore(&bigben->lock, flags); -} static void bigben_worker(struct work_struct *work) { struct bigben_device *bigben = container_of(work, struct bigben_device, worker); struct hid_field *report_field = bigben->report->field[0]; - bool do_work_led = false; - bool do_work_ff = false; - u8 *buf; - u32 len; - unsigned long flags; - buf = hid_alloc_report_buf(bigben->report, GFP_KERNEL); - if (!buf) + if (bigben->removed || !report_field) return; - len = hid_report_len(bigben->report); - - /* LED work */ - spin_lock_irqsave(&bigben->lock, flags); - if (bigben->work_led) { bigben->work_led = false; - do_work_led = true; report_field->value[0] = 0x01; /* 1 = led message */ report_field->value[1] = 0x08; /* reserved value, always 8 */ report_field->value[2] = bigben->led_state; @@ -226,22 +204,11 @@ static void bigben_worker(struct work_struct *work) report_field->value[5] = 0x00; /* padding */ report_field->value[6] = 0x00; /* padding */ report_field->value[7] = 0x00; /* padding */ - hid_output_report(bigben->report, buf); + hid_hw_request(bigben->hid, bigben->report, HID_REQ_SET_REPORT); } - spin_unlock_irqrestore(&bigben->lock, flags); - - if (do_work_led) { - hid_hw_raw_request(bigben->hid, bigben->report->id, buf, len, - bigben->report->type, HID_REQ_SET_REPORT); - } - - /* FF work */ - spin_lock_irqsave(&bigben->lock, flags); - if (bigben->work_ff) { bigben->work_ff = false; - do_work_ff = true; report_field->value[0] = 0x02; /* 2 = rumble effect message */ report_field->value[1] = 0x08; /* reserved value, always 8 */ report_field->value[2] = bigben->right_motor_on; @@ -250,17 +217,8 @@ static void bigben_worker(struct work_struct *work) report_field->value[5] = 0x00; /* padding */ report_field->value[6] = 0x00; /* padding */ report_field->value[7] = 0x00; /* padding */ - hid_output_report(bigben->report, buf); + hid_hw_request(bigben->hid, bigben->report, HID_REQ_SET_REPORT); } - - spin_unlock_irqrestore(&bigben->lock, flags); - - if (do_work_ff) { - hid_hw_raw_request(bigben->hid, bigben->report->id, buf, len, - bigben->report->type, HID_REQ_SET_REPORT); - } - - kfree(buf); } static int hid_bigben_play_effect(struct input_dev *dev, void *data, @@ -270,7 +228,6 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data, struct bigben_device *bigben = hid_get_drvdata(hid); u8 right_motor_on; u8 left_motor_force; - unsigned long flags; if (!bigben) { hid_err(hid, "no device data\n"); @@ -285,13 +242,10 @@ static int hid_bigben_play_effect(struct input_dev *dev, void *data, if (right_motor_on != bigben->right_motor_on || left_motor_force != bigben->left_motor_force) { - spin_lock_irqsave(&bigben->lock, flags); bigben->right_motor_on = right_motor_on; bigben->left_motor_force = left_motor_force; bigben->work_ff = true; - spin_unlock_irqrestore(&bigben->lock, flags); - - bigben_schedule_work(bigben); + schedule_work(&bigben->worker); } return 0; @@ -305,7 +259,6 @@ static void bigben_set_led(struct led_classdev *led, struct bigben_device *bigben = hid_get_drvdata(hid); int n; bool work; - unsigned long flags; if (!bigben) { hid_err(hid, "no device data\n"); @@ -314,7 +267,6 @@ static void bigben_set_led(struct led_classdev *led, for (n = 0; n < NUM_LEDS; n++) { if (led == bigben->leds[n]) { - spin_lock_irqsave(&bigben->lock, flags); if (value == LED_OFF) { work = (bigben->led_state & BIT(n)); bigben->led_state &= ~BIT(n); @@ -322,11 +274,10 @@ static void bigben_set_led(struct led_classdev *led, work = !(bigben->led_state & BIT(n)); bigben->led_state |= BIT(n); } - spin_unlock_irqrestore(&bigben->lock, flags); if (work) { bigben->work_led = true; - bigben_schedule_work(bigben); + schedule_work(&bigben->worker); } return; } @@ -356,12 +307,8 @@ static enum led_brightness bigben_get_led(struct led_classdev *led) static void bigben_remove(struct hid_device *hid) { struct bigben_device *bigben = hid_get_drvdata(hid); - unsigned long flags; - spin_lock_irqsave(&bigben->lock, flags); bigben->removed = true; - spin_unlock_irqrestore(&bigben->lock, flags); - cancel_work_sync(&bigben->worker); hid_hw_stop(hid); } @@ -371,6 +318,7 @@ static int bigben_probe(struct hid_device *hid, { struct bigben_device *bigben; struct hid_input *hidinput; + struct list_head *report_list; struct led_classdev *led; char *name; size_t name_sz; @@ -395,12 +343,9 @@ static int bigben_probe(struct hid_device *hid, return error; } - bigben->report = hid_validate_values(hid, HID_OUTPUT_REPORT, 0, 0, 8); - if (!bigben->report) { - hid_err(hid, "no output report found\n"); - error = -ENODEV; - goto error_hw_stop; - } + report_list = &hid->report_enum[HID_OUTPUT_REPORT].report_list; + bigben->report = list_entry(report_list->next, + struct hid_report, list); if (list_empty(&hid->inputs)) { hid_err(hid, "no inputs found\n"); @@ -412,7 +357,6 @@ static int bigben_probe(struct hid_device *hid, set_bit(FF_RUMBLE, hidinput->input->ffbit); INIT_WORK(&bigben->worker, bigben_worker); - spin_lock_init(&bigben->lock); error = input_ff_create_memless(hidinput->input, NULL, hid_bigben_play_effect); @@ -453,7 +397,7 @@ static int bigben_probe(struct hid_device *hid, bigben->left_motor_force = 0; bigben->work_led = true; bigben->work_ff = true; - bigben_schedule_work(bigben); + schedule_work(&bigben->worker); hid_info(hid, "LED and force feedback support for BigBen gamepad\n");
diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c index 7796fc0..c5d7785 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c
@@ -32,7 +32,6 @@ #include <linux/hiddev.h> #include <linux/hid-debug.h> #include <linux/hidraw.h> -#include <linux/uhid.h> #include "hid-ids.h" @@ -270,7 +269,6 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign { struct hid_report *report; struct hid_field *field; - unsigned int max_buffer_size = HID_MAX_BUFFER_SIZE; unsigned int usages; unsigned int offset; unsigned int i; @@ -301,11 +299,8 @@ static int hid_add_field(struct hid_parser *parser, unsigned report_type, unsign offset = report->size; report->size += parser->global.report_size * parser->global.report_count; - if (IS_ENABLED(CONFIG_UHID) && parser->device->ll_driver == &uhid_hid_driver) - max_buffer_size = UHID_DATA_MAX; - /* Total size check: Allow for possible report index byte */ - if (report->size > (max_buffer_size - 1) << 3) { + if (report->size > (HID_MAX_BUFFER_SIZE - 1) << 3) { hid_err(parser->device, "report is too long\n"); return -1; } @@ -997,8 +992,8 @@ struct hid_report *hid_validate_values(struct hid_device *hid, * Validating on id 0 means we should examine the first * report in the list. */ - report = list_first_entry_or_null( - &hid->report_enum[type].report_list, + report = list_entry( + hid->report_enum[type].report_list.next, struct hid_report, list); } else { report = hid->report_enum[type].report_id_hash[id]; @@ -1206,7 +1201,6 @@ int hid_open_report(struct hid_device *device) __u8 *end; __u8 *next; int ret; - int i; static int (*dispatch_type[])(struct hid_parser *parser, struct hid_item *item) = { hid_parser_main, @@ -1257,8 +1251,6 @@ int hid_open_report(struct hid_device *device) goto err; } device->collection_size = HID_DEFAULT_NUM_COLLECTIONS; - for (i = 0; i < HID_DEFAULT_NUM_COLLECTIONS; i++) - device->collection[i].parent_idx = -1; ret = -EINVAL; while ((next = fetch_item(start, end, &item)) != NULL) { @@ -1322,9 +1314,6 @@ static s32 snto32(__u32 value, unsigned n) if (!value || !n) return 0; - if (n > 32) - n = 32; - switch (n) { case 8: return ((__s8)value); case 16: return ((__s16)value); @@ -1761,7 +1750,6 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, struct hid_report_enum *report_enum = hid->report_enum + type; struct hid_report *report; struct hid_driver *hdrv; - int max_buffer_size = HID_MAX_BUFFER_SIZE; unsigned int a; u32 rsize, csize = size; u8 *cdata = data; @@ -1778,13 +1766,10 @@ int hid_report_raw_event(struct hid_device *hid, int type, u8 *data, u32 size, rsize = hid_compute_report_size(report); - if (IS_ENABLED(CONFIG_UHID) && hid->ll_driver == &uhid_hid_driver) - max_buffer_size = UHID_DATA_MAX; - - if (report_enum->numbered && rsize >= max_buffer_size) - rsize = max_buffer_size - 1; - else if (rsize > max_buffer_size) - rsize = max_buffer_size; + if (report_enum->numbered && rsize >= HID_MAX_BUFFER_SIZE) + rsize = HID_MAX_BUFFER_SIZE - 1; + else if (rsize > HID_MAX_BUFFER_SIZE) + rsize = HID_MAX_BUFFER_SIZE; if (csize < rsize) { dbg_hid("report %d is too short, (%d < %d)\n", report->id,
diff --git a/drivers/hid/hid-cp2112.c b/drivers/hid/hid-cp2112.c index 340408f..db1b55d 100644 --- a/drivers/hid/hid-cp2112.c +++ b/drivers/hid/hid-cp2112.c
@@ -787,11 +787,6 @@ static int cp2112_xfer(struct i2c_adapter *adap, u16 addr, data->word = le16_to_cpup((__le16 *)buf); break; case I2C_SMBUS_I2C_BLOCK_DATA: - if (read_length > I2C_SMBUS_BLOCK_MAX) { - ret = -EINVAL; - goto power_normal; - } - memcpy(data->block + 1, buf, read_length); break; case I2C_SMBUS_BLOCK_DATA:
diff --git a/drivers/hid/hid-debug.c b/drivers/hid/hid-debug.c index 0066eab..419d8de 100644 --- a/drivers/hid/hid-debug.c +++ b/drivers/hid/hid-debug.c
@@ -933,7 +933,6 @@ static const char *keys[KEY_MAX + 1] = { [KEY_VOICECOMMAND] = "VoiceCommand", [KEY_EMOJI_PICKER] = "EmojiPicker", [KEY_DICTATE] = "Dictate", - [KEY_MICMUTE] = "MicrophoneMute", [KEY_BRIGHTNESS_MIN] = "BrightnessMin", [KEY_BRIGHTNESS_MAX] = "BrightnessMax", [KEY_BRIGHTNESS_AUTO] = "BrightnessAuto",
diff --git a/drivers/hid/hid-hyperv.c b/drivers/hid/hid-hyperv.c index 5928e93..79a28fc 100644 --- a/drivers/hid/hid-hyperv.c +++ b/drivers/hid/hid-hyperv.c
@@ -492,7 +492,7 @@ static int mousevsc_probe(struct hv_device *device, ret = hid_add_device(hid_dev); if (ret) - goto probe_err2; + goto probe_err1; ret = hid_parse(hid_dev);
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 1c4cd62..39e0aee 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h
@@ -650,7 +650,6 @@ #define I2C_DEVICE_ID_ITE_LENOVO_LEGION_Y720 0x837a #define USB_DEVICE_ID_ITE_LENOVO_YOGA900 0x8396 #define USB_DEVICE_ID_ITE8595 0x8595 -#define USB_DEVICE_ID_ITE_MEDION_E1239T 0xce50 #define USB_VENDOR_ID_JABRA 0x0b0e #define USB_DEVICE_ID_JABRA_SPEAK_410 0x0412 @@ -819,7 +818,6 @@ #define USB_DEVICE_ID_MADCATZ_BEATPAD 0x4540 #define USB_DEVICE_ID_MADCATZ_RAT5 0x1705 #define USB_DEVICE_ID_MADCATZ_RAT9 0x1709 -#define USB_DEVICE_ID_MADCATZ_MMO7 0x1713 #define USB_VENDOR_ID_MCC 0x09db #define USB_DEVICE_ID_MCC_PMD1024LS 0x0076 @@ -865,7 +863,6 @@ #define USB_DEVICE_ID_MS_XBOX_ONE_S_CONTROLLER 0x02fd #define USB_DEVICE_ID_MS_PIXART_MOUSE 0x00cb #define USB_DEVICE_ID_8BITDO_SN30_PRO_PLUS 0x02e0 -#define USB_DEVICE_ID_MS_MOUSE_0783 0x0783 #define USB_VENDOR_ID_MOJO 0x8282 #define USB_DEVICE_ID_RETRO_ADAPTER 0x3201 @@ -941,10 +938,7 @@ #define USB_DEVICE_ID_ORTEK_IHOME_IMAC_A210S 0x8003 #define USB_VENDOR_ID_PLANTRONICS 0x047f -#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3210_SERIES 0xc055 #define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES 0xc056 -#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES 0xc057 -#define USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES 0xc058 #define USB_VENDOR_ID_PANASONIC 0x04da #define USB_DEVICE_ID_PANABOARD_UBT780 0x1044 @@ -1083,7 +1077,6 @@ #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_2 0x09cc #define USB_DEVICE_ID_SONY_PS4_CONTROLLER_DONGLE 0x0ba0 #define USB_DEVICE_ID_SONY_PS5_CONTROLLER 0x0ce6 -#define USB_DEVICE_ID_SONY_PS5_CONTROLLER_2 0x0df2 #define USB_DEVICE_ID_SONY_MOTION_CONTROLLER 0x03d5 #define USB_DEVICE_ID_SONY_NAVIGATION_CONTROLLER 0x042f #define USB_DEVICE_ID_SONY_BUZZ_CONTROLLER 0x0002 @@ -1148,9 +1141,7 @@ #define USB_DEVICE_ID_SYNAPTICS_DELL_K12A 0x2819 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_012 0x2968 #define USB_DEVICE_ID_SYNAPTICS_TP_V103 0x5710 -#define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1002 0x73f4 #define USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003 0x73f5 -#define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_017 0x73f6 #define USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5 0x81a7 #define USB_VENDOR_ID_TEXAS_INSTRUMENTS 0x2047 @@ -1304,7 +1295,6 @@ #define USB_VENDOR_ID_PRIMAX 0x0461 #define USB_DEVICE_ID_PRIMAX_MOUSE_4D22 0x4d22 -#define USB_DEVICE_ID_PRIMAX_MOUSE_4E2A 0x4e2a #define USB_DEVICE_ID_PRIMAX_KEYBOARD 0x4e05 #define USB_DEVICE_ID_PRIMAX_REZEL 0x4e72 #define USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F 0x4d0f
diff --git a/drivers/hid/hid-input.c b/drivers/hid/hid-input.c index 004aa3c..d1ba6fa 100644 --- a/drivers/hid/hid-input.c +++ b/drivers/hid/hid-input.c
@@ -671,14 +671,6 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel break; } - if ((usage->hid & 0xf0) == 0xa0) { /* SystemControl */ - switch (usage->hid & 0xf) { - case 0x9: map_key_clear(KEY_MICMUTE); break; - default: goto ignore; - } - break; - } - if ((usage->hid & 0xf0) == 0xb0) { /* SC - Display */ switch (usage->hid & 0xf) { case 0x05: map_key_clear(KEY_SWITCHVIDEOMODE); break;
diff --git a/drivers/hid/hid-ite.c b/drivers/hid/hid-ite.c index b8cce9c..742c052 100644 --- a/drivers/hid/hid-ite.c +++ b/drivers/hid/hid-ite.c
@@ -18,21 +18,10 @@ static __u8 *ite_report_fixup(struct hid_device *hdev, __u8 *rdesc, unsigned int unsigned long quirks = (unsigned long)hid_get_drvdata(hdev); if (quirks & QUIRK_TOUCHPAD_ON_OFF_REPORT) { - /* For Acer Aspire Switch 10 SW5-012 keyboard-dock */ if (*rsize == 188 && rdesc[162] == 0x81 && rdesc[163] == 0x02) { - hid_info(hdev, "Fixing up Acer Sw5-012 ITE keyboard report descriptor\n"); + hid_info(hdev, "Fixing up ITE keyboard report descriptor\n"); rdesc[163] = HID_MAIN_ITEM_RELATIVE; } - /* For Acer One S1002/S1003 keyboard-dock */ - if (*rsize == 188 && rdesc[185] == 0x81 && rdesc[186] == 0x02) { - hid_info(hdev, "Fixing up Acer S1002/S1003 ITE keyboard report descriptor\n"); - rdesc[186] = HID_MAIN_ITEM_RELATIVE; - } - /* For Acer Aspire Switch 10E (SW3-016) keyboard-dock */ - if (*rsize == 210 && rdesc[184] == 0x81 && rdesc[185] == 0x02) { - hid_info(hdev, "Fixing up Acer Aspire Switch 10E (SW3-016) ITE keyboard report descriptor\n"); - rdesc[185] = HID_MAIN_ITEM_RELATIVE; - } } return rdesc; @@ -114,18 +103,7 @@ static const struct hid_device_id ite_devices[] = { /* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */ { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, USB_VENDOR_ID_SYNAPTICS, - USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1002), - .driver_data = QUIRK_TOUCHPAD_ON_OFF_REPORT }, - /* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */ - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, - USB_VENDOR_ID_SYNAPTICS, - USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003), - .driver_data = QUIRK_TOUCHPAD_ON_OFF_REPORT }, - /* ITE8910 USB kbd ctlr, with Synaptics touchpad connected to it. */ - { HID_DEVICE(BUS_USB, HID_GROUP_GENERIC, - USB_VENDOR_ID_SYNAPTICS, - USB_DEVICE_ID_SYNAPTICS_ACER_SWITCH5_017), - .driver_data = QUIRK_TOUCHPAD_ON_OFF_REPORT }, + USB_DEVICE_ID_SYNAPTICS_ACER_ONE_S1003) }, { } }; MODULE_DEVICE_TABLE(hid, ite_devices);
diff --git a/drivers/hid/hid-lg4ff.c b/drivers/hid/hid-lg4ff.c index e3fcf13..5e6a0ce 100644 --- a/drivers/hid/hid-lg4ff.c +++ b/drivers/hid/hid-lg4ff.c
@@ -872,12 +872,6 @@ static ssize_t lg4ff_alternate_modes_store(struct device *dev, struct device_att return -ENOMEM; i = strlen(lbuf); - - if (i == 0) { - kfree(lbuf); - return -EINVAL; - } - if (lbuf[i-1] == '\n') { if (i == 1) { kfree(lbuf);
diff --git a/drivers/hid/hid-magicmouse.c b/drivers/hid/hid-magicmouse.c index 28158d2..fc4c074 100644 --- a/drivers/hid/hid-magicmouse.c +++ b/drivers/hid/hid-magicmouse.c
@@ -387,7 +387,7 @@ static int magicmouse_raw_event(struct hid_device *hdev, magicmouse_raw_event(hdev, report, data + 2, data[1]); magicmouse_raw_event(hdev, report, data + 2 + data[1], size - 2 - data[1]); - return 0; + break; default: return 0; }
diff --git a/drivers/hid/hid-multitouch.c b/drivers/hid/hid-multitouch.c index 9db3276..653f436 100644 --- a/drivers/hid/hid-multitouch.c +++ b/drivers/hid/hid-multitouch.c
@@ -1162,7 +1162,7 @@ static void mt_touch_report(struct hid_device *hid, int contact_count = -1; /* sticky fingers release in progress, abort */ - if (test_and_set_bit_lock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags)) + if (test_and_set_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags)) return; scantime = *app->scantime; @@ -1243,7 +1243,7 @@ static void mt_touch_report(struct hid_device *hid, del_timer(&td->release_timer); } - clear_bit_unlock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags); + clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags); } static int mt_touch_input_configured(struct hid_device *hdev, @@ -1680,11 +1680,11 @@ static void mt_expired_timeout(struct timer_list *t) * An input report came in just before we release the sticky fingers, * it will take care of the sticky fingers. */ - if (test_and_set_bit_lock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags)) + if (test_and_set_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags)) return; if (test_bit(MT_IO_FLAGS_PENDING_SLOTS, &td->mt_io_flags)) mt_release_contacts(hdev); - clear_bit_unlock(MT_IO_FLAGS_RUNNING, &td->mt_io_flags); + clear_bit(MT_IO_FLAGS_RUNNING, &td->mt_io_flags); } static int mt_probe(struct hid_device *hdev, const struct hid_device_id *id) @@ -1953,10 +1953,6 @@ static const struct hid_device_id mt_devices[] = { HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, USB_VENDOR_ID_ELAN, 0x313a) }, - { .driver_data = MT_CLS_WIN_8_FORCE_MULTI_INPUT, - HID_DEVICE(BUS_I2C, HID_GROUP_MULTITOUCH_WIN_8, - USB_VENDOR_ID_ELAN, 0x3148) }, - /* Elitegroup panel */ { .driver_data = MT_CLS_SERIAL, MT_USB_DEVICE(USB_VENDOR_ID_ELITEGROUP,
diff --git a/drivers/hid/hid-plantronics.c b/drivers/hid/hid-plantronics.c index 3d414ae..e81b7ce 100644 --- a/drivers/hid/hid-plantronics.c +++ b/drivers/hid/hid-plantronics.c
@@ -199,17 +199,8 @@ static int plantronics_probe(struct hid_device *hdev, static const struct hid_device_id plantronics_devices[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, - USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3210_SERIES), - .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, - { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3220_SERIES), .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, - { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, - USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3215_SERIES), - .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, - { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, - USB_DEVICE_ID_PLANTRONICS_BLACKWIRE_3225_SERIES), - .driver_data = PLT_QUIRK_DOUBLE_VOLUME_KEYS }, { HID_USB_DEVICE(USB_VENDOR_ID_PLANTRONICS, HID_ANY_ID) }, { } };
diff --git a/drivers/hid/hid-playstation.c b/drivers/hid/hid-playstation.c index 954f8c2..1c92164 100644 --- a/drivers/hid/hid-playstation.c +++ b/drivers/hid/hid-playstation.c
@@ -11,8 +11,6 @@ #include <linux/hid.h> #include <linux/idr.h> #include <linux/input/mt.h> -#include <linux/leds.h> -#include <linux/led-class-multicolor.h> #include <linux/module.h> #include <asm/unaligned.h> @@ -40,13 +38,11 @@ struct ps_device { uint8_t battery_capacity; int battery_status; - const char *input_dev_name; /* Name of primary input device. */ uint8_t mac_address[6]; /* Note: stored in little endian order. */ uint32_t hw_version; uint32_t fw_version; int (*parse_report)(struct ps_device *dev, struct hid_report *report, u8 *data, int size); - void (*remove)(struct ps_device *dev); }; /* Calibration data for playstation motion sensors. */ @@ -57,13 +53,6 @@ struct ps_calibration_data { int sens_denom; }; -struct ps_led_info { - const char *name; - const char *color; - enum led_brightness (*brightness_get)(struct led_classdev *cdev); - int (*brightness_set)(struct led_classdev *cdev, enum led_brightness); -}; - /* Seed values for DualShock4 / DualSense CRC32 for different report types. */ #define PS_INPUT_CRC32_SEED 0xA1 #define PS_OUTPUT_CRC32_SEED 0xA2 @@ -108,9 +97,6 @@ struct ps_led_info { #define DS_STATUS_CHARGING GENMASK(7, 4) #define DS_STATUS_CHARGING_SHIFT 4 -/* Feature version from DualSense Firmware Info report. */ -#define DS_FEATURE_VERSION(major, minor) ((major & 0xff) << 8 | (minor & 0xff)) - /* * Status of a DualSense touch point contact. * Contact IDs, with highest bit set are 'inactive' @@ -129,7 +115,6 @@ struct ps_led_info { #define DS_OUTPUT_VALID_FLAG1_RELEASE_LEDS BIT(3) #define DS_OUTPUT_VALID_FLAG1_PLAYER_INDICATOR_CONTROL_ENABLE BIT(4) #define DS_OUTPUT_VALID_FLAG2_LIGHTBAR_SETUP_CONTROL_ENABLE BIT(1) -#define DS_OUTPUT_VALID_FLAG2_COMPATIBLE_VIBRATION2 BIT(2) #define DS_OUTPUT_POWER_SAVE_CONTROL_MIC_MUTE BIT(4) #define DS_OUTPUT_LIGHTBAR_SETUP_LIGHT_OUT BIT(1) @@ -147,9 +132,6 @@ struct dualsense { struct input_dev *sensors; struct input_dev *touchpad; - /* Update version is used as a feature/capability version. */ - uint16_t update_version; - /* Calibration data for accelerometer and gyroscope. */ struct ps_calibration_data accel_calib_data[3]; struct ps_calibration_data gyro_calib_data[3]; @@ -160,13 +142,11 @@ struct dualsense { uint32_t sensor_timestamp_us; /* Compatible rumble state */ - bool use_vibration_v2; bool update_rumble; uint8_t motor_left; uint8_t motor_right; /* RGB lightbar */ - struct led_classdev_mc lightbar; bool update_lightbar; uint8_t lightbar_red; uint8_t lightbar_green; @@ -183,7 +163,6 @@ struct dualsense { struct led_classdev player_leds[5]; struct work_struct output_worker; - bool output_worker_initialized; void *output_report_dmabuf; uint8_t output_seq; /* Sequence number for output report. */ }; @@ -309,9 +288,6 @@ static const struct {int x; int y; } ps_gamepad_hat_mapping[] = { {0, 0}, }; -static inline void dualsense_schedule_work(struct dualsense *ds); -static void dualsense_set_lightbar(struct dualsense *ds, uint8_t red, uint8_t green, uint8_t blue); - /* * Add a new ps_device to ps_devices if it doesn't exist. * Return error on duplicate device, which can happen if the same @@ -549,71 +525,6 @@ static int ps_get_report(struct hid_device *hdev, uint8_t report_id, uint8_t *bu return 0; } -static int ps_led_register(struct ps_device *ps_dev, struct led_classdev *led, - const struct ps_led_info *led_info) -{ - int ret; - - led->name = devm_kasprintf(&ps_dev->hdev->dev, GFP_KERNEL, - "%s:%s:%s", ps_dev->input_dev_name, led_info->color, led_info->name); - - if (!led->name) - return -ENOMEM; - - led->brightness = 0; - led->max_brightness = 1; - led->flags = LED_CORE_SUSPENDRESUME; - led->brightness_get = led_info->brightness_get; - led->brightness_set_blocking = led_info->brightness_set; - - ret = devm_led_classdev_register(&ps_dev->hdev->dev, led); - if (ret) { - hid_err(ps_dev->hdev, "Failed to register LED %s: %d\n", led_info->name, ret); - return ret; - } - - return 0; -} - -/* Register a DualSense/DualShock4 RGB lightbar represented by a multicolor LED. */ -static int ps_lightbar_register(struct ps_device *ps_dev, struct led_classdev_mc *lightbar_mc_dev, - int (*brightness_set)(struct led_classdev *, enum led_brightness)) -{ - struct hid_device *hdev = ps_dev->hdev; - struct mc_subled *mc_led_info; - struct led_classdev *led_cdev; - int ret; - - mc_led_info = devm_kmalloc_array(&hdev->dev, 3, sizeof(*mc_led_info), - GFP_KERNEL | __GFP_ZERO); - if (!mc_led_info) - return -ENOMEM; - - mc_led_info[0].color_index = LED_COLOR_ID_RED; - mc_led_info[1].color_index = LED_COLOR_ID_GREEN; - mc_led_info[2].color_index = LED_COLOR_ID_BLUE; - - lightbar_mc_dev->subled_info = mc_led_info; - lightbar_mc_dev->num_colors = 3; - - led_cdev = &lightbar_mc_dev->led_cdev; - led_cdev->name = devm_kasprintf(&hdev->dev, GFP_KERNEL, "%s:rgb:indicator", - ps_dev->input_dev_name); - if (!led_cdev->name) - return -ENOMEM; - led_cdev->brightness = 255; - led_cdev->max_brightness = 255; - led_cdev->brightness_set_blocking = brightness_set; - - ret = devm_led_classdev_multicolor_register(&hdev->dev, lightbar_mc_dev); - if (ret < 0) { - hid_err(hdev, "Cannot register multicolor LED device\n"); - return ret; - } - - return 0; -} - static struct input_dev *ps_sensors_create(struct hid_device *hdev, int accel_range, int accel_res, int gyro_range, int gyro_res) { @@ -703,12 +614,15 @@ static ssize_t hardware_version_show(struct device *dev, static DEVICE_ATTR_RO(hardware_version); -static struct attribute *ps_device_attrs[] = { +static struct attribute *ps_device_attributes[] = { &dev_attr_firmware_version.attr, &dev_attr_hardware_version.attr, NULL }; -ATTRIBUTE_GROUPS(ps_device); + +static const struct attribute_group ps_device_attribute_group = { + .attrs = ps_device_attributes, +}; static int dualsense_get_calibration_data(struct dualsense *ds) { @@ -800,7 +714,6 @@ static int dualsense_get_calibration_data(struct dualsense *ds) return ret; } - static int dualsense_get_firmware_info(struct dualsense *ds) { uint8_t *buf; @@ -820,15 +733,6 @@ static int dualsense_get_firmware_info(struct dualsense *ds) ds->base.hw_version = get_unaligned_le32(&buf[24]); ds->base.fw_version = get_unaligned_le32(&buf[28]); - /* Update version is some kind of feature version. It is distinct from - * the firmware version as there can be many different variations of a - * controller over time with the same physical shell, but with different - * PCBs and other internal changes. The update version (internal name) is - * used as a means to detect what features are available and change behavior. - * Note: the version is different between DualSense and DualSense Edge. - */ - ds->update_version = get_unaligned_le16(&buf[44]); - err_free: kfree(buf); return ret; @@ -857,53 +761,6 @@ static int dualsense_get_mac_address(struct dualsense *ds) return ret; } -static int dualsense_lightbar_set_brightness(struct led_classdev *cdev, - enum led_brightness brightness) -{ - struct led_classdev_mc *mc_cdev = lcdev_to_mccdev(cdev); - struct dualsense *ds = container_of(mc_cdev, struct dualsense, lightbar); - uint8_t red, green, blue; - - led_mc_calc_color_components(mc_cdev, brightness); - red = mc_cdev->subled_info[0].brightness; - green = mc_cdev->subled_info[1].brightness; - blue = mc_cdev->subled_info[2].brightness; - - dualsense_set_lightbar(ds, red, green, blue); - return 0; -} - -static enum led_brightness dualsense_player_led_get_brightness(struct led_classdev *led) -{ - struct hid_device *hdev = to_hid_device(led->dev->parent); - struct dualsense *ds = hid_get_drvdata(hdev); - - return !!(ds->player_leds_state & BIT(led - ds->player_leds)); -} - -static int dualsense_player_led_set_brightness(struct led_classdev *led, enum led_brightness value) -{ - struct hid_device *hdev = to_hid_device(led->dev->parent); - struct dualsense *ds = hid_get_drvdata(hdev); - unsigned long flags; - unsigned int led_index; - - spin_lock_irqsave(&ds->base.lock, flags); - - led_index = led - ds->player_leds; - if (value == LED_OFF) - ds->player_leds_state &= ~BIT(led_index); - else - ds->player_leds_state |= BIT(led_index); - - ds->update_player_leds = true; - spin_unlock_irqrestore(&ds->base.lock, flags); - - dualsense_schedule_work(ds); - - return 0; -} - static void dualsense_init_output_report(struct dualsense *ds, struct dualsense_output_report *rp, void *buf) { @@ -943,16 +800,6 @@ static void dualsense_init_output_report(struct dualsense *ds, struct dualsense_ } } -static inline void dualsense_schedule_work(struct dualsense *ds) -{ - unsigned long flags; - - spin_lock_irqsave(&ds->base.lock, flags); - if (ds->output_worker_initialized) - schedule_work(&ds->output_worker); - spin_unlock_irqrestore(&ds->base.lock, flags); -} - /* * Helper function to send DualSense output reports. Applies a CRC at the end of a report * for Bluetooth reports. @@ -991,10 +838,7 @@ static void dualsense_output_worker(struct work_struct *work) if (ds->update_rumble) { /* Select classic rumble style haptics and enable it. */ common->valid_flag0 |= DS_OUTPUT_VALID_FLAG0_HAPTICS_SELECT; - if (ds->use_vibration_v2) - common->valid_flag2 |= DS_OUTPUT_VALID_FLAG2_COMPATIBLE_VIBRATION2; - else - common->valid_flag0 |= DS_OUTPUT_VALID_FLAG0_COMPATIBLE_VIBRATION; + common->valid_flag0 |= DS_OUTPUT_VALID_FLAG0_COMPATIBLE_VIBRATION; common->motor_left = ds->motor_left; common->motor_right = ds->motor_right; ds->update_rumble = false; @@ -1116,7 +960,7 @@ static int dualsense_parse_report(struct ps_device *ps_dev, struct hid_report *r spin_unlock_irqrestore(&ps_dev->lock, flags); /* Schedule updating of microphone state at hardware level. */ - dualsense_schedule_work(ds); + schedule_work(&ds->output_worker); } ds->last_btn_mic_state = btn_mic_state; @@ -1231,22 +1075,10 @@ static int dualsense_play_effect(struct input_dev *dev, void *data, struct ff_ef ds->motor_right = effect->u.rumble.weak_magnitude / 256; spin_unlock_irqrestore(&ds->base.lock, flags); - dualsense_schedule_work(ds); + schedule_work(&ds->output_worker); return 0; } -static void dualsense_remove(struct ps_device *ps_dev) -{ - struct dualsense *ds = container_of(ps_dev, struct dualsense, base); - unsigned long flags; - - spin_lock_irqsave(&ds->base.lock, flags); - ds->output_worker_initialized = false; - spin_unlock_irqrestore(&ds->base.lock, flags); - - cancel_work_sync(&ds->output_worker); -} - static int dualsense_reset_leds(struct dualsense *ds) { struct dualsense_output_report report; @@ -1274,16 +1106,12 @@ static int dualsense_reset_leds(struct dualsense *ds) static void dualsense_set_lightbar(struct dualsense *ds, uint8_t red, uint8_t green, uint8_t blue) { - unsigned long flags; - - spin_lock_irqsave(&ds->base.lock, flags); ds->update_lightbar = true; ds->lightbar_red = red; ds->lightbar_green = green; ds->lightbar_blue = blue; - spin_unlock_irqrestore(&ds->base.lock, flags); - dualsense_schedule_work(ds); + schedule_work(&ds->output_worker); } static void dualsense_set_player_leds(struct dualsense *ds) @@ -1306,7 +1134,7 @@ static void dualsense_set_player_leds(struct dualsense *ds) ds->update_player_leds = true; ds->player_leds_state = player_ids[player_id]; - dualsense_schedule_work(ds); + schedule_work(&ds->output_worker); } static struct ps_device *dualsense_create(struct hid_device *hdev) @@ -1314,20 +1142,7 @@ static struct ps_device *dualsense_create(struct hid_device *hdev) struct dualsense *ds; struct ps_device *ps_dev; uint8_t max_output_report_size; - int i, ret; - - static const struct ps_led_info player_leds_info[] = { - { LED_FUNCTION_PLAYER1, "white", dualsense_player_led_get_brightness, - dualsense_player_led_set_brightness }, - { LED_FUNCTION_PLAYER2, "white", dualsense_player_led_get_brightness, - dualsense_player_led_set_brightness }, - { LED_FUNCTION_PLAYER3, "white", dualsense_player_led_get_brightness, - dualsense_player_led_set_brightness }, - { LED_FUNCTION_PLAYER4, "white", dualsense_player_led_get_brightness, - dualsense_player_led_set_brightness }, - { LED_FUNCTION_PLAYER5, "white", dualsense_player_led_get_brightness, - dualsense_player_led_set_brightness } - }; + int ret; ds = devm_kzalloc(&hdev->dev, sizeof(*ds), GFP_KERNEL); if (!ds) @@ -1345,9 +1160,7 @@ static struct ps_device *dualsense_create(struct hid_device *hdev) ps_dev->battery_capacity = 100; /* initial value until parse_report. */ ps_dev->battery_status = POWER_SUPPLY_STATUS_UNKNOWN; ps_dev->parse_report = dualsense_parse_report; - ps_dev->remove = dualsense_remove; INIT_WORK(&ds->output_worker, dualsense_output_worker); - ds->output_worker_initialized = true; hid_set_drvdata(hdev, ds); max_output_report_size = sizeof(struct dualsense_output_report_bt); @@ -1368,21 +1181,6 @@ static struct ps_device *dualsense_create(struct hid_device *hdev) return ERR_PTR(ret); } - /* Original DualSense firmware simulated classic controller rumble through - * its new haptics hardware. It felt different from classic rumble users - * were used to. Since then new firmwares were introduced to change behavior - * and make this new 'v2' behavior default on PlayStation and other platforms. - * The original DualSense requires a new enough firmware as bundled with PS5 - * software released in 2021. DualSense edge supports it out of the box. - * Both devices also support the old mode, but it is not really used. - */ - if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER) { - /* Feature version 2.21 introduced new vibration method. */ - ds->use_vibration_v2 = ds->update_version >= DS_FEATURE_VERSION(2, 21); - } else if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) { - ds->use_vibration_v2 = true; - } - ret = ps_devices_list_add(ps_dev); if (ret) return ERR_PTR(ret); @@ -1398,8 +1196,6 @@ static struct ps_device *dualsense_create(struct hid_device *hdev) ret = PTR_ERR(ds->gamepad); goto err; } - /* Use gamepad input device name as primary device name for e.g. LEDs */ - ps_dev->input_dev_name = dev_name(&ds->gamepad->dev); ds->sensors = ps_sensors_create(hdev, DS_ACC_RANGE, DS_ACC_RES_PER_G, DS_GYRO_RANGE, DS_GYRO_RES_PER_DEG_S); @@ -1427,21 +1223,8 @@ static struct ps_device *dualsense_create(struct hid_device *hdev) if (ret) goto err; - ret = ps_lightbar_register(ps_dev, &ds->lightbar, dualsense_lightbar_set_brightness); - if (ret) - goto err; - - /* Set default lightbar color. */ dualsense_set_lightbar(ds, 0, 0, 128); /* blue */ - for (i = 0; i < ARRAY_SIZE(player_leds_info); i++) { - const struct ps_led_info *led_info = &player_leds_info[i]; - - ret = ps_led_register(ps_dev, &ds->player_leds[i], led_info); - if (ret < 0) - goto err; - } - ret = ps_device_set_player_id(ps_dev); if (ret) { hid_err(hdev, "Failed to assign player id for DualSense: %d\n", ret); @@ -1499,8 +1282,7 @@ static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id) goto err_stop; } - if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER || - hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) { + if (hdev->product == USB_DEVICE_ID_SONY_PS5_CONTROLLER) { dev = dualsense_create(hdev); if (IS_ERR(dev)) { hid_err(hdev, "Failed to create dualsense.\n"); @@ -1509,6 +1291,12 @@ static int ps_probe(struct hid_device *hdev, const struct hid_device_id *id) } } + ret = devm_device_add_group(&hdev->dev, &ps_device_attribute_group); + if (ret) { + hid_err(hdev, "Failed to register sysfs nodes.\n"); + goto err_close; + } + return ret; err_close: @@ -1525,9 +1313,6 @@ static void ps_remove(struct hid_device *hdev) ps_devices_list_remove(dev); ps_device_release_player_id(dev); - if (dev->remove) - dev->remove(dev); - hid_hw_close(hdev); hid_hw_stop(hdev); } @@ -1535,8 +1320,6 @@ static void ps_remove(struct hid_device *hdev) static const struct hid_device_id ps_devices[] = { { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER) }, { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER) }, - { HID_BLUETOOTH_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) }, - { HID_USB_DEVICE(USB_VENDOR_ID_SONY, USB_DEVICE_ID_SONY_PS5_CONTROLLER_2) }, { } }; MODULE_DEVICE_TABLE(hid, ps_devices); @@ -1547,9 +1330,6 @@ static struct hid_driver ps_driver = { .probe = ps_probe, .remove = ps_remove, .raw_event = ps_raw_event, - .driver = { - .dev_groups = ps_device_groups, - }, }; static int __init ps_init(void)
diff --git a/drivers/hid/hid-quirks.c b/drivers/hid/hid-quirks.c index e5dcc47..45eba22 100644 --- a/drivers/hid/hid-quirks.c +++ b/drivers/hid/hid-quirks.c
@@ -122,7 +122,6 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C05A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_LOGITECH, USB_DEVICE_ID_LOGITECH_MOUSE_C06A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MCS, USB_DEVICE_ID_MCS_GAMEPADBLOCK), HID_QUIRK_MULTI_INPUT }, - { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_MOUSE_0783), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_PIXART_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_SURFACE3_COVER), HID_QUIRK_NO_INIT_REPORTS }, @@ -147,7 +146,6 @@ static const struct hid_device_id hid_quirks[] = { { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_OPTICAL_TOUCH_SCREEN), HID_QUIRK_NO_INIT_REPORTS }, { HID_USB_DEVICE(USB_VENDOR_ID_PIXART, USB_DEVICE_ID_PIXART_USB_OPTICAL_MOUSE), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4D22), HID_QUIRK_ALWAYS_POLL }, - { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_MOUSE_4E2A), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D0F), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4D65), HID_QUIRK_ALWAYS_POLL }, { HID_USB_DEVICE(USB_VENDOR_ID_PRIMAX, USB_DEVICE_ID_PRIMAX_PIXART_MOUSE_4E22), HID_QUIRK_ALWAYS_POLL }, @@ -617,7 +615,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT5) }, { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_RAT9) }, - { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7) }, #endif #if IS_ENABLED(CONFIG_HID_SAMSUNG) { HID_USB_DEVICE(USB_VENDOR_ID_SAMSUNG, USB_DEVICE_ID_SAMSUNG_IR_REMOTE) },
diff --git a/drivers/hid/hid-roccat.c b/drivers/hid/hid-roccat.c index 6da80e4..26373b8 100644 --- a/drivers/hid/hid-roccat.c +++ b/drivers/hid/hid-roccat.c
@@ -257,8 +257,6 @@ int roccat_report_event(int minor, u8 const *data) if (!new_value) return -ENOMEM; - mutex_lock(&device->cbuf_lock); - report = &device->cbuf[device->cbuf_end]; /* passing NULL is safe */ @@ -278,8 +276,6 @@ int roccat_report_event(int minor, u8 const *data) reader->cbuf_start = (reader->cbuf_start + 1) % ROCCAT_CBUF_SIZE; } - mutex_unlock(&device->cbuf_lock); - wake_up_interruptible(&device->wait); return 0; }
diff --git a/drivers/hid/hid-saitek.c b/drivers/hid/hid-saitek.c index b84e975..c7bf14c 100644 --- a/drivers/hid/hid-saitek.c +++ b/drivers/hid/hid-saitek.c
@@ -187,8 +187,6 @@ static const struct hid_device_id saitek_devices[] = { .driver_data = SAITEK_RELEASE_MODE_RAT7 }, { HID_USB_DEVICE(USB_VENDOR_ID_SAITEK, USB_DEVICE_ID_SAITEK_MMO7), .driver_data = SAITEK_RELEASE_MODE_MMO7 }, - { HID_USB_DEVICE(USB_VENDOR_ID_MADCATZ, USB_DEVICE_ID_MADCATZ_MMO7), - .driver_data = SAITEK_RELEASE_MODE_MMO7 }, { } };
diff --git a/drivers/hid/hid-sensor-custom.c b/drivers/hid/hid-sensor-custom.c index 825f011..fb827c2 100644 --- a/drivers/hid/hid-sensor-custom.c +++ b/drivers/hid/hid-sensor-custom.c
@@ -59,7 +59,7 @@ struct hid_sensor_sample { u32 raw_len; } __packed; -static struct attribute hid_custom_attrs[HID_CUSTOM_TOTAL_ATTRS] = { +static struct attribute hid_custom_attrs[] = { {.name = "name", .mode = S_IRUGO}, {.name = "units", .mode = S_IRUGO}, {.name = "unit-expo", .mode = S_IRUGO},
diff --git a/drivers/hid/hid-uclogic-core.c b/drivers/hid/hid-uclogic-core.c index e4811d3..4edb241 100644 --- a/drivers/hid/hid-uclogic-core.c +++ b/drivers/hid/hid-uclogic-core.c
@@ -172,7 +172,6 @@ static int uclogic_probe(struct hid_device *hdev, * than the pen, so use QUIRK_MULTI_INPUT for all tablets. */ hdev->quirks |= HID_QUIRK_MULTI_INPUT; - hdev->quirks |= HID_QUIRK_HIDINPUT_FORCE; /* Allocate and assign driver data */ drvdata = devm_kzalloc(&hdev->dev, sizeof(*drvdata), GFP_KERNEL);
diff --git a/drivers/hid/hidraw.c b/drivers/hid/hidraw.c index f8ef626..b382c6b 100644 --- a/drivers/hid/hidraw.c +++ b/drivers/hid/hidraw.c
@@ -346,13 +346,10 @@ static int hidraw_release(struct inode * inode, struct file * file) unsigned int minor = iminor(inode); struct hidraw_list *list = file->private_data; unsigned long flags; - int i; mutex_lock(&minors_lock); spin_lock_irqsave(&hidraw_table[minor]->list_lock, flags); - for (i = list->tail; i < list->head; i++) - kfree(list->buffer[i].value); list_del(&list->node); spin_unlock_irqrestore(&hidraw_table[minor]->list_lock, flags); kfree(list);
diff --git a/drivers/hid/intel-ish-hid/ishtp-hid.h b/drivers/hid/intel-ish-hid/ishtp-hid.h index 65af0eb..5ffd0da 100644 --- a/drivers/hid/intel-ish-hid/ishtp-hid.h +++ b/drivers/hid/intel-ish-hid/ishtp-hid.h
@@ -110,7 +110,7 @@ struct report_list { * @multi_packet_cnt: Count of fragmented packet count * * This structure is used to store completion flags and per client data like - * report description, number of HID devices etc. + * like report description, number of HID devices etc. */ struct ishtp_cl_data { /* completion flags */
diff --git a/drivers/hid/intel-ish-hid/ishtp/client.c b/drivers/hid/intel-ish-hid/ishtp/client.c index c0d6930..1cc1571 100644 --- a/drivers/hid/intel-ish-hid/ishtp/client.c +++ b/drivers/hid/intel-ish-hid/ishtp/client.c
@@ -626,14 +626,13 @@ static void ishtp_cl_read_complete(struct ishtp_cl_rb *rb) } /** - * ipc_tx_send() - IPC tx send function + * ipc_tx_callback() - IPC tx callback function * @prm: Pointer to client device instance * - * Send message over IPC. Message will be split into fragments - * if message size is bigger than IPC FIFO size, and all - * fragments will be sent one by one. + * Send message over IPC either first time or on callback on previous message + * completion */ -static void ipc_tx_send(void *prm) +static void ipc_tx_callback(void *prm) { struct ishtp_cl *cl = prm; struct ishtp_cl_tx_ring *cl_msg; @@ -678,41 +677,32 @@ static void ipc_tx_send(void *prm) list); rem = cl_msg->send_buf.size - cl->tx_offs; - while (rem > 0) { - ishtp_hdr.host_addr = cl->host_client_id; - ishtp_hdr.fw_addr = cl->fw_client_id; - ishtp_hdr.reserved = 0; - pmsg = cl_msg->send_buf.data + cl->tx_offs; + ishtp_hdr.host_addr = cl->host_client_id; + ishtp_hdr.fw_addr = cl->fw_client_id; + ishtp_hdr.reserved = 0; + pmsg = cl_msg->send_buf.data + cl->tx_offs; - if (rem <= dev->mtu) { - /* Last fragment or only one packet */ - ishtp_hdr.length = rem; - ishtp_hdr.msg_complete = 1; - /* Submit to IPC queue with no callback */ - ishtp_write_message(dev, &ishtp_hdr, pmsg); - cl->tx_offs = 0; - cl->sending = 0; - - break; - } else { - /* Send ipc fragment */ - ishtp_hdr.length = dev->mtu; - ishtp_hdr.msg_complete = 0; - /* All fregments submitted to IPC queue with no callback */ - ishtp_write_message(dev, &ishtp_hdr, pmsg); - cl->tx_offs += dev->mtu; - rem = cl_msg->send_buf.size - cl->tx_offs; - } + if (rem <= dev->mtu) { + ishtp_hdr.length = rem; + ishtp_hdr.msg_complete = 1; + cl->sending = 0; + list_del_init(&cl_msg->list); /* Must be before write */ + spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); + /* Submit to IPC queue with no callback */ + ishtp_write_message(dev, &ishtp_hdr, pmsg); + spin_lock_irqsave(&cl->tx_free_list_spinlock, tx_free_flags); + list_add_tail(&cl_msg->list, &cl->tx_free_list.list); + ++cl->tx_ring_free_size; + spin_unlock_irqrestore(&cl->tx_free_list_spinlock, + tx_free_flags); + } else { + /* Send IPC fragment */ + spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); + cl->tx_offs += dev->mtu; + ishtp_hdr.length = dev->mtu; + ishtp_hdr.msg_complete = 0; + ishtp_send_msg(dev, &ishtp_hdr, pmsg, ipc_tx_callback, cl); } - - list_del_init(&cl_msg->list); - spin_unlock_irqrestore(&cl->tx_list_spinlock, tx_flags); - - spin_lock_irqsave(&cl->tx_free_list_spinlock, tx_free_flags); - list_add_tail(&cl_msg->list, &cl->tx_free_list.list); - ++cl->tx_ring_free_size; - spin_unlock_irqrestore(&cl->tx_free_list_spinlock, - tx_free_flags); } /** @@ -730,7 +720,7 @@ static void ishtp_cl_send_msg_ipc(struct ishtp_device *dev, return; cl->tx_offs = 0; - ipc_tx_send(cl); + ipc_tx_callback(cl); ++cl->send_msg_cnt_ipc; }
diff --git a/drivers/hid/intel-ish-hid/ishtp/dma-if.c b/drivers/hid/intel-ish-hid/ishtp/dma-if.c index 00046cb..40554c8 100644 --- a/drivers/hid/intel-ish-hid/ishtp/dma-if.c +++ b/drivers/hid/intel-ish-hid/ishtp/dma-if.c
@@ -104,11 +104,6 @@ void *ishtp_cl_get_dma_send_buf(struct ishtp_device *dev, int required_slots = (size / DMA_SLOT_SIZE) + 1 * (size % DMA_SLOT_SIZE != 0); - if (!dev->ishtp_dma_tx_map) { - dev_err(dev->devc, "Fail to allocate Tx map\n"); - return NULL; - } - spin_lock_irqsave(&dev->ishtp_dma_tx_lock, flags); for (i = 0; i <= (dev->ishtp_dma_num_slots - required_slots); i++) { free = 1; @@ -155,11 +150,6 @@ void ishtp_cl_release_dma_acked_mem(struct ishtp_device *dev, return; } - if (!dev->ishtp_dma_tx_map) { - dev_err(dev->devc, "Fail to allocate Tx map\n"); - return; - } - i = (msg_addr - dev->ishtp_host_dma_tx_buf) / DMA_SLOT_SIZE; spin_lock_irqsave(&dev->ishtp_dma_tx_lock, flags); for (j = 0; j < acked_slots; j++) {
diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index b42785f..329bb1a 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c
@@ -160,9 +160,6 @@ static int wacom_raw_event(struct hid_device *hdev, struct hid_report *report, { struct wacom *wacom = hid_get_drvdata(hdev); - if (wacom->wacom_wac.features.type == BOOTLOADER) - return 0; - if (size > WACOM_PKGLEN_MAX) return 1; @@ -2127,7 +2124,7 @@ static int wacom_register_inputs(struct wacom *wacom) error = wacom_setup_pad_input_capabilities(pad_input_dev, wacom_wac); if (error) { - /* no pad events using this interface */ + /* no pad in use on this interface */ input_free_device(pad_input_dev); wacom_wac->pad_input = NULL; pad_input_dev = NULL; @@ -2789,11 +2786,6 @@ static int wacom_probe(struct hid_device *hdev, return error; } - if (features->type == BOOTLOADER) { - hid_warn(hdev, "Using device in hidraw-only mode"); - return hid_hw_start(hdev, HID_CONNECT_HIDRAW); - } - error = wacom_parse_and_register(wacom, false); if (error) return error;
diff --git a/drivers/hid/wacom_wac.c b/drivers/hid/wacom_wac.c index aa477a4..de69ea5 100644 --- a/drivers/hid/wacom_wac.c +++ b/drivers/hid/wacom_wac.c
@@ -638,26 +638,9 @@ static int wacom_intuos_id_mangle(int tool_id) return (tool_id & ~0xFFF) << 4 | (tool_id & 0xFFF); } -static bool wacom_is_art_pen(int tool_id) -{ - bool is_art_pen = false; - - switch (tool_id) { - case 0x885: /* Intuos3 Marker Pen */ - case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */ - case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ - is_art_pen = true; - break; - } - return is_art_pen; -} - static int wacom_intuos_get_tool_type(int tool_id) { - int tool_type = BTN_TOOL_PEN; - - if (wacom_is_art_pen(tool_id)) - return tool_type; + int tool_type; switch (tool_id) { case 0x812: /* Inking pen */ @@ -672,9 +655,12 @@ static int wacom_intuos_get_tool_type(int tool_id) case 0x852: case 0x823: /* Intuos3 Grip Pen */ case 0x813: /* Intuos3 Classic Pen */ + case 0x885: /* Intuos3 Marker Pen */ case 0x802: /* Intuos4/5 13HD/24HD General Pen */ + case 0x804: /* Intuos4/5 13HD/24HD Marker Pen */ case 0x8e2: /* IntuosHT2 pen */ case 0x022: + case 0x10804: /* Intuos4/5 13HD/24HD Art Pen */ case 0x10842: /* MobileStudio Pro Pro Pen slim */ case 0x14802: /* Intuos4/5 13HD/24HD Classic Pen */ case 0x16802: /* Cintiq 13HD Pro Pen */ @@ -732,6 +718,10 @@ static int wacom_intuos_get_tool_type(int tool_id) case 0x10902: /* Intuos4/5 13HD/24HD Airbrush */ tool_type = BTN_TOOL_AIRBRUSH; break; + + default: /* Unknown tool */ + tool_type = BTN_TOOL_PEN; + break; } return tool_type; } @@ -2016,6 +2006,7 @@ static void wacom_wac_pad_usage_mapping(struct hid_device *hdev, wacom_wac->has_mute_touch_switch = true; usage->type = EV_SW; usage->code = SW_MUTE_DEVICE; + features->device_type |= WACOM_DEVICETYPE_PAD; break; case WACOM_HID_WD_TOUCHSTRIP: wacom_map_usage(input, usage, field, EV_ABS, ABS_RX, 0); @@ -2095,30 +2086,6 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field wacom_wac->hid_data.inrange_state |= value; } - /* Process touch switch state first since it is reported through touch interface, - * which is indepentent of pad interface. In the case when there are no other pad - * events, the pad interface will not even be created. - */ - if ((equivalent_usage == WACOM_HID_WD_MUTE_DEVICE) || - (equivalent_usage == WACOM_HID_WD_TOUCHONOFF)) { - if (wacom_wac->shared->touch_input) { - bool *is_touch_on = &wacom_wac->shared->is_touch_on; - - if (equivalent_usage == WACOM_HID_WD_MUTE_DEVICE && value) - *is_touch_on = !(*is_touch_on); - else if (equivalent_usage == WACOM_HID_WD_TOUCHONOFF) - *is_touch_on = value; - - input_report_switch(wacom_wac->shared->touch_input, - SW_MUTE_DEVICE, !(*is_touch_on)); - input_sync(wacom_wac->shared->touch_input); - } - return; - } - - if (!input) - return; - switch (equivalent_usage) { case WACOM_HID_WD_TOUCHRING: /* @@ -2154,6 +2121,22 @@ static void wacom_wac_pad_event(struct hid_device *hdev, struct hid_field *field input_event(input, usage->type, usage->code, 0); break; + case WACOM_HID_WD_MUTE_DEVICE: + case WACOM_HID_WD_TOUCHONOFF: + if (wacom_wac->shared->touch_input) { + bool *is_touch_on = &wacom_wac->shared->is_touch_on; + + if (equivalent_usage == WACOM_HID_WD_MUTE_DEVICE && value) + *is_touch_on = !(*is_touch_on); + else if (equivalent_usage == WACOM_HID_WD_TOUCHONOFF) + *is_touch_on = value; + + input_report_switch(wacom_wac->shared->touch_input, + SW_MUTE_DEVICE, !(*is_touch_on)); + input_sync(wacom_wac->shared->touch_input); + } + break; + case WACOM_HID_WD_MODE_CHANGE: if (wacom_wac->is_direct_mode != value) { wacom_wac->is_direct_mode = value; @@ -2329,9 +2312,6 @@ static void wacom_wac_pen_event(struct hid_device *hdev, struct hid_field *field } return; case HID_DG_TWIST: - /* don't modify the value if the pen doesn't support the feature */ - if (!wacom_is_art_pen(wacom_wac->id[0])) return; - /* * Userspace expects pen twist to have its zero point when * the buttons/finger is on the tablet's left. HID values @@ -2783,7 +2763,7 @@ void wacom_wac_event(struct hid_device *hdev, struct hid_field *field, /* usage tests must precede field tests */ if (WACOM_BATTERY_USAGE(usage)) wacom_wac_battery_event(hdev, field, usage, value); - else if (WACOM_PAD_FIELD(field)) + else if (WACOM_PAD_FIELD(field) && wacom->wacom_wac.pad_input) wacom_wac_pad_event(hdev, field, usage, value); else if (WACOM_PEN_FIELD(field) && wacom->wacom_wac.pen_input) wacom_wac_pen_event(hdev, field, usage, value); @@ -4782,9 +4762,6 @@ static const struct wacom_features wacom_features_0x3c8 = static const struct wacom_features wacom_features_HID_ANY_ID = { "Wacom HID", .type = HID_GENERIC, .oVid = HID_ANY_ID, .oPid = HID_ANY_ID }; -static const struct wacom_features wacom_features_0x94 = - { "Wacom Bootloader", .type = BOOTLOADER }; - #define USB_DEVICE_WACOM(prod) \ HID_DEVICE(BUS_USB, HID_GROUP_WACOM, USB_VENDOR_ID_WACOM, prod),\ .driver_data = (kernel_ulong_t)&wacom_features_##prod @@ -4858,7 +4835,6 @@ const struct hid_device_id wacom_ids[] = { { USB_DEVICE_WACOM(0x84) }, { USB_DEVICE_WACOM(0x90) }, { USB_DEVICE_WACOM(0x93) }, - { USB_DEVICE_WACOM(0x94) }, { USB_DEVICE_WACOM(0x97) }, { USB_DEVICE_WACOM(0x9A) }, { USB_DEVICE_WACOM(0x9F) },
diff --git a/drivers/hid/wacom_wac.h b/drivers/hid/wacom_wac.h index ca172ef..8dea7cb 100644 --- a/drivers/hid/wacom_wac.h +++ b/drivers/hid/wacom_wac.h
@@ -242,7 +242,6 @@ enum { MTTPC, MTTPC_B, HID_GENERIC, - BOOTLOADER, MAX_TYPE };
diff --git a/drivers/hsi/controllers/omap_ssi_core.c b/drivers/hsi/controllers/omap_ssi_core.c index 329889b..f36036b 100644 --- a/drivers/hsi/controllers/omap_ssi_core.c +++ b/drivers/hsi/controllers/omap_ssi_core.c
@@ -502,10 +502,8 @@ static int ssi_probe(struct platform_device *pd) platform_set_drvdata(pd, ssi); err = ssi_add_controller(ssi, pd); - if (err < 0) { - hsi_put_controller(ssi); + if (err < 0) goto out1; - } pm_runtime_enable(&pd->dev); @@ -526,7 +524,6 @@ static int ssi_probe(struct platform_device *pd) if (!childpdev) { err = -ENODEV; dev_err(&pd->dev, "failed to create ssi controller port\n"); - of_node_put(child); goto out3; } } @@ -538,9 +535,9 @@ static int ssi_probe(struct platform_device *pd) device_for_each_child(&pd->dev, NULL, ssi_remove_ports); out2: ssi_remove_controller(ssi); - pm_runtime_disable(&pd->dev); out1: platform_set_drvdata(pd, NULL); + pm_runtime_disable(&pd->dev); return err; } @@ -631,13 +628,7 @@ static int __init ssi_init(void) { if (ret) return ret; - ret = platform_driver_register(&ssi_port_pdriver); - if (ret) { - platform_driver_unregister(&ssi_pdriver); - return ret; - } - - return 0; + return platform_driver_register(&ssi_port_pdriver); } module_init(ssi_init);
diff --git a/drivers/hsi/controllers/omap_ssi_port.c b/drivers/hsi/controllers/omap_ssi_port.c index b9495b7..a0cb5be 100644 --- a/drivers/hsi/controllers/omap_ssi_port.c +++ b/drivers/hsi/controllers/omap_ssi_port.c
@@ -230,10 +230,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch) if (msg->ttype == HSI_MSG_READ) { err = dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents, DMA_FROM_DEVICE); - if (!err) { + if (err < 0) { dev_dbg(&ssi->device, "DMA map SG failed !\n"); pm_runtime_put_autosuspend(omap_port->pdev); - return -EIO; + return err; } csdp = SSI_DST_BURST_4x32_BIT | SSI_DST_MEMORY_PORT | SSI_SRC_SINGLE_ACCESS0 | SSI_SRC_PERIPHERAL_PORT | @@ -247,10 +247,10 @@ static int ssi_start_dma(struct hsi_msg *msg, int lch) } else { err = dma_map_sg(&ssi->device, msg->sgt.sgl, msg->sgt.nents, DMA_TO_DEVICE); - if (!err) { + if (err < 0) { dev_dbg(&ssi->device, "DMA map SG failed !\n"); pm_runtime_put_autosuspend(omap_port->pdev); - return -EIO; + return err; } csdp = SSI_SRC_BURST_4x32_BIT | SSI_SRC_MEMORY_PORT | SSI_DST_SINGLE_ACCESS0 | SSI_DST_PERIPHERAL_PORT |
diff --git a/drivers/hv/channel_mgmt.c b/drivers/hv/channel_mgmt.c index 3adf4fa..9260ad4 100644 --- a/drivers/hv/channel_mgmt.c +++ b/drivers/hv/channel_mgmt.c
@@ -493,17 +493,13 @@ static void vmbus_add_channel_work(struct work_struct *work) * Add the new device to the bus. This will kick off device-driver * binding which eventually invokes the device driver's AddDevice() * method. - * - * If vmbus_device_register() fails, the 'device_obj' is freed in - * vmbus_device_release() as called by device_unregister() in the - * error path of vmbus_device_register(). In the outside error - * path, there's no need to free it. */ ret = vmbus_device_register(newchannel->device_obj); if (ret != 0) { pr_err("unable to add child device object (relid %d)\n", newchannel->offermsg.child_relid); + kfree(newchannel->device_obj); goto err_deq_chan; }
diff --git a/drivers/hv/vmbus_drv.c b/drivers/hv/vmbus_drv.c index a1cfa75..5691827 100644 --- a/drivers/hv/vmbus_drv.c +++ b/drivers/hv/vmbus_drv.c
@@ -1863,7 +1863,6 @@ int vmbus_device_register(struct hv_device *child_device_obj) ret = device_register(&child_device_obj->device); if (ret) { pr_err("Unable to register child device\n"); - put_device(&child_device_obj->device); return ret; } @@ -2076,7 +2075,7 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, bool fb_overlap_ok) { struct resource *iter, *shadow; - resource_size_t range_min, range_max, start, end; + resource_size_t range_min, range_max, start; const char *dev_n = dev_name(&device_obj->device); int retval; @@ -2111,14 +2110,6 @@ int vmbus_allocate_mmio(struct resource **new, struct hv_device *device_obj, range_max = iter->end; start = (range_min + align - 1) & ~(align - 1); for (; start + size - 1 <= range_max; start += align) { - end = start + size - 1; - - /* Skip the whole fb_mmio region if not fb_overlap_ok */ - if (!fb_overlap_ok && fb_mmio && - (((start >= fb_mmio->start) && (start <= fb_mmio->end)) || - ((end >= fb_mmio->start) && (end <= fb_mmio->end)))) - continue; - shadow = __request_region(iter, start, size, NULL, IORESOURCE_BUSY); if (!shadow)
diff --git a/drivers/hwmon/adt7475.c b/drivers/hwmon/adt7475.c index 5af7226..01c2eeb 100644 --- a/drivers/hwmon/adt7475.c +++ b/drivers/hwmon/adt7475.c
@@ -484,10 +484,10 @@ static ssize_t temp_store(struct device *dev, struct device_attribute *attr, val = (temp - val) / 1000; if (sattr->index != 1) { - data->temp[HYSTERSIS][sattr->index] &= 0x0F; + data->temp[HYSTERSIS][sattr->index] &= 0xF0; data->temp[HYSTERSIS][sattr->index] |= (val & 0xF) << 4; } else { - data->temp[HYSTERSIS][sattr->index] &= 0xF0; + data->temp[HYSTERSIS][sattr->index] &= 0x0F; data->temp[HYSTERSIS][sattr->index] |= (val & 0xF); } @@ -552,11 +552,11 @@ static ssize_t temp_st_show(struct device *dev, struct device_attribute *attr, val = data->enh_acoustics[0] & 0xf; break; case 1: - val = data->enh_acoustics[1] & 0xf; + val = (data->enh_acoustics[1] >> 4) & 0xf; break; case 2: default: - val = (data->enh_acoustics[1] >> 4) & 0xf; + val = data->enh_acoustics[1] & 0xf; break; }
diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c index e232f44..d855c78 100644 --- a/drivers/hwmon/coretemp.c +++ b/drivers/hwmon/coretemp.c
@@ -46,6 +46,9 @@ MODULE_PARM_DESC(tjmax, "TjMax value in degrees Celsius"); #define TOTAL_ATTRS (MAX_CORE_ATTRS + 1) #define MAX_CORE_DATA (NUM_REAL_CORES + BASE_SYSFS_ATTR_NO) +#define TO_CORE_ID(cpu) (cpu_data(cpu).cpu_core_id) +#define TO_ATTR_NO(cpu) (TO_CORE_ID(cpu) + BASE_SYSFS_ATTR_NO) + #ifdef CONFIG_SMP #define for_each_sibling(i, cpu) \ for_each_cpu(i, topology_sibling_cpumask(cpu)) @@ -88,8 +91,6 @@ struct temp_data { struct platform_data { struct device *hwmon_dev; u16 pkg_id; - u16 cpu_map[NUM_REAL_CORES]; - struct ida ida; struct cpumask cpumask; struct temp_data *core_data[MAX_CORE_DATA]; struct device_attribute name_attr; @@ -242,13 +243,10 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev) */ if (host_bridge && host_bridge->vendor == PCI_VENDOR_ID_INTEL) { for (i = 0; i < ARRAY_SIZE(tjmax_pci_table); i++) { - if (host_bridge->device == tjmax_pci_table[i].device) { - pci_dev_put(host_bridge); + if (host_bridge->device == tjmax_pci_table[i].device) return tjmax_pci_table[i].tjmax; - } } } - pci_dev_put(host_bridge); for (i = 0; i < ARRAY_SIZE(tjmax_table); i++) { if (strstr(c->x86_model_id, tjmax_table[i].id)) @@ -443,7 +441,7 @@ static struct temp_data *init_temp_data(unsigned int cpu, int pkg_flag) MSR_IA32_THERM_STATUS; tdata->is_pkg_data = pkg_flag; tdata->cpu = cpu; - tdata->cpu_core_id = topology_core_id(cpu); + tdata->cpu_core_id = TO_CORE_ID(cpu); tdata->attr_size = MAX_CORE_ATTRS; mutex_init(&tdata->update_lock); return tdata; @@ -456,7 +454,7 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu, struct platform_data *pdata = platform_get_drvdata(pdev); struct cpuinfo_x86 *c = &cpu_data(cpu); u32 eax, edx; - int err, index, attr_no; + int err, attr_no; /* * Find attr number for sysfs: @@ -464,26 +462,14 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu, * The attr number is always core id + 2 * The Pkgtemp will always show up as temp1_*, if available */ - if (pkg_flag) { - attr_no = PKG_SYSFS_ATTR_NO; - } else { - index = ida_alloc(&pdata->ida, GFP_KERNEL); - if (index < 0) - return index; - pdata->cpu_map[index] = topology_core_id(cpu); - attr_no = index + BASE_SYSFS_ATTR_NO; - } + attr_no = pkg_flag ? PKG_SYSFS_ATTR_NO : TO_ATTR_NO(cpu); - if (attr_no > MAX_CORE_DATA - 1) { - err = -ERANGE; - goto ida_free; - } + if (attr_no > MAX_CORE_DATA - 1) + return -ERANGE; tdata = init_temp_data(cpu, pkg_flag); - if (!tdata) { - err = -ENOMEM; - goto ida_free; - } + if (!tdata) + return -ENOMEM; /* Test if we can access the status register */ err = rdmsr_safe_on_cpu(cpu, tdata->status_reg, &eax, &edx); @@ -519,9 +505,6 @@ static int create_core_data(struct platform_device *pdev, unsigned int cpu, exit_free: pdata->core_data[attr_no] = NULL; kfree(tdata); -ida_free: - if (!pkg_flag) - ida_free(&pdata->ida, index); return err; } @@ -536,63 +519,71 @@ static void coretemp_remove_core(struct platform_data *pdata, int indx) { struct temp_data *tdata = pdata->core_data[indx]; - /* if we errored on add then this is already gone */ - if (!tdata) - return; - /* Remove the sysfs attributes */ sysfs_remove_group(&pdata->hwmon_dev->kobj, &tdata->attr_group); kfree(pdata->core_data[indx]); pdata->core_data[indx] = NULL; - - if (indx >= BASE_SYSFS_ATTR_NO) - ida_free(&pdata->ida, indx - BASE_SYSFS_ATTR_NO); } -static int coretemp_device_add(int zoneid) +static int coretemp_probe(struct platform_device *pdev) { - struct platform_device *pdev; + struct device *dev = &pdev->dev; struct platform_data *pdata; - int err; /* Initialize the per-zone data structures */ - pdata = kzalloc(sizeof(*pdata), GFP_KERNEL); + pdata = devm_kzalloc(dev, sizeof(struct platform_data), GFP_KERNEL); if (!pdata) return -ENOMEM; - pdata->pkg_id = zoneid; - ida_init(&pdata->ida); - - pdev = platform_device_alloc(DRVNAME, zoneid); - if (!pdev) { - err = -ENOMEM; - goto err_free_pdata; - } - - err = platform_device_add(pdev); - if (err) - goto err_put_dev; - + pdata->pkg_id = pdev->id; platform_set_drvdata(pdev, pdata); - zone_devices[zoneid] = pdev; - return 0; -err_put_dev: - platform_device_put(pdev); -err_free_pdata: - kfree(pdata); - return err; + pdata->hwmon_dev = devm_hwmon_device_register_with_groups(dev, DRVNAME, + pdata, NULL); + return PTR_ERR_OR_ZERO(pdata->hwmon_dev); } -static void coretemp_device_remove(int zoneid) +static int coretemp_remove(struct platform_device *pdev) { - struct platform_device *pdev = zone_devices[zoneid]; struct platform_data *pdata = platform_get_drvdata(pdev); + int i; - ida_destroy(&pdata->ida); - kfree(pdata); - platform_device_unregister(pdev); + for (i = MAX_CORE_DATA - 1; i >= 0; --i) + if (pdata->core_data[i]) + coretemp_remove_core(pdata, i); + + return 0; +} + +static struct platform_driver coretemp_driver = { + .driver = { + .name = DRVNAME, + }, + .probe = coretemp_probe, + .remove = coretemp_remove, +}; + +static struct platform_device *coretemp_device_add(unsigned int cpu) +{ + int err, zoneid = topology_logical_die_id(cpu); + struct platform_device *pdev; + + if (zoneid < 0) + return ERR_PTR(-ENOMEM); + + pdev = platform_device_alloc(DRVNAME, zoneid); + if (!pdev) + return ERR_PTR(-ENOMEM); + + err = platform_device_add(pdev); + if (err) { + platform_device_put(pdev); + return ERR_PTR(err); + } + + zone_devices[zoneid] = pdev; + return pdev; } static int coretemp_cpu_online(unsigned int cpu) @@ -616,10 +607,7 @@ static int coretemp_cpu_online(unsigned int cpu) if (!cpu_has(c, X86_FEATURE_DTHERM)) return -ENODEV; - pdata = platform_get_drvdata(pdev); - if (!pdata->hwmon_dev) { - struct device *hwmon; - + if (!pdev) { /* Check the microcode version of the CPU */ if (chk_ucode_version(cpu)) return -EINVAL; @@ -630,11 +618,9 @@ static int coretemp_cpu_online(unsigned int cpu) * online. So, initialize per-pkg data structures and * then bring this core online. */ - hwmon = hwmon_device_register_with_groups(&pdev->dev, DRVNAME, - pdata, NULL); - if (IS_ERR(hwmon)) - return PTR_ERR(hwmon); - pdata->hwmon_dev = hwmon; + pdev = coretemp_device_add(cpu); + if (IS_ERR(pdev)) + return PTR_ERR(pdev); /* * Check whether pkgtemp support is available. @@ -644,6 +630,7 @@ static int coretemp_cpu_online(unsigned int cpu) coretemp_add_core(pdev, cpu, 1); } + pdata = platform_get_drvdata(pdev); /* * Check whether a thread sibling is already online. If not add the * interface for this CPU core. @@ -660,28 +647,25 @@ static int coretemp_cpu_offline(unsigned int cpu) struct platform_device *pdev = coretemp_get_pdev(cpu); struct platform_data *pd; struct temp_data *tdata; - int i, indx = -1, target; + int indx, target; - /* No need to tear down any interfaces for suspend */ + /* + * Don't execute this on suspend as the device remove locks + * up the machine. + */ if (cpuhp_tasks_frozen) return 0; /* If the physical CPU device does not exist, just return */ + if (!pdev) + return 0; + + /* The core id is too big, just return */ + indx = TO_ATTR_NO(cpu); + if (indx > MAX_CORE_DATA - 1) + return 0; + pd = platform_get_drvdata(pdev); - if (!pd->hwmon_dev) - return 0; - - for (i = 0; i < NUM_REAL_CORES; i++) { - if (pd->cpu_map[i] == topology_core_id(cpu)) { - indx = i + BASE_SYSFS_ATTR_NO; - break; - } - } - - /* Too many cores and this core is not populated, just return */ - if (indx < 0) - return 0; - tdata = pd->core_data[indx]; cpumask_clear_cpu(cpu, &pd->cpumask); @@ -701,14 +685,13 @@ static int coretemp_cpu_offline(unsigned int cpu) } /* - * If all cores in this pkg are offline, remove the interface. + * If all cores in this pkg are offline, remove the device. This + * will invoke the platform driver remove function, which cleans up + * the rest. */ - tdata = pd->core_data[PKG_SYSFS_ATTR_NO]; if (cpumask_empty(&pd->cpumask)) { - if (tdata) - coretemp_remove_core(pd, PKG_SYSFS_ATTR_NO); - hwmon_device_unregister(pd->hwmon_dev); - pd->hwmon_dev = NULL; + zone_devices[topology_logical_die_id(cpu)] = NULL; + platform_device_unregister(pdev); return 0; } @@ -716,6 +699,7 @@ static int coretemp_cpu_offline(unsigned int cpu) * Check whether this core is the target for the package * interface. We need to assign it to some other cpu. */ + tdata = pd->core_data[PKG_SYSFS_ATTR_NO]; if (tdata && tdata->cpu == cpu) { target = cpumask_first(&pd->cpumask); mutex_lock(&tdata->update_lock); @@ -734,7 +718,7 @@ static enum cpuhp_state coretemp_hp_online; static int __init coretemp_init(void) { - int i, err; + int err; /* * CPUID.06H.EAX[0] indicates whether the CPU has thermal @@ -750,22 +734,20 @@ static int __init coretemp_init(void) if (!zone_devices) return -ENOMEM; - for (i = 0; i < max_zones; i++) { - err = coretemp_device_add(i); - if (err) - goto outzone; - } + err = platform_driver_register(&coretemp_driver); + if (err) + goto outzone; err = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "hwmon/coretemp:online", coretemp_cpu_online, coretemp_cpu_offline); if (err < 0) - goto outzone; + goto outdrv; coretemp_hp_online = err; return 0; +outdrv: + platform_driver_unregister(&coretemp_driver); outzone: - while (i--) - coretemp_device_remove(i); kfree(zone_devices); return err; } @@ -773,11 +755,8 @@ module_init(coretemp_init) static void __exit coretemp_exit(void) { - int i; - cpuhp_remove_state(coretemp_hp_online); - for (i = 0; i < max_zones; i++) - coretemp_device_remove(i); + platform_driver_unregister(&coretemp_driver); kfree(zone_devices); } module_exit(coretemp_exit)
diff --git a/drivers/hwmon/gpio-fan.c b/drivers/hwmon/gpio-fan.c index d96e435..3ea4021 100644 --- a/drivers/hwmon/gpio-fan.c +++ b/drivers/hwmon/gpio-fan.c
@@ -391,9 +391,6 @@ static int gpio_fan_set_cur_state(struct thermal_cooling_device *cdev, if (!fan_data) return -EINVAL; - if (state >= fan_data->num_speed) - return -EINVAL; - set_fan_speed(fan_data, state); return 0; }
diff --git a/drivers/hwmon/i5500_temp.c b/drivers/hwmon/i5500_temp.c index d4be03f..360f5ae 100644 --- a/drivers/hwmon/i5500_temp.c +++ b/drivers/hwmon/i5500_temp.c
@@ -108,7 +108,7 @@ static int i5500_temp_probe(struct pci_dev *pdev, u32 tstimer; s8 tsfsc; - err = pcim_enable_device(pdev); + err = pci_enable_device(pdev); if (err) { dev_err(&pdev->dev, "Failed to enable device\n"); return err;
diff --git a/drivers/hwmon/ibmpex.c b/drivers/hwmon/ibmpex.c index fe90f05..b2ab83c 100644 --- a/drivers/hwmon/ibmpex.c +++ b/drivers/hwmon/ibmpex.c
@@ -502,7 +502,6 @@ static void ibmpex_register_bmc(int iface, struct device *dev) return; out_register: - list_del(&data->list); hwmon_device_unregister(data->hwmon_dev); out_user: ipmi_destroy_user(data->user);
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index 1b7f92f..026f70d 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c
@@ -672,7 +672,7 @@ static int ina3221_probe_child_from_dt(struct device *dev, return ret; } else if (val > INA3221_CHANNEL3) { dev_err(dev, "invalid reg %d of %pOFn\n", val, child); - return -EINVAL; + return ret; } input = &ina->inputs[val];
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index 85413d3..fac9b5c 100644 --- a/drivers/hwmon/it87.c +++ b/drivers/hwmon/it87.c
@@ -486,8 +486,6 @@ static const struct it87_devices it87_devices[] = { #define has_pwm_freq2(data) ((data)->features & FEAT_PWM_FREQ2) #define has_six_temp(data) ((data)->features & FEAT_SIX_TEMP) #define has_vin3_5v(data) ((data)->features & FEAT_VIN3_5V) -#define has_scaling(data) ((data)->features & (FEAT_12MV_ADC | \ - FEAT_10_9MV_ADC)) struct it87_sio_data { int sioaddr; @@ -3100,7 +3098,7 @@ static int it87_probe(struct platform_device *pdev) "Detected broken BIOS defaults, disabling PWM interface\n"); /* Starting with IT8721F, we handle scaling of internal voltages */ - if (has_scaling(data)) { + if (has_12mv_adc(data)) { if (sio_data->internal & BIT(0)) data->in_scaled |= BIT(3); /* in3 is AVCC */ if (sio_data->internal & BIT(1))
diff --git a/drivers/hwmon/ltc2945.c b/drivers/hwmon/ltc2945.c index a1dd1ef..2818276 100644 --- a/drivers/hwmon/ltc2945.c +++ b/drivers/hwmon/ltc2945.c
@@ -248,8 +248,6 @@ static ssize_t ltc2945_value_store(struct device *dev, /* convert to register value, then clamp and write result */ regval = ltc2945_val_to_reg(dev, reg, val); - if (regval < 0) - return regval; if (is_power_reg(reg)) { regval = clamp_val(regval, 0, 0xffffff); regbuf[0] = regval >> 16;
diff --git a/drivers/hwmon/mlxreg-fan.c b/drivers/hwmon/mlxreg-fan.c index 052c897..bd8f5a3 100644 --- a/drivers/hwmon/mlxreg-fan.c +++ b/drivers/hwmon/mlxreg-fan.c
@@ -127,12 +127,6 @@ mlxreg_fan_read(struct device *dev, enum hwmon_sensor_types type, u32 attr, if (err) return err; - if (MLXREG_FAN_GET_FAULT(regval, tacho->mask)) { - /* FAN is broken - return zero for FAN speed. */ - *val = 0; - return 0; - } - *val = MLXREG_FAN_GET_RPM(regval, fan->divider, fan->samples); break;
diff --git a/drivers/hwmon/xgene-hwmon.c b/drivers/hwmon/xgene-hwmon.c index f5d3cf8..f2a5af2 100644 --- a/drivers/hwmon/xgene-hwmon.c +++ b/drivers/hwmon/xgene-hwmon.c
@@ -768,7 +768,6 @@ static int xgene_hwmon_remove(struct platform_device *pdev) { struct xgene_hwmon_dev *ctx = platform_get_drvdata(pdev); - cancel_work_sync(&ctx->workq); hwmon_device_unregister(ctx->hwmon_dev); kfifo_free(&ctx->async_msg_fifo); if (acpi_disabled)
diff --git a/drivers/hwtracing/coresight/coresight-etm4x.c b/drivers/hwtracing/coresight/coresight-etm4x.c index da63e09..83dccde 100644 --- a/drivers/hwtracing/coresight/coresight-etm4x.c +++ b/drivers/hwtracing/coresight/coresight-etm4x.c
@@ -156,7 +156,7 @@ static int etm4_enable_hw(struct etmv4_drvdata *drvdata) writel_relaxed(config->ss_pe_cmp[i], drvdata->base + TRCSSPCICRn(i)); } - for (i = 0; i < drvdata->nr_addr_cmp * 2; i++) { + for (i = 0; i < drvdata->nr_addr_cmp; i++) { writeq_relaxed(config->addr_val[i], drvdata->base + TRCACVRn(i)); writeq_relaxed(config->addr_acc[i],
diff --git a/drivers/hwtracing/coresight/coresight.c b/drivers/hwtracing/coresight/coresight.c index 7d64d77..0bbce0d 100644 --- a/drivers/hwtracing/coresight/coresight.c +++ b/drivers/hwtracing/coresight/coresight.c
@@ -1073,7 +1073,6 @@ static int coresight_remove_match(struct device *dev, void *data) * platform data. */ fwnode_handle_put(conn->child_fwnode); - conn->child_fwnode = NULL; /* No need to continue */ break; }
diff --git a/drivers/hwtracing/intel_th/msu-sink.c b/drivers/hwtracing/intel_th/msu-sink.c index 891b28e..2c7f511 100644 --- a/drivers/hwtracing/intel_th/msu-sink.c +++ b/drivers/hwtracing/intel_th/msu-sink.c
@@ -71,9 +71,6 @@ static int msu_sink_alloc_window(void *data, struct sg_table **sgt, size_t size) block = dma_alloc_coherent(priv->dev->parent->parent, PAGE_SIZE, &sg_dma_address(sg_ptr), GFP_KERNEL); - if (!block) - return -ENOMEM; - sg_set_buf(sg_ptr, block, PAGE_SIZE); }
diff --git a/drivers/hwtracing/intel_th/msu.c b/drivers/hwtracing/intel_th/msu.c index 640b0aa..3cd2489 100644 --- a/drivers/hwtracing/intel_th/msu.c +++ b/drivers/hwtracing/intel_th/msu.c
@@ -1050,16 +1050,6 @@ msc_buffer_set_uc(struct msc_window *win, unsigned int nr_segs) {} static inline void msc_buffer_set_wb(struct msc_window *win) {} #endif /* CONFIG_X86 */ -static struct page *msc_sg_page(struct scatterlist *sg) -{ - void *addr = sg_virt(sg); - - if (is_vmalloc_addr(addr)) - return vmalloc_to_page(addr); - - return sg_page(sg); -} - /** * msc_buffer_win_alloc() - alloc a window for a multiblock mode * @msc: MSC device @@ -1132,7 +1122,7 @@ static void __msc_buffer_win_free(struct msc *msc, struct msc_window *win) int i; for_each_sg(win->sgt->sgl, sg, win->nr_segs, i) { - struct page *page = msc_sg_page(sg); + struct page *page = sg_page(sg); page->mapping = NULL; dma_free_coherent(msc_dev(win->msc)->parent->parent, PAGE_SIZE, @@ -1394,7 +1384,7 @@ static struct page *msc_buffer_get_page(struct msc *msc, unsigned long pgoff) pgoff -= win->pgoff; for_each_sg(win->sgt->sgl, sg, win->nr_segs, blk) { - struct page *page = msc_sg_page(sg); + struct page *page = sg_page(sg); size_t pgsz = PFN_DOWN(sg->length); if (pgoff < pgsz)
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c index 6fcc20e..a723c8c 100644 --- a/drivers/hwtracing/intel_th/pci.c +++ b/drivers/hwtracing/intel_th/pci.c
@@ -100,10 +100,8 @@ static int intel_th_pci_probe(struct pci_dev *pdev, } th = intel_th_alloc(&pdev->dev, drvdata, resource, r); - if (IS_ERR(th)) { - err = PTR_ERR(th); - goto err_free_irq; - } + if (IS_ERR(th)) + return PTR_ERR(th); th->activate = intel_th_pci_activate; th->deactivate = intel_th_pci_deactivate; @@ -111,10 +109,6 @@ static int intel_th_pci_probe(struct pci_dev *pdev, pci_set_master(pdev); return 0; - -err_free_irq: - pci_free_irq_vectors(pdev); - return err; } static void intel_th_pci_remove(struct pci_dev *pdev) @@ -280,21 +274,6 @@ static const struct pci_device_id intel_th_pci_id_table[] = { .driver_data = (kernel_ulong_t)&intel_th_2x, }, { - /* Raptor Lake-S CPU */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa76f), - .driver_data = (kernel_ulong_t)&intel_th_2x, - }, - { - /* Meteor Lake-P */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7e24), - .driver_data = (kernel_ulong_t)&intel_th_2x, - }, - { - /* Raptor Lake-S */ - PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26), - .driver_data = (kernel_ulong_t)&intel_th_2x, - }, - { /* Rocket Lake CPU */ PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x4c19), .driver_data = (kernel_ulong_t)&intel_th_2x,
diff --git a/drivers/i2c/busses/i2c-cadence.c b/drivers/i2c/busses/i2c-cadence.c index 72699fd..8750e44 100644 --- a/drivers/i2c/busses/i2c-cadence.c +++ b/drivers/i2c/busses/i2c-cadence.c
@@ -348,13 +348,8 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id) ctrl_reg = cdns_i2c_readreg(CDNS_I2C_CR_OFFSET); ctrl_reg |= CDNS_I2C_CR_RW | CDNS_I2C_CR_CLR_FIFO; - /* - * Receive up to I2C_SMBUS_BLOCK_MAX data bytes, plus one message length - * byte, plus one checksum byte if PEC is enabled. p_msg->len will be 2 if - * PEC is enabled, otherwise 1. - */ if (id->p_msg->flags & I2C_M_RECV_LEN) - id->recv_count = I2C_SMBUS_BLOCK_MAX + id->p_msg->len; + id->recv_count = I2C_SMBUS_BLOCK_MAX + 1; id->curr_recv_count = id->recv_count; @@ -540,9 +535,6 @@ static int cdns_i2c_process_msg(struct cdns_i2c *id, struct i2c_msg *msg, if (id->err_status & CDNS_I2C_IXR_ARB_LOST) return -EAGAIN; - if (msg->flags & I2C_M_RECV_LEN) - msg->len += min_t(unsigned int, msg->buf[0], I2C_SMBUS_BLOCK_MAX); - return 0; }
diff --git a/drivers/i2c/busses/i2c-i801.c b/drivers/i2c/busses/i2c-i801.c index 2b84db5..4e6d0b7 100644 --- a/drivers/i2c/busses/i2c-i801.c +++ b/drivers/i2c/busses/i2c-i801.c
@@ -1253,7 +1253,6 @@ static const struct { * Additional individual entries were added after verification. */ { "Vostro V131", 0x1d }, - { "Vostro 5568", 0x29 }, }; static void register_dell_lis3lv02d_i2c_device(struct i801_priv *priv)
diff --git a/drivers/i2c/busses/i2c-imx-lpi2c.c b/drivers/i2c/busses/i2c-imx-lpi2c.c index 4fac259..a0d045c 100644 --- a/drivers/i2c/busses/i2c-imx-lpi2c.c +++ b/drivers/i2c/busses/i2c-imx-lpi2c.c
@@ -468,8 +468,6 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, if (num == 1 && msgs[0].len == 0) goto stop; - lpi2c_imx->rx_buf = NULL; - lpi2c_imx->tx_buf = NULL; lpi2c_imx->delivered = 0; lpi2c_imx->msglen = msgs[i].len; init_completion(&lpi2c_imx->complete); @@ -510,14 +508,10 @@ static int lpi2c_imx_xfer(struct i2c_adapter *adapter, static irqreturn_t lpi2c_imx_isr(int irq, void *dev_id) { struct lpi2c_imx_struct *lpi2c_imx = dev_id; - unsigned int enabled; unsigned int temp; - enabled = readl(lpi2c_imx->base + LPI2C_MIER); - lpi2c_imx_intctrl(lpi2c_imx, 0); temp = readl(lpi2c_imx->base + LPI2C_MSR); - temp &= enabled; if (temp & MSR_RDF) lpi2c_imx_read_rxfifo(lpi2c_imx);
diff --git a/drivers/i2c/busses/i2c-ismt.c b/drivers/i2c/busses/i2c-ismt.c index e69f792..5332541 100644 --- a/drivers/i2c/busses/i2c-ismt.c +++ b/drivers/i2c/busses/i2c-ismt.c
@@ -506,9 +506,6 @@ static int ismt_access(struct i2c_adapter *adap, u16 addr, if (read_write == I2C_SMBUS_WRITE) { /* Block Write */ dev_dbg(dev, "I2C_SMBUS_BLOCK_DATA: WRITE\n"); - if (data->block[0] < 1 || data->block[0] > I2C_SMBUS_BLOCK_MAX) - return -EINVAL; - dma_size = data->block[0] + 1; dma_direction = DMA_TO_DEVICE; desc->wr_len_cmd = dma_size;
diff --git a/drivers/i2c/busses/i2c-ocores.c b/drivers/i2c/busses/i2c-ocores.c index 1c3595c..ca8b3ec 100644 --- a/drivers/i2c/busses/i2c-ocores.c +++ b/drivers/i2c/busses/i2c-ocores.c
@@ -343,18 +343,18 @@ static int ocores_poll_wait(struct ocores_i2c *i2c) * ocores_isr(), we just add our polling code around it. * * It can run in atomic context - * - * Return: 0 on success, -ETIMEDOUT on timeout */ -static int ocores_process_polling(struct ocores_i2c *i2c) +static void ocores_process_polling(struct ocores_i2c *i2c) { - irqreturn_t ret; - int err = 0; - while (1) { + irqreturn_t ret; + int err; + err = ocores_poll_wait(i2c); - if (err) + if (err) { + i2c->state = STATE_ERROR; break; /* timeout */ + } ret = ocores_isr(-1, i2c); if (ret == IRQ_NONE) @@ -365,15 +365,13 @@ static int ocores_process_polling(struct ocores_i2c *i2c) break; } } - - return err; } static int ocores_xfer_core(struct ocores_i2c *i2c, struct i2c_msg *msgs, int num, bool polling) { - int ret = 0; + int ret; u8 ctrl; ctrl = oc_getreg(i2c, OCI2C_CONTROL); @@ -391,16 +389,15 @@ static int ocores_xfer_core(struct ocores_i2c *i2c, oc_setreg(i2c, OCI2C_CMD, OCI2C_CMD_START); if (polling) { - ret = ocores_process_polling(i2c); + ocores_process_polling(i2c); } else { - if (wait_event_timeout(i2c->wait, - (i2c->state == STATE_ERROR) || - (i2c->state == STATE_DONE), HZ) == 0) - ret = -ETIMEDOUT; - } - if (ret) { - ocores_process_timeout(i2c); - return ret; + ret = wait_event_timeout(i2c->wait, + (i2c->state == STATE_ERROR) || + (i2c->state == STATE_DONE), HZ); + if (ret == 0) { + ocores_process_timeout(i2c); + return -ETIMEDOUT; + } } return (i2c->state == STATE_DONE) ? num : -EIO;
diff --git a/drivers/i2c/busses/i2c-pxa-pci.c b/drivers/i2c/busses/i2c-pxa-pci.c index 30e38bc..f614cad 100644 --- a/drivers/i2c/busses/i2c-pxa-pci.c +++ b/drivers/i2c/busses/i2c-pxa-pci.c
@@ -105,7 +105,7 @@ static int ce4100_i2c_probe(struct pci_dev *dev, int i; struct ce4100_devices *sds; - ret = pcim_enable_device(dev); + ret = pci_enable_device_mem(dev); if (ret) return ret; @@ -114,8 +114,10 @@ static int ce4100_i2c_probe(struct pci_dev *dev, return -EINVAL; } sds = kzalloc(sizeof(*sds), GFP_KERNEL); - if (!sds) - return -ENOMEM; + if (!sds) { + ret = -ENOMEM; + goto err_mem; + } for (i = 0; i < ARRAY_SIZE(sds->pdev); i++) { sds->pdev[i] = add_i2c_device(dev, i); @@ -131,6 +133,8 @@ static int ce4100_i2c_probe(struct pci_dev *dev, err_dev_add: kfree(sds); +err_mem: + pci_disable_device(dev); return ret; }
diff --git a/drivers/i2c/busses/i2c-rk3x.c b/drivers/i2c/busses/i2c-rk3x.c index ac3ae14..1107a5e 100644 --- a/drivers/i2c/busses/i2c-rk3x.c +++ b/drivers/i2c/busses/i2c-rk3x.c
@@ -79,7 +79,7 @@ enum { #define DEFAULT_SCL_RATE (100 * 1000) /* Hz */ /** - * struct i2c_spec_values - I2C specification values for various modes + * struct i2c_spec_values: * @min_hold_start_ns: min hold time (repeated) START condition * @min_low_ns: min LOW period of the SCL clock * @min_high_ns: min HIGH period of the SCL cloc @@ -135,7 +135,7 @@ static const struct i2c_spec_values fast_mode_plus_spec = { }; /** - * struct rk3x_i2c_calced_timings - calculated V1 timings + * struct rk3x_i2c_calced_timings: * @div_low: Divider output for low * @div_high: Divider output for high * @tuning: Used to adjust setup/hold data time, @@ -158,7 +158,7 @@ enum rk3x_i2c_state { }; /** - * struct rk3x_i2c_soc_data - SOC-specific data + * struct rk3x_i2c_soc_data: * @grf_offset: offset inside the grf regmap for setting the i2c type * @calc_timings: Callback function for i2c timing information calculated */ @@ -238,8 +238,7 @@ static inline void rk3x_i2c_clean_ipd(struct rk3x_i2c *i2c) } /** - * rk3x_i2c_start - Generate a START condition, which triggers a REG_INT_START interrupt. - * @i2c: target controller data + * Generate a START condition, which triggers a REG_INT_START interrupt. */ static void rk3x_i2c_start(struct rk3x_i2c *i2c) { @@ -258,8 +257,8 @@ static void rk3x_i2c_start(struct rk3x_i2c *i2c) } /** - * rk3x_i2c_stop - Generate a STOP condition, which triggers a REG_INT_STOP interrupt. - * @i2c: target controller data + * Generate a STOP condition, which triggers a REG_INT_STOP interrupt. + * * @error: Error code to return in rk3x_i2c_xfer */ static void rk3x_i2c_stop(struct rk3x_i2c *i2c, int error) @@ -298,8 +297,7 @@ static void rk3x_i2c_stop(struct rk3x_i2c *i2c, int error) } /** - * rk3x_i2c_prepare_read - Setup a read according to i2c->msg - * @i2c: target controller data + * Setup a read according to i2c->msg */ static void rk3x_i2c_prepare_read(struct rk3x_i2c *i2c) { @@ -330,8 +328,7 @@ static void rk3x_i2c_prepare_read(struct rk3x_i2c *i2c) } /** - * rk3x_i2c_fill_transmit_buf - Fill the transmit buffer with data from i2c->msg - * @i2c: target controller data + * Fill the transmit buffer with data from i2c->msg */ static void rk3x_i2c_fill_transmit_buf(struct rk3x_i2c *i2c) { @@ -534,10 +531,11 @@ static irqreturn_t rk3x_i2c_irq(int irqno, void *dev_id) } /** - * rk3x_i2c_get_spec - Get timing values of I2C specification + * Get timing values of I2C specification + * * @speed: Desired SCL frequency * - * Return: Matched i2c_spec_values. + * Returns: Matched i2c spec values. */ static const struct i2c_spec_values *rk3x_i2c_get_spec(unsigned int speed) { @@ -550,12 +548,13 @@ static const struct i2c_spec_values *rk3x_i2c_get_spec(unsigned int speed) } /** - * rk3x_i2c_v0_calc_timings - Calculate divider values for desired SCL frequency + * Calculate divider values for desired SCL frequency + * * @clk_rate: I2C input clock rate * @t: Known I2C timing information * @t_calc: Caculated rk3x private timings that would be written into regs * - * Return: %0 on success, -%EINVAL if the goal SCL rate is too slow. In that case + * Returns: 0 on success, -EINVAL if the goal SCL rate is too slow. In that case * a best-effort divider value is returned in divs. If the target rate is * too high, we silently use the highest possible rate. */ @@ -710,12 +709,13 @@ static int rk3x_i2c_v0_calc_timings(unsigned long clk_rate, } /** - * rk3x_i2c_v1_calc_timings - Calculate timing values for desired SCL frequency + * Calculate timing values for desired SCL frequency + * * @clk_rate: I2C input clock rate * @t: Known I2C timing information * @t_calc: Caculated rk3x private timings that would be written into regs * - * Return: %0 on success, -%EINVAL if the goal SCL rate is too slow. In that case + * Returns: 0 on success, -EINVAL if the goal SCL rate is too slow. In that case * a best-effort divider value is returned in divs. If the target rate is * too high, we silently use the highest possible rate. * The following formulas are v1's method to calculate timings. @@ -959,14 +959,14 @@ static int rk3x_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long } /** - * rk3x_i2c_setup - Setup I2C registers for an I2C operation specified by msgs, num. - * @i2c: target controller data - * @msgs: I2C msgs to process - * @num: Number of msgs + * Setup I2C registers for an I2C operation specified by msgs, num. * * Must be called with i2c->lock held. * - * Return: Number of I2C msgs processed or negative in case of error + * @msgs: I2C msgs to process + * @num: Number of msgs + * + * returns: Number of I2C msgs processed or negative in case of error */ static int rk3x_i2c_setup(struct rk3x_i2c *i2c, struct i2c_msg *msgs, int num) {
diff --git a/drivers/i2c/busses/i2c-xgene-slimpro.c b/drivers/i2c/busses/i2c-xgene-slimpro.c index 76e9dcd..63cbb9c7 100644 --- a/drivers/i2c/busses/i2c-xgene-slimpro.c +++ b/drivers/i2c/busses/i2c-xgene-slimpro.c
@@ -308,9 +308,6 @@ static int slimpro_i2c_blkwr(struct slimpro_i2c_dev *ctx, u32 chip, u32 msg[3]; int rc; - if (writelen > I2C_SMBUS_BLOCK_MAX) - return -EINVAL; - memcpy(ctx->dma_buffer, data, writelen); paddr = dma_map_single(ctx->dev, ctx->dma_buffer, writelen, DMA_TO_DEVICE);
diff --git a/drivers/i2c/busses/i2c-xiic.c b/drivers/i2c/busses/i2c-xiic.c index c92ea69..a48bee5 100644 --- a/drivers/i2c/busses/i2c-xiic.c +++ b/drivers/i2c/busses/i2c-xiic.c
@@ -884,7 +884,6 @@ static struct platform_driver xiic_i2c_driver = { module_platform_driver(xiic_i2c_driver); -MODULE_ALIAS("platform:" DRIVER_NAME); MODULE_AUTHOR("info@mocean-labs.com"); MODULE_DESCRIPTION("Xilinx I2C bus driver"); MODULE_LICENSE("GPL v2");
diff --git a/drivers/i2c/i2c-core-base.c b/drivers/i2c/i2c-core-base.c index 964e8a2..1b93fae 100644 --- a/drivers/i2c/i2c-core-base.c +++ b/drivers/i2c/i2c-core-base.c
@@ -2358,9 +2358,8 @@ void i2c_put_adapter(struct i2c_adapter *adap) if (!adap) return; - module_put(adap->owner); - /* Should be last, otherwise we risk use-after-free with 'adap' */ put_device(&adap->dev); + module_put(adap->owner); } EXPORT_SYMBOL(i2c_put_adapter);
diff --git a/drivers/i2c/muxes/i2c-mux-gpmux.c b/drivers/i2c/muxes/i2c-mux-gpmux.c index 480ec74..f830535 100644 --- a/drivers/i2c/muxes/i2c-mux-gpmux.c +++ b/drivers/i2c/muxes/i2c-mux-gpmux.c
@@ -138,7 +138,6 @@ static int i2c_mux_probe(struct platform_device *pdev) return 0; err_children: - of_node_put(child); i2c_mux_del_adapters(muxc); err_parent: i2c_put_adapter(parent);
diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c index 8742ded..a5d6adc 100644 --- a/drivers/idle/intel_idle.c +++ b/drivers/idle/intel_idle.c
@@ -46,13 +46,11 @@ #include <linux/tick.h> #include <trace/events/power.h> #include <linux/sched.h> -#include <linux/sched/smt.h> #include <linux/notifier.h> #include <linux/cpu.h> #include <linux/moduleparam.h> #include <asm/cpu_device_id.h> #include <asm/intel-family.h> -#include <asm/nospec-branch.h> #include <asm/mwait.h> #include <asm/msr.h> @@ -100,12 +98,6 @@ static struct cpuidle_state *cpuidle_state_table; #define CPUIDLE_FLAG_TLB_FLUSHED 0x10000 /* - * Disable IBRS across idle (when KERNEL_IBRS), is exclusive vs IRQ_ENABLE - * above. - */ -#define CPUIDLE_FLAG_IBRS BIT(16) - -/* * MWAIT takes an 8-bit "hint" in EAX "suggesting" * the C-state (top nibble) and sub-state (bottom nibble) * 0x00 means "MWAIT(C1)", 0x10 means "MWAIT(C2)" etc. @@ -115,24 +107,6 @@ static struct cpuidle_state *cpuidle_state_table; #define flg2MWAIT(flags) (((flags) >> 24) & 0xFF) #define MWAIT2flg(eax) ((eax & 0xFF) << 24) -static __cpuidle int intel_idle_ibrs(struct cpuidle_device *dev, - struct cpuidle_driver *drv, int index) -{ - bool smt_active = sched_smt_active(); - u64 spec_ctrl = spec_ctrl_current(); - int ret; - - if (smt_active) - wrmsrl(MSR_IA32_SPEC_CTRL, 0); - - ret = intel_idle(dev, drv, index); - - if (smt_active) - wrmsrl(MSR_IA32_SPEC_CTRL, spec_ctrl); - - return ret; -} - /* * States are indexed by the cstate number, * which is also the index into the MWAIT hint array. @@ -631,7 +605,7 @@ static struct cpuidle_state skl_cstates[] = { { .name = "C6", .desc = "MWAIT 0x20", - .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 85, .target_residency = 200, .enter = &intel_idle, @@ -639,7 +613,7 @@ static struct cpuidle_state skl_cstates[] = { { .name = "C7s", .desc = "MWAIT 0x33", - .flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x33) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 124, .target_residency = 800, .enter = &intel_idle, @@ -647,7 +621,7 @@ static struct cpuidle_state skl_cstates[] = { { .name = "C8", .desc = "MWAIT 0x40", - .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x40) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 200, .target_residency = 800, .enter = &intel_idle, @@ -655,7 +629,7 @@ static struct cpuidle_state skl_cstates[] = { { .name = "C9", .desc = "MWAIT 0x50", - .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x50) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 480, .target_residency = 5000, .enter = &intel_idle, @@ -663,7 +637,7 @@ static struct cpuidle_state skl_cstates[] = { { .name = "C10", .desc = "MWAIT 0x60", - .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x60) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 890, .target_residency = 5000, .enter = &intel_idle, @@ -692,7 +666,7 @@ static struct cpuidle_state skx_cstates[] = { { .name = "C6", .desc = "MWAIT 0x20", - .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED | CPUIDLE_FLAG_IBRS, + .flags = MWAIT2flg(0x20) | CPUIDLE_FLAG_TLB_FLUSHED, .exit_latency = 133, .target_residency = 600, .enter = &intel_idle, @@ -1398,11 +1372,6 @@ static void __init intel_idle_cpuidle_driver_init(void) drv->states[drv->state_count] = /* structure copy */ cpuidle_state_table[cstate]; - if (cpu_feature_enabled(X86_FEATURE_KERNEL_IBRS) && - cpuidle_state_table[cstate].flags & CPUIDLE_FLAG_IBRS) { - drv->states[drv->state_count].enter = intel_idle_ibrs; - } - drv->state_count += 1; }
diff --git a/drivers/iio/accel/hid-sensor-accel-3d.c b/drivers/iio/accel/hid-sensor-accel-3d.c index a4e0e2b..f908476 100644 --- a/drivers/iio/accel/hid-sensor-accel-3d.c +++ b/drivers/iio/accel/hid-sensor-accel-3d.c
@@ -279,7 +279,6 @@ static int accel_3d_capture_sample(struct hid_sensor_hub_device *hsdev, hid_sensor_convert_timestamp( &accel_state->common_attributes, *(int64_t *)raw_data); - ret = 0; break; default: break;
diff --git a/drivers/iio/accel/mma9551_core.c b/drivers/iio/accel/mma9551_core.c index 9bb5c2f..666e7a0 100644 --- a/drivers/iio/accel/mma9551_core.c +++ b/drivers/iio/accel/mma9551_core.c
@@ -296,12 +296,9 @@ int mma9551_read_config_word(struct i2c_client *client, u8 app_id, ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_CONFIG, reg, NULL, 0, (u8 *)&v, 2); - if (ret < 0) - return ret; - *val = be16_to_cpu(v); - return 0; + return ret; } EXPORT_SYMBOL(mma9551_read_config_word); @@ -357,12 +354,9 @@ int mma9551_read_status_word(struct i2c_client *client, u8 app_id, ret = mma9551_transfer(client, app_id, MMA9551_CMD_READ_STATUS, reg, NULL, 0, (u8 *)&v, 2); - if (ret < 0) - return ret; - *val = be16_to_cpu(v); - return 0; + return ret; } EXPORT_SYMBOL(mma9551_read_status_word);
diff --git a/drivers/iio/adc/ad_sigma_delta.c b/drivers/iio/adc/ad_sigma_delta.c index a2171c8..2640b75 100644 --- a/drivers/iio/adc/ad_sigma_delta.c +++ b/drivers/iio/adc/ad_sigma_delta.c
@@ -283,10 +283,10 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, unsigned int data_reg; int ret = 0; - ret = iio_device_claim_direct_mode(indio_dev); - if (ret) - return ret; + if (iio_buffer_enabled(indio_dev)) + return -EBUSY; + mutex_lock(&indio_dev->mlock); ad_sigma_delta_set_channel(sigma_delta, chan->address); spi_bus_lock(sigma_delta->spi->master); @@ -325,7 +325,7 @@ int ad_sigma_delta_single_conversion(struct iio_dev *indio_dev, ad_sigma_delta_set_mode(sigma_delta, AD_SD_MODE_IDLE); sigma_delta->bus_locked = false; spi_bus_unlock(sigma_delta->spi->master); - iio_device_release_direct_mode(indio_dev); + mutex_unlock(&indio_dev->mlock); if (ret) return ret;
diff --git a/drivers/iio/adc/at91-sama5d2_adc.c b/drivers/iio/adc/at91-sama5d2_adc.c index e84a4c5..8854da4 100644 --- a/drivers/iio/adc/at91-sama5d2_adc.c +++ b/drivers/iio/adc/at91-sama5d2_adc.c
@@ -73,7 +73,7 @@ #define AT91_SAMA5D2_MR_ANACH BIT(23) /* Tracking Time */ #define AT91_SAMA5D2_MR_TRACKTIM(v) ((v) << 24) -#define AT91_SAMA5D2_MR_TRACKTIM_MAX 0xf +#define AT91_SAMA5D2_MR_TRACKTIM_MAX 0xff /* Transfer Time */ #define AT91_SAMA5D2_MR_TRANSFER(v) ((v) << 28) #define AT91_SAMA5D2_MR_TRANSFER_MAX 0x3 @@ -983,7 +983,7 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *indio, trig = devm_iio_trigger_alloc(&indio->dev, "%s-dev%d-%s", indio->name, indio->id, trigger_name); if (!trig) - return ERR_PTR(-ENOMEM); + return NULL; trig->dev.parent = indio->dev.parent; iio_trigger_set_drvdata(trig, indio); @@ -1321,12 +1321,10 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, ret = at91_adc_read_position(st, chan->channel, &tmp_val); *val = tmp_val; - if (ret > 0) - ret = at91_adc_adjust_val_osr(st, val); mutex_unlock(&st->lock); iio_device_release_direct_mode(indio_dev); - return ret; + return at91_adc_adjust_val_osr(st, val); } if (chan->type == IIO_PRESSURE) { ret = iio_device_claim_direct_mode(indio_dev); @@ -1337,12 +1335,10 @@ static int at91_adc_read_info_raw(struct iio_dev *indio_dev, ret = at91_adc_read_pressure(st, chan->channel, &tmp_val); *val = tmp_val; - if (ret > 0) - ret = at91_adc_adjust_val_osr(st, val); mutex_unlock(&st->lock); iio_device_release_direct_mode(indio_dev); - return ret; + return at91_adc_adjust_val_osr(st, val); } /* in this case we have a voltage channel */ @@ -1433,20 +1429,16 @@ static int at91_adc_write_raw(struct iio_dev *indio_dev, /* if no change, optimize out */ if (val == st->oversampling_ratio) return 0; - mutex_lock(&st->lock); st->oversampling_ratio = val; /* update ratio */ at91_adc_config_emr(st); - mutex_unlock(&st->lock); return 0; case IIO_CHAN_INFO_SAMP_FREQ: if (val < st->soc_info.min_sample_rate || val > st->soc_info.max_sample_rate) return -EINVAL; - mutex_lock(&st->lock); at91_adc_setup_samp_freq(indio_dev, val); - mutex_unlock(&st->lock); return 0; default: return -EINVAL;
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c index cc81b35..abe9985 100644 --- a/drivers/iio/adc/at91_adc.c +++ b/drivers/iio/adc/at91_adc.c
@@ -616,10 +616,8 @@ static struct iio_trigger *at91_adc_allocate_trigger(struct iio_dev *idev, trig->ops = &at91_adc_trigger_ops; ret = iio_trigger_register(trig); - if (ret) { - iio_trigger_free(trig); + if (ret) return NULL; - } return trig; }
diff --git a/drivers/iio/adc/berlin2-adc.c b/drivers/iio/adc/berlin2-adc.c index 86fdfea..72d8fa9 100644 --- a/drivers/iio/adc/berlin2-adc.c +++ b/drivers/iio/adc/berlin2-adc.c
@@ -289,10 +289,8 @@ static int berlin2_adc_probe(struct platform_device *pdev) int ret; indio_dev = devm_iio_device_alloc(&pdev->dev, sizeof(*priv)); - if (!indio_dev) { - of_node_put(parent_np); + if (!indio_dev) return -ENOMEM; - } priv = iio_priv(indio_dev); platform_set_drvdata(pdev, indio_dev);
diff --git a/drivers/iio/adc/mcp3911.c b/drivers/iio/adc/mcp3911.c index 4e2e8e8..dd52f08 100644 --- a/drivers/iio/adc/mcp3911.c +++ b/drivers/iio/adc/mcp3911.c
@@ -38,8 +38,8 @@ #define MCP3911_CHANNEL(x) (MCP3911_REG_CHANNEL0 + x * 3) #define MCP3911_OFFCAL(x) (MCP3911_REG_OFFCAL_CH0 + x * 6) -/* Internal voltage reference in mV */ -#define MCP3911_INT_VREF_MV 1200 +/* Internal voltage reference in uV */ +#define MCP3911_INT_VREF_UV 1200000 #define MCP3911_REG_READ(reg, id) ((((reg) << 1) | ((id) << 5) | (1 << 0)) & 0xff) #define MCP3911_REG_WRITE(reg, id) ((((reg) << 1) | ((id) << 5) | (0 << 0)) & 0xff) @@ -111,8 +111,6 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, if (ret) goto out; - *val = sign_extend32(*val, 23); - ret = IIO_VAL_INT; break; @@ -137,18 +135,11 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, *val = ret / 1000; } else { - *val = MCP3911_INT_VREF_MV; + *val = MCP3911_INT_VREF_UV; } - /* - * For 24bit Conversion - * Raw = ((Voltage)/(Vref) * 2^23 * Gain * 1.5 - * Voltage = Raw * (Vref)/(2^23 * Gain * 1.5) - */ - - /* val2 = (2^23 * 1.5) */ - *val2 = 12582912; - ret = IIO_VAL_FRACTIONAL; + *val2 = 24; + ret = IIO_VAL_FRACTIONAL_LOG2; break; }
diff --git a/drivers/iio/adc/stm32-dfsdm-adc.c b/drivers/iio/adc/stm32-dfsdm-adc.c index 0c92eb3..c2948de 100644 --- a/drivers/iio/adc/stm32-dfsdm-adc.c +++ b/drivers/iio/adc/stm32-dfsdm-adc.c
@@ -1544,7 +1544,6 @@ static const struct of_device_id stm32_dfsdm_adc_match[] = { }, {} }; -MODULE_DEVICE_TABLE(of, stm32_dfsdm_adc_match); static int stm32_dfsdm_adc_probe(struct platform_device *pdev) {
diff --git a/drivers/iio/adc/ti-adc128s052.c b/drivers/iio/adc/ti-adc128s052.c index c1de80b..4267d75 100644 --- a/drivers/iio/adc/ti-adc128s052.c +++ b/drivers/iio/adc/ti-adc128s052.c
@@ -194,13 +194,13 @@ static int adc128_remove(struct spi_device *spi) } static const struct of_device_id adc128_of_match[] = { - { .compatible = "ti,adc128s052", .data = (void*)0L, }, - { .compatible = "ti,adc122s021", .data = (void*)1L, }, - { .compatible = "ti,adc122s051", .data = (void*)1L, }, - { .compatible = "ti,adc122s101", .data = (void*)1L, }, - { .compatible = "ti,adc124s021", .data = (void*)2L, }, - { .compatible = "ti,adc124s051", .data = (void*)2L, }, - { .compatible = "ti,adc124s101", .data = (void*)2L, }, + { .compatible = "ti,adc128s052", }, + { .compatible = "ti,adc122s021", }, + { .compatible = "ti,adc122s051", }, + { .compatible = "ti,adc122s101", }, + { .compatible = "ti,adc124s021", }, + { .compatible = "ti,adc124s051", }, + { .compatible = "ti,adc124s101", }, { /* sentinel */ }, }; MODULE_DEVICE_TABLE(of, adc128_of_match);
diff --git a/drivers/iio/adc/ti-ads7950.c b/drivers/iio/adc/ti-ads7950.c index 1dee372..7a1a9fe 100644 --- a/drivers/iio/adc/ti-ads7950.c +++ b/drivers/iio/adc/ti-ads7950.c
@@ -635,7 +635,6 @@ static int ti_ads7950_probe(struct spi_device *spi) st->chip.label = dev_name(&st->spi->dev); st->chip.parent = &st->spi->dev; st->chip.owner = THIS_MODULE; - st->chip.can_sleep = true; st->chip.base = -1; st->chip.ngpio = TI_ADS7950_NUM_GPIOS; st->chip.get_direction = ti_ads7950_get_direction;
diff --git a/drivers/iio/adc/twl6030-gpadc.c b/drivers/iio/adc/twl6030-gpadc.c index 0a76081..fb77c3f 100644 --- a/drivers/iio/adc/twl6030-gpadc.c +++ b/drivers/iio/adc/twl6030-gpadc.c
@@ -57,18 +57,6 @@ #define TWL6030_GPADCS BIT(1) #define TWL6030_GPADCR BIT(0) -#define USB_VBUS_CTRL_SET 0x04 -#define USB_ID_CTRL_SET 0x06 - -#define TWL6030_MISC1 0xE4 -#define VBUS_MEAS 0x01 -#define ID_MEAS 0x01 - -#define VAC_MEAS 0x04 -#define VBAT_MEAS 0x02 -#define BB_MEAS 0x01 - - /** * struct twl6030_chnl_calib - channel calibration * @gain: slope coefficient for ideal curve @@ -939,26 +927,6 @@ static int twl6030_gpadc_probe(struct platform_device *pdev) return ret; } - ret = twl_i2c_write_u8(TWL_MODULE_USB, VBUS_MEAS, USB_VBUS_CTRL_SET); - if (ret < 0) { - dev_err(dev, "failed to wire up inputs\n"); - return ret; - } - - ret = twl_i2c_write_u8(TWL_MODULE_USB, ID_MEAS, USB_ID_CTRL_SET); - if (ret < 0) { - dev_err(dev, "failed to wire up inputs\n"); - return ret; - } - - ret = twl_i2c_write_u8(TWL6030_MODULE_ID0, - VBAT_MEAS | BB_MEAS | VAC_MEAS, - TWL6030_MISC1); - if (ret < 0) { - dev_err(dev, "failed to wire up inputs\n"); - return ret; - } - indio_dev->name = DRIVER_NAME; indio_dev->dev.parent = dev; indio_dev->info = &twl6030_gpadc_iio_info;
diff --git a/drivers/iio/dac/ad5593r.c b/drivers/iio/dac/ad5593r.c index cd5d9ce..44ea3b8 100644 --- a/drivers/iio/dac/ad5593r.c +++ b/drivers/iio/dac/ad5593r.c
@@ -14,8 +14,6 @@ #include <linux/of.h> #include <linux/acpi.h> -#include <asm/unaligned.h> - #define AD5593R_MODE_CONF (0 << 4) #define AD5593R_MODE_DAC_WRITE (1 << 4) #define AD5593R_MODE_ADC_READBACK (4 << 4) @@ -23,24 +21,6 @@ #define AD5593R_MODE_GPIO_READBACK (6 << 4) #define AD5593R_MODE_REG_READBACK (7 << 4) -static int ad5593r_read_word(struct i2c_client *i2c, u8 reg, u16 *value) -{ - int ret; - u8 buf[2]; - - ret = i2c_smbus_write_byte(i2c, reg); - if (ret < 0) - return ret; - - ret = i2c_master_recv(i2c, buf, sizeof(buf)); - if (ret < 0) - return ret; - - *value = get_unaligned_be16(buf); - - return 0; -} - static int ad5593r_write_dac(struct ad5592r_state *st, unsigned chan, u16 value) { struct i2c_client *i2c = to_i2c_client(st->dev); @@ -59,7 +39,13 @@ static int ad5593r_read_adc(struct ad5592r_state *st, unsigned chan, u16 *value) if (val < 0) return (int) val; - return ad5593r_read_word(i2c, AD5593R_MODE_ADC_READBACK, value); + val = i2c_smbus_read_word_swapped(i2c, AD5593R_MODE_ADC_READBACK); + if (val < 0) + return (int) val; + + *value = (u16) val; + + return 0; } static int ad5593r_reg_write(struct ad5592r_state *st, u8 reg, u16 value) @@ -73,19 +59,25 @@ static int ad5593r_reg_write(struct ad5592r_state *st, u8 reg, u16 value) static int ad5593r_reg_read(struct ad5592r_state *st, u8 reg, u16 *value) { struct i2c_client *i2c = to_i2c_client(st->dev); + s32 val; - return ad5593r_read_word(i2c, AD5593R_MODE_REG_READBACK | reg, value); + val = i2c_smbus_read_word_swapped(i2c, AD5593R_MODE_REG_READBACK | reg); + if (val < 0) + return (int) val; + + *value = (u16) val; + + return 0; } static int ad5593r_gpio_read(struct ad5592r_state *st, u8 *value) { struct i2c_client *i2c = to_i2c_client(st->dev); - u16 val; - int ret; + s32 val; - ret = ad5593r_read_word(i2c, AD5593R_MODE_GPIO_READBACK, &val); - if (ret) - return ret; + val = i2c_smbus_read_word_swapped(i2c, AD5593R_MODE_GPIO_READBACK); + if (val < 0) + return (int) val; *value = (u8) val;
diff --git a/drivers/iio/dac/cio-dac.c b/drivers/iio/dac/cio-dac.c index 080a372..8167779 100644 --- a/drivers/iio/dac/cio-dac.c +++ b/drivers/iio/dac/cio-dac.c
@@ -66,8 +66,8 @@ static int cio_dac_write_raw(struct iio_dev *indio_dev, if (mask != IIO_CHAN_INFO_RAW) return -EINVAL; - /* DAC can only accept up to a 12-bit value */ - if ((unsigned int)val > 4095) + /* DAC can only accept up to a 16-bit value */ + if ((unsigned int)val > 65535) return -EINVAL; priv->chan_out_states[chan->channel] = val;
diff --git a/drivers/iio/health/afe4403.c b/drivers/iio/health/afe4403.c index 3fdaf31..2910465 100644 --- a/drivers/iio/health/afe4403.c +++ b/drivers/iio/health/afe4403.c
@@ -245,14 +245,14 @@ static int afe4403_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct afe4403_data *afe = iio_priv(indio_dev); - unsigned int reg, field; + unsigned int reg = afe4403_channel_values[chan->address]; + unsigned int field = afe4403_channel_leds[chan->address]; int ret; switch (chan->type) { case IIO_INTENSITY: switch (mask) { case IIO_CHAN_INFO_RAW: - reg = afe4403_channel_values[chan->address]; ret = afe4403_read(afe, reg, val); if (ret) return ret; @@ -262,7 +262,6 @@ static int afe4403_read_raw(struct iio_dev *indio_dev, case IIO_CURRENT: switch (mask) { case IIO_CHAN_INFO_RAW: - field = afe4403_channel_leds[chan->address]; ret = regmap_field_read(afe->fields[field], val); if (ret) return ret;
diff --git a/drivers/iio/health/afe4404.c b/drivers/iio/health/afe4404.c index 7780e9b..cebb1fd 100644 --- a/drivers/iio/health/afe4404.c +++ b/drivers/iio/health/afe4404.c
@@ -250,20 +250,20 @@ static int afe4404_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct afe4404_data *afe = iio_priv(indio_dev); - unsigned int value_reg, led_field, offdac_field; + unsigned int value_reg = afe4404_channel_values[chan->address]; + unsigned int led_field = afe4404_channel_leds[chan->address]; + unsigned int offdac_field = afe4404_channel_offdacs[chan->address]; int ret; switch (chan->type) { case IIO_INTENSITY: switch (mask) { case IIO_CHAN_INFO_RAW: - value_reg = afe4404_channel_values[chan->address]; ret = regmap_read(afe->regmap, value_reg, val); if (ret) return ret; return IIO_VAL_INT; case IIO_CHAN_INFO_OFFSET: - offdac_field = afe4404_channel_offdacs[chan->address]; ret = regmap_field_read(afe->fields[offdac_field], val); if (ret) return ret; @@ -273,7 +273,6 @@ static int afe4404_read_raw(struct iio_dev *indio_dev, case IIO_CURRENT: switch (mask) { case IIO_CHAN_INFO_RAW: - led_field = afe4404_channel_leds[chan->address]; ret = regmap_field_read(afe->fields[led_field], val); if (ret) return ret; @@ -296,20 +295,19 @@ static int afe4404_write_raw(struct iio_dev *indio_dev, int val, int val2, long mask) { struct afe4404_data *afe = iio_priv(indio_dev); - unsigned int led_field, offdac_field; + unsigned int led_field = afe4404_channel_leds[chan->address]; + unsigned int offdac_field = afe4404_channel_offdacs[chan->address]; switch (chan->type) { case IIO_INTENSITY: switch (mask) { case IIO_CHAN_INFO_OFFSET: - offdac_field = afe4404_channel_offdacs[chan->address]; return regmap_field_write(afe->fields[offdac_field], val); } break; case IIO_CURRENT: switch (mask) { case IIO_CHAN_INFO_RAW: - led_field = afe4404_channel_leds[chan->address]; return regmap_field_write(afe->fields[led_field], val); } break;
diff --git a/drivers/iio/industrialio-sw-trigger.c b/drivers/iio/industrialio-sw-trigger.c index a7714d3..9ae793a 100644 --- a/drivers/iio/industrialio-sw-trigger.c +++ b/drivers/iio/industrialio-sw-trigger.c
@@ -58,12 +58,8 @@ int iio_register_sw_trigger_type(struct iio_sw_trigger_type *t) t->group = configfs_register_default_group(iio_triggers_group, t->name, &iio_trigger_type_group_type); - if (IS_ERR(t->group)) { - mutex_lock(&iio_trigger_types_lock); - list_del(&t->list); - mutex_unlock(&iio_trigger_types_lock); + if (IS_ERR(t->group)) ret = PTR_ERR(t->group); - } return ret; }
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c index d00f304..ca0fe90 100644 --- a/drivers/iio/inkern.c +++ b/drivers/iio/inkern.c
@@ -136,10 +136,9 @@ static int __of_iio_channel_get(struct iio_channel *channel, idev = bus_find_device(&iio_bus_type, NULL, iiospec.np, iio_dev_node_match); - if (idev == NULL) { - of_node_put(iiospec.np); + of_node_put(iiospec.np); + if (idev == NULL) return -EPROBE_DEFER; - } indio_dev = dev_to_iio_dev(idev); channel->indio_dev = indio_dev; @@ -147,7 +146,6 @@ static int __of_iio_channel_get(struct iio_channel *channel, index = indio_dev->info->of_xlate(indio_dev, &iiospec); else index = __of_iio_simple_xlate(indio_dev, &iiospec); - of_node_put(iiospec.np); if (index < 0) goto err_put; channel->channel = &indio_dev->channels[index];
diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig index 83885f6..42b64b8 100644 --- a/drivers/iio/light/Kconfig +++ b/drivers/iio/light/Kconfig
@@ -239,8 +239,6 @@ tristate "ROHM RPR0521 ALS and proximity sensor driver" depends on I2C select REGMAP_I2C - select IIO_BUFFER - select IIO_TRIGGERED_BUFFER help Say Y here if you want to build support for ROHM's RPR0521 ambient light and proximity sensor device.
diff --git a/drivers/iio/light/apds9960.c b/drivers/iio/light/apds9960.c index 2403911..c5dfb9a 100644 --- a/drivers/iio/light/apds9960.c +++ b/drivers/iio/light/apds9960.c
@@ -55,6 +55,9 @@ #define APDS9960_REG_CONTROL_PGAIN_MASK_SHIFT 2 #define APDS9960_REG_CONFIG_2 0x90 +#define APDS9960_REG_CONFIG_2_GGAIN_MASK 0x60 +#define APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT 5 + #define APDS9960_REG_ID 0x92 #define APDS9960_REG_STATUS 0x93 @@ -75,9 +78,6 @@ #define APDS9960_REG_GCONF_1_GFIFO_THRES_MASK_SHIFT 6 #define APDS9960_REG_GCONF_2 0xa3 -#define APDS9960_REG_GCONF_2_GGAIN_MASK 0x60 -#define APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT 5 - #define APDS9960_REG_GOFFSET_U 0xa4 #define APDS9960_REG_GOFFSET_D 0xa5 #define APDS9960_REG_GPULSE 0xa6 @@ -397,9 +397,9 @@ static int apds9960_set_pxs_gain(struct apds9960_data *data, int val) } ret = regmap_update_bits(data->regmap, - APDS9960_REG_GCONF_2, - APDS9960_REG_GCONF_2_GGAIN_MASK, - idx << APDS9960_REG_GCONF_2_GGAIN_MASK_SHIFT); + APDS9960_REG_CONFIG_2, + APDS9960_REG_CONFIG_2_GGAIN_MASK, + idx << APDS9960_REG_CONFIG_2_GGAIN_MASK_SHIFT); if (!ret) data->pxs_gain = idx; mutex_unlock(&data->lock);
diff --git a/drivers/iio/light/isl29028.c b/drivers/iio/light/isl29028.c index 14e150c..4d220c8 100644 --- a/drivers/iio/light/isl29028.c +++ b/drivers/iio/light/isl29028.c
@@ -628,7 +628,7 @@ static int isl29028_probe(struct i2c_client *client, ISL29028_POWER_OFF_DELAY_MS); pm_runtime_use_autosuspend(&client->dev); - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev); if (ret < 0) { dev_err(&client->dev, "%s(): iio registration failed with error %d\n",
diff --git a/drivers/iio/light/tsl2583.c b/drivers/iio/light/tsl2583.c index 06b98a2..fe6001a 100644 --- a/drivers/iio/light/tsl2583.c +++ b/drivers/iio/light/tsl2583.c
@@ -857,7 +857,7 @@ static int tsl2583_probe(struct i2c_client *clientp, TSL2583_POWER_OFF_DELAY_MS); pm_runtime_use_autosuspend(&clientp->dev); - ret = iio_device_register(indio_dev); + ret = devm_iio_device_register(indio_dev->dev.parent, indio_dev); if (ret) { dev_err(&clientp->dev, "%s: iio registration failed\n", __func__);
diff --git a/drivers/iio/light/tsl2772.c b/drivers/iio/light/tsl2772.c index 665a24f..be37fcb 100644 --- a/drivers/iio/light/tsl2772.c +++ b/drivers/iio/light/tsl2772.c
@@ -606,7 +606,6 @@ static int tsl2772_read_prox_diodes(struct tsl2772_chip *chip) return -EINVAL; } } - chip->settings.prox_diode = prox_diode_mask; return 0; }
diff --git a/drivers/iio/pressure/dps310.c b/drivers/iio/pressure/dps310.c index d3d1625..2c1943b 100644 --- a/drivers/iio/pressure/dps310.c +++ b/drivers/iio/pressure/dps310.c
@@ -89,7 +89,6 @@ struct dps310_data { s32 c00, c10, c20, c30, c01, c11, c21; s32 pressure_raw; s32 temp_raw; - bool timeout_recovery_failed; }; static const struct iio_chan_spec dps310_channels[] = { @@ -160,102 +159,6 @@ static int dps310_get_coefs(struct dps310_data *data) return 0; } -/* - * Some versions of the chip will read temperatures in the ~60C range when - * it's actually ~20C. This is the manufacturer recommended workaround - * to correct the issue. The registers used below are undocumented. - */ -static int dps310_temp_workaround(struct dps310_data *data) -{ - int rc; - int reg; - - rc = regmap_read(data->regmap, 0x32, ®); - if (rc) - return rc; - - /* - * If bit 1 is set then the device is okay, and the workaround does not - * need to be applied - */ - if (reg & BIT(1)) - return 0; - - rc = regmap_write(data->regmap, 0x0e, 0xA5); - if (rc) - return rc; - - rc = regmap_write(data->regmap, 0x0f, 0x96); - if (rc) - return rc; - - rc = regmap_write(data->regmap, 0x62, 0x02); - if (rc) - return rc; - - rc = regmap_write(data->regmap, 0x0e, 0x00); - if (rc) - return rc; - - return regmap_write(data->regmap, 0x0f, 0x00); -} - -static int dps310_startup(struct dps310_data *data) -{ - int rc; - int ready; - - /* - * Set up pressure sensor in single sample, one measurement per second - * mode - */ - rc = regmap_write(data->regmap, DPS310_PRS_CFG, 0); - if (rc) - return rc; - - /* - * Set up external (MEMS) temperature sensor in single sample, one - * measurement per second mode - */ - rc = regmap_write(data->regmap, DPS310_TMP_CFG, DPS310_TMP_EXT); - if (rc) - return rc; - - /* Temp and pressure shifts are disabled when PRC <= 8 */ - rc = regmap_write_bits(data->regmap, DPS310_CFG_REG, - DPS310_PRS_SHIFT_EN | DPS310_TMP_SHIFT_EN, 0); - if (rc) - return rc; - - /* MEAS_CFG doesn't update correctly unless first written with 0 */ - rc = regmap_write_bits(data->regmap, DPS310_MEAS_CFG, - DPS310_MEAS_CTRL_BITS, 0); - if (rc) - return rc; - - /* Turn on temperature and pressure measurement in the background */ - rc = regmap_write_bits(data->regmap, DPS310_MEAS_CFG, - DPS310_MEAS_CTRL_BITS, DPS310_PRS_EN | - DPS310_TEMP_EN | DPS310_BACKGROUND); - if (rc) - return rc; - - /* - * Calibration coefficients required for reporting temperature. - * They are available 40ms after the device has started - */ - rc = regmap_read_poll_timeout(data->regmap, DPS310_MEAS_CFG, ready, - ready & DPS310_COEF_RDY, 10000, 40000); - if (rc) - return rc; - - rc = dps310_get_coefs(data); - if (rc) - return rc; - - return dps310_temp_workaround(data); -} - static int dps310_get_pres_precision(struct dps310_data *data) { int rc; @@ -394,69 +297,11 @@ static int dps310_get_temp_k(struct dps310_data *data) return scale_factors[ilog2(rc)]; } -static int dps310_reset_wait(struct dps310_data *data) -{ - int rc; - - rc = regmap_write(data->regmap, DPS310_RESET, DPS310_RESET_MAGIC); - if (rc) - return rc; - - /* Wait for device chip access: 2.5ms in specification */ - usleep_range(2500, 12000); - return 0; -} - -static int dps310_reset_reinit(struct dps310_data *data) -{ - int rc; - - rc = dps310_reset_wait(data); - if (rc) - return rc; - - return dps310_startup(data); -} - -static int dps310_ready_status(struct dps310_data *data, int ready_bit, int timeout) -{ - int sleep = DPS310_POLL_SLEEP_US(timeout); - int ready; - - return regmap_read_poll_timeout(data->regmap, DPS310_MEAS_CFG, ready, ready & ready_bit, - sleep, timeout); -} - -static int dps310_ready(struct dps310_data *data, int ready_bit, int timeout) -{ - int rc; - - rc = dps310_ready_status(data, ready_bit, timeout); - if (rc) { - if (rc == -ETIMEDOUT && !data->timeout_recovery_failed) { - /* Reset and reinitialize the chip. */ - if (dps310_reset_reinit(data)) { - data->timeout_recovery_failed = true; - } else { - /* Try again to get sensor ready status. */ - if (dps310_ready_status(data, ready_bit, timeout)) - data->timeout_recovery_failed = true; - else - return 0; - } - } - - return rc; - } - - data->timeout_recovery_failed = false; - return 0; -} - static int dps310_read_pres_raw(struct dps310_data *data) { int rc; int rate; + int ready; int timeout; s32 raw; u8 val[3]; @@ -468,7 +313,9 @@ static int dps310_read_pres_raw(struct dps310_data *data) timeout = DPS310_POLL_TIMEOUT_US(rate); /* Poll for sensor readiness; base the timeout upon the sample rate. */ - rc = dps310_ready(data, DPS310_PRS_RDY, timeout); + rc = regmap_read_poll_timeout(data->regmap, DPS310_MEAS_CFG, ready, + ready & DPS310_PRS_RDY, + DPS310_POLL_SLEEP_US(timeout), timeout); if (rc) goto done; @@ -505,6 +352,7 @@ static int dps310_read_temp_raw(struct dps310_data *data) { int rc; int rate; + int ready; int timeout; if (mutex_lock_interruptible(&data->lock)) @@ -514,8 +362,10 @@ static int dps310_read_temp_raw(struct dps310_data *data) timeout = DPS310_POLL_TIMEOUT_US(rate); /* Poll for sensor readiness; base the timeout upon the sample rate. */ - rc = dps310_ready(data, DPS310_TMP_RDY, timeout); - if (rc) + rc = regmap_read_poll_timeout(data->regmap, DPS310_MEAS_CFG, ready, + ready & DPS310_TMP_RDY, + DPS310_POLL_SLEEP_US(timeout), timeout); + if (rc < 0) goto done; rc = dps310_read_temp_ready(data); @@ -810,7 +660,7 @@ static void dps310_reset(void *action_data) { struct dps310_data *data = action_data; - dps310_reset_wait(data); + regmap_write(data->regmap, DPS310_RESET, DPS310_RESET_MAGIC); } static const struct regmap_config dps310_regmap_config = { @@ -827,12 +677,52 @@ static const struct iio_info dps310_info = { .write_raw = dps310_write_raw, }; +/* + * Some verions of chip will read temperatures in the ~60C range when + * its actually ~20C. This is the manufacturer recommended workaround + * to correct the issue. The registers used below are undocumented. + */ +static int dps310_temp_workaround(struct dps310_data *data) +{ + int rc; + int reg; + + rc = regmap_read(data->regmap, 0x32, ®); + if (rc < 0) + return rc; + + /* + * If bit 1 is set then the device is okay, and the workaround does not + * need to be applied + */ + if (reg & BIT(1)) + return 0; + + rc = regmap_write(data->regmap, 0x0e, 0xA5); + if (rc < 0) + return rc; + + rc = regmap_write(data->regmap, 0x0f, 0x96); + if (rc < 0) + return rc; + + rc = regmap_write(data->regmap, 0x62, 0x02); + if (rc < 0) + return rc; + + rc = regmap_write(data->regmap, 0x0e, 0x00); + if (rc < 0) + return rc; + + return regmap_write(data->regmap, 0x0f, 0x00); +} + static int dps310_probe(struct i2c_client *client, const struct i2c_device_id *id) { struct dps310_data *data; struct iio_dev *iio; - int rc; + int rc, ready; iio = devm_iio_device_alloc(&client->dev, sizeof(*data)); if (!iio) @@ -858,8 +748,54 @@ static int dps310_probe(struct i2c_client *client, if (rc) return rc; - rc = dps310_startup(data); - if (rc) + /* + * Set up pressure sensor in single sample, one measurement per second + * mode + */ + rc = regmap_write(data->regmap, DPS310_PRS_CFG, 0); + + /* + * Set up external (MEMS) temperature sensor in single sample, one + * measurement per second mode + */ + rc = regmap_write(data->regmap, DPS310_TMP_CFG, DPS310_TMP_EXT); + if (rc < 0) + return rc; + + /* Temp and pressure shifts are disabled when PRC <= 8 */ + rc = regmap_write_bits(data->regmap, DPS310_CFG_REG, + DPS310_PRS_SHIFT_EN | DPS310_TMP_SHIFT_EN, 0); + if (rc < 0) + return rc; + + /* MEAS_CFG doesn't update correctly unless first written with 0 */ + rc = regmap_write_bits(data->regmap, DPS310_MEAS_CFG, + DPS310_MEAS_CTRL_BITS, 0); + if (rc < 0) + return rc; + + /* Turn on temperature and pressure measurement in the background */ + rc = regmap_write_bits(data->regmap, DPS310_MEAS_CFG, + DPS310_MEAS_CTRL_BITS, DPS310_PRS_EN | + DPS310_TEMP_EN | DPS310_BACKGROUND); + if (rc < 0) + return rc; + + /* + * Calibration coefficients required for reporting temperature. + * They are available 40ms after the device has started + */ + rc = regmap_read_poll_timeout(data->regmap, DPS310_MEAS_CFG, ready, + ready & DPS310_COEF_RDY, 10000, 40000); + if (rc < 0) + return rc; + + rc = dps310_get_coefs(data); + if (rc < 0) + return rc; + + rc = dps310_temp_workaround(data); + if (rc < 0) return rc; rc = devm_iio_device_register(&client->dev, iio);
diff --git a/drivers/iio/pressure/ms5611.h b/drivers/iio/pressure/ms5611.h index 5e2d2d4..bc06271 100644 --- a/drivers/iio/pressure/ms5611.h +++ b/drivers/iio/pressure/ms5611.h
@@ -25,6 +25,13 @@ enum { MS5607, }; +struct ms5611_chip_info { + u16 prom[MS5611_PROM_WORDS_NB]; + + int (*temp_and_pressure_compensate)(struct ms5611_chip_info *chip_info, + s32 *temp, s32 *pressure); +}; + /* * OverSampling Rate descriptor. * Warning: cmd MUST be kept aligned on a word boundary (see @@ -43,15 +50,12 @@ struct ms5611_state { const struct ms5611_osr *pressure_osr; const struct ms5611_osr *temp_osr; - u16 prom[MS5611_PROM_WORDS_NB]; - - int (*reset)(struct ms5611_state *st); - int (*read_prom_word)(struct ms5611_state *st, int index, u16 *word); - int (*read_adc_temp_and_pressure)(struct ms5611_state *st, + int (*reset)(struct device *dev); + int (*read_prom_word)(struct device *dev, int index, u16 *word); + int (*read_adc_temp_and_pressure)(struct device *dev, s32 *temp, s32 *pressure); - int (*compensate_temp_and_pressure)(struct ms5611_state *st, s32 *temp, - s32 *pressure); + struct ms5611_chip_info *chip_info; struct regulator *vdd; };
diff --git a/drivers/iio/pressure/ms5611_core.c b/drivers/iio/pressure/ms5611_core.c index 511ebde..f5db9fa 100644 --- a/drivers/iio/pressure/ms5611_core.c +++ b/drivers/iio/pressure/ms5611_core.c
@@ -85,7 +85,8 @@ static int ms5611_read_prom(struct iio_dev *indio_dev) struct ms5611_state *st = iio_priv(indio_dev); for (i = 0; i < MS5611_PROM_WORDS_NB; i++) { - ret = st->read_prom_word(st, i, &st->prom[i]); + ret = st->read_prom_word(&indio_dev->dev, + i, &st->chip_info->prom[i]); if (ret < 0) { dev_err(&indio_dev->dev, "failed to read prom at %d\n", i); @@ -93,7 +94,7 @@ static int ms5611_read_prom(struct iio_dev *indio_dev) } } - if (!ms5611_prom_is_valid(st->prom, MS5611_PROM_WORDS_NB)) { + if (!ms5611_prom_is_valid(st->chip_info->prom, MS5611_PROM_WORDS_NB)) { dev_err(&indio_dev->dev, "PROM integrity check failed\n"); return -ENODEV; } @@ -107,27 +108,28 @@ static int ms5611_read_temp_and_pressure(struct iio_dev *indio_dev, int ret; struct ms5611_state *st = iio_priv(indio_dev); - ret = st->read_adc_temp_and_pressure(st, temp, pressure); + ret = st->read_adc_temp_and_pressure(&indio_dev->dev, temp, pressure); if (ret < 0) { dev_err(&indio_dev->dev, "failed to read temperature and pressure\n"); return ret; } - return st->compensate_temp_and_pressure(st, temp, pressure); + return st->chip_info->temp_and_pressure_compensate(st->chip_info, + temp, pressure); } -static int ms5611_temp_and_pressure_compensate(struct ms5611_state *st, +static int ms5611_temp_and_pressure_compensate(struct ms5611_chip_info *chip_info, s32 *temp, s32 *pressure) { s32 t = *temp, p = *pressure; s64 off, sens, dt; - dt = t - (st->prom[5] << 8); - off = ((s64)st->prom[2] << 16) + ((st->prom[4] * dt) >> 7); - sens = ((s64)st->prom[1] << 15) + ((st->prom[3] * dt) >> 8); + dt = t - (chip_info->prom[5] << 8); + off = ((s64)chip_info->prom[2] << 16) + ((chip_info->prom[4] * dt) >> 7); + sens = ((s64)chip_info->prom[1] << 15) + ((chip_info->prom[3] * dt) >> 8); - t = 2000 + ((st->prom[6] * dt) >> 23); + t = 2000 + ((chip_info->prom[6] * dt) >> 23); if (t < 2000) { s64 off2, sens2, t2; @@ -153,17 +155,17 @@ static int ms5611_temp_and_pressure_compensate(struct ms5611_state *st, return 0; } -static int ms5607_temp_and_pressure_compensate(struct ms5611_state *st, +static int ms5607_temp_and_pressure_compensate(struct ms5611_chip_info *chip_info, s32 *temp, s32 *pressure) { s32 t = *temp, p = *pressure; s64 off, sens, dt; - dt = t - (st->prom[5] << 8); - off = ((s64)st->prom[2] << 17) + ((st->prom[4] * dt) >> 6); - sens = ((s64)st->prom[1] << 16) + ((st->prom[3] * dt) >> 7); + dt = t - (chip_info->prom[5] << 8); + off = ((s64)chip_info->prom[2] << 17) + ((chip_info->prom[4] * dt) >> 6); + sens = ((s64)chip_info->prom[1] << 16) + ((chip_info->prom[3] * dt) >> 7); - t = 2000 + ((st->prom[6] * dt) >> 23); + t = 2000 + ((chip_info->prom[6] * dt) >> 23); if (t < 2000) { s64 off2, sens2, t2, tmp; @@ -194,7 +196,7 @@ static int ms5611_reset(struct iio_dev *indio_dev) int ret; struct ms5611_state *st = iio_priv(indio_dev); - ret = st->reset(st); + ret = st->reset(&indio_dev->dev); if (ret < 0) { dev_err(&indio_dev->dev, "failed to reset device\n"); return ret; @@ -341,6 +343,15 @@ static int ms5611_write_raw(struct iio_dev *indio_dev, static const unsigned long ms5611_scan_masks[] = {0x3, 0}; +static struct ms5611_chip_info chip_info_tbl[] = { + [MS5611] = { + .temp_and_pressure_compensate = ms5611_temp_and_pressure_compensate, + }, + [MS5607] = { + .temp_and_pressure_compensate = ms5607_temp_and_pressure_compensate, + } +}; + static const struct iio_chan_spec ms5611_channels[] = { { .type = IIO_PRESSURE, @@ -423,20 +434,7 @@ int ms5611_probe(struct iio_dev *indio_dev, struct device *dev, struct ms5611_state *st = iio_priv(indio_dev); mutex_init(&st->lock); - - switch (type) { - case MS5611: - st->compensate_temp_and_pressure = - ms5611_temp_and_pressure_compensate; - break; - case MS5607: - st->compensate_temp_and_pressure = - ms5607_temp_and_pressure_compensate; - break; - default: - return -EINVAL; - } - + st->chip_info = &chip_info_tbl[type]; st->temp_osr = &ms5611_avail_temp_osr[ARRAY_SIZE(ms5611_avail_temp_osr) - 1]; st->pressure_osr =
diff --git a/drivers/iio/pressure/ms5611_i2c.c b/drivers/iio/pressure/ms5611_i2c.c index 3175816..8089c59 100644 --- a/drivers/iio/pressure/ms5611_i2c.c +++ b/drivers/iio/pressure/ms5611_i2c.c
@@ -18,15 +18,17 @@ #include "ms5611.h" -static int ms5611_i2c_reset(struct ms5611_state *st) +static int ms5611_i2c_reset(struct device *dev) { + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); + return i2c_smbus_write_byte(st->client, MS5611_RESET); } -static int ms5611_i2c_read_prom_word(struct ms5611_state *st, int index, - u16 *word) +static int ms5611_i2c_read_prom_word(struct device *dev, int index, u16 *word) { int ret; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); ret = i2c_smbus_read_word_swapped(st->client, MS5611_READ_PROM_WORD + (index << 1)); @@ -53,10 +55,11 @@ static int ms5611_i2c_read_adc(struct ms5611_state *st, s32 *val) return 0; } -static int ms5611_i2c_read_adc_temp_and_pressure(struct ms5611_state *st, +static int ms5611_i2c_read_adc_temp_and_pressure(struct device *dev, s32 *temp, s32 *pressure) { int ret; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); const struct ms5611_osr *osr = st->temp_osr; ret = i2c_smbus_write_byte(st->client, osr->cmd);
diff --git a/drivers/iio/pressure/ms5611_spi.c b/drivers/iio/pressure/ms5611_spi.c index 6e9cab6..b463eaa 100644 --- a/drivers/iio/pressure/ms5611_spi.c +++ b/drivers/iio/pressure/ms5611_spi.c
@@ -13,17 +13,18 @@ #include "ms5611.h" -static int ms5611_spi_reset(struct ms5611_state *st) +static int ms5611_spi_reset(struct device *dev) { u8 cmd = MS5611_RESET; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); return spi_write_then_read(st->client, &cmd, 1, NULL, 0); } -static int ms5611_spi_read_prom_word(struct ms5611_state *st, int index, - u16 *word) +static int ms5611_spi_read_prom_word(struct device *dev, int index, u16 *word) { int ret; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); ret = spi_w8r16be(st->client, MS5611_READ_PROM_WORD + (index << 1)); if (ret < 0) @@ -34,10 +35,11 @@ static int ms5611_spi_read_prom_word(struct ms5611_state *st, int index, return 0; } -static int ms5611_spi_read_adc(struct ms5611_state *st, s32 *val) +static int ms5611_spi_read_adc(struct device *dev, s32 *val) { int ret; u8 buf[3] = { MS5611_READ_ADC }; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); ret = spi_write_then_read(st->client, buf, 1, buf, 3); if (ret < 0) @@ -48,10 +50,11 @@ static int ms5611_spi_read_adc(struct ms5611_state *st, s32 *val) return 0; } -static int ms5611_spi_read_adc_temp_and_pressure(struct ms5611_state *st, +static int ms5611_spi_read_adc_temp_and_pressure(struct device *dev, s32 *temp, s32 *pressure) { int ret; + struct ms5611_state *st = iio_priv(dev_to_iio_dev(dev)); const struct ms5611_osr *osr = st->temp_osr; /* @@ -63,7 +66,7 @@ static int ms5611_spi_read_adc_temp_and_pressure(struct ms5611_state *st, return ret; usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL)); - ret = ms5611_spi_read_adc(st, temp); + ret = ms5611_spi_read_adc(dev, temp); if (ret < 0) return ret; @@ -73,7 +76,7 @@ static int ms5611_spi_read_adc_temp_and_pressure(struct ms5611_state *st, return ret; usleep_range(osr->conv_usec, osr->conv_usec + (osr->conv_usec / 10UL)); - return ms5611_spi_read_adc(st, pressure); + return ms5611_spi_read_adc(dev, pressure); } static int ms5611_spi_probe(struct spi_device *spi) @@ -89,7 +92,7 @@ static int ms5611_spi_probe(struct spi_device *spi) spi_set_drvdata(spi, indio_dev); spi->mode = SPI_MODE_0; - spi->max_speed_hz = min(spi->max_speed_hz, 20000000U); + spi->max_speed_hz = 20000000; spi->bits_per_word = 8; ret = spi_setup(spi); if (ret < 0)
diff --git a/drivers/iio/trigger/iio-trig-sysfs.c b/drivers/iio/trigger/iio-trig-sysfs.c index 9ed5b94..2277d63 100644 --- a/drivers/iio/trigger/iio-trig-sysfs.c +++ b/drivers/iio/trigger/iio-trig-sysfs.c
@@ -209,13 +209,9 @@ static int iio_sysfs_trigger_remove(int id) static int __init iio_sysfs_trig_init(void) { - int ret; device_initialize(&iio_sysfs_trig_dev); dev_set_name(&iio_sysfs_trig_dev, "iio_sysfs_trigger"); - ret = device_add(&iio_sysfs_trig_dev); - if (ret) - put_device(&iio_sysfs_trig_dev); - return ret; + return device_add(&iio_sysfs_trig_dev); } module_init(iio_sysfs_trig_init);
diff --git a/drivers/infiniband/core/cma.c b/drivers/infiniband/core/cma.c index 052d156..de7df5a 100644 --- a/drivers/infiniband/core/cma.c +++ b/drivers/infiniband/core/cma.c
@@ -1434,7 +1434,7 @@ static bool validate_ipv4_net_dev(struct net_device *net_dev, return false; memset(&fl4, 0, sizeof(fl4)); - fl4.flowi4_oif = net_dev->ifindex; + fl4.flowi4_iif = net_dev->ifindex; fl4.daddr = daddr; fl4.saddr = saddr; @@ -1719,8 +1719,8 @@ cma_ib_id_from_event(struct ib_cm_id *cm_id, } if (!validate_net_dev(*net_dev, - (struct sockaddr *)&req->src_addr_storage, - (struct sockaddr *)&req->listen_addr_storage)) { + (struct sockaddr *)&req->listen_addr_storage, + (struct sockaddr *)&req->src_addr_storage)) { id_priv = ERR_PTR(-EHOSTUNREACH); goto err; }
diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index a12ee8e..de66d7d 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c
@@ -2762,18 +2762,10 @@ static int __init ib_core_init(void) nldev_init(); rdma_nl_register(RDMA_NL_LS, ibnl_ls_cb_table); - ret = roce_gid_mgmt_init(); - if (ret) { - pr_warn("Couldn't init RoCE GID management\n"); - goto err_parent; - } + roce_gid_mgmt_init(); return 0; -err_parent: - rdma_nl_unregister(RDMA_NL_LS); - nldev_exit(); - unregister_pernet_device(&rdma_dev_net_ops); err_compat: unregister_blocking_lsm_notifier(&ibdev_lsm_nb); err_sa: @@ -2796,8 +2788,8 @@ static int __init ib_core_init(void) static void __exit ib_core_cleanup(void) { roce_gid_mgmt_cleanup(); - rdma_nl_unregister(RDMA_NL_LS); nldev_exit(); + rdma_nl_unregister(RDMA_NL_LS); unregister_pernet_device(&rdma_dev_net_ops); unregister_blocking_lsm_notifier(&ibdev_lsm_nb); ib_sa_cleanup();
diff --git a/drivers/infiniband/core/nldev.c b/drivers/infiniband/core/nldev.c index 88c68d7..e4905d9 100644 --- a/drivers/infiniband/core/nldev.c +++ b/drivers/infiniband/core/nldev.c
@@ -493,7 +493,7 @@ static int fill_res_cm_id_entry(struct sk_buff *msg, bool has_cap_net_admin, struct rdma_cm_id *cm_id = &id_priv->id; if (port && port != cm_id->port_num) - return -EAGAIN; + return 0; if (cm_id->port_num && nla_put_u32(msg, RDMA_NLDEV_ATTR_PORT_INDEX, cm_id->port_num)) @@ -694,8 +694,6 @@ static int fill_stat_counter_qps(struct sk_buff *msg, int ret = 0; table_attr = nla_nest_start(msg, RDMA_NLDEV_ATTR_RES_QP); - if (!table_attr) - return -EMSGSIZE; rt = &counter->device->res[RDMA_RESTRACK_QP]; xa_lock(&rt->xa); @@ -2100,7 +2098,7 @@ void __init nldev_init(void) rdma_nl_register(RDMA_NL_NLDEV, nldev_cb_table); } -void nldev_exit(void) +void __exit nldev_exit(void) { rdma_nl_unregister(RDMA_NL_NLDEV); }
diff --git a/drivers/infiniband/core/uverbs_cmd.c b/drivers/infiniband/core/uverbs_cmd.c index 39cbb85..d413daf 100644 --- a/drivers/infiniband/core/uverbs_cmd.c +++ b/drivers/infiniband/core/uverbs_cmd.c
@@ -1952,7 +1952,7 @@ static int ib_uverbs_ex_modify_qp(struct uverbs_attr_bundle *attrs) * Last bit is reserved for extending the attr_mask by * using another field. */ - BUILD_BUG_ON(IB_USER_LAST_QP_ATTR_MASK == (1ULL << 31)); + BUILD_BUG_ON(IB_USER_LAST_QP_ATTR_MASK == (1 << 31)); if (cmd.base.attr_mask & ~((IB_USER_LAST_QP_ATTR_MASK << 1) - 1))
diff --git a/drivers/infiniband/core/verbs.c b/drivers/infiniband/core/verbs.c index f61933d..5d896f6 100644 --- a/drivers/infiniband/core/verbs.c +++ b/drivers/infiniband/core/verbs.c
@@ -521,8 +521,6 @@ static struct ib_ah *_rdma_create_ah(struct ib_pd *pd, ret = device->ops.create_ah(ah, ah_attr, flags, udata); if (ret) { - if (ah->sgid_attr) - rdma_put_gid_attr(ah->sgid_attr); kfree(ah); return ERR_PTR(ret); } @@ -2842,18 +2840,15 @@ EXPORT_SYMBOL(__rdma_block_iter_start); bool __rdma_block_iter_next(struct ib_block_iter *biter) { unsigned int block_offset; - unsigned int sg_delta; if (!biter->__sg_nents || !biter->__sg) return false; biter->__dma_addr = sg_dma_address(biter->__sg) + biter->__sg_advance; block_offset = biter->__dma_addr & (BIT_ULL(biter->__pg_bit) - 1); - sg_delta = BIT_ULL(biter->__pg_bit) - block_offset; + biter->__sg_advance += BIT_ULL(biter->__pg_bit) - block_offset; - if (sg_dma_len(biter->__sg) - biter->__sg_advance > sg_delta) { - biter->__sg_advance += sg_delta; - } else { + if (biter->__sg_advance >= sg_dma_len(biter->__sg)) { biter->__sg_advance = 0; biter->__sg = sg_next(biter->__sg); biter->__sg_nents--;
diff --git a/drivers/infiniband/hw/hfi1/affinity.c b/drivers/infiniband/hw/hfi1/affinity.c index 832b878..1aeea5d 100644 --- a/drivers/infiniband/hw/hfi1/affinity.c +++ b/drivers/infiniband/hw/hfi1/affinity.c
@@ -218,8 +218,6 @@ int node_affinity_init(void) for (node = 0; node < node_affinity.num_possible_nodes; node++) hfi1_per_node_cntr[node] = 1; - pci_dev_put(dev); - return 0; }
diff --git a/drivers/infiniband/hw/hfi1/file_ops.c b/drivers/infiniband/hw/hfi1/file_ops.c index 607e263..8c7ba7b 100644 --- a/drivers/infiniband/hw/hfi1/file_ops.c +++ b/drivers/infiniband/hw/hfi1/file_ops.c
@@ -1224,10 +1224,8 @@ static int setup_base_ctxt(struct hfi1_filedata *fd, goto done; ret = init_user_ctxt(fd, uctxt); - if (ret) { - hfi1_free_ctxt_rcv_groups(uctxt); + if (ret) goto done; - } user_init(uctxt); @@ -1363,15 +1361,12 @@ static int user_exp_rcv_setup(struct hfi1_filedata *fd, unsigned long arg, addr = arg + offsetof(struct hfi1_tid_info, tidcnt); if (copy_to_user((void __user *)addr, &tinfo.tidcnt, sizeof(tinfo.tidcnt))) - ret = -EFAULT; + return -EFAULT; addr = arg + offsetof(struct hfi1_tid_info, length); - if (!ret && copy_to_user((void __user *)addr, &tinfo.length, + if (copy_to_user((void __user *)addr, &tinfo.length, sizeof(tinfo.length))) ret = -EFAULT; - - if (ret) - hfi1_user_exp_rcv_invalid(fd, &tinfo); } return ret;
diff --git a/drivers/infiniband/hw/hfi1/firmware.c b/drivers/infiniband/hw/hfi1/firmware.c index 747ec08..c090807 100644 --- a/drivers/infiniband/hw/hfi1/firmware.c +++ b/drivers/infiniband/hw/hfi1/firmware.c
@@ -1786,7 +1786,6 @@ int parse_platform_config(struct hfi1_devdata *dd) if (!dd->platform_config.data) { dd_dev_err(dd, "%s: Missing config file\n", __func__); - ret = -EINVAL; goto bail; } ptr = (u32 *)dd->platform_config.data; @@ -1795,7 +1794,6 @@ int parse_platform_config(struct hfi1_devdata *dd) ptr++; if (magic_num != PLATFORM_CONFIG_MAGIC_NUM) { dd_dev_err(dd, "%s: Bad config file\n", __func__); - ret = -EINVAL; goto bail; } @@ -1819,7 +1817,6 @@ int parse_platform_config(struct hfi1_devdata *dd) if (file_length > dd->platform_config.size) { dd_dev_info(dd, "%s:File claims to be larger than read size\n", __func__); - ret = -EINVAL; goto bail; } else if (file_length < dd->platform_config.size) { dd_dev_info(dd, @@ -1840,7 +1837,6 @@ int parse_platform_config(struct hfi1_devdata *dd) dd_dev_err(dd, "%s: Failed validation at offset %ld\n", __func__, (ptr - (u32 *) dd->platform_config.data)); - ret = -EINVAL; goto bail; } @@ -1887,7 +1883,6 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *) dd->platform_config.data)); - ret = -EINVAL; goto bail; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table = ptr; @@ -1912,7 +1907,6 @@ int parse_platform_config(struct hfi1_devdata *dd) __func__, table_type, (ptr - (u32 *)dd->platform_config.data)); - ret = -EINVAL; goto bail; /* We don't trust this file now */ } pcfgcache->config_tables[table_type].table_metadata =
diff --git a/drivers/infiniband/hw/hfi1/pio.c b/drivers/infiniband/hw/hfi1/pio.c index fa5de36..1a82ea7 100644 --- a/drivers/infiniband/hw/hfi1/pio.c +++ b/drivers/infiniband/hw/hfi1/pio.c
@@ -955,7 +955,8 @@ void sc_disable(struct send_context *sc) spin_unlock(&sc->release_lock); write_seqlock(&sc->waitlock); - list_splice_init(&sc->piowait, &wake_list); + if (!list_empty(&sc->piowait)) + list_move(&sc->piowait, &wake_list); write_sequnlock(&sc->waitlock); while (!list_empty(&wake_list)) { struct iowait *wait;
diff --git a/drivers/infiniband/hw/hfi1/user_exp_rcv.c b/drivers/infiniband/hw/hfi1/user_exp_rcv.c index 6c1d36b..4d73235 100644 --- a/drivers/infiniband/hw/hfi1/user_exp_rcv.c +++ b/drivers/infiniband/hw/hfi1/user_exp_rcv.c
@@ -215,11 +215,16 @@ static void unpin_rcv_pages(struct hfi1_filedata *fd, static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf) { int pinned; - unsigned int npages = tidbuf->npages; + unsigned int npages; unsigned long vaddr = tidbuf->vaddr; struct page **pages = NULL; struct hfi1_devdata *dd = fd->uctxt->dd; + /* Get the number of pages the user buffer spans */ + npages = num_user_pages(vaddr, tidbuf->length); + if (!npages) + return -EINVAL; + if (npages > fd->uctxt->expected_count) { dd_dev_err(dd, "Expected buffer too big\n"); return -EINVAL; @@ -253,6 +258,7 @@ static int pin_rcv_pages(struct hfi1_filedata *fd, struct tid_user_buf *tidbuf) return pinned; } tidbuf->pages = pages; + tidbuf->npages = npages; fd->tid_n_pinned += pinned; return pinned; } @@ -319,8 +325,6 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, if (!PAGE_ALIGNED(tinfo->vaddr)) return -EINVAL; - if (tinfo->length == 0) - return -EINVAL; tidbuf = kzalloc(sizeof(*tidbuf), GFP_KERNEL); if (!tidbuf) @@ -328,42 +332,43 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, tidbuf->vaddr = tinfo->vaddr; tidbuf->length = tinfo->length; - tidbuf->npages = num_user_pages(tidbuf->vaddr, tidbuf->length); tidbuf->psets = kcalloc(uctxt->expected_count, sizeof(*tidbuf->psets), GFP_KERNEL); if (!tidbuf->psets) { - ret = -ENOMEM; - goto fail_release_mem; + kfree(tidbuf); + return -ENOMEM; } pinned = pin_rcv_pages(fd, tidbuf); if (pinned <= 0) { - ret = (pinned < 0) ? pinned : -ENOSPC; - goto fail_unpin; + kfree(tidbuf->psets); + kfree(tidbuf); + return pinned; } /* Find sets of physically contiguous pages */ tidbuf->n_psets = find_phys_blocks(tidbuf, pinned); - /* Reserve the number of expected tids to be used. */ + /* + * We don't need to access this under a lock since tid_used is per + * process and the same process cannot be in hfi1_user_exp_rcv_clear() + * and hfi1_user_exp_rcv_setup() at the same time. + */ spin_lock(&fd->tid_lock); if (fd->tid_used + tidbuf->n_psets > fd->tid_limit) pageset_count = fd->tid_limit - fd->tid_used; else pageset_count = tidbuf->n_psets; - fd->tid_used += pageset_count; spin_unlock(&fd->tid_lock); - if (!pageset_count) { - ret = -ENOSPC; - goto fail_unreserve; - } + if (!pageset_count) + goto bail; ngroups = pageset_count / dd->rcv_entries.group_size; tidlist = kcalloc(pageset_count, sizeof(*tidlist), GFP_KERNEL); if (!tidlist) { ret = -ENOMEM; - goto fail_unreserve; + goto nomem; } tididx = 0; @@ -459,60 +464,43 @@ int hfi1_user_exp_rcv_setup(struct hfi1_filedata *fd, } unlock: mutex_unlock(&uctxt->exp_mutex); +nomem: hfi1_cdbg(TID, "total mapped: tidpairs:%u pages:%u (%d)", tididx, mapped_pages, ret); + if (tididx) { + spin_lock(&fd->tid_lock); + fd->tid_used += tididx; + spin_unlock(&fd->tid_lock); + tinfo->tidcnt = tididx; + tinfo->length = mapped_pages * PAGE_SIZE; - /* fail if nothing was programmed, set error if none provided */ - if (tididx == 0) { - if (ret >= 0) - ret = -ENOSPC; - goto fail_unreserve; + if (copy_to_user(u64_to_user_ptr(tinfo->tidlist), + tidlist, sizeof(tidlist[0]) * tididx)) { + /* + * On failure to copy to the user level, we need to undo + * everything done so far so we don't leak resources. + */ + tinfo->tidlist = (unsigned long)&tidlist; + hfi1_user_exp_rcv_clear(fd, tinfo); + tinfo->tidlist = 0; + ret = -EFAULT; + goto bail; + } } - /* adjust reserved tid_used to actual count */ - spin_lock(&fd->tid_lock); - fd->tid_used -= pageset_count - tididx; - spin_unlock(&fd->tid_lock); - - /* unpin all pages not covered by a TID */ - unpin_rcv_pages(fd, tidbuf, NULL, mapped_pages, pinned - mapped_pages, - false); - - tinfo->tidcnt = tididx; - tinfo->length = mapped_pages * PAGE_SIZE; - - if (copy_to_user(u64_to_user_ptr(tinfo->tidlist), - tidlist, sizeof(tidlist[0]) * tididx)) { - ret = -EFAULT; - goto fail_unprogram; - } - - kfree(tidbuf->pages); + /* + * If not everything was mapped (due to insufficient RcvArray entries, + * for example), unpin all unmapped pages so we can pin them nex time. + */ + if (mapped_pages != pinned) + unpin_rcv_pages(fd, tidbuf, NULL, mapped_pages, + (pinned - mapped_pages), false); +bail: kfree(tidbuf->psets); - kfree(tidbuf); kfree(tidlist); - return 0; - -fail_unprogram: - /* unprogram, unmap, and unpin all allocated TIDs */ - tinfo->tidlist = (unsigned long)tidlist; - hfi1_user_exp_rcv_clear(fd, tinfo); - tinfo->tidlist = 0; - pinned = 0; /* nothing left to unpin */ - pageset_count = 0; /* nothing left reserved */ -fail_unreserve: - spin_lock(&fd->tid_lock); - fd->tid_used -= pageset_count; - spin_unlock(&fd->tid_lock); -fail_unpin: - if (pinned > 0) - unpin_rcv_pages(fd, tidbuf, NULL, 0, pinned, false); -fail_release_mem: kfree(tidbuf->pages); - kfree(tidbuf->psets); kfree(tidbuf); - kfree(tidlist); - return ret; + return ret > 0 ? 0 : ret; } int hfi1_user_exp_rcv_clear(struct hfi1_filedata *fd,
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c index 28bbc47..d01e322 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.c +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.c
@@ -5216,8 +5216,8 @@ static irqreturn_t hns_roce_v2_msix_interrupt_abn(int irq, void *dev_id) dev_err(dev, "AEQ overflow!\n"); - roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG, - 1 << HNS_ROCE_V2_VF_INT_ST_AEQ_OVERFLOW_S); + int_st |= 1 << HNS_ROCE_V2_VF_INT_ST_AEQ_OVERFLOW_S; + roce_write(hr_dev, ROCEE_VF_ABN_INT_ST_REG, int_st); /* Set reset level for reset_event() */ if (ops->set_default_reset_request)
diff --git a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h index b9ab3ca..76a14db 100644 --- a/drivers/infiniband/hw/hns/hns_roce_hw_v2.h +++ b/drivers/infiniband/hw/hns/hns_roce_hw_v2.h
@@ -89,7 +89,7 @@ #define HNS_ROCE_V2_SCCC_ENTRY_SZ 32 #define HNS_ROCE_V2_QPC_TIMER_ENTRY_SZ PAGE_SIZE #define HNS_ROCE_V2_CQC_TIMER_ENTRY_SZ PAGE_SIZE -#define HNS_ROCE_V2_PAGE_SIZE_SUPPORTED 0xFFFF000 +#define HNS_ROCE_V2_PAGE_SIZE_SUPPORTED 0xFFFFF000 #define HNS_ROCE_V2_MAX_INNER_MTPT_NUM 2 #define HNS_ROCE_INVALID_LKEY 0x100 #define HNS_ROCE_CMQ_TX_TIMEOUT 30000
diff --git a/drivers/infiniband/hw/mlx5/mad.c b/drivers/infiniband/hw/mlx5/mad.c index 3897a3c..348c1df 100644 --- a/drivers/infiniband/hw/mlx5/mad.c +++ b/drivers/infiniband/hw/mlx5/mad.c
@@ -219,12 +219,6 @@ static int process_pma_cmd(struct mlx5_ib_dev *dev, u8 port_num, mdev = dev->mdev; mdev_port_num = 1; } - if (MLX5_CAP_GEN(dev->mdev, num_ports) == 1) { - /* set local port to one for Function-Per-Port HCA. */ - mdev = dev->mdev; - mdev_port_num = 1; - } - /* Declaring support of extended counters */ if (in_mad->mad_hdr.attr_id == IB_PMA_CLASS_PORT_INFO) { struct ib_class_port_info cpi = {};
diff --git a/drivers/infiniband/hw/mlx5/qp.c b/drivers/infiniband/hw/mlx5/qp.c index 6edd30c..634f29c 100644 --- a/drivers/infiniband/hw/mlx5/qp.c +++ b/drivers/infiniband/hw/mlx5/qp.c
@@ -3890,40 +3890,6 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr, return err; } -static int validate_rd_atomic(struct mlx5_ib_dev *dev, struct ib_qp_attr *attr, - int attr_mask, enum ib_qp_type qp_type) -{ - int log_max_ra_res; - int log_max_ra_req; - - if (qp_type == MLX5_IB_QPT_DCI) { - log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_res_dc); - log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_req_dc); - } else { - log_max_ra_res = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_res_qp); - log_max_ra_req = 1 << MLX5_CAP_GEN(dev->mdev, - log_max_ra_req_qp); - } - - if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC && - attr->max_rd_atomic > log_max_ra_res) { - mlx5_ib_dbg(dev, "invalid max_rd_atomic value %d\n", - attr->max_rd_atomic); - return false; - } - - if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC && - attr->max_dest_rd_atomic > log_max_ra_req) { - mlx5_ib_dbg(dev, "invalid max_dest_rd_atomic value %d\n", - attr->max_dest_rd_atomic); - return false; - } - return true; -} - int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, int attr_mask, struct ib_udata *udata) { @@ -4020,8 +3986,21 @@ int mlx5_ib_modify_qp(struct ib_qp *ibqp, struct ib_qp_attr *attr, } } - if (!validate_rd_atomic(dev, attr, attr_mask, qp_type)) + if (attr_mask & IB_QP_MAX_QP_RD_ATOMIC && + attr->max_rd_atomic > + (1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_res_qp))) { + mlx5_ib_dbg(dev, "invalid max_rd_atomic value %d\n", + attr->max_rd_atomic); goto out; + } + + if (attr_mask & IB_QP_MAX_DEST_RD_ATOMIC && + attr->max_dest_rd_atomic > + (1 << MLX5_CAP_GEN(dev->mdev, log_max_ra_req_qp))) { + mlx5_ib_dbg(dev, "invalid max_dest_rd_atomic value %d\n", + attr->max_dest_rd_atomic); + goto out; + } if (cur_state == new_state && cur_state == IB_QPS_RESET) { err = 0;
diff --git a/drivers/infiniband/hw/qedr/main.c b/drivers/infiniband/hw/qedr/main.c index 50b75bd..93040c9 100644 --- a/drivers/infiniband/hw/qedr/main.c +++ b/drivers/infiniband/hw/qedr/main.c
@@ -362,10 +362,6 @@ static int qedr_alloc_resources(struct qedr_dev *dev) if (IS_IWARP(dev)) { xa_init(&dev->qps); dev->iwarp_wq = create_singlethread_workqueue("qedr_iwarpq"); - if (!dev->iwarp_wq) { - rc = -ENOMEM; - goto err1; - } } /* Allocate Status blocks for CNQ */ @@ -373,7 +369,7 @@ static int qedr_alloc_resources(struct qedr_dev *dev) GFP_KERNEL); if (!dev->sb_array) { rc = -ENOMEM; - goto err_destroy_wq; + goto err1; } dev->cnq_array = kcalloc(dev->num_cnq, @@ -427,9 +423,6 @@ static int qedr_alloc_resources(struct qedr_dev *dev) kfree(dev->cnq_array); err2: kfree(dev->sb_array); -err_destroy_wq: - if (IS_IWARP(dev)) - destroy_workqueue(dev->iwarp_wq); err1: kfree(dev->sgid_tbl); return rc;
diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c index 1d060ae..62e6ffa 100644 --- a/drivers/infiniband/hw/usnic/usnic_uiom.c +++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@ -281,8 +281,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, size = pa_end - pa_start + PAGE_SIZE; usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x", va_start, &pa_start, size, flags); - err = iommu_map_atomic(pd->domain, va_start, - pa_start, size, flags); + err = iommu_map(pd->domain, va_start, pa_start, + size, flags); if (err) { usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", va_start, &pa_start, size, err); @@ -298,8 +298,8 @@ static int usnic_uiom_map_sorted_intervals(struct list_head *intervals, size = pa - pa_start + PAGE_SIZE; usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n", va_start, &pa_start, size, flags); - err = iommu_map_atomic(pd->domain, va_start, - pa_start, size, flags); + err = iommu_map(pd->domain, va_start, pa_start, + size, flags); if (err) { usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n", va_start, &pa_start, size, err);
diff --git a/drivers/infiniband/sw/rxe/rxe_qp.c b/drivers/infiniband/sw/rxe/rxe_qp.c index 5dd9bce..53166b9 100644 --- a/drivers/infiniband/sw/rxe/rxe_qp.c +++ b/drivers/infiniband/sw/rxe/rxe_qp.c
@@ -211,14 +211,6 @@ static void rxe_qp_init_misc(struct rxe_dev *rxe, struct rxe_qp *qp, spin_lock_init(&qp->grp_lock); spin_lock_init(&qp->state_lock); - spin_lock_init(&qp->req.task.state_lock); - spin_lock_init(&qp->resp.task.state_lock); - spin_lock_init(&qp->comp.task.state_lock); - - spin_lock_init(&qp->sq.sq_lock); - spin_lock_init(&qp->rq.producer_lock); - spin_lock_init(&qp->rq.consumer_lock); - atomic_set(&qp->ssn, 0); atomic_set(&qp->skb_out, 0); } @@ -276,6 +268,7 @@ static int rxe_qp_init_req(struct rxe_dev *rxe, struct rxe_qp *qp, qp->req.opcode = -1; qp->comp.opcode = -1; + spin_lock_init(&qp->sq.sq_lock); skb_queue_head_init(&qp->req_pkts); rxe_init_task(rxe, &qp->req.task, qp, @@ -325,6 +318,9 @@ static int rxe_qp_init_resp(struct rxe_dev *rxe, struct rxe_qp *qp, } } + spin_lock_init(&qp->rq.producer_lock); + spin_lock_init(&qp->rq.consumer_lock); + skb_queue_head_init(&qp->resp_pkts); rxe_init_task(rxe, &qp->resp.task, qp, @@ -805,9 +801,7 @@ void rxe_qp_destroy(struct rxe_qp *qp) rxe_cleanup_task(&qp->comp.task); /* flush out any receive wr's or pending requests */ - if (qp->req.task.func) - __rxe_do_task(&qp->req.task); - + __rxe_do_task(&qp->req.task); if (qp->sq.queue) { __rxe_do_task(&qp->comp.task); __rxe_do_task(&qp->req.task); @@ -842,15 +836,13 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->resp.mr = NULL; } + if (qp_type(qp) == IB_QPT_RC) + sk_dst_reset(qp->sk->sk); + free_rd_atomic_resources(qp); - if (qp->sk) { - if (qp_type(qp) == IB_QPT_RC) - sk_dst_reset(qp->sk->sk); - - kernel_sock_shutdown(qp->sk, SHUT_RDWR); - sock_release(qp->sk); - } + kernel_sock_shutdown(qp->sk, SHUT_RDWR); + sock_release(qp->sk); } /* called when the last reference to the qp is dropped */
diff --git a/drivers/infiniband/sw/siw/siw_cm.c b/drivers/infiniband/sw/siw/siw_cm.c index 69fcf21..3aed597 100644 --- a/drivers/infiniband/sw/siw/siw_cm.c +++ b/drivers/infiniband/sw/siw/siw_cm.c
@@ -725,11 +725,11 @@ static int siw_proc_mpareply(struct siw_cep *cep) enum mpa_v2_ctrl mpa_p2p_mode = MPA_V2_RDMA_NO_RTR; rv = siw_recv_mpa_rr(cep); + if (rv != -EAGAIN) + siw_cancel_mpatimer(cep); if (rv) goto out_err; - siw_cancel_mpatimer(cep); - rep = &cep->mpa.hdr; if (__mpa_rr_revision(rep->params.bits) > MPA_REVISION_2) { @@ -895,8 +895,7 @@ static int siw_proc_mpareply(struct siw_cep *cep) } out_err: - if (rv != -EAGAIN) - siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY, -EINVAL); + siw_cm_upcall(cep, IW_CM_EVENT_CONNECT_REPLY, -EINVAL); return rv; }
diff --git a/drivers/infiniband/sw/siw/siw_cq.c b/drivers/infiniband/sw/siw/siw_cq.c index 214714a..d8db3be 100644 --- a/drivers/infiniband/sw/siw/siw_cq.c +++ b/drivers/infiniband/sw/siw/siw_cq.c
@@ -56,6 +56,8 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc) if (READ_ONCE(cqe->flags) & SIW_WQE_VALID) { memset(wc, 0, sizeof(*wc)); wc->wr_id = cqe->id; + wc->status = map_cqe_status[cqe->status].ib; + wc->opcode = map_wc_opcode[cqe->opcode]; wc->byte_len = cqe->bytes; /* @@ -69,32 +71,10 @@ int siw_reap_cqe(struct siw_cq *cq, struct ib_wc *wc) wc->wc_flags = IB_WC_WITH_INVALIDATE; } wc->qp = cqe->base_qp; - wc->opcode = map_wc_opcode[cqe->opcode]; - wc->status = map_cqe_status[cqe->status].ib; siw_dbg_cq(cq, "idx %u, type %d, flags %2x, id 0x%pK\n", cq->cq_get % cq->num_cqe, cqe->opcode, cqe->flags, (void *)(uintptr_t)cqe->id); - } else { - /* - * A malicious user may set invalid opcode or - * status in the user mmapped CQE array. - * Sanity check and correct values in that case - * to avoid out-of-bounds access to global arrays - * for opcode and status mapping. - */ - u8 opcode = cqe->opcode; - u16 status = cqe->status; - - if (opcode >= SIW_NUM_OPCODES) { - opcode = 0; - status = SIW_WC_GENERAL_ERR; - } else if (status >= SIW_NUM_WC_STATUS) { - status = SIW_WC_GENERAL_ERR; - } - wc->opcode = map_wc_opcode[opcode]; - wc->status = map_cqe_status[status].ib; - } WRITE_ONCE(cqe->flags, 0); cq->cq_get++;
diff --git a/drivers/infiniband/sw/siw/siw_qp_rx.c b/drivers/infiniband/sw/siw/siw_qp_rx.c index e8a1aa0..5f94c71 100644 --- a/drivers/infiniband/sw/siw/siw_qp_rx.c +++ b/drivers/infiniband/sw/siw/siw_qp_rx.c
@@ -961,28 +961,27 @@ int siw_proc_terminate(struct siw_qp *qp) static int siw_get_trailer(struct siw_qp *qp, struct siw_rx_stream *srx) { struct sk_buff *skb = srx->skb; - int avail = min(srx->skb_new, srx->fpdu_part_rem); u8 *tbuf = (u8 *)&srx->trailer.crc - srx->pad; __wsum crc_in, crc_own = 0; siw_dbg_qp(qp, "expected %d, available %d, pad %u\n", srx->fpdu_part_rem, srx->skb_new, srx->pad); - skb_copy_bits(skb, srx->skb_offset, tbuf, avail); - - srx->skb_new -= avail; - srx->skb_offset += avail; - srx->skb_copied += avail; - srx->fpdu_part_rem -= avail; - - if (srx->fpdu_part_rem) + if (srx->skb_new < srx->fpdu_part_rem) return -EAGAIN; + skb_copy_bits(skb, srx->skb_offset, tbuf, srx->fpdu_part_rem); + + if (srx->mpa_crc_hd && srx->pad) + crypto_shash_update(srx->mpa_crc_hd, tbuf, srx->pad); + + srx->skb_new -= srx->fpdu_part_rem; + srx->skb_offset += srx->fpdu_part_rem; + srx->skb_copied += srx->fpdu_part_rem; + if (!srx->mpa_crc_hd) return 0; - if (srx->pad) - crypto_shash_update(srx->mpa_crc_hd, tbuf, srx->pad); /* * CRC32 is computed, transmitted and received directly in NBO, * so there's never a reason to convert byte order. @@ -1084,9 +1083,10 @@ static int siw_get_hdr(struct siw_rx_stream *srx) * completely received. */ if (iwarp_pktinfo[opcode].hdr_len > sizeof(struct iwarp_ctrl_tagged)) { - int hdrlen = iwarp_pktinfo[opcode].hdr_len; + bytes = iwarp_pktinfo[opcode].hdr_len - MIN_DDP_HDR; - bytes = min_t(int, hdrlen - MIN_DDP_HDR, srx->skb_new); + if (srx->skb_new < bytes) + return -EAGAIN; skb_copy_bits(skb, srx->skb_offset, (char *)c_hdr + srx->fpdu_part_rcvd, bytes); @@ -1096,9 +1096,6 @@ static int siw_get_hdr(struct siw_rx_stream *srx) srx->skb_new -= bytes; srx->skb_offset += bytes; srx->skb_copied += bytes; - - if (srx->fpdu_part_rcvd < hdrlen) - return -EAGAIN; } /*
diff --git a/drivers/infiniband/sw/siw/siw_qp_tx.c b/drivers/infiniband/sw/siw/siw_qp_tx.c index 2b5120a..424918e 100644 --- a/drivers/infiniband/sw/siw/siw_qp_tx.c +++ b/drivers/infiniband/sw/siw/siw_qp_tx.c
@@ -29,7 +29,7 @@ static struct page *siw_get_pblpage(struct siw_mem *mem, u64 addr, int *idx) dma_addr_t paddr = siw_pbl_get_buffer(pbl, offset, NULL, idx); if (paddr) - return virt_to_page((void *)(uintptr_t)paddr); + return virt_to_page(paddr); return NULL; } @@ -523,23 +523,13 @@ static int siw_tx_hdt(struct siw_iwarp_tx *c_tx, struct socket *s) kunmap(p); } } else { - /* - * Cast to an uintptr_t to preserve all 64 bits - * in sge->laddr. - */ - uintptr_t va = (uintptr_t)(sge->laddr + sge_off); + u64 va = sge->laddr + sge_off; - /* - * virt_to_page() takes a (void *) pointer - * so cast to a (void *) meaning it will be 64 - * bits on a 64 bit platform and 32 bits on a - * 32 bit platform. - */ - page_array[seg] = virt_to_page((void *)(va & PAGE_MASK)); + page_array[seg] = virt_to_page(va & PAGE_MASK); if (do_crc) crypto_shash_update( c_tx->mpa_crc_hd, - (void *)va, + (void *)(uintptr_t)va, plen); }
diff --git a/drivers/infiniband/sw/siw/siw_verbs.c b/drivers/infiniband/sw/siw/siw_verbs.c index c8c2014..b9ca54e 100644 --- a/drivers/infiniband/sw/siw/siw_verbs.c +++ b/drivers/infiniband/sw/siw/siw_verbs.c
@@ -694,45 +694,13 @@ static int siw_copy_inline_sgl(const struct ib_send_wr *core_wr, static int siw_sq_flush_wr(struct siw_qp *qp, const struct ib_send_wr *wr, const struct ib_send_wr **bad_wr) { + struct siw_sqe sqe = {}; int rv = 0; while (wr) { - struct siw_sqe sqe = {}; - - switch (wr->opcode) { - case IB_WR_RDMA_WRITE: - sqe.opcode = SIW_OP_WRITE; - break; - case IB_WR_RDMA_READ: - sqe.opcode = SIW_OP_READ; - break; - case IB_WR_RDMA_READ_WITH_INV: - sqe.opcode = SIW_OP_READ_LOCAL_INV; - break; - case IB_WR_SEND: - sqe.opcode = SIW_OP_SEND; - break; - case IB_WR_SEND_WITH_IMM: - sqe.opcode = SIW_OP_SEND_WITH_IMM; - break; - case IB_WR_SEND_WITH_INV: - sqe.opcode = SIW_OP_SEND_REMOTE_INV; - break; - case IB_WR_LOCAL_INV: - sqe.opcode = SIW_OP_INVAL_STAG; - break; - case IB_WR_REG_MR: - sqe.opcode = SIW_OP_REG_MR; - break; - default: - rv = -EINVAL; - break; - } - if (!rv) { - sqe.id = wr->wr_id; - rv = siw_sqe_complete(qp, &sqe, 0, - SIW_WC_WR_FLUSH_ERR); - } + sqe.id = wr->wr_id; + sqe.opcode = wr->opcode; + rv = siw_sqe_complete(qp, &sqe, 0, SIW_WC_WR_FLUSH_ERR); if (rv) { if (bad_wr) *bad_wr = wr;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c index 3c3cc6a..69ecf37 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
@@ -2171,14 +2171,6 @@ int ipoib_intf_init(struct ib_device *hca, u8 port, const char *name, rn->attach_mcast = ipoib_mcast_attach; rn->detach_mcast = ipoib_mcast_detach; rn->hca = hca; - - rc = netif_set_real_num_tx_queues(dev, 1); - if (rc) - goto out; - - rc = netif_set_real_num_rx_queues(dev, 1); - if (rc) - goto out; } priv->rn_ops = dev->netdev_ops;
diff --git a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c index 28e9b70..5b05cf3 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib_netlink.c +++ b/drivers/infiniband/ulp/ipoib/ipoib_netlink.c
@@ -42,11 +42,6 @@ static const struct nla_policy ipoib_policy[IFLA_IPOIB_MAX + 1] = { [IFLA_IPOIB_UMCAST] = { .type = NLA_U16 }, }; -static unsigned int ipoib_get_max_num_queues(void) -{ - return min_t(unsigned int, num_possible_cpus(), 128); -} - static int ipoib_fill_info(struct sk_buff *skb, const struct net_device *dev) { struct ipoib_dev_priv *priv = ipoib_priv(dev); @@ -178,8 +173,6 @@ static struct rtnl_link_ops ipoib_link_ops __read_mostly = { .changelink = ipoib_changelink, .get_size = ipoib_get_size, .fill_info = ipoib_fill_info, - .get_num_rx_queues = ipoib_get_max_num_queues, - .get_num_tx_queues = ipoib_get_max_num_queues, }; struct rtnl_link_ops *ipoib_get_link_ops(void)
diff --git a/drivers/infiniband/ulp/srp/ib_srp.h b/drivers/infiniband/ulp/srp/ib_srp.h index 3f17bfd..b2861cd 100644 --- a/drivers/infiniband/ulp/srp/ib_srp.h +++ b/drivers/infiniband/ulp/srp/ib_srp.h
@@ -63,6 +63,9 @@ enum { SRP_DEFAULT_CMD_SQ_SIZE = SRP_DEFAULT_QUEUE_SIZE - SRP_RSP_SQ_SIZE - SRP_TSK_MGMT_SQ_SIZE, + SRP_TAG_NO_REQ = ~0U, + SRP_TAG_TSK_MGMT = 1U << 31, + SRP_MAX_PAGES_PER_MR = 512, SRP_MAX_ADD_CDB_LEN = 16, @@ -77,11 +80,6 @@ enum { sizeof(struct srp_imm_buf), }; -enum { - SRP_TAG_NO_REQ = ~0U, - SRP_TAG_TSK_MGMT = BIT(31), -}; - enum srp_target_state { SRP_TARGET_SCANNING, SRP_TARGET_LIVE,
diff --git a/drivers/input/joystick/iforce/iforce-main.c b/drivers/input/joystick/iforce/iforce-main.c index 84b8752..b2a68bc 100644 --- a/drivers/input/joystick/iforce/iforce-main.c +++ b/drivers/input/joystick/iforce/iforce-main.c
@@ -50,7 +50,6 @@ static struct iforce_device iforce_device[] = { { 0x046d, 0xc291, "Logitech WingMan Formula Force", btn_wheel, abs_wheel, ff_iforce }, { 0x05ef, 0x020a, "AVB Top Shot Pegasus", btn_joystick_avb, abs_avb_pegasus, ff_iforce }, { 0x05ef, 0x8884, "AVB Mag Turbo Force", btn_wheel, abs_wheel, ff_iforce }, - { 0x05ef, 0x8886, "Boeder Force Feedback Wheel", btn_wheel, abs_wheel, ff_iforce }, { 0x05ef, 0x8888, "AVB Top Shot Force Feedback Racing Wheel", btn_wheel, abs_wheel, ff_iforce }, //? { 0x061c, 0xc0a4, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, //? { 0x061c, 0xc084, "ACT LABS Force RS", btn_wheel, abs_wheel, ff_iforce }, @@ -273,22 +272,22 @@ int iforce_init_device(struct device *parent, u16 bustype, * Get device info. */ - if (!iforce_get_id_packet(iforce, 'M', buf, &len) && len >= 3) + if (!iforce_get_id_packet(iforce, 'M', buf, &len) || len < 3) input_dev->id.vendor = get_unaligned_le16(buf + 1); else dev_warn(&iforce->dev->dev, "Device does not respond to id packet M\n"); - if (!iforce_get_id_packet(iforce, 'P', buf, &len) && len >= 3) + if (!iforce_get_id_packet(iforce, 'P', buf, &len) || len < 3) input_dev->id.product = get_unaligned_le16(buf + 1); else dev_warn(&iforce->dev->dev, "Device does not respond to id packet P\n"); - if (!iforce_get_id_packet(iforce, 'B', buf, &len) && len >= 3) + if (!iforce_get_id_packet(iforce, 'B', buf, &len) || len < 3) iforce->device_memory.end = get_unaligned_le16(buf + 1); else dev_warn(&iforce->dev->dev, "Device does not respond to id packet B\n"); - if (!iforce_get_id_packet(iforce, 'N', buf, &len) && len >= 2) + if (!iforce_get_id_packet(iforce, 'N', buf, &len) || len < 2) ff_effects = buf[1]; else dev_warn(&iforce->dev->dev, "Device does not respond to id packet N\n");
diff --git a/drivers/input/joystick/iforce/iforce-serio.c b/drivers/input/joystick/iforce/iforce-serio.c index 2380546..f95a81b 100644 --- a/drivers/input/joystick/iforce/iforce-serio.c +++ b/drivers/input/joystick/iforce/iforce-serio.c
@@ -39,7 +39,7 @@ static void iforce_serio_xmit(struct iforce *iforce) again: if (iforce->xmit.head == iforce->xmit.tail) { - iforce_clear_xmit_and_wake(iforce); + clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); spin_unlock_irqrestore(&iforce->xmit_lock, flags); return; } @@ -64,7 +64,7 @@ static void iforce_serio_xmit(struct iforce *iforce) if (test_and_clear_bit(IFORCE_XMIT_AGAIN, iforce->xmit_flags)) goto again; - iforce_clear_xmit_and_wake(iforce); + clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); spin_unlock_irqrestore(&iforce->xmit_lock, flags); } @@ -169,7 +169,7 @@ static irqreturn_t iforce_serio_irq(struct serio *serio, iforce_serio->cmd_response_len = iforce_serio->len; /* Signal that command is done */ - wake_up_all(&iforce->wait); + wake_up(&iforce->wait); } else if (likely(iforce->type)) { iforce_process_packet(iforce, iforce_serio->id, iforce_serio->data_in,
diff --git a/drivers/input/joystick/iforce/iforce-usb.c b/drivers/input/joystick/iforce/iforce-usb.c index cba92bd..ea58805 100644 --- a/drivers/input/joystick/iforce/iforce-usb.c +++ b/drivers/input/joystick/iforce/iforce-usb.c
@@ -30,7 +30,7 @@ static void __iforce_usb_xmit(struct iforce *iforce) spin_lock_irqsave(&iforce->xmit_lock, flags); if (iforce->xmit.head == iforce->xmit.tail) { - iforce_clear_xmit_and_wake(iforce); + clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); spin_unlock_irqrestore(&iforce->xmit_lock, flags); return; } @@ -58,9 +58,9 @@ static void __iforce_usb_xmit(struct iforce *iforce) XMIT_INC(iforce->xmit.tail, n); if ( (n=usb_submit_urb(iforce_usb->out, GFP_ATOMIC)) ) { + clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); dev_warn(&iforce_usb->intf->dev, "usb_submit_urb failed %d\n", n); - iforce_clear_xmit_and_wake(iforce); } /* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended. @@ -175,15 +175,15 @@ static void iforce_usb_out(struct urb *urb) struct iforce *iforce = &iforce_usb->iforce; if (urb->status) { + clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); dev_dbg(&iforce_usb->intf->dev, "urb->status %d, exiting\n", urb->status); - iforce_clear_xmit_and_wake(iforce); return; } __iforce_usb_xmit(iforce); - wake_up_all(&iforce->wait); + wake_up(&iforce->wait); } static int iforce_usb_probe(struct usb_interface *intf,
diff --git a/drivers/input/joystick/iforce/iforce.h b/drivers/input/joystick/iforce/iforce.h index 9ccb910..6aa761e 100644 --- a/drivers/input/joystick/iforce/iforce.h +++ b/drivers/input/joystick/iforce/iforce.h
@@ -119,12 +119,6 @@ static inline int iforce_get_id_packet(struct iforce *iforce, u8 id, response_data, response_len); } -static inline void iforce_clear_xmit_and_wake(struct iforce *iforce) -{ - clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags); - wake_up_all(&iforce->wait); -} - /* Public functions */ /* iforce-main.c */ int iforce_init_device(struct device *parent, u16 bustype,
diff --git a/drivers/input/joystick/xpad.c b/drivers/input/joystick/xpad.c index 70dedc0..ba101af 100644 --- a/drivers/input/joystick/xpad.c +++ b/drivers/input/joystick/xpad.c
@@ -112,8 +112,6 @@ static const struct xpad_device { u8 xtype; } xpad_device[] = { { 0x0079, 0x18d4, "GPD Win 2 X-Box Controller", 0, XTYPE_XBOX360 }, - { 0x03eb, 0xff01, "Wooting One (Legacy)", 0, XTYPE_XBOX360 }, - { 0x03eb, 0xff02, "Wooting Two (Legacy)", 0, XTYPE_XBOX360 }, { 0x044f, 0x0f00, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f03, "Thrustmaster Wheel", 0, XTYPE_XBOX }, { 0x044f, 0x0f07, "Thrustmaster, Inc. Controller", 0, XTYPE_XBOX }, @@ -244,7 +242,6 @@ static const struct xpad_device { { 0x0f0d, 0x0063, "Hori Real Arcade Pro Hayabusa (USA) Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x0f0d, 0x0067, "HORIPAD ONE", 0, XTYPE_XBOXONE }, { 0x0f0d, 0x0078, "Hori Real Arcade Pro V Kai Xbox One", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, - { 0x0f0d, 0x00c5, "Hori Fighting Commander ONE", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x0f30, 0x010b, "Philips Recoil", 0, XTYPE_XBOX }, { 0x0f30, 0x0202, "Joytech Advanced Controller", 0, XTYPE_XBOX }, { 0x0f30, 0x8888, "BigBen XBMiniPad Controller", 0, XTYPE_XBOX }, @@ -261,7 +258,6 @@ static const struct xpad_device { { 0x1430, 0x8888, "TX6500+ Dance Pad (first generation)", MAP_DPAD_TO_BUTTONS, XTYPE_XBOX }, { 0x1430, 0xf801, "RedOctane Controller", 0, XTYPE_XBOX360 }, { 0x146b, 0x0601, "BigBen Interactive XBOX 360 Controller", 0, XTYPE_XBOX360 }, - { 0x146b, 0x0604, "Bigben Interactive DAIJA Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x1532, 0x0037, "Razer Sabertooth", 0, XTYPE_XBOX360 }, { 0x1532, 0x0a00, "Razer Atrox Arcade Stick", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOXONE }, { 0x1532, 0x0a03, "Razer Wildcat", 0, XTYPE_XBOXONE }, @@ -326,7 +322,6 @@ static const struct xpad_device { { 0x24c6, 0x5502, "Hori Fighting Stick VX Alt", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5503, "Hori Fighting Edge", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x5506, "Hori SOULCALIBUR V Stick", 0, XTYPE_XBOX360 }, - { 0x24c6, 0x5510, "Hori Fighting Commander ONE (Xbox 360/PC Mode)", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x550d, "Hori GEM Xbox controller", 0, XTYPE_XBOX360 }, { 0x24c6, 0x550e, "Hori Real Arcade Pro V Kai 360", MAP_TRIGGERS_TO_BUTTONS, XTYPE_XBOX360 }, { 0x24c6, 0x551a, "PowerA FUSION Pro Controller", 0, XTYPE_XBOXONE }, @@ -336,14 +331,6 @@ static const struct xpad_device { { 0x24c6, 0x5b03, "Thrustmaster Ferrari 458 Racing Wheel", 0, XTYPE_XBOX360 }, { 0x24c6, 0x5d04, "Razer Sabertooth", 0, XTYPE_XBOX360 }, { 0x24c6, 0xfafe, "Rock Candy Gamepad for Xbox 360", 0, XTYPE_XBOX360 }, - { 0x2563, 0x058d, "OneXPlayer Gamepad", 0, XTYPE_XBOX360 }, - { 0x2dc8, 0x2000, "8BitDo Pro 2 Wired Controller fox Xbox", 0, XTYPE_XBOXONE }, - { 0x31e3, 0x1100, "Wooting One", 0, XTYPE_XBOX360 }, - { 0x31e3, 0x1200, "Wooting Two", 0, XTYPE_XBOX360 }, - { 0x31e3, 0x1210, "Wooting Lekker", 0, XTYPE_XBOX360 }, - { 0x31e3, 0x1220, "Wooting Two HE", 0, XTYPE_XBOX360 }, - { 0x31e3, 0x1300, "Wooting 60HE (AVR)", 0, XTYPE_XBOX360 }, - { 0x31e3, 0x1310, "Wooting 60HE (ARM)", 0, XTYPE_XBOX360 }, { 0x3285, 0x0607, "Nacon GC-100", 0, XTYPE_XBOX360 }, { 0x3767, 0x0101, "Fanatec Speedster 3 Forceshock Wheel", 0, XTYPE_XBOX }, { 0xffff, 0xffff, "Chinese-made Xbox Controller", 0, XTYPE_XBOX }, @@ -429,7 +416,6 @@ static const signed short xpad_abs_triggers[] = { static const struct usb_device_id xpad_table[] = { { USB_INTERFACE_INFO('X', 'B', 0) }, /* X-Box USB-IF not approved class */ XPAD_XBOX360_VENDOR(0x0079), /* GPD Win 2 Controller */ - XPAD_XBOX360_VENDOR(0x03eb), /* Wooting Keyboards (Legacy) */ XPAD_XBOX360_VENDOR(0x044f), /* Thrustmaster X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x045e), /* Microsoft X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x045e), /* Microsoft X-Box One controllers */ @@ -440,7 +426,6 @@ static const struct usb_device_id xpad_table[] = { { USB_DEVICE(0x0738, 0x4540) }, /* Mad Catz Beat Pad */ XPAD_XBOXONE_VENDOR(0x0738), /* Mad Catz FightStick TE 2 */ XPAD_XBOX360_VENDOR(0x07ff), /* Mad Catz GamePad */ - XPAD_XBOX360_VENDOR(0x0c12), /* Zeroplus X-Box 360 controllers */ XPAD_XBOX360_VENDOR(0x0e6f), /* 0x0e6f X-Box 360 controllers */ XPAD_XBOXONE_VENDOR(0x0e6f), /* 0x0e6f X-Box One controllers */ XPAD_XBOX360_VENDOR(0x0f0d), /* Hori Controllers */ @@ -461,12 +446,8 @@ static const struct usb_device_id xpad_table[] = { XPAD_XBOXONE_VENDOR(0x20d6), /* PowerA Controllers */ XPAD_XBOX360_VENDOR(0x24c6), /* PowerA Controllers */ XPAD_XBOXONE_VENDOR(0x24c6), /* PowerA Controllers */ - XPAD_XBOX360_VENDOR(0x2563), /* OneXPlayer Gamepad */ - XPAD_XBOX360_VENDOR(0x260d), /* Dareu H101 */ - XPAD_XBOXONE_VENDOR(0x2dc8), /* 8BitDo Pro 2 Wired Controller for Xbox */ XPAD_XBOXONE_VENDOR(0x2e24), /* Hyperkin Duke X-Box One pad */ XPAD_XBOX360_VENDOR(0x2f24), /* GameSir Controllers */ - XPAD_XBOX360_VENDOR(0x31e3), /* Wooting Keyboards */ XPAD_XBOX360_VENDOR(0x3285), /* Nacon GC-100 */ { } }; @@ -1983,6 +1964,7 @@ static struct usb_driver xpad_driver = { .disconnect = xpad_disconnect, .suspend = xpad_suspend, .resume = xpad_resume, + .reset_resume = xpad_resume, .id_table = xpad_table, };
diff --git a/drivers/input/keyboard/omap-keypad.c b/drivers/input/keyboard/omap-keypad.c index dbe836c..5fe7a56 100644 --- a/drivers/input/keyboard/omap-keypad.c +++ b/drivers/input/keyboard/omap-keypad.c
@@ -46,7 +46,7 @@ struct omap_kp { unsigned short keymap[]; }; -static DECLARE_TASKLET_DISABLED_OLD(kp_tasklet, omap_kp_tasklet); +static DECLARE_TASKLET_DISABLED(kp_tasklet, omap_kp_tasklet, 0); static unsigned int *row_gpios; static unsigned int *col_gpios;
diff --git a/drivers/input/misc/rk805-pwrkey.c b/drivers/input/misc/rk805-pwrkey.c index 76873aa..3fb64db 100644 --- a/drivers/input/misc/rk805-pwrkey.c +++ b/drivers/input/misc/rk805-pwrkey.c
@@ -98,7 +98,6 @@ static struct platform_driver rk805_pwrkey_driver = { }; module_platform_driver(rk805_pwrkey_driver); -MODULE_ALIAS("platform:rk805-pwrkey"); MODULE_AUTHOR("Joseph Chen <chenjh@rock-chips.com>"); MODULE_DESCRIPTION("RK805 PMIC Power Key driver"); MODULE_LICENSE("GPL");
diff --git a/drivers/input/mouse/alps.c b/drivers/input/mouse/alps.c index 3aaebad..34700ed 100644 --- a/drivers/input/mouse/alps.c +++ b/drivers/input/mouse/alps.c
@@ -852,8 +852,8 @@ static void alps_process_packet_v6(struct psmouse *psmouse) x = y = z = 0; /* Divide 4 since trackpoint's speed is too fast */ - input_report_rel(dev2, REL_X, (s8)x / 4); - input_report_rel(dev2, REL_Y, -((s8)y / 4)); + input_report_rel(dev2, REL_X, (char)x / 4); + input_report_rel(dev2, REL_Y, -((char)y / 4)); psmouse_report_standard_buttons(dev2, packet[3]); @@ -1104,8 +1104,8 @@ static void alps_process_trackstick_packet_v7(struct psmouse *psmouse) ((packet[3] & 0x20) << 1); z = (packet[5] & 0x3f) | ((packet[3] & 0x80) >> 1); - input_report_rel(dev2, REL_X, (s8)x); - input_report_rel(dev2, REL_Y, -((s8)y)); + input_report_rel(dev2, REL_X, (char)x); + input_report_rel(dev2, REL_Y, -((char)y)); input_report_abs(dev2, ABS_PRESSURE, z); psmouse_report_standard_buttons(dev2, packet[1]); @@ -2294,20 +2294,20 @@ static int alps_get_v3_v7_resolution(struct psmouse *psmouse, int reg_pitch) if (reg < 0) return reg; - x_pitch = (s8)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_pitch = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ x_pitch = 50 + 2 * x_pitch; /* In 0.1 mm units */ - y_pitch = (s8)reg >> 4; /* sign extend upper 4 bits */ + y_pitch = (char)reg >> 4; /* sign extend upper 4 bits */ y_pitch = 36 + 2 * y_pitch; /* In 0.1 mm units */ reg = alps_command_mode_read_reg(psmouse, reg_pitch + 1); if (reg < 0) return reg; - x_electrode = (s8)(reg << 4) >> 4; /* sign extend lower 4 bits */ + x_electrode = (char)(reg << 4) >> 4; /* sign extend lower 4 bits */ x_electrode = 17 + x_electrode; - y_electrode = (s8)reg >> 4; /* sign extend upper 4 bits */ + y_electrode = (char)reg >> 4; /* sign extend upper 4 bits */ y_electrode = 13 + y_electrode; x_phys = x_pitch * (x_electrode - 1); /* In 0.1 mm units */
diff --git a/drivers/input/mouse/focaltech.c b/drivers/input/mouse/focaltech.c index c74b990..6fd5fff 100644 --- a/drivers/input/mouse/focaltech.c +++ b/drivers/input/mouse/focaltech.c
@@ -202,8 +202,8 @@ static void focaltech_process_rel_packet(struct psmouse *psmouse, state->pressed = packet[0] >> 7; finger1 = ((packet[0] >> 4) & 0x7) - 1; if (finger1 < FOC_MAX_FINGERS) { - state->fingers[finger1].x += (s8)packet[1]; - state->fingers[finger1].y += (s8)packet[2]; + state->fingers[finger1].x += (char)packet[1]; + state->fingers[finger1].y += (char)packet[2]; } else { psmouse_err(psmouse, "First finger in rel packet invalid: %d\n", finger1); @@ -218,8 +218,8 @@ static void focaltech_process_rel_packet(struct psmouse *psmouse, */ finger2 = ((packet[3] >> 4) & 0x7) - 1; if (finger2 < FOC_MAX_FINGERS) { - state->fingers[finger2].x += (s8)packet[4]; - state->fingers[finger2].y += (s8)packet[5]; + state->fingers[finger2].x += (char)packet[4]; + state->fingers[finger2].y += (char)packet[5]; } }
diff --git a/drivers/input/serio/hil_mlc.c b/drivers/input/serio/hil_mlc.c index d36e89d..4c039e4 100644 --- a/drivers/input/serio/hil_mlc.c +++ b/drivers/input/serio/hil_mlc.c
@@ -77,7 +77,7 @@ static struct timer_list hil_mlcs_kicker; static int hil_mlcs_probe, hil_mlc_stop; static void hil_mlcs_process(unsigned long unused); -static DECLARE_TASKLET_DISABLED_OLD(hil_mlcs_tasklet, hil_mlcs_process); +static DECLARE_TASKLET_DISABLED(hil_mlcs_tasklet, hil_mlcs_process, 0); /* #define HIL_MLC_DEBUG */
diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h index 92fb2f7..0282c4c 100644 --- a/drivers/input/serio/i8042-x86ia64io.h +++ b/drivers/input/serio/i8042-x86ia64io.h
@@ -67,93 +67,17 @@ static inline void i8042_write_command(int val) #include <linux/dmi.h> -#define SERIO_QUIRK_NOKBD BIT(0) -#define SERIO_QUIRK_NOAUX BIT(1) -#define SERIO_QUIRK_NOMUX BIT(2) -#define SERIO_QUIRK_FORCEMUX BIT(3) -#define SERIO_QUIRK_UNLOCK BIT(4) -#define SERIO_QUIRK_PROBE_DEFER BIT(5) -#define SERIO_QUIRK_RESET_ALWAYS BIT(6) -#define SERIO_QUIRK_RESET_NEVER BIT(7) -#define SERIO_QUIRK_DIECT BIT(8) -#define SERIO_QUIRK_DUMBKBD BIT(9) -#define SERIO_QUIRK_NOLOOP BIT(10) -#define SERIO_QUIRK_NOTIMEOUT BIT(11) -#define SERIO_QUIRK_KBDRESET BIT(12) -#define SERIO_QUIRK_DRITEK BIT(13) -#define SERIO_QUIRK_NOPNP BIT(14) - -/* Quirk table for different mainboards. Options similar or identical to i8042 - * module parameters. - * ORDERING IS IMPORTANT! The first match will be apllied and the rest ignored. - * This allows entries to overwrite vendor wide quirks on a per device basis. - * Where this is irrelevant, entries are sorted case sensitive by DMI_SYS_VENDOR - * and/or DMI_BOARD_VENDOR to make it easier to avoid dublicate entries. - */ -static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { +static const struct dmi_system_id __initconst i8042_dmi_noloop_table[] = { { + /* + * Arima-Rioworks HDAMB - + * AUX LOOP command does not raise AUX IRQ + */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ALIENWARE"), - DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"), + DMI_MATCH(DMI_BOARD_VENDOR, "RIOWORKS"), + DMI_MATCH(DMI_BOARD_NAME, "HDAMB"), + DMI_MATCH(DMI_BOARD_VERSION, "Rev E"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "X750LN"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Asus X450LCP */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_NEVER) - }, - { - /* ASUS ZenBook UX425UA */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"), - }, - .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER) - }, - { - /* ASUS ZenBook UM325UA */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"), - }, - .driver_data = (void *)(SERIO_QUIRK_PROBE_DEFER | SERIO_QUIRK_RESET_NEVER) - }, - /* - * On some Asus laptops, just running self tests cause problems. - */ - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_NEVER) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */ - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_NEVER) - }, - { - /* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */ - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), - DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"), - DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) }, { /* ASUS G1S */ @@ -162,241 +86,34 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_BOARD_NAME, "G1S"), DMI_MATCH(DMI_BOARD_VERSION, "1.0"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) + }, + { + /* ASUS P65UP5 - AUX LOOP command does not raise AUX IRQ */ + .matches = { + DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."), + DMI_MATCH(DMI_BOARD_NAME, "P/I-P65UP5"), + DMI_MATCH(DMI_BOARD_VERSION, "REV 2.X"), + }, }, { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"), + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X750LN"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Acer Aspire 5710 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Acer Aspire 7738 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7738"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Acer Aspire 5536 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"), - DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* - * Acer Aspire 5738z - * Touchpad stops working in mux mode when dis- + re-enabled - * with the touchpad enable/disable toggle hotkey - */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Acer Aspire One 150 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - /* - * Some Wistron based laptops need us to explicitly enable the 'Dritek - * keyboard extension' to make their extra keys start generating scancodes. - * Originally, this was just confined to older laptops, but a few Acer laptops - * have turned up in 2007 that also need this again. - */ - { - /* Acer Aspire 5100 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 5610 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 5630 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5630"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 5650 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5650"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 5680 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 5720 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5720"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer Aspire 9110 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 9110"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer TravelMate 660 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer TravelMate 2490 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Acer TravelMate 4280 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), - }, - .driver_data = (void *)(SERIO_QUIRK_DRITEK) - }, - { - /* Amoi M636/A737 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."), - DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"), - DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Compal HEL80I */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"), - DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Compaq"), - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant"), + DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"), DMI_MATCH(DMI_PRODUCT_VERSION, "8500"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) }, { .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Compaq"), - DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant"), + DMI_MATCH(DMI_PRODUCT_NAME , "ProLiant"), DMI_MATCH(DMI_PRODUCT_VERSION, "DL760"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Advent 4211 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "DIXONSXP"), - DMI_MATCH(DMI_PRODUCT_NAME, "Advent 4211"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) }, { /* Dell Embedded Box PC 3000 */ @@ -404,210 +121,54 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), DMI_MATCH(DMI_PRODUCT_NAME, "Embedded Box PC 3000"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) }, { - /* Dell XPS M1530 */ + /* OQO Model 01 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"), + DMI_MATCH(DMI_SYS_VENDOR, "OQO"), + DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "00"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Dell Vostro 1510 */ + /* ULI EV4873 - AUX LOOP does not work properly */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"), + DMI_MATCH(DMI_SYS_VENDOR, "ULI"), + DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"), + DMI_MATCH(DMI_PRODUCT_VERSION, "5a"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Dell Vostro V13 */ + /* Microsoft Virtual Machine */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), + DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), + DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT) }, { - /* Dell Vostro 1320 */ + /* Medion MAM 2070 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1320"), + DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_PRODUCT_NAME, "MAM 2070"), + DMI_MATCH(DMI_PRODUCT_VERSION, "5a"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) }, { - /* Dell Vostro 1520 */ + /* Medion Akoya E7225 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1520"), + DMI_MATCH(DMI_SYS_VENDOR, "Medion"), + DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"), + DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) }, { - /* Dell Vostro 1720 */ + /* Blue FB5601 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), - DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), + DMI_MATCH(DMI_SYS_VENDOR, "blue"), + DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"), + DMI_MATCH(DMI_PRODUCT_VERSION, "M606"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* Entroware Proteus */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Entroware"), - DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"), - DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS) - }, - /* - * Some Fujitsu notebooks are having trouble with touchpads if - * active multiplexing mode is activated. Luckily they don't have - * external PS/2 ports so we can safely disable it. - * ... apparently some Toshibas don't like MUX mode either and - * die horrible death on reboot. - */ - { - /* Fujitsu Lifebook P7010/P7010D */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "P7010"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu Lifebook P5020D */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P Series"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu Lifebook S2000 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S Series"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu Lifebook S6230 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu Lifebook T725 laptop */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT) - }, - { - /* Fujitsu Lifebook U745 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu T70H */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu A544 laptop */ - /* https://bugzilla.redhat.com/show_bug.cgi?id=1111138 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK A544"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT) - }, - { - /* Fujitsu AH544 laptop */ - /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT) - }, - { - /* Fujitsu U574 laptop */ - /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT) - }, - { - /* Fujitsu UH554 laptop */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOTIMEOUT) - }, - { - /* Fujitsu Lifebook P7010 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "0000000000"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu-Siemens Lifebook T3010 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T3010"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu-Siemens Lifebook E4010 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E4010"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu-Siemens Amilo Pro 2010 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2010"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu-Siemens Amilo Pro 2030 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), - DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Fujitsu Lifebook A574/H */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), - DMI_MATCH(DMI_PRODUCT_NAME, "FMVA0501PZ"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { /* Gigabyte M912 */ @@ -616,75 +177,6 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "M912"), DMI_MATCH(DMI_PRODUCT_VERSION, "01"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Gigabyte Spring Peak - defines wrong chassis type */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Gigabyte T1005 - defines wrong chassis type ("Other") */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "T1005"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Gigabyte T1005M/P - defines wrong chassis type ("Other") */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - /* - * Some laptops need keyboard reset before probing for the trackpad to get - * it detected, initialised & finally work. - */ - { - /* Gigabyte P35 v2 - Elantech touchpad */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "P35V2"), - }, - .driver_data = (void *)(SERIO_QUIRK_KBDRESET) - }, - { - /* Aorus branded Gigabyte X3 Plus - Elantech touchpad */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "X3"), - }, - .driver_data = (void *)(SERIO_QUIRK_KBDRESET) - }, - { - /* Gigabyte P34 - Elantech touchpad */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "P34"), - }, - .driver_data = (void *)(SERIO_QUIRK_KBDRESET) - }, - { - /* Gigabyte P57 - Elantech touchpad */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), - DMI_MATCH(DMI_PRODUCT_NAME, "P57"), - }, - .driver_data = (void *)(SERIO_QUIRK_KBDRESET) - }, - { - /* Gericom Bellagio */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Gericom"), - DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { /* Gigabyte M1022M netbook */ @@ -693,7 +185,27 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_BOARD_NAME, "M1022E"), DMI_MATCH(DMI_BOARD_VERSION, "1.02"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) + }, + { + /* Gigabyte Spring Peak - defines wrong chassis type */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Spring Peak"), + }, + }, + { + /* Gigabyte T1005 - defines wrong chassis type ("Other") */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005"), + }, + }, + { + /* Gigabyte T1005M/P - defines wrong chassis type ("Other") */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "T1005M/P"), + }, }, { .matches = { @@ -701,165 +213,113 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv9700"), DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) }, { - /* - * HP Pavilion DV4017EA - - * errors on MUX ports are reported without raising AUXDATA - * causing "spurious NAK" messages. - */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"), + DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"), + DMI_MATCH(DMI_PRODUCT_NAME, "C15B"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* - * HP Pavilion ZT1000 - - * like DV4017EA does not raise AUXERR for errors on MUX ports. - */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"), - DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"), + DMI_MATCH(DMI_SYS_VENDOR, "ByteSpeed LLC"), + DMI_MATCH(DMI_PRODUCT_NAME, "ByteSpeed Laptop C15B"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) + }, + { } +}; + +/* + * Some Fujitsu notebooks are having trouble with touchpads if + * active multiplexing mode is activated. Luckily they don't have + * external PS/2 ports so we can safely disable it. + * ... apparently some Toshibas don't like MUX mode either and + * die horrible death on reboot. + */ +static const struct dmi_system_id __initconst i8042_dmi_nomux_table[] = { + { + /* Fujitsu Lifebook P7010/P7010D */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "P7010"), + }, }, { - /* - * HP Pavilion DV4270ca - - * like DV4017EA does not raise AUXERR for errors on MUX ports. - */ + /* Fujitsu Lifebook P7010 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "0000000000"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Newer HP Pavilion dv4 models */ + /* Fujitsu Lifebook P5020D */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), - DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook P Series"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_NOTIMEOUT) }, { - /* IBM 2656 */ + /* Fujitsu Lifebook S2000 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "IBM"), - DMI_MATCH(DMI_PRODUCT_NAME, "2656"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S Series"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Avatar AVIU-145A6 */ + /* Fujitsu Lifebook S6230 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Intel"), - DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook S6230"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Intel MBO Desktop D845PESV */ + /* Fujitsu Lifebook T725 laptop */ .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), - DMI_MATCH(DMI_BOARD_NAME, "D845PESV"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), }, - .driver_data = (void *)(SERIO_QUIRK_NOPNP) }, { - /* - * Intel NUC D54250WYK - does not have i8042 controller but - * declares PS/2 devices in DSDT. - */ + /* Fujitsu Lifebook U745 */ .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), - DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U745"), }, - .driver_data = (void *)(SERIO_QUIRK_NOPNP) }, { - /* Lenovo 3000 n100 */ + /* Fujitsu T70H */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "076804U"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "FMVLT70H"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Lenovo XiaoXin Air 12 */ + /* Fujitsu-Siemens Lifebook T3010 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "80UN"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T3010"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Lenovo LaVie Z */ + /* Fujitsu-Siemens Lifebook E4010 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK E4010"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Lenovo Ideapad U455 */ + /* Fujitsu-Siemens Amilo Pro 2010 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "20046"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "AMILO Pro V2010"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) }, { - /* Lenovo ThinkPad L460 */ + /* Fujitsu-Siemens Amilo Pro 2030 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"), + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"), + DMI_MATCH(DMI_PRODUCT_NAME, "AMILO PRO V2030"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* Lenovo ThinkPad Twist S230u */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), - DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* LG Electronics X110 */ - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."), - DMI_MATCH(DMI_BOARD_NAME, "X110"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* Medion Akoya Mini E1210 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), - DMI_MATCH(DMI_PRODUCT_NAME, "E1210"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* Medion Akoya E1222 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), - DMI_MATCH(DMI_PRODUCT_NAME, "E122X"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* MSI Wind U-100 */ - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), - DMI_MATCH(DMI_BOARD_NAME, "U-100"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOPNP) }, { /* @@ -871,95 +331,62 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "Matsushita"), DMI_MATCH(DMI_PRODUCT_NAME, "CF-29"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Medion Akoya E7225 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Medion"), - DMI_MATCH(DMI_PRODUCT_NAME, "Akoya E7225"), - DMI_MATCH(DMI_PRODUCT_VERSION, "1.0"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Microsoft Virtual Machine */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Microsoft Corporation"), - DMI_MATCH(DMI_PRODUCT_NAME, "Virtual Machine"), - DMI_MATCH(DMI_PRODUCT_VERSION, "VS2005R2"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Medion MAM 2070 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), - DMI_MATCH(DMI_PRODUCT_NAME, "MAM 2070"), - DMI_MATCH(DMI_PRODUCT_VERSION, "5a"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* TUXEDO BU1406 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), - DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - { - /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), - DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"), - }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - { - /* OQO Model 01 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "OQO"), - DMI_MATCH(DMI_PRODUCT_NAME, "ZEPTO"), - DMI_MATCH(DMI_PRODUCT_VERSION, "00"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "PEGATRON CORPORATION"), - DMI_MATCH(DMI_PRODUCT_NAME, "C15B"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - { - /* Acer Aspire 5 A515 */ - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "PK"), - DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOPNP) - }, - { - /* ULI EV4873 - AUX LOOP does not work properly */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ULI"), - DMI_MATCH(DMI_PRODUCT_NAME, "EV4873"), - DMI_MATCH(DMI_PRODUCT_VERSION, "5a"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) }, { /* - * Arima-Rioworks HDAMB - - * AUX LOOP command does not raise AUX IRQ + * HP Pavilion DV4017EA - + * errors on MUX ports are reported without raising AUXDATA + * causing "spurious NAK" messages. */ .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "RIOWORKS"), - DMI_MATCH(DMI_BOARD_NAME, "HDAMB"), - DMI_MATCH(DMI_BOARD_VERSION, "Rev E"), + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EA032EA#ABF)"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) + }, + { + /* + * HP Pavilion ZT1000 - + * like DV4017EA does not raise AUXERR for errors on MUX ports. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion Notebook PC"), + DMI_MATCH(DMI_PRODUCT_VERSION, "HP Pavilion Notebook ZT1000"), + }, + }, + { + /* + * HP Pavilion DV4270ca - + * like DV4017EA does not raise AUXERR for errors on MUX ports. + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "Pavilion dv4000 (EH476UA#ABL)"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "EQUIUM A110"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), + DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE C850D"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ALIENWARE"), + DMI_MATCH(DMI_PRODUCT_NAME, "Sentia"), + }, }, { /* Sharp Actius MM20 */ @@ -967,7 +394,13 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "SHARP"), DMI_MATCH(DMI_PRODUCT_NAME, "PC-MM20 Series"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) + }, + { + /* Sony Vaio FS-115b */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"), + }, }, { /* @@ -979,7 +412,6 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FZ240E"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { /* @@ -991,17 +423,157 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_BOARD_NAME, "VAIO"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { - /* Sony Vaio FS-115b */ + /* Amoi M636/A737 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), - DMI_MATCH(DMI_PRODUCT_NAME, "VGN-FS115B"), + DMI_MATCH(DMI_SYS_VENDOR, "Amoi Electronics CO.,LTD."), + DMI_MATCH(DMI_PRODUCT_NAME, "M636/A737 platform"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { + /* Lenovo 3000 n100 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "076804U"), + }, + }, + { + /* Lenovo XiaoXin Air 12 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "80UN"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 1360"), + }, + }, + { + /* Acer Aspire 5710 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710"), + }, + }, + { + /* Acer Aspire 7738 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 7738"), + }, + }, + { + /* Gericom Bellagio */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Gericom"), + DMI_MATCH(DMI_PRODUCT_NAME, "N34AS6"), + }, + }, + { + /* IBM 2656 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "IBM"), + DMI_MATCH(DMI_PRODUCT_NAME, "2656"), + }, + }, + { + /* Dell XPS M1530 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "XPS M1530"), + }, + }, + { + /* Compal HEL80I */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "COMPAL"), + DMI_MATCH(DMI_PRODUCT_NAME, "HEL80I"), + }, + }, + { + /* Dell Vostro 1510 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"), + }, + }, + { + /* Acer Aspire 5536 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5536"), + DMI_MATCH(DMI_PRODUCT_VERSION, "0100"), + }, + }, + { + /* Dell Vostro V13 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), + }, + }, + { + /* Newer HP Pavilion dv4 models */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"), + }, + }, + { + /* Asus X450LCP */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "X450LCP"), + }, + }, + { + /* Avatar AVIU-145A6 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Intel"), + DMI_MATCH(DMI_PRODUCT_NAME, "IC4I"), + }, + }, + { + /* TUXEDO BU1406 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_PRODUCT_NAME, "N24_25BU"), + }, + }, + { + /* Lenovo LaVie Z */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "Lenovo LaVie Z"), + }, + }, + { + /* + * Acer Aspire 5738z + * Touchpad stops working in mux mode when dis- + re-enabled + * with the touchpad enable/disable toggle hotkey + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5738"), + }, + }, + { + /* Entroware Proteus */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Entroware"), + DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"), + DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"), + }, + }, + { } +}; + +static const struct dmi_system_id i8042_dmi_forcemux_table[] __initconst = { + { /* * Sony Vaio VGN-CS series require MUX or the touch sensor * buttons will disturb touchpad operation @@ -1010,51 +582,111 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "Sony Corporation"), DMI_MATCH(DMI_PRODUCT_NAME, "VGN-CS"), }, - .driver_data = (void *)(SERIO_QUIRK_FORCEMUX) + }, + { } +}; + +/* + * On some Asus laptops, just running self tests cause problems. + */ +static const struct dmi_system_id i8042_dmi_noselftest_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_CHASSIS_TYPE, "10"), /* Notebook */ + }, + }, { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_CHASSIS_TYPE, "31"), /* Convertible Notebook */ + }, + }, + { } +}; +static const struct dmi_system_id __initconst i8042_dmi_reset_table[] = { + { + /* MSI Wind U-100 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "U-100"), + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + }, + }, + { + /* LG Electronics X110 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "X110"), + DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."), + }, + }, + { + /* Acer Aspire One 150 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "AOA150"), + }, }, { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "Satellite P10"), + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A114-31"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "EQUIUM A110"), + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A314-31"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) }, { .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "TOSHIBA"), - DMI_MATCH(DMI_PRODUCT_NAME, "SATELLITE C850D"), + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire A315-31"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX) - }, - /* - * A lot of modern Clevo barebones have touchpad and/or keyboard issues - * after suspend fixable with nomux + reset + noloop + nopnp. Luckily, - * none of them have an external PS/2 port so this can safely be set for - * all of them. These two are based on a Clevo design, but have the - * board_name changed. - */ - { - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "AURA1501"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "TUXEDO"), - DMI_MATCH(DMI_BOARD_NAME, "EDUBOOK1502"), + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-132"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-332"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire ES1-432"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate Spin B118-RN"), + }, + }, + { + /* Advent 4211 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "DIXONSXP"), + DMI_MATCH(DMI_PRODUCT_NAME, "Advent 4211"), + }, + }, + { + /* Medion Akoya Mini E1210 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_PRODUCT_NAME, "E1210"), + }, + }, + { + /* Medion Akoya E1222 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), + DMI_MATCH(DMI_PRODUCT_NAME, "E122X"), + }, }, { /* Mivvy M310 */ @@ -1062,147 +694,104 @@ static const struct dmi_system_id i8042_dmi_quirk_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "VIOOO"), DMI_MATCH(DMI_PRODUCT_NAME, "N10"), }, - .driver_data = (void *)(SERIO_QUIRK_RESET_ALWAYS) - }, - /* - * Some laptops need keyboard reset before probing for the trackpad to get - * it detected, initialised & finally work. - */ - { - /* Schenker XMG C504 - Elantech touchpad */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "XMG"), - DMI_MATCH(DMI_PRODUCT_NAME, "C504"), - }, - .driver_data = (void *)(SERIO_QUIRK_KBDRESET) }, { - /* Blue FB5601 */ + /* Dell Vostro 1320 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "blue"), - DMI_MATCH(DMI_PRODUCT_NAME, "FB5601"), - DMI_MATCH(DMI_PRODUCT_VERSION, "M606"), + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1320"), }, - .driver_data = (void *)(SERIO_QUIRK_NOLOOP) - }, - /* - * A lot of modern Clevo barebones have touchpad and/or keyboard issues - * after suspend fixable with nomux + reset + noloop + nopnp. Luckily, - * none of them have an external PS/2 port so this can safely be set for - * all of them. - * Clevo barebones come with board_vendor and/or system_vendor set to - * either the very generic string "Notebook" and/or a different value - * for each individual reseller. The only somewhat universal way to - * identify them is by board_name. - */ - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "LAPQC71A"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { + /* Dell Vostro 1520 */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "LAPQC71B"), + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1520"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { + /* Dell Vostro 1720 */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "N140CU"), + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro 1720"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { + /* Lenovo Ideapad U455 */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "N141CU"), + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "20046"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { + /* Lenovo ThinkPad L460 */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "NH5xAx"), + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_VERSION, "ThinkPad L460"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { + /* Clevo P650RS, 650RP6, Sager NP8152-S, and others */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "NL5xRU"), + DMI_MATCH(DMI_SYS_VENDOR, "Notebook"), + DMI_MATCH(DMI_PRODUCT_NAME, "P65xRP"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) - }, - /* - * At least one modern Clevo barebone has the touchpad connected both - * via PS/2 and i2c interface. This causes a race condition between the - * psmouse and i2c-hid driver. Since the full capability of the touchpad - * is available via the i2c interface and the device has no external - * PS/2 port, it is safe to just ignore all ps2 mouses here to avoid - * this issue. The known affected device is the - * TUXEDO InfinityBook S17 Gen6 / Clevo NS70MU which comes with one of - * the two different dmi strings below. NS50MU is not a typo! - */ - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "NS50MU"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX | - SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | - SERIO_QUIRK_NOPNP) }, { + /* Lenovo ThinkPad Twist S230u */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "NS50_70MU"), + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "33474HU"), }, - .driver_data = (void *)(SERIO_QUIRK_NOAUX | SERIO_QUIRK_NOMUX | - SERIO_QUIRK_RESET_ALWAYS | SERIO_QUIRK_NOLOOP | - SERIO_QUIRK_NOPNP) }, { + /* Entroware Proteus */ .matches = { - DMI_MATCH(DMI_BOARD_NAME, "NJ50_70CU"), + DMI_MATCH(DMI_SYS_VENDOR, "Entroware"), + DMI_MATCH(DMI_PRODUCT_NAME, "Proteus"), + DMI_MATCH(DMI_PRODUCT_VERSION, "EL07R4"), }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) - }, - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "PB50_70DFx,DDx"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) - }, - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "PCX0DX"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) - }, - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "X170SM"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) - }, - { - .matches = { - DMI_MATCH(DMI_BOARD_NAME, "X170KM-G"), - }, - .driver_data = (void *)(SERIO_QUIRK_NOMUX | SERIO_QUIRK_RESET_ALWAYS | - SERIO_QUIRK_NOLOOP | SERIO_QUIRK_NOPNP) }, { } }; #ifdef CONFIG_PNP -static const struct dmi_system_id i8042_dmi_laptop_table[] __initconst = { +static const struct dmi_system_id __initconst i8042_dmi_nopnp_table[] = { + { + /* Intel MBO Desktop D845PESV */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "D845PESV"), + DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), + }, + }, + { + /* + * Intel NUC D54250WYK - does not have i8042 controller but + * declares PS/2 devices in DSDT. + */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "D54250WYK"), + DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), + }, + }, + { + /* MSI Wind U-100 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "U-100"), + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), + }, + }, + { + /* Acer Aspire 5 A515 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "Grumpy_PK"), + DMI_MATCH(DMI_BOARD_VENDOR, "PK"), + }, + }, + { } +}; + +static const struct dmi_system_id __initconst i8042_dmi_laptop_table[] = { { .matches = { DMI_MATCH(DMI_CHASSIS_TYPE, "8"), /* Portable */ @@ -1227,6 +816,203 @@ static const struct dmi_system_id i8042_dmi_laptop_table[] __initconst = { }; #endif +static const struct dmi_system_id __initconst i8042_dmi_notimeout_table[] = { + { + /* Dell Vostro V13 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Vostro V13"), + }, + }, + { + /* Newer HP Pavilion dv4 models */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Hewlett-Packard"), + DMI_MATCH(DMI_PRODUCT_NAME, "HP Pavilion dv4 Notebook PC"), + }, + }, + { + /* Fujitsu A544 laptop */ + /* https://bugzilla.redhat.com/show_bug.cgi?id=1111138 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK A544"), + }, + }, + { + /* Fujitsu AH544 laptop */ + /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK AH544"), + }, + }, + { + /* Fujitsu Lifebook T725 laptop */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK T725"), + }, + }, + { + /* Fujitsu U574 laptop */ + /* https://bugzilla.kernel.org/show_bug.cgi?id=69731 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK U574"), + }, + }, + { + /* Fujitsu UH554 laptop */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU"), + DMI_MATCH(DMI_PRODUCT_NAME, "LIFEBOOK UH544"), + }, + }, + { } +}; + +/* + * Some Wistron based laptops need us to explicitly enable the 'Dritek + * keyboard extension' to make their extra keys start generating scancodes. + * Originally, this was just confined to older laptops, but a few Acer laptops + * have turned up in 2007 that also need this again. + */ +static const struct dmi_system_id __initconst i8042_dmi_dritek_table[] = { + { + /* Acer Aspire 5100 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5100"), + }, + }, + { + /* Acer Aspire 5610 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5610"), + }, + }, + { + /* Acer Aspire 5630 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5630"), + }, + }, + { + /* Acer Aspire 5650 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5650"), + }, + }, + { + /* Acer Aspire 5680 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5680"), + }, + }, + { + /* Acer Aspire 5720 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5720"), + }, + }, + { + /* Acer Aspire 9110 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 9110"), + }, + }, + { + /* Acer TravelMate 660 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 660"), + }, + }, + { + /* Acer TravelMate 2490 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 2490"), + }, + }, + { + /* Acer TravelMate 4280 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Acer"), + DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), + }, + }, + { } +}; + +/* + * Some laptops need keyboard reset before probing for the trackpad to get + * it detected, initialised & finally work. + */ +static const struct dmi_system_id __initconst i8042_dmi_kbdreset_table[] = { + { + /* Gigabyte P35 v2 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "P35V2"), + }, + }, + { + /* Aorus branded Gigabyte X3 Plus - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "X3"), + }, + }, + { + /* Gigabyte P34 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "P34"), + }, + }, + { + /* Gigabyte P57 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "GIGABYTE"), + DMI_MATCH(DMI_PRODUCT_NAME, "P57"), + }, + }, + { + /* Schenker XMG C504 - Elantech touchpad */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "XMG"), + DMI_MATCH(DMI_PRODUCT_NAME, "C504"), + }, + }, + { } +}; + +static const struct dmi_system_id i8042_dmi_probe_defer_table[] __initconst = { + { + /* ASUS ZenBook UX425UA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX425UA"), + }, + }, + { + /* ASUS ZenBook UM325UA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_PRODUCT_NAME, "ZenBook UX325UA_UM325UA"), + }, + }, + { } +}; + #endif /* CONFIG_X86 */ #ifdef CONFIG_PNP @@ -1380,6 +1166,11 @@ static int __init i8042_pnp_init(void) bool pnp_data_busted = false; int err; +#ifdef CONFIG_X86 + if (dmi_check_system(i8042_dmi_nopnp_table)) + i8042_nopnp = true; +#endif + if (i8042_nopnp) { pr_info("PNP detection disabled\n"); return 0; @@ -1483,59 +1274,6 @@ static inline int i8042_pnp_init(void) { return 0; } static inline void i8042_pnp_exit(void) { } #endif /* CONFIG_PNP */ - -#ifdef CONFIG_X86 -static void __init i8042_check_quirks(void) -{ - const struct dmi_system_id *device_quirk_info; - uintptr_t quirks; - - device_quirk_info = dmi_first_match(i8042_dmi_quirk_table); - if (!device_quirk_info) - return; - - quirks = (uintptr_t)device_quirk_info->driver_data; - - if (quirks & SERIO_QUIRK_NOKBD) - i8042_nokbd = true; - if (quirks & SERIO_QUIRK_NOAUX) - i8042_noaux = true; - if (quirks & SERIO_QUIRK_NOMUX) - i8042_nomux = true; - if (quirks & SERIO_QUIRK_FORCEMUX) - i8042_nomux = false; - if (quirks & SERIO_QUIRK_UNLOCK) - i8042_unlock = true; - if (quirks & SERIO_QUIRK_PROBE_DEFER) - i8042_probe_defer = true; - /* Honor module parameter when value is not default */ - if (i8042_reset == I8042_RESET_DEFAULT) { - if (quirks & SERIO_QUIRK_RESET_ALWAYS) - i8042_reset = I8042_RESET_ALWAYS; - if (quirks & SERIO_QUIRK_RESET_NEVER) - i8042_reset = I8042_RESET_NEVER; - } - if (quirks & SERIO_QUIRK_DIECT) - i8042_direct = true; - if (quirks & SERIO_QUIRK_DUMBKBD) - i8042_dumbkbd = true; - if (quirks & SERIO_QUIRK_NOLOOP) - i8042_noloop = true; - if (quirks & SERIO_QUIRK_NOTIMEOUT) - i8042_notimeout = true; - if (quirks & SERIO_QUIRK_KBDRESET) - i8042_kbdreset = true; - if (quirks & SERIO_QUIRK_DRITEK) - i8042_dritek = true; -#ifdef CONFIG_PNP - if (quirks & SERIO_QUIRK_NOPNP) - i8042_nopnp = true; -#endif -} -#else -static inline void i8042_check_quirks(void) {} -#endif - static int __init i8042_platform_init(void) { int retval; @@ -1558,17 +1296,45 @@ static int __init i8042_platform_init(void) i8042_kbd_irq = I8042_MAP_IRQ(1); i8042_aux_irq = I8042_MAP_IRQ(12); -#if defined(__ia64__) - i8042_reset = I8042_RESET_ALWAYS; -#endif - - i8042_check_quirks(); - retval = i8042_pnp_init(); if (retval) return retval; +#if defined(__ia64__) + i8042_reset = I8042_RESET_ALWAYS; +#endif + #ifdef CONFIG_X86 + /* Honor module parameter when value is not default */ + if (i8042_reset == I8042_RESET_DEFAULT) { + if (dmi_check_system(i8042_dmi_reset_table)) + i8042_reset = I8042_RESET_ALWAYS; + + if (dmi_check_system(i8042_dmi_noselftest_table)) + i8042_reset = I8042_RESET_NEVER; + } + + if (dmi_check_system(i8042_dmi_noloop_table)) + i8042_noloop = true; + + if (dmi_check_system(i8042_dmi_nomux_table)) + i8042_nomux = true; + + if (dmi_check_system(i8042_dmi_forcemux_table)) + i8042_nomux = false; + + if (dmi_check_system(i8042_dmi_notimeout_table)) + i8042_notimeout = true; + + if (dmi_check_system(i8042_dmi_dritek_table)) + i8042_dritek = true; + + if (dmi_check_system(i8042_dmi_kbdreset_table)) + i8042_kbdreset = true; + + if (dmi_check_system(i8042_dmi_probe_defer_table)) + i8042_probe_defer = true; + /* * A20 was already enabled during early kernel init. But some buggy * BIOSes (in MSI Laptops) require A20 to be enabled using 8042 to
diff --git a/drivers/input/serio/i8042.c b/drivers/input/serio/i8042.c index dc40f60..bb76ff2 100644 --- a/drivers/input/serio/i8042.c +++ b/drivers/input/serio/i8042.c
@@ -1540,6 +1540,8 @@ static int i8042_probe(struct platform_device *dev) { int error; + i8042_platform_device = dev; + if (i8042_reset == I8042_RESET_ALWAYS) { error = i8042_controller_selftest(); if (error) @@ -1577,6 +1579,7 @@ static int i8042_probe(struct platform_device *dev) i8042_free_aux_ports(); /* in case KBD failed but AUX not */ i8042_free_irqs(); i8042_controller_reset(false); + i8042_platform_device = NULL; return error; } @@ -1586,6 +1589,7 @@ static int i8042_remove(struct platform_device *dev) i8042_unregister_ports(); i8042_free_irqs(); i8042_controller_reset(false); + i8042_platform_device = NULL; return 0; }
diff --git a/drivers/input/touchscreen/ads7846.c b/drivers/input/touchscreen/ads7846.c index 0506115..d247d0a 100644 --- a/drivers/input/touchscreen/ads7846.c +++ b/drivers/input/touchscreen/ads7846.c
@@ -790,8 +790,14 @@ static void ads7846_report_state(struct ads7846 *ts) if (x == MAX_12BIT) x = 0; - if (ts->model == 7843 || ts->model == 7845) { + if (ts->model == 7843) { Rt = ts->pressure_max / 2; + } else if (ts->model == 7845) { + if (get_pendown_state(ts)) + Rt = ts->pressure_max / 2; + else + Rt = 0; + dev_vdbg(&ts->spi->dev, "x/y: %d/%d, PD %d\n", x, y, Rt); } else if (likely(x && z1)) { /* compute touch pressure resistance using equation #2 */ Rt = z2; @@ -1370,9 +1376,8 @@ static int ads7846_probe(struct spi_device *spi) pdata->y_min ? : 0, pdata->y_max ? : MAX_12BIT, 0, 0); - if (ts->model != 7845) - input_set_abs_params(input_dev, ABS_PRESSURE, - pdata->pressure_min, pdata->pressure_max, 0, 0); + input_set_abs_params(input_dev, ABS_PRESSURE, + pdata->pressure_min, pdata->pressure_max, 0, 0); /* * Parse common framework properties. Must be done here to ensure the
diff --git a/drivers/input/touchscreen/elants_i2c.c b/drivers/input/touchscreen/elants_i2c.c index 4022816..a51e7c8 100644 --- a/drivers/input/touchscreen/elants_i2c.c +++ b/drivers/input/touchscreen/elants_i2c.c
@@ -1078,12 +1078,14 @@ static int elants_i2c_power_on(struct elants_data *ts) if (IS_ERR_OR_NULL(ts->reset_gpio)) return 0; + gpiod_set_value_cansleep(ts->reset_gpio, 1); + error = regulator_enable(ts->vcc33); if (error) { dev_err(&ts->client->dev, "failed to enable vcc33 regulator: %d\n", error); - return error; + goto release_reset_gpio; } error = regulator_enable(ts->vccio); @@ -1092,7 +1094,7 @@ static int elants_i2c_power_on(struct elants_data *ts) "failed to enable vccio regulator: %d\n", error); regulator_disable(ts->vcc33); - return error; + goto release_reset_gpio; } /* @@ -1101,6 +1103,7 @@ static int elants_i2c_power_on(struct elants_data *ts) */ udelay(ELAN_POWERON_DELAY_USEC); +release_reset_gpio: gpiod_set_value_cansleep(ts->reset_gpio, 0); if (error) return error; @@ -1208,7 +1211,7 @@ static int elants_i2c_probe(struct i2c_client *client, return error; } - ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_HIGH); + ts->reset_gpio = devm_gpiod_get(&client->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(ts->reset_gpio)) { error = PTR_ERR(ts->reset_gpio);
diff --git a/drivers/input/touchscreen/goodix.c b/drivers/input/touchscreen/goodix.c index f60466c..3c9cdb8 100644 --- a/drivers/input/touchscreen/goodix.c +++ b/drivers/input/touchscreen/goodix.c
@@ -170,18 +170,10 @@ static const struct dmi_system_id rotated_screen[] = { static const struct dmi_system_id nine_bytes_report[] = { #if defined(CONFIG_DMI) && defined(CONFIG_X86) { - /* Lenovo Yoga Book X90F / X90L */ + .ident = "Lenovo YogaBook", + /* YB1-X91L/F and YB1-X90L/F */ .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "CHERRYVIEW D1 PLATFORM"), - DMI_EXACT_MATCH(DMI_PRODUCT_VERSION, "YETI-11"), - } - }, - { - /* Lenovo Yoga Book X91F / X91L */ - .matches = { - /* Non exact match to match F + L versions */ - DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X91"), + DMI_MATCH(DMI_PRODUCT_NAME, "Lenovo YB1-X9") } }, #endif
diff --git a/drivers/input/touchscreen/melfas_mip4.c b/drivers/input/touchscreen/melfas_mip4.c index 0588b8f..247c3aa 100644 --- a/drivers/input/touchscreen/melfas_mip4.c +++ b/drivers/input/touchscreen/melfas_mip4.c
@@ -1453,7 +1453,7 @@ static int mip4_probe(struct i2c_client *client, const struct i2c_device_id *id) "ce", GPIOD_OUT_LOW); if (IS_ERR(ts->gpio_ce)) { error = PTR_ERR(ts->gpio_ce); - if (error != -EPROBE_DEFER) + if (error != EPROBE_DEFER) dev_err(&client->dev, "Failed to get gpio: %d\n", error); return error;
diff --git a/drivers/interconnect/core.c b/drivers/interconnect/core.c index bc4d2b2..dcff97b 100644 --- a/drivers/interconnect/core.c +++ b/drivers/interconnect/core.c
@@ -614,10 +614,6 @@ void icc_node_destroy(int id) mutex_unlock(&icc_lock); - if (!node) - return; - - kfree(node->links); kfree(node); } EXPORT_SYMBOL_GPL(icc_node_destroy);
diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 4a9feff..82d0083 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c
@@ -84,10 +84,6 @@ #define ACPI_DEVFLAG_ATSDIS 0x10000000 #define LOOP_TIMEOUT 2000000 - -#define IVRS_GET_SBDF_ID(seg, bus, dev, fd) (((seg & 0xffff) << 16) | ((bus & 0xff) << 8) \ - | ((dev & 0x1f) << 3) | (fn & 0x7)) - /* * ACPI table definitions * @@ -2975,32 +2971,24 @@ static int __init parse_amd_iommu_options(char *str) static int __init parse_ivrs_ioapic(char *str) { - u32 seg = 0, bus, dev, fn; - int id, i; - u32 devid; + unsigned int bus, dev, fn; + int ret, id, i; + u16 devid; - if (sscanf(str, "=%d@%x:%x.%x", &id, &bus, &dev, &fn) == 4 || - sscanf(str, "=%d@%x:%x:%x.%x", &id, &seg, &bus, &dev, &fn) == 5) - goto found; + ret = sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn); - if (sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn) == 4 || - sscanf(str, "[%d]=%x:%x:%x.%x", &id, &seg, &bus, &dev, &fn) == 5) { - pr_warn("ivrs_ioapic%s option format deprecated; use ivrs_ioapic=%d@%04x:%02x:%02x.%d instead\n", - str, id, seg, bus, dev, fn); - goto found; + if (ret != 4) { + pr_err("Invalid command line: ivrs_ioapic%s\n", str); + return 1; } - pr_err("Invalid command line: ivrs_ioapic%s\n", str); - return 1; - -found: if (early_ioapic_map_size == EARLY_MAP_SIZE) { pr_err("Early IOAPIC map overflow - ignoring ivrs_ioapic%s\n", str); return 1; } - devid = IVRS_GET_SBDF_ID(seg, bus, dev, fn); + devid = ((bus & 0xff) << 8) | ((dev & 0x1f) << 3) | (fn & 0x7); cmdline_maps = true; i = early_ioapic_map_size++; @@ -3013,32 +3001,24 @@ static int __init parse_ivrs_ioapic(char *str) static int __init parse_ivrs_hpet(char *str) { - u32 seg = 0, bus, dev, fn; - int id, i; - u32 devid; + unsigned int bus, dev, fn; + int ret, id, i; + u16 devid; - if (sscanf(str, "=%d@%x:%x.%x", &id, &bus, &dev, &fn) == 4 || - sscanf(str, "=%d@%x:%x:%x.%x", &id, &seg, &bus, &dev, &fn) == 5) - goto found; + ret = sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn); - if (sscanf(str, "[%d]=%x:%x.%x", &id, &bus, &dev, &fn) == 4 || - sscanf(str, "[%d]=%x:%x:%x.%x", &id, &seg, &bus, &dev, &fn) == 5) { - pr_warn("ivrs_hpet%s option format deprecated; use ivrs_hpet=%d@%04x:%02x:%02x.%d instead\n", - str, id, seg, bus, dev, fn); - goto found; + if (ret != 4) { + pr_err("Invalid command line: ivrs_hpet%s\n", str); + return 1; } - pr_err("Invalid command line: ivrs_hpet%s\n", str); - return 1; - -found: if (early_hpet_map_size == EARLY_MAP_SIZE) { pr_err("Early HPET map overflow - ignoring ivrs_hpet%s\n", str); return 1; } - devid = IVRS_GET_SBDF_ID(seg, bus, dev, fn); + devid = ((bus & 0xff) << 8) | ((dev & 0x1f) << 3) | (fn & 0x7); cmdline_maps = true; i = early_hpet_map_size++; @@ -3049,53 +3029,19 @@ static int __init parse_ivrs_hpet(char *str) return 1; } -#define ACPIID_LEN (ACPIHID_UID_LEN + ACPIHID_HID_LEN) - static int __init parse_ivrs_acpihid(char *str) { - u32 seg = 0, bus, dev, fn; - char *hid, *uid, *p, *addr; - char acpiid[ACPIID_LEN] = {0}; - int i; + u32 bus, dev, fn; + char *hid, *uid, *p; + char acpiid[ACPIHID_UID_LEN + ACPIHID_HID_LEN] = {0}; + int ret, i; - addr = strchr(str, '@'); - if (!addr) { - addr = strchr(str, '='); - if (!addr) - goto not_found; - - ++addr; - - if (strlen(addr) > ACPIID_LEN) - goto not_found; - - if (sscanf(str, "[%x:%x.%x]=%s", &bus, &dev, &fn, acpiid) == 4 || - sscanf(str, "[%x:%x:%x.%x]=%s", &seg, &bus, &dev, &fn, acpiid) == 5) { - pr_warn("ivrs_acpihid%s option format deprecated; use ivrs_acpihid=%s@%04x:%02x:%02x.%d instead\n", - str, acpiid, seg, bus, dev, fn); - goto found; - } - goto not_found; + ret = sscanf(str, "[%x:%x.%x]=%s", &bus, &dev, &fn, acpiid); + if (ret != 4) { + pr_err("Invalid command line: ivrs_acpihid(%s)\n", str); + return 1; } - /* We have the '@', make it the terminator to get just the acpiid */ - *addr++ = 0; - - if (strlen(str) > ACPIID_LEN + 1) - goto not_found; - - if (sscanf(str, "=%s", acpiid) != 1) - goto not_found; - - if (sscanf(addr, "%x:%x.%x", &bus, &dev, &fn) == 3 || - sscanf(addr, "%x:%x:%x.%x", &seg, &bus, &dev, &fn) == 4) - goto found; - -not_found: - pr_err("Invalid command line: ivrs_acpihid%s\n", str); - return 1; - -found: p = acpiid; hid = strsep(&p, ":"); uid = p; @@ -3105,17 +3051,11 @@ static int __init parse_ivrs_acpihid(char *str) return 1; } - /* - * Ignore leading zeroes after ':', so e.g., AMDI0095:00 - * will match AMDI0095:0 in the second strcmp in acpi_dev_hid_uid_match - */ - while (*uid == '0' && *(uid + 1)) - uid++; - i = early_acpihid_map_size++; memcpy(early_acpihid_map[i].hid, hid, strlen(hid)); memcpy(early_acpihid_map[i].uid, uid, strlen(uid)); - early_acpihid_map[i].devid = IVRS_GET_SBDF_ID(seg, bus, dev, fn); + early_acpihid_map[i].devid = + ((bus & 0xff) << 8) | ((dev & 0x1f) << 3) | (fn & 0x7); early_acpihid_map[i].cmd_line = true; return 1;
diff --git a/drivers/iommu/amd_iommu_v2.c b/drivers/iommu/amd_iommu_v2.c index db391dd..05f3d93 100644 --- a/drivers/iommu/amd_iommu_v2.c +++ b/drivers/iommu/amd_iommu_v2.c
@@ -591,7 +591,6 @@ static int ppr_notifier(struct notifier_block *nb, unsigned long e, void *data) put_device_state(dev_state); out: - pci_dev_put(pdev); return ret; }
diff --git a/drivers/iommu/dma-iommu.c b/drivers/iommu/dma-iommu.c index 5be5470..661bc03 100644 --- a/drivers/iommu/dma-iommu.c +++ b/drivers/iommu/dma-iommu.c
@@ -706,7 +706,7 @@ static void iommu_dma_sync_single_for_cpu(struct device *dev, return; phys = iommu_iova_to_phys(iommu_get_dma_domain(dev), dma_handle); - arch_sync_dma_for_cpu(phys, size, dir); + arch_sync_dma_for_cpu(dev, phys, size, dir); } static void iommu_dma_sync_single_for_device(struct device *dev, @@ -718,7 +718,7 @@ static void iommu_dma_sync_single_for_device(struct device *dev, return; phys = iommu_iova_to_phys(iommu_get_dma_domain(dev), dma_handle); - arch_sync_dma_for_device(phys, size, dir); + arch_sync_dma_for_device(dev, phys, size, dir); } static void iommu_dma_sync_sg_for_cpu(struct device *dev, @@ -732,7 +732,7 @@ static void iommu_dma_sync_sg_for_cpu(struct device *dev, return; for_each_sg(sgl, sg, nelems, i) - arch_sync_dma_for_cpu(sg_phys(sg), sg->length, dir); + arch_sync_dma_for_cpu(dev, sg_phys(sg), sg->length, dir); } static void iommu_dma_sync_sg_for_device(struct device *dev, @@ -746,7 +746,7 @@ static void iommu_dma_sync_sg_for_device(struct device *dev, return; for_each_sg(sgl, sg, nelems, i) - arch_sync_dma_for_device(sg_phys(sg), sg->length, dir); + arch_sync_dma_for_device(dev, sg_phys(sg), sg->length, dir); } static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, @@ -761,7 +761,7 @@ static dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, dma_handle =__iommu_dma_map(dev, phys, size, prot); if (!coherent && !(attrs & DMA_ATTR_SKIP_CPU_SYNC) && dma_handle != DMA_MAPPING_ERROR) - arch_sync_dma_for_device(phys, size, dir); + arch_sync_dma_for_device(dev, phys, size, dir); return dma_handle; }
diff --git a/drivers/iommu/dmar.c b/drivers/iommu/dmar.c index 36900d6..9f7c1e2 100644 --- a/drivers/iommu/dmar.c +++ b/drivers/iommu/dmar.c
@@ -475,7 +475,7 @@ static int dmar_parse_one_rhsa(struct acpi_dmar_header *header, void *arg) if (drhd->reg_base_addr == rhsa->base_address) { int node = acpi_map_pxm_to_node(rhsa->proximity_domain); - if (node != NUMA_NO_NODE && !node_online(node)) + if (!node_online(node)) node = NUMA_NO_NODE; drhd->iommu->node = node; return 0; @@ -794,7 +794,6 @@ int __init dmar_dev_scope_init(void) info = dmar_alloc_pci_notify_info(dev, BUS_NOTIFY_ADD_DEVICE); if (!info) { - pci_dev_put(dev); return dmar_dev_scope_status; } else { dmar_pci_bus_add_dev(info);
diff --git a/drivers/iommu/exynos-iommu.c b/drivers/iommu/exynos-iommu.c index acf21e4..85b7a1b 100644 --- a/drivers/iommu/exynos-iommu.c +++ b/drivers/iommu/exynos-iommu.c
@@ -635,7 +635,7 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) ret = iommu_device_register(&data->iommu); if (ret) - goto err_iommu_register; + return ret; platform_set_drvdata(pdev, data); @@ -662,10 +662,6 @@ static int exynos_sysmmu_probe(struct platform_device *pdev) pm_runtime_enable(dev); return 0; - -err_iommu_register: - iommu_device_sysfs_remove(&data->iommu); - return ret; } static int __maybe_unused exynos_sysmmu_suspend(struct device *dev)
diff --git a/drivers/iommu/fsl_pamu.c b/drivers/iommu/fsl_pamu.c index 4dbecd1..cde281b 100644 --- a/drivers/iommu/fsl_pamu.c +++ b/drivers/iommu/fsl_pamu.c
@@ -1122,7 +1122,7 @@ static int fsl_pamu_probe(struct platform_device *pdev) ret = create_csd(ppaact_phys, mem_size, csd_port_id); if (ret) { dev_err(dev, "could not create coherence subdomain\n"); - goto error; + return ret; } }
diff --git a/drivers/iommu/intel-iommu.c b/drivers/iommu/intel-iommu.c index 2a53fa7..d00ac43 100644 --- a/drivers/iommu/intel-iommu.c +++ b/drivers/iommu/intel-iommu.c
@@ -2751,7 +2751,6 @@ static int __init si_domain_init(int hw) if (md_domain_init(si_domain, DEFAULT_DOMAIN_ADDRESS_WIDTH)) { domain_exit(si_domain); - si_domain = NULL; return -EFAULT; } @@ -3372,10 +3371,6 @@ static int __init init_dmars(void) disable_dmar_iommu(iommu); free_dmar_iommu(iommu); } - if (si_domain) { - domain_exit(si_domain); - si_domain = NULL; - } kfree(g_iommus);
diff --git a/drivers/iommu/intel-pasid.c b/drivers/iommu/intel-pasid.c index 58f0600..e7cb0b8 100644 --- a/drivers/iommu/intel-pasid.c +++ b/drivers/iommu/intel-pasid.c
@@ -166,9 +166,6 @@ int intel_pasid_alloc_table(struct device *dev) attach_out: device_attach_pasid_table(info, pasid_table); - if (!ecap_coherent(info->iommu->ecap)) - clflush_cache_range(pasid_table->table, size); - return 0; } @@ -253,10 +250,6 @@ struct pasid_entry *intel_pasid_get_entry(struct device *dev, int pasid) WRITE_ONCE(dir[dir_index].val, (u64)virt_to_phys(entries) | PASID_PTE_PRESENT); - if (!ecap_coherent(info->iommu->ecap)) { - clflush_cache_range(entries, VTD_PAGE_SIZE); - clflush_cache_range(&dir[dir_index].val, sizeof(*dir)); - } } spin_unlock(&pasid_lock);
diff --git a/drivers/iommu/mtk_iommu_v1.c b/drivers/iommu/mtk_iommu_v1.c index fa602bf..e93b94e 100644 --- a/drivers/iommu/mtk_iommu_v1.c +++ b/drivers/iommu/mtk_iommu_v1.c
@@ -626,34 +626,18 @@ static int mtk_iommu_probe(struct platform_device *pdev) ret = iommu_device_sysfs_add(&data->iommu, &pdev->dev, NULL, dev_name(&pdev->dev)); if (ret) - goto out_clk_unprepare; + return ret; iommu_device_set_ops(&data->iommu, &mtk_iommu_ops); ret = iommu_device_register(&data->iommu); if (ret) - goto out_sysfs_remove; + return ret; - if (!iommu_present(&platform_bus_type)) { - ret = bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); - if (ret) - goto out_dev_unreg; - } + if (!iommu_present(&platform_bus_type)) + bus_set_iommu(&platform_bus_type, &mtk_iommu_ops); - ret = component_master_add_with_match(dev, &mtk_iommu_com_ops, match); - if (ret) - goto out_bus_set_null; - return ret; - -out_bus_set_null: - bus_set_iommu(&platform_bus_type, NULL); -out_dev_unreg: - iommu_device_unregister(&data->iommu); -out_sysfs_remove: - iommu_device_sysfs_remove(&data->iommu); -out_clk_unprepare: - clk_disable_unprepare(data->bclk); - return ret; + return component_master_add_with_match(dev, &mtk_iommu_com_ops, match); } static int mtk_iommu_remove(struct platform_device *pdev)
diff --git a/drivers/iommu/omap-iommu-debug.c b/drivers/iommu/omap-iommu-debug.c index 259f652..a99afb5 100644 --- a/drivers/iommu/omap-iommu-debug.c +++ b/drivers/iommu/omap-iommu-debug.c
@@ -32,12 +32,12 @@ static inline bool is_omap_iommu_detached(struct omap_iommu *obj) ssize_t bytes; \ const char *str = "%20s: %08x\n"; \ const int maxcol = 32; \ - if (len < maxcol) \ - goto out; \ - bytes = scnprintf(p, maxcol, str, __stringify(name), \ + bytes = snprintf(p, maxcol, str, __stringify(name), \ iommu_read_reg(obj, MMU_##name)); \ p += bytes; \ len -= bytes; \ + if (len < maxcol) \ + goto out; \ } while (0) static ssize_t
diff --git a/drivers/iommu/qcom_iommu.c b/drivers/iommu/qcom_iommu.c index e377f77..1be1a17 100644 --- a/drivers/iommu/qcom_iommu.c +++ b/drivers/iommu/qcom_iommu.c
@@ -785,12 +785,9 @@ static bool qcom_iommu_has_secure_context(struct qcom_iommu_dev *qcom_iommu) { struct device_node *child; - for_each_child_of_node(qcom_iommu->dev->of_node, child) { - if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec")) { - of_node_put(child); + for_each_child_of_node(qcom_iommu->dev->of_node, child) + if (of_device_is_compatible(child, "qcom,msm-iommu-v1-sec")) return true; - } - } return false; }
diff --git a/drivers/irqchip/irq-alpine-msi.c b/drivers/irqchip/irq-alpine-msi.c index 1819bb1..ede02dc 100644 --- a/drivers/irqchip/irq-alpine-msi.c +++ b/drivers/irqchip/irq-alpine-msi.c
@@ -199,7 +199,6 @@ static int alpine_msix_init_domains(struct alpine_msix_data *priv, } gic_domain = irq_find_host(gic_node); - of_node_put(gic_node); if (!gic_domain) { pr_err("Failed to find the GIC domain\n"); return -ENXIO;
diff --git a/drivers/irqchip/irq-bcm7120-l2.c b/drivers/irqchip/irq-bcm7120-l2.c index d308bbe..586df35 100644 --- a/drivers/irqchip/irq-bcm7120-l2.c +++ b/drivers/irqchip/irq-bcm7120-l2.c
@@ -268,8 +268,7 @@ static int __init bcm7120_l2_intc_probe(struct device_node *dn, flags |= IRQ_GC_BE_IO; ret = irq_alloc_domain_generic_chips(data->domain, IRQS_PER_WORD, 1, - dn->full_name, handle_level_irq, clr, - IRQ_LEVEL, flags); + dn->full_name, handle_level_irq, clr, 0, flags); if (ret) { pr_err("failed to allocate generic irq chip\n"); goto out_free_domain;
diff --git a/drivers/irqchip/irq-brcmstb-l2.c b/drivers/irqchip/irq-brcmstb-l2.c index f803ecb..0298ede 100644 --- a/drivers/irqchip/irq-brcmstb-l2.c +++ b/drivers/irqchip/irq-brcmstb-l2.c
@@ -161,7 +161,6 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, *init_params) { unsigned int clr = IRQ_NOREQUEST | IRQ_NOPROBE | IRQ_NOAUTOEN; - unsigned int set = 0; struct brcmstb_l2_intc_data *data; struct irq_chip_type *ct; int ret; @@ -209,12 +208,9 @@ static int __init brcmstb_l2_intc_of_init(struct device_node *np, if (IS_ENABLED(CONFIG_MIPS) && IS_ENABLED(CONFIG_CPU_BIG_ENDIAN)) flags |= IRQ_GC_BE_IO; - if (init_params->handler == handle_level_irq) - set |= IRQ_LEVEL; - /* Allocate a single Generic IRQ chip for this node */ ret = irq_alloc_domain_generic_chips(data->domain, 32, 1, - np->full_name, init_params->handler, clr, set, flags); + np->full_name, init_params->handler, clr, 0, flags); if (ret) { pr_err("failed to allocate generic irq chip\n"); goto out_free_domain;
diff --git a/drivers/irqchip/irq-gic-pm.c b/drivers/irqchip/irq-gic-pm.c index 8be7d13..1337cec 100644 --- a/drivers/irqchip/irq-gic-pm.c +++ b/drivers/irqchip/irq-gic-pm.c
@@ -104,7 +104,7 @@ static int gic_probe(struct platform_device *pdev) pm_runtime_enable(dev); - ret = pm_runtime_resume_and_get(dev); + ret = pm_runtime_get_sync(dev); if (ret < 0) goto rpm_disable;
diff --git a/drivers/irqchip/irq-mvebu-gicp.c b/drivers/irqchip/irq-mvebu-gicp.c index 5caec41..3be5c5d 100644 --- a/drivers/irqchip/irq-mvebu-gicp.c +++ b/drivers/irqchip/irq-mvebu-gicp.c
@@ -223,7 +223,6 @@ static int mvebu_gicp_probe(struct platform_device *pdev) } parent_domain = irq_find_host(irq_parent_dn); - of_node_put(irq_parent_dn); if (!parent_domain) { dev_err(&pdev->dev, "failed to find parent IRQ domain\n"); return -ENODEV;
diff --git a/drivers/irqchip/irq-tegra.c b/drivers/irqchip/irq-tegra.c index ad3e2c1..e1f771c 100644 --- a/drivers/irqchip/irq-tegra.c +++ b/drivers/irqchip/irq-tegra.c
@@ -148,10 +148,10 @@ static int tegra_ictlr_suspend(void) lic->cop_iep[i] = readl_relaxed(ictlr + ICTLR_COP_IEP_CLASS); /* Disable COP interrupts */ - writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_COP_IER_CLR); + writel_relaxed(~0ul, ictlr + ICTLR_COP_IER_CLR); /* Disable CPU interrupts */ - writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_CPU_IER_CLR); + writel_relaxed(~0ul, ictlr + ICTLR_CPU_IER_CLR); /* Enable the wakeup sources of ictlr */ writel_relaxed(lic->ictlr_wake_mask[i], ictlr + ICTLR_CPU_IER_SET); @@ -172,12 +172,12 @@ static void tegra_ictlr_resume(void) writel_relaxed(lic->cpu_iep[i], ictlr + ICTLR_CPU_IEP_CLASS); - writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_CPU_IER_CLR); + writel_relaxed(~0ul, ictlr + ICTLR_CPU_IER_CLR); writel_relaxed(lic->cpu_ier[i], ictlr + ICTLR_CPU_IER_SET); writel_relaxed(lic->cop_iep[i], ictlr + ICTLR_COP_IEP_CLASS); - writel_relaxed(GENMASK(31, 0), ictlr + ICTLR_COP_IER_CLR); + writel_relaxed(~0ul, ictlr + ICTLR_COP_IER_CLR); writel_relaxed(lic->cop_ier[i], ictlr + ICTLR_COP_IER_SET); } @@ -312,7 +312,7 @@ static int __init tegra_ictlr_init(struct device_node *node, lic->base[i] = base; /* Disable all interrupts */ - writel_relaxed(GENMASK(31, 0), base + ICTLR_CPU_IER_CLR); + writel_relaxed(~0UL, base + ICTLR_CPU_IER_CLR); /* All interrupts target IRQ */ writel_relaxed(0, base + ICTLR_CPU_IEP_CLASS);
diff --git a/drivers/irqchip/irq-ti-sci-intr.c b/drivers/irqchip/irq-ti-sci-intr.c index 7d0163d..59d51a2 100644 --- a/drivers/irqchip/irq-ti-sci-intr.c +++ b/drivers/irqchip/irq-ti-sci-intr.c
@@ -205,7 +205,6 @@ static int ti_sci_intr_irq_domain_probe(struct platform_device *pdev) } parent_domain = irq_find_host(parent_node); - of_node_put(parent_node); if (!parent_domain) { dev_err(dev, "Failed to find IRQ parent domain\n"); return -ENODEV;
diff --git a/drivers/isdn/hardware/mISDN/hfcmulti.c b/drivers/isdn/hardware/mISDN/hfcmulti.c index 2c74064..86669ec 100644 --- a/drivers/isdn/hardware/mISDN/hfcmulti.c +++ b/drivers/isdn/hardware/mISDN/hfcmulti.c
@@ -3219,7 +3219,6 @@ static int hfcm_l1callback(struct dchannel *dch, u_int cmd) { struct hfc_multi *hc = dch->hw; - struct sk_buff_head free_queue; u_long flags; switch (cmd) { @@ -3248,7 +3247,6 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd) l1_event(dch->l1, HW_POWERUP_IND); break; case HW_DEACT_REQ: - __skb_queue_head_init(&free_queue); /* start deactivation */ spin_lock_irqsave(&hc->lock, flags); if (hc->ctype == HFC_TYPE_E1) { @@ -3268,21 +3266,20 @@ hfcm_l1callback(struct dchannel *dch, u_int cmd) plxsd_checksync(hc, 0); } } - skb_queue_splice_init(&dch->squeue, &free_queue); + skb_queue_purge(&dch->squeue); if (dch->tx_skb) { - __skb_queue_tail(&free_queue, dch->tx_skb); + dev_kfree_skb(dch->tx_skb); dch->tx_skb = NULL; } dch->tx_idx = 0; if (dch->rx_skb) { - __skb_queue_tail(&free_queue, dch->rx_skb); + dev_kfree_skb(dch->rx_skb); dch->rx_skb = NULL; } test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); if (test_and_clear_bit(FLG_BUSY_TIMER, &dch->Flags)) del_timer(&dch->timer); spin_unlock_irqrestore(&hc->lock, flags); - __skb_queue_purge(&free_queue); break; case HW_POWERUP_REQ: spin_lock_irqsave(&hc->lock, flags); @@ -3389,9 +3386,6 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) case PH_DEACTIVATE_REQ: test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags); if (dch->dev.D.protocol != ISDN_P_TE_S0) { - struct sk_buff_head free_queue; - - __skb_queue_head_init(&free_queue); spin_lock_irqsave(&hc->lock, flags); if (debug & DEBUG_HFCMULTI_MSG) printk(KERN_DEBUG @@ -3413,14 +3407,14 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) /* deactivate */ dch->state = 1; } - skb_queue_splice_init(&dch->squeue, &free_queue); + skb_queue_purge(&dch->squeue); if (dch->tx_skb) { - __skb_queue_tail(&free_queue, dch->tx_skb); + dev_kfree_skb(dch->tx_skb); dch->tx_skb = NULL; } dch->tx_idx = 0; if (dch->rx_skb) { - __skb_queue_tail(&free_queue, dch->rx_skb); + dev_kfree_skb(dch->rx_skb); dch->rx_skb = NULL; } test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); @@ -3432,7 +3426,6 @@ handle_dmsg(struct mISDNchannel *ch, struct sk_buff *skb) #endif ret = 0; spin_unlock_irqrestore(&hc->lock, flags); - __skb_queue_purge(&free_queue); } else ret = l1_event(dch->l1, hh->prim); break;
diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c index 41ff2e3..a2b2ce1 100644 --- a/drivers/isdn/hardware/mISDN/hfcpci.c +++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1617,19 +1617,16 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb) test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags); spin_lock_irqsave(&hc->lock, flags); if (hc->hw.protocol == ISDN_P_NT_S0) { - struct sk_buff_head free_queue; - - __skb_queue_head_init(&free_queue); /* prepare deactivation */ Write_hfc(hc, HFCPCI_STATES, 0x40); - skb_queue_splice_init(&dch->squeue, &free_queue); + skb_queue_purge(&dch->squeue); if (dch->tx_skb) { - __skb_queue_tail(&free_queue, dch->tx_skb); + dev_kfree_skb(dch->tx_skb); dch->tx_skb = NULL; } dch->tx_idx = 0; if (dch->rx_skb) { - __skb_queue_tail(&free_queue, dch->rx_skb); + dev_kfree_skb(dch->rx_skb); dch->rx_skb = NULL; } test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); @@ -1642,12 +1639,10 @@ hfcpci_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb) hc->hw.mst_m &= ~HFCPCI_MASTER; Write_hfc(hc, HFCPCI_MST_MODE, hc->hw.mst_m); ret = 0; - spin_unlock_irqrestore(&hc->lock, flags); - __skb_queue_purge(&free_queue); } else { ret = l1_event(dch->l1, hh->prim); - spin_unlock_irqrestore(&hc->lock, flags); } + spin_unlock_irqrestore(&hc->lock, flags); break; } if (!ret)
diff --git a/drivers/isdn/hardware/mISDN/hfcsusb.c b/drivers/isdn/hardware/mISDN/hfcsusb.c index 111a597..1f89378 100644 --- a/drivers/isdn/hardware/mISDN/hfcsusb.c +++ b/drivers/isdn/hardware/mISDN/hfcsusb.c
@@ -327,24 +327,20 @@ hfcusb_l2l1D(struct mISDNchannel *ch, struct sk_buff *skb) test_and_clear_bit(FLG_L2_ACTIVATED, &dch->Flags); if (hw->protocol == ISDN_P_NT_S0) { - struct sk_buff_head free_queue; - - __skb_queue_head_init(&free_queue); hfcsusb_ph_command(hw, HFC_L1_DEACTIVATE_NT); spin_lock_irqsave(&hw->lock, flags); - skb_queue_splice_init(&dch->squeue, &free_queue); + skb_queue_purge(&dch->squeue); if (dch->tx_skb) { - __skb_queue_tail(&free_queue, dch->tx_skb); + dev_kfree_skb(dch->tx_skb); dch->tx_skb = NULL; } dch->tx_idx = 0; if (dch->rx_skb) { - __skb_queue_tail(&free_queue, dch->rx_skb); + dev_kfree_skb(dch->rx_skb); dch->rx_skb = NULL; } test_and_clear_bit(FLG_TX_BUSY, &dch->Flags); spin_unlock_irqrestore(&hw->lock, flags); - __skb_queue_purge(&free_queue); #ifdef FIXME if (test_and_clear_bit(FLG_L1_BUSY, &dch->Flags)) dchannel_sched_event(&hc->dch, D_CLEARBUSY); @@ -1335,7 +1331,7 @@ tx_iso_complete(struct urb *urb) printk("\n"); } - dev_consume_skb_irq(tx_skb); + dev_kfree_skb(tx_skb); tx_skb = NULL; if (fifo->dch && get_next_dframe(fifo->dch)) tx_skb = fifo->dch->tx_skb;
diff --git a/drivers/isdn/hardware/mISDN/netjet.c b/drivers/isdn/hardware/mISDN/netjet.c index 6d818d5..8299def 100644 --- a/drivers/isdn/hardware/mISDN/netjet.c +++ b/drivers/isdn/hardware/mISDN/netjet.c
@@ -956,7 +956,7 @@ nj_release(struct tiger_hw *card) } if (card->irq > 0) free_irq(card->irq, card); - if (device_is_registered(&card->isac.dch.dev.dev)) + if (card->isac.dch.dev.dev.class) mISDN_unregister_device(&card->isac.dch.dev); for (i = 0; i < 2; i++) {
diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 90ee56d..a41b4b2 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c
@@ -222,7 +222,7 @@ mISDN_register_device(struct mISDNdevice *dev, err = get_free_devid(); if (err < 0) - return err; + goto error1; dev->id = err; device_initialize(&dev->dev); @@ -233,12 +233,11 @@ mISDN_register_device(struct mISDNdevice *dev, if (debug & DEBUG_CORE) printk(KERN_DEBUG "mISDN_register %s %d\n", dev_name(&dev->dev), dev->id); - dev->dev.class = &mISDN_class; - err = create_stack(dev); if (err) goto error1; + dev->dev.class = &mISDN_class; dev->dev.platform_data = dev; dev->dev.parent = parent; dev_set_drvdata(&dev->dev, dev); @@ -250,8 +249,8 @@ mISDN_register_device(struct mISDNdevice *dev, error3: delete_stack(dev); + return err; error1: - put_device(&dev->dev); return err; }
diff --git a/drivers/isdn/mISDN/dsp_pipeline.c b/drivers/isdn/mISDN/dsp_pipeline.c index cd9bc11..4058869 100644 --- a/drivers/isdn/mISDN/dsp_pipeline.c +++ b/drivers/isdn/mISDN/dsp_pipeline.c
@@ -80,7 +80,6 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) if (!entry) return -ENOMEM; - INIT_LIST_HEAD(&entry->list); entry->elem = elem; entry->dev.class = elements_class; @@ -115,7 +114,7 @@ int mISDN_dsp_element_register(struct mISDN_dsp_element *elem) device_unregister(&entry->dev); return ret; err1: - put_device(&entry->dev); + kfree(entry); return ret; } EXPORT_SYMBOL(mISDN_dsp_element_register);
diff --git a/drivers/isdn/mISDN/l1oip.h b/drivers/isdn/mISDN/l1oip.h index 48133d0..7ea10db 100644 --- a/drivers/isdn/mISDN/l1oip.h +++ b/drivers/isdn/mISDN/l1oip.h
@@ -59,7 +59,6 @@ struct l1oip { int bundle; /* bundle channels in one frm */ int codec; /* codec to use for transmis. */ int limit; /* limit number of bchannels */ - bool shutdown; /* if card is released */ /* timer */ struct timer_list keep_tl;
diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index aec4f2a..b57dcb8 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c
@@ -275,7 +275,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, p = frame; /* restart timer */ - if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ) && !hc->shutdown) + if (time_before(hc->keep_tl.expires, jiffies + 5 * HZ)) mod_timer(&hc->keep_tl, jiffies + L1OIP_KEEPALIVE * HZ); else hc->keep_tl.expires = jiffies + L1OIP_KEEPALIVE * HZ; @@ -601,9 +601,7 @@ l1oip_socket_parse(struct l1oip *hc, struct sockaddr_in *sin, u8 *buf, int len) goto multiframe; /* restart timer */ - if ((time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || - !hc->timeout_on) && - !hc->shutdown) { + if (time_before(hc->timeout_tl.expires, jiffies + 5 * HZ) || !hc->timeout_on) { hc->timeout_on = 1; mod_timer(&hc->timeout_tl, jiffies + L1OIP_TIMEOUT * HZ); } else /* only adjust timer */ @@ -1234,10 +1232,11 @@ release_card(struct l1oip *hc) { int ch; - hc->shutdown = true; + if (timer_pending(&hc->keep_tl)) + del_timer(&hc->keep_tl); - del_timer_sync(&hc->keep_tl); - del_timer_sync(&hc->timeout_tl); + if (timer_pending(&hc->timeout_tl)) + del_timer(&hc->timeout_tl); cancel_work_sync(&hc->workq);
diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig index 364c118..2cbf66d 100644 --- a/drivers/leds/Kconfig +++ b/drivers/leds/Kconfig
@@ -30,16 +30,6 @@ for the flash related features of a LED device. It can be built as a module. -config LEDS_CLASS_MULTICOLOR - tristate "LED Multicolor Class Support" - depends on LEDS_CLASS - help - This option enables the multicolor LED sysfs class in /sys/class/leds. - It wraps LED class and adds multicolor LED specific sysfs attributes - and kernel internal API to it. You'll need this to provide support - for multicolor LEDs that are grouped together. This class is not - intended for single color LEDs. It can be built as a module. - config LEDS_BRIGHTNESS_HW_CHANGED bool "LED Class brightness_hw_changed attribute support" depends on LEDS_CLASS
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile index 858be6b..41fb073 100644 --- a/drivers/leds/Makefile +++ b/drivers/leds/Makefile
@@ -4,7 +4,6 @@ obj-$(CONFIG_NEW_LEDS) += led-core.o obj-$(CONFIG_LEDS_CLASS) += led-class.o obj-$(CONFIG_LEDS_CLASS_FLASH) += led-class-flash.o -obj-$(CONFIG_LEDS_CLASS_MULTICOLOR) += led-class-multicolor.o obj-$(CONFIG_LEDS_TRIGGERS) += led-triggers.o # LED Platform Drivers
diff --git a/drivers/leds/led-class-multicolor.c b/drivers/leds/led-class-multicolor.c deleted file mode 100644 index e317408..0000000 --- a/drivers/leds/led-class-multicolor.c +++ /dev/null
@@ -1,203 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -// LED Multicolor class interface -// Copyright (C) 2019-20 Texas Instruments Incorporated - http://www.ti.com/ -// Author: Dan Murphy <dmurphy@ti.com> - -#include <linux/device.h> -#include <linux/init.h> -#include <linux/led-class-multicolor.h> -#include <linux/module.h> -#include <linux/slab.h> -#include <linux/uaccess.h> - -#include "leds.h" - -int led_mc_calc_color_components(struct led_classdev_mc *mcled_cdev, - enum led_brightness brightness) -{ - struct led_classdev *led_cdev = &mcled_cdev->led_cdev; - int i; - - for (i = 0; i < mcled_cdev->num_colors; i++) - mcled_cdev->subled_info[i].brightness = brightness * - mcled_cdev->subled_info[i].intensity / - led_cdev->max_brightness; - - return 0; -} -EXPORT_SYMBOL_GPL(led_mc_calc_color_components); - -static ssize_t multi_intensity_store(struct device *dev, - struct device_attribute *intensity_attr, - const char *buf, size_t size) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); - int nrchars, offset = 0; - int intensity_value[LED_COLOR_ID_MAX]; - int i; - ssize_t ret; - - mutex_lock(&led_cdev->led_access); - - for (i = 0; i < mcled_cdev->num_colors; i++) { - ret = sscanf(buf + offset, "%i%n", - &intensity_value[i], &nrchars); - if (ret != 1) { - ret = -EINVAL; - goto err_out; - } - offset += nrchars; - } - - offset++; - if (offset < size) { - ret = -EINVAL; - goto err_out; - } - - for (i = 0; i < mcled_cdev->num_colors; i++) - mcled_cdev->subled_info[i].intensity = intensity_value[i]; - - led_set_brightness(led_cdev, led_cdev->brightness); - ret = size; -err_out: - mutex_unlock(&led_cdev->led_access); - return ret; -} - -static ssize_t multi_intensity_show(struct device *dev, - struct device_attribute *intensity_attr, - char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); - int len = 0; - int i; - - for (i = 0; i < mcled_cdev->num_colors; i++) { - len += sprintf(buf + len, "%d", - mcled_cdev->subled_info[i].intensity); - if (i < mcled_cdev->num_colors - 1) - len += sprintf(buf + len, " "); - } - - buf[len++] = '\n'; - return len; -} -static DEVICE_ATTR_RW(multi_intensity); - -static ssize_t multi_index_show(struct device *dev, - struct device_attribute *multi_index_attr, - char *buf) -{ - struct led_classdev *led_cdev = dev_get_drvdata(dev); - struct led_classdev_mc *mcled_cdev = lcdev_to_mccdev(led_cdev); - int len = 0; - int index; - int i; - - for (i = 0; i < mcled_cdev->num_colors; i++) { - index = mcled_cdev->subled_info[i].color_index; - len += sprintf(buf + len, "%s", led_colors[index]); - if (i < mcled_cdev->num_colors - 1) - len += sprintf(buf + len, " "); - } - - buf[len++] = '\n'; - return len; -} -static DEVICE_ATTR_RO(multi_index); - -static struct attribute *led_multicolor_attrs[] = { - &dev_attr_multi_intensity.attr, - &dev_attr_multi_index.attr, - NULL, -}; -ATTRIBUTE_GROUPS(led_multicolor); - -int led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data) -{ - struct led_classdev *led_cdev; - - if (!mcled_cdev) - return -EINVAL; - - if (mcled_cdev->num_colors <= 0) - return -EINVAL; - - if (mcled_cdev->num_colors > LED_COLOR_ID_MAX) - return -EINVAL; - - led_cdev = &mcled_cdev->led_cdev; - mcled_cdev->led_cdev.groups = led_multicolor_groups; - - return led_classdev_register_ext(parent, led_cdev, init_data); -} -EXPORT_SYMBOL_GPL(led_classdev_multicolor_register_ext); - -void led_classdev_multicolor_unregister(struct led_classdev_mc *mcled_cdev) -{ - if (!mcled_cdev) - return; - - led_classdev_unregister(&mcled_cdev->led_cdev); -} -EXPORT_SYMBOL_GPL(led_classdev_multicolor_unregister); - -static void devm_led_classdev_multicolor_release(struct device *dev, void *res) -{ - led_classdev_multicolor_unregister(*(struct led_classdev_mc **)res); -} - -int devm_led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data) -{ - struct led_classdev_mc **dr; - int ret; - - dr = devres_alloc(devm_led_classdev_multicolor_release, - sizeof(*dr), GFP_KERNEL); - if (!dr) - return -ENOMEM; - - ret = led_classdev_multicolor_register_ext(parent, mcled_cdev, - init_data); - if (ret) { - devres_free(dr); - return ret; - } - - *dr = mcled_cdev; - devres_add(parent, dr); - - return 0; -} -EXPORT_SYMBOL_GPL(devm_led_classdev_multicolor_register_ext); - -static int devm_led_classdev_multicolor_match(struct device *dev, - void *res, void *data) -{ - struct led_classdev_mc **p = res; - - if (WARN_ON(!p || !*p)) - return 0; - - return *p == data; -} - -void devm_led_classdev_multicolor_unregister(struct device *dev, - struct led_classdev_mc *mcled_cdev) -{ - WARN_ON(devres_release(dev, - devm_led_classdev_multicolor_release, - devm_led_classdev_multicolor_match, mcled_cdev)); -} -EXPORT_SYMBOL_GPL(devm_led_classdev_multicolor_unregister); - -MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com>"); -MODULE_DESCRIPTION("Multicolor LED class interface"); -MODULE_LICENSE("GPL v2");
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c index 172a8b1..eb3adfb 100644 --- a/drivers/macintosh/macio-adb.c +++ b/drivers/macintosh/macio-adb.c
@@ -106,10 +106,6 @@ int macio_init(void) return -ENXIO; } adb = ioremap(r.start, sizeof(struct adb_regs)); - if (!adb) { - of_node_put(adbs); - return -ENOMEM; - } out_8(&adb->ctrl.r, 0); out_8(&adb->intr.r, 0);
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c index 176bbd0..92d142d 100644 --- a/drivers/macintosh/macio_asic.c +++ b/drivers/macintosh/macio_asic.c
@@ -425,7 +425,7 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip, if (of_device_register(&dev->ofdev) != 0) { printk(KERN_DEBUG"macio: device registration error for %s!\n", dev_name(&dev->ofdev.dev)); - put_device(&dev->ofdev.dev); + kfree(dev); return NULL; }
diff --git a/drivers/macintosh/windfarm_lm75_sensor.c b/drivers/macintosh/windfarm_lm75_sensor.c index 8713e80..1e5fa09 100644 --- a/drivers/macintosh/windfarm_lm75_sensor.c +++ b/drivers/macintosh/windfarm_lm75_sensor.c
@@ -34,8 +34,8 @@ #endif struct wf_lm75_sensor { - unsigned int ds1775 : 1; - unsigned int inited : 1; + int ds1775 : 1; + int inited : 1; struct i2c_client *i2c; struct wf_sensor sens; };
diff --git a/drivers/macintosh/windfarm_smu_sensors.c b/drivers/macintosh/windfarm_smu_sensors.c index 90823b4..3e6059e 100644 --- a/drivers/macintosh/windfarm_smu_sensors.c +++ b/drivers/macintosh/windfarm_smu_sensors.c
@@ -273,8 +273,8 @@ struct smu_cpu_power_sensor { struct list_head link; struct wf_sensor *volts; struct wf_sensor *amps; - unsigned int fake_volts : 1; - unsigned int quadratic : 1; + int fake_volts : 1; + int quadratic : 1; struct wf_sensor sens; }; #define to_smu_cpu_power(c) container_of(c, struct smu_cpu_power_sensor, sens)
diff --git a/drivers/mailbox/bcm-flexrm-mailbox.c b/drivers/mailbox/bcm-flexrm-mailbox.c index f7191db..8ee9db2 100644 --- a/drivers/mailbox/bcm-flexrm-mailbox.c +++ b/drivers/mailbox/bcm-flexrm-mailbox.c
@@ -632,15 +632,15 @@ static int flexrm_spu_dma_map(struct device *dev, struct brcm_message *msg) rc = dma_map_sg(dev, msg->spu.src, sg_nents(msg->spu.src), DMA_TO_DEVICE); - if (!rc) - return -EIO; + if (rc < 0) + return rc; rc = dma_map_sg(dev, msg->spu.dst, sg_nents(msg->spu.dst), DMA_FROM_DEVICE); - if (!rc) { + if (rc < 0) { dma_unmap_sg(dev, msg->spu.src, sg_nents(msg->spu.src), DMA_TO_DEVICE); - return -EIO; + return rc; } return 0;
diff --git a/drivers/mailbox/mailbox-test.c b/drivers/mailbox/mailbox-test.c index abcee58..4555d67 100644 --- a/drivers/mailbox/mailbox-test.c +++ b/drivers/mailbox/mailbox-test.c
@@ -12,7 +12,6 @@ #include <linux/kernel.h> #include <linux/mailbox_client.h> #include <linux/module.h> -#include <linux/mutex.h> #include <linux/of.h> #include <linux/platform_device.h> #include <linux/poll.h> @@ -39,7 +38,6 @@ struct mbox_test_device { char *signal; char *message; spinlock_t lock; - struct mutex mutex; wait_queue_head_t waitq; struct fasync_struct *async_queue; struct dentry *root_debugfs_dir; @@ -97,7 +95,6 @@ static ssize_t mbox_test_message_write(struct file *filp, size_t count, loff_t *ppos) { struct mbox_test_device *tdev = filp->private_data; - char *message; void *data; int ret; @@ -113,13 +110,10 @@ static ssize_t mbox_test_message_write(struct file *filp, return -EINVAL; } - message = kzalloc(MBOX_MAX_MSG_LEN, GFP_KERNEL); - if (!message) + tdev->message = kzalloc(MBOX_MAX_MSG_LEN, GFP_KERNEL); + if (!tdev->message) return -ENOMEM; - mutex_lock(&tdev->mutex); - - tdev->message = message; ret = copy_from_user(tdev->message, userbuf, count); if (ret) { ret = -EFAULT; @@ -150,8 +144,6 @@ static ssize_t mbox_test_message_write(struct file *filp, kfree(tdev->message); tdev->signal = NULL; - mutex_unlock(&tdev->mutex); - return ret < 0 ? ret : count; } @@ -400,7 +392,6 @@ static int mbox_test_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tdev); spin_lock_init(&tdev->lock); - mutex_init(&tdev->mutex); if (tdev->rx_channel) { tdev->rx_buffer = devm_kzalloc(&pdev->dev,
diff --git a/drivers/mailbox/zynqmp-ipi-mailbox.c b/drivers/mailbox/zynqmp-ipi-mailbox.c index 1d0b8ab..f9cc674 100644 --- a/drivers/mailbox/zynqmp-ipi-mailbox.c +++ b/drivers/mailbox/zynqmp-ipi-mailbox.c
@@ -493,7 +493,6 @@ static int zynqmp_ipi_mbox_probe(struct zynqmp_ipi_mbox *ipi_mbox, ret = device_register(&ipi_mbox->dev); if (ret) { dev_err(dev, "Failed to register ipi mbox dev.\n"); - put_device(&ipi_mbox->dev); return ret; } mdev = &ipi_mbox->dev; @@ -620,8 +619,7 @@ static void zynqmp_ipi_free_mboxes(struct zynqmp_ipi_pdata *pdata) ipi_mbox = &pdata->ipi_mboxes[i]; if (ipi_mbox->dev.parent) { mbox_controller_unregister(&ipi_mbox->mbox); - if (device_is_registered(&ipi_mbox->dev)) - device_unregister(&ipi_mbox->dev); + device_unregister(&ipi_mbox->dev); } } }
diff --git a/drivers/mcb/mcb-core.c b/drivers/mcb/mcb-core.c index 2df3ab3..c799bb8 100644 --- a/drivers/mcb/mcb-core.c +++ b/drivers/mcb/mcb-core.c
@@ -71,10 +71,8 @@ static int mcb_probe(struct device *dev) get_device(dev); ret = mdrv->probe(mdev, found_id); - if (ret) { + if (ret) module_put(carrier_mod); - put_device(dev); - } return ret; }
diff --git a/drivers/mcb/mcb-parse.c b/drivers/mcb/mcb-parse.c index cfe5c95..3b69e6a 100644 --- a/drivers/mcb/mcb-parse.c +++ b/drivers/mcb/mcb-parse.c
@@ -108,7 +108,7 @@ static int chameleon_parse_gdd(struct mcb_bus *bus, return 0; err: - put_device(&mdev->dev); + mcb_free_dev(mdev); return ret; }
diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 5767ff6..0b02210 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c
@@ -119,61 +119,27 @@ static void __update_writeback_rate(struct cached_dev *dc) dc->writeback_rate_target = target; } -static bool idle_counter_exceeded(struct cache_set *c) -{ - int counter, dev_nr; - - /* - * If c->idle_counter is overflow (idel for really long time), - * reset as 0 and not set maximum rate this time for code - * simplicity. - */ - counter = atomic_inc_return(&c->idle_counter); - if (counter <= 0) { - atomic_set(&c->idle_counter, 0); - return false; - } - - dev_nr = atomic_read(&c->attached_dev_nr); - if (dev_nr == 0) - return false; - - /* - * c->idle_counter is increased by writeback thread of all - * attached backing devices, in order to represent a rough - * time period, counter should be divided by dev_nr. - * Otherwise the idle time cannot be larger with more backing - * device attached. - * The following calculation equals to checking - * (counter / dev_nr) < (dev_nr * 6) - */ - if (counter < (dev_nr * dev_nr * 6)) - return false; - - return true; -} - -/* - * Idle_counter is increased every time when update_writeback_rate() is - * called. If all backing devices attached to the same cache set have - * identical dc->writeback_rate_update_seconds values, it is about 6 - * rounds of update_writeback_rate() on each backing device before - * c->at_max_writeback_rate is set to 1, and then max wrteback rate set - * to each dc->writeback_rate.rate. - * In order to avoid extra locking cost for counting exact dirty cached - * devices number, c->attached_dev_nr is used to calculate the idle - * throushold. It might be bigger if not all cached device are in write- - * back mode, but it still works well with limited extra rounds of - * update_writeback_rate(). - */ static bool set_at_max_writeback_rate(struct cache_set *c, struct cached_dev *dc) { /* Don't set max writeback rate if gc is running */ if (!c->gc_mark_valid) return false; - - if (!idle_counter_exceeded(c)) + /* + * Idle_counter is increased everytime when update_writeback_rate() is + * called. If all backing devices attached to the same cache set have + * identical dc->writeback_rate_update_seconds values, it is about 6 + * rounds of update_writeback_rate() on each backing device before + * c->at_max_writeback_rate is set to 1, and then max wrteback rate set + * to each dc->writeback_rate.rate. + * In order to avoid extra locking cost for counting exact dirty cached + * devices number, c->attached_dev_nr is used to calculate the idle + * throushold. It might be bigger if not all cached device are in write- + * back mode, but it still works well with limited extra rounds of + * update_writeback_rate(). + */ + if (atomic_inc_return(&c->idle_counter) < + atomic_read(&c->attached_dev_nr) * 6) return false; if (atomic_read(&c->at_max_writeback_rate) != 1) @@ -187,10 +153,13 @@ static bool set_at_max_writeback_rate(struct cache_set *c, dc->writeback_rate_change = 0; /* - * In case new I/O arrives during before - * set_at_max_writeback_rate() returns. + * Check c->idle_counter and c->at_max_writeback_rate agagain in case + * new I/O arrives during before set_at_max_writeback_rate() returns. + * Then the writeback rate is set to 1, and its new value should be + * decided via __update_writeback_rate(). */ - if (!idle_counter_exceeded(c) || + if ((atomic_read(&c->idle_counter) < + atomic_read(&c->attached_dev_nr) * 6) || !atomic_read(&c->at_max_writeback_rate)) return false;
diff --git a/drivers/md/dm-cache-metadata.c b/drivers/md/dm-cache-metadata.c index 2ecd0db..af6d4f8 100644 --- a/drivers/md/dm-cache-metadata.c +++ b/drivers/md/dm-cache-metadata.c
@@ -551,13 +551,11 @@ static int __create_persistent_data_objects(struct dm_cache_metadata *cmd, return r; } -static void __destroy_persistent_data_objects(struct dm_cache_metadata *cmd, - bool destroy_bm) +static void __destroy_persistent_data_objects(struct dm_cache_metadata *cmd) { dm_sm_destroy(cmd->metadata_sm); dm_tm_destroy(cmd->tm); - if (destroy_bm) - dm_block_manager_destroy(cmd->bm); + dm_block_manager_destroy(cmd->bm); } typedef unsigned long (*flags_mutator)(unsigned long); @@ -828,7 +826,7 @@ static struct dm_cache_metadata *lookup_or_open(struct block_device *bdev, cmd2 = lookup(bdev); if (cmd2) { mutex_unlock(&table_lock); - __destroy_persistent_data_objects(cmd, true); + __destroy_persistent_data_objects(cmd); kfree(cmd); return cmd2; } @@ -876,7 +874,7 @@ void dm_cache_metadata_close(struct dm_cache_metadata *cmd) mutex_unlock(&table_lock); if (!cmd->fail_io) - __destroy_persistent_data_objects(cmd, true); + __destroy_persistent_data_objects(cmd); kfree(cmd); } } @@ -1810,52 +1808,14 @@ int dm_cache_metadata_needs_check(struct dm_cache_metadata *cmd, bool *result) int dm_cache_metadata_abort(struct dm_cache_metadata *cmd) { - int r = -EINVAL; - struct dm_block_manager *old_bm = NULL, *new_bm = NULL; - - /* fail_io is double-checked with cmd->root_lock held below */ - if (unlikely(cmd->fail_io)) - return r; - - /* - * Replacement block manager (new_bm) is created and old_bm destroyed outside of - * cmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of - * shrinker associated with the block manager's bufio client vs cmd root_lock). - * - must take shrinker_rwsem without holding cmd->root_lock - */ - new_bm = dm_block_manager_create(cmd->bdev, DM_CACHE_METADATA_BLOCK_SIZE << SECTOR_SHIFT, - CACHE_MAX_CONCURRENT_LOCKS); + int r; WRITE_LOCK(cmd); - if (cmd->fail_io) { - WRITE_UNLOCK(cmd); - goto out; - } - - __destroy_persistent_data_objects(cmd, false); - old_bm = cmd->bm; - if (IS_ERR(new_bm)) { - DMERR("could not create block manager during abort"); - cmd->bm = NULL; - r = PTR_ERR(new_bm); - goto out_unlock; - } - - cmd->bm = new_bm; - r = __open_or_format_metadata(cmd, false); - if (r) { - cmd->bm = NULL; - goto out_unlock; - } - new_bm = NULL; -out_unlock: + __destroy_persistent_data_objects(cmd); + r = __create_persistent_data_objects(cmd, false); if (r) cmd->fail_io = true; WRITE_UNLOCK(cmd); - dm_block_manager_destroy(old_bm); -out: - if (new_bm && !IS_ERR(new_bm)) - dm_block_manager_destroy(new_bm); return r; }
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index 08b5e44..f595e98 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c
@@ -1011,14 +1011,14 @@ static void abort_transaction(struct cache *cache) if (get_cache_mode(cache) >= CM_READ_ONLY) return; - DMERR_LIMIT("%s: aborting current metadata transaction", dev_name); - if (dm_cache_metadata_abort(cache->cmd)) { - DMERR("%s: failed to abort metadata transaction", dev_name); + if (dm_cache_metadata_set_needs_check(cache->cmd)) { + DMERR("%s: failed to set 'needs_check' flag in metadata", dev_name); set_cache_mode(cache, CM_FAIL); } - if (dm_cache_metadata_set_needs_check(cache->cmd)) { - DMERR("%s: failed to set 'needs_check' flag in metadata", dev_name); + DMERR_LIMIT("%s: aborting current metadata transaction", dev_name); + if (dm_cache_metadata_abort(cache->cmd)) { + DMERR("%s: failed to abort metadata transaction", dev_name); set_cache_mode(cache, CM_FAIL); } } @@ -1910,7 +1910,6 @@ static void process_deferred_bios(struct work_struct *ws) else commit_needed = process_bio(cache, bio) || commit_needed; - cond_resched(); } if (commit_needed) @@ -1933,7 +1932,6 @@ static void requeue_deferred_bios(struct cache *cache) while ((bio = bio_list_pop(&bios))) { bio->bi_status = BLK_STS_DM_REQUEUE; bio_endio(bio); - cond_resched(); } } @@ -1974,8 +1972,6 @@ static void check_migrations(struct work_struct *ws) r = mg_start(cache, op, NULL); if (r) break; - - cond_resched(); } } @@ -1996,7 +1992,6 @@ static void destroy(struct cache *cache) if (cache->prison) dm_bio_prison_destroy_v2(cache->prison); - cancel_delayed_work_sync(&cache->waker); if (cache->wq) destroy_workqueue(cache->wq);
diff --git a/drivers/md/dm-clone-target.c b/drivers/md/dm-clone-target.c index ce9d03f..eb7a5d3 100644 --- a/drivers/md/dm-clone-target.c +++ b/drivers/md/dm-clone-target.c
@@ -1977,7 +1977,6 @@ static void clone_dtr(struct dm_target *ti) mempool_exit(&clone->hydration_pool); dm_kcopyd_client_destroy(clone->kcopyd_client); - cancel_delayed_work_sync(&clone->waker); destroy_workqueue(clone->wq); hash_table_exit(clone); dm_clone_metadata_close(clone->cmd);
diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c index 4301f22..fa674e9b6 100644 --- a/drivers/md/dm-crypt.c +++ b/drivers/md/dm-crypt.c
@@ -1554,7 +1554,6 @@ static int dmcrypt_write(void *data) io = crypt_io_from_node(rb_first(&write_tree)); rb_erase(&io->rb_node, &write_tree); kcryptd_io_write(io); - cond_resched(); } while (!RB_EMPTY_ROOT(&write_tree)); blk_finish_plug(&plug); }
diff --git a/drivers/md/dm-default-key.c b/drivers/md/dm-default-key.c index 1d6b5ac..8b3e8c1 100644 --- a/drivers/md/dm-default-key.c +++ b/drivers/md/dm-default-key.c
@@ -67,9 +67,13 @@ lookup_cipher(const char *cipher_string) static void default_key_dtr(struct dm_target *ti) { struct default_key_c *dkc = ti->private; + int err; if (dkc->dev) { - blk_crypto_evict_key(bdev_get_queue(dkc->dev->bdev), &dkc->key); + err = blk_crypto_evict_key(bdev_get_queue(dkc->dev->bdev), + &dkc->key); + if (err && err != -ENOKEY) + DMWARN("Failed to evict crypto key: %d", err); dm_put_device(ti, dkc->dev); } kzfree(dkc->cipher_string);
diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index 7a17b8d..2ffe0b4 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c
@@ -301,11 +301,8 @@ static void corrupt_bio_data(struct bio *bio, struct flakey_c *fc) */ bio_for_each_segment(bvec, bio, iter) { if (bio_iter_len(bio, iter) > corrupt_bio_byte) { - char *segment; - struct page *page = bio_iter_page(bio, iter); - if (unlikely(page == ZERO_PAGE(0))) - break; - segment = (page_address(page) + bio_iter_offset(bio, iter)); + char *segment = (page_address(bio_iter_page(bio, iter)) + + bio_iter_offset(bio, iter)); segment[corrupt_bio_byte] = fc->corrupt_bio_value; DMDEBUG("Corrupting data bio=%p by writing %u to byte %u " "(rw=%c bi_opf=%u bi_sector=%llu size=%u)\n", @@ -363,11 +360,9 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) /* * Corrupt matching writes. */ - if (fc->corrupt_bio_byte) { - if (fc->corrupt_bio_rw == WRITE) { - if (all_corrupt_bio_flags_match(bio, fc)) - corrupt_bio_data(bio, fc); - } + if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == WRITE)) { + if (all_corrupt_bio_flags_match(bio, fc)) + corrupt_bio_data(bio, fc); goto map_bio; } @@ -393,14 +388,13 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, return DM_ENDIO_DONE; if (!*error && pb->bio_submitted && (bio_data_dir(bio) == READ)) { - if (fc->corrupt_bio_byte) { - if ((fc->corrupt_bio_rw == READ) && - all_corrupt_bio_flags_match(bio, fc)) { - /* - * Corrupt successful matching READs while in down state. - */ - corrupt_bio_data(bio, fc); - } + if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == READ) && + all_corrupt_bio_flags_match(bio, fc)) { + /* + * Corrupt successful matching READs while in down state. + */ + corrupt_bio_data(bio, fc); + } else if (!test_bit(DROP_WRITES, &fc->flags) && !test_bit(ERROR_WRITES, &fc->flags)) { /*
diff --git a/drivers/md/dm-integrity.c b/drivers/md/dm-integrity.c index 3c9a2be..acbda91 100644 --- a/drivers/md/dm-integrity.c +++ b/drivers/md/dm-integrity.c
@@ -2346,6 +2346,10 @@ static void integrity_writer(struct work_struct *w) unsigned prev_free_sectors; + /* the following test is not needed, but it tests the replay code */ + if (unlikely(dm_post_suspending(ic->ti)) && !ic->meta_dev) + return; + spin_lock_irq(&ic->endio_wait.lock); write_start = ic->committed_section; write_sections = ic->n_committed_sections; @@ -2854,7 +2858,8 @@ static void dm_integrity_postsuspend(struct dm_target *ti) drain_workqueue(ic->commit_wq); if (ic->mode == 'J') { - queue_work(ic->writer_wq, &ic->writer_work); + if (ic->meta_dev) + queue_work(ic->writer_wq, &ic->writer_work); drain_workqueue(ic->writer_wq); dm_integrity_flush_buffers(ic, true); } @@ -4195,8 +4200,6 @@ static void dm_integrity_dtr(struct dm_target *ti) BUG_ON(!RB_EMPTY_ROOT(&ic->in_progress)); BUG_ON(!list_empty(&ic->wait_list)); - if (ic->mode == 'B') - cancel_delayed_work_sync(&ic->bitmap_flush_work); if (ic->metadata_wq) destroy_workqueue(ic->metadata_wq); if (ic->wait_wq)
diff --git a/drivers/md/dm-ioctl.c b/drivers/md/dm-ioctl.c index 1907256..a73c26c 100644 --- a/drivers/md/dm-ioctl.c +++ b/drivers/md/dm-ioctl.c
@@ -573,7 +573,7 @@ static void list_version_get_needed(struct target_type *tt, void *needed_param) size_t *needed = needed_param; *needed += sizeof(struct dm_target_versions); - *needed += strlen(tt->name) + 1; + *needed += strlen(tt->name); *needed += ALIGN_MASK; } @@ -638,7 +638,7 @@ static int __list_versions(struct dm_ioctl *param, size_t param_size, const char iter_info.old_vers = NULL; iter_info.vers = vers; iter_info.flags = 0; - iter_info.end = (char *)vers + needed; + iter_info.end = (char *)vers+len; /* * Now loop through filling out the names & versions.
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 882e83d..42151c9 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c
@@ -3528,7 +3528,7 @@ static void raid_status(struct dm_target *ti, status_type_t type, { struct raid_set *rs = ti->private; struct mddev *mddev = &rs->md; - struct r5conf *conf = rs_is_raid456(rs) ? mddev->private : NULL; + struct r5conf *conf = mddev->private; int i, max_nr_stripes = conf ? conf->max_nr_stripes : 0; unsigned long recovery; unsigned int raid_param_cnt = 1; /* at least 1 for chunksize */ @@ -3808,7 +3808,7 @@ static void attempt_restore_of_faulty_devices(struct raid_set *rs) memset(cleared_failed_devices, 0, sizeof(cleared_failed_devices)); - for (i = 0; i < rs->raid_disks; i++) { + for (i = 0; i < mddev->raid_disks; i++) { r = &rs->dev[i].rdev; /* HM FIXME: enhance journal device recovery processing */ if (test_bit(Journal, &r->flags))
diff --git a/drivers/md/dm-stats.c b/drivers/md/dm-stats.c index 0f42f4a..ce6d3bc 100644 --- a/drivers/md/dm-stats.c +++ b/drivers/md/dm-stats.c
@@ -188,7 +188,7 @@ static int dm_stat_in_flight(struct dm_stat_shared *shared) atomic_read(&shared->in_flight[WRITE]); } -int dm_stats_init(struct dm_stats *stats) +void dm_stats_init(struct dm_stats *stats) { int cpu; struct dm_stats_last_position *last; @@ -196,16 +196,11 @@ int dm_stats_init(struct dm_stats *stats) mutex_init(&stats->mutex); INIT_LIST_HEAD(&stats->list); stats->last = alloc_percpu(struct dm_stats_last_position); - if (!stats->last) - return -ENOMEM; - for_each_possible_cpu(cpu) { last = per_cpu_ptr(stats->last, cpu); last->last_sector = (sector_t)ULLONG_MAX; last->last_rw = UINT_MAX; } - - return 0; } void dm_stats_cleanup(struct dm_stats *stats)
diff --git a/drivers/md/dm-stats.h b/drivers/md/dm-stats.h index dcac11f..2ddfae6 100644 --- a/drivers/md/dm-stats.h +++ b/drivers/md/dm-stats.h
@@ -22,7 +22,7 @@ struct dm_stats_aux { unsigned long long duration_ns; }; -int dm_stats_init(struct dm_stats *st); +void dm_stats_init(struct dm_stats *st); void dm_stats_cleanup(struct dm_stats *st); struct mapped_device;
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c index 9ed2607..1d98ed2 100644 --- a/drivers/md/dm-table.c +++ b/drivers/md/dm-table.c
@@ -1285,12 +1285,21 @@ struct dm_keyslot_manager { struct mapped_device *md; }; +struct dm_keyslot_evict_args { + const struct blk_crypto_key *key; + int err; +}; + static int dm_keyslot_evict_callback(struct dm_target *ti, struct dm_dev *dev, sector_t start, sector_t len, void *data) { - const struct blk_crypto_key *key = data; + struct dm_keyslot_evict_args *args = data; + int err; - blk_crypto_evict_key(bdev_get_queue(dev->bdev), key); + err = blk_crypto_evict_key(bdev_get_queue(dev->bdev), args->key); + if (!args->err) + args->err = err; + /* Always try to evict the key from all devices. */ return 0; } @@ -1305,6 +1314,7 @@ static int dm_keyslot_evict(struct blk_keyslot_manager *ksm, struct dm_keyslot_manager, ksm); struct mapped_device *md = dksm->md; + struct dm_keyslot_evict_args args = { key }; struct dm_table *t; int srcu_idx; int i; @@ -1317,11 +1327,10 @@ static int dm_keyslot_evict(struct blk_keyslot_manager *ksm, ti = dm_table_get_target(t, i); if (!ti->type->iterate_devices) continue; - ti->type->iterate_devices(ti, dm_keyslot_evict_callback, - (void *)key); + ti->type->iterate_devices(ti, dm_keyslot_evict_callback, &args); } dm_put_live_table(md, srcu_idx); - return 0; + return args.err; } struct dm_derive_raw_secret_args {
diff --git a/drivers/md/dm-thin-metadata.c b/drivers/md/dm-thin-metadata.c index 92e646d..a5ed59e 100644 --- a/drivers/md/dm-thin-metadata.c +++ b/drivers/md/dm-thin-metadata.c
@@ -701,15 +701,6 @@ static int __open_metadata(struct dm_pool_metadata *pmd) goto bad_cleanup_data_sm; } - /* - * For pool metadata opening process, root setting is redundant - * because it will be set again in __begin_transaction(). But dm - * pool aborting process really needs to get last transaction's - * root to avoid accessing broken btree. - */ - pmd->root = le64_to_cpu(disk_super->data_mapping_root); - pmd->details_root = le64_to_cpu(disk_super->device_details_root); - __setup_btree_details(pmd); dm_bm_unlock(sblock); @@ -762,15 +753,13 @@ static int __create_persistent_data_objects(struct dm_pool_metadata *pmd, bool f return r; } -static void __destroy_persistent_data_objects(struct dm_pool_metadata *pmd, - bool destroy_bm) +static void __destroy_persistent_data_objects(struct dm_pool_metadata *pmd) { dm_sm_destroy(pmd->data_sm); dm_sm_destroy(pmd->metadata_sm); dm_tm_destroy(pmd->nb_tm); dm_tm_destroy(pmd->tm); - if (destroy_bm) - dm_block_manager_destroy(pmd->bm); + dm_block_manager_destroy(pmd->bm); } static int __begin_transaction(struct dm_pool_metadata *pmd) @@ -977,7 +966,7 @@ int dm_pool_metadata_close(struct dm_pool_metadata *pmd) } pmd_write_unlock(pmd); if (!pmd->fail_io) - __destroy_persistent_data_objects(pmd, true); + __destroy_persistent_data_objects(pmd); kfree(pmd); return 0; @@ -1886,52 +1875,19 @@ static void __set_abort_with_changes_flags(struct dm_pool_metadata *pmd) int dm_pool_abort_metadata(struct dm_pool_metadata *pmd) { int r = -EINVAL; - struct dm_block_manager *old_bm = NULL, *new_bm = NULL; - - /* fail_io is double-checked with pmd->root_lock held below */ - if (unlikely(pmd->fail_io)) - return r; - - /* - * Replacement block manager (new_bm) is created and old_bm destroyed outside of - * pmd root_lock to avoid ABBA deadlock that would result (due to life-cycle of - * shrinker associated with the block manager's bufio client vs pmd root_lock). - * - must take shrinker_rwsem without holding pmd->root_lock - */ - new_bm = dm_block_manager_create(pmd->bdev, THIN_METADATA_BLOCK_SIZE << SECTOR_SHIFT, - THIN_MAX_CONCURRENT_LOCKS); pmd_write_lock(pmd); - if (pmd->fail_io) { - pmd_write_unlock(pmd); + if (pmd->fail_io) goto out; - } __set_abort_with_changes_flags(pmd); - __destroy_persistent_data_objects(pmd, false); - old_bm = pmd->bm; - if (IS_ERR(new_bm)) { - DMERR("could not create block manager during abort"); - pmd->bm = NULL; - r = PTR_ERR(new_bm); - goto out_unlock; - } - - pmd->bm = new_bm; - r = __open_or_format_metadata(pmd, false); - if (r) { - pmd->bm = NULL; - goto out_unlock; - } - new_bm = NULL; -out_unlock: + __destroy_persistent_data_objects(pmd); + r = __create_persistent_data_objects(pmd, false); if (r) pmd->fail_io = true; - pmd_write_unlock(pmd); - dm_block_manager_destroy(old_bm); + out: - if (new_bm && !IS_ERR(new_bm)) - dm_block_manager_destroy(new_bm); + pmd_write_unlock(pmd); return r; } @@ -2104,13 +2060,10 @@ int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd, dm_sm_threshold_fn fn, void *context) { - int r = -EINVAL; + int r; pmd_write_lock_in_core(pmd); - if (!pmd->fail_io) { - r = dm_sm_register_threshold_callback(pmd->metadata_sm, - threshold, fn, context); - } + r = dm_sm_register_threshold_callback(pmd->metadata_sm, threshold, fn, context); pmd_write_unlock(pmd); return r;
diff --git a/drivers/md/dm-thin.c b/drivers/md/dm-thin.c index a1abdb3..1b2c98b 100644 --- a/drivers/md/dm-thin.c +++ b/drivers/md/dm-thin.c
@@ -2224,7 +2224,6 @@ static void process_thin_deferred_bios(struct thin_c *tc) throttle_work_update(&pool->throttle); dm_pool_issue_prefetches(pool->pmd); } - cond_resched(); } blk_finish_plug(&plug); } @@ -2308,7 +2307,6 @@ static void process_thin_deferred_cells(struct thin_c *tc) else pool->process_cell(tc, cell); } - cond_resched(); } while (!list_empty(&cells)); } @@ -2933,8 +2931,6 @@ static void __pool_destroy(struct pool *pool) dm_bio_prison_destroy(pool->prison); dm_kcopyd_client_destroy(pool->copier); - cancel_delayed_work_sync(&pool->waker); - cancel_delayed_work_sync(&pool->no_space_timeout); if (pool->wq) destroy_workqueue(pool->wq); @@ -3407,7 +3403,6 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) pt->adjusted_pf = pt->requested_pf = pf; bio_init(&pt->flush_bio, NULL, 0); ti->num_flush_bios = 1; - ti->limit_swap_bios = true; /* * Only need to enable discards if the pool should pass @@ -3430,10 +3425,8 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) calc_metadata_threshold(pt), metadata_low_callback, pool); - if (r) { - ti->error = "Error registering metadata threshold"; + if (r) goto out_flags_changed; - } pt->callbacks.congested_fn = pool_is_congested; dm_table_add_target_callbacks(ti->table, &pt->callbacks); @@ -3596,31 +3589,23 @@ static int pool_preresume(struct dm_target *ti) */ r = bind_control_target(pool, ti); if (r) - goto out; + return r; dm_pool_register_pre_commit_callback(pool->pmd, metadata_pre_commit_callback, pt); r = maybe_resize_data_dev(ti, &need_commit1); if (r) - goto out; + return r; r = maybe_resize_metadata_dev(ti, &need_commit2); if (r) - goto out; + return r; if (need_commit1 || need_commit2) (void) commit(pool); -out: - /* - * When a thin-pool is PM_FAIL, it cannot be rebuilt if - * bio is in deferred list. Therefore need to return 0 - * to allow pool_resume() to flush IO. - */ - if (r && get_pool_mode(pool) == PM_FAIL) - r = 0; - return r; + return 0; } static void pool_suspend_active_thins(struct pool *pool) @@ -4293,7 +4278,6 @@ static int thin_ctr(struct dm_target *ti, unsigned argc, char **argv) goto bad; ti->num_flush_bios = 1; - ti->limit_swap_bios = true; ti->flush_supported = true; ti->per_io_data_size = sizeof(struct dm_thin_endio_hook);
diff --git a/drivers/md/dm-writecache.c b/drivers/md/dm-writecache.c index 961498d..ec10fda 100644 --- a/drivers/md/dm-writecache.c +++ b/drivers/md/dm-writecache.c
@@ -20,7 +20,7 @@ #define HIGH_WATERMARK 50 #define LOW_WATERMARK 45 -#define MAX_WRITEBACK_JOBS min(0x10000000 / PAGE_SIZE, totalram_pages() / 16) +#define MAX_WRITEBACK_JOBS 0 #define ENDIO_LATENCY 16 #define WRITEBACK_LATENCY 64 #define AUTOCOMMIT_BLOCKS_SSD 65536
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 0088bc2..c121162 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c
@@ -265,6 +265,7 @@ static int __init local_init(void) static void local_exit(void) { + flush_scheduled_work(); destroy_workqueue(deferred_remove_workqueue); unregister_blkdev(_major, _name); @@ -1992,9 +1993,7 @@ static struct mapped_device *alloc_dev(int minor) if (!md->bdev) goto bad; - r = dm_stats_init(&md->stats); - if (r < 0) - goto bad; + dm_stats_init(&md->stats); /* Populate the mapping, nobody knows we exist yet */ spin_lock(&_minor_lock); @@ -3079,11 +3078,6 @@ static int dm_call_pr(struct block_device *bdev, iterate_devices_callout_fn fn, goto out; ti = dm_table_get_target(table, 0); - if (dm_suspended_md(md)) { - ret = -EAGAIN; - goto out; - } - ret = -EINVAL; if (!ti->type->iterate_devices) goto out;
diff --git a/drivers/md/md-bitmap.c b/drivers/md/md-bitmap.c index b71da0a..67200f1 100644 --- a/drivers/md/md-bitmap.c +++ b/drivers/md/md-bitmap.c
@@ -493,7 +493,7 @@ void md_bitmap_print_sb(struct bitmap *bitmap) sb = kmap_atomic(bitmap->storage.sb_page); pr_debug("%s: bitmap file superblock:\n", bmname(bitmap)); pr_debug(" magic: %08x\n", le32_to_cpu(sb->magic)); - pr_debug(" version: %u\n", le32_to_cpu(sb->version)); + pr_debug(" version: %d\n", le32_to_cpu(sb->version)); pr_debug(" uuid: %08x.%08x.%08x.%08x\n", le32_to_cpu(*(__le32 *)(sb->uuid+0)), le32_to_cpu(*(__le32 *)(sb->uuid+4)), @@ -504,11 +504,11 @@ void md_bitmap_print_sb(struct bitmap *bitmap) pr_debug("events cleared: %llu\n", (unsigned long long) le64_to_cpu(sb->events_cleared)); pr_debug(" state: %08x\n", le32_to_cpu(sb->state)); - pr_debug(" chunksize: %u B\n", le32_to_cpu(sb->chunksize)); - pr_debug(" daemon sleep: %us\n", le32_to_cpu(sb->daemon_sleep)); + pr_debug(" chunksize: %d B\n", le32_to_cpu(sb->chunksize)); + pr_debug(" daemon sleep: %ds\n", le32_to_cpu(sb->daemon_sleep)); pr_debug(" sync size: %llu KB\n", (unsigned long long)le64_to_cpu(sb->sync_size)/2); - pr_debug("max write behind: %u\n", le32_to_cpu(sb->write_behind)); + pr_debug("max write behind: %d\n", le32_to_cpu(sb->write_behind)); kunmap_atomic(sb); } @@ -2114,8 +2114,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, bytes = DIV_ROUND_UP(chunks, 8); if (!bitmap->mddev->bitmap_info.external) bytes += sizeof(bitmap_super_t); - } while (bytes > (space << 9) && (chunkshift + BITMAP_BLOCK_SHIFT) < - (BITS_PER_BYTE * sizeof(((bitmap_super_t *)0)->chunksize) - 1)); + } while (bytes > (space << 9)); } else chunkshift = ffz(~chunksize) - BITMAP_BLOCK_SHIFT; @@ -2160,7 +2159,7 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, bitmap->counts.missing_pages = pages; bitmap->counts.chunkshift = chunkshift; bitmap->counts.chunks = chunks; - bitmap->mddev->bitmap_info.chunksize = 1UL << (chunkshift + + bitmap->mddev->bitmap_info.chunksize = 1 << (chunkshift + BITMAP_BLOCK_SHIFT); blocks = min(old_counts.chunks << old_counts.chunkshift, @@ -2186,8 +2185,8 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, bitmap->counts.missing_pages = old_counts.pages; bitmap->counts.chunkshift = old_counts.chunkshift; bitmap->counts.chunks = old_counts.chunks; - bitmap->mddev->bitmap_info.chunksize = - 1UL << (old_counts.chunkshift + BITMAP_BLOCK_SHIFT); + bitmap->mddev->bitmap_info.chunksize = 1 << (old_counts.chunkshift + + BITMAP_BLOCK_SHIFT); blocks = old_counts.chunks << old_counts.chunkshift; pr_warn("Could not pre-allocate in-memory bitmap for cluster raid\n"); break; @@ -2205,23 +2204,20 @@ int md_bitmap_resize(struct bitmap *bitmap, sector_t blocks, if (set) { bmc_new = md_bitmap_get_counter(&bitmap->counts, block, &new_blocks, 1); - if (bmc_new) { - if (*bmc_new == 0) { - /* need to set on-disk bits too. */ - sector_t end = block + new_blocks; - sector_t start = block >> chunkshift; - - start <<= chunkshift; - while (start < end) { - md_bitmap_file_set_bit(bitmap, block); - start += 1 << chunkshift; - } - *bmc_new = 2; - md_bitmap_count_page(&bitmap->counts, block, 1); - md_bitmap_set_pending(&bitmap->counts, block); + if (*bmc_new == 0) { + /* need to set on-disk bits too. */ + sector_t end = block + new_blocks; + sector_t start = block >> chunkshift; + start <<= chunkshift; + while (start < end) { + md_bitmap_file_set_bit(bitmap, block); + start += 1 << chunkshift; } - *bmc_new |= NEEDED_MASK; + *bmc_new = 2; + md_bitmap_count_page(&bitmap->counts, block, 1); + md_bitmap_set_pending(&bitmap->counts, block); } + *bmc_new |= NEEDED_MASK; if (new_blocks < old_blocks) old_blocks = new_blocks; } @@ -2528,9 +2524,6 @@ chunksize_store(struct mddev *mddev, const char *buf, size_t len) if (csize < 512 || !is_power_of_2(csize)) return -EINVAL; - if (BITS_PER_LONG > 32 && csize >= (1ULL << (BITS_PER_BYTE * - sizeof(((bitmap_super_t *)0)->chunksize)))) - return -EOVERFLOW; mddev->bitmap_info.chunksize = csize; return len; }
diff --git a/drivers/md/md.c b/drivers/md/md.c index 6455899..11fd3b3 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c
@@ -481,14 +481,13 @@ static void md_end_flush(struct bio *bio) struct md_rdev *rdev = bio->bi_private; struct mddev *mddev = rdev->mddev; - bio_put(bio); - rdev_dec_pending(rdev, mddev); if (atomic_dec_and_test(&mddev->flush_pending)) { /* The pre-request flush has finished */ queue_work(md_wq, &mddev->flush_work); } + bio_put(bio); } static void md_submit_flush_data(struct work_struct *ws); @@ -886,12 +885,10 @@ static void super_written(struct bio *bio) } else clear_bit(LastDev, &rdev->flags); - bio_put(bio); - - rdev_dec_pending(rdev, mddev); - if (atomic_dec_and_test(&mddev->pending_writes)) wake_up(&mddev->sb_wait); + rdev_dec_pending(rdev, mddev); + bio_put(bio); } void md_super_write(struct mddev *mddev, struct md_rdev *rdev, @@ -3082,9 +3079,6 @@ slot_store(struct md_rdev *rdev, const char *buf, size_t len) err = kstrtouint(buf, 10, (unsigned int *)&slot); if (err < 0) return err; - if (slot < 0) - /* overflow */ - return -ENOSPC; } if (rdev->mddev->pers && slot == -1) { /* Setting 'slot' on an active array requires also @@ -6100,7 +6094,6 @@ void md_stop(struct mddev *mddev) /* stop the array and free an attached data structures. * This is called from dm-raid */ - __md_stop_writes(mddev); __md_stop(mddev); bioset_exit(&mddev->bio_set); bioset_exit(&mddev->sync_set);
diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c index 8cbaa99..0ead5a7 100644 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c
@@ -63,8 +63,8 @@ static void dump_zones(struct mddev *mddev) int len = 0; for (k = 0; k < conf->strip_zone[j].nb_dev; k++) - len += scnprintf(line+len, 200-len, "%s%s", k?"/":"", - bdevname(conf->devlist[j*raid_disks + len += snprintf(line+len, 200-len, "%s%s", k?"/":"", + bdevname(conf->devlist[j*raid_disks + k]->bdev, b)); pr_debug("md: zone%d=[%s]\n", j, line);
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 1919de4..e871846 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c
@@ -3132,7 +3132,6 @@ static int raid1_run(struct mddev *mddev) * RAID1 needs at least one disk in active */ if (conf->raid_disks - mddev->degraded < 1) { - md_unregister_thread(&conf->thread); ret = -EINVAL; goto abort; }
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 9fcc141..deddabf 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c
@@ -1826,12 +1826,9 @@ static int raid10_remove_disk(struct mddev *mddev, struct md_rdev *rdev) int err = 0; int number = rdev->raid_disk; struct md_rdev **rdevp; - struct raid10_info *p; + struct raid10_info *p = conf->mirrors + number; print_conf(conf); - if (unlikely(number >= mddev->raid_disks)) - return 0; - p = conf->mirrors + number; if (rdev == p->rdev) rdevp = &p->rdev; else if (rdev == p->replacement)
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index d0c3f49..474cf6a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c
@@ -36,7 +36,6 @@ */ #include <linux/blkdev.h> -#include <linux/delay.h> #include <linux/kthread.h> #include <linux/raid/pq.h> #include <linux/async_tx.h> @@ -2667,10 +2666,10 @@ static void raid5_end_write_request(struct bio *bi) if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags)) clear_bit(R5_LOCKED, &sh->dev[i].flags); set_bit(STRIPE_HANDLE, &sh->state); + raid5_release_stripe(sh); if (sh->batch_head && sh != sh->batch_head) raid5_release_stripe(sh->batch_head); - raid5_release_stripe(sh); } static void raid5_error(struct mddev *mddev, struct md_rdev *rdev) @@ -3729,7 +3728,7 @@ static void handle_stripe_fill(struct stripe_head *sh, * back cache (prexor with orig_page, and then xor with * page) in the read path */ - if (s->to_read && s->injournal && s->failed) { + if (s->injournal && s->failed) { if (test_bit(STRIPE_R5C_CACHING, &sh->state)) r5c_make_stripe_write_out(sh); goto out; @@ -6335,18 +6334,7 @@ static void raid5d(struct md_thread *thread) spin_unlock_irq(&conf->device_lock); md_check_recovery(mddev); spin_lock_irq(&conf->device_lock); - - /* - * Waiting on MD_SB_CHANGE_PENDING below may deadlock - * seeing md_check_recovery() is needed to clear - * the flag when using mdmon. - */ - continue; } - - wait_event_lock_irq(mddev->sb_wait, - !test_bit(MD_SB_CHANGE_PENDING, &mddev->sb_flags), - conf->device_lock); } pr_debug("%d stripes handled\n", handled);
diff --git a/drivers/media/dvb-core/dmxdev.c b/drivers/media/dvb-core/dmxdev.c index 95d0f1e..56785d9 100644 --- a/drivers/media/dvb-core/dmxdev.c +++ b/drivers/media/dvb-core/dmxdev.c
@@ -800,11 +800,6 @@ static int dvb_demux_open(struct inode *inode, struct file *file) if (mutex_lock_interruptible(&dmxdev->mutex)) return -ERESTARTSYS; - if (dmxdev->exit) { - mutex_unlock(&dmxdev->mutex); - return -ENODEV; - } - for (i = 0; i < dmxdev->filternum; i++) if (dmxdev->filter[i].state == DMXDEV_STATE_FREE) break; @@ -1586,10 +1581,7 @@ EXPORT_SYMBOL(dvb_dmxdev_init); void dvb_dmxdev_release(struct dmxdev *dmxdev) { - mutex_lock(&dmxdev->mutex); dmxdev->exit = 1; - mutex_unlock(&dmxdev->mutex); - if (dmxdev->dvbdev->users > 1) { wait_event(dmxdev->dvbdev->wait_queue, dmxdev->dvbdev->users == 1);
diff --git a/drivers/media/dvb-core/dvb_ca_en50221.c b/drivers/media/dvb-core/dvb_ca_en50221.c index fd47653..cfc2762 100644 --- a/drivers/media/dvb-core/dvb_ca_en50221.c +++ b/drivers/media/dvb-core/dvb_ca_en50221.c
@@ -157,7 +157,7 @@ static void dvb_ca_private_free(struct dvb_ca_private *ca) { unsigned int i; - dvb_device_put(ca->dvbdev); + dvb_free_device(ca->dvbdev); for (i = 0; i < ca->slot_count; i++) vfree(ca->slot_info[i].rx_buffer.data);
diff --git a/drivers/media/dvb-core/dvb_frontend.c b/drivers/media/dvb-core/dvb_frontend.c index 6998f2e..a0c3014 100644 --- a/drivers/media/dvb-core/dvb_frontend.c +++ b/drivers/media/dvb-core/dvb_frontend.c
@@ -135,7 +135,7 @@ static void __dvb_frontend_free(struct dvb_frontend *fe) struct dvb_frontend_private *fepriv = fe->frontend_priv; if (fepriv) - dvb_device_put(fepriv->dvbdev); + dvb_free_device(fepriv->dvbdev); dvb_frontend_invoke_release(fe, fe->ops.release); @@ -3044,7 +3044,6 @@ int dvb_register_frontend(struct dvb_adapter *dvb, .name = fe->ops.info.name, #endif }; - int ret; dev_dbg(dvb->device, "%s:\n", __func__); @@ -3078,13 +3077,8 @@ int dvb_register_frontend(struct dvb_adapter *dvb, "DVB: registering adapter %i frontend %i (%s)...\n", fe->dvb->num, fe->id, fe->ops.info.name); - ret = dvb_register_device(fe->dvb, &fepriv->dvbdev, &dvbdev_template, + dvb_register_device(fe->dvb, &fepriv->dvbdev, &dvbdev_template, fe, DVB_DEVICE_FRONTEND, 0); - if (ret) { - dvb_frontend_put(fe); - mutex_unlock(&frontend_mutex); - return ret; - } /* * Initialize the cache to the proper values according with the
diff --git a/drivers/media/dvb-core/dvb_vb2.c b/drivers/media/dvb-core/dvb_vb2.c index 1331f2c..6974f17 100644 --- a/drivers/media/dvb-core/dvb_vb2.c +++ b/drivers/media/dvb-core/dvb_vb2.c
@@ -358,12 +358,6 @@ int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req) int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b) { - struct vb2_queue *q = &ctx->vb_q; - - if (b->index >= q->num_buffers) { - dprintk(1, "[%s] buffer index out of range\n", ctx->name); - return -EINVAL; - } vb2_core_querybuf(&ctx->vb_q, b->index, b); dprintk(3, "[%s] index=%d\n", ctx->name, b->index); return 0; @@ -388,13 +382,8 @@ int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp) int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b) { - struct vb2_queue *q = &ctx->vb_q; int ret; - if (b->index >= q->num_buffers) { - dprintk(1, "[%s] buffer index out of range\n", ctx->name); - return -EINVAL; - } ret = vb2_core_qbuf(&ctx->vb_q, b->index, b, NULL); if (ret) { dprintk(1, "[%s] index=%d errno=%d\n", ctx->name,
diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 68d3e12..c95d455 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c
@@ -112,7 +112,7 @@ static int dvb_device_open(struct inode *inode, struct file *file) new_fops = fops_get(dvbdev->fops); if (!new_fops) goto fail; - file->private_data = dvb_device_get(dvbdev); + file->private_data = dvbdev; replace_fops(file, new_fops); if (file->f_op->open) err = file->f_op->open(inode, file); @@ -176,9 +176,6 @@ int dvb_generic_release(struct inode *inode, struct file *file) } dvbdev->users++; - - dvb_device_put(dvbdev); - return 0; } EXPORT_SYMBOL(dvb_generic_release); @@ -350,7 +347,6 @@ static int dvb_create_media_entity(struct dvb_device *dvbdev, GFP_KERNEL); if (!dvbdev->pads) { kfree(dvbdev->entity); - dvbdev->entity = NULL; return -ENOMEM; } } @@ -497,7 +493,6 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, } memcpy(dvbdev, template, sizeof(struct dvb_device)); - kref_init(&dvbdev->ref); dvbdev->type = type; dvbdev->id = id; dvbdev->adapter = adap; @@ -527,7 +522,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, #endif dvbdev->minor = minor; - dvb_minors[minor] = dvb_device_get(dvbdev); + dvb_minors[minor] = dvbdev; up_write(&minor_rwsem); ret = dvb_register_media_device(dvbdev, type, minor, demux_sink_pads); @@ -567,7 +562,6 @@ void dvb_remove_device(struct dvb_device *dvbdev) down_write(&minor_rwsem); dvb_minors[dvbdev->minor] = NULL; - dvb_device_put(dvbdev); up_write(&minor_rwsem); dvb_media_device_free(dvbdev); @@ -579,34 +573,21 @@ void dvb_remove_device(struct dvb_device *dvbdev) EXPORT_SYMBOL(dvb_remove_device); -static void dvb_free_device(struct kref *ref) +void dvb_free_device(struct dvb_device *dvbdev) { - struct dvb_device *dvbdev = container_of(ref, struct dvb_device, ref); + if (!dvbdev) + return; kfree (dvbdev->fops); kfree (dvbdev); } - - -struct dvb_device *dvb_device_get(struct dvb_device *dvbdev) -{ - kref_get(&dvbdev->ref); - return dvbdev; -} -EXPORT_SYMBOL(dvb_device_get); - - -void dvb_device_put(struct dvb_device *dvbdev) -{ - if (dvbdev) - kref_put(&dvbdev->ref, dvb_free_device); -} +EXPORT_SYMBOL(dvb_free_device); void dvb_unregister_device(struct dvb_device *dvbdev) { dvb_remove_device(dvbdev); - dvb_device_put(dvbdev); + dvb_free_device(dvbdev); } EXPORT_SYMBOL(dvb_unregister_device);
diff --git a/drivers/media/dvb-frontends/bcm3510.c b/drivers/media/dvb-frontends/bcm3510.c index 6457b09..e92542b 100644 --- a/drivers/media/dvb-frontends/bcm3510.c +++ b/drivers/media/dvb-frontends/bcm3510.c
@@ -649,7 +649,6 @@ static int bcm3510_download_firmware(struct dvb_frontend* fe) deb_info("firmware chunk, addr: 0x%04x, len: 0x%04x, total length: 0x%04zx\n",addr,len,fw->size); if ((ret = bcm3510_write_ram(st,addr,&b[i+4],len)) < 0) { err("firmware download failed: %d\n",ret); - release_firmware(fw); return ret; } i += 4 + len;
diff --git a/drivers/media/dvb-frontends/drxk_hard.c b/drivers/media/dvb-frontends/drxk_hard.c index 2dccc9d..0a4875b 100644 --- a/drivers/media/dvb-frontends/drxk_hard.c +++ b/drivers/media/dvb-frontends/drxk_hard.c
@@ -6684,7 +6684,7 @@ static int drxk_read_snr(struct dvb_frontend *fe, u16 *snr) static int drxk_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) { struct drxk_state *state = fe->demodulator_priv; - u16 err = 0; + u16 err; dprintk(1, "\n");
diff --git a/drivers/media/dvb-frontends/stv0288.c b/drivers/media/dvb-frontends/stv0288.c index 3ae1f3a..3d54a0e 100644 --- a/drivers/media/dvb-frontends/stv0288.c +++ b/drivers/media/dvb-frontends/stv0288.c
@@ -440,8 +440,9 @@ static int stv0288_set_frontend(struct dvb_frontend *fe) struct stv0288_state *state = fe->demodulator_priv; struct dtv_frontend_properties *c = &fe->dtv_property_cache; - u8 tda[3], reg, time_out = 0; - s8 tm; + char tm; + unsigned char tda[3]; + u8 reg, time_out = 0; dprintk("%s : FE_SET_FRONTEND\n", __func__);
diff --git a/drivers/media/i2c/ad5820.c b/drivers/media/i2c/ad5820.c index d7d85ed..7a49651 100644 --- a/drivers/media/i2c/ad5820.c +++ b/drivers/media/i2c/ad5820.c
@@ -314,18 +314,18 @@ static int ad5820_probe(struct i2c_client *client, ret = media_entity_pads_init(&coil->subdev.entity, 0, NULL); if (ret < 0) - goto clean_mutex; + goto cleanup2; ret = v4l2_async_register_subdev(&coil->subdev); if (ret < 0) - goto clean_entity; + goto cleanup; return ret; -clean_entity: - media_entity_cleanup(&coil->subdev.entity); -clean_mutex: +cleanup2: mutex_destroy(&coil->power_lock); +cleanup: + media_entity_cleanup(&coil->subdev.entity); return ret; }
diff --git a/drivers/media/i2c/m5mols/m5mols_core.c b/drivers/media/i2c/m5mols/m5mols_core.c index dcf9e4d..21666d7 100644 --- a/drivers/media/i2c/m5mols/m5mols_core.c +++ b/drivers/media/i2c/m5mols/m5mols_core.c
@@ -488,7 +488,7 @@ static enum m5mols_restype __find_restype(u32 code) do { if (code == m5mols_default_ffmt[type].code) return type; - } while (++type != SIZE_DEFAULT_FFMT); + } while (type++ != SIZE_DEFAULT_FFMT); return 0; }
diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 087fb46..be6c882 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c
@@ -2704,7 +2704,7 @@ static int ov5640_init_controls(struct ov5640_dev *sensor) /* Auto/manual gain */ ctrls->auto_gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_AUTOGAIN, 0, 1, 1, 1); - ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_ANALOGUE_GAIN, + ctrls->gain = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_GAIN, 0, 1023, 1, 0); ctrls->saturation = v4l2_ctrl_new_std(hdl, ops, V4L2_CID_SATURATION,
diff --git a/drivers/media/i2c/ov5675.c b/drivers/media/i2c/ov5675.c index 477f61b..1ae2523 100644 --- a/drivers/media/i2c/ov5675.c +++ b/drivers/media/i2c/ov5675.c
@@ -722,10 +722,8 @@ static int ov5675_init_controls(struct ov5675 *ov5675) V4L2_CID_TEST_PATTERN, ARRAY_SIZE(ov5675_test_pattern_menu) - 1, 0, 0, ov5675_test_pattern_menu); - if (ctrl_hdlr->error) { - v4l2_ctrl_handler_free(ctrl_hdlr); + if (ctrl_hdlr->error) return ctrl_hdlr->error; - } ov5675->sd.ctrl_handler = ctrl_hdlr;
diff --git a/drivers/media/i2c/ov7670.c b/drivers/media/i2c/ov7670.c index e47800c..154776d 100644 --- a/drivers/media/i2c/ov7670.c +++ b/drivers/media/i2c/ov7670.c
@@ -1824,7 +1824,7 @@ static int ov7670_parse_dt(struct device *dev, if (bus_cfg.bus_type != V4L2_MBUS_PARALLEL) { dev_err(dev, "Unsupported media bus type\n"); - return -EINVAL; + return ret; } info->mbus_config = bus_cfg.bus.parallel.flags;
diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c index 5033950..2cc6a67 100644 --- a/drivers/media/i2c/ov772x.c +++ b/drivers/media/i2c/ov772x.c
@@ -1397,7 +1397,7 @@ static int ov772x_probe(struct i2c_client *client) priv->subdev.ctrl_handler = &priv->hdl; if (priv->hdl.error) { ret = priv->hdl.error; - goto error_ctrl_free; + goto error_mutex_destroy; } priv->clk = clk_get(&client->dev, NULL); @@ -1446,6 +1446,7 @@ static int ov772x_probe(struct i2c_client *client) clk_put(priv->clk); error_ctrl_free: v4l2_ctrl_handler_free(&priv->hdl); +error_mutex_destroy: mutex_destroy(&priv->lock); return ret;
diff --git a/drivers/media/pci/cx88/cx88-vbi.c b/drivers/media/pci/cx88/cx88-vbi.c index 7cf2271..58489ea 100644 --- a/drivers/media/pci/cx88/cx88-vbi.c +++ b/drivers/media/pci/cx88/cx88-vbi.c
@@ -144,10 +144,11 @@ static int buffer_prepare(struct vb2_buffer *vb) return -EINVAL; vb2_set_plane_payload(vb, 0, size); - return cx88_risc_buffer(dev->pci, &buf->risc, sgt->sgl, - 0, VBI_LINE_LENGTH * lines, - VBI_LINE_LENGTH, 0, - lines); + cx88_risc_buffer(dev->pci, &buf->risc, sgt->sgl, + 0, VBI_LINE_LENGTH * lines, + VBI_LINE_LENGTH, 0, + lines); + return 0; } static void buffer_finish(struct vb2_buffer *vb)
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c index 547e18d..b8abcd5 100644 --- a/drivers/media/pci/cx88/cx88-video.c +++ b/drivers/media/pci/cx88/cx88-video.c
@@ -433,7 +433,6 @@ static int queue_setup(struct vb2_queue *q, static int buffer_prepare(struct vb2_buffer *vb) { - int ret; struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb); struct cx8800_dev *dev = vb->vb2_queue->drv_priv; struct cx88_core *core = dev->core; @@ -448,35 +447,35 @@ static int buffer_prepare(struct vb2_buffer *vb) switch (core->field) { case V4L2_FIELD_TOP: - ret = cx88_risc_buffer(dev->pci, &buf->risc, - sgt->sgl, 0, UNSET, - buf->bpl, 0, core->height); + cx88_risc_buffer(dev->pci, &buf->risc, + sgt->sgl, 0, UNSET, + buf->bpl, 0, core->height); break; case V4L2_FIELD_BOTTOM: - ret = cx88_risc_buffer(dev->pci, &buf->risc, - sgt->sgl, UNSET, 0, - buf->bpl, 0, core->height); + cx88_risc_buffer(dev->pci, &buf->risc, + sgt->sgl, UNSET, 0, + buf->bpl, 0, core->height); break; case V4L2_FIELD_SEQ_TB: - ret = cx88_risc_buffer(dev->pci, &buf->risc, - sgt->sgl, - 0, buf->bpl * (core->height >> 1), - buf->bpl, 0, - core->height >> 1); + cx88_risc_buffer(dev->pci, &buf->risc, + sgt->sgl, + 0, buf->bpl * (core->height >> 1), + buf->bpl, 0, + core->height >> 1); break; case V4L2_FIELD_SEQ_BT: - ret = cx88_risc_buffer(dev->pci, &buf->risc, - sgt->sgl, - buf->bpl * (core->height >> 1), 0, - buf->bpl, 0, - core->height >> 1); + cx88_risc_buffer(dev->pci, &buf->risc, + sgt->sgl, + buf->bpl * (core->height >> 1), 0, + buf->bpl, 0, + core->height >> 1); break; case V4L2_FIELD_INTERLACED: default: - ret = cx88_risc_buffer(dev->pci, &buf->risc, - sgt->sgl, 0, buf->bpl, - buf->bpl, buf->bpl, - core->height >> 1); + cx88_risc_buffer(dev->pci, &buf->risc, + sgt->sgl, 0, buf->bpl, + buf->bpl, buf->bpl, + core->height >> 1); break; } dprintk(2, @@ -484,7 +483,7 @@ static int buffer_prepare(struct vb2_buffer *vb) buf, buf->vb.vb2_buf.index, __func__, core->width, core->height, dev->fmt->depth, dev->fmt->fourcc, (unsigned long)buf->risc.dma); - return ret; + return 0; } static void buffer_finish(struct vb2_buffer *vb)
diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 3457f0f..7808ec1 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c
@@ -1871,9 +1871,6 @@ static void cio2_pci_remove(struct pci_dev *pci_dev) v4l2_device_unregister(&cio2->v4l2_dev); media_device_cleanup(&cio2->media_dev); mutex_destroy(&cio2->lock); - - pm_runtime_forbid(&pci_dev->dev); - pm_runtime_get_noresume(&pci_dev->dev); } static int __maybe_unused cio2_runtime_suspend(struct device *dev)
diff --git a/drivers/media/pci/saa7164/saa7164-core.c b/drivers/media/pci/saa7164/saa7164-core.c index 59b039b..9ae04e1 100644 --- a/drivers/media/pci/saa7164/saa7164-core.c +++ b/drivers/media/pci/saa7164/saa7164-core.c
@@ -1227,7 +1227,7 @@ static int saa7164_initdev(struct pci_dev *pci_dev, if (saa7164_dev_setup(dev) < 0) { err = -EINVAL; - goto fail_dev; + goto fail_free; } /* print pci info */ @@ -1395,8 +1395,6 @@ static int saa7164_initdev(struct pci_dev *pci_dev, fail_irq: saa7164_dev_unregister(dev); -fail_dev: - pci_disable_device(pci_dev); fail_free: v4l2_device_unregister(&dev->v4l2_dev); kfree(dev);
diff --git a/drivers/media/pci/solo6x10/solo6x10-core.c b/drivers/media/pci/solo6x10/solo6x10-core.c index c52ee14..6e1ba48 100644 --- a/drivers/media/pci/solo6x10/solo6x10-core.c +++ b/drivers/media/pci/solo6x10/solo6x10-core.c
@@ -420,7 +420,6 @@ static int solo_sysfs_init(struct solo_dev *solo_dev) solo_dev->nr_chans); if (device_register(dev)) { - put_device(dev); dev->parent = NULL; return -ENOMEM; }
diff --git a/drivers/media/pci/tw686x/tw686x-core.c b/drivers/media/pci/tw686x/tw686x-core.c index 8a25a0d..74ae4f0 100644 --- a/drivers/media/pci/tw686x/tw686x-core.c +++ b/drivers/media/pci/tw686x/tw686x-core.c
@@ -315,6 +315,13 @@ static int tw686x_probe(struct pci_dev *pci_dev, spin_lock_init(&dev->lock); + err = request_irq(pci_dev->irq, tw686x_irq, IRQF_SHARED, + dev->name, dev); + if (err < 0) { + dev_err(&pci_dev->dev, "unable to request interrupt\n"); + goto iounmap; + } + timer_setup(&dev->dma_delay_timer, tw686x_dma_delay, 0); /* @@ -326,23 +333,18 @@ static int tw686x_probe(struct pci_dev *pci_dev, err = tw686x_video_init(dev); if (err) { dev_err(&pci_dev->dev, "can't register video\n"); - goto iounmap; + goto free_irq; } err = tw686x_audio_init(dev); if (err) dev_warn(&pci_dev->dev, "can't register audio\n"); - err = request_irq(pci_dev->irq, tw686x_irq, IRQF_SHARED, - dev->name, dev); - if (err < 0) { - dev_err(&pci_dev->dev, "unable to request interrupt\n"); - goto iounmap; - } - pci_set_drvdata(pci_dev, dev); return 0; +free_irq: + free_irq(pci_dev->irq, dev); iounmap: pci_iounmap(pci_dev, dev->mmio); free_region:
diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c index 73023d3..e6b68be 100644 --- a/drivers/media/platform/coda/coda-bit.c +++ b/drivers/media/platform/coda/coda-bit.c
@@ -852,7 +852,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) /* Only H.264BP and H.263P3 are considered */ iram_info->buf_dbk_y_use = coda_iram_alloc(iram_info, w64); iram_info->buf_dbk_c_use = coda_iram_alloc(iram_info, w64); - if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) + if (!iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits; @@ -876,7 +876,7 @@ static void coda_setup_iram(struct coda_ctx *ctx) iram_info->buf_dbk_y_use = coda_iram_alloc(iram_info, w128); iram_info->buf_dbk_c_use = coda_iram_alloc(iram_info, w128); - if (!iram_info->buf_dbk_y_use || !iram_info->buf_dbk_c_use) + if (!iram_info->buf_dbk_c_use) goto out; iram_info->axi_sram_use |= dbk_bits; @@ -1082,16 +1082,10 @@ static int coda_start_encoding(struct coda_ctx *ctx) } if (dst_fourcc == V4L2_PIX_FMT_JPEG) { - if (!ctx->params.jpeg_qmat_tab[0]) { + if (!ctx->params.jpeg_qmat_tab[0]) ctx->params.jpeg_qmat_tab[0] = kmalloc(64, GFP_KERNEL); - if (!ctx->params.jpeg_qmat_tab[0]) - return -ENOMEM; - } - if (!ctx->params.jpeg_qmat_tab[1]) { + if (!ctx->params.jpeg_qmat_tab[1]) ctx->params.jpeg_qmat_tab[1] = kmalloc(64, GFP_KERNEL); - if (!ctx->params.jpeg_qmat_tab[1]) - return -ENOMEM; - } coda_set_jpeg_compression_quality(ctx, ctx->params.jpeg_quality); }
diff --git a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c index ae274a7..31390ce 100644 --- a/drivers/media/platform/cros-ec-cec/cros-ec-cec.c +++ b/drivers/media/platform/cros-ec-cec/cros-ec-cec.c
@@ -45,8 +45,6 @@ static void handle_cec_message(struct cros_ec_cec *cros_ec_cec) uint8_t *cec_message = cros_ec->event_data.data.cec_message; unsigned int len = cros_ec->event_size; - if (len > CEC_MAX_MSG_SIZE) - len = CEC_MAX_MSG_SIZE; cros_ec_cec->rx_msg.len = len; memcpy(cros_ec_cec->rx_msg.msg, cec_message, len);
diff --git a/drivers/media/platform/exynos4-is/fimc-core.c b/drivers/media/platform/exynos4-is/fimc-core.c index 5b06c83..cde60fb 100644 --- a/drivers/media/platform/exynos4-is/fimc-core.c +++ b/drivers/media/platform/exynos4-is/fimc-core.c
@@ -1231,7 +1231,7 @@ int __init fimc_register_driver(void) return platform_driver_register(&fimc_driver); } -void fimc_unregister_driver(void) +void __exit fimc_unregister_driver(void) { platform_driver_unregister(&fimc_driver); }
diff --git a/drivers/media/platform/exynos4-is/fimc-is.c b/drivers/media/platform/exynos4-is/fimc-is.c index c78c2a7..9bb14bb 100644 --- a/drivers/media/platform/exynos4-is/fimc-is.c +++ b/drivers/media/platform/exynos4-is/fimc-is.c
@@ -214,7 +214,6 @@ static int fimc_is_register_subdevs(struct fimc_is *is) if (ret < 0 || index >= FIMC_IS_SENSORS_NUM) { of_node_put(child); - of_node_put(i2c_bus); return ret; } index++;
diff --git a/drivers/media/platform/exynos4-is/media-dev.c b/drivers/media/platform/exynos4-is/media-dev.c index 707feb3..a07d796 100644 --- a/drivers/media/platform/exynos4-is/media-dev.c +++ b/drivers/media/platform/exynos4-is/media-dev.c
@@ -1581,11 +1581,7 @@ static int __init fimc_md_init(void) if (ret) return ret; - ret = platform_driver_register(&fimc_md_driver); - if (ret) - fimc_unregister_driver(); - - return ret; + return platform_driver_register(&fimc_md_driver); } static void __exit fimc_md_exit(void)
diff --git a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h b/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h index b810c96..2cb8cec 100644 --- a/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h +++ b/drivers/media/platform/mtk-mdp/mtk_mdp_ipi.h
@@ -40,14 +40,12 @@ struct mdp_ipi_init { * @ipi_id : IPI_MDP * @ap_inst : AP mtk_mdp_vpu address * @vpu_inst_addr : VPU MDP instance address - * @padding : Alignment padding */ struct mdp_ipi_comm { uint32_t msg_id; uint32_t ipi_id; uint64_t ap_inst; uint32_t vpu_inst_addr; - uint32_t padding; }; /**
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 88d491a..dce6b36 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c
@@ -2312,16 +2312,7 @@ static int isp_probe(struct platform_device *pdev) /* Regulators */ isp->isp_csiphy1.vdd = devm_regulator_get(&pdev->dev, "vdd-csiphy1"); - if (IS_ERR(isp->isp_csiphy1.vdd)) { - ret = PTR_ERR(isp->isp_csiphy1.vdd); - goto error; - } - isp->isp_csiphy2.vdd = devm_regulator_get(&pdev->dev, "vdd-csiphy2"); - if (IS_ERR(isp->isp_csiphy2.vdd)) { - ret = PTR_ERR(isp->isp_csiphy2.vdd); - goto error; - } /* Clocks *
diff --git a/drivers/media/platform/qcom/camss/camss-video.c b/drivers/media/platform/qcom/camss/camss-video.c index 6a5ec13..4c2675b 100644 --- a/drivers/media/platform/qcom/camss/camss-video.c +++ b/drivers/media/platform/qcom/camss/camss-video.c
@@ -438,7 +438,7 @@ static int video_start_streaming(struct vb2_queue *q, unsigned int count) ret = media_pipeline_start(&vdev->entity, &video->pipe); if (ret < 0) - goto flush_buffers; + return ret; ret = video_check_format(video); if (ret < 0) @@ -467,7 +467,6 @@ static int video_start_streaming(struct vb2_queue *q, unsigned int count) error: media_pipeline_stop(&vdev->entity); -flush_buffers: video->ops->flush_buffers(video, VB2_BUF_STATE_QUEUED); return ret;
diff --git a/drivers/media/platform/qcom/venus/vdec.c b/drivers/media/platform/qcom/venus/vdec.c index d1ac1d7..658825b 100644 --- a/drivers/media/platform/qcom/venus/vdec.c +++ b/drivers/media/platform/qcom/venus/vdec.c
@@ -157,8 +157,6 @@ vdec_try_fmt_common(struct venus_inst *inst, struct v4l2_format *f) else return NULL; fmt = find_format(inst, pixmp->pixelformat, f->type); - if (!fmt) - return NULL; } pixmp->width = clamp(pixmp->width, frame_width_min(inst),
diff --git a/drivers/media/platform/s5p-cec/s5p_cec.c b/drivers/media/platform/s5p-cec/s5p_cec.c index 0c668d4..828792b 100644 --- a/drivers/media/platform/s5p-cec/s5p_cec.c +++ b/drivers/media/platform/s5p-cec/s5p_cec.c
@@ -115,8 +115,6 @@ static irqreturn_t s5p_cec_irq_handler(int irq, void *priv) dev_dbg(cec->dev, "Buffer overrun (worker did not process previous message)\n"); cec->rx = STATE_BUSY; cec->msg.len = status >> 24; - if (cec->msg.len > CEC_MAX_MSG_SIZE) - cec->msg.len = CEC_MAX_MSG_SIZE; cec->msg.rx_status = CEC_RX_STATUS_OK; s5p_cec_get_rx_buf(cec, cec->msg.len, cec->msg.msg);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c index d3fd337..9faecd0 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1580,18 +1580,8 @@ static struct s5p_mfc_variant mfc_drvdata_v7 = { .port_num = MFC_NUM_PORTS_V7, .buf_size = &buf_size_v7, .fw_name[0] = "s5p-mfc-v7.fw", - .clk_names = {"mfc"}, - .num_clocks = 1, -}; - -static struct s5p_mfc_variant mfc_drvdata_v7_3250 = { - .version = MFC_VERSION_V7, - .version_bit = MFC_V7_BIT, - .port_num = MFC_NUM_PORTS_V7, - .buf_size = &buf_size_v7, - .fw_name[0] = "s5p-mfc-v7.fw", - .clk_names = {"mfc", "sclk_mfc"}, - .num_clocks = 2, + .clk_names = {"mfc", "sclk_mfc"}, + .num_clocks = 2, }; static struct s5p_mfc_buf_size_v6 mfc_buf_size_v8 = { @@ -1662,9 +1652,6 @@ static const struct of_device_id exynos_mfc_match[] = { .compatible = "samsung,mfc-v7", .data = &mfc_drvdata_v7, }, { - .compatible = "samsung,exynos3250-mfc", - .data = &mfc_drvdata_v7_3250, - }, { .compatible = "samsung,mfc-v8", .data = &mfc_drvdata_v8, }, {
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c index 58822ec..da138c3 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_ctrl.c
@@ -468,10 +468,8 @@ void s5p_mfc_close_mfc_inst(struct s5p_mfc_dev *dev, struct s5p_mfc_ctx *ctx) s5p_mfc_hw_call(dev->mfc_ops, try_run, dev); /* Wait until instance is returned or timeout occurred */ if (s5p_mfc_wait_for_done_ctx(ctx, - S5P_MFC_R2H_CMD_CLOSE_INSTANCE_RET, 0)){ - clear_work_bit_irqsave(ctx); + S5P_MFC_R2H_CMD_CLOSE_INSTANCE_RET, 0)) mfc_err("Err returning instance\n"); - } /* Free resources */ s5p_mfc_hw_call(dev->mfc_ops, release_codec_buffers, ctx);
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c index 6ed3df5..912fe0c 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_enc.c
@@ -1212,7 +1212,6 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) unsigned long mb_y_addr, mb_c_addr; int slice_type; unsigned int strm_size; - bool src_ready; slice_type = s5p_mfc_hw_call(dev->mfc_ops, get_enc_slice_type, dev); strm_size = s5p_mfc_hw_call(dev->mfc_ops, get_enc_strm_size, dev); @@ -1252,8 +1251,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) } } } - if (ctx->src_queue_cnt > 0 && (ctx->state == MFCINST_RUNNING || - ctx->state == MFCINST_FINISHING)) { + if ((ctx->src_queue_cnt > 0) && (ctx->state == MFCINST_RUNNING)) { mb_entry = list_entry(ctx->src_queue.next, struct s5p_mfc_buf, list); if (mb_entry->flags & MFC_BUF_FLAG_USED) { @@ -1284,13 +1282,7 @@ static int enc_post_frame_start(struct s5p_mfc_ctx *ctx) vb2_set_plane_payload(&mb_entry->b->vb2_buf, 0, strm_size); vb2_buffer_done(&mb_entry->b->vb2_buf, VB2_BUF_STATE_DONE); } - - src_ready = true; - if (ctx->state == MFCINST_RUNNING && ctx->src_queue_cnt == 0) - src_ready = false; - if (ctx->state == MFCINST_FINISHING && ctx->ref_queue_cnt == 0) - src_ready = false; - if (!src_ready || ctx->dst_queue_cnt == 0) + if ((ctx->src_queue_cnt == 0) || (ctx->dst_queue_cnt == 0)) clear_work_bit(ctx); return 0;
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c index ef8169f..a145305 100644 --- a/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c +++ b/drivers/media/platform/s5p-mfc/s5p_mfc_opr_v6.c
@@ -1060,7 +1060,7 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx) } /* aspect ratio VUI */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 5); reg |= ((p_h264->vui_sar & 0x1) << 5); writel(reg, mfc_regs->e_h264_options); @@ -1083,7 +1083,7 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx) /* intra picture period for H.264 open GOP */ /* control */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 4); reg |= ((p_h264->open_gop & 0x1) << 4); writel(reg, mfc_regs->e_h264_options); @@ -1097,23 +1097,23 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx) } /* 'WEIGHTED_BI_PREDICTION' for B is disable */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x3 << 9); writel(reg, mfc_regs->e_h264_options); /* 'CONSTRAINED_INTRA_PRED_ENABLE' is disable */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 14); writel(reg, mfc_regs->e_h264_options); /* ASO */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 6); reg |= ((p_h264->aso & 0x1) << 6); writel(reg, mfc_regs->e_h264_options); /* hier qp enable */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 8); reg |= ((p_h264->open_gop & 0x1) << 8); writel(reg, mfc_regs->e_h264_options); @@ -1134,7 +1134,7 @@ static int s5p_mfc_set_enc_params_h264(struct s5p_mfc_ctx *ctx) writel(reg, mfc_regs->e_h264_num_t_layer); /* frame packing SEI generation */ - reg = readl(mfc_regs->e_h264_options); + readl(mfc_regs->e_h264_options); reg &= ~(0x1 << 25); reg |= ((p_h264->sei_frame_packing & 0x1) << 25); writel(reg, mfc_regs->e_h264_options);
diff --git a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c index 69070b7..5baada4 100644 --- a/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c +++ b/drivers/media/platform/sti/c8sectpfe/c8sectpfe-core.c
@@ -939,7 +939,6 @@ static int configure_channels(struct c8sectpfei *fei) if (ret) { dev_err(fei->dev, "configure_memdma_and_inputblock failed\n"); - of_node_put(child); goto err_unmap; } index++;
diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index f6dc2b6..cc71aa4 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c
@@ -297,28 +297,6 @@ static int vidioc_g_fbuf(struct file *file, void *fh, struct v4l2_framebuffer *a return vivid_vid_out_g_fbuf(file, fh, a); } -/* - * Only support the framebuffer of one of the vivid instances. - * Anything else is rejected. - */ -bool vivid_validate_fb(const struct v4l2_framebuffer *a) -{ - struct vivid_dev *dev; - int i; - - for (i = 0; i < n_devs; i++) { - dev = vivid_devs[i]; - if (!dev || !dev->video_pbase) - continue; - if ((unsigned long)a->base == dev->video_pbase && - a->fmt.width <= dev->display_width && - a->fmt.height <= dev->display_height && - a->fmt.bytesperline <= dev->display_byte_stride) - return true; - } - return false; -} - static int vidioc_s_fbuf(struct file *file, void *fh, const struct v4l2_framebuffer *a) { struct video_device *vdev = video_devdata(file);
diff --git a/drivers/media/platform/vivid/vivid-core.h b/drivers/media/platform/vivid/vivid-core.h index 0ab4051..7ebb146 100644 --- a/drivers/media/platform/vivid/vivid-core.h +++ b/drivers/media/platform/vivid/vivid-core.h
@@ -564,6 +564,4 @@ static inline bool vivid_is_hdmi_out(const struct vivid_dev *dev) return dev->output_type[dev->output] == HDMI; } -bool vivid_validate_fb(const struct v4l2_framebuffer *a); - #endif
diff --git a/drivers/media/platform/vivid/vivid-vid-cap.c b/drivers/media/platform/vivid/vivid-vid-cap.c index 842ebfe..2d03073 100644 --- a/drivers/media/platform/vivid/vivid-vid-cap.c +++ b/drivers/media/platform/vivid/vivid-vid-cap.c
@@ -452,12 +452,6 @@ void vivid_update_format_cap(struct vivid_dev *dev, bool keep_controls) tpg_reset_source(&dev->tpg, dev->src_rect.width, dev->src_rect.height, dev->field_cap); dev->crop_cap = dev->src_rect; dev->crop_bounds_cap = dev->src_rect; - if (dev->bitmap_cap && - (dev->compose_cap.width != dev->crop_cap.width || - dev->compose_cap.height != dev->crop_cap.height)) { - vfree(dev->bitmap_cap); - dev->bitmap_cap = NULL; - } dev->compose_cap = dev->crop_cap; if (V4L2_FIELD_HAS_T_OR_B(dev->field_cap)) dev->compose_cap.height /= 2; @@ -889,8 +883,6 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection struct vivid_dev *dev = video_drvdata(file); struct v4l2_rect *crop = &dev->crop_cap; struct v4l2_rect *compose = &dev->compose_cap; - unsigned orig_compose_w = compose->width; - unsigned orig_compose_h = compose->height; unsigned factor = V4L2_FIELD_HAS_T_OR_B(dev->field_cap) ? 2 : 1; int ret; @@ -935,7 +927,6 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection if (dev->has_compose_cap) { v4l2_rect_set_min_size(compose, &min_rect); v4l2_rect_set_max_size(compose, &max_rect); - v4l2_rect_map_inside(compose, &fmt); } dev->fmt_cap_rect = fmt; tpg_s_buf_height(&dev->tpg, fmt.height); @@ -1008,17 +999,17 @@ int vivid_vid_cap_s_selection(struct file *file, void *fh, struct v4l2_selection s->r.height /= factor; } v4l2_rect_map_inside(&s->r, &dev->fmt_cap_rect); + if (dev->bitmap_cap && (compose->width != s->r.width || + compose->height != s->r.height)) { + vfree(dev->bitmap_cap); + dev->bitmap_cap = NULL; + } *compose = s->r; break; default: return -EINVAL; } - if (dev->bitmap_cap && (compose->width != orig_compose_w || - compose->height != orig_compose_h)) { - vfree(dev->bitmap_cap); - dev->bitmap_cap = NULL; - } tpg_s_crop_compose(&dev->tpg, crop, compose); return 0; } @@ -1259,14 +1250,7 @@ int vivid_vid_cap_s_fbuf(struct file *file, void *fh, return -EINVAL; if (a->fmt.bytesperline < (a->fmt.width * fmt->bit_depth[0]) / 8) return -EINVAL; - if (a->fmt.bytesperline > a->fmt.sizeimage / a->fmt.height) - return -EINVAL; - - /* - * Only support the framebuffer of one of the vivid instances. - * Anything else is rejected. - */ - if (!vivid_validate_fb(a)) + if (a->fmt.height * a->fmt.bytesperline < a->fmt.sizeimage) return -EINVAL; dev->fb_vbase_cap = phys_to_virt((unsigned long)a->base);
diff --git a/drivers/media/platform/xilinx/xilinx-vipp.c b/drivers/media/platform/xilinx/xilinx-vipp.c index f2b0c49..cc2856e 100644 --- a/drivers/media/platform/xilinx/xilinx-vipp.c +++ b/drivers/media/platform/xilinx/xilinx-vipp.c
@@ -472,7 +472,7 @@ static int xvip_graph_dma_init(struct xvip_composite_device *xdev) { struct device_node *ports; struct device_node *port; - int ret = 0; + int ret; ports = of_get_child_by_name(xdev->dev->of_node, "ports"); if (ports == NULL) { @@ -482,14 +482,13 @@ static int xvip_graph_dma_init(struct xvip_composite_device *xdev) for_each_child_of_node(ports, port) { ret = xvip_graph_dma_init_one(xdev, port); - if (ret) { + if (ret < 0) { of_node_put(port); - break; + return ret; } } - of_node_put(ports); - return ret; + return 0; } static void xvip_graph_cleanup(struct xvip_composite_device *xdev)
diff --git a/drivers/media/radio/si470x/radio-si470x-usb.c b/drivers/media/radio/si470x/radio-si470x-usb.c index 1365ae7..3f8634a 100644 --- a/drivers/media/radio/si470x/radio-si470x-usb.c +++ b/drivers/media/radio/si470x/radio-si470x-usb.c
@@ -733,10 +733,8 @@ static int si470x_usb_driver_probe(struct usb_interface *intf, /* start radio */ retval = si470x_start_usb(radio); - if (retval < 0 && !radio->int_in_running) + if (retval < 0) goto err_buf; - else if (retval < 0) /* in case of radio->int_in_running == 1 */ - goto err_all; /* set initial frequency */ si470x_set_freq(radio, 87.5 * FREQ_MUL); /* available in all regions */
diff --git a/drivers/media/rc/ene_ir.c b/drivers/media/rc/ene_ir.c index 20cadff..82867a2 100644 --- a/drivers/media/rc/ene_ir.c +++ b/drivers/media/rc/ene_ir.c
@@ -1106,8 +1106,6 @@ static void ene_remove(struct pnp_dev *pnp_dev) struct ene_device *dev = pnp_get_drvdata(pnp_dev); unsigned long flags; - rc_unregister_device(dev->rdev); - del_timer_sync(&dev->tx_sim_timer); spin_lock_irqsave(&dev->hw_lock, flags); ene_rx_disable(dev); ene_rx_restore_hw_buffer(dev); @@ -1115,6 +1113,7 @@ static void ene_remove(struct pnp_dev *pnp_dev) free_irq(dev->irq, dev); release_region(dev->hw_io, ENE_IO_SIZE); + rc_unregister_device(dev->rdev); kfree(dev); }
diff --git a/drivers/media/rc/imon.c b/drivers/media/rc/imon.c index d8401ef..c683a24 100644 --- a/drivers/media/rc/imon.c +++ b/drivers/media/rc/imon.c
@@ -604,14 +604,15 @@ static int send_packet(struct imon_context *ictx) pr_err_ratelimited("error submitting urb(%d)\n", retval); } else { /* Wait for transmission to complete (or abort) */ + mutex_unlock(&ictx->lock); retval = wait_for_completion_interruptible( &ictx->tx.finished); if (retval) { usb_kill_urb(ictx->tx_urb); pr_err_ratelimited("task interrupted\n"); } + mutex_lock(&ictx->lock); - ictx->tx.busy = false; retval = ictx->tx.status; if (retval) pr_err_ratelimited("packet tx failed (%d)\n", retval); @@ -918,8 +919,7 @@ static ssize_t vfd_write(struct file *file, const char __user *buf, return -ENODEV; } - if (mutex_lock_interruptible(&ictx->lock)) - return -ERESTARTSYS; + mutex_lock(&ictx->lock); if (!ictx->dev_present_intf0) { pr_err_ratelimited("no iMON device present\n");
diff --git a/drivers/media/usb/dvb-usb/az6027.c b/drivers/media/usb/dvb-usb/az6027.c index ffc0db6..5aa9c50 100644 --- a/drivers/media/usb/dvb-usb/az6027.c +++ b/drivers/media/usb/dvb-usb/az6027.c
@@ -975,10 +975,6 @@ static int az6027_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg msg[], int n if (msg[i].addr == 0x99) { req = 0xBE; index = 0; - if (msg[i].len < 1) { - i = -EOPNOTSUPP; - break; - } value = msg[i].buf[0] & 0x00ff; length = 1; az6027_usb_out_op(d, req, value, index, data, length);
diff --git a/drivers/media/usb/dvb-usb/dvb-usb-init.c b/drivers/media/usb/dvb-usb/dvb-usb-init.c index cb5bf11..e7720ff 100644 --- a/drivers/media/usb/dvb-usb/dvb-usb-init.c +++ b/drivers/media/usb/dvb-usb/dvb-usb-init.c
@@ -81,7 +81,7 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) ret = dvb_usb_adapter_stream_init(adap); if (ret) - goto stream_init_err; + return ret; ret = dvb_usb_adapter_dvb_init(adap, adapter_nrs); if (ret) @@ -114,8 +114,6 @@ static int dvb_usb_adapter_init(struct dvb_usb_device *d, short *adapter_nrs) dvb_usb_adapter_dvb_exit(adap); dvb_init_err: dvb_usb_adapter_stream_exit(adap); -stream_init_err: - kfree(adap->priv); return ret; }
diff --git a/drivers/media/usb/hdpvr/hdpvr-video.c b/drivers/media/usb/hdpvr/hdpvr-video.c index 4f1505b..7849f1f 100644 --- a/drivers/media/usb/hdpvr/hdpvr-video.c +++ b/drivers/media/usb/hdpvr/hdpvr-video.c
@@ -409,7 +409,7 @@ static ssize_t hdpvr_read(struct file *file, char __user *buffer, size_t count, struct hdpvr_device *dev = video_drvdata(file); struct hdpvr_buffer *buf = NULL; struct urb *urb; - int ret = 0; + unsigned int ret = 0; int rem, cnt; if (*pos)
diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index d101fa8..11e7fcf 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c
@@ -2611,7 +2611,6 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, del_timer_sync(&hdw->encoder_run_timer); del_timer_sync(&hdw->encoder_wait_timer); flush_work(&hdw->workpoll); - v4l2_device_unregister(&hdw->v4l2_dev); usb_free_urb(hdw->ctl_read_urb); usb_free_urb(hdw->ctl_write_urb); kfree(hdw->ctl_read_buffer);
diff --git a/drivers/media/usb/siano/smsusb.c b/drivers/media/usb/siano/smsusb.c index 1db232a..9ba3a2a 100644 --- a/drivers/media/usb/siano/smsusb.c +++ b/drivers/media/usb/siano/smsusb.c
@@ -179,7 +179,6 @@ static void smsusb_stop_streaming(struct smsusb_device_t *dev) for (i = 0; i < MAX_URBS; i++) { usb_kill_urb(&dev->surbs[i].urb); - cancel_work_sync(&dev->surbs[i].wq); if (dev->surbs[i].cb) { smscore_putbuffer(dev->coredev, dev->surbs[i].cb);
diff --git a/drivers/media/usb/uvc/uvc_ctrl.c b/drivers/media/usb/uvc/uvc_ctrl.c index e0d894c..36abe47 100644 --- a/drivers/media/usb/uvc/uvc_ctrl.c +++ b/drivers/media/usb/uvc/uvc_ctrl.c
@@ -6,7 +6,6 @@ * Laurent Pinchart (laurent.pinchart@ideasonboard.com) */ -#include <asm/barrier.h> #include <linux/kernel.h> #include <linux/list.h> #include <linux/module.h> @@ -1276,12 +1275,17 @@ static void uvc_ctrl_send_slave_event(struct uvc_video_chain *chain, uvc_ctrl_send_event(chain, handle, ctrl, mapping, val, changes); } -void uvc_ctrl_status_event(struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data) +static void uvc_ctrl_status_event_work(struct work_struct *work) { + struct uvc_device *dev = container_of(work, struct uvc_device, + async_ctrl.work); + struct uvc_ctrl_work *w = &dev->async_ctrl; + struct uvc_video_chain *chain = w->chain; struct uvc_control_mapping *mapping; + struct uvc_control *ctrl = w->ctrl; struct uvc_fh *handle; unsigned int i; + int ret; mutex_lock(&chain->ctrl_mutex); @@ -1289,7 +1293,7 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, ctrl->handle = NULL; list_for_each_entry(mapping, &ctrl->info.mappings, list) { - s32 value = __uvc_ctrl_get_value(mapping, data); + s32 value = __uvc_ctrl_get_value(mapping, w->data); /* * handle may be NULL here if the device sends auto-update @@ -1308,20 +1312,6 @@ void uvc_ctrl_status_event(struct uvc_video_chain *chain, } mutex_unlock(&chain->ctrl_mutex); -} - -static void uvc_ctrl_status_event_work(struct work_struct *work) -{ - struct uvc_device *dev = container_of(work, struct uvc_device, - async_ctrl.work); - struct uvc_ctrl_work *w = &dev->async_ctrl; - int ret; - - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); - - /* The barrier is needed to synchronize with uvc_status_stop(). */ - if (smp_load_acquire(&dev->flush_status)) - return; /* Resubmit the URB. */ w->urb->interval = dev->int_ep->desc.bInterval; @@ -1331,8 +1321,8 @@ static void uvc_ctrl_status_event_work(struct work_struct *work) ret); } -bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data) +bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain, + struct uvc_control *ctrl, const u8 *data) { struct uvc_device *dev = chain->dev; struct uvc_ctrl_work *w = &dev->async_ctrl;
diff --git a/drivers/media/usb/uvc/uvc_driver.c b/drivers/media/usb/uvc/uvc_driver.c index 0caa57a..40ca1d4 100644 --- a/drivers/media/usb/uvc/uvc_driver.c +++ b/drivers/media/usb/uvc/uvc_driver.c
@@ -1060,8 +1060,10 @@ static int uvc_parse_vendor_control(struct uvc_device *dev, + n; memcpy(unit->extension.bmControls, &buffer[23+p], 2*n); - if (buffer[24+p+2*n] == 0 || - usb_string(udev, buffer[24+p+2*n], unit->name, sizeof(unit->name)) < 0) + if (buffer[24+p+2*n] != 0) + usb_string(udev, buffer[24+p+2*n], unit->name, + sizeof(unit->name)); + else sprintf(unit->name, "Extension %u", buffer[3]); list_add_tail(&unit->list, &dev->entities); @@ -1186,15 +1188,15 @@ static int uvc_parse_standard_control(struct uvc_device *dev, memcpy(term->media.bmTransportModes, &buffer[10+n], p); } - if (buffer[7] == 0 || - usb_string(udev, buffer[7], term->name, sizeof(term->name)) < 0) { - if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) - sprintf(term->name, "Camera %u", buffer[3]); - if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT) - sprintf(term->name, "Media %u", buffer[3]); - else - sprintf(term->name, "Input %u", buffer[3]); - } + if (buffer[7] != 0) + usb_string(udev, buffer[7], term->name, + sizeof(term->name)); + else if (UVC_ENTITY_TYPE(term) == UVC_ITT_CAMERA) + sprintf(term->name, "Camera %u", buffer[3]); + else if (UVC_ENTITY_TYPE(term) == UVC_ITT_MEDIA_TRANSPORT_INPUT) + sprintf(term->name, "Media %u", buffer[3]); + else + sprintf(term->name, "Input %u", buffer[3]); list_add_tail(&term->list, &dev->entities); break; @@ -1226,8 +1228,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, memcpy(term->baSourceID, &buffer[7], 1); - if (buffer[8] == 0 || - usb_string(udev, buffer[8], term->name, sizeof(term->name)) < 0) + if (buffer[8] != 0) + usb_string(udev, buffer[8], term->name, + sizeof(term->name)); + else sprintf(term->name, "Output %u", buffer[3]); list_add_tail(&term->list, &dev->entities); @@ -1249,8 +1253,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, memcpy(unit->baSourceID, &buffer[5], p); - if (buffer[5+p] == 0 || - usb_string(udev, buffer[5+p], unit->name, sizeof(unit->name)) < 0) + if (buffer[5+p] != 0) + usb_string(udev, buffer[5+p], unit->name, + sizeof(unit->name)); + else sprintf(unit->name, "Selector %u", buffer[3]); list_add_tail(&unit->list, &dev->entities); @@ -1280,8 +1286,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, if (dev->uvc_version >= 0x0110) unit->processing.bmVideoStandards = buffer[9+n]; - if (buffer[8+n] == 0 || - usb_string(udev, buffer[8+n], unit->name, sizeof(unit->name)) < 0) + if (buffer[8+n] != 0) + usb_string(udev, buffer[8+n], unit->name, + sizeof(unit->name)); + else sprintf(unit->name, "Processing %u", buffer[3]); list_add_tail(&unit->list, &dev->entities); @@ -1309,8 +1317,10 @@ static int uvc_parse_standard_control(struct uvc_device *dev, unit->extension.bmControls = (u8 *)unit + sizeof(*unit); memcpy(unit->extension.bmControls, &buffer[23+p], n); - if (buffer[23+p+n] == 0 || - usb_string(udev, buffer[23+p+n], unit->name, sizeof(unit->name)) < 0) + if (buffer[23+p+n] != 0) + usb_string(udev, buffer[23+p+n], unit->name, + sizeof(unit->name)); + else sprintf(unit->name, "Extension %u", buffer[3]); list_add_tail(&unit->list, &dev->entities); @@ -2462,24 +2472,6 @@ static const struct usb_device_id uvc_ids[] = { .bInterfaceSubClass = 1, .bInterfaceProtocol = 0, .driver_info = (kernel_ulong_t)&uvc_quirk_probe_minmax }, - /* Logitech, Webcam C910 */ - { .match_flags = USB_DEVICE_ID_MATCH_DEVICE - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = 0x046d, - .idProduct = 0x0821, - .bInterfaceClass = USB_CLASS_VIDEO, - .bInterfaceSubClass = 1, - .bInterfaceProtocol = 0, - .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, - /* Logitech, Webcam B910 */ - { .match_flags = USB_DEVICE_ID_MATCH_DEVICE - | USB_DEVICE_ID_MATCH_INT_INFO, - .idVendor = 0x046d, - .idProduct = 0x0823, - .bInterfaceClass = USB_CLASS_VIDEO, - .bInterfaceSubClass = 1, - .bInterfaceProtocol = 0, - .driver_info = UVC_INFO_QUIRK(UVC_QUIRK_WAKE_AUTOSUSPEND)}, /* Logitech Quickcam Fusion */ { .match_flags = USB_DEVICE_ID_MATCH_DEVICE | USB_DEVICE_ID_MATCH_INT_INFO,
diff --git a/drivers/media/usb/uvc/uvc_entity.c b/drivers/media/usb/uvc/uvc_entity.c index 7c98953..ca3a9c2 100644 --- a/drivers/media/usb/uvc/uvc_entity.c +++ b/drivers/media/usb/uvc/uvc_entity.c
@@ -37,7 +37,7 @@ static int uvc_mc_create_links(struct uvc_video_chain *chain, continue; remote = uvc_entity_by_id(chain->dev, entity->baSourceID[i]); - if (remote == NULL || remote->num_pads == 0) + if (remote == NULL) return -EINVAL; source = (UVC_ENTITY_TYPE(remote) == UVC_TT_STREAMING)
diff --git a/drivers/media/usb/uvc/uvc_status.c b/drivers/media/usb/uvc/uvc_status.c index 7372505..2bdb0ff 100644 --- a/drivers/media/usb/uvc/uvc_status.c +++ b/drivers/media/usb/uvc/uvc_status.c
@@ -6,7 +6,6 @@ * Laurent Pinchart (laurent.pinchart@ideasonboard.com) */ -#include <asm/barrier.h> #include <linux/kernel.h> #include <linux/input.h> #include <linux/slab.h> @@ -180,8 +179,7 @@ static bool uvc_event_control(struct urb *urb, switch (status->bAttribute) { case UVC_CTRL_VALUE_CHANGE: - return uvc_ctrl_status_event_async(urb, chain, ctrl, - status->bValue); + return uvc_ctrl_status_event(urb, chain, ctrl, status->bValue); case UVC_CTRL_INFO_CHANGE: case UVC_CTRL_FAILURE_CHANGE: @@ -311,41 +309,5 @@ int uvc_status_start(struct uvc_device *dev, gfp_t flags) void uvc_status_stop(struct uvc_device *dev) { - struct uvc_ctrl_work *w = &dev->async_ctrl; - - /* - * Prevent the asynchronous control handler from requeing the URB. The - * barrier is needed so the flush_status change is visible to other - * CPUs running the asynchronous handler before usb_kill_urb() is - * called below. - */ - smp_store_release(&dev->flush_status, true); - - /* - * Cancel any pending asynchronous work. If any status event was queued, - * process it synchronously. - */ - if (cancel_work_sync(&w->work)) - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); - - /* Kill the urb. */ usb_kill_urb(dev->int_urb); - - /* - * The URB completion handler may have queued asynchronous work. This - * won't resubmit the URB as flush_status is set, but it needs to be - * cancelled before returning or it could then race with a future - * uvc_status_start() call. - */ - if (cancel_work_sync(&w->work)) - uvc_ctrl_status_event(w->chain, w->ctrl, w->data); - - /* - * From this point, there are no events on the queue and the status URB - * is dead. No events will be queued until uvc_status_start() is called. - * The barrier is needed to make sure that flush_status is visible to - * uvc_ctrl_status_event_work() when uvc_status_start() will be called - * again. - */ - smp_store_release(&dev->flush_status, false); }
diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c index e676a9e..fe58723 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c
@@ -1308,9 +1308,7 @@ static void uvc_video_decode_meta(struct uvc_streaming *stream, if (has_scr) memcpy(stream->clock.last_scr, scr, 6); - meta->length = mem[0]; - meta->flags = mem[1]; - memcpy(meta->buf, &mem[2], length - 2); + memcpy(&meta->length, mem, length); meta_buf->bytesused += length + sizeof(meta->ns) + sizeof(meta->sof); uvc_trace(UVC_TRACE_FRAME, @@ -1905,17 +1903,6 @@ static int uvc_video_start_transfer(struct uvc_streaming *stream, uvc_trace(UVC_TRACE_VIDEO, "Selecting alternate setting %u " "(%u B/frame bandwidth).\n", altsetting, best_psize); - /* - * Some devices, namely the Logitech C910 and B910, are unable - * to recover from a USB autosuspend, unless the alternate - * setting of the streaming interface is toggled. - */ - if (stream->dev->quirks & UVC_QUIRK_WAKE_AUTOSUSPEND) { - usb_set_interface(stream->dev->udev, intfnum, - altsetting); - usb_set_interface(stream->dev->udev, intfnum, 0); - } - ret = usb_set_interface(stream->dev->udev, intfnum, altsetting); if (ret < 0) return ret;
diff --git a/drivers/media/usb/uvc/uvcvideo.h b/drivers/media/usb/uvc/uvcvideo.h index 9f5b960..5f13740 100644 --- a/drivers/media/usb/uvc/uvcvideo.h +++ b/drivers/media/usb/uvc/uvcvideo.h
@@ -199,7 +199,6 @@ #define UVC_QUIRK_RESTORE_CTRLS_ON_INIT 0x00000400 #define UVC_QUIRK_FORCE_Y8 0x00000800 #define UVC_QUIRK_FORCE_BPP 0x00001000 -#define UVC_QUIRK_WAKE_AUTOSUSPEND 0x00002000 /* Format flags */ #define UVC_FMT_FLAG_COMPRESSED 0x00000001 @@ -664,7 +663,6 @@ struct uvc_device { /* Status Interrupt Endpoint */ struct usb_host_endpoint *int_ep; struct urb *int_urb; - bool flush_status; u8 *status; struct input_dev *input; char input_phys[64]; @@ -834,9 +832,7 @@ int uvc_ctrl_add_mapping(struct uvc_video_chain *chain, int uvc_ctrl_init_device(struct uvc_device *dev); void uvc_ctrl_cleanup_device(struct uvc_device *dev); int uvc_ctrl_restore_values(struct uvc_device *dev); -bool uvc_ctrl_status_event_async(struct urb *urb, struct uvc_video_chain *chain, - struct uvc_control *ctrl, const u8 *data); -void uvc_ctrl_status_event(struct uvc_video_chain *chain, +bool uvc_ctrl_status_event(struct urb *urb, struct uvc_video_chain *chain, struct uvc_control *ctrl, const u8 *data); int uvc_ctrl_begin(struct uvc_video_chain *chain);
diff --git a/drivers/media/v4l2-core/v4l2-dv-timings.c b/drivers/media/v4l2-core/v4l2-dv-timings.c index 942d000..af48705 100644 --- a/drivers/media/v4l2-core/v4l2-dv-timings.c +++ b/drivers/media/v4l2-core/v4l2-dv-timings.c
@@ -145,8 +145,6 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, const struct v4l2_bt_timings *bt = &t->bt; const struct v4l2_bt_timings_cap *cap = &dvcap->bt; u32 caps = cap->capabilities; - const u32 max_vert = 10240; - u32 max_hor = 3 * bt->width; if (t->type != V4L2_DV_BT_656_1120) return false; @@ -163,26 +161,6 @@ bool v4l2_valid_dv_timings(const struct v4l2_dv_timings *t, (bt->interlaced && !(caps & V4L2_DV_BT_CAP_INTERLACED)) || (!bt->interlaced && !(caps & V4L2_DV_BT_CAP_PROGRESSIVE))) return false; - - /* sanity checks for the blanking timings */ - if (!bt->interlaced && - (bt->il_vbackporch || bt->il_vsync || bt->il_vfrontporch)) - return false; - /* - * Some video receivers cannot properly separate the frontporch, - * backporch and sync values, and instead they only have the total - * blanking. That can be assigned to any of these three fields. - * So just check that none of these are way out of range. - */ - if (bt->hfrontporch > max_hor || - bt->hsync > max_hor || bt->hbackporch > max_hor) - return false; - if (bt->vfrontporch > max_vert || - bt->vsync > max_vert || bt->vbackporch > max_vert) - return false; - if (bt->interlaced && (bt->il_vfrontporch > max_vert || - bt->il_vsync > max_vert || bt->il_vbackporch > max_vert)) - return false; return fnc == NULL || fnc(t, fnc_handle); } EXPORT_SYMBOL_GPL(v4l2_valid_dv_timings);
diff --git a/drivers/media/v4l2-core/videobuf-dma-contig.c b/drivers/media/v4l2-core/videobuf-dma-contig.c index 6a6cd04..aeb2f49 100644 --- a/drivers/media/v4l2-core/videobuf-dma-contig.c +++ b/drivers/media/v4l2-core/videobuf-dma-contig.c
@@ -36,11 +36,12 @@ struct videobuf_dma_contig_memory { static int __videobuf_dc_alloc(struct device *dev, struct videobuf_dma_contig_memory *mem, - unsigned long size) + unsigned long size, gfp_t flags) { mem->size = size; - mem->vaddr = dma_alloc_coherent(dev, mem->size, &mem->dma_handle, - GFP_KERNEL); + mem->vaddr = dma_alloc_coherent(dev, mem->size, + &mem->dma_handle, flags); + if (!mem->vaddr) { dev_err(dev, "memory alloc size %ld failed\n", mem->size); return -ENOMEM; @@ -257,7 +258,8 @@ static int __videobuf_iolock(struct videobuf_queue *q, return videobuf_dma_contig_user_get(mem, vb); /* allocate memory for the read() method */ - if (__videobuf_dc_alloc(q->dev, mem, PAGE_ALIGN(vb->size))) + if (__videobuf_dc_alloc(q->dev, mem, PAGE_ALIGN(vb->size), + GFP_KERNEL)) return -ENOMEM; break; case V4L2_MEMORY_OVERLAY: @@ -293,18 +295,22 @@ static int __videobuf_mmap_mapper(struct videobuf_queue *q, BUG_ON(!mem); MAGIC_CHECK(mem->magic, MAGIC_DC_MEM); - if (__videobuf_dc_alloc(q->dev, mem, PAGE_ALIGN(buf->bsize))) + if (__videobuf_dc_alloc(q->dev, mem, PAGE_ALIGN(buf->bsize), + GFP_KERNEL | __GFP_COMP)) goto error; + /* Try to remap memory */ + vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); + /* the "vm_pgoff" is just used in v4l2 to find the * corresponding buffer data structure which is allocated * earlier and it does not mean the offset from the physical * buffer start address as usual. So set it to 0 to pass - * the sanity check in dma_mmap_coherent(). + * the sanity check in vm_iomap_memory(). */ vma->vm_pgoff = 0; - retval = dma_mmap_coherent(q->dev, vma, mem->vaddr, mem->dma_handle, - mem->size); + + retval = vm_iomap_memory(vma, mem->dma_handle, mem->size); if (retval) { dev_err(q->dev, "mmap: remap failed with error %d. ", retval);
diff --git a/drivers/memory/atmel-sdramc.c b/drivers/memory/atmel-sdramc.c index ea6e9e1..9c49d00 100644 --- a/drivers/memory/atmel-sdramc.c +++ b/drivers/memory/atmel-sdramc.c
@@ -47,17 +47,19 @@ static int atmel_ramc_probe(struct platform_device *pdev) caps = of_device_get_match_data(&pdev->dev); if (caps->has_ddrck) { - clk = devm_clk_get_enabled(&pdev->dev, "ddrck"); + clk = devm_clk_get(&pdev->dev, "ddrck"); if (IS_ERR(clk)) return PTR_ERR(clk); + clk_prepare_enable(clk); } if (caps->has_mpddr_clk) { - clk = devm_clk_get_enabled(&pdev->dev, "mpddr"); + clk = devm_clk_get(&pdev->dev, "mpddr"); if (IS_ERR(clk)) { pr_err("AT91 RAMC: couldn't get mpddr clock\n"); return PTR_ERR(clk); } + clk_prepare_enable(clk); } return 0;
diff --git a/drivers/memory/mvebu-devbus.c b/drivers/memory/mvebu-devbus.c index 9bf477b..095f8a3 100644 --- a/drivers/memory/mvebu-devbus.c +++ b/drivers/memory/mvebu-devbus.c
@@ -282,9 +282,10 @@ static int mvebu_devbus_probe(struct platform_device *pdev) if (IS_ERR(devbus->base)) return PTR_ERR(devbus->base); - clk = devm_clk_get_enabled(&pdev->dev, NULL); + clk = devm_clk_get(&pdev->dev, NULL); if (IS_ERR(clk)) return PTR_ERR(clk); + clk_prepare_enable(clk); /* * Obtain clock period in picoseconds,
diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index 8357543..46539b2 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c
@@ -132,7 +132,6 @@ const struct lpddr2_timings *of_get_ddr_timings(struct device_node *np_ddr, for_each_child_of_node(np_ddr, np_tim) { if (of_device_is_compatible(np_tim, tim_compat)) { if (of_do_get_timings(np_tim, &timings[i])) { - of_node_put(np_tim); devm_kfree(dev, timings); goto default_timings; }
diff --git a/drivers/memory/pl353-smc.c b/drivers/memory/pl353-smc.c index 322d7ea..cc01979 100644 --- a/drivers/memory/pl353-smc.c +++ b/drivers/memory/pl353-smc.c
@@ -416,7 +416,6 @@ static int pl353_smc_probe(struct amba_device *adev, const struct amba_id *id) if (init) init(adev, child); of_platform_device_create(child, NULL, &adev->dev); - of_node_put(child); return 0;
diff --git a/drivers/memstick/core/memstick.c b/drivers/memstick/core/memstick.c index 1c7a9dc..12bc3f5 100644 --- a/drivers/memstick/core/memstick.c +++ b/drivers/memstick/core/memstick.c
@@ -412,7 +412,6 @@ static struct memstick_dev *memstick_alloc_card(struct memstick_host *host) return card; err_out: host->card = old_card; - kfree_const(card->dev.kobj.name); kfree(card); return NULL; } @@ -471,10 +470,8 @@ static void memstick_check(struct work_struct *work) put_device(&card->dev); host->card = NULL; } - } else { - kfree_const(card->dev.kobj.name); + } else kfree(card); - } } out_power_off:
diff --git a/drivers/memstick/core/ms_block.c b/drivers/memstick/core/ms_block.c index 6014fcb..55907e4 100644 --- a/drivers/memstick/core/ms_block.c +++ b/drivers/memstick/core/ms_block.c
@@ -1335,17 +1335,17 @@ static int msb_ftl_initialize(struct msb_data *msb) msb->zone_count = msb->block_count / MS_BLOCKS_IN_ZONE; msb->logical_block_count = msb->zone_count * 496 - 2; - msb->used_blocks_bitmap = bitmap_zalloc(msb->block_count, GFP_KERNEL); - msb->erased_blocks_bitmap = bitmap_zalloc(msb->block_count, GFP_KERNEL); + msb->used_blocks_bitmap = kzalloc(msb->block_count / 8, GFP_KERNEL); + msb->erased_blocks_bitmap = kzalloc(msb->block_count / 8, GFP_KERNEL); msb->lba_to_pba_table = kmalloc_array(msb->logical_block_count, sizeof(u16), GFP_KERNEL); if (!msb->used_blocks_bitmap || !msb->lba_to_pba_table || !msb->erased_blocks_bitmap) { - bitmap_free(msb->used_blocks_bitmap); - bitmap_free(msb->erased_blocks_bitmap); + kfree(msb->used_blocks_bitmap); kfree(msb->lba_to_pba_table); + kfree(msb->erased_blocks_bitmap); return -ENOMEM; } @@ -1953,8 +1953,7 @@ static int msb_bd_open(struct block_device *bdev, fmode_t mode) static void msb_data_clear(struct msb_data *msb) { kfree(msb->boot_page); - bitmap_free(msb->used_blocks_bitmap); - bitmap_free(msb->erased_blocks_bitmap); + kfree(msb->used_blocks_bitmap); kfree(msb->lba_to_pba_table); kfree(msb->cache); msb->card = NULL;
diff --git a/drivers/memstick/host/r592.c b/drivers/memstick/host/r592.c index dd06c18..eaa2a94 100644 --- a/drivers/memstick/host/r592.c +++ b/drivers/memstick/host/r592.c
@@ -828,7 +828,7 @@ static void r592_remove(struct pci_dev *pdev) /* Stop the processing thread. That ensures that we won't take any more requests */ kthread_stop(dev->io_thread); - del_timer_sync(&dev->detect_timer); + r592_enable_device(dev, false); while (!error && dev->req) {
diff --git a/drivers/mfd/arizona-core.c b/drivers/mfd/arizona-core.c index 07d256e..3ff872c 100644 --- a/drivers/mfd/arizona-core.c +++ b/drivers/mfd/arizona-core.c
@@ -45,7 +45,7 @@ int arizona_clk32k_enable(struct arizona *arizona) if (arizona->clk32k_ref == 1) { switch (arizona->pdata.clk32k_src) { case ARIZONA_32KZ_MCLK1: - ret = pm_runtime_resume_and_get(arizona->dev); + ret = pm_runtime_get_sync(arizona->dev); if (ret != 0) goto err_ref; ret = clk_prepare_enable(arizona->mclk[ARIZONA_MCLK1]);
diff --git a/drivers/mfd/fsl-imx25-tsadc.c b/drivers/mfd/fsl-imx25-tsadc.c index 5f1f6f3..a016b39 100644 --- a/drivers/mfd/fsl-imx25-tsadc.c +++ b/drivers/mfd/fsl-imx25-tsadc.c
@@ -69,7 +69,7 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, int irq; irq = platform_get_irq(pdev, 0); - if (irq < 0) + if (irq <= 0) return irq; tsadc->domain = irq_domain_add_simple(np, 2, 0, &mx25_tsadc_domain_ops, @@ -84,19 +84,6 @@ static int mx25_tsadc_setup_irq(struct platform_device *pdev, return 0; } -static int mx25_tsadc_unset_irq(struct platform_device *pdev) -{ - struct mx25_tsadc *tsadc = platform_get_drvdata(pdev); - int irq = platform_get_irq(pdev, 0); - - if (irq >= 0) { - irq_set_chained_handler_and_data(irq, NULL, NULL); - irq_domain_remove(tsadc->domain); - } - - return 0; -} - static void mx25_tsadc_setup_clk(struct platform_device *pdev, struct mx25_tsadc *tsadc) { @@ -184,21 +171,18 @@ static int mx25_tsadc_probe(struct platform_device *pdev) platform_set_drvdata(pdev, tsadc); - ret = devm_of_platform_populate(dev); - if (ret) - goto err_irq; - - return 0; - -err_irq: - mx25_tsadc_unset_irq(pdev); - - return ret; + return devm_of_platform_populate(dev); } static int mx25_tsadc_remove(struct platform_device *pdev) { - mx25_tsadc_unset_irq(pdev); + struct mx25_tsadc *tsadc = platform_get_drvdata(pdev); + int irq = platform_get_irq(pdev, 0); + + if (irq) { + irq_set_chained_handler_and_data(irq, NULL, NULL); + irq_domain_remove(tsadc->domain); + } return 0; }
diff --git a/drivers/mfd/intel_soc_pmic_core.c b/drivers/mfd/intel_soc_pmic_core.c index 4d9b2ad..c9f3537 100644 --- a/drivers/mfd/intel_soc_pmic_core.c +++ b/drivers/mfd/intel_soc_pmic_core.c
@@ -111,7 +111,6 @@ static int intel_soc_pmic_i2c_probe(struct i2c_client *i2c, return 0; err_del_irq_chip: - pwm_remove_table(crc_pwm_lookup, ARRAY_SIZE(crc_pwm_lookup)); regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data); return ret; }
diff --git a/drivers/mfd/lp8788-irq.c b/drivers/mfd/lp8788-irq.c index 3900629..348439a 100644 --- a/drivers/mfd/lp8788-irq.c +++ b/drivers/mfd/lp8788-irq.c
@@ -175,7 +175,6 @@ int lp8788_irq_init(struct lp8788 *lp, int irq) IRQF_TRIGGER_FALLING | IRQF_ONESHOT, "lp8788-irq", irqd); if (ret) { - irq_domain_remove(lp->irqdm); dev_err(lp->dev, "failed to create a thread for IRQ_N\n"); return ret; } @@ -189,6 +188,4 @@ void lp8788_irq_exit(struct lp8788 *lp) { if (lp->irq) free_irq(lp->irq, lp->irqdm); - if (lp->irqdm) - irq_domain_remove(lp->irqdm); }
diff --git a/drivers/mfd/lp8788.c b/drivers/mfd/lp8788.c index 5c3d642..768d556 100644 --- a/drivers/mfd/lp8788.c +++ b/drivers/mfd/lp8788.c
@@ -195,16 +195,8 @@ static int lp8788_probe(struct i2c_client *cl, const struct i2c_device_id *id) if (ret) return ret; - ret = mfd_add_devices(lp->dev, -1, lp8788_devs, - ARRAY_SIZE(lp8788_devs), NULL, 0, NULL); - if (ret) - goto err_exit_irq; - - return 0; - -err_exit_irq: - lp8788_irq_exit(lp); - return ret; + return mfd_add_devices(lp->dev, -1, lp8788_devs, + ARRAY_SIZE(lp8788_devs), NULL, 0, NULL); } static int lp8788_remove(struct i2c_client *cl)
diff --git a/drivers/mfd/max77620.c b/drivers/mfd/max77620.c index 2bf5bcb..a851ff4 100644 --- a/drivers/mfd/max77620.c +++ b/drivers/mfd/max77620.c
@@ -418,11 +418,9 @@ static int max77620_initialise_fps(struct max77620_chip *chip) ret = max77620_config_fps(chip, fps_child); if (ret < 0) { of_node_put(fps_child); - of_node_put(fps_np); return ret; } } - of_node_put(fps_np); config = chip->enable_global_lpm ? MAX77620_ONOFFCNFG2_SLP_LPM_MSK : 0; ret = regmap_update_bits(chip->rmap, MAX77620_REG_ONOFFCNFG2,
diff --git a/drivers/mfd/pcf50633-adc.c b/drivers/mfd/pcf50633-adc.c index 191b1bc..5cd653e 100644 --- a/drivers/mfd/pcf50633-adc.c +++ b/drivers/mfd/pcf50633-adc.c
@@ -136,7 +136,6 @@ int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, void *callback_param) { struct pcf50633_adc_request *req; - int ret; /* req is freed when the result is ready, in interrupt handler */ req = kmalloc(sizeof(*req), GFP_KERNEL); @@ -148,11 +147,7 @@ int pcf50633_adc_async_read(struct pcf50633 *pcf, int mux, int avg, req->callback = callback; req->callback_param = callback_param; - ret = adc_enqueue_request(pcf, req); - if (ret) - kfree(req); - - return ret; + return adc_enqueue_request(pcf, req); } EXPORT_SYMBOL_GPL(pcf50633_adc_async_read);
diff --git a/drivers/mfd/sm501.c b/drivers/mfd/sm501.c index aab8d89..bbcde58 100644 --- a/drivers/mfd/sm501.c +++ b/drivers/mfd/sm501.c
@@ -1733,12 +1733,7 @@ static struct platform_driver sm501_plat_driver = { static int __init sm501_base_init(void) { - int ret; - - ret = platform_driver_register(&sm501_plat_driver); - if (ret < 0) - return ret; - + platform_driver_register(&sm501_plat_driver); return pci_register_driver(&sm501_pci_driver); }
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c index 58811c5..70da0c4 100644 --- a/drivers/mfd/t7l66xb.c +++ b/drivers/mfd/t7l66xb.c
@@ -405,8 +405,11 @@ static int t7l66xb_probe(struct platform_device *dev) static int t7l66xb_remove(struct platform_device *dev) { + struct t7l66xb_platform_data *pdata = dev_get_platdata(&dev->dev); struct t7l66xb *t7l66xb = platform_get_drvdata(dev); + int ret; + ret = pdata->disable(dev); clk_disable_unprepare(t7l66xb->clk48m); clk_put(t7l66xb->clk48m); clk_disable_unprepare(t7l66xb->clk32k); @@ -417,7 +420,8 @@ static int t7l66xb_remove(struct platform_device *dev) mfd_remove_devices(&dev->dev); kfree(t7l66xb); - return 0; + return ret; + } static struct platform_driver t7l66xb_platform_driver = {
diff --git a/drivers/misc/cardreader/rtsx_pcr.c b/drivers/misc/cardreader/rtsx_pcr.c index 5807aef..4c707d8 100644 --- a/drivers/misc/cardreader/rtsx_pcr.c +++ b/drivers/misc/cardreader/rtsx_pcr.c
@@ -1485,7 +1485,7 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->remap_addr = ioremap_nocache(base, len); if (!pcr->remap_addr) { ret = -ENOMEM; - goto free_idr; + goto free_handle; } pcr->rtsx_resv_buf = dma_alloc_coherent(&(pcidev->dev), @@ -1547,10 +1547,6 @@ static int rtsx_pci_probe(struct pci_dev *pcidev, pcr->rtsx_resv_buf, pcr->rtsx_resv_buf_addr); unmap: iounmap(pcr->remap_addr); -free_idr: - spin_lock(&rtsx_pci_lock); - idr_remove(&rtsx_pci_idr, pcr->id); - spin_unlock(&rtsx_pci_lock); free_handle: kfree(handle); free_pcr:
diff --git a/drivers/misc/cxl/guest.c b/drivers/misc/cxl/guest.c index 6334376..186308f 100644 --- a/drivers/misc/cxl/guest.c +++ b/drivers/misc/cxl/guest.c
@@ -959,10 +959,10 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n * if it returns an error! */ if ((rc = cxl_register_afu(afu))) - goto err_put_dev; + goto err_put1; if ((rc = cxl_sysfs_afu_add(afu))) - goto err_del_dev; + goto err_put1; /* * pHyp doesn't expose the programming models supported by the @@ -978,7 +978,7 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n afu->modes_supported = CXL_MODE_DIRECTED; if ((rc = cxl_afu_select_best_mode(afu))) - goto err_remove_sysfs; + goto err_put2; adapter->afu[afu->slice] = afu; @@ -998,12 +998,10 @@ int cxl_guest_init_afu(struct cxl *adapter, int slice, struct device_node *afu_n return 0; -err_remove_sysfs: +err_put2: cxl_sysfs_afu_remove(afu); -err_del_dev: - device_del(&afu->dev); -err_put_dev: - put_device(&afu->dev); +err_put1: + device_unregister(&afu->dev); free = false; guest_release_serr_irq(afu); err2: @@ -1137,20 +1135,18 @@ struct cxl *cxl_guest_init_adapter(struct device_node *np, struct platform_devic * even if it returns an error! */ if ((rc = cxl_register_adapter(adapter))) - goto err_put_dev; + goto err_put1; if ((rc = cxl_sysfs_adapter_add(adapter))) - goto err_del_dev; + goto err_put1; /* release the context lock as the adapter is configured */ cxl_adapter_context_unlock(adapter); return adapter; -err_del_dev: - device_del(&adapter->dev); -err_put_dev: - put_device(&adapter->dev); +err_put1: + device_unregister(&adapter->dev); free = false; cxl_guest_remove_chardev(adapter); err1:
diff --git a/drivers/misc/cxl/irq.c b/drivers/misc/cxl/irq.c index 2e4dcfe..4cb829d 100644 --- a/drivers/misc/cxl/irq.c +++ b/drivers/misc/cxl/irq.c
@@ -349,7 +349,6 @@ int afu_allocate_irqs(struct cxl_context *ctx, u32 count) out: cxl_ops->release_irq_ranges(&ctx->irqs, ctx->afu->adapter); - bitmap_free(ctx->irq_bitmap); afu_irq_name_free(ctx); return -ENOMEM; }
diff --git a/drivers/misc/cxl/pci.c b/drivers/misc/cxl/pci.c index d183836..2ba899f 100644 --- a/drivers/misc/cxl/pci.c +++ b/drivers/misc/cxl/pci.c
@@ -387,7 +387,6 @@ int cxl_calc_capp_routing(struct pci_dev *dev, u64 *chipid, rc = get_phb_index(np, phb_index); if (rc) { pr_err("cxl: invalid phb index\n"); - of_node_put(np); return rc; } @@ -1165,10 +1164,10 @@ static int pci_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev) * if it returns an error! */ if ((rc = cxl_register_afu(afu))) - goto err_put_dev; + goto err_put1; if ((rc = cxl_sysfs_afu_add(afu))) - goto err_del_dev; + goto err_put1; adapter->afu[afu->slice] = afu; @@ -1177,12 +1176,10 @@ static int pci_init_afu(struct cxl *adapter, int slice, struct pci_dev *dev) return 0; -err_del_dev: - device_del(&afu->dev); -err_put_dev: +err_put1: pci_deconfigure_afu(afu); cxl_debugfs_afu_remove(afu); - put_device(&afu->dev); + device_unregister(&afu->dev); return rc; err_free_native: @@ -1670,25 +1667,23 @@ static struct cxl *cxl_pci_init_adapter(struct pci_dev *dev) * even if it returns an error! */ if ((rc = cxl_register_adapter(adapter))) - goto err_put_dev; + goto err_put1; if ((rc = cxl_sysfs_adapter_add(adapter))) - goto err_del_dev; + goto err_put1; /* Release the context lock as adapter is configured */ cxl_adapter_context_unlock(adapter); return adapter; -err_del_dev: - device_del(&adapter->dev); -err_put_dev: +err_put1: /* This should mirror cxl_remove_adapter, except without the * sysfs parts */ cxl_debugfs_adapter_remove(adapter); cxl_deconfigure_adapter(adapter); - put_device(&adapter->dev); + device_unregister(&adapter->dev); return ERR_PTR(rc); err_release:
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c index 19840ad..fb5ddf3 100644 --- a/drivers/misc/fastrpc.c +++ b/drivers/misc/fastrpc.c
@@ -218,13 +218,6 @@ static void fastrpc_free_map(struct kref *ref) dma_buf_put(map->buf); } - if (map->fl) { - spin_lock(&map->fl->lock); - list_del(&map->node); - spin_unlock(&map->fl->lock); - map->fl = NULL; - } - kfree(map); } @@ -234,12 +227,10 @@ static void fastrpc_map_put(struct fastrpc_map *map) kref_put(&map->refcount, fastrpc_free_map); } -static int fastrpc_map_get(struct fastrpc_map *map) +static void fastrpc_map_get(struct fastrpc_map *map) { - if (!map) - return -ENOENT; - - return kref_get_unless_zero(&map->refcount) ? 0 : -ENOENT; + if (map) + kref_get(&map->refcount); } static int fastrpc_map_find(struct fastrpc_user *fl, int fd, @@ -1089,7 +1080,12 @@ static int fastrpc_init_create_process(struct fastrpc_user *fl, fl->init_mem = NULL; fastrpc_buf_free(imem); err_alloc: - fastrpc_map_put(map); + if (map) { + spin_lock(&fl->lock); + list_del(&map->node); + spin_unlock(&fl->lock); + fastrpc_map_put(map); + } err: kfree(args); @@ -1165,8 +1161,10 @@ static int fastrpc_device_release(struct inode *inode, struct file *file) fastrpc_context_put(ctx); } - list_for_each_entry_safe(map, m, &fl->maps, node) + list_for_each_entry_safe(map, m, &fl->maps, node) { + list_del(&map->node); fastrpc_map_put(map); + } fastrpc_session_free(cctx, fl->sctx); fastrpc_channel_ctx_put(cctx); @@ -1359,12 +1357,7 @@ static int fastrpc_cb_probe(struct platform_device *pdev) of_property_read_u32(dev->of_node, "qcom,nsessions", &sessions); spin_lock_irqsave(&cctx->lock, flags); - if (cctx->sesscount >= FASTRPC_MAX_SESSIONS) { - dev_err(&pdev->dev, "too many sessions\n"); - spin_unlock_irqrestore(&cctx->lock, flags); - return -ENOSPC; - } - sess = &cctx->session[cctx->sesscount++]; + sess = &cctx->session[cctx->sesscount]; sess->used = false; sess->valid = true; sess->dev = dev; @@ -1377,12 +1370,13 @@ static int fastrpc_cb_probe(struct platform_device *pdev) struct fastrpc_session_ctx *dup_sess; for (i = 1; i < sessions; i++) { - if (cctx->sesscount >= FASTRPC_MAX_SESSIONS) + if (cctx->sesscount++ >= FASTRPC_MAX_SESSIONS) break; - dup_sess = &cctx->session[cctx->sesscount++]; + dup_sess = &cctx->session[cctx->sesscount]; memcpy(dup_sess, sess, sizeof(*dup_sess)); } } + cctx->sesscount++; spin_unlock_irqrestore(&cctx->lock, flags); rc = dma_set_mask(dev, DMA_BIT_MASK(32)); if (rc) {
diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c index 27262e7..0a2b99e 100644 --- a/drivers/misc/mei/bus-fixup.c +++ b/drivers/misc/mei/bus-fixup.c
@@ -178,7 +178,7 @@ static int mei_fwver(struct mei_cl_device *cldev) ret = __mei_cl_send(cldev->cl, buf, sizeof(struct mkhi_msg_hdr), MEI_CL_IO_TX_BLOCKING); if (ret < 0) { - dev_err(&cldev->dev, "Could not send ReqFWVersion cmd ret = %d\n", ret); + dev_err(&cldev->dev, "Could not send ReqFWVersion cmd\n"); return ret; } @@ -190,7 +190,7 @@ static int mei_fwver(struct mei_cl_device *cldev) * Should be at least one version block, * error out if nothing found */ - dev_err(&cldev->dev, "Could not read FW version ret = %d\n", bytes_recv); + dev_err(&cldev->dev, "Could not read FW version\n"); return -EIO; } @@ -339,7 +339,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, ret = __mei_cl_send(cl, (u8 *)&cmd, sizeof(struct mei_nfc_cmd), MEI_CL_IO_TX_BLOCKING); if (ret < 0) { - dev_err(bus->dev, "Could not send IF version cmd ret = %d\n", ret); + dev_err(bus->dev, "Could not send IF version cmd\n"); return ret; } @@ -354,7 +354,7 @@ static int mei_nfc_if_version(struct mei_cl *cl, ret = 0; bytes_recv = __mei_cl_recv(cl, (u8 *)reply, if_version_length, 0, 0); if (bytes_recv < 0 || (size_t)bytes_recv < if_version_length) { - dev_err(bus->dev, "Could not read IF version ret = %d\n", bytes_recv); + dev_err(bus->dev, "Could not read IF version\n"); ret = -EIO; goto err; }
diff --git a/drivers/misc/ocxl/file.c b/drivers/misc/ocxl/file.c index 524ded8..c742ab0 100644 --- a/drivers/misc/ocxl/file.c +++ b/drivers/misc/ocxl/file.c
@@ -259,8 +259,6 @@ static long afu_ioctl(struct file *file, unsigned int cmd, if (IS_ERR(ev_ctx)) return PTR_ERR(ev_ctx); rc = ocxl_irq_set_handler(ctx, irq_id, irq_handler, irq_free, ev_ctx); - if (rc) - eventfd_ctx_put(ev_ctx); break; case OCXL_IOCTL_GET_METADATA: @@ -543,11 +541,8 @@ int ocxl_file_register_afu(struct ocxl_afu *afu) goto err_put; rc = device_register(&info->dev); - if (rc) { - free_minor(info); - put_device(&info->dev); - return rc; - } + if (rc) + goto err_put; rc = ocxl_sysfs_register_afu(info); if (rc)
diff --git a/drivers/misc/sgi-gru/grufault.c b/drivers/misc/sgi-gru/grufault.c index 7f26a78..4b713a8 100644 --- a/drivers/misc/sgi-gru/grufault.c +++ b/drivers/misc/sgi-gru/grufault.c
@@ -648,7 +648,6 @@ int gru_handle_user_call_os(unsigned long cb) if ((cb & (GRU_HANDLE_STRIDE - 1)) || ucbnum >= GRU_NUM_CB) return -EINVAL; -again: gts = gru_find_lock_gts(cb); if (!gts) return -EINVAL; @@ -657,11 +656,7 @@ int gru_handle_user_call_os(unsigned long cb) if (ucbnum >= gts->ts_cbr_au_count * GRU_CBR_AU_SIZE) goto exit; - if (gru_check_context_placement(gts)) { - gru_unlock_gts(gts); - gru_unload_context(gts, 1); - goto again; - } + gru_check_context_placement(gts); /* * CCH may contain stale data if ts_force_cch_reload is set. @@ -879,11 +874,7 @@ int gru_set_context_option(unsigned long arg) } else { gts->ts_user_blade_id = req.val1; gts->ts_user_chiplet_id = req.val0; - if (gru_check_context_placement(gts)) { - gru_unlock_gts(gts); - gru_unload_context(gts, 1); - return ret; - } + gru_check_context_placement(gts); } break; case sco_gseg_owner:
diff --git a/drivers/misc/sgi-gru/grumain.c b/drivers/misc/sgi-gru/grumain.c index e2325e3..40ac59d 100644 --- a/drivers/misc/sgi-gru/grumain.c +++ b/drivers/misc/sgi-gru/grumain.c
@@ -716,10 +716,9 @@ static int gru_check_chiplet_assignment(struct gru_state *gru, * chiplet. Misassignment can occur if the process migrates to a different * blade or if the user changes the selected blade/chiplet. */ -int gru_check_context_placement(struct gru_thread_state *gts) +void gru_check_context_placement(struct gru_thread_state *gts) { struct gru_state *gru; - int ret = 0; /* * If the current task is the context owner, verify that the @@ -727,23 +726,15 @@ int gru_check_context_placement(struct gru_thread_state *gts) * references. Pthread apps use non-owner references to the CBRs. */ gru = gts->ts_gru; - /* - * If gru or gts->ts_tgid_owner isn't initialized properly, return - * success to indicate that the caller does not need to unload the - * gru context.The caller is responsible for their inspection and - * reinitialization if needed. - */ if (!gru || gts->ts_tgid_owner != current->tgid) - return ret; + return; if (!gru_check_chiplet_assignment(gru, gts)) { STAT(check_context_unload); - ret = -EINVAL; + gru_unload_context(gts, 1); } else if (gru_retarget_intr(gts)) { STAT(check_context_retarget_intr); } - - return ret; } @@ -943,12 +934,7 @@ vm_fault_t gru_fault(struct vm_fault *vmf) mutex_lock(>s->ts_ctxlock); preempt_disable(); - if (gru_check_context_placement(gts)) { - preempt_enable(); - mutex_unlock(>s->ts_ctxlock); - gru_unload_context(gts, 1); - return VM_FAULT_NOPAGE; - } + gru_check_context_placement(gts); if (!gts->ts_gru) { STAT(load_user_context);
diff --git a/drivers/misc/sgi-gru/grutables.h b/drivers/misc/sgi-gru/grutables.h index 6cebec4..a7e44b2 100644 --- a/drivers/misc/sgi-gru/grutables.h +++ b/drivers/misc/sgi-gru/grutables.h
@@ -637,7 +637,7 @@ extern int gru_user_flush_tlb(unsigned long arg); extern int gru_user_unload_context(unsigned long arg); extern int gru_get_exception_detail(unsigned long arg); extern int gru_set_context_option(unsigned long address); -extern int gru_check_context_placement(struct gru_thread_state *gts); +extern void gru_check_context_placement(struct gru_thread_state *gts); extern int gru_cpu_fault_map_id(void); extern struct vm_area_struct *gru_find_vma(unsigned long vaddr); extern void gru_flush_all_tlb(struct gru_state *gru);
diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c index 8f0ffb4..e6b40aa 100644 --- a/drivers/misc/tifm_7xx1.c +++ b/drivers/misc/tifm_7xx1.c
@@ -190,7 +190,7 @@ static void tifm_7xx1_switch_media(struct work_struct *work) spin_unlock_irqrestore(&fm->lock, flags); } if (sock) - put_device(&sock->dev); + tifm_free_device(&sock->dev); } spin_lock_irqsave(&fm->lock, flags); }
diff --git a/drivers/misc/vmw_vmci/vmci_queue_pair.c b/drivers/misc/vmw_vmci/vmci_queue_pair.c index d4d388f..a49782d 100644 --- a/drivers/misc/vmw_vmci/vmci_queue_pair.c +++ b/drivers/misc/vmw_vmci/vmci_queue_pair.c
@@ -852,7 +852,6 @@ static int qp_notify_peer_local(bool attach, struct vmci_handle handle) u32 context_id = vmci_get_context_id(); struct vmci_event_qp ev; - memset(&ev, 0, sizeof(ev)); ev.msg.hdr.dst = vmci_make_handle(context_id, VMCI_EVENT_HANDLER); ev.msg.hdr.src = vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID, VMCI_CONTEXT_RESOURCE_ID); @@ -1466,7 +1465,6 @@ static int qp_notify_peer(bool attach, * kernel. */ - memset(&ev, 0, sizeof(ev)); ev.msg.hdr.dst = vmci_make_handle(peer_id, VMCI_EVENT_HANDLER); ev.msg.hdr.src = vmci_make_handle(VMCI_HYPERVISOR_CONTEXT_ID, VMCI_CONTEXT_RESOURCE_ID);
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index d64352f..4b92e13 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c
@@ -1149,13 +1149,7 @@ u32 mmc_select_voltage(struct mmc_host *host, u32 ocr) mmc_power_cycle(host, ocr); } else { bit = fls(ocr) - 1; - /* - * The bit variable represents the highest voltage bit set in - * the OCR register. - * To keep a range of 2 values (e.g. 3.2V/3.3V and 3.3V/3.4V), - * we must shift the mask '3' with (bit - 1). - */ - ocr &= 3 << (bit - 1); + ocr &= 3 << bit; if (bit != host->ios.vdd) dev_warn(mmc_dev(host), "exceeding card's volts\n"); } @@ -1560,11 +1554,6 @@ void mmc_init_erase(struct mmc_card *card) card->pref_erase = 0; } -static bool is_trim_arg(unsigned int arg) -{ - return (arg & MMC_TRIM_OR_DISCARD_ARGS) && arg != MMC_DISCARD_ARG; -} - static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card, unsigned int arg, unsigned int qty) { @@ -1896,7 +1885,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_ER_EN)) return -EOPNOTSUPP; - if (mmc_card_mmc(card) && is_trim_arg(arg) && + if (mmc_card_mmc(card) && (arg & MMC_TRIM_ARGS) && !(card->ext_csd.sec_feature_support & EXT_CSD_SEC_GB_CL_EN)) return -EOPNOTSUPP; @@ -1926,7 +1915,7 @@ int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, * identified by the card->eg_boundary flag. */ rem = card->erase_size - (from % card->erase_size); - if ((arg & MMC_TRIM_OR_DISCARD_ARGS) && card->eg_boundary && nr > rem) { + if ((arg & MMC_TRIM_ARGS) && (card->eg_boundary) && (nr > rem)) { err = mmc_do_erase(card, from, from + rem - 1, arg); from += rem; if ((err) || (to <= from))
diff --git a/drivers/mmc/core/mmc_test.c b/drivers/mmc/core/mmc_test.c index cd64e0f..492dd45 100644 --- a/drivers/mmc/core/mmc_test.c +++ b/drivers/mmc/core/mmc_test.c
@@ -3167,8 +3167,7 @@ static int __mmc_test_register_dbgfs_file(struct mmc_card *card, struct mmc_test_dbgfs_file *df; if (card->debugfs_root) - file = debugfs_create_file(name, mode, card->debugfs_root, - card, fops); + debugfs_create_file(name, mode, card->debugfs_root, card, fops); df = kmalloc(sizeof(*df), GFP_KERNEL); if (!df) {
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 854f7c6..4e935d0 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c
@@ -799,8 +799,7 @@ int mmc_sd_get_cid(struct mmc_host *host, u32 ocr, u32 *cid, u32 *rocr) * the CCS bit is set as well. We deliberately deviate from the spec in * regards to this, which allows UHS-I to be supported for SDSC cards. */ - if (!mmc_host_is_spi(host) && (ocr & SD_OCR_S18R) && - rocr && (*rocr & SD_ROCR_S18A)) { + if (!mmc_host_is_spi(host) && rocr && (*rocr & 0x01000000)) { err = mmc_set_uhs_voltage(host, pocr); if (err == -EAGAIN) { retries--;
diff --git a/drivers/mmc/core/sdio_bus.c b/drivers/mmc/core/sdio_bus.c index 69eeff7..3cc9282 100644 --- a/drivers/mmc/core/sdio_bus.c +++ b/drivers/mmc/core/sdio_bus.c
@@ -266,14 +266,7 @@ static void sdio_release_func(struct device *dev) { struct sdio_func *func = dev_to_sdio_func(dev); - if (!(func->card->quirks & MMC_QUIRK_NONSTD_SDIO)) - sdio_free_func_cis(func); - - /* - * We have now removed the link to the tuples in the - * card structure, so remove the reference. - */ - put_device(&func->card->dev); + sdio_free_func_cis(func); kfree(func->info); kfree(func->tmpbuf); @@ -305,12 +298,6 @@ struct sdio_func *sdio_alloc_func(struct mmc_card *card) device_initialize(&func->dev); - /* - * We may link to tuples in the card structure, - * we need make sure we have a reference to it. - */ - get_device(&func->card->dev); - func->dev.parent = &card->dev; func->dev.bus = &sdio_bus_type; func->dev.release = sdio_release_func; @@ -364,9 +351,10 @@ int sdio_add_func(struct sdio_func *func) */ void sdio_remove_func(struct sdio_func *func) { - if (sdio_func_present(func)) - device_del(&func->dev); + if (!sdio_func_present(func)) + return; + device_del(&func->dev); of_node_put(func->dev.of_node); put_device(&func->dev); }
diff --git a/drivers/mmc/core/sdio_cis.c b/drivers/mmc/core/sdio_cis.c index ca94ff2..5be378f 100644 --- a/drivers/mmc/core/sdio_cis.c +++ b/drivers/mmc/core/sdio_cis.c
@@ -395,6 +395,12 @@ int sdio_read_func_cis(struct sdio_func *func) return ret; /* + * Since we've linked to tuples in the card structure, + * we must make sure we have a reference to it. + */ + get_device(&func->card->dev); + + /* * Vendor/device id is optional for function CIS, so * copy it from the card structure as needed. */ @@ -419,5 +425,11 @@ void sdio_free_func_cis(struct sdio_func *func) } func->tuples = NULL; + + /* + * We have now removed the link to the tuples in the + * card structure, so remove the reference. + */ + put_device(&func->card->dev); }
diff --git a/drivers/mmc/host/alcor.c b/drivers/mmc/host/alcor.c index a8ec2e6..026ca91 100644 --- a/drivers/mmc/host/alcor.c +++ b/drivers/mmc/host/alcor.c
@@ -1114,10 +1114,7 @@ static int alcor_pci_sdmmc_drv_probe(struct platform_device *pdev) alcor_hw_init(host); dev_set_drvdata(&pdev->dev, host); - ret = mmc_add_host(mmc); - if (ret) - goto free_host; - + mmc_add_host(mmc); return 0; free_host:
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 4d8f277..c26fbe5 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c
@@ -1812,6 +1812,7 @@ static void atmci_tasklet_func(unsigned long priv) atmci_writel(host, ATMCI_IER, ATMCI_NOTBUSY); state = STATE_WAITING_NOTBUSY; } else if (host->mrq->stop) { + atmci_writel(host, ATMCI_IER, ATMCI_CMDRDY); atmci_send_stop_cmd(host, data); state = STATE_SENDING_STOP; } else { @@ -1844,6 +1845,8 @@ static void atmci_tasklet_func(unsigned long priv) * command to send. */ if (host->mrq->stop) { + atmci_writel(host, ATMCI_IER, + ATMCI_CMDRDY); atmci_send_stop_cmd(host, data); state = STATE_SENDING_STOP; } else { @@ -2214,7 +2217,6 @@ static int atmci_init_slot(struct atmel_mci *host, { struct mmc_host *mmc; struct atmel_mci_slot *slot; - int ret; mmc = mmc_alloc_host(sizeof(struct atmel_mci_slot), &host->pdev->dev); if (!mmc) @@ -2298,13 +2300,11 @@ static int atmci_init_slot(struct atmel_mci *host, host->slot[id] = slot; mmc_regulator_get_supply(mmc); - ret = mmc_add_host(mmc); - if (ret) { - mmc_free_host(mmc); - return ret; - } + mmc_add_host(mmc); if (gpio_is_valid(slot->detect_pin)) { + int ret; + timer_setup(&slot->detect_timer, atmci_detect_change, 0); ret = request_irq(gpio_to_irq(slot->detect_pin),
diff --git a/drivers/mmc/host/au1xmmc.c b/drivers/mmc/host/au1xmmc.c index 9c4a67f..bc8aeb4 100644 --- a/drivers/mmc/host/au1xmmc.c +++ b/drivers/mmc/host/au1xmmc.c
@@ -1116,9 +1116,8 @@ static int au1xmmc_probe(struct platform_device *pdev) if (host->platdata && host->platdata->cd_setup && !(mmc->caps & MMC_CAP_NEEDS_POLL)) host->platdata->cd_setup(mmc, 0); - - clk_disable_unprepare(host->clk); out_clk: + clk_disable_unprepare(host->clk); clk_put(host->clk); out_irq: free_irq(host->irq, host);
diff --git a/drivers/mmc/host/cavium-octeon.c b/drivers/mmc/host/cavium-octeon.c index 2245452..22aded1 100644 --- a/drivers/mmc/host/cavium-octeon.c +++ b/drivers/mmc/host/cavium-octeon.c
@@ -288,7 +288,6 @@ static int octeon_mmc_probe(struct platform_device *pdev) if (ret) { dev_err(&pdev->dev, "Error populating slots\n"); octeon_mmc_set_shared_power(host, 0); - of_node_put(cn); goto error; } i++;
diff --git a/drivers/mmc/host/cavium-thunderx.c b/drivers/mmc/host/cavium-thunderx.c index f79806e..eee08d8 100644 --- a/drivers/mmc/host/cavium-thunderx.c +++ b/drivers/mmc/host/cavium-thunderx.c
@@ -138,10 +138,8 @@ static int thunder_mmc_probe(struct pci_dev *pdev, continue; ret = cvm_mmc_of_slot_probe(&host->slot_pdev[i]->dev, host); - if (ret) { - of_node_put(child_node); + if (ret) goto error; - } } i++; }
diff --git a/drivers/mmc/host/mmc_spi.c b/drivers/mmc/host/mmc_spi.c index 7874b26..7083d8d 100644 --- a/drivers/mmc/host/mmc_spi.c +++ b/drivers/mmc/host/mmc_spi.c
@@ -1420,7 +1420,7 @@ static int mmc_spi_probe(struct spi_device *spi) status = mmc_add_host(mmc); if (status != 0) - goto fail_glue_init; + goto fail_add_host; /* * Index 0 is card detect @@ -1428,7 +1428,7 @@ static int mmc_spi_probe(struct spi_device *spi) */ status = mmc_gpiod_request_cd(mmc, NULL, 0, false, 1, NULL); if (status == -EPROBE_DEFER) - goto fail_gpiod_request; + goto fail_add_host; if (!status) { /* * The platform has a CD GPIO signal that may support @@ -1443,7 +1443,7 @@ static int mmc_spi_probe(struct spi_device *spi) /* Index 1 is write protect/read only */ status = mmc_gpiod_request_ro(mmc, NULL, 1, 0, NULL); if (status == -EPROBE_DEFER) - goto fail_gpiod_request; + goto fail_add_host; if (!status) has_ro = true; @@ -1457,7 +1457,7 @@ static int mmc_spi_probe(struct spi_device *spi) ? ", cd polling" : ""); return 0; -fail_gpiod_request: +fail_add_host: mmc_remove_host(mmc); fail_glue_init: if (host->dma_dev)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c index 1e5e244..7e4bc91 100644 --- a/drivers/mmc/host/mmci.c +++ b/drivers/mmc/host/mmci.c
@@ -2079,9 +2079,7 @@ static int mmci_probe(struct amba_device *dev, pm_runtime_set_autosuspend_delay(&dev->dev, 50); pm_runtime_use_autosuspend(&dev->dev); - ret = mmc_add_host(mmc); - if (ret) - goto clk_disable; + mmc_add_host(mmc); pm_runtime_put(&dev->dev); return 0;
diff --git a/drivers/mmc/host/moxart-mmc.c b/drivers/mmc/host/moxart-mmc.c index 52307dc..5c81dc7 100644 --- a/drivers/mmc/host/moxart-mmc.c +++ b/drivers/mmc/host/moxart-mmc.c
@@ -111,8 +111,8 @@ #define CLK_DIV_MASK 0x7f /* REG_BUS_WIDTH */ -#define BUS_WIDTH_4_SUPPORT BIT(3) -#define BUS_WIDTH_4 BIT(2) +#define BUS_WIDTH_8 BIT(2) +#define BUS_WIDTH_4 BIT(1) #define BUS_WIDTH_1 BIT(0) #define MMC_VDD_360 23 @@ -527,6 +527,9 @@ static void moxart_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) case MMC_BUS_WIDTH_4: writel(BUS_WIDTH_4, host->base + REG_BUS_WIDTH); break; + case MMC_BUS_WIDTH_8: + writel(BUS_WIDTH_8, host->base + REG_BUS_WIDTH); + break; default: writel(BUS_WIDTH_1, host->base + REG_BUS_WIDTH); break; @@ -643,8 +646,16 @@ static int moxart_probe(struct platform_device *pdev) dmaengine_slave_config(host->dma_chan_rx, &cfg); } - if (readl(host->base + REG_BUS_WIDTH) & BUS_WIDTH_4_SUPPORT) + switch ((readl(host->base + REG_BUS_WIDTH) >> 3) & 3) { + case 1: mmc->caps |= MMC_CAP_4_BIT_DATA; + break; + case 2: + mmc->caps |= MMC_CAP_4_BIT_DATA | MMC_CAP_8_BIT_DATA; + break; + default: + break; + } writel(0, host->base + REG_INTERRUPT_MASK); @@ -660,9 +671,7 @@ static int moxart_probe(struct platform_device *pdev) goto out; dev_set_drvdata(dev, mmc); - ret = mmc_add_host(mmc); - if (ret) - goto out; + mmc_add_host(mmc); dev_dbg(dev, "IRQ=%d, FIFO is %d bytes\n", irq, host->fifo_width);
diff --git a/drivers/mmc/host/mxcmmc.c b/drivers/mmc/host/mxcmmc.c index 9165af4..011b59a 100644 --- a/drivers/mmc/host/mxcmmc.c +++ b/drivers/mmc/host/mxcmmc.c
@@ -1158,9 +1158,7 @@ static int mxcmci_probe(struct platform_device *pdev) timer_setup(&host->watchdog, mxcmci_watchdog, 0); - ret = mmc_add_host(mmc); - if (ret) - goto out_free_dma; + mmc_add_host(mmc); return 0;
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index ee9edf8..d0df054 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1998,9 +1998,7 @@ static int omap_hsmmc_probe(struct platform_device *pdev) if (!ret) mmc->caps |= MMC_CAP_SDIO_IRQ; - ret = mmc_add_host(mmc); - if (ret) - goto err_irq; + mmc_add_host(mmc); if (mmc_pdata(host)->name != NULL) { ret = device_create_file(&mmc->class_dev, &dev_attr_slot_name);
diff --git a/drivers/mmc/host/pxamci.c b/drivers/mmc/host/pxamci.c index 7f96df4..953e745 100644 --- a/drivers/mmc/host/pxamci.c +++ b/drivers/mmc/host/pxamci.c
@@ -648,7 +648,7 @@ static int pxamci_probe(struct platform_device *pdev) ret = pxamci_of_init(pdev, mmc); if (ret) - goto out; + return ret; host = mmc_priv(mmc); host->mmc = mmc; @@ -672,7 +672,7 @@ static int pxamci_probe(struct platform_device *pdev) ret = pxamci_init_ocr(host); if (ret < 0) - goto out; + return ret; mmc->caps = 0; host->cmdat = 0; @@ -761,12 +761,7 @@ static int pxamci_probe(struct platform_device *pdev) dev_warn(dev, "gpio_ro and get_ro() both defined\n"); } - ret = mmc_add_host(mmc); - if (ret) { - if (host->pdata && host->pdata->exit) - host->pdata->exit(dev, mmc); - goto out; - } + mmc_add_host(mmc); return 0;
diff --git a/drivers/mmc/host/rtsx_usb_sdmmc.c b/drivers/mmc/host/rtsx_usb_sdmmc.c index 3261560..81d0dfe 100644 --- a/drivers/mmc/host/rtsx_usb_sdmmc.c +++ b/drivers/mmc/host/rtsx_usb_sdmmc.c
@@ -1338,7 +1338,6 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev) #ifdef RTSX_USB_USE_LEDS_CLASS int err; #endif - int ret; ucr = usb_get_intfdata(to_usb_interface(pdev->dev.parent)); if (!ucr) @@ -1375,15 +1374,7 @@ static int rtsx_usb_sdmmc_drv_probe(struct platform_device *pdev) INIT_WORK(&host->led_work, rtsx_usb_update_led); #endif - ret = mmc_add_host(mmc); - if (ret) { -#ifdef RTSX_USB_USE_LEDS_CLASS - led_classdev_unregister(&host->led); -#endif - mmc_free_host(mmc); - pm_runtime_disable(&pdev->dev); - return ret; - } + mmc_add_host(mmc); return 0; }
diff --git a/drivers/mmc/host/sdhci-cqhci.h b/drivers/mmc/host/sdhci-cqhci.h deleted file mode 100644 index cf8e7ba..0000000 --- a/drivers/mmc/host/sdhci-cqhci.h +++ /dev/null
@@ -1,24 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-only */ -/* - * Copyright 2022 The Chromium OS Authors - * - * Support that applies to the combination of SDHCI and CQHCI, while not - * expressing a dependency between the two modules. - */ - -#ifndef __MMC_HOST_SDHCI_CQHCI_H__ -#define __MMC_HOST_SDHCI_CQHCI_H__ - -#include "cqhci.h" -#include "sdhci.h" - -static inline void sdhci_and_cqhci_reset(struct sdhci_host *host, u8 mask) -{ - if ((host->mmc->caps2 & MMC_CAP2_CQE) && (mask & SDHCI_RESET_ALL) && - host->mmc->cqe_private) - cqhci_deactivate(host->mmc); - - sdhci_reset(host, mask); -} - -#endif /* __MMC_HOST_SDHCI_CQHCI_H__ */
diff --git a/drivers/mmc/host/sdhci-esdhc-imx.c b/drivers/mmc/host/sdhci-esdhc-imx.c index b3f761e..d97c19e 100644 --- a/drivers/mmc/host/sdhci-esdhc-imx.c +++ b/drivers/mmc/host/sdhci-esdhc-imx.c
@@ -89,8 +89,6 @@ /* NOTE: the minimum valid tuning start tap for mx6sl is 1 */ #define ESDHC_TUNING_START_TAP_DEFAULT 0x1 #define ESDHC_TUNING_START_TAP_MASK 0x7f -#define ESDHC_TUNING_CMD_CRC_CHECK_DISABLE (1 << 7) -#define ESDHC_TUNING_STEP_DEFAULT 0x1 #define ESDHC_TUNING_STEP_MASK 0x00070000 #define ESDHC_TUNING_STEP_SHIFT 16 @@ -1182,8 +1180,7 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host) { struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct pltfm_imx_data *imx_data = sdhci_pltfm_priv(pltfm_host); - struct cqhci_host *cq_host = host->mmc->cqe_private; - u32 tmp; + int tmp; if (esdhc_is_usdhc(imx_data)) { /* @@ -1236,37 +1233,18 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host) if (imx_data->socdata->flags & ESDHC_FLAG_STD_TUNING) { tmp = readl(host->ioaddr + ESDHC_TUNING_CTRL); - tmp |= ESDHC_STD_TUNING_EN; - - /* - * ROM code or bootloader may config the start tap - * and step, unmask them first. - */ - tmp &= ~(ESDHC_TUNING_START_TAP_MASK | ESDHC_TUNING_STEP_MASK); - if (imx_data->boarddata.tuning_start_tap) + tmp |= ESDHC_STD_TUNING_EN | + ESDHC_TUNING_START_TAP_DEFAULT; + if (imx_data->boarddata.tuning_start_tap) { + tmp &= ~ESDHC_TUNING_START_TAP_MASK; tmp |= imx_data->boarddata.tuning_start_tap; - else - tmp |= ESDHC_TUNING_START_TAP_DEFAULT; - - if (imx_data->boarddata.tuning_step) { - tmp |= imx_data->boarddata.tuning_step - << ESDHC_TUNING_STEP_SHIFT; - } else { - tmp |= ESDHC_TUNING_STEP_DEFAULT - << ESDHC_TUNING_STEP_SHIFT; } - /* Disable the CMD CRC check for tuning, if not, need to - * add some delay after every tuning command, because - * hardware standard tuning logic will directly go to next - * step once it detect the CMD CRC error, will not wait for - * the card side to finally send out the tuning data, trigger - * the buffer read ready interrupt immediately. If usdhc send - * the next tuning command some eMMC card will stuck, can't - * response, block the tuning procedure or the first command - * after the whole tuning procedure always can't get any response. - */ - tmp |= ESDHC_TUNING_CMD_CRC_CHECK_DISABLE; + if (imx_data->boarddata.tuning_step) { + tmp &= ~ESDHC_TUNING_STEP_MASK; + tmp |= imx_data->boarddata.tuning_step + << ESDHC_TUNING_STEP_SHIFT; + } writel(tmp, host->ioaddr + ESDHC_TUNING_CTRL); } else if (imx_data->socdata->flags & ESDHC_FLAG_MAN_TUNING) { /* @@ -1278,21 +1256,6 @@ static void sdhci_esdhc_imx_hwinit(struct sdhci_host *host) tmp &= ~ESDHC_STD_TUNING_EN; writel(tmp, host->ioaddr + ESDHC_TUNING_CTRL); } - - /* - * On i.MX8MM, we are running Dual Linux OS, with 1st Linux using SD Card - * as rootfs storage, 2nd Linux using eMMC as rootfs storage. We let the - * the 1st linux configure power/clock for the 2nd Linux. - * - * When the 2nd Linux is booting into rootfs stage, we let the 1st Linux - * to destroy the 2nd linux, then restart the 2nd linux, we met SDHCI dump. - * After we clear the pending interrupt and halt CQCTL, issue gone. - */ - if (cq_host) { - tmp = cqhci_readl(cq_host, CQHCI_IS); - cqhci_writel(cq_host, tmp, CQHCI_IS); - cqhci_writel(cq_host, CQHCI_HALT, CQHCI_CTL); - } } } @@ -1339,7 +1302,7 @@ static void esdhc_cqe_enable(struct mmc_host *mmc) * system resume back. */ cqhci_writel(cq_host, 0, CQHCI_CTL); - if (cqhci_readl(cq_host, CQHCI_CTL) & CQHCI_HALT) + if (cqhci_readl(cq_host, CQHCI_CTL) && CQHCI_HALT) dev_err(mmc_dev(host->mmc), "failed to exit halt state when enable CQE\n"); @@ -1608,6 +1571,8 @@ static int sdhci_esdhc_imx_probe(struct platform_device *pdev) if (err) goto disable_ahb_clk; + host->tuning_delay = 1; + sdhci_esdhc_imx_hwinit(host); err = sdhci_add_host(host);
diff --git a/drivers/mmc/host/sdhci-msm.c b/drivers/mmc/host/sdhci-msm.c index f69e2de..0c8733e 100644 --- a/drivers/mmc/host/sdhci-msm.c +++ b/drivers/mmc/host/sdhci-msm.c
@@ -2148,7 +2148,6 @@ static const struct sdhci_msm_variant_info sdm845_sdhci_var = { static const struct of_device_id sdhci_msm_dt_match[] = { {.compatible = "qcom,sdhci-msm-v4", .data = &sdhci_msm_mci_var}, {.compatible = "qcom,sdhci-msm-v5", .data = &sdhci_msm_v5_var}, - {.compatible = "qcom,sdm670-sdhci", .data = &sdm845_sdhci_var}, {.compatible = "qcom,sdm845-sdhci", .data = &sdm845_sdhci_var}, {}, };
diff --git a/drivers/mmc/host/sdhci-of-arasan.c b/drivers/mmc/host/sdhci-of-arasan.c index aa24674..dd10f7a 100644 --- a/drivers/mmc/host/sdhci-of-arasan.c +++ b/drivers/mmc/host/sdhci-of-arasan.c
@@ -24,7 +24,6 @@ #include <linux/of.h> #include "cqhci.h" -#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #define SDHCI_ARASAN_VENDOR_REGISTER 0x78 @@ -265,7 +264,7 @@ static void sdhci_arasan_reset(struct sdhci_host *host, u8 mask) struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_arasan_data *sdhci_arasan = sdhci_pltfm_priv(pltfm_host); - sdhci_and_cqhci_reset(host, mask); + sdhci_reset(host, mask); if (sdhci_arasan->quirks & SDHCI_ARASAN_QUIRK_FORCE_CDTEST) { ctrl = sdhci_readb(host, SDHCI_HOST_CONTROL);
diff --git a/drivers/mmc/host/sdhci-of-at91.c b/drivers/mmc/host/sdhci-of-at91.c index 03698d7..881f813 100644 --- a/drivers/mmc/host/sdhci-of-at91.c +++ b/drivers/mmc/host/sdhci-of-at91.c
@@ -109,13 +109,8 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode, static void sdhci_at91_set_uhs_signaling(struct sdhci_host *host, unsigned int timing) { - u8 mc1r; - - if (timing == MMC_TIMING_MMC_DDR52) { - mc1r = sdhci_readb(host, SDMMC_MC1R); - mc1r |= SDMMC_MC1R_DDR; - sdhci_writeb(host, mc1r, SDMMC_MC1R); - } + if (timing == MMC_TIMING_MMC_DDR52) + sdhci_writeb(host, SDMMC_MC1R_DDR, SDMMC_MC1R); sdhci_set_uhs_signaling(host, timing); }
diff --git a/drivers/mmc/host/sdhci-of-esdhc.c b/drivers/mmc/host/sdhci-of-esdhc.c index 69c133e..0ff3390 100644 --- a/drivers/mmc/host/sdhci-of-esdhc.c +++ b/drivers/mmc/host/sdhci-of-esdhc.c
@@ -844,7 +844,6 @@ static int esdhc_signal_voltage_switch(struct mmc_host *mmc, scfg_node = of_find_matching_node(NULL, scfg_device_ids); if (scfg_node) scfg_base = of_iomap(scfg_node, 0); - of_node_put(scfg_node); if (scfg_base) { sdhciovselcr = SDHCIOVSELCR_TGLEN | SDHCIOVSELCR_VSELVAL;
diff --git a/drivers/mmc/host/sdhci-pci-core.c b/drivers/mmc/host/sdhci-pci-core.c index 892c109..1e19c0d 100644 --- a/drivers/mmc/host/sdhci-pci-core.c +++ b/drivers/mmc/host/sdhci-pci-core.c
@@ -1795,8 +1795,6 @@ static int amd_probe(struct sdhci_pci_chip *chip) } } - pci_dev_put(smbus_dev); - if (gen == AMD_CHIPSET_BEFORE_ML || gen == AMD_CHIPSET_CZ) chip->quirks2 |= SDHCI_QUIRK2_CLEAR_TRANSFERMODE_REG_BEFORE_CMD;
diff --git a/drivers/mmc/host/sdhci-pci-o2micro.c b/drivers/mmc/host/sdhci-pci-o2micro.c index 4b639e8..3170c19 100644 --- a/drivers/mmc/host/sdhci-pci-o2micro.c +++ b/drivers/mmc/host/sdhci-pci-o2micro.c
@@ -31,7 +31,6 @@ #define O2_SD_CAPS 0xE0 #define O2_SD_ADMA1 0xE2 #define O2_SD_ADMA2 0xE7 -#define O2_SD_MISC_CTRL2 0xF0 #define O2_SD_INF_MOD 0xF1 #define O2_SD_MISC_CTRL4 0xFC #define O2_SD_TUNING_CTRL 0x300 @@ -778,12 +777,6 @@ int sdhci_pci_o2_probe(struct sdhci_pci_chip *chip) /* Set Tuning Windows to 5 */ pci_write_config_byte(chip->pdev, O2_SD_TUNING_CTRL, 0x55); - //Adjust 1st and 2nd CD debounce time - pci_read_config_dword(chip->pdev, O2_SD_MISC_CTRL2, &scratch_32); - scratch_32 &= 0xFFE7FFFF; - scratch_32 |= 0x00180000; - pci_write_config_dword(chip->pdev, O2_SD_MISC_CTRL2, scratch_32); - pci_write_config_dword(chip->pdev, O2_SD_DETECT_SETTING, 1); /* Lock WP */ ret = pci_read_config_byte(chip->pdev, O2_SD_LOCK_WP, &scratch);
diff --git a/drivers/mmc/host/sdhci-sprd.c b/drivers/mmc/host/sdhci-sprd.c index 80f8d45..4ac419f 100644 --- a/drivers/mmc/host/sdhci-sprd.c +++ b/drivers/mmc/host/sdhci-sprd.c
@@ -224,15 +224,13 @@ static inline void _sdhci_sprd_set_clock(struct sdhci_host *host, div = ((div & 0x300) >> 2) | ((div & 0xFF) << 8); sdhci_enable_clk(host, div); - /* Enable CLK_AUTO when the clock is greater than 400K. */ - if (clk > 400000) { - val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI); - mask = SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN | - SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN; - if (mask != (val & mask)) { - val |= mask; - sdhci_writel(host, val, SDHCI_SPRD_REG_32_BUSY_POSI); - } + /* enable auto gate sdhc_enable_auto_gate */ + val = sdhci_readl(host, SDHCI_SPRD_REG_32_BUSY_POSI); + mask = SDHCI_SPRD_BIT_OUTR_CLK_AUTO_EN | + SDHCI_SPRD_BIT_INNR_CLK_AUTO_EN; + if (mask != (val & mask)) { + val |= mask; + sdhci_writel(host, val, SDHCI_SPRD_REG_32_BUSY_POSI); } } @@ -298,7 +296,7 @@ static unsigned int sdhci_sprd_get_max_clock(struct sdhci_host *host) static unsigned int sdhci_sprd_get_min_clock(struct sdhci_host *host) { - return 100000; + return 400000; } static void sdhci_sprd_set_uhs_signaling(struct sdhci_host *host, @@ -459,7 +457,7 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) } if (IS_ERR(sprd_host->pinctrl)) - goto reset; + return 0; switch (ios->signal_voltage) { case MMC_SIGNAL_VOLTAGE_180: @@ -487,8 +485,6 @@ static int sdhci_sprd_voltage_switch(struct mmc_host *mmc, struct mmc_ios *ios) /* Wait for 300 ~ 500 us for pin state stable */ usleep_range(300, 500); - -reset: sdhci_reset(host, SDHCI_RESET_CMD | SDHCI_RESET_DATA); return 0;
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c index d583837..65dfe75 100644 --- a/drivers/mmc/host/sdhci-tegra.c +++ b/drivers/mmc/host/sdhci-tegra.c
@@ -24,7 +24,6 @@ #include <linux/gpio/consumer.h> #include <linux/ktime.h> -#include "sdhci-cqhci.h" #include "sdhci-pltfm.h" #include "cqhci.h" @@ -348,7 +347,7 @@ static void tegra_sdhci_reset(struct sdhci_host *host, u8 mask) const struct sdhci_tegra_soc_data *soc_data = tegra_host->soc_data; u32 misc_ctrl, clk_ctrl, pad_ctrl; - sdhci_and_cqhci_reset(host, mask); + sdhci_reset(host, mask); if (!(mask & SDHCI_RESET_ALL)) return;
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index 5a3279e..f07dac4 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c
@@ -9,7 +9,6 @@ * - JMicron (hardware and technical support) */ -#include <linux/bitfield.h> #include <linux/delay.h> #include <linux/ktime.h> #include <linux/highmem.h> @@ -1639,9 +1638,10 @@ u16 sdhci_calc_clk(struct sdhci_host *host, unsigned int clock, clk = sdhci_readw(host, SDHCI_CLOCK_CONTROL); pre_val = sdhci_get_preset_value(host); - div = FIELD_GET(SDHCI_PRESET_SDCLK_FREQ_MASK, pre_val); + div = (pre_val & SDHCI_PRESET_SDCLK_FREQ_MASK) + >> SDHCI_PRESET_SDCLK_FREQ_SHIFT; if (host->clk_mul && - (pre_val & SDHCI_PRESET_CLKGEN_SEL)) { + (pre_val & SDHCI_PRESET_CLKGEN_SEL_MASK)) { clk = SDHCI_PROG_CLOCK_MODE; real_div = div + 1; clk_mul = host->clk_mul; @@ -2154,8 +2154,8 @@ void sdhci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) sdhci_enable_preset_value(host, true); preset = sdhci_get_preset_value(host); - ios->drv_type = FIELD_GET(SDHCI_PRESET_DRV_MASK, - preset); + ios->drv_type = (preset & SDHCI_PRESET_DRV_MASK) + >> SDHCI_PRESET_DRV_SHIFT; } /* Re-enable SD Clock */
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h index 02f1140..97aae19 100644 --- a/drivers/mmc/host/sdhci.h +++ b/drivers/mmc/host/sdhci.h
@@ -9,7 +9,6 @@ #ifndef __SDHCI_HW_H #define __SDHCI_HW_H -#include <linux/bits.h> #include <linux/scatterlist.h> #include <linux/compiler.h> #include <linux/types.h> @@ -270,9 +269,12 @@ #define SDHCI_PRESET_FOR_SDR104 0x6C #define SDHCI_PRESET_FOR_DDR50 0x6E #define SDHCI_PRESET_FOR_HS400 0x74 /* Non-standard */ -#define SDHCI_PRESET_DRV_MASK GENMASK(15, 14) -#define SDHCI_PRESET_CLKGEN_SEL BIT(10) -#define SDHCI_PRESET_SDCLK_FREQ_MASK GENMASK(9, 0) +#define SDHCI_PRESET_DRV_MASK 0xC000 +#define SDHCI_PRESET_DRV_SHIFT 14 +#define SDHCI_PRESET_CLKGEN_SEL_MASK 0x400 +#define SDHCI_PRESET_CLKGEN_SEL_SHIFT 10 +#define SDHCI_PRESET_SDCLK_FREQ_MASK 0x3FF +#define SDHCI_PRESET_SDCLK_FREQ_SHIFT 0 #define SDHCI_SLOT_INT_STATUS 0xFC
diff --git a/drivers/mmc/host/sdhci_am654.c b/drivers/mmc/host/sdhci_am654.c index 987626f..4cbb764 100644 --- a/drivers/mmc/host/sdhci_am654.c +++ b/drivers/mmc/host/sdhci_am654.c
@@ -227,6 +227,8 @@ static void sdhci_am654_write_b(struct sdhci_host *host, u8 val, int reg) */ case MMC_TIMING_SD_HS: case MMC_TIMING_MMC_HS: + case MMC_TIMING_UHS_SDR12: + case MMC_TIMING_UHS_SDR25: val &= ~SDHCI_CTRL_HISPD; } }
diff --git a/drivers/mmc/host/sdhci_f_sdh30.c b/drivers/mmc/host/sdhci_f_sdh30.c index 9548d02..f8b939e 100644 --- a/drivers/mmc/host/sdhci_f_sdh30.c +++ b/drivers/mmc/host/sdhci_f_sdh30.c
@@ -194,9 +194,6 @@ static int sdhci_f_sdh30_probe(struct platform_device *pdev) if (reg & SDHCI_CAN_DO_8BIT) priv->vendor_hs200 = F_SDH30_EMMC_HS200; - if (!(reg & SDHCI_TIMEOUT_CLK_MASK)) - host->quirks |= SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK; - ret = sdhci_add_host(host); if (ret) goto err_add_host;
diff --git a/drivers/mmc/host/sunxi-mmc.c b/drivers/mmc/host/sunxi-mmc.c index 519718b..d577a6b 100644 --- a/drivers/mmc/host/sunxi-mmc.c +++ b/drivers/mmc/host/sunxi-mmc.c
@@ -1456,11 +1456,9 @@ static int sunxi_mmc_remove(struct platform_device *pdev) struct sunxi_mmc_host *host = mmc_priv(mmc); mmc_remove_host(mmc); - pm_runtime_disable(&pdev->dev); - if (!pm_runtime_status_suspended(&pdev->dev)) { - disable_irq(host->irq); - sunxi_mmc_disable(host); - } + pm_runtime_force_suspend(&pdev->dev); + disable_irq(host->irq); + sunxi_mmc_disable(host); dma_free_coherent(&pdev->dev, PAGE_SIZE, host->sg_cpu, host->sg_dma); mmc_free_host(mmc);
diff --git a/drivers/mmc/host/toshsd.c b/drivers/mmc/host/toshsd.c index 497791f..8d037c2 100644 --- a/drivers/mmc/host/toshsd.c +++ b/drivers/mmc/host/toshsd.c
@@ -651,9 +651,7 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto unmap; - ret = mmc_add_host(mmc); - if (ret) - goto free_irq; + mmc_add_host(mmc); base = pci_resource_start(pdev, 0); dev_dbg(&pdev->dev, "MMIO %pa, IRQ %d\n", &base, pdev->irq); @@ -662,8 +660,6 @@ static int toshsd_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -free_irq: - free_irq(pdev->irq, host); unmap: pci_iounmap(pdev, host->ioaddr); release:
diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 2c4d390..721e5dd 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c
@@ -1154,9 +1154,7 @@ static int via_sd_probe(struct pci_dev *pcidev, pcidev->subsystem_device == 0x3891) sdhost->quirks = VIA_CRDR_QUIRK_300MS_PWRDELAY; - ret = mmc_add_host(mmc); - if (ret) - goto unmap; + mmc_add_host(mmc); return 0;
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index 58cc3c9..5e1d702 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c
@@ -2049,7 +2049,6 @@ static void vub300_enable_sdio_irq(struct mmc_host *mmc, int enable) return; kref_get(&vub300->kref); if (enable) { - set_current_state(TASK_RUNNING); mutex_lock(&vub300->irq_mutex); if (vub300->irqs_queued) { vub300->irqs_queued -= 1; @@ -2065,7 +2064,6 @@ static void vub300_enable_sdio_irq(struct mmc_host *mmc, int enable) vub300_queue_poll_work(vub300, 0); } mutex_unlock(&vub300->irq_mutex); - set_current_state(TASK_INTERRUPTIBLE); } else { vub300->irq_enabled = 0; } @@ -2308,14 +2306,14 @@ static int vub300_probe(struct usb_interface *interface, 0x0000, 0x0000, &vub300->system_port_status, sizeof(vub300->system_port_status), 1000); if (retval < 0) { - goto error5; + goto error4; } else if (sizeof(vub300->system_port_status) == retval) { vub300->card_present = (0x0001 & vub300->system_port_status.port_flags) ? 1 : 0; vub300->read_only = (0x0010 & vub300->system_port_status.port_flags) ? 1 : 0; } else { - goto error5; + goto error4; } usb_set_intfdata(interface, vub300); INIT_DELAYED_WORK(&vub300->pollwork, vub300_pollwork_thread); @@ -2338,13 +2336,8 @@ static int vub300_probe(struct usb_interface *interface, "USB vub300 remote SDIO host controller[%d]" "connected with no SD/SDIO card inserted\n", interface_to_InterfaceNumber(interface)); - retval = mmc_add_host(mmc); - if (retval) - goto error6; - + mmc_add_host(mmc); return 0; -error6: - del_timer_sync(&vub300->inactivity_timer); error5: mmc_free_host(mmc); /*
diff --git a/drivers/mmc/host/wbsd.c b/drivers/mmc/host/wbsd.c index 639f87b..740179f 100644 --- a/drivers/mmc/host/wbsd.c +++ b/drivers/mmc/host/wbsd.c
@@ -1701,17 +1701,7 @@ static int wbsd_init(struct device *dev, int base, int irq, int dma, */ wbsd_init_device(host); - ret = mmc_add_host(mmc); - if (ret) { - if (!pnp) - wbsd_chip_poweroff(host); - - wbsd_release_resources(host); - wbsd_free_mmc(dev); - - mmc_free_host(mmc); - return ret; - } + mmc_add_host(mmc); pr_info("%s: W83L51xD", mmc_hostname(mmc)); if (host->chip_id != 0)
diff --git a/drivers/mmc/host/wmt-sdmmc.c b/drivers/mmc/host/wmt-sdmmc.c index b1e4199..2c4ba1f 100644 --- a/drivers/mmc/host/wmt-sdmmc.c +++ b/drivers/mmc/host/wmt-sdmmc.c
@@ -849,7 +849,7 @@ static int wmt_mci_probe(struct platform_device *pdev) if (IS_ERR(priv->clk_sdmmc)) { dev_err(&pdev->dev, "Error getting clock\n"); ret = PTR_ERR(priv->clk_sdmmc); - goto fail5_and_a_half; + goto fail5; } ret = clk_prepare_enable(priv->clk_sdmmc); @@ -859,20 +859,13 @@ static int wmt_mci_probe(struct platform_device *pdev) /* configure the controller to a known 'ready' state */ wmt_reset_hardware(mmc); - ret = mmc_add_host(mmc); - if (ret) - goto fail7; + mmc_add_host(mmc); dev_info(&pdev->dev, "WMT SDHC Controller initialized\n"); return 0; -fail7: - clk_disable_unprepare(priv->clk_sdmmc); fail6: clk_put(priv->clk_sdmmc); -fail5_and_a_half: - dma_free_coherent(&pdev->dev, mmc->max_blk_count * 16, - priv->dma_desc_buffer, priv->dma_desc_device_addr); fail5: free_irq(dma_irq, priv); fail4:
diff --git a/drivers/mtd/devices/docg3.c b/drivers/mtd/devices/docg3.c index 40f9b6d..eb0f460 100644 --- a/drivers/mtd/devices/docg3.c +++ b/drivers/mtd/devices/docg3.c
@@ -1975,14 +1975,9 @@ static int __init docg3_probe(struct platform_device *pdev) dev_err(dev, "No I/O memory resource defined\n"); return ret; } + base = devm_ioremap(dev, ress->start, DOC_IOSPACE_SIZE); ret = -ENOMEM; - base = devm_ioremap(dev, ress->start, DOC_IOSPACE_SIZE); - if (!base) { - dev_err(dev, "devm_ioremap dev failed\n"); - return ret; - } - cascade = devm_kcalloc(dev, DOC_MAX_NBFLOORS, sizeof(*cascade), GFP_KERNEL); if (!cascade)
diff --git a/drivers/mtd/devices/st_spi_fsm.c b/drivers/mtd/devices/st_spi_fsm.c index 41b5a23..f4d1667 100644 --- a/drivers/mtd/devices/st_spi_fsm.c +++ b/drivers/mtd/devices/st_spi_fsm.c
@@ -2116,12 +2116,10 @@ static int stfsm_probe(struct platform_device *pdev) (long long)fsm->mtd.size, (long long)(fsm->mtd.size >> 20), fsm->mtd.erasesize, (fsm->mtd.erasesize >> 10)); - ret = mtd_device_register(&fsm->mtd, NULL, 0); - if (ret) { -err_clk_unprepare: - clk_disable_unprepare(fsm->clk); - } + return mtd_device_register(&fsm->mtd, NULL, 0); +err_clk_unprepare: + clk_disable_unprepare(fsm->clk); return ret; }
diff --git a/drivers/mtd/lpddr/lpddr2_nvm.c b/drivers/mtd/lpddr/lpddr2_nvm.c index add4386..72f5c7b 100644 --- a/drivers/mtd/lpddr/lpddr2_nvm.c +++ b/drivers/mtd/lpddr/lpddr2_nvm.c
@@ -433,8 +433,6 @@ static int lpddr2_nvm_probe(struct platform_device *pdev) /* lpddr2_nvm address range */ add_range = platform_get_resource(pdev, IORESOURCE_MEM, 0); - if (!add_range) - return -ENODEV; /* Populate map_info data structure */ *map = (struct map_info) {
diff --git a/drivers/mtd/maps/physmap-versatile.c b/drivers/mtd/maps/physmap-versatile.c index a1b8b7b..ad7cd9c 100644 --- a/drivers/mtd/maps/physmap-versatile.c +++ b/drivers/mtd/maps/physmap-versatile.c
@@ -93,7 +93,6 @@ static int ap_flash_init(struct platform_device *pdev) return -ENODEV; } ebi_base = of_iomap(ebi, 0); - of_node_put(ebi); if (!ebi_base) return -ENODEV; @@ -208,7 +207,6 @@ int of_flash_probe_versatile(struct platform_device *pdev, versatile_flashprot = (enum versatile_flashprot)devid->data; rmap = syscon_node_to_regmap(sysnp); - of_node_put(sysnp); if (IS_ERR(rmap)) return PTR_ERR(rmap);
diff --git a/drivers/mtd/maps/pxa2xx-flash.c b/drivers/mtd/maps/pxa2xx-flash.c index 6e5e557..7d96758 100644 --- a/drivers/mtd/maps/pxa2xx-flash.c +++ b/drivers/mtd/maps/pxa2xx-flash.c
@@ -66,7 +66,6 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) if (!info->map.virt) { printk(KERN_WARNING "Failed to ioremap %s\n", info->map.name); - kfree(info); return -ENOMEM; } info->map.cached = ioremap_cache(info->map.phys, info->map.size); @@ -88,7 +87,6 @@ static int pxa2xx_flash_probe(struct platform_device *pdev) iounmap((void *)info->map.virt); if (info->map.cached) iounmap(info->map.cached); - kfree(info); return -EIO; } info->mtd->dev.parent = &pdev->dev;
diff --git a/drivers/mtd/mtdblock.c b/drivers/mtd/mtdblock.c index 546ded5..c06b532 100644 --- a/drivers/mtd/mtdblock.c +++ b/drivers/mtd/mtdblock.c
@@ -150,7 +150,7 @@ static int do_cached_write (struct mtdblk_dev *mtdblk, unsigned long pos, mtdblk->cache_state = STATE_EMPTY; ret = mtd_read(mtd, sect_start, sect_size, &retlen, mtdblk->cache_data); - if (ret && !mtd_is_bitflip(ret)) + if (ret) return ret; if (retlen != sect_size) return -EIO; @@ -206,7 +206,7 @@ static int do_cached_read (struct mtdblk_dev *mtdblk, unsigned long pos, memcpy (buf, mtdblk->cache_data + offset, size); } else { ret = mtd_read(mtd, pos, size, &retlen, buf); - if (ret && !mtd_is_bitflip(ret)) + if (ret) return ret; if (retlen != size) return -EIO;
diff --git a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c index 83012d7..ac5d3b6 100644 --- a/drivers/mtd/mtdcore.c +++ b/drivers/mtd/mtdcore.c
@@ -673,10 +673,8 @@ int add_mtd_device(struct mtd_info *mtd) dev_set_drvdata(&mtd->dev, mtd); of_node_get(mtd_get_of_node(mtd)); error = device_register(&mtd->dev); - if (error) { - put_device(&mtd->dev); + if (error) goto fail_added; - } /* Add the nvmem provider */ error = mtd_nvmem_add(mtd);
diff --git a/drivers/mtd/nand/raw/atmel/nand-controller.c b/drivers/mtd/nand/raw/atmel/nand-controller.c index 997910b..17c751f 100644 --- a/drivers/mtd/nand/raw/atmel/nand-controller.c +++ b/drivers/mtd/nand/raw/atmel/nand-controller.c
@@ -402,7 +402,6 @@ static int atmel_nand_dma_transfer(struct atmel_nand_controller *nc, dma_async_issue_pending(nc->dmac); wait_for_completion(&finished); - dma_unmap_single(nc->dev, buf_dma, len, dir); return 0;
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c index b806a76..02218c3 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c
@@ -652,9 +652,8 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, unsigned int tRP_ps; bool use_half_period; int sample_delay_ps, sample_delay_factor; - unsigned int busy_timeout_cycles; + u16 busy_timeout_cycles; u8 wrn_dly_sel; - u64 busy_timeout_ps; if (sdr->tRC_min >= 30000) { /* ONFI non-EDO modes [0-3] */ @@ -678,8 +677,7 @@ static void gpmi_nfc_compute_timings(struct gpmi_nand_data *this, addr_setup_cycles = TO_CYCLES(sdr->tALS_min, period_ps); data_setup_cycles = TO_CYCLES(sdr->tDS_min, period_ps); data_hold_cycles = TO_CYCLES(sdr->tDH_min, period_ps); - busy_timeout_ps = max(sdr->tBERS_max, sdr->tPROG_max); - busy_timeout_cycles = TO_CYCLES(busy_timeout_ps, period_ps); + busy_timeout_cycles = TO_CYCLES(sdr->tWB_max + sdr->tR_max, period_ps); hw->timing0 = BF_GPMI_TIMING0_ADDRESS_SETUP(addr_setup_cycles) | BF_GPMI_TIMING0_DATA_HOLD(data_hold_cycles) |
diff --git a/drivers/mtd/nand/raw/marvell_nand.c b/drivers/mtd/nand/raw/marvell_nand.c index 36cb0db..ef163ff 100644 --- a/drivers/mtd/nand/raw/marvell_nand.c +++ b/drivers/mtd/nand/raw/marvell_nand.c
@@ -2630,7 +2630,7 @@ static int marvell_nand_chip_init(struct device *dev, struct marvell_nfc *nfc, chip->controller = &nfc->controller; nand_set_flash_node(chip, np); - if (of_property_read_bool(np, "marvell,nand-keep-config")) + if (!of_property_read_bool(np, "marvell,nand-keep-config")) chip->options |= NAND_KEEP_TIMINGS; mtd = nand_to_mtd(chip);
diff --git a/drivers/mtd/nand/raw/stm32_fmc2_nand.c b/drivers/mtd/nand/raw/stm32_fmc2_nand.c index ad4d944..5c06e0b 100644 --- a/drivers/mtd/nand/raw/stm32_fmc2_nand.c +++ b/drivers/mtd/nand/raw/stm32_fmc2_nand.c
@@ -1592,9 +1592,6 @@ static int stm32_fmc2_setup_interface(struct nand_chip *chip, int chipnr, if (IS_ERR(sdrt)) return PTR_ERR(sdrt); - if (sdrt->tRC_min < 30000) - return -EOPNOTSUPP; - if (chipnr == NAND_DATA_IFACE_CHECK_ONLY) return 0;
diff --git a/drivers/mtd/nand/raw/sunxi_nand.c b/drivers/mtd/nand/raw/sunxi_nand.c index 0f3bce3..45c376f 100644 --- a/drivers/mtd/nand/raw/sunxi_nand.c +++ b/drivers/mtd/nand/raw/sunxi_nand.c
@@ -1587,7 +1587,7 @@ static int sunxi_nand_ooblayout_free(struct mtd_info *mtd, int section, if (section < ecc->steps) oobregion->length = 4; else - oobregion->length = mtd->oobsize - oobregion->offset; + oobregion->offset = mtd->oobsize - oobregion->offset; return 0; }
diff --git a/drivers/mtd/parsers/redboot.c b/drivers/mtd/parsers/redboot.c index 4f3bcc5..3ccd636 100644 --- a/drivers/mtd/parsers/redboot.c +++ b/drivers/mtd/parsers/redboot.c
@@ -58,7 +58,6 @@ static void parse_redboot_of(struct mtd_info *master) return; ret = of_property_read_u32(npart, "fis-index-block", &dirblock); - of_node_put(npart); if (ret) return;
diff --git a/drivers/mtd/sm_ftl.c b/drivers/mtd/sm_ftl.c index d4e72fd..4744bf9 100644 --- a/drivers/mtd/sm_ftl.c +++ b/drivers/mtd/sm_ftl.c
@@ -1097,9 +1097,9 @@ static void sm_release(struct mtd_blktrans_dev *dev) { struct sm_ftl *ftl = dev->priv; + mutex_lock(&ftl->mutex); del_timer_sync(&ftl->timer); cancel_work_sync(&ftl->flush_work); - mutex_lock(&ftl->mutex); sm_cache_flush(ftl); mutex_unlock(&ftl->mutex); }
diff --git a/drivers/mtd/spi-nor/intel-spi.c b/drivers/mtd/spi-nor/intel-spi.c index 21b98c8..43e55a2 100644 --- a/drivers/mtd/spi-nor/intel-spi.c +++ b/drivers/mtd/spi-nor/intel-spi.c
@@ -113,7 +113,7 @@ #define ERASE_OPCODE_SHIFT 8 #define ERASE_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) #define ERASE_64K_OPCODE_SHIFT 16 -#define ERASE_64K_OPCODE_MASK (0xff << ERASE_64K_OPCODE_SHIFT) +#define ERASE_64K_OPCODE_MASK (0xff << ERASE_OPCODE_SHIFT) #define INTEL_SPI_TIMEOUT 5000 /* ms */ #define INTEL_SPI_FIFO_SZ 64
diff --git a/drivers/mtd/spi-nor/spi-nor.c b/drivers/mtd/spi-nor/spi-nor.c index dc7f5db..dd6963e 100644 --- a/drivers/mtd/spi-nor/spi-nor.c +++ b/drivers/mtd/spi-nor/spi-nor.c
@@ -1010,8 +1010,6 @@ spi_nor_find_best_erase_type(const struct spi_nor_erase_map *map, continue; erase = &map->erase_type[i]; - if (!erase->size) - continue; /* Alignment is not mandatory for overlaid regions */ if (region->offset & SNOR_OVERLAID_REGION &&
diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c index f29ed91..df521ff 100644 --- a/drivers/mtd/ubi/build.c +++ b/drivers/mtd/ubi/build.c
@@ -467,7 +467,6 @@ static int uif_init(struct ubi_device *ubi) err = ubi_add_volume(ubi, ubi->volumes[i]); if (err) { ubi_err(ubi, "cannot add volume %d", i); - ubi->volumes[i] = NULL; goto out_volumes; } } @@ -661,21 +660,6 @@ static int io_init(struct ubi_device *ubi, int max_beb_per1024) ubi->vid_hdr_aloffset; } - /* - * Memory allocation for VID header is ubi->vid_hdr_alsize - * which is described in comments in io.c. - * Make sure VID header shift + UBI_VID_HDR_SIZE not exceeds - * ubi->vid_hdr_alsize, so that all vid header operations - * won't access memory out of bounds. - */ - if ((ubi->vid_hdr_shift + UBI_VID_HDR_SIZE) > ubi->vid_hdr_alsize) { - ubi_err(ubi, "Invalid VID header offset %d, VID header shift(%d)" - " + VID header size(%zu) > VID header aligned size(%d).", - ubi->vid_hdr_offset, ubi->vid_hdr_shift, - UBI_VID_HDR_SIZE, ubi->vid_hdr_alsize); - return -EINVAL; - } - /* Similar for the data offset */ ubi->leb_start = ubi->vid_hdr_offset + UBI_VID_HDR_SIZE; ubi->leb_start = ALIGN(ubi->leb_start, ubi->min_io_size);
diff --git a/drivers/mtd/ubi/vmt.c b/drivers/mtd/ubi/vmt.c index d79323e..6ea95ad 100644 --- a/drivers/mtd/ubi/vmt.c +++ b/drivers/mtd/ubi/vmt.c
@@ -464,7 +464,7 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) for (i = 0; i < -pebs; i++) { err = ubi_eba_unmap_leb(ubi, vol, reserved_pebs + i); if (err) - goto out_free; + goto out_acc; } spin_lock(&ubi->volumes_lock); ubi->rsvd_pebs += pebs; @@ -512,10 +512,8 @@ int ubi_resize_volume(struct ubi_volume_desc *desc, int reserved_pebs) ubi->avail_pebs += pebs; spin_unlock(&ubi->volumes_lock); } - return err; - out_free: - ubi_eba_destroy_table(new_eba_tbl); + kfree(new_eba_tbl); return err; } @@ -582,7 +580,6 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) if (err) { ubi_err(ubi, "cannot add character device for volume %d, error %d", vol_id, err); - vol_release(&vol->dev); return err; } @@ -593,14 +590,15 @@ int ubi_add_volume(struct ubi_device *ubi, struct ubi_volume *vol) vol->dev.groups = volume_dev_groups; dev_set_name(&vol->dev, "%s_%d", ubi->ubi_name, vol->vol_id); err = device_register(&vol->dev); - if (err) { - cdev_del(&vol->cdev); - put_device(&vol->dev); - return err; - } + if (err) + goto out_cdev; self_check_volumes(ubi); return err; + +out_cdev: + cdev_del(&vol->cdev); + return err; } /**
diff --git a/drivers/mtd/ubi/wl.c b/drivers/mtd/ubi/wl.c index fd0e8f9..7def041 100644 --- a/drivers/mtd/ubi/wl.c +++ b/drivers/mtd/ubi/wl.c
@@ -576,7 +576,6 @@ static int erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk, * @vol_id: the volume ID that last used this PEB * @lnum: the last used logical eraseblock number for the PEB * @torture: if the physical eraseblock has to be tortured - * @nested: denotes whether the work_sem is already held * * This function returns zero in case of success and a %-ENOMEM in case of * failure. @@ -880,11 +879,8 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, err = do_sync_erase(ubi, e1, vol_id, lnum, 0); if (err) { - if (e2) { - spin_lock(&ubi->wl_lock); + if (e2) wl_entry_destroy(ubi, e2); - spin_unlock(&ubi->wl_lock); - } goto out_ro; } @@ -966,11 +962,11 @@ static int wear_leveling_worker(struct ubi_device *ubi, struct ubi_work *wrk, spin_lock(&ubi->wl_lock); ubi->move_from = ubi->move_to = NULL; ubi->move_to_put = ubi->wl_scheduled = 0; - wl_entry_destroy(ubi, e1); - wl_entry_destroy(ubi, e2); spin_unlock(&ubi->wl_lock); ubi_free_vid_buf(vidb); + wl_entry_destroy(ubi, e1); + wl_entry_destroy(ubi, e2); out_ro: ubi_ro_mode(ubi); @@ -1061,6 +1057,8 @@ static int ensure_wear_leveling(struct ubi_device *ubi, int nested) * __erase_worker - physical eraseblock erase worker function. * @ubi: UBI device description object * @wl_wrk: the work object + * @shutdown: non-zero if the worker has to free memory and exit + * because the WL sub-system is shutting down * * This function erases a physical eraseblock and perform torture testing if * needed. It also takes care about marking the physical eraseblock bad if @@ -1110,20 +1108,16 @@ static int __erase_worker(struct ubi_device *ubi, struct ubi_work *wl_wrk) int err1; /* Re-schedule the LEB for erasure */ - err1 = schedule_erase(ubi, e, vol_id, lnum, 0, true); + err1 = schedule_erase(ubi, e, vol_id, lnum, 0, false); if (err1) { - spin_lock(&ubi->wl_lock); wl_entry_destroy(ubi, e); - spin_unlock(&ubi->wl_lock); err = err1; goto out_ro; } return err; } - spin_lock(&ubi->wl_lock); wl_entry_destroy(ubi, e); - spin_unlock(&ubi->wl_lock); if (err != -EIO) /* * If this is not %-EIO, we have no idea what to do. Scheduling @@ -1239,18 +1233,6 @@ int ubi_wl_put_peb(struct ubi_device *ubi, int vol_id, int lnum, retry: spin_lock(&ubi->wl_lock); e = ubi->lookuptbl[pnum]; - if (!e) { - /* - * This wl entry has been removed for some errors by other - * process (eg. wear leveling worker), corresponding process - * (except __erase_worker, which cannot concurrent with - * ubi_wl_put_peb) will set ubi ro_mode at the same time, - * just ignore this wl entry. - */ - spin_unlock(&ubi->wl_lock); - up_read(&ubi->fm_protect); - return 0; - } if (e == ubi->move_from) { /* * User is putting the physical eraseblock which was selected to
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c index 0c4e6fc..31ed761 100644 --- a/drivers/net/bonding/bond_3ad.c +++ b/drivers/net/bonding/bond_3ad.c
@@ -1529,7 +1529,6 @@ static void ad_port_selection_logic(struct port *port, bool *update_slave_arr) slave_err(bond->dev, port->slave->dev, "Port %d did not find a suitable aggregator\n", port->actor_port_number); - return; } } /* if all aggregator's ports are READY_N == TRUE, set ready=TRUE @@ -1998,24 +1997,30 @@ void bond_3ad_initiate_agg_selection(struct bonding *bond, int timeout) */ void bond_3ad_initialize(struct bonding *bond, u16 tick_resolution) { - BOND_AD_INFO(bond).aggregator_identifier = 0; - BOND_AD_INFO(bond).system.sys_priority = - bond->params.ad_actor_sys_prio; - if (is_zero_ether_addr(bond->params.ad_actor_system)) - BOND_AD_INFO(bond).system.sys_mac_addr = - *((struct mac_addr *)bond->dev->dev_addr); - else - BOND_AD_INFO(bond).system.sys_mac_addr = - *((struct mac_addr *)bond->params.ad_actor_system); + /* check that the bond is not initialized yet */ + if (!MAC_ADDRESS_EQUAL(&(BOND_AD_INFO(bond).system.sys_mac_addr), + bond->dev->dev_addr)) { - /* initialize how many times this module is called in one - * second (should be about every 100ms) - */ - ad_ticks_per_sec = tick_resolution; + BOND_AD_INFO(bond).aggregator_identifier = 0; - bond_3ad_initiate_agg_selection(bond, - AD_AGGREGATOR_SELECTION_TIMER * - ad_ticks_per_sec); + BOND_AD_INFO(bond).system.sys_priority = + bond->params.ad_actor_sys_prio; + if (is_zero_ether_addr(bond->params.ad_actor_system)) + BOND_AD_INFO(bond).system.sys_mac_addr = + *((struct mac_addr *)bond->dev->dev_addr); + else + BOND_AD_INFO(bond).system.sys_mac_addr = + *((struct mac_addr *)bond->params.ad_actor_system); + + /* initialize how many times this module is called in one + * second (should be about every 100ms) + */ + ad_ticks_per_sec = tick_resolution; + + bond_3ad_initiate_agg_selection(bond, + AD_AGGREGATOR_SELECTION_TIMER * + ad_ticks_per_sec); + } } /**
diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c index 20114e1..8bee935 100644 --- a/drivers/net/bonding/bond_alb.c +++ b/drivers/net/bonding/bond_alb.c
@@ -1360,7 +1360,7 @@ netdev_tx_t bond_tlb_xmit(struct sk_buff *skb, struct net_device *bond_dev) struct bond_up_slave *slaves; unsigned int count; - slaves = rcu_dereference(bond->usable_slaves); + slaves = rcu_dereference(bond->slave_arr); count = slaves ? READ_ONCE(slaves->count) : 0; if (likely(count)) tx_slave = slaves->arr[hash_index % @@ -1494,7 +1494,7 @@ netdev_tx_t bond_alb_xmit(struct sk_buff *skb, struct net_device *bond_dev) struct bond_up_slave *slaves; unsigned int count; - slaves = rcu_dereference(bond->usable_slaves); + slaves = rcu_dereference(bond->slave_arr); count = slaves ? READ_ONCE(slaves->count) : 0; if (likely(count)) tx_slave = slaves->arr[bond_xmit_hash(bond, skb) %
diff --git a/drivers/net/bonding/bond_debugfs.c b/drivers/net/bonding/bond_debugfs.c index 8b6cf2b..f3f86ef 100644 --- a/drivers/net/bonding/bond_debugfs.c +++ b/drivers/net/bonding/bond_debugfs.c
@@ -76,7 +76,7 @@ void bond_debug_reregister(struct bonding *bond) d = debugfs_rename(bonding_debug_root, bond->debug_dir, bonding_debug_root, bond->dev->name); - if (!IS_ERR(d)) { + if (d) { bond->debug_dir = d; } else { netdev_warn(bond->dev, "failed to reregister, so just unregister old one\n");
diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c index 0885991..246bcbd 100644 --- a/drivers/net/bonding/bond_main.c +++ b/drivers/net/bonding/bond_main.c
@@ -2102,21 +2102,12 @@ static int bond_slave_info_query(struct net_device *bond_dev, struct ifslave *in /* called with rcu_read_lock() */ static int bond_miimon_inspect(struct bonding *bond) { - bool ignore_updelay = false; int link_state, commit = 0; struct list_head *iter; struct slave *slave; + bool ignore_updelay; - if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP) { - ignore_updelay = !rcu_dereference(bond->curr_active_slave); - } else { - struct bond_up_slave *usable_slaves; - - usable_slaves = rcu_dereference(bond->usable_slaves); - - if (usable_slaves && usable_slaves->count == 0) - ignore_updelay = true; - } + ignore_updelay = !rcu_dereference(bond->curr_active_slave); bond_for_each_slave_rcu(bond, slave, iter) { bond_propose_link_state(slave, BOND_LINK_NOCHANGE); @@ -4049,29 +4040,6 @@ static void bond_slave_arr_handler(struct work_struct *work) bond_slave_arr_work_rearm(bond, 1); } -static void bond_skip_slave(struct bond_up_slave *slaves, - struct slave *skipslave) -{ - int idx; - - /* Rare situation where caller has asked to skip a specific - * slave but allocation failed (most likely!). BTW this is - * only possible when the call is initiated from - * __bond_release_one(). In this situation; overwrite the - * skipslave entry in the array with the last entry from the - * array to avoid a situation where the xmit path may choose - * this to-be-skipped slave to send a packet out. - */ - for (idx = 0; slaves && idx < slaves->count; idx++) { - if (skipslave == slaves->arr[idx]) { - slaves->arr[idx] = - slaves->arr[slaves->count - 1]; - slaves->count--; - break; - } - } -} - /* Build the usable slaves array in control path for modes that use xmit-hash * to determine the slave interface - * (a) BOND_MODE_8023AD @@ -4082,9 +4050,9 @@ static void bond_skip_slave(struct bond_up_slave *slaves, */ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) { - struct bond_up_slave *usable_slaves, *old_usable_slaves; struct slave *slave; struct list_head *iter; + struct bond_up_slave *new_arr, *old_arr; int agg_id = 0; int ret = 0; @@ -4092,10 +4060,11 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) WARN_ON(lockdep_is_held(&bond->mode_lock)); #endif - usable_slaves = kzalloc(struct_size(usable_slaves, arr, - bond->slave_cnt), GFP_KERNEL); - if (!usable_slaves) { + new_arr = kzalloc(offsetof(struct bond_up_slave, arr[bond->slave_cnt]), + GFP_KERNEL); + if (!new_arr) { ret = -ENOMEM; + pr_err("Failed to build slave-array.\n"); goto out; } if (BOND_MODE(bond) == BOND_MODE_8023AD) { @@ -4103,14 +4072,14 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) if (bond_3ad_get_active_agg_info(bond, &ad_info)) { pr_debug("bond_3ad_get_active_agg_info failed\n"); - kfree_rcu(usable_slaves, rcu); + kfree_rcu(new_arr, rcu); /* No active aggragator means it's not safe to use * the previous array. */ - old_usable_slaves = rtnl_dereference(bond->usable_slaves); - if (old_usable_slaves) { - RCU_INIT_POINTER(bond->usable_slaves, NULL); - kfree_rcu(old_usable_slaves, rcu); + old_arr = rtnl_dereference(bond->slave_arr); + if (old_arr) { + RCU_INIT_POINTER(bond->slave_arr, NULL); + kfree_rcu(old_arr, rcu); } goto out; } @@ -4130,20 +4099,37 @@ int bond_update_slave_arr(struct bonding *bond, struct slave *skipslave) continue; slave_dbg(bond->dev, slave->dev, "Adding slave to tx hash array[%d]\n", - usable_slaves->count); + new_arr->count); - usable_slaves->arr[usable_slaves->count++] = slave; + new_arr->arr[new_arr->count++] = slave; } - old_usable_slaves = rtnl_dereference(bond->usable_slaves); - rcu_assign_pointer(bond->usable_slaves, usable_slaves); - if (old_usable_slaves) - kfree_rcu(old_usable_slaves, rcu); + old_arr = rtnl_dereference(bond->slave_arr); + rcu_assign_pointer(bond->slave_arr, new_arr); + if (old_arr) + kfree_rcu(old_arr, rcu); out: - if (ret != 0 && skipslave) - bond_skip_slave(rtnl_dereference(bond->usable_slaves), - skipslave); + if (ret != 0 && skipslave) { + int idx; + /* Rare situation where caller has asked to skip a specific + * slave but allocation failed (most likely!). BTW this is + * only possible when the call is initiated from + * __bond_release_one(). In this situation; overwrite the + * skipslave entry in the array with the last entry from the + * array to avoid a situation where the xmit path may choose + * this to-be-skipped slave to send a packet out. + */ + old_arr = rtnl_dereference(bond->slave_arr); + for (idx = 0; old_arr != NULL && idx < old_arr->count; idx++) { + if (skipslave == old_arr->arr[idx]) { + old_arr->arr[idx] = + old_arr->arr[old_arr->count-1]; + old_arr->count--; + break; + } + } + } return ret; } @@ -4159,7 +4145,7 @@ static netdev_tx_t bond_3ad_xor_xmit(struct sk_buff *skb, struct bond_up_slave *slaves; unsigned int count; - slaves = rcu_dereference(bond->usable_slaves); + slaves = rcu_dereference(bond->slave_arr); count = slaves ? READ_ONCE(slaves->count) : 0; if (likely(count)) { slave = slaves->arr[bond_xmit_hash(bond, skb) % count]; @@ -4466,9 +4452,9 @@ static void bond_uninit(struct net_device *bond_dev) __bond_release_one(bond_dev, slave->dev, true, true); netdev_info(bond_dev, "Released all slaves\n"); - arr = rtnl_dereference(bond->usable_slaves); + arr = rtnl_dereference(bond->slave_arr); if (arr) { - RCU_INIT_POINTER(bond->usable_slaves, NULL); + RCU_INIT_POINTER(bond->slave_arr, NULL); kfree_rcu(arr, rcu); }
diff --git a/drivers/net/can/cc770/cc770_isa.c b/drivers/net/can/cc770/cc770_isa.c index 910e8c3..b9047d8 100644 --- a/drivers/net/can/cc770/cc770_isa.c +++ b/drivers/net/can/cc770/cc770_isa.c
@@ -264,24 +264,22 @@ static int cc770_isa_probe(struct platform_device *pdev) if (err) { dev_err(&pdev->dev, "couldn't register device (err=%d)\n", err); - goto exit_free; + goto exit_unmap; } dev_info(&pdev->dev, "device registered (reg_base=0x%p, irq=%d)\n", priv->reg_base, dev->irq); return 0; -exit_free: - free_cc770dev(dev); -exit_unmap: + exit_unmap: if (mem[idx]) iounmap(base); -exit_release: + exit_release: if (mem[idx]) release_mem_region(mem[idx], iosize); else release_region(port[idx], iosize); -exit: + exit: return err; }
diff --git a/drivers/net/can/m_can/tcan4x5x.c b/drivers/net/can/m_can/tcan4x5x.c index b312cbf..0d66582 100644 --- a/drivers/net/can/m_can/tcan4x5x.c +++ b/drivers/net/can/m_can/tcan4x5x.c
@@ -291,6 +291,11 @@ static int tcan4x5x_clear_interrupts(struct m_can_classdev *cdev) if (ret) return ret; + ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_MCAN_INT_REG, + TCAN4X5X_ENABLE_MCAN_INT); + if (ret) + return ret; + ret = tcan4x5x_write_tcan_reg(cdev, TCAN4X5X_INT_FLAGS, TCAN4X5X_CLEAR_ALL_INT); if (ret)
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c index 3305d9d..e4f4b5c 100644 --- a/drivers/net/can/mscan/mpc5xxx_can.c +++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -325,14 +325,14 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) &mscan_clksrc); if (!priv->can.clock.freq) { dev_err(&ofdev->dev, "couldn't get MSCAN clock properties\n"); - goto exit_put_clock; + goto exit_free_mscan; } err = register_mscandev(dev, mscan_clksrc); if (err) { dev_err(&ofdev->dev, "registering %s failed (err=%d)\n", DRV_NAME, err); - goto exit_put_clock; + goto exit_free_mscan; } dev_info(&ofdev->dev, "MSCAN at 0x%p, irq %d, clock %d Hz\n", @@ -340,9 +340,7 @@ static int mpc5xxx_can_probe(struct platform_device *ofdev) return 0; -exit_put_clock: - if (data->put_clock) - data->put_clock(ofdev); +exit_free_mscan: free_candev(dev); exit_dispose_irq: irq_dispose_mapping(irq);
diff --git a/drivers/net/can/pch_can.c b/drivers/net/can/pch_can.c index 586bda0..e90651f 100644 --- a/drivers/net/can/pch_can.c +++ b/drivers/net/can/pch_can.c
@@ -489,7 +489,6 @@ static void pch_can_error(struct net_device *ndev, u32 status) if (!skb) return; - errc = ioread32(&priv->regs->errc); if (status & PCH_BUS_OFF) { pch_can_set_tx_all(priv, 0); pch_can_set_rx_all(priv, 0); @@ -497,11 +496,9 @@ static void pch_can_error(struct net_device *ndev, u32 status) cf->can_id |= CAN_ERR_BUSOFF; priv->can.can_stats.bus_off++; can_bus_off(ndev); - } else { - cf->data[6] = errc & PCH_TEC; - cf->data[7] = (errc & PCH_REC) >> 8; } + errc = ioread32(&priv->regs->errc); /* Warning interrupt. */ if (status & PCH_EWARN) { state = CAN_STATE_ERROR_WARNING; @@ -559,6 +556,9 @@ static void pch_can_error(struct net_device *ndev, u32 status) break; } + cf->data[6] = errc & PCH_TEC; + cf->data[7] = (errc & PCH_REC) >> 8; + priv->can.state = state; netif_receive_skb(skb);
diff --git a/drivers/net/can/rcar/rcar_can.c b/drivers/net/can/rcar/rcar_can.c index b99b1b2..ac52288 100644 --- a/drivers/net/can/rcar/rcar_can.c +++ b/drivers/net/can/rcar/rcar_can.c
@@ -235,8 +235,11 @@ static void rcar_can_error(struct net_device *ndev) if (eifr & (RCAR_CAN_EIFR_EWIF | RCAR_CAN_EIFR_EPIF)) { txerr = readb(&priv->regs->tecr); rxerr = readb(&priv->regs->recr); - if (skb) + if (skb) { cf->can_id |= CAN_ERR_CRTL; + cf->data[6] = txerr; + cf->data[7] = rxerr; + } } if (eifr & RCAR_CAN_EIFR_BEIF) { int rx_errors = 0, tx_errors = 0; @@ -336,9 +339,6 @@ static void rcar_can_error(struct net_device *ndev) can_bus_off(ndev); if (skb) cf->can_id |= CAN_ERR_BUSOFF; - } else if (skb) { - cf->data[6] = txerr; - cf->data[7] = rxerr; } if (eifr & RCAR_CAN_EIFR_ORIF) { netdev_dbg(priv->ndev, "Receive overrun error interrupt\n");
diff --git a/drivers/net/can/rcar/rcar_canfd.c b/drivers/net/can/rcar/rcar_canfd.c index eed69e7..d4e9815 100644 --- a/drivers/net/can/rcar/rcar_canfd.c +++ b/drivers/net/can/rcar/rcar_canfd.c
@@ -1075,7 +1075,7 @@ static irqreturn_t rcar_canfd_global_interrupt(int irq, void *dev_id) struct rcar_canfd_global *gpriv = dev_id; struct net_device *ndev; struct rcar_canfd_channel *priv; - u32 sts, cc, gerfl; + u32 sts, gerfl; u32 ch, ridx; /* Global error interrupts still indicate a condition specific @@ -1093,9 +1093,7 @@ static irqreturn_t rcar_canfd_global_interrupt(int irq, void *dev_id) /* Handle Rx interrupts */ sts = rcar_canfd_read(priv->base, RCANFD_RFSTS(ridx)); - cc = rcar_canfd_read(priv->base, RCANFD_RFCC(ridx)); - if (likely(sts & RCANFD_RFSTS_RFIF && - cc & RCANFD_RFCC_RFIE)) { + if (likely(sts & RCANFD_RFSTS_RFIF)) { if (napi_schedule_prep(&priv->napi)) { /* Disable Rx FIFO interrupts */ rcar_canfd_clear_bit(priv->base,
diff --git a/drivers/net/can/sja1000/sja1000.c b/drivers/net/can/sja1000/sja1000.c index e7327ce..9f10779 100644 --- a/drivers/net/can/sja1000/sja1000.c +++ b/drivers/net/can/sja1000/sja1000.c
@@ -405,6 +405,9 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) txerr = priv->read_reg(priv, SJA1000_TXERR); rxerr = priv->read_reg(priv, SJA1000_RXERR); + cf->data[6] = txerr; + cf->data[7] = rxerr; + if (isrc & IRQ_DOI) { /* data overrun interrupt */ netdev_dbg(dev, "data overrun interrupt\n"); @@ -426,10 +429,6 @@ static int sja1000_err(struct net_device *dev, uint8_t isrc, uint8_t status) else state = CAN_STATE_ERROR_ACTIVE; } - if (state != CAN_STATE_BUS_OFF) { - cf->data[6] = txerr; - cf->data[7] = rxerr; - } if (isrc & IRQ_BEI) { /* bus error interrupt */ priv->can.can_stats.bus_error++;
diff --git a/drivers/net/can/sja1000/sja1000_isa.c b/drivers/net/can/sja1000/sja1000_isa.c index fe8441b..1c4d32d 100644 --- a/drivers/net/can/sja1000/sja1000_isa.c +++ b/drivers/net/can/sja1000/sja1000_isa.c
@@ -202,24 +202,22 @@ static int sja1000_isa_probe(struct platform_device *pdev) if (err) { dev_err(&pdev->dev, "registering %s failed (err=%d)\n", DRV_NAME, err); - goto exit_free; + goto exit_unmap; } dev_info(&pdev->dev, "%s device registered (reg_base=0x%p, irq=%d)\n", DRV_NAME, priv->reg_base, dev->irq); return 0; -exit_free: - free_sja1000dev(dev); -exit_unmap: + exit_unmap: if (mem[idx]) iounmap(base); -exit_release: + exit_release: if (mem[idx]) release_mem_region(mem[idx], iosize); else release_region(port[idx], iosize); -exit: + exit: return err; }
diff --git a/drivers/net/can/spi/hi311x.c b/drivers/net/can/spi/hi311x.c index 28273e8..7d2315c 100644 --- a/drivers/net/can/spi/hi311x.c +++ b/drivers/net/can/spi/hi311x.c
@@ -670,6 +670,8 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) txerr = hi3110_read(spi, HI3110_READ_TEC); rxerr = hi3110_read(spi, HI3110_READ_REC); + cf->data[6] = txerr; + cf->data[7] = rxerr; tx_state = txerr >= rxerr ? new_state : 0; rx_state = txerr <= rxerr ? new_state : 0; can_change_state(net, cf, tx_state, rx_state); @@ -682,9 +684,6 @@ static irqreturn_t hi3110_can_ist(int irq, void *dev_id) hi3110_hw_sleep(spi); break; } - } else { - cf->data[6] = txerr; - cf->data[7] = rxerr; } }
diff --git a/drivers/net/can/spi/mcp251x.c b/drivers/net/can/spi/mcp251x.c index 32bd593..bb20a9b 100644 --- a/drivers/net/can/spi/mcp251x.c +++ b/drivers/net/can/spi/mcp251x.c
@@ -756,6 +756,9 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) mcp251x_read_2regs(spi, CANINTF, &intf, &eflag); + /* mask out flags we don't care about */ + intf &= CANINTF_RX | CANINTF_TX | CANINTF_ERR; + /* receive buffer 0 */ if (intf & CANINTF_RX0IF) { mcp251x_hw_rx(spi, 0); @@ -765,18 +768,6 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) if (mcp251x_is_2510(spi)) mcp251x_write_bits(spi, CANINTF, CANINTF_RX0IF, 0x00); - - /* check if buffer 1 is already known to be full, no need to re-read */ - if (!(intf & CANINTF_RX1IF)) { - u8 intf1, eflag1; - - /* intf needs to be read again to avoid a race condition */ - mcp251x_read_2regs(spi, CANINTF, &intf1, &eflag1); - - /* combine flags from both operations for error handling */ - intf |= intf1; - eflag |= eflag1; - } } /* receive buffer 1 */ @@ -787,9 +778,6 @@ static irqreturn_t mcp251x_can_ist(int irq, void *dev_id) clear_intf |= CANINTF_RX1IF; } - /* mask out flags we don't care about */ - intf &= CANINTF_RX | CANINTF_TX | CANINTF_ERR; - /* any error or tx interrupt we need to clear? */ if (intf & (CANINTF_ERR | CANINTF_TX)) clear_intf |= intf & (CANINTF_ERR | CANINTF_TX);
diff --git a/drivers/net/can/sun4i_can.c b/drivers/net/can/sun4i_can.c index c519b6f..f4cd881 100644 --- a/drivers/net/can/sun4i_can.c +++ b/drivers/net/can/sun4i_can.c
@@ -525,6 +525,11 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) rxerr = (errc >> 16) & 0xFF; txerr = errc & 0xFF; + if (skb) { + cf->data[6] = txerr; + cf->data[7] = rxerr; + } + if (isrc & SUN4I_INT_DATA_OR) { /* data overrun interrupt */ netdev_dbg(dev, "data overrun interrupt\n"); @@ -555,10 +560,6 @@ static int sun4i_can_err(struct net_device *dev, u8 isrc, u8 status) else state = CAN_STATE_ERROR_ACTIVE; } - if (skb && state != CAN_STATE_BUS_OFF) { - cf->data[6] = txerr; - cf->data[7] = rxerr; - } if (isrc & SUN4I_INT_BUS_ERR) { /* bus error interrupt */ netdev_dbg(dev, "bus error interrupt\n");
diff --git a/drivers/net/can/usb/ems_usb.c b/drivers/net/can/usb/ems_usb.c index ff05b52..6458da9 100644 --- a/drivers/net/can/usb/ems_usb.c +++ b/drivers/net/can/usb/ems_usb.c
@@ -194,7 +194,7 @@ struct __packed ems_cpc_msg { __le32 ts_sec; /* timestamp in seconds */ __le32 ts_nsec; /* timestamp in nano seconds */ - union __packed { + union { u8 generic[64]; struct cpc_can_msg can_msg; struct cpc_can_params can_params;
diff --git a/drivers/net/can/usb/esd_usb2.c b/drivers/net/can/usb/esd_usb2.c index c9ccce6..8847942 100644 --- a/drivers/net/can/usb/esd_usb2.c +++ b/drivers/net/can/usb/esd_usb2.c
@@ -227,10 +227,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, u8 rxerr = msg->msg.rx.data[2]; u8 txerr = msg->msg.rx.data[3]; - netdev_dbg(priv->netdev, - "CAN_ERR_EV_EXT: dlc=%#02x state=%02x ecc=%02x rec=%02x tec=%02x\n", - msg->msg.rx.dlc, state, ecc, rxerr, txerr); - skb = alloc_can_err_skb(priv->netdev, &cf); if (skb == NULL) { stats->rx_dropped++; @@ -257,8 +253,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, break; default: priv->can.state = CAN_STATE_ERROR_ACTIVE; - txerr = 0; - rxerr = 0; break; } } else { @@ -278,6 +272,7 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, cf->data[2] |= CAN_ERR_PROT_STUFF; break; default: + cf->data[3] = ecc & SJA1000_ECC_SEG; break; } @@ -285,9 +280,6 @@ static void esd_usb2_rx_event(struct esd_usb2_net_priv *priv, if (!(ecc & SJA1000_ECC_DIR)) cf->data[2] |= CAN_ERR_PROT_TX; - /* Bit stream position in CAN frame as the error was detected */ - cf->data[3] = ecc & SJA1000_ECC_SEG; - if (priv->can.state == CAN_STATE_ERROR_WARNING || priv->can.state == CAN_STATE_ERROR_PASSIVE) { cf->data[1] = (txerr > rxerr) ?
diff --git a/drivers/net/can/usb/gs_usb.c b/drivers/net/can/usb/gs_usb.c index abd2a57..bf4ab30 100644 --- a/drivers/net/can/usb/gs_usb.c +++ b/drivers/net/can/usb/gs_usb.c
@@ -678,7 +678,6 @@ static int gs_can_open(struct net_device *netdev) flags |= GS_CAN_MODE_TRIPLE_SAMPLE; /* finally start device */ - dev->can.state = CAN_STATE_ERROR_ACTIVE; dm->mode = cpu_to_le32(GS_CAN_MODE_START); dm->flags = cpu_to_le32(flags); rc = usb_control_msg(interface_to_usbdev(dev->iface), @@ -695,12 +694,13 @@ static int gs_can_open(struct net_device *netdev) if (rc < 0) { netdev_err(netdev, "Couldn't start device (err=%d)\n", rc); kfree(dm); - dev->can.state = CAN_STATE_STOPPED; return rc; } kfree(dm); + dev->can.state = CAN_STATE_ERROR_ACTIVE; + parent->active_channels++; if (!(dev->can.ctrlmode & CAN_CTRLMODE_LISTENONLY)) netif_start_queue(netdev);
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h index 5699531..61e6798 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb.h +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb.h
@@ -76,14 +76,6 @@ struct kvaser_usb_tx_urb_context { int dlc; }; -struct kvaser_usb_busparams { - __le32 bitrate; - u8 tseg1; - u8 tseg2; - u8 sjw; - u8 nsamples; -} __packed; - struct kvaser_usb { struct usb_device *udev; struct usb_interface *intf; @@ -112,19 +104,13 @@ struct kvaser_usb_net_priv { struct can_priv can; struct can_berr_counter bec; - /* subdriver-specific data */ - void *sub_priv; - struct kvaser_usb *dev; struct net_device *netdev; int channel; - struct completion start_comp, stop_comp, flush_comp, - get_busparams_comp; + struct completion start_comp, stop_comp, flush_comp; struct usb_anchor tx_submitted; - struct kvaser_usb_busparams busparams_nominal, busparams_data; - spinlock_t tx_contexts_lock; /* lock for active_tx_contexts */ int active_tx_contexts; struct kvaser_usb_tx_urb_context tx_contexts[]; @@ -134,15 +120,11 @@ struct kvaser_usb_net_priv { * struct kvaser_usb_dev_ops - Device specific functions * @dev_set_mode: used for can.do_set_mode * @dev_set_bittiming: used for can.do_set_bittiming - * @dev_get_busparams: readback arbitration busparams * @dev_set_data_bittiming: used for can.do_set_data_bittiming - * @dev_get_data_busparams: readback data busparams * @dev_get_berr_counter: used for can.do_get_berr_counter * * @dev_setup_endpoints: setup USB in and out endpoints * @dev_init_card: initialize card - * @dev_init_channel: initialize channel - * @dev_remove_channel: uninitialize channel * @dev_get_software_info: get software info * @dev_get_software_details: get software details * @dev_get_card_info: get card info @@ -158,18 +140,12 @@ struct kvaser_usb_net_priv { */ struct kvaser_usb_dev_ops { int (*dev_set_mode)(struct net_device *netdev, enum can_mode mode); - int (*dev_set_bittiming)(const struct net_device *netdev, - const struct kvaser_usb_busparams *busparams); - int (*dev_get_busparams)(struct kvaser_usb_net_priv *priv); - int (*dev_set_data_bittiming)(const struct net_device *netdev, - const struct kvaser_usb_busparams *busparams); - int (*dev_get_data_busparams)(struct kvaser_usb_net_priv *priv); + int (*dev_set_bittiming)(struct net_device *netdev); + int (*dev_set_data_bittiming)(struct net_device *netdev); int (*dev_get_berr_counter)(const struct net_device *netdev, struct can_berr_counter *bec); int (*dev_setup_endpoints)(struct kvaser_usb *dev); int (*dev_init_card)(struct kvaser_usb *dev); - int (*dev_init_channel)(struct kvaser_usb_net_priv *priv); - void (*dev_remove_channel)(struct kvaser_usb_net_priv *priv); int (*dev_get_software_info)(struct kvaser_usb *dev); int (*dev_get_software_details)(struct kvaser_usb *dev); int (*dev_get_card_info)(struct kvaser_usb *dev); @@ -202,8 +178,6 @@ struct kvaser_usb_dev_cfg { extern const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops; extern const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops; -void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv); - int kvaser_usb_recv_cmd(const struct kvaser_usb *dev, void *cmd, int len, int *actual_len);
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c index 1f015b4..416763f 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c
@@ -416,6 +416,10 @@ static int kvaser_usb_open(struct net_device *netdev) if (err) return err; + err = kvaser_usb_setup_rx_urbs(dev); + if (err) + goto error; + err = ops->dev_set_opt_mode(priv); if (err) goto error; @@ -449,7 +453,7 @@ static void kvaser_usb_reset_tx_urb_contexts(struct kvaser_usb_net_priv *priv) /* This method might sleep. Do not call it in the atomic context * of URB completions. */ -void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv) +static void kvaser_usb_unlink_tx_urbs(struct kvaser_usb_net_priv *priv) { usb_kill_anchored_urbs(&priv->tx_submitted); kvaser_usb_reset_tx_urb_contexts(priv); @@ -506,93 +510,6 @@ static int kvaser_usb_close(struct net_device *netdev) return 0; } -static int kvaser_usb_set_bittiming(struct net_device *netdev) -{ - struct kvaser_usb_net_priv *priv = netdev_priv(netdev); - struct kvaser_usb *dev = priv->dev; - const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops; - struct can_bittiming *bt = &priv->can.bittiming; - - struct kvaser_usb_busparams busparams; - int tseg1 = bt->prop_seg + bt->phase_seg1; - int tseg2 = bt->phase_seg2; - int sjw = bt->sjw; - int err = -EOPNOTSUPP; - - busparams.bitrate = cpu_to_le32(bt->bitrate); - busparams.sjw = (u8)sjw; - busparams.tseg1 = (u8)tseg1; - busparams.tseg2 = (u8)tseg2; - if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) - busparams.nsamples = 3; - else - busparams.nsamples = 1; - - err = ops->dev_set_bittiming(netdev, &busparams); - if (err) - return err; - - err = kvaser_usb_setup_rx_urbs(priv->dev); - if (err) - return err; - - err = ops->dev_get_busparams(priv); - if (err) { - /* Treat EOPNOTSUPP as success */ - if (err == -EOPNOTSUPP) - err = 0; - return err; - } - - if (memcmp(&busparams, &priv->busparams_nominal, - sizeof(priv->busparams_nominal)) != 0) - err = -EINVAL; - - return err; -} - -static int kvaser_usb_set_data_bittiming(struct net_device *netdev) -{ - struct kvaser_usb_net_priv *priv = netdev_priv(netdev); - struct kvaser_usb *dev = priv->dev; - const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops; - struct can_bittiming *dbt = &priv->can.data_bittiming; - - struct kvaser_usb_busparams busparams; - int tseg1 = dbt->prop_seg + dbt->phase_seg1; - int tseg2 = dbt->phase_seg2; - int sjw = dbt->sjw; - int err; - - if (!ops->dev_set_data_bittiming || - !ops->dev_get_data_busparams) - return -EOPNOTSUPP; - - busparams.bitrate = cpu_to_le32(dbt->bitrate); - busparams.sjw = (u8)sjw; - busparams.tseg1 = (u8)tseg1; - busparams.tseg2 = (u8)tseg2; - busparams.nsamples = 1; - - err = ops->dev_set_data_bittiming(netdev, &busparams); - if (err) - return err; - - err = kvaser_usb_setup_rx_urbs(priv->dev); - if (err) - return err; - - err = ops->dev_get_data_busparams(priv); - if (err) - return err; - - if (memcmp(&busparams, &priv->busparams_data, - sizeof(priv->busparams_data)) != 0) - err = -EINVAL; - - return err; -} - static void kvaser_usb_write_bulk_callback(struct urb *urb) { struct kvaser_usb_tx_urb_context *context = urb->context; @@ -728,7 +645,6 @@ static const struct net_device_ops kvaser_usb_netdev_ops = { static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev) { - const struct kvaser_usb_dev_ops *ops = dev->driver_info->ops; int i; for (i = 0; i < dev->nchannels; i++) { @@ -744,9 +660,6 @@ static void kvaser_usb_remove_interfaces(struct kvaser_usb *dev) if (!dev->nets[i]) continue; - if (ops->dev_remove_channel) - ops->dev_remove_channel(dev->nets[i]); - free_candev(dev->nets[i]->netdev); } } @@ -777,8 +690,6 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) init_usb_anchor(&priv->tx_submitted); init_completion(&priv->start_comp); init_completion(&priv->stop_comp); - init_completion(&priv->flush_comp); - init_completion(&priv->get_busparams_comp); priv->can.ctrlmode_supported = 0; priv->dev = dev; @@ -791,7 +702,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) priv->can.state = CAN_STATE_STOPPED; priv->can.clock.freq = dev->cfg->clock.freq; priv->can.bittiming_const = dev->cfg->bittiming_const; - priv->can.do_set_bittiming = kvaser_usb_set_bittiming; + priv->can.do_set_bittiming = ops->dev_set_bittiming; priv->can.do_set_mode = ops->dev_set_mode; if ((driver_info->quirks & KVASER_USB_QUIRK_HAS_TXRX_ERRORS) || (priv->dev->card_data.capabilities & KVASER_USB_CAP_BERR_CAP)) @@ -803,7 +714,7 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) if (priv->can.ctrlmode_supported & CAN_CTRLMODE_FD) { priv->can.data_bittiming_const = dev->cfg->data_bittiming_const; - priv->can.do_set_data_bittiming = kvaser_usb_set_data_bittiming; + priv->can.do_set_data_bittiming = ops->dev_set_data_bittiming; } netdev->flags |= IFF_ECHO; @@ -815,26 +726,17 @@ static int kvaser_usb_init_one(struct kvaser_usb *dev, int channel) dev->nets[channel] = priv; - if (ops->dev_init_channel) { - err = ops->dev_init_channel(priv); - if (err) - goto err; - } - err = register_candev(netdev); if (err) { dev_err(&dev->intf->dev, "Failed to register CAN device\n"); - goto err; + free_candev(netdev); + dev->nets[channel] = NULL; + return err; } netdev_dbg(netdev, "device registered\n"); return 0; - -err: - free_candev(netdev); - dev->nets[channel] = NULL; - return err; } static int kvaser_usb_probe(struct usb_interface *intf,
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c index 233bbfe..a7c408a 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_hydra.c
@@ -43,8 +43,6 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_hydra_dev_cfg_flexc; /* Minihydra command IDs */ #define CMD_SET_BUSPARAMS_REQ 16 -#define CMD_GET_BUSPARAMS_REQ 17 -#define CMD_GET_BUSPARAMS_RESP 18 #define CMD_GET_CHIP_STATE_REQ 19 #define CMD_CHIP_STATE_EVENT 20 #define CMD_SET_DRIVERMODE_REQ 21 @@ -195,26 +193,21 @@ struct kvaser_cmd_chip_state_event { #define KVASER_USB_HYDRA_BUS_MODE_CANFD_ISO 0x01 #define KVASER_USB_HYDRA_BUS_MODE_NONISO 0x02 struct kvaser_cmd_set_busparams { - struct kvaser_usb_busparams busparams_nominal; + __le32 bitrate; + u8 tseg1; + u8 tseg2; + u8 sjw; + u8 nsamples; u8 reserved0[4]; - struct kvaser_usb_busparams busparams_data; + __le32 bitrate_d; + u8 tseg1_d; + u8 tseg2_d; + u8 sjw_d; + u8 nsamples_d; u8 canfd_mode; u8 reserved1[7]; } __packed; -/* Busparam type */ -#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN 0x00 -#define KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD 0x01 -struct kvaser_cmd_get_busparams_req { - u8 type; - u8 reserved[27]; -} __packed; - -struct kvaser_cmd_get_busparams_res { - struct kvaser_usb_busparams busparams; - u8 reserved[20]; -} __packed; - /* Ctrl modes */ #define KVASER_USB_HYDRA_CTRLMODE_NORMAL 0x01 #define KVASER_USB_HYDRA_CTRLMODE_LISTEN 0x02 @@ -285,8 +278,6 @@ struct kvaser_cmd { struct kvaser_cmd_error_event error_event; struct kvaser_cmd_set_busparams set_busparams_req; - struct kvaser_cmd_get_busparams_req get_busparams_req; - struct kvaser_cmd_get_busparams_res get_busparams_res; struct kvaser_cmd_chip_state_event chip_state_event; @@ -302,7 +293,6 @@ struct kvaser_cmd { #define KVASER_USB_HYDRA_CF_FLAG_OVERRUN BIT(1) #define KVASER_USB_HYDRA_CF_FLAG_REMOTE_FRAME BIT(4) #define KVASER_USB_HYDRA_CF_FLAG_EXTENDED_ID BIT(5) -#define KVASER_USB_HYDRA_CF_FLAG_TX_ACK BIT(6) /* CAN frame flags. Used in ext_rx_can and ext_tx_can */ #define KVASER_USB_HYDRA_CF_FLAG_OSM_NACK BIT(12) #define KVASER_USB_HYDRA_CF_FLAG_ABL BIT(13) @@ -369,10 +359,6 @@ struct kvaser_cmd_ext { } __packed; } __packed; -struct kvaser_usb_net_hydra_priv { - int pending_get_busparams_type; -}; - static const struct can_bittiming_const kvaser_usb_hydra_kcan_bittiming_c = { .name = "kvaser_usb_kcan", .tseg1_min = 1, @@ -518,7 +504,6 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev, u8 cmd_no, int channel) { struct kvaser_cmd *cmd; - size_t cmd_len; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); @@ -526,7 +511,6 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev, return -ENOMEM; cmd->header.cmd_no = cmd_no; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); if (channel < 0) { kvaser_usb_hydra_set_cmd_dest_he (cmd, KVASER_USB_HYDRA_HE_ADDRESS_ILLEGAL); @@ -543,7 +527,7 @@ static int kvaser_usb_hydra_send_simple_cmd(struct kvaser_usb *dev, kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); if (err) goto end; @@ -559,7 +543,6 @@ kvaser_usb_hydra_send_simple_cmd_async(struct kvaser_usb_net_priv *priv, { struct kvaser_cmd *cmd; struct kvaser_usb *dev = priv->dev; - size_t cmd_len; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_ATOMIC); @@ -567,14 +550,14 @@ kvaser_usb_hydra_send_simple_cmd_async(struct kvaser_usb_net_priv *priv, return -ENOMEM; cmd->header.cmd_no = cmd_no; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); kvaser_usb_hydra_set_cmd_dest_he (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd_async(priv, cmd, cmd_len); + err = kvaser_usb_send_cmd_async(priv, cmd, + kvaser_usb_hydra_cmd_size(cmd)); if (err) kfree(cmd); @@ -718,7 +701,6 @@ static int kvaser_usb_hydra_get_single_capability(struct kvaser_usb *dev, { struct kvaser_usb_dev_card_data *card_data = &dev->card_data; struct kvaser_cmd *cmd; - size_t cmd_len; u32 value = 0; u32 mask = 0; u16 cap_cmd_res; @@ -730,14 +712,13 @@ static int kvaser_usb_hydra_get_single_capability(struct kvaser_usb *dev, return -ENOMEM; cmd->header.cmd_no = CMD_GET_CAPABILITIES_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); cmd->cap_req.cap_cmd = cpu_to_le16(cap_cmd_req); kvaser_usb_hydra_set_cmd_dest_he(cmd, card_data->hydra.sysdbg_he); kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); if (err) goto end; @@ -831,39 +812,6 @@ static void kvaser_usb_hydra_flush_queue_reply(const struct kvaser_usb *dev, complete(&priv->flush_comp); } -static void kvaser_usb_hydra_get_busparams_reply(const struct kvaser_usb *dev, - const struct kvaser_cmd *cmd) -{ - struct kvaser_usb_net_priv *priv; - struct kvaser_usb_net_hydra_priv *hydra; - - priv = kvaser_usb_hydra_net_priv_from_cmd(dev, cmd); - if (!priv) - return; - - hydra = priv->sub_priv; - if (!hydra) - return; - - switch (hydra->pending_get_busparams_type) { - case KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN: - memcpy(&priv->busparams_nominal, &cmd->get_busparams_res.busparams, - sizeof(priv->busparams_nominal)); - break; - case KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD: - memcpy(&priv->busparams_data, &cmd->get_busparams_res.busparams, - sizeof(priv->busparams_nominal)); - break; - default: - dev_warn(&dev->intf->dev, "Unknown get_busparams_type %d\n", - hydra->pending_get_busparams_type); - break; - } - hydra->pending_get_busparams_type = -1; - - complete(&priv->get_busparams_comp); -} - static void kvaser_usb_hydra_bus_status_to_can_state(const struct kvaser_usb_net_priv *priv, u8 bus_status, @@ -942,10 +890,8 @@ static void kvaser_usb_hydra_update_state(struct kvaser_usb_net_priv *priv, new_state < CAN_STATE_BUS_OFF) priv->can.can_stats.restarts++; - if (new_state != CAN_STATE_BUS_OFF) { - cf->data[6] = bec->txerr; - cf->data[7] = bec->rxerr; - } + cf->data[6] = bec->txerr; + cf->data[7] = bec->rxerr; stats = &netdev->stats; stats->rx_packets++; @@ -1099,10 +1045,8 @@ kvaser_usb_hydra_error_frame(struct kvaser_usb_net_priv *priv, shhwtstamps->hwtstamp = hwtstamp; cf->can_id |= CAN_ERR_BUSERROR; - if (new_state != CAN_STATE_BUS_OFF) { - cf->data[6] = bec.txerr; - cf->data[7] = bec.rxerr; - } + cf->data[6] = bec.txerr; + cf->data[7] = bec.rxerr; stats->rx_packets++; stats->rx_bytes += cf->can_dlc; @@ -1151,7 +1095,6 @@ static void kvaser_usb_hydra_tx_acknowledge(const struct kvaser_usb *dev, struct kvaser_usb_net_priv *priv; unsigned long irq_flags; bool one_shot_fail = false; - bool is_err_frame = false; u16 transid = kvaser_usb_hydra_get_cmd_transid(cmd); priv = kvaser_usb_hydra_net_priv_from_cmd(dev, cmd); @@ -1170,13 +1113,10 @@ static void kvaser_usb_hydra_tx_acknowledge(const struct kvaser_usb *dev, kvaser_usb_hydra_one_shot_fail(priv, cmd_ext); one_shot_fail = true; } - - is_err_frame = flags & KVASER_USB_HYDRA_CF_FLAG_TX_ACK && - flags & KVASER_USB_HYDRA_CF_FLAG_ERROR_FRAME; } context = &priv->tx_contexts[transid % dev->max_tx_urbs]; - if (!one_shot_fail && !is_err_frame) { + if (!one_shot_fail) { struct net_device_stats *stats = &priv->netdev->stats; stats->tx_packets++; @@ -1350,10 +1290,6 @@ static void kvaser_usb_hydra_handle_cmd_std(const struct kvaser_usb *dev, kvaser_usb_hydra_state_event(dev, cmd); break; - case CMD_GET_BUSPARAMS_RESP: - kvaser_usb_hydra_get_busparams_reply(dev, cmd); - break; - case CMD_ERROR_EVENT: kvaser_usb_hydra_error_event(dev, cmd); break; @@ -1554,61 +1490,15 @@ static int kvaser_usb_hydra_set_mode(struct net_device *netdev, return err; } -static int kvaser_usb_hydra_get_busparams(struct kvaser_usb_net_priv *priv, - int busparams_type) -{ - struct kvaser_usb *dev = priv->dev; - struct kvaser_usb_net_hydra_priv *hydra = priv->sub_priv; - struct kvaser_cmd *cmd; - size_t cmd_len; - int err; - - if (!hydra) - return -EINVAL; - - cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); - if (!cmd) - return -ENOMEM; - - cmd->header.cmd_no = CMD_GET_BUSPARAMS_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); - kvaser_usb_hydra_set_cmd_dest_he - (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); - kvaser_usb_hydra_set_cmd_transid - (cmd, kvaser_usb_hydra_get_next_transid(dev)); - cmd->get_busparams_req.type = busparams_type; - hydra->pending_get_busparams_type = busparams_type; - - reinit_completion(&priv->get_busparams_comp); - - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); - if (err) - return err; - - if (!wait_for_completion_timeout(&priv->get_busparams_comp, - msecs_to_jiffies(KVASER_USB_TIMEOUT))) - return -ETIMEDOUT; - - return err; -} - -static int kvaser_usb_hydra_get_nominal_busparams(struct kvaser_usb_net_priv *priv) -{ - return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CAN); -} - -static int kvaser_usb_hydra_get_data_busparams(struct kvaser_usb_net_priv *priv) -{ - return kvaser_usb_hydra_get_busparams(priv, KVASER_USB_HYDRA_BUSPARAM_TYPE_CANFD); -} - -static int kvaser_usb_hydra_set_bittiming(const struct net_device *netdev, - const struct kvaser_usb_busparams *busparams) +static int kvaser_usb_hydra_set_bittiming(struct net_device *netdev) { struct kvaser_cmd *cmd; struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct can_bittiming *bt = &priv->can.bittiming; struct kvaser_usb *dev = priv->dev; - size_t cmd_len; + int tseg1 = bt->prop_seg + bt->phase_seg1; + int tseg2 = bt->phase_seg2; + int sjw = bt->sjw; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); @@ -1616,29 +1506,33 @@ static int kvaser_usb_hydra_set_bittiming(const struct net_device *netdev, return -ENOMEM; cmd->header.cmd_no = CMD_SET_BUSPARAMS_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); - memcpy(&cmd->set_busparams_req.busparams_nominal, busparams, - sizeof(cmd->set_busparams_req.busparams_nominal)); + cmd->set_busparams_req.bitrate = cpu_to_le32(bt->bitrate); + cmd->set_busparams_req.sjw = (u8)sjw; + cmd->set_busparams_req.tseg1 = (u8)tseg1; + cmd->set_busparams_req.tseg2 = (u8)tseg2; + cmd->set_busparams_req.nsamples = 1; kvaser_usb_hydra_set_cmd_dest_he (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); kfree(cmd); return err; } -static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev, - const struct kvaser_usb_busparams *busparams) +static int kvaser_usb_hydra_set_data_bittiming(struct net_device *netdev) { struct kvaser_cmd *cmd; struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct can_bittiming *dbt = &priv->can.data_bittiming; struct kvaser_usb *dev = priv->dev; - size_t cmd_len; + int tseg1 = dbt->prop_seg + dbt->phase_seg1; + int tseg2 = dbt->phase_seg2; + int sjw = dbt->sjw; int err; cmd = kcalloc(1, sizeof(struct kvaser_cmd), GFP_KERNEL); @@ -1646,9 +1540,11 @@ static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev, return -ENOMEM; cmd->header.cmd_no = CMD_SET_BUSPARAMS_FD_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); - memcpy(&cmd->set_busparams_req.busparams_data, busparams, - sizeof(cmd->set_busparams_req.busparams_data)); + cmd->set_busparams_req.bitrate_d = cpu_to_le32(dbt->bitrate); + cmd->set_busparams_req.sjw_d = (u8)sjw; + cmd->set_busparams_req.tseg1_d = (u8)tseg1; + cmd->set_busparams_req.tseg2_d = (u8)tseg2; + cmd->set_busparams_req.nsamples_d = 1; if (priv->can.ctrlmode & CAN_CTRLMODE_FD) { if (priv->can.ctrlmode & CAN_CTRLMODE_FD_NON_ISO) @@ -1664,7 +1560,7 @@ static int kvaser_usb_hydra_set_data_bittiming(const struct net_device *netdev, kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); kfree(cmd); @@ -1755,19 +1651,6 @@ static int kvaser_usb_hydra_init_card(struct kvaser_usb *dev) return 0; } -static int kvaser_usb_hydra_init_channel(struct kvaser_usb_net_priv *priv) -{ - struct kvaser_usb_net_hydra_priv *hydra; - - hydra = devm_kzalloc(&priv->dev->intf->dev, sizeof(*hydra), GFP_KERNEL); - if (!hydra) - return -ENOMEM; - - priv->sub_priv = hydra; - - return 0; -} - static int kvaser_usb_hydra_get_software_info(struct kvaser_usb *dev) { struct kvaser_cmd cmd; @@ -1792,7 +1675,6 @@ static int kvaser_usb_hydra_get_software_info(struct kvaser_usb *dev) static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev) { struct kvaser_cmd *cmd; - size_t cmd_len; int err; u32 flags; struct kvaser_usb_dev_card_data *card_data = &dev->card_data; @@ -1802,7 +1684,6 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev) return -ENOMEM; cmd->header.cmd_no = CMD_GET_SOFTWARE_DETAILS_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); cmd->sw_detail_req.use_ext_cmd = 1; kvaser_usb_hydra_set_cmd_dest_he (cmd, KVASER_USB_HYDRA_HE_ADDRESS_ILLEGAL); @@ -1810,7 +1691,7 @@ static int kvaser_usb_hydra_get_software_details(struct kvaser_usb *dev) kvaser_usb_hydra_set_cmd_transid (cmd, kvaser_usb_hydra_get_next_transid(dev)); - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); if (err) goto end; @@ -1926,7 +1807,6 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv) { struct kvaser_usb *dev = priv->dev; struct kvaser_cmd *cmd; - size_t cmd_len; int err; if ((priv->can.ctrlmode & @@ -1942,7 +1822,6 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv) return -ENOMEM; cmd->header.cmd_no = CMD_SET_DRIVERMODE_REQ; - cmd_len = kvaser_usb_hydra_cmd_size(cmd); kvaser_usb_hydra_set_cmd_dest_he (cmd, dev->card_data.hydra.channel_to_he[priv->channel]); kvaser_usb_hydra_set_cmd_transid @@ -1952,7 +1831,7 @@ static int kvaser_usb_hydra_set_opt_mode(const struct kvaser_usb_net_priv *priv) else cmd->set_ctrlmode.mode = KVASER_USB_HYDRA_CTRLMODE_NORMAL; - err = kvaser_usb_send_cmd(dev, cmd, cmd_len); + err = kvaser_usb_send_cmd(dev, cmd, kvaser_usb_hydra_cmd_size(cmd)); kfree(cmd); return err; @@ -1962,7 +1841,7 @@ static int kvaser_usb_hydra_start_chip(struct kvaser_usb_net_priv *priv) { int err; - reinit_completion(&priv->start_comp); + init_completion(&priv->start_comp); err = kvaser_usb_hydra_send_simple_cmd(priv->dev, CMD_START_CHIP_REQ, priv->channel); @@ -1980,7 +1859,7 @@ static int kvaser_usb_hydra_stop_chip(struct kvaser_usb_net_priv *priv) { int err; - reinit_completion(&priv->stop_comp); + init_completion(&priv->stop_comp); /* Make sure we do not report invalid BUS_OFF from CMD_CHIP_STATE_EVENT * see comment in kvaser_usb_hydra_update_state() @@ -2003,7 +1882,7 @@ static int kvaser_usb_hydra_flush_queue(struct kvaser_usb_net_priv *priv) { int err; - reinit_completion(&priv->flush_comp); + init_completion(&priv->flush_comp); err = kvaser_usb_hydra_send_simple_cmd(priv->dev, CMD_FLUSH_QUEUE, priv->channel); @@ -2114,13 +1993,10 @@ kvaser_usb_hydra_frame_to_cmd(const struct kvaser_usb_net_priv *priv, const struct kvaser_usb_dev_ops kvaser_usb_hydra_dev_ops = { .dev_set_mode = kvaser_usb_hydra_set_mode, .dev_set_bittiming = kvaser_usb_hydra_set_bittiming, - .dev_get_busparams = kvaser_usb_hydra_get_nominal_busparams, .dev_set_data_bittiming = kvaser_usb_hydra_set_data_bittiming, - .dev_get_data_busparams = kvaser_usb_hydra_get_data_busparams, .dev_get_berr_counter = kvaser_usb_hydra_get_berr_counter, .dev_setup_endpoints = kvaser_usb_hydra_setup_endpoints, .dev_init_card = kvaser_usb_hydra_init_card, - .dev_init_channel = kvaser_usb_hydra_init_channel, .dev_get_software_info = kvaser_usb_hydra_get_software_info, .dev_get_software_details = kvaser_usb_hydra_get_software_details, .dev_get_card_info = kvaser_usb_hydra_get_card_info,
diff --git a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c index f06d63d..0e0403d 100644 --- a/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c +++ b/drivers/net/can/usb/kvaser_usb/kvaser_usb_leaf.c
@@ -20,7 +20,6 @@ #include <linux/string.h> #include <linux/types.h> #include <linux/usb.h> -#include <linux/workqueue.h> #include <linux/can.h> #include <linux/can/dev.h> @@ -56,9 +55,6 @@ #define CMD_RX_EXT_MESSAGE 14 #define CMD_TX_EXT_MESSAGE 15 #define CMD_SET_BUS_PARAMS 16 -#define CMD_GET_BUS_PARAMS 17 -#define CMD_GET_BUS_PARAMS_REPLY 18 -#define CMD_GET_CHIP_STATE 19 #define CMD_CHIP_STATE_EVENT 20 #define CMD_SET_CTRL_MODE 21 #define CMD_RESET_CHIP 24 @@ -73,13 +69,10 @@ #define CMD_GET_CARD_INFO_REPLY 35 #define CMD_GET_SOFTWARE_INFO 38 #define CMD_GET_SOFTWARE_INFO_REPLY 39 -#define CMD_ERROR_EVENT 45 #define CMD_FLUSH_QUEUE 48 #define CMD_TX_ACKNOWLEDGE 50 #define CMD_CAN_ERROR_EVENT 51 #define CMD_FLUSH_QUEUE_REPLY 68 -#define CMD_GET_CAPABILITIES_REQ 95 -#define CMD_GET_CAPABILITIES_RESP 96 #define CMD_LEAF_LOG_MESSAGE 106 @@ -89,8 +82,6 @@ #define KVASER_USB_LEAF_SWOPTION_FREQ_32_MHZ_CLK BIT(5) #define KVASER_USB_LEAF_SWOPTION_FREQ_24_MHZ_CLK BIT(6) -#define KVASER_USB_LEAF_SWOPTION_EXT_CAP BIT(12) - /* error factors */ #define M16C_EF_ACKE BIT(0) #define M16C_EF_CRCE BIT(1) @@ -165,7 +156,11 @@ struct usbcan_cmd_softinfo { struct kvaser_cmd_busparams { u8 tid; u8 channel; - struct kvaser_usb_busparams busparams; + __le32 bitrate; + u8 tseg1; + u8 tseg2; + u8 sjw; + u8 no_samp; } __packed; struct kvaser_cmd_tx_can { @@ -234,7 +229,7 @@ struct kvaser_cmd_tx_acknowledge_header { u8 tid; } __packed; -struct leaf_cmd_can_error_event { +struct leaf_cmd_error_event { u8 tid; u8 flags; __le16 time[3]; @@ -246,7 +241,7 @@ struct leaf_cmd_can_error_event { u8 error_factor; } __packed; -struct usbcan_cmd_can_error_event { +struct usbcan_cmd_error_event { u8 tid; u8 padding; u8 tx_errors_count_ch0; @@ -258,28 +253,6 @@ struct usbcan_cmd_can_error_event { __le16 time; } __packed; -/* CMD_ERROR_EVENT error codes */ -#define KVASER_USB_LEAF_ERROR_EVENT_TX_QUEUE_FULL 0x8 -#define KVASER_USB_LEAF_ERROR_EVENT_PARAM 0x9 - -struct leaf_cmd_error_event { - u8 tid; - u8 error_code; - __le16 timestamp[3]; - __le16 padding; - __le16 info1; - __le16 info2; -} __packed; - -struct usbcan_cmd_error_event { - u8 tid; - u8 error_code; - __le16 info1; - __le16 info2; - __le16 timestamp; - __le16 padding; -} __packed; - struct kvaser_cmd_ctrl_mode { u8 tid; u8 channel; @@ -304,28 +277,6 @@ struct leaf_cmd_log_message { u8 data[8]; } __packed; -/* Sub commands for cap_req and cap_res */ -#define KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE 0x02 -#define KVASER_USB_LEAF_CAP_CMD_ERR_REPORT 0x05 -struct kvaser_cmd_cap_req { - __le16 padding0; - __le16 cap_cmd; - __le16 padding1; - __le16 channel; -} __packed; - -/* Status codes for cap_res */ -#define KVASER_USB_LEAF_CAP_STAT_OK 0x00 -#define KVASER_USB_LEAF_CAP_STAT_NOT_IMPL 0x01 -#define KVASER_USB_LEAF_CAP_STAT_UNAVAIL 0x02 -struct kvaser_cmd_cap_res { - __le16 padding; - __le16 cap_cmd; - __le16 status; - __le32 mask; - __le32 value; -} __packed; - struct kvaser_cmd { u8 len; u8 id; @@ -341,18 +292,14 @@ struct kvaser_cmd { struct leaf_cmd_softinfo softinfo; struct leaf_cmd_rx_can rx_can; struct leaf_cmd_chip_state_event chip_state_event; - struct leaf_cmd_can_error_event can_error_event; - struct leaf_cmd_log_message log_message; struct leaf_cmd_error_event error_event; - struct kvaser_cmd_cap_req cap_req; - struct kvaser_cmd_cap_res cap_res; + struct leaf_cmd_log_message log_message; } __packed leaf; union { struct usbcan_cmd_softinfo softinfo; struct usbcan_cmd_rx_can rx_can; struct usbcan_cmd_chip_state_event chip_state_event; - struct usbcan_cmd_can_error_event can_error_event; struct usbcan_cmd_error_event error_event; } __packed usbcan; @@ -362,42 +309,6 @@ struct kvaser_cmd { } u; } __packed; -#define CMD_SIZE_ANY 0xff -#define kvaser_fsize(field) sizeof_field(struct kvaser_cmd, field) - -static const u8 kvaser_usb_leaf_cmd_sizes_leaf[] = { - [CMD_START_CHIP_REPLY] = kvaser_fsize(u.simple), - [CMD_STOP_CHIP_REPLY] = kvaser_fsize(u.simple), - [CMD_GET_CARD_INFO_REPLY] = kvaser_fsize(u.cardinfo), - [CMD_TX_ACKNOWLEDGE] = kvaser_fsize(u.tx_acknowledge_header), - [CMD_GET_SOFTWARE_INFO_REPLY] = kvaser_fsize(u.leaf.softinfo), - [CMD_RX_STD_MESSAGE] = kvaser_fsize(u.leaf.rx_can), - [CMD_RX_EXT_MESSAGE] = kvaser_fsize(u.leaf.rx_can), - [CMD_LEAF_LOG_MESSAGE] = kvaser_fsize(u.leaf.log_message), - [CMD_CHIP_STATE_EVENT] = kvaser_fsize(u.leaf.chip_state_event), - [CMD_CAN_ERROR_EVENT] = kvaser_fsize(u.leaf.can_error_event), - [CMD_GET_CAPABILITIES_RESP] = kvaser_fsize(u.leaf.cap_res), - [CMD_GET_BUS_PARAMS_REPLY] = kvaser_fsize(u.busparams), - [CMD_ERROR_EVENT] = kvaser_fsize(u.leaf.error_event), - /* ignored events: */ - [CMD_FLUSH_QUEUE_REPLY] = CMD_SIZE_ANY, -}; - -static const u8 kvaser_usb_leaf_cmd_sizes_usbcan[] = { - [CMD_START_CHIP_REPLY] = kvaser_fsize(u.simple), - [CMD_STOP_CHIP_REPLY] = kvaser_fsize(u.simple), - [CMD_GET_CARD_INFO_REPLY] = kvaser_fsize(u.cardinfo), - [CMD_TX_ACKNOWLEDGE] = kvaser_fsize(u.tx_acknowledge_header), - [CMD_GET_SOFTWARE_INFO_REPLY] = kvaser_fsize(u.usbcan.softinfo), - [CMD_RX_STD_MESSAGE] = kvaser_fsize(u.usbcan.rx_can), - [CMD_RX_EXT_MESSAGE] = kvaser_fsize(u.usbcan.rx_can), - [CMD_CHIP_STATE_EVENT] = kvaser_fsize(u.usbcan.chip_state_event), - [CMD_CAN_ERROR_EVENT] = kvaser_fsize(u.usbcan.can_error_event), - [CMD_ERROR_EVENT] = kvaser_fsize(u.usbcan.error_event), - /* ignored events: */ - [CMD_USBCAN_CLOCK_OVERFLOW_EVENT] = CMD_SIZE_ANY, -}; - /* Summary of a kvaser error event, for a unified Leaf/Usbcan error * handling. Some discrepancies between the two families exist: * @@ -421,12 +332,6 @@ struct kvaser_usb_err_summary { }; }; -struct kvaser_usb_net_leaf_priv { - struct kvaser_usb_net_priv *net; - - struct delayed_work chip_state_req_work; -}; - static const struct can_bittiming_const kvaser_usb_leaf_m16c_bittiming_const = { .name = "kvaser_usb_ucii", .tseg1_min = 4, @@ -491,43 +396,6 @@ static const struct kvaser_usb_dev_cfg kvaser_usb_leaf_imx_dev_cfg_32mhz = { .bittiming_const = &kvaser_usb_flexc_bittiming_const, }; -static int kvaser_usb_leaf_verify_size(const struct kvaser_usb *dev, - const struct kvaser_cmd *cmd) -{ - /* buffer size >= cmd->len ensured by caller */ - u8 min_size = 0; - - switch (dev->driver_info->family) { - case KVASER_LEAF: - if (cmd->id < ARRAY_SIZE(kvaser_usb_leaf_cmd_sizes_leaf)) - min_size = kvaser_usb_leaf_cmd_sizes_leaf[cmd->id]; - break; - case KVASER_USBCAN: - if (cmd->id < ARRAY_SIZE(kvaser_usb_leaf_cmd_sizes_usbcan)) - min_size = kvaser_usb_leaf_cmd_sizes_usbcan[cmd->id]; - break; - } - - if (min_size == CMD_SIZE_ANY) - return 0; - - if (min_size) { - min_size += CMD_HEADER_LEN; - if (cmd->len >= min_size) - return 0; - - dev_err_ratelimited(&dev->intf->dev, - "Received command %u too short (size %u, needed %u)", - cmd->id, cmd->len, min_size); - return -EIO; - } - - dev_warn_ratelimited(&dev->intf->dev, - "Unhandled command (%d, size %d)\n", - cmd->id, cmd->len); - return -EINVAL; -} - static void * kvaser_usb_leaf_frame_to_cmd(const struct kvaser_usb_net_priv *priv, const struct sk_buff *skb, int *frame_len, @@ -635,9 +503,6 @@ static int kvaser_usb_leaf_wait_cmd(const struct kvaser_usb *dev, u8 id, end: kfree(buf); - if (err == 0) - err = kvaser_usb_leaf_verify_size(dev, cmd); - return err; } @@ -670,9 +535,6 @@ static void kvaser_usb_leaf_get_software_info_leaf(struct kvaser_usb *dev, dev->fw_version = le32_to_cpu(softinfo->fw_version); dev->max_tx_urbs = le16_to_cpu(softinfo->max_outstanding_tx); - if (sw_options & KVASER_USB_LEAF_SWOPTION_EXT_CAP) - dev->card_data.capabilities |= KVASER_USB_CAP_EXT_CAP; - if (dev->driver_info->quirks & KVASER_USB_QUIRK_IGNORE_CLK_FREQ) { /* Firmware expects bittiming parameters calculated for 16MHz * clock, regardless of the actual clock @@ -760,116 +622,6 @@ static int kvaser_usb_leaf_get_card_info(struct kvaser_usb *dev) return 0; } -static int kvaser_usb_leaf_get_single_capability(struct kvaser_usb *dev, - u16 cap_cmd_req, u16 *status) -{ - struct kvaser_usb_dev_card_data *card_data = &dev->card_data; - struct kvaser_cmd *cmd; - u32 value = 0; - u32 mask = 0; - u16 cap_cmd_res; - int err; - int i; - - cmd = kzalloc(sizeof(*cmd), GFP_KERNEL); - if (!cmd) - return -ENOMEM; - - cmd->id = CMD_GET_CAPABILITIES_REQ; - cmd->u.leaf.cap_req.cap_cmd = cpu_to_le16(cap_cmd_req); - cmd->len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_cap_req); - - err = kvaser_usb_send_cmd(dev, cmd, cmd->len); - if (err) - goto end; - - err = kvaser_usb_leaf_wait_cmd(dev, CMD_GET_CAPABILITIES_RESP, cmd); - if (err) - goto end; - - *status = le16_to_cpu(cmd->u.leaf.cap_res.status); - - if (*status != KVASER_USB_LEAF_CAP_STAT_OK) - goto end; - - cap_cmd_res = le16_to_cpu(cmd->u.leaf.cap_res.cap_cmd); - switch (cap_cmd_res) { - case KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE: - case KVASER_USB_LEAF_CAP_CMD_ERR_REPORT: - value = le32_to_cpu(cmd->u.leaf.cap_res.value); - mask = le32_to_cpu(cmd->u.leaf.cap_res.mask); - break; - default: - dev_warn(&dev->intf->dev, "Unknown capability command %u\n", - cap_cmd_res); - break; - } - - for (i = 0; i < dev->nchannels; i++) { - if (BIT(i) & (value & mask)) { - switch (cap_cmd_res) { - case KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE: - card_data->ctrlmode_supported |= - CAN_CTRLMODE_LISTENONLY; - break; - case KVASER_USB_LEAF_CAP_CMD_ERR_REPORT: - card_data->capabilities |= - KVASER_USB_CAP_BERR_CAP; - break; - } - } - } - -end: - kfree(cmd); - - return err; -} - -static int kvaser_usb_leaf_get_capabilities_leaf(struct kvaser_usb *dev) -{ - int err; - u16 status; - - if (!(dev->card_data.capabilities & KVASER_USB_CAP_EXT_CAP)) { - dev_info(&dev->intf->dev, - "No extended capability support. Upgrade device firmware.\n"); - return 0; - } - - err = kvaser_usb_leaf_get_single_capability(dev, - KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE, - &status); - if (err) - return err; - if (status) - dev_info(&dev->intf->dev, - "KVASER_USB_LEAF_CAP_CMD_LISTEN_MODE failed %u\n", - status); - - err = kvaser_usb_leaf_get_single_capability(dev, - KVASER_USB_LEAF_CAP_CMD_ERR_REPORT, - &status); - if (err) - return err; - if (status) - dev_info(&dev->intf->dev, - "KVASER_USB_LEAF_CAP_CMD_ERR_REPORT failed %u\n", - status); - - return 0; -} - -static int kvaser_usb_leaf_get_capabilities(struct kvaser_usb *dev) -{ - int err = 0; - - if (dev->driver_info->family == KVASER_LEAF) - err = kvaser_usb_leaf_get_capabilities_leaf(dev); - - return err; -} - static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev, const struct kvaser_cmd *cmd) { @@ -898,7 +650,7 @@ static void kvaser_usb_leaf_tx_acknowledge(const struct kvaser_usb *dev, context = &priv->tx_contexts[tid % dev->max_tx_urbs]; /* Sometimes the state change doesn't come after a bus-off event */ - if (priv->can.restart_ms && priv->can.state == CAN_STATE_BUS_OFF) { + if (priv->can.restart_ms && priv->can.state >= CAN_STATE_BUS_OFF) { struct sk_buff *skb; struct can_frame *cf; @@ -954,16 +706,6 @@ static int kvaser_usb_leaf_simple_cmd_async(struct kvaser_usb_net_priv *priv, return err; } -static void kvaser_usb_leaf_chip_state_req_work(struct work_struct *work) -{ - struct kvaser_usb_net_leaf_priv *leaf = - container_of(work, struct kvaser_usb_net_leaf_priv, - chip_state_req_work.work); - struct kvaser_usb_net_priv *priv = leaf->net; - - kvaser_usb_leaf_simple_cmd_async(priv, CMD_GET_CHIP_STATE); -} - static void kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, const struct kvaser_usb_err_summary *es, @@ -982,17 +724,21 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, new_state = CAN_STATE_BUS_OFF; } else if (es->status & M16C_STATE_BUS_PASSIVE) { new_state = CAN_STATE_ERROR_PASSIVE; - } else if ((es->status & M16C_STATE_BUS_ERROR) && - cur_state >= CAN_STATE_BUS_OFF) { + } else if (es->status & M16C_STATE_BUS_ERROR) { /* Guard against spurious error events after a busoff */ - } else if (es->txerr >= 128 || es->rxerr >= 128) { - new_state = CAN_STATE_ERROR_PASSIVE; - } else if (es->txerr >= 96 || es->rxerr >= 96) { - new_state = CAN_STATE_ERROR_WARNING; - } else { - new_state = CAN_STATE_ERROR_ACTIVE; + if (cur_state < CAN_STATE_BUS_OFF) { + if (es->txerr >= 128 || es->rxerr >= 128) + new_state = CAN_STATE_ERROR_PASSIVE; + else if (es->txerr >= 96 || es->rxerr >= 96) + new_state = CAN_STATE_ERROR_WARNING; + else if (cur_state > CAN_STATE_ERROR_ACTIVE) + new_state = CAN_STATE_ERROR_ACTIVE; + } } + if (!es->status) + new_state = CAN_STATE_ERROR_ACTIVE; + if (new_state != cur_state) { tx_state = (es->txerr >= es->rxerr) ? new_state : 0; rx_state = (es->txerr <= es->rxerr) ? new_state : 0; @@ -1001,7 +747,7 @@ kvaser_usb_leaf_rx_error_update_can_state(struct kvaser_usb_net_priv *priv, } if (priv->can.restart_ms && - cur_state == CAN_STATE_BUS_OFF && + cur_state >= CAN_STATE_BUS_OFF && new_state < CAN_STATE_BUS_OFF) priv->can.can_stats.restarts++; @@ -1035,7 +781,6 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, struct sk_buff *skb; struct net_device_stats *stats; struct kvaser_usb_net_priv *priv; - struct kvaser_usb_net_leaf_priv *leaf; enum can_state old_state, new_state; if (es->channel >= dev->nchannels) { @@ -1045,13 +790,8 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, } priv = dev->nets[es->channel]; - leaf = priv->sub_priv; stats = &priv->netdev->stats; - /* Ignore e.g. state change to bus-off reported just after stopping */ - if (!netif_running(priv->netdev)) - return; - /* Update all of the CAN interface's state and error counters before * trying any memory allocation that can actually fail with -ENOMEM. * @@ -1066,14 +806,6 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, kvaser_usb_leaf_rx_error_update_can_state(priv, es, &tmp_cf); new_state = priv->can.state; - /* If there are errors, request status updates periodically as we do - * not get automatic notifications of improved state. - */ - if (new_state < CAN_STATE_BUS_OFF && - (es->rxerr || es->txerr || new_state == CAN_STATE_ERROR_PASSIVE)) - schedule_delayed_work(&leaf->chip_state_req_work, - msecs_to_jiffies(500)); - skb = alloc_can_err_skb(priv->netdev, &cf); if (!skb) { stats->rx_dropped++; @@ -1091,7 +823,7 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, } if (priv->can.restart_ms && - old_state == CAN_STATE_BUS_OFF && + old_state >= CAN_STATE_BUS_OFF && new_state < CAN_STATE_BUS_OFF) { cf->can_id |= CAN_ERR_RESTARTED; netif_carrier_on(priv->netdev); @@ -1125,10 +857,8 @@ static void kvaser_usb_leaf_rx_error(const struct kvaser_usb *dev, break; } - if (new_state != CAN_STATE_BUS_OFF) { - cf->data[6] = es->txerr; - cf->data[7] = es->rxerr; - } + cf->data[6] = es->txerr; + cf->data[7] = es->rxerr; stats->rx_packets++; stats->rx_bytes += cf->can_dlc; @@ -1191,11 +921,11 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev, case CMD_CAN_ERROR_EVENT: es.channel = 0; - es.status = cmd->u.usbcan.can_error_event.status_ch0; - es.txerr = cmd->u.usbcan.can_error_event.tx_errors_count_ch0; - es.rxerr = cmd->u.usbcan.can_error_event.rx_errors_count_ch0; + es.status = cmd->u.usbcan.error_event.status_ch0; + es.txerr = cmd->u.usbcan.error_event.tx_errors_count_ch0; + es.rxerr = cmd->u.usbcan.error_event.rx_errors_count_ch0; es.usbcan.other_ch_status = - cmd->u.usbcan.can_error_event.status_ch1; + cmd->u.usbcan.error_event.status_ch1; kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &es); /* The USBCAN firmware supports up to 2 channels. @@ -1203,13 +933,13 @@ static void kvaser_usb_leaf_usbcan_rx_error(const struct kvaser_usb *dev, */ if (dev->nchannels == MAX_USBCAN_NET_DEVICES) { es.channel = 1; - es.status = cmd->u.usbcan.can_error_event.status_ch1; + es.status = cmd->u.usbcan.error_event.status_ch1; es.txerr = - cmd->u.usbcan.can_error_event.tx_errors_count_ch1; + cmd->u.usbcan.error_event.tx_errors_count_ch1; es.rxerr = - cmd->u.usbcan.can_error_event.rx_errors_count_ch1; + cmd->u.usbcan.error_event.rx_errors_count_ch1; es.usbcan.other_ch_status = - cmd->u.usbcan.can_error_event.status_ch0; + cmd->u.usbcan.error_event.status_ch0; kvaser_usb_leaf_usbcan_conditionally_rx_error(dev, &es); } break; @@ -1226,11 +956,11 @@ static void kvaser_usb_leaf_leaf_rx_error(const struct kvaser_usb *dev, switch (cmd->id) { case CMD_CAN_ERROR_EVENT: - es.channel = cmd->u.leaf.can_error_event.channel; - es.status = cmd->u.leaf.can_error_event.status; - es.txerr = cmd->u.leaf.can_error_event.tx_errors_count; - es.rxerr = cmd->u.leaf.can_error_event.rx_errors_count; - es.leaf.error_factor = cmd->u.leaf.can_error_event.error_factor; + es.channel = cmd->u.leaf.error_event.channel; + es.status = cmd->u.leaf.error_event.status; + es.txerr = cmd->u.leaf.error_event.tx_errors_count; + es.rxerr = cmd->u.leaf.error_event.rx_errors_count; + es.leaf.error_factor = cmd->u.leaf.error_event.error_factor; break; case CMD_LEAF_LOG_MESSAGE: es.channel = cmd->u.leaf.log_message.channel; @@ -1362,74 +1092,6 @@ static void kvaser_usb_leaf_rx_can_msg(const struct kvaser_usb *dev, netif_rx(skb); } -static void kvaser_usb_leaf_error_event_parameter(const struct kvaser_usb *dev, - const struct kvaser_cmd *cmd) -{ - u16 info1 = 0; - - switch (dev->driver_info->family) { - case KVASER_LEAF: - info1 = le16_to_cpu(cmd->u.leaf.error_event.info1); - break; - case KVASER_USBCAN: - info1 = le16_to_cpu(cmd->u.usbcan.error_event.info1); - break; - } - - /* info1 will contain the offending cmd_no */ - switch (info1) { - case CMD_SET_CTRL_MODE: - dev_warn(&dev->intf->dev, - "CMD_SET_CTRL_MODE error in parameter\n"); - break; - - case CMD_SET_BUS_PARAMS: - dev_warn(&dev->intf->dev, - "CMD_SET_BUS_PARAMS error in parameter\n"); - break; - - default: - dev_warn(&dev->intf->dev, - "Unhandled parameter error event cmd_no (%u)\n", - info1); - break; - } -} - -static void kvaser_usb_leaf_error_event(const struct kvaser_usb *dev, - const struct kvaser_cmd *cmd) -{ - u8 error_code = 0; - - switch (dev->driver_info->family) { - case KVASER_LEAF: - error_code = cmd->u.leaf.error_event.error_code; - break; - case KVASER_USBCAN: - error_code = cmd->u.usbcan.error_event.error_code; - break; - } - - switch (error_code) { - case KVASER_USB_LEAF_ERROR_EVENT_TX_QUEUE_FULL: - /* Received additional CAN message, when firmware TX queue is - * already full. Something is wrong with the driver. - * This should never happen! - */ - dev_err(&dev->intf->dev, - "Received error event TX_QUEUE_FULL\n"); - break; - case KVASER_USB_LEAF_ERROR_EVENT_PARAM: - kvaser_usb_leaf_error_event_parameter(dev, cmd); - break; - - default: - dev_warn(&dev->intf->dev, - "Unhandled error event (%d)\n", error_code); - break; - } -} - static void kvaser_usb_leaf_start_chip_reply(const struct kvaser_usb *dev, const struct kvaser_cmd *cmd) { @@ -1470,31 +1132,9 @@ static void kvaser_usb_leaf_stop_chip_reply(const struct kvaser_usb *dev, complete(&priv->stop_comp); } -static void kvaser_usb_leaf_get_busparams_reply(const struct kvaser_usb *dev, - const struct kvaser_cmd *cmd) -{ - struct kvaser_usb_net_priv *priv; - u8 channel = cmd->u.busparams.channel; - - if (channel >= dev->nchannels) { - dev_err(&dev->intf->dev, - "Invalid channel number (%d)\n", channel); - return; - } - - priv = dev->nets[channel]; - memcpy(&priv->busparams_nominal, &cmd->u.busparams.busparams, - sizeof(priv->busparams_nominal)); - - complete(&priv->get_busparams_comp); -} - static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev, const struct kvaser_cmd *cmd) { - if (kvaser_usb_leaf_verify_size(dev, cmd) < 0) - return; - switch (cmd->id) { case CMD_START_CHIP_REPLY: kvaser_usb_leaf_start_chip_reply(dev, cmd); @@ -1527,14 +1167,6 @@ static void kvaser_usb_leaf_handle_command(const struct kvaser_usb *dev, kvaser_usb_leaf_tx_acknowledge(dev, cmd); break; - case CMD_ERROR_EVENT: - kvaser_usb_leaf_error_event(dev, cmd); - break; - - case CMD_GET_BUS_PARAMS_REPLY: - kvaser_usb_leaf_get_busparams_reply(dev, cmd); - break; - /* Ignored commands */ case CMD_USBCAN_CLOCK_OVERFLOW_EVENT: if (dev->driver_info->family != KVASER_USBCAN) @@ -1615,7 +1247,7 @@ static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv) { int err; - reinit_completion(&priv->start_comp); + init_completion(&priv->start_comp); err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_START_CHIP, priv->channel); @@ -1631,12 +1263,9 @@ static int kvaser_usb_leaf_start_chip(struct kvaser_usb_net_priv *priv) static int kvaser_usb_leaf_stop_chip(struct kvaser_usb_net_priv *priv) { - struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv; int err; - reinit_completion(&priv->stop_comp); - - cancel_delayed_work(&leaf->chip_state_req_work); + init_completion(&priv->stop_comp); err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_STOP_CHIP, priv->channel); @@ -1684,35 +1313,10 @@ static int kvaser_usb_leaf_init_card(struct kvaser_usb *dev) return 0; } -static int kvaser_usb_leaf_init_channel(struct kvaser_usb_net_priv *priv) -{ - struct kvaser_usb_net_leaf_priv *leaf; - - leaf = devm_kzalloc(&priv->dev->intf->dev, sizeof(*leaf), GFP_KERNEL); - if (!leaf) - return -ENOMEM; - - leaf->net = priv; - INIT_DELAYED_WORK(&leaf->chip_state_req_work, - kvaser_usb_leaf_chip_state_req_work); - - priv->sub_priv = leaf; - - return 0; -} - -static void kvaser_usb_leaf_remove_channel(struct kvaser_usb_net_priv *priv) -{ - struct kvaser_usb_net_leaf_priv *leaf = priv->sub_priv; - - if (leaf) - cancel_delayed_work_sync(&leaf->chip_state_req_work); -} - -static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev, - const struct kvaser_usb_busparams *busparams) +static int kvaser_usb_leaf_set_bittiming(struct net_device *netdev) { struct kvaser_usb_net_priv *priv = netdev_priv(netdev); + struct can_bittiming *bt = &priv->can.bittiming; struct kvaser_usb *dev = priv->dev; struct kvaser_cmd *cmd; int rc; @@ -1725,8 +1329,15 @@ static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev, cmd->len = CMD_HEADER_LEN + sizeof(struct kvaser_cmd_busparams); cmd->u.busparams.channel = priv->channel; cmd->u.busparams.tid = 0xff; - memcpy(&cmd->u.busparams.busparams, busparams, - sizeof(cmd->u.busparams.busparams)); + cmd->u.busparams.bitrate = cpu_to_le32(bt->bitrate); + cmd->u.busparams.sjw = bt->sjw; + cmd->u.busparams.tseg1 = bt->prop_seg + bt->phase_seg1; + cmd->u.busparams.tseg2 = bt->phase_seg2; + + if (priv->can.ctrlmode & CAN_CTRLMODE_3_SAMPLES) + cmd->u.busparams.no_samp = 3; + else + cmd->u.busparams.no_samp = 1; rc = kvaser_usb_send_cmd(dev, cmd, cmd->len); @@ -1734,27 +1345,6 @@ static int kvaser_usb_leaf_set_bittiming(const struct net_device *netdev, return rc; } -static int kvaser_usb_leaf_get_busparams(struct kvaser_usb_net_priv *priv) -{ - int err; - - if (priv->dev->driver_info->family == KVASER_USBCAN) - return -EOPNOTSUPP; - - reinit_completion(&priv->get_busparams_comp); - - err = kvaser_usb_leaf_send_simple_cmd(priv->dev, CMD_GET_BUS_PARAMS, - priv->channel); - if (err) - return err; - - if (!wait_for_completion_timeout(&priv->get_busparams_comp, - msecs_to_jiffies(KVASER_USB_TIMEOUT))) - return -ETIMEDOUT; - - return 0; -} - static int kvaser_usb_leaf_set_mode(struct net_device *netdev, enum can_mode mode) { @@ -1763,13 +1353,9 @@ static int kvaser_usb_leaf_set_mode(struct net_device *netdev, switch (mode) { case CAN_MODE_START: - kvaser_usb_unlink_tx_urbs(priv); - err = kvaser_usb_leaf_simple_cmd_async(priv, CMD_START_CHIP); if (err) return err; - - priv->can.state = CAN_STATE_ERROR_ACTIVE; break; default: return -EOPNOTSUPP; @@ -1816,18 +1402,14 @@ static int kvaser_usb_leaf_setup_endpoints(struct kvaser_usb *dev) const struct kvaser_usb_dev_ops kvaser_usb_leaf_dev_ops = { .dev_set_mode = kvaser_usb_leaf_set_mode, .dev_set_bittiming = kvaser_usb_leaf_set_bittiming, - .dev_get_busparams = kvaser_usb_leaf_get_busparams, .dev_set_data_bittiming = NULL, - .dev_get_data_busparams = NULL, .dev_get_berr_counter = kvaser_usb_leaf_get_berr_counter, .dev_setup_endpoints = kvaser_usb_leaf_setup_endpoints, .dev_init_card = kvaser_usb_leaf_init_card, - .dev_init_channel = kvaser_usb_leaf_init_channel, - .dev_remove_channel = kvaser_usb_leaf_remove_channel, .dev_get_software_info = kvaser_usb_leaf_get_software_info, .dev_get_software_details = NULL, .dev_get_card_info = kvaser_usb_leaf_get_card_info, - .dev_get_capabilities = kvaser_usb_leaf_get_capabilities, + .dev_get_capabilities = NULL, .dev_set_opt_mode = kvaser_usb_leaf_set_opt_mode, .dev_start_chip = kvaser_usb_leaf_start_chip, .dev_stop_chip = kvaser_usb_leaf_stop_chip,
diff --git a/drivers/net/can/usb/mcba_usb.c b/drivers/net/can/usb/mcba_usb.c index 16fb4fc..957e51a 100644 --- a/drivers/net/can/usb/mcba_usb.c +++ b/drivers/net/can/usb/mcba_usb.c
@@ -47,10 +47,6 @@ #define MCBA_VER_REQ_USB 1 #define MCBA_VER_REQ_CAN 2 -/* Drive the CAN_RES signal LOW "0" to activate R24 and R25 */ -#define MCBA_VER_TERMINATION_ON 0 -#define MCBA_VER_TERMINATION_OFF 1 - #define MCBA_SIDL_EXID_MASK 0x8 #define MCBA_DLC_MASK 0xf #define MCBA_DLC_RTR_MASK 0x40 @@ -473,7 +469,7 @@ static void mcba_usb_process_ka_usb(struct mcba_priv *priv, priv->usb_ka_first_pass = false; } - if (msg->termination_state == MCBA_VER_TERMINATION_ON) + if (msg->termination_state) priv->can.termination = MCBA_TERMINATION_ENABLED; else priv->can.termination = MCBA_TERMINATION_DISABLED; @@ -793,9 +789,9 @@ static int mcba_set_termination(struct net_device *netdev, u16 term) }; if (term == MCBA_TERMINATION_ENABLED) - usb_msg.termination = MCBA_VER_TERMINATION_ON; + usb_msg.termination = 1; else - usb_msg.termination = MCBA_VER_TERMINATION_OFF; + usb_msg.termination = 0; mcba_usb_xmit_cmd(priv, (struct mcba_usb_msg *)&usb_msg);
diff --git a/drivers/net/can/usb/usb_8dev.c b/drivers/net/can/usb/usb_8dev.c index 89a94c1..b514b2e 100644 --- a/drivers/net/can/usb/usb_8dev.c +++ b/drivers/net/can/usb/usb_8dev.c
@@ -442,10 +442,9 @@ static void usb_8dev_rx_err_msg(struct usb_8dev_priv *priv, if (rx_errors) stats->rx_errors++; - if (priv->can.state != CAN_STATE_BUS_OFF) { - cf->data[6] = txerr; - cf->data[7] = rxerr; - } + + cf->data[6] = txerr; + cf->data[7] = rxerr; priv->bec.txerr = txerr; priv->bec.rxerr = rxerr;
diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c index 1458416..825d840 100644 --- a/drivers/net/dsa/b53/b53_common.c +++ b/drivers/net/dsa/b53/b53_common.c
@@ -1551,7 +1551,6 @@ static int b53_arl_op(struct b53_device *dev, int op, int port, memset(&ent, 0, sizeof(ent)); ent.port = port; - ent.is_valid = is_valid; ent.vid = vid; ent.is_static = true; memcpy(ent.mac, addr, ETH_ALEN);
diff --git a/drivers/net/dsa/b53/b53_mmap.c b/drivers/net/dsa/b53/b53_mmap.c index 1d52cb3..c628d09 100644 --- a/drivers/net/dsa/b53/b53_mmap.c +++ b/drivers/net/dsa/b53/b53_mmap.c
@@ -215,18 +215,6 @@ static int b53_mmap_write64(struct b53_device *dev, u8 page, u8 reg, return 0; } -static int b53_mmap_phy_read16(struct b53_device *dev, int addr, int reg, - u16 *value) -{ - return -EIO; -} - -static int b53_mmap_phy_write16(struct b53_device *dev, int addr, int reg, - u16 value) -{ - return -EIO; -} - static const struct b53_io_ops b53_mmap_ops = { .read8 = b53_mmap_read8, .read16 = b53_mmap_read16, @@ -238,8 +226,6 @@ static const struct b53_io_ops b53_mmap_ops = { .write32 = b53_mmap_write32, .write48 = b53_mmap_write48, .write64 = b53_mmap_write64, - .phy_read16 = b53_mmap_phy_read16, - .phy_write16 = b53_mmap_phy_write16, }; static int b53_mmap_probe(struct platform_device *pdev)
diff --git a/drivers/net/dsa/dsa_loop.c b/drivers/net/dsa/dsa_loop.c index e99e38c..0df6c2b 100644 --- a/drivers/net/dsa/dsa_loop.c +++ b/drivers/net/dsa/dsa_loop.c
@@ -329,17 +329,6 @@ static struct mdio_driver dsa_loop_drv = { #define NUM_FIXED_PHYS (DSA_LOOP_NUM_PORTS - 2) -static void dsa_loop_phydevs_unregister(void) -{ - unsigned int i; - - for (i = 0; i < NUM_FIXED_PHYS; i++) - if (!IS_ERR(phydevs[i])) { - fixed_phy_unregister(phydevs[i]); - phy_device_free(phydevs[i]); - } -} - static int __init dsa_loop_init(void) { struct fixed_phy_status status = { @@ -347,23 +336,23 @@ static int __init dsa_loop_init(void) .speed = SPEED_100, .duplex = DUPLEX_FULL, }; - unsigned int i, ret; + unsigned int i; for (i = 0; i < NUM_FIXED_PHYS; i++) phydevs[i] = fixed_phy_register(PHY_POLL, &status, NULL); - ret = mdio_driver_register(&dsa_loop_drv); - if (ret) - dsa_loop_phydevs_unregister(); - - return ret; + return mdio_driver_register(&dsa_loop_drv); } module_init(dsa_loop_init); static void __exit dsa_loop_exit(void) { + unsigned int i; + mdio_driver_unregister(&dsa_loop_drv); - dsa_loop_phydevs_unregister(); + for (i = 0; i < NUM_FIXED_PHYS; i++) + if (!IS_ERR(phydevs[i])) + fixed_phy_unregister(phydevs[i]); } module_exit(dsa_loop_exit);
diff --git a/drivers/net/dsa/lan9303-core.c b/drivers/net/dsa/lan9303-core.c index 625db92..4b9d5b0 100644 --- a/drivers/net/dsa/lan9303-core.c +++ b/drivers/net/dsa/lan9303-core.c
@@ -957,7 +957,7 @@ static const struct lan9303_mib_desc lan9303_mib[] = { { .offset = LAN9303_MAC_TX_BRDCST_CNT_0, .name = "TxBroad", }, { .offset = LAN9303_MAC_TX_PAUSE_CNT_0, .name = "TxPause", }, { .offset = LAN9303_MAC_TX_MULCST_CNT_0, .name = "TxMulti", }, - { .offset = LAN9303_MAC_RX_UNDSZE_CNT_0, .name = "RxShort", }, + { .offset = LAN9303_MAC_RX_UNDSZE_CNT_0, .name = "TxUnderRun", }, { .offset = LAN9303_MAC_TX_64_CNT_0, .name = "Tx64Byte", }, { .offset = LAN9303_MAC_TX_127_CNT_0, .name = "Tx128Byte", }, { .offset = LAN9303_MAC_TX_255_CNT_0, .name = "Tx256Byte", }, @@ -1001,11 +1001,9 @@ static void lan9303_get_ethtool_stats(struct dsa_switch *ds, int port, ret = lan9303_read_switch_port( chip, port, lan9303_mib[u].offset, ®); - if (ret) { + if (ret) dev_warn(chip->dev, "Reading status port %d reg %u failed\n", port, lan9303_mib[u].offset); - reg = 0; - } data[u] = reg; } }
diff --git a/drivers/net/dsa/microchip/ksz9477.c b/drivers/net/dsa/microchip/ksz9477.c index ba2dc01..0370e71 100644 --- a/drivers/net/dsa/microchip/ksz9477.c +++ b/drivers/net/dsa/microchip/ksz9477.c
@@ -682,10 +682,10 @@ static int ksz9477_port_fdb_del(struct dsa_switch *ds, int port, ksz_read32(dev, REG_SW_ALU_VAL_D, &alu_table[3]); /* clear forwarding port */ - alu_table[1] &= ~BIT(port); + alu_table[2] &= ~BIT(port); /* if there is no port to forward, clear table */ - if ((alu_table[1] & ALU_V_PORT_MAP) == 0) { + if ((alu_table[2] & ALU_V_PORT_MAP) == 0) { alu_table[0] = 0; alu_table[1] = 0; alu_table[2] = 0; @@ -766,9 +766,6 @@ static int ksz9477_port_fdb_dump(struct dsa_switch *ds, int port, goto exit; } - if (!(ksz_data & ALU_VALID)) - continue; - /* read ALU table */ ksz9477_read_table(dev, alu_table);
diff --git a/drivers/net/dsa/mv88e6060.c b/drivers/net/dsa/mv88e6060.c index 51ef8f2..2a2489b 100644 --- a/drivers/net/dsa/mv88e6060.c +++ b/drivers/net/dsa/mv88e6060.c
@@ -117,9 +117,6 @@ static int mv88e6060_setup_port(struct mv88e6060_priv *priv, int p) int addr = REG_PORT(p); int ret; - if (dsa_is_unused_port(priv->ds, p)) - return 0; - /* Do not force flow control, disable Ingress and Egress * Header tagging, disable VLAN tunneling, and set the port * state to Forwarding. Additionally, if this is the CPU
diff --git a/drivers/net/dsa/mv88e6xxx/chip.c b/drivers/net/dsa/mv88e6xxx/chip.c index ea32be5..b336ed0 100644 --- a/drivers/net/dsa/mv88e6xxx/chip.c +++ b/drivers/net/dsa/mv88e6xxx/chip.c
@@ -2433,14 +2433,9 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) * If this is the upstream port for this switch, enable * forwarding of unknown unicasts and multicasts. */ - reg = MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP | + reg = MV88E6XXX_PORT_CTL0_IGMP_MLD_SNOOP | + MV88E6185_PORT_CTL0_USE_TAG | MV88E6185_PORT_CTL0_USE_IP | MV88E6XXX_PORT_CTL0_STATE_FORWARDING; - /* Forward any IPv4 IGMP or IPv6 MLD frames received - * by a USER port to the CPU port to allow snooping. - */ - if (dsa_is_user_port(ds, port)) - reg |= MV88E6XXX_PORT_CTL0_IGMP_MLD_SNOOP; - err = mv88e6xxx_port_write(chip, port, MV88E6XXX_PORT_CTL0, reg); if (err) return err;
diff --git a/drivers/net/ethernet/aeroflex/greth.c b/drivers/net/ethernet/aeroflex/greth.c index 19e2b83..907904c 100644 --- a/drivers/net/ethernet/aeroflex/greth.c +++ b/drivers/net/ethernet/aeroflex/greth.c
@@ -258,7 +258,6 @@ static int greth_init_rings(struct greth_private *greth) if (dma_mapping_error(greth->dev, dma_addr)) { if (netif_msg_ifup(greth)) dev_err(greth->dev, "Could not create initial DMA mapping\n"); - dev_kfree_skb(skb); goto cleanup; } greth->rx_skbuff[i] = skb;
diff --git a/drivers/net/ethernet/amd/atarilance.c b/drivers/net/ethernet/amd/atarilance.c index 414b990..d3d44e0 100644 --- a/drivers/net/ethernet/amd/atarilance.c +++ b/drivers/net/ethernet/amd/atarilance.c
@@ -825,7 +825,7 @@ lance_start_xmit(struct sk_buff *skb, struct net_device *dev) lp->memcpy_f( PKTBUF_ADDR(head), (void *)skb->data, skb->len ); head->flag = TMD1_OWN_CHIP | TMD1_ENP | TMD1_STP; dev->stats.tx_bytes += skb->len; - dev_consume_skb_irq(skb); + dev_kfree_skb( skb ); lp->cur_tx++; while( lp->cur_tx >= TX_RING_SIZE && lp->dirty_tx >= TX_RING_SIZE ) { lp->cur_tx -= TX_RING_SIZE;
diff --git a/drivers/net/ethernet/amd/lance.c b/drivers/net/ethernet/amd/lance.c index 7ba3da8..f90b454 100644 --- a/drivers/net/ethernet/amd/lance.c +++ b/drivers/net/ethernet/amd/lance.c
@@ -997,7 +997,7 @@ static netdev_tx_t lance_start_xmit(struct sk_buff *skb, skb_copy_from_linear_data(skb, &lp->tx_bounce_buffs[entry], skb->len); lp->tx_ring[entry].base = ((u32)isa_virt_to_bus((lp->tx_bounce_buffs + entry)) & 0xffffff) | 0x83000000; - dev_consume_skb_irq(skb); + dev_kfree_skb(skb); } else { lp->tx_skbuff[entry] = skb; lp->tx_ring[entry].base = ((u32)isa_virt_to_bus(skb->data) & 0xffffff) | 0x83000000;
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c index decc1c0..d5fd49d 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-dev.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-dev.c
@@ -524,28 +524,19 @@ static void xgbe_disable_vxlan(struct xgbe_prv_data *pdata) netif_dbg(pdata, drv, pdata->netdev, "VXLAN acceleration disabled\n"); } -static unsigned int xgbe_get_fc_queue_count(struct xgbe_prv_data *pdata) -{ - unsigned int max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES; - - /* From MAC ver 30H the TFCR is per priority, instead of per queue */ - if (XGMAC_GET_BITS(pdata->hw_feat.version, MAC_VR, SNPSVER) >= 0x30) - return max_q_count; - else - return min_t(unsigned int, pdata->tx_q_count, max_q_count); -} - static int xgbe_disable_tx_flow_control(struct xgbe_prv_data *pdata) { + unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i, q_count; + unsigned int i; /* Clear MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) XGMAC_MTL_IOWRITE_BITS(pdata, i, MTL_Q_RQOMR, EHFC, 0); /* Clear MAC flow control */ - q_count = xgbe_get_fc_queue_count(pdata); + max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES; + q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = XGMAC_IOREAD(pdata, reg); @@ -562,8 +553,9 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata) { struct ieee_pfc *pfc = pdata->pfc; struct ieee_ets *ets = pdata->ets; + unsigned int max_q_count, q_count; unsigned int reg, reg_val; - unsigned int i, q_count; + unsigned int i; /* Set MTL flow control */ for (i = 0; i < pdata->rx_q_count; i++) { @@ -587,7 +579,8 @@ static int xgbe_enable_tx_flow_control(struct xgbe_prv_data *pdata) } /* Set MAC flow control */ - q_count = xgbe_get_fc_queue_count(pdata); + max_q_count = XGMAC_MAX_FLOW_CONTROL_QUEUES; + q_count = min_t(unsigned int, pdata->tx_q_count, max_q_count); reg = MAC_Q0TFCR; for (i = 0; i < q_count; i++) { reg_val = XGMAC_IOREAD(pdata, reg);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c index 7f70548..0442d7e 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-drv.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-drv.c
@@ -1139,9 +1139,6 @@ static void xgbe_free_irqs(struct xgbe_prv_data *pdata) devm_free_irq(pdata->dev, pdata->dev_irq, pdata); - tasklet_kill(&pdata->tasklet_dev); - tasklet_kill(&pdata->tasklet_ecc); - if (pdata->vdata->ecc_support && (pdata->dev_irq != pdata->ecc_irq)) devm_free_irq(pdata->dev, pdata->ecc_irq, pdata);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c b/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c index 5300437..4d9062d 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-i2c.c
@@ -447,10 +447,8 @@ static void xgbe_i2c_stop(struct xgbe_prv_data *pdata) xgbe_i2c_disable(pdata); xgbe_i2c_clear_all_interrupts(pdata); - if (pdata->dev_irq != pdata->i2c_irq) { + if (pdata->dev_irq != pdata->i2c_irq) devm_free_irq(pdata->dev, pdata->i2c_irq, pdata); - tasklet_kill(&pdata->tasklet_i2c); - } } static int xgbe_i2c_start(struct xgbe_prv_data *pdata)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c index 7840eb4..156a0bc 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-mdio.c
@@ -496,7 +496,6 @@ static enum xgbe_an xgbe_an73_tx_training(struct xgbe_prv_data *pdata, reg |= XGBE_KR_TRAINING_ENABLE; reg |= XGBE_KR_TRAINING_START; XMDIO_WRITE(pdata, MDIO_MMD_PMAPMD, MDIO_PMA_10GBR_PMD_CTRL, reg); - pdata->kr_start_time = jiffies; netif_dbg(pdata, link, pdata->netdev, "KR training initiated\n"); @@ -633,8 +632,6 @@ static enum xgbe_an xgbe_an73_incompat_link(struct xgbe_prv_data *pdata) xgbe_switch_mode(pdata); - pdata->an_result = XGBE_AN_READY; - xgbe_an_restart(pdata); return XGBE_AN_INCOMPAT_LINK; @@ -1278,30 +1275,9 @@ static bool xgbe_phy_aneg_done(struct xgbe_prv_data *pdata) static void xgbe_check_link_timeout(struct xgbe_prv_data *pdata) { unsigned long link_timeout; - unsigned long kr_time; - int wait; link_timeout = pdata->link_check + (XGBE_LINK_TIMEOUT * HZ); if (time_after(jiffies, link_timeout)) { - if ((xgbe_cur_mode(pdata) == XGBE_MODE_KR) && - pdata->phy.autoneg == AUTONEG_ENABLE) { - /* AN restart should not happen while KR training is in progress. - * The while loop ensures no AN restart during KR training, - * waits up to 500ms and AN restart is triggered only if KR - * training is failed. - */ - wait = XGBE_KR_TRAINING_WAIT_ITER; - while (wait--) { - kr_time = pdata->kr_start_time + - msecs_to_jiffies(XGBE_AN_MS_TIMEOUT); - if (time_after(jiffies, kr_time)) - break; - /* AN restart is not required, if AN result is COMPLETE */ - if (pdata->an_result == XGBE_AN_COMPLETE) - return; - usleep_range(10000, 11000); - } - } netif_dbg(pdata, link, pdata->netdev, "AN link timeout\n"); xgbe_phy_config_aneg(pdata); } @@ -1414,10 +1390,8 @@ static void xgbe_phy_stop(struct xgbe_prv_data *pdata) /* Disable auto-negotiation */ xgbe_an_disable_all(pdata); - if (pdata->dev_irq != pdata->an_irq) { + if (pdata->dev_irq != pdata->an_irq) devm_free_irq(pdata->dev, pdata->an_irq, pdata); - tasklet_kill(&pdata->tasklet_an); - } pdata->phy_if.phy_impl.stop(pdata);
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c index 0a15c61..0b325ae 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c +++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -188,7 +188,6 @@ enum xgbe_sfp_cable { XGBE_SFP_CABLE_UNKNOWN = 0, XGBE_SFP_CABLE_ACTIVE, XGBE_SFP_CABLE_PASSIVE, - XGBE_SFP_CABLE_FIBER, }; enum xgbe_sfp_base { @@ -236,7 +235,9 @@ enum xgbe_sfp_speed { #define XGBE_SFP_BASE_BR 12 #define XGBE_SFP_BASE_BR_1GBE_MIN 0x0a +#define XGBE_SFP_BASE_BR_1GBE_MAX 0x0d #define XGBE_SFP_BASE_BR_10GBE_MIN 0x64 +#define XGBE_SFP_BASE_BR_10GBE_MAX 0x68 #define XGBE_SFP_BASE_CU_CABLE_LEN 18 @@ -282,8 +283,6 @@ struct xgbe_sfp_eeprom { #define XGBE_BEL_FUSE_VENDOR "BEL-FUSE " #define XGBE_BEL_FUSE_PARTNO "1GBT-SFP06 " -#define XGBE_MOLEX_VENDOR "Molex Inc. " - struct xgbe_sfp_ascii { union { char vendor[XGBE_SFP_BASE_VENDOR_NAME_LEN + 1]; @@ -823,22 +822,25 @@ static void xgbe_phy_sfp_phy_settings(struct xgbe_prv_data *pdata) static bool xgbe_phy_sfp_bit_rate(struct xgbe_sfp_eeprom *sfp_eeprom, enum xgbe_sfp_speed sfp_speed) { - u8 *sfp_base, min; + u8 *sfp_base, min, max; sfp_base = sfp_eeprom->base; switch (sfp_speed) { case XGBE_SFP_SPEED_1000: min = XGBE_SFP_BASE_BR_1GBE_MIN; + max = XGBE_SFP_BASE_BR_1GBE_MAX; break; case XGBE_SFP_SPEED_10000: min = XGBE_SFP_BASE_BR_10GBE_MIN; + max = XGBE_SFP_BASE_BR_10GBE_MAX; break; default: return false; } - return sfp_base[XGBE_SFP_BASE_BR] >= min; + return ((sfp_base[XGBE_SFP_BASE_BR] >= min) && + (sfp_base[XGBE_SFP_BASE_BR] <= max)); } static void xgbe_phy_free_phy_device(struct xgbe_prv_data *pdata) @@ -1139,21 +1141,16 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) phy_data->sfp_tx_fault = xgbe_phy_check_sfp_tx_fault(phy_data); phy_data->sfp_rx_los = xgbe_phy_check_sfp_rx_los(phy_data); - /* Assume FIBER cable unless told otherwise */ + /* Assume ACTIVE cable unless told it is PASSIVE */ if (sfp_base[XGBE_SFP_BASE_CABLE] & XGBE_SFP_BASE_CABLE_PASSIVE) { phy_data->sfp_cable = XGBE_SFP_CABLE_PASSIVE; phy_data->sfp_cable_len = sfp_base[XGBE_SFP_BASE_CU_CABLE_LEN]; - } else if (sfp_base[XGBE_SFP_BASE_CABLE] & XGBE_SFP_BASE_CABLE_ACTIVE) { - phy_data->sfp_cable = XGBE_SFP_CABLE_ACTIVE; } else { - phy_data->sfp_cable = XGBE_SFP_CABLE_FIBER; + phy_data->sfp_cable = XGBE_SFP_CABLE_ACTIVE; } /* Determine the type of SFP */ - if (phy_data->sfp_cable != XGBE_SFP_CABLE_FIBER && - xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000)) - phy_data->sfp_base = XGBE_SFP_BASE_10000_CR; - else if (sfp_base[XGBE_SFP_BASE_10GBE_CC] & XGBE_SFP_BASE_10GBE_CC_SR) + if (sfp_base[XGBE_SFP_BASE_10GBE_CC] & XGBE_SFP_BASE_10GBE_CC_SR) phy_data->sfp_base = XGBE_SFP_BASE_10000_SR; else if (sfp_base[XGBE_SFP_BASE_10GBE_CC] & XGBE_SFP_BASE_10GBE_CC_LR) phy_data->sfp_base = XGBE_SFP_BASE_10000_LR; @@ -1169,6 +1166,9 @@ static void xgbe_phy_sfp_parse_eeprom(struct xgbe_prv_data *pdata) phy_data->sfp_base = XGBE_SFP_BASE_1000_CX; else if (sfp_base[XGBE_SFP_BASE_1GBE_CC] & XGBE_SFP_BASE_1GBE_CC_T) phy_data->sfp_base = XGBE_SFP_BASE_1000_T; + else if ((phy_data->sfp_cable == XGBE_SFP_CABLE_PASSIVE) && + xgbe_phy_sfp_bit_rate(sfp_eeprom, XGBE_SFP_SPEED_10000)) + phy_data->sfp_base = XGBE_SFP_BASE_10000_CR; switch (phy_data->sfp_base) { case XGBE_SFP_BASE_1000_T:
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe.h b/drivers/net/ethernet/amd/xgbe/xgbe.h index 729307a..0c93a55 100644 --- a/drivers/net/ethernet/amd/xgbe/xgbe.h +++ b/drivers/net/ethernet/amd/xgbe/xgbe.h
@@ -290,7 +290,6 @@ /* Auto-negotiation */ #define XGBE_AN_MS_TIMEOUT 500 #define XGBE_LINK_TIMEOUT 5 -#define XGBE_KR_TRAINING_WAIT_ITER 50 #define XGBE_SGMII_AN_LINK_STATUS BIT(1) #define XGBE_SGMII_AN_LINK_SPEED (BIT(2) | BIT(3)) @@ -1267,7 +1266,6 @@ struct xgbe_prv_data { unsigned int parallel_detect; unsigned int fec_ability; unsigned long an_start; - unsigned long kr_start_time; enum xgbe_an_mode an_mode; /* I2C support */
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c index 29fcc4d..ce4e617 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.c +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.c
@@ -1004,10 +1004,8 @@ static int xgene_enet_open(struct net_device *ndev) xgene_enet_napi_enable(pdata); ret = xgene_enet_register_irq(ndev); - if (ret) { - xgene_enet_napi_disable(pdata); + if (ret) return ret; - } if (ndev->phydev) { phy_start(ndev->phydev);
diff --git a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h index 6a253f8..18f4923 100644 --- a/drivers/net/ethernet/apm/xgene/xgene_enet_main.h +++ b/drivers/net/ethernet/apm/xgene/xgene_enet_main.h
@@ -18,7 +18,6 @@ #include <linux/of_platform.h> #include <linux/of_net.h> #include <linux/of_mdio.h> -#include <linux/mdio/mdio-xgene.h> #include <linux/module.h> #include <net/ip.h> #include <linux/prefetch.h> @@ -27,6 +26,7 @@ #include "xgene_enet_hw.h" #include "xgene_enet_cle.h" #include "xgene_enet_ring2.h" +#include "../../../phy/mdio-xgene.h" #define XGENE_DRV_VERSION "v1.0" #define ETHER_MIN_PACKET 64
diff --git a/drivers/net/ethernet/apple/bmac.c b/drivers/net/ethernet/apple/bmac.c index 11d9884..3e3711b 100644 --- a/drivers/net/ethernet/apple/bmac.c +++ b/drivers/net/ethernet/apple/bmac.c
@@ -1511,7 +1511,7 @@ static void bmac_tx_timeout(struct timer_list *t) i = bp->tx_empty; ++dev->stats.tx_errors; if (i != bp->tx_fill) { - dev_kfree_skb_irq(bp->tx_bufs[i]); + dev_kfree_skb(bp->tx_bufs[i]); bp->tx_bufs[i] = NULL; if (++i >= N_TX_RING) i = 0; bp->tx_empty = i;
diff --git a/drivers/net/ethernet/apple/mace.c b/drivers/net/ethernet/apple/mace.c index 65ed373..b8ba2ab 100644 --- a/drivers/net/ethernet/apple/mace.c +++ b/drivers/net/ethernet/apple/mace.c
@@ -841,7 +841,7 @@ static void mace_tx_timeout(struct timer_list *t) if (mp->tx_bad_runt) { mp->tx_bad_runt = 0; } else if (i != mp->tx_fill) { - dev_kfree_skb_irq(mp->tx_bufs[i]); + dev_kfree_skb(mp->tx_bufs[i]); if (++i >= N_TX_RING) i = 0; mp->tx_empty = i;
diff --git a/drivers/net/ethernet/broadcom/bgmac-bcma.c b/drivers/net/ethernet/broadcom/bgmac-bcma.c index 7d844b0..2d52754 100644 --- a/drivers/net/ethernet/broadcom/bgmac-bcma.c +++ b/drivers/net/ethernet/broadcom/bgmac-bcma.c
@@ -228,12 +228,12 @@ static int bgmac_probe(struct bcma_device *core) bgmac->feature_flags |= BGMAC_FEAT_CLKCTLST; bgmac->feature_flags |= BGMAC_FEAT_FLW_CTRL1; bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_PHY; - if ((ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM47186) || - (ci->id == BCMA_CHIP_ID_BCM53572 && ci->pkg == BCMA_PKG_ID_BCM47188)) { + if (ci->pkg == BCMA_PKG_ID_BCM47188 || + ci->pkg == BCMA_PKG_ID_BCM47186) { bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_RGMII; bgmac->feature_flags |= BGMAC_FEAT_IOST_ATTACHED; } - if (ci->id == BCMA_CHIP_ID_BCM5357 && ci->pkg == BCMA_PKG_ID_BCM5358) + if (ci->pkg == BCMA_PKG_ID_BCM5358) bgmac->feature_flags |= BGMAC_FEAT_SW_TYPE_EPHYRMII; break; case BCMA_CHIP_ID_BCM53573:
diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c index 1937223..148734b 100644 --- a/drivers/net/ethernet/broadcom/bgmac.c +++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -189,8 +189,8 @@ static netdev_tx_t bgmac_dma_tx_add(struct bgmac *bgmac, } slot->skb = skb; - netdev_sent_queue(net_dev, skb->len); ring->end += nr_frags + 1; + netdev_sent_queue(net_dev, skb->len); wmb(); @@ -1564,6 +1564,7 @@ void bgmac_enet_remove(struct bgmac *bgmac) phy_disconnect(bgmac->net_dev->phydev); netif_napi_del(&bgmac->napi); bgmac_dma_free(bgmac); + free_netdev(bgmac->net_dev); } EXPORT_SYMBOL_GPL(bgmac_enet_remove);
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c index d8e13ee..9af8afd 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
@@ -787,7 +787,6 @@ static void bnx2x_tpa_stop(struct bnx2x *bp, struct bnx2x_fastpath *fp, BNX2X_ERR("skb_put is about to fail... pad %d len %d rx_buf_size %d\n", pad, len, fp->rx_buf_size); bnx2x_panic(); - bnx2x_frag_free(fp, new_data); return; } #endif
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c index d920bb8..4630998 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
@@ -807,20 +807,16 @@ static void bnx2x_vf_enable_traffic(struct bnx2x *bp, struct bnx2x_virtf *vf) static u8 bnx2x_vf_is_pcie_pending(struct bnx2x *bp, u8 abs_vfid) { - struct bnx2x_virtf *vf = bnx2x_vf_by_abs_fid(bp, abs_vfid); struct pci_dev *dev; - bool pending; + struct bnx2x_virtf *vf = bnx2x_vf_by_abs_fid(bp, abs_vfid); if (!vf) return false; dev = pci_get_domain_bus_and_slot(vf->domain, vf->bus, vf->devfn); - if (!dev) - return false; - pending = bnx2x_is_pcie_pending(dev); - pci_dev_put(dev); - - return pending; + if (dev) + return bnx2x_is_pcie_pending(dev); + return false; } int bnx2x_vf_flr_clnup_epilog(struct bnx2x *bp, u8 abs_vfid)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c index 2c71e83..5a7d5e7 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -221,12 +221,12 @@ static const struct pci_device_id bnxt_pci_tbl[] = { { PCI_VDEVICE(BROADCOM, 0x1750), .driver_data = BCM57508 }, { PCI_VDEVICE(BROADCOM, 0x1751), .driver_data = BCM57504 }, { PCI_VDEVICE(BROADCOM, 0x1752), .driver_data = BCM57502 }, - { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57502_NPAR }, + { PCI_VDEVICE(BROADCOM, 0x1800), .driver_data = BCM57508_NPAR }, { PCI_VDEVICE(BROADCOM, 0x1801), .driver_data = BCM57504_NPAR }, - { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57508_NPAR }, - { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57502_NPAR }, + { PCI_VDEVICE(BROADCOM, 0x1802), .driver_data = BCM57502_NPAR }, + { PCI_VDEVICE(BROADCOM, 0x1803), .driver_data = BCM57508_NPAR }, { PCI_VDEVICE(BROADCOM, 0x1804), .driver_data = BCM57504_NPAR }, - { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57508_NPAR }, + { PCI_VDEVICE(BROADCOM, 0x1805), .driver_data = BCM57502_NPAR }, { PCI_VDEVICE(BROADCOM, 0xd802), .driver_data = BCM58802 }, { PCI_VDEVICE(BROADCOM, 0xd804), .driver_data = BCM58804 }, #ifdef CONFIG_BNXT_SRIOV @@ -2747,7 +2747,7 @@ static int bnxt_alloc_ring(struct bnxt *bp, struct bnxt_ring_mem_info *rmem) static void bnxt_free_tpa_info(struct bnxt *bp) { - int i, j; + int i; for (i = 0; i < bp->rx_nr_rings; i++) { struct bnxt_rx_ring_info *rxr = &bp->rx_ring[i]; @@ -2755,10 +2755,8 @@ static void bnxt_free_tpa_info(struct bnxt *bp) kfree(rxr->rx_tpa_idx_map); rxr->rx_tpa_idx_map = NULL; if (rxr->rx_tpa) { - for (j = 0; j < bp->max_tpa; j++) { - kfree(rxr->rx_tpa[j].agg_arr); - rxr->rx_tpa[j].agg_arr = NULL; - } + kfree(rxr->rx_tpa[0].agg_arr); + rxr->rx_tpa[0].agg_arr = NULL; } kfree(rxr->rx_tpa); rxr->rx_tpa = NULL; @@ -2767,13 +2765,14 @@ static void bnxt_free_tpa_info(struct bnxt *bp) static int bnxt_alloc_tpa_info(struct bnxt *bp) { - int i, j; + int i, j, total_aggs = 0; bp->max_tpa = MAX_TPA; if (bp->flags & BNXT_FLAG_CHIP_P5) { if (!bp->max_tpa_v2) return 0; bp->max_tpa = max_t(u16, bp->max_tpa_v2, MAX_TPA_P5); + total_aggs = bp->max_tpa * MAX_SKB_FRAGS; } for (i = 0; i < bp->rx_nr_rings; i++) { @@ -2787,12 +2786,12 @@ static int bnxt_alloc_tpa_info(struct bnxt *bp) if (!(bp->flags & BNXT_FLAG_CHIP_P5)) continue; - for (j = 0; j < bp->max_tpa; j++) { - agg = kcalloc(MAX_SKB_FRAGS, sizeof(*agg), GFP_KERNEL); - if (!agg) - return -ENOMEM; - rxr->rx_tpa[j].agg_arr = agg; - } + agg = kcalloc(total_aggs, sizeof(*agg), GFP_KERNEL); + rxr->rx_tpa[0].agg_arr = agg; + if (!agg) + return -ENOMEM; + for (j = 1; j < bp->max_tpa; j++) + rxr->rx_tpa[j].agg_arr = agg + j * MAX_SKB_FRAGS; rxr->rx_tpa_idx_map = kzalloc(sizeof(*rxr->rx_tpa_idx_map), GFP_KERNEL); if (!rxr->rx_tpa_idx_map) @@ -8206,14 +8205,10 @@ int bnxt_reserve_rings(struct bnxt *bp, bool irq_re_init) netdev_err(bp->dev, "ring reservation/IRQ init failure rc: %d\n", rc); return rc; } - if (tcs && (bp->tx_nr_rings_per_tc * tcs != - bp->tx_nr_rings - bp->tx_nr_rings_xdp)) { + if (tcs && (bp->tx_nr_rings_per_tc * tcs != bp->tx_nr_rings)) { netdev_err(bp->dev, "tx ring reservation failure\n"); netdev_reset_tc(bp->dev); - if (bp->tx_nr_rings_xdp) - bp->tx_nr_rings_per_tc = bp->tx_nr_rings_xdp; - else - bp->tx_nr_rings_per_tc = bp->tx_nr_rings; + bp->tx_nr_rings_per_tc = bp->tx_nr_rings; return -ENOMEM; } return 0; @@ -11187,8 +11182,8 @@ static int bnxt_rx_flow_steer(struct net_device *dev, const struct sk_buff *skb, rcu_read_lock(); hlist_for_each_entry_rcu(fltr, head, hash) { if (bnxt_fltr_match(fltr, new_fltr)) { - rc = fltr->sw_id; rcu_read_unlock(); + rc = 0; goto err_free; } } @@ -12237,16 +12232,8 @@ static struct pci_driver bnxt_pci_driver = { static int __init bnxt_init(void) { - int err; - bnxt_debug_init(); - err = pci_register_driver(&bnxt_pci_driver); - if (err) { - bnxt_debug_exit(); - return err; - } - - return 0; + return pci_register_driver(&bnxt_pci_driver); } static void __exit bnxt_exit(void)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c index 24282a4..d74c6a3 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -124,7 +124,7 @@ static int bnxt_set_coalesce(struct net_device *dev, } reset_coalesce: - if (test_bit(BNXT_STATE_OPEN, &bp->state)) { + if (netif_running(dev)) { if (update_stats) { rc = bnxt_close_nic(bp, true, false); if (!rc)
diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c index 3434ad6..452be97 100644 --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c
@@ -597,7 +597,7 @@ static int bnxt_hwrm_func_vf_resc_cfg(struct bnxt *bp, int num_vfs, bool reset) hw_resc->max_stat_ctxs -= le16_to_cpu(req.min_stat_ctx) * n; hw_resc->max_vnics -= le16_to_cpu(req.min_vnics) * n; if (bp->flags & BNXT_FLAG_CHIP_P5) - hw_resc->max_nqs -= vf_msix; + hw_resc->max_irqs -= vf_msix * n; rc = pf->active_vfs; }
diff --git a/drivers/net/ethernet/broadcom/genet/bcmgenet.c b/drivers/net/ethernet/broadcom/genet/bcmgenet.c index 1b725a0..e03e2bf 100644 --- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c +++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c
@@ -1823,14 +1823,6 @@ static unsigned int bcmgenet_desc_rx(struct bcmgenet_rx_ring *ring, __func__, p_index, ring->c_index, ring->read_ptr, dma_length_status); - if (unlikely(len > RX_BUF_LENGTH)) { - netif_err(priv, rx_status, dev, "oversized packet\n"); - dev->stats.rx_length_errors++; - dev->stats.rx_errors++; - dev_kfree_skb_any(skb); - goto next; - } - if (unlikely(!(dma_flag & DMA_EOP) || !(dma_flag & DMA_SOP))) { netif_err(priv, rx_status, dev, "dropping fragmented packet!\n");
diff --git a/drivers/net/ethernet/broadcom/tg3.c b/drivers/net/ethernet/broadcom/tg3.c index d0cd86a..70bd79d 100644 --- a/drivers/net/ethernet/broadcom/tg3.c +++ b/drivers/net/ethernet/broadcom/tg3.c
@@ -11195,7 +11195,7 @@ static void tg3_reset_task(struct work_struct *work) rtnl_lock(); tg3_full_lock(tp, 0); - if (tp->pcierr_recovery || !netif_running(tp->dev)) { + if (!netif_running(tp->dev)) { tg3_flag_clear(tp, RESET_TASK_PENDING); tg3_full_unlock(tp); rtnl_unlock(); @@ -18154,20 +18154,16 @@ static void tg3_shutdown(struct pci_dev *pdev) struct net_device *dev = pci_get_drvdata(pdev); struct tg3 *tp = netdev_priv(dev); - tg3_reset_task_cancel(tp); - rtnl_lock(); - netif_device_detach(dev); if (netif_running(dev)) dev_close(dev); - tg3_power_down(tp); + if (system_state == SYSTEM_POWER_OFF) + tg3_power_down(tp); rtnl_unlock(); - - pci_disable_device(pdev); } /** @@ -18187,9 +18183,6 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, netdev_info(netdev, "PCI I/O error detected\n"); - /* Want to make sure that the reset task doesn't run */ - tg3_reset_task_cancel(tp); - rtnl_lock(); /* Could be second call or maybe we don't have netdev yet */ @@ -18206,6 +18199,9 @@ static pci_ers_result_t tg3_io_error_detected(struct pci_dev *pdev, tg3_timer_stop(tp); + /* Want to make sure that the reset task doesn't run */ + tg3_reset_task_cancel(tp); + netif_device_detach(netdev); /* Clean up software state, even if MMIO is blocked */
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c index 12dd18c..78219a9 100644 --- a/drivers/net/ethernet/cadence/macb_main.c +++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -719,10 +719,6 @@ static dma_addr_t macb_get_addr(struct macb *bp, struct macb_dma_desc *desc) } #endif addr |= MACB_BF(RX_WADDR, MACB_BFEXT(RX_WADDR, desc->addr)); -#ifdef CONFIG_MACB_USE_HWSTAMP - if (bp->hw_dma_cap & HW_DMA_CAP_PTP) - addr &= ~GEM_BIT(DMA_RXVALID); -#endif return addr; } @@ -1756,6 +1752,7 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) bool cloned = skb_cloned(*skb) || skb_header_cloned(*skb) || skb_is_nonlinear(*skb); int padlen = ETH_ZLEN - (*skb)->len; + int headroom = skb_headroom(*skb); int tailroom = skb_tailroom(*skb); struct sk_buff *nskb; u32 fcs; @@ -1769,6 +1766,9 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) /* FCS could be appeded to tailroom. */ if (tailroom >= ETH_FCS_LEN) goto add_fcs; + /* FCS could be appeded by moving data to headroom. */ + else if (!cloned && headroom + tailroom >= ETH_FCS_LEN) + padlen = 0; /* No room for FCS, need to reallocate skb. */ else padlen = ETH_FCS_LEN; @@ -1777,7 +1777,10 @@ static int macb_pad_and_fcs(struct sk_buff **skb, struct net_device *ndev) padlen += ETH_FCS_LEN; } - if (cloned || tailroom < padlen) { + if (!cloned && headroom + tailroom >= padlen) { + (*skb)->data = memmove((*skb)->head, (*skb)->data, (*skb)->len); + skb_set_tail_pointer(*skb, (*skb)->len); + } else { nskb = skb_copy_expand(*skb, 0, padlen, GFP_ATOMIC); if (!nskb) return -ENOMEM;
diff --git a/drivers/net/ethernet/cavium/liquidio/lio_main.c b/drivers/net/ethernet/cavium/liquidio/lio_main.c index ab86240..d0c77ff 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_main.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_main.c
@@ -1836,10 +1836,13 @@ static int liquidio_open(struct net_device *netdev) ifstate_set(lio, LIO_IFSTATE_RUNNING); - if (!OCTEON_CN23XX_PF(oct) || !oct->msix_on) { - ret = setup_tx_poll_fn(netdev); - if (ret) - goto err_poll; + if (OCTEON_CN23XX_PF(oct)) { + if (!oct->msix_on) + if (setup_tx_poll_fn(netdev)) + return -1; + } else { + if (setup_tx_poll_fn(netdev)) + return -1; } netif_tx_start_all_queues(netdev); @@ -1852,7 +1855,7 @@ static int liquidio_open(struct net_device *netdev) /* tell Octeon to start forwarding packets to host */ ret = send_rx_ctrl_cmd(lio, 1); if (ret) - goto err_rx_ctrl; + return ret; /* start periodical statistics fetch */ INIT_DELAYED_WORK(&lio->stats_wk.work, lio_fetch_stats); @@ -1863,27 +1866,6 @@ static int liquidio_open(struct net_device *netdev) dev_info(&oct->pci_dev->dev, "%s interface is opened\n", netdev->name); - return 0; - -err_rx_ctrl: - if (!OCTEON_CN23XX_PF(oct) || !oct->msix_on) - cleanup_tx_poll_fn(netdev); -err_poll: - if (lio->ptp_clock) { - ptp_clock_unregister(lio->ptp_clock); - lio->ptp_clock = NULL; - } - - if (oct->props[lio->ifidx].napi_enabled == 1) { - list_for_each_entry_safe(napi, n, &netdev->napi_list, dev_list) - napi_disable(napi); - - oct->props[lio->ifidx].napi_enabled = 0; - - if (OCTEON_CN23XX_PF(oct)) - oct->droq[0]->ops.poll_mode = 0; - } - return ret; }
diff --git a/drivers/net/ethernet/cavium/thunder/nicvf_main.c b/drivers/net/ethernet/cavium/thunder/nicvf_main.c index e861567..27ea528 100644 --- a/drivers/net/ethernet/cavium/thunder/nicvf_main.c +++ b/drivers/net/ethernet/cavium/thunder/nicvf_main.c
@@ -2268,7 +2268,7 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = register_netdev(netdev); if (err) { dev_err(dev, "Failed to register netdevice\n"); - goto err_destroy_workqueue; + goto err_unregister_interrupts; } nic->msg_enable = debug; @@ -2277,8 +2277,6 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -err_destroy_workqueue: - destroy_workqueue(nic->nicvf_rx_mode_wq); err_unregister_interrupts: nicvf_unregister_interrupts(nic); err_free_netdev:
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index a34c33e..76ff42e 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c
@@ -1438,10 +1438,8 @@ static acpi_status bgx_acpi_match_id(acpi_handle handle, u32 lvl, return AE_OK; } - if (strncmp(string.pointer, bgx_sel, 4)) { - kfree(string.pointer); + if (strncmp(string.pointer, bgx_sel, 4)) return AE_OK; - } acpi_walk_namespace(ACPI_TYPE_DEVICE, handle, 1, bgx_acpi_register_phy, NULL, bgx, NULL);
diff --git a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c index b0fd22c..97ff860 100644 --- a/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c +++ b/drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c
@@ -1303,7 +1303,6 @@ static int cxgb_up(struct adapter *adap) if (ret < 0) { CH_ERR(adap, "failed to bind qsets, err %d\n", ret); t3_intr_disable(adap); - quiesce_rx(adap); free_irq_resources(adap); err = ret; goto out;
diff --git a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c index 97963d9..f4d41f9 100644 --- a/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c +++ b/drivers/net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c
@@ -860,7 +860,7 @@ static int cxgb4vf_open(struct net_device *dev) */ err = t4vf_update_port_info(pi); if (err < 0) - goto err_unwind; + return err; /* * Note that this interface is up and start everything up ...
diff --git a/drivers/net/ethernet/dnet.c b/drivers/net/ethernet/dnet.c index da9f9ec..e249790 100644 --- a/drivers/net/ethernet/dnet.c +++ b/drivers/net/ethernet/dnet.c
@@ -553,11 +553,11 @@ static netdev_tx_t dnet_start_xmit(struct sk_buff *skb, struct net_device *dev) skb_tx_timestamp(skb); - spin_unlock_irqrestore(&bp->lock, flags); - /* free the buffer */ dev_kfree_skb(skb); + spin_unlock_irqrestore(&bp->lock, flags); + return NETDEV_TX_OK; }
diff --git a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c index ad0d070..34540e6 100644 --- a/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c +++ b/drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c
@@ -971,8 +971,8 @@ static int add_bufs(struct dpaa2_eth_priv *priv, buf_array[i] = addr; /* tracing point */ - trace_dpaa2_eth_buf_seed(priv->net_dev, page_address(page), - DPAA2_ETH_RX_BUF_RAW_SIZE, + trace_dpaa2_eth_buf_seed(priv->net_dev, + page, DPAA2_ETH_RX_BUF_RAW_SIZE, addr, priv->rx_buf_size, bpid); }
diff --git a/drivers/net/ethernet/freescale/enetc/enetc.c b/drivers/net/ethernet/freescale/enetc/enetc.c index d6df2dd..cee7732 100644 --- a/drivers/net/ethernet/freescale/enetc/enetc.c +++ b/drivers/net/ethernet/freescale/enetc/enetc.c
@@ -1146,12 +1146,7 @@ static void enetc_setup_rxbdr(struct enetc_hw *hw, struct enetc_bdr *rx_ring) enetc_rxbdr_wr(hw, idx, ENETC_RBBSR, ENETC_RXB_DMA_SIZE); - /* Also prepare the consumer index in case page allocation never - * succeeds. In that case, hardware will never advance producer index - * to match consumer index, and will drop all frames. - */ enetc_rxbdr_wr(hw, idx, ENETC_RBPIR, 0); - enetc_rxbdr_wr(hw, idx, ENETC_RBCIR, 1); /* enable Rx ints by setting pkt thr to 1 */ enetc_rxbdr_wr(hw, idx, ENETC_RBICIR0, ENETC_RBICIR0_ICEN | 0x1);
diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index e1b8c58..a31f891 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -626,7 +626,7 @@ fec_enet_txq_put_data_tso(struct fec_enet_priv_tx_q *txq, struct sk_buff *skb, dev_kfree_skb_any(skb); if (net_ratelimit()) netdev_err(ndev, "Tx DMA memory map failed\n"); - return NETDEV_TX_OK; + return NETDEV_TX_BUSY; } bdp->cbd_datlen = cpu_to_fec16(size); @@ -688,7 +688,7 @@ fec_enet_txq_put_hdr_tso(struct fec_enet_priv_tx_q *txq, dev_kfree_skb_any(skb); if (net_ratelimit()) netdev_err(ndev, "Tx DMA memory map failed\n"); - return NETDEV_TX_OK; + return NETDEV_TX_BUSY; } }
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c index 6fd0c73..3b54a37 100644 --- a/drivers/net/ethernet/freescale/fec_ptp.c +++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -141,7 +141,11 @@ static int fec_ptp_enable_pps(struct fec_enet_private *fep, uint enable) * NSEC_PER_SEC - ts.tv_nsec. Add the remaining nanoseconds * to current timer would be next second. */ - tempval = fep->cc.read(&fep->cc); + tempval = readl(fep->hwp + FEC_ATIME_CTRL); + tempval |= FEC_T_CTRL_CAPTURE; + writel(tempval, fep->hwp + FEC_ATIME_CTRL); + + tempval = readl(fep->hwp + FEC_ATIME); /* Convert the ptp local counter to 1588 timestamp */ ns = timecounter_cyc2time(&fep->tc, tempval); ts = ns_to_timespec64(ns);
diff --git a/drivers/net/ethernet/freescale/fman/mac.c b/drivers/net/ethernet/freescale/fman/mac.c index 8e2a243..147126e 100644 --- a/drivers/net/ethernet/freescale/fman/mac.c +++ b/drivers/net/ethernet/freescale/fman/mac.c
@@ -885,21 +885,12 @@ static int mac_probe(struct platform_device *_of_dev) return err; } -static int mac_remove(struct platform_device *pdev) -{ - struct mac_device *mac_dev = platform_get_drvdata(pdev); - - platform_device_unregister(mac_dev->priv->eth_dev); - return 0; -} - static struct platform_driver mac_driver = { .driver = { .name = KBUILD_MODNAME, .of_match_table = mac_match, }, .probe = mac_probe, - .remove = mac_remove, }; builtin_platform_driver(mac_driver);
diff --git a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c index 61f4b6e..99fe2c2 100644 --- a/drivers/net/ethernet/freescale/fs_enet/mac-fec.c +++ b/drivers/net/ethernet/freescale/fs_enet/mac-fec.c
@@ -98,7 +98,7 @@ static int do_pd_setup(struct fs_enet_private *fep) return -EINVAL; fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0); - if (!fep->fec.fecp) + if (!fep->fcc.fccp) return -EINVAL; return 0;
diff --git a/drivers/net/ethernet/hisilicon/hisi_femac.c b/drivers/net/ethernet/hisilicon/hisi_femac.c index 2ee6265..90ab7ad 100644 --- a/drivers/net/ethernet/hisilicon/hisi_femac.c +++ b/drivers/net/ethernet/hisilicon/hisi_femac.c
@@ -283,7 +283,7 @@ static int hisi_femac_rx(struct net_device *dev, int limit) skb->protocol = eth_type_trans(skb, dev); napi_gro_receive(&priv->napi, skb); dev->stats.rx_packets++; - dev->stats.rx_bytes += len; + dev->stats.rx_bytes += skb->len; next: pos = (pos + 1) % rxq->num; if (rx_pkts_num >= limit)
diff --git a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c index 645cae5..c41b19c 100644 --- a/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c +++ b/drivers/net/ethernet/hisilicon/hix5hd2_gmac.c
@@ -550,7 +550,7 @@ static int hix5hd2_rx(struct net_device *dev, int limit) skb->protocol = eth_type_trans(skb, dev); napi_gro_receive(&priv->napi, skb); dev->stats.rx_packets++; - dev->stats.rx_bytes += len; + dev->stats.rx_bytes += skb->len; next: pos = dma_ring_incr(pos, RX_DESC_NUM); }
diff --git a/drivers/net/ethernet/hisilicon/hns/hnae.c b/drivers/net/ethernet/hisilicon/hns/hnae.c index 7c838a7..0833927 100644 --- a/drivers/net/ethernet/hisilicon/hns/hnae.c +++ b/drivers/net/ethernet/hisilicon/hns/hnae.c
@@ -419,10 +419,8 @@ int hnae_ae_register(struct hnae_ae_dev *hdev, struct module *owner) hdev->cls_dev.release = hnae_release; (void)dev_set_name(&hdev->cls_dev, "hnae%d", hdev->id); ret = device_register(&hdev->cls_dev); - if (ret) { - put_device(&hdev->cls_dev); + if (ret) return ret; - } __module_get(THIS_MODULE);
diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index 48956c3..403c1b9 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
@@ -2592,8 +2592,7 @@ static int hclgevf_pci_reset(struct hclgevf_dev *hdev) struct pci_dev *pdev = hdev->pdev; int ret = 0; - if ((hdev->reset_type == HNAE3_VF_FULL_RESET || - hdev->reset_type == HNAE3_FLR_RESET) && + if (hdev->reset_type == HNAE3_VF_FULL_RESET && test_bit(HCLGEVF_STATE_IRQ_INITED, &hdev->state)) { hclgevf_misc_irq_uninit(hdev); hclgevf_uninit_msi(hdev);
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c index 1d8b84e..1fd2b84 100644 --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -2897,7 +2897,6 @@ static struct device *ehea_register_port(struct ehea_port *port, ret = of_device_register(&port->ofdev); if (ret) { pr_err("failed to register device. ret=%d\n", ret); - put_device(&port->ofdev.dev); goto out; }
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c index 2c34d45..cbd83bb 100644 --- a/drivers/net/ethernet/intel/e1000e/netdev.c +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -5270,6 +5270,31 @@ static void e1000_watchdog_task(struct work_struct *work) ew32(TARC(0), tarc0); } + /* disable TSO for pcie and 10/100 speeds, to avoid + * some hardware issues + */ + if (!(adapter->flags & FLAG_TSO_FORCE)) { + switch (adapter->link_speed) { + case SPEED_10: + case SPEED_100: + e_info("10/100 speed: disabling TSO\n"); + netdev->features &= ~NETIF_F_TSO; + netdev->features &= ~NETIF_F_TSO6; + break; + case SPEED_1000: + netdev->features |= NETIF_F_TSO; + netdev->features |= NETIF_F_TSO6; + break; + default: + /* oops */ + break; + } + if (hw->mac.type == e1000_pch_spt) { + netdev->features &= ~NETIF_F_TSO; + netdev->features &= ~NETIF_F_TSO6; + } + } + /* enable transmits in the hardware, need to do this * after setting TARC(0) */ @@ -5891,9 +5916,9 @@ static netdev_tx_t e1000_xmit_frame(struct sk_buff *skb, e1000_tx_queue(tx_ring, tx_flags, count); /* Make sure there is space in the ring for the next send. */ e1000_maybe_stop_tx(tx_ring, - ((MAX_SKB_FRAGS + 1) * + (MAX_SKB_FRAGS * DIV_ROUND_UP(PAGE_SIZE, - adapter->tx_fifo_limit) + 4)); + adapter->tx_fifo_limit) + 2)); if (!netdev_xmit_more() || netif_xmit_stopped(netdev_get_tx_queue(netdev, 0))) { @@ -7198,32 +7223,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent) NETIF_F_RXCSUM | NETIF_F_HW_CSUM); - /* disable TSO for pcie and 10/100 speeds to avoid - * some hardware issues and for i219 to fix transfer - * speed being capped at 60% - */ - if (!(adapter->flags & FLAG_TSO_FORCE)) { - switch (adapter->link_speed) { - case SPEED_10: - case SPEED_100: - e_info("10/100 speed: disabling TSO\n"); - netdev->features &= ~NETIF_F_TSO; - netdev->features &= ~NETIF_F_TSO6; - break; - case SPEED_1000: - netdev->features |= NETIF_F_TSO; - netdev->features |= NETIF_F_TSO6; - break; - default: - /* oops */ - break; - } - if (hw->mac.type == e1000_pch_spt) { - netdev->features &= ~NETIF_F_TSO; - netdev->features &= ~NETIF_F_TSO6; - } - } - /* Set user-changeable features (subset of all device features) */ netdev->hw_features = netdev->features; netdev->hw_features |= NETIF_F_RXFCS;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_client.c b/drivers/net/ethernet/intel/i40e/i40e_client.c index 10125b0..5706abb 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_client.c +++ b/drivers/net/ethernet/intel/i40e/i40e_client.c
@@ -178,10 +178,6 @@ void i40e_notify_client_of_netdev_close(struct i40e_vsi *vsi, bool reset) "Cannot locate client instance close routine\n"); return; } - if (!test_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state)) { - dev_dbg(&pf->pdev->dev, "Client is not open, abort close\n"); - return; - } cdev->client->ops->close(&cdev->lan_info, cdev->client, reset); clear_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state); i40e_client_release_qvlist(&cdev->lan_info); @@ -380,6 +376,7 @@ void i40e_client_subtask(struct i40e_pf *pf) /* Remove failed client instance */ clear_bit(__I40E_CLIENT_INSTANCE_OPENED, &cdev->state); + i40e_client_del_instance(pf); return; } }
diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.c b/drivers/net/ethernet/intel/i40e/i40e_diag.c index ca229b0..ef4d376 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_diag.c +++ b/drivers/net/ethernet/intel/i40e/i40e_diag.c
@@ -44,7 +44,7 @@ static i40e_status i40e_diag_reg_pattern_test(struct i40e_hw *hw, return 0; } -const struct i40e_diag_reg_test_info i40e_reg_list[] = { +struct i40e_diag_reg_test_info i40e_reg_list[] = { /* offset mask elements stride */ {I40E_QTX_CTL(0), 0x0000FFBF, 1, I40E_QTX_CTL(1) - I40E_QTX_CTL(0)}, @@ -78,28 +78,27 @@ i40e_status i40e_diag_reg_test(struct i40e_hw *hw) { i40e_status ret_code = 0; u32 reg, mask; - u32 elements; u32 i, j; for (i = 0; i40e_reg_list[i].offset != 0 && !ret_code; i++) { - elements = i40e_reg_list[i].elements; /* set actual reg range for dynamically allocated resources */ if (i40e_reg_list[i].offset == I40E_QTX_CTL(0) && hw->func_caps.num_tx_qp != 0) - elements = hw->func_caps.num_tx_qp; + i40e_reg_list[i].elements = hw->func_caps.num_tx_qp; if ((i40e_reg_list[i].offset == I40E_PFINT_ITRN(0, 0) || i40e_reg_list[i].offset == I40E_PFINT_ITRN(1, 0) || i40e_reg_list[i].offset == I40E_PFINT_ITRN(2, 0) || i40e_reg_list[i].offset == I40E_QINT_TQCTL(0) || i40e_reg_list[i].offset == I40E_QINT_RQCTL(0)) && hw->func_caps.num_msix_vectors != 0) - elements = hw->func_caps.num_msix_vectors - 1; + i40e_reg_list[i].elements = + hw->func_caps.num_msix_vectors - 1; /* test register access */ mask = i40e_reg_list[i].mask; - for (j = 0; j < elements && !ret_code; j++) { + for (j = 0; j < i40e_reg_list[i].elements && !ret_code; j++) { reg = i40e_reg_list[i].offset + (j * i40e_reg_list[i].stride); ret_code = i40e_diag_reg_pattern_test(hw, reg, mask);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_diag.h b/drivers/net/ethernet/intel/i40e/i40e_diag.h index 1db7c6d..c3340f3 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_diag.h +++ b/drivers/net/ethernet/intel/i40e/i40e_diag.h
@@ -20,7 +20,7 @@ struct i40e_diag_reg_test_info { u32 stride; /* bytes between each element */ }; -extern const struct i40e_diag_reg_test_info i40e_reg_list[]; +extern struct i40e_diag_reg_test_info i40e_reg_list[]; i40e_status i40e_diag_reg_test(struct i40e_hw *hw); i40e_status i40e_diag_eeprom_test(struct i40e_hw *hw);
diff --git a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c index 95a6f86..689deec 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_ethtool.c +++ b/drivers/net/ethernet/intel/i40e/i40e_ethtool.c
@@ -3082,17 +3082,10 @@ static int i40e_get_rss_hash_opts(struct i40e_pf *pf, struct ethtool_rxnfc *cmd) if (cmd->flow_type == TCP_V4_FLOW || cmd->flow_type == UDP_V4_FLOW) { - if (hw->mac.type == I40E_MAC_X722) { - if (i_set & I40E_X722_L3_SRC_MASK) - cmd->data |= RXH_IP_SRC; - if (i_set & I40E_X722_L3_DST_MASK) - cmd->data |= RXH_IP_DST; - } else { - if (i_set & I40E_L3_SRC_MASK) - cmd->data |= RXH_IP_SRC; - if (i_set & I40E_L3_DST_MASK) - cmd->data |= RXH_IP_DST; - } + if (i_set & I40E_L3_SRC_MASK) + cmd->data |= RXH_IP_SRC; + if (i_set & I40E_L3_DST_MASK) + cmd->data |= RXH_IP_DST; } else if (cmd->flow_type == TCP_V6_FLOW || cmd->flow_type == UDP_V6_FLOW) { if (i_set & I40E_L3_V6_SRC_MASK) @@ -3399,15 +3392,12 @@ static int i40e_get_rxnfc(struct net_device *netdev, struct ethtool_rxnfc *cmd, /** * i40e_get_rss_hash_bits - Read RSS Hash bits from register - * @hw: hw structure * @nfc: pointer to user request * @i_setc: bits currently set * * Returns value of bits to be set per user request **/ -static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw, - struct ethtool_rxnfc *nfc, - u64 i_setc) +static u64 i40e_get_rss_hash_bits(struct ethtool_rxnfc *nfc, u64 i_setc) { u64 i_set = i_setc; u64 src_l3 = 0, dst_l3 = 0; @@ -3426,13 +3416,8 @@ static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw, dst_l3 = I40E_L3_V6_DST_MASK; } else if (nfc->flow_type == TCP_V4_FLOW || nfc->flow_type == UDP_V4_FLOW) { - if (hw->mac.type == I40E_MAC_X722) { - src_l3 = I40E_X722_L3_SRC_MASK; - dst_l3 = I40E_X722_L3_DST_MASK; - } else { - src_l3 = I40E_L3_SRC_MASK; - dst_l3 = I40E_L3_DST_MASK; - } + src_l3 = I40E_L3_SRC_MASK; + dst_l3 = I40E_L3_DST_MASK; } else { /* Any other flow type are not supported here */ return i_set; @@ -3450,7 +3435,6 @@ static u64 i40e_get_rss_hash_bits(struct i40e_hw *hw, return i_set; } -#define FLOW_PCTYPES_SIZE 64 /** * i40e_set_rss_hash_opt - Enable/Disable flow types for RSS hash * @pf: pointer to the physical function struct @@ -3463,11 +3447,9 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) struct i40e_hw *hw = &pf->hw; u64 hena = (u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(0)) | ((u64)i40e_read_rx_ctl(hw, I40E_PFQF_HENA(1)) << 32); - DECLARE_BITMAP(flow_pctypes, FLOW_PCTYPES_SIZE); + u8 flow_pctype = 0; u64 i_set, i_setc; - bitmap_zero(flow_pctypes, FLOW_PCTYPES_SIZE); - if (pf->flags & I40E_FLAG_MFP_ENABLED) { dev_err(&pf->pdev->dev, "Change of RSS hash input set is not supported when MFP mode is enabled\n"); @@ -3483,35 +3465,36 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) switch (nfc->flow_type) { case TCP_V4_FLOW: - set_bit(I40E_FILTER_PCTYPE_NONF_IPV4_TCP, flow_pctypes); + flow_pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP; if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) - set_bit(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK, - flow_pctypes); + hena |= + BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK); break; case TCP_V6_FLOW: - set_bit(I40E_FILTER_PCTYPE_NONF_IPV6_TCP, flow_pctypes); + flow_pctype = I40E_FILTER_PCTYPE_NONF_IPV6_TCP; if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) - set_bit(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK, - flow_pctypes); + hena |= + BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN_NO_ACK); + if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) + hena |= + BIT_ULL(I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN_NO_ACK); break; case UDP_V4_FLOW: - set_bit(I40E_FILTER_PCTYPE_NONF_IPV4_UDP, flow_pctypes); - if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) { - set_bit(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP, - flow_pctypes); - set_bit(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP, - flow_pctypes); - } + flow_pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP; + if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) + hena |= + BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | + BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP); + hena |= BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV4); break; case UDP_V6_FLOW: - set_bit(I40E_FILTER_PCTYPE_NONF_IPV6_UDP, flow_pctypes); - if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) { - set_bit(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP, - flow_pctypes); - set_bit(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP, - flow_pctypes); - } + flow_pctype = I40E_FILTER_PCTYPE_NONF_IPV6_UDP; + if (pf->hw_features & I40E_HW_MULTIPLE_TCP_UDP_RSS_PCTYPE) + hena |= + BIT_ULL(I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | + BIT_ULL(I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP); + hena |= BIT_ULL(I40E_FILTER_PCTYPE_FRAG_IPV6); break; case AH_ESP_V4_FLOW: @@ -3544,20 +3527,17 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) return -EINVAL; } - if (bitmap_weight(flow_pctypes, FLOW_PCTYPES_SIZE)) { - u8 flow_id; - - for_each_set_bit(flow_id, flow_pctypes, FLOW_PCTYPES_SIZE) { - i_setc = (u64)i40e_read_rx_ctl(hw, I40E_GLQF_HASH_INSET(0, flow_id)) | - ((u64)i40e_read_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, flow_id)) << 32); - i_set = i40e_get_rss_hash_bits(&pf->hw, nfc, i_setc); - - i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(0, flow_id), - (u32)i_set); - i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, flow_id), - (u32)(i_set >> 32)); - hena |= BIT_ULL(flow_id); - } + if (flow_pctype) { + i_setc = (u64)i40e_read_rx_ctl(hw, I40E_GLQF_HASH_INSET(0, + flow_pctype)) | + ((u64)i40e_read_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, + flow_pctype)) << 32); + i_set = i40e_get_rss_hash_bits(nfc, i_setc); + i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(0, flow_pctype), + (u32)i_set); + i40e_write_rx_ctl(hw, I40E_GLQF_HASH_INSET(1, flow_pctype), + (u32)(i_set >> 32)); + hena |= BIT_ULL(flow_pctype); } i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), (u32)hena); @@ -4233,7 +4213,11 @@ static int i40e_check_fdir_input_set(struct i40e_vsi *vsi, return -EOPNOTSUPP; /* First 4 bytes of L4 header */ - if (usr_ip4_spec->l4_4_bytes) + if (usr_ip4_spec->l4_4_bytes == htonl(0xFFFFFFFF)) + new_mask |= I40E_L4_SRC_MASK | I40E_L4_DST_MASK; + else if (!usr_ip4_spec->l4_4_bytes) + new_mask &= ~(I40E_L4_SRC_MASK | I40E_L4_DST_MASK); + else return -EOPNOTSUPP; /* Filtering on Type of Service is not supported. */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c index 351d4c5..637f6ed 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_main.c +++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -409,9 +409,7 @@ static void i40e_tx_timeout(struct net_device *netdev) set_bit(__I40E_GLOBAL_RESET_REQUESTED, pf->state); break; default: - netdev_err(netdev, "tx_timeout recovery unsuccessful, device is in non-recoverable state.\n"); - set_bit(__I40E_DOWN_REQUESTED, pf->state); - set_bit(__I40E_VSI_DOWN_REQUESTED, vsi->state); + netdev_err(netdev, "tx_timeout recovery unsuccessful\n"); break; } @@ -2702,7 +2700,7 @@ static int i40e_change_mtu(struct net_device *netdev, int new_mtu) struct i40e_pf *pf = vsi->back; if (i40e_enabled_xdp_vsi(vsi)) { - int frame_size = new_mtu + I40E_PACKET_HDR_PAD; + int frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN; if (frame_size > i40e_max_xdp_frame_size(vsi)) return -EINVAL; @@ -5639,26 +5637,6 @@ static int i40e_get_link_speed(struct i40e_vsi *vsi) } /** - * i40e_bw_bytes_to_mbits - Convert max_tx_rate from bytes to mbits - * @vsi: Pointer to vsi structure - * @max_tx_rate: max TX rate in bytes to be converted into Mbits - * - * Helper function to convert units before send to set BW limit - **/ -static u64 i40e_bw_bytes_to_mbits(struct i40e_vsi *vsi, u64 max_tx_rate) -{ - if (max_tx_rate < I40E_BW_MBPS_DIVISOR) { - dev_warn(&vsi->back->pdev->dev, - "Setting max tx rate to minimum usable value of 50Mbps.\n"); - max_tx_rate = I40E_BW_CREDIT_DIVISOR; - } else { - do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR); - } - - return max_tx_rate; -} - -/** * i40e_set_bw_limit - setup BW limit for Tx traffic based on max_tx_rate * @vsi: VSI to be configured * @seid: seid of the channel/VSI @@ -5680,10 +5658,10 @@ int i40e_set_bw_limit(struct i40e_vsi *vsi, u16 seid, u64 max_tx_rate) max_tx_rate, seid); return -EINVAL; } - if (max_tx_rate && max_tx_rate < I40E_BW_CREDIT_DIVISOR) { + if (max_tx_rate && max_tx_rate < 50) { dev_warn(&pf->pdev->dev, "Setting max tx rate to minimum usable value of 50Mbps.\n"); - max_tx_rate = I40E_BW_CREDIT_DIVISOR; + max_tx_rate = 50; } /* Tx rate credits are in values of 50Mbps, 0 is disabled */ @@ -7611,9 +7589,9 @@ static int i40e_setup_tc(struct net_device *netdev, void *type_data) if (pf->flags & I40E_FLAG_TC_MQPRIO) { if (vsi->mqprio_qopt.max_rate[0]) { - u64 max_tx_rate = i40e_bw_bytes_to_mbits(vsi, - vsi->mqprio_qopt.max_rate[0]); + u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0]; + do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR); ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate); if (!ret) { u64 credits = max_tx_rate; @@ -9954,21 +9932,6 @@ static int i40e_rebuild_channels(struct i40e_vsi *vsi) } /** - * i40e_clean_xps_state - clean xps state for every tx_ring - * @vsi: ptr to the VSI - **/ -static void i40e_clean_xps_state(struct i40e_vsi *vsi) -{ - int i; - - if (vsi->tx_rings) - for (i = 0; i < vsi->num_queue_pairs; i++) - if (vsi->tx_rings[i]) - clear_bit(__I40E_TX_XPS_INIT_DONE, - vsi->tx_rings[i]->state); -} - -/** * i40e_prep_for_reset - prep for the core to reset * @pf: board private structure * @lock_acquired: indicates whether or not the lock has been acquired @@ -9999,10 +9962,8 @@ static void i40e_prep_for_reset(struct i40e_pf *pf, bool lock_acquired) rtnl_unlock(); for (v = 0; v < pf->num_alloc_vsi; v++) { - if (pf->vsi[v]) { - i40e_clean_xps_state(pf->vsi[v]); + if (pf->vsi[v]) pf->vsi[v]->seid = 0; - } } i40e_shutdown_adminq(&pf->hw); @@ -10284,10 +10245,10 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) } if (vsi->mqprio_qopt.max_rate[0]) { - u64 max_tx_rate = i40e_bw_bytes_to_mbits(vsi, - vsi->mqprio_qopt.max_rate[0]); + u64 max_tx_rate = vsi->mqprio_qopt.max_rate[0]; u64 credits = 0; + do_div(max_tx_rate, I40E_BW_MBPS_DIVISOR); ret = i40e_set_bw_limit(vsi, vsi->seid, max_tx_rate); if (ret) goto end_unlock; @@ -10336,11 +10297,8 @@ static void i40e_rebuild(struct i40e_pf *pf, bool reinit, bool lock_acquired) pf->hw.aq.asq_last_status)); } /* reinit the misc interrupt */ - if (pf->flags & I40E_FLAG_MSIX_ENABLED) { + if (pf->flags & I40E_FLAG_MSIX_ENABLED) ret = i40e_setup_misc_vector(pf); - if (ret) - goto end_unlock; - } /* Add a filter to drop all Flow control frames from any VSI from being * transmitted. By doing so we stop a malicious VF from sending out @@ -12538,8 +12496,6 @@ static int i40e_ndo_bridge_setlink(struct net_device *dev, } br_spec = nlmsg_find_attr(nlh, sizeof(struct ifinfomsg), IFLA_AF_SPEC); - if (!br_spec) - return -EINVAL; nla_for_each_nested(attr, br_spec, rem) { __u16 mode; @@ -13466,15 +13422,15 @@ static int i40e_add_vsi(struct i40e_vsi *vsi) vsi->id = ctxt.vsi_number; } - spin_lock_bh(&vsi->mac_filter_hash_lock); vsi->active_filters = 0; + clear_bit(__I40E_VSI_OVERFLOW_PROMISC, vsi->state); + spin_lock_bh(&vsi->mac_filter_hash_lock); /* If macvlan filters already exist, force them to get loaded */ hash_for_each_safe(vsi->mac_filter_hash, bkt, h, f, hlist) { f->state = I40E_FILTER_NEW; f_count++; } spin_unlock_bh(&vsi->mac_filter_hash_lock); - clear_bit(__I40E_VSI_OVERFLOW_PROMISC, vsi->state); if (f_count) { vsi->flags |= I40E_VSI_FLAG_FILTER_CHANGED; @@ -14826,7 +14782,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw) int err; int v_idx; - pci_set_drvdata(pf->pdev, pf); pci_save_state(pf->pdev); /* set up periodic task facility */
diff --git a/drivers/net/ethernet/intel/i40e/i40e_type.h b/drivers/net/ethernet/intel/i40e/i40e_type.h index 0470681..666a251 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_type.h +++ b/drivers/net/ethernet/intel/i40e/i40e_type.h
@@ -1470,10 +1470,6 @@ struct i40e_lldp_variables { #define I40E_PFQF_CTL_0_HASHLUTSIZE_512 0x00010000 /* INPUT SET MASK for RSS, flow director, and flexible payload */ -#define I40E_X722_L3_SRC_SHIFT 49 -#define I40E_X722_L3_SRC_MASK (0x3ULL << I40E_X722_L3_SRC_SHIFT) -#define I40E_X722_L3_DST_SHIFT 41 -#define I40E_X722_L3_DST_MASK (0x3ULL << I40E_X722_L3_DST_SHIFT) #define I40E_L3_SRC_SHIFT 47 #define I40E_L3_SRC_MASK (0x3ULL << I40E_L3_SRC_SHIFT) #define I40E_L3_V6_SRC_SHIFT 43
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index be07148..4080fda 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c
@@ -1352,12 +1352,10 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) if (test_bit(__I40E_VF_RESETS_DISABLED, pf->state)) return true; - /* Bail out if VFs are disabled. */ - if (test_bit(__I40E_VF_DISABLE, pf->state)) - return true; - - /* If VF is being reset already we don't need to continue. */ - if (test_and_set_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) + /* If the VFs have been disabled, this means something else is + * resetting the VF, so we shouldn't continue. + */ + if (test_and_set_bit(__I40E_VF_DISABLE, pf->state)) return true; i40e_trigger_vf_reset(vf, flr); @@ -1394,8 +1392,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) i40e_cleanup_reset_vf(vf); i40e_flush(hw); - usleep_range(20000, 40000); - clear_bit(I40E_VF_STATE_RESETTING, &vf->vf_states); + clear_bit(__I40E_VF_DISABLE, pf->state); return true; } @@ -1428,12 +1425,8 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) return false; /* Begin reset on all VFs at once */ - for (v = 0; v < pf->num_alloc_vfs; v++) { - vf = &pf->vf[v]; - /* If VF is being reset no need to trigger reset again */ - if (!test_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) - i40e_trigger_vf_reset(&pf->vf[v], flr); - } + for (v = 0; v < pf->num_alloc_vfs; v++) + i40e_trigger_vf_reset(&pf->vf[v], flr); /* HW requires some time to make sure it can flush the FIFO for a VF * when it resets it. Poll the VPGEN_VFRSTAT register for each VF in @@ -1449,11 +1442,9 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) */ while (v < pf->num_alloc_vfs) { vf = &pf->vf[v]; - if (!test_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) { - reg = rd32(hw, I40E_VPGEN_VFRSTAT(vf->vf_id)); - if (!(reg & I40E_VPGEN_VFRSTAT_VFRD_MASK)) - break; - } + reg = rd32(hw, I40E_VPGEN_VFRSTAT(vf->vf_id)); + if (!(reg & I40E_VPGEN_VFRSTAT_VFRD_MASK)) + break; /* If the current VF has finished resetting, move on * to the next VF in sequence. @@ -1481,10 +1472,6 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) if (pf->vf[v].lan_vsi_idx == 0) continue; - /* If VF is reset in another thread just continue */ - if (test_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) - continue; - i40e_vsi_stop_rings_no_wait(pf->vsi[pf->vf[v].lan_vsi_idx]); } @@ -1496,10 +1483,6 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) if (pf->vf[v].lan_vsi_idx == 0) continue; - /* If VF is reset in another thread just continue */ - if (test_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) - continue; - i40e_vsi_wait_queues_disabled(pf->vsi[pf->vf[v].lan_vsi_idx]); } @@ -1509,16 +1492,10 @@ bool i40e_reset_all_vfs(struct i40e_pf *pf, bool flr) mdelay(50); /* Finish the reset on each VF */ - for (v = 0; v < pf->num_alloc_vfs; v++) { - /* If VF is reset in another thread just continue */ - if (test_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) - continue; - + for (v = 0; v < pf->num_alloc_vfs; v++) i40e_cleanup_reset_vf(&pf->vf[v]); - } i40e_flush(hw); - usleep_range(20000, 40000); clear_bit(__I40E_VF_DISABLE, pf->state); return true; @@ -1897,25 +1874,6 @@ static void i40e_del_qch(struct i40e_vf *vf) } /** - * i40e_vc_get_max_frame_size - * @vf: pointer to the VF - * - * Max frame size is determined based on the current port's max frame size and - * whether a port VLAN is configured on this VF. The VF is not aware whether - * it's in a port VLAN so the PF needs to account for this in max frame size - * checks and sending the max frame size to the VF. - **/ -static u16 i40e_vc_get_max_frame_size(struct i40e_vf *vf) -{ - u16 max_frame_size = vf->pf->hw.phy.link_info.max_frame_size; - - if (vf->port_vlan_id) - max_frame_size -= VLAN_HLEN; - - return max_frame_size; -} - -/** * i40e_vc_get_vf_resources_msg * @vf: pointer to the VF info * @msg: pointer to the msg buffer @@ -2015,7 +1973,6 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) vfres->max_vectors = pf->hw.func_caps.num_msix_vectors_vf; vfres->rss_key_size = I40E_HKEY_ARRAY_SIZE; vfres->rss_lut_size = I40E_VF_HLUT_ARRAY_SIZE; - vfres->max_mtu = i40e_vc_get_max_frame_size(vf); if (vf->lan_vsi_idx) { vfres->vsi_res[0].vsi_id = vf->lan_vsi_id;
diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h index 2318273..7df3e58 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h
@@ -41,7 +41,6 @@ enum i40e_vf_states { I40E_VF_STATE_MC_PROMISC, I40E_VF_STATE_UC_PROMISC, I40E_VF_STATE_PRE_ENABLE, - I40E_VF_STATE_RESETTING }; /* VF capabilities */
diff --git a/drivers/net/ethernet/intel/iavf/iavf.h b/drivers/net/ethernet/intel/iavf/iavf.h index 85275b6..81ca647 100644 --- a/drivers/net/ethernet/intel/iavf/iavf.h +++ b/drivers/net/ethernet/intel/iavf/iavf.h
@@ -86,7 +86,6 @@ struct iavf_vsi { #define IAVF_HKEY_ARRAY_SIZE ((IAVF_VFQF_HKEY_MAX_INDEX + 1) * 4) #define IAVF_HLUT_ARRAY_SIZE ((IAVF_VFQF_HLUT_MAX_INDEX + 1) * 4) #define IAVF_MBPS_DIVISOR 125000 /* divisor to convert to Mbps */ -#define IAVF_MBPS_QUANTA 50 #define IAVF_VIRTCHNL_VF_RESOURCE_SIZE (sizeof(struct virtchnl_vf_resource) + \ (IAVF_MAX_VF_VSI * \
diff --git a/drivers/net/ethernet/intel/iavf/iavf_adminq.c b/drivers/net/ethernet/intel/iavf/iavf_adminq.c index 897b349..9fa3fa9 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_adminq.c +++ b/drivers/net/ethernet/intel/iavf/iavf_adminq.c
@@ -324,7 +324,6 @@ static enum iavf_status iavf_config_arq_regs(struct iavf_hw *hw) static enum iavf_status iavf_init_asq(struct iavf_hw *hw) { enum iavf_status ret_code = 0; - int i; if (hw->aq.asq.count > 0) { /* queue already initialized */ @@ -355,17 +354,12 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) /* initialize base registers */ ret_code = iavf_config_asq_regs(hw); if (ret_code) - goto init_free_asq_bufs; + goto init_adminq_free_rings; /* success! */ hw->aq.asq.count = hw->aq.num_asq_entries; goto init_adminq_exit; -init_free_asq_bufs: - for (i = 0; i < hw->aq.num_asq_entries; i++) - iavf_free_dma_mem(hw, &hw->aq.asq.r.asq_bi[i]); - iavf_free_virt_mem(hw, &hw->aq.asq.dma_head); - init_adminq_free_rings: iavf_free_adminq_asq(hw); @@ -389,7 +383,6 @@ static enum iavf_status iavf_init_asq(struct iavf_hw *hw) static enum iavf_status iavf_init_arq(struct iavf_hw *hw) { enum iavf_status ret_code = 0; - int i; if (hw->aq.arq.count > 0) { /* queue already initialized */ @@ -420,16 +413,12 @@ static enum iavf_status iavf_init_arq(struct iavf_hw *hw) /* initialize base registers */ ret_code = iavf_config_arq_regs(hw); if (ret_code) - goto init_free_arq_bufs; + goto init_adminq_free_rings; /* success! */ hw->aq.arq.count = hw->aq.num_arq_entries; goto init_adminq_exit; -init_free_arq_bufs: - for (i = 0; i < hw->aq.num_arq_entries; i++) - iavf_free_dma_mem(hw, &hw->aq.arq.r.arq_bi[i]); - iavf_free_virt_mem(hw, &hw->aq.arq.dma_head); init_adminq_free_rings: iavf_free_adminq_arq(hw);
diff --git a/drivers/net/ethernet/intel/iavf/iavf_common.c b/drivers/net/ethernet/intel/iavf/iavf_common.c index 78423ca..8547fc8 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_common.c +++ b/drivers/net/ethernet/intel/iavf/iavf_common.c
@@ -662,7 +662,7 @@ struct iavf_rx_ptype_decoded iavf_ptype_lookup[] = { /* Non Tunneled IPv6 */ IAVF_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3), IAVF_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3), - IAVF_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY4), + IAVF_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP, PAY3), IAVF_PTT_UNUSED_ENTRY(91), IAVF_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP, PAY4), IAVF_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c index 4c41bb4..e8850ba 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_main.c +++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -2581,7 +2581,6 @@ static int iavf_validate_ch_config(struct iavf_adapter *adapter, struct tc_mqprio_qopt_offload *mqprio_qopt) { u64 total_max_rate = 0; - u32 tx_rate_rem = 0; int i, num_qps = 0; u64 tx_rate = 0; int ret = 0; @@ -2596,32 +2595,12 @@ static int iavf_validate_ch_config(struct iavf_adapter *adapter, return -EINVAL; if (mqprio_qopt->min_rate[i]) { dev_err(&adapter->pdev->dev, - "Invalid min tx rate (greater than 0) specified for TC%d\n", - i); + "Invalid min tx rate (greater than 0) specified\n"); return -EINVAL; } - - /* convert to Mbps */ + /*convert to Mbps */ tx_rate = div_u64(mqprio_qopt->max_rate[i], IAVF_MBPS_DIVISOR); - - if (mqprio_qopt->max_rate[i] && - tx_rate < IAVF_MBPS_QUANTA) { - dev_err(&adapter->pdev->dev, - "Invalid max tx rate for TC%d, minimum %dMbps\n", - i, IAVF_MBPS_QUANTA); - return -EINVAL; - } - - (void)div_u64_rem(tx_rate, IAVF_MBPS_QUANTA, &tx_rate_rem); - - if (tx_rate_rem != 0) { - dev_err(&adapter->pdev->dev, - "Invalid max tx rate for TC%d, not divisible by %d\n", - i, IAVF_MBPS_QUANTA); - return -EINVAL; - } - total_max_rate += tx_rate; num_qps += mqprio_qopt->qopt.count[i]; }
diff --git a/drivers/net/ethernet/intel/iavf/iavf_txrx.c b/drivers/net/ethernet/intel/iavf/iavf_txrx.c index 7a18129..c6905d1 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_txrx.c +++ b/drivers/net/ethernet/intel/iavf/iavf_txrx.c
@@ -114,11 +114,8 @@ u32 iavf_get_tx_pending(struct iavf_ring *ring, bool in_sw) { u32 head, tail; - /* underlying hardware might not allow access and/or always return - * 0 for the head/tail registers so just use the cached values - */ head = ring->next_to_clean; - tail = ring->next_to_use; + tail = readl(ring->tail); if (head != tail) return (head < tail) ? @@ -1061,7 +1058,7 @@ static inline void iavf_rx_hash(struct iavf_ring *ring, cpu_to_le64((u64)IAVF_RX_DESC_FLTSTAT_RSS_HASH << IAVF_RX_DESC_STATUS_FLTSTAT_SHIFT); - if (!(ring->netdev->features & NETIF_F_RXHASH)) + if (ring->netdev->features & NETIF_F_RXHASH) return; if ((rx_desc->wb.qword1.status_error_len & rss_mask) == rss_mask) { @@ -1374,7 +1371,7 @@ static struct sk_buff *iavf_build_skb(struct iavf_ring *rx_ring, #endif struct sk_buff *skb; - if (!rx_buffer || !size) + if (!rx_buffer) return NULL; /* prefetch first cache line of first page */ va = page_address(rx_buffer->page) + rx_buffer->page_offset; @@ -1534,7 +1531,7 @@ static int iavf_clean_rx_irq(struct iavf_ring *rx_ring, int budget) /* exit if we failed to retrieve a buffer */ if (!skb) { rx_ring->rx_stats.alloc_buff_failed++; - if (rx_buffer && size) + if (rx_buffer) rx_buffer->pagecnt_bias++; break; }
diff --git a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c index 7a17694..4d471a6 100644 --- a/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c +++ b/drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
@@ -241,14 +241,11 @@ int iavf_get_vf_config(struct iavf_adapter *adapter) void iavf_configure_queues(struct iavf_adapter *adapter) { struct virtchnl_vsi_queue_config_info *vqci; - int i, max_frame = adapter->vf_res->max_mtu; - int pairs = adapter->num_active_queues; struct virtchnl_queue_pair_info *vqpi; + int pairs = adapter->num_active_queues; + int i, max_frame = IAVF_MAX_RXBUFFER; size_t len; - if (max_frame > IAVF_MAX_RXBUFFER || !max_frame) - max_frame = IAVF_MAX_RXBUFFER; - if (adapter->current_op != VIRTCHNL_OP_UNKNOWN) { /* bail because we already have a command pending */ dev_err(&adapter->pdev->dev, "Cannot configure queues, command %d pending\n",
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c index 209ae96..7d28563 100644 --- a/drivers/net/ethernet/intel/ice/ice_main.c +++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -3211,7 +3211,7 @@ static int __init ice_module_init(void) pr_info("%s - version %s\n", ice_driver_string, ice_drv_ver); pr_info("%s\n", ice_copyright); - ice_wq = alloc_workqueue("%s", 0, 0, KBUILD_MODNAME); + ice_wq = alloc_workqueue("%s", WQ_MEM_RECLAIM, 0, KBUILD_MODNAME); if (!ice_wq) { pr_err("Failed to create workqueue\n"); return -ENOMEM; @@ -3492,12 +3492,15 @@ int ice_vsi_cfg(struct ice_vsi *vsi) { int err; - if (vsi->netdev && vsi->type == ICE_VSI_PF) { + if (vsi->netdev) { ice_set_rx_mode(vsi->netdev); - err = ice_vsi_vlan_setup(vsi); - if (err) - return err; + if (vsi->type != ICE_VSI_LB) { + err = ice_vsi_vlan_setup(vsi); + + if (err) + return err; + } } ice_vsi_cfg_dcb_rings(vsi); @@ -3554,7 +3557,7 @@ static int ice_up_complete(struct ice_vsi *vsi) if (vsi->port_info && (vsi->port_info->phy.link_info.link_info & ICE_AQ_LINK_UP) && - vsi->netdev && vsi->type == ICE_VSI_PF) { + vsi->netdev) { ice_print_link_msg(vsi, true); netif_tx_start_all_queues(vsi->netdev); netif_carrier_on(vsi->netdev); @@ -3564,9 +3567,7 @@ static int ice_up_complete(struct ice_vsi *vsi) * set the baseline so counters are ready when interface is up */ ice_update_eth_stats(vsi); - - if (vsi->type == ICE_VSI_PF) - ice_service_task_schedule(pf); + ice_service_task_schedule(pf); return 0; }
diff --git a/drivers/net/ethernet/intel/ice/ice_switch.c b/drivers/net/ethernet/intel/ice/ice_switch.c index 0c71995..7ff2e07 100644 --- a/drivers/net/ethernet/intel/ice/ice_switch.c +++ b/drivers/net/ethernet/intel/ice/ice_switch.c
@@ -2627,7 +2627,7 @@ ice_set_vlan_vsi_promisc(struct ice_hw *hw, u16 vsi_handle, u8 promisc_mask, else status = ice_set_vsi_promisc(hw, vsi_handle, promisc_mask, vlan_id); - if (status && status != -EEXIST) + if (status) break; }
diff --git a/drivers/net/ethernet/intel/igb/igb.h b/drivers/net/ethernet/intel/igb/igb.h index 33cbe4f..ca54e26 100644 --- a/drivers/net/ethernet/intel/igb/igb.h +++ b/drivers/net/ethernet/intel/igb/igb.h
@@ -594,8 +594,6 @@ struct igb_adapter { struct igb_mac_addr *mac_table; struct vf_mac_filter vf_macs; struct vf_mac_filter *vf_mac_list; - /* lock for VF resources */ - spinlock_t vfs_lock; }; /* flags controlling PTP/1588 function */
diff --git a/drivers/net/ethernet/intel/igb/igb_ethtool.c b/drivers/net/ethernet/intel/igb/igb_ethtool.c index 6196f9b..f809333 100644 --- a/drivers/net/ethernet/intel/igb/igb_ethtool.c +++ b/drivers/net/ethernet/intel/igb/igb_ethtool.c
@@ -1402,8 +1402,6 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) *data = 1; return -1; } - wr32(E1000_IVAR_MISC, E1000_IVAR_VALID << 8); - wr32(E1000_EIMS, BIT(0)); } else if (adapter->flags & IGB_FLAG_HAS_MSI) { shared_int = false; if (request_irq(irq,
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c index 00d66a6..8734dfd 100644 --- a/drivers/net/ethernet/intel/igb/igb_main.c +++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -1213,12 +1213,8 @@ static int igb_alloc_q_vector(struct igb_adapter *adapter, if (!q_vector) { q_vector = kzalloc(size, GFP_KERNEL); } else if (size > ksize(q_vector)) { - struct igb_q_vector *new_q_vector; - - new_q_vector = kzalloc(size, GFP_KERNEL); - if (new_q_vector) - kfree_rcu(q_vector, rcu); - q_vector = new_q_vector; + kfree_rcu(q_vector, rcu); + q_vector = kzalloc(size, GFP_KERNEL); } else { memset(q_vector, 0, size); } @@ -3495,7 +3491,6 @@ static int igb_disable_sriov(struct pci_dev *pdev) struct net_device *netdev = pci_get_drvdata(pdev); struct igb_adapter *adapter = netdev_priv(netdev); struct e1000_hw *hw = &adapter->hw; - unsigned long flags; /* reclaim resources allocated to VFs */ if (adapter->vf_data) { @@ -3508,13 +3503,12 @@ static int igb_disable_sriov(struct pci_dev *pdev) pci_disable_sriov(pdev); msleep(500); } - spin_lock_irqsave(&adapter->vfs_lock, flags); + kfree(adapter->vf_mac_list); adapter->vf_mac_list = NULL; kfree(adapter->vf_data); adapter->vf_data = NULL; adapter->vfs_allocated_count = 0; - spin_unlock_irqrestore(&adapter->vfs_lock, flags); wr32(E1000_IOVCTL, E1000_IOVCTL_REUSE_VFQ); wrfl(); msleep(100); @@ -3835,9 +3829,6 @@ static int igb_sw_init(struct igb_adapter *adapter) spin_lock_init(&adapter->nfc_lock); spin_lock_init(&adapter->stats64_lock); - - /* init spinlock to avoid concurrency of VF resources */ - spin_lock_init(&adapter->vfs_lock); #ifdef CONFIG_PCI_IOV switch (hw->mac.type) { case e1000_82576: @@ -7135,7 +7126,7 @@ static void igb_vf_reset_msg(struct igb_adapter *adapter, u32 vf) { struct e1000_hw *hw = &adapter->hw; unsigned char *vf_mac = adapter->vf_data[vf].vf_mac_addresses; - u32 reg, msgbuf[3] = {}; + u32 reg, msgbuf[3]; u8 *addr = (u8 *)(&msgbuf[1]); /* process all the same items cleared in a function level reset */ @@ -7578,10 +7569,8 @@ static void igb_rcv_msg_from_vf(struct igb_adapter *adapter, u32 vf) static void igb_msg_task(struct igb_adapter *adapter) { struct e1000_hw *hw = &adapter->hw; - unsigned long flags; u32 vf; - spin_lock_irqsave(&adapter->vfs_lock, flags); for (vf = 0; vf < adapter->vfs_allocated_count; vf++) { /* process any reset requests */ if (!igb_check_for_rst(hw, vf)) @@ -7595,7 +7584,6 @@ static void igb_msg_task(struct igb_adapter *adapter) if (!igb_check_for_ack(hw, vf)) igb_rcv_ack_from_vf(adapter, vf); } - spin_unlock_irqrestore(&adapter->vfs_lock, flags); } /**
diff --git a/drivers/net/ethernet/intel/igbvf/netdev.c b/drivers/net/ethernet/intel/igbvf/netdev.c index 5bf1c9d..1082e49 100644 --- a/drivers/net/ethernet/intel/igbvf/netdev.c +++ b/drivers/net/ethernet/intel/igbvf/netdev.c
@@ -1070,7 +1070,7 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter) igbvf_intr_msix_rx, 0, adapter->rx_ring->name, netdev); if (err) - goto free_irq_tx; + goto out; adapter->rx_ring->itr_register = E1000_EITR(vector); adapter->rx_ring->itr_val = adapter->current_itr; @@ -1079,14 +1079,10 @@ static int igbvf_request_msix(struct igbvf_adapter *adapter) err = request_irq(adapter->msix_entries[vector].vector, igbvf_msix_other, 0, netdev->name, netdev); if (err) - goto free_irq_rx; + goto out; igbvf_configure_msix(adapter); return 0; -free_irq_rx: - free_irq(adapter->msix_entries[--vector].vector, netdev); -free_irq_tx: - free_irq(adapter->msix_entries[--vector].vector, netdev); out: return err; }
diff --git a/drivers/net/ethernet/intel/igbvf/vf.c b/drivers/net/ethernet/intel/igbvf/vf.c index a47a2e3..b8ba3f9 100644 --- a/drivers/net/ethernet/intel/igbvf/vf.c +++ b/drivers/net/ethernet/intel/igbvf/vf.c
@@ -1,8 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* Copyright(c) 2009 - 2018 Intel Corporation. */ -#include <linux/etherdevice.h> - #include "vf.h" static s32 e1000_check_for_link_vf(struct e1000_hw *hw); @@ -133,16 +131,11 @@ static s32 e1000_reset_hw_vf(struct e1000_hw *hw) /* set our "perm_addr" based on info provided by PF */ ret_val = mbx->ops.read_posted(hw, msgbuf, 3); if (!ret_val) { - switch (msgbuf[0]) { - case E1000_VF_RESET | E1000_VT_MSGTYPE_ACK: + if (msgbuf[0] == (E1000_VF_RESET | + E1000_VT_MSGTYPE_ACK)) memcpy(hw->mac.perm_addr, addr, ETH_ALEN); - break; - case E1000_VF_RESET | E1000_VT_MSGTYPE_NACK: - eth_zero_addr(hw->mac.perm_addr); - break; - default: + else ret_val = -E1000_ERR_MAC_INIT; - } } }
diff --git a/drivers/net/ethernet/intel/igc/igc_base.c b/drivers/net/ethernet/intel/igc/igc_base.c index d66429e..db289bc 100644 --- a/drivers/net/ethernet/intel/igc/igc_base.c +++ b/drivers/net/ethernet/intel/igc/igc_base.c
@@ -187,7 +187,15 @@ static s32 igc_init_phy_params_base(struct igc_hw *hw) igc_check_for_copper_link(hw); - phy->type = igc_phy_i225; + /* Verify phy id and set remaining function pointers */ + switch (phy->id) { + case I225_I_PHY_ID: + phy->type = igc_phy_i225; + break; + default: + ret_val = -IGC_ERR_PHY; + goto out; + } out: return ret_val;
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c index b8297a6..9ba05d9 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -2884,7 +2884,8 @@ bool igc_has_link(struct igc_adapter *adapter) break; } - if (hw->mac.type == igc_i225) { + if (hw->mac.type == igc_i225 && + hw->phy.id == I225_I_PHY_ID) { if (!netif_carrier_ok(adapter->netdev)) { adapter->flags &= ~IGC_FLAG_NEED_LINK_UPDATE; } else if (!(adapter->flags & IGC_FLAG_NEED_LINK_UPDATE)) {
diff --git a/drivers/net/ethernet/intel/igc/igc_phy.c b/drivers/net/ethernet/intel/igc/igc_phy.c index 1be112c..6156c76 100644 --- a/drivers/net/ethernet/intel/igc/igc_phy.c +++ b/drivers/net/ethernet/intel/igc/igc_phy.c
@@ -235,7 +235,8 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) return ret_val; } - if (phy->autoneg_mask & ADVERTISE_2500_FULL) { + if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && + hw->phy.id == I225_I_PHY_ID) { /* Read the MULTI GBT AN Control Register - reg 7.32 */ ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) | @@ -375,7 +376,8 @@ static s32 igc_phy_setup_autoneg(struct igc_hw *hw) ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL, mii_1000t_ctrl_reg); - if (phy->autoneg_mask & ADVERTISE_2500_FULL) + if ((phy->autoneg_mask & ADVERTISE_2500_FULL) && + hw->phy.id == I225_I_PHY_ID) ret_val = phy->ops.write_reg(hw, (STANDARD_AN_REG_MASK << MMD_DEVADDR_SHIFT) |
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe.h b/drivers/net/ethernet/intel/ixgbe/ixgbe.h index 0142ca2..fa49ef2 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe.h +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe.h
@@ -67,8 +67,6 @@ #define IXGBE_RXBUFFER_4K 4096 #define IXGBE_MAX_RXBUFFER 16384 /* largest size for a single descriptor */ -#define IXGBE_PKT_HDR_PAD (ETH_HLEN + ETH_FCS_LEN + (VLAN_HLEN * 2)) - /* Attempt to maximize the headroom available for incoming frames. We * use a 2K buffer for receives and need 1536/1534 to store the data for * the frame. This leaves us with 512 bytes of room. From that we need
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index a864b91..f8aa1a0 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -6722,18 +6722,6 @@ static void ixgbe_free_all_rx_resources(struct ixgbe_adapter *adapter) } /** - * ixgbe_max_xdp_frame_size - returns the maximum allowed frame size for XDP - * @adapter: device handle, pointer to adapter - */ -static int ixgbe_max_xdp_frame_size(struct ixgbe_adapter *adapter) -{ - if (PAGE_SIZE >= 8192 || adapter->flags2 & IXGBE_FLAG2_RX_LEGACY) - return IXGBE_RXBUFFER_2K; - else - return IXGBE_RXBUFFER_3K; -} - -/** * ixgbe_change_mtu - Change the Maximum Transfer Unit * @netdev: network interface device structure * @new_mtu: new value for maximum frame size @@ -6744,12 +6732,18 @@ static int ixgbe_change_mtu(struct net_device *netdev, int new_mtu) { struct ixgbe_adapter *adapter = netdev_priv(netdev); - if (ixgbe_enabled_xdp_adapter(adapter)) { - int new_frame_size = new_mtu + IXGBE_PKT_HDR_PAD; + if (adapter->xdp_prog) { + int new_frame_size = new_mtu + ETH_HLEN + ETH_FCS_LEN + + VLAN_HLEN; + int i; - if (new_frame_size > ixgbe_max_xdp_frame_size(adapter)) { - e_warn(probe, "Requested MTU size is not supported with XDP\n"); - return -EINVAL; + for (i = 0; i < adapter->num_rx_queues; i++) { + struct ixgbe_ring *ring = adapter->rx_ring[i]; + + if (new_frame_size > ixgbe_rx_bufsz(ring)) { + e_warn(probe, "Requested MTU size is not supported with XDP\n"); + return -EINVAL; + } } }
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c index ba36be0..2fb9796 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -851,11 +851,9 @@ static struct pci_dev *ixgbe_get_first_secondary_devfn(unsigned int devfn) rp_pdev = pci_get_domain_bus_and_slot(0, 0, devfn); if (rp_pdev && rp_pdev->subordinate) { bus = rp_pdev->subordinate->number; - pci_dev_put(rp_pdev); return pci_get_domain_bus_and_slot(0, bus, 0); } - pci_dev_put(rp_pdev); return NULL; } @@ -872,7 +870,6 @@ static bool ixgbe_x550em_a_has_mii(struct ixgbe_hw *hw) struct ixgbe_adapter *adapter = hw->back; struct pci_dev *pdev = adapter->pdev; struct pci_dev *func0_pdev; - bool has_mii = false; /* For the C3000 family of SoCs (x550em_a) the internal ixgbe devices * are always downstream of root ports @ 0000:00:16.0 & 0000:00:17.0 @@ -883,16 +880,15 @@ static bool ixgbe_x550em_a_has_mii(struct ixgbe_hw *hw) func0_pdev = ixgbe_get_first_secondary_devfn(PCI_DEVFN(0x16, 0)); if (func0_pdev) { if (func0_pdev == pdev) - has_mii = true; - goto out; + return true; + else + return false; } func0_pdev = ixgbe_get_first_secondary_devfn(PCI_DEVFN(0x17, 0)); if (func0_pdev == pdev) - has_mii = true; + return true; -out: - pci_dev_put(func0_pdev); - return has_mii; + return false; } /**
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c index d155181..0be13a9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_ptp.c
@@ -1211,6 +1211,7 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) struct cyclecounter cc; unsigned long flags; u32 incval = 0; + u32 tsauxc = 0; u32 fuse0 = 0; /* For some of the boards below this mask is technically incorrect. @@ -1245,6 +1246,18 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) case ixgbe_mac_x550em_a: case ixgbe_mac_X550: cc.read = ixgbe_ptp_read_X550; + + /* enable SYSTIME counter */ + IXGBE_WRITE_REG(hw, IXGBE_SYSTIMR, 0); + IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0); + IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0); + tsauxc = IXGBE_READ_REG(hw, IXGBE_TSAUXC); + IXGBE_WRITE_REG(hw, IXGBE_TSAUXC, + tsauxc & ~IXGBE_TSAUXC_DISABLE_SYSTIME); + IXGBE_WRITE_REG(hw, IXGBE_TSIM, IXGBE_TSIM_TXTS); + IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_TIMESYNC); + + IXGBE_WRITE_FLUSH(hw); break; case ixgbe_mac_X540: cc.read = ixgbe_ptp_read_82599; @@ -1277,50 +1290,6 @@ void ixgbe_ptp_start_cyclecounter(struct ixgbe_adapter *adapter) } /** - * ixgbe_ptp_init_systime - Initialize SYSTIME registers - * @adapter: the ixgbe private board structure - * - * Initialize and start the SYSTIME registers. - */ -static void ixgbe_ptp_init_systime(struct ixgbe_adapter *adapter) -{ - struct ixgbe_hw *hw = &adapter->hw; - u32 tsauxc; - - switch (hw->mac.type) { - case ixgbe_mac_X550EM_x: - case ixgbe_mac_x550em_a: - case ixgbe_mac_X550: - tsauxc = IXGBE_READ_REG(hw, IXGBE_TSAUXC); - - /* Reset SYSTIME registers to 0 */ - IXGBE_WRITE_REG(hw, IXGBE_SYSTIMR, 0); - IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0); - IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0); - - /* Reset interrupt settings */ - IXGBE_WRITE_REG(hw, IXGBE_TSIM, IXGBE_TSIM_TXTS); - IXGBE_WRITE_REG(hw, IXGBE_EIMS, IXGBE_EIMS_TIMESYNC); - - /* Activate the SYSTIME counter */ - IXGBE_WRITE_REG(hw, IXGBE_TSAUXC, - tsauxc & ~IXGBE_TSAUXC_DISABLE_SYSTIME); - break; - case ixgbe_mac_X540: - case ixgbe_mac_82599EB: - /* Reset SYSTIME registers to 0 */ - IXGBE_WRITE_REG(hw, IXGBE_SYSTIML, 0); - IXGBE_WRITE_REG(hw, IXGBE_SYSTIMH, 0); - break; - default: - /* Other devices aren't supported */ - return; - }; - - IXGBE_WRITE_FLUSH(hw); -} - -/** * ixgbe_ptp_reset * @adapter: the ixgbe private board structure * @@ -1346,8 +1315,6 @@ void ixgbe_ptp_reset(struct ixgbe_adapter *adapter) ixgbe_ptp_start_cyclecounter(adapter); - ixgbe_ptp_init_systime(adapter); - spin_lock_irqsave(&adapter->tmreg_lock, flags); timecounter_init(&adapter->hw_tc, &adapter->hw_cc, ktime_to_ns(ktime_get_real()));
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 12e8b0f..6e73ffe 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c
@@ -466,6 +466,7 @@ ltq_etop_tx(struct sk_buff *skb, struct net_device *dev) len = skb->len < ETH_ZLEN ? ETH_ZLEN : skb->len; if ((desc->ctl & (LTQ_DMA_OWN | LTQ_DMA_C)) || ch->skb[ch->dma.desc]) { + dev_kfree_skb_any(skb); netdev_err(dev, "tx ring full\n"); netif_tx_stop_queue(txq); return NETDEV_TX_BUSY;
diff --git a/drivers/net/ethernet/marvell/mv643xx_eth.c b/drivers/net/ethernet/marvell/mv643xx_eth.c index 10e5c4c..82ea55a 100644 --- a/drivers/net/ethernet/marvell/mv643xx_eth.c +++ b/drivers/net/ethernet/marvell/mv643xx_eth.c
@@ -2476,7 +2476,6 @@ static int mv643xx_eth_open(struct net_device *dev) for (i = 0; i < mp->rxq_count; i++) rxq_deinit(mp->rxq + i); out: - napi_disable(&mp->napi); free_irq(dev->irq, dev); return err;
diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c index 977c296..64aa551 100644 --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c
@@ -549,20 +549,6 @@ struct mvneta_rx_desc { }; #endif -enum mvneta_tx_buf_type { - MVNETA_TYPE_SKB, - MVNETA_TYPE_XDP_TX, - MVNETA_TYPE_XDP_NDO, -}; - -struct mvneta_tx_buf { - enum mvneta_tx_buf_type type; - union { - struct xdp_frame *xdpf; - struct sk_buff *skb; - }; -}; - struct mvneta_tx_queue { /* Number of this TX queue, in the range 0-7 */ u8 id; @@ -578,8 +564,8 @@ struct mvneta_tx_queue { int tx_stop_threshold; int tx_wake_threshold; - /* Array of transmitted buffers */ - struct mvneta_tx_buf *buf; + /* Array of transmitted skb */ + struct sk_buff **tx_skb; /* Index of last TX DMA descriptor that was inserted */ int txq_put_index; @@ -1788,9 +1774,14 @@ static void mvneta_txq_bufs_free(struct mvneta_port *pp, int i; for (i = 0; i < num; i++) { - struct mvneta_tx_buf *buf = &txq->buf[txq->txq_get_index]; struct mvneta_tx_desc *tx_desc = txq->descs + txq->txq_get_index; + struct sk_buff *skb = txq->tx_skb[txq->txq_get_index]; + + if (skb) { + bytes_compl += skb->len; + pkts_compl++; + } mvneta_txq_inc_get(txq); @@ -1798,12 +1789,9 @@ static void mvneta_txq_bufs_free(struct mvneta_port *pp, dma_unmap_single(pp->dev->dev.parent, tx_desc->buf_phys_addr, tx_desc->data_size, DMA_TO_DEVICE); - if (!buf->skb) + if (!skb) continue; - - bytes_compl += buf->skb->len; - pkts_compl++; - dev_kfree_skb_any(buf->skb); + dev_kfree_skb_any(skb); } netdev_tx_completed_queue(nq, pkts_compl, bytes_compl); @@ -2254,19 +2242,16 @@ static inline void mvneta_tso_put_hdr(struct sk_buff *skb, struct mvneta_port *pp, struct mvneta_tx_queue *txq) { - int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); - struct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index]; struct mvneta_tx_desc *tx_desc; + int hdr_len = skb_transport_offset(skb) + tcp_hdrlen(skb); + txq->tx_skb[txq->txq_put_index] = NULL; tx_desc = mvneta_txq_next_desc_get(txq); tx_desc->data_size = hdr_len; tx_desc->command = mvneta_skb_tx_csum(pp, skb); tx_desc->command |= MVNETA_TXD_F_DESC; tx_desc->buf_phys_addr = txq->tso_hdrs_phys + txq->txq_put_index * TSO_HEADER_SIZE; - buf->type = MVNETA_TYPE_SKB; - buf->skb = NULL; - mvneta_txq_inc_put(txq); } @@ -2275,7 +2260,6 @@ mvneta_tso_put_data(struct net_device *dev, struct mvneta_tx_queue *txq, struct sk_buff *skb, char *data, int size, bool last_tcp, bool is_last) { - struct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index]; struct mvneta_tx_desc *tx_desc; tx_desc = mvneta_txq_next_desc_get(txq); @@ -2289,8 +2273,7 @@ mvneta_tso_put_data(struct net_device *dev, struct mvneta_tx_queue *txq, } tx_desc->command = 0; - buf->type = MVNETA_TYPE_SKB; - buf->skb = NULL; + txq->tx_skb[txq->txq_put_index] = NULL; if (last_tcp) { /* last descriptor in the TCP packet */ @@ -2298,7 +2281,7 @@ mvneta_tso_put_data(struct net_device *dev, struct mvneta_tx_queue *txq, /* last descriptor in SKB */ if (is_last) - buf->skb = skb; + txq->tx_skb[txq->txq_put_index] = skb; } mvneta_txq_inc_put(txq); return 0; @@ -2383,7 +2366,6 @@ static int mvneta_tx_frag_process(struct mvneta_port *pp, struct sk_buff *skb, int i, nr_frags = skb_shinfo(skb)->nr_frags; for (i = 0; i < nr_frags; i++) { - struct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index]; skb_frag_t *frag = &skb_shinfo(skb)->frags[i]; void *addr = skb_frag_address(frag); @@ -2403,13 +2385,12 @@ static int mvneta_tx_frag_process(struct mvneta_port *pp, struct sk_buff *skb, if (i == nr_frags - 1) { /* Last descriptor */ tx_desc->command = MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD; - buf->skb = skb; + txq->tx_skb[txq->txq_put_index] = skb; } else { /* Descriptor in the middle: Not First, Not Last */ tx_desc->command = 0; - buf->skb = NULL; + txq->tx_skb[txq->txq_put_index] = NULL; } - buf->type = MVNETA_TYPE_SKB; mvneta_txq_inc_put(txq); } @@ -2437,7 +2418,6 @@ static netdev_tx_t mvneta_tx(struct sk_buff *skb, struct net_device *dev) struct mvneta_port *pp = netdev_priv(dev); u16 txq_id = skb_get_queue_mapping(skb); struct mvneta_tx_queue *txq = &pp->txqs[txq_id]; - struct mvneta_tx_buf *buf = &txq->buf[txq->txq_put_index]; struct mvneta_tx_desc *tx_desc; int len = skb->len; int frags = 0; @@ -2470,17 +2450,16 @@ static netdev_tx_t mvneta_tx(struct sk_buff *skb, struct net_device *dev) goto out; } - buf->type = MVNETA_TYPE_SKB; if (frags == 1) { /* First and Last descriptor */ tx_cmd |= MVNETA_TXD_FLZ_DESC; tx_desc->command = tx_cmd; - buf->skb = skb; + txq->tx_skb[txq->txq_put_index] = skb; mvneta_txq_inc_put(txq); } else { /* First but not Last */ tx_cmd |= MVNETA_TXD_F_DESC; - buf->skb = NULL; + txq->tx_skb[txq->txq_put_index] = NULL; mvneta_txq_inc_put(txq); tx_desc->command = tx_cmd; /* Continue with other skb fragments */ @@ -3026,8 +3005,9 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp, txq->last_desc = txq->size - 1; - txq->buf = kmalloc_array(txq->size, sizeof(*txq->buf), GFP_KERNEL); - if (!txq->buf) { + txq->tx_skb = kmalloc_array(txq->size, sizeof(*txq->tx_skb), + GFP_KERNEL); + if (!txq->tx_skb) { dma_free_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, txq->descs, txq->descs_phys); @@ -3039,7 +3019,7 @@ static int mvneta_txq_sw_init(struct mvneta_port *pp, txq->size * TSO_HEADER_SIZE, &txq->tso_hdrs_phys, GFP_KERNEL); if (!txq->tso_hdrs) { - kfree(txq->buf); + kfree(txq->tx_skb); dma_free_coherent(pp->dev->dev.parent, txq->size * MVNETA_DESC_ALIGNED_SIZE, txq->descs, txq->descs_phys); @@ -3094,7 +3074,7 @@ static void mvneta_txq_sw_deinit(struct mvneta_port *pp, { struct netdev_queue *nq = netdev_get_tx_queue(pp->dev, txq->id); - kfree(txq->buf); + kfree(txq->tx_skb); if (txq->tso_hdrs) dma_free_coherent(pp->dev->dev.parent, @@ -3737,7 +3717,7 @@ static void mvneta_percpu_elect(struct mvneta_port *pp) /* Use the cpu associated to the rxq when it is online, in all * the other cases, use the cpu 0 which can't be offline. */ - if (pp->rxq_def < nr_cpu_ids && cpu_online(pp->rxq_def)) + if (cpu_online(pp->rxq_def)) elected_cpu = pp->rxq_def; max_cpu = num_present_cpus();
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h index cf45b92..543a310 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -1202,6 +1202,5 @@ u32 mvpp2_read(struct mvpp2 *priv, u32 offset); void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name); void mvpp2_dbgfs_cleanup(struct mvpp2 *priv); -void mvpp2_dbgfs_exit(void); #endif
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c index 75e83ea..4a3baa7 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_debugfs.c
@@ -691,13 +691,6 @@ static int mvpp2_dbgfs_port_init(struct dentry *parent, return 0; } -static struct dentry *mvpp2_root; - -void mvpp2_dbgfs_exit(void) -{ - debugfs_remove(mvpp2_root); -} - void mvpp2_dbgfs_cleanup(struct mvpp2 *priv) { debugfs_remove_recursive(priv->dbgfs_dir); @@ -707,9 +700,10 @@ void mvpp2_dbgfs_cleanup(struct mvpp2 *priv) void mvpp2_dbgfs_init(struct mvpp2 *priv, const char *name) { - struct dentry *mvpp2_dir; + struct dentry *mvpp2_dir, *mvpp2_root; int ret, i; + mvpp2_root = debugfs_lookup(MVPP2_DRIVER_NAME, NULL); if (!mvpp2_root) mvpp2_root = debugfs_create_dir(MVPP2_DRIVER_NAME, NULL);
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c index 31dde6f..d700f1b 100644 --- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c +++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
@@ -6004,18 +6004,7 @@ static struct platform_driver mvpp2_driver = { }, }; -static int __init mvpp2_driver_init(void) -{ - return platform_driver_register(&mvpp2_driver); -} -module_init(mvpp2_driver_init); - -static void __exit mvpp2_driver_exit(void) -{ - platform_driver_unregister(&mvpp2_driver); - mvpp2_dbgfs_exit(); -} -module_exit(mvpp2_driver_exit); +module_platform_driver(mvpp2_driver); MODULE_DESCRIPTION("Marvell PPv2 Ethernet Driver - www.marvell.com"); MODULE_AUTHOR("Marcin Wojtas <mw@semihalf.com>");
diff --git a/drivers/net/ethernet/mellanox/mlx4/qp.c b/drivers/net/ethernet/mellanox/mlx4/qp.c index d7f2890..427e7a3 100644 --- a/drivers/net/ethernet/mellanox/mlx4/qp.c +++ b/drivers/net/ethernet/mellanox/mlx4/qp.c
@@ -697,8 +697,7 @@ static int mlx4_create_zones(struct mlx4_dev *dev, err = mlx4_bitmap_init(*bitmap + k, 1, MLX4_QP_TABLE_RAW_ETH_SIZE - 1, 0, 0); - if (!err) - mlx4_bitmap_alloc_range(*bitmap + k, 1, 1, 0); + mlx4_bitmap_alloc_range(*bitmap + k, 1, 1, 0); } if (err)
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c index 93a6597..6c7b364 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/cmd.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/cmd.c
@@ -1417,8 +1417,8 @@ static ssize_t outlen_write(struct file *filp, const char __user *buf, return -EFAULT; err = sscanf(outlen_str, "%d", &outlen); - if (err != 1) - return -EINVAL; + if (err < 0) + return err; ptr = kzalloc(outlen, GFP_KERNEL); if (!ptr) @@ -1682,17 +1682,12 @@ void mlx5_cmd_flush(struct mlx5_core_dev *dev) struct mlx5_cmd *cmd = &dev->cmd; int i; - for (i = 0; i < cmd->max_reg_cmds; i++) { - while (down_trylock(&cmd->sem)) { + for (i = 0; i < cmd->max_reg_cmds; i++) + while (down_trylock(&cmd->sem)) mlx5_cmd_trigger_completions(dev); - cond_resched(); - } - } - while (down_trylock(&cmd->pages_sem)) { + while (down_trylock(&cmd->pages_sem)) mlx5_cmd_trigger_completions(dev); - cond_resched(); - } /* Unlock cmdif */ up(&cmd->pages_sem); @@ -1855,7 +1850,7 @@ void mlx5_cmd_init_async_ctx(struct mlx5_core_dev *dev, ctx->dev = dev; /* Starts at 1 to avoid doing wake_up if we are not cleaning up */ atomic_set(&ctx->num_inflight, 1); - init_completion(&ctx->inflight_done); + init_waitqueue_head(&ctx->wait); } EXPORT_SYMBOL(mlx5_cmd_init_async_ctx); @@ -1869,8 +1864,8 @@ EXPORT_SYMBOL(mlx5_cmd_init_async_ctx); */ void mlx5_cmd_cleanup_async_ctx(struct mlx5_async_ctx *ctx) { - if (!atomic_dec_and_test(&ctx->num_inflight)) - wait_for_completion(&ctx->inflight_done); + atomic_dec(&ctx->num_inflight); + wait_event(ctx->wait, atomic_read(&ctx->num_inflight) == 0); } EXPORT_SYMBOL(mlx5_cmd_cleanup_async_ctx); @@ -1881,7 +1876,7 @@ static void mlx5_cmd_exec_cb_handler(int status, void *_work) work->user_callback(status, work); if (atomic_dec_and_test(&ctx->num_inflight)) - complete(&ctx->inflight_done); + wake_up(&ctx->wait); } int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size, @@ -1897,7 +1892,7 @@ int mlx5_cmd_exec_cb(struct mlx5_async_ctx *ctx, void *in, int in_size, ret = cmd_exec(ctx->dev, in, in_size, out, out_size, mlx5_cmd_exec_cb_handler, work, false); if (ret && atomic_dec_and_test(&ctx->num_inflight)) - complete(&ctx->inflight_done); + wake_up(&ctx->wait); return ret; }
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c index fcf5fef..f8144ce 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/diag/fw_tracer.c
@@ -600,7 +600,7 @@ static int mlx5_tracer_handle_string_trace(struct mlx5_fw_tracer *tracer, } else { cur_string = mlx5_tracer_message_get(tracer, tracer_event); if (!cur_string) { - pr_debug("%s Got string event for unknown string tmsn: %d\n", + pr_debug("%s Got string event for unknown string tdsm: %d\n", __func__, tracer_event->string_event.tmsn); return -1; } @@ -636,7 +636,7 @@ static void mlx5_tracer_handle_timestamp_trace(struct mlx5_fw_tracer *tracer, trace_timestamp = (timestamp_event.timestamp & MASK_52_7) | (str_frmt->timestamp & MASK_6_0); else - trace_timestamp = ((timestamp_event.timestamp - 1) & MASK_52_7) | + trace_timestamp = ((timestamp_event.timestamp & MASK_52_7) - 1) | (str_frmt->timestamp & MASK_6_0); mlx5_tracer_print_trace(str_frmt, dev, trace_timestamp);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en.h b/drivers/net/ethernet/mellanox/mlx5/core/en.h index 3209dec..b5c8afe 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en.h +++ b/drivers/net/ethernet/mellanox/mlx5/core/en.h
@@ -101,7 +101,7 @@ struct page_pool; #define MLX5E_LOG_ALIGNED_MPWQE_PPW (ilog2(MLX5E_REQUIRED_WQE_MTTS)) #define MLX5E_REQUIRED_MTTS(wqes) (wqes * MLX5E_REQUIRED_WQE_MTTS) #define MLX5E_MAX_RQ_NUM_MTTS \ - (ALIGN_DOWN(U16_MAX, 4) * 2) /* So that MLX5_MTT_OCTW(num_mtts) fits into u16 */ + ((1 << 16) * 2) /* So that MLX5_MTT_OCTW(num_mtts) fits into u16 */ #define MLX5E_ORDER2_MAX_PACKET_MTU (order_base_2(10 * 1024)) #define MLX5E_PARAMS_MAXIMUM_LOG_RQ_SIZE_MPW \ (ilog2(MLX5E_MAX_RQ_NUM_MTTS / MLX5E_REQUIRED_WQE_MTTS))
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c index 70087f2..c467f5e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.c
@@ -117,6 +117,7 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry) struct xfrm_replay_state_esn *replay_esn; u32 seq_bottom; u8 overlap; + u32 *esn; if (!(sa_entry->x->props.flags & XFRM_STATE_ESN)) { sa_entry->esn_state.trigger = 0; @@ -129,9 +130,11 @@ static bool mlx5e_ipsec_update_esn_state(struct mlx5e_ipsec_sa_entry *sa_entry) sa_entry->esn_state.esn = xfrm_replay_seqhi(sa_entry->x, htonl(seq_bottom)); + esn = &sa_entry->esn_state.esn; sa_entry->esn_state.trigger = 1; if (unlikely(overlap && seq_bottom < MLX5E_IPSEC_ESN_SCOPE_MID)) { + ++(*esn); sa_entry->esn_state.overlap = 0; return true; } else if (unlikely(!overlap &&
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c index f1952e1..01f2918 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_dcbnl.c
@@ -109,14 +109,12 @@ static int mlx5e_dcbnl_ieee_getets(struct net_device *netdev, if (!MLX5_CAP_GEN(priv->mdev, ets)) return -EOPNOTSUPP; - for (i = 0; i < IEEE_8021QAZ_MAX_TCS; i++) { + ets->ets_cap = mlx5_max_tc(priv->mdev) + 1; + for (i = 0; i < ets->ets_cap; i++) { err = mlx5_query_port_prio_tc(mdev, i, &ets->prio_tc[i]); if (err) return err; - } - ets->ets_cap = mlx5_max_tc(priv->mdev) + 1; - for (i = 0; i < ets->ets_cap; i++) { err = mlx5_query_port_tc_group(mdev, i, &tc_group[i]); if (err) return err;
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c index f448a13..88b51f6 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_rep.c
@@ -1434,8 +1434,6 @@ static void mlx5e_build_rep_params(struct net_device *netdev) params->num_tc = 1; params->tunneled_offload_en = false; - if (rep->vport != MLX5_VPORT_UPLINK) - params->vlan_strip_disable = true; mlx5_query_min_inline(mdev, ¶ms->tx_min_inline_mode);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c index c9115c0..366bda1 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads_termtbl.c
@@ -267,8 +267,6 @@ mlx5_eswitch_add_termtbl_rule(struct mlx5_eswitch *esw, for (curr_dest = 0; curr_dest < num_vport_dests; curr_dest++) { struct mlx5_termtbl_handle *tt = attr->dests[curr_dest].termtbl; - attr->dests[curr_dest].termtbl = NULL; - /* search for the destination associated with the * current term table */
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c index 2c81ec3..492ff2e 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/clock.c
@@ -417,8 +417,8 @@ static int mlx5_ptp_verify(struct ptp_clock_info *ptp, unsigned int pin, static const struct ptp_clock_info mlx5_ptp_clock_info = { .owner = THIS_MODULE, - .name = "mlx5_ptp", - .max_adj = 50000000, + .name = "mlx5_p2p", + .max_adj = 100000000, .n_alarm = 0, .n_ext_ts = 0, .n_per_out = 0,
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c index 6dc83e8..23361a9 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/lib/geneve.c
@@ -105,7 +105,6 @@ int mlx5_geneve_tlv_option_add(struct mlx5_geneve *geneve, struct geneve_opt *op geneve->opt_type = opt->type; geneve->obj_id = res; geneve->refcount++; - res = 0; } unlock:
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/main.c b/drivers/net/ethernet/mellanox/mlx5/core/main.c index 83ee942..f2657cd 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/main.c
@@ -1640,7 +1640,7 @@ static void mlx5_core_verify_params(void) } } -static int __init mlx5_init(void) +static int __init init(void) { int err; @@ -1665,7 +1665,7 @@ static int __init mlx5_init(void) return err; } -static void __exit mlx5_cleanup(void) +static void __exit cleanup(void) { #ifdef CONFIG_MLX5_CORE_EN mlx5e_cleanup(); @@ -1674,5 +1674,5 @@ static void __exit mlx5_cleanup(void) mlx5_unregister_debugfs(); } -module_init(mlx5_init); -module_exit(mlx5_cleanup); +module_init(init); +module_exit(cleanup);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c index 7f7693b..db76c92 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/pagealloc.c
@@ -167,8 +167,7 @@ static int alloc_4k(struct mlx5_core_dev *dev, u64 *addr) fp = list_entry(dev->priv.free_list.next, struct fw_page, list); n = find_first_bit(&fp->bitmask, 8 * sizeof(fp->bitmask)); if (n >= MLX5_NUM_4K_IN_PAGE) { - mlx5_core_warn(dev, "alloc 4k bug: fw page = 0x%llx, n = %u, bitmask: %lu, max num of 4K pages: %d\n", - fp->addr, n, fp->bitmask, MLX5_NUM_4K_IN_PAGE); + mlx5_core_warn(dev, "alloc 4k bug\n"); return -ENOENT; } clear_bit(n, &fp->bitmask);
diff --git a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c index 077b4be..e178d8d 100644 --- a/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/steering/dr_table.c
@@ -9,7 +9,7 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl, struct mlx5dr_matcher *last_matcher = NULL; struct mlx5dr_htbl_connect_info info; struct mlx5dr_ste_htbl *last_htbl; - int ret = -EOPNOTSUPP; + int ret; if (action && action->action_type != DR_ACTION_TYP_FT) return -EOPNOTSUPP; @@ -68,9 +68,6 @@ int mlx5dr_table_set_miss_action(struct mlx5dr_table *tbl, } } - if (ret) - goto out; - /* Release old action */ if (tbl->miss_action) refcount_dec(&tbl->miss_action->refcount);
diff --git a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c index 972c571..017d68f 100644 --- a/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c +++ b/drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2_tlv_multi.c
@@ -31,8 +31,6 @@ mlxfw_mfa2_tlv_next(const struct mlxfw_mfa2_file *mfa2_file, if (tlv->type == MLXFW_MFA2_TLV_MULTI_PART) { multi = mlxfw_mfa2_tlv_multi_get(mfa2_file, tlv); - if (!multi) - return NULL; tlv_len = NLA_ALIGN(tlv_len + be16_to_cpu(multi->total_len)); }
diff --git a/drivers/net/ethernet/micrel/ksz884x.c b/drivers/net/ethernet/micrel/ksz884x.c index 9ffb888..2431723 100644 --- a/drivers/net/ethernet/micrel/ksz884x.c +++ b/drivers/net/ethernet/micrel/ksz884x.c
@@ -6928,7 +6928,7 @@ static int pcidev_init(struct pci_dev *pdev, const struct pci_device_id *id) char banner[sizeof(version)]; struct ksz_switch *sw = NULL; - result = pcim_enable_device(pdev); + result = pci_enable_device(pdev); if (result) return result;
diff --git a/drivers/net/ethernet/microchip/encx24j600-regmap.c b/drivers/net/ethernet/microchip/encx24j600-regmap.c index 8c6c5c7..e252863 100644 --- a/drivers/net/ethernet/microchip/encx24j600-regmap.c +++ b/drivers/net/ethernet/microchip/encx24j600-regmap.c
@@ -364,7 +364,7 @@ static int regmap_encx24j600_phy_reg_read(void *context, unsigned int reg, goto err_out; usleep_range(26, 100); - while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) && + while ((ret = regmap_read(ctx->regmap, MISTAT, &mistat) != 0) && (mistat & BUSY)) cpu_relax(); @@ -402,7 +402,7 @@ static int regmap_encx24j600_phy_reg_write(void *context, unsigned int reg, goto err_out; usleep_range(26, 100); - while (((ret = regmap_read(ctx->regmap, MISTAT, &mistat)) == 0) && + while ((ret = regmap_read(ctx->regmap, MISTAT, &mistat) != 0) && (mistat & BUSY)) cpu_relax();
diff --git a/drivers/net/ethernet/moxa/moxart_ether.c b/drivers/net/ethernet/moxa/moxart_ether.c index 8732708..1371482 100644 --- a/drivers/net/ethernet/moxa/moxart_ether.c +++ b/drivers/net/ethernet/moxa/moxart_ether.c
@@ -74,6 +74,11 @@ static int moxart_set_mac_address(struct net_device *ndev, void *addr) static void moxart_mac_free_memory(struct net_device *ndev) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); + int i; + + for (i = 0; i < RX_DESC_NUM; i++) + dma_unmap_single(&ndev->dev, priv->rx_mapping[i], + priv->rx_buf_size, DMA_FROM_DEVICE); if (priv->tx_desc_base) dma_free_coherent(&priv->pdev->dev, @@ -142,11 +147,11 @@ static void moxart_mac_setup_desc_ring(struct net_device *ndev) desc + RX_REG_OFFSET_DESC1); priv->rx_buf[i] = priv->rx_buf_base + priv->rx_buf_size * i; - priv->rx_mapping[i] = dma_map_single(&priv->pdev->dev, + priv->rx_mapping[i] = dma_map_single(&ndev->dev, priv->rx_buf[i], priv->rx_buf_size, DMA_FROM_DEVICE); - if (dma_mapping_error(&priv->pdev->dev, priv->rx_mapping[i])) + if (dma_mapping_error(&ndev->dev, priv->rx_mapping[i])) netdev_err(ndev, "DMA mapping error\n"); moxart_desc_write(priv->rx_mapping[i], @@ -188,7 +193,6 @@ static int moxart_mac_open(struct net_device *ndev) static int moxart_mac_stop(struct net_device *ndev) { struct moxart_mac_priv_t *priv = netdev_priv(ndev); - int i; napi_disable(&priv->napi); @@ -200,11 +204,6 @@ static int moxart_mac_stop(struct net_device *ndev) /* disable all functions */ writel(0, priv->base + REG_MAC_CTRL); - /* unmap areas mapped in moxart_mac_setup_desc_ring() */ - for (i = 0; i < RX_DESC_NUM; i++) - dma_unmap_single(&priv->pdev->dev, priv->rx_mapping[i], - priv->rx_buf_size, DMA_FROM_DEVICE); - return 0; } @@ -241,7 +240,7 @@ static int moxart_rx_poll(struct napi_struct *napi, int budget) if (len > RX_BUF_SIZE) len = RX_BUF_SIZE; - dma_sync_single_for_cpu(&priv->pdev->dev, + dma_sync_single_for_cpu(&ndev->dev, priv->rx_mapping[rx_head], priv->rx_buf_size, DMA_FROM_DEVICE); skb = netdev_alloc_skb_ip_align(ndev, len); @@ -295,7 +294,7 @@ static void moxart_tx_finished(struct net_device *ndev) unsigned int tx_tail = priv->tx_tail; while (tx_tail != tx_head) { - dma_unmap_single(&priv->pdev->dev, priv->tx_mapping[tx_tail], + dma_unmap_single(&ndev->dev, priv->tx_mapping[tx_tail], priv->tx_len[tx_tail], DMA_TO_DEVICE); ndev->stats.tx_packets++; @@ -358,9 +357,9 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) len = skb->len > TX_BUF_SIZE ? TX_BUF_SIZE : skb->len; - priv->tx_mapping[tx_head] = dma_map_single(&priv->pdev->dev, skb->data, + priv->tx_mapping[tx_head] = dma_map_single(&ndev->dev, skb->data, len, DMA_TO_DEVICE); - if (dma_mapping_error(&priv->pdev->dev, priv->tx_mapping[tx_head])) { + if (dma_mapping_error(&ndev->dev, priv->tx_mapping[tx_head])) { netdev_err(ndev, "DMA mapping error\n"); goto out_unlock; } @@ -379,7 +378,7 @@ static int moxart_mac_start_xmit(struct sk_buff *skb, struct net_device *ndev) len = ETH_ZLEN; } - dma_sync_single_for_device(&priv->pdev->dev, priv->tx_mapping[tx_head], + dma_sync_single_for_device(&ndev->dev, priv->tx_mapping[tx_head], priv->tx_buf_size, DMA_TO_DEVICE); txdes1 = TX_DESC1_LTS | TX_DESC1_FTS | (len & TX_DESC1_BUF_SIZE_MASK); @@ -499,7 +498,7 @@ static int moxart_mac_probe(struct platform_device *pdev) priv->tx_buf_size = TX_BUF_SIZE; priv->rx_buf_size = RX_BUF_SIZE; - priv->tx_desc_base = dma_alloc_coherent(p_dev, TX_REG_DESC_SIZE * + priv->tx_desc_base = dma_alloc_coherent(&pdev->dev, TX_REG_DESC_SIZE * TX_DESC_NUM, &priv->tx_base, GFP_DMA | GFP_KERNEL); if (!priv->tx_desc_base) { @@ -507,7 +506,7 @@ static int moxart_mac_probe(struct platform_device *pdev) goto init_fail; } - priv->rx_desc_base = dma_alloc_coherent(p_dev, RX_REG_DESC_SIZE * + priv->rx_desc_base = dma_alloc_coherent(&pdev->dev, RX_REG_DESC_SIZE * RX_DESC_NUM, &priv->rx_base, GFP_DMA | GFP_KERNEL); if (!priv->rx_desc_base) {
diff --git a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c index 5aee774..c4c7160 100644 --- a/drivers/net/ethernet/myricom/myri10ge/myri10ge.c +++ b/drivers/net/ethernet/myricom/myri10ge/myri10ge.c
@@ -3956,7 +3956,6 @@ static int myri10ge_probe(struct pci_dev *pdev, const struct pci_device_id *ent) myri10ge_free_slices(mgp); abort_with_firmware: - kfree(mgp->msix_vectors); myri10ge_dummy_rdma(mgp, 0); abort_with_ioremap:
diff --git a/drivers/net/ethernet/natsemi/sonic.c b/drivers/net/ethernet/natsemi/sonic.c index 953708e..05e7604 100644 --- a/drivers/net/ethernet/natsemi/sonic.c +++ b/drivers/net/ethernet/natsemi/sonic.c
@@ -256,7 +256,7 @@ static int sonic_send_packet(struct sk_buff *skb, struct net_device *dev) */ laddr = dma_map_single(lp->device, skb->data, length, DMA_TO_DEVICE); - if (dma_mapping_error(lp->device, laddr)) { + if (!laddr) { pr_err_ratelimited("%s: failed to map tx DMA buffer.\n", dev->name); dev_kfree_skb_any(skb); return NETDEV_TX_OK; @@ -474,7 +474,7 @@ static bool sonic_alloc_rb(struct net_device *dev, struct sonic_local *lp, *new_addr = dma_map_single(lp->device, skb_put(*new_skb, SONIC_RBSIZE), SONIC_RBSIZE, DMA_FROM_DEVICE); - if (dma_mapping_error(lp->device, *new_addr)) { + if (!*new_addr) { dev_kfree_skb(*new_skb); *new_skb = NULL; return false;
diff --git a/drivers/net/ethernet/neterion/s2io.c b/drivers/net/ethernet/neterion/s2io.c index 496052a..71ab4e9 100644 --- a/drivers/net/ethernet/neterion/s2io.c +++ b/drivers/net/ethernet/neterion/s2io.c
@@ -2375,7 +2375,7 @@ static void free_tx_buffers(struct s2io_nic *nic) skb = s2io_txdl_getskb(&mac_control->fifos[i], txdp, j); if (skb) { swstats->mem_freed += skb->truesize; - dev_kfree_skb_irq(skb); + dev_kfree_skb(skb); cnt++; } } @@ -7122,8 +7122,9 @@ static int s2io_card_up(struct s2io_nic *sp) if (ret) { DBG_PRINT(ERR_DBG, "%s: Out of memory in Open\n", dev->name); - ret = -ENOMEM; - goto err_fill_buff; + s2io_reset(sp); + free_rx_buffers(sp); + return -ENOMEM; } DBG_PRINT(INFO_DBG, "Buf in ring:%d is %d:\n", i, ring->rx_bufs_left); @@ -7161,16 +7162,18 @@ static int s2io_card_up(struct s2io_nic *sp) /* Enable Rx Traffic and interrupts on the NIC */ if (start_nic(sp)) { DBG_PRINT(ERR_DBG, "%s: Starting NIC failed\n", dev->name); - ret = -ENODEV; - goto err_out; + s2io_reset(sp); + free_rx_buffers(sp); + return -ENODEV; } /* Add interrupt service routine */ if (s2io_add_isr(sp) != 0) { if (sp->config.intr_type == MSI_X) s2io_rem_isr(sp); - ret = -ENODEV; - goto err_out; + s2io_reset(sp); + free_rx_buffers(sp); + return -ENODEV; } timer_setup(&sp->alarm_timer, s2io_alarm_handle, 0); @@ -7190,20 +7193,6 @@ static int s2io_card_up(struct s2io_nic *sp) } return 0; - -err_out: - if (config->napi) { - if (config->intr_type == MSI_X) { - for (i = 0; i < sp->config.rx_ring_num; i++) - napi_disable(&sp->mac_control.rings[i].napi); - } else { - napi_disable(&sp->napi); - } - } -err_fill_buff: - s2io_reset(sp); - free_rx_buffers(sp); - return ret; } /**
diff --git a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c index ff88103..1085791 100644 --- a/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c +++ b/drivers/net/ethernet/netronome/nfp/nfp_net_ethtool.c
@@ -1127,11 +1127,6 @@ nfp_port_get_module_info(struct net_device *netdev, u8 data; port = nfp_port_from_netdev(netdev); - if (!port) - return -EOPNOTSUPP; - - /* update port state to get latest interface */ - set_bit(NFP_PORT_CHANGED, &port->flags); eth_port = nfp_port_get_eth_port(port); if (!eth_port) return -EOPNOTSUPP;
diff --git a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c index b163489..6ef48eb 100644 --- a/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c +++ b/drivers/net/ethernet/netronome/nfp/nfpcore/nfp_cppcore.c
@@ -874,6 +874,7 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, } /* Adjust the start address to be cache size aligned */ + cache->id = id; cache->addr = addr & ~(u64)(cache->size - 1); /* Re-init to the new ID and address */ @@ -893,8 +894,6 @@ area_cache_get(struct nfp_cpp *cpp, u32 id, return NULL; } - cache->id = id; - exit: /* Adjust offset */ *offset = addr - cache->addr;
diff --git a/drivers/net/ethernet/ni/nixge.c b/drivers/net/ethernet/ni/nixge.c index acb25b8..56f2859 100644 --- a/drivers/net/ethernet/ni/nixge.c +++ b/drivers/net/ethernet/ni/nixge.c
@@ -249,26 +249,25 @@ static void nixge_hw_dma_bd_release(struct net_device *ndev) struct sk_buff *skb; int i; - if (priv->rx_bd_v) { - for (i = 0; i < RX_BD_NUM; i++) { - phys_addr = nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], - phys); + for (i = 0; i < RX_BD_NUM; i++) { + phys_addr = nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], + phys); - dma_unmap_single(ndev->dev.parent, phys_addr, - NIXGE_MAX_JUMBO_FRAME_SIZE, - DMA_FROM_DEVICE); + dma_unmap_single(ndev->dev.parent, phys_addr, + NIXGE_MAX_JUMBO_FRAME_SIZE, + DMA_FROM_DEVICE); - skb = (struct sk_buff *)(uintptr_t) - nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], - sw_id_offset); - dev_kfree_skb(skb); - } + skb = (struct sk_buff *)(uintptr_t) + nixge_hw_dma_bd_get_addr(&priv->rx_bd_v[i], + sw_id_offset); + dev_kfree_skb(skb); + } + if (priv->rx_bd_v) dma_free_coherent(ndev->dev.parent, sizeof(*priv->rx_bd_v) * RX_BD_NUM, priv->rx_bd_v, priv->rx_bd_p); - } if (priv->tx_skb) devm_kfree(ndev->dev.parent, priv->tx_skb); @@ -900,7 +899,6 @@ static int nixge_open(struct net_device *ndev) err_rx_irq: free_irq(priv->tx_irq, ndev); err_tx_irq: - napi_disable(&priv->napi); phy_stop(phy); phy_disconnect(phy); tasklet_kill(&priv->dma_err_tasklet);
diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c index 45b7f0f..8ff4c61 100644 --- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c +++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -1166,7 +1166,6 @@ static void pch_gbe_tx_queue(struct pch_gbe_adapter *adapter, buffer_info->dma = 0; buffer_info->time_stamp = 0; tx_ring->next_to_use = ring_num; - dev_kfree_skb_any(skb); return; } buffer_info->mapped = true; @@ -2481,7 +2480,6 @@ static void pch_gbe_remove(struct pci_dev *pdev) unregister_netdev(netdev); pch_gbe_phy_hw_reset(&adapter->hw); - pci_dev_put(adapter->ptp_pdev); free_netdev(netdev); } @@ -2563,7 +2561,7 @@ static int pch_gbe_probe(struct pci_dev *pdev, /* setup the private structure */ ret = pch_gbe_sw_init(adapter); if (ret) - goto err_put_dev; + goto err_free_netdev; /* Initialize PHY */ ret = pch_gbe_init_phy(adapter); @@ -2621,8 +2619,6 @@ static int pch_gbe_probe(struct pci_dev *pdev, err_free_adapter: pch_gbe_phy_hw_reset(&adapter->hw); -err_put_dev: - pci_dev_put(adapter->ptp_pdev); err_free_netdev: free_netdev(netdev); return ret;
diff --git a/drivers/net/ethernet/pensando/ionic/ionic_lif.c b/drivers/net/ethernet/pensando/ionic/ionic_lif.c index d084183..f9c303d 100644 --- a/drivers/net/ethernet/pensando/ionic/ionic_lif.c +++ b/drivers/net/ethernet/pensando/ionic/ionic_lif.c
@@ -190,7 +190,6 @@ static int ionic_qcq_enable(struct ionic_qcq *qcq) .oper = IONIC_Q_ENABLE, }, }; - int ret; idev = &lif->ionic->idev; dev = lif->ionic->dev; @@ -198,24 +197,16 @@ static int ionic_qcq_enable(struct ionic_qcq *qcq) dev_dbg(dev, "q_enable.index %d q_enable.qtype %d\n", ctx.cmd.q_control.index, ctx.cmd.q_control.type); - if (qcq->flags & IONIC_QCQ_F_INTR) - ionic_intr_clean(idev->intr_ctrl, qcq->intr.index); - - ret = ionic_adminq_post_wait(lif, &ctx); - if (ret) - return ret; - - if (qcq->napi.poll) - napi_enable(&qcq->napi); - if (qcq->flags & IONIC_QCQ_F_INTR) { irq_set_affinity_hint(qcq->intr.vector, &qcq->intr.affinity_mask); + napi_enable(&qcq->napi); + ionic_intr_clean(idev->intr_ctrl, qcq->intr.index); ionic_intr_mask(idev->intr_ctrl, qcq->intr.index, IONIC_INTR_MASK_CLEAR); } - return 0; + return ionic_adminq_post_wait(lif, &ctx); } static int ionic_qcq_disable(struct ionic_qcq *qcq)
diff --git a/drivers/net/ethernet/qlogic/qed/qed_dev.c b/drivers/net/ethernet/qlogic/qed/qed_dev.c index 3511977..a923c65 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_dev.c +++ b/drivers/net/ethernet/qlogic/qed/qed_dev.c
@@ -5139,11 +5139,6 @@ static int qed_init_wfq_param(struct qed_hwfn *p_hwfn, num_vports = p_hwfn->qm_info.num_vports; - if (num_vports < 2) { - DP_NOTICE(p_hwfn, "Unexpected num_vports: %d\n", num_vports); - return -EINVAL; - } - /* Accounting for the vports which are configured for WFQ explicitly */ for (i = 0; i < num_vports; i++) { u32 tmp_speed;
diff --git a/drivers/net/ethernet/qlogic/qed/qed_sriov.c b/drivers/net/ethernet/qlogic/qed/qed_sriov.c index caa0468..20f840e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_sriov.c +++ b/drivers/net/ethernet/qlogic/qed/qed_sriov.c
@@ -4404,9 +4404,6 @@ qed_iov_configure_min_tx_rate(struct qed_dev *cdev, int vfid, u32 rate) } vf = qed_iov_get_vf_info(QED_LEADING_HWFN(cdev), (u16)vfid, true); - if (!vf) - return -EINVAL; - vport_id = vf->vport_id; return qed_configure_vport_wfq(cdev, vport_id, rate); @@ -5153,7 +5150,7 @@ static void qed_iov_handle_trust_change(struct qed_hwfn *hwfn) /* Validate that the VF has a configured vport */ vf = qed_iov_get_vf_info(hwfn, i, true); - if (!vf || !vf->vport_instance) + if (!vf->vport_instance) continue; memset(¶ms, 0, sizeof(params));
diff --git a/drivers/net/ethernet/qlogic/qla3xxx.c b/drivers/net/ethernet/qlogic/qla3xxx.c index 11616ac..5e81cd3 100644 --- a/drivers/net/ethernet/qlogic/qla3xxx.c +++ b/drivers/net/ethernet/qlogic/qla3xxx.c
@@ -2476,7 +2476,6 @@ static netdev_tx_t ql3xxx_send(struct sk_buff *skb, skb_shinfo(skb)->nr_frags); if (tx_cb->seg_count == -1) { netdev_err(ndev, "%s: invalid segment count!\n", __func__); - dev_kfree_skb_any(skb); return NETDEV_TX_OK; }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c index e6538f3..df43d36 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c
@@ -2993,7 +2993,7 @@ static void qlcnic_83xx_recover_driver_lock(struct qlcnic_adapter *adapter) QLCWRX(adapter->ahw, QLC_83XX_RECOVER_DRV_LOCK, val); dev_info(&adapter->pdev->dev, "%s: lock recovery initiated\n", __func__); - mdelay(QLC_83XX_DRV_LOCK_RECOVERY_DELAY); + msleep(QLC_83XX_DRV_LOCK_RECOVERY_DELAY); val = QLCRDX(adapter->ahw, QLC_83XX_RECOVER_DRV_LOCK); id = ((val >> 2) & 0xF); if (id == adapter->portnum) { @@ -3029,7 +3029,7 @@ int qlcnic_83xx_lock_driver(struct qlcnic_adapter *adapter) if (status) break; - mdelay(QLC_83XX_DRV_LOCK_WAIT_DELAY); + msleep(QLC_83XX_DRV_LOCK_WAIT_DELAY); i++; if (i == 1)
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c index 85419b8..1028621 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c
@@ -2525,13 +2525,7 @@ int qlcnic_83xx_init(struct qlcnic_adapter *adapter, int pci_using_dac) goto disable_mbx_intr; qlcnic_83xx_clear_function_resources(adapter); - - err = qlcnic_dcb_enable(adapter->dcb); - if (err) { - qlcnic_dcb_free(adapter->dcb); - goto disable_mbx_intr; - } - + qlcnic_dcb_enable(adapter->dcb); qlcnic_83xx_initialize_nic(adapter, 1); qlcnic_dcb_get_info(adapter->dcb);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c index 4814046..af38d3d 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c
@@ -629,13 +629,7 @@ int qlcnic_fw_create_ctx(struct qlcnic_adapter *dev) int i, err, ring; if (dev->flags & QLCNIC_NEED_FLR) { - err = pci_reset_function(dev->pdev); - if (err) { - dev_err(&dev->pdev->dev, - "Adapter reset failed (%d). Please reboot\n", - err); - return err; - } + pci_reset_function(dev->pdev); dev->flags &= ~QLCNIC_NEED_FLR; }
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h index eb8000d..0a9d24e 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.h
@@ -42,6 +42,11 @@ struct qlcnic_dcb { unsigned long state; }; +static inline void qlcnic_clear_dcb_ops(struct qlcnic_dcb *dcb) +{ + kfree(dcb); +} + static inline int qlcnic_dcb_get_hw_capability(struct qlcnic_dcb *dcb) { if (dcb && dcb->ops->get_hw_capability) @@ -108,8 +113,9 @@ static inline void qlcnic_dcb_init_dcbnl_ops(struct qlcnic_dcb *dcb) dcb->ops->init_dcbnl_ops(dcb); } -static inline int qlcnic_dcb_enable(struct qlcnic_dcb *dcb) +static inline void qlcnic_dcb_enable(struct qlcnic_dcb *dcb) { - return dcb ? qlcnic_dcb_attach(dcb) : 0; + if (dcb && qlcnic_dcb_attach(dcb)) + qlcnic_clear_dcb_ops(dcb); } #endif
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index 9d5b74c..3a96fd6 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c
@@ -2639,13 +2639,7 @@ qlcnic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) "Device does not support MSI interrupts\n"); if (qlcnic_82xx_check(adapter)) { - err = qlcnic_dcb_enable(adapter->dcb); - if (err) { - qlcnic_dcb_free(adapter->dcb); - dev_err(&pdev->dev, "Failed to enable DCB\n"); - goto err_out_free_hw; - } - + qlcnic_dcb_enable(adapter->dcb); qlcnic_dcb_get_info(adapter->dcb); err = qlcnic_setup_intr(adapter);
diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c index 7c782df..400bc2c 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sriov_common.c
@@ -222,8 +222,6 @@ int qlcnic_sriov_init(struct qlcnic_adapter *adapter, int num_vfs) return 0; qlcnic_destroy_async_wq: - while (i--) - kfree(sriov->vf_info[i].vp); destroy_workqueue(bc->bc_async_wq); qlcnic_destroy_trans_wq:
diff --git a/drivers/net/ethernet/qualcomm/emac/emac.c b/drivers/net/ethernet/qualcomm/emac/emac.c index 5fe28de..5c199d2 100644 --- a/drivers/net/ethernet/qualcomm/emac/emac.c +++ b/drivers/net/ethernet/qualcomm/emac/emac.c
@@ -738,15 +738,9 @@ static int emac_remove(struct platform_device *pdev) struct net_device *netdev = dev_get_drvdata(&pdev->dev); struct emac_adapter *adpt = netdev_priv(netdev); - netif_carrier_off(netdev); - netif_tx_disable(netdev); - unregister_netdev(netdev); netif_napi_del(&adpt->rx_q.napi); - free_irq(adpt->irq.irq, &adpt->irq); - cancel_work_sync(&adpt->work_thread); - emac_clks_teardown(adpt); put_device(&adpt->phydev->mdio.dev);
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c index b66689e..f158fdf 100644 --- a/drivers/net/ethernet/rdc/r6040.c +++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1162,12 +1162,10 @@ static int r6040_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) err = register_netdev(dev); if (err) { dev_err(&pdev->dev, "Failed to register net device\n"); - goto err_out_phy_disconnect; + goto err_out_mdio_unregister; } return 0; -err_out_phy_disconnect: - phy_disconnect(dev->phydev); err_out_mdio_unregister: mdiobus_unregister(lp->mii_bus); err_out_mdio: @@ -1191,7 +1189,6 @@ static void r6040_remove_one(struct pci_dev *pdev) struct r6040_private *lp = netdev_priv(dev); unregister_netdev(dev); - phy_disconnect(dev->phydev); mdiobus_unregister(lp->mii_bus); mdiobus_free(lp->mii_bus); netif_napi_del(&lp->napi);
diff --git a/drivers/net/ethernet/renesas/ravb_main.c b/drivers/net/ethernet/renesas/ravb_main.c index 231a129..9208a72 100644 --- a/drivers/net/ethernet/renesas/ravb_main.c +++ b/drivers/net/ethernet/renesas/ravb_main.c
@@ -736,14 +736,14 @@ static void ravb_error_interrupt(struct net_device *ndev) ravb_write(ndev, ~(EIS_QFS | EIS_RESERVED), EIS); if (eis & EIS_QFS) { ris2 = ravb_read(ndev, RIS2); - ravb_write(ndev, ~(RIS2_QFF0 | RIS2_QFF1 | RIS2_RFFF | RIS2_RESERVED), + ravb_write(ndev, ~(RIS2_QFF0 | RIS2_RFFF | RIS2_RESERVED), RIS2); /* Receive Descriptor Empty int */ if (ris2 & RIS2_QFF0) priv->stats[RAVB_BE].rx_over_errors++; - /* Receive Descriptor Empty int */ + /* Receive Descriptor Empty int */ if (ris2 & RIS2_QFF1) priv->stats[RAVB_NC].rx_over_errors++; @@ -2216,11 +2216,11 @@ static int ravb_remove(struct platform_device *pdev) priv->desc_bat_dma); /* Set reset mode */ ravb_write(ndev, CCC_OPC_RESET, CCC); + pm_runtime_put_sync(&pdev->dev); unregister_netdev(ndev); netif_napi_del(&priv->napi[RAVB_NC]); netif_napi_del(&priv->napi[RAVB_BE]); ravb_mdio_release(priv); - pm_runtime_put_sync(&pdev->dev); pm_runtime_disable(&pdev->dev); free_netdev(ndev); platform_set_drvdata(pdev, NULL); @@ -2327,7 +2327,6 @@ static int __maybe_unused ravb_resume(struct device *dev) ret = ravb_open(ndev); if (ret < 0) return ret; - ravb_set_rx_mode(ndev); netif_device_attach(ndev); }
diff --git a/drivers/net/ethernet/rocker/rocker_ofdpa.c b/drivers/net/ethernet/rocker/rocker_ofdpa.c index e4d919d..8157666 100644 --- a/drivers/net/ethernet/rocker/rocker_ofdpa.c +++ b/drivers/net/ethernet/rocker/rocker_ofdpa.c
@@ -1273,7 +1273,7 @@ static int ofdpa_port_ipv4_neigh(struct ofdpa_port *ofdpa_port, bool removing; int err = 0; - entry = kzalloc(sizeof(*entry), GFP_ATOMIC); + entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (!entry) return -ENOMEM;
diff --git a/drivers/net/ethernet/socionext/netsec.c b/drivers/net/ethernet/socionext/netsec.c index 5a67265..33d7c29 100644 --- a/drivers/net/ethernet/socionext/netsec.c +++ b/drivers/net/ethernet/socionext/netsec.c
@@ -1936,13 +1936,11 @@ static int netsec_register_mdio(struct netsec_priv *priv, u32 phy_addr) ret = PTR_ERR(priv->phydev); dev_err(priv->dev, "get_phy_device err(%d)\n", ret); priv->phydev = NULL; - mdiobus_unregister(bus); return -ENODEV; } ret = phy_device_register(priv->phydev); if (ret) { - phy_device_free(priv->phydev); mdiobus_unregister(bus); dev_err(priv->dev, "phy_device_register err(%d)\n", ret);
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c index 78be62e..bfc4a92 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c
@@ -505,8 +505,6 @@ static int qcom_ethqos_probe(struct platform_device *pdev) plat_dat->has_gmac4 = 1; plat_dat->pmt = 1; plat_dat->tso_en = of_property_read_bool(np, "snps,tso"); - if (of_device_is_compatible(np, "qcom,qcs404-ethqos")) - plat_dat->rx_clk_runs_in_lpi = 1; ret = stmmac_dvr_probe(&pdev->dev, plat_dat, &stmmac_res); if (ret)
diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c index 59165c0..e436fa1 100644 --- a/drivers/net/ethernet/stmicro/stmmac/dwmac5.c +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac5.c
@@ -520,9 +520,9 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, return 0; } + val |= PPSCMDx(index, 0x2); val |= TRGTMODSELx(index, 0x2); val |= PPSEN0; - writel(val, ioaddr + MAC_PPS_CONTROL); writel(cfg->start.tv_sec, ioaddr + MAC_PPSx_TARGET_TIME_SEC(index)); @@ -547,7 +547,6 @@ int dwmac5_flex_pps_config(void __iomem *ioaddr, int index, writel(period - 1, ioaddr + MAC_PPSx_WIDTH(index)); /* Finally, activate it */ - val |= PPSCMDx(index, 0x2); writel(val, ioaddr + MAC_PPS_CONTROL); return 0; }
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c index 7954681..8c14c99 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c
@@ -43,8 +43,7 @@ static void config_sub_second_increment(void __iomem *ioaddr, if (!(value & PTP_TCR_TSCTRLSSR)) data = (data * 1000) / 465; - if (data > PTP_SSIR_SSINC_MAX) - data = PTP_SSIR_SSINC_MAX; + data &= PTP_SSIR_SSINC_MASK; reg_value = data; if (gmac4)
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c index c62fd5d..79ed3b9 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
@@ -972,8 +972,7 @@ static void stmmac_mac_link_up(struct phylink_config *config, stmmac_mac_set(priv, priv->ioaddr, true); if (phy && priv->dma_cap.eee) { - priv->eee_active = - phy_init_eee(phy, !priv->plat->rx_clk_runs_in_lpi) >= 0; + priv->eee_active = phy_init_eee(phy, 1) >= 0; priv->eee_enabled = stmmac_eee_init(priv); stmmac_set_eee_pls(priv, priv->hw, true); } @@ -1039,11 +1038,6 @@ static int stmmac_init_phy(struct net_device *dev) int addr = priv->plat->phy_addr; struct phy_device *phydev; - if (addr < 0) { - netdev_err(priv->dev, "no phy found\n"); - return -ENODEV; - } - phydev = mdiobus_get_phy(priv->mii, addr); if (!phydev) { netdev_err(priv->dev, "no phy at addr %d\n", addr);
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c index e0f13da..2a7c3ce 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_platform.c
@@ -107,10 +107,10 @@ static struct stmmac_axi *stmmac_axi_setup(struct platform_device *pdev) axi->axi_lpi_en = of_property_read_bool(np, "snps,lpi_en"); axi->axi_xit_frm = of_property_read_bool(np, "snps,xit_frm"); - axi->axi_kbbe = of_property_read_bool(np, "snps,kbbe"); - axi->axi_fb = of_property_read_bool(np, "snps,fb"); - axi->axi_mb = of_property_read_bool(np, "snps,mb"); - axi->axi_rb = of_property_read_bool(np, "snps,rb"); + axi->axi_kbbe = of_property_read_bool(np, "snps,axi_kbbe"); + axi->axi_fb = of_property_read_bool(np, "snps,axi_fb"); + axi->axi_mb = of_property_read_bool(np, "snps,axi_mb"); + axi->axi_rb = of_property_read_bool(np, "snps,axi_rb"); if (of_property_read_u32(np, "snps,wr_osr_lmt", &axi->axi_wr_osr_lmt)) axi->axi_wr_osr_lmt = 1; @@ -554,7 +554,7 @@ stmmac_probe_config_dt(struct platform_device *pdev, const char **mac) dma_cfg->mixed_burst = of_property_read_bool(np, "snps,mixed-burst"); plat->force_thresh_dma_mode = of_property_read_bool(np, "snps,force_thresh_dma_mode"); - if (plat->force_thresh_dma_mode && plat->force_sf_dma_mode) { + if (plat->force_thresh_dma_mode) { plat->force_sf_dma_mode = 0; dev_warn(&pdev->dev, "force_sf_dma_mode is ignored if force_thresh_dma_mode is set.\n");
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h index 60e6b08..7abb1d4 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.h
@@ -61,7 +61,7 @@ #define PTP_TCR_TSENMACADDR BIT(18) /* SSIR defines */ -#define PTP_SSIR_SSINC_MAX 0xff +#define PTP_SSIR_SSINC_MASK 0xff #define GMAC4_PTP_SSIR_SSINC_SHIFT 16 #endif /* __STMMAC_PTP_H__ */
diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c index e65577f..ba03a2d 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_selftests.c
@@ -1614,16 +1614,12 @@ static int stmmac_test_arpoffload(struct stmmac_priv *priv) } ret = stmmac_set_arp_offload(priv, priv->hw, true, ip_addr); - if (ret) { - kfree_skb(skb); + if (ret) goto cleanup; - } ret = dev_set_promiscuity(priv->dev, 1); - if (ret) { - kfree_skb(skb); + if (ret) goto cleanup; - } skb_set_queue_mapping(skb, 0); ret = dev_queue_xmit(skb);
diff --git a/drivers/net/ethernet/sun/ldmvsw.c b/drivers/net/ethernet/sun/ldmvsw.c index 934a4b5..01ea0d6 100644 --- a/drivers/net/ethernet/sun/ldmvsw.c +++ b/drivers/net/ethernet/sun/ldmvsw.c
@@ -290,9 +290,6 @@ static int vsw_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) hp = mdesc_grab(); - if (!hp) - return -ENODEV; - rmac = mdesc_get_property(hp, vdev->mp, remote_macaddr_prop, &len); err = -ENODEV; if (!rmac) {
diff --git a/drivers/net/ethernet/sun/niu.c b/drivers/net/ethernet/sun/niu.c index 201470d..70b9a7b 100644 --- a/drivers/net/ethernet/sun/niu.c +++ b/drivers/net/ethernet/sun/niu.c
@@ -4503,7 +4503,7 @@ static int niu_alloc_channels(struct niu *np) err = niu_rbr_fill(np, rp, GFP_KERNEL); if (err) - goto out_err; + return err; } tx_rings = kcalloc(num_tx_rings, sizeof(struct tx_ring_info),
diff --git a/drivers/net/ethernet/sun/sunhme.c b/drivers/net/ethernet/sun/sunhme.c index dbbbb6e..3133f90 100644 --- a/drivers/net/ethernet/sun/sunhme.c +++ b/drivers/net/ethernet/sun/sunhme.c
@@ -2064,9 +2064,9 @@ static void happy_meal_rx(struct happy_meal *hp, struct net_device *dev) skb_reserve(copy_skb, 2); skb_put(copy_skb, len); - dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE); + dma_sync_single_for_cpu(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE); skb_copy_from_linear_data(skb, copy_skb->data, len); - dma_sync_single_for_device(hp->dma_dev, dma_addr, len + 2, DMA_FROM_DEVICE); + dma_sync_single_for_device(hp->dma_dev, dma_addr, len, DMA_FROM_DEVICE); /* Reuse original ring buffer. */ hme_write_rxd(hp, this, (RXFLAG_OWN|((RX_BUF_ALLOC_SIZE-RX_OFFSET)<<16)),
diff --git a/drivers/net/ethernet/sun/sunvnet.c b/drivers/net/ethernet/sun/sunvnet.c index b6c03ad..96b883f 100644 --- a/drivers/net/ethernet/sun/sunvnet.c +++ b/drivers/net/ethernet/sun/sunvnet.c
@@ -431,9 +431,6 @@ static int vnet_port_probe(struct vio_dev *vdev, const struct vio_device_id *id) hp = mdesc_grab(); - if (!hp) - return -ENODEV; - vp = vnet_find_parent(hp, vdev->mp, vdev); if (IS_ERR(vp)) { pr_err("Cannot find port parent vnet\n");
diff --git a/drivers/net/ethernet/ti/cpsw.c b/drivers/net/ethernet/ti/cpsw.c index 774a72d..33eca55 100644 --- a/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c
@@ -1753,8 +1753,6 @@ static int cpsw_ndo_open(struct net_device *ndev) err_cleanup: if (!cpsw->usage_count) { - napi_disable(&cpsw->napi_rx); - napi_disable(&cpsw->napi_tx); cpdma_ctlr_stop(cpsw->dma); cpsw_destroy_xdp_rxqs(cpsw); }
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c index 5dbb4ed..4154c48 100644 --- a/drivers/net/ethernet/ti/netcp_core.c +++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -1262,7 +1262,7 @@ static int netcp_tx_submit_skb(struct netcp_intf *netcp, } /* Submit the packet */ -static netdev_tx_t netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev) +static int netcp_ndo_start_xmit(struct sk_buff *skb, struct net_device *ndev) { struct netcp_intf *netcp = netdev_priv(ndev); struct netcp_stats *tx_stats = &netcp->stats;
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index 4e6c71d..9d9f8ac 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c
@@ -317,17 +317,15 @@ static int gelic_card_init_chain(struct gelic_card *card, /* set up the hardware pointers in each descriptor */ for (i = 0; i < no; i++, descr++) { - dma_addr_t cpu_addr; - gelic_descr_set_status(descr, GELIC_DESCR_DMA_NOT_IN_USE); + descr->bus_addr = + dma_map_single(ctodev(card), descr, + GELIC_DESCR_SIZE, + DMA_BIDIRECTIONAL); - cpu_addr = dma_map_single(ctodev(card), descr, - GELIC_DESCR_SIZE, DMA_BIDIRECTIONAL); - - if (dma_mapping_error(ctodev(card), cpu_addr)) + if (!descr->bus_addr) goto iommu_error; - descr->bus_addr = cpu_to_be32(cpu_addr); descr->next = descr + 1; descr->prev = descr - 1; } @@ -367,30 +365,28 @@ static int gelic_card_init_chain(struct gelic_card *card, * * allocates a new rx skb, iommu-maps it and attaches it to the descriptor. * Activate the descriptor state-wise - * - * Gelic RX sk_buffs must be aligned to GELIC_NET_RXBUF_ALIGN and the length - * must be a multiple of GELIC_NET_RXBUF_ALIGN. */ static int gelic_descr_prepare_rx(struct gelic_card *card, struct gelic_descr *descr) { - static const unsigned int rx_skb_size = - ALIGN(GELIC_NET_MAX_FRAME, GELIC_NET_RXBUF_ALIGN) + - GELIC_NET_RXBUF_ALIGN - 1; - dma_addr_t cpu_addr; int offset; + unsigned int bufsize; if (gelic_descr_get_status(descr) != GELIC_DESCR_DMA_NOT_IN_USE) dev_info(ctodev(card), "%s: ERROR status\n", __func__); + /* we need to round up the buffer size to a multiple of 128 */ + bufsize = ALIGN(GELIC_NET_MAX_MTU, GELIC_NET_RXBUF_ALIGN); - descr->skb = netdev_alloc_skb(*card->netdev, rx_skb_size); + /* and we need to have it 128 byte aligned, therefore we allocate a + * bit more */ + descr->skb = dev_alloc_skb(bufsize + GELIC_NET_RXBUF_ALIGN - 1); if (!descr->skb) { descr->buf_addr = 0; /* tell DMAC don't touch memory */ dev_info(ctodev(card), "%s:allocate skb failed !!\n", __func__); return -ENOMEM; } - descr->buf_size = cpu_to_be32(rx_skb_size); + descr->buf_size = cpu_to_be32(bufsize); descr->dmac_cmd_status = 0; descr->result_size = 0; descr->valid_size = 0; @@ -401,10 +397,11 @@ static int gelic_descr_prepare_rx(struct gelic_card *card, if (offset) skb_reserve(descr->skb, GELIC_NET_RXBUF_ALIGN - offset); /* io-mmu-map the skb */ - cpu_addr = dma_map_single(ctodev(card), descr->skb->data, - GELIC_NET_MAX_FRAME, DMA_FROM_DEVICE); - descr->buf_addr = cpu_to_be32(cpu_addr); - if (dma_mapping_error(ctodev(card), cpu_addr)) { + descr->buf_addr = cpu_to_be32(dma_map_single(ctodev(card), + descr->skb->data, + GELIC_NET_MAX_MTU, + DMA_FROM_DEVICE)); + if (!descr->buf_addr) { dev_kfree_skb_any(descr->skb); descr->skb = NULL; dev_info(ctodev(card), @@ -784,7 +781,7 @@ static int gelic_descr_prepare_tx(struct gelic_card *card, buf = dma_map_single(ctodev(card), skb->data, skb->len, DMA_TO_DEVICE); - if (dma_mapping_error(ctodev(card), buf)) { + if (!buf) { dev_err(ctodev(card), "dma map 2 failed (%p, %i). Dropping packet\n", skb->data, skb->len); @@ -920,7 +917,7 @@ static void gelic_net_pass_skb_up(struct gelic_descr *descr, data_error = be32_to_cpu(descr->data_error); /* unmap skb buffer */ dma_unmap_single(ctodev(card), be32_to_cpu(descr->buf_addr), - GELIC_NET_MAX_FRAME, + GELIC_NET_MAX_MTU, DMA_FROM_DEVICE); skb_put(skb, be32_to_cpu(descr->valid_size)?
diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.h b/drivers/net/ethernet/toshiba/ps3_gelic_net.h index 7624c68..0510335 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.h +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.h
@@ -19,9 +19,8 @@ #define GELIC_NET_RX_DESCRIPTORS 128 /* num of descriptors */ #define GELIC_NET_TX_DESCRIPTORS 128 /* num of descriptors */ -#define GELIC_NET_MAX_FRAME 2312 -#define GELIC_NET_MAX_MTU 2294 -#define GELIC_NET_MIN_MTU 64 +#define GELIC_NET_MAX_MTU VLAN_ETH_FRAME_LEN +#define GELIC_NET_MIN_MTU VLAN_ETH_ZLEN #define GELIC_NET_RXBUF_ALIGN 128 #define GELIC_CARD_RX_CSUM_DEFAULT 1 /* hw chksum */ #define GELIC_NET_WATCHDOG_TIMEOUT 5*HZ
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index fcebd24..c62f474 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c
@@ -1302,15 +1302,12 @@ static int tsi108_open(struct net_device *dev) data->rxring = dma_alloc_coherent(&data->pdev->dev, rxring_size, &data->rxdma, GFP_KERNEL); - if (!data->rxring) { - free_irq(data->irq_num, dev); + if (!data->rxring) return -ENOMEM; - } data->txring = dma_alloc_coherent(&data->pdev->dev, txring_size, &data->txdma, GFP_KERNEL); if (!data->txring) { - free_irq(data->irq_num, dev); dma_free_coherent(&data->pdev->dev, rxring_size, data->rxring, data->rxdma); return -ENOMEM;
diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c index 951482d..6e5ea68 100644 --- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c +++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c
@@ -541,7 +541,7 @@ static void xemaclite_tx_timeout(struct net_device *dev) xemaclite_enable_interrupts(lp); if (lp->deferred_skb) { - dev_kfree_skb_irq(lp->deferred_skb); + dev_kfree_skb(lp->deferred_skb); lp->deferred_skb = NULL; dev->stats.tx_errors++; }
diff --git a/drivers/net/ethernet/xircom/xirc2ps_cs.c b/drivers/net/ethernet/xircom/xirc2ps_cs.c index e3438ce..fd5288f 100644 --- a/drivers/net/ethernet/xircom/xirc2ps_cs.c +++ b/drivers/net/ethernet/xircom/xirc2ps_cs.c
@@ -503,11 +503,6 @@ static void xirc2ps_detach(struct pcmcia_device *link) { struct net_device *dev = link->priv; - struct local_info *local = netdev_priv(dev); - - netif_carrier_off(dev); - netif_tx_disable(dev); - cancel_work_sync(&local->tx_timeout_task); dev_dbg(&link->dev, "detach\n");
diff --git a/drivers/net/fddi/defxx.c b/drivers/net/fddi/defxx.c index 28bf530..c866f58 100644 --- a/drivers/net/fddi/defxx.c +++ b/drivers/net/fddi/defxx.c
@@ -3844,24 +3844,10 @@ static int dfx_init(void) int status; status = pci_register_driver(&dfx_pci_driver); - if (status) - goto err_pci_register; - - status = eisa_driver_register(&dfx_eisa_driver); - if (status) - goto err_eisa_register; - - status = tc_register_driver(&dfx_tc_driver); - if (status) - goto err_tc_register; - - return 0; - -err_tc_register: - eisa_driver_unregister(&dfx_eisa_driver); -err_eisa_register: - pci_unregister_driver(&dfx_pci_driver); -err_pci_register: + if (!status) + status = eisa_driver_register(&dfx_eisa_driver); + if (!status) + status = tc_register_driver(&dfx_tc_driver); return status; }
diff --git a/drivers/net/geneve.c b/drivers/net/geneve.c index 5636673..84f5717 100644 --- a/drivers/net/geneve.c +++ b/drivers/net/geneve.c
@@ -851,7 +851,8 @@ static struct dst_entry *geneve_get_v6_dst(struct sk_buff *skb, use_cache = false; } - fl6->flowlabel = ip6_make_flowinfo(prio, info->key.label); + fl6->flowlabel = ip6_make_flowinfo(RT_TOS(prio), + info->key.label); dst_cache = (struct dst_cache *)&info->dst_cache; if (use_cache) { dst = dst_cache_get_ip6(dst_cache, &fl6->saddr);
diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c index c5495ca..4476491 100644 --- a/drivers/net/hamradio/baycom_epp.c +++ b/drivers/net/hamradio/baycom_epp.c
@@ -758,7 +758,7 @@ static void epp_bh(struct work_struct *work) * ===================== network driver interface ========================= */ -static netdev_tx_t baycom_send_packet(struct sk_buff *skb, struct net_device *dev) +static int baycom_send_packet(struct sk_buff *skb, struct net_device *dev) { struct baycom_state *bc = netdev_priv(dev);
diff --git a/drivers/net/hamradio/bpqether.c b/drivers/net/hamradio/bpqether.c index e0b9823..e2ad3c2 100644 --- a/drivers/net/hamradio/bpqether.c +++ b/drivers/net/hamradio/bpqether.c
@@ -511,7 +511,7 @@ static int bpq_device_event(struct notifier_block *this, if (!net_eq(dev_net(dev), &init_net)) return NOTIFY_DONE; - if (!dev_is_ethdev(dev) && !bpq_get_ax25_dev(dev)) + if (!dev_is_ethdev(dev)) return NOTIFY_DONE; switch (event) {
diff --git a/drivers/net/hamradio/scc.c b/drivers/net/hamradio/scc.c index 3dc4eb8..6c03932 100644 --- a/drivers/net/hamradio/scc.c +++ b/drivers/net/hamradio/scc.c
@@ -300,12 +300,12 @@ static inline void scc_discard_buffers(struct scc_channel *scc) spin_lock_irqsave(&scc->lock, flags); if (scc->tx_buff != NULL) { - dev_kfree_skb_irq(scc->tx_buff); + dev_kfree_skb(scc->tx_buff); scc->tx_buff = NULL; } while (!skb_queue_empty(&scc->tx_queue)) - dev_kfree_skb_irq(skb_dequeue(&scc->tx_queue)); + dev_kfree_skb(skb_dequeue(&scc->tx_queue)); spin_unlock_irqrestore(&scc->lock, flags); } @@ -1667,7 +1667,7 @@ static netdev_tx_t scc_net_tx(struct sk_buff *skb, struct net_device *dev) if (skb_queue_len(&scc->tx_queue) > scc->dev->tx_queue_len) { struct sk_buff *skb_del; skb_del = skb_dequeue(&scc->tx_queue); - dev_kfree_skb_irq(skb_del); + dev_kfree_skb(skb_del); } skb_queue_tail(&scc->tx_queue, skb); netif_trans_update(dev);
diff --git a/drivers/net/hyperv/hyperv_net.h b/drivers/net/hyperv/hyperv_net.h index 43ba221..e74f2d1 100644 --- a/drivers/net/hyperv/hyperv_net.h +++ b/drivers/net/hyperv/hyperv_net.h
@@ -954,9 +954,6 @@ struct net_device_context { u32 vf_alloc; /* Serial number of the VF to team with */ u32 vf_serial; - - /* completion variable to confirm vf association */ - struct completion vf_add; }; /* Per channel data */
diff --git a/drivers/net/hyperv/netvsc.c b/drivers/net/hyperv/netvsc.c index 01425bf..6c0732f 100644 --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c
@@ -1223,10 +1223,6 @@ static void netvsc_send_vf(struct net_device *ndev, net_device_ctx->vf_alloc = nvmsg->msg.v4_msg.vf_assoc.allocated; net_device_ctx->vf_serial = nvmsg->msg.v4_msg.vf_assoc.serial; - - if (net_device_ctx->vf_alloc) - complete(&net_device_ctx->vf_add); - netdev_info(ndev, "VF slot %u %s\n", net_device_ctx->vf_serial, net_device_ctx->vf_alloc ? "added" : "removed");
diff --git a/drivers/net/hyperv/netvsc_drv.c b/drivers/net/hyperv/netvsc_drv.c index 471c289..57e92c5 100644 --- a/drivers/net/hyperv/netvsc_drv.c +++ b/drivers/net/hyperv/netvsc_drv.c
@@ -2133,7 +2133,6 @@ static struct net_device *get_netvsc_byslot(const struct net_device *vf_netdev) { struct device *parent = vf_netdev->dev.parent; struct net_device_context *ndev_ctx; - struct net_device *ndev; struct pci_dev *pdev; u32 serial; @@ -2160,18 +2159,6 @@ static struct net_device *get_netvsc_byslot(const struct net_device *vf_netdev) return hv_get_drvdata(ndev_ctx->device_ctx); } - /* Fallback path to check synthetic vf with - * help of mac addr - */ - list_for_each_entry(ndev_ctx, &netvsc_dev_list, list) { - ndev = hv_get_drvdata(ndev_ctx->device_ctx); - if (ether_addr_equal(vf_netdev->perm_addr, ndev->perm_addr)) { - netdev_notice(vf_netdev, - "falling back to mac addr based matching\n"); - return ndev; - } - } - netdev_notice(vf_netdev, "no netdev found for vf serial:%u\n", serial); return NULL; @@ -2245,11 +2232,6 @@ static int netvsc_vf_changed(struct net_device *vf_netdev) if (!netvsc_dev) return NOTIFY_DONE; - if (vf_is_up && !net_device_ctx->vf_alloc) { - netdev_info(ndev, "Waiting for the VF association from host\n"); - wait_for_completion(&net_device_ctx->vf_add); - } - netvsc_switch_datapath(ndev, vf_is_up); netdev_info(ndev, "Data path switched %s VF: %s\n", vf_is_up ? "to" : "from", vf_netdev->name); @@ -2271,7 +2253,6 @@ static int netvsc_unregister_vf(struct net_device *vf_netdev) netdev_info(ndev, "VF unregistering: %s\n", vf_netdev->name); - reinit_completion(&net_device_ctx->vf_add); netdev_rx_handler_unregister(vf_netdev); netdev_upper_dev_unlink(vf_netdev, ndev); RCU_INIT_POINTER(net_device_ctx->vf_netdev, NULL); @@ -2309,7 +2290,6 @@ static int netvsc_probe(struct hv_device *dev, INIT_DELAYED_WORK(&net_device_ctx->dwork, netvsc_link_change); - init_completion(&net_device_ctx->vf_add); spin_lock_init(&net_device_ctx->lock); INIT_LIST_HEAD(&net_device_ctx->reconfig_events); INIT_DELAYED_WORK(&net_device_ctx->vf_takeover, netvsc_vf_setup);
diff --git a/drivers/net/ieee802154/adf7242.c b/drivers/net/ieee802154/adf7242.c index cb29da9..5945ac5 100644 --- a/drivers/net/ieee802154/adf7242.c +++ b/drivers/net/ieee802154/adf7242.c
@@ -1310,11 +1310,10 @@ static int adf7242_remove(struct spi_device *spi) debugfs_remove_recursive(lp->debugfs_root); - ieee802154_unregister_hw(lp->hw); - cancel_delayed_work_sync(&lp->work); destroy_workqueue(lp->wqueue); + ieee802154_unregister_hw(lp->hw); mutex_destroy(&lp->bmux); ieee802154_free_hw(lp->hw);
diff --git a/drivers/net/ieee802154/ca8210.c b/drivers/net/ieee802154/ca8210.c index fb57e56..47959aa 100644 --- a/drivers/net/ieee802154/ca8210.c +++ b/drivers/net/ieee802154/ca8210.c
@@ -926,7 +926,7 @@ static int ca8210_spi_transfer( dev_dbg(&spi->dev, "%s called\n", __func__); - cas_ctl = kzalloc(sizeof(*cas_ctl), GFP_ATOMIC); + cas_ctl = kmalloc(sizeof(*cas_ctl), GFP_ATOMIC); if (!cas_ctl) return -ENOMEM; @@ -1944,9 +1944,10 @@ static int ca8210_skb_tx( struct ca8210_priv *priv ) { + int status; struct ieee802154_hdr header = { }; struct secspec secspec; - int mac_len, status; + unsigned int mac_len; dev_dbg(&priv->spi->dev, "%s called\n", __func__); @@ -1954,8 +1955,6 @@ static int ca8210_skb_tx( * packet */ mac_len = ieee802154_hdr_peek_addrs(skb, &header); - if (mac_len < 0) - return mac_len; secspec.security_level = header.sec.level; secspec.key_id_mode = header.sec.key_id_mode;
diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c index 9739a6e..4350694 100644 --- a/drivers/net/ieee802154/cc2520.c +++ b/drivers/net/ieee802154/cc2520.c
@@ -507,7 +507,6 @@ cc2520_tx(struct ieee802154_hw *hw, struct sk_buff *skb) goto err_tx; if (status & CC2520_STATUS_TX_UNDERFLOW) { - rc = -EINVAL; dev_err(&priv->spi->dev, "cc2520 tx underflow exception\n"); goto err_tx; } @@ -973,7 +972,7 @@ static int cc2520_hw_init(struct cc2520_private *priv) if (timeout-- <= 0) { dev_err(&priv->spi->dev, "oscillator start failed!\n"); - return -ETIMEDOUT; + return ret; } udelay(1); } while (!(status & CC2520_STATUS_XOSC32M_STABLE));
diff --git a/drivers/net/ipvlan/ipvlan_core.c b/drivers/net/ipvlan/ipvlan_core.c index 0a5b5ff..8801d09 100644 --- a/drivers/net/ipvlan/ipvlan_core.c +++ b/drivers/net/ipvlan/ipvlan_core.c
@@ -437,9 +437,6 @@ static int ipvlan_process_v4_outbound(struct sk_buff *skb) goto err; } skb_dst_set(skb, &rt->dst); - - memset(IPCB(skb), 0, sizeof(*IPCB(skb))); - err = ip_local_out(net, skb->sk, skb); if (unlikely(net_xmit_eval(err))) dev->stats.tx_errors++; @@ -478,9 +475,6 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb) goto err; } skb_dst_set(skb, dst); - - memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); - err = ip6_local_out(net, skb->sk, skb); if (unlikely(net_xmit_eval(err))) dev->stats.tx_errors++; @@ -502,6 +496,7 @@ static int ipvlan_process_v6_outbound(struct sk_buff *skb) static int ipvlan_process_outbound(struct sk_buff *skb) { + struct ethhdr *ethh = eth_hdr(skb); int ret = NET_XMIT_DROP; /* The ipvlan is a pseudo-L2 device, so the packets that we receive @@ -511,8 +506,6 @@ static int ipvlan_process_outbound(struct sk_buff *skb) if (skb_mac_header_was_set(skb)) { /* In this mode we dont care about * multicast and broadcast traffic */ - struct ethhdr *ethh = eth_hdr(skb); - if (is_multicast_ether_addr(ethh->h_dest)) { pr_debug_ratelimited( "Dropped {multi|broad}cast of type=[%x]\n", @@ -597,7 +590,7 @@ static int ipvlan_xmit_mode_l3(struct sk_buff *skb, struct net_device *dev) static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev) { const struct ipvl_dev *ipvlan = netdev_priv(dev); - struct ethhdr *eth = skb_eth_hdr(skb); + struct ethhdr *eth = eth_hdr(skb); struct ipvl_addr *addr; void *lyr3h; int addr_type; @@ -627,7 +620,6 @@ static int ipvlan_xmit_mode_l2(struct sk_buff *skb, struct net_device *dev) return dev_forward_skb(ipvlan->phy_dev, skb); } else if (is_multicast_ether_addr(eth->h_dest)) { - skb_reset_mac_header(skb); ipvlan_skb_crossing_ns(skb, NULL); ipvlan_multicast_enqueue(ipvlan->port, skb, true); return NET_XMIT_SUCCESS;
diff --git a/drivers/net/ipvlan/ipvlan_l3s.c b/drivers/net/ipvlan/ipvlan_l3s.c index 71712ea..943d26c 100644 --- a/drivers/net/ipvlan/ipvlan_l3s.c +++ b/drivers/net/ipvlan/ipvlan_l3s.c
@@ -101,7 +101,6 @@ static unsigned int ipvlan_nf_input(void *priv, struct sk_buff *skb, goto out; skb->dev = addr->master->dev; - skb->skb_iif = skb->dev->ifindex; len = skb->len + ETH_HLEN; ipvlan_count_rx(addr->master, len, true, false); out:
diff --git a/drivers/net/ipvlan/ipvtap.c b/drivers/net/ipvlan/ipvtap.c index f01078b..1cedb63 100644 --- a/drivers/net/ipvlan/ipvtap.c +++ b/drivers/net/ipvlan/ipvtap.c
@@ -194,7 +194,7 @@ static struct notifier_block ipvtap_notifier_block __read_mostly = { .notifier_call = ipvtap_device_event, }; -static int __init ipvtap_init(void) +static int ipvtap_init(void) { int err; @@ -228,7 +228,7 @@ static int __init ipvtap_init(void) } module_init(ipvtap_init); -static void __exit ipvtap_exit(void) +static void ipvtap_exit(void) { rtnl_link_unregister(&ipvtap_link_ops); unregister_netdevice_notifier(&ipvtap_notifier_block);
diff --git a/drivers/net/loopback.c b/drivers/net/loopback.c index 7788f72..14545a8 100644 --- a/drivers/net/loopback.c +++ b/drivers/net/loopback.c
@@ -206,7 +206,7 @@ static __net_init int loopback_net_init(struct net *net) int err; err = -ENOMEM; - dev = alloc_netdev(0, "lo", NET_NAME_PREDICTABLE, loopback_setup); + dev = alloc_netdev(0, "lo", NET_NAME_UNKNOWN, loopback_setup); if (!dev) goto out;
diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c index 545d181..07622cf 100644 --- a/drivers/net/macvlan.c +++ b/drivers/net/macvlan.c
@@ -138,7 +138,7 @@ static struct macvlan_source_entry *macvlan_hash_lookup_source( u32 idx = macvlan_eth_hash(addr); struct hlist_head *h = &vlan->port->vlan_source_hash[idx]; - hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { + hlist_for_each_entry_rcu(entry, h, hlist) { if (ether_addr_equal_64bits(entry->addr, addr) && entry->vlan == vlan) return entry; @@ -1166,7 +1166,7 @@ void macvlan_common_setup(struct net_device *dev) { ether_setup(dev); - /* ether_setup() has set dev->min_mtu to ETH_MIN_MTU. */ + dev->min_mtu = 0; dev->max_mtu = ETH_MAX_MTU; dev->priv_flags &= ~IFF_TX_SKB_SHARING; netif_keep_dst(dev); @@ -1499,10 +1499,8 @@ int macvlan_common_newlink(struct net *src_net, struct net_device *dev, /* the macvlan port may be freed by macvlan_uninit when fail to register. * so we destroy the macvlan port only when it's valid. */ - if (create && macvlan_port_get_rtnl(lowerdev)) { - macvlan_flush_sources(port, vlan); + if (create && macvlan_port_get_rtnl(lowerdev)) macvlan_port_destroy(port->dev); - } return err; } EXPORT_SYMBOL_GPL(macvlan_common_newlink); @@ -1604,7 +1602,7 @@ static int macvlan_fill_info_macaddr(struct sk_buff *skb, struct hlist_head *h = &vlan->port->vlan_source_hash[i]; struct macvlan_source_entry *entry; - hlist_for_each_entry_rcu(entry, h, hlist, lockdep_rtnl_is_held()) { + hlist_for_each_entry_rcu(entry, h, hlist) { if (entry->vlan != vlan) continue; if (nla_put(skb, IFLA_MACVLAN_MACADDR, ETH_ALEN, entry->addr))
diff --git a/drivers/net/net_failover.c b/drivers/net/net_failover.c index 6b7bba7..fb182be 100644 --- a/drivers/net/net_failover.c +++ b/drivers/net/net_failover.c
@@ -130,10 +130,14 @@ static u16 net_failover_select_queue(struct net_device *dev, txq = ops->ndo_select_queue(primary_dev, skb, sb_dev); else txq = netdev_pick_tx(primary_dev, skb, NULL); - } else { - txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0; + + qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping; + + return txq; } + txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0; + /* Save the original txq to restore before passing to the driver */ qdisc_skb_cb(skb)->slave_dev_queue_mapping = skb->queue_mapping;
diff --git a/drivers/net/netdevsim/bpf.c b/drivers/net/netdevsim/bpf.c index 8e47755..e0a4acc 100644 --- a/drivers/net/netdevsim/bpf.c +++ b/drivers/net/netdevsim/bpf.c
@@ -347,12 +347,10 @@ nsim_map_alloc_elem(struct bpf_offloaded_map *offmap, unsigned int idx) { struct nsim_bpf_bound_map *nmap = offmap->dev_priv; - nmap->entry[idx].key = kmalloc(offmap->map.key_size, - GFP_KERNEL_ACCOUNT | __GFP_NOWARN); + nmap->entry[idx].key = kmalloc(offmap->map.key_size, GFP_USER); if (!nmap->entry[idx].key) return -ENOMEM; - nmap->entry[idx].value = kmalloc(offmap->map.value_size, - GFP_KERNEL_ACCOUNT | __GFP_NOWARN); + nmap->entry[idx].value = kmalloc(offmap->map.value_size, GFP_USER); if (!nmap->entry[idx].value) { kfree(nmap->entry[idx].key); nmap->entry[idx].key = NULL; @@ -494,7 +492,7 @@ nsim_bpf_map_alloc(struct netdevsim *ns, struct bpf_offloaded_map *offmap) if (offmap->map.map_flags) return -EINVAL; - nmap = kzalloc(sizeof(*nmap), GFP_KERNEL_ACCOUNT); + nmap = kzalloc(sizeof(*nmap), GFP_USER); if (!nmap) return -ENOMEM;
diff --git a/drivers/net/ntb_netdev.c b/drivers/net/ntb_netdev.c index b701ee8..a5bab61 100644 --- a/drivers/net/ntb_netdev.c +++ b/drivers/net/ntb_netdev.c
@@ -137,7 +137,7 @@ static void ntb_netdev_rx_handler(struct ntb_transport_qp *qp, void *qp_data, enqueue_again: rc = ntb_transport_rx_enqueue(qp, skb, skb->data, ndev->mtu + ETH_HLEN); if (rc) { - dev_kfree_skb_any(skb); + dev_kfree_skb(skb); ndev->stats.rx_errors++; ndev->stats.rx_fifo_errors++; } @@ -192,7 +192,7 @@ static void ntb_netdev_tx_handler(struct ntb_transport_qp *qp, void *qp_data, ndev->stats.tx_aborted_errors++; } - dev_kfree_skb_any(skb); + dev_kfree_skb(skb); if (ntb_transport_tx_free_entry(dev->qp) >= tx_start) { /* Make sure anybody stopping the queue after this sees the new @@ -484,14 +484,7 @@ static int __init ntb_netdev_init_module(void) rc = ntb_transport_register_client_dev(KBUILD_MODNAME); if (rc) return rc; - - rc = ntb_transport_register_client(&ntb_netdev_client); - if (rc) { - ntb_transport_unregister_client_dev(KBUILD_MODNAME); - return rc; - } - - return 0; + return ntb_transport_register_client(&ntb_netdev_client); } module_init(ntb_netdev_init_module);
diff --git a/drivers/net/phy/dp83822.c b/drivers/net/phy/dp83822.c index da39833..ae17d2f 100644 --- a/drivers/net/phy/dp83822.c +++ b/drivers/net/phy/dp83822.c
@@ -197,7 +197,9 @@ static int dp83822_config_intr(struct phy_device *phydev) if (misr_status < 0) return misr_status; - misr_status |= (DP83822_ANEG_COMPLETE_INT_EN | + misr_status |= (DP83822_RX_ERR_HF_INT_EN | + DP83822_FALSE_CARRIER_HF_INT_EN | + DP83822_ANEG_COMPLETE_INT_EN | DP83822_DUP_MODE_CHANGE_INT_EN | DP83822_SPEED_CHANGED_INT_EN | DP83822_LINK_STAT_INT_EN |
diff --git a/drivers/net/phy/dp83867.c b/drivers/net/phy/dp83867.c index c7d9141..87c0cdb 100644 --- a/drivers/net/phy/dp83867.c +++ b/drivers/net/phy/dp83867.c
@@ -432,14 +432,6 @@ static int dp83867_config_init(struct phy_device *phydev) else val &= ~DP83867_SGMII_TYPE; phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_SGMIICTL, val); - - /* This is a SW workaround for link instability if RX_CTRL is - * not strapped to mode 3 or 4 in HW. This is required for SGMII - * in addition to clearing bit 7, handled above. - */ - if (dp83867->rxctrl_strap_quirk) - phy_set_bits_mmd(phydev, DP83867_DEVADDR, DP83867_CFG4, - BIT(8)); } val = phy_read(phydev, DP83867_CFG3);
diff --git a/drivers/net/phy/mdio-i2c.c b/drivers/net/phy/mdio-i2c.c index 5969878..0dce676 100644 --- a/drivers/net/phy/mdio-i2c.c +++ b/drivers/net/phy/mdio-i2c.c
@@ -10,9 +10,10 @@ * of their settings. */ #include <linux/i2c.h> -#include <linux/mdio/mdio-i2c.h> #include <linux/phy.h> +#include "mdio-i2c.h" + /* * I2C bus addresses 0x50 and 0x51 are normally an EEPROM, which is * specified to be present in SFP modules. These correspond with PHY
diff --git a/include/linux/mdio/mdio-i2c.h b/drivers/net/phy/mdio-i2c.h similarity index 100% rename from include/linux/mdio/mdio-i2c.h rename to drivers/net/phy/mdio-i2c.h
diff --git a/drivers/net/phy/mdio-mux-meson-g12a.c b/drivers/net/phy/mdio-mux-meson-g12a.c index 1f6715d..dc06cf1 100644 --- a/drivers/net/phy/mdio-mux-meson-g12a.c +++ b/drivers/net/phy/mdio-mux-meson-g12a.c
@@ -4,7 +4,6 @@ */ #include <linux/bitfield.h> -#include <linux/delay.h> #include <linux/clk.h> #include <linux/clk-provider.h> #include <linux/device.h> @@ -167,7 +166,6 @@ static const struct clk_ops g12a_ephy_pll_ops = { static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv) { - u32 value; int ret; #ifdef CONFIG_AMLOGIC_ETH_PRIVE void __iomem *tx_amp_src = NULL; @@ -190,7 +188,6 @@ static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv) /* Initialize ephy control */ writel(EPHY_G12A_ID, priv->regs + ETH_PHY_CNTL0); - writel(FIELD_PREP(PHY_CNTL1_ST_MODE, 3) | FIELD_PREP(PHY_CNTL1_ST_PHYADD, EPHY_DFLT_ADD) | FIELD_PREP(PHY_CNTL1_MII_MODE, EPHY_MODE_RMII) | @@ -199,27 +196,12 @@ static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv) PHY_CNTL1_PHY_ENB, priv->regs + ETH_PHY_CNTL1); /*need delay to wait reset*/ - - /* Make sure we get a 0 -> 1 transition on the enable bit */ - value = FIELD_PREP(PHY_CNTL1_ST_MODE, 3) | - FIELD_PREP(PHY_CNTL1_ST_PHYADD, EPHY_DFLT_ADD) | - FIELD_PREP(PHY_CNTL1_MII_MODE, EPHY_MODE_RMII) | - PHY_CNTL1_CLK_EN | - PHY_CNTL1_CLKFREQ; - writel(value, priv->regs + ETH_PHY_CNTL1); - - value |= PHY_CNTL1_PHY_ENB; - writel(value, priv->regs + ETH_PHY_CNTL1); - - /* The phy needs a bit of time to power up */ mdelay(10); - writel(PHY_CNTL2_USE_INTERNAL | PHY_CNTL2_SMI_SRC_MAC | PHY_CNTL2_RX_CLK_EPHY, priv->regs + ETH_PHY_CNTL2); - #ifdef CONFIG_AMLOGIC_ETH_PRIVE /*enet_type*/ if (of_property_read_u32(np, "enet_type", &enet_type)) @@ -251,7 +233,6 @@ static int g12a_enable_internal_mdio(struct g12a_mdio_mux *priv) if ((cts_valid) && (cts_enhance)) writel(0x0400000, priv->regs + ETH_PLL_CTL3); #endif - return 0; }
diff --git a/drivers/net/phy/mdio-thunder.c b/drivers/net/phy/mdio-thunder.c index e832af1..426f4f9 100644 --- a/drivers/net/phy/mdio-thunder.c +++ b/drivers/net/phy/mdio-thunder.c
@@ -104,7 +104,6 @@ static int thunder_mdiobus_pci_probe(struct pci_dev *pdev, if (i >= ARRAY_SIZE(nexus->buses)) break; } - fwnode_handle_put(fwn); return 0; err_release_regions:
diff --git a/drivers/net/phy/mdio-xgene.c b/drivers/net/phy/mdio-xgene.c index 461207c..34990ea 100644 --- a/drivers/net/phy/mdio-xgene.c +++ b/drivers/net/phy/mdio-xgene.c
@@ -11,7 +11,6 @@ #include <linux/efi.h> #include <linux/if_vlan.h> #include <linux/io.h> -#include <linux/mdio/mdio-xgene.h> #include <linux/module.h> #include <linux/of_platform.h> #include <linux/of_net.h> @@ -19,6 +18,7 @@ #include <linux/prefetch.h> #include <linux/phy.h> #include <net/ip.h> +#include "mdio-xgene.h" static bool xgene_mdio_status;
diff --git a/include/linux/mdio/mdio-xgene.h b/drivers/net/phy/mdio-xgene.h similarity index 100% rename from include/linux/mdio/mdio-xgene.h rename to drivers/net/phy/mdio-xgene.h
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c index fdf8221..05c24db 100644 --- a/drivers/net/phy/mdio_bus.c +++ b/drivers/net/phy/mdio_bus.c
@@ -117,12 +117,7 @@ EXPORT_SYMBOL(mdiobus_unregister_device); struct phy_device *mdiobus_get_phy(struct mii_bus *bus, int addr) { - struct mdio_device *mdiodev; - - if (addr < 0 || addr >= ARRAY_SIZE(bus->mdio_map)) - return NULL; - - mdiodev = bus->mdio_map[addr]; + struct mdio_device *mdiodev = bus->mdio_map[addr]; if (!mdiodev) return NULL; @@ -424,7 +419,7 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) bus->reset(bus); for (i = 0; i < PHY_MAX_ADDR; i++) { - if ((bus->phy_mask & BIT(i)) == 0) { + if ((bus->phy_mask & (1 << i)) == 0) { struct phy_device *phydev; phydev = mdiobus_scan(bus, i);
diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c index 375bbd6..a644e8e 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c
@@ -326,37 +326,6 @@ static int lan88xx_config_aneg(struct phy_device *phydev) return genphy_config_aneg(phydev); } -static void lan88xx_link_change_notify(struct phy_device *phydev) -{ - int temp; - - /* At forced 100 F/H mode, chip may fail to set mode correctly - * when cable is switched between long(~50+m) and short one. - * As workaround, set to 10 before setting to 100 - * at forced 100 F/H mode. - */ - if (!phydev->autoneg && phydev->speed == 100) { - /* disable phy interrupt */ - temp = phy_read(phydev, LAN88XX_INT_MASK); - temp &= ~LAN88XX_INT_MASK_MDINTPIN_EN_; - phy_write(phydev, LAN88XX_INT_MASK, temp); - - temp = phy_read(phydev, MII_BMCR); - temp &= ~(BMCR_SPEED100 | BMCR_SPEED1000); - phy_write(phydev, MII_BMCR, temp); /* set to 10 first */ - temp |= BMCR_SPEED100; - phy_write(phydev, MII_BMCR, temp); /* set to 100 later */ - - /* clear pending interrupt generated while workaround */ - temp = phy_read(phydev, LAN88XX_INT_STS); - - /* enable phy interrupt back */ - temp = phy_read(phydev, LAN88XX_INT_MASK); - temp |= LAN88XX_INT_MASK_MDINTPIN_EN_; - phy_write(phydev, LAN88XX_INT_MASK, temp); - } -} - static struct phy_driver microchip_phy_driver[] = { { .phy_id = 0x0007c130, @@ -370,7 +339,6 @@ static struct phy_driver microchip_phy_driver[] = { .config_init = lan88xx_config_init, .config_aneg = lan88xx_config_aneg, - .link_change_notify = lan88xx_link_change_notify, .ack_interrupt = lan88xx_phy_ack_interrupt, .config_intr = lan88xx_phy_config_intr,
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 3887999..78b918d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c
@@ -1312,7 +1312,6 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev, error_module_put: module_put(d->driver->owner); - d->driver = NULL; error_put_device: put_device(d); if (ndev_owner != bus->owner)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 9639aa1..beaa003 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c
@@ -7,7 +7,6 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/jiffies.h> -#include <linux/mdio/mdio-i2c.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> @@ -17,6 +16,7 @@ #include <linux/slab.h> #include <linux/workqueue.h> +#include "mdio-i2c.h" #include "sfp.h" #include "swphy.h"
diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index e387c21..b732982 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c
@@ -108,11 +108,8 @@ static int lan911x_config_init(struct phy_device *phydev) static int lan87xx_read_status(struct phy_device *phydev) { struct smsc_phy_priv *priv = phydev->priv; - int err; - err = genphy_read_status(phydev); - if (err) - return err; + int err = genphy_read_status(phydev); if (!phydev->link && priv->energy_enable) { int i;
diff --git a/drivers/net/phy/xilinx_gmii2rgmii.c b/drivers/net/phy/xilinx_gmii2rgmii.c index 7a78dfd..151c2a3 100644 --- a/drivers/net/phy/xilinx_gmii2rgmii.c +++ b/drivers/net/phy/xilinx_gmii2rgmii.c
@@ -82,7 +82,6 @@ static int xgmiitorgmii_probe(struct mdio_device *mdiodev) if (!priv->phy_dev->drv) { dev_info(dev, "Attached phy not ready\n"); - put_device(&priv->phy_dev->mdio.dev); return -EPROBE_DEFER; }
diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c index 4b50c28..e89cdeb 100644 --- a/drivers/net/plip/plip.c +++ b/drivers/net/plip/plip.c
@@ -444,12 +444,12 @@ plip_bh_timeout_error(struct net_device *dev, struct net_local *nl, } rcv->state = PLIP_PK_DONE; if (rcv->skb) { - dev_kfree_skb_irq(rcv->skb); + kfree_skb(rcv->skb); rcv->skb = NULL; } snd->state = PLIP_PK_DONE; if (snd->skb) { - dev_consume_skb_irq(snd->skb); + dev_kfree_skb(snd->skb); snd->skb = NULL; } spin_unlock_irq(&nl->lock); @@ -1103,7 +1103,7 @@ plip_open(struct net_device *dev) /* Any address will do - we take the first. We already have the first two bytes filled with 0xfc, from plip_init_dev(). */ - const struct in_ifaddr *ifa = rtnl_dereference(in_dev->ifa_list); + const struct in_ifaddr *ifa = rcu_dereference(in_dev->ifa_list); if (ifa != NULL) { memcpy(dev->dev_addr+2, &ifa->ifa_local, 4); }
diff --git a/drivers/net/ppp/ppp_generic.c b/drivers/net/ppp/ppp_generic.c index 078c0f4..a085213 100644 --- a/drivers/net/ppp/ppp_generic.c +++ b/drivers/net/ppp/ppp_generic.c
@@ -1522,8 +1522,6 @@ ppp_send_frame(struct ppp *ppp, struct sk_buff *skb) int len; unsigned char *cp; - skb->dev = ppp->dev; - if (proto < 0x8000) { #ifdef CONFIG_PPP_FILTER /* check if we should pass this packet */
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index a522d16..f870d08 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c
@@ -525,7 +525,7 @@ static int tap_open(struct inode *inode, struct file *file) q->sock.state = SS_CONNECTED; q->sock.file = file; q->sock.ops = &tap_socket_ops; - sock_init_data_uid(&q->sock, &q->sk, inode->i_uid); + sock_init_data(&q->sock, &q->sk); q->sk.sk_write_space = tap_sock_write_space; q->sk.sk_destruct = tap_sock_destruct; q->flags = IFF_VNET_HDR | IFF_NO_PI | IFF_TAP;
diff --git a/drivers/net/team/team.c b/drivers/net/team/team.c index da74ec7..0eb894b 100644 --- a/drivers/net/team/team.c +++ b/drivers/net/team/team.c
@@ -1270,12 +1270,10 @@ static int team_port_add(struct team *team, struct net_device *port_dev, } } - if (dev->flags & IFF_UP) { - netif_addr_lock_bh(dev); - dev_uc_sync_multiple(port_dev, dev); - dev_mc_sync_multiple(port_dev, dev); - netif_addr_unlock_bh(dev); - } + netif_addr_lock_bh(dev); + dev_uc_sync_multiple(port_dev, dev); + dev_mc_sync_multiple(port_dev, dev); + netif_addr_unlock_bh(dev); port->index = -1; list_add_tail_rcu(&port->list, &team->port_list); @@ -1346,10 +1344,8 @@ static int team_port_del(struct team *team, struct net_device *port_dev) netdev_rx_handler_unregister(port_dev); team_port_disable_netpoll(port); vlan_vids_del_by_dev(port_dev, dev); - if (dev->flags & IFF_UP) { - dev_uc_unsync(port_dev, dev); - dev_mc_unsync(port_dev, dev); - } + dev_uc_unsync(port_dev, dev); + dev_mc_unsync(port_dev, dev); dev_close(port_dev); team_port_leave(team, port); @@ -1698,14 +1694,6 @@ static int team_open(struct net_device *dev) static int team_close(struct net_device *dev) { - struct team *team = netdev_priv(dev); - struct team_port *port; - - list_for_each_entry(port, &team->port_list, list) { - dev_uc_unsync(port->dev, dev); - dev_mc_unsync(port->dev, dev); - } - return 0; }
diff --git a/drivers/net/thunderbolt.c b/drivers/net/thunderbolt.c index ce7f0f6..dacb4f6 100644 --- a/drivers/net/thunderbolt.c +++ b/drivers/net/thunderbolt.c
@@ -1339,21 +1339,12 @@ static int __init tbnet_init(void) TBNET_MATCH_FRAGS_ID); ret = tb_register_property_dir("network", tbnet_dir); - if (ret) - goto err_free_dir; + if (ret) { + tb_property_free_dir(tbnet_dir); + return ret; + } - ret = tb_register_service_driver(&tbnet_driver); - if (ret) - goto err_unregister; - - return 0; - -err_unregister: - tb_unregister_property_dir("network", tbnet_dir); -err_free_dir: - tb_property_free_dir(tbnet_dir); - - return ret; + return tb_register_service_driver(&tbnet_driver); } module_init(tbnet_init);
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index a4e44f9..dd02fcc 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c
@@ -250,9 +250,6 @@ struct tun_struct { struct tun_prog __rcu *steering_prog; struct tun_prog __rcu *filter_prog; struct ethtool_link_ksettings link_ksettings; - /* init args */ - struct file *file; - struct ifreq *ifr; }; struct veth { @@ -278,9 +275,6 @@ void *tun_ptr_to_xdp(void *ptr) } EXPORT_SYMBOL(tun_ptr_to_xdp); -static void tun_flow_init(struct tun_struct *tun); -static void tun_flow_uninit(struct tun_struct *tun); - static int tun_napi_receive(struct napi_struct *napi, int budget) { struct tun_file *tfile = container_of(napi, struct tun_file, napi); @@ -748,6 +742,7 @@ static void __tun_detach(struct tun_file *tfile, bool clean) if (tun) xdp_rxq_info_unreg(&tfile->xdp_rxq); ptr_ring_cleanup(&tfile->tx_ring, tun_ptr_free); + sock_put(&tfile->sk); } } @@ -763,9 +758,6 @@ static void tun_detach(struct tun_file *tfile, bool clean) if (dev) netdev_state_change(dev); rtnl_unlock(); - - if (clean) - sock_put(&tfile->sk); } static void tun_detach_all(struct net_device *dev) @@ -1033,49 +1025,6 @@ static int check_filter(struct tap_filter *filter, const struct sk_buff *skb) static const struct ethtool_ops tun_ethtool_ops; -static int tun_net_init(struct net_device *dev) -{ - struct tun_struct *tun = netdev_priv(dev); - struct ifreq *ifr = tun->ifr; - int err; - - tun->pcpu_stats = netdev_alloc_pcpu_stats(struct tun_pcpu_stats); - if (!tun->pcpu_stats) - return -ENOMEM; - - spin_lock_init(&tun->lock); - - err = security_tun_dev_alloc_security(&tun->security); - if (err < 0) { - free_percpu(tun->pcpu_stats); - return err; - } - - tun_flow_init(tun); - - dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | - TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | - NETIF_F_HW_VLAN_STAG_TX; - dev->features = dev->hw_features | NETIF_F_LLTX; - dev->vlan_features = dev->features & - ~(NETIF_F_HW_VLAN_CTAG_TX | - NETIF_F_HW_VLAN_STAG_TX); - - tun->flags = (tun->flags & ~TUN_FEATURES) | - (ifr->ifr_flags & TUN_FEATURES); - - INIT_LIST_HEAD(&tun->disabled); - err = tun_attach(tun, tun->file, false, ifr->ifr_flags & IFF_NAPI, - ifr->ifr_flags & IFF_NAPI_FRAGS, false); - if (err < 0) { - tun_flow_uninit(tun); - security_tun_dev_free_security(tun->security); - free_percpu(tun->pcpu_stats); - return err; - } - return 0; -} - /* Net device detach from fd. */ static void tun_net_uninit(struct net_device *dev) { @@ -1334,7 +1283,6 @@ static int tun_net_change_carrier(struct net_device *dev, bool new_carrier) } static const struct net_device_ops tun_netdev_ops = { - .ndo_init = tun_net_init, .ndo_uninit = tun_net_uninit, .ndo_open = tun_net_open, .ndo_stop = tun_net_close, @@ -1415,7 +1363,6 @@ static int tun_xdp_tx(struct net_device *dev, struct xdp_buff *xdp) } static const struct net_device_ops tap_netdev_ops = { - .ndo_init = tun_net_init, .ndo_uninit = tun_net_uninit, .ndo_open = tun_net_open, .ndo_stop = tun_net_close, @@ -1456,7 +1403,7 @@ static void tun_flow_uninit(struct tun_struct *tun) #define MAX_MTU 65535 /* Initialize net device. */ -static void tun_net_initialize(struct net_device *dev) +static void tun_net_init(struct net_device *dev) { struct tun_struct *tun = netdev_priv(dev); @@ -1545,8 +1492,7 @@ static struct sk_buff *tun_napi_alloc_frags(struct tun_file *tfile, int err; int i; - if (it->nr_segs > MAX_SKB_FRAGS + 1 || - len > (ETH_MAX_MTU - NET_SKB_PAD - NET_IP_ALIGN)) + if (it->nr_segs > MAX_SKB_FRAGS + 1) return ERR_PTR(-EMSGSIZE); local_bh_disable(); @@ -2055,25 +2001,17 @@ static ssize_t tun_get_user(struct tun_struct *tun, struct tun_file *tfile, skb_headlen(skb)); if (unlikely(headlen > skb_headlen(skb))) { - WARN_ON_ONCE(1); - err = -ENOMEM; this_cpu_inc(tun->pcpu_stats->rx_dropped); -napi_busy: napi_free_frags(&tfile->napi); rcu_read_unlock(); mutex_unlock(&tfile->napi_mutex); - return err; + WARN_ON(1); + return -ENOMEM; } - if (likely(napi_schedule_prep(&tfile->napi))) { - local_bh_disable(); - napi_gro_frags(&tfile->napi); - napi_complete(&tfile->napi); - local_bh_enable(); - } else { - err = -EBUSY; - goto napi_busy; - } + local_bh_disable(); + napi_gro_frags(&tfile->napi); + local_bh_enable(); mutex_unlock(&tfile->napi_mutex); } else if (tfile->napi_enabled) { struct sk_buff_head *queue = &tfile->sk.sk_write_queue; @@ -2890,6 +2828,9 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) if (!dev) return -ENOMEM; + err = dev_get_valid_name(net, dev, name); + if (err < 0) + goto err_free_dev; dev_net_set(dev, net); dev->rtnl_link_ops = &tun_link_ops; @@ -2908,16 +2849,41 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) tun->rx_batched = 0; RCU_INIT_POINTER(tun->steering_prog, NULL); - tun->ifr = ifr; - tun->file = file; + tun->pcpu_stats = netdev_alloc_pcpu_stats(struct tun_pcpu_stats); + if (!tun->pcpu_stats) { + err = -ENOMEM; + goto err_free_dev; + } - tun_net_initialize(dev); + spin_lock_init(&tun->lock); + + err = security_tun_dev_alloc_security(&tun->security); + if (err < 0) + goto err_free_stat; + + tun_net_init(dev); + tun_flow_init(tun); + + dev->hw_features = NETIF_F_SG | NETIF_F_FRAGLIST | + TUN_USER_FEATURES | NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX; + dev->features = dev->hw_features | NETIF_F_LLTX; + dev->vlan_features = dev->features & + ~(NETIF_F_HW_VLAN_CTAG_TX | + NETIF_F_HW_VLAN_STAG_TX); + + tun->flags = (tun->flags & ~TUN_FEATURES) | + (ifr->ifr_flags & TUN_FEATURES); + + INIT_LIST_HEAD(&tun->disabled); + err = tun_attach(tun, file, false, ifr->ifr_flags & IFF_NAPI, + ifr->ifr_flags & IFF_NAPI_FRAGS, false); + if (err < 0) + goto err_free_flow; err = register_netdevice(tun->dev); - if (err < 0) { - free_netdev(dev); - return err; - } + if (err < 0) + goto err_detach; /* free_netdev() won't check refcnt, to aovid race * with dev_put() we need publish tun after registration. */ @@ -2936,6 +2902,20 @@ static int tun_set_iff(struct net *net, struct file *file, struct ifreq *ifr) strcpy(ifr->ifr_name, tun->dev->name); return 0; + +err_detach: + tun_detach_all(dev); + /* register_netdevice() already called tun_free_netdev() */ + goto err_free_dev; + +err_free_flow: + tun_flow_uninit(tun); + security_tun_dev_free_security(tun->security); +err_free_stat: + free_percpu(tun->pcpu_stats); +err_free_dev: + free_netdev(dev); + return err; } static void tun_get_iff(struct tun_struct *tun, struct ifreq *ifr) @@ -3534,7 +3514,7 @@ static int tun_chr_open(struct inode *inode, struct file * file) tfile->socket.file = file; tfile->socket.ops = &tun_socket_ops; - sock_init_data_uid(&tfile->socket, &tfile->sk, inode->i_uid); + sock_init_data(&tfile->socket, &tfile->sk); tfile->sk.sk_write_space = tun_sock_write_space; tfile->sk.sk_sndbuf = INT_MAX;
diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index ea9c836..5ee3e45 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c
@@ -1690,7 +1690,7 @@ static const struct driver_info ax88179_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1703,7 +1703,7 @@ static const struct driver_info ax88178a_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1716,7 +1716,7 @@ static const struct driver_info cypress_GX3_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1729,7 +1729,7 @@ static const struct driver_info dlink_dub1312_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1742,7 +1742,7 @@ static const struct driver_info sitecom_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1755,7 +1755,7 @@ static const struct driver_info samsung_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1768,7 +1768,7 @@ static const struct driver_info lenovo_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, }; @@ -1781,7 +1781,7 @@ static const struct driver_info belkin_info = { .link_reset = ax88179_link_reset, .reset = ax88179_reset, .stop = ax88179_stop, - .flags = FLAG_ETHER | FLAG_FRAMING_AX, + .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_SEND_ZLP, .rx_fixup = ax88179_rx_fixup, .tx_fixup = ax88179_tx_fixup, };
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c index e457fa8..eee402a 100644 --- a/drivers/net/usb/cdc_ether.c +++ b/drivers/net/usb/cdc_ether.c
@@ -764,13 +764,6 @@ static const struct usb_device_id products[] = { }, #endif -/* Lenovo ThinkPad OneLink+ Dock (based on Realtek RTL8153) */ -{ - USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3054, USB_CLASS_COMM, - USB_CDC_SUBCLASS_ETHERNET, USB_CDC_PROTO_NONE), - .driver_info = 0, -}, - /* ThinkPad USB-C Dock (based on Realtek RTL8153) */ { USB_DEVICE_AND_INTERFACE_INFO(LENOVO_VENDOR_ID, 0x3062, USB_CLASS_COMM,
diff --git a/drivers/net/usb/cdc_mbim.c b/drivers/net/usb/cdc_mbim.c index 6ad1fb0..414341c 100644 --- a/drivers/net/usb/cdc_mbim.c +++ b/drivers/net/usb/cdc_mbim.c
@@ -663,11 +663,6 @@ static const struct usb_device_id mbim_devs[] = { .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle, }, - /* Telit FE990 */ - { USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1081, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), - .driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle, - }, - /* default entry */ { USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE), .driver_info = (unsigned long)&cdc_mbim_info_zlp,
diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 4824385..1c9a1b9 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c
@@ -175,17 +175,10 @@ static u32 cdc_ncm_check_tx_max(struct usbnet *dev, u32 new_tx) u32 val, max, min; /* clamp new_tx to sane values */ - if (ctx->is_ndp16) - min = ctx->max_datagram_size + ctx->max_ndp_size + sizeof(struct usb_cdc_ncm_nth16); - else - min = ctx->max_datagram_size + ctx->max_ndp_size + sizeof(struct usb_cdc_ncm_nth32); - - if (le32_to_cpu(ctx->ncm_parm.dwNtbOutMaxSize) == 0) + min = ctx->max_datagram_size + ctx->max_ndp_size + sizeof(struct usb_cdc_ncm_nth16); + max = min_t(u32, CDC_NCM_NTB_MAX_SIZE_TX, le32_to_cpu(ctx->ncm_parm.dwNtbOutMaxSize)); + if (max == 0) max = CDC_NCM_NTB_MAX_SIZE_TX; /* dwNtbOutMaxSize not set */ - else - max = clamp_t(u32, le32_to_cpu(ctx->ncm_parm.dwNtbOutMaxSize), - USB_CDC_NCM_NTB_MIN_OUT_SIZE, - CDC_NCM_NTB_MAX_SIZE_TX); /* some devices set dwNtbOutMaxSize too low for the above default */ min = min(min, max); @@ -316,17 +309,10 @@ static ssize_t ndp_to_end_store(struct device *d, struct device_attribute *attr if (enable == (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END)) return len; - if (enable) { - if (ctx->is_ndp16 && !ctx->delayed_ndp16) { - ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); - if (!ctx->delayed_ndp16) - return -ENOMEM; - } - if (!ctx->is_ndp16 && !ctx->delayed_ndp32) { - ctx->delayed_ndp32 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); - if (!ctx->delayed_ndp32) - return -ENOMEM; - } + if (enable && !ctx->delayed_ndp16) { + ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); + if (!ctx->delayed_ndp16) + return -ENOMEM; } /* flush pending data before changing flag */ @@ -528,9 +514,6 @@ static int cdc_ncm_init(struct usbnet *dev) dev_err(&dev->intf->dev, "SET_CRC_MODE failed\n"); } - /* use ndp16 by default */ - ctx->is_ndp16 = 1; - /* set NTB format, if both formats are supported. * * "The host shall only send this command while the NCM Data @@ -538,27 +521,14 @@ static int cdc_ncm_init(struct usbnet *dev) */ if (le16_to_cpu(ctx->ncm_parm.bmNtbFormatsSupported) & USB_CDC_NCM_NTB32_SUPPORTED) { - if (ctx->drvflags & CDC_NCM_FLAG_PREFER_NTB32) { - ctx->is_ndp16 = 0; - dev_dbg(&dev->intf->dev, "Setting NTB format to 32-bit\n"); - err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT, - USB_TYPE_CLASS | USB_DIR_OUT - | USB_RECIP_INTERFACE, - USB_CDC_NCM_NTB32_FORMAT, - iface_no, NULL, 0); - } else { - ctx->is_ndp16 = 1; - dev_dbg(&dev->intf->dev, "Setting NTB format to 16-bit\n"); - err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT, - USB_TYPE_CLASS | USB_DIR_OUT - | USB_RECIP_INTERFACE, - USB_CDC_NCM_NTB16_FORMAT, - iface_no, NULL, 0); - } - if (err < 0) { - ctx->is_ndp16 = 1; + dev_dbg(&dev->intf->dev, "Setting NTB format to 16-bit\n"); + err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT, + USB_TYPE_CLASS | USB_DIR_OUT + | USB_RECIP_INTERFACE, + USB_CDC_NCM_NTB16_FORMAT, + iface_no, NULL, 0); + if (err < 0) dev_err(&dev->intf->dev, "SET_NTB_FORMAT failed\n"); - } } /* set initial device values */ @@ -581,10 +551,7 @@ static int cdc_ncm_init(struct usbnet *dev) ctx->tx_max_datagrams = CDC_NCM_DPT_DATAGRAMS_MAX; /* set up maximum NDP size */ - if (ctx->is_ndp16) - ctx->max_ndp_size = sizeof(struct usb_cdc_ncm_ndp16) + (ctx->tx_max_datagrams + 1) * sizeof(struct usb_cdc_ncm_dpe16); - else - ctx->max_ndp_size = sizeof(struct usb_cdc_ncm_ndp32) + (ctx->tx_max_datagrams + 1) * sizeof(struct usb_cdc_ncm_dpe32); + ctx->max_ndp_size = sizeof(struct usb_cdc_ncm_ndp16) + (ctx->tx_max_datagrams + 1) * sizeof(struct usb_cdc_ncm_dpe16); /* initial coalescing timer interval */ ctx->timer_interval = CDC_NCM_TIMER_INTERVAL_USEC * NSEC_PER_USEC; @@ -769,10 +736,7 @@ static void cdc_ncm_free(struct cdc_ncm_ctx *ctx) ctx->tx_curr_skb = NULL; } - if (ctx->is_ndp16) - kfree(ctx->delayed_ndp16); - else - kfree(ctx->delayed_ndp32); + kfree(ctx->delayed_ndp16); kfree(ctx); } @@ -810,8 +774,10 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ u8 *buf; int len; int temp; + int err; u8 iface_no; struct usb_cdc_parsed_header hdr; + __le16 curr_ntb_format; ctx = kzalloc(sizeof(*ctx), GFP_KERNEL); if (!ctx) @@ -915,6 +881,32 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ goto error2; } + /* + * Some Huawei devices have been observed to come out of reset in NDP32 mode. + * Let's check if this is the case, and set the device to NDP16 mode again if + * needed. + */ + if (ctx->drvflags & CDC_NCM_FLAG_RESET_NTB16) { + err = usbnet_read_cmd(dev, USB_CDC_GET_NTB_FORMAT, + USB_TYPE_CLASS | USB_DIR_IN | USB_RECIP_INTERFACE, + 0, iface_no, &curr_ntb_format, 2); + if (err < 0) { + goto error2; + } + + if (curr_ntb_format == cpu_to_le16(USB_CDC_NCM_NTB32_FORMAT)) { + dev_info(&intf->dev, "resetting NTB format to 16-bit"); + err = usbnet_write_cmd(dev, USB_CDC_SET_NTB_FORMAT, + USB_TYPE_CLASS | USB_DIR_OUT + | USB_RECIP_INTERFACE, + USB_CDC_NCM_NTB16_FORMAT, + iface_no, NULL, 0); + + if (err < 0) + goto error2; + } + } + cdc_ncm_find_endpoints(dev, ctx->data); cdc_ncm_find_endpoints(dev, ctx->control); if (!dev->in || !dev->out || !dev->status) { @@ -939,15 +931,9 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_ /* Allocate the delayed NDP if needed. */ if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) { - if (ctx->is_ndp16) { - ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); - if (!ctx->delayed_ndp16) - goto error2; - } else { - ctx->delayed_ndp32 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); - if (!ctx->delayed_ndp32) - goto error2; - } + ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL); + if (!ctx->delayed_ndp16) + goto error2; dev_info(&intf->dev, "NDP will be placed at end of frame for this device."); } @@ -1071,7 +1057,7 @@ static void cdc_ncm_align_tail(struct sk_buff *skb, size_t modulus, size_t remai /* return a pointer to a valid struct usb_cdc_ncm_ndp16 of type sign, possibly * allocating a new one within skb */ -static struct usb_cdc_ncm_ndp16 *cdc_ncm_ndp16(struct cdc_ncm_ctx *ctx, struct sk_buff *skb, __le32 sign, size_t reserve) +static struct usb_cdc_ncm_ndp16 *cdc_ncm_ndp(struct cdc_ncm_ctx *ctx, struct sk_buff *skb, __le32 sign, size_t reserve) { struct usb_cdc_ncm_ndp16 *ndp16 = NULL; struct usb_cdc_ncm_nth16 *nth16 = (void *)skb->data; @@ -1126,73 +1112,12 @@ static struct usb_cdc_ncm_ndp16 *cdc_ncm_ndp16(struct cdc_ncm_ctx *ctx, struct s return ndp16; } -static struct usb_cdc_ncm_ndp32 *cdc_ncm_ndp32(struct cdc_ncm_ctx *ctx, struct sk_buff *skb, __le32 sign, size_t reserve) -{ - struct usb_cdc_ncm_ndp32 *ndp32 = NULL; - struct usb_cdc_ncm_nth32 *nth32 = (void *)skb->data; - size_t ndpoffset = le32_to_cpu(nth32->dwNdpIndex); - - /* If NDP should be moved to the end of the NCM package, we can't follow the - * NTH32 header as we would normally do. NDP isn't written to the SKB yet, and - * the wNdpIndex field in the header is actually not consistent with reality. It will be later. - */ - if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) { - if (ctx->delayed_ndp32->dwSignature == sign) - return ctx->delayed_ndp32; - - /* We can only push a single NDP to the end. Return - * NULL to send what we've already got and queue this - * skb for later. - */ - else if (ctx->delayed_ndp32->dwSignature) - return NULL; - } - - /* follow the chain of NDPs, looking for a match */ - while (ndpoffset) { - ndp32 = (struct usb_cdc_ncm_ndp32 *)(skb->data + ndpoffset); - if (ndp32->dwSignature == sign) - return ndp32; - ndpoffset = le32_to_cpu(ndp32->dwNextNdpIndex); - } - - /* align new NDP */ - if (!(ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END)) - cdc_ncm_align_tail(skb, ctx->tx_ndp_modulus, 0, ctx->tx_curr_size); - - /* verify that there is room for the NDP and the datagram (reserve) */ - if ((ctx->tx_curr_size - skb->len - reserve) < ctx->max_ndp_size) - return NULL; - - /* link to it */ - if (ndp32) - ndp32->dwNextNdpIndex = cpu_to_le32(skb->len); - else - nth32->dwNdpIndex = cpu_to_le32(skb->len); - - /* push a new empty NDP */ - if (!(ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END)) - ndp32 = skb_put_zero(skb, ctx->max_ndp_size); - else - ndp32 = ctx->delayed_ndp32; - - ndp32->dwSignature = sign; - ndp32->wLength = cpu_to_le16(sizeof(struct usb_cdc_ncm_ndp32) + sizeof(struct usb_cdc_ncm_dpe32)); - return ndp32; -} - struct sk_buff * cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) { struct cdc_ncm_ctx *ctx = (struct cdc_ncm_ctx *)dev->data[0]; - union { - struct usb_cdc_ncm_nth16 *nth16; - struct usb_cdc_ncm_nth32 *nth32; - } nth; - union { - struct usb_cdc_ncm_ndp16 *ndp16; - struct usb_cdc_ncm_ndp32 *ndp32; - } ndp; + struct usb_cdc_ncm_nth16 *nth16; + struct usb_cdc_ncm_ndp16 *ndp16; struct sk_buff *skb_out; u16 n = 0, index, ndplen; u8 ready2send = 0; @@ -1232,9 +1157,6 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) * further. */ if (skb_out == NULL) { - /* If even the smallest allocation fails, abort. */ - if (ctx->tx_curr_size == USB_CDC_NCM_NTB_MIN_OUT_SIZE) - goto alloc_failed; ctx->tx_low_mem_max_cnt = min(ctx->tx_low_mem_max_cnt + 1, (unsigned)CDC_NCM_LOW_MEM_MAX_CNT); ctx->tx_low_mem_val = ctx->tx_low_mem_max_cnt; @@ -1253,23 +1175,20 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) skb_out = alloc_skb(ctx->tx_curr_size, GFP_ATOMIC); /* No allocation possible so we will abort */ - if (!skb_out) - goto alloc_failed; + if (skb_out == NULL) { + if (skb != NULL) { + dev_kfree_skb_any(skb); + dev->net->stats.tx_dropped++; + } + goto exit_no_skb; + } ctx->tx_low_mem_val--; } - if (ctx->is_ndp16) { - /* fill out the initial 16-bit NTB header */ - nth.nth16 = skb_put_zero(skb_out, sizeof(struct usb_cdc_ncm_nth16)); - nth.nth16->dwSignature = cpu_to_le32(USB_CDC_NCM_NTH16_SIGN); - nth.nth16->wHeaderLength = cpu_to_le16(sizeof(struct usb_cdc_ncm_nth16)); - nth.nth16->wSequence = cpu_to_le16(ctx->tx_seq++); - } else { - /* fill out the initial 32-bit NTB header */ - nth.nth32 = skb_put_zero(skb_out, sizeof(struct usb_cdc_ncm_nth32)); - nth.nth32->dwSignature = cpu_to_le32(USB_CDC_NCM_NTH32_SIGN); - nth.nth32->wHeaderLength = cpu_to_le16(sizeof(struct usb_cdc_ncm_nth32)); - nth.nth32->wSequence = cpu_to_le16(ctx->tx_seq++); - } + /* fill out the initial 16-bit NTB header */ + nth16 = skb_put_zero(skb_out, sizeof(struct usb_cdc_ncm_nth16)); + nth16->dwSignature = cpu_to_le32(USB_CDC_NCM_NTH16_SIGN); + nth16->wHeaderLength = cpu_to_le16(sizeof(struct usb_cdc_ncm_nth16)); + nth16->wSequence = cpu_to_le16(ctx->tx_seq++); /* count total number of frames in this NTB */ ctx->tx_curr_frame_num = 0; @@ -1291,17 +1210,13 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) } /* get the appropriate NDP for this skb */ - if (ctx->is_ndp16) - ndp.ndp16 = cdc_ncm_ndp16(ctx, skb_out, sign, skb->len + ctx->tx_modulus + ctx->tx_remainder); - else - ndp.ndp32 = cdc_ncm_ndp32(ctx, skb_out, sign, skb->len + ctx->tx_modulus + ctx->tx_remainder); + ndp16 = cdc_ncm_ndp(ctx, skb_out, sign, skb->len + ctx->tx_modulus + ctx->tx_remainder); /* align beginning of next frame */ cdc_ncm_align_tail(skb_out, ctx->tx_modulus, ctx->tx_remainder, ctx->tx_curr_size); /* check if we had enough room left for both NDP and frame */ - if ((ctx->is_ndp16 && !ndp.ndp16) || (!ctx->is_ndp16 && !ndp.ndp32) || - skb_out->len + skb->len + delayed_ndp_size > ctx->tx_curr_size) { + if (!ndp16 || skb_out->len + skb->len + delayed_ndp_size > ctx->tx_curr_size) { if (n == 0) { /* won't fit, MTU problem? */ dev_kfree_skb_any(skb); @@ -1323,22 +1238,13 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) } /* calculate frame number withing this NDP */ - if (ctx->is_ndp16) { - ndplen = le16_to_cpu(ndp.ndp16->wLength); - index = (ndplen - sizeof(struct usb_cdc_ncm_ndp16)) / sizeof(struct usb_cdc_ncm_dpe16) - 1; + ndplen = le16_to_cpu(ndp16->wLength); + index = (ndplen - sizeof(struct usb_cdc_ncm_ndp16)) / sizeof(struct usb_cdc_ncm_dpe16) - 1; - /* OK, add this skb */ - ndp.ndp16->dpe16[index].wDatagramLength = cpu_to_le16(skb->len); - ndp.ndp16->dpe16[index].wDatagramIndex = cpu_to_le16(skb_out->len); - ndp.ndp16->wLength = cpu_to_le16(ndplen + sizeof(struct usb_cdc_ncm_dpe16)); - } else { - ndplen = le16_to_cpu(ndp.ndp32->wLength); - index = (ndplen - sizeof(struct usb_cdc_ncm_ndp32)) / sizeof(struct usb_cdc_ncm_dpe32) - 1; - - ndp.ndp32->dpe32[index].dwDatagramLength = cpu_to_le32(skb->len); - ndp.ndp32->dpe32[index].dwDatagramIndex = cpu_to_le32(skb_out->len); - ndp.ndp32->wLength = cpu_to_le16(ndplen + sizeof(struct usb_cdc_ncm_dpe32)); - } + /* OK, add this skb */ + ndp16->dpe16[index].wDatagramLength = cpu_to_le16(skb->len); + ndp16->dpe16[index].wDatagramIndex = cpu_to_le16(skb_out->len); + ndp16->wLength = cpu_to_le16(ndplen + sizeof(struct usb_cdc_ncm_dpe16)); skb_put_data(skb_out, skb->data, skb->len); ctx->tx_curr_frame_payload += skb->len; /* count real tx payload data */ dev_kfree_skb_any(skb); @@ -1385,22 +1291,13 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) /* If requested, put NDP at end of frame. */ if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) { - if (ctx->is_ndp16) { - nth.nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data; - cdc_ncm_align_tail(skb_out, ctx->tx_ndp_modulus, 0, ctx->tx_curr_size - ctx->max_ndp_size); - nth.nth16->wNdpIndex = cpu_to_le16(skb_out->len); - skb_put_data(skb_out, ctx->delayed_ndp16, ctx->max_ndp_size); + nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data; + cdc_ncm_align_tail(skb_out, ctx->tx_ndp_modulus, 0, ctx->tx_curr_size - ctx->max_ndp_size); + nth16->wNdpIndex = cpu_to_le16(skb_out->len); + skb_put_data(skb_out, ctx->delayed_ndp16, ctx->max_ndp_size); - /* Zero out delayed NDP - signature checking will naturally fail. */ - ndp.ndp16 = memset(ctx->delayed_ndp16, 0, ctx->max_ndp_size); - } else { - nth.nth32 = (struct usb_cdc_ncm_nth32 *)skb_out->data; - cdc_ncm_align_tail(skb_out, ctx->tx_ndp_modulus, 0, ctx->tx_curr_size - ctx->max_ndp_size); - nth.nth32->dwNdpIndex = cpu_to_le32(skb_out->len); - skb_put_data(skb_out, ctx->delayed_ndp32, ctx->max_ndp_size); - - ndp.ndp32 = memset(ctx->delayed_ndp32, 0, ctx->max_ndp_size); - } + /* Zero out delayed NDP - signature checking will naturally fail. */ + ndp16 = memset(ctx->delayed_ndp16, 0, ctx->max_ndp_size); } /* If collected data size is less or equal ctx->min_tx_pkt @@ -1423,13 +1320,8 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) } /* set final frame length */ - if (ctx->is_ndp16) { - nth.nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data; - nth.nth16->wBlockLength = cpu_to_le16(skb_out->len); - } else { - nth.nth32 = (struct usb_cdc_ncm_nth32 *)skb_out->data; - nth.nth32->dwBlockLength = cpu_to_le32(skb_out->len); - } + nth16 = (struct usb_cdc_ncm_nth16 *)skb_out->data; + nth16->wBlockLength = cpu_to_le16(skb_out->len); /* return skb */ ctx->tx_curr_skb = NULL; @@ -1447,11 +1339,6 @@ cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign) return skb_out; -alloc_failed: - if (skb) { - dev_kfree_skb_any(skb); - dev->net->stats.tx_dropped++; - } exit_no_skb: /* Start timer, if there is a remaining non-empty skb */ if (ctx->tx_curr_skb != NULL && n > 0) @@ -1517,12 +1404,7 @@ cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags) goto error; spin_lock_bh(&ctx->mtx); - - if (ctx->is_ndp16) - skb_out = cdc_ncm_fill_tx_frame(dev, skb, cpu_to_le32(USB_CDC_NCM_NDP16_NOCRC_SIGN)); - else - skb_out = cdc_ncm_fill_tx_frame(dev, skb, cpu_to_le32(USB_CDC_NCM_NDP32_NOCRC_SIGN)); - + skb_out = cdc_ncm_fill_tx_frame(dev, skb, cpu_to_le32(USB_CDC_NCM_NDP16_NOCRC_SIGN)); spin_unlock_bh(&ctx->mtx); return skb_out; @@ -1583,54 +1465,6 @@ int cdc_ncm_rx_verify_nth16(struct cdc_ncm_ctx *ctx, struct sk_buff *skb_in) } EXPORT_SYMBOL_GPL(cdc_ncm_rx_verify_nth16); -int cdc_ncm_rx_verify_nth32(struct cdc_ncm_ctx *ctx, struct sk_buff *skb_in) -{ - struct usbnet *dev = netdev_priv(skb_in->dev); - struct usb_cdc_ncm_nth32 *nth32; - int len; - int ret = -EINVAL; - - if (ctx == NULL) - goto error; - - if (skb_in->len < (sizeof(struct usb_cdc_ncm_nth32) + - sizeof(struct usb_cdc_ncm_ndp32))) { - netif_dbg(dev, rx_err, dev->net, "frame too short\n"); - goto error; - } - - nth32 = (struct usb_cdc_ncm_nth32 *)skb_in->data; - - if (nth32->dwSignature != cpu_to_le32(USB_CDC_NCM_NTH32_SIGN)) { - netif_dbg(dev, rx_err, dev->net, - "invalid NTH32 signature <%#010x>\n", - le32_to_cpu(nth32->dwSignature)); - goto error; - } - - len = le32_to_cpu(nth32->dwBlockLength); - if (len > ctx->rx_max) { - netif_dbg(dev, rx_err, dev->net, - "unsupported NTB block length %u/%u\n", len, - ctx->rx_max); - goto error; - } - - if ((ctx->rx_seq + 1) != le16_to_cpu(nth32->wSequence) && - (ctx->rx_seq || le16_to_cpu(nth32->wSequence)) && - !((ctx->rx_seq == 0xffff) && !le16_to_cpu(nth32->wSequence))) { - netif_dbg(dev, rx_err, dev->net, - "sequence number glitch prev=%d curr=%d\n", - ctx->rx_seq, le16_to_cpu(nth32->wSequence)); - } - ctx->rx_seq = le16_to_cpu(nth32->wSequence); - - ret = le32_to_cpu(nth32->dwNdpIndex); -error: - return ret; -} -EXPORT_SYMBOL_GPL(cdc_ncm_rx_verify_nth32); - /* verify NDP header and return number of datagrams, or negative error */ int cdc_ncm_rx_verify_ndp16(struct sk_buff *skb_in, int ndpoffset) { @@ -1667,42 +1501,6 @@ int cdc_ncm_rx_verify_ndp16(struct sk_buff *skb_in, int ndpoffset) } EXPORT_SYMBOL_GPL(cdc_ncm_rx_verify_ndp16); -/* verify NDP header and return number of datagrams, or negative error */ -int cdc_ncm_rx_verify_ndp32(struct sk_buff *skb_in, int ndpoffset) -{ - struct usbnet *dev = netdev_priv(skb_in->dev); - struct usb_cdc_ncm_ndp32 *ndp32; - int ret = -EINVAL; - - if ((ndpoffset + sizeof(struct usb_cdc_ncm_ndp32)) > skb_in->len) { - netif_dbg(dev, rx_err, dev->net, "invalid NDP offset <%u>\n", - ndpoffset); - goto error; - } - ndp32 = (struct usb_cdc_ncm_ndp32 *)(skb_in->data + ndpoffset); - - if (le16_to_cpu(ndp32->wLength) < USB_CDC_NCM_NDP32_LENGTH_MIN) { - netif_dbg(dev, rx_err, dev->net, "invalid DPT32 length <%u>\n", - le16_to_cpu(ndp32->wLength)); - goto error; - } - - ret = ((le16_to_cpu(ndp32->wLength) - - sizeof(struct usb_cdc_ncm_ndp32)) / - sizeof(struct usb_cdc_ncm_dpe32)); - ret--; /* we process NDP entries except for the last one */ - - if ((sizeof(struct usb_cdc_ncm_ndp32) + - ret * (sizeof(struct usb_cdc_ncm_dpe32))) > skb_in->len) { - netif_dbg(dev, rx_err, dev->net, "Invalid nframes = %d\n", ret); - ret = -EINVAL; - } - -error: - return ret; -} -EXPORT_SYMBOL_GPL(cdc_ncm_rx_verify_ndp32); - int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in) { struct sk_buff *skb; @@ -1711,66 +1509,34 @@ int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in) int nframes; int x; int offset; - union { - struct usb_cdc_ncm_ndp16 *ndp16; - struct usb_cdc_ncm_ndp32 *ndp32; - } ndp; - union { - struct usb_cdc_ncm_dpe16 *dpe16; - struct usb_cdc_ncm_dpe32 *dpe32; - } dpe; - + struct usb_cdc_ncm_ndp16 *ndp16; + struct usb_cdc_ncm_dpe16 *dpe16; int ndpoffset; int loopcount = 50; /* arbitrary max preventing infinite loop */ u32 payload = 0; - if (ctx->is_ndp16) - ndpoffset = cdc_ncm_rx_verify_nth16(ctx, skb_in); - else - ndpoffset = cdc_ncm_rx_verify_nth32(ctx, skb_in); - + ndpoffset = cdc_ncm_rx_verify_nth16(ctx, skb_in); if (ndpoffset < 0) goto error; next_ndp: - if (ctx->is_ndp16) { - nframes = cdc_ncm_rx_verify_ndp16(skb_in, ndpoffset); - if (nframes < 0) - goto error; + nframes = cdc_ncm_rx_verify_ndp16(skb_in, ndpoffset); + if (nframes < 0) + goto error; - ndp.ndp16 = (struct usb_cdc_ncm_ndp16 *)(skb_in->data + ndpoffset); + ndp16 = (struct usb_cdc_ncm_ndp16 *)(skb_in->data + ndpoffset); - if (ndp.ndp16->dwSignature != cpu_to_le32(USB_CDC_NCM_NDP16_NOCRC_SIGN)) { - netif_dbg(dev, rx_err, dev->net, - "invalid DPT16 signature <%#010x>\n", - le32_to_cpu(ndp.ndp16->dwSignature)); - goto err_ndp; - } - dpe.dpe16 = ndp.ndp16->dpe16; - } else { - nframes = cdc_ncm_rx_verify_ndp32(skb_in, ndpoffset); - if (nframes < 0) - goto error; - - ndp.ndp32 = (struct usb_cdc_ncm_ndp32 *)(skb_in->data + ndpoffset); - - if (ndp.ndp32->dwSignature != cpu_to_le32(USB_CDC_NCM_NDP32_NOCRC_SIGN)) { - netif_dbg(dev, rx_err, dev->net, - "invalid DPT32 signature <%#010x>\n", - le32_to_cpu(ndp.ndp32->dwSignature)); - goto err_ndp; - } - dpe.dpe32 = ndp.ndp32->dpe32; + if (ndp16->dwSignature != cpu_to_le32(USB_CDC_NCM_NDP16_NOCRC_SIGN)) { + netif_dbg(dev, rx_err, dev->net, + "invalid DPT16 signature <%#010x>\n", + le32_to_cpu(ndp16->dwSignature)); + goto err_ndp; } + dpe16 = ndp16->dpe16; - for (x = 0; x < nframes; x++) { - if (ctx->is_ndp16) { - offset = le16_to_cpu(dpe.dpe16->wDatagramIndex); - len = le16_to_cpu(dpe.dpe16->wDatagramLength); - } else { - offset = le32_to_cpu(dpe.dpe32->dwDatagramIndex); - len = le32_to_cpu(dpe.dpe32->dwDatagramLength); - } + for (x = 0; x < nframes; x++, dpe16++) { + offset = le16_to_cpu(dpe16->wDatagramIndex); + len = le16_to_cpu(dpe16->wDatagramLength); /* * CDC NCM ch. 3.7 @@ -1801,19 +1567,10 @@ int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in) usbnet_skb_return(dev, skb); payload += len; /* count payload bytes in this NTB */ } - - if (ctx->is_ndp16) - dpe.dpe16++; - else - dpe.dpe32++; } err_ndp: /* are there more NDPs to process? */ - if (ctx->is_ndp16) - ndpoffset = le16_to_cpu(ndp.ndp16->wNextNdpIndex); - else - ndpoffset = le32_to_cpu(ndp.ndp32->dwNextNdpIndex); - + ndpoffset = le16_to_cpu(ndp16->wNextNdpIndex); if (ndpoffset && loopcount--) goto next_ndp;
diff --git a/drivers/net/usb/huawei_cdc_ncm.c b/drivers/net/usb/huawei_cdc_ncm.c index 099d848..e15a472 100644 --- a/drivers/net/usb/huawei_cdc_ncm.c +++ b/drivers/net/usb/huawei_cdc_ncm.c
@@ -77,11 +77,11 @@ static int huawei_cdc_ncm_bind(struct usbnet *usbnet_dev, */ drvflags |= CDC_NCM_FLAG_NDP_TO_END; - /* For many Huawei devices the NTB32 mode is the default and the best mode - * they work with. Huawei E5785 and E5885 devices refuse to work in NTB16 mode at all. + /* Additionally, it has been reported that some Huawei E3372H devices, with + * firmware version 21.318.01.00.541, come out of reset in NTB32 format mode, hence + * needing to be set to the NTB16 one again. */ - drvflags |= CDC_NCM_FLAG_PREFER_NTB32; - + drvflags |= CDC_NCM_FLAG_RESET_NTB16; ret = cdc_ncm_bind_common(usbnet_dev, intf, 1, drvflags); if (ret) goto err;
diff --git a/drivers/net/usb/kalmia.c b/drivers/net/usb/kalmia.c index a552bb1..fc5895f 100644 --- a/drivers/net/usb/kalmia.c +++ b/drivers/net/usb/kalmia.c
@@ -65,8 +65,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, init_msg, init_msg_len, &act_len, KALMIA_USB_TIMEOUT); if (status != 0) { netdev_err(dev->net, - "Error sending init packet. Status %i\n", - status); + "Error sending init packet. Status %i, length %i\n", + status, act_len); return status; } else if (act_len != init_msg_len) { @@ -83,8 +83,8 @@ kalmia_send_init_packet(struct usbnet *dev, u8 *init_msg, u8 init_msg_len, if (status != 0) netdev_err(dev->net, - "Error receiving init result. Status %i\n", - status); + "Error receiving init result. Status %i, length %i\n", + status, act_len); else if (act_len != expected_len) netdev_err(dev->net, "Unexpected init result length: %i\n", act_len);
diff --git a/drivers/net/usb/lan78xx.c b/drivers/net/usb/lan78xx.c index b510179..ce3c8f4 100644 --- a/drivers/net/usb/lan78xx.c +++ b/drivers/net/usb/lan78xx.c
@@ -824,19 +824,20 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset, u32 length, u8 *data) { int i; + int ret; u32 buf; unsigned long timeout; - lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + ret = lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (buf & OTP_PWR_DN_PWRDN_N_) { /* clear it and wait to be cleared */ - lan78xx_write_reg(dev, OTP_PWR_DN, 0); + ret = lan78xx_write_reg(dev, OTP_PWR_DN, 0); timeout = jiffies + HZ; do { usleep_range(1, 10); - lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + ret = lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_PWR_DN"); @@ -846,18 +847,18 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset, } for (i = 0; i < length; i++) { - lan78xx_write_reg(dev, OTP_ADDR1, + ret = lan78xx_write_reg(dev, OTP_ADDR1, ((offset + i) >> 8) & OTP_ADDR1_15_11); - lan78xx_write_reg(dev, OTP_ADDR2, + ret = lan78xx_write_reg(dev, OTP_ADDR2, ((offset + i) & OTP_ADDR2_10_3)); - lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); - lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); + ret = lan78xx_write_reg(dev, OTP_FUNC_CMD, OTP_FUNC_CMD_READ_); + ret = lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); timeout = jiffies + HZ; do { udelay(1); - lan78xx_read_reg(dev, OTP_STATUS, &buf); + ret = lan78xx_read_reg(dev, OTP_STATUS, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_STATUS"); @@ -865,7 +866,7 @@ static int lan78xx_read_raw_otp(struct lan78xx_net *dev, u32 offset, } } while (buf & OTP_STATUS_BUSY_); - lan78xx_read_reg(dev, OTP_RD_DATA, &buf); + ret = lan78xx_read_reg(dev, OTP_RD_DATA, &buf); data[i] = (u8)(buf & 0xFF); } @@ -877,19 +878,20 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *dev, u32 offset, u32 length, u8 *data) { int i; + int ret; u32 buf; unsigned long timeout; - lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + ret = lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (buf & OTP_PWR_DN_PWRDN_N_) { /* clear it and wait to be cleared */ - lan78xx_write_reg(dev, OTP_PWR_DN, 0); + ret = lan78xx_write_reg(dev, OTP_PWR_DN, 0); timeout = jiffies + HZ; do { udelay(1); - lan78xx_read_reg(dev, OTP_PWR_DN, &buf); + ret = lan78xx_read_reg(dev, OTP_PWR_DN, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "timeout on OTP_PWR_DN completion"); @@ -899,21 +901,21 @@ static int lan78xx_write_raw_otp(struct lan78xx_net *dev, u32 offset, } /* set to BYTE program mode */ - lan78xx_write_reg(dev, OTP_PRGM_MODE, OTP_PRGM_MODE_BYTE_); + ret = lan78xx_write_reg(dev, OTP_PRGM_MODE, OTP_PRGM_MODE_BYTE_); for (i = 0; i < length; i++) { - lan78xx_write_reg(dev, OTP_ADDR1, + ret = lan78xx_write_reg(dev, OTP_ADDR1, ((offset + i) >> 8) & OTP_ADDR1_15_11); - lan78xx_write_reg(dev, OTP_ADDR2, + ret = lan78xx_write_reg(dev, OTP_ADDR2, ((offset + i) & OTP_ADDR2_10_3)); - lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]); - lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_); - lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); + ret = lan78xx_write_reg(dev, OTP_PRGM_DATA, data[i]); + ret = lan78xx_write_reg(dev, OTP_TST_CMD, OTP_TST_CMD_PRGVRFY_); + ret = lan78xx_write_reg(dev, OTP_CMD_GO, OTP_CMD_GO_GO_); timeout = jiffies + HZ; do { udelay(1); - lan78xx_read_reg(dev, OTP_STATUS, &buf); + ret = lan78xx_read_reg(dev, OTP_STATUS, &buf); if (time_after(jiffies, timeout)) { netdev_warn(dev->net, "Timeout on OTP_STATUS completion"); @@ -1038,6 +1040,7 @@ static void lan78xx_deferred_multicast_write(struct work_struct *param) container_of(param, struct lan78xx_priv, set_multicast); struct lan78xx_net *dev = pdata->dev; int i; + int ret; netif_dbg(dev, drv, dev->net, "deferred multicast write 0x%08x\n", pdata->rfe_ctl); @@ -1046,14 +1049,14 @@ static void lan78xx_deferred_multicast_write(struct work_struct *param) DP_SEL_VHF_HASH_LEN, pdata->mchash_table); for (i = 1; i < NUM_OF_MAF; i++) { - lan78xx_write_reg(dev, MAF_HI(i), 0); - lan78xx_write_reg(dev, MAF_LO(i), + ret = lan78xx_write_reg(dev, MAF_HI(i), 0); + ret = lan78xx_write_reg(dev, MAF_LO(i), pdata->pfilter_table[i][1]); - lan78xx_write_reg(dev, MAF_HI(i), + ret = lan78xx_write_reg(dev, MAF_HI(i), pdata->pfilter_table[i][0]); } - lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); + ret = lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); } static void lan78xx_set_multicast(struct net_device *netdev) @@ -1123,6 +1126,7 @@ static int lan78xx_update_flowcontrol(struct lan78xx_net *dev, u8 duplex, u16 lcladv, u16 rmtadv) { u32 flow = 0, fct_flow = 0; + int ret; u8 cap; if (dev->fc_autoneg) @@ -1145,10 +1149,10 @@ static int lan78xx_update_flowcontrol(struct lan78xx_net *dev, u8 duplex, (cap & FLOW_CTRL_RX ? "enabled" : "disabled"), (cap & FLOW_CTRL_TX ? "enabled" : "disabled")); - lan78xx_write_reg(dev, FCT_FLOW, fct_flow); + ret = lan78xx_write_reg(dev, FCT_FLOW, fct_flow); /* threshold value should be set before enabling flow */ - lan78xx_write_reg(dev, FLOW, flow); + ret = lan78xx_write_reg(dev, FLOW, flow); return 0; } @@ -1677,10 +1681,11 @@ static int lan78xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd) static void lan78xx_init_mac_address(struct lan78xx_net *dev) { u32 addr_lo, addr_hi; + int ret; u8 addr[6]; - lan78xx_read_reg(dev, RX_ADDRL, &addr_lo); - lan78xx_read_reg(dev, RX_ADDRH, &addr_hi); + ret = lan78xx_read_reg(dev, RX_ADDRL, &addr_lo); + ret = lan78xx_read_reg(dev, RX_ADDRH, &addr_hi); addr[0] = addr_lo & 0xFF; addr[1] = (addr_lo >> 8) & 0xFF; @@ -1713,12 +1718,12 @@ static void lan78xx_init_mac_address(struct lan78xx_net *dev) (addr[2] << 16) | (addr[3] << 24); addr_hi = addr[4] | (addr[5] << 8); - lan78xx_write_reg(dev, RX_ADDRL, addr_lo); - lan78xx_write_reg(dev, RX_ADDRH, addr_hi); + ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo); + ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi); } - lan78xx_write_reg(dev, MAF_LO(0), addr_lo); - lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); + ret = lan78xx_write_reg(dev, MAF_LO(0), addr_lo); + ret = lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); ether_addr_copy(dev->net->dev_addr, addr); } @@ -1851,8 +1856,33 @@ static void lan78xx_remove_mdio(struct lan78xx_net *dev) static void lan78xx_link_status_change(struct net_device *net) { struct phy_device *phydev = net->phydev; + int ret, temp; - phy_print_status(phydev); + /* At forced 100 F/H mode, chip may fail to set mode correctly + * when cable is switched between long(~50+m) and short one. + * As workaround, set to 10 before setting to 100 + * at forced 100 F/H mode. + */ + if (!phydev->autoneg && (phydev->speed == 100)) { + /* disable phy interrupt */ + temp = phy_read(phydev, LAN88XX_INT_MASK); + temp &= ~LAN88XX_INT_MASK_MDINTPIN_EN_; + ret = phy_write(phydev, LAN88XX_INT_MASK, temp); + + temp = phy_read(phydev, MII_BMCR); + temp &= ~(BMCR_SPEED100 | BMCR_SPEED1000); + phy_write(phydev, MII_BMCR, temp); /* set to 10 first */ + temp |= BMCR_SPEED100; + phy_write(phydev, MII_BMCR, temp); /* set to 100 later */ + + /* clear pending interrupt generated while workaround */ + temp = phy_read(phydev, LAN88XX_INT_STS); + + /* enable phy interrupt back */ + temp = phy_read(phydev, LAN88XX_INT_MASK); + temp |= LAN88XX_INT_MASK_MDINTPIN_EN_; + ret = phy_write(phydev, LAN88XX_INT_MASK, temp); + } } static int irq_map(struct irq_domain *d, unsigned int irq, @@ -1905,13 +1935,14 @@ static void lan78xx_irq_bus_sync_unlock(struct irq_data *irqd) struct lan78xx_net *dev = container_of(data, struct lan78xx_net, domain_data); u32 buf; + int ret; /* call register access here because irq_bus_lock & irq_bus_sync_unlock * are only two callbacks executed in non-atomic contex. */ - lan78xx_read_reg(dev, INT_EP_CTL, &buf); + ret = lan78xx_read_reg(dev, INT_EP_CTL, &buf); if (buf != data->irqenable) - lan78xx_write_reg(dev, INT_EP_CTL, data->irqenable); + ret = lan78xx_write_reg(dev, INT_EP_CTL, data->irqenable); mutex_unlock(&data->irq_lock); } @@ -1978,6 +2009,7 @@ static void lan78xx_remove_irq_domain(struct lan78xx_net *dev) static int lan8835_fixup(struct phy_device *phydev) { int buf; + int ret; struct lan78xx_net *dev = netdev_priv(phydev->attached_dev); /* LED2/PME_N/IRQ_N/RGMII_ID pin to IRQ_N mode */ @@ -1987,11 +2019,11 @@ static int lan8835_fixup(struct phy_device *phydev) phy_write_mmd(phydev, MDIO_MMD_PCS, 0x8010, buf); /* RGMII MAC TXC Delay Enable */ - lan78xx_write_reg(dev, MAC_RGMII_ID, + ret = lan78xx_write_reg(dev, MAC_RGMII_ID, MAC_RGMII_ID_TXC_DELAY_EN_); /* RGMII TX DLL Tune Adjust */ - lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); + ret = lan78xx_write_reg(dev, RGMII_TX_BYP_DLL, 0x3D00); dev->interface = PHY_INTERFACE_MODE_RGMII_TXID; @@ -2175,27 +2207,28 @@ static int lan78xx_phy_init(struct lan78xx_net *dev) static int lan78xx_set_rx_max_frame_length(struct lan78xx_net *dev, int size) { + int ret = 0; u32 buf; bool rxenabled; - lan78xx_read_reg(dev, MAC_RX, &buf); + ret = lan78xx_read_reg(dev, MAC_RX, &buf); rxenabled = ((buf & MAC_RX_RXEN_) != 0); if (rxenabled) { buf &= ~MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret = lan78xx_write_reg(dev, MAC_RX, buf); } /* add 4 to size for FCS */ buf &= ~MAC_RX_MAX_SIZE_MASK_; buf |= (((size + 4) << MAC_RX_MAX_SIZE_SHIFT_) & MAC_RX_MAX_SIZE_MASK_); - lan78xx_write_reg(dev, MAC_RX, buf); + ret = lan78xx_write_reg(dev, MAC_RX, buf); if (rxenabled) { buf |= MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret = lan78xx_write_reg(dev, MAC_RX, buf); } return 0; @@ -2252,12 +2285,13 @@ static int lan78xx_change_mtu(struct net_device *netdev, int new_mtu) int ll_mtu = new_mtu + netdev->hard_header_len; int old_hard_mtu = dev->hard_mtu; int old_rx_urb_size = dev->rx_urb_size; + int ret; /* no second zero-length packet read wanted after mtu-sized packets */ if ((ll_mtu % dev->maxpacket) == 0) return -EDOM; - lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN); + ret = lan78xx_set_rx_max_frame_length(dev, new_mtu + VLAN_ETH_HLEN); netdev->mtu = new_mtu; @@ -2280,6 +2314,7 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) struct lan78xx_net *dev = netdev_priv(netdev); struct sockaddr *addr = p; u32 addr_lo, addr_hi; + int ret; if (netif_running(netdev)) return -EBUSY; @@ -2296,12 +2331,12 @@ static int lan78xx_set_mac_addr(struct net_device *netdev, void *p) addr_hi = netdev->dev_addr[4] | netdev->dev_addr[5] << 8; - lan78xx_write_reg(dev, RX_ADDRL, addr_lo); - lan78xx_write_reg(dev, RX_ADDRH, addr_hi); + ret = lan78xx_write_reg(dev, RX_ADDRL, addr_lo); + ret = lan78xx_write_reg(dev, RX_ADDRH, addr_hi); /* Added to support MAC address changes */ - lan78xx_write_reg(dev, MAF_LO(0), addr_lo); - lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); + ret = lan78xx_write_reg(dev, MAF_LO(0), addr_lo); + ret = lan78xx_write_reg(dev, MAF_HI(0), addr_hi | MAF_HI_VALID_); return 0; } @@ -2313,6 +2348,7 @@ static int lan78xx_set_features(struct net_device *netdev, struct lan78xx_net *dev = netdev_priv(netdev); struct lan78xx_priv *pdata = (struct lan78xx_priv *)(dev->data[0]); unsigned long flags; + int ret; spin_lock_irqsave(&pdata->rfe_ctl_lock, flags); @@ -2336,7 +2372,7 @@ static int lan78xx_set_features(struct net_device *netdev, spin_unlock_irqrestore(&pdata->rfe_ctl_lock, flags); - lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); + ret = lan78xx_write_reg(dev, RFE_CTL, pdata->rfe_ctl); return 0; } @@ -3792,6 +3828,7 @@ static u16 lan78xx_wakeframe_crc16(const u8 *buf, int len) static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) { u32 buf; + int ret; int mask_index; u16 crc; u32 temp_wucsr; @@ -3800,26 +3837,26 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) const u8 ipv6_multicast[3] = { 0x33, 0x33 }; const u8 arp_type[2] = { 0x08, 0x06 }; - lan78xx_read_reg(dev, MAC_TX, &buf); + ret = lan78xx_read_reg(dev, MAC_TX, &buf); buf &= ~MAC_TX_TXEN_; - lan78xx_write_reg(dev, MAC_TX, buf); - lan78xx_read_reg(dev, MAC_RX, &buf); + ret = lan78xx_write_reg(dev, MAC_TX, buf); + ret = lan78xx_read_reg(dev, MAC_RX, &buf); buf &= ~MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret = lan78xx_write_reg(dev, MAC_RX, buf); - lan78xx_write_reg(dev, WUCSR, 0); - lan78xx_write_reg(dev, WUCSR2, 0); - lan78xx_write_reg(dev, WK_SRC, 0xFFF1FF1FUL); + ret = lan78xx_write_reg(dev, WUCSR, 0); + ret = lan78xx_write_reg(dev, WUCSR2, 0); + ret = lan78xx_write_reg(dev, WK_SRC, 0xFFF1FF1FUL); temp_wucsr = 0; temp_pmt_ctl = 0; - lan78xx_read_reg(dev, PMT_CTL, &temp_pmt_ctl); + ret = lan78xx_read_reg(dev, PMT_CTL, &temp_pmt_ctl); temp_pmt_ctl &= ~PMT_CTL_RES_CLR_WKP_EN_; temp_pmt_ctl |= PMT_CTL_RES_CLR_WKP_STS_; for (mask_index = 0; mask_index < NUM_OF_WUF_CFG; mask_index++) - lan78xx_write_reg(dev, WUF_CFG(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_CFG(mask_index), 0); mask_index = 0; if (wol & WAKE_PHY) { @@ -3848,30 +3885,30 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) /* set WUF_CFG & WUF_MASK for IPv4 Multicast */ crc = lan78xx_wakeframe_crc16(ipv4_multicast, 3); - lan78xx_write_reg(dev, WUF_CFG(mask_index), + ret = lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_MCAST_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); - lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); - lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK0(mask_index), 7); + ret = lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; /* for IPv6 Multicast */ crc = lan78xx_wakeframe_crc16(ipv6_multicast, 2); - lan78xx_write_reg(dev, WUF_CFG(mask_index), + ret = lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_MCAST_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); - lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); - lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK0(mask_index), 3); + ret = lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; temp_pmt_ctl |= PMT_CTL_WOL_EN_; @@ -3892,16 +3929,16 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) * for packettype (offset 12,13) = ARP (0x0806) */ crc = lan78xx_wakeframe_crc16(arp_type, 2); - lan78xx_write_reg(dev, WUF_CFG(mask_index), + ret = lan78xx_write_reg(dev, WUF_CFG(mask_index), WUF_CFGX_EN_ | WUF_CFGX_TYPE_ALL_ | (0 << WUF_CFGX_OFFSET_SHIFT_) | (crc & WUF_CFGX_CRC16_MASK_)); - lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); - lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); - lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK0(mask_index), 0x3000); + ret = lan78xx_write_reg(dev, WUF_MASK1(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK2(mask_index), 0); + ret = lan78xx_write_reg(dev, WUF_MASK3(mask_index), 0); mask_index++; temp_pmt_ctl |= PMT_CTL_WOL_EN_; @@ -3909,7 +3946,7 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) temp_pmt_ctl |= PMT_CTL_SUS_MODE_0_; } - lan78xx_write_reg(dev, WUCSR, temp_wucsr); + ret = lan78xx_write_reg(dev, WUCSR, temp_wucsr); /* when multiple WOL bits are set */ if (hweight_long((unsigned long)wol) > 1) { @@ -3917,16 +3954,16 @@ static int lan78xx_set_suspend(struct lan78xx_net *dev, u32 wol) temp_pmt_ctl &= ~PMT_CTL_SUS_MODE_MASK_; temp_pmt_ctl |= PMT_CTL_SUS_MODE_0_; } - lan78xx_write_reg(dev, PMT_CTL, temp_pmt_ctl); + ret = lan78xx_write_reg(dev, PMT_CTL, temp_pmt_ctl); /* clear WUPS */ - lan78xx_read_reg(dev, PMT_CTL, &buf); + ret = lan78xx_read_reg(dev, PMT_CTL, &buf); buf |= PMT_CTL_WUPS_MASK_; - lan78xx_write_reg(dev, PMT_CTL, buf); + ret = lan78xx_write_reg(dev, PMT_CTL, buf); - lan78xx_read_reg(dev, MAC_RX, &buf); + ret = lan78xx_read_reg(dev, MAC_RX, &buf); buf |= MAC_RX_RXEN_; - lan78xx_write_reg(dev, MAC_RX, buf); + ret = lan78xx_write_reg(dev, MAC_RX, buf); return 0; }
diff --git a/drivers/net/usb/plusb.c b/drivers/net/usb/plusb.c index ce7862d..17c9c63 100644 --- a/drivers/net/usb/plusb.c +++ b/drivers/net/usb/plusb.c
@@ -57,7 +57,9 @@ static inline int pl_vendor_req(struct usbnet *dev, u8 req, u8 val, u8 index) { - return usbnet_write_cmd(dev, req, USB_TYPE_VENDOR | USB_RECIP_DEVICE, + return usbnet_read_cmd(dev, req, + USB_DIR_IN | USB_TYPE_VENDOR | + USB_RECIP_DEVICE, val, index, NULL, 0); }
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index c2307cf..8ef0a01 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c
@@ -1046,7 +1046,6 @@ static const struct usb_device_id products[] = { {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0512)}, /* Quectel EG12/EM12 */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0620)}, /* Quectel EM160R-GL */ {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0800)}, /* Quectel RM500Q-GL */ - {QMI_MATCH_FF_FF_FF(0x2c7c, 0x0801)}, /* Quectel RM520N */ /* 3. Combined interface devices matching on interface number */ {QMI_FIXED_INTF(0x0408, 0xea42, 4)}, /* Yota / Megafon M100-1 */ @@ -1314,12 +1313,10 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x2357, 0x0201, 4)}, /* TP-LINK HSUPA Modem MA180 */ {QMI_FIXED_INTF(0x2357, 0x9000, 4)}, /* TP-LINK MA260 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1031, 3)}, /* Telit LE910C1-EUX */ - {QMI_QUIRK_SET_DTR(0x1bc7, 0x103a, 0)}, /* Telit LE910C4-WWX */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1040, 2)}, /* Telit LE922A */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1050, 2)}, /* Telit FN980 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1060, 2)}, /* Telit LN920 */ {QMI_QUIRK_SET_DTR(0x1bc7, 0x1070, 2)}, /* Telit FN990 */ - {QMI_QUIRK_SET_DTR(0x1bc7, 0x1080, 2)}, /* Telit FE990 */ {QMI_FIXED_INTF(0x1bc7, 0x1100, 3)}, /* Telit ME910 */ {QMI_FIXED_INTF(0x1bc7, 0x1101, 3)}, /* Telit ME910 dual modem */ {QMI_FIXED_INTF(0x1bc7, 0x1200, 5)}, /* Telit LE920 */ @@ -1356,7 +1353,6 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x413c, 0x81b3, 8)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ {QMI_FIXED_INTF(0x413c, 0x81b6, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81b6, 10)}, /* Dell Wireless 5811e */ - {QMI_FIXED_INTF(0x413c, 0x81c2, 8)}, /* Dell Wireless 5811e */ {QMI_FIXED_INTF(0x413c, 0x81cc, 8)}, /* Dell Wireless 5816e */ {QMI_FIXED_INTF(0x413c, 0x81d7, 0)}, /* Dell Wireless 5821e */ {QMI_FIXED_INTF(0x413c, 0x81d7, 1)}, /* Dell Wireless 5821e preproduction config */ @@ -1375,7 +1371,6 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x0489, 0xe0b4, 0)}, /* Foxconn T77W968 LTE */ {QMI_FIXED_INTF(0x0489, 0xe0b5, 0)}, /* Foxconn T77W968 LTE with eSIM support*/ {QMI_FIXED_INTF(0x2692, 0x9025, 4)}, /* Cellient MPL200 (rebranded Qualcomm 05c6:9025) */ - {QMI_QUIRK_SET_DTR(0x1546, 0x1342, 4)}, /* u-blox LARA-L6 */ /* 4. Gobi 1000 devices */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index b0412d1..873f288 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c
@@ -1479,9 +1479,7 @@ static void intr_callback(struct urb *urb) "Stop submitting intr, status %d\n", status); return; case -EOVERFLOW: - if (net_ratelimit()) - netif_info(tp, intr, tp->netdev, - "intr status -EOVERFLOW\n"); + netif_info(tp, intr, tp->netdev, "intr status -EOVERFLOW\n"); goto resubmit; /* -EPIPE: should clear the halt */ default: @@ -5823,7 +5821,6 @@ static const struct usb_device_id rtl8152_table[] = { {REALTEK_USB_DEVICE(VENDOR_ID_MICROSOFT, 0x0927)}, {REALTEK_USB_DEVICE(VENDOR_ID_SAMSUNG, 0xa101)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x304f)}, - {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3054)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3062)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x3069)}, {REALTEK_USB_DEVICE(VENDOR_ID_LENOVO, 0x7205)},
diff --git a/drivers/net/usb/rndis_host.c b/drivers/net/usb/rndis_host.c index 1ff723e..1505fe3 100644 --- a/drivers/net/usb/rndis_host.c +++ b/drivers/net/usb/rndis_host.c
@@ -255,8 +255,7 @@ static int rndis_query(struct usbnet *dev, struct usb_interface *intf, off = le32_to_cpu(u.get_c->offset); len = le32_to_cpu(u.get_c->len); - if (unlikely((off > CONTROL_BUFFER_SIZE - 8) || - (len > CONTROL_BUFFER_SIZE - 8 - off))) + if (unlikely((8 + off + len) > CONTROL_BUFFER_SIZE)) goto response_error; if (*reply_len != -1 && len != *reply_len)
diff --git a/drivers/net/usb/smsc75xx.c b/drivers/net/usb/smsc75xx.c index bd53382..aa848be 100644 --- a/drivers/net/usb/smsc75xx.c +++ b/drivers/net/usb/smsc75xx.c
@@ -2198,13 +2198,6 @@ static int smsc75xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) size = (rx_cmd_a & RX_CMD_A_LEN) - RXW_PADDING; align_count = (4 - ((size + RXW_PADDING) % 4)) % 4; - if (unlikely(size > skb->len)) { - netif_dbg(dev, rx_err, dev->net, - "size err rx_cmd_a=0x%08x\n", - rx_cmd_a); - return 0; - } - if (unlikely(rx_cmd_a & RX_CMD_A_RED)) { netif_dbg(dev, rx_err, dev->net, "Error rx_cmd_a=0x%08x\n", rx_cmd_a);
diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c index 9a770f7..bb4ccbd 100644 --- a/drivers/net/usb/smsc95xx.c +++ b/drivers/net/usb/smsc95xx.c
@@ -1935,12 +1935,6 @@ static int smsc95xx_rx_fixup(struct usbnet *dev, struct sk_buff *skb) size = (u16)((header & RX_STS_FL_) >> 16); align_count = (4 - ((size + NET_IP_ALIGN) % 4)) % 4; - if (unlikely(size > skb->len)) { - netif_dbg(dev, rx_err, dev->net, - "size err header=0x%08x\n", header); - return 0; - } - if (unlikely(header & RX_STS_ES_)) { netif_dbg(dev, rx_err, dev->net, "Error header=0x%08x\n", header);
diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c index 811c875..fce6713 100644 --- a/drivers/net/usb/sr9700.c +++ b/drivers/net/usb/sr9700.c
@@ -410,7 +410,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb) /* ignore the CRC length */ len = (skb->data[1] | (skb->data[2] << 8)) - 4; - if (len > ETH_FRAME_LEN || len > skb->len || len < 0) + if (len > ETH_FRAME_LEN || len > skb->len) return 0; /* the last packet of current skb */
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c index b2eb778..598af8f 100644 --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c
@@ -858,11 +858,13 @@ int usbnet_stop (struct net_device *net) mpn = !test_and_clear_bit(EVENT_NO_RUNTIME_PM, &dev->flags); - /* deferred work (timer, softirq, task) must also stop */ + /* deferred work (task, timer, softirq) must also stop. + * can't flush_scheduled_work() until we drop rtnl (later), + * else workers could deadlock; so make workers a NOP. + */ dev->flags = 0; del_timer_sync (&dev->delay); tasklet_kill (&dev->bh); - cancel_work_sync(&dev->kevent); if (!pm) usb_autopm_put_interface(dev->intf); @@ -1620,7 +1622,6 @@ void usbnet_disconnect (struct usb_interface *intf) struct usbnet *dev; struct usb_device *xdev; struct net_device *net; - struct urb *urb; dev = usb_get_intfdata(intf); usb_set_intfdata(intf, NULL); @@ -1637,11 +1638,9 @@ void usbnet_disconnect (struct usb_interface *intf) net = dev->net; unregister_netdev (net); - while ((urb = usb_get_from_anchor(&dev->deferred))) { - dev_kfree_skb(urb->context); - kfree(urb->sg); - usb_free_urb(urb); - } + cancel_work_sync(&dev->kevent); + + usb_scuttle_anchored_urbs(&dev->deferred); if (dev->driver_info->unbind) dev->driver_info->unbind (dev, intf);
diff --git a/drivers/net/virtio_net.c b/drivers/net/virtio_net.c index bf2e31c..4a548d4 100644 --- a/drivers/net/virtio_net.c +++ b/drivers/net/virtio_net.c
@@ -646,13 +646,8 @@ static struct page *xdp_linearize_page(struct receive_queue *rq, int page_off, unsigned int *len) { - int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); - struct page *page; + struct page *page = alloc_page(GFP_ATOMIC); - if (page_off + *len + tailroom > PAGE_SIZE) - return NULL; - - page = alloc_page(GFP_ATOMIC); if (!page) return NULL; @@ -660,6 +655,7 @@ static struct page *xdp_linearize_page(struct receive_queue *rq, page_off += *len; while (--*num_buf) { + int tailroom = SKB_DATA_ALIGN(sizeof(struct skb_shared_info)); unsigned int buflen; void *buf; int off; @@ -1914,8 +1910,8 @@ static int virtnet_close(struct net_device *dev) cancel_delayed_work_sync(&vi->refill); for (i = 0; i < vi->max_queue_pairs; i++) { - napi_disable(&vi->rq[i].napi); xdp_rxq_info_unreg(&vi->rq[i].xdp_rxq); + napi_disable(&vi->rq[i].napi); virtnet_napi_tx_disable(&vi->sq[i].napi); }
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c index 6ac6a64..1901ec7 100644 --- a/drivers/net/wan/farsync.c +++ b/drivers/net/wan/farsync.c
@@ -569,8 +569,8 @@ static void do_bottom_half_rx(struct fst_card_info *card); static void fst_process_tx_work_q(unsigned long work_q); static void fst_process_int_work_q(unsigned long work_q); -static DECLARE_TASKLET_OLD(fst_tx_task, fst_process_tx_work_q); -static DECLARE_TASKLET_OLD(fst_int_task, fst_process_int_work_q); +static DECLARE_TASKLET(fst_tx_task, fst_process_tx_work_q, 0); +static DECLARE_TASKLET(fst_int_task, fst_process_int_work_q, 0); static struct fst_card_info *fst_card_array[FST_MAX_CARDS]; static spinlock_t fst_work_q_lock; @@ -2613,7 +2613,6 @@ fst_remove_one(struct pci_dev *pdev) for (i = 0; i < card->nports; i++) { struct net_device *dev = port_to_dev(&card->ports[i]); unregister_hdlc_device(dev); - free_netdev(dev); } fst_disable_intr(card); @@ -2634,7 +2633,6 @@ fst_remove_one(struct pci_dev *pdev) card->tx_dma_handle_card); } fst_card_array[card->card_no] = NULL; - kfree(card); } static struct pci_driver fst_driver = {
diff --git a/drivers/net/wan/fsl_ucc_hdlc.c b/drivers/net/wan/fsl_ucc_hdlc.c index 46077ce..034eb65 100644 --- a/drivers/net/wan/fsl_ucc_hdlc.c +++ b/drivers/net/wan/fsl_ucc_hdlc.c
@@ -1249,11 +1249,9 @@ static int ucc_hdlc_probe(struct platform_device *pdev) free_dev: free_netdev(dev); undo_uhdlc_init: - if (utdm) - iounmap(utdm->siram); + iounmap(utdm->siram); unmap_si_regs: - if (utdm) - iounmap(utdm->si_regs); + iounmap(utdm->si_regs); free_utdm: if (uhdlc_priv->tsa) kfree(utdm);
diff --git a/drivers/net/wan/lapbether.c b/drivers/net/wan/lapbether.c index bbcd8ef..4e42954 100644 --- a/drivers/net/wan/lapbether.c +++ b/drivers/net/wan/lapbether.c
@@ -403,7 +403,7 @@ static int lapbeth_device_event(struct notifier_block *this, if (dev_net(dev) != &init_net) return NOTIFY_DONE; - if (!dev_is_ethdev(dev) && !lapbeth_get_x25_dev(dev)) + if (!dev_is_ethdev(dev)) return NOTIFY_DONE; switch (event) {
diff --git a/drivers/net/wireguard/queueing.h b/drivers/net/wireguard/queueing.h index 1a7aaa2..e238810 100644 --- a/drivers/net/wireguard/queueing.h +++ b/drivers/net/wireguard/queueing.h
@@ -82,17 +82,6 @@ static inline void wg_reset_packet(struct sk_buff *skb, bool encapsulating) memset(&skb->headers_start, 0, offsetof(struct sk_buff, headers_end) - offsetof(struct sk_buff, headers_start)); - - /* ANDROID: - * Due to attempts to keep the ABI stable for struct sk_buff, the new - * fields were incorrectly added _AFTER_ the headers_end field, which - * requires that we manually copy the fields here from the old to the - * new one. - * Be sure to add any new field that is added in the - * ANDROID_KABI_REPLACE() macros below here as well. - */ - skb->scm_io_uring = 0; - if (encapsulating) { skb->l4_hash = l4_hash; skb->sw_hash = sw_hash;
diff --git a/drivers/net/wireless/ath/ar5523/ar5523.c b/drivers/net/wireless/ath/ar5523/ar5523.c index 5d3cf35..58e189e 100644 --- a/drivers/net/wireless/ath/ar5523/ar5523.c +++ b/drivers/net/wireless/ath/ar5523/ar5523.c
@@ -241,11 +241,6 @@ static void ar5523_cmd_tx_cb(struct urb *urb) } } -static void ar5523_cancel_tx_cmd(struct ar5523 *ar) -{ - usb_kill_urb(ar->tx_cmd.urb_tx); -} - static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata, int ilen, void *odata, int olen, int flags) { @@ -285,7 +280,6 @@ static int ar5523_cmd(struct ar5523 *ar, u32 code, const void *idata, } if (!wait_for_completion_timeout(&cmd->done, 2 * HZ)) { - ar5523_cancel_tx_cmd(ar); cmd->odata = NULL; ar5523_err(ar, "timeout waiting for command %02x reply\n", code);
diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c index afa3cc9..3026eb5 100644 --- a/drivers/net/wireless/ath/ath10k/mac.c +++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -856,36 +856,11 @@ static int ath10k_peer_delete(struct ath10k *ar, u32 vdev_id, const u8 *addr) return 0; } -static void ath10k_peer_map_cleanup(struct ath10k *ar, struct ath10k_peer *peer) -{ - int peer_id, i; - - lockdep_assert_held(&ar->conf_mutex); - - for_each_set_bit(peer_id, peer->peer_ids, - ATH10K_MAX_NUM_PEER_IDS) { - ar->peer_map[peer_id] = NULL; - } - - /* Double check that peer is properly un-referenced from - * the peer_map - */ - for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++) { - if (ar->peer_map[i] == peer) { - ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %pK idx %d)\n", - peer->addr, peer, i); - ar->peer_map[i] = NULL; - } - } - - list_del(&peer->list); - kfree(peer); - ar->num_peers--; -} - static void ath10k_peer_cleanup(struct ath10k *ar, u32 vdev_id) { struct ath10k_peer *peer, *tmp; + int peer_id; + int i; lockdep_assert_held(&ar->conf_mutex); @@ -897,7 +872,25 @@ static void ath10k_peer_cleanup(struct ath10k *ar, u32 vdev_id) ath10k_warn(ar, "removing stale peer %pM from vdev_id %d\n", peer->addr, vdev_id); - ath10k_peer_map_cleanup(ar, peer); + for_each_set_bit(peer_id, peer->peer_ids, + ATH10K_MAX_NUM_PEER_IDS) { + ar->peer_map[peer_id] = NULL; + } + + /* Double check that peer is properly un-referenced from + * the peer_map + */ + for (i = 0; i < ARRAY_SIZE(ar->peer_map); i++) { + if (ar->peer_map[i] == peer) { + ath10k_warn(ar, "removing stale peer_map entry for %pM (ptr %pK idx %d)\n", + peer->addr, peer, i); + ar->peer_map[i] = NULL; + } + } + + list_del(&peer->list); + kfree(peer); + ar->num_peers--; } spin_unlock_bh(&ar->data_lock); } @@ -6648,7 +6641,10 @@ static int ath10k_sta_state(struct ieee80211_hw *hw, /* Clean up the peer object as well since we * must have failed to do this above. */ - ath10k_peer_map_cleanup(ar, peer); + list_del(&peer->list); + ar->peer_map[i] = NULL; + kfree(peer); + ar->num_peers--; } } spin_unlock_bh(&ar->data_lock);
diff --git a/drivers/net/wireless/ath/ath10k/pci.c b/drivers/net/wireless/ath/ath10k/pci.c index c28328c..0f055e5 100644 --- a/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -3769,22 +3769,18 @@ static struct pci_driver ath10k_pci_driver = { static int __init ath10k_pci_init(void) { - int ret1, ret2; + int ret; - ret1 = pci_register_driver(&ath10k_pci_driver); - if (ret1) + ret = pci_register_driver(&ath10k_pci_driver); + if (ret) printk(KERN_ERR "failed to register ath10k pci driver: %d\n", - ret1); + ret); - ret2 = ath10k_ahb_init(); - if (ret2) - printk(KERN_ERR "ahb init failed: %d\n", ret2); + ret = ath10k_ahb_init(); + if (ret) + printk(KERN_ERR "ahb init failed: %d\n", ret); - if (ret1 && ret2) - return ret1; - - /* registered to at least one bus */ - return 0; + return ret; } module_init(ath10k_pci_init);
diff --git a/drivers/net/wireless/ath/ath10k/snoc.c b/drivers/net/wireless/ath/ath10k/snoc.c index b6762fe..d4589b2 100644 --- a/drivers/net/wireless/ath/ath10k/snoc.c +++ b/drivers/net/wireless/ath/ath10k/snoc.c
@@ -1192,12 +1192,13 @@ static void ath10k_snoc_init_napi(struct ath10k *ar) static int ath10k_snoc_request_irq(struct ath10k *ar) { struct ath10k_snoc *ar_snoc = ath10k_snoc_priv(ar); + int irqflags = IRQF_TRIGGER_RISING; int ret, id; for (id = 0; id < CE_COUNT_MAX; id++) { ret = request_irq(ar_snoc->ce_irqs[id].irq_line, - ath10k_snoc_per_engine_handler, 0, - ce_name[id], ar); + ath10k_snoc_per_engine_handler, + irqflags, ce_name[id], ar); if (ret) { ath10k_err(ar, "failed to register IRQ handler for CE %d: %d",
diff --git a/drivers/net/wireless/ath/ath10k/wmi.c b/drivers/net/wireless/ath/ath10k/wmi.c index 4adbe3a..796bd93 100644 --- a/drivers/net/wireless/ath/ath10k/wmi.c +++ b/drivers/net/wireless/ath/ath10k/wmi.c
@@ -9462,5 +9462,7 @@ void ath10k_wmi_detach(struct ath10k *ar) } cancel_work_sync(&ar->svc_rdy_work); - dev_kfree_skb(ar->svc_rdy_skb); + + if (ar->svc_rdy_skb) + dev_kfree_skb(ar->svc_rdy_skb); }
diff --git a/drivers/net/wireless/ath/ath9k/hif_usb.c b/drivers/net/wireless/ath/ath9k/hif_usb.c index e23d58f..c8c7afe 100644 --- a/drivers/net/wireless/ath/ath9k/hif_usb.c +++ b/drivers/net/wireless/ath/ath9k/hif_usb.c
@@ -244,11 +244,11 @@ static inline void ath9k_skb_queue_complete(struct hif_device_usb *hif_dev, ath9k_htc_txcompletion_cb(hif_dev->htc_handle, skb, txok); if (txok) { - TX_STAT_INC(hif_dev, skb_success); - TX_STAT_ADD(hif_dev, skb_success_bytes, ln); + TX_STAT_INC(skb_success); + TX_STAT_ADD(skb_success_bytes, ln); } else - TX_STAT_INC(hif_dev, skb_failed); + TX_STAT_INC(skb_failed); } } @@ -302,7 +302,7 @@ static void hif_usb_tx_cb(struct urb *urb) hif_dev->tx.tx_buf_cnt++; if (!(hif_dev->tx.flags & HIF_USB_TX_STOP)) __hif_usb_tx(hif_dev); /* Check for pending SKBs */ - TX_STAT_INC(hif_dev, buf_completed); + TX_STAT_INC(buf_completed); spin_unlock(&hif_dev->tx.tx_lock); } @@ -353,7 +353,7 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev) tx_buf->len += tx_buf->offset; __skb_queue_tail(&tx_buf->skb_queue, nskb); - TX_STAT_INC(hif_dev, skb_queued); + TX_STAT_INC(skb_queued); } usb_fill_bulk_urb(tx_buf->urb, hif_dev->udev, @@ -368,10 +368,11 @@ static int __hif_usb_tx(struct hif_device_usb *hif_dev) __skb_queue_head_init(&tx_buf->skb_queue); list_move_tail(&tx_buf->list, &hif_dev->tx.tx_buf); hif_dev->tx.tx_buf_cnt++; - } else { - TX_STAT_INC(hif_dev, buf_queued); } + if (!ret) + TX_STAT_INC(buf_queued); + return ret; } @@ -514,7 +515,7 @@ static void hif_usb_sta_drain(void *hif_handle, u8 idx) ath9k_htc_txcompletion_cb(hif_dev->htc_handle, skb, false); hif_dev->tx.tx_skb_cnt--; - TX_STAT_INC(hif_dev, skb_failed); + TX_STAT_INC(skb_failed); } } @@ -561,11 +562,11 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, memcpy(ptr, skb->data, rx_remain_len); rx_pkt_len += rx_remain_len; + hif_dev->rx_remain_len = 0; skb_put(remain_skb, rx_pkt_len); skb_pool[pool_index++] = remain_skb; - hif_dev->remain_skb = NULL; - hif_dev->rx_remain_len = 0; + } else { index = rx_remain_len; } @@ -584,21 +585,16 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, pkt_len = get_unaligned_le16(ptr + index); pkt_tag = get_unaligned_le16(ptr + index + 2); - /* It is supposed that if we have an invalid pkt_tag or - * pkt_len then the whole input SKB is considered invalid - * and dropped; the associated packets already in skb_pool - * are dropped, too. - */ if (pkt_tag != ATH_USB_RX_STREAM_MODE_TAG) { - RX_STAT_INC(hif_dev, skb_dropped); - goto invalid_pkt; + RX_STAT_INC(skb_dropped); + return; } if (pkt_len > 2 * MAX_RX_BUF_SIZE) { dev_err(&hif_dev->udev->dev, "ath9k_htc: invalid pkt_len (%x)\n", pkt_len); - RX_STAT_INC(hif_dev, skb_dropped); - goto invalid_pkt; + RX_STAT_INC(skb_dropped); + return; } pad_len = 4 - (pkt_len & 0x3); @@ -610,6 +606,11 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, if (index > MAX_RX_BUF_SIZE) { spin_lock(&hif_dev->rx_lock); + hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE; + hif_dev->rx_transfer_len = + MAX_RX_BUF_SIZE - chk_idx - 4; + hif_dev->rx_pad_len = pad_len; + nskb = __dev_alloc_skb(pkt_len + 32, GFP_ATOMIC); if (!nskb) { dev_err(&hif_dev->udev->dev, @@ -617,14 +618,8 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, spin_unlock(&hif_dev->rx_lock); goto err; } - - hif_dev->rx_remain_len = index - MAX_RX_BUF_SIZE; - hif_dev->rx_transfer_len = - MAX_RX_BUF_SIZE - chk_idx - 4; - hif_dev->rx_pad_len = pad_len; - skb_reserve(nskb, 32); - RX_STAT_INC(hif_dev, skb_allocated); + RX_STAT_INC(skb_allocated); memcpy(nskb->data, &(skb->data[chk_idx+4]), hif_dev->rx_transfer_len); @@ -645,7 +640,7 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, goto err; } skb_reserve(nskb, 32); - RX_STAT_INC(hif_dev, skb_allocated); + RX_STAT_INC(skb_allocated); memcpy(nskb->data, &(skb->data[chk_idx+4]), pkt_len); skb_put(nskb, pkt_len); @@ -655,18 +650,11 @@ static void ath9k_hif_usb_rx_stream(struct hif_device_usb *hif_dev, err: for (i = 0; i < pool_index; i++) { - RX_STAT_ADD(hif_dev, skb_completed_bytes, skb_pool[i]->len); + RX_STAT_ADD(skb_completed_bytes, skb_pool[i]->len); ath9k_htc_rx_msg(hif_dev->htc_handle, skb_pool[i], skb_pool[i]->len, USB_WLAN_RX_PIPE); - RX_STAT_INC(hif_dev, skb_completed); + RX_STAT_INC(skb_completed); } - return; -invalid_pkt: - for (i = 0; i < pool_index; i++) { - dev_kfree_skb_any(skb_pool[i]); - RX_STAT_INC(hif_dev, skb_dropped); - } - return; } static void ath9k_hif_usb_rx_cb(struct urb *urb) @@ -721,13 +709,14 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) struct rx_buf *rx_buf = (struct rx_buf *)urb->context; struct hif_device_usb *hif_dev = rx_buf->hif_dev; struct sk_buff *skb = rx_buf->skb; + struct sk_buff *nskb; int ret; if (!skb) return; if (!hif_dev) - goto free_skb; + goto free; switch (urb->status) { case 0: @@ -736,7 +725,7 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) case -ECONNRESET: case -ENODEV: case -ESHUTDOWN: - goto free_skb; + goto free; default: skb_reset_tail_pointer(skb); skb_trim(skb, 0); @@ -747,27 +736,25 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) if (likely(urb->actual_length != 0)) { skb_put(skb, urb->actual_length); - /* - * Process the command first. - * skb is either freed here or passed to be - * managed to another callback function. - */ + /* Process the command first */ ath9k_htc_rx_msg(hif_dev->htc_handle, skb, skb->len, USB_REG_IN_PIPE); - skb = alloc_skb(MAX_REG_IN_BUF_SIZE, GFP_ATOMIC); - if (!skb) { + + nskb = alloc_skb(MAX_REG_IN_BUF_SIZE, GFP_ATOMIC); + if (!nskb) { dev_err(&hif_dev->udev->dev, "ath9k_htc: REG_IN memory allocation failure\n"); - goto free_rx_buf; + urb->context = NULL; + return; } - rx_buf->skb = skb; + rx_buf->skb = nskb; usb_fill_int_urb(urb, hif_dev->udev, usb_rcvintpipe(hif_dev->udev, USB_REG_IN_PIPE), - skb->data, MAX_REG_IN_BUF_SIZE, + nskb->data, MAX_REG_IN_BUF_SIZE, ath9k_hif_usb_reg_in_cb, rx_buf, 1); } @@ -776,13 +763,12 @@ static void ath9k_hif_usb_reg_in_cb(struct urb *urb) ret = usb_submit_urb(urb, GFP_ATOMIC); if (ret) { usb_unanchor_urb(urb); - goto free_skb; + goto free; } return; -free_skb: +free: kfree_skb(skb); -free_rx_buf: kfree(rx_buf); urb->context = NULL; } @@ -795,10 +781,14 @@ static void ath9k_hif_usb_dealloc_tx_urbs(struct hif_device_usb *hif_dev) spin_lock_irqsave(&hif_dev->tx.tx_lock, flags); list_for_each_entry_safe(tx_buf, tx_buf_tmp, &hif_dev->tx.tx_buf, list) { + usb_get_urb(tx_buf->urb); + spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags); + usb_kill_urb(tx_buf->urb); list_del(&tx_buf->list); usb_free_urb(tx_buf->urb); kfree(tx_buf->buf); kfree(tx_buf); + spin_lock_irqsave(&hif_dev->tx.tx_lock, flags); } spin_unlock_irqrestore(&hif_dev->tx.tx_lock, flags); @@ -1340,24 +1330,10 @@ static int send_eject_command(struct usb_interface *interface) static int ath9k_hif_usb_probe(struct usb_interface *interface, const struct usb_device_id *id) { - struct usb_endpoint_descriptor *bulk_in, *bulk_out, *int_in, *int_out; struct usb_device *udev = interface_to_usbdev(interface); - struct usb_host_interface *alt; struct hif_device_usb *hif_dev; int ret = 0; - /* Verify the expected endpoints are present */ - alt = interface->cur_altsetting; - if (usb_find_common_endpoints(alt, &bulk_in, &bulk_out, &int_in, &int_out) < 0 || - usb_endpoint_num(bulk_in) != USB_WLAN_RX_PIPE || - usb_endpoint_num(bulk_out) != USB_WLAN_TX_PIPE || - usb_endpoint_num(int_in) != USB_REG_IN_PIPE || - usb_endpoint_num(int_out) != USB_REG_OUT_PIPE) { - dev_err(&udev->dev, - "ath9k_htc: Device endpoint numbers are not the expected ones\n"); - return -ENODEV; - } - if (id->driver_info == STORAGE_DEVICE) return send_eject_command(interface);
diff --git a/drivers/net/wireless/ath/ath9k/htc.h b/drivers/net/wireless/ath/ath9k/htc.h index 232e93d..9f64e32 100644 --- a/drivers/net/wireless/ath/ath9k/htc.h +++ b/drivers/net/wireless/ath/ath9k/htc.h
@@ -325,18 +325,14 @@ static inline struct ath9k_htc_tx_ctl *HTC_SKB_CB(struct sk_buff *skb) } #ifdef CONFIG_ATH9K_HTC_DEBUGFS -#define __STAT_SAFE(hif_dev, expr) do { ((hif_dev)->htc_handle->drv_priv ? (expr) : 0); } while (0) -#define CAB_STAT_INC(priv) do { ((priv)->debug.tx_stats.cab_queued++); } while (0) -#define TX_QSTAT_INC(priv, q) do { ((priv)->debug.tx_stats.queue_stats[q]++); } while (0) -#define TX_STAT_INC(hif_dev, c) \ - __STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c++) -#define TX_STAT_ADD(hif_dev, c, a) \ - __STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.tx_stats.c += a) -#define RX_STAT_INC(hif_dev, c) \ - __STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.skbrx_stats.c++) -#define RX_STAT_ADD(hif_dev, c, a) \ - __STAT_SAFE((hif_dev), (hif_dev)->htc_handle->drv_priv->debug.skbrx_stats.c += a) +#define TX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c++) +#define TX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.tx_stats.c += a) +#define RX_STAT_INC(c) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c++) +#define RX_STAT_ADD(c, a) (hif_dev->htc_handle->drv_priv->debug.skbrx_stats.c += a) +#define CAB_STAT_INC priv->debug.tx_stats.cab_queued++ + +#define TX_QSTAT_INC(q) (priv->debug.tx_stats.queue_stats[q]++) void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv, struct ath_rx_status *rs); @@ -376,13 +372,13 @@ void ath9k_htc_get_et_stats(struct ieee80211_hw *hw, struct ethtool_stats *stats, u64 *data); #else -#define TX_STAT_INC(hif_dev, c) do { } while (0) -#define TX_STAT_ADD(hif_dev, c, a) do { } while (0) -#define RX_STAT_INC(hif_dev, c) do { } while (0) -#define RX_STAT_ADD(hif_dev, c, a) do { } while (0) +#define TX_STAT_INC(c) do { } while (0) +#define TX_STAT_ADD(c, a) do { } while (0) +#define RX_STAT_INC(c) do { } while (0) +#define RX_STAT_ADD(c, a) do { } while (0) +#define CAB_STAT_INC do { } while (0) -#define CAB_STAT_INC(priv) -#define TX_QSTAT_INC(priv, c) +#define TX_QSTAT_INC(c) do { } while (0) static inline void ath9k_htc_err_stat_rx(struct ath9k_htc_priv *priv, struct ath_rx_status *rs)
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_init.c b/drivers/net/wireless/ath/ath9k/htc_drv_init.c index eaaafa6..11054c1 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_init.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_init.c
@@ -944,6 +944,7 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, priv->hw = hw; priv->htc = htc_handle; priv->dev = dev; + htc_handle->drv_priv = priv; SET_IEEE80211_DEV(hw, priv->dev); ret = ath9k_htc_wait_for_target(priv); @@ -964,8 +965,6 @@ int ath9k_htc_probe_device(struct htc_target *htc_handle, struct device *dev, if (ret) goto err_init; - htc_handle->drv_priv = priv; - return 0; err_init:
diff --git a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c index ee02173..eeaf63d 100644 --- a/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c +++ b/drivers/net/wireless/ath/ath9k/htc_drv_txrx.c
@@ -106,20 +106,20 @@ static inline enum htc_endpoint_id get_htc_epid(struct ath9k_htc_priv *priv, switch (qnum) { case 0: - TX_QSTAT_INC(priv, IEEE80211_AC_VO); + TX_QSTAT_INC(IEEE80211_AC_VO); epid = priv->data_vo_ep; break; case 1: - TX_QSTAT_INC(priv, IEEE80211_AC_VI); + TX_QSTAT_INC(IEEE80211_AC_VI); epid = priv->data_vi_ep; break; case 2: - TX_QSTAT_INC(priv, IEEE80211_AC_BE); + TX_QSTAT_INC(IEEE80211_AC_BE); epid = priv->data_be_ep; break; case 3: default: - TX_QSTAT_INC(priv, IEEE80211_AC_BK); + TX_QSTAT_INC(IEEE80211_AC_BK); epid = priv->data_bk_ep; break; } @@ -323,7 +323,7 @@ static void ath9k_htc_tx_data(struct ath9k_htc_priv *priv, memcpy(tx_fhdr, (u8 *) &tx_hdr, sizeof(tx_hdr)); if (is_cab) { - CAB_STAT_INC(priv); + CAB_STAT_INC; tx_ctl->epid = priv->cab_ep; return; }
diff --git a/drivers/net/wireless/ath/ath9k/htc_hst.c b/drivers/net/wireless/ath/ath9k/htc_hst.c index fe62ff6..994ec48 100644 --- a/drivers/net/wireless/ath/ath9k/htc_hst.c +++ b/drivers/net/wireless/ath/ath9k/htc_hst.c
@@ -364,34 +364,40 @@ void ath9k_htc_txcompletion_cb(struct htc_target *htc_handle, } static void ath9k_htc_fw_panic_report(struct htc_target *htc_handle, - struct sk_buff *skb, u32 len) + struct sk_buff *skb) { uint32_t *pattern = (uint32_t *)skb->data; - if (*pattern == 0x33221199 && len >= sizeof(struct htc_panic_bad_vaddr)) { + switch (*pattern) { + case 0x33221199: + { struct htc_panic_bad_vaddr *htc_panic; htc_panic = (struct htc_panic_bad_vaddr *) skb->data; dev_err(htc_handle->dev, "ath: firmware panic! " "exccause: 0x%08x; pc: 0x%08x; badvaddr: 0x%08x.\n", htc_panic->exccause, htc_panic->pc, htc_panic->badvaddr); - return; - } - if (*pattern == 0x33221299) { + break; + } + case 0x33221299: + { struct htc_panic_bad_epid *htc_panic; htc_panic = (struct htc_panic_bad_epid *) skb->data; dev_err(htc_handle->dev, "ath: firmware panic! " "bad epid: 0x%08x\n", htc_panic->epid); - return; + break; + } + default: + dev_err(htc_handle->dev, "ath: unknown panic pattern!\n"); + break; } - dev_err(htc_handle->dev, "ath: unknown panic pattern!\n"); } /* * HTC Messages are handled directly here and the obtained SKB * is freed. * - * Service messages (Data, WMI) are passed to the corresponding + * Service messages (Data, WMI) passed to the corresponding * endpoint RX handlers, which have to free the SKB. */ void ath9k_htc_rx_msg(struct htc_target *htc_handle, @@ -405,26 +411,16 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle, if (!htc_handle || !skb) return; - /* A valid message requires len >= 8. - * - * sizeof(struct htc_frame_hdr) == 8 - * sizeof(struct htc_ready_msg) == 8 - * sizeof(struct htc_panic_bad_vaddr) == 16 - * sizeof(struct htc_panic_bad_epid) == 8 - */ - if (unlikely(len < sizeof(struct htc_frame_hdr))) - goto invalid; htc_hdr = (struct htc_frame_hdr *) skb->data; epid = htc_hdr->endpoint_id; if (epid == 0x99) { - ath9k_htc_fw_panic_report(htc_handle, skb, len); + ath9k_htc_fw_panic_report(htc_handle, skb); kfree_skb(skb); return; } if (epid < 0 || epid >= ENDPOINT_MAX) { -invalid: if (pipe_id != USB_REG_IN_PIPE) dev_kfree_skb_any(skb); else @@ -436,30 +432,21 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle, /* Handle trailer */ if (htc_hdr->flags & HTC_FLAGS_RECV_TRAILER) { - if (be32_to_cpu(*(__be32 *) skb->data) == 0x00C60000) { + if (be32_to_cpu(*(__be32 *) skb->data) == 0x00C60000) /* Move past the Watchdog pattern */ htc_hdr = (struct htc_frame_hdr *)(skb->data + 4); - len -= 4; - } } /* Get the message ID */ - if (unlikely(len < sizeof(struct htc_frame_hdr) + sizeof(__be16))) - goto invalid; msg_id = (__be16 *) ((void *) htc_hdr + sizeof(struct htc_frame_hdr)); /* Now process HTC messages */ switch (be16_to_cpu(*msg_id)) { case HTC_MSG_READY_ID: - if (unlikely(len < sizeof(struct htc_ready_msg))) - goto invalid; htc_process_target_rdy(htc_handle, htc_hdr); break; case HTC_MSG_CONNECT_SERVICE_RESPONSE_ID: - if (unlikely(len < sizeof(struct htc_frame_hdr) + - sizeof(struct htc_conn_svc_rspmsg))) - goto invalid; htc_process_conn_rsp(htc_handle, htc_hdr); break; default: @@ -478,8 +465,6 @@ void ath9k_htc_rx_msg(struct htc_target *htc_handle, if (endpoint->ep_callbacks.rx) endpoint->ep_callbacks.rx(endpoint->ep_callbacks.priv, skb, epid); - else - goto invalid; } }
diff --git a/drivers/net/wireless/ath/ath9k/wmi.c b/drivers/net/wireless/ath/ath9k/wmi.c index deb22b8..e7a3127 100644 --- a/drivers/net/wireless/ath/ath9k/wmi.c +++ b/drivers/net/wireless/ath/ath9k/wmi.c
@@ -338,7 +338,6 @@ int ath9k_wmi_cmd(struct wmi *wmi, enum wmi_cmd_id cmd_id, if (!time_left) { ath_dbg(common, WMI, "Timeout waiting for WMI command: %s\n", wmi_cmd_to_name(cmd_id)); - wmi->last_seq_id = 0; mutex_unlock(&wmi->op_mutex); return -ETIMEDOUT; }
diff --git a/drivers/net/wireless/ath/wil6210/debugfs.c b/drivers/net/wireless/ath/wil6210/debugfs.c index 1e38fdf..304b4d4 100644 --- a/drivers/net/wireless/ath/wil6210/debugfs.c +++ b/drivers/net/wireless/ath/wil6210/debugfs.c
@@ -1021,14 +1021,20 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, void *cmd; int cmdlen = len - sizeof(struct wmi_cmd_hdr); u16 cmdid; - int rc1; + int rc, rc1; - if (cmdlen < 0 || *ppos != 0) + if (cmdlen < 0) return -EINVAL; - wmi = memdup_user(buf, len); - if (IS_ERR(wmi)) - return PTR_ERR(wmi); + wmi = kmalloc(len, GFP_KERNEL); + if (!wmi) + return -ENOMEM; + + rc = simple_write_to_buffer(wmi, len, ppos, buf, len); + if (rc < 0) { + kfree(wmi); + return rc; + } cmd = (cmdlen > 0) ? &wmi[1] : NULL; cmdid = le16_to_cpu(wmi->command_id); @@ -1038,7 +1044,7 @@ static ssize_t wil_write_file_wmi(struct file *file, const char __user *buf, wil_info(wil, "0x%04x[%d] -> %d\n", cmdid, cmdlen, rc1); - return len; + return rc; } static const struct file_operations fops_wmi = {
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c index cd146bb..6439adc 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -87,9 +87,6 @@ #define BRCMF_ASSOC_PARAMS_FIXED_SIZE \ (sizeof(struct brcmf_assoc_params_le) - sizeof(u16)) -#define BRCMF_MAX_CHANSPEC_LIST \ - (BRCMF_DCMD_MEDLEN / sizeof(__le32) - 1) - static bool check_vif_up(struct brcmf_cfg80211_vif *vif) { if (!test_bit(BRCMF_VIF_STATUS_READY, &vif->sme_state)) { @@ -6070,13 +6067,6 @@ static int brcmf_construct_chaninfo(struct brcmf_cfg80211_info *cfg, band->channels[i].flags = IEEE80211_CHAN_DISABLED; total = le32_to_cpu(list->count); - if (total > BRCMF_MAX_CHANSPEC_LIST) { - bphy_err(drvr, "Invalid count of channel Spec. (%u)\n", - total); - err = -EINVAL; - goto fail_pbuf; - } - for (i = 0; i < total; i++) { ch.chspec = (u16)le32_to_cpu(list->element[i]); cfg->d11inf.decchspec(&ch); @@ -6222,13 +6212,6 @@ static int brcmf_enable_bw40_2g(struct brcmf_cfg80211_info *cfg) band = cfg_to_wiphy(cfg)->bands[NL80211_BAND_2GHZ]; list = (struct brcmf_chanspec_list *)pbuf; num_chan = le32_to_cpu(list->count); - if (num_chan > BRCMF_MAX_CHANSPEC_LIST) { - bphy_err(drvr, "Invalid count of channel Spec. (%u)\n", - num_chan); - kfree(pbuf); - return -EINVAL; - } - for (i = 0; i < num_chan; i++) { ch.chspec = (u16)le32_to_cpu(list->element[i]); cfg->d11inf.decchspec(&ch);
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c index e7c97df..dec25e4 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/common.c
@@ -264,7 +264,6 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) err); goto done; } - buf[sizeof(buf) - 1] = '\0'; ptr = (char *)buf; strsep(&ptr, "\n"); @@ -281,17 +280,15 @@ int brcmf_c_preinit_dcmds(struct brcmf_if *ifp) if (err) { brcmf_dbg(TRACE, "retrieving clmver failed, %d\n", err); } else { - buf[sizeof(buf) - 1] = '\0'; clmver = (char *)buf; + /* store CLM version for adding it to revinfo debugfs file */ + memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver)); /* Replace all newline/linefeed characters with space * character */ strreplace(clmver, '\n', ' '); - /* store CLM version for adding it to revinfo debugfs file */ - memcpy(ifp->drvr->clmver, clmver, sizeof(ifp->drvr->clmver)); - brcmf_dbg(INFO, "CLM version = %s\n", clmver); }
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c index 4907a66..edb79e9 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/core.c
@@ -290,7 +290,6 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, struct brcmf_pub *drvr = ifp->drvr; struct ethhdr *eh; int head_delta; - unsigned int tx_bytes = skb->len; brcmf_dbg(DATA, "Enter, bsscfgidx=%d\n", ifp->bsscfgidx); @@ -333,7 +332,6 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, bphy_err(drvr, "%s: failed to expand headroom\n", brcmf_ifname(ifp)); atomic_inc(&drvr->bus_if->stats.pktcow_failed); - dev_kfree_skb(skb); goto done; } } @@ -363,7 +361,7 @@ static netdev_tx_t brcmf_netdev_start_xmit(struct sk_buff *skb, ndev->stats.tx_dropped++; } else { ndev->stats.tx_packets++; - ndev->stats.tx_bytes += tx_bytes; + ndev->stats.tx_bytes += skb->len; } /* Return ok: we always eat the packet */
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c index 47e33fe..544ad80 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/firmware.c
@@ -703,11 +703,6 @@ brcmf_fw_alloc_request(u32 chip, u32 chiprev, u32 i, j; char end = '\0'; - if (chiprev >= BITS_PER_TYPE(u32)) { - brcmf_err("Invalid chip revision %u\n", chiprev); - return NULL; - } - for (i = 0; i < table_size; i++) { if (mapping_table[i].chipid == chip && mapping_table[i].revmask & BIT(chiprev))
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c index 94f8431..a30fcfb 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/fweh.c
@@ -228,10 +228,6 @@ static void brcmf_fweh_event_worker(struct work_struct *work) brcmf_fweh_event_name(event->code), event->code, event->emsg.ifidx, event->emsg.bsscfgidx, event->emsg.addr); - if (event->emsg.bsscfgidx >= BRCMF_MAX_IFS) { - bphy_err(drvr, "invalid bsscfg index: %u\n", event->emsg.bsscfgidx); - goto event_free; - } /* convert event message */ emsg_be = &event->emsg;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c index fd54acb..c2705d7 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/msgbuf.c
@@ -345,11 +345,8 @@ brcmf_msgbuf_alloc_pktid(struct device *dev, count++; } while (count < pktids->array_size); - if (count == pktids->array_size) { - dma_unmap_single(dev, *physaddr, skb->len - data_offset, - pktids->direction); + if (count == pktids->array_size) return -ENOMEM; - } array[*idx].data_offset = data_offset; array[*idx].physaddr = *physaddr;
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c index 6aa175b..b5d2e5b 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pcie.c
@@ -616,7 +616,7 @@ static int brcmf_pcie_exit_download_state(struct brcmf_pciedev_info *devinfo, } if (!brcmf_chip_set_active(devinfo->ci, resetintr)) - return -EIO; + return -EINVAL; return 0; } @@ -1109,10 +1109,6 @@ static int brcmf_pcie_init_ringbuffers(struct brcmf_pciedev_info *devinfo) BRCMF_NROF_H2D_COMMON_MSGRINGS; max_completionrings = BRCMF_NROF_D2H_COMMON_MSGRINGS; } - if (max_flowrings > 512) { - brcmf_err(bus, "invalid max_flowrings(%d)\n", max_flowrings); - return -EIO; - } if (devinfo->dma_idx_sz != 0) { bufsz = (max_submissionrings + max_completionrings) *
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c index 7ec1630..14e5306 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/pno.c
@@ -154,12 +154,12 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi) struct brcmf_pno_macaddr_le pfn_mac; u8 *mac_addr = NULL; u8 *mac_mask = NULL; - int err, i, ri; + int err, i; - for (ri = 0; ri < pi->n_reqs; ri++) - if (pi->reqs[ri]->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) { - mac_addr = pi->reqs[ri]->mac_addr; - mac_mask = pi->reqs[ri]->mac_addr_mask; + for (i = 0; i < pi->n_reqs; i++) + if (pi->reqs[i]->flags & NL80211_SCAN_FLAG_RANDOM_ADDR) { + mac_addr = pi->reqs[i]->mac_addr; + mac_mask = pi->reqs[i]->mac_addr_mask; break; } @@ -181,7 +181,7 @@ static int brcmf_pno_set_random(struct brcmf_if *ifp, struct brcmf_pno_info *pi) pfn_mac.mac[0] |= 0x02; brcmf_dbg(SCAN, "enabling random mac: reqid=%llu mac=%pM\n", - pi->reqs[ri]->reqid, pfn_mac.mac); + pi->reqs[i]->reqid, pfn_mac.mac); err = brcmf_fil_iovar_data_set(ifp, "pfn_macaddr", &pfn_mac, sizeof(pfn_mac)); if (err)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c index 5874f56..ddc9996 100644 --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c
@@ -3367,7 +3367,6 @@ static int brcmf_sdio_download_firmware(struct brcmf_sdio *bus, /* Take arm out of reset */ if (!brcmf_chip_set_active(bus->ci, rstvec)) { brcmf_err("error getting out of ARM core reset\n"); - bcmerror = -EIO; goto err; }
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2100.c b/drivers/net/wireless/intel/ipw2x00/ipw2100.c index 7524893..a162146 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2100.c
@@ -2294,11 +2294,10 @@ static int ipw2100_alloc_skb(struct ipw2100_priv *priv, return -ENOMEM; packet->rxp = (struct ipw2100_rx *)packet->skb->data; - packet->dma_addr = dma_map_single(&priv->pci_dev->dev, - packet->skb->data, + packet->dma_addr = pci_map_single(priv->pci_dev, packet->skb->data, sizeof(struct ipw2100_rx), - DMA_FROM_DEVICE); - if (dma_mapping_error(&priv->pci_dev->dev, packet->dma_addr)) { + PCI_DMA_FROMDEVICE); + if (pci_dma_mapping_error(priv->pci_dev, packet->dma_addr)) { dev_kfree_skb(packet->skb); return -ENOMEM; } @@ -2479,8 +2478,9 @@ static void isr_rx(struct ipw2100_priv *priv, int i, return; } - dma_unmap_single(&priv->pci_dev->dev, packet->dma_addr, - sizeof(struct ipw2100_rx), DMA_FROM_DEVICE); + pci_unmap_single(priv->pci_dev, + packet->dma_addr, + sizeof(struct ipw2100_rx), PCI_DMA_FROMDEVICE); skb_put(packet->skb, status->frame_size); @@ -2562,8 +2562,8 @@ static void isr_rx_monitor(struct ipw2100_priv *priv, int i, return; } - dma_unmap_single(&priv->pci_dev->dev, packet->dma_addr, - sizeof(struct ipw2100_rx), DMA_FROM_DEVICE); + pci_unmap_single(priv->pci_dev, packet->dma_addr, + sizeof(struct ipw2100_rx), PCI_DMA_FROMDEVICE); memmove(packet->skb->data + sizeof(struct ipw_rt_hdr), packet->skb->data, status->frame_size); @@ -2688,9 +2688,9 @@ static void __ipw2100_rx_process(struct ipw2100_priv *priv) /* Sync the DMA for the RX buffer so CPU is sure to get * the correct values */ - dma_sync_single_for_cpu(&priv->pci_dev->dev, packet->dma_addr, - sizeof(struct ipw2100_rx), - DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(priv->pci_dev, packet->dma_addr, + sizeof(struct ipw2100_rx), + PCI_DMA_FROMDEVICE); if (unlikely(ipw2100_corruption_check(priv, i))) { ipw2100_corruption_detected(priv, i); @@ -2922,8 +2922,9 @@ static int __ipw2100_tx_process(struct ipw2100_priv *priv) (packet->index + 1 + i) % txq->entries, tbd->host_addr, tbd->buf_length); - dma_unmap_single(&priv->pci_dev->dev, tbd->host_addr, - tbd->buf_length, DMA_TO_DEVICE); + pci_unmap_single(priv->pci_dev, + tbd->host_addr, + tbd->buf_length, PCI_DMA_TODEVICE); } libipw_txb_free(packet->info.d_struct.txb); @@ -3163,13 +3164,15 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) tbd->buf_length = packet->info.d_struct.txb-> fragments[i]->len - LIBIPW_3ADDR_LEN; - tbd->host_addr = dma_map_single(&priv->pci_dev->dev, + tbd->host_addr = pci_map_single(priv->pci_dev, packet->info.d_struct. - txb->fragments[i]->data + + txb->fragments[i]-> + data + LIBIPW_3ADDR_LEN, tbd->buf_length, - DMA_TO_DEVICE); - if (dma_mapping_error(&priv->pci_dev->dev, tbd->host_addr)) { + PCI_DMA_TODEVICE); + if (pci_dma_mapping_error(priv->pci_dev, + tbd->host_addr)) { IPW_DEBUG_TX("dma mapping error\n"); break; } @@ -3178,10 +3181,10 @@ static void ipw2100_tx_send_data(struct ipw2100_priv *priv) txq->next, tbd->host_addr, tbd->buf_length); - dma_sync_single_for_device(&priv->pci_dev->dev, - tbd->host_addr, - tbd->buf_length, - DMA_TO_DEVICE); + pci_dma_sync_single_for_device(priv->pci_dev, + tbd->host_addr, + tbd->buf_length, + PCI_DMA_TODEVICE); txq->next++; txq->next %= txq->entries; @@ -3436,9 +3439,9 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) return -ENOMEM; for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) { - v = dma_alloc_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_cmd_header), &p, - GFP_KERNEL); + v = pci_zalloc_consistent(priv->pci_dev, + sizeof(struct ipw2100_cmd_header), + &p); if (!v) { printk(KERN_ERR DRV_NAME ": " "%s: PCI alloc failed for msg " @@ -3457,10 +3460,11 @@ static int ipw2100_msg_allocate(struct ipw2100_priv *priv) return 0; for (j = 0; j < i; j++) { - dma_free_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_cmd_header), - priv->msg_buffers[j].info.c_struct.cmd, - priv->msg_buffers[j].info.c_struct.cmd_phys); + pci_free_consistent(priv->pci_dev, + sizeof(struct ipw2100_cmd_header), + priv->msg_buffers[j].info.c_struct.cmd, + priv->msg_buffers[j].info.c_struct. + cmd_phys); } kfree(priv->msg_buffers); @@ -3491,10 +3495,11 @@ static void ipw2100_msg_free(struct ipw2100_priv *priv) return; for (i = 0; i < IPW_COMMAND_POOL_SIZE; i++) { - dma_free_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_cmd_header), - priv->msg_buffers[i].info.c_struct.cmd, - priv->msg_buffers[i].info.c_struct.cmd_phys); + pci_free_consistent(priv->pci_dev, + sizeof(struct ipw2100_cmd_header), + priv->msg_buffers[i].info.c_struct.cmd, + priv->msg_buffers[i].info.c_struct. + cmd_phys); } kfree(priv->msg_buffers); @@ -4317,8 +4322,7 @@ static int status_queue_allocate(struct ipw2100_priv *priv, int entries) IPW_DEBUG_INFO("enter\n"); q->size = entries * sizeof(struct ipw2100_status); - q->drv = dma_alloc_coherent(&priv->pci_dev->dev, q->size, &q->nic, - GFP_KERNEL); + q->drv = pci_zalloc_consistent(priv->pci_dev, q->size, &q->nic); if (!q->drv) { IPW_DEBUG_WARNING("Can not allocate status queue.\n"); return -ENOMEM; @@ -4334,10 +4338,9 @@ static void status_queue_free(struct ipw2100_priv *priv) IPW_DEBUG_INFO("enter\n"); if (priv->status_queue.drv) { - dma_free_coherent(&priv->pci_dev->dev, - priv->status_queue.size, - priv->status_queue.drv, - priv->status_queue.nic); + pci_free_consistent(priv->pci_dev, priv->status_queue.size, + priv->status_queue.drv, + priv->status_queue.nic); priv->status_queue.drv = NULL; } @@ -4353,8 +4356,7 @@ static int bd_queue_allocate(struct ipw2100_priv *priv, q->entries = entries; q->size = entries * sizeof(struct ipw2100_bd); - q->drv = dma_alloc_coherent(&priv->pci_dev->dev, q->size, &q->nic, - GFP_KERNEL); + q->drv = pci_zalloc_consistent(priv->pci_dev, q->size, &q->nic); if (!q->drv) { IPW_DEBUG_INFO ("can't allocate shared memory for buffer descriptors\n"); @@ -4374,8 +4376,7 @@ static void bd_queue_free(struct ipw2100_priv *priv, struct ipw2100_bd_queue *q) return; if (q->drv) { - dma_free_coherent(&priv->pci_dev->dev, q->size, q->drv, - q->nic); + pci_free_consistent(priv->pci_dev, q->size, q->drv, q->nic); q->drv = NULL; } @@ -4435,9 +4436,9 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv) } for (i = 0; i < TX_PENDED_QUEUE_LENGTH; i++) { - v = dma_alloc_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_data_header), &p, - GFP_KERNEL); + v = pci_alloc_consistent(priv->pci_dev, + sizeof(struct ipw2100_data_header), + &p); if (!v) { printk(KERN_ERR DRV_NAME ": %s: PCI alloc failed for tx " "buffers.\n", @@ -4457,10 +4458,11 @@ static int ipw2100_tx_allocate(struct ipw2100_priv *priv) return 0; for (j = 0; j < i; j++) { - dma_free_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_data_header), - priv->tx_buffers[j].info.d_struct.data, - priv->tx_buffers[j].info.d_struct.data_phys); + pci_free_consistent(priv->pci_dev, + sizeof(struct ipw2100_data_header), + priv->tx_buffers[j].info.d_struct.data, + priv->tx_buffers[j].info.d_struct. + data_phys); } kfree(priv->tx_buffers); @@ -4537,10 +4539,12 @@ static void ipw2100_tx_free(struct ipw2100_priv *priv) priv->tx_buffers[i].info.d_struct.txb = NULL; } if (priv->tx_buffers[i].info.d_struct.data) - dma_free_coherent(&priv->pci_dev->dev, - sizeof(struct ipw2100_data_header), - priv->tx_buffers[i].info.d_struct.data, - priv->tx_buffers[i].info.d_struct.data_phys); + pci_free_consistent(priv->pci_dev, + sizeof(struct ipw2100_data_header), + priv->tx_buffers[i].info.d_struct. + data, + priv->tx_buffers[i].info.d_struct. + data_phys); } kfree(priv->tx_buffers); @@ -4603,10 +4607,9 @@ static int ipw2100_rx_allocate(struct ipw2100_priv *priv) return 0; for (j = 0; j < i; j++) { - dma_unmap_single(&priv->pci_dev->dev, - priv->rx_buffers[j].dma_addr, + pci_unmap_single(priv->pci_dev, priv->rx_buffers[j].dma_addr, sizeof(struct ipw2100_rx_packet), - DMA_FROM_DEVICE); + PCI_DMA_FROMDEVICE); dev_kfree_skb(priv->rx_buffers[j].skb); } @@ -4658,10 +4661,10 @@ static void ipw2100_rx_free(struct ipw2100_priv *priv) for (i = 0; i < RX_QUEUE_LENGTH; i++) { if (priv->rx_buffers[i].rxp) { - dma_unmap_single(&priv->pci_dev->dev, + pci_unmap_single(priv->pci_dev, priv->rx_buffers[i].dma_addr, sizeof(struct ipw2100_rx), - DMA_FROM_DEVICE); + PCI_DMA_FROMDEVICE); dev_kfree_skb(priv->rx_buffers[i].skb); } } @@ -6193,7 +6196,7 @@ static int ipw2100_pci_init_one(struct pci_dev *pci_dev, pci_set_master(pci_dev); pci_set_drvdata(pci_dev, priv); - err = dma_set_mask(&pci_dev->dev, DMA_BIT_MASK(32)); + err = pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32)); if (err) { printk(KERN_WARNING DRV_NAME "Error calling pci_set_dma_mask.\n");
diff --git a/drivers/net/wireless/intel/ipw2x00/ipw2200.c b/drivers/net/wireless/intel/ipw2x00/ipw2200.c index 5ce1a4d..ac5f797 100644 --- a/drivers/net/wireless/intel/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/intel/ipw2x00/ipw2200.c
@@ -3442,10 +3442,9 @@ static void ipw_rx_queue_reset(struct ipw_priv *priv, /* In the reset function, these buffers may have been allocated * to an SKB, so we need to unmap and free potential storage */ if (rxq->pool[i].skb != NULL) { - dma_unmap_single(&priv->pci_dev->dev, - rxq->pool[i].dma_addr, - IPW_RX_BUF_SIZE, DMA_FROM_DEVICE); - dev_kfree_skb_irq(rxq->pool[i].skb); + pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr, + IPW_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); + dev_kfree_skb(rxq->pool[i].skb); rxq->pool[i].skb = NULL; } list_add_tail(&rxq->pool[i].list, &rxq->rx_used); @@ -3777,8 +3776,7 @@ static int ipw_queue_tx_init(struct ipw_priv *priv, } q->bd = - dma_alloc_coherent(&dev->dev, sizeof(q->bd[0]) * count, - &q->q.dma_addr, GFP_KERNEL); + pci_alloc_consistent(dev, sizeof(q->bd[0]) * count, &q->q.dma_addr); if (!q->bd) { IPW_ERROR("pci_alloc_consistent(%zd) failed\n", sizeof(q->bd[0]) * count); @@ -3820,10 +3818,9 @@ static void ipw_queue_tx_free_tfd(struct ipw_priv *priv, /* unmap chunks if any */ for (i = 0; i < le32_to_cpu(bd->u.data.num_chunks); i++) { - dma_unmap_single(&dev->dev, - le32_to_cpu(bd->u.data.chunk_ptr[i]), + pci_unmap_single(dev, le32_to_cpu(bd->u.data.chunk_ptr[i]), le16_to_cpu(bd->u.data.chunk_len[i]), - DMA_TO_DEVICE); + PCI_DMA_TODEVICE); if (txq->txb[txq->q.last_used]) { libipw_txb_free(txq->txb[txq->q.last_used]); txq->txb[txq->q.last_used] = NULL; @@ -3855,8 +3852,8 @@ static void ipw_queue_tx_free(struct ipw_priv *priv, struct clx2_tx_queue *txq) } /* free buffers belonging to queue itself */ - dma_free_coherent(&dev->dev, sizeof(txq->bd[0]) * q->n_bd, txq->bd, - q->dma_addr); + pci_free_consistent(dev, sizeof(txq->bd[0]) * q->n_bd, txq->bd, + q->dma_addr); kfree(txq->txb); /* 0 fill whole structure */ @@ -5201,8 +5198,8 @@ static void ipw_rx_queue_replenish(void *data) list_del(element); rxb->dma_addr = - dma_map_single(&priv->pci_dev->dev, rxb->skb->data, - IPW_RX_BUF_SIZE, DMA_FROM_DEVICE); + pci_map_single(priv->pci_dev, rxb->skb->data, + IPW_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); list_add_tail(&rxb->list, &rxq->rx_free); rxq->free_count++; @@ -5235,9 +5232,8 @@ static void ipw_rx_queue_free(struct ipw_priv *priv, struct ipw_rx_queue *rxq) for (i = 0; i < RX_QUEUE_SIZE + RX_FREE_BUFFERS; i++) { if (rxq->pool[i].skb != NULL) { - dma_unmap_single(&priv->pci_dev->dev, - rxq->pool[i].dma_addr, - IPW_RX_BUF_SIZE, DMA_FROM_DEVICE); + pci_unmap_single(priv->pci_dev, rxq->pool[i].dma_addr, + IPW_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); dev_kfree_skb(rxq->pool[i].skb); } } @@ -8275,8 +8271,9 @@ static void ipw_rx(struct ipw_priv *priv) } priv->rxq->queue[i] = NULL; - dma_sync_single_for_cpu(&priv->pci_dev->dev, rxb->dma_addr, - IPW_RX_BUF_SIZE, DMA_FROM_DEVICE); + pci_dma_sync_single_for_cpu(priv->pci_dev, rxb->dma_addr, + IPW_RX_BUF_SIZE, + PCI_DMA_FROMDEVICE); pkt = (struct ipw_rx_packet *)rxb->skb->data; IPW_DEBUG_RX("Packet: type=%02X seq=%02X bits=%02X\n", @@ -8428,8 +8425,8 @@ static void ipw_rx(struct ipw_priv *priv) rxb->skb = NULL; } - dma_unmap_single(&priv->pci_dev->dev, rxb->dma_addr, - IPW_RX_BUF_SIZE, DMA_FROM_DEVICE); + pci_unmap_single(priv->pci_dev, rxb->dma_addr, + IPW_RX_BUF_SIZE, PCI_DMA_FROMDEVICE); list_add_tail(&rxb->list, &priv->rxq->rx_used); i = (i + 1) % RX_QUEUE_SIZE; @@ -10228,10 +10225,11 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb, txb->fragments[i]->len - hdr_len); tfd->u.data.chunk_ptr[i] = - cpu_to_le32(dma_map_single(&priv->pci_dev->dev, - txb->fragments[i]->data + hdr_len, - txb->fragments[i]->len - hdr_len, - DMA_TO_DEVICE)); + cpu_to_le32(pci_map_single + (priv->pci_dev, + txb->fragments[i]->data + hdr_len, + txb->fragments[i]->len - hdr_len, + PCI_DMA_TODEVICE)); tfd->u.data.chunk_len[i] = cpu_to_le16(txb->fragments[i]->len - hdr_len); } @@ -10261,10 +10259,10 @@ static int ipw_tx_skb(struct ipw_priv *priv, struct libipw_txb *txb, dev_kfree_skb_any(txb->fragments[i]); txb->fragments[i] = skb; tfd->u.data.chunk_ptr[i] = - cpu_to_le32(dma_map_single(&priv->pci_dev->dev, - skb->data, - remaining_bytes, - DMA_TO_DEVICE)); + cpu_to_le32(pci_map_single + (priv->pci_dev, skb->data, + remaining_bytes, + PCI_DMA_TODEVICE)); le32_add_cpu(&tfd->u.data.num_chunks, 1); } @@ -11414,14 +11412,9 @@ static int ipw_wdev_init(struct net_device *dev) set_wiphy_dev(wdev->wiphy, &priv->pci_dev->dev); /* With that information in place, we can now register the wiphy... */ - rc = wiphy_register(wdev->wiphy); - if (rc) - goto out; - - return 0; + if (wiphy_register(wdev->wiphy)) + rc = -EIO; out: - kfree(priv->ieee->a_band.channels); - kfree(priv->ieee->bg_band.channels); return rc; } @@ -11639,9 +11632,9 @@ static int ipw_pci_probe(struct pci_dev *pdev, pci_set_master(pdev); - err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); + err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32)); if (!err) - err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(32)); + err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32)); if (err) { printk(KERN_WARNING DRV_NAME ": No suitable DMA available.\n"); goto out_pci_disable_device;
diff --git a/drivers/net/wireless/intel/iwlegacy/3945-mac.c b/drivers/net/wireless/intel/iwlegacy/3945-mac.c index a1bd61d..e2e9c3e 100644 --- a/drivers/net/wireless/intel/iwlegacy/3945-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/3945-mac.c
@@ -2302,7 +2302,9 @@ __il3945_down(struct il_priv *il) il3945_hw_txq_ctx_free(il); exit: memset(&il->card_alive, 0, sizeof(struct il_alive_resp)); - dev_kfree_skb(il->beacon_skb); + + if (il->beacon_skb) + dev_kfree_skb(il->beacon_skb); il->beacon_skb = NULL; /* clear out any free frames */ @@ -3382,12 +3384,10 @@ static DEVICE_ATTR(dump_errors, 0200, NULL, il3945_dump_error_log); * *****************************************************************************/ -static int +static void il3945_setup_deferred_work(struct il_priv *il) { il->workqueue = create_singlethread_workqueue(DRV_NAME); - if (!il->workqueue) - return -ENOMEM; init_waitqueue_head(&il->wait_command_queue); @@ -3406,8 +3406,6 @@ il3945_setup_deferred_work(struct il_priv *il) tasklet_init(&il->irq_tasklet, il3945_irq_tasklet, (unsigned long)il); - - return 0; } static void @@ -3729,10 +3727,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) } il_set_rxon_channel(il, &il->bands[NL80211_BAND_2GHZ].channels[5]); - err = il3945_setup_deferred_work(il); - if (err) - goto out_remove_sysfs; - + il3945_setup_deferred_work(il); il3945_setup_handlers(il); il_power_initialize(il); @@ -3744,7 +3739,7 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) err = il3945_setup_mac(il); if (err) - goto out_destroy_workqueue; + goto out_remove_sysfs; il_dbgfs_register(il, DRV_NAME); @@ -3753,10 +3748,9 @@ il3945_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) return 0; -out_destroy_workqueue: +out_remove_sysfs: destroy_workqueue(il->workqueue); il->workqueue = NULL; -out_remove_sysfs: sysfs_remove_group(&pdev->dev.kobj, &il3945_attribute_group); out_release_irq: free_irq(il->pci_dev->irq, il); @@ -3853,7 +3847,9 @@ il3945_pci_remove(struct pci_dev *pdev) il_free_channel_map(il); il_free_geos(il); kfree(il->scan_cmd); - dev_kfree_skb(il->beacon_skb); + if (il->beacon_skb) + dev_kfree_skb(il->beacon_skb); + ieee80211_free_hw(il->hw); }
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-mac.c b/drivers/net/wireless/intel/iwlegacy/4965-mac.c index feeb57c..5fe1703 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-mac.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-mac.c
@@ -6217,12 +6217,10 @@ il4965_bg_txpower_work(struct work_struct *work) mutex_unlock(&il->mutex); } -static int +static void il4965_setup_deferred_work(struct il_priv *il) { il->workqueue = create_singlethread_workqueue(DRV_NAME); - if (!il->workqueue) - return -ENOMEM; init_waitqueue_head(&il->wait_command_queue); @@ -6243,8 +6241,6 @@ il4965_setup_deferred_work(struct il_priv *il) tasklet_init(&il->irq_tasklet, il4965_irq_tasklet, (unsigned long)il); - - return 0; } static void @@ -6634,10 +6630,7 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto out_disable_msi; } - err = il4965_setup_deferred_work(il); - if (err) - goto out_free_irq; - + il4965_setup_deferred_work(il); il4965_setup_handlers(il); /********************************************* @@ -6675,7 +6668,6 @@ il4965_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) out_destroy_workqueue: destroy_workqueue(il->workqueue); il->workqueue = NULL; -out_free_irq: free_irq(il->pci_dev->irq, il); out_disable_msi: pci_disable_msi(il->pci_dev);
diff --git a/drivers/net/wireless/intel/iwlegacy/4965-rs.c b/drivers/net/wireless/intel/iwlegacy/4965-rs.c index b79a8ae..0a02d8a 100644 --- a/drivers/net/wireless/intel/iwlegacy/4965-rs.c +++ b/drivers/net/wireless/intel/iwlegacy/4965-rs.c
@@ -2403,7 +2403,7 @@ il4965_rs_fill_link_cmd(struct il_priv *il, struct il_lq_sta *lq_sta, /* Repeat initial/next rate. * For legacy IL_NUMBER_TRY == 1, this loop will not execute. * For HT IL_HT_NUMBER_TRY == 3, this executes twice. */ - while (repeat_rate > 0 && idx < (LINK_QUAL_MAX_RETRY_NUM - 1)) { + while (repeat_rate > 0 && idx < LINK_QUAL_MAX_RETRY_NUM) { if (is_legacy(tbl_type.lq_type)) { if (ant_toggle_cnt < NUM_TRY_BEFORE_ANT_TOGGLE) ant_toggle_cnt++;
diff --git a/drivers/net/wireless/intel/iwlegacy/common.c b/drivers/net/wireless/intel/iwlegacy/common.c index 7cfd80d..1107b96 100644 --- a/drivers/net/wireless/intel/iwlegacy/common.c +++ b/drivers/net/wireless/intel/iwlegacy/common.c
@@ -5182,7 +5182,8 @@ il_mac_reset_tsf(struct ieee80211_hw *hw, struct ieee80211_vif *vif) memset(&il->current_ht_config, 0, sizeof(struct il_ht_config)); /* new association get rid of ibss beacon skb */ - dev_consume_skb_irq(il->beacon_skb); + if (il->beacon_skb) + dev_kfree_skb(il->beacon_skb); il->beacon_skb = NULL; il->timestamp = 0; @@ -5301,7 +5302,10 @@ il_beacon_update(struct ieee80211_hw *hw, struct ieee80211_vif *vif) } spin_lock_irqsave(&il->lock, flags); - dev_consume_skb_irq(il->beacon_skb); + + if (il->beacon_skb) + dev_kfree_skb(il->beacon_skb); + il->beacon_skb = skb; timestamp = ((struct ieee80211_mgmt *)skb->data)->u.beacon.timestamp;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c index a325510..5df4bbb 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/sta.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/sta.c
@@ -1810,7 +1810,6 @@ static void iwl_mvm_disable_sta_queues(struct iwl_mvm *mvm, iwl_mvm_txq_from_mac80211(sta->txq[i]); mvmtxq->txq_id = IWL_MVM_INVALID_QUEUE; - list_del_init(&mvmtxq->list); } }
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c index 9a81ce2..d46e606 100644 --- a/drivers/net/wireless/intel/iwlwifi/mvm/tx.c +++ b/drivers/net/wireless/intel/iwlwifi/mvm/tx.c
@@ -1209,7 +1209,6 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, struct sk_buff_head mpdus_skbs; unsigned int payload_len; int ret; - struct sk_buff *orig_skb = skb; if (WARN_ON_ONCE(!mvmsta)) return -1; @@ -1242,17 +1241,8 @@ int iwl_mvm_tx_skb_sta(struct iwl_mvm *mvm, struct sk_buff *skb, ret = iwl_mvm_tx_mpdu(mvm, skb, &info, sta); if (ret) { - /* Free skbs created as part of TSO logic that have not yet been dequeued */ __skb_queue_purge(&mpdus_skbs); - /* skb here is not necessarily same as skb that entered this method, - * so free it explicitly. - */ - if (skb == orig_skb) - ieee80211_free_txskb(mvm->hw, skb); - else - kfree_skb(skb); - /* there was error, but we consumed skb one way or another, so return 0 */ - return 0; + return ret; } }
diff --git a/drivers/net/wireless/intersil/orinoco/hw.c b/drivers/net/wireless/intersil/orinoco/hw.c index af49aa4..61af5a2 100644 --- a/drivers/net/wireless/intersil/orinoco/hw.c +++ b/drivers/net/wireless/intersil/orinoco/hw.c
@@ -931,8 +931,6 @@ int __orinoco_hw_setup_enc(struct orinoco_private *priv) err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFAUTHENTICATION_AGERE, auth_flag); - if (err) - return err; } err = hermes_write_wordrec(hw, USER_BAP, HERMES_RID_CNFWEPENABLED_AGERE,
diff --git a/drivers/net/wireless/intersil/p54/main.c b/drivers/net/wireless/intersil/p54/main.c index 8fa3ec7..a3ca662 100644 --- a/drivers/net/wireless/intersil/p54/main.c +++ b/drivers/net/wireless/intersil/p54/main.c
@@ -682,7 +682,7 @@ static void p54_flush(struct ieee80211_hw *dev, struct ieee80211_vif *vif, * queues have already been stopped and no new frames can sneak * up from behind. */ - while ((total = p54_flush_count(priv)) && i--) { + while ((total = p54_flush_count(priv) && i--)) { /* waste time */ msleep(20); }
diff --git a/drivers/net/wireless/intersil/p54/p54spi.c b/drivers/net/wireless/intersil/p54/p54spi.c index cdb5781..ab0fe85 100644 --- a/drivers/net/wireless/intersil/p54/p54spi.c +++ b/drivers/net/wireless/intersil/p54/p54spi.c
@@ -164,7 +164,7 @@ static int p54spi_request_firmware(struct ieee80211_hw *dev) ret = p54_parse_firmware(dev, priv->firmware); if (ret) { - /* the firmware is released by the caller */ + release_firmware(priv->firmware); return ret; } @@ -659,7 +659,6 @@ static int p54spi_probe(struct spi_device *spi) return 0; err_free_common: - release_firmware(priv->firmware); free_irq(gpio_to_irq(p54spi_gpio_irq), spi); err_free_gpio_irq: gpio_free(p54spi_gpio_irq);
diff --git a/drivers/net/wireless/mac80211_hwsim.c b/drivers/net/wireless/mac80211_hwsim.c index f8abb3f..270578f 100644 --- a/drivers/net/wireless/mac80211_hwsim.c +++ b/drivers/net/wireless/mac80211_hwsim.c
@@ -535,7 +535,7 @@ struct mac80211_hwsim_data { bool ps_poll_pending; struct dentry *debugfs; - atomic_t pending_cookie; + uintptr_t pending_cookie; struct sk_buff_head pending; /* packets pending */ /* * Only radios in the same group can communicate together (the @@ -717,7 +717,6 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, struct hwsim_vif_priv *vp = (void *)vif->drv_priv; struct sk_buff *skb; struct ieee80211_hdr *hdr; - struct ieee80211_tx_info *cb; if (!vp->assoc) return; @@ -739,10 +738,6 @@ static void hwsim_send_nullfunc(struct mac80211_hwsim_data *data, u8 *mac, memcpy(hdr->addr2, mac, ETH_ALEN); memcpy(hdr->addr3, vp->bssid, ETH_ALEN); - cb = IEEE80211_SKB_CB(skb); - cb->control.rates[0].count = 1; - cb->control.rates[1].idx = -1; - rcu_read_lock(); mac80211_hwsim_tx_frame(data->hw, skb, rcu_dereference(vif->chanctx_conf)->def.chan); @@ -1214,7 +1209,8 @@ static void mac80211_hwsim_tx_frame_nl(struct ieee80211_hw *hw, goto nla_put_failure; /* We create a cookie to identify this skb */ - cookie = atomic_inc_return(&data->pending_cookie); + data->pending_cookie++; + cookie = data->pending_cookie; info->rate_driver_data[0] = (void *)cookie; if (nla_put_u64_64bit(skb, HWSIM_ATTR_COOKIE, cookie, HWSIM_ATTR_PAD)) goto nla_put_failure; @@ -3394,7 +3390,6 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, const u8 *src; unsigned int hwsim_flags; int i; - unsigned long flags; bool found = false; if (!info->attrs[HWSIM_ATTR_ADDR_TRANSMITTER] || @@ -3422,20 +3417,18 @@ static int hwsim_tx_info_frame_received_nl(struct sk_buff *skb_2, } /* look for the skb matching the cookie passed back from user */ - spin_lock_irqsave(&data2->pending.lock, flags); skb_queue_walk_safe(&data2->pending, skb, tmp) { - uintptr_t skb_cookie; + u64 skb_cookie; txi = IEEE80211_SKB_CB(skb); - skb_cookie = (uintptr_t)txi->rate_driver_data[0]; + skb_cookie = (u64)(uintptr_t)txi->rate_driver_data[0]; if (skb_cookie == ret_skb_cookie) { - __skb_unlink(skb, &data2->pending); + skb_unlink(skb, &data2->pending); found = true; break; } } - spin_unlock_irqrestore(&data2->pending.lock, flags); /* not found */ if (!found)
diff --git a/drivers/net/wireless/marvell/libertas/cmdresp.c b/drivers/net/wireless/marvell/libertas/cmdresp.c index 5908f07..b73d083 100644 --- a/drivers/net/wireless/marvell/libertas/cmdresp.c +++ b/drivers/net/wireless/marvell/libertas/cmdresp.c
@@ -48,7 +48,7 @@ void lbs_mac_event_disconnected(struct lbs_private *priv, /* Free Tx and Rx packets */ spin_lock_irqsave(&priv->driver_lock, flags); - dev_kfree_skb_irq(priv->currenttxskb); + kfree_skb(priv->currenttxskb); priv->currenttxskb = NULL; priv->tx_pending_len = 0; spin_unlock_irqrestore(&priv->driver_lock, flags);
diff --git a/drivers/net/wireless/marvell/libertas/if_usb.c b/drivers/net/wireless/marvell/libertas/if_usb.c index 2240b4d..5d6dc1d 100644 --- a/drivers/net/wireless/marvell/libertas/if_usb.c +++ b/drivers/net/wireless/marvell/libertas/if_usb.c
@@ -287,7 +287,6 @@ static int if_usb_probe(struct usb_interface *intf, return 0; err_get_fw: - usb_put_dev(udev); lbs_remove_card(priv); err_add_card: if_usb_reset_device(cardp); @@ -637,7 +636,7 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff, priv->resp_len[i] = (recvlength - MESSAGE_HEADER_LEN); memcpy(priv->resp_buf[i], recvbuff + MESSAGE_HEADER_LEN, priv->resp_len[i]); - dev_kfree_skb_irq(skb); + kfree_skb(skb); lbs_notify_command_response(priv, i); spin_unlock_irqrestore(&priv->driver_lock, flags);
diff --git a/drivers/net/wireless/marvell/libertas/main.c b/drivers/net/wireless/marvell/libertas/main.c index ff0b3a0..2233b59 100644 --- a/drivers/net/wireless/marvell/libertas/main.c +++ b/drivers/net/wireless/marvell/libertas/main.c
@@ -217,7 +217,7 @@ int lbs_stop_iface(struct lbs_private *priv) spin_lock_irqsave(&priv->driver_lock, flags); priv->iface_running = false; - dev_kfree_skb_irq(priv->currenttxskb); + kfree_skb(priv->currenttxskb); priv->currenttxskb = NULL; priv->tx_pending_len = 0; spin_unlock_irqrestore(&priv->driver_lock, flags); @@ -870,7 +870,6 @@ static int lbs_init_adapter(struct lbs_private *priv) ret = kfifo_alloc(&priv->event_fifo, sizeof(u32) * 16, GFP_KERNEL); if (ret) { pr_err("Out of memory allocating event FIFO buffer\n"); - lbs_free_cmd_buffer(priv); goto out; }
diff --git a/drivers/net/wireless/marvell/libertas_tf/if_usb.c b/drivers/net/wireless/marvell/libertas_tf/if_usb.c index f47db95..b30bcb2 100644 --- a/drivers/net/wireless/marvell/libertas_tf/if_usb.c +++ b/drivers/net/wireless/marvell/libertas_tf/if_usb.c
@@ -613,7 +613,7 @@ static inline void process_cmdrequest(int recvlength, uint8_t *recvbuff, spin_lock_irqsave(&priv->driver_lock, flags); memcpy(priv->cmd_resp_buff, recvbuff + MESSAGE_HEADER_LEN, recvlength - MESSAGE_HEADER_LEN); - dev_kfree_skb_irq(skb); + kfree_skb(skb); lbtf_cmd_response_rx(priv); spin_unlock_irqrestore(&priv->driver_lock, flags); }
diff --git a/drivers/net/wireless/marvell/mwifiex/11n.c b/drivers/net/wireless/marvell/mwifiex/11n.c index b397a7e..acbef9f 100644 --- a/drivers/net/wireless/marvell/mwifiex/11n.c +++ b/drivers/net/wireless/marvell/mwifiex/11n.c
@@ -890,7 +890,7 @@ mwifiex_send_delba_txbastream_tbl(struct mwifiex_private *priv, u8 tid) */ void mwifiex_update_ampdu_txwinsize(struct mwifiex_adapter *adapter) { - u8 i, j; + u8 i; u32 tx_win_size; struct mwifiex_private *priv; @@ -921,8 +921,8 @@ void mwifiex_update_ampdu_txwinsize(struct mwifiex_adapter *adapter) if (tx_win_size != priv->add_ba_param.tx_win_size) { if (!priv->media_connected) continue; - for (j = 0; j < MAX_NUM_TID; j++) - mwifiex_send_delba_txbastream_tbl(priv, j); + for (i = 0; i < MAX_NUM_TID; i++) + mwifiex_send_delba_txbastream_tbl(priv, i); } } }
diff --git a/drivers/net/wireless/marvell/mwifiex/sdio.c b/drivers/net/wireless/marvell/mwifiex/sdio.c index 9b39ffd..b322c27 100644 --- a/drivers/net/wireless/marvell/mwifiex/sdio.c +++ b/drivers/net/wireless/marvell/mwifiex/sdio.c
@@ -58,7 +58,6 @@ static struct memory_type_mapping mem_type_mapping_tbl[] = { }; static const struct of_device_id mwifiex_sdio_of_match_table[] = { - { .compatible = "marvell,sd8787" }, { .compatible = "marvell,sd8897" }, { .compatible = "marvell,sd8997" }, { }
diff --git a/drivers/net/wireless/mediatek/mt76/dma.c b/drivers/net/wireless/mediatek/mt76/dma.c index 50a92aa..d3efcbd 100644 --- a/drivers/net/wireless/mediatek/mt76/dma.c +++ b/drivers/net/wireless/mediatek/mt76/dma.c
@@ -411,7 +411,6 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) bool more; spin_lock_bh(&q->lock); - do { buf = mt76_dma_dequeue(dev, q, true, NULL, NULL, &more); if (!buf) @@ -419,12 +418,6 @@ mt76_dma_rx_cleanup(struct mt76_dev *dev, struct mt76_queue *q) skb_free_frag(buf); } while (1); - - if (q->rx_head) { - dev_kfree_skb(q->rx_head); - q->rx_head = NULL; - } - spin_unlock_bh(&q->lock); if (!q->rx_page.va) @@ -447,6 +440,12 @@ mt76_dma_rx_reset(struct mt76_dev *dev, enum mt76_rxq_id qid) mt76_dma_rx_cleanup(dev, q); mt76_dma_sync_idx(dev, q); mt76_dma_rx_fill(dev, q); + + if (!q->rx_head) + return; + + dev_kfree_skb(q->rx_head); + q->rx_head = NULL; } static void
diff --git a/drivers/net/wireless/mediatek/mt76/mac80211.c b/drivers/net/wireless/mediatek/mt76/mac80211.c index 179337e..8bd1913 100644 --- a/drivers/net/wireless/mediatek/mt76/mac80211.c +++ b/drivers/net/wireless/mediatek/mt76/mac80211.c
@@ -103,7 +103,6 @@ static int mt76_led_init(struct mt76_dev *dev) if (!of_property_read_u32(np, "led-sources", &led_pin)) dev->led_pin = led_pin; dev->led_al = of_property_read_bool(np, "led-active-low"); - of_node_put(np); } return led_classdev_register(dev->dev, &dev->led_cdev);
diff --git a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c index 4209209..92305bd 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x02_beacon.c
@@ -77,7 +77,10 @@ int mt76x02_mac_set_beacon(struct mt76x02_dev *dev, u8 vif_idx, for (i = 0; i < ARRAY_SIZE(dev->beacons); i++) { if (vif_idx == i) { force_update = !!dev->beacons[i] ^ !!skb; - dev_kfree_skb(dev->beacons[i]); + + if (dev->beacons[i]) + dev_kfree_skb(dev->beacons[i]); + dev->beacons[i] = skb; __mt76x02_mac_set_beacon(dev, bcn_idx, skb); } else if (force_update && dev->beacons[i]) {
diff --git a/drivers/net/wireless/mediatek/mt7601u/dma.c b/drivers/net/wireless/mediatek/mt7601u/dma.c index 0728880..6f2172b 100644 --- a/drivers/net/wireless/mediatek/mt7601u/dma.c +++ b/drivers/net/wireless/mediatek/mt7601u/dma.c
@@ -118,8 +118,7 @@ static u16 mt7601u_rx_next_seg_len(u8 *data, u32 data_len) if (data_len < min_seg_len || WARN_ON_ONCE(!dma_len) || WARN_ON_ONCE(dma_len + MT_DMA_HDRS > data_len) || - WARN_ON_ONCE(dma_len & 0x3) || - WARN_ON_ONCE(dma_len < min_seg_len)) + WARN_ON_ONCE(dma_len & 0x3)) return 0; return MT_DMA_HDRS + dma_len;
diff --git a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c index 32d2528..c99f191 100644 --- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
@@ -4154,10 +4154,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, rt2800_bbp_write(rt2x00dev, 62, 0x37 - rt2x00dev->lna_gain); rt2800_bbp_write(rt2x00dev, 63, 0x37 - rt2x00dev->lna_gain); rt2800_bbp_write(rt2x00dev, 64, 0x37 - rt2x00dev->lna_gain); - if (rt2x00_rt(rt2x00dev, RT6352)) - rt2800_bbp_write(rt2x00dev, 86, 0x38); - else - rt2800_bbp_write(rt2x00dev, 86, 0); + rt2800_bbp_write(rt2x00dev, 86, 0); } if (rf->channel <= 14) { @@ -4358,8 +4355,7 @@ static void rt2800_config_channel(struct rt2x00_dev *rt2x00dev, reg = (rf->channel <= 14 ? 0x1c : 0x24) + 2*rt2x00dev->lna_gain; rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, reg); - if (rt2x00_rt(rt2x00dev, RT5592)) - rt2800_iq_calibrate(rt2x00dev, rf->channel); + rt2800_iq_calibrate(rt2x00dev, rf->channel); } bbp = rt2800_bbp_read(rt2x00dev, 4); @@ -5632,8 +5628,7 @@ static inline void rt2800_set_vgc(struct rt2x00_dev *rt2x00dev, if (qual->vgc_level != vgc_level) { if (rt2x00_rt(rt2x00dev, RT3572) || rt2x00_rt(rt2x00dev, RT3593) || - rt2x00_rt(rt2x00dev, RT3883) || - rt2x00_rt(rt2x00dev, RT6352)) { + rt2x00_rt(rt2x00dev, RT3883)) { rt2800_bbp_write_with_rx_chain(rt2x00dev, 66, vgc_level); } else if (rt2x00_rt(rt2x00dev, RT5592)) { @@ -5856,7 +5851,7 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404); } else if (rt2x00_rt(rt2x00dev, RT6352)) { rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000401); - rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0001); + rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x000C0000); rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000); rt2800_register_write(rt2x00dev, TX_ALC_VGA3, 0x00000000); rt2800_register_write(rt2x00dev, TX0_BB_GAIN_ATTEN, 0x0); @@ -6118,27 +6113,6 @@ static int rt2800_init_registers(struct rt2x00_dev *rt2x00dev) reg = rt2800_register_read(rt2x00dev, US_CYC_CNT); rt2x00_set_field32(®, US_CYC_CNT_CLOCK_CYCLE, 125); rt2800_register_write(rt2x00dev, US_CYC_CNT, reg); - } else if (rt2x00_is_soc(rt2x00dev)) { - struct clk *clk = clk_get_sys("bus", NULL); - int rate; - - if (IS_ERR(clk)) { - clk = clk_get_sys("cpu", NULL); - - if (IS_ERR(clk)) { - rate = 125; - } else { - rate = clk_get_rate(clk) / 3000000; - clk_put(clk); - } - } else { - rate = clk_get_rate(clk) / 1000000; - clk_put(clk); - } - - reg = rt2800_register_read(rt2x00dev, US_CYC_CNT); - rt2x00_set_field32(®, US_CYC_CNT_CLOCK_CYCLE, rate); - rt2800_register_write(rt2x00dev, US_CYC_CNT, reg); } reg = rt2800_register_read(rt2x00dev, HT_FBK_CFG0);
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h index 2a02d4d..6858f7d 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h
@@ -1178,7 +1178,7 @@ struct rtl8723bu_c2h { u8 dummy3_0; } __packed ra_report; }; -} __packed; +}; struct rtl8xxxu_fileops;
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c index edd2960..02ca805 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c
@@ -1671,11 +1671,6 @@ static void rtl8192e_enable_rf(struct rtl8xxxu_priv *priv) val8 = rtl8xxxu_read8(priv, REG_PAD_CTRL1); val8 &= ~BIT(0); rtl8xxxu_write8(priv, REG_PAD_CTRL1, val8); - - /* - * Fix transmission failure of rtl8192e. - */ - rtl8xxxu_write8(priv, REG_TXPAUSE, 0x00); } struct rtl8xxxu_fileops rtl8192eu_fops = {
diff --git a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c index bdccc84..048984c 100644 --- a/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c +++ b/drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c
@@ -1608,18 +1608,18 @@ static void rtl8xxxu_print_chipinfo(struct rtl8xxxu_priv *priv) static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv) { struct device *dev = &priv->udev->dev; - u32 val32, bonding, sys_cfg; + u32 val32, bonding; u16 val16; - sys_cfg = rtl8xxxu_read32(priv, REG_SYS_CFG); - priv->chip_cut = (sys_cfg & SYS_CFG_CHIP_VERSION_MASK) >> + val32 = rtl8xxxu_read32(priv, REG_SYS_CFG); + priv->chip_cut = (val32 & SYS_CFG_CHIP_VERSION_MASK) >> SYS_CFG_CHIP_VERSION_SHIFT; - if (sys_cfg & SYS_CFG_TRP_VAUX_EN) { + if (val32 & SYS_CFG_TRP_VAUX_EN) { dev_info(dev, "Unsupported test chip\n"); return -ENOTSUPP; } - if (sys_cfg & SYS_CFG_BT_FUNC) { + if (val32 & SYS_CFG_BT_FUNC) { if (priv->chip_cut >= 3) { sprintf(priv->chip_name, "8723BU"); priv->rtl_chip = RTL8723B; @@ -1641,7 +1641,7 @@ static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv) if (val32 & MULTI_GPS_FUNC_EN) priv->has_gps = 1; priv->is_multi_func = 1; - } else if (sys_cfg & SYS_CFG_TYPE_ID) { + } else if (val32 & SYS_CFG_TYPE_ID) { bonding = rtl8xxxu_read32(priv, REG_HPON_FSM); bonding &= HPON_FSM_BONDING_MASK; if (priv->fops->tx_desc_size == @@ -1689,7 +1689,7 @@ static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv) case RTL8188E: case RTL8192E: case RTL8723B: - switch (sys_cfg & SYS_CFG_VENDOR_EXT_MASK) { + switch (val32 & SYS_CFG_VENDOR_EXT_MASK) { case SYS_CFG_VENDOR_ID_TSMC: sprintf(priv->chip_vendor, "TSMC"); break; @@ -1706,7 +1706,7 @@ static int rtl8xxxu_identify_chip(struct rtl8xxxu_priv *priv) } break; default: - if (sys_cfg & SYS_CFG_VENDOR_ID) { + if (val32 & SYS_CFG_VENDOR_ID) { sprintf(priv->chip_vendor, "UMC"); priv->vendor_umc = 1; } else { @@ -1875,6 +1875,13 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv) /* We have 8 bits to indicate validity */ map_addr = offset * 8; + if (map_addr >= EFUSE_MAP_LEN) { + dev_warn(dev, "%s: Illegal map_addr (%04x), " + "efuse corrupt!\n", + __func__, map_addr); + ret = -EINVAL; + goto exit; + } for (i = 0; i < EFUSE_MAX_WORD_UNIT; i++) { /* Check word enable condition in the section */ if (word_mask & BIT(i)) { @@ -1885,13 +1892,6 @@ static int rtl8xxxu_read_efuse(struct rtl8xxxu_priv *priv) ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8); if (ret) goto exit; - if (map_addr >= EFUSE_MAP_LEN - 1) { - dev_warn(dev, "%s: Illegal map_addr (%04x), " - "efuse corrupt!\n", - __func__, map_addr); - ret = -EINVAL; - goto exit; - } priv->efuse_wifi.raw[map_addr++] = val8; ret = rtl8xxxu_read_efuse8(priv, efuse_addr++, &val8); @@ -2926,12 +2926,12 @@ bool rtl8xxxu_gen2_simularity_compare(struct rtl8xxxu_priv *priv, } if (!(simubitmap & 0x30) && priv->tx_paths > 1) { - /* path B TX OK */ + /* path B RX OK */ for (i = 4; i < 6; i++) result[3][i] = result[c1][i]; } - if (!(simubitmap & 0xc0) && priv->tx_paths > 1) { + if (!(simubitmap & 0x30) && priv->tx_paths > 1) { /* path B RX OK */ for (i = 6; i < 8; i++) result[3][i] = result[c1][i]; @@ -4372,9 +4372,12 @@ void rtl8xxxu_gen1_report_connect(struct rtl8xxxu_priv *priv, void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv, u8 macid, bool connect) { +#ifdef RTL8XXXU_GEN2_REPORT_CONNECT /* - * The firmware turns on the rate control when it knows it's - * connected to a network. + * Barry Day reports this causes issues with 8192eu and 8723bu + * devices reconnecting. The reason for this is unclear, but + * until it is better understood, leave the code in place but + * disabled, so it is not lost. */ struct h2c_cmd h2c; @@ -4387,6 +4390,7 @@ void rtl8xxxu_gen2_report_connect(struct rtl8xxxu_priv *priv, h2c.media_status_rpt.parm &= ~BIT(0); rtl8xxxu_gen2_h2c_cmd(priv, &h2c, sizeof(h2c.media_status_rpt)); +#endif } void rtl8xxxu_gen1_init_aggregation(struct rtl8xxxu_priv *priv) @@ -4946,8 +4950,6 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, if (control && control->sta) sta = control->sta; - queue = rtl8xxxu_queue_select(hw, skb); - tx_desc = skb_push(skb, tx_desc_size); memset(tx_desc, 0, tx_desc_size); @@ -4960,6 +4962,7 @@ static void rtl8xxxu_tx(struct ieee80211_hw *hw, is_broadcast_ether_addr(ieee80211_get_DA(hdr))) tx_desc->txdw0 |= TXDESC_BROADMULTICAST; + queue = rtl8xxxu_queue_select(hw, skb); tx_desc->txdw1 = cpu_to_le32(queue << TXDESC_QUEUE_SHIFT); if (tx_info->control.hw_key) { @@ -5095,7 +5098,7 @@ static void rtl8xxxu_queue_rx_urb(struct rtl8xxxu_priv *priv, pending = priv->rx_urb_pending_count; } else { skb = (struct sk_buff *)rx_urb->urb.context; - dev_kfree_skb_irq(skb); + dev_kfree_skb(skb); usb_free_urb(&rx_urb->urb); } @@ -5494,6 +5497,7 @@ static int rtl8xxxu_config(struct ieee80211_hw *hw, u32 changed) { struct rtl8xxxu_priv *priv = hw->priv; struct device *dev = &priv->udev->dev; + u16 val16; int ret = 0, channel; bool ht40; @@ -5503,6 +5507,14 @@ static int rtl8xxxu_config(struct ieee80211_hw *hw, u32 changed) __func__, hw->conf.chandef.chan->hw_value, changed, hw->conf.chandef.width); + if (changed & IEEE80211_CONF_CHANGE_RETRY_LIMITS) { + val16 = ((hw->conf.long_frame_max_tx_count << + RETRY_LIMIT_LONG_SHIFT) & RETRY_LIMIT_LONG_MASK) | + ((hw->conf.short_frame_max_tx_count << + RETRY_LIMIT_SHORT_SHIFT) & RETRY_LIMIT_SHORT_MASK); + rtl8xxxu_write16(priv, REG_RETRY_LIMIT, val16); + } + if (changed & IEEE80211_CONF_CHANGE_CHANNEL) { switch (hw->conf.chandef.width) { case NL80211_CHAN_WIDTH_20_NOHT:
diff --git a/drivers/net/wireless/realtek/rtlwifi/debug.c b/drivers/net/wireless/realtek/rtlwifi/debug.c index ec0da33..55db71c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/debug.c +++ b/drivers/net/wireless/realtek/rtlwifi/debug.c
@@ -349,8 +349,8 @@ static ssize_t rtl_debugfs_set_write_h2c(struct file *filp, tmp_len = (count > sizeof(tmp) - 1 ? sizeof(tmp) - 1 : count); - if (copy_from_user(tmp, buffer, tmp_len)) - return -EFAULT; + if (!buffer || copy_from_user(tmp, buffer, tmp_len)) + return count; tmp[tmp_len] = '\0'; @@ -360,8 +360,8 @@ static ssize_t rtl_debugfs_set_write_h2c(struct file *filp, &h2c_data[4], &h2c_data[5], &h2c_data[6], &h2c_data[7]); - if (h2c_len == 0) - return -EINVAL; + if (h2c_len <= 0) + return count; for (i = 0; i < h2c_len; i++) h2c_data_packed[i] = (u8)h2c_data[i];
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c index 8647db0..979e434 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/phy.c
@@ -1587,7 +1587,7 @@ static void _rtl8821ae_phy_txpower_by_rate_configuration(struct ieee80211_hw *hw } /* string is in decimal */ -static bool _rtl8812ae_get_integer_from_string(const char *str, u8 *pint) +static bool _rtl8812ae_get_integer_from_string(char *str, u8 *pint) { u16 i = 0; *pint = 0; @@ -1605,6 +1605,18 @@ static bool _rtl8812ae_get_integer_from_string(const char *str, u8 *pint) return true; } +static bool _rtl8812ae_eq_n_byte(u8 *str1, u8 *str2, u32 num) +{ + if (num == 0) + return false; + while (num > 0) { + num--; + if (str1[num] != str2[num]) + return false; + } + return true; +} + static s8 _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(struct ieee80211_hw *hw, u8 band, u8 channel) { @@ -1631,11 +1643,10 @@ static s8 _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(struct ieee80211_hw *hw, return channel_index; } -static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, - const char *pregulation, - const char *pband, const char *pbandwidth, - const char *prate_section, const char *prf_path, - const char *pchannel, const char *ppower_limit) +static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 *pregulation, + u8 *pband, u8 *pbandwidth, + u8 *prate_section, u8 *prf_path, + u8 *pchannel, u8 *ppower_limit) { struct rtl_priv *rtlpriv = rtl_priv(hw); struct rtl_phy *rtlphy = &rtlpriv->phy; @@ -1643,8 +1654,8 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, u8 channel_index; s8 power_limit = 0, prev_power_limit, ret; - if (!_rtl8812ae_get_integer_from_string(pchannel, &channel) || - !_rtl8812ae_get_integer_from_string(ppower_limit, + if (!_rtl8812ae_get_integer_from_string((char *)pchannel, &channel) || + !_rtl8812ae_get_integer_from_string((char *)ppower_limit, &power_limit)) { RT_TRACE(rtlpriv, COMP_INIT, DBG_TRACE, "Illegal index of pwr_lmt table [chnl %d][val %d]\n", @@ -1654,42 +1665,42 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, power_limit = power_limit > MAX_POWER_INDEX ? MAX_POWER_INDEX : power_limit; - if (strcmp(pregulation, "FCC") == 0) + if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("FCC"), 3)) regulation = 0; - else if (strcmp(pregulation, "MKK") == 0) + else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("MKK"), 3)) regulation = 1; - else if (strcmp(pregulation, "ETSI") == 0) + else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("ETSI"), 4)) regulation = 2; - else if (strcmp(pregulation, "WW13") == 0) + else if (_rtl8812ae_eq_n_byte(pregulation, (u8 *)("WW13"), 4)) regulation = 3; - if (strcmp(prate_section, "CCK") == 0) + if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("CCK"), 3)) rate_section = 0; - else if (strcmp(prate_section, "OFDM") == 0) + else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("OFDM"), 4)) rate_section = 1; - else if (strcmp(prate_section, "HT") == 0 && - strcmp(prf_path, "1T") == 0) + else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) && + _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2)) rate_section = 2; - else if (strcmp(prate_section, "HT") == 0 && - strcmp(prf_path, "2T") == 0) + else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("HT"), 2) && + _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2)) rate_section = 3; - else if (strcmp(prate_section, "VHT") == 0 && - strcmp(prf_path, "1T") == 0) + else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) && + _rtl8812ae_eq_n_byte(prf_path, (u8 *)("1T"), 2)) rate_section = 4; - else if (strcmp(prate_section, "VHT") == 0 && - strcmp(prf_path, "2T") == 0) + else if (_rtl8812ae_eq_n_byte(prate_section, (u8 *)("VHT"), 3) && + _rtl8812ae_eq_n_byte(prf_path, (u8 *)("2T"), 2)) rate_section = 5; - if (strcmp(pbandwidth, "20M") == 0) + if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("20M"), 3)) bandwidth = 0; - else if (strcmp(pbandwidth, "40M") == 0) + else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("40M"), 3)) bandwidth = 1; - else if (strcmp(pbandwidth, "80M") == 0) + else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("80M"), 3)) bandwidth = 2; - else if (strcmp(pbandwidth, "160M") == 0) + else if (_rtl8812ae_eq_n_byte(pbandwidth, (u8 *)("160M"), 4)) bandwidth = 3; - if (strcmp(pband, "2.4G") == 0) { + if (_rtl8812ae_eq_n_byte(pband, (u8 *)("2.4G"), 4)) { ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw, BAND_ON_2_4G, channel); @@ -1713,7 +1724,7 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, regulation, bandwidth, rate_section, channel_index, rtlphy->txpwr_limit_2_4g[regulation][bandwidth] [rate_section][channel_index][RF90_PATH_A]); - } else if (strcmp(pband, "5G") == 0) { + } else if (_rtl8812ae_eq_n_byte(pband, (u8 *)("5G"), 2)) { ret = _rtl8812ae_phy_get_chnl_idx_of_txpwr_lmt(hw, BAND_ON_5G, channel); @@ -1744,10 +1755,10 @@ static void _rtl8812ae_phy_set_txpower_limit(struct ieee80211_hw *hw, } static void _rtl8812ae_phy_config_bb_txpwr_lmt(struct ieee80211_hw *hw, - const char *regulation, const char *band, - const char *bandwidth, const char *rate_section, - const char *rf_path, const char *channel, - const char *power_limit) + u8 *regulation, u8 *band, + u8 *bandwidth, u8 *rate_section, + u8 *rf_path, u8 *channel, + u8 *power_limit) { _rtl8812ae_phy_set_txpower_limit(hw, regulation, band, bandwidth, rate_section, rf_path, channel, @@ -1760,7 +1771,7 @@ static void _rtl8821ae_phy_read_and_config_txpwr_lmt(struct ieee80211_hw *hw) struct rtl_hal *rtlhal = rtl_hal(rtlpriv); u32 i = 0; u32 array_len; - const char **array; + u8 **array; if (rtlhal->hw_type == HARDWARE_TYPE_RTL8812AE) { array_len = RTL8812AE_TXPWR_LMT_ARRAY_LEN; @@ -1774,13 +1785,13 @@ static void _rtl8821ae_phy_read_and_config_txpwr_lmt(struct ieee80211_hw *hw) "\n"); for (i = 0; i < array_len; i += 7) { - const char *regulation = array[i]; - const char *band = array[i+1]; - const char *bandwidth = array[i+2]; - const char *rate = array[i+3]; - const char *rf_path = array[i+4]; - const char *chnl = array[i+5]; - const char *val = array[i+6]; + u8 *regulation = array[i]; + u8 *band = array[i+1]; + u8 *bandwidth = array[i+2]; + u8 *rate = array[i+3]; + u8 *rf_path = array[i+4]; + u8 *chnl = array[i+5]; + u8 *val = array[i+6]; _rtl8812ae_phy_config_bb_txpwr_lmt(hw, regulation, band, bandwidth, rate, rf_path,
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c index fcaaf66..ed72a2a 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.c
@@ -2894,7 +2894,7 @@ u32 RTL8821AE_AGC_TAB_1TARRAYLEN = ARRAY_SIZE(RTL8821AE_AGC_TAB_ARRAY); * TXPWR_LMT.TXT ******************************************************************************/ -const char *RTL8812AE_TXPWR_LMT[] = { +u8 *RTL8812AE_TXPWR_LMT[] = { "FCC", "2.4G", "20M", "CCK", "1T", "01", "36", "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32", "MKK", "2.4G", "20M", "CCK", "1T", "01", "32", @@ -3463,7 +3463,7 @@ const char *RTL8812AE_TXPWR_LMT[] = { u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN = ARRAY_SIZE(RTL8812AE_TXPWR_LMT); -const char *RTL8821AE_TXPWR_LMT[] = { +u8 *RTL8821AE_TXPWR_LMT[] = { "FCC", "2.4G", "20M", "CCK", "1T", "01", "32", "ETSI", "2.4G", "20M", "CCK", "1T", "01", "32", "MKK", "2.4G", "20M", "CCK", "1T", "01", "32",
diff --git a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h index 76c62b7..540159c 100644 --- a/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h +++ b/drivers/net/wireless/realtek/rtlwifi/rtl8821ae/table.h
@@ -28,7 +28,7 @@ extern u32 RTL8821AE_AGC_TAB_ARRAY[]; extern u32 RTL8812AE_AGC_TAB_1TARRAYLEN; extern u32 RTL8812AE_AGC_TAB_ARRAY[]; extern u32 RTL8812AE_TXPWR_LMT_ARRAY_LEN; -extern const char *RTL8812AE_TXPWR_LMT[]; +extern u8 *RTL8812AE_TXPWR_LMT[]; extern u32 RTL8821AE_TXPWR_LMT_ARRAY_LEN; -extern const char *RTL8821AE_TXPWR_LMT[]; +extern u8 *RTL8821AE_TXPWR_LMT[]; #endif
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c index ace0169..c8f8fe5 100644 --- a/drivers/net/wireless/rndis_wlan.c +++ b/drivers/net/wireless/rndis_wlan.c
@@ -700,8 +700,8 @@ static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len) struct rndis_query *get; struct rndis_query_c *get_c; } u; - int ret; - size_t buflen, resplen, respoffs, copylen; + int ret, buflen; + int resplen, respoffs, copylen; buflen = *len + sizeof(*u.get); if (buflen < CONTROL_BUFFER_SIZE) @@ -736,15 +736,22 @@ static int rndis_query_oid(struct usbnet *dev, u32 oid, void *data, int *len) if (respoffs > buflen) { /* Device returned data offset outside buffer, error. */ - netdev_dbg(dev->net, - "%s(%s): received invalid data offset: %zu > %zu\n", - __func__, oid_to_string(oid), respoffs, buflen); + netdev_dbg(dev->net, "%s(%s): received invalid " + "data offset: %d > %d\n", __func__, + oid_to_string(oid), respoffs, buflen); ret = -EINVAL; goto exit_unlock; } - copylen = min(resplen, buflen - respoffs); + if ((resplen + respoffs) > buflen) { + /* Device would have returned more data if buffer would + * have been big enough. Copy just the bits that we got. + */ + copylen = buflen - respoffs; + } else { + copylen = resplen; + } if (copylen > *len) copylen = *len;
diff --git a/drivers/net/wireless/rsi/rsi_91x_coex.c b/drivers/net/wireless/rsi/rsi_91x_coex.c index acf4d8c..c8ba148 100644 --- a/drivers/net/wireless/rsi/rsi_91x_coex.c +++ b/drivers/net/wireless/rsi/rsi_91x_coex.c
@@ -160,7 +160,6 @@ int rsi_coex_attach(struct rsi_common *common) rsi_coex_scheduler_thread, "Coex-Tx-Thread")) { rsi_dbg(ERR_ZONE, "%s: Unable to init tx thrd\n", __func__); - kfree(coex_cb); return -EINVAL; } return 0;
diff --git a/drivers/net/wireless/rsi/rsi_91x_core.c b/drivers/net/wireless/rsi/rsi_91x_core.c index a939b55..c6c2903 100644 --- a/drivers/net/wireless/rsi/rsi_91x_core.c +++ b/drivers/net/wireless/rsi/rsi_91x_core.c
@@ -466,9 +466,7 @@ void rsi_core_xmit(struct rsi_common *common, struct sk_buff *skb) tid, 0); } } - - if (IEEE80211_SKB_CB(skb)->control.flags & - IEEE80211_TX_CTRL_PORT_CTRL_PROTO) { + if (skb->protocol == cpu_to_be16(ETH_P_PAE)) { q_num = MGMT_SOFT_Q; skb->priority = q_num; }
diff --git a/drivers/net/wireless/rsi/rsi_91x_hal.c b/drivers/net/wireless/rsi/rsi_91x_hal.c index 062c5da..7d0b44f 100644 --- a/drivers/net/wireless/rsi/rsi_91x_hal.c +++ b/drivers/net/wireless/rsi/rsi_91x_hal.c
@@ -162,16 +162,12 @@ int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb) u8 header_size; u8 vap_id = 0; u8 dword_align_bytes; - bool tx_eapol; u16 seq_num; info = IEEE80211_SKB_CB(skb); vif = info->control.vif; tx_params = (struct skb_info *)info->driver_data; - tx_eapol = IEEE80211_SKB_CB(skb)->control.flags & - IEEE80211_TX_CTRL_PORT_CTRL_PROTO; - header_size = FRAME_DESC_SZ + sizeof(struct rsi_xtended_desc); if (header_size > skb_headroom(skb)) { rsi_dbg(ERR_ZONE, "%s: Unable to send pkt\n", __func__); @@ -235,7 +231,7 @@ int rsi_prepare_data_desc(struct rsi_common *common, struct sk_buff *skb) } } - if (tx_eapol) { + if (skb->protocol == cpu_to_be16(ETH_P_PAE)) { rsi_dbg(INFO_ZONE, "*** Tx EAPOL ***\n"); data_desc->frame_info = cpu_to_le16(RATE_INFO_ENABLE);
diff --git a/drivers/net/wireless/st/cw1200/scan.c b/drivers/net/wireless/st/cw1200/scan.c index 988581c..c46b044 100644 --- a/drivers/net/wireless/st/cw1200/scan.c +++ b/drivers/net/wireless/st/cw1200/scan.c
@@ -120,7 +120,8 @@ int cw1200_hw_scan(struct ieee80211_hw *hw, ++priv->scan.n_ssids; } - dev_kfree_skb(frame.skb); + if (frame.skb) + dev_kfree_skb(frame.skb); mutex_unlock(&priv->conf_mutex); queue_work(priv->workqueue, &priv->scan.work); return 0;
diff --git a/drivers/net/wireless/wl3501_cs.c b/drivers/net/wireless/wl3501_cs.c index 8638c7c..122d364 100644 --- a/drivers/net/wireless/wl3501_cs.c +++ b/drivers/net/wireless/wl3501_cs.c
@@ -1328,7 +1328,7 @@ static netdev_tx_t wl3501_hard_start_xmit(struct sk_buff *skb, } else { ++dev->stats.tx_packets; dev->stats.tx_bytes += skb->len; - dev_kfree_skb_irq(skb); + kfree_skb(skb); if (this->tx_buffer_cnt < 2) netif_stop_queue(dev);
diff --git a/drivers/net/xen-netback/common.h b/drivers/net/xen-netback/common.h index 56ab292..f7e746f 100644 --- a/drivers/net/xen-netback/common.h +++ b/drivers/net/xen-netback/common.h
@@ -48,6 +48,7 @@ #include <linux/debugfs.h> typedef unsigned int pending_ring_idx_t; +#define INVALID_PENDING_RING_IDX (~0U) struct pending_tx_info { struct xen_netif_tx_request req; /* tx request */ @@ -81,6 +82,8 @@ struct xenvif_rx_meta { /* Discriminate from any valid pending_idx value. */ #define INVALID_PENDING_IDX 0xFFFF +#define MAX_BUFFER_OFFSET XEN_PAGE_SIZE + #define MAX_PENDING_REQS XEN_NETIF_TX_RING_SIZE /* The maximum number of frags is derived from the size of a grant (same @@ -166,7 +169,7 @@ struct xenvif_queue { /* Per-queue data for xenvif */ struct pending_tx_info pending_tx_info[MAX_PENDING_REQS]; grant_handle_t grant_tx_handle[MAX_PENDING_REQS]; - struct gnttab_copy tx_copy_ops[2 * MAX_PENDING_REQS]; + struct gnttab_copy tx_copy_ops[MAX_PENDING_REQS]; struct gnttab_map_grant_ref tx_map_ops[MAX_PENDING_REQS]; struct gnttab_unmap_grant_ref tx_unmap_ops[MAX_PENDING_REQS]; /* passed to gnttab_[un]map_refs with pages under (un)mapping */ @@ -361,6 +364,11 @@ void xenvif_free(struct xenvif *vif); int xenvif_xenbus_init(void); void xenvif_xenbus_fini(void); +int xenvif_schedulable(struct xenvif *vif); + +int xenvif_queue_stopped(struct xenvif_queue *queue); +void xenvif_wake_queue(struct xenvif_queue *queue); + /* (Un)Map communication rings. */ void xenvif_unmap_frontend_data_rings(struct xenvif_queue *queue); int xenvif_map_frontend_data_rings(struct xenvif_queue *queue, @@ -383,13 +391,17 @@ int xenvif_dealloc_kthread(void *data); irqreturn_t xenvif_ctrl_irq_fn(int irq, void *data); bool xenvif_have_rx_work(struct xenvif_queue *queue, bool test_kthread); -bool xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb); +void xenvif_rx_action(struct xenvif_queue *queue); +void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb); void xenvif_carrier_on(struct xenvif *vif); /* Callback from stack when TX packet can be released */ void xenvif_zerocopy_callback(struct ubuf_info *ubuf, bool zerocopy_success); +/* Unmap a pending page and release it back to the guest */ +void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx); + static inline pending_ring_idx_t nr_pending_reqs(struct xenvif_queue *queue) { return MAX_PENDING_REQS -
diff --git a/drivers/net/xen-netback/interface.c b/drivers/net/xen-netback/interface.c index 6432f6e..8090895 100644 --- a/drivers/net/xen-netback/interface.c +++ b/drivers/net/xen-netback/interface.c
@@ -70,7 +70,7 @@ void xenvif_skb_zerocopy_complete(struct xenvif_queue *queue) wake_up(&queue->dealloc_wq); } -static int xenvif_schedulable(struct xenvif *vif) +int xenvif_schedulable(struct xenvif *vif) { return netif_running(vif->dev) && test_bit(VIF_STATUS_CONNECTED, &vif->status) && @@ -178,6 +178,20 @@ irqreturn_t xenvif_interrupt(int irq, void *dev_id) return IRQ_HANDLED; } +int xenvif_queue_stopped(struct xenvif_queue *queue) +{ + struct net_device *dev = queue->vif->dev; + unsigned int id = queue->id; + return netif_tx_queue_stopped(netdev_get_tx_queue(dev, id)); +} + +void xenvif_wake_queue(struct xenvif_queue *queue) +{ + struct net_device *dev = queue->vif->dev; + unsigned int id = queue->id; + netif_tx_wake_queue(netdev_get_tx_queue(dev, id)); +} + static u16 xenvif_select_queue(struct net_device *dev, struct sk_buff *skb, struct net_device *sb_dev) { @@ -255,16 +269,14 @@ xenvif_start_xmit(struct sk_buff *skb, struct net_device *dev) if (vif->hash.alg == XEN_NETIF_CTRL_HASH_ALGORITHM_NONE) skb_clear_hash(skb); - if (!xenvif_rx_queue_tail(queue, skb)) - goto drop; - + xenvif_rx_queue_tail(queue, skb); xenvif_kick_thread(queue); return NETDEV_TX_OK; drop: vif->dev->stats.tx_dropped++; - dev_kfree_skb_any(skb); + dev_kfree_skb(skb); return NETDEV_TX_OK; }
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index a307875..995566a 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c
@@ -105,8 +105,6 @@ static void make_tx_response(struct xenvif_queue *queue, s8 st); static void push_tx_responses(struct xenvif_queue *queue); -static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx); - static inline int tx_work_todo(struct xenvif_queue *queue); static inline unsigned long idx_to_pfn(struct xenvif_queue *queue, @@ -325,14 +323,10 @@ static int xenvif_count_requests(struct xenvif_queue *queue, struct xenvif_tx_cb { - u16 copy_pending_idx[XEN_NETBK_LEGACY_SLOTS_MAX + 1]; - u8 copy_count; - u32 split_mask; + u16 pending_idx; }; #define XENVIF_TX_CB(skb) ((struct xenvif_tx_cb *)(skb)->cb) -#define copy_pending_idx(skb, i) (XENVIF_TX_CB(skb)->copy_pending_idx[i]) -#define copy_count(skb) (XENVIF_TX_CB(skb)->copy_count) static inline void xenvif_tx_create_map_op(struct xenvif_queue *queue, u16 pending_idx, @@ -355,8 +349,6 @@ static inline struct sk_buff *xenvif_alloc_skb(unsigned int size) struct sk_buff *skb = alloc_skb(size + NET_SKB_PAD + NET_IP_ALIGN, GFP_ATOMIC | __GFP_NOWARN); - - BUILD_BUG_ON(sizeof(*XENVIF_TX_CB(skb)) > sizeof(skb->cb)); if (unlikely(skb == NULL)) return NULL; @@ -369,104 +361,31 @@ static inline struct sk_buff *xenvif_alloc_skb(unsigned int size) return skb; } -static void xenvif_get_requests(struct xenvif_queue *queue, - struct sk_buff *skb, - struct xen_netif_tx_request *first, - struct xen_netif_tx_request *txfrags, - unsigned *copy_ops, - unsigned *map_ops, - unsigned int frag_overflow, - struct sk_buff *nskb, - unsigned int extra_count, - unsigned int data_len) +static struct gnttab_map_grant_ref *xenvif_get_requests(struct xenvif_queue *queue, + struct sk_buff *skb, + struct xen_netif_tx_request *txp, + struct gnttab_map_grant_ref *gop, + unsigned int frag_overflow, + struct sk_buff *nskb) { struct skb_shared_info *shinfo = skb_shinfo(skb); skb_frag_t *frags = shinfo->frags; - u16 pending_idx; + u16 pending_idx = XENVIF_TX_CB(skb)->pending_idx; + int start; pending_ring_idx_t index; unsigned int nr_slots; - struct gnttab_copy *cop = queue->tx_copy_ops + *copy_ops; - struct gnttab_map_grant_ref *gop = queue->tx_map_ops + *map_ops; - struct xen_netif_tx_request *txp = first; - nr_slots = shinfo->nr_frags + 1; + nr_slots = shinfo->nr_frags; - copy_count(skb) = 0; - XENVIF_TX_CB(skb)->split_mask = 0; + /* Skip first skb fragment if it is on same page as header fragment. */ + start = (frag_get_pending_idx(&shinfo->frags[0]) == pending_idx); - /* Create copy ops for exactly data_len bytes into the skb head. */ - __skb_put(skb, data_len); - while (data_len > 0) { - int amount = data_len > txp->size ? txp->size : data_len; - bool split = false; - - cop->source.u.ref = txp->gref; - cop->source.domid = queue->vif->domid; - cop->source.offset = txp->offset; - - cop->dest.domid = DOMID_SELF; - cop->dest.offset = (offset_in_page(skb->data + - skb_headlen(skb) - - data_len)) & ~XEN_PAGE_MASK; - cop->dest.u.gmfn = virt_to_gfn(skb->data + skb_headlen(skb) - - data_len); - - /* Don't cross local page boundary! */ - if (cop->dest.offset + amount > XEN_PAGE_SIZE) { - amount = XEN_PAGE_SIZE - cop->dest.offset; - XENVIF_TX_CB(skb)->split_mask |= 1U << copy_count(skb); - split = true; - } - - cop->len = amount; - cop->flags = GNTCOPY_source_gref; - - index = pending_index(queue->pending_cons); - pending_idx = queue->pending_ring[index]; - callback_param(queue, pending_idx).ctx = NULL; - copy_pending_idx(skb, copy_count(skb)) = pending_idx; - if (!split) - copy_count(skb)++; - - cop++; - data_len -= amount; - - if (amount == txp->size) { - /* The copy op covered the full tx_request */ - - memcpy(&queue->pending_tx_info[pending_idx].req, - txp, sizeof(*txp)); - queue->pending_tx_info[pending_idx].extra_count = - (txp == first) ? extra_count : 0; - - if (txp == first) - txp = txfrags; - else - txp++; - queue->pending_cons++; - nr_slots--; - } else { - /* The copy op partially covered the tx_request. - * The remainder will be mapped or copied in the next - * iteration. - */ - txp->offset += amount; - txp->size -= amount; - } - } - - for (shinfo->nr_frags = 0; shinfo->nr_frags < nr_slots; - shinfo->nr_frags++, gop++) { + for (shinfo->nr_frags = start; shinfo->nr_frags < nr_slots; + shinfo->nr_frags++, txp++, gop++) { index = pending_index(queue->pending_cons++); pending_idx = queue->pending_ring[index]; - xenvif_tx_create_map_op(queue, pending_idx, txp, - txp == first ? extra_count : 0, gop); + xenvif_tx_create_map_op(queue, pending_idx, txp, 0, gop); frag_set_pending_idx(&frags[shinfo->nr_frags], pending_idx); - - if (txp == first) - txp = txfrags; - else - txp++; } if (frag_overflow) { @@ -487,8 +406,7 @@ static void xenvif_get_requests(struct xenvif_queue *queue, skb_shinfo(skb)->frag_list = nskb; } - (*copy_ops) = cop - queue->tx_copy_ops; - (*map_ops) = gop - queue->tx_map_ops; + return gop; } static inline void xenvif_grant_handle_set(struct xenvif_queue *queue, @@ -524,7 +442,7 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, struct gnttab_copy **gopp_copy) { struct gnttab_map_grant_ref *gop_map = *gopp_map; - u16 pending_idx; + u16 pending_idx = XENVIF_TX_CB(skb)->pending_idx; /* This always points to the shinfo of the skb being checked, which * could be either the first or the one on the frag_list */ @@ -535,44 +453,24 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, struct skb_shared_info *first_shinfo = NULL; int nr_frags = shinfo->nr_frags; const bool sharedslot = nr_frags && - frag_get_pending_idx(&shinfo->frags[0]) == - copy_pending_idx(skb, copy_count(skb) - 1); - int i, err = 0; + frag_get_pending_idx(&shinfo->frags[0]) == pending_idx; + int i, err; - for (i = 0; i < copy_count(skb); i++) { - int newerr; - - /* Check status of header. */ - pending_idx = copy_pending_idx(skb, i); - - newerr = (*gopp_copy)->status; - - /* Split copies need to be handled together. */ - if (XENVIF_TX_CB(skb)->split_mask & (1U << i)) { - (*gopp_copy)++; - if (!newerr) - newerr = (*gopp_copy)->status; - } - if (likely(!newerr)) { - /* The first frag might still have this slot mapped */ - if (i < copy_count(skb) - 1 || !sharedslot) - xenvif_idx_release(queue, pending_idx, - XEN_NETIF_RSP_OKAY); - } else { - err = newerr; - if (net_ratelimit()) - netdev_dbg(queue->vif->dev, - "Grant copy of header failed! status: %d pending_idx: %u ref: %u\n", - (*gopp_copy)->status, - pending_idx, - (*gopp_copy)->source.u.ref); - /* The first frag might still have this slot mapped */ - if (i < copy_count(skb) - 1 || !sharedslot) - xenvif_idx_release(queue, pending_idx, - XEN_NETIF_RSP_ERROR); - } - (*gopp_copy)++; + /* Check status of header. */ + err = (*gopp_copy)->status; + if (unlikely(err)) { + if (net_ratelimit()) + netdev_dbg(queue->vif->dev, + "Grant copy of header failed! status: %d pending_idx: %u ref: %u\n", + (*gopp_copy)->status, + pending_idx, + (*gopp_copy)->source.u.ref); + /* The first frag might still have this slot mapped */ + if (!sharedslot) + xenvif_idx_release(queue, pending_idx, + XEN_NETIF_RSP_ERROR); } + (*gopp_copy)++; check_frags: for (i = 0; i < nr_frags; i++, gop_map++) { @@ -619,6 +517,14 @@ static int xenvif_tx_check_gop(struct xenvif_queue *queue, if (err) continue; + /* First error: if the header haven't shared a slot with the + * first frag, release it as well. + */ + if (!sharedslot) + xenvif_idx_release(queue, + XENVIF_TX_CB(skb)->pending_idx, + XEN_NETIF_RSP_OKAY); + /* Invalidate preceding fragments of this skb. */ for (j = 0; j < i; j++) { pending_idx = frag_get_pending_idx(&shinfo->frags[j]); @@ -888,6 +794,7 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, unsigned *copy_ops, unsigned *map_ops) { + struct gnttab_map_grant_ref *gop = queue->tx_map_ops; struct sk_buff *skb, *nskb; int ret; unsigned int frag_overflow; @@ -969,12 +876,8 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, continue; } - data_len = (txreq.size > XEN_NETBACK_TX_COPY_LEN) ? - XEN_NETBACK_TX_COPY_LEN : txreq.size; - ret = xenvif_count_requests(queue, &txreq, extra_count, txfrags, work_to_do); - if (unlikely(ret < 0)) break; @@ -989,8 +892,10 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, /* No crossing a page as the payload mustn't fragment. */ if (unlikely((txreq.offset + txreq.size) > XEN_PAGE_SIZE)) { - netdev_err(queue->vif->dev, "Cross page boundary, txreq.offset: %u, size: %u\n", - txreq.offset, txreq.size); + netdev_err(queue->vif->dev, + "txreq.offset: %u, size: %u, end: %lu\n", + txreq.offset, txreq.size, + (unsigned long)(txreq.offset&~XEN_PAGE_MASK) + txreq.size); xenvif_fatal_tx_err(queue->vif); break; } @@ -998,8 +903,9 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, index = pending_index(queue->pending_cons); pending_idx = queue->pending_ring[index]; - if (ret >= XEN_NETBK_LEGACY_SLOTS_MAX - 1 && data_len < txreq.size) - data_len = txreq.size; + data_len = (txreq.size > XEN_NETBACK_TX_COPY_LEN && + ret < XEN_NETBK_LEGACY_SLOTS_MAX) ? + XEN_NETBACK_TX_COPY_LEN : txreq.size; skb = xenvif_alloc_skb(data_len); if (unlikely(skb == NULL)) { @@ -1010,6 +916,8 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, } skb_shinfo(skb)->nr_frags = ret; + if (data_len < txreq.size) + skb_shinfo(skb)->nr_frags++; /* At this point shinfo->nr_frags is in fact the number of * slots, which can be as large as XEN_NETBK_LEGACY_SLOTS_MAX. */ @@ -1071,19 +979,54 @@ static void xenvif_tx_build_gops(struct xenvif_queue *queue, type); } - xenvif_get_requests(queue, skb, &txreq, txfrags, copy_ops, - map_ops, frag_overflow, nskb, extra_count, - data_len); + XENVIF_TX_CB(skb)->pending_idx = pending_idx; + + __skb_put(skb, data_len); + queue->tx_copy_ops[*copy_ops].source.u.ref = txreq.gref; + queue->tx_copy_ops[*copy_ops].source.domid = queue->vif->domid; + queue->tx_copy_ops[*copy_ops].source.offset = txreq.offset; + + queue->tx_copy_ops[*copy_ops].dest.u.gmfn = + virt_to_gfn(skb->data); + queue->tx_copy_ops[*copy_ops].dest.domid = DOMID_SELF; + queue->tx_copy_ops[*copy_ops].dest.offset = + offset_in_page(skb->data) & ~XEN_PAGE_MASK; + + queue->tx_copy_ops[*copy_ops].len = data_len; + queue->tx_copy_ops[*copy_ops].flags = GNTCOPY_source_gref; + + (*copy_ops)++; + + if (data_len < txreq.size) { + frag_set_pending_idx(&skb_shinfo(skb)->frags[0], + pending_idx); + xenvif_tx_create_map_op(queue, pending_idx, &txreq, + extra_count, gop); + gop++; + } else { + frag_set_pending_idx(&skb_shinfo(skb)->frags[0], + INVALID_PENDING_IDX); + memcpy(&queue->pending_tx_info[pending_idx].req, + &txreq, sizeof(txreq)); + queue->pending_tx_info[pending_idx].extra_count = + extra_count; + } + + queue->pending_cons++; + + gop = xenvif_get_requests(queue, skb, txfrags, gop, + frag_overflow, nskb); __skb_queue_tail(&queue->tx_queue, skb); queue->tx.req_cons = idx; - if ((*map_ops >= ARRAY_SIZE(queue->tx_map_ops)) || + if (((gop-queue->tx_map_ops) >= ARRAY_SIZE(queue->tx_map_ops)) || (*copy_ops >= ARRAY_SIZE(queue->tx_copy_ops))) break; } + (*map_ops) = gop - queue->tx_map_ops; return; } @@ -1162,8 +1105,9 @@ static int xenvif_tx_submit(struct xenvif_queue *queue) while ((skb = __skb_dequeue(&queue->tx_queue)) != NULL) { struct xen_netif_tx_request *txp; u16 pending_idx; + unsigned data_len; - pending_idx = copy_pending_idx(skb, 0); + pending_idx = XENVIF_TX_CB(skb)->pending_idx; txp = &queue->pending_tx_info[pending_idx].req; /* Check the remap error code. */ @@ -1182,6 +1126,18 @@ static int xenvif_tx_submit(struct xenvif_queue *queue) continue; } + data_len = skb->len; + callback_param(queue, pending_idx).ctx = NULL; + if (data_len < txp->size) { + /* Append the packet payload as a fragment. */ + txp->offset += data_len; + txp->size -= data_len; + } else { + /* Schedule a response immediately. */ + xenvif_idx_release(queue, pending_idx, + XEN_NETIF_RSP_OKAY); + } + if (txp->flags & XEN_NETTXF_csum_blank) skb->ip_summed = CHECKSUM_PARTIAL; else if (txp->flags & XEN_NETTXF_data_validated) @@ -1367,7 +1323,7 @@ static inline void xenvif_tx_dealloc_action(struct xenvif_queue *queue) /* Called after netfront has transmitted */ int xenvif_tx_action(struct xenvif_queue *queue, int budget) { - unsigned nr_mops = 0, nr_cops = 0; + unsigned nr_mops, nr_cops = 0; int work_done, ret; if (unlikely(!tx_work_todo(queue))) @@ -1454,7 +1410,7 @@ static void push_tx_responses(struct xenvif_queue *queue) notify_remote_via_irq(queue->tx_irq); } -static void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx) +void xenvif_idx_unmap(struct xenvif_queue *queue, u16 pending_idx) { int ret; struct gnttab_unmap_grant_ref tx_unmap_op;
diff --git a/drivers/net/xen-netback/rx.c b/drivers/net/xen-netback/rx.c index ab21697..85a5a62 100644 --- a/drivers/net/xen-netback/rx.c +++ b/drivers/net/xen-netback/rx.c
@@ -82,10 +82,9 @@ static bool xenvif_rx_ring_slots_available(struct xenvif_queue *queue) return false; } -bool xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb) +void xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb) { unsigned long flags; - bool ret = true; spin_lock_irqsave(&queue->rx_queue.lock, flags); @@ -93,7 +92,8 @@ bool xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb) struct net_device *dev = queue->vif->dev; netif_tx_stop_queue(netdev_get_tx_queue(dev, queue->id)); - ret = false; + kfree_skb(skb); + queue->vif->dev->stats.rx_dropped++; } else { if (skb_queue_empty(&queue->rx_queue)) xenvif_update_needed_slots(queue, skb); @@ -104,8 +104,6 @@ bool xenvif_rx_queue_tail(struct xenvif_queue *queue, struct sk_buff *skb) } spin_unlock_irqrestore(&queue->rx_queue.lock, flags); - - return ret; } static struct sk_buff *xenvif_rx_dequeue(struct xenvif_queue *queue) @@ -475,7 +473,7 @@ static void xenvif_rx_skb(struct xenvif_queue *queue) #define RX_BATCH_SIZE 64 -static void xenvif_rx_action(struct xenvif_queue *queue) +void xenvif_rx_action(struct xenvif_queue *queue) { struct sk_buff_head completed_skbs; unsigned int work_done = 0;
diff --git a/drivers/net/xen-netback/xenbus.c b/drivers/net/xen-netback/xenbus.c index 43bd881..44e353d 100644 --- a/drivers/net/xen-netback/xenbus.c +++ b/drivers/net/xen-netback/xenbus.c
@@ -202,10 +202,10 @@ static int netback_remove(struct xenbus_device *dev) set_backend_state(be, XenbusStateClosed); unregister_hotplug_status_watch(be); - xenbus_rm(XBT_NIL, dev->nodename, "hotplug-status"); if (be->vif) { kobject_uevent(&dev->dev.kobj, KOBJ_OFFLINE); xen_unregister_watchers(be->vif); + xenbus_rm(XBT_NIL, dev->nodename, "hotplug-status"); xenvif_free(be->vif); be->vif = NULL; } @@ -435,6 +435,7 @@ static void backend_disconnect(struct backend_info *be) unsigned int queue_index; xen_unregister_watchers(vif); + xenbus_rm(XBT_NIL, be->dev->nodename, "hotplug-status"); #ifdef CONFIG_DEBUG_FS xenvif_debugfs_delif(vif); #endif /* CONFIG_DEBUG_FS */
diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 9ae0903..810fa99 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c
@@ -1621,12 +1621,6 @@ static int netfront_resume(struct xenbus_device *dev) netif_tx_unlock_bh(info->netdev); xennet_disconnect_backend(info); - - rtnl_lock(); - if (info->queues) - xennet_destroy_queues(info); - rtnl_unlock(); - return 0; }
diff --git a/drivers/nfc/fdp/i2c.c b/drivers/nfc/fdp/i2c.c index 7305f1a..ad0abb1 100644 --- a/drivers/nfc/fdp/i2c.c +++ b/drivers/nfc/fdp/i2c.c
@@ -255,9 +255,6 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev, len, sizeof(**fw_vsc_cfg), GFP_KERNEL); - if (!*fw_vsc_cfg) - goto alloc_err; - r = device_property_read_u8_array(dev, FDP_DP_FW_VSC_CFG_NAME, *fw_vsc_cfg, len); @@ -271,7 +268,6 @@ static void fdp_nci_i2c_read_device_properties(struct device *dev, *fw_vsc_cfg = NULL; } -alloc_err: dev_dbg(dev, "Clock type: %d, clock frequency: %d, VSC: %s", *clock_type, *clock_freq, *fw_vsc_cfg != NULL ? "yes" : "no"); }
diff --git a/drivers/nfc/nfcmrvl/i2c.c b/drivers/nfc/nfcmrvl/i2c.c index fa6db97..919b4d2 100644 --- a/drivers/nfc/nfcmrvl/i2c.c +++ b/drivers/nfc/nfcmrvl/i2c.c
@@ -151,15 +151,10 @@ static int nfcmrvl_i2c_nci_send(struct nfcmrvl_private *priv, ret = -EREMOTEIO; } else ret = 0; - } - - if (ret) { kfree_skb(skb); - return ret; } - consume_skb(skb); - return 0; + return ret; } static void nfcmrvl_i2c_nci_update_config(struct nfcmrvl_private *priv,
diff --git a/drivers/nfc/pn533/pn533.c b/drivers/nfc/pn533/pn533.c index 1e90ff1..807b7b3 100644 --- a/drivers/nfc/pn533/pn533.c +++ b/drivers/nfc/pn533/pn533.c
@@ -1293,8 +1293,6 @@ static int pn533_poll_dep_complete(struct pn533 *dev, void *arg, if (IS_ERR(resp)) return PTR_ERR(resp); - memset(&nfc_target, 0, sizeof(struct nfc_target)); - rsp = (struct pn533_cmd_jump_dep_response *)resp->data; rc = rsp->status & PN533_CMD_RET_MASK; @@ -1776,8 +1774,6 @@ static int pn533_in_dep_link_up_complete(struct pn533 *dev, void *arg, dev_dbg(dev->dev, "Creating new target\n"); - memset(&nfc_target, 0, sizeof(struct nfc_target)); - nfc_target.supported_protocols = NFC_PROTO_NFC_DEP_MASK; nfc_target.nfcid1_len = 10; memcpy(nfc_target.nfcid1, rsp->nfcid3t, nfc_target.nfcid1_len);
diff --git a/drivers/nfc/pn533/usb.c b/drivers/nfc/pn533/usb.c index 2021a9d..d7a355d 100644 --- a/drivers/nfc/pn533/usb.c +++ b/drivers/nfc/pn533/usb.c
@@ -153,17 +153,10 @@ static int pn533_usb_send_ack(struct pn533 *dev, gfp_t flags) return usb_submit_urb(phy->ack_urb, flags); } -struct pn533_out_arg { - struct pn533_usb_phy *phy; - struct completion done; -}; - static int pn533_usb_send_frame(struct pn533 *dev, struct sk_buff *out) { struct pn533_usb_phy *phy = dev->phy; - struct pn533_out_arg arg; - void *cntx; int rc; if (phy->priv == NULL) @@ -175,18 +168,10 @@ static int pn533_usb_send_frame(struct pn533 *dev, print_hex_dump_debug("PN533 TX: ", DUMP_PREFIX_NONE, 16, 1, out->data, out->len, false); - arg.phy = phy; - init_completion(&arg.done); - cntx = phy->out_urb->context; - phy->out_urb->context = &arg; - rc = usb_submit_urb(phy->out_urb, GFP_KERNEL); if (rc) return rc; - wait_for_completion(&arg.done); - phy->out_urb->context = cntx; - if (dev->protocol_type == PN533_PROTO_REQ_RESP) { /* request for response for sent packet directly */ rc = pn533_submit_urb_for_response(phy, GFP_KERNEL); @@ -427,31 +412,7 @@ static int pn533_acr122_poweron_rdr(struct pn533_usb_phy *phy) return arg.rc; } -static void pn533_out_complete(struct urb *urb) -{ - struct pn533_out_arg *arg = urb->context; - struct pn533_usb_phy *phy = arg->phy; - - switch (urb->status) { - case 0: - break; /* success */ - case -ECONNRESET: - case -ENOENT: - dev_dbg(&phy->udev->dev, - "The urb has been stopped (status %d)\n", - urb->status); - break; - case -ESHUTDOWN: - default: - nfc_err(&phy->udev->dev, - "Urb failure (status %d)\n", - urb->status); - } - - complete(&arg->done); -} - -static void pn533_ack_complete(struct urb *urb) +static void pn533_send_complete(struct urb *urb) { struct pn533_usb_phy *phy = urb->context; @@ -539,10 +500,10 @@ static int pn533_usb_probe(struct usb_interface *interface, usb_fill_bulk_urb(phy->out_urb, phy->udev, usb_sndbulkpipe(phy->udev, out_endpoint), - NULL, 0, pn533_out_complete, phy); + NULL, 0, pn533_send_complete, phy); usb_fill_bulk_urb(phy->ack_urb, phy->udev, usb_sndbulkpipe(phy->udev, out_endpoint), - NULL, 0, pn533_ack_complete, phy); + NULL, 0, pn533_send_complete, phy); switch (id->driver_info) { case PN533_DEVICE_STD:
diff --git a/drivers/nfc/s3fwrn5/core.c b/drivers/nfc/s3fwrn5/core.c index 9b43cd3..ba6c486 100644 --- a/drivers/nfc/s3fwrn5/core.c +++ b/drivers/nfc/s3fwrn5/core.c
@@ -97,15 +97,11 @@ static int s3fwrn5_nci_send(struct nci_dev *ndev, struct sk_buff *skb) } ret = s3fwrn5_write(info, skb); - if (ret < 0) { + if (ret < 0) kfree_skb(skb); - mutex_unlock(&info->mutex); - return ret; - } - consume_skb(skb); mutex_unlock(&info->mutex); - return 0; + return ret; } static int s3fwrn5_nci_post_setup(struct nci_dev *ndev)
diff --git a/drivers/nfc/st-nci/ndlc.c b/drivers/nfc/st-nci/ndlc.c index 8ccf5a8..5d74c67 100644 --- a/drivers/nfc/st-nci/ndlc.c +++ b/drivers/nfc/st-nci/ndlc.c
@@ -286,15 +286,13 @@ EXPORT_SYMBOL(ndlc_probe); void ndlc_remove(struct llt_ndlc *ndlc) { + st_nci_remove(ndlc->ndev); + /* cancel timers */ del_timer_sync(&ndlc->t1_timer); del_timer_sync(&ndlc->t2_timer); ndlc->t2_active = false; ndlc->t1_active = false; - /* cancel work */ - cancel_work_sync(&ndlc->sm_work); - - st_nci_remove(ndlc->ndev); skb_queue_purge(&ndlc->rcv_q); skb_queue_purge(&ndlc->send_q);
diff --git a/drivers/nfc/st-nci/se.c b/drivers/nfc/st-nci/se.c index 17793f6..f25f1ec 100644 --- a/drivers/nfc/st-nci/se.c +++ b/drivers/nfc/st-nci/se.c
@@ -327,7 +327,7 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev, * AID 81 5 to 16 * PARAMETERS 82 0 to 255 */ - if (skb->len < NFC_MIN_AID_LENGTH + 2 || + if (skb->len < NFC_MIN_AID_LENGTH + 2 && skb->data[0] != NFC_EVT_TRANSACTION_AID_TAG) return -EPROTO; @@ -341,10 +341,8 @@ static int st_nci_hci_connectivity_event_received(struct nci_dev *ndev, /* Check next byte is PARAMETERS tag (82) */ if (skb->data[transaction->aid_len + 2] != - NFC_EVT_TRANSACTION_PARAMS_TAG) { - devm_kfree(dev, transaction); + NFC_EVT_TRANSACTION_PARAMS_TAG) return -EPROTO; - } transaction->params_len = skb->data[transaction->aid_len + 3]; memcpy(transaction->params, skb->data + @@ -665,12 +663,6 @@ int st_nci_se_io(struct nci_dev *ndev, u32 se_idx, ST_NCI_EVT_TRANSMIT_DATA, apdu, apdu_length); default: - /* Need to free cb_context here as at the moment we can't - * clearly indicate to the caller if the callback function - * would be called (and free it) or not. In both cases a - * negative value may be returned to the caller. - */ - kfree(cb_context); return -ENODEV; } }
diff --git a/drivers/nfc/st21nfca/se.c b/drivers/nfc/st21nfca/se.c index 6a1d3b2..d416365 100644 --- a/drivers/nfc/st21nfca/se.c +++ b/drivers/nfc/st21nfca/se.c
@@ -236,12 +236,6 @@ int st21nfca_hci_se_io(struct nfc_hci_dev *hdev, u32 se_idx, ST21NFCA_EVT_TRANSMIT_DATA, apdu, apdu_length); default: - /* Need to free cb_context here as at the moment we can't - * clearly indicate to the caller if the callback function - * would be called (and free it) or not. In both cases a - * negative value may be returned to the caller. - */ - kfree(cb_context); return -ENODEV; } }
diff --git a/drivers/ntb/test/ntb_tool.c b/drivers/ntb/test/ntb_tool.c index 6301aa4..311d6ab 100644 --- a/drivers/ntb/test/ntb_tool.c +++ b/drivers/ntb/test/ntb_tool.c
@@ -367,16 +367,14 @@ static ssize_t tool_fn_write(struct tool_ctx *tc, u64 bits; int n; - if (*offp) - return 0; - buf = kmalloc(size + 1, GFP_KERNEL); if (!buf) return -ENOMEM; - if (copy_from_user(buf, ubuf, size)) { + ret = simple_write_to_buffer(buf, size, offp, ubuf, size); + if (ret < 0) { kfree(buf); - return -EFAULT; + return ret; } buf[size] = 0;
diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index 029a89a..d2ea6ca 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c
@@ -2018,21 +2018,18 @@ static int nvme_pr_preempt(struct block_device *bdev, u64 old, u64 new, enum pr_type type, bool abort) { u32 cdw10 = nvme_pr_type(type) << 8 | (abort ? 2 : 1); - return nvme_pr_command(bdev, cdw10, old, new, nvme_cmd_resv_acquire); } static int nvme_pr_clear(struct block_device *bdev, u64 key) { - u32 cdw10 = 1 | (key ? 0 : 1 << 3); - - return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release); + u32 cdw10 = 1 | (key ? 1 << 3 : 0); + return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_register); } static int nvme_pr_release(struct block_device *bdev, u64 key, enum pr_type type) { - u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 0 : 1 << 3); - + u32 cdw10 = nvme_pr_type(type) << 8 | (key ? 1 << 3 : 0); return nvme_pr_command(bdev, cdw10, key, 0, nvme_cmd_resv_release); } @@ -2671,6 +2668,7 @@ static int nvme_init_subsystem(struct nvme_ctrl *ctrl, struct nvme_id_ctrl *id) nvme_init_subnqn(subsys, ctrl, id); memcpy(subsys->serial, id->sn, sizeof(subsys->serial)); memcpy(subsys->model, id->mn, sizeof(subsys->model)); + memcpy(subsys->firmware_rev, id->fr, sizeof(subsys->firmware_rev)); subsys->vendor_id = le16_to_cpu(id->vid); subsys->cmic = id->cmic; subsys->awupf = le16_to_cpu(id->awupf); @@ -2806,6 +2804,10 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) if (!ctrl->identified) { int i; + ret = nvme_init_subsystem(ctrl, id); + if (ret) + goto out_free; + /* * Check for quirks. Quirk can depend on firmware version, * so, in principle, the set of quirks present can change @@ -2818,13 +2820,7 @@ int nvme_init_identify(struct nvme_ctrl *ctrl) if (quirk_matches(id, &core_quirks[i])) ctrl->quirks |= core_quirks[i].quirks; } - - ret = nvme_init_subsystem(ctrl, id); - if (ret) - goto out_free; } - memcpy(ctrl->subsys->firmware_rev, id->fr, - sizeof(ctrl->subsys->firmware_rev)); if (force_apst && (ctrl->quirks & NVME_QUIRK_NO_DEEPEST_PS)) { dev_warn(ctrl->device, "forcibly allowing all power states due to nvme_core.force_apst -- use at your own risk\n"); @@ -3027,17 +3023,11 @@ static long nvme_dev_ioctl(struct file *file, unsigned int cmd, case NVME_IOCTL_IO_CMD: return nvme_dev_user_cmd(ctrl, argp); case NVME_IOCTL_RESET: - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; dev_warn(ctrl->device, "resetting controller\n"); return nvme_reset_ctrl_sync(ctrl); case NVME_IOCTL_SUBSYS_RESET: - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; return nvme_reset_subsystem(ctrl); case NVME_IOCTL_RESCAN: - if (!capable(CAP_SYS_ADMIN)) - return -EACCES; nvme_queue_scan(ctrl); return 0; default:
diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h index 17c0d6a..81a5b96 100644 --- a/drivers/nvme/host/nvme.h +++ b/drivers/nvme/host/nvme.h
@@ -422,23 +422,11 @@ static inline void nvme_fault_inject_fini(struct nvme_fault_inject *fault_inj) static inline void nvme_should_fail(struct request *req) {} #endif -bool nvme_wait_reset(struct nvme_ctrl *ctrl); -int nvme_try_sched_reset(struct nvme_ctrl *ctrl); - static inline int nvme_reset_subsystem(struct nvme_ctrl *ctrl) { - int ret; - if (!ctrl->subsystem) return -ENOTTY; - if (!nvme_wait_reset(ctrl)) - return -EBUSY; - - ret = ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65); - if (ret) - return ret; - - return nvme_try_sched_reset(ctrl); + return ctrl->ops->reg_write32(ctrl, NVME_REG_NSSR, 0x4E564D65); } /* @@ -485,6 +473,7 @@ void nvme_cancel_tagset(struct nvme_ctrl *ctrl); void nvme_cancel_admin_tagset(struct nvme_ctrl *ctrl); bool nvme_change_ctrl_state(struct nvme_ctrl *ctrl, enum nvme_ctrl_state new_state); +bool nvme_wait_reset(struct nvme_ctrl *ctrl); int nvme_disable_ctrl(struct nvme_ctrl *ctrl); int nvme_enable_ctrl(struct nvme_ctrl *ctrl); int nvme_shutdown_ctrl(struct nvme_ctrl *ctrl); @@ -536,6 +525,7 @@ int nvme_set_queue_count(struct nvme_ctrl *ctrl, int *count); void nvme_stop_keep_alive(struct nvme_ctrl *ctrl); int nvme_reset_ctrl(struct nvme_ctrl *ctrl); int nvme_reset_ctrl_sync(struct nvme_ctrl *ctrl); +int nvme_try_sched_reset(struct nvme_ctrl *ctrl); int nvme_delete_ctrl(struct nvme_ctrl *ctrl); int nvme_get_log(struct nvme_ctrl *ctrl, u32 nsid, u8 log_page, u8 lsp,
diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c index a58711c..10fe7a7 100644 --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c
@@ -117,9 +117,9 @@ struct nvme_dev { mempool_t *iod_mempool; /* shadow doorbell buffer support: */ - __le32 *dbbuf_dbs; + u32 *dbbuf_dbs; dma_addr_t dbbuf_dbs_dma_addr; - __le32 *dbbuf_eis; + u32 *dbbuf_eis; dma_addr_t dbbuf_eis_dma_addr; /* host memory buffer support: */ @@ -187,10 +187,10 @@ struct nvme_queue { #define NVMEQ_SQ_CMB 1 #define NVMEQ_DELETE_ERROR 2 #define NVMEQ_POLLED 3 - __le32 *dbbuf_sq_db; - __le32 *dbbuf_cq_db; - __le32 *dbbuf_sq_ei; - __le32 *dbbuf_cq_ei; + u32 *dbbuf_sq_db; + u32 *dbbuf_cq_db; + u32 *dbbuf_sq_ei; + u32 *dbbuf_cq_ei; struct completion delete_done; }; @@ -311,11 +311,11 @@ static inline int nvme_dbbuf_need_event(u16 event_idx, u16 new_idx, u16 old) } /* Update dbbuf and return true if an MMIO is required */ -static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db, - volatile __le32 *dbbuf_ei) +static bool nvme_dbbuf_update_and_check_event(u16 value, u32 *dbbuf_db, + volatile u32 *dbbuf_ei) { if (dbbuf_db) { - u16 old_value, event_idx; + u16 old_value; /* * Ensure that the queue is written before updating @@ -323,8 +323,8 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db, */ wmb(); - old_value = le32_to_cpu(*dbbuf_db); - *dbbuf_db = cpu_to_le32(value); + old_value = *dbbuf_db; + *dbbuf_db = value; /* * Ensure that the doorbell is updated before reading the event @@ -334,8 +334,7 @@ static bool nvme_dbbuf_update_and_check_event(u16 value, __le32 *dbbuf_db, */ mb(); - event_idx = le32_to_cpu(*dbbuf_ei); - if (!nvme_dbbuf_need_event(event_idx, value, old_value)) + if (!nvme_dbbuf_need_event(*dbbuf_ei, value, old_value)) return false; } @@ -3199,6 +3198,7 @@ static const struct pci_device_id nvme_id_table[] = { NVME_QUIRK_IGNORE_DEV_SUBNQN, }, { PCI_DEVICE(0x1c5c, 0x1504), /* SK Hynix PC400 */ .driver_data = NVME_QUIRK_DISABLE_WRITE_ZEROES, }, + { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { PCI_DEVICE(0x2646, 0x2263), /* KINGSTON A2000 NVMe SSD */ .driver_data = NVME_QUIRK_NO_DEEPEST_PS, }, { PCI_DEVICE(PCI_VENDOR_ID_APPLE, 0x2001), @@ -3208,8 +3208,6 @@ static const struct pci_device_id nvme_id_table[] = { .driver_data = NVME_QUIRK_SINGLE_VECTOR | NVME_QUIRK_128_BYTES_SQES | NVME_QUIRK_SHARED_TAGS }, - - { PCI_DEVICE_CLASS(PCI_CLASS_STORAGE_EXPRESS, 0xffffff) }, { 0, } }; MODULE_DEVICE_TABLE(pci, nvme_id_table);
diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 4250081..2a27ac9 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c
@@ -1074,7 +1074,7 @@ static void nvme_tcp_io_work(struct work_struct *w) if (result > 0) pending = true; - if (!pending || !queue->rd_enabled) + if (!pending) return; } while (!time_after(jiffies, deadline)); /* quota is exhausted */ @@ -1387,7 +1387,22 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, if (ret) goto err_init_connect; + queue->rd_enabled = true; set_bit(NVME_TCP_Q_ALLOCATED, &queue->flags); + nvme_tcp_init_recv_ctx(queue); + + write_lock_bh(&queue->sock->sk->sk_callback_lock); + queue->sock->sk->sk_user_data = queue; + queue->state_change = queue->sock->sk->sk_state_change; + queue->data_ready = queue->sock->sk->sk_data_ready; + queue->write_space = queue->sock->sk->sk_write_space; + queue->sock->sk->sk_data_ready = nvme_tcp_data_ready; + queue->sock->sk->sk_state_change = nvme_tcp_state_change; + queue->sock->sk->sk_write_space = nvme_tcp_write_space; +#ifdef CONFIG_NET_RX_BUSY_POLL + queue->sock->sk->sk_ll_usec = 1; +#endif + write_unlock_bh(&queue->sock->sk->sk_callback_lock); return 0; @@ -1404,7 +1419,7 @@ static int nvme_tcp_alloc_queue(struct nvme_ctrl *nctrl, return ret; } -static void nvme_tcp_restore_sock_ops(struct nvme_tcp_queue *queue) +static void nvme_tcp_restore_sock_calls(struct nvme_tcp_queue *queue) { struct socket *sock = queue->sock; @@ -1419,7 +1434,7 @@ static void nvme_tcp_restore_sock_ops(struct nvme_tcp_queue *queue) static void __nvme_tcp_stop_queue(struct nvme_tcp_queue *queue) { kernel_sock_shutdown(queue->sock, SHUT_RDWR); - nvme_tcp_restore_sock_ops(queue); + nvme_tcp_restore_sock_calls(queue); cancel_work_sync(&queue->io_work); } @@ -1433,42 +1448,21 @@ static void nvme_tcp_stop_queue(struct nvme_ctrl *nctrl, int qid) __nvme_tcp_stop_queue(queue); } -static void nvme_tcp_setup_sock_ops(struct nvme_tcp_queue *queue) -{ - write_lock_bh(&queue->sock->sk->sk_callback_lock); - queue->sock->sk->sk_user_data = queue; - queue->state_change = queue->sock->sk->sk_state_change; - queue->data_ready = queue->sock->sk->sk_data_ready; - queue->write_space = queue->sock->sk->sk_write_space; - queue->sock->sk->sk_data_ready = nvme_tcp_data_ready; - queue->sock->sk->sk_state_change = nvme_tcp_state_change; - queue->sock->sk->sk_write_space = nvme_tcp_write_space; -#ifdef CONFIG_NET_RX_BUSY_POLL - queue->sock->sk->sk_ll_usec = 1; -#endif - write_unlock_bh(&queue->sock->sk->sk_callback_lock); -} - static int nvme_tcp_start_queue(struct nvme_ctrl *nctrl, int idx) { struct nvme_tcp_ctrl *ctrl = to_tcp_ctrl(nctrl); - struct nvme_tcp_queue *queue = &ctrl->queues[idx]; int ret; - queue->rd_enabled = true; - nvme_tcp_init_recv_ctx(queue); - nvme_tcp_setup_sock_ops(queue); - if (idx) ret = nvmf_connect_io_queue(nctrl, idx, false); else ret = nvmf_connect_admin_queue(nctrl); if (!ret) { - set_bit(NVME_TCP_Q_LIVE, &queue->flags); + set_bit(NVME_TCP_Q_LIVE, &ctrl->queues[idx].flags); } else { - if (test_bit(NVME_TCP_Q_ALLOCATED, &queue->flags)) - __nvme_tcp_stop_queue(queue); + if (test_bit(NVME_TCP_Q_ALLOCATED, &ctrl->queues[idx].flags)) + __nvme_tcp_stop_queue(&ctrl->queues[idx]); dev_err(nctrl->device, "failed to connect queue: %d ret=%d\n", idx, ret); }
diff --git a/drivers/nvme/target/core.c b/drivers/nvme/target/core.c index d109333..ee81d94 100644 --- a/drivers/nvme/target/core.c +++ b/drivers/nvme/target/core.c
@@ -709,8 +709,6 @@ static void nvmet_set_error(struct nvmet_req *req, u16 status) static void __nvmet_req_complete(struct nvmet_req *req, u16 status) { - struct nvmet_ns *ns = req->ns; - if (!req->sq->sqhd_disabled) nvmet_update_sq_head(req); req->cqe->sq_id = cpu_to_le16(req->sq->qid); @@ -721,17 +719,15 @@ static void __nvmet_req_complete(struct nvmet_req *req, u16 status) trace_nvmet_req_complete(req); + if (req->ns) + nvmet_put_namespace(req->ns); req->ops->queue_response(req); - if (ns) - nvmet_put_namespace(ns); } void nvmet_req_complete(struct nvmet_req *req, u16 status) { - struct nvmet_sq *sq = req->sq; - __nvmet_req_complete(req, status); - percpu_ref_put(&sq->ref); + percpu_ref_put(&req->sq->ref); } EXPORT_SYMBOL_GPL(nvmet_req_complete);
diff --git a/drivers/nvme/target/fc.c b/drivers/nvme/target/fc.c index f74fc64..9b07e8c 100644 --- a/drivers/nvme/target/fc.c +++ b/drivers/nvme/target/fc.c
@@ -1362,10 +1362,8 @@ nvmet_fc_ls_create_association(struct nvmet_fc_tgtport *tgtport, else { queue = nvmet_fc_alloc_target_queue(iod->assoc, 0, be16_to_cpu(rqst->assoc_cmd.sqsize)); - if (!queue) { + if (!queue) ret = VERR_QUEUE_ALLOC_FAIL; - nvmet_fc_tgt_a_put(iod->assoc); - } } }
diff --git a/drivers/nvme/target/tcp.c b/drivers/nvme/target/tcp.c index df7a911..4341c72 100644 --- a/drivers/nvme/target/tcp.c +++ b/drivers/nvme/target/tcp.c
@@ -858,17 +858,10 @@ static int nvmet_tcp_handle_h2c_data_pdu(struct nvmet_tcp_queue *queue) struct nvme_tcp_data_pdu *data = &queue->pdu.data; struct nvmet_tcp_cmd *cmd; - if (likely(queue->nr_cmds)) { - if (unlikely(data->ttag >= queue->nr_cmds)) { - pr_err("queue %d: received out of bound ttag %u, nr_cmds %u\n", - queue->idx, data->ttag, queue->nr_cmds); - nvmet_tcp_fatal_error(queue); - return -EPROTO; - } + if (likely(queue->nr_cmds)) cmd = &queue->cmds[data->ttag]; - } else { + else cmd = &queue->connect; - } if (le32_to_cpu(data->data_offset) != cmd->rbytes_done) { pr_err("ttag %u unexpected data offset %u (expected %u)\n", @@ -1423,9 +1416,6 @@ static void nvmet_tcp_state_change(struct sock *sk) goto done; switch (sk->sk_state) { - case TCP_FIN_WAIT2: - case TCP_LAST_ACK: - break; case TCP_FIN_WAIT1: case TCP_CLOSE_WAIT: case TCP_CLOSE: @@ -1772,8 +1762,7 @@ static int __init nvmet_tcp_init(void) { int ret; - nvmet_tcp_wq = alloc_workqueue("nvmet_tcp_wq", - WQ_MEM_RECLAIM | WQ_HIGHPRI, 0); + nvmet_tcp_wq = alloc_workqueue("nvmet_tcp_wq", WQ_HIGHPRI, 0); if (!nvmet_tcp_wq) return -ENOMEM;
diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c index cde1d77..c0f4324 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -439,7 +439,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) if (config->cells) { rval = nvmem_add_cells(nvmem, config->cells, config->ncells); if (rval) - goto err_remove_cells; + goto err_teardown_compat; } rval = nvmem_add_cells_from_table(nvmem); @@ -456,6 +456,7 @@ struct nvmem_device *nvmem_register(const struct nvmem_config *config) err_remove_cells: nvmem_device_remove_all_cells(nvmem); +err_teardown_compat: if (config->compat) nvmem_sysfs_remove_compat(nvmem, config); err_device_del:
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 8cfcc1b..67031ba 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c
@@ -321,7 +321,7 @@ static int unflatten_dt_nodes(const void *blob, for (offset = 0; offset >= 0 && depth >= initial_depth; offset = fdt_next_node(blob, offset, &depth)) { - if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH - 1)) + if (WARN_ON_ONCE(depth >= FDT_MAX_DEPTH)) continue; if (!IS_ENABLED(CONFIG_OF_KOBJ) &&
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c index 7a3de2b..26ddb4c 100644 --- a/drivers/of/of_mdio.c +++ b/drivers/of/of_mdio.c
@@ -281,7 +281,6 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np) return 0; unregister: - of_node_put(child); mdiobus_unregister(mdio); return rc; }
diff --git a/drivers/of/overlay.c b/drivers/of/overlay.c index dc29877..8420ef4 100644 --- a/drivers/of/overlay.c +++ b/drivers/of/overlay.c
@@ -547,7 +547,7 @@ static int find_dup_cset_node_entry(struct overlay_changeset *ovcs, fn_1 = kasprintf(GFP_KERNEL, "%pOF", ce_1->np); fn_2 = kasprintf(GFP_KERNEL, "%pOF", ce_2->np); - node_path_match = !fn_1 || !fn_2 || !strcmp(fn_1, fn_2); + node_path_match = !strcmp(fn_1, fn_2); kfree(fn_1); kfree(fn_2); if (node_path_match) { @@ -582,7 +582,7 @@ static int find_dup_cset_prop(struct overlay_changeset *ovcs, fn_1 = kasprintf(GFP_KERNEL, "%pOF", ce_1->np); fn_2 = kasprintf(GFP_KERNEL, "%pOF", ce_2->np); - node_path_match = !fn_1 || !fn_2 || !strcmp(fn_1, fn_2); + node_path_match = !strcmp(fn_1, fn_2); kfree(fn_1); kfree(fn_2); if (node_path_match &&
diff --git a/drivers/of/property.c b/drivers/of/property.c index 6fc55a3..5d7af9f 100644 --- a/drivers/of/property.c +++ b/drivers/of/property.c
@@ -919,10 +919,8 @@ of_fwnode_get_reference_args(const struct fwnode_handle *fwnode, nargs, index, &of_args); if (ret < 0) return ret; - if (!args) { - of_node_put(of_args.np); + if (!args) return 0; - } args->nargs = of_args.args_count; args->fwnode = of_fwnode_handle(of_args.np);
diff --git a/drivers/opp/core.c b/drivers/opp/core.c index 08f5d1c..088c93d 100644 --- a/drivers/opp/core.c +++ b/drivers/opp/core.c
@@ -1881,8 +1881,8 @@ struct opp_table *dev_pm_opp_attach_genpd(struct device *dev, } virt_dev = dev_pm_domain_attach_by_name(dev, *name); - if (IS_ERR_OR_NULL(virt_dev)) { - ret = PTR_ERR(virt_dev) ? : -ENODEV; + if (IS_ERR(virt_dev)) { + ret = PTR_ERR(virt_dev); dev_err(dev, "Couldn't attach to pm_domain: %d\n", ret); goto err; }
diff --git a/drivers/opp/debugfs.c b/drivers/opp/debugfs.c index c764741..609665e 100644 --- a/drivers/opp/debugfs.c +++ b/drivers/opp/debugfs.c
@@ -162,7 +162,7 @@ static void opp_migrate_dentry(struct opp_device *opp_dev, dentry = debugfs_rename(rootdir, opp_dev->dentry, rootdir, opp_table->dentry_name); - if (IS_ERR(dentry)) { + if (!dentry) { dev_err(dev, "%s: Failed to rename link from: %s to %s\n", __func__, dev_name(opp_dev->dev), dev_name(dev)); return;
diff --git a/drivers/parisc/ccio-dma.c b/drivers/parisc/ccio-dma.c index fdd302d..5013568 100644 --- a/drivers/parisc/ccio-dma.c +++ b/drivers/parisc/ccio-dma.c
@@ -1378,17 +1378,15 @@ ccio_init_resource(struct resource *res, char *name, void __iomem *ioaddr) } } -static int __init ccio_init_resources(struct ioc *ioc) +static void __init ccio_init_resources(struct ioc *ioc) { struct resource *res = ioc->mmio_region; char *name = kmalloc(14, GFP_KERNEL); - if (unlikely(!name)) - return -ENOMEM; + snprintf(name, 14, "GSC Bus [%d/]", ioc->hw_path); ccio_init_resource(res, name, &ioc->ioc_regs->io_io_low); ccio_init_resource(res + 1, name, &ioc->ioc_regs->io_io_low_hv); - return 0; } static int new_ioc_area(struct resource *res, unsigned long size, @@ -1543,11 +1541,7 @@ static int __init ccio_probe(struct parisc_device *dev) return -ENOMEM; } ccio_ioc_init(ioc); - if (ccio_init_resources(ioc)) { - iounmap(ioc->ioc_regs); - kfree(ioc); - return -ENOMEM; - } + ccio_init_resources(ioc); hppa_dma_ops = &ccio_ops; hba = kzalloc(sizeof(*hba), GFP_KERNEL);
diff --git a/drivers/parisc/iosapic.c b/drivers/parisc/iosapic.c index 7914cf3..32f506f 100644 --- a/drivers/parisc/iosapic.c +++ b/drivers/parisc/iosapic.c
@@ -875,7 +875,6 @@ int iosapic_serial_irq(struct parisc_device *dev) return vi->txn_irq; } -EXPORT_SYMBOL(iosapic_serial_irq); #endif
diff --git a/drivers/parisc/led.c b/drivers/parisc/led.c index 609c747..73e37bb 100644 --- a/drivers/parisc/led.c +++ b/drivers/parisc/led.c
@@ -137,9 +137,6 @@ static int start_task(void) /* Create the work queue and queue the LED task */ led_wq = create_singlethread_workqueue("led_wq"); - if (!led_wq) - return -ENOMEM; - queue_delayed_work(led_wq, &led_task, 0); return 0;
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 3bc0027..1f17a39 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c
@@ -475,7 +475,7 @@ static size_t parport_pc_fifo_write_block_pio(struct parport *port, const unsigned char *bufp = buf; size_t left = length; unsigned long expire = jiffies + port->physport->cad->timeout; - const unsigned long fifo = FIFO(port); + const int fifo = FIFO(port); int poll_for = 8; /* 80 usecs */ const struct parport_pc_private *priv = port->physport->private_data; const int fifo_depth = priv->fifo_depth;
diff --git a/drivers/pci/controller/dwc/pcie-tegra194.c b/drivers/pci/controller/dwc/pcie-tegra194.c index 120d64c..c06b05a 100644 --- a/drivers/pci/controller/dwc/pcie-tegra194.c +++ b/drivers/pci/controller/dwc/pcie-tegra194.c
@@ -345,14 +345,15 @@ static irqreturn_t tegra_pcie_rp_irq_handler(struct tegra_pcie_dw *pcie) { struct dw_pcie *pci = &pcie->pci; struct pcie_port *pp = &pci->pp; - u32 val, status_l0, status_l1; + u32 val, tmp; u16 val_w; - status_l0 = appl_readl(pcie, APPL_INTR_STATUS_L0); - if (status_l0 & APPL_INTR_STATUS_L0_LINK_STATE_INT) { - status_l1 = appl_readl(pcie, APPL_INTR_STATUS_L1_0_0); - appl_writel(pcie, status_l1, APPL_INTR_STATUS_L1_0_0); - if (status_l1 & APPL_INTR_STATUS_L1_0_0_LINK_REQ_RST_NOT_CHGED) { + val = appl_readl(pcie, APPL_INTR_STATUS_L0); + if (val & APPL_INTR_STATUS_L0_LINK_STATE_INT) { + val = appl_readl(pcie, APPL_INTR_STATUS_L1_0_0); + if (val & APPL_INTR_STATUS_L1_0_0_LINK_REQ_RST_NOT_CHGED) { + appl_writel(pcie, val, APPL_INTR_STATUS_L1_0_0); + /* SBR & Surprise Link Down WAR */ val = appl_readl(pcie, APPL_CAR_RESET_OVRD); val &= ~APPL_CAR_RESET_OVRD_CYA_OVERRIDE_CORE_RST_N; @@ -368,15 +369,15 @@ static irqreturn_t tegra_pcie_rp_irq_handler(struct tegra_pcie_dw *pcie) } } - if (status_l0 & APPL_INTR_STATUS_L0_INT_INT) { - status_l1 = appl_readl(pcie, APPL_INTR_STATUS_L1_8_0); - if (status_l1 & APPL_INTR_STATUS_L1_8_0_AUTO_BW_INT_STS) { + if (val & APPL_INTR_STATUS_L0_INT_INT) { + val = appl_readl(pcie, APPL_INTR_STATUS_L1_8_0); + if (val & APPL_INTR_STATUS_L1_8_0_AUTO_BW_INT_STS) { appl_writel(pcie, APPL_INTR_STATUS_L1_8_0_AUTO_BW_INT_STS, APPL_INTR_STATUS_L1_8_0); apply_bad_link_workaround(pp); } - if (status_l1 & APPL_INTR_STATUS_L1_8_0_BW_MGT_INT_STS) { + if (val & APPL_INTR_STATUS_L1_8_0_BW_MGT_INT_STS) { appl_writel(pcie, APPL_INTR_STATUS_L1_8_0_BW_MGT_INT_STS, APPL_INTR_STATUS_L1_8_0); @@ -388,24 +389,25 @@ static irqreturn_t tegra_pcie_rp_irq_handler(struct tegra_pcie_dw *pcie) } } - if (status_l0 & APPL_INTR_STATUS_L0_CDM_REG_CHK_INT) { - status_l1 = appl_readl(pcie, APPL_INTR_STATUS_L1_18); - val = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS); - if (status_l1 & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_CMPLT) { + val = appl_readl(pcie, APPL_INTR_STATUS_L0); + if (val & APPL_INTR_STATUS_L0_CDM_REG_CHK_INT) { + val = appl_readl(pcie, APPL_INTR_STATUS_L1_18); + tmp = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS); + if (val & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_CMPLT) { dev_info(pci->dev, "CDM check complete\n"); - val |= PCIE_PL_CHK_REG_CHK_REG_COMPLETE; + tmp |= PCIE_PL_CHK_REG_CHK_REG_COMPLETE; } - if (status_l1 & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_CMP_ERR) { + if (val & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_CMP_ERR) { dev_err(pci->dev, "CDM comparison mismatch\n"); - val |= PCIE_PL_CHK_REG_CHK_REG_COMPARISON_ERROR; + tmp |= PCIE_PL_CHK_REG_CHK_REG_COMPARISON_ERROR; } - if (status_l1 & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_LOGIC_ERR) { + if (val & APPL_INTR_STATUS_L1_18_CDM_REG_CHK_LOGIC_ERR) { dev_err(pci->dev, "CDM Logic error\n"); - val |= PCIE_PL_CHK_REG_CHK_REG_LOGIC_ERROR; + tmp |= PCIE_PL_CHK_REG_CHK_REG_LOGIC_ERROR; } - dw_pcie_writel_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS, val); - val = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_ERR_ADDR); - dev_err(pci->dev, "CDM Error Address Offset = 0x%08X\n", val); + dw_pcie_writel_dbi(pci, PCIE_PL_CHK_REG_CONTROL_STATUS, tmp); + tmp = dw_pcie_readl_dbi(pci, PCIE_PL_CHK_REG_ERR_ADDR); + dev_err(pci->dev, "CDM Error Address Offset = 0x%08X\n", tmp); } return IRQ_HANDLED; @@ -854,7 +856,7 @@ static int tegra_pcie_dw_host_init(struct pcie_port *pp) offset = dw_pcie_find_ext_capability(pci, PCI_EXT_CAP_ID_DLF); val = dw_pcie_readl_dbi(pci, offset + PCI_DLF_CAP); val &= ~PCI_DLF_EXCHANGE_ENABLE; - dw_pcie_writel_dbi(pci, offset + PCI_DLF_CAP, val); + dw_pcie_writel_dbi(pci, offset, val); tegra_pcie_prepare_host(pp);
diff --git a/drivers/pci/irq.c b/drivers/pci/irq.c index 3f6a5d5..a1de501 100644 --- a/drivers/pci/irq.c +++ b/drivers/pci/irq.c
@@ -94,8 +94,6 @@ int pci_request_irq(struct pci_dev *dev, unsigned int nr, irq_handler_t handler, va_start(ap, fmt); devname = kvasprintf(GFP_KERNEL, fmt, ap); va_end(ap); - if (!devname) - return -ENOMEM; ret = request_threaded_irq(pci_irq_vector(dev, nr), handler, thread_fn, irqflags, devname, dev_id);
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 70c8584..5ea612a 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c
@@ -946,7 +946,7 @@ static int pci_pm_resume_noirq(struct device *dev) pcie_pme_root_status_cleanup(pci_dev); if (!skip_bus_pm && prev_state == PCI_D3cold) - pci_bridge_wait_for_secondary_bus(pci_dev, "resume", PCI_RESET_WAIT); + pci_bridge_wait_for_secondary_bus(pci_dev); if (pci_has_legacy_pm_support(pci_dev)) return pci_legacy_resume_early(dev); @@ -1355,7 +1355,7 @@ static int pci_pm_runtime_resume(struct device *dev) pci_fixup_device(pci_fixup_resume, pci_dev); if (prev_state == PCI_D3cold) - pci_bridge_wait_for_secondary_bus(pci_dev, "resume", PCI_RESET_WAIT); + pci_bridge_wait_for_secondary_bus(pci_dev); if (pm && pm->runtime_resume) rc = pm->runtime_resume(dev);
diff --git a/drivers/pci/pci-sysfs.c b/drivers/pci/pci-sysfs.c index 171988d..e401f04 100644 --- a/drivers/pci/pci-sysfs.c +++ b/drivers/pci/pci-sysfs.c
@@ -1157,9 +1157,11 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) sysfs_bin_attr_init(res_attr); if (write_combine) { + pdev->res_attr_wc[num] = res_attr; sprintf(res_attr_name, "resource%d_wc", num); res_attr->mmap = pci_mmap_resource_wc; } else { + pdev->res_attr[num] = res_attr; sprintf(res_attr_name, "resource%d", num); if (pci_resource_flags(pdev, num) & IORESOURCE_IO) { res_attr->read = pci_read_resource_io; @@ -1175,17 +1177,10 @@ static int pci_create_attr(struct pci_dev *pdev, int num, int write_combine) res_attr->size = pci_resource_len(pdev, num); res_attr->private = (void *)(unsigned long)num; retval = sysfs_create_bin_file(&pdev->dev.kobj, res_attr); - if (retval) { + if (retval) kfree(res_attr); - return retval; - } - if (write_combine) - pdev->res_attr_wc[num] = res_attr; - else - pdev->res_attr[num] = res_attr; - - return 0; + return retval; } /**
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 0e4ed8c..8cf5edd 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c
@@ -4484,7 +4484,7 @@ static int pci_dev_wait(struct pci_dev *dev, char *reset_type, int timeout) return -ENOTTY; } - if (delay > PCI_RESET_WAIT) + if (delay > 1000) pci_info(dev, "not ready %dms after %s; waiting\n", delay - 1, reset_type); @@ -4493,7 +4493,7 @@ static int pci_dev_wait(struct pci_dev *dev, char *reset_type, int timeout) pci_read_config_dword(dev, PCI_COMMAND, &id); } - if (delay > PCI_RESET_WAIT) + if (delay > 1000) pci_info(dev, "ready %dms after %s\n", delay - 1, reset_type); @@ -4728,31 +4728,24 @@ static int pci_bus_max_d3cold_delay(const struct pci_bus *bus) /** * pci_bridge_wait_for_secondary_bus - Wait for secondary bus to be accessible * @dev: PCI bridge - * @reset_type: reset type in human-readable form - * @timeout: maximum time to wait for devices on secondary bus (milliseconds) * * Handle necessary delays before access to the devices on the secondary - * side of the bridge are permitted after D3cold to D0 transition - * or Conventional Reset. + * side of the bridge are permitted after D3cold to D0 transition. * * For PCIe this means the delays in PCIe 5.0 section 6.6.1. For * conventional PCI it means Tpvrh + Trhfa specified in PCI 3.0 section * 4.3.2. - * - * Return 0 on success or -ENOTTY if the first device on the secondary bus - * failed to become accessible. */ -int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, - int timeout) +void pci_bridge_wait_for_secondary_bus(struct pci_dev *dev) { struct pci_dev *child; int delay; if (pci_dev_is_disconnected(dev)) - return 0; + return; - if (!pci_is_bridge(dev)) - return 0; + if (!pci_is_bridge(dev) || !dev->bridge_d3) + return; down_read(&pci_bus_sem); @@ -4764,14 +4757,14 @@ int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, */ if (!dev->subordinate || list_empty(&dev->subordinate->devices)) { up_read(&pci_bus_sem); - return 0; + return; } /* Take d3cold_delay requirements into account */ delay = pci_bus_max_d3cold_delay(dev->subordinate); if (!delay) { up_read(&pci_bus_sem); - return 0; + return; } child = list_first_entry(&dev->subordinate->devices, struct pci_dev, @@ -4780,12 +4773,14 @@ int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, /* * Conventional PCI and PCI-X we need to wait Tpvrh + Trhfa before - * accessing the device after reset (that is 1000 ms + 100 ms). + * accessing the device after reset (that is 1000 ms + 100 ms). In + * practice this should not be needed because we don't do power + * management for them (see pci_bridge_d3_possible()). */ if (!pci_is_pcie(dev)) { pci_dbg(dev, "waiting %d ms for secondary bus\n", 1000 + delay); msleep(1000 + delay); - return 0; + return; } /* @@ -4802,11 +4797,11 @@ int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, * configuration requests if we only wait for 100 ms (see * https://bugzilla.kernel.org/show_bug.cgi?id=203885). * - * Therefore we wait for 100 ms and check for the device presence - * until the timeout expires. + * Therefore we wait for 100 ms and check for the device presence. + * If it is still not present give it an additional 100 ms. */ if (!pcie_downstream_port(dev)) - return 0; + return; if (pcie_get_speed_cap(dev) <= PCIE_SPEED_5_0GT) { pci_dbg(dev, "waiting %d ms for downstream link\n", delay); @@ -4816,11 +4811,14 @@ int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, delay); if (!pcie_wait_for_link_delay(dev, true, delay)) { /* Did not train, no need to wait any further */ - return -ENOTTY; + return; } } - return pci_dev_wait(child, reset_type, timeout - delay); + if (!pci_device_is_present(child)) { + pci_dbg(child, "waiting additional %d ms to become accessible\n", delay); + msleep(delay); + } } void pci_reset_secondary_bus(struct pci_dev *dev) @@ -4839,6 +4837,15 @@ void pci_reset_secondary_bus(struct pci_dev *dev) ctrl &= ~PCI_BRIDGE_CTL_BUS_RESET; pci_write_config_word(dev, PCI_BRIDGE_CONTROL, ctrl); + + /* + * Trhfa for conventional PCI is 2^25 clock cycles. + * Assuming a minimum 33MHz clock this results in a 1s + * delay before we can consider subordinate devices to + * be re-initialized. PCIe has some ways to shorten this, + * but we don't make use of them yet. + */ + ssleep(1); } void __weak pcibios_reset_secondary_bus(struct pci_dev *dev) @@ -4857,8 +4864,7 @@ int pci_bridge_secondary_bus_reset(struct pci_dev *dev) { pcibios_reset_secondary_bus(dev); - return pci_bridge_wait_for_secondary_bus(dev, "bus reset", - PCIE_RESET_READY_POLL_MS); + return pci_dev_wait(dev, "bus reset", PCIE_RESET_READY_POLL_MS); } EXPORT_SYMBOL_GPL(pci_bridge_secondary_bus_reset); @@ -6088,8 +6094,6 @@ bool pci_device_is_present(struct pci_dev *pdev) { u32 v; - /* Check PF if pdev is a VF, since VF Vendor/Device IDs are 0xffff */ - pdev = pci_physfn(pdev); if (pci_dev_is_disconnected(pdev)) return false; return pci_bus_read_dev_vendor_id(pdev->bus, pdev->devfn, &v, 0);
diff --git a/drivers/pci/pci.h b/drivers/pci/pci.h index 1783ec6..403cdc1 100644 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h
@@ -48,13 +48,6 @@ int pci_bus_error_reset(struct pci_dev *dev); #define PCI_PM_D3COLD_WAIT 100 #define PCI_PM_BUS_WAIT 50 -/* - * Following exit from Conventional Reset, devices must be ready within 1 sec - * (PCIe r6.0 sec 6.6.1). A D3cold to D0 transition implies a Conventional - * Reset (PCIe r6.0 sec 5.8). - */ -#define PCI_RESET_WAIT 1000 /* msec */ - /** * struct pci_platform_pm_ops - Firmware PM callbacks * @@ -115,8 +108,7 @@ void pci_allocate_cap_save_buffers(struct pci_dev *dev); void pci_free_cap_save_buffers(struct pci_dev *dev); bool pci_bridge_d3_possible(struct pci_dev *dev); void pci_bridge_d3_update(struct pci_dev *dev); -int pci_bridge_wait_for_secondary_bus(struct pci_dev *dev, char *reset_type, - int timeout); +void pci_bridge_wait_for_secondary_bus(struct pci_dev *dev); static inline void pci_wakeup_event(struct pci_dev *dev) { @@ -360,36 +352,53 @@ struct pci_sriov { * @dev - pci device to set new error_state * @new - the state we want dev to be in * - * If the device is experiencing perm_failure, it has to remain in that state. - * Any other transition is allowed. + * Must be called with device_lock held. * * Returns true if state has been changed to the requested state. */ static inline bool pci_dev_set_io_state(struct pci_dev *dev, pci_channel_state_t new) { - pci_channel_state_t old; + bool changed = false; + device_lock_assert(&dev->dev); switch (new) { case pci_channel_io_perm_failure: - xchg(&dev->error_state, pci_channel_io_perm_failure); - return true; + switch (dev->error_state) { + case pci_channel_io_frozen: + case pci_channel_io_normal: + case pci_channel_io_perm_failure: + changed = true; + break; + } + break; case pci_channel_io_frozen: - old = cmpxchg(&dev->error_state, pci_channel_io_normal, - pci_channel_io_frozen); - return old != pci_channel_io_perm_failure; + switch (dev->error_state) { + case pci_channel_io_frozen: + case pci_channel_io_normal: + changed = true; + break; + } + break; case pci_channel_io_normal: - old = cmpxchg(&dev->error_state, pci_channel_io_frozen, - pci_channel_io_normal); - return old != pci_channel_io_perm_failure; - default: - return false; + switch (dev->error_state) { + case pci_channel_io_frozen: + case pci_channel_io_normal: + changed = true; + break; + } + break; } + if (changed) + dev->error_state = new; + return changed; } static inline int pci_dev_set_disconnected(struct pci_dev *dev, void *unused) { + device_lock(&dev->dev); pci_dev_set_io_state(dev, pci_channel_io_perm_failure); + device_unlock(&dev->dev); return 0; }
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 449d4ed..2a4bc8d 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c
@@ -4843,26 +4843,6 @@ static int pci_quirk_brcm_acs(struct pci_dev *dev, u16 acs_flags) PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); } -/* - * Wangxun 10G/1G NICs have no ACS capability, and on multi-function - * devices, peer-to-peer transactions are not be used between the functions. - * So add an ACS quirk for below devices to isolate functions. - * SFxxx 1G NICs(em). - * RP1000/RP2000 10G NICs(sp). - */ -static int pci_quirk_wangxun_nic_acs(struct pci_dev *dev, u16 acs_flags) -{ - switch (dev->device) { - case 0x0100 ... 0x010F: - case 0x1001: - case 0x2001: - return pci_acs_ctrl_enabled(acs_flags, - PCI_ACS_SV | PCI_ACS_RR | PCI_ACS_CR | PCI_ACS_UF); - } - - return false; -} - static const struct pci_dev_acs_enabled { u16 vendor; u16 device; @@ -4963,9 +4943,6 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_AMPERE, 0xE00C, pci_quirk_xgene_acs }, /* Broadcom multi-function device */ { PCI_VENDOR_ID_BROADCOM, 0x16D7, pci_quirk_mf_endpoint_acs }, - { PCI_VENDOR_ID_BROADCOM, 0x1750, pci_quirk_mf_endpoint_acs }, - { PCI_VENDOR_ID_BROADCOM, 0x1751, pci_quirk_mf_endpoint_acs }, - { PCI_VENDOR_ID_BROADCOM, 0x1752, pci_quirk_mf_endpoint_acs }, { PCI_VENDOR_ID_BROADCOM, 0xD714, pci_quirk_brcm_acs }, /* Amazon Annapurna Labs */ { PCI_VENDOR_ID_AMAZON_ANNAPURNA_LABS, 0x0031, pci_quirk_al_acs }, @@ -5008,8 +4985,6 @@ static const struct pci_dev_acs_enabled { { PCI_VENDOR_ID_NXP, 0x8d9b, pci_quirk_nxp_rp_acs }, /* Zhaoxin Root/Downstream Ports */ { PCI_VENDOR_ID_ZHAOXIN, PCI_ANY_ID, pci_quirk_zhaoxin_pcie_ports_acs }, - /* Wangxun nics */ - { PCI_VENDOR_ID_WANGXUN, PCI_ANY_ID, pci_quirk_wangxun_nic_acs }, { 0 } }; @@ -5360,7 +5335,6 @@ static void quirk_no_flr(struct pci_dev *dev) DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x1487, quirk_no_flr); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x148c, quirk_no_flr); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x149c, quirk_no_flr); -DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_AMD, 0x7901, quirk_no_flr); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1502, quirk_no_flr); DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x1503, quirk_no_flr);
diff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c index eca74d7..da5023e 100644 --- a/drivers/pci/setup-res.c +++ b/drivers/pci/setup-res.c
@@ -209,17 +209,6 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev, root = pci_find_parent_resource(dev, res); if (!root) { - /* - * If dev is behind a bridge, accesses will only reach it - * if res is inside the relevant bridge window. - */ - if (pci_upstream_bridge(dev)) - return -ENXIO; - - /* - * On the root bus, assume the host bridge will forward - * everything. - */ if (res->flags & IORESOURCE_IO) root = &ioport_resource; else
diff --git a/drivers/perf/arm_dsu_pmu.c b/drivers/perf/arm_dsu_pmu.c index 96e7691..4594e2e 100644 --- a/drivers/perf/arm_dsu_pmu.c +++ b/drivers/perf/arm_dsu_pmu.c
@@ -816,11 +816,7 @@ static int __init dsu_pmu_init(void) if (ret < 0) return ret; dsu_pmu_cpuhp_state = ret; - ret = platform_driver_register(&dsu_pmu_driver); - if (ret) - cpuhp_remove_multi_state(dsu_pmu_cpuhp_state); - - return ret; + return platform_driver_register(&dsu_pmu_driver); } static void __exit dsu_pmu_exit(void)
diff --git a/drivers/perf/arm_pmu_platform.c b/drivers/perf/arm_pmu_platform.c index ee2fc93..50bd474 100644 --- a/drivers/perf/arm_pmu_platform.c +++ b/drivers/perf/arm_pmu_platform.c
@@ -118,7 +118,7 @@ static int pmu_parse_irqs(struct arm_pmu *pmu) if (num_irqs == 1) { int irq = platform_get_irq(pdev, 0); - if ((irq > 0) && irq_is_percpu_devid(irq)) + if (irq && irq_is_percpu_devid(irq)) return pmu_parse_percpu_irq(pmu, irq); }
diff --git a/drivers/perf/arm_smmuv3_pmu.c b/drivers/perf/arm_smmuv3_pmu.c index 0b6af77..6a3fa1f 100644 --- a/drivers/perf/arm_smmuv3_pmu.c +++ b/drivers/perf/arm_smmuv3_pmu.c
@@ -872,8 +872,6 @@ static struct platform_driver smmu_pmu_driver = { static int __init arm_smmu_pmu_init(void) { - int ret; - cpuhp_state_num = cpuhp_setup_state_multi(CPUHP_AP_ONLINE_DYN, "perf/arm/pmcg:online", NULL, @@ -881,11 +879,7 @@ static int __init arm_smmu_pmu_init(void) if (cpuhp_state_num < 0) return cpuhp_state_num; - ret = platform_driver_register(&smmu_pmu_driver); - if (ret) - cpuhp_remove_multi_state(cpuhp_state_num); - - return ret; + return platform_driver_register(&smmu_pmu_driver); } module_init(arm_smmu_pmu_init);
diff --git a/drivers/phy/qualcomm/phy-qcom-usb-hsic.c b/drivers/phy/qualcomm/phy-qcom-usb-hsic.c index d4741c2..04d18d5 100644 --- a/drivers/phy/qualcomm/phy-qcom-usb-hsic.c +++ b/drivers/phy/qualcomm/phy-qcom-usb-hsic.c
@@ -54,10 +54,8 @@ static int qcom_usb_hsic_phy_power_on(struct phy *phy) /* Configure pins for HSIC functionality */ pins_default = pinctrl_lookup_state(uphy->pctl, PINCTRL_STATE_DEFAULT); - if (IS_ERR(pins_default)) { - ret = PTR_ERR(pins_default); - goto err_ulpi; - } + if (IS_ERR(pins_default)) + return PTR_ERR(pins_default); ret = pinctrl_select_state(uphy->pctl, pins_default); if (ret)
diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c index b5f7a93..eae865f 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c
@@ -467,10 +467,8 @@ static int rockchip_usb2phy_power_on(struct phy *phy) return ret; ret = property_enable(base, &rport->port_cfg->phy_sus, false); - if (ret) { - clk_disable_unprepare(rphy->clk480m); + if (ret) return ret; - } /* waiting for the utmi_clk to become stable */ usleep_range(1500, 2000);
diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c index ba805f1..2456316 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c +++ b/drivers/phy/rockchip/phy-rockchip-typec.c
@@ -808,8 +808,9 @@ static int tcphy_get_mode(struct rockchip_typec_phy *tcphy) struct extcon_dev *edev = tcphy->extcon; union extcon_property_value property; unsigned int id; + bool ufp, dp; u8 mode; - int ret, ufp, dp; + int ret; if (!edev) return MODE_DFP_USB;
diff --git a/drivers/phy/st/phy-stm32-usbphyc.c b/drivers/phy/st/phy-stm32-usbphyc.c index e643c21..56bdea4 100644 --- a/drivers/phy/st/phy-stm32-usbphyc.c +++ b/drivers/phy/st/phy-stm32-usbphyc.c
@@ -393,8 +393,6 @@ static int stm32_usbphyc_probe(struct platform_device *pdev) ret = of_property_read_u32(child, "reg", &index); if (ret || index > usbphyc->nphys) { dev_err(&phy->dev, "invalid reg property: %d\n", ret); - if (!ret) - ret = -EINVAL; goto put_child; }
diff --git a/drivers/pinctrl/aspeed/pinctrl-aspeed.c b/drivers/pinctrl/aspeed/pinctrl-aspeed.c index 2c1e799..22aca6d 100644 --- a/drivers/pinctrl/aspeed/pinctrl-aspeed.c +++ b/drivers/pinctrl/aspeed/pinctrl-aspeed.c
@@ -115,7 +115,7 @@ static int aspeed_disable_sig(struct aspeed_pinmux_data *ctx, int ret = 0; if (!exprs) - return -EINVAL; + return true; while (*exprs && !ret) { ret = aspeed_sig_expr_disable(ctx, *exprs);
diff --git a/drivers/pinctrl/devicetree.c b/drivers/pinctrl/devicetree.c index 362d84c..dbaacde 100644 --- a/drivers/pinctrl/devicetree.c +++ b/drivers/pinctrl/devicetree.c
@@ -223,8 +223,6 @@ int pinctrl_dt_to_map(struct pinctrl *p, struct pinctrl_dev *pctldev) for (state = 0; ; state++) { /* Retrieve the pinctrl-* property */ propname = kasprintf(GFP_KERNEL, "pinctrl-%d", state); - if (!propname) - return -ENOMEM; prop = of_find_property(np, propname, &size); kfree(propname); if (!prop) {
diff --git a/drivers/pinctrl/intel/pinctrl-intel.c b/drivers/pinctrl/intel/pinctrl-intel.c index 32c6326..4e89bbf 100644 --- a/drivers/pinctrl/intel/pinctrl-intel.c +++ b/drivers/pinctrl/intel/pinctrl-intel.c
@@ -459,14 +459,9 @@ static void __intel_gpio_set_direction(void __iomem *padcfg0, bool input) writel(value, padcfg0); } -static int __intel_gpio_get_gpio_mode(u32 value) -{ - return (value & PADCFG0_PMODE_MASK) >> PADCFG0_PMODE_SHIFT; -} - static int intel_gpio_get_gpio_mode(void __iomem *padcfg0) { - return __intel_gpio_get_gpio_mode(readl(padcfg0)); + return (readl(padcfg0) & PADCFG0_PMODE_MASK) >> PADCFG0_PMODE_SHIFT; } static void intel_gpio_set_gpio_mode(void __iomem *padcfg0) @@ -1510,16 +1505,9 @@ int intel_pinctrl_probe_by_uid(struct platform_device *pdev) EXPORT_SYMBOL_GPL(intel_pinctrl_probe_by_uid); #ifdef CONFIG_PM_SLEEP -static bool __intel_gpio_is_direct_irq(u32 value) -{ - return (value & PADCFG0_GPIROUTIOXAPIC) && (value & PADCFG0_GPIOTXDIS) && - (__intel_gpio_get_gpio_mode(value) == PADCFG0_PMODE_GPIO); -} - static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int pin) { const struct pin_desc *pd = pin_desc_get(pctrl->pctldev, pin); - u32 value; if (!pd || !intel_pad_usable(pctrl, pin)) return false; @@ -1534,24 +1522,6 @@ static bool intel_pinctrl_should_save(struct intel_pinctrl *pctrl, unsigned int gpiochip_line_is_irq(&pctrl->chip, intel_pin_to_gpio(pctrl, pin))) return true; - /* - * The firmware on some systems may configure GPIO pins to be - * an interrupt source in so called "direct IRQ" mode. In such - * cases the GPIO controller driver has no idea if those pins - * are being used or not. At the same time, there is a known bug - * in the firmwares that don't restore the pin settings correctly - * after suspend, i.e. by an unknown reason the Rx value becomes - * inverted. - * - * Hence, let's save and restore the pins that are configured - * as GPIOs in the input mode with GPIROUTIOXAPIC bit set. - * - * See https://bugzilla.kernel.org/show_bug.cgi?id=214749. - */ - value = readl(intel_get_padcfg(pctrl, pin, PADCFG0)); - if (__intel_gpio_is_direct_irq(value)) - return true; - return false; } @@ -1661,12 +1631,7 @@ int intel_pinctrl_resume_noirq(struct device *dev) void __iomem *padcfg; u32 val; - if (!(intel_pinctrl_should_save(pctrl, desc->number) || - /* - * If the firmware mangled the register contents too much, - * check the saved value for the Direct IRQ mode. - */ - __intel_gpio_is_direct_irq(pads[i].padcfg0))) + if (!intel_pinctrl_should_save(pctrl, desc->number)) continue; padcfg = intel_get_padcfg(pctrl, desc->number, PADCFG0);
diff --git a/drivers/pinctrl/mediatek/mtk-eint.c b/drivers/pinctrl/mediatek/mtk-eint.c index 24502df..7e526bc 100644 --- a/drivers/pinctrl/mediatek/mtk-eint.c +++ b/drivers/pinctrl/mediatek/mtk-eint.c
@@ -277,15 +277,12 @@ static struct irq_chip mtk_eint_irq_chip = { static unsigned int mtk_eint_hw_init(struct mtk_eint *eint) { - void __iomem *dom_en = eint->base + eint->regs->dom_en; - void __iomem *mask_set = eint->base + eint->regs->mask_set; + void __iomem *reg = eint->base + eint->regs->dom_en; unsigned int i; for (i = 0; i < eint->hw->ap_num; i += 32) { - writel(0xffffffff, dom_en); - writel(0xffffffff, mask_set); - dom_en += 4; - mask_set += 4; + writel(0xffffffff, reg); + reg += 4; } return 0;
diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c index 5d7e368..9f00adf 100644 --- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c +++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -1461,10 +1461,8 @@ static int nmk_pinctrl_dt_subnode_to_map(struct pinctrl_dev *pctldev, has_config = nmk_pinctrl_dt_get_config(np, &configs); np_config = of_parse_phandle(np, "ste,config", 0); - if (np_config) { + if (np_config) has_config |= nmk_pinctrl_dt_get_config(np_config, &configs); - of_node_put(np_config); - } if (has_config) { const char *gpio_name; const char *pin;
diff --git a/drivers/pinctrl/pinconf-generic.c b/drivers/pinctrl/pinconf-generic.c index 8798bc7..e31042b 100644 --- a/drivers/pinctrl/pinconf-generic.c +++ b/drivers/pinctrl/pinconf-generic.c
@@ -392,10 +392,8 @@ int pinconf_generic_dt_node_to_map(struct pinctrl_dev *pctldev, for_each_available_child_of_node(np_config, np) { ret = pinconf_generic_dt_subnode_to_map(pctldev, np, map, &reserved_maps, num_maps, type); - if (ret < 0) { - of_node_put(np); + if (ret < 0) goto exit; - } } return 0;
diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c index 887dc57..4c02439 100644 --- a/drivers/pinctrl/pinctrl-amd.c +++ b/drivers/pinctrl/pinctrl-amd.c
@@ -770,34 +770,6 @@ static const struct pinconf_ops amd_pinconf_ops = { .pin_config_group_set = amd_pinconf_group_set, }; -static void amd_gpio_irq_init(struct amd_gpio *gpio_dev) -{ - struct pinctrl_desc *desc = gpio_dev->pctrl->desc; - unsigned long flags; - u32 pin_reg, mask; - int i; - - mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3) | - BIT(INTERRUPT_MASK_OFF) | BIT(INTERRUPT_ENABLE_OFF) | - BIT(WAKE_CNTRL_OFF_S4); - - for (i = 0; i < desc->npins; i++) { - int pin = desc->pins[i].number; - const struct pin_desc *pd = pin_desc_get(gpio_dev->pctrl, pin); - - if (!pd) - continue; - - raw_spin_lock_irqsave(&gpio_dev->lock, flags); - - pin_reg = readl(gpio_dev->base + i * 4); - pin_reg &= ~mask; - writel(pin_reg, gpio_dev->base + i * 4); - - raw_spin_unlock_irqrestore(&gpio_dev->lock, flags); - } -} - #ifdef CONFIG_PM_SLEEP static bool amd_gpio_should_save(struct amd_gpio *gpio_dev, unsigned int pin) { @@ -821,7 +793,6 @@ static int amd_gpio_suspend(struct device *dev) { struct amd_gpio *gpio_dev = dev_get_drvdata(dev); struct pinctrl_desc *desc = gpio_dev->pctrl->desc; - unsigned long flags; int i; for (i = 0; i < desc->npins; i++) { @@ -830,9 +801,7 @@ static int amd_gpio_suspend(struct device *dev) if (!amd_gpio_should_save(gpio_dev, pin)) continue; - raw_spin_lock_irqsave(&gpio_dev->lock, flags); - gpio_dev->saved_regs[i] = readl(gpio_dev->base + pin * 4) & ~PIN_IRQ_PENDING; - raw_spin_unlock_irqrestore(&gpio_dev->lock, flags); + gpio_dev->saved_regs[i] = readl(gpio_dev->base + pin*4); } return 0; @@ -842,7 +811,6 @@ static int amd_gpio_resume(struct device *dev) { struct amd_gpio *gpio_dev = dev_get_drvdata(dev); struct pinctrl_desc *desc = gpio_dev->pctrl->desc; - unsigned long flags; int i; for (i = 0; i < desc->npins; i++) { @@ -851,10 +819,7 @@ static int amd_gpio_resume(struct device *dev) if (!amd_gpio_should_save(gpio_dev, pin)) continue; - raw_spin_lock_irqsave(&gpio_dev->lock, flags); - gpio_dev->saved_regs[i] |= readl(gpio_dev->base + pin * 4) & PIN_IRQ_PENDING; - writel(gpio_dev->saved_regs[i], gpio_dev->base + pin * 4); - raw_spin_unlock_irqrestore(&gpio_dev->lock, flags); + writel(gpio_dev->saved_regs[i], gpio_dev->base + pin*4); } return 0; @@ -880,7 +845,6 @@ static int amd_gpio_probe(struct platform_device *pdev) int irq_base; struct resource *res; struct amd_gpio *gpio_dev; - struct gpio_irq_chip *girq; gpio_dev = devm_kzalloc(&pdev->dev, sizeof(struct amd_gpio), GFP_KERNEL); @@ -942,18 +906,6 @@ static int amd_gpio_probe(struct platform_device *pdev) return PTR_ERR(gpio_dev->pctrl); } - /* Disable and mask interrupts */ - amd_gpio_irq_init(gpio_dev); - - girq = &gpio_dev->gc.irq; - girq->chip = &amd_gpio_irqchip; - /* This will let us handle the parent IRQ in the driver */ - girq->parent_handler = NULL; - girq->num_parents = 0; - girq->parents = NULL; - girq->default_type = IRQ_TYPE_NONE; - girq->handler = handle_simple_irq; - ret = gpiochip_add_data(&gpio_dev->gc, gpio_dev); if (ret) return ret; @@ -965,6 +917,17 @@ static int amd_gpio_probe(struct platform_device *pdev) goto out2; } + ret = gpiochip_irqchip_add(&gpio_dev->gc, + &amd_gpio_irqchip, + 0, + handle_simple_irq, + IRQ_TYPE_NONE); + if (ret) { + dev_err(&pdev->dev, "could not add irqchip\n"); + ret = -ENODEV; + goto out2; + } + ret = devm_request_irq(&pdev->dev, irq_base, amd_gpio_irq_handler, IRQF_SHARED, KBUILD_MODNAME, gpio_dev); if (ret)
diff --git a/drivers/pinctrl/pinctrl-at91-pio4.c b/drivers/pinctrl/pinctrl-at91-pio4.c index 064b7c3..d6de4d3 100644 --- a/drivers/pinctrl/pinctrl-at91-pio4.c +++ b/drivers/pinctrl/pinctrl-at91-pio4.c
@@ -1011,8 +1011,8 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) pin_desc[i].number = i; /* Pin naming convention: P(bank_name)(bank_pin_number). */ - pin_desc[i].name = devm_kasprintf(&pdev->dev, GFP_KERNEL, "P%c%d", - bank + 'A', line); + pin_desc[i].name = kasprintf(GFP_KERNEL, "P%c%d", + bank + 'A', line); group->name = group_names[i] = pin_desc[i].name; group->pin = pin_desc[i].number; @@ -1069,6 +1069,7 @@ static int atmel_pinctrl_probe(struct platform_device *pdev) dev_err(dev, "can't add the irq domain\n"); return -ENODEV; } + atmel_pioctrl->irq_domain->name = "atmel gpio"; for (i = 0; i < atmel_pioctrl->npins; i++) { int irq = irq_create_mapping(atmel_pioctrl->irq_domain, i);
diff --git a/drivers/pinctrl/pinctrl-at91.c b/drivers/pinctrl/pinctrl-at91.c index 39a55fd..d6e7e9f 100644 --- a/drivers/pinctrl/pinctrl-at91.c +++ b/drivers/pinctrl/pinctrl-at91.c
@@ -1891,7 +1891,7 @@ static int at91_gpio_probe(struct platform_device *pdev) } for (i = 0; i < chip->ngpio; i++) - names[i] = devm_kasprintf(&pdev->dev, GFP_KERNEL, "pio%c%d", alias_idx + 'A', i); + names[i] = kasprintf(GFP_KERNEL, "pio%c%d", alias_idx + 'A', i); chip->names = (const char *const *)names;
diff --git a/drivers/pinctrl/pinctrl-ocelot.c b/drivers/pinctrl/pinctrl-ocelot.c index cccf1cc..0a951a7 100644 --- a/drivers/pinctrl/pinctrl-ocelot.c +++ b/drivers/pinctrl/pinctrl-ocelot.c
@@ -420,7 +420,7 @@ static int ocelot_pinmux_set_mux(struct pinctrl_dev *pctldev, regmap_update_bits(info->map, REG_ALT(0, info, pin->pin), BIT(p), f << p); regmap_update_bits(info->map, REG_ALT(1, info, pin->pin), - BIT(p), (f >> 1) << p); + BIT(p), f << (p - 1)); return 0; }
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index ce5be6f..fb1c896 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c
@@ -345,8 +345,6 @@ static int pcs_set_mux(struct pinctrl_dev *pctldev, unsigned fselector, if (!pcs->fmask) return 0; function = pinmux_generic_get_function(pctldev, fselector); - if (!function) - return -EINVAL; func = function->data; if (!func) return -EINVAL; @@ -705,7 +703,7 @@ static int pcs_allocate_pin_table(struct pcs_device *pcs) mux_bytes = pcs->width / BITS_PER_BYTE; - if (pcs->bits_per_mux && pcs->fmask) { + if (pcs->bits_per_mux) { pcs->bits_per_pin = fls(pcs->fmask); nr_pins = (pcs->size * BITS_PER_BYTE) / pcs->bits_per_pin; num_pins_in_register = pcs->width / pcs->bits_per_pin;
diff --git a/drivers/pinctrl/qcom/pinctrl-msm8916.c b/drivers/pinctrl/qcom/pinctrl-msm8916.c index bf68913..396db12 100644 --- a/drivers/pinctrl/qcom/pinctrl-msm8916.c +++ b/drivers/pinctrl/qcom/pinctrl-msm8916.c
@@ -844,8 +844,8 @@ static const struct msm_pingroup msm8916_groups[] = { PINGROUP(28, pwr_modem_enabled_a, NA, NA, NA, NA, NA, qdss_tracedata_b, NA, atest_combodac), PINGROUP(29, cci_i2c, NA, NA, NA, NA, NA, qdss_tracedata_b, NA, atest_combodac), PINGROUP(30, cci_i2c, NA, NA, NA, NA, NA, NA, NA, qdss_tracedata_b), - PINGROUP(31, cci_timer0, flash_strobe, NA, NA, NA, NA, NA, NA, NA), - PINGROUP(32, cci_timer1, flash_strobe, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(31, cci_timer0, NA, NA, NA, NA, NA, NA, NA, NA), + PINGROUP(32, cci_timer1, NA, NA, NA, NA, NA, NA, NA, NA), PINGROUP(33, cci_async, NA, NA, NA, NA, NA, NA, NA, qdss_tracedata_b), PINGROUP(34, pwr_nav_enabled_a, NA, NA, NA, NA, NA, NA, NA, qdss_tracedata_b), PINGROUP(35, pwr_crypto_enabled_a, NA, NA, NA, NA, NA, NA, NA, qdss_tracedata_b),
diff --git a/drivers/pinctrl/stm32/pinctrl-stm32.c b/drivers/pinctrl/stm32/pinctrl-stm32.c index 10595b4..e8149ff 100644 --- a/drivers/pinctrl/stm32/pinctrl-stm32.c +++ b/drivers/pinctrl/stm32/pinctrl-stm32.c
@@ -1250,7 +1250,6 @@ static struct irq_domain *stm32_pctrl_get_irq_domain(struct device_node *np) return ERR_PTR(-ENXIO); domain = irq_find_host(parent); - of_node_put(parent); if (!domain) /* domain not registered yet */ return ERR_PTR(-EPROBE_DEFER);
diff --git a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c index 12c40f9..4557e18 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c +++ b/drivers/pinctrl/sunxi/pinctrl-sun50i-h6-r.c
@@ -105,7 +105,6 @@ static const struct sunxi_pinctrl_desc sun50i_h6_r_pinctrl_data = { .npins = ARRAY_SIZE(sun50i_h6_r_pins), .pin_base = PL_BASE, .irq_banks = 2, - .io_bias_cfg_variant = BIAS_VOLTAGE_PIO_POW_MODE_SEL, }; static int sun50i_h6_r_pinctrl_probe(struct platform_device *pdev)
diff --git a/drivers/pinctrl/sunxi/pinctrl-sunxi.c b/drivers/pinctrl/sunxi/pinctrl-sunxi.c index 8c41f8b..c4052ea 100644 --- a/drivers/pinctrl/sunxi/pinctrl-sunxi.c +++ b/drivers/pinctrl/sunxi/pinctrl-sunxi.c
@@ -616,7 +616,7 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl, unsigned pin, struct regulator *supply) { - unsigned short bank; + unsigned short bank = pin / PINS_PER_BANK; unsigned long flags; u32 val, reg; int uV; @@ -632,9 +632,6 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl, if (uV == 0) return 0; - pin -= pctl->desc->pin_base; - bank = pin / PINS_PER_BANK; - switch (pctl->desc->io_bias_cfg_variant) { case BIAS_VOLTAGE_GRP_CONFIG: /* @@ -652,6 +649,8 @@ static int sunxi_pinctrl_set_io_bias_cfg(struct sunxi_pinctrl *pctl, else val = 0xD; /* 3.3V */ + pin -= pctl->desc->pin_base; + reg = readl(pctl->membase + sunxi_grp_config_reg(pin)); reg &= ~IO_BIAS_MASK; writel(reg | val, pctl->membase + sunxi_grp_config_reg(pin));
diff --git a/drivers/platform/chrome/chromeos_laptop.c b/drivers/platform/chrome/chromeos_laptop.c index 9549531..8723bcf 100644 --- a/drivers/platform/chrome/chromeos_laptop.c +++ b/drivers/platform/chrome/chromeos_laptop.c
@@ -716,7 +716,6 @@ static int __init chromeos_laptop_prepare_i2c_peripherals(struct chromeos_laptop *cros_laptop, const struct chromeos_laptop *src) { - struct i2c_peripheral *i2c_peripherals; struct i2c_peripheral *i2c_dev; struct i2c_board_info *info; int i; @@ -725,15 +724,17 @@ chromeos_laptop_prepare_i2c_peripherals(struct chromeos_laptop *cros_laptop, if (!src->num_i2c_peripherals) return 0; - i2c_peripherals = kmemdup(src->i2c_peripherals, - src->num_i2c_peripherals * - sizeof(*src->i2c_peripherals), - GFP_KERNEL); - if (!i2c_peripherals) + cros_laptop->i2c_peripherals = kmemdup(src->i2c_peripherals, + src->num_i2c_peripherals * + sizeof(*src->i2c_peripherals), + GFP_KERNEL); + if (!cros_laptop->i2c_peripherals) return -ENOMEM; - for (i = 0; i < src->num_i2c_peripherals; i++) { - i2c_dev = &i2c_peripherals[i]; + cros_laptop->num_i2c_peripherals = src->num_i2c_peripherals; + + for (i = 0; i < cros_laptop->num_i2c_peripherals; i++) { + i2c_dev = &cros_laptop->i2c_peripherals[i]; info = &i2c_dev->board_info; error = chromeos_laptop_setup_irq(i2c_dev); @@ -751,19 +752,16 @@ chromeos_laptop_prepare_i2c_peripherals(struct chromeos_laptop *cros_laptop, } } - cros_laptop->i2c_peripherals = i2c_peripherals; - cros_laptop->num_i2c_peripherals = src->num_i2c_peripherals; - return 0; err_out: while (--i >= 0) { - i2c_dev = &i2c_peripherals[i]; + i2c_dev = &cros_laptop->i2c_peripherals[i]; info = &i2c_dev->board_info; if (info->properties) property_entries_free(info->properties); } - kfree(i2c_peripherals); + kfree(cros_laptop->i2c_peripherals); return error; }
diff --git a/drivers/platform/chrome/cros_ec_chardev.c b/drivers/platform/chrome/cros_ec_chardev.c index 4791b62..74ded44 100644 --- a/drivers/platform/chrome/cros_ec_chardev.c +++ b/drivers/platform/chrome/cros_ec_chardev.c
@@ -285,7 +285,7 @@ static long cros_ec_chardev_ioctl_xcmd(struct cros_ec_dev *ec, void __user *arg) u_cmd.insize > EC_MAX_MSG_BYTES) return -EINVAL; - s_cmd = kzalloc(sizeof(*s_cmd) + max(u_cmd.outsize, u_cmd.insize), + s_cmd = kmalloc(sizeof(*s_cmd) + max(u_cmd.outsize, u_cmd.insize), GFP_KERNEL); if (!s_cmd) return -ENOMEM; @@ -328,9 +328,6 @@ static long cros_ec_chardev_ioctl_readmem(struct cros_ec_dev *ec, if (copy_from_user(&s_mem, arg, sizeof(s_mem))) return -EFAULT; - if (s_mem.bytes > sizeof(s_mem.buffer)) - return -EINVAL; - num = ec_dev->cmd_readmem(ec_dev, s_mem.offset, s_mem.bytes, s_mem.buffer); if (num <= 0)
diff --git a/drivers/platform/olpc/olpc-ec.c b/drivers/platform/olpc/olpc-ec.c index 89d9fca..2db7113 100644 --- a/drivers/platform/olpc/olpc-ec.c +++ b/drivers/platform/olpc/olpc-ec.c
@@ -265,7 +265,7 @@ static ssize_t ec_dbgfs_cmd_write(struct file *file, const char __user *buf, int i, m; unsigned char ec_cmd[EC_MAX_CMD_ARGS]; unsigned int ec_cmd_int[EC_MAX_CMD_ARGS]; - char cmdbuf[64] = ""; + char cmdbuf[64]; int ec_cmd_bytes; mutex_lock(&ec_dbgfs_lock);
diff --git a/drivers/platform/x86/acer-wmi.c b/drivers/platform/x86/acer-wmi.c index d6c4cd4..d27a564 100644 --- a/drivers/platform/x86/acer-wmi.c +++ b/drivers/platform/x86/acer-wmi.c
@@ -93,7 +93,6 @@ static const struct key_entry acer_wmi_keymap[] __initconst = { {KE_KEY, 0x22, {KEY_PROG2} }, /* Arcade */ {KE_KEY, 0x23, {KEY_PROG3} }, /* P_Key */ {KE_KEY, 0x24, {KEY_PROG4} }, /* Social networking_Key */ - {KE_KEY, 0x27, {KEY_HELP} }, {KE_KEY, 0x29, {KEY_PROG3} }, /* P_Key for TM8372 */ {KE_IGNORE, 0x41, {KEY_MUTE} }, {KE_IGNORE, 0x42, {KEY_PREVIOUSSONG} }, @@ -107,13 +106,7 @@ static const struct key_entry acer_wmi_keymap[] __initconst = { {KE_IGNORE, 0x48, {KEY_VOLUMEUP} }, {KE_IGNORE, 0x49, {KEY_VOLUMEDOWN} }, {KE_IGNORE, 0x4a, {KEY_VOLUMEDOWN} }, - /* - * 0x61 is KEY_SWITCHVIDEOMODE. Usually this is a duplicate input event - * with the "Video Bus" input device events. But sometimes it is not - * a dup. Map it to KEY_UNKNOWN instead of using KE_IGNORE so that - * udev/hwdb can override it on systems where it is not a dup. - */ - {KE_KEY, 0x61, {KEY_UNKNOWN} }, + {KE_IGNORE, 0x61, {KEY_SWITCHVIDEOMODE} }, {KE_IGNORE, 0x62, {KEY_BRIGHTNESSUP} }, {KE_IGNORE, 0x63, {KEY_BRIGHTNESSDOWN} }, {KE_KEY, 0x64, {KEY_SWITCHVIDEOMODE} }, /* Display Switch */ @@ -538,15 +531,6 @@ static const struct dmi_system_id acer_quirks[] __initconst = { }, { .callback = set_force_caps, - .ident = "Acer Aspire Switch V 10 SW5-017", - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "SW5-017"), - }, - .driver_data = (void *)ACER_CAP_KBD_DOCK, - }, - { - .callback = set_force_caps, .ident = "Acer One 10 (S1003)", .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Acer"),
diff --git a/drivers/platform/x86/asus-nb-wmi.c b/drivers/platform/x86/asus-nb-wmi.c index 6424bdb..59b78a1 100644 --- a/drivers/platform/x86/asus-nb-wmi.c +++ b/drivers/platform/x86/asus-nb-wmi.c
@@ -528,7 +528,6 @@ static const struct key_entry asus_nb_wmi_keymap[] = { { KE_KEY, 0x30, { KEY_VOLUMEUP } }, { KE_KEY, 0x31, { KEY_VOLUMEDOWN } }, { KE_KEY, 0x32, { KEY_MUTE } }, - { KE_KEY, 0x33, { KEY_SCREENLOCK } }, { KE_KEY, 0x35, { KEY_SCREENLOCK } }, { KE_KEY, 0x40, { KEY_PREVIOUSSONG } }, { KE_KEY, 0x41, { KEY_NEXTSONG } },
diff --git a/drivers/platform/x86/asus-wmi.c b/drivers/platform/x86/asus-wmi.c index 761cab6..ed83fb1 100644 --- a/drivers/platform/x86/asus-wmi.c +++ b/drivers/platform/x86/asus-wmi.c
@@ -1195,8 +1195,6 @@ static void asus_wmi_set_xusb2pr(struct asus_wmi *asus) pci_write_config_dword(xhci_pdev, USB_INTEL_XUSB2PR, cpu_to_le32(ports_available)); - pci_dev_put(xhci_pdev); - pr_info("set USB_INTEL_XUSB2PR old: 0x%04x, new: 0x%04x\n", orig_ports_available, ports_available); }
diff --git a/drivers/platform/x86/hp-wmi.c b/drivers/platform/x86/hp-wmi.c index d3a329b..c3fdb0e 100644 --- a/drivers/platform/x86/hp-wmi.c +++ b/drivers/platform/x86/hp-wmi.c
@@ -63,7 +63,6 @@ enum hp_wmi_event_ids { HPWMI_PEAKSHIFT_PERIOD = 0x0F, HPWMI_BATTERY_CHARGE_PERIOD = 0x10, HPWMI_SANITIZATION_MODE = 0x17, - HPWMI_SMART_EXPERIENCE_APP = 0x21, }; struct bios_args { @@ -633,8 +632,6 @@ static void hp_wmi_notify(u32 value, void *context) break; case HPWMI_SANITIZATION_MODE: break; - case HPWMI_SMART_EXPERIENCE_APP: - break; default: pr_info("Unknown event_id - %d - 0x%x\n", event_id, event_data); break; @@ -883,16 +880,8 @@ static int __init hp_wmi_bios_setup(struct platform_device *device) wwan_rfkill = NULL; rfkill2_count = 0; - /* - * In pre-2009 BIOS, command 1Bh return 0x4 to indicate that - * BIOS no longer controls the power for the wireless - * devices. All features supported by this command will no - * longer be supported. - */ - if (!hp_wmi_bios_2009_later()) { - if (hp_wmi_rfkill_setup(device)) - hp_wmi_rfkill2_setup(device); - } + if (hp_wmi_rfkill_setup(device)) + hp_wmi_rfkill2_setup(device); return 0; }
diff --git a/drivers/platform/x86/intel_pmc_core_pltdrv.c b/drivers/platform/x86/intel_pmc_core_pltdrv.c index 42ed02a..e1266f5 100644 --- a/drivers/platform/x86/intel_pmc_core_pltdrv.c +++ b/drivers/platform/x86/intel_pmc_core_pltdrv.c
@@ -18,8 +18,6 @@ #include <asm/cpu_device_id.h> #include <asm/intel-family.h> -#include <xen/xen.h> - static void intel_pmc_core_release(struct device *dev) { /* Nothing to do. */ @@ -58,13 +56,6 @@ static int __init pmc_core_platform_init(void) if (acpi_dev_present("INT33A1", NULL, -1)) return -ENODEV; - /* - * Skip forcefully attaching the device for VMs. Make an exception for - * Xen dom0, which does have full hardware access. - */ - if (cpu_feature_enabled(X86_FEATURE_HYPERVISOR) && !xen_initial_domain()) - return -ENODEV; - if (!x86_match_cpu(intel_pmc_core_platform_ids)) return -ENODEV;
diff --git a/drivers/platform/x86/msi-laptop.c b/drivers/platform/x86/msi-laptop.c index 0e804b6..24ffc8e 100644 --- a/drivers/platform/x86/msi-laptop.c +++ b/drivers/platform/x86/msi-laptop.c
@@ -596,10 +596,11 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = { { .ident = "MSI S270", .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT"), + DMI_MATCH(DMI_SYS_VENDOR, "MICRO-STAR INT'L CO.,LTD"), DMI_MATCH(DMI_PRODUCT_NAME, "MS-1013"), DMI_MATCH(DMI_PRODUCT_VERSION, "0131"), - DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT") + DMI_MATCH(DMI_CHASSIS_VENDOR, + "MICRO-STAR INT'L CO.,LTD") }, .driver_data = &quirk_old_ec_model, .callback = dmi_check_cb @@ -632,7 +633,8 @@ static const struct dmi_system_id msi_dmi_table[] __initconst = { DMI_MATCH(DMI_SYS_VENDOR, "NOTEBOOK"), DMI_MATCH(DMI_PRODUCT_NAME, "SAM2000"), DMI_MATCH(DMI_PRODUCT_VERSION, "0131"), - DMI_MATCH(DMI_CHASSIS_VENDOR, "MICRO-STAR INT") + DMI_MATCH(DMI_CHASSIS_VENDOR, + "MICRO-STAR INT'L CO.,LTD") }, .driver_data = &quirk_old_ec_model, .callback = dmi_check_cb @@ -1046,7 +1048,8 @@ static int __init msi_init(void) return -EINVAL; /* Register backlight stuff */ - if (quirks->old_ec_model && + + if (quirks->old_ec_model || acpi_video_get_backlight_type() == acpi_backlight_vendor) { struct backlight_properties props; memset(&props, 0, sizeof(struct backlight_properties)); @@ -1114,8 +1117,6 @@ static int __init msi_init(void) fail_create_group: if (quirks->load_scm_model) { i8042_remove_filter(msi_laptop_i8042_filter); - cancel_delayed_work_sync(&msi_touchpad_dwork); - input_unregister_device(msi_laptop_input_dev); cancel_delayed_work_sync(&msi_rfkill_dwork); cancel_work_sync(&msi_rfkill_work); rfkill_cleanup(); @@ -1136,7 +1137,6 @@ static void __exit msi_cleanup(void) { if (quirks->load_scm_model) { i8042_remove_filter(msi_laptop_i8042_filter); - cancel_delayed_work_sync(&msi_touchpad_dwork); input_unregister_device(msi_laptop_input_dev); cancel_delayed_work_sync(&msi_rfkill_dwork); cancel_work_sync(&msi_rfkill_work);
diff --git a/drivers/platform/x86/mxm-wmi.c b/drivers/platform/x86/mxm-wmi.c index 9a45795..9a19fbd 100644 --- a/drivers/platform/x86/mxm-wmi.c +++ b/drivers/platform/x86/mxm-wmi.c
@@ -35,11 +35,13 @@ int mxm_wmi_call_mxds(int adapter) .xarg = 1, }; struct acpi_buffer input = { (acpi_size)sizeof(args), &args }; + struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; acpi_status status; printk("calling mux switch %d\n", adapter); - status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, NULL); + status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, + &output); if (ACPI_FAILURE(status)) return status; @@ -58,11 +60,13 @@ int mxm_wmi_call_mxmx(int adapter) .xarg = 1, }; struct acpi_buffer input = { (acpi_size)sizeof(args), &args }; + struct acpi_buffer output = { ACPI_ALLOCATE_BUFFER, NULL }; acpi_status status; printk("calling mux switch %d\n", adapter); - status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, NULL); + status = wmi_evaluate_method(MXM_WMMX_GUID, 0x0, adapter, &input, + &output); if (ACPI_FAILURE(status)) return status;
diff --git a/drivers/platform/x86/pmc_atom.c b/drivers/platform/x86/pmc_atom.c index ee349a1..597cfab 100644 --- a/drivers/platform/x86/pmc_atom.c +++ b/drivers/platform/x86/pmc_atom.c
@@ -244,7 +244,7 @@ static void pmc_power_off(void) pm1_cnt_port = acpi_base_addr + PM1_CNT; pm1_cnt_value = inl(pm1_cnt_port); - pm1_cnt_value &= ~SLEEP_TYPE_MASK; + pm1_cnt_value &= SLEEP_TYPE_MASK; pm1_cnt_value |= SLEEP_TYPE_S5; pm1_cnt_value |= SLEEP_ENABLE;
diff --git a/drivers/platform/x86/sony-laptop.c b/drivers/platform/x86/sony-laptop.c index 5a290fe..fb088dd 100644 --- a/drivers/platform/x86/sony-laptop.c +++ b/drivers/platform/x86/sony-laptop.c
@@ -1899,21 +1899,14 @@ static int sony_nc_kbd_backlight_setup(struct platform_device *pd, break; } - /* - * Only probe if there is a separate probe_base, otherwise the probe call - * is equivalent to __sony_nc_kbd_backlight_mode_set(0), resulting in - * the keyboard backlight being turned off. - */ - if (probe_base) { - ret = sony_call_snc_handle(handle, probe_base, &result); - if (ret) - return ret; + ret = sony_call_snc_handle(handle, probe_base, &result); + if (ret) + return ret; - if ((handle == 0x0137 && !(result & 0x02)) || - !(result & 0x01)) { - dprintk("no backlight keyboard found\n"); - return 0; - } + if ((handle == 0x0137 && !(result & 0x02)) || + !(result & 0x01)) { + dprintk("no backlight keyboard found\n"); + return 0; } kbdbl_ctl = kzalloc(sizeof(*kbdbl_ctl), GFP_KERNEL);
diff --git a/drivers/platform/x86/touchscreen_dmi.c b/drivers/platform/x86/touchscreen_dmi.c index 61cb1a4..515c66c 100644 --- a/drivers/platform/x86/touchscreen_dmi.c +++ b/drivers/platform/x86/touchscreen_dmi.c
@@ -169,23 +169,6 @@ static const struct ts_dmi_data connect_tablet9_data = { .properties = connect_tablet9_props, }; -static const struct property_entry csl_panther_tab_hd_props[] = { - PROPERTY_ENTRY_U32("touchscreen-min-x", 1), - PROPERTY_ENTRY_U32("touchscreen-min-y", 20), - PROPERTY_ENTRY_U32("touchscreen-size-x", 1980), - PROPERTY_ENTRY_U32("touchscreen-size-y", 1526), - PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"), - PROPERTY_ENTRY_BOOL("touchscreen-swapped-x-y"), - PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-csl-panther-tab-hd.fw"), - PROPERTY_ENTRY_U32("silead,max-fingers", 10), - { } -}; - -static const struct ts_dmi_data csl_panther_tab_hd_data = { - .acpi_name = "MSSL1680:00", - .properties = csl_panther_tab_hd_props, -}; - static const struct property_entry cube_iwork8_air_props[] = { PROPERTY_ENTRY_U32("touchscreen-min-x", 1), PROPERTY_ENTRY_U32("touchscreen-min-y", 3), @@ -739,14 +722,6 @@ static const struct dmi_system_id touchscreen_dmi_table[] = { }, }, { - /* CSL Panther Tab HD */ - .driver_data = (void *)&csl_panther_tab_hd_data, - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "CSL Computer GmbH & Co. KG"), - DMI_MATCH(DMI_PRODUCT_NAME, "CSL Panther Tab HD"), - }, - }, - { /* CUBE iwork8 Air */ .driver_data = (void *)&cube_iwork8_air_data, .matches = {
diff --git a/drivers/pnp/core.c b/drivers/pnp/core.c index 131b925..3bf18d7 100644 --- a/drivers/pnp/core.c +++ b/drivers/pnp/core.c
@@ -160,14 +160,14 @@ struct pnp_dev *pnp_alloc_dev(struct pnp_protocol *protocol, int id, dev->dev.coherent_dma_mask = dev->dma_mask; dev->dev.release = &pnp_release_device; + dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); + dev_id = pnp_add_id(dev, pnpid); if (!dev_id) { kfree(dev); return NULL; } - dev_set_name(&dev->dev, "%02x:%02x", dev->protocol->number, dev->number); - return dev; }
diff --git a/drivers/power/avs/smartreflex.c b/drivers/power/avs/smartreflex.c index 2365efe..4684e7d 100644 --- a/drivers/power/avs/smartreflex.c +++ b/drivers/power/avs/smartreflex.c
@@ -942,7 +942,6 @@ static int omap_sr_probe(struct platform_device *pdev) err_debugfs: debugfs_remove_recursive(sr_info->dbg_dir); err_list_del: - pm_runtime_disable(&pdev->dev); list_del(&sr_info->node); pm_runtime_put_sync(&pdev->dev);
diff --git a/drivers/power/supply/adp5061.c b/drivers/power/supply/adp5061.c index daee116..0035570 100644 --- a/drivers/power/supply/adp5061.c +++ b/drivers/power/supply/adp5061.c
@@ -427,11 +427,11 @@ static int adp5061_get_chg_type(struct adp5061_state *st, if (ret < 0) return ret; - chg_type = ADP5061_CHG_STATUS_1_CHG_STATUS(status1); - if (chg_type >= ARRAY_SIZE(adp5061_chg_type)) + chg_type = adp5061_chg_type[ADP5061_CHG_STATUS_1_CHG_STATUS(status1)]; + if (chg_type > ADP5061_CHG_FAST_CV) val->intval = POWER_SUPPLY_STATUS_UNKNOWN; else - val->intval = adp5061_chg_type[chg_type]; + val->intval = chg_type; return ret; }
diff --git a/drivers/power/supply/cros_usbpd-charger.c b/drivers/power/supply/cros_usbpd-charger.c index 0f80fdf..6cc7c39 100644 --- a/drivers/power/supply/cros_usbpd-charger.c +++ b/drivers/power/supply/cros_usbpd-charger.c
@@ -282,7 +282,7 @@ static int cros_usbpd_charger_get_power_info(struct port_data *port) port->psy_current_max = 0; break; default: - dev_dbg(dev, "Port %d: default case!\n", port->port_number); + dev_err(dev, "Port %d: default case!\n", port->port_number); port->psy_usb_type = POWER_SUPPLY_USB_TYPE_SDP; }
diff --git a/drivers/power/supply/da9150-charger.c b/drivers/power/supply/da9150-charger.c index 6b987da..f9314cc 100644 --- a/drivers/power/supply/da9150-charger.c +++ b/drivers/power/supply/da9150-charger.c
@@ -662,7 +662,6 @@ static int da9150_charger_remove(struct platform_device *pdev) if (!IS_ERR_OR_NULL(charger->usb_phy)) usb_unregister_notifier(charger->usb_phy, &charger->otg_nb); - cancel_work_sync(&charger->otg_work); power_supply_unregister(charger->battery); power_supply_unregister(charger->usb);
diff --git a/drivers/power/supply/power_supply_core.c b/drivers/power/supply/power_supply_core.c index 0e67840..7839597 100644 --- a/drivers/power/supply/power_supply_core.c +++ b/drivers/power/supply/power_supply_core.c
@@ -728,11 +728,6 @@ int power_supply_get_battery_info(struct power_supply *psy, int i, tab_len, size; propname = kasprintf(GFP_KERNEL, "ocv-capacity-table-%d", index); - if (!propname) { - power_supply_put_battery_info(psy, info); - err = -ENOMEM; - goto out_put_node; - } list = of_get_property(battery_np, propname, &size); if (!list || !size) { dev_err(&psy->dev, "failed to get %s\n", propname); @@ -1252,8 +1247,8 @@ __power_supply_register(struct device *parent, register_cooler_failed: psy_unregister_thermal(psy); register_thermal_failed: -wakeup_init_failed: device_del(dev); +wakeup_init_failed: device_add_failed: check_supplies_failed: dev_set_name_failed:
diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c index d5a505f..925b000 100644 --- a/drivers/powercap/intel_rapl_common.c +++ b/drivers/powercap/intel_rapl_common.c
@@ -885,9 +885,6 @@ static u64 rapl_compute_time_window_core(struct rapl_package *rp, u64 value, y = value & 0x1f; value = (1 << y) * (4 + f) * rp->time_unit / 4; } else { - if (value < rp->time_unit) - return 0; - do_div(value, rp->time_unit); y = ilog2(value); f = div64_u64(4 * (value - (1 << y)), 1 << y);
diff --git a/drivers/powercap/powercap_sys.c b/drivers/powercap/powercap_sys.c index 7a3109a..3f0b8e2 100644 --- a/drivers/powercap/powercap_sys.c +++ b/drivers/powercap/powercap_sys.c
@@ -530,6 +530,9 @@ struct powercap_zone *powercap_register_zone( power_zone->name = kstrdup(name, GFP_KERNEL); if (!power_zone->name) goto err_name_alloc; + dev_set_name(&power_zone->dev, "%s:%x", + dev_name(power_zone->dev.parent), + power_zone->id); power_zone->constraints = kcalloc(nr_constraints, sizeof(*power_zone->constraints), GFP_KERNEL); @@ -552,16 +555,9 @@ struct powercap_zone *powercap_register_zone( power_zone->dev_attr_groups[0] = &power_zone->dev_zone_attr_group; power_zone->dev_attr_groups[1] = NULL; power_zone->dev.groups = power_zone->dev_attr_groups; - dev_set_name(&power_zone->dev, "%s:%x", - dev_name(power_zone->dev.parent), - power_zone->id); result = device_register(&power_zone->dev); - if (result) { - put_device(&power_zone->dev); - mutex_unlock(&control_type->lock); - - return ERR_PTR(result); - } + if (result) + goto err_dev_ret; control_type->nr_zones++; mutex_unlock(&control_type->lock);
diff --git a/drivers/ptp/ptp_qoriq.c b/drivers/ptp/ptp_qoriq.c index ca211fe..a577218 100644 --- a/drivers/ptp/ptp_qoriq.c +++ b/drivers/ptp/ptp_qoriq.c
@@ -604,7 +604,7 @@ static int ptp_qoriq_probe(struct platform_device *dev) return 0; no_clock: - iounmap(base); + iounmap(ptp_qoriq->base); no_ioremap: release_resource(ptp_qoriq->rsrc); no_resource:
diff --git a/drivers/pwm/pwm-cros-ec.c b/drivers/pwm/pwm-cros-ec.c index ad4321f..8949744 100644 --- a/drivers/pwm/pwm-cros-ec.c +++ b/drivers/pwm/pwm-cros-ec.c
@@ -125,7 +125,6 @@ static void cros_ec_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, state->enabled = (ret > 0); state->period = EC_PWM_MAX_DUTY; - state->polarity = PWM_POLARITY_NORMAL; /* Note that "disabled" and "duty cycle == 0" are treated the same */ state->duty_cycle = ret;
diff --git a/drivers/pwm/pwm-sifive.c b/drivers/pwm/pwm-sifive.c index 23eb70c..62de0bb 100644 --- a/drivers/pwm/pwm-sifive.c +++ b/drivers/pwm/pwm-sifive.c
@@ -43,7 +43,7 @@ struct pwm_sifive_ddata { struct pwm_chip chip; - struct mutex lock; /* lock to protect user_count and approx_period */ + struct mutex lock; /* lock to protect user_count */ struct notifier_block notifier; struct clk *clk; void __iomem *regs; @@ -78,7 +78,6 @@ static void pwm_sifive_free(struct pwm_chip *chip, struct pwm_device *pwm) mutex_unlock(&ddata->lock); } -/* Called holding ddata->lock */ static void pwm_sifive_update_clock(struct pwm_sifive_ddata *ddata, unsigned long rate) { @@ -167,6 +166,7 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, return ret; } + mutex_lock(&ddata->lock); cur_state = pwm->state; enabled = cur_state.enabled; @@ -185,23 +185,14 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, /* The hardware cannot generate a 100% duty cycle */ frac = min(frac, (1U << PWM_SIFIVE_CMPWIDTH) - 1); - mutex_lock(&ddata->lock); if (state->period != ddata->approx_period) { - /* - * Don't let a 2nd user change the period underneath the 1st user. - * However if ddate->approx_period == 0 this is the first time we set - * any period, so let whoever gets here first set the period so other - * users who agree on the period won't fail. - */ - if (ddata->user_count != 1 && ddata->approx_period) { - mutex_unlock(&ddata->lock); + if (ddata->user_count != 1) { ret = -EBUSY; goto exit; } ddata->approx_period = state->period; pwm_sifive_update_clock(ddata, clk_get_rate(ddata->clk)); } - mutex_unlock(&ddata->lock); writel(frac, ddata->regs + PWM_SIFIVE_PWMCMP0 + pwm->hwpwm * PWM_SIFIVE_SIZE_PWMCMP); @@ -211,6 +202,7 @@ static int pwm_sifive_apply(struct pwm_chip *chip, struct pwm_device *pwm, exit: clk_disable(ddata->clk); + mutex_unlock(&ddata->lock); return ret; } @@ -229,11 +221,8 @@ static int pwm_sifive_clock_notifier(struct notifier_block *nb, struct pwm_sifive_ddata *ddata = container_of(nb, struct pwm_sifive_ddata, notifier); - if (event == POST_RATE_CHANGE) { - mutex_lock(&ddata->lock); + if (event == POST_RATE_CHANGE) pwm_sifive_update_clock(ddata, ndata->new_rate); - mutex_unlock(&ddata->lock); - } return NOTIFY_OK; }
diff --git a/drivers/pwm/pwm-sprd.c b/drivers/pwm/pwm-sprd.c index b30d664..892d853 100644 --- a/drivers/pwm/pwm-sprd.c +++ b/drivers/pwm/pwm-sprd.c
@@ -109,7 +109,6 @@ static void sprd_pwm_get_state(struct pwm_chip *chip, struct pwm_device *pwm, duty = val & SPRD_PWM_DUTY_MSK; tmp = (prescale + 1) * NSEC_PER_SEC * duty; state->duty_cycle = DIV_ROUND_CLOSEST_ULL(tmp, chn->clk_rate); - state->polarity = PWM_POLARITY_NORMAL; /* Disable PWM clocks if the PWM channel is not in enable state. */ if (!state->enabled)
diff --git a/drivers/pwm/pwm-stm32-lp.c b/drivers/pwm/pwm-stm32-lp.c index c8a847f..945a8b2 100644 --- a/drivers/pwm/pwm-stm32-lp.c +++ b/drivers/pwm/pwm-stm32-lp.c
@@ -127,7 +127,7 @@ static int stm32_pwm_lp_apply(struct pwm_chip *chip, struct pwm_device *pwm, /* ensure CMP & ARR registers are properly written */ ret = regmap_read_poll_timeout(priv->regmap, STM32_LPTIM_ISR, val, - (val & STM32_LPTIM_CMPOK_ARROK) == STM32_LPTIM_CMPOK_ARROK, + (val & STM32_LPTIM_CMPOK_ARROK), 100, 1000); if (ret) { dev_err(priv->chip.dev, "ARR/CMP registers write issue\n");
diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c index 2371151..2b08fde 100644 --- a/drivers/rapidio/devices/rio_mport_cdev.c +++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -1807,11 +1807,8 @@ static int rio_mport_add_riodev(struct mport_cdev_priv *priv, rio_init_dbell_res(&rdev->riores[RIO_DOORBELL_RESOURCE], 0, 0xffff); err = rio_add_device(rdev); - if (err) { - put_device(&rdev->dev); - return err; - } - + if (err) + goto cleanup; rio_dev_get(rdev); return 0; @@ -1907,6 +1904,10 @@ static int mport_cdev_open(struct inode *inode, struct file *filp) priv->md = chdev; + mutex_lock(&chdev->file_mutex); + list_add_tail(&priv->list, &chdev->file_list); + mutex_unlock(&chdev->file_mutex); + INIT_LIST_HEAD(&priv->db_filters); INIT_LIST_HEAD(&priv->pw_filters); spin_lock_init(&priv->fifo_lock); @@ -1915,7 +1916,6 @@ static int mport_cdev_open(struct inode *inode, struct file *filp) sizeof(struct rio_event) * MPORT_EVENT_DEPTH, GFP_KERNEL); if (ret < 0) { - put_device(&chdev->dev); dev_err(&chdev->dev, DRV_NAME ": kfifo_alloc failed\n"); ret = -ENOMEM; goto err_fifo; @@ -1926,9 +1926,6 @@ static int mport_cdev_open(struct inode *inode, struct file *filp) spin_lock_init(&priv->req_lock); mutex_init(&priv->dma_lock); #endif - mutex_lock(&chdev->file_mutex); - list_add_tail(&priv->list, &chdev->file_list); - mutex_unlock(&chdev->file_mutex); filp->private_data = priv; goto out;
diff --git a/drivers/rapidio/rio-scan.c b/drivers/rapidio/rio-scan.c index b1cd6e0..0e90c5d 100644 --- a/drivers/rapidio/rio-scan.c +++ b/drivers/rapidio/rio-scan.c
@@ -456,12 +456,8 @@ static struct rio_dev *rio_setup_device(struct rio_net *net, 0, 0xffff); ret = rio_add_device(rdev); - if (ret) { - if (rswitch) - kfree(rswitch->route_table); - put_device(&rdev->dev); - return NULL; - } + if (ret) + goto cleanup; rio_dev_get(rdev);
diff --git a/drivers/rapidio/rio.c b/drivers/rapidio/rio.c index fcab174..606986c 100644 --- a/drivers/rapidio/rio.c +++ b/drivers/rapidio/rio.c
@@ -2267,16 +2267,11 @@ int rio_register_mport(struct rio_mport *port) atomic_set(&port->state, RIO_DEVICE_RUNNING); res = device_register(&port->dev); - if (res) { + if (res) dev_err(&port->dev, "RIO: mport%d registration failed ERR=%d\n", port->id, res); - mutex_lock(&rio_mport_list_lock); - list_del(&port->node); - mutex_unlock(&rio_mport_list_lock); - put_device(&port->dev); - } else { + else dev_dbg(&port->dev, "RIO: registered mport%d\n", port->id); - } return res; }
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c index 91a0e0e..bc2689c 100644 --- a/drivers/regulator/core.c +++ b/drivers/regulator/core.c
@@ -956,7 +956,7 @@ static int drms_uA_update(struct regulator_dev *rdev) /* get input voltage */ input_uV = 0; if (rdev->supply) - input_uV = regulator_get_voltage_rdev(rdev->supply->rdev); + input_uV = regulator_get_voltage(rdev->supply); if (input_uV <= 0) input_uV = rdev->constraints->input_uV; if (input_uV <= 0) { @@ -1387,13 +1387,7 @@ static int set_machine_constraints(struct regulator_dev *rdev) if (rdev->supply_name && !rdev->supply) return -EPROBE_DEFER; - /* If supplying regulator has already been enabled, - * it's not intended to have use_count increment - * when rdev is only boot-on. - */ - if (rdev->supply && - (rdev->constraints->always_on || - !regulator_is_enabled(rdev->supply))) { + if (rdev->supply) { ret = regulator_enable(rdev->supply); if (ret < 0) { _regulator_put(rdev->supply); @@ -1437,7 +1431,6 @@ static int set_supply(struct regulator_dev *rdev, rdev->supply = create_regulator(supply_rdev, &rdev->dev, "SUPPLY"); if (rdev->supply == NULL) { - module_put(supply_rdev->owner); err = -ENOMEM; return err; } @@ -1611,7 +1604,7 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, regulator = kzalloc(sizeof(*regulator), GFP_KERNEL); if (regulator == NULL) { - kfree_const(supply_name); + kfree(supply_name); return NULL; } @@ -1741,7 +1734,6 @@ static struct regulator_dev *regulator_dev_lookup(struct device *dev, node = of_get_regulator(dev, supply); if (node) { r = of_find_regulator_by_node(node); - of_node_put(node); if (r) return r; @@ -2498,18 +2490,13 @@ static int _regulator_do_enable(struct regulator_dev *rdev) */ static int _regulator_handle_consumer_enable(struct regulator *regulator) { - int ret; struct regulator_dev *rdev = regulator->rdev; lockdep_assert_held_once(&rdev->mutex.base); regulator->enable_count++; - if (regulator->uA_load && regulator->enable_count == 1) { - ret = drms_uA_update(rdev); - if (ret) - regulator->enable_count--; - return ret; - } + if (regulator->uA_load && regulator->enable_count == 1) + return drms_uA_update(rdev); return 0; } @@ -4814,7 +4801,6 @@ static void regulator_dev_release(struct device *dev) { struct regulator_dev *rdev = dev_get_drvdata(dev); - debugfs_remove_recursive(rdev->debugfs); kfree(rdev->constraints); of_node_put(rdev->dev.of_node); kfree(rdev); @@ -5278,20 +5264,15 @@ regulator_register(const struct regulator_desc *regulator_desc, regulator_remove_coupling(rdev); mutex_unlock(®ulator_list_mutex); wash: - regulator_put(rdev->supply); kfree(rdev->coupling_desc.coupled_rdevs); mutex_lock(®ulator_list_mutex); regulator_ena_gpio_free(rdev); mutex_unlock(®ulator_list_mutex); - put_device(&rdev->dev); - rdev = NULL; clean: if (dangling_of_gpiod) gpiod_put(config->ena_gpiod); - if (rdev && rdev->dev.of_node) - of_node_put(rdev->dev.of_node); - kfree(rdev); kfree(config); + put_device(&rdev->dev); rinse: if (dangling_cfg_gpiod) gpiod_put(cfg->ena_gpiod); @@ -5320,6 +5301,7 @@ void regulator_unregister(struct regulator_dev *rdev) mutex_lock(®ulator_list_mutex); + debugfs_remove_recursive(rdev->debugfs); WARN_ON(rdev->open_count); regulator_remove_coupling(rdev); unset_regulator_supplies(rdev);
diff --git a/drivers/regulator/da9211-regulator.c b/drivers/regulator/da9211-regulator.c index 7baa612..bf80748 100644 --- a/drivers/regulator/da9211-regulator.c +++ b/drivers/regulator/da9211-regulator.c
@@ -471,12 +471,6 @@ static int da9211_i2c_probe(struct i2c_client *i2c, chip->chip_irq = i2c->irq; - ret = da9211_regulator_init(chip); - if (ret < 0) { - dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret); - return ret; - } - if (chip->chip_irq != 0) { ret = devm_request_threaded_irq(chip->dev, chip->chip_irq, NULL, da9211_irq_handler, @@ -491,6 +485,11 @@ static int da9211_i2c_probe(struct i2c_client *i2c, dev_warn(chip->dev, "No IRQ configured\n"); } + ret = da9211_regulator_init(chip); + + if (ret < 0) + dev_err(chip->dev, "Failed to initialize regulator: %d\n", ret); + return ret; }
diff --git a/drivers/regulator/fan53555.c b/drivers/regulator/fan53555.c index 99a1b2d..dbe477d 100644 --- a/drivers/regulator/fan53555.c +++ b/drivers/regulator/fan53555.c
@@ -8,19 +8,18 @@ // Copyright (c) 2012 Marvell Technology Ltd. // Yunfan Zhang <yfzhang@marvell.com> -#include <linux/bits.h> -#include <linux/err.h> -#include <linux/i2c.h> #include <linux/module.h> -#include <linux/of_device.h> #include <linux/param.h> +#include <linux/err.h> #include <linux/platform_device.h> -#include <linux/regmap.h> #include <linux/regulator/driver.h> -#include <linux/regulator/fan53555.h> #include <linux/regulator/machine.h> #include <linux/regulator/of_regulator.h> +#include <linux/of_device.h> +#include <linux/i2c.h> #include <linux/slab.h> +#include <linux/regmap.h> +#include <linux/regulator/fan53555.h> /* Voltage setting */ #define FAN53555_VSEL0 0x00
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c index 2f0bed8..f815330 100644 --- a/drivers/regulator/fixed.c +++ b/drivers/regulator/fixed.c
@@ -181,8 +181,8 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev) drvdata->enable_clock = devm_clk_get(dev, NULL); if (IS_ERR(drvdata->enable_clock)) { - dev_err(dev, "Can't get enable-clock from devicetree\n"); - return PTR_ERR(drvdata->enable_clock); + dev_err(dev, "Cant get enable-clock from devicetree\n"); + return -ENOENT; } } else { drvdata->desc.ops = &fixed_voltage_ops;
diff --git a/drivers/regulator/max77802-regulator.c b/drivers/regulator/max77802-regulator.c index 660e179..7b8ec8c 100644 --- a/drivers/regulator/max77802-regulator.c +++ b/drivers/regulator/max77802-regulator.c
@@ -95,11 +95,9 @@ static int max77802_set_suspend_disable(struct regulator_dev *rdev) { unsigned int val = MAX77802_OFF_PWRREQ; struct max77802_regulator_prv *max77802 = rdev_get_drvdata(rdev); - unsigned int id = rdev_get_id(rdev); + int id = rdev_get_id(rdev); int shift = max77802_get_opmode_shift(id); - if (WARN_ON_ONCE(id >= ARRAY_SIZE(max77802->opmode))) - return -EINVAL; max77802->opmode[id] = val; return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, rdev->desc->enable_mask, val << shift); @@ -113,7 +111,7 @@ static int max77802_set_suspend_disable(struct regulator_dev *rdev) static int max77802_set_mode(struct regulator_dev *rdev, unsigned int mode) { struct max77802_regulator_prv *max77802 = rdev_get_drvdata(rdev); - unsigned int id = rdev_get_id(rdev); + int id = rdev_get_id(rdev); unsigned int val; int shift = max77802_get_opmode_shift(id); @@ -130,9 +128,6 @@ static int max77802_set_mode(struct regulator_dev *rdev, unsigned int mode) return -EINVAL; } - if (WARN_ON_ONCE(id >= ARRAY_SIZE(max77802->opmode))) - return -EINVAL; - max77802->opmode[id] = val; return regmap_update_bits(rdev->regmap, rdev->desc->enable_reg, rdev->desc->enable_mask, val << shift); @@ -141,10 +136,8 @@ static int max77802_set_mode(struct regulator_dev *rdev, unsigned int mode) static unsigned max77802_get_mode(struct regulator_dev *rdev) { struct max77802_regulator_prv *max77802 = rdev_get_drvdata(rdev); - unsigned int id = rdev_get_id(rdev); + int id = rdev_get_id(rdev); - if (WARN_ON_ONCE(id >= ARRAY_SIZE(max77802->opmode))) - return -EINVAL; return max77802_map_mode(max77802->opmode[id]); } @@ -168,13 +161,10 @@ static int max77802_set_suspend_mode(struct regulator_dev *rdev, unsigned int mode) { struct max77802_regulator_prv *max77802 = rdev_get_drvdata(rdev); - unsigned int id = rdev_get_id(rdev); + int id = rdev_get_id(rdev); unsigned int val; int shift = max77802_get_opmode_shift(id); - if (WARN_ON_ONCE(id >= ARRAY_SIZE(max77802->opmode))) - return -EINVAL; - /* * If the regulator has been disabled for suspend * then is invalid to try setting a suspend mode. @@ -220,11 +210,9 @@ static int max77802_set_suspend_mode(struct regulator_dev *rdev, static int max77802_enable(struct regulator_dev *rdev) { struct max77802_regulator_prv *max77802 = rdev_get_drvdata(rdev); - unsigned int id = rdev_get_id(rdev); + int id = rdev_get_id(rdev); int shift = max77802_get_opmode_shift(id); - if (WARN_ON_ONCE(id >= ARRAY_SIZE(max77802->opmode))) - return -EINVAL; if (max77802->opmode[id] == MAX77802_OFF_PWRREQ) max77802->opmode[id] = MAX77802_OPMODE_NORMAL; @@ -553,7 +541,7 @@ static int max77802_pmic_probe(struct platform_device *pdev) for (i = 0; i < MAX77802_REG_MAX; i++) { struct regulator_dev *rdev; - unsigned int id = regulators[i].id; + int id = regulators[i].id; int shift = max77802_get_opmode_shift(id); int ret; @@ -571,12 +559,10 @@ static int max77802_pmic_probe(struct platform_device *pdev) * the hardware reports OFF as the regulator operating mode. * Default to operating mode NORMAL in that case. */ - if (id < ARRAY_SIZE(max77802->opmode)) { - if (val == MAX77802_STATUS_OFF) - max77802->opmode[id] = MAX77802_OPMODE_NORMAL; - else - max77802->opmode[id] = val; - } + if (val == MAX77802_STATUS_OFF) + max77802->opmode[id] = MAX77802_OPMODE_NORMAL; + else + max77802->opmode[id] = val; rdev = devm_regulator_register(&pdev->dev, ®ulators[i], &config);
diff --git a/drivers/regulator/of_regulator.c b/drivers/regulator/of_regulator.c index 7a0a235..87637eb 100644 --- a/drivers/regulator/of_regulator.c +++ b/drivers/regulator/of_regulator.c
@@ -206,12 +206,8 @@ static int of_get_regulation_constraints(struct device *dev, } suspend_np = of_get_child_by_name(np, regulator_states[i]); - if (!suspend_np) + if (!suspend_np || !suspend_state) continue; - if (!suspend_state) { - of_node_put(suspend_np); - continue; - } if (!of_property_read_u32(suspend_np, "regulator-mode", &pval)) {
diff --git a/drivers/regulator/pfuze100-regulator.c b/drivers/regulator/pfuze100-regulator.c index 1360994..f873d97 100644 --- a/drivers/regulator/pfuze100-regulator.c +++ b/drivers/regulator/pfuze100-regulator.c
@@ -788,7 +788,7 @@ static int pfuze100_regulator_probe(struct i2c_client *client, ((pfuze_chip->chip_id == PFUZE3000) ? "3000" : "3001")))); memcpy(pfuze_chip->regulator_descs, pfuze_chip->pfuze_regulators, - regulator_num * sizeof(struct pfuze_regulator)); + sizeof(pfuze_chip->regulator_descs)); ret = pfuze_parse_regulators_dt(pfuze_chip); if (ret)
diff --git a/drivers/regulator/qcom_rpm-regulator.c b/drivers/regulator/qcom_rpm-regulator.c index 84027e9..7407cd5 100644 --- a/drivers/regulator/qcom_rpm-regulator.c +++ b/drivers/regulator/qcom_rpm-regulator.c
@@ -812,12 +812,6 @@ static const struct rpm_regulator_data rpm_pm8018_regulators[] = { }; static const struct rpm_regulator_data rpm_pm8058_regulators[] = { - { "s0", QCOM_RPM_PM8058_SMPS0, &pm8058_smps, "vdd_s0" }, - { "s1", QCOM_RPM_PM8058_SMPS1, &pm8058_smps, "vdd_s1" }, - { "s2", QCOM_RPM_PM8058_SMPS2, &pm8058_smps, "vdd_s2" }, - { "s3", QCOM_RPM_PM8058_SMPS3, &pm8058_smps, "vdd_s3" }, - { "s4", QCOM_RPM_PM8058_SMPS4, &pm8058_smps, "vdd_s4" }, - { "l0", QCOM_RPM_PM8058_LDO0, &pm8058_nldo, "vdd_l0_l1_lvs" }, { "l1", QCOM_RPM_PM8058_LDO1, &pm8058_nldo, "vdd_l0_l1_lvs" }, { "l2", QCOM_RPM_PM8058_LDO2, &pm8058_pldo, "vdd_l2_l11_l12" }, @@ -845,6 +839,12 @@ static const struct rpm_regulator_data rpm_pm8058_regulators[] = { { "l24", QCOM_RPM_PM8058_LDO24, &pm8058_nldo, "vdd_l23_l24_l25" }, { "l25", QCOM_RPM_PM8058_LDO25, &pm8058_nldo, "vdd_l23_l24_l25" }, + { "s0", QCOM_RPM_PM8058_SMPS0, &pm8058_smps, "vdd_s0" }, + { "s1", QCOM_RPM_PM8058_SMPS1, &pm8058_smps, "vdd_s1" }, + { "s2", QCOM_RPM_PM8058_SMPS2, &pm8058_smps, "vdd_s2" }, + { "s3", QCOM_RPM_PM8058_SMPS3, &pm8058_smps, "vdd_s3" }, + { "s4", QCOM_RPM_PM8058_SMPS4, &pm8058_smps, "vdd_s4" }, + { "lvs0", QCOM_RPM_PM8058_LVS0, &pm8058_switch, "vdd_l0_l1_lvs" }, { "lvs1", QCOM_RPM_PM8058_LVS1, &pm8058_switch, "vdd_l0_l1_lvs" }, @@ -853,12 +853,6 @@ static const struct rpm_regulator_data rpm_pm8058_regulators[] = { }; static const struct rpm_regulator_data rpm_pm8901_regulators[] = { - { "s0", QCOM_RPM_PM8901_SMPS0, &pm8901_ftsmps, "vdd_s0" }, - { "s1", QCOM_RPM_PM8901_SMPS1, &pm8901_ftsmps, "vdd_s1" }, - { "s2", QCOM_RPM_PM8901_SMPS2, &pm8901_ftsmps, "vdd_s2" }, - { "s3", QCOM_RPM_PM8901_SMPS3, &pm8901_ftsmps, "vdd_s3" }, - { "s4", QCOM_RPM_PM8901_SMPS4, &pm8901_ftsmps, "vdd_s4" }, - { "l0", QCOM_RPM_PM8901_LDO0, &pm8901_nldo, "vdd_l0" }, { "l1", QCOM_RPM_PM8901_LDO1, &pm8901_pldo, "vdd_l1" }, { "l2", QCOM_RPM_PM8901_LDO2, &pm8901_pldo, "vdd_l2" }, @@ -867,6 +861,12 @@ static const struct rpm_regulator_data rpm_pm8901_regulators[] = { { "l5", QCOM_RPM_PM8901_LDO5, &pm8901_pldo, "vdd_l5" }, { "l6", QCOM_RPM_PM8901_LDO6, &pm8901_pldo, "vdd_l6" }, + { "s0", QCOM_RPM_PM8901_SMPS0, &pm8901_ftsmps, "vdd_s0" }, + { "s1", QCOM_RPM_PM8901_SMPS1, &pm8901_ftsmps, "vdd_s1" }, + { "s2", QCOM_RPM_PM8901_SMPS2, &pm8901_ftsmps, "vdd_s2" }, + { "s3", QCOM_RPM_PM8901_SMPS3, &pm8901_ftsmps, "vdd_s3" }, + { "s4", QCOM_RPM_PM8901_SMPS4, &pm8901_ftsmps, "vdd_s4" }, + { "lvs0", QCOM_RPM_PM8901_LVS0, &pm8901_switch, "lvs0_in" }, { "lvs1", QCOM_RPM_PM8901_LVS1, &pm8901_switch, "lvs1_in" }, { "lvs2", QCOM_RPM_PM8901_LVS2, &pm8901_switch, "lvs2_in" },
diff --git a/drivers/regulator/s5m8767.c b/drivers/regulator/s5m8767.c index 7ff4808..1e9f03a 100644 --- a/drivers/regulator/s5m8767.c +++ b/drivers/regulator/s5m8767.c
@@ -924,14 +924,10 @@ static int s5m8767_pmic_probe(struct platform_device *pdev) for (i = 0; i < pdata->num_regulators; i++) { const struct sec_voltage_desc *desc; - unsigned int id = pdata->regulators[i].id; + int id = pdata->regulators[i].id; int enable_reg, enable_val; struct regulator_dev *rdev; - BUILD_BUG_ON(ARRAY_SIZE(regulators) != ARRAY_SIZE(reg_voltage_map)); - if (WARN_ON_ONCE(id >= ARRAY_SIZE(regulators))) - continue; - desc = reg_voltage_map[id]; if (desc) { regulators[id].n_voltages =
diff --git a/drivers/regulator/slg51000-regulator.c b/drivers/regulator/slg51000-regulator.c index 5a18d7e..a0565da 100644 --- a/drivers/regulator/slg51000-regulator.c +++ b/drivers/regulator/slg51000-regulator.c
@@ -465,8 +465,6 @@ static int slg51000_i2c_probe(struct i2c_client *client, chip->cs_gpiod = cs_gpiod; } - usleep_range(10000, 11000); - i2c_set_clientdata(client, chip); chip->chip_irq = client->irq; chip->dev = dev;
diff --git a/drivers/regulator/twl6030-regulator.c b/drivers/regulator/twl6030-regulator.c index 71625db..b8100c3 100644 --- a/drivers/regulator/twl6030-regulator.c +++ b/drivers/regulator/twl6030-regulator.c
@@ -67,7 +67,6 @@ struct twlreg_info { #define TWL6030_CFG_STATE_SLEEP 0x03 #define TWL6030_CFG_STATE_GRP_SHIFT 5 #define TWL6030_CFG_STATE_APP_SHIFT 2 -#define TWL6030_CFG_STATE_MASK 0x03 #define TWL6030_CFG_STATE_APP_MASK (0x03 << TWL6030_CFG_STATE_APP_SHIFT) #define TWL6030_CFG_STATE_APP(v) (((v) & TWL6030_CFG_STATE_APP_MASK) >>\ TWL6030_CFG_STATE_APP_SHIFT) @@ -129,14 +128,13 @@ static int twl6030reg_is_enabled(struct regulator_dev *rdev) if (grp < 0) return grp; grp &= P1_GRP_6030; - val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE); - val = TWL6030_CFG_STATE_APP(val); } else { - val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE); - val &= TWL6030_CFG_STATE_MASK; grp = 1; } + val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE); + val = TWL6030_CFG_STATE_APP(val); + return grp && (val == TWL6030_CFG_STATE_ON); } @@ -189,12 +187,7 @@ static int twl6030reg_get_status(struct regulator_dev *rdev) val = twlreg_read(info, TWL_MODULE_PM_RECEIVER, VREG_STATE); - if (info->features & TWL6032_SUBCLASS) - val &= TWL6030_CFG_STATE_MASK; - else - val = TWL6030_CFG_STATE_APP(val); - - switch (val) { + switch (TWL6030_CFG_STATE_APP(val)) { case TWL6030_CFG_STATE_ON: return REGULATOR_STATUS_NORMAL; @@ -537,7 +530,6 @@ static const struct twlreg_info TWL6030_INFO_##label = { \ #define TWL6032_ADJUSTABLE_LDO(label, offset) \ static const struct twlreg_info TWL6032_INFO_##label = { \ .base = offset, \ - .features = TWL6032_SUBCLASS, \ .desc = { \ .name = #label, \ .id = TWL6032_REG_##label, \ @@ -570,7 +562,6 @@ static const struct twlreg_info TWLFIXED_INFO_##label = { \ #define TWL6032_ADJUSTABLE_SMPS(label, offset) \ static const struct twlreg_info TWLSMPS_INFO_##label = { \ .base = offset, \ - .features = TWL6032_SUBCLASS, \ .desc = { \ .name = #label, \ .id = TWL6032_REG_##label, \
diff --git a/drivers/remoteproc/qcom_q6v5_mss.c b/drivers/remoteproc/qcom_q6v5_mss.c index 49faa90..5e54e6f 100644 --- a/drivers/remoteproc/qcom_q6v5_mss.c +++ b/drivers/remoteproc/qcom_q6v5_mss.c
@@ -16,7 +16,6 @@ #include <linux/module.h> #include <linux/of_address.h> #include <linux/of_device.h> -#include <linux/of_reserved_mem.h> #include <linux/platform_device.h> #include <linux/pm_domain.h> #include <linux/pm_runtime.h> @@ -176,9 +175,6 @@ struct q6v5 { void *mba_region; size_t mba_size; - phys_addr_t mdata_phys; - size_t mdata_size; - phys_addr_t mpss_phys; phys_addr_t mpss_reloc; void *mpss_region; @@ -683,35 +679,15 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw) if (IS_ERR(metadata)) return PTR_ERR(metadata); - if (qproc->mdata_phys) { - if (size > qproc->mdata_size) { - ret = -EINVAL; - dev_err(qproc->dev, "metadata size outside memory range\n"); - goto free_metadata; - } - - phys = qproc->mdata_phys; - ptr = memremap(qproc->mdata_phys, size, MEMREMAP_WC); - if (!ptr) { - ret = -EBUSY; - dev_err(qproc->dev, "unable to map memory region: %pa+%zx\n", - &qproc->mdata_phys, size); - goto free_metadata; - } - } else { - ptr = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); - if (!ptr) { - ret = -ENOMEM; - dev_err(qproc->dev, "failed to allocate mdt buffer\n"); - goto free_metadata; - } + ptr = dma_alloc_attrs(qproc->dev, size, &phys, GFP_KERNEL, dma_attrs); + if (!ptr) { + kfree(metadata); + dev_err(qproc->dev, "failed to allocate mdt buffer\n"); + return -ENOMEM; } memcpy(ptr, metadata, size); - if (qproc->mdata_phys) - memunmap(ptr); - /* Hypervisor mapping to access metadata by modem */ mdata_perm = BIT(QCOM_SCM_VMID_HLOS); ret = q6v5_xfer_mem_ownership(qproc, &mdata_perm, true, phys, size); @@ -738,9 +714,7 @@ static int q6v5_mpss_init_image(struct q6v5 *qproc, const struct firmware *fw) "mdt buffer not reclaimed system may become unstable\n"); free_dma_attrs: - if (!qproc->mdata_phys) - dma_free_attrs(qproc->dev, size, ptr, phys, dma_attrs); -free_metadata: + dma_free_attrs(qproc->dev, size, ptr, phys, dma_attrs); kfree(metadata); return ret < 0 ? ret : 0; @@ -1409,7 +1383,6 @@ static int q6v5_init_reset(struct q6v5 *qproc) static int q6v5_alloc_memory_region(struct q6v5 *qproc) { struct device_node *child; - struct reserved_mem *rmem; struct device_node *node; struct resource r; int ret; @@ -1444,26 +1417,6 @@ static int q6v5_alloc_memory_region(struct q6v5 *qproc) qproc->mpss_phys = qproc->mpss_reloc = r.start; qproc->mpss_size = resource_size(&r); - if (!child) { - node = of_parse_phandle(qproc->dev->of_node, "memory-region", 2); - } else { - child = of_get_child_by_name(qproc->dev->of_node, "metadata"); - node = of_parse_phandle(child, "memory-region", 0); - of_node_put(child); - } - - if (!node) - return 0; - - rmem = of_reserved_mem_lookup(node); - if (!rmem) { - dev_err(qproc->dev, "unable to resolve metadata region\n"); - return -EINVAL; - } - - qproc->mdata_phys = rmem->base; - qproc->mdata_size = rmem->size; - return 0; }
diff --git a/drivers/remoteproc/qcom_q6v5_pas.c b/drivers/remoteproc/qcom_q6v5_pas.c index d48f4b5..db4b3c4 100644 --- a/drivers/remoteproc/qcom_q6v5_pas.c +++ b/drivers/remoteproc/qcom_q6v5_pas.c
@@ -230,7 +230,6 @@ static int adsp_alloc_memory_region(struct qcom_adsp *adsp) } ret = of_address_to_resource(node, 0, &r); - of_node_put(node); if (ret) return ret;
diff --git a/drivers/remoteproc/qcom_sysmon.c b/drivers/remoteproc/qcom_sysmon.c index b7d0c35..c231314 100644 --- a/drivers/remoteproc/qcom_sysmon.c +++ b/drivers/remoteproc/qcom_sysmon.c
@@ -518,9 +518,7 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc, if (sysmon->shutdown_irq != -ENODATA) { dev_err(sysmon->dev, "failed to retrieve shutdown-ack IRQ\n"); - ret = sysmon->shutdown_irq; - kfree(sysmon); - return ERR_PTR(ret); + return ERR_PTR(sysmon->shutdown_irq); } } else { ret = devm_request_threaded_irq(sysmon->dev, @@ -531,7 +529,6 @@ struct qcom_sysmon *qcom_add_sysmon_subdev(struct rproc *rproc, if (ret) { dev_err(sysmon->dev, "failed to acquire shutdown-ack IRQ\n"); - kfree(sysmon); return ERR_PTR(ret); } }
diff --git a/drivers/remoteproc/qcom_wcnss.c b/drivers/remoteproc/qcom_wcnss.c index 18431ac..c72f1b3 100644 --- a/drivers/remoteproc/qcom_wcnss.c +++ b/drivers/remoteproc/qcom_wcnss.c
@@ -407,7 +407,6 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss, irq_handler_t thread_fn) { int ret; - int irq_number; ret = platform_get_irq_byname(pdev, name); if (ret < 0 && optional) { @@ -418,19 +417,14 @@ static int wcnss_request_irq(struct qcom_wcnss *wcnss, return ret; } - irq_number = ret; - ret = devm_request_threaded_irq(&pdev->dev, ret, NULL, thread_fn, IRQF_TRIGGER_RISING | IRQF_ONESHOT, "wcnss", wcnss); - if (ret) { + if (ret) dev_err(&pdev->dev, "request %s IRQ failed\n", name); - return ret; - } - /* Return the IRQ number if the IRQ was successfully acquired */ - return irq_number; + return ret; } static int wcnss_alloc_memory_region(struct qcom_wcnss *wcnss)
diff --git a/drivers/rpmsg/qcom_glink_native.c b/drivers/rpmsg/qcom_glink_native.c index 11ba44d..0f10b3f 100644 --- a/drivers/rpmsg/qcom_glink_native.c +++ b/drivers/rpmsg/qcom_glink_native.c
@@ -929,7 +929,6 @@ static void qcom_glink_handle_intent(struct qcom_glink *glink, spin_unlock_irqrestore(&glink->idr_lock, flags); if (!channel) { dev_err(glink->dev, "intents for non-existing channel\n"); - qcom_glink_rx_advance(glink, ALIGN(msglen, 8)); return; } @@ -1473,7 +1472,7 @@ static void qcom_glink_rx_close(struct qcom_glink *glink, unsigned int rcid) cancel_work_sync(&channel->intent_work); if (channel->rpdev) { - strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); + strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY;
diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c index b5167ef..a4db9f6 100644 --- a/drivers/rpmsg/qcom_smd.c +++ b/drivers/rpmsg/qcom_smd.c
@@ -1073,7 +1073,7 @@ static int qcom_smd_create_device(struct qcom_smd_channel *channel) /* Assign public information to the rpmsg_device */ rpdev = &qsdev->rpdev; - strscpy_pad(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); + strncpy(rpdev->id.name, channel->name, RPMSG_NAME_SIZE); rpdev->src = RPMSG_ADDR_ANY; rpdev->dst = RPMSG_ADDR_ANY; @@ -1304,7 +1304,7 @@ static void qcom_channel_state_worker(struct work_struct *work) spin_unlock_irqrestore(&edge->channels_lock, flags); - strscpy_pad(chinfo.name, channel->name, sizeof(chinfo.name)); + strncpy(chinfo.name, channel->name, sizeof(chinfo.name)); chinfo.src = RPMSG_ADDR_ANY; chinfo.dst = RPMSG_ADDR_ANY; rpmsg_unregister_device(&edge->dev, &chinfo); @@ -1364,7 +1364,6 @@ static int qcom_smd_parse_edge(struct device *dev, } edge->ipc_regmap = syscon_node_to_regmap(syscon_np); - of_node_put(syscon_np); if (IS_ERR(edge->ipc_regmap)) { ret = PTR_ERR(edge->ipc_regmap); goto put_node;
diff --git a/drivers/rtc/rtc-mxc_v2.c b/drivers/rtc/rtc-mxc_v2.c index 48595b0..d349cef 100644 --- a/drivers/rtc/rtc-mxc_v2.c +++ b/drivers/rtc/rtc-mxc_v2.c
@@ -337,10 +337,8 @@ static int mxc_rtc_probe(struct platform_device *pdev) } pdata->rtc = devm_rtc_allocate_device(&pdev->dev); - if (IS_ERR(pdata->rtc)) { - clk_disable_unprepare(pdata->clk); + if (IS_ERR(pdata->rtc)) return PTR_ERR(pdata->rtc); - } pdata->rtc->ops = &mxc_rtc_ops; pdata->rtc->range_max = U32_MAX;
diff --git a/drivers/rtc/rtc-pcf85063.c b/drivers/rtc/rtc-pcf85063.c index 3e7ea52..1afa6d9 100644 --- a/drivers/rtc/rtc-pcf85063.c +++ b/drivers/rtc/rtc-pcf85063.c
@@ -159,10 +159,10 @@ static int pcf85063_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm) if (ret) return ret; - alrm->time.tm_sec = bcd2bin(buf[0] & 0x7f); - alrm->time.tm_min = bcd2bin(buf[1] & 0x7f); - alrm->time.tm_hour = bcd2bin(buf[2] & 0x3f); - alrm->time.tm_mday = bcd2bin(buf[3] & 0x3f); + alrm->time.tm_sec = bcd2bin(buf[0]); + alrm->time.tm_min = bcd2bin(buf[1]); + alrm->time.tm_hour = bcd2bin(buf[2]); + alrm->time.tm_mday = bcd2bin(buf[3]); ret = regmap_read(pcf85063->regmap, PCF85063_REG_CTRL2, &val); if (ret)
diff --git a/drivers/rtc/rtc-pic32.c b/drivers/rtc/rtc-pic32.c index 40f2936..17653ed 100644 --- a/drivers/rtc/rtc-pic32.c +++ b/drivers/rtc/rtc-pic32.c
@@ -326,16 +326,16 @@ static int pic32_rtc_probe(struct platform_device *pdev) spin_lock_init(&pdata->alarm_lock); - pdata->rtc = devm_rtc_allocate_device(&pdev->dev); - if (IS_ERR(pdata->rtc)) - return PTR_ERR(pdata->rtc); - clk_prepare_enable(pdata->clk); pic32_rtc_enable(pdata, 1); device_init_wakeup(&pdev->dev, 1); + pdata->rtc = devm_rtc_allocate_device(&pdev->dev); + if (IS_ERR(pdata->rtc)) + return PTR_ERR(pdata->rtc); + pdata->rtc->ops = &pic32_rtcops; pdata->rtc->range_min = RTC_TIMESTAMP_BEGIN_2000; pdata->rtc->range_max = RTC_TIMESTAMP_END_2099;
diff --git a/drivers/rtc/rtc-pm8xxx.c b/drivers/rtc/rtc-pm8xxx.c index c22a795..f5a30e0 100644 --- a/drivers/rtc/rtc-pm8xxx.c +++ b/drivers/rtc/rtc-pm8xxx.c
@@ -219,6 +219,7 @@ static int pm8xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) { int rc, i; u8 value[NUM_8_BIT_RTC_REGS]; + unsigned int ctrl_reg; unsigned long secs, irq_flags; struct pm8xxx_rtc *rtc_dd = dev_get_drvdata(dev); const struct pm8xxx_rtc_regs *regs = rtc_dd->regs; @@ -230,11 +231,6 @@ static int pm8xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) secs >>= 8; } - rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl, - regs->alarm_en, 0); - if (rc) - return rc; - spin_lock_irqsave(&rtc_dd->ctrl_reg_lock, irq_flags); rc = regmap_bulk_write(rtc_dd->regmap, regs->alarm_rw, value, @@ -244,11 +240,19 @@ static int pm8xxx_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alarm) goto rtc_rw_fail; } - if (alarm->enabled) { - rc = regmap_update_bits(rtc_dd->regmap, regs->alarm_ctrl, - regs->alarm_en, regs->alarm_en); - if (rc) - goto rtc_rw_fail; + rc = regmap_read(rtc_dd->regmap, regs->alarm_ctrl, &ctrl_reg); + if (rc) + goto rtc_rw_fail; + + if (alarm->enabled) + ctrl_reg |= regs->alarm_en; + else + ctrl_reg &= ~regs->alarm_en; + + rc = regmap_write(rtc_dd->regmap, regs->alarm_ctrl, ctrl_reg); + if (rc) { + dev_err(dev, "Write to RTC alarm control register failed\n"); + goto rtc_rw_fail; } dev_dbg(dev, "Alarm Set for h:m:s=%ptRt, y-m-d=%ptRdr\n",
diff --git a/drivers/rtc/rtc-snvs.c b/drivers/rtc/rtc-snvs.c index 0f1e544..757f4da 100644 --- a/drivers/rtc/rtc-snvs.c +++ b/drivers/rtc/rtc-snvs.c
@@ -33,14 +33,6 @@ #define SNVS_LPPGDR_INIT 0x41736166 #define CNTR_TO_SECS_SH 15 -/* The maximum RTC clock cycles that are allowed to pass between two - * consecutive clock counter register reads. If the values are corrupted a - * bigger difference is expected. The RTC frequency is 32kHz. With 320 cycles - * we end at 10ms which should be enough for most cases. If it once takes - * longer than expected we do a retry. - */ -#define MAX_RTC_READ_DIFF_CYCLES 320 - struct snvs_rtc_data { struct rtc_device *rtc; struct regmap *regmap; @@ -65,7 +57,6 @@ static u64 rtc_read_lpsrt(struct snvs_rtc_data *data) static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) { u64 read1, read2; - s64 diff; unsigned int timeout = 100; /* As expected, the registers might update between the read of the LSB @@ -76,8 +67,7 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) do { read2 = read1; read1 = rtc_read_lpsrt(data); - diff = read1 - read2; - } while (((diff < 0) || (diff > MAX_RTC_READ_DIFF_CYCLES)) && --timeout); + } while (read1 != read2 && --timeout); if (!timeout) dev_err(&data->rtc->dev, "Timeout trying to get valid LPSRT Counter read\n"); @@ -89,15 +79,13 @@ static u32 rtc_read_lp_counter(struct snvs_rtc_data *data) static int rtc_read_lp_counter_lsb(struct snvs_rtc_data *data, u32 *lsb) { u32 count1, count2; - s32 diff; unsigned int timeout = 100; regmap_read(data->regmap, data->offset + SNVS_LPSRTCLR, &count1); do { count2 = count1; regmap_read(data->regmap, data->offset + SNVS_LPSRTCLR, &count1); - diff = count1 - count2; - } while (((diff < 0) || (diff > MAX_RTC_READ_DIFF_CYCLES)) && --timeout); + } while (count1 != count2 && --timeout); if (!timeout) { dev_err(&data->rtc->dev, "Timeout trying to get valid LPSRT Counter read\n"); return -ETIMEDOUT;
diff --git a/drivers/rtc/rtc-st-lpc.c b/drivers/rtc/rtc-st-lpc.c index 27261b0..49474a3 100644 --- a/drivers/rtc/rtc-st-lpc.c +++ b/drivers/rtc/rtc-st-lpc.c
@@ -241,7 +241,6 @@ static int st_rtc_probe(struct platform_device *pdev) rtc->clkrate = clk_get_rate(rtc->clk); if (!rtc->clkrate) { - clk_disable_unprepare(rtc->clk); dev_err(&pdev->dev, "Unable to fetch clock rate\n"); return -EINVAL; }
diff --git a/drivers/rtc/rtc-sun6i.c b/drivers/rtc/rtc-sun6i.c index 5bef414..c41bc80 100644 --- a/drivers/rtc/rtc-sun6i.c +++ b/drivers/rtc/rtc-sun6i.c
@@ -129,6 +129,7 @@ struct sun6i_rtc_clk_data { unsigned int fixed_prescaler : 16; unsigned int has_prescaler : 1; unsigned int has_out_clk : 1; + unsigned int export_iosc : 1; unsigned int has_losc_en : 1; unsigned int has_auto_swt : 1; }; @@ -250,19 +251,23 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, writel(reg, rtc->base + SUN6I_LOSC_CTRL); } - /* Switch to the external, more precise, oscillator, if present */ - if (of_get_property(node, "clocks", NULL)) { - reg |= SUN6I_LOSC_CTRL_EXT_OSC; - if (rtc->data->has_losc_en) - reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN; - } + /* Switch to the external, more precise, oscillator */ + reg |= SUN6I_LOSC_CTRL_EXT_OSC; + if (rtc->data->has_losc_en) + reg |= SUN6I_LOSC_CTRL_EXT_LOSC_EN; writel(reg, rtc->base + SUN6I_LOSC_CTRL); /* Yes, I know, this is ugly. */ sun6i_rtc = rtc; - of_property_read_string_index(node, "clock-output-names", 2, - &iosc_name); + /* Deal with old DTs */ + if (!of_get_property(node, "clocks", NULL)) + goto err; + + /* Only read IOSC name from device tree if it is exported */ + if (rtc->data->export_iosc) + of_property_read_string_index(node, "clock-output-names", 2, + &iosc_name); rtc->int_osc = clk_hw_register_fixed_rate_with_accuracy(NULL, iosc_name, @@ -275,13 +280,11 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, } parents[0] = clk_hw_get_name(rtc->int_osc); - /* If there is no external oscillator, this will be NULL and ... */ parents[1] = of_clk_get_parent_name(node, 0); rtc->hw.init = &init; init.parent_names = parents; - /* ... number of clock parents will be 1. */ init.num_parents = of_clk_get_parent_count(node) + 1; of_property_read_string_index(node, "clock-output-names", 0, &init.name); @@ -303,10 +306,13 @@ static void __init sun6i_rtc_clk_init(struct device_node *node, goto err_register; } - clk_data->num = 3; + clk_data->num = 2; clk_data->hws[0] = &rtc->hw; clk_data->hws[1] = __clk_get_hw(rtc->ext_losc); - clk_data->hws[2] = rtc->int_osc; + if (rtc->data->export_iosc) { + clk_data->hws[2] = rtc->int_osc; + clk_data->num = 3; + } of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); return; @@ -346,6 +352,7 @@ static const struct sun6i_rtc_clk_data sun8i_h3_rtc_data = { .fixed_prescaler = 32, .has_prescaler = 1, .has_out_clk = 1, + .export_iosc = 1, }; static void __init sun8i_h3_rtc_clk_init(struct device_node *node) @@ -363,6 +370,7 @@ static const struct sun6i_rtc_clk_data sun50i_h6_rtc_data = { .fixed_prescaler = 32, .has_prescaler = 1, .has_out_clk = 1, + .export_iosc = 1, .has_losc_en = 1, .has_auto_swt = 1, };
diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c index 3362f23..e0570cd 100644 --- a/drivers/s390/block/dasd.c +++ b/drivers/s390/block/dasd.c
@@ -2128,8 +2128,8 @@ static void __dasd_device_check_path_events(struct dasd_device *device) if (device->stopped & ~(DASD_STOPPED_DC_WAIT | DASD_UNRESUMED_PM)) return; - rc = device->discipline->pe_handler(device, - dasd_path_get_tbvpm(device)); + rc = device->discipline->verify_path(device, + dasd_path_get_tbvpm(device)); if (rc) dasd_device_set_timer(device, 50); else
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c index b6b938a..dc78a52 100644 --- a/drivers/s390/block/dasd_alias.c +++ b/drivers/s390/block/dasd_alias.c
@@ -675,12 +675,12 @@ int dasd_alias_remove_device(struct dasd_device *device) struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device) { struct dasd_eckd_private *alias_priv, *private = base_device->private; + struct alias_pav_group *group = private->pavgroup; struct alias_lcu *lcu = private->lcu; struct dasd_device *alias_device; - struct alias_pav_group *group; unsigned long flags; - if (!lcu) + if (!group || !lcu) return NULL; if (lcu->pav == NO_PAV || lcu->flags & (NEED_UAC_UPDATE | UPDATE_PENDING)) @@ -697,11 +697,6 @@ struct dasd_device *dasd_alias_get_start_dev(struct dasd_device *base_device) } spin_lock_irqsave(&lcu->lock, flags); - group = private->pavgroup; - if (!group) { - spin_unlock_irqrestore(&lcu->lock, flags); - return NULL; - } alias_device = group->next; if (!alias_device) { if (list_empty(&group->aliaslist)) {
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c index f029884..f7ae03f 100644 --- a/drivers/s390/block/dasd_diag.c +++ b/drivers/s390/block/dasd_diag.c
@@ -644,17 +644,12 @@ static void dasd_diag_setup_blk_queue(struct dasd_block *block) blk_queue_segment_boundary(q, PAGE_SIZE - 1); } -static int dasd_diag_pe_handler(struct dasd_device *device, __u8 tbvpm) -{ - return dasd_generic_verify_path(device, tbvpm); -} - static struct dasd_discipline dasd_diag_discipline = { .owner = THIS_MODULE, .name = "DIAG", .ebcname = "DIAG", .check_device = dasd_diag_check_device, - .pe_handler = dasd_diag_pe_handler, + .verify_path = dasd_generic_verify_path, .fill_geometry = dasd_diag_fill_geometry, .setup_blk_queue = dasd_diag_setup_blk_queue, .start_IO = dasd_start_diag,
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c index c6930c1..7749deb 100644 --- a/drivers/s390/block/dasd_eckd.c +++ b/drivers/s390/block/dasd_eckd.c
@@ -103,7 +103,7 @@ struct ext_pool_exhaust_work_data { }; /* definitions for the path verification worker */ -struct pe_handler_work_data { +struct path_verification_work_data { struct work_struct worker; struct dasd_device *device; struct dasd_ccw_req cqr; @@ -112,8 +112,8 @@ struct pe_handler_work_data { int isglobal; __u8 tbvpm; }; -static struct pe_handler_work_data *pe_handler_worker; -static DEFINE_MUTEX(dasd_pe_handler_mutex); +static struct path_verification_work_data *path_verification_worker; +static DEFINE_MUTEX(dasd_path_verification_mutex); struct check_attention_work_data { struct work_struct worker; @@ -1219,7 +1219,7 @@ static int verify_fcx_max_data(struct dasd_device *device, __u8 lpm) } static int rebuild_device_uid(struct dasd_device *device, - struct pe_handler_work_data *data) + struct path_verification_work_data *data) { struct dasd_eckd_private *private = device->private; __u8 lpm, opm = dasd_path_get_opm(device); @@ -1257,9 +1257,10 @@ static int rebuild_device_uid(struct dasd_device *device, return rc; } -static void dasd_eckd_path_available_action(struct dasd_device *device, - struct pe_handler_work_data *data) +static void do_path_verification_work(struct work_struct *work) { + struct path_verification_work_data *data; + struct dasd_device *device; struct dasd_eckd_private path_private; struct dasd_uid *uid; __u8 path_rcd_buf[DASD_ECKD_RCD_DATA_SIZE]; @@ -1268,6 +1269,19 @@ static void dasd_eckd_path_available_action(struct dasd_device *device, char print_uid[60]; int rc; + data = container_of(work, struct path_verification_work_data, worker); + device = data->device; + + /* delay path verification until device was resumed */ + if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) { + schedule_work(work); + return; + } + /* check if path verification already running and delay if so */ + if (test_and_set_bit(DASD_FLAG_PATH_VERIFY, &device->flags)) { + schedule_work(work); + return; + } opm = 0; npm = 0; ppm = 0; @@ -1404,54 +1418,30 @@ static void dasd_eckd_path_available_action(struct dasd_device *device, dasd_path_add_nohpfpm(device, hpfpm); spin_unlock_irqrestore(get_ccwdev_lock(device->cdev), flags); } -} - -static void do_pe_handler_work(struct work_struct *work) -{ - struct pe_handler_work_data *data; - struct dasd_device *device; - - data = container_of(work, struct pe_handler_work_data, worker); - device = data->device; - - /* delay path verification until device was resumed */ - if (test_bit(DASD_FLAG_SUSPENDED, &device->flags)) { - schedule_work(work); - return; - } - /* check if path verification already running and delay if so */ - if (test_and_set_bit(DASD_FLAG_PATH_VERIFY, &device->flags)) { - schedule_work(work); - return; - } - - dasd_eckd_path_available_action(device, data); - clear_bit(DASD_FLAG_PATH_VERIFY, &device->flags); dasd_put_device(device); if (data->isglobal) - mutex_unlock(&dasd_pe_handler_mutex); + mutex_unlock(&dasd_path_verification_mutex); else kfree(data); } -static int dasd_eckd_pe_handler(struct dasd_device *device, __u8 lpm) +static int dasd_eckd_verify_path(struct dasd_device *device, __u8 lpm) { - struct pe_handler_work_data *data; + struct path_verification_work_data *data; data = kmalloc(sizeof(*data), GFP_ATOMIC | GFP_DMA); if (!data) { - if (mutex_trylock(&dasd_pe_handler_mutex)) { - data = pe_handler_worker; + if (mutex_trylock(&dasd_path_verification_mutex)) { + data = path_verification_worker; data->isglobal = 1; - } else { + } else return -ENOMEM; - } } else { memset(data, 0, sizeof(*data)); data->isglobal = 0; } - INIT_WORK(&data->worker, do_pe_handler_work); + INIT_WORK(&data->worker, do_path_verification_work); dasd_get_device(device); data->device = device; data->tbvpm = lpm; @@ -4637,6 +4627,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, struct dasd_device *basedev; struct req_iterator iter; struct dasd_ccw_req *cqr; + unsigned int first_offs; unsigned int trkcount; unsigned long *idaws; unsigned int size; @@ -4670,6 +4661,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, last_trk = (blk_rq_pos(req) + blk_rq_sectors(req) - 1) / DASD_RAW_SECTORS_PER_TRACK; trkcount = last_trk - first_trk + 1; + first_offs = 0; if (rq_data_dir(req) == READ) cmd = DASD_ECKD_CCW_READ_TRACK; @@ -4713,13 +4705,13 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_raw(struct dasd_device *startdev, if (use_prefix) { prefix_LRE(ccw++, data, first_trk, last_trk, cmd, basedev, - startdev, 1, 0, trkcount, 0, 0); + startdev, 1, first_offs + 1, trkcount, 0, 0); } else { define_extent(ccw++, data, first_trk, last_trk, cmd, basedev, 0); ccw[-1].flags |= CCW_FLAG_CC; data += sizeof(struct DE_eckd_data); - locate_record_ext(ccw++, data, first_trk, 0, + locate_record_ext(ccw++, data, first_trk, first_offs + 1, trkcount, cmd, basedev, 0, 0); } @@ -6704,7 +6696,7 @@ static struct dasd_discipline dasd_eckd_discipline = { .check_device = dasd_eckd_check_characteristics, .uncheck_device = dasd_eckd_uncheck_device, .do_analysis = dasd_eckd_do_analysis, - .pe_handler = dasd_eckd_pe_handler, + .verify_path = dasd_eckd_verify_path, .basic_to_ready = dasd_eckd_basic_to_ready, .online_to_ready = dasd_eckd_online_to_ready, .basic_to_known = dasd_eckd_basic_to_known, @@ -6763,20 +6755,18 @@ dasd_eckd_init(void) return -ENOMEM; dasd_vol_info_req = kmalloc(sizeof(*dasd_vol_info_req), GFP_KERNEL | GFP_DMA); - if (!dasd_vol_info_req) { - kfree(dasd_reserve_req); + if (!dasd_vol_info_req) return -ENOMEM; - } - pe_handler_worker = kmalloc(sizeof(*pe_handler_worker), - GFP_KERNEL | GFP_DMA); - if (!pe_handler_worker) { + path_verification_worker = kmalloc(sizeof(*path_verification_worker), + GFP_KERNEL | GFP_DMA); + if (!path_verification_worker) { kfree(dasd_reserve_req); kfree(dasd_vol_info_req); return -ENOMEM; } rawpadpage = (void *)__get_free_page(GFP_KERNEL); if (!rawpadpage) { - kfree(pe_handler_worker); + kfree(path_verification_worker); kfree(dasd_reserve_req); kfree(dasd_vol_info_req); return -ENOMEM; @@ -6785,7 +6775,7 @@ dasd_eckd_init(void) if (!ret) wait_for_device_probe(); else { - kfree(pe_handler_worker); + kfree(path_verification_worker); kfree(dasd_reserve_req); kfree(dasd_vol_info_req); free_page((unsigned long)rawpadpage); @@ -6797,7 +6787,7 @@ static void __exit dasd_eckd_cleanup(void) { ccw_driver_unregister(&dasd_eckd_driver); - kfree(pe_handler_worker); + kfree(path_verification_worker); kfree(dasd_reserve_req); free_page((unsigned long)rawpadpage); }
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c index b159575..1a44e32 100644 --- a/drivers/s390/block/dasd_fba.c +++ b/drivers/s390/block/dasd_fba.c
@@ -803,18 +803,13 @@ static void dasd_fba_setup_blk_queue(struct dasd_block *block) blk_queue_flag_set(QUEUE_FLAG_DISCARD, q); } -static int dasd_fba_pe_handler(struct dasd_device *device, __u8 tbvpm) -{ - return dasd_generic_verify_path(device, tbvpm); -} - static struct dasd_discipline dasd_fba_discipline = { .owner = THIS_MODULE, .name = "FBA ", .ebcname = "FBA ", .check_device = dasd_fba_check_characteristics, .do_analysis = dasd_fba_do_analysis, - .pe_handler = dasd_fba_pe_handler, + .verify_path = dasd_generic_verify_path, .setup_blk_queue = dasd_fba_setup_blk_queue, .fill_geometry = dasd_fba_fill_geometry, .start_IO = dasd_start_IO,
diff --git a/drivers/s390/block/dasd_int.h b/drivers/s390/block/dasd_int.h index 5d7d35ca..9d9685c 100644 --- a/drivers/s390/block/dasd_int.h +++ b/drivers/s390/block/dasd_int.h
@@ -298,7 +298,7 @@ struct dasd_discipline { * e.g. verify that new path is compatible with the current * configuration. */ - int (*pe_handler)(struct dasd_device *, __u8); + int (*verify_path)(struct dasd_device *, __u8); /* * Last things to do when a device is set online, and first things
diff --git a/drivers/s390/char/zcore.c b/drivers/s390/char/zcore.c index c9d1725..08f8124 100644 --- a/drivers/s390/char/zcore.c +++ b/drivers/s390/char/zcore.c
@@ -53,7 +53,6 @@ static struct dentry *zcore_reipl_file; static struct dentry *zcore_hsa_file; static struct ipl_parameter_block *zcore_ipl_block; -static DEFINE_MUTEX(hsa_buf_mutex); static char hsa_buf[PAGE_SIZE] __aligned(PAGE_SIZE); /* @@ -70,24 +69,19 @@ int memcpy_hsa_user(void __user *dest, unsigned long src, size_t count) if (!hsa_available) return -ENODATA; - mutex_lock(&hsa_buf_mutex); while (count) { if (sclp_sdias_copy(hsa_buf, src / PAGE_SIZE + 2, 1)) { TRACE("sclp_sdias_copy() failed\n"); - mutex_unlock(&hsa_buf_mutex); return -EIO; } offset = src % PAGE_SIZE; bytes = min(PAGE_SIZE - offset, count); - if (copy_to_user(dest, hsa_buf + offset, bytes)) { - mutex_unlock(&hsa_buf_mutex); + if (copy_to_user(dest, hsa_buf + offset, bytes)) return -EFAULT; - } src += bytes; dest += bytes; count -= bytes; } - mutex_unlock(&hsa_buf_mutex); return 0; } @@ -105,11 +99,9 @@ int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count) if (!hsa_available) return -ENODATA; - mutex_lock(&hsa_buf_mutex); while (count) { if (sclp_sdias_copy(hsa_buf, src / PAGE_SIZE + 2, 1)) { TRACE("sclp_sdias_copy() failed\n"); - mutex_unlock(&hsa_buf_mutex); return -EIO; } offset = src % PAGE_SIZE; @@ -119,7 +111,6 @@ int memcpy_hsa_kernel(void *dest, unsigned long src, size_t count) dest += bytes; count -= bytes; } - mutex_unlock(&hsa_buf_mutex); return 0; }
diff --git a/drivers/s390/cio/vfio_ccw_drv.c b/drivers/s390/cio/vfio_ccw_drv.c index d42e5a3..fd590d1 100644 --- a/drivers/s390/cio/vfio_ccw_drv.c +++ b/drivers/s390/cio/vfio_ccw_drv.c
@@ -247,10 +247,18 @@ static int vfio_ccw_sch_event(struct subchannel *sch, int process) if (work_pending(&sch->todo_work)) goto out_unlock; - rc = 0; - - if (cio_update_schib(sch)) + if (cio_update_schib(sch)) { vfio_ccw_fsm_event(private, VFIO_CCW_EVENT_NOT_OPER); + rc = 0; + goto out_unlock; + } + + private = dev_get_drvdata(&sch->dev); + if (private->state == VFIO_CCW_STATE_NOT_OPER) { + private->state = private->mdev ? VFIO_CCW_STATE_IDLE : + VFIO_CCW_STATE_STANDBY; + } + rc = 0; out_unlock: spin_unlock_irqrestore(sch->lock, flags);
diff --git a/drivers/s390/crypto/ap_bus.c b/drivers/s390/crypto/ap_bus.c index fb1de36..5256e3c 100644 --- a/drivers/s390/crypto/ap_bus.c +++ b/drivers/s390/crypto/ap_bus.c
@@ -91,7 +91,7 @@ static DECLARE_WORK(ap_scan_work, ap_scan_bus); * Tasklet & timer for AP request polling and interrupts */ static void ap_tasklet_fn(unsigned long); -static DECLARE_TASKLET_OLD(ap_tasklet, ap_tasklet_fn); +static DECLARE_TASKLET(ap_tasklet, ap_tasklet_fn, 0); static DECLARE_WAIT_QUEUE_HEAD(ap_poll_wait); static struct task_struct *ap_poll_kthread; static DEFINE_MUTEX(ap_poll_thread_mutex);
diff --git a/drivers/s390/crypto/vfio_ap_drv.c b/drivers/s390/crypto/vfio_ap_drv.c index 22128eb..7dc72cb 100644 --- a/drivers/s390/crypto/vfio_ap_drv.c +++ b/drivers/s390/crypto/vfio_ap_drv.c
@@ -82,9 +82,8 @@ static void vfio_ap_queue_dev_remove(struct ap_device *apdev) static void vfio_ap_matrix_dev_release(struct device *dev) { - struct ap_matrix_dev *matrix_dev; + struct ap_matrix_dev *matrix_dev = dev_get_drvdata(dev); - matrix_dev = container_of(dev, struct ap_matrix_dev, device); kfree(matrix_dev); }
diff --git a/drivers/s390/net/ctcm_main.c b/drivers/s390/net/ctcm_main.c index 87d05b1..437a6d8 100644 --- a/drivers/s390/net/ctcm_main.c +++ b/drivers/s390/net/ctcm_main.c
@@ -865,9 +865,16 @@ static int ctcmpc_transmit_skb(struct channel *ch, struct sk_buff *skb) /** * Start transmission of a packet. * Called from generic network device layer. + * + * skb Pointer to buffer containing the packet. + * dev Pointer to interface struct. + * + * returns 0 if packet consumed, !0 if packet rejected. + * Note: If we return !0, then the packet is free'd by + * the generic network layer. */ /* first merge version - leaving both functions separated */ -static netdev_tx_t ctcm_tx(struct sk_buff *skb, struct net_device *dev) +static int ctcm_tx(struct sk_buff *skb, struct net_device *dev) { struct ctcm_priv *priv = dev->ml_priv; @@ -910,7 +917,7 @@ static netdev_tx_t ctcm_tx(struct sk_buff *skb, struct net_device *dev) } /* unmerged MPC variant of ctcm_tx */ -static netdev_tx_t ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) +static int ctcmpc_tx(struct sk_buff *skb, struct net_device *dev) { int len = 0; struct ctcm_priv *priv = dev->ml_priv;
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 7370816..4eec7bf 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c
@@ -1518,8 +1518,9 @@ lcs_txbuffer_cb(struct lcs_channel *channel, struct lcs_buffer *buffer) /** * Packet transmit function called by network stack */ -static netdev_tx_t __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, - struct net_device *dev) +static int +__lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, + struct net_device *dev) { struct lcs_header *header; int rc = NETDEV_TX_OK; @@ -1580,7 +1581,8 @@ static netdev_tx_t __lcs_start_xmit(struct lcs_card *card, struct sk_buff *skb, return rc; } -static netdev_tx_t lcs_start_xmit(struct sk_buff *skb, struct net_device *dev) +static int +lcs_start_xmit(struct sk_buff *skb, struct net_device *dev) { struct lcs_card *card; int rc;
diff --git a/drivers/s390/net/netiucv.c b/drivers/s390/net/netiucv.c index e2984b5..5ce2424 100644 --- a/drivers/s390/net/netiucv.c +++ b/drivers/s390/net/netiucv.c
@@ -1344,8 +1344,15 @@ static int netiucv_pm_restore_thaw(struct device *dev) /** * Start transmission of a packet. * Called from generic network device layer. + * + * @param skb Pointer to buffer containing the packet. + * @param dev Pointer to interface struct. + * + * @return 0 if packet consumed, !0 if packet rejected. + * Note: If we return !0, then the packet is free'd by + * the generic network layer. */ -static netdev_tx_t netiucv_tx(struct sk_buff *skb, struct net_device *dev) +static int netiucv_tx(struct sk_buff *skb, struct net_device *dev) { struct netiucv_priv *privptr = netdev_priv(dev); int rc;
diff --git a/drivers/s390/scsi/zfcp_fc.c b/drivers/s390/scsi/zfcp_fc.c index 7285e6c..d4c2c44 100644 --- a/drivers/s390/scsi/zfcp_fc.c +++ b/drivers/s390/scsi/zfcp_fc.c
@@ -145,33 +145,27 @@ void zfcp_fc_enqueue_event(struct zfcp_adapter *adapter, static int zfcp_fc_wka_port_get(struct zfcp_fc_wka_port *wka_port) { - int ret = -EIO; - if (mutex_lock_interruptible(&wka_port->mutex)) return -ERESTARTSYS; if (wka_port->status == ZFCP_FC_WKA_PORT_OFFLINE || wka_port->status == ZFCP_FC_WKA_PORT_CLOSING) { wka_port->status = ZFCP_FC_WKA_PORT_OPENING; - if (zfcp_fsf_open_wka_port(wka_port)) { - /* could not even send request, nothing to wait for */ + if (zfcp_fsf_open_wka_port(wka_port)) wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE; - goto out; - } } - wait_event(wka_port->opened, + mutex_unlock(&wka_port->mutex); + + wait_event(wka_port->completion_wq, wka_port->status == ZFCP_FC_WKA_PORT_ONLINE || wka_port->status == ZFCP_FC_WKA_PORT_OFFLINE); if (wka_port->status == ZFCP_FC_WKA_PORT_ONLINE) { atomic_inc(&wka_port->refcount); - ret = 0; - goto out; + return 0; } -out: - mutex_unlock(&wka_port->mutex); - return ret; + return -EIO; } static void zfcp_fc_wka_port_offline(struct work_struct *work) @@ -187,12 +181,9 @@ static void zfcp_fc_wka_port_offline(struct work_struct *work) wka_port->status = ZFCP_FC_WKA_PORT_CLOSING; if (zfcp_fsf_close_wka_port(wka_port)) { - /* could not even send request, nothing to wait for */ wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE; - goto out; + wake_up(&wka_port->completion_wq); } - wait_event(wka_port->closed, - wka_port->status == ZFCP_FC_WKA_PORT_OFFLINE); out: mutex_unlock(&wka_port->mutex); } @@ -202,15 +193,13 @@ static void zfcp_fc_wka_port_put(struct zfcp_fc_wka_port *wka_port) if (atomic_dec_return(&wka_port->refcount) != 0) return; /* wait 10 milliseconds, other reqs might pop in */ - queue_delayed_work(wka_port->adapter->work_queue, &wka_port->work, - msecs_to_jiffies(10)); + schedule_delayed_work(&wka_port->work, HZ / 100); } static void zfcp_fc_wka_port_init(struct zfcp_fc_wka_port *wka_port, u32 d_id, struct zfcp_adapter *adapter) { - init_waitqueue_head(&wka_port->opened); - init_waitqueue_head(&wka_port->closed); + init_waitqueue_head(&wka_port->completion_wq); wka_port->adapter = adapter; wka_port->d_id = d_id;
diff --git a/drivers/s390/scsi/zfcp_fc.h b/drivers/s390/scsi/zfcp_fc.h index 25bebfa..6902ae1 100644 --- a/drivers/s390/scsi/zfcp_fc.h +++ b/drivers/s390/scsi/zfcp_fc.h
@@ -185,8 +185,7 @@ enum zfcp_fc_wka_status { /** * struct zfcp_fc_wka_port - representation of well-known-address (WKA) FC port * @adapter: Pointer to adapter structure this WKA port belongs to - * @opened: Wait for completion of open command - * @closed: Wait for completion of close command + * @completion_wq: Wait for completion of open/close command * @status: Current status of WKA port * @refcount: Reference count to keep port open as long as it is in use * @d_id: FC destination id or well-known-address @@ -196,8 +195,7 @@ enum zfcp_fc_wka_status { */ struct zfcp_fc_wka_port { struct zfcp_adapter *adapter; - wait_queue_head_t opened; - wait_queue_head_t closed; + wait_queue_head_t completion_wq; enum zfcp_fc_wka_status status; atomic_t refcount; u32 d_id;
diff --git a/drivers/s390/scsi/zfcp_fsf.c b/drivers/s390/scsi/zfcp_fsf.c index 3fddf85..5c652de 100644 --- a/drivers/s390/scsi/zfcp_fsf.c +++ b/drivers/s390/scsi/zfcp_fsf.c
@@ -755,7 +755,7 @@ static int zfcp_fsf_req_send(struct zfcp_fsf_req *req) const bool is_srb = zfcp_fsf_req_is_status_read_buffer(req); struct zfcp_adapter *adapter = req->adapter; struct zfcp_qdio *qdio = adapter->qdio; - unsigned long req_id = req->req_id; + int req_id = req->req_id; zfcp_reqlist_add(adapter->req_list, req); @@ -1625,7 +1625,7 @@ static void zfcp_fsf_open_wka_port_handler(struct zfcp_fsf_req *req) wka_port->status = ZFCP_FC_WKA_PORT_ONLINE; } out: - wake_up(&wka_port->opened); + wake_up(&wka_port->completion_wq); } /** @@ -1684,7 +1684,7 @@ static void zfcp_fsf_close_wka_port_handler(struct zfcp_fsf_req *req) } wka_port->status = ZFCP_FC_WKA_PORT_OFFLINE; - wake_up(&wka_port->closed); + wake_up(&wka_port->completion_wq); } /**
diff --git a/drivers/scsi/3w-9xxx.c b/drivers/scsi/3w-9xxx.c index f6f9203..3337b1e 100644 --- a/drivers/scsi/3w-9xxx.c +++ b/drivers/scsi/3w-9xxx.c
@@ -2014,7 +2014,7 @@ static int twa_probe(struct pci_dev *pdev, const struct pci_device_id *dev_id) retval = pci_enable_device(pdev); if (retval) { TW_PRINTK(host, TW_DRIVER, 0x34, "Failed to enable pci device"); - return -ENODEV; + goto out_disable_device; } pci_set_master(pdev);
diff --git a/drivers/scsi/aic94xx/aic94xx_task.c b/drivers/scsi/aic94xx/aic94xx_task.c index 593b167..f923ed0 100644 --- a/drivers/scsi/aic94xx/aic94xx_task.c +++ b/drivers/scsi/aic94xx/aic94xx_task.c
@@ -50,9 +50,6 @@ static int asd_map_scatterlist(struct sas_task *task, dma_addr_t dma = dma_map_single(&asd_ha->pcidev->dev, p, task->total_xfer_len, task->data_dir); - if (dma_mapping_error(&asd_ha->pcidev->dev, dma)) - return -ENOMEM; - sg_arr[0].bus_addr = cpu_to_le64((u64)dma); sg_arr[0].size = cpu_to_le32(task->total_xfer_len); sg_arr[0].flags |= ASD_SG_EL_LIST_EOL;
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c index bf0b317..fe8a5e5 100644 --- a/drivers/scsi/device_handler/scsi_dh_alua.c +++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -1036,12 +1036,10 @@ static int alua_activate(struct scsi_device *sdev, rcu_read_unlock(); mutex_unlock(&h->init_mutex); - if (alua_rtpg_queue(pg, sdev, qdata, true)) { + if (alua_rtpg_queue(pg, sdev, qdata, true)) fn = NULL; - } else { - kfree(qdata); + else err = SCSI_DH_DEV_OFFLINED; - } kref_put(&pg->kref, release_port_group); out: if (fn)
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index 00ddb3f..25dae9f 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c
@@ -2506,7 +2506,6 @@ static int __init fcoe_init(void) out_free: mutex_unlock(&fcoe_config_mutex); - fcoe_transport_detach(&fcoe_sw_transport); out_destroy: destroy_workqueue(fcoe_wq); return rc;
diff --git a/drivers/scsi/fcoe/fcoe_sysfs.c b/drivers/scsi/fcoe/fcoe_sysfs.c index b3086cf..2cb7a8c 100644 --- a/drivers/scsi/fcoe/fcoe_sysfs.c +++ b/drivers/scsi/fcoe/fcoe_sysfs.c
@@ -830,15 +830,14 @@ struct fcoe_ctlr_device *fcoe_ctlr_device_add(struct device *parent, dev_set_name(&ctlr->dev, "ctlr_%d", ctlr->id); error = device_register(&ctlr->dev); - if (error) { - destroy_workqueue(ctlr->devloss_work_q); - destroy_workqueue(ctlr->work_q); - put_device(&ctlr->dev); - return NULL; - } + if (error) + goto out_del_q2; return ctlr; +out_del_q2: + destroy_workqueue(ctlr->devloss_work_q); + ctlr->devloss_work_q = NULL; out_del_q: destroy_workqueue(ctlr->work_q); ctlr->work_q = NULL; @@ -1037,16 +1036,16 @@ struct fcoe_fcf_device *fcoe_fcf_device_add(struct fcoe_ctlr_device *ctlr, fcf->selected = new_fcf->selected; error = device_register(&fcf->dev); - if (error) { - put_device(&fcf->dev); - goto out; - } + if (error) + goto out_del; fcf->state = FCOE_FCF_STATE_CONNECTED; list_add_tail(&fcf->peers, &ctlr->fcfs); return fcf; +out_del: + kfree(fcf); out: return NULL; }
diff --git a/drivers/scsi/hisi_sas/hisi_sas_main.c b/drivers/scsi/hisi_sas/hisi_sas_main.c index 7135bbe..031aa40 100644 --- a/drivers/scsi/hisi_sas/hisi_sas_main.c +++ b/drivers/scsi/hisi_sas/hisi_sas_main.c
@@ -1397,7 +1397,7 @@ static void hisi_sas_refresh_port_id(struct hisi_hba *hisi_hba) device->linkrate = phy->sas_phy.linkrate; hisi_hba->hw->setup_itct(hisi_hba, sas_dev); - } else if (!port->port_attached) + } else port->id = 0xff; } }
diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c index b97e046..45885e8 100644 --- a/drivers/scsi/hosts.c +++ b/drivers/scsi/hosts.c
@@ -179,7 +179,6 @@ void scsi_remove_host(struct Scsi_Host *shost) scsi_forget_host(shost); mutex_unlock(&shost->scan_mutex); scsi_proc_host_rm(shost); - scsi_proc_hostdir_rm(shost->hostt); spin_lock_irqsave(shost->host_lock, flags); if (scsi_host_set_state(shost, SHOST_DEL)) @@ -319,7 +318,9 @@ static void scsi_host_dev_release(struct device *dev) struct Scsi_Host *shost = dev_to_shost(dev); struct device *parent = dev->parent; - /* Wait for functions invoked through call_rcu(&scmd->rcu, ...) */ + scsi_proc_hostdir_rm(shost->hostt); + + /* Wait for functions invoked through call_rcu(&shost->rcu, ...) */ rcu_barrier(); if (shost->tmf_work_q)
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index e670cce..bac7059 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c
@@ -5810,7 +5810,7 @@ static int hpsa_scsi_host_alloc(struct ctlr_info *h) { struct Scsi_Host *sh; - sh = scsi_host_alloc(&hpsa_driver_template, sizeof(struct ctlr_info)); + sh = scsi_host_alloc(&hpsa_driver_template, sizeof(h)); if (sh == NULL) { dev_err(&h->pdev->dev, "scsi_host_alloc failed\n"); return -ENOMEM; @@ -8903,7 +8903,7 @@ static int hpsa_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) destroy_workqueue(h->monitor_ctlr_wq); h->monitor_ctlr_wq = NULL; } - hpda_free_ctlr_info(h); + kfree(h); return rc; } @@ -9763,8 +9763,7 @@ static int hpsa_add_sas_host(struct ctlr_info *h) return 0; free_sas_phy: - sas_phy_free(hpsa_sas_phy->phy); - kfree(hpsa_sas_phy); + hpsa_free_sas_phy(hpsa_sas_phy); free_sas_port: hpsa_free_sas_port(hpsa_sas_port); free_sas_node: @@ -9800,12 +9799,10 @@ static int hpsa_add_sas_device(struct hpsa_sas_node *hpsa_sas_node, rc = hpsa_sas_port_add_rphy(hpsa_sas_port, rphy); if (rc) - goto free_sas_rphy; + goto free_sas_port; return 0; -free_sas_rphy: - sas_rphy_free(rphy); free_sas_port: hpsa_free_sas_port(hpsa_sas_port); device->sas_port = NULL;
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c index 205ab65..a163fd9 100644 --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c
@@ -1517,22 +1517,23 @@ static void ipr_process_ccn(struct ipr_cmnd *ipr_cmd) } /** - * strip_whitespace - Strip and pad trailing whitespace. - * @i: size of buffer - * @buf: string to modify + * strip_and_pad_whitespace - Strip and pad trailing whitespace. + * @i: index into buffer + * @buf: string to modify * - * This function will strip all trailing whitespace and - * NUL terminate the string. + * This function will strip all trailing whitespace, pad the end + * of the string with a single space, and NULL terminate the string. * + * Return value: + * new length of string **/ -static void strip_whitespace(int i, char *buf) +static int strip_and_pad_whitespace(int i, char *buf) { - if (i < 1) - return; - i--; while (i && buf[i] == ' ') i--; - buf[i+1] = '\0'; + buf[i+1] = ' '; + buf[i+2] = '\0'; + return i + 2; } /** @@ -1547,21 +1548,19 @@ static void strip_whitespace(int i, char *buf) static void ipr_log_vpd_compact(char *prefix, struct ipr_hostrcb *hostrcb, struct ipr_vpd *vpd) { - char vendor_id[IPR_VENDOR_ID_LEN + 1]; - char product_id[IPR_PROD_ID_LEN + 1]; - char sn[IPR_SERIAL_NUM_LEN + 1]; + char buffer[IPR_VENDOR_ID_LEN + IPR_PROD_ID_LEN + IPR_SERIAL_NUM_LEN + 3]; + int i = 0; - memcpy(vendor_id, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN); - strip_whitespace(IPR_VENDOR_ID_LEN, vendor_id); + memcpy(buffer, vpd->vpids.vendor_id, IPR_VENDOR_ID_LEN); + i = strip_and_pad_whitespace(IPR_VENDOR_ID_LEN - 1, buffer); - memcpy(product_id, vpd->vpids.product_id, IPR_PROD_ID_LEN); - strip_whitespace(IPR_PROD_ID_LEN, product_id); + memcpy(&buffer[i], vpd->vpids.product_id, IPR_PROD_ID_LEN); + i = strip_and_pad_whitespace(i + IPR_PROD_ID_LEN - 1, buffer); - memcpy(sn, vpd->sn, IPR_SERIAL_NUM_LEN); - strip_whitespace(IPR_SERIAL_NUM_LEN, sn); + memcpy(&buffer[i], vpd->sn, IPR_SERIAL_NUM_LEN); + buffer[IPR_SERIAL_NUM_LEN + i] = '\0'; - ipr_hcam_err(hostrcb, "%s VPID/SN: %s %s %s\n", prefix, - vendor_id, product_id, sn); + ipr_hcam_err(hostrcb, "%s VPID/SN: %s\n", prefix, buffer); } /** @@ -10844,19 +10843,11 @@ static struct notifier_block ipr_notifier = { **/ static int __init ipr_init(void) { - int rc; - ipr_info("IBM Power RAID SCSI Device Driver version: %s %s\n", IPR_DRIVER_VERSION, IPR_DRIVER_DATE); register_reboot_notifier(&ipr_notifier); - rc = pci_register_driver(&ipr_driver); - if (rc) { - unregister_reboot_notifier(&ipr_notifier); - return rc; - } - - return 0; + return pci_register_driver(&ipr_driver); } /**
diff --git a/drivers/scsi/iscsi_tcp.c b/drivers/scsi/iscsi_tcp.c index 9320a0a..b5dd1ca 100644 --- a/drivers/scsi/iscsi_tcp.c +++ b/drivers/scsi/iscsi_tcp.c
@@ -770,7 +770,7 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost, enum iscsi_host_param param, char *buf) { struct iscsi_sw_tcp_host *tcp_sw_host = iscsi_host_priv(shost); - struct iscsi_session *session; + struct iscsi_session *session = tcp_sw_host->session; struct iscsi_conn *conn; struct iscsi_tcp_conn *tcp_conn; struct iscsi_sw_tcp_conn *tcp_sw_conn; @@ -779,7 +779,6 @@ static int iscsi_sw_tcp_host_get_param(struct Scsi_Host *shost, switch (param) { case ISCSI_HOST_PARAM_IPADDRESS: - session = tcp_sw_host->session; if (!session) return -ENOTCONN; @@ -868,14 +867,12 @@ iscsi_sw_tcp_session_create(struct iscsi_endpoint *ep, uint16_t cmds_max, if (!cls_session) goto remove_host; session = cls_session->dd_data; + tcp_sw_host = iscsi_host_priv(shost); + tcp_sw_host->session = session; shost->can_queue = session->scsi_cmds_max; if (iscsi_tcp_r2tpool_alloc(session)) goto remove_session; - - /* We are now fully setup so expose the session to sysfs. */ - tcp_sw_host = iscsi_host_priv(shost); - tcp_sw_host->session = session; return cls_session; remove_session:
diff --git a/drivers/scsi/libsas/sas_expander.c b/drivers/scsi/libsas/sas_expander.c index 173f91a..9fdb9c9 100644 --- a/drivers/scsi/libsas/sas_expander.c +++ b/drivers/scsi/libsas/sas_expander.c
@@ -85,7 +85,7 @@ static int smp_execute_task_sg(struct domain_device *dev, res = i->dft->lldd_execute_task(task, GFP_KERNEL); if (res) { - del_timer_sync(&task->slow_task->timer); + del_timer(&task->slow_task->timer); pr_notice("executing SMP task failed:%d\n", res); break; }
diff --git a/drivers/scsi/lpfc/lpfc_debugfs.c b/drivers/scsi/lpfc/lpfc_debugfs.c index 6955113..e15bb3d 100644 --- a/drivers/scsi/lpfc/lpfc_debugfs.c +++ b/drivers/scsi/lpfc/lpfc_debugfs.c
@@ -2402,8 +2402,8 @@ lpfc_debugfs_multixripools_write(struct file *file, const char __user *buf, struct lpfc_sli4_hdw_queue *qp; struct lpfc_multixri_pool *multixri_pool; - if (nbytes > sizeof(mybuf) - 1) - nbytes = sizeof(mybuf) - 1; + if (nbytes > 64) + nbytes = 64; /* Protect copy from user */ if (!access_ok(buf, nbytes)) @@ -2487,8 +2487,8 @@ lpfc_debugfs_nvmestat_write(struct file *file, const char __user *buf, if (!phba->targetport) return -ENXIO; - if (nbytes > sizeof(mybuf) - 1) - nbytes = sizeof(mybuf) - 1; + if (nbytes > 64) + nbytes = 64; memset(mybuf, 0, sizeof(mybuf)); @@ -2629,8 +2629,8 @@ lpfc_debugfs_nvmektime_write(struct file *file, const char __user *buf, char mybuf[64]; char *pbuf; - if (nbytes > sizeof(mybuf) - 1) - nbytes = sizeof(mybuf) - 1; + if (nbytes > 64) + nbytes = 64; memset(mybuf, 0, sizeof(mybuf)); @@ -2757,8 +2757,8 @@ lpfc_debugfs_nvmeio_trc_write(struct file *file, const char __user *buf, char mybuf[64]; char *pbuf; - if (nbytes > sizeof(mybuf) - 1) - nbytes = sizeof(mybuf) - 1; + if (nbytes > 63) + nbytes = 63; memset(mybuf, 0, sizeof(mybuf)); @@ -2863,8 +2863,8 @@ lpfc_debugfs_cpucheck_write(struct file *file, const char __user *buf, char *pbuf; int i, j; - if (nbytes > sizeof(mybuf) - 1) - nbytes = sizeof(mybuf) - 1; + if (nbytes > 64) + nbytes = 64; memset(mybuf, 0, sizeof(mybuf));
diff --git a/drivers/scsi/lpfc/lpfc_init.c b/drivers/scsi/lpfc/lpfc_init.c index 8930696..b5cee2a 100644 --- a/drivers/scsi/lpfc/lpfc_init.c +++ b/drivers/scsi/lpfc/lpfc_init.c
@@ -6537,7 +6537,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) /* Allocate device driver memory */ rc = lpfc_mem_alloc(phba, SGL_ALIGN_SZ); if (rc) - goto out_destroy_workqueue; + return -ENOMEM; /* IF Type 2 ports get initialized now. */ if (bf_get(lpfc_sli_intf_if_type, &phba->sli4_hba.sli_intf) >= @@ -6911,9 +6911,6 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) lpfc_destroy_bootstrap_mbox(phba); out_free_mem: lpfc_mem_free(phba); -out_destroy_workqueue: - destroy_workqueue(phba->wq); - phba->wq = NULL; return rc; }
diff --git a/drivers/scsi/lpfc/lpfc_sli.c b/drivers/scsi/lpfc/lpfc_sli.c index e489c68..bd908dd 100644 --- a/drivers/scsi/lpfc/lpfc_sli.c +++ b/drivers/scsi/lpfc/lpfc_sli.c
@@ -20407,20 +20407,20 @@ lpfc_get_io_buf_from_private_pool(struct lpfc_hba *phba, static struct lpfc_io_buf * lpfc_get_io_buf_from_expedite_pool(struct lpfc_hba *phba) { - struct lpfc_io_buf *lpfc_ncmd = NULL, *iter; + struct lpfc_io_buf *lpfc_ncmd; struct lpfc_io_buf *lpfc_ncmd_next; unsigned long iflag; struct lpfc_epd_pool *epd_pool; epd_pool = &phba->epd_pool; + lpfc_ncmd = NULL; spin_lock_irqsave(&epd_pool->lock, iflag); if (epd_pool->count > 0) { - list_for_each_entry_safe(iter, lpfc_ncmd_next, + list_for_each_entry_safe(lpfc_ncmd, lpfc_ncmd_next, &epd_pool->list, list) { - list_del(&iter->list); + list_del(&lpfc_ncmd->list); epd_pool->count--; - lpfc_ncmd = iter; break; } }
diff --git a/drivers/scsi/megaraid/megaraid_sas.h b/drivers/scsi/megaraid/megaraid_sas.h index ce0c36f..aa62cc8 100644 --- a/drivers/scsi/megaraid/megaraid_sas.h +++ b/drivers/scsi/megaraid/megaraid_sas.h
@@ -1515,8 +1515,6 @@ struct megasas_ctrl_info { #define MEGASAS_MAX_LD_IDS (MEGASAS_MAX_LD_CHANNELS * \ MEGASAS_MAX_DEV_PER_CHANNEL) -#define MEGASAS_MAX_SUPPORTED_LD_IDS 240 - #define MEGASAS_MAX_SECTORS (2*1024) #define MEGASAS_MAX_SECTORS_IEEE (2*128) #define MEGASAS_DBG_LVL 1
diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 6171485..a261ce5 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c
@@ -3235,7 +3235,7 @@ fw_crash_buffer_show(struct device *cdev, spin_lock_irqsave(&instance->crashdump_lock, flags); buff_offset = instance->fw_crash_buffer_offset; - if (!instance->crash_dump_buf || + if (!instance->crash_dump_buf && !((instance->fw_crash_state == AVAILABLE) || (instance->fw_crash_state == COPYING))) { dev_err(&instance->pdev->dev,
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c index ff20f47..8bfb46d 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fp.c +++ b/drivers/scsi/megaraid/megaraid_sas_fp.c
@@ -359,7 +359,7 @@ u8 MR_ValidateMapInfo(struct megasas_instance *instance, u64 map_id) ld = MR_TargetIdToLdGet(i, drv_map); /* For non existing VDs, iterate to next VD*/ - if (ld >= MEGASAS_MAX_SUPPORTED_LD_IDS) + if (ld >= (MAX_LOGICAL_DRIVES_EXT - 1)) continue; raid = MR_LdRaidGet(ld, drv_map);
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c index 8900026..a78a702 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fusion.c +++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -4659,7 +4659,7 @@ int megasas_task_abort_fusion(struct scsi_cmnd *scmd) devhandle = megasas_get_tm_devhandle(scmd->device); if (devhandle == (u16)ULONG_MAX) { - ret = FAILED; + ret = SUCCESS; sdev_printk(KERN_INFO, scmd->device, "task abort issued for invalid devhandle\n"); mutex_unlock(&instance->reset_mutex); @@ -4729,7 +4729,7 @@ int megasas_reset_target_fusion(struct scsi_cmnd *scmd) devhandle = megasas_get_tm_devhandle(scmd->device); if (devhandle == (u16)ULONG_MAX) { - ret = FAILED; + ret = SUCCESS; sdev_printk(KERN_INFO, scmd->device, "target reset issued for invalid devhandle\n"); mutex_unlock(&instance->reset_mutex); @@ -5182,6 +5182,7 @@ megasas_alloc_fusion_context(struct megasas_instance *instance) if (!fusion->log_to_span) { dev_err(&instance->pdev->dev, "Failed from %s %d\n", __func__, __LINE__); + kfree(instance->ctrl_context); return -ENOMEM; } }
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c index 044a00e..97c1f24 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c +++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -3238,7 +3238,6 @@ static struct fw_event_work *dequeue_next_fw_event(struct MPT3SAS_ADAPTER *ioc) fw_event = list_first_entry(&ioc->fw_event_list, struct fw_event_work, list); list_del_init(&fw_event->list); - fw_event_work_put(fw_event); } spin_unlock_irqrestore(&ioc->fw_event_lock, flags); @@ -3273,6 +3272,7 @@ _scsih_fw_event_cleanup_queue(struct MPT3SAS_ADAPTER *ioc) if (cancel_work_sync(&fw_event->work)) fw_event_work_put(fw_event); + fw_event_work_put(fw_event); } }
diff --git a/drivers/scsi/mpt3sas/mpt3sas_transport.c b/drivers/scsi/mpt3sas/mpt3sas_transport.c index ebe78ec..5324662 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_transport.c +++ b/drivers/scsi/mpt3sas/mpt3sas_transport.c
@@ -670,7 +670,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, goto out_fail; } port = sas_port_alloc_num(sas_node->parent_dev); - if (!port || (sas_port_add(port))) { + if ((sas_port_add(port))) { ioc_err(ioc, "failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); goto out_fail; @@ -695,12 +695,6 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, rphy = sas_expander_alloc(port, mpt3sas_port->remote_identify.device_type); - if (!rphy) { - ioc_err(ioc, "failure at %s:%d/%s()!\n", - __FILE__, __LINE__, __func__); - goto out_delete_port; - } - rphy->identify = mpt3sas_port->remote_identify; if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE) { @@ -718,9 +712,6 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, if ((sas_rphy_add(rphy))) { ioc_err(ioc, "failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); - sas_rphy_free(rphy); - rphy = NULL; - goto out_delete_port; } if (mpt3sas_port->remote_identify.device_type == SAS_END_DEVICE) { @@ -748,10 +739,7 @@ mpt3sas_transport_port_add(struct MPT3SAS_ADAPTER *ioc, u16 handle, rphy_to_expander_device(rphy)); return mpt3sas_port; -out_delete_port: - sas_port_delete(port); - -out_fail: + out_fail: list_for_each_entry_safe(mpt3sas_phy, next, &mpt3sas_port->phy_list, port_siblings) list_del(&mpt3sas_phy->port_siblings);
diff --git a/drivers/scsi/qedf/qedf_main.c b/drivers/scsi/qedf/qedf_main.c index f864ef0..c95e04c 100644 --- a/drivers/scsi/qedf/qedf_main.c +++ b/drivers/scsi/qedf/qedf_main.c
@@ -3544,6 +3544,11 @@ static int __qedf_probe(struct pci_dev *pdev, int mode) err1: scsi_host_put(lport->host); err0: + if (qedf) { + QEDF_INFO(&qedf->dbg_ctx, QEDF_LOG_DISC, "Probe done.\n"); + + clear_bit(QEDF_PROBING, &qedf->flags); + } return rc; }
diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h index a8272d4..caf28c5 100644 --- a/drivers/scsi/qla2xxx/qla_def.h +++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -3899,8 +3899,8 @@ struct qla_hw_data { #define IS_OEM_001(ha) ((ha)->device_type & DT_OEM_001) #define HAS_EXTENDED_IDS(ha) ((ha)->device_type & DT_EXTENDED_IDS) #define IS_CT6_SUPPORTED(ha) ((ha)->device_type & DT_CT6_SUPPORTED) -#define IS_MQUE_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \ - IS_QLA28XX(ha)) +#define IS_MQUE_CAPABLE(ha) ((ha)->mqenable || IS_QLA83XX(ha) || \ + IS_QLA27XX(ha) || IS_QLA28XX(ha)) #define IS_BIDI_CAPABLE(ha) \ (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) /* Bit 21 of fw_attributes decides the MCTP capabilities */
diff --git a/drivers/scsi/qla2xxx/qla_gbl.h b/drivers/scsi/qla2xxx/qla_gbl.h index 6d78818..1a98e37 100644 --- a/drivers/scsi/qla2xxx/qla_gbl.h +++ b/drivers/scsi/qla2xxx/qla_gbl.h
@@ -397,8 +397,7 @@ extern int qla2x00_get_resource_cnts(scsi_qla_host_t *); extern int -qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map, - u8 *num_entries); +qla2x00_get_fcal_position_map(scsi_qla_host_t *ha, char *pos_map); extern int qla2x00_get_link_status(scsi_qla_host_t *, uint16_t, struct link_statistics *,
diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c index 85f65a0..a6e24ce 100644 --- a/drivers/scsi/qla2xxx/qla_init.c +++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -5068,22 +5068,6 @@ qla2x00_configure_loop(scsi_qla_host_t *vha) return (rval); } -static void -qla_reinitialize_link(scsi_qla_host_t *vha) -{ - int rval; - - atomic_set(&vha->loop_state, LOOP_DOWN); - atomic_set(&vha->loop_down_timer, LOOP_DOWN_TIME); - rval = qla2x00_full_login_lip(vha); - if (rval == QLA_SUCCESS) { - ql_dbg(ql_dbg_disc, vha, 0xd050, "Link reinitialized\n"); - } else { - ql_dbg(ql_dbg_disc, vha, 0xd051, - "Link reinitialization failed (%d)\n", rval); - } -} - /* * qla2x00_configure_local_loop * Updates Fibre Channel Device Database with local loop devices. @@ -5148,19 +5132,6 @@ qla2x00_configure_local_loop(scsi_qla_host_t *vha) spin_unlock_irqrestore(&vha->work_lock, flags); if (vha->scan.scan_retry < MAX_SCAN_RETRIES) { - u8 loop_map_entries = 0; - int rc; - - rc = qla2x00_get_fcal_position_map(vha, NULL, - &loop_map_entries); - if (rc == QLA_SUCCESS && loop_map_entries > 1) { - /* - * There are devices that are still not logged - * in. Reinitialize to give them a chance. - */ - qla_reinitialize_link(vha); - return QLA_FUNCTION_FAILED; - } set_bit(LOCAL_LOOP_UPDATE, &vha->dpc_flags); set_bit(LOOP_RESYNC_NEEDED, &vha->dpc_flags); } @@ -5417,6 +5388,8 @@ qla2x00_reg_remote_port(scsi_qla_host_t *vha, fc_port_t *fcport) if (atomic_read(&fcport->state) == FCS_ONLINE) return; + qla2x00_set_fcport_state(fcport, FCS_ONLINE); + rport_ids.node_name = wwn_to_u64(fcport->node_name); rport_ids.port_name = wwn_to_u64(fcport->port_name); rport_ids.port_id = fcport->d_id.b.domain << 16 | @@ -5512,6 +5485,7 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) qla2x00_reg_remote_port(vha, fcport); break; case MODE_TARGET: + qla2x00_set_fcport_state(fcport, FCS_ONLINE); if (!vha->vha_tgt.qla_tgt->tgt_stop && !vha->vha_tgt.qla_tgt->tgt_stopped) qlt_fc_port_added(vha, fcport); @@ -5526,8 +5500,6 @@ qla2x00_update_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) break; } - qla2x00_set_fcport_state(fcport, FCS_ONLINE); - if (IS_IIDMA_CAPABLE(vha->hw) && vha->hw->flags.gpsc_supported) { if (fcport->id_changed) { fcport->id_changed = 0;
diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 0892eb6..d7cf7f9 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c
@@ -3568,12 +3568,16 @@ qla24xx_enable_msix(struct qla_hw_data *ha, struct rsp_que *rsp) } /* Enable MSI-X vector for response queue update for queue 0 */ - if (IS_MQUE_CAPABLE(ha) && - (ha->msixbase && ha->mqiobase && ha->max_qpairs)) - ha->mqenable = 1; - else - ha->mqenable = 0; - + if (IS_QLA83XX(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha)) { + if (ha->msixbase && ha->mqiobase && + (ha->max_rsp_queues > 1 || ha->max_req_queues > 1 || + ql2xmqsupport)) + ha->mqenable = 1; + } else + if (ha->mqiobase && + (ha->max_rsp_queues > 1 || ha->max_req_queues > 1 || + ql2xmqsupport)) + ha->mqenable = 1; ql_dbg(ql_dbg_multiq, vha, 0xc005, "mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n", ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
diff --git a/drivers/scsi/qla2xxx/qla_mbx.c b/drivers/scsi/qla2xxx/qla_mbx.c index 77abecf..29f2730 100644 --- a/drivers/scsi/qla2xxx/qla_mbx.c +++ b/drivers/scsi/qla2xxx/qla_mbx.c
@@ -271,12 +271,6 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) atomic_inc(&ha->num_pend_mbx_stage3); if (!wait_for_completion_timeout(&ha->mbx_intr_comp, mcp->tov * HZ)) { - ql_dbg(ql_dbg_mbx, vha, 0x117a, - "cmd=%x Timeout.\n", command); - spin_lock_irqsave(&ha->hardware_lock, flags); - clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags); - spin_unlock_irqrestore(&ha->hardware_lock, flags); - if (chip_reset != ha->chip_reset) { spin_lock_irqsave(&ha->hardware_lock, flags); ha->flags.mbox_busy = 0; @@ -287,6 +281,12 @@ qla2x00_mailbox_command(scsi_qla_host_t *vha, mbx_cmd_t *mcp) rval = QLA_ABORTED; goto premature_exit; } + ql_dbg(ql_dbg_mbx, vha, 0x117a, + "cmd=%x Timeout.\n", command); + spin_lock_irqsave(&ha->hardware_lock, flags); + clear_bit(MBX_INTR_WAIT, &ha->mbx_cmd_flags); + spin_unlock_irqrestore(&ha->hardware_lock, flags); + } else if (ha->flags.purge_mbox || chip_reset != ha->chip_reset) { spin_lock_irqsave(&ha->hardware_lock, flags); @@ -2928,8 +2928,7 @@ qla2x00_get_resource_cnts(scsi_qla_host_t *vha) * Kernel context. */ int -qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map, - u8 *num_entries) +qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map) { int rval; mbx_cmd_t mc; @@ -2969,8 +2968,6 @@ qla2x00_get_fcal_position_map(scsi_qla_host_t *vha, char *pos_map, if (pos_map) memcpy(pos_map, pmap, FCAL_MAP_SIZE); - if (num_entries) - *num_entries = pmap[0]; } dma_pool_free(ha->s_dma_pool, pmap, pmap_dma);
diff --git a/drivers/scsi/qla2xxx/qla_nvme.c b/drivers/scsi/qla2xxx/qla_nvme.c index ab9dcbd..a15af04 100644 --- a/drivers/scsi/qla2xxx/qla_nvme.c +++ b/drivers/scsi/qla2xxx/qla_nvme.c
@@ -36,6 +36,11 @@ int qla_nvme_register_remote(struct scsi_qla_host *vha, struct fc_port *fcport) (fcport->nvme_flag & NVME_FLAG_REGISTERED)) return 0; + if (atomic_read(&fcport->state) == FCS_ONLINE) + return 0; + + qla2x00_set_fcport_state(fcport, FCS_ONLINE); + fcport->nvme_flag &= ~NVME_FLAG_RESETTING; memset(&req, 0, sizeof(struct nvme_fc_port_info)); @@ -152,6 +157,18 @@ static void qla_nvme_release_fcp_cmd_kref(struct kref *kref) qla2xxx_rel_qpair_sp(sp->qpair, sp); } +static void qla_nvme_ls_unmap(struct srb *sp, struct nvmefc_ls_req *fd) +{ + if (sp->flags & SRB_DMA_VALID) { + struct srb_iocb *nvme = &sp->u.iocb_cmd; + struct qla_hw_data *ha = sp->fcport->vha->hw; + + dma_unmap_single(&ha->pdev->dev, nvme->u.nvme.cmd_dma, + fd->rqstlen, DMA_TO_DEVICE); + sp->flags &= ~SRB_DMA_VALID; + } +} + static void qla_nvme_release_ls_cmd_kref(struct kref *kref) { struct srb *sp = container_of(kref, struct srb, cmd_kref); @@ -169,6 +186,7 @@ static void qla_nvme_release_ls_cmd_kref(struct kref *kref) fd = priv->fd; + qla_nvme_ls_unmap(sp, fd); fd->done(fd, priv->comp_status); out: qla2x00_rel_sp(sp); @@ -310,10 +328,13 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, nvme->u.nvme.rsp_len = fd->rsplen; nvme->u.nvme.rsp_dma = fd->rspdma; nvme->u.nvme.timeout_sec = fd->timeout; - nvme->u.nvme.cmd_dma = fd->rqstdma; + nvme->u.nvme.cmd_dma = dma_map_single(&ha->pdev->dev, fd->rqstaddr, + fd->rqstlen, DMA_TO_DEVICE); dma_sync_single_for_device(&ha->pdev->dev, nvme->u.nvme.cmd_dma, fd->rqstlen, DMA_TO_DEVICE); + sp->flags |= SRB_DMA_VALID; + rval = qla2x00_start_sp(sp); if (rval != QLA_SUCCESS) { ql_log(ql_log_warn, vha, 0x700e, @@ -321,6 +342,7 @@ static int qla_nvme_ls_req(struct nvme_fc_local_port *lport, wake_up(&sp->nvme_ls_waitq); sp->priv = NULL; priv->sp = NULL; + qla_nvme_ls_unmap(sp, fd); qla2x00_rel_sp(sp); return rval; }
diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index 30a5ca9..a5dbaa3 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c
@@ -1738,17 +1738,6 @@ __qla2x00_abort_all_cmds(struct qla_qpair *qp, int res) for (cnt = 1; cnt < req->num_outstanding_cmds; cnt++) { sp = req->outstanding_cmds[cnt]; if (sp) { - /* - * perform lockless completion during driver unload - */ - if (qla2x00_chip_is_down(vha)) { - req->outstanding_cmds[cnt] = NULL; - spin_unlock_irqrestore(qp->qp_lock_ptr, flags); - sp->done(sp, res); - spin_lock_irqsave(qp->qp_lock_ptr, flags); - continue; - } - switch (sp->cmd_type) { case TYPE_SRB: qla2x00_abort_srb(qp, sp, res, &flags); @@ -6372,12 +6361,9 @@ qla2x00_do_dpc(void *data) } } loop_resync_check: - if (!qla2x00_reset_active(base_vha) && - test_and_clear_bit(LOOP_RESYNC_NEEDED, + if (test_and_clear_bit(LOOP_RESYNC_NEEDED, &base_vha->dpc_flags)) { - /* - * Allow abort_isp to complete before moving on to scanning. - */ + ql_dbg(ql_dbg_dpc, base_vha, 0x400f, "Loop resync scheduled.\n"); @@ -6621,7 +6607,7 @@ qla2x00_timer(struct timer_list *t) /* if the loop has been down for 4 minutes, reinit adapter */ if (atomic_dec_and_test(&vha->loop_down_timer) != 0) { - if (!(vha->device_flags & DFLG_NO_CABLE) && !vha->vp_idx) { + if (!(vha->device_flags & DFLG_NO_CABLE)) { ql_log(ql_log_warn, vha, 0x6009, "Loop down - aborting ISP.\n");
diff --git a/drivers/scsi/scsi.c b/drivers/scsi/scsi.c index 2921256..1ce3f90 100644 --- a/drivers/scsi/scsi.c +++ b/drivers/scsi/scsi.c
@@ -331,18 +331,11 @@ static int scsi_vpd_inquiry(struct scsi_device *sdev, unsigned char *buffer, if (result) return -EIO; - /* - * Sanity check that we got the page back that we asked for and that - * the page size is not 0. - */ + /* Sanity check that we got the page back that we asked for */ if (buffer[1] != page) return -EIO; - result = get_unaligned_be16(&buffer[2]); - if (!result) - return -EIO; - - return result + 4; + return get_unaligned_be16(&buffer[2]) + 4; } /**
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c index 2c86ed1..408166b 100644 --- a/drivers/scsi/scsi_debug.c +++ b/drivers/scsi/scsi_debug.c
@@ -3139,7 +3139,7 @@ static int resp_write_scat(struct scsi_cmnd *scp, mk_sense_buffer(scp, ILLEGAL_REQUEST, INVALID_FIELD_IN_CDB, 0); return illegal_condition_result; } - lrdp = kzalloc(lbdof_blen, GFP_ATOMIC | __GFP_NOWARN); + lrdp = kzalloc(lbdof_blen, GFP_ATOMIC); if (lrdp == NULL) return SCSI_MLQUEUE_HOST_BUSY; if (sdebug_verbose)
diff --git a/drivers/scsi/scsi_devinfo.c b/drivers/scsi/scsi_devinfo.c index e920a6a..7f76bf5 100644 --- a/drivers/scsi/scsi_devinfo.c +++ b/drivers/scsi/scsi_devinfo.c
@@ -232,7 +232,6 @@ static struct { {"SGI", "RAID5", "*", BLIST_SPARSELUN}, {"SGI", "TP9100", "*", BLIST_REPORTLUN2}, {"SGI", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, - {"SKhynix", "H28U74301AMR", NULL, BLIST_SKIP_VPD_PAGES}, {"IBM", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"SUN", "Universal Xport", "*", BLIST_NO_ULD_ATTACH}, {"DELL", "Universal Xport", "*", BLIST_NO_ULD_ATTACH},
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 9d9617a..6e73eb3 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c
@@ -1645,7 +1645,12 @@ static bool scsi_mq_get_budget(struct blk_mq_hw_ctx *hctx) struct request_queue *q = hctx->queue; struct scsi_device *sdev = q->queuedata; - return scsi_dev_queue_ready(q, sdev); + if (scsi_dev_queue_ready(q, sdev)) + return true; + + if (atomic_read(&sdev->device_busy) == 0 && !scsi_device_blocked(sdev)) + blk_mq_delay_run_hw_queue(hctx, SCSI_QUEUE_DELAY); + return false; } static blk_status_t scsi_queue_rq(struct blk_mq_hw_ctx *hctx,
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c index d236322..3fd109f 100644 --- a/drivers/scsi/scsi_scan.c +++ b/drivers/scsi/scsi_scan.c
@@ -1130,7 +1130,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, * that no LUN is present, so don't add sdev in these cases. * Two specific examples are: * 1) NetApp targets: return PQ=1, PDT=0x1f - * 2) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved" + * 2) IBM/2145 targets: return PQ=1, PDT=0 + * 3) USB UFI: returns PDT=0x1f, with the PQ bits being "reserved" * in the UFI 1.0 spec (we cannot rely on reserved bits). * * References: @@ -1144,8 +1145,8 @@ static int scsi_probe_and_add_lun(struct scsi_target *starget, * PDT=00h Direct-access device (floppy) * PDT=1Fh none (no FDD connected to the requested logical unit) */ - if (((result[0] >> 5) == 1 || starget->pdt_1f_for_no_lun) && - (result[0] & 0x1f) == 0x1f && + if (((result[0] >> 5) == 1 || + (starget->pdt_1f_for_no_lun && (result[0] & 0x1f) == 0x1f)) && !scsi_is_wlun(lun)) { SCSI_LOG_SCAN_BUS(3, sdev_printk(KERN_INFO, sdev, "scsi scan: peripheral device type"
diff --git a/drivers/scsi/scsi_sysfs.c b/drivers/scsi/scsi_sysfs.c index 59e7f20..eceb23d 100644 --- a/drivers/scsi/scsi_sysfs.c +++ b/drivers/scsi/scsi_sysfs.c
@@ -795,14 +795,6 @@ store_state_field(struct device *dev, struct device_attribute *attr, } mutex_lock(&sdev->state_mutex); - switch (sdev->sdev_state) { - case SDEV_RUNNING: - case SDEV_OFFLINE: - break; - default: - mutex_unlock(&sdev->state_mutex); - return -EINVAL; - } if (sdev->sdev_state == SDEV_RUNNING && state == SDEV_RUNNING) { ret = 0; } else {
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c index 6a1428d..0a1734f 100644 --- a/drivers/scsi/ses.c +++ b/drivers/scsi/ses.c
@@ -433,8 +433,8 @@ int ses_match_host(struct enclosure_device *edev, void *data) } #endif /* 0 */ -static int ses_process_descriptor(struct enclosure_component *ecomp, - unsigned char *desc, int max_desc_len) +static void ses_process_descriptor(struct enclosure_component *ecomp, + unsigned char *desc) { int eip = desc[0] & 0x10; int invalid = desc[0] & 0x80; @@ -445,32 +445,22 @@ static int ses_process_descriptor(struct enclosure_component *ecomp, unsigned char *d; if (invalid) - return 0; + return; switch (proto) { case SCSI_PROTOCOL_FCP: if (eip) { - if (max_desc_len <= 7) - return 1; d = desc + 4; slot = d[3]; } break; case SCSI_PROTOCOL_SAS: - if (eip) { - if (max_desc_len <= 27) - return 1; d = desc + 4; slot = d[3]; d = desc + 8; - } else { - if (max_desc_len <= 23) - return 1; + } else d = desc + 4; - } - - /* only take the phy0 addr */ addr = (u64)d[12] << 56 | (u64)d[13] << 48 | @@ -487,8 +477,6 @@ static int ses_process_descriptor(struct enclosure_component *ecomp, } ecomp->slot = slot; scomp->addr = addr; - - return 0; } struct efd { @@ -503,6 +491,9 @@ static int ses_enclosure_find_by_addr(struct enclosure_device *edev, int i; struct ses_component *scomp; + if (!edev->component[0].scratch) + return 0; + for (i = 0; i < edev->components; i++) { scomp = edev->component[i].scratch; if (scomp->addr != efd->addr) @@ -558,7 +549,7 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, /* skip past overall descriptor */ desc_ptr += len + 4; } - if (ses_dev->page10 && ses_dev->page10_len > 9) + if (ses_dev->page10) addl_desc_ptr = ses_dev->page10 + 8; type_ptr = ses_dev->page1_types; components = 0; @@ -566,22 +557,17 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, for (j = 0; j < type_ptr[1]; j++) { char *name = NULL; struct enclosure_component *ecomp; - int max_desc_len; if (desc_ptr) { - if (desc_ptr + 3 >= buf + page7_len) { + if (desc_ptr >= buf + page7_len) { desc_ptr = NULL; } else { len = (desc_ptr[2] << 8) + desc_ptr[3]; desc_ptr += 4; - if (desc_ptr + len > buf + page7_len) - desc_ptr = NULL; - else { - /* Add trailing zero - pushes into - * reserved space */ - desc_ptr[len] = '\0'; - name = desc_ptr; - } + /* Add trailing zero - pushes into + * reserved space */ + desc_ptr[len] = '\0'; + name = desc_ptr; } } if (type_ptr[0] == ENCLOSURE_COMPONENT_DEVICE || @@ -593,20 +579,14 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, components++, type_ptr[0], name); - else if (components < edev->components) - ecomp = &edev->component[components++]; else - ecomp = ERR_PTR(-EINVAL); + ecomp = &edev->component[components++]; if (!IS_ERR(ecomp)) { - if (addl_desc_ptr) { - max_desc_len = ses_dev->page10_len - - (addl_desc_ptr - ses_dev->page10); - if (ses_process_descriptor(ecomp, - addl_desc_ptr, - max_desc_len)) - addl_desc_ptr = NULL; - } + if (addl_desc_ptr) + ses_process_descriptor( + ecomp, + addl_desc_ptr); if (create) enclosure_component_register( ecomp); @@ -623,11 +603,9 @@ static void ses_enclosure_data_process(struct enclosure_device *edev, /* these elements are optional */ type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_TARGET_PORT || type_ptr[0] == ENCLOSURE_COMPONENT_SCSI_INITIATOR_PORT || - type_ptr[0] == ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS)) { + type_ptr[0] == ENCLOSURE_COMPONENT_CONTROLLER_ELECTRONICS)) addl_desc_ptr += addl_desc_ptr[1] + 2; - if (addl_desc_ptr + 1 >= ses_dev->page10 + ses_dev->page10_len) - addl_desc_ptr = NULL; - } + } } kfree(buf); @@ -726,7 +704,6 @@ static int ses_intf_add(struct device *cdev, type_ptr[0] == ENCLOSURE_COMPONENT_ARRAY_DEVICE) components += type_ptr[1]; } - ses_dev->page1 = buf; ses_dev->page1_len = len; buf = NULL; @@ -768,11 +745,9 @@ static int ses_intf_add(struct device *cdev, buf = NULL; } page2_not_supported: - if (components > 0) { - scomp = kcalloc(components, sizeof(struct ses_component), GFP_KERNEL); - if (!scomp) - goto err_free; - } + scomp = kcalloc(components, sizeof(struct ses_component), GFP_KERNEL); + if (!scomp) + goto err_free; edev = enclosure_register(cdev->parent, dev_name(&sdev->sdev_gendev), components, &ses_enclosure_callbacks); @@ -852,8 +827,7 @@ static void ses_intf_remove_enclosure(struct scsi_device *sdev) kfree(ses_dev->page2); kfree(ses_dev); - if (edev->components) - kfree(edev->component[0].scratch); + kfree(edev->component[0].scratch); put_device(&edev->edev); enclosure_unregister(edev);
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c index cc83661..9c6bf13 100644 --- a/drivers/scsi/sg.c +++ b/drivers/scsi/sg.c
@@ -190,7 +190,7 @@ static void sg_link_reserve(Sg_fd * sfp, Sg_request * srp, int size); static void sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp); static Sg_fd *sg_add_sfp(Sg_device * sdp); static void sg_remove_sfp(struct kref *); -static Sg_request *sg_get_rq_mark(Sg_fd * sfp, int pack_id, bool *busy); +static Sg_request *sg_get_rq_mark(Sg_fd * sfp, int pack_id); static Sg_request *sg_add_request(Sg_fd * sfp); static int sg_remove_request(Sg_fd * sfp, Sg_request * srp); static Sg_device *sg_get_dev(int dev); @@ -412,7 +412,6 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos) Sg_fd *sfp; Sg_request *srp; int req_pack_id = -1; - bool busy; sg_io_hdr_t *hp; struct sg_header *old_hdr = NULL; int retval = 0; @@ -460,19 +459,25 @@ sg_read(struct file *filp, char __user *buf, size_t count, loff_t * ppos) } else req_pack_id = old_hdr->pack_id; } - srp = sg_get_rq_mark(sfp, req_pack_id, &busy); + srp = sg_get_rq_mark(sfp, req_pack_id); if (!srp) { /* now wait on packet to arrive */ + if (atomic_read(&sdp->detaching)) { + retval = -ENODEV; + goto free_old_hdr; + } if (filp->f_flags & O_NONBLOCK) { retval = -EAGAIN; goto free_old_hdr; } retval = wait_event_interruptible(sfp->read_wait, - ((srp = sg_get_rq_mark(sfp, req_pack_id, &busy)) || - (!busy && atomic_read(&sdp->detaching)))); - if (!srp) { - /* signal or detaching */ - if (!retval) - retval = -ENODEV; + (atomic_read(&sdp->detaching) || + (srp = sg_get_rq_mark(sfp, req_pack_id)))); + if (atomic_read(&sdp->detaching)) { + retval = -ENODEV; + goto free_old_hdr; + } + if (retval) { + /* -ERESTARTSYS as signal hit process */ goto free_old_hdr; } } @@ -923,7 +928,9 @@ sg_ioctl(struct file *filp, unsigned int cmd_in, unsigned long arg) if (result < 0) return result; result = wait_event_interruptible(sfp->read_wait, - srp_done(sfp, srp)); + (srp_done(sfp, srp) || atomic_read(&sdp->detaching))); + if (atomic_read(&sdp->detaching)) + return -ENODEV; write_lock_irq(&sfp->rq_list_lock); if (srp->done) { srp->done = 2; @@ -2067,28 +2074,19 @@ sg_unlink_reserve(Sg_fd * sfp, Sg_request * srp) } static Sg_request * -sg_get_rq_mark(Sg_fd * sfp, int pack_id, bool *busy) +sg_get_rq_mark(Sg_fd * sfp, int pack_id) { Sg_request *resp; unsigned long iflags; - *busy = false; write_lock_irqsave(&sfp->rq_list_lock, iflags); list_for_each_entry(resp, &sfp->rq_list, entry) { - /* look for requests that are not SG_IO owned */ - if ((!resp->sg_io_owned) && + /* look for requests that are ready + not SG_IO owned */ + if ((1 == resp->done) && (!resp->sg_io_owned) && ((-1 == pack_id) || (resp->header.pack_id == pack_id))) { - switch (resp->done) { - case 0: /* request active */ - *busy = true; - break; - case 1: /* request done; response ready to return */ - resp->done = 2; /* guard against other readers */ - write_unlock_irqrestore(&sfp->rq_list_lock, iflags); - return resp; - case 2: /* response already being returned */ - break; - } + resp->done = 2; /* guard against other readers */ + write_unlock_irqrestore(&sfp->rq_list_lock, iflags); + return resp; } } write_unlock_irqrestore(&sfp->rq_list_lock, iflags); @@ -2142,15 +2140,6 @@ sg_remove_request(Sg_fd * sfp, Sg_request * srp) res = 1; } write_unlock_irqrestore(&sfp->rq_list_lock, iflags); - - /* - * If the device is detaching, wakeup any readers in case we just - * removed the last response, which would leave nothing for them to - * return other than -ENODEV. - */ - if (unlikely(atomic_read(&sfp->parentdp->detaching))) - wake_up_interruptible_all(&sfp->read_wait); - return res; }
diff --git a/drivers/scsi/smartpqi/smartpqi_init.c b/drivers/scsi/smartpqi/smartpqi_init.c index 540d6eb..80ff000 100644 --- a/drivers/scsi/smartpqi/smartpqi_init.c +++ b/drivers/scsi/smartpqi/smartpqi_init.c
@@ -5018,10 +5018,10 @@ static int pqi_raid_submit_scsi_cmd_with_io_request( } switch (scmd->sc_data_direction) { - case DMA_FROM_DEVICE: + case DMA_TO_DEVICE: request->data_direction = SOP_READ_FLAG; break; - case DMA_TO_DEVICE: + case DMA_FROM_DEVICE: request->data_direction = SOP_WRITE_FLAG; break; case DMA_NONE:
diff --git a/drivers/scsi/snic/snic_disc.c b/drivers/scsi/snic/snic_disc.c index 7cf8713..e9ccfb9 100644 --- a/drivers/scsi/snic/snic_disc.c +++ b/drivers/scsi/snic/snic_disc.c
@@ -318,9 +318,6 @@ snic_tgt_create(struct snic *snic, struct snic_tgt_id *tgtid) ret); put_device(&snic->shost->shost_gendev); - spin_lock_irqsave(snic->shost->host_lock, flags); - list_del(&tgt->list); - spin_unlock_irqrestore(snic->shost->host_lock, flags); kfree(tgt); tgt = NULL;
diff --git a/drivers/scsi/stex.c b/drivers/scsi/stex.c index 159ffc2..33287b6 100644 --- a/drivers/scsi/stex.c +++ b/drivers/scsi/stex.c
@@ -668,17 +668,16 @@ stex_queuecommand_lck(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)) return 0; case PASSTHRU_CMD: if (cmd->cmnd[1] == PASSTHRU_GET_DRVVER) { - const struct st_drvver ver = { - .major = ST_VER_MAJOR, - .minor = ST_VER_MINOR, - .oem = ST_OEM, - .build = ST_BUILD_VER, - .signature[0] = PASSTHRU_SIGNATURE, - .console_id = host->max_id - 1, - .host_no = hba->host->host_no, - }; + struct st_drvver ver; size_t cp_len = sizeof(ver); + ver.major = ST_VER_MAJOR; + ver.minor = ST_VER_MINOR; + ver.oem = ST_OEM; + ver.build = ST_BUILD_VER; + ver.signature[0] = PASSTHRU_SIGNATURE; + ver.console_id = host->max_id - 1; + ver.host_no = hba->host->host_no; cp_len = scsi_sg_copy_from_buffer(cmd, &ver, cp_len); cmd->result = sizeof(ver) == cp_len ? DID_OK << 16 | COMMAND_COMPLETE << 8 :
diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c index 8d1b19b..5087ed6 100644 --- a/drivers/scsi/storvsc_drv.c +++ b/drivers/scsi/storvsc_drv.c
@@ -1846,7 +1846,7 @@ static int storvsc_probe(struct hv_device *device, */ host_dev->handle_error_wq = alloc_ordered_workqueue("storvsc_error_wq_%d", - 0, + WQ_MEM_RECLAIM, host->host_no); if (!host_dev->handle_error_wq) goto err_out2;
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index ee6cea7..51c4db6 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c
@@ -9503,6 +9503,5 @@ EXPORT_SYMBOL_GPL(ufshcd_init); MODULE_AUTHOR("Santosh Yaragnavi <santosh.sy@samsung.com>"); MODULE_AUTHOR("Vinayak Holikatti <h.vinayak@samsung.com>"); MODULE_DESCRIPTION("Generic UFS host controller driver Core"); -MODULE_SOFTDEP("pre: governor_simpleondemand"); MODULE_LICENSE("GPL"); MODULE_VERSION(UFSHCD_DRIVER_VERSION);
diff --git a/drivers/siox/siox-core.c b/drivers/siox/siox-core.c index e0ffef6..f8c08fb 100644 --- a/drivers/siox/siox-core.c +++ b/drivers/siox/siox-core.c
@@ -835,8 +835,6 @@ static struct siox_device *siox_device_add(struct siox_master *smaster, err_device_register: /* don't care to make the buffer smaller again */ - put_device(&sdevice->dev); - sdevice = NULL; err_buf_alloc: siox_master_unlock(smaster);
diff --git a/drivers/slimbus/stream.c b/drivers/slimbus/stream.c index 73a2aa3..75f87b3 100644 --- a/drivers/slimbus/stream.c +++ b/drivers/slimbus/stream.c
@@ -67,10 +67,10 @@ static const int slim_presence_rate_table[] = { 384000, 768000, 0, /* Reserved */ - 11025, - 22050, - 44100, - 88200, + 110250, + 220500, + 441000, + 882000, 176400, 352800, 705600,
diff --git a/drivers/soc/bcm/brcmstb/pm/pm-arm.c b/drivers/soc/bcm/brcmstb/pm/pm-arm.c index 722fd54..c6ec7d9 100644 --- a/drivers/soc/bcm/brcmstb/pm/pm-arm.c +++ b/drivers/soc/bcm/brcmstb/pm/pm-arm.c
@@ -681,14 +681,13 @@ static int brcmstb_pm_probe(struct platform_device *pdev) const struct of_device_id *of_id = NULL; struct device_node *dn; void __iomem *base; - int ret, i, s; + int ret, i; /* AON ctrl registers */ base = brcmstb_ioremap_match(aon_ctrl_dt_ids, 0, NULL); if (IS_ERR(base)) { pr_err("error mapping AON_CTRL\n"); - ret = PTR_ERR(base); - goto aon_err; + return PTR_ERR(base); } ctrl.aon_ctrl_base = base; @@ -698,10 +697,8 @@ static int brcmstb_pm_probe(struct platform_device *pdev) /* Assume standard offset */ ctrl.aon_sram = ctrl.aon_ctrl_base + AON_CTRL_SYSTEM_DATA_RAM_OFS; - s = 0; } else { ctrl.aon_sram = base; - s = 1; } writel_relaxed(0, ctrl.aon_sram + AON_REG_PANIC); @@ -711,8 +708,7 @@ static int brcmstb_pm_probe(struct platform_device *pdev) (const void **)&ddr_phy_data); if (IS_ERR(base)) { pr_err("error mapping DDR PHY\n"); - ret = PTR_ERR(base); - goto ddr_phy_err; + return PTR_ERR(base); } ctrl.support_warm_boot = ddr_phy_data->supports_warm_boot; ctrl.pll_status_offset = ddr_phy_data->pll_status_offset; @@ -732,20 +728,17 @@ static int brcmstb_pm_probe(struct platform_device *pdev) for_each_matching_node(dn, ddr_shimphy_dt_ids) { i = ctrl.num_memc; if (i >= MAX_NUM_MEMC) { - of_node_put(dn); pr_warn("too many MEMCs (max %d)\n", MAX_NUM_MEMC); break; } base = of_io_request_and_map(dn, 0, dn->full_name); if (IS_ERR(base)) { - of_node_put(dn); if (!ctrl.support_warm_boot) break; pr_err("error mapping DDR SHIMPHY %d\n", i); - ret = PTR_ERR(base); - goto ddr_shimphy_err; + return PTR_ERR(base); } ctrl.memcs[i].ddr_shimphy_base = base; ctrl.num_memc++; @@ -756,18 +749,14 @@ static int brcmstb_pm_probe(struct platform_device *pdev) for_each_matching_node(dn, brcmstb_memc_of_match) { base = of_iomap(dn, 0); if (!base) { - of_node_put(dn); pr_err("error mapping DDR Sequencer %d\n", i); - ret = -ENOMEM; - goto brcmstb_memc_err; + return -ENOMEM; } of_id = of_match_node(brcmstb_memc_of_match, dn); if (!of_id) { iounmap(base); - of_node_put(dn); - ret = -EINVAL; - goto brcmstb_memc_err; + return -EINVAL; } ddr_seq_data = of_id->data; @@ -787,24 +776,21 @@ static int brcmstb_pm_probe(struct platform_device *pdev) dn = of_find_matching_node(NULL, sram_dt_ids); if (!dn) { pr_err("SRAM not found\n"); - ret = -EINVAL; - goto brcmstb_memc_err; + return -EINVAL; } ret = brcmstb_init_sram(dn); of_node_put(dn); if (ret) { pr_err("error setting up SRAM for PM\n"); - goto brcmstb_memc_err; + return ret; } ctrl.pdev = pdev; ctrl.s3_params = kmalloc(sizeof(*ctrl.s3_params), GFP_KERNEL); - if (!ctrl.s3_params) { - ret = -ENOMEM; - goto s3_params_err; - } + if (!ctrl.s3_params) + return -ENOMEM; ctrl.s3_params_pa = dma_map_single(&pdev->dev, ctrl.s3_params, sizeof(*ctrl.s3_params), DMA_TO_DEVICE); @@ -824,21 +810,7 @@ static int brcmstb_pm_probe(struct platform_device *pdev) out: kfree(ctrl.s3_params); -s3_params_err: - iounmap(ctrl.boot_sram); -brcmstb_memc_err: - for (i--; i >= 0; i--) - iounmap(ctrl.memcs[i].ddr_ctrl); -ddr_shimphy_err: - for (i = 0; i < ctrl.num_memc; i++) - iounmap(ctrl.memcs[i].ddr_shimphy_base); - iounmap(ctrl.memcs[0].ddr_phy_base); -ddr_phy_err: - iounmap(ctrl.aon_ctrl_base); - if (s) - iounmap(ctrl.aon_sram); -aon_err: pr_warn("PM: initialization failed with code %d\n", ret); return ret;
diff --git a/drivers/soc/fsl/Kconfig b/drivers/soc/fsl/Kconfig index df06247..f9ad8ad 100644 --- a/drivers/soc/fsl/Kconfig +++ b/drivers/soc/fsl/Kconfig
@@ -24,7 +24,6 @@ tristate "QorIQ DPAA2 DPIO driver" depends on FSL_MC_BUS select SOC_BUS - select FSL_GUTS help Driver for the DPAA2 DPIO object. A DPIO provides queue and buffer management facilities for software to interact with
diff --git a/drivers/soc/fsl/guts.c b/drivers/soc/fsl/guts.c index 2b7fb7a..34810f9 100644 --- a/drivers/soc/fsl/guts.c +++ b/drivers/soc/fsl/guts.c
@@ -142,7 +142,7 @@ static int fsl_guts_probe(struct platform_device *pdev) struct device *dev = &pdev->dev; struct resource *res; const struct fsl_soc_die_attr *soc_die; - const char *machine = NULL; + const char *machine; u32 svr; /* Initialize guts */
diff --git a/drivers/soc/qcom/Kconfig b/drivers/soc/qcom/Kconfig index 6bd5f6e..68e18c2 100644 --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig
@@ -56,7 +56,6 @@ config QCOM_LLCC tristate "Qualcomm Technologies, Inc. LLCC driver" depends on ARCH_QCOM || COMPILE_TEST - select REGMAP_MMIO help Qualcomm Technologies, Inc. platform specific Last Level Cache Controller(LLCC) driver. This provides interfaces
diff --git a/drivers/soc/qcom/qcom_aoss.c b/drivers/soc/qcom/qcom_aoss.c index bca98df..f16d6ec 100644 --- a/drivers/soc/qcom/qcom_aoss.c +++ b/drivers/soc/qcom/qcom_aoss.c
@@ -489,10 +489,8 @@ static int qmp_cooling_devices_register(struct qmp *qmp) continue; ret = qmp_cooling_device_add(qmp, &qmp->cooling_devs[count++], child); - if (ret) { - of_node_put(child); + if (ret) goto unroll; - } } if (!count)
diff --git a/drivers/soc/qcom/smem_state.c b/drivers/soc/qcom/smem_state.c index 41e9294..d2b5584 100644 --- a/drivers/soc/qcom/smem_state.c +++ b/drivers/soc/qcom/smem_state.c
@@ -136,7 +136,6 @@ static void qcom_smem_state_release(struct kref *ref) struct qcom_smem_state *state = container_of(ref, struct qcom_smem_state, refcount); list_del(&state->list); - of_node_put(state->of_node); kfree(state); } @@ -170,7 +169,7 @@ struct qcom_smem_state *qcom_smem_state_register(struct device_node *of_node, kref_init(&state->refcount); - state->of_node = of_node_get(of_node); + state->of_node = of_node; state->ops = *ops; state->priv = priv;
diff --git a/drivers/soc/qcom/smsm.c b/drivers/soc/qcom/smsm.c index acba67d..6564f15 100644 --- a/drivers/soc/qcom/smsm.c +++ b/drivers/soc/qcom/smsm.c
@@ -511,7 +511,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) for (id = 0; id < smsm->num_hosts; id++) { ret = smsm_parse_ipc(smsm, id); if (ret < 0) - goto out_put; + return ret; } /* Acquire the main SMSM state vector */ @@ -519,14 +519,13 @@ static int qcom_smsm_probe(struct platform_device *pdev) smsm->num_entries * sizeof(u32)); if (ret < 0 && ret != -EEXIST) { dev_err(&pdev->dev, "unable to allocate shared state entry\n"); - goto out_put; + return ret; } states = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_SHARED_STATE, NULL); if (IS_ERR(states)) { dev_err(&pdev->dev, "Unable to acquire shared state entry\n"); - ret = PTR_ERR(states); - goto out_put; + return PTR_ERR(states); } /* Acquire the list of interrupt mask vectors */ @@ -534,14 +533,13 @@ static int qcom_smsm_probe(struct platform_device *pdev) ret = qcom_smem_alloc(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, size); if (ret < 0 && ret != -EEXIST) { dev_err(&pdev->dev, "unable to allocate smsm interrupt mask\n"); - goto out_put; + return ret; } intr_mask = qcom_smem_get(QCOM_SMEM_HOST_ANY, SMEM_SMSM_CPU_INTR_MASK, NULL); if (IS_ERR(intr_mask)) { dev_err(&pdev->dev, "unable to acquire shared memory interrupt mask\n"); - ret = PTR_ERR(intr_mask); - goto out_put; + return PTR_ERR(intr_mask); } /* Setup the reference to the local state bits */ @@ -552,8 +550,7 @@ static int qcom_smsm_probe(struct platform_device *pdev) smsm->state = qcom_smem_state_register(local_node, &smsm_state_ops, smsm); if (IS_ERR(smsm->state)) { dev_err(smsm->dev, "failed to register qcom_smem_state\n"); - ret = PTR_ERR(smsm->state); - goto out_put; + return PTR_ERR(smsm->state); } /* Register handlers for remote processor entries of interest. */ @@ -583,19 +580,16 @@ static int qcom_smsm_probe(struct platform_device *pdev) } platform_set_drvdata(pdev, smsm); - of_node_put(local_node); return 0; unwind_interfaces: - of_node_put(node); for (id = 0; id < smsm->num_entries; id++) if (smsm->entries[id].domain) irq_domain_remove(smsm->entries[id].domain); qcom_smem_state_unregister(smsm->state); -out_put: - of_node_put(local_node); + return ret; }
diff --git a/drivers/soc/sunxi/sunxi_sram.c b/drivers/soc/sunxi/sunxi_sram.c index 33139c7..1b0d50f 100644 --- a/drivers/soc/sunxi/sunxi_sram.c +++ b/drivers/soc/sunxi/sunxi_sram.c
@@ -78,8 +78,8 @@ static struct sunxi_sram_desc sun4i_a10_sram_d = { static struct sunxi_sram_desc sun50i_a64_sram_c = { .data = SUNXI_SRAM_DATA("C", 0x4, 24, 1, - SUNXI_SRAM_MAP(1, 0, "cpu"), - SUNXI_SRAM_MAP(0, 1, "de2")), + SUNXI_SRAM_MAP(0, 1, "cpu"), + SUNXI_SRAM_MAP(1, 0, "de2")), }; static const struct of_device_id sunxi_sram_dt_ids[] = { @@ -254,7 +254,6 @@ int sunxi_sram_claim(struct device *dev) writel(val | ((device << sram_data->offset) & mask), base + sram_data->reg); - sram_desc->claimed = true; spin_unlock(&sram_lock); return 0; @@ -319,11 +318,12 @@ static struct regmap_config sunxi_sram_emac_clock_regmap = { .writeable_reg = sunxi_sram_regmap_accessible_reg, }; -static int __init sunxi_sram_probe(struct platform_device *pdev) +static int sunxi_sram_probe(struct platform_device *pdev) { + struct resource *res; + struct dentry *d; struct regmap *emac_clock; const struct sunxi_sramc_variant *variant; - struct device *dev = &pdev->dev; sram_dev = &pdev->dev; @@ -331,10 +331,18 @@ static int __init sunxi_sram_probe(struct platform_device *pdev) if (!variant) return -EINVAL; - base = devm_platform_ioremap_resource(pdev, 0); + res = platform_get_resource(pdev, IORESOURCE_MEM, 0); + base = devm_ioremap_resource(&pdev->dev, res); if (IS_ERR(base)) return PTR_ERR(base); + of_platform_populate(pdev->dev.of_node, NULL, NULL, &pdev->dev); + + d = debugfs_create_file("sram", S_IRUGO, NULL, NULL, + &sunxi_sram_fops); + if (!d) + return -ENOMEM; + if (variant->has_emac_clock) { emac_clock = devm_regmap_init_mmio(&pdev->dev, base, &sunxi_sram_emac_clock_regmap); @@ -343,10 +351,6 @@ static int __init sunxi_sram_probe(struct platform_device *pdev) return PTR_ERR(emac_clock); } - of_platform_populate(dev->of_node, NULL, NULL, dev); - - debugfs_create_file("sram", 0444, NULL, NULL, &sunxi_sram_fops); - return 0; } @@ -392,8 +396,9 @@ static struct platform_driver sunxi_sram_driver = { .name = "sunxi-sram", .of_match_table = sunxi_sram_dt_match, }, + .probe = sunxi_sram_probe, }; -builtin_platform_driver_probe(sunxi_sram_driver, sunxi_sram_probe); +module_platform_driver(sunxi_sram_driver); MODULE_AUTHOR("Maxime Ripard <maxime.ripard@free-electrons.com>"); MODULE_DESCRIPTION("Allwinner sunXi SRAM Controller Driver");
diff --git a/drivers/soc/ti/knav_qmss_queue.c b/drivers/soc/ti/knav_qmss_queue.c index 341f1c7..b821047 100644 --- a/drivers/soc/ti/knav_qmss_queue.c +++ b/drivers/soc/ti/knav_qmss_queue.c
@@ -64,7 +64,7 @@ static DEFINE_MUTEX(knav_dev_lock); * Newest followed by older ones. Search is done from start of the array * until a firmware file is found. */ -static const char * const knav_acc_firmwares[] = {"ks2_qmss_pdsp_acc48.bin"}; +const char *knav_acc_firmwares[] = {"ks2_qmss_pdsp_acc48.bin"}; static bool device_ready; bool knav_qmss_device_ready(void) @@ -1789,9 +1789,9 @@ static int knav_queue_probe(struct platform_device *pdev) INIT_LIST_HEAD(&kdev->pdsps); pm_runtime_enable(&pdev->dev); - ret = pm_runtime_resume_and_get(&pdev->dev); + ret = pm_runtime_get_sync(&pdev->dev); if (ret < 0) { - pm_runtime_disable(&pdev->dev); + pm_runtime_put_noidle(&pdev->dev); dev_err(dev, "Failed to enable QMSS\n"); return ret; }
diff --git a/drivers/soc/ux500/ux500-soc-id.c b/drivers/soc/ux500/ux500-soc-id.c index 36d1022..d64feeb 100644 --- a/drivers/soc/ux500/ux500-soc-id.c +++ b/drivers/soc/ux500/ux500-soc-id.c
@@ -159,18 +159,20 @@ static ssize_t ux500_get_process(struct device *dev, static const char *db8500_read_soc_id(struct device_node *backupram) { void __iomem *base; + void __iomem *uid; const char *retstr; - u32 uid[5]; base = of_iomap(backupram, 0); if (!base) return NULL; - memcpy_fromio(uid, base + 0x1fc0, sizeof(uid)); + uid = base + 0x1fc0; /* Throw these device-specific numbers into the entropy pool */ - add_device_randomness(uid, sizeof(uid)); + add_device_randomness(uid, 0x14); retstr = kasprintf(GFP_KERNEL, "%08x%08x%08x%08x%08x", - uid[0], uid[1], uid[2], uid[3], uid[4]); + readl((u32 *)uid+0), + readl((u32 *)uid+1), readl((u32 *)uid+2), + readl((u32 *)uid+3), readl((u32 *)uid+4)); iounmap(base); return retstr; }
diff --git a/drivers/soundwire/bus_type.c b/drivers/soundwire/bus_type.c index 2fe5a51..4a465f5 100644 --- a/drivers/soundwire/bus_type.c +++ b/drivers/soundwire/bus_type.c
@@ -155,8 +155,12 @@ int __sdw_register_driver(struct sdw_driver *drv, struct module *owner) drv->driver.owner = owner; drv->driver.probe = sdw_drv_probe; - drv->driver.remove = sdw_drv_remove; - drv->driver.shutdown = sdw_drv_shutdown; + + if (drv->remove) + drv->driver.remove = sdw_drv_remove; + + if (drv->shutdown) + drv->driver.shutdown = sdw_drv_shutdown; return driver_register(&drv->driver); }
diff --git a/drivers/spi/spi-bcm63xx-hsspi.c b/drivers/spi/spi-bcm63xx-hsspi.c index 2ddace1..509476a 100644 --- a/drivers/spi/spi-bcm63xx-hsspi.c +++ b/drivers/spi/spi-bcm63xx-hsspi.c
@@ -20,8 +20,6 @@ #include <linux/spi/spi.h> #include <linux/mutex.h> #include <linux/of.h> -#include <linux/reset.h> -#include <linux/pm_runtime.h> #define HSSPI_GLOBAL_CTRL_REG 0x0 #define GLOBAL_CTRL_CS_POLARITY_SHIFT 0 @@ -163,7 +161,6 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) int step_size = HSSPI_BUFFER_LEN; const u8 *tx = t->tx_buf; u8 *rx = t->rx_buf; - u32 val = 0; bcm63xx_hsspi_set_clk(bs, spi, t->speed_hz); bcm63xx_hsspi_set_cs(bs, spi->chip_select, true); @@ -179,16 +176,11 @@ static int bcm63xx_hsspi_do_txrx(struct spi_device *spi, struct spi_transfer *t) step_size -= HSSPI_OPCODE_LEN; if ((opcode == HSSPI_OP_READ && t->rx_nbits == SPI_NBITS_DUAL) || - (opcode == HSSPI_OP_WRITE && t->tx_nbits == SPI_NBITS_DUAL)) { + (opcode == HSSPI_OP_WRITE && t->tx_nbits == SPI_NBITS_DUAL)) opcode |= HSSPI_OP_MULTIBIT; - if (t->rx_nbits == SPI_NBITS_DUAL) - val |= 1 << MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT; - if (t->tx_nbits == SPI_NBITS_DUAL) - val |= 1 << MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT; - } - - __raw_writel(val | 0xff, + __raw_writel(1 << MODE_CTRL_MULTIDATA_WR_SIZE_SHIFT | + 1 << MODE_CTRL_MULTIDATA_RD_SIZE_SHIFT | 0xff, bs->regs + HSSPI_PROFILE_MODE_CTRL_REG(chip_select)); while (pending > 0) { @@ -436,17 +428,13 @@ static int bcm63xx_hsspi_probe(struct platform_device *pdev) if (ret) goto out_put_master; - pm_runtime_enable(&pdev->dev); - /* register and we are done */ ret = devm_spi_register_master(dev, master); if (ret) - goto out_pm_disable; + goto out_put_master; return 0; -out_pm_disable: - pm_runtime_disable(&pdev->dev); out_put_master: spi_master_put(master); out_disable_pll_clk:
diff --git a/drivers/spi/spi-gpio.c b/drivers/spi/spi-gpio.c index 282c5ee..e7dc1fa 100644 --- a/drivers/spi/spi-gpio.c +++ b/drivers/spi/spi-gpio.c
@@ -244,19 +244,9 @@ static int spi_gpio_set_direction(struct spi_device *spi, bool output) if (output) return gpiod_direction_output(spi_gpio->mosi, 1); - /* - * Only change MOSI to an input if using 3WIRE mode. - * Otherwise, MOSI could be left floating if there is - * no pull resistor connected to the I/O pin, or could - * be left logic high if there is a pull-up. Transmitting - * logic high when only clocking MISO data in can put some - * SPI devices in to a bad state. - */ - if (spi->mode & SPI_3WIRE) { - ret = gpiod_direction_input(spi_gpio->mosi); - if (ret) - return ret; - } + ret = gpiod_direction_input(spi_gpio->mosi); + if (ret) + return ret; /* * Send a turnaround high impedance cycle when switching * from output to input. Theoretically there should be
diff --git a/drivers/spi/spi-imx.c b/drivers/spi/spi-imx.c index 9d59367..474d5a7 100644 --- a/drivers/spi/spi-imx.c +++ b/drivers/spi/spi-imx.c
@@ -431,7 +431,8 @@ static unsigned int mx51_ecspi_clkdiv(struct spi_imx_data *spi_imx, unsigned int pre, post; unsigned int fin = spi_imx->spi_clk; - fspi = min(fspi, fin); + if (unlikely(fspi > fin)) + return 0; post = fls(fin) - fls(fspi); if (fin > fspi << post)
diff --git a/drivers/spi/spi-omap-100k.c b/drivers/spi/spi-omap-100k.c index 89d89ad..f64d030 100644 --- a/drivers/spi/spi-omap-100k.c +++ b/drivers/spi/spi-omap-100k.c
@@ -416,7 +416,6 @@ static int omap1_spi100k_probe(struct platform_device *pdev) return status; err_fck: - pm_runtime_disable(&pdev->dev); clk_disable_unprepare(spi100k->fck); err_ick: clk_disable_unprepare(spi100k->ick);
diff --git a/drivers/spi/spi-qup.c b/drivers/spi/spi-qup.c index ead6c21..d1dfb52 100644 --- a/drivers/spi/spi-qup.c +++ b/drivers/spi/spi-qup.c
@@ -1199,10 +1199,8 @@ static int spi_qup_pm_resume_runtime(struct device *device) return ret; ret = clk_prepare_enable(controller->cclk); - if (ret) { - clk_disable_unprepare(controller->iclk); + if (ret) return ret; - } /* Disable clocks auto gaiting */ config = readl_relaxed(controller->base + QUP_CONFIG); @@ -1248,25 +1246,14 @@ static int spi_qup_resume(struct device *device) return ret; ret = clk_prepare_enable(controller->cclk); - if (ret) { - clk_disable_unprepare(controller->iclk); + if (ret) return ret; - } ret = spi_qup_set_state(controller, QUP_STATE_RESET); if (ret) - goto disable_clk; + return ret; - ret = spi_master_resume(master); - if (ret) - goto disable_clk; - - return 0; - -disable_clk: - clk_disable_unprepare(controller->cclk); - clk_disable_unprepare(controller->iclk); - return ret; + return spi_master_resume(master); } #endif /* CONFIG_PM_SLEEP */
diff --git a/drivers/spi/spi-rspi.c b/drivers/spi/spi-rspi.c index 8ae2ac4..0524741 100644 --- a/drivers/spi/spi-rspi.c +++ b/drivers/spi/spi-rspi.c
@@ -595,10 +595,6 @@ static int rspi_dma_transfer(struct rspi_data *rspi, struct sg_table *tx, rspi->dma_callbacked, HZ); if (ret > 0 && rspi->dma_callbacked) { ret = 0; - if (tx) - dmaengine_synchronize(rspi->ctlr->dma_tx); - if (rx) - dmaengine_synchronize(rspi->ctlr->dma_rx); } else { if (!ret) { dev_err(&rspi->ctlr->dev, "DMA timeout\n");
diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c index d942056..1d948fe 100644 --- a/drivers/spi/spi-s3c64xx.c +++ b/drivers/spi/spi-s3c64xx.c
@@ -84,7 +84,6 @@ #define S3C64XX_SPI_ST_TX_FIFORDY (1<<0) #define S3C64XX_SPI_PACKET_CNT_EN (1<<16) -#define S3C64XX_SPI_PACKET_CNT_MASK GENMASK(15, 0) #define S3C64XX_SPI_PND_TX_UNDERRUN_CLR (1<<4) #define S3C64XX_SPI_PND_TX_OVERRUN_CLR (1<<3) @@ -655,13 +654,6 @@ static int s3c64xx_spi_prepare_message(struct spi_master *master, return 0; } -static size_t s3c64xx_spi_max_transfer_size(struct spi_device *spi) -{ - struct spi_controller *ctlr = spi->controller; - - return ctlr->can_dma ? S3C64XX_SPI_PACKET_CNT_MASK : SIZE_MAX; -} - static int s3c64xx_spi_transfer_one(struct spi_master *master, struct spi_device *spi, struct spi_transfer *xfer) @@ -1126,7 +1118,6 @@ static int s3c64xx_spi_probe(struct platform_device *pdev) master->prepare_transfer_hardware = s3c64xx_spi_prepare_transfer; master->prepare_message = s3c64xx_spi_prepare_message; master->transfer_one = s3c64xx_spi_transfer_one; - master->max_transfer_size = s3c64xx_spi_max_transfer_size; master->num_chipselect = sci->num_cs; master->dma_alignment = 8; master->bits_per_word_mask = SPI_BPW_MASK(32) | SPI_BPW_MASK(16) |
diff --git a/drivers/spi/spi-stm32.c b/drivers/spi/spi-stm32.c index e843e94..9ae1609 100644 --- a/drivers/spi/spi-stm32.c +++ b/drivers/spi/spi-stm32.c
@@ -444,7 +444,7 @@ static int stm32_spi_prepare_mbr(struct stm32_spi *spi, u32 speed_hz, u32 div, mbrdiv; /* Ensure spi->clk_rate is even */ - div = DIV_ROUND_CLOSEST(spi->clk_rate & ~0x1, speed_hz); + div = DIV_ROUND_UP(spi->clk_rate & ~0x1, speed_hz); /* * SPI framework set xfer->speed_hz to master->max_speed_hz if @@ -937,7 +937,6 @@ static irqreturn_t stm32h7_spi_irq_thread(int irq, void *dev_id) static DEFINE_RATELIMIT_STATE(rs, DEFAULT_RATELIMIT_INTERVAL * 10, 1); - ratelimit_set_flags(&rs, RATELIMIT_MSG_ON_RELEASE); if (__ratelimit(&rs)) dev_dbg_ratelimited(spi->dev, "Communication suspended\n"); if (!spi->cur_usedma && (spi->rx_buf && (spi->rx_len > 0)))
diff --git a/drivers/spi/spi-synquacer.c b/drivers/spi/spi-synquacer.c index 5d6e4a5..785e7c4 100644 --- a/drivers/spi/spi-synquacer.c +++ b/drivers/spi/spi-synquacer.c
@@ -472,9 +472,10 @@ static int synquacer_spi_transfer_one(struct spi_master *master, read_fifo(sspi); } - if (status == 0) { - dev_err(sspi->dev, "failed to transfer. Timeout.\n"); - return -ETIMEDOUT; + if (status < 0) { + dev_err(sspi->dev, "failed to transfer. status: 0x%x\n", + status); + return status; } return 0; @@ -783,7 +784,6 @@ static int __maybe_unused synquacer_spi_resume(struct device *dev) ret = synquacer_spi_enable(master); if (ret) { - clk_disable_unprepare(sspi->clk); dev_err(dev, "failed to enable spi (%d)\n", ret); return ret; }
diff --git a/drivers/spi/spidev.c b/drivers/spi/spidev.c index 6d6fc7d..be503a0 100644 --- a/drivers/spi/spidev.c +++ b/drivers/spi/spidev.c
@@ -373,23 +373,12 @@ spidev_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) switch (cmd) { /* read requests */ case SPI_IOC_RD_MODE: + retval = put_user(spi->mode & SPI_MODE_MASK, + (__u8 __user *)arg); + break; case SPI_IOC_RD_MODE32: - tmp = spi->mode; - - { - struct spi_controller *ctlr = spi->controller; - - if (ctlr->use_gpio_descriptors && ctlr->cs_gpiods && - ctlr->cs_gpiods[spi->chip_select]) - tmp &= ~SPI_CS_HIGH; - } - - if (cmd == SPI_IOC_RD_MODE) - retval = put_user(tmp & SPI_MODE_MASK, - (__u8 __user *)arg); - else - retval = put_user(tmp & SPI_MODE_MASK, - (__u32 __user *)arg); + retval = put_user(spi->mode & SPI_MODE_MASK, + (__u32 __user *)arg); break; case SPI_IOC_RD_LSB_FIRST: retval = put_user((spi->mode & SPI_LSB_FIRST) ? 1 : 0, @@ -588,6 +577,7 @@ static int spidev_open(struct inode *inode, struct file *filp) if (!spidev->tx_buffer) { spidev->tx_buffer = kmalloc(bufsiz, GFP_KERNEL); if (!spidev->tx_buffer) { + dev_dbg(&spidev->spi->dev, "open/ENOMEM\n"); status = -ENOMEM; goto err_find_dev; } @@ -596,6 +586,7 @@ static int spidev_open(struct inode *inode, struct file *filp) if (!spidev->rx_buffer) { spidev->rx_buffer = kmalloc(bufsiz, GFP_KERNEL); if (!spidev->rx_buffer) { + dev_dbg(&spidev->spi->dev, "open/ENOMEM\n"); status = -ENOMEM; goto err_alloc_rx_buf; }
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c index e6de2ae..bbbd311 100644 --- a/drivers/spmi/spmi-pmic-arb.c +++ b/drivers/spmi/spmi-pmic-arb.c
@@ -887,8 +887,7 @@ static int pmic_arb_read_apid_map_v5(struct spmi_pmic_arb *pmic_arb) * version 5, there is more than one APID mapped to each PPID. * The owner field for each of these mappings specifies the EE which is * allowed to write to the APID. The owner of the last (highest) APID - * which has the IRQ owner bit set for a given PPID will receive - * interrupts from the PPID. + * for a given PPID will receive interrupts from the PPID. */ for (i = 0; ; i++, apidd++) { offset = pmic_arb->ver_ops->apid_map_offset(i); @@ -911,16 +910,16 @@ static int pmic_arb_read_apid_map_v5(struct spmi_pmic_arb *pmic_arb) apid = pmic_arb->ppid_to_apid[ppid] & ~PMIC_ARB_APID_VALID; prev_apidd = &pmic_arb->apid_data[apid]; - if (!valid || apidd->write_ee == pmic_arb->ee) { - /* First PPID mapping or one for this EE */ - pmic_arb->ppid_to_apid[ppid] = i | PMIC_ARB_APID_VALID; - } else if (valid && is_irq_ee && - prev_apidd->write_ee == pmic_arb->ee) { + if (valid && is_irq_ee && + prev_apidd->write_ee == pmic_arb->ee) { /* * Duplicate PPID mapping after the one for this EE; * override the irq owner */ prev_apidd->irq_ee = apidd->irq_ee; + } else if (!valid || is_irq_ee) { + /* First PPID mapping or duplicate for another EE */ + pmic_arb->ppid_to_apid[ppid] = i | PMIC_ARB_APID_VALID; } apidd->ppid = ppid;
diff --git a/drivers/staging/comedi/drivers/adv_pci1760.c b/drivers/staging/comedi/drivers/adv_pci1760.c index 0f6faf2..f460f21 100644 --- a/drivers/staging/comedi/drivers/adv_pci1760.c +++ b/drivers/staging/comedi/drivers/adv_pci1760.c
@@ -59,7 +59,7 @@ #define PCI1760_CMD_CLR_IMB2 0x00 /* Clears IMB2 */ #define PCI1760_CMD_SET_DO 0x01 /* Set output state */ #define PCI1760_CMD_GET_DO 0x02 /* Read output status */ -#define PCI1760_CMD_GET_STATUS 0x07 /* Read current status */ +#define PCI1760_CMD_GET_STATUS 0x03 /* Read current status */ #define PCI1760_CMD_GET_FW_VER 0x0e /* Read firmware version */ #define PCI1760_CMD_GET_HW_VER 0x0f /* Read hardware version */ #define PCI1760_CMD_SET_PWM_HI(x) (0x10 + (x) * 2) /* Set "hi" period */
diff --git a/drivers/staging/emxx_udc/emxx_udc.c b/drivers/staging/emxx_udc/emxx_udc.c index 7d18ad6..cc4c18c 100644 --- a/drivers/staging/emxx_udc/emxx_udc.c +++ b/drivers/staging/emxx_udc/emxx_udc.c
@@ -2593,15 +2593,10 @@ static int nbu2ss_ep_queue(struct usb_ep *_ep, req->unaligned = false; if (req->unaligned) { - if (!ep->virt_buf) { + if (!ep->virt_buf) ep->virt_buf = dma_alloc_coherent(udc->dev, PAGE_SIZE, &ep->phys_buf, GFP_ATOMIC | GFP_DMA); - if (!ep->virt_buf) { - spin_unlock_irqrestore(&udc->lock, flags); - return -ENOMEM; - } - } if (ep->epnum > 0) { if (ep->direct == USB_DIR_IN) memcpy(ep->virt_buf, req->req.buf,
diff --git a/drivers/staging/media/meson/vdec/vdec.c b/drivers/staging/media/meson/vdec/vdec.c index a242bbe..8dd1396 100644 --- a/drivers/staging/media/meson/vdec/vdec.c +++ b/drivers/staging/media/meson/vdec/vdec.c
@@ -1074,7 +1074,6 @@ static int vdec_probe(struct platform_device *pdev) err_vdev_release: video_device_release(vdev); - v4l2_device_unregister(&core->v4l2_dev); return ret; } @@ -1083,7 +1082,6 @@ static int vdec_remove(struct platform_device *pdev) struct amvdec_core *core = platform_get_drvdata(pdev); video_unregister_device(core->vdev_dec); - v4l2_device_unregister(&core->v4l2_dev); return 0; }
diff --git a/drivers/staging/media/sunxi/cedrus/cedrus.c b/drivers/staging/media/sunxi/cedrus/cedrus.c index 6ad4488..e80e82a 100644 --- a/drivers/staging/media/sunxi/cedrus/cedrus.c +++ b/drivers/staging/media/sunxi/cedrus/cedrus.c
@@ -323,8 +323,6 @@ static int cedrus_probe(struct platform_device *pdev) if (!dev) return -ENOMEM; - platform_set_drvdata(pdev, dev); - dev->vfd = cedrus_video_device; dev->dev = &pdev->dev; dev->pdev = pdev; @@ -394,6 +392,8 @@ static int cedrus_probe(struct platform_device *pdev) goto err_m2m_mc; } + platform_set_drvdata(pdev, dev); + return 0; err_m2m_mc:
diff --git a/drivers/staging/most/dim2/dim2.c b/drivers/staging/most/dim2/dim2.c index 774abed..64c9791 100644 --- a/drivers/staging/most/dim2/dim2.c +++ b/drivers/staging/most/dim2/dim2.c
@@ -47,7 +47,7 @@ MODULE_PARM_DESC(fcnt, "Num of frames per sub-buffer for sync channels as a powe static DEFINE_SPINLOCK(dim_lock); static void dim2_tasklet_fn(unsigned long data); -static DECLARE_TASKLET_OLD(dim2_tasklet, dim2_tasklet_fn); +static DECLARE_TASKLET(dim2_tasklet, dim2_tasklet_fn, 0); /** * struct hdm_channel - private structure to keep channel specific data
diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c index 100b235..fe6e1ae 100644 --- a/drivers/staging/octeon/ethernet-tx.c +++ b/drivers/staging/octeon/ethernet-tx.c
@@ -41,7 +41,7 @@ #endif static void cvm_oct_tx_do_cleanup(unsigned long arg); -static DECLARE_TASKLET_OLD(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup); +static DECLARE_TASKLET(cvm_oct_tx_cleanup_tasklet, cvm_oct_tx_do_cleanup, 0); /* Maximum number of SKBs to try to free per xmit packet. */ #define MAX_SKB_TO_FREE (MAX_OUT_QUEUE_DEPTH * 2)
diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c index 458ecca..20e4941 100644 --- a/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c +++ b/drivers/staging/rtl8192e/rtl8192e/rtl_dm.c
@@ -185,6 +185,7 @@ static void _rtl92e_dm_init_fsync(struct net_device *dev); static void _rtl92e_dm_deinit_fsync(struct net_device *dev); static void _rtl92e_dm_check_txrateandretrycount(struct net_device *dev); +static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev); static void _rtl92e_dm_check_fsync(struct net_device *dev); static void _rtl92e_dm_check_rf_ctrl_gpio(void *data); static void _rtl92e_dm_fsync_timer_callback(struct timer_list *t); @@ -237,6 +238,8 @@ void rtl92e_dm_watchdog(struct net_device *dev) if (priv->being_init_adapter) return; + _rtl92e_dm_check_ac_dc_power(dev); + _rtl92e_dm_check_txrateandretrycount(dev); _rtl92e_dm_check_edca_turbo(dev); @@ -254,6 +257,30 @@ void rtl92e_dm_watchdog(struct net_device *dev) _rtl92e_dm_cts_to_self(dev); } +static void _rtl92e_dm_check_ac_dc_power(struct net_device *dev) +{ + struct r8192_priv *priv = rtllib_priv(dev); + static char const ac_dc_script[] = "/etc/acpi/wireless-rtl-ac-dc-power.sh"; + char *argv[] = {(char *)ac_dc_script, DRV_NAME, NULL}; + static char *envp[] = {"HOME=/", + "TERM=linux", + "PATH=/usr/bin:/bin", + NULL}; + + if (priv->ResetProgress == RESET_TYPE_SILENT) { + RT_TRACE((COMP_INIT | COMP_POWER | COMP_RF), + "GPIOChangeRFWorkItemCallBack(): Silent Reset!!!!!!!\n"); + return; + } + + if (priv->rtllib->state != RTLLIB_LINKED) + return; + call_usermodehelper(ac_dc_script, argv, envp, UMH_WAIT_PROC); + + return; +}; + + void rtl92e_init_adaptive_rate(struct net_device *dev) { @@ -1773,6 +1800,10 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) u8 tmp1byte; enum rt_rf_power_state eRfPowerStateToSet; bool bActuallySet = false; + char *argv[3]; + static char const RadioPowerPath[] = "/etc/acpi/events/RadioPower.sh"; + static char *envp[] = {"HOME=/", "TERM=linux", "PATH=/usr/bin:/bin", + NULL}; bActuallySet = false; @@ -1804,6 +1835,14 @@ static void _rtl92e_dm_check_rf_ctrl_gpio(void *data) mdelay(1000); priv->bHwRfOffAction = 1; rtl92e_set_rf_state(dev, eRfPowerStateToSet, RF_CHANGE_BY_HW); + if (priv->bHwRadioOff) + argv[1] = "RFOFF"; + else + argv[1] = "RFON"; + + argv[0] = (char *)RadioPowerPath; + argv[2] = NULL; + call_usermodehelper(RadioPowerPath, argv, envp, UMH_WAIT_PROC); } }
diff --git a/drivers/staging/rtl8192e/rtllib_rx.c b/drivers/staging/rtl8192e/rtllib_rx.c index a78f914..83c30e2 100644 --- a/drivers/staging/rtl8192e/rtllib_rx.c +++ b/drivers/staging/rtl8192e/rtllib_rx.c
@@ -1490,9 +1490,9 @@ static int rtllib_rx_Monitor(struct rtllib_device *ieee, struct sk_buff *skb, hdrlen += 4; } + rtllib_monitor_rx(ieee, skb, rx_stats, hdrlen); ieee->stats.rx_packets++; ieee->stats.rx_bytes += skb->len; - rtllib_monitor_rx(ieee, skb, rx_stats, hdrlen); return 1; }
diff --git a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c index d51f734..00e34c3 100644 --- a/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c
@@ -943,11 +943,9 @@ int ieee80211_rx(struct ieee80211_device *ieee, struct sk_buff *skb, #endif if (ieee->iw_mode == IW_MODE_MONITOR) { - unsigned int len = skb->len; - ieee80211_monitor_rx(ieee, skb, rx_stats); stats->rx_packets++; - stats->rx_bytes += len; + stats->rx_bytes += skb->len; return 1; }
diff --git a/drivers/staging/rtl8192u/r8192U.h b/drivers/staging/rtl8192u/r8192U.h index 57badc1..ec33fb9 100644 --- a/drivers/staging/rtl8192u/r8192U.h +++ b/drivers/staging/rtl8192u/r8192U.h
@@ -1013,7 +1013,7 @@ typedef struct r8192_priv { bool bis_any_nonbepkts; bool bcurrent_turbo_EDCA; bool bis_cur_rdlstate; - struct delayed_work fsync_work; + struct timer_list fsync_timer; bool bfsync_processing; /* 500ms Fsync timer is active or not */ u32 rate_record; u32 rateCountDiffRecord;
diff --git a/drivers/staging/rtl8192u/r8192U_dm.c b/drivers/staging/rtl8192u/r8192U_dm.c index 30b272d..c23e43b 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.c +++ b/drivers/staging/rtl8192u/r8192U_dm.c
@@ -2585,20 +2585,19 @@ static void dm_init_fsync(struct net_device *dev) priv->ieee80211->fsync_seconddiff_ratethreshold = 200; priv->ieee80211->fsync_state = Default_Fsync; priv->framesyncMonitor = 1; /* current default 0xc38 monitor on */ - INIT_DELAYED_WORK(&priv->fsync_work, dm_fsync_work_callback); + timer_setup(&priv->fsync_timer, dm_fsync_timer_callback, 0); } static void dm_deInit_fsync(struct net_device *dev) { struct r8192_priv *priv = ieee80211_priv(dev); - cancel_delayed_work_sync(&priv->fsync_work); + del_timer_sync(&priv->fsync_timer); } -void dm_fsync_work_callback(struct work_struct *work) +void dm_fsync_timer_callback(struct timer_list *t) { - struct r8192_priv *priv = - container_of(work, struct r8192_priv, fsync_work.work); + struct r8192_priv *priv = from_timer(priv, t, fsync_timer); struct net_device *dev = priv->ieee80211->dev; u32 rate_index, rate_count = 0, rate_count_diff = 0; bool bSwitchFromCountDiff = false; @@ -2665,16 +2664,17 @@ void dm_fsync_work_callback(struct work_struct *work) } } if (bDoubleTimeInterval) { - cancel_delayed_work_sync(&priv->fsync_work); - schedule_delayed_work(&priv->fsync_work, - msecs_to_jiffies(priv - ->ieee80211->fsync_time_interval * - priv->ieee80211->fsync_multiple_timeinterval)); + if (timer_pending(&priv->fsync_timer)) + del_timer_sync(&priv->fsync_timer); + priv->fsync_timer.expires = jiffies + + msecs_to_jiffies(priv->ieee80211->fsync_time_interval*priv->ieee80211->fsync_multiple_timeinterval); + add_timer(&priv->fsync_timer); } else { - cancel_delayed_work_sync(&priv->fsync_work); - schedule_delayed_work(&priv->fsync_work, - msecs_to_jiffies(priv - ->ieee80211->fsync_time_interval)); + if (timer_pending(&priv->fsync_timer)) + del_timer_sync(&priv->fsync_timer); + priv->fsync_timer.expires = jiffies + + msecs_to_jiffies(priv->ieee80211->fsync_time_interval); + add_timer(&priv->fsync_timer); } } else { /* Let Register return to default value; */ @@ -2702,7 +2702,7 @@ static void dm_EndSWFsync(struct net_device *dev) struct r8192_priv *priv = ieee80211_priv(dev); RT_TRACE(COMP_HALDM, "%s\n", __func__); - cancel_delayed_work_sync(&priv->fsync_work); + del_timer_sync(&(priv->fsync_timer)); /* Let Register return to default value; */ if (priv->bswitch_fsync) { @@ -2744,9 +2744,11 @@ static void dm_StartSWFsync(struct net_device *dev) if (priv->ieee80211->fsync_rate_bitmap & rateBitmap) priv->rate_record += priv->stats.received_rate_histogram[1][rateIndex]; } - cancel_delayed_work_sync(&priv->fsync_work); - schedule_delayed_work(&priv->fsync_work, - msecs_to_jiffies(priv->ieee80211->fsync_time_interval)); + if (timer_pending(&priv->fsync_timer)) + del_timer_sync(&priv->fsync_timer); + priv->fsync_timer.expires = jiffies + + msecs_to_jiffies(priv->ieee80211->fsync_time_interval); + add_timer(&priv->fsync_timer); write_nic_dword(dev, rOFDM0_RxDetector2, 0x465c12cd);
diff --git a/drivers/staging/rtl8192u/r8192U_dm.h b/drivers/staging/rtl8192u/r8192U_dm.h index 2159018..0b2a1c6 100644 --- a/drivers/staging/rtl8192u/r8192U_dm.h +++ b/drivers/staging/rtl8192u/r8192U_dm.h
@@ -166,7 +166,7 @@ void dm_force_tx_fw_info(struct net_device *dev, void dm_init_edca_turbo(struct net_device *dev); void dm_rf_operation_test_callback(unsigned long data); void dm_rf_pathcheck_workitemcallback(struct work_struct *work); -void dm_fsync_work_callback(struct work_struct *work); +void dm_fsync_timer_callback(struct timer_list *t); void dm_cck_txpower_adjust(struct net_device *dev, bool binch14); void dm_shadow_init(struct net_device *dev); void dm_initialize_txpower_tracking(struct net_device *dev);
diff --git a/drivers/staging/rtl8712/rtl8712_cmd.c b/drivers/staging/rtl8712/rtl8712_cmd.c index 30e965c..ff3cb09 100644 --- a/drivers/staging/rtl8712/rtl8712_cmd.c +++ b/drivers/staging/rtl8712/rtl8712_cmd.c
@@ -117,6 +117,34 @@ static void r871x_internal_cmd_hdl(struct _adapter *padapter, u8 *pbuf) kfree(pdrvcmd->pbuf); } +static u8 read_macreg_hdl(struct _adapter *padapter, u8 *pbuf) +{ + void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); + struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; + + /* invoke cmd->callback function */ + pcmd_callback = cmd_callback[pcmd->cmdcode].callback; + if (!pcmd_callback) + r8712_free_cmd_obj(pcmd); + else + pcmd_callback(padapter, pcmd); + return H2C_SUCCESS; +} + +static u8 write_macreg_hdl(struct _adapter *padapter, u8 *pbuf) +{ + void (*pcmd_callback)(struct _adapter *dev, struct cmd_obj *pcmd); + struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; + + /* invoke cmd->callback function */ + pcmd_callback = cmd_callback[pcmd->cmdcode].callback; + if (!pcmd_callback) + r8712_free_cmd_obj(pcmd); + else + pcmd_callback(padapter, pcmd); + return H2C_SUCCESS; +} + static u8 read_bbreg_hdl(struct _adapter *padapter, u8 *pbuf) { struct cmd_obj *pcmd = (struct cmd_obj *)pbuf; @@ -185,6 +213,14 @@ static struct cmd_obj *cmd_hdl_filter(struct _adapter *padapter, pcmd_r = NULL; switch (pcmd->cmdcode) { + case GEN_CMD_CODE(_Read_MACREG): + read_macreg_hdl(padapter, (u8 *)pcmd); + pcmd_r = pcmd; + break; + case GEN_CMD_CODE(_Write_MACREG): + write_macreg_hdl(padapter, (u8 *)pcmd); + pcmd_r = pcmd; + break; case GEN_CMD_CODE(_Read_BBREG): read_bbreg_hdl(padapter, (u8 *)pcmd); break;
diff --git a/drivers/staging/rtl8723bs/core/rtw_cmd.c b/drivers/staging/rtl8723bs/core/rtw_cmd.c index a82114d..8d93c2f 100644 --- a/drivers/staging/rtl8723bs/core/rtw_cmd.c +++ b/drivers/staging/rtl8723bs/core/rtw_cmd.c
@@ -165,6 +165,8 @@ No irqsave is necessary. int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) { + int res = 0; + init_completion(&pcmdpriv->cmd_queue_comp); init_completion(&pcmdpriv->terminate_cmdthread_comp); @@ -176,16 +178,18 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_allocated_buf = rtw_zmalloc(MAX_CMDSZ + CMDBUFF_ALIGN_SZ); - if (!pcmdpriv->cmd_allocated_buf) - return -ENOMEM; + if (!pcmdpriv->cmd_allocated_buf) { + res = -ENOMEM; + goto exit; + } pcmdpriv->cmd_buf = pcmdpriv->cmd_allocated_buf + CMDBUFF_ALIGN_SZ - ((SIZE_PTR)(pcmdpriv->cmd_allocated_buf) & (CMDBUFF_ALIGN_SZ-1)); pcmdpriv->rsp_allocated_buf = rtw_zmalloc(MAX_RSPSZ + 4); if (!pcmdpriv->rsp_allocated_buf) { - kfree(pcmdpriv->cmd_allocated_buf); - return -ENOMEM; + res = -ENOMEM; + goto exit; } pcmdpriv->rsp_buf = pcmdpriv->rsp_allocated_buf + 4 - ((SIZE_PTR)(pcmdpriv->rsp_allocated_buf) & 3); @@ -193,8 +197,8 @@ int rtw_init_cmd_priv(struct cmd_priv *pcmdpriv) pcmdpriv->cmd_issued_cnt = pcmdpriv->cmd_done_cnt = pcmdpriv->rsp_cnt = 0; mutex_init(&pcmdpriv->sctx_mutex); - - return 0; +exit: + return res; } static void c2h_wk_callback(_workitem *work);
diff --git a/drivers/staging/speakup/main.c b/drivers/staging/speakup/main.c index 11c3b47..81ecfd1 100644 --- a/drivers/staging/speakup/main.c +++ b/drivers/staging/speakup/main.c
@@ -1781,7 +1781,7 @@ static void speakup_con_update(struct vc_data *vc) { unsigned long flags; - if (!speakup_console[vc->vc_num] || spk_parked || !synth) + if (!speakup_console[vc->vc_num] || spk_parked) return; if (!spin_trylock_irqsave(&speakup_info.spinlock, flags)) /* Speakup output, discard */
diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/device_main.c index 18284c4..0823029 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c
@@ -560,7 +560,7 @@ static int device_init_rd0_ring(struct vnt_private *priv) kfree(desc->rd_info); err_free_desc: - while (i--) { + while (--i) { desc = &priv->aRD0Ring[i]; device_free_rx_buf(priv, desc); kfree(desc->rd_info); @@ -606,7 +606,7 @@ static int device_init_rd1_ring(struct vnt_private *priv) kfree(desc->rd_info); err_free_desc: - while (i--) { + while (--i) { desc = &priv->aRD1Ring[i]; device_free_rx_buf(priv, desc); kfree(desc->rd_info); @@ -670,7 +670,7 @@ static int device_init_td0_ring(struct vnt_private *priv) return 0; err_free_desc: - while (i--) { + while (--i) { desc = &priv->apTD0Rings[i]; kfree(desc->td_info); } @@ -710,7 +710,7 @@ static int device_init_td1_ring(struct vnt_private *priv) return 0; err_free_desc: - while (i--) { + while (--i) { desc = &priv->apTD1Rings[i]; kfree(desc->td_info); }
diff --git a/drivers/staging/wilc1000/wilc_netdev.c b/drivers/staging/wilc1000/wilc_netdev.c index f34b1f0..508acb8 100644 --- a/drivers/staging/wilc1000/wilc_netdev.c +++ b/drivers/staging/wilc1000/wilc_netdev.c
@@ -717,15 +717,14 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) if (skb->dev != ndev) { netdev_err(ndev, "Packet not destined to this device\n"); - dev_kfree_skb(skb); - return NETDEV_TX_OK; + return 0; } tx_data = kmalloc(sizeof(*tx_data), GFP_ATOMIC); if (!tx_data) { dev_kfree_skb(skb); netif_wake_queue(ndev); - return NETDEV_TX_OK; + return 0; } tx_data->buff = skb->data; @@ -749,7 +748,7 @@ netdev_tx_t wilc_mac_xmit(struct sk_buff *skb, struct net_device *ndev) mutex_unlock(&wilc->vif_mutex); } - return NETDEV_TX_OK; + return 0; } static int wilc_mac_close(struct net_device *ndev)
diff --git a/drivers/staging/wilc1000/wilc_sdio.c b/drivers/staging/wilc1000/wilc_sdio.c index 22a30da..c787c5d 100644 --- a/drivers/staging/wilc1000/wilc_sdio.c +++ b/drivers/staging/wilc1000/wilc_sdio.c
@@ -20,7 +20,6 @@ static const struct sdio_device_id wilc_sdio_ids[] = { { SDIO_DEVICE(SDIO_VENDOR_ID_WILC, SDIO_DEVICE_ID_WILC) }, { }, }; -MODULE_DEVICE_TABLE(sdio, wilc_sdio_ids); #define WILC_SDIO_BLOCK_SIZE 512
diff --git a/drivers/target/iscsi/iscsi_target_parameters.c b/drivers/target/iscsi/iscsi_target_parameters.c index 31cd3c0..7a461fb 100644 --- a/drivers/target/iscsi/iscsi_target_parameters.c +++ b/drivers/target/iscsi/iscsi_target_parameters.c
@@ -1262,20 +1262,18 @@ static struct iscsi_param *iscsi_check_key( return param; if (!(param->phase & phase)) { - char *phase_name; - + pr_err("Key \"%s\" may not be negotiated during ", + param->name); switch (phase) { case PHASE_SECURITY: - phase_name = "Security"; + pr_debug("Security phase.\n"); break; case PHASE_OPERATIONAL: - phase_name = "Operational"; + pr_debug("Operational phase.\n"); break; default: - phase_name = "Unknown"; + pr_debug("Unknown phase.\n"); } - pr_err("Key \"%s\" may not be negotiated during %s phase.\n", - param->name, phase_name); return NULL; }
diff --git a/drivers/target/loopback/tcm_loop.c b/drivers/target/loopback/tcm_loop.c index 5ae5d94..16d5a4e 100644 --- a/drivers/target/loopback/tcm_loop.c +++ b/drivers/target/loopback/tcm_loop.c
@@ -394,7 +394,6 @@ static int tcm_loop_setup_hba_bus(struct tcm_loop_hba *tl_hba, int tcm_loop_host ret = device_register(&tl_hba->dev); if (ret) { pr_err("device_register() failed for tl_hba->dev: %d\n", ret); - put_device(&tl_hba->dev); return -ENODEV; } @@ -1073,7 +1072,7 @@ static struct se_wwn *tcm_loop_make_scsi_hba( */ ret = tcm_loop_setup_hba_bus(tl_hba, tcm_loop_hba_no_cnt); if (ret) - return ERR_PTR(ret); + goto out; sh = tl_hba->sh; tcm_loop_hba_no_cnt++;
diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c index 18fbbe5..7143d03 100644 --- a/drivers/target/target_core_file.c +++ b/drivers/target/target_core_file.c
@@ -340,7 +340,7 @@ static int fd_do_rw(struct se_cmd *cmd, struct file *fd, len += sg->length; } - iov_iter_bvec(&iter, is_write, bvec, sgl_nents, len); + iov_iter_bvec(&iter, READ, bvec, sgl_nents, len); if (is_write) ret = vfs_iter_write(fd, &iter, &pos, 0); else @@ -477,7 +477,7 @@ fd_execute_write_same(struct se_cmd *cmd) len += se_dev->dev_attrib.block_size; } - iov_iter_bvec(&iter, WRITE, bvec, nolb, len); + iov_iter_bvec(&iter, READ, bvec, nolb, len); ret = vfs_iter_write(fd_dev->fd_file, &iter, &pos, 0); kfree(bvec);
diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c index 6928ebf..feeba39 100644 --- a/drivers/target/target_core_tmr.c +++ b/drivers/target/target_core_tmr.c
@@ -82,8 +82,8 @@ static bool __target_check_io_state(struct se_cmd *se_cmd, { struct se_session *sess = se_cmd->se_sess; - lockdep_assert_held(&sess->sess_cmd_lock); - + assert_spin_locked(&sess->sess_cmd_lock); + WARN_ON_ONCE(!irqs_disabled()); /* * If command already reached CMD_T_COMPLETE state within * target_complete_cmd() or CMD_T_FABRIC_STOP due to shutdown,
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c index 71c491c..acff7dd 100644 --- a/drivers/tee/optee/device.c +++ b/drivers/tee/optee/device.c
@@ -89,7 +89,7 @@ static int optee_register_device(const uuid_t *device_uuid, u32 device_id) rc = device_register(&optee_device->dev); if (rc) { pr_err("device registration failed, err: %d\n", rc); - put_device(&optee_device->dev); + kfree(optee_device); } return rc;
diff --git a/drivers/tee/tee_core.c b/drivers/tee/tee_core.c index 2db144d..a7ccd4d 100644 --- a/drivers/tee/tee_core.c +++ b/drivers/tee/tee_core.c
@@ -182,9 +182,6 @@ tee_ioctl_shm_register(struct tee_context *ctx, if (data.flags) return -EINVAL; - if (!access_ok((void __user *)(unsigned long)data.addr, data.length)) - return -EFAULT; - shm = tee_shm_register(ctx, data.addr, data.length, TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED); if (IS_ERR(shm))
diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c index bee6d35..2d26ae8 100644 --- a/drivers/thermal/hisi_thermal.c +++ b/drivers/thermal/hisi_thermal.c
@@ -435,6 +435,10 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data) data->sensor[0].irq_name = "tsensor_a73"; data->sensor[0].data = data; + data->sensor[1].id = HI3660_LITTLE_SENSOR; + data->sensor[1].irq_name = "tsensor_a53"; + data->sensor[1].data = data; + return 0; }
diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index b542757..8025b21 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig
@@ -60,8 +60,7 @@ config INTEL_BXT_PMIC_THERMAL tristate "Intel Broxton PMIC thermal driver" - depends on X86 && INTEL_SOC_PMIC_BXTWC - select REGMAP + depends on X86 && INTEL_SOC_PMIC_BXTWC && REGMAP help Select this driver for Intel Broxton PMIC with ADC channels monitoring system temperature measurements and alerts.
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c index 9090f87..c313c4f 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.c
@@ -43,13 +43,11 @@ static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone, int trip, int *temp) { struct int34x_thermal_zone *d = zone->devdata; - int i, ret = 0; + int i; if (d->override_ops && d->override_ops->get_trip_temp) return d->override_ops->get_trip_temp(zone, trip, temp); - mutex_lock(&d->trip_mutex); - if (trip < d->aux_trip_nr) *temp = d->aux_trips[trip]; else if (trip == d->crt_trip_id) @@ -67,12 +65,10 @@ static int int340x_thermal_get_trip_temp(struct thermal_zone_device *zone, } } if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT) - ret = -EINVAL; + return -EINVAL; } - mutex_unlock(&d->trip_mutex); - - return ret; + return 0; } static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone, @@ -80,13 +76,11 @@ static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone, enum thermal_trip_type *type) { struct int34x_thermal_zone *d = zone->devdata; - int i, ret = 0; + int i; if (d->override_ops && d->override_ops->get_trip_type) return d->override_ops->get_trip_type(zone, trip, type); - mutex_lock(&d->trip_mutex); - if (trip < d->aux_trip_nr) *type = THERMAL_TRIP_PASSIVE; else if (trip == d->crt_trip_id) @@ -104,12 +98,10 @@ static int int340x_thermal_get_trip_type(struct thermal_zone_device *zone, } } if (i == INT340X_THERMAL_MAX_ACT_TRIP_COUNT) - ret = -EINVAL; + return -EINVAL; } - mutex_unlock(&d->trip_mutex); - - return ret; + return 0; } static int int340x_thermal_set_trip_temp(struct thermal_zone_device *zone, @@ -181,8 +173,6 @@ int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone) int trip_cnt = int34x_zone->aux_trip_nr; int i; - mutex_lock(&int34x_zone->trip_mutex); - int34x_zone->crt_trip_id = -1; if (!int340x_thermal_get_trip_config(int34x_zone->adev->handle, "_CRT", &int34x_zone->crt_temp)) @@ -210,8 +200,6 @@ int int340x_thermal_read_trips(struct int34x_thermal_zone *int34x_zone) int34x_zone->act_trips[i].valid = true; } - mutex_unlock(&int34x_zone->trip_mutex); - return trip_cnt; } EXPORT_SYMBOL_GPL(int340x_thermal_read_trips); @@ -235,8 +223,6 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, if (!int34x_thermal_zone) return ERR_PTR(-ENOMEM); - mutex_init(&int34x_thermal_zone->trip_mutex); - int34x_thermal_zone->adev = adev; int34x_thermal_zone->override_ops = override_ops; @@ -283,7 +269,6 @@ struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *adev, acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table); kfree(int34x_thermal_zone->aux_trips); err_trip_alloc: - mutex_destroy(&int34x_thermal_zone->trip_mutex); kfree(int34x_thermal_zone); return ERR_PTR(ret); } @@ -295,7 +280,6 @@ void int340x_thermal_zone_remove(struct int34x_thermal_zone thermal_zone_device_unregister(int34x_thermal_zone->zone); acpi_lpat_free_conversion_table(int34x_thermal_zone->lpat_table); kfree(int34x_thermal_zone->aux_trips); - mutex_destroy(&int34x_thermal_zone->trip_mutex); kfree(int34x_thermal_zone); } EXPORT_SYMBOL_GPL(int340x_thermal_zone_remove);
diff --git a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h index 8f9872a..3b4971d 100644 --- a/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h +++ b/drivers/thermal/intel/int340x_thermal/int340x_thermal_zone.h
@@ -32,7 +32,6 @@ struct int34x_thermal_zone { struct thermal_zone_device_ops *override_ops; void *priv_data; struct acpi_lpat_conversion_table *lpat_table; - struct mutex trip_mutex; }; struct int34x_thermal_zone *int340x_thermal_zone_add(struct acpi_device *,
diff --git a/drivers/thermal/intel/intel_powerclamp.c b/drivers/thermal/intel/intel_powerclamp.c index d24f637..53216dc 100644 --- a/drivers/thermal/intel/intel_powerclamp.c +++ b/drivers/thermal/intel/intel_powerclamp.c
@@ -57,7 +57,6 @@ static unsigned int target_mwait; static struct dentry *debug_dir; -static bool poll_pkg_cstate_enable; /* user selected target */ static unsigned int set_target_ratio; @@ -266,9 +265,6 @@ static unsigned int get_compensation(int ratio) { unsigned int comp = 0; - if (!poll_pkg_cstate_enable) - return 0; - /* we only use compensation if all adjacent ones are good */ if (ratio == 1 && cal_data[ratio].confidence >= CONFIDENCE_OK && @@ -538,11 +534,12 @@ static int start_power_clamp(void) get_online_cpus(); /* prefer BSP */ - control_cpu = cpumask_first(cpu_online_mask); + control_cpu = 0; + if (!cpu_online(control_cpu)) + control_cpu = smp_processor_id(); clamping = true; - if (poll_pkg_cstate_enable) - schedule_delayed_work(&poll_pkg_cstate_work, 0); + schedule_delayed_work(&poll_pkg_cstate_work, 0); /* start one kthread worker per online cpu */ for_each_online_cpu(cpu) { @@ -611,15 +608,11 @@ static int powerclamp_get_max_state(struct thermal_cooling_device *cdev, static int powerclamp_get_cur_state(struct thermal_cooling_device *cdev, unsigned long *state) { - if (clamping) { - if (poll_pkg_cstate_enable) - *state = pkg_cstate_ratio_cur; - else - *state = set_target_ratio; - } else { + if (true == clamping) + *state = pkg_cstate_ratio_cur; + else /* to save power, do not poll idle ratio while not clamping */ *state = -1; /* indicates invalid state */ - } return 0; } @@ -744,9 +737,6 @@ static int __init powerclamp_init(void) goto exit_unregister; } - if (topology_max_packages() == 1 && topology_max_die_per_package() == 1) - poll_pkg_cstate_enable = true; - cooling_dev = thermal_cooling_device_register("intel_powerclamp", NULL, &powerclamp_cooling_ops); if (IS_ERR(cooling_dev)) {
diff --git a/drivers/thermal/intel/intel_quark_dts_thermal.c b/drivers/thermal/intel/intel_quark_dts_thermal.c index ad92d8f..5d33b35 100644 --- a/drivers/thermal/intel/intel_quark_dts_thermal.c +++ b/drivers/thermal/intel/intel_quark_dts_thermal.c
@@ -440,14 +440,22 @@ MODULE_DEVICE_TABLE(x86cpu, qrk_thermal_ids); static int __init intel_quark_thermal_init(void) { + int err = 0; + if (!x86_match_cpu(qrk_thermal_ids) || !iosf_mbi_available()) return -ENODEV; soc_dts = alloc_soc_dts(); - if (IS_ERR(soc_dts)) - return PTR_ERR(soc_dts); + if (IS_ERR(soc_dts)) { + err = PTR_ERR(soc_dts); + goto err_free; + } return 0; + +err_free: + free_soc_dts(soc_dts); + return err; } static void __exit intel_quark_thermal_exit(void)
diff --git a/drivers/thermal/intel/intel_soc_dts_iosf.c b/drivers/thermal/intel/intel_soc_dts_iosf.c index 410f13f..5716b62 100644 --- a/drivers/thermal/intel/intel_soc_dts_iosf.c +++ b/drivers/thermal/intel/intel_soc_dts_iosf.c
@@ -396,7 +396,7 @@ struct intel_soc_dts_sensors *intel_soc_dts_iosf_init( { struct intel_soc_dts_sensors *sensors; bool notification; - int tj_max; + u32 tj_max; int ret; int i;
diff --git a/drivers/thermal/thermal_sysfs.c b/drivers/thermal/thermal_sysfs.c index 17b2361..4dce4a8 100644 --- a/drivers/thermal/thermal_sysfs.c +++ b/drivers/thermal/thermal_sysfs.c
@@ -909,13 +909,12 @@ static const struct attribute_group cooling_device_stats_attr_group = { static void cooling_device_stats_setup(struct thermal_cooling_device *cdev) { - const struct attribute_group *stats_attr_group = NULL; struct cooling_dev_stats *stats; unsigned long states; int var; if (cdev->ops->get_max_state(cdev, &states)) - goto out; + return; states++; /* Total number of states is highest state + 1 */ @@ -925,7 +924,7 @@ static void cooling_device_stats_setup(struct thermal_cooling_device *cdev) stats = kzalloc(var, GFP_KERNEL); if (!stats) - goto out; + return; stats->time_in_state = (ktime_t *)(stats + 1); stats->trans_table = (unsigned int *)(stats->time_in_state + states); @@ -935,12 +934,9 @@ static void cooling_device_stats_setup(struct thermal_cooling_device *cdev) spin_lock_init(&stats->lock); - stats_attr_group = &cooling_device_stats_attr_group; - -out: /* Fill the empty slot left in cooling_device_attr_groups */ var = ARRAY_SIZE(cooling_device_attr_groups) - 2; - cooling_device_attr_groups[var] = stats_attr_group; + cooling_device_attr_groups[var] = &cooling_device_stats_attr_group; } static void cooling_device_stats_destroy(struct thermal_cooling_device *cdev)
diff --git a/drivers/thunderbolt/ctl.c b/drivers/thunderbolt/ctl.c index fd074c6..2ec1af8 100644 --- a/drivers/thunderbolt/ctl.c +++ b/drivers/thunderbolt/ctl.c
@@ -388,7 +388,7 @@ static void tb_ctl_rx_submit(struct ctl_pkg *pkg) static int tb_async_error(const struct ctl_pkg *pkg) { - const struct cfg_error_pkg *error = pkg->buffer; + const struct cfg_error_pkg *error = (const struct cfg_error_pkg *)pkg; if (pkg->frame.eof != TB_CFG_PKG_ERROR) return false;
diff --git a/drivers/thunderbolt/nhi.c b/drivers/thunderbolt/nhi.c index 8a117d1..73a698e 100644 --- a/drivers/thunderbolt/nhi.c +++ b/drivers/thunderbolt/nhi.c
@@ -40,7 +40,7 @@ #define NHI_MAILBOX_TIMEOUT 500 /* ms */ -static int ring_interrupt_index(const struct tb_ring *ring) +static int ring_interrupt_index(struct tb_ring *ring) { int bit = ring->hop; if (!ring->is_tx)
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c index bf8bb9c..2d2d04c 100644 --- a/drivers/tty/hvc/hvc_xen.c +++ b/drivers/tty/hvc/hvc_xen.c
@@ -43,7 +43,6 @@ struct xencons_info { int irq; int vtermno; grant_ref_t gntref; - spinlock_t ring_lock; }; static LIST_HEAD(xenconsoles); @@ -53,22 +52,17 @@ static DEFINE_SPINLOCK(xencons_lock); static struct xencons_info *vtermno_to_xencons(int vtermno) { - struct xencons_info *entry, *ret = NULL; - unsigned long flags; + struct xencons_info *entry, *n, *ret = NULL; - spin_lock_irqsave(&xencons_lock, flags); - if (list_empty(&xenconsoles)) { - spin_unlock_irqrestore(&xencons_lock, flags); - return NULL; - } + if (list_empty(&xenconsoles)) + return NULL; - list_for_each_entry(entry, &xenconsoles, list) { + list_for_each_entry_safe(entry, n, &xenconsoles, list) { if (entry->vtermno == vtermno) { ret = entry; break; } } - spin_unlock_irqrestore(&xencons_lock, flags); return ret; } @@ -90,15 +84,12 @@ static int __write_console(struct xencons_info *xencons, XENCONS_RING_IDX cons, prod; struct xencons_interface *intf = xencons->intf; int sent = 0; - unsigned long flags; - spin_lock_irqsave(&xencons->ring_lock, flags); cons = intf->out_cons; prod = intf->out_prod; mb(); /* update queue values before going on */ if ((prod - cons) > sizeof(intf->out)) { - spin_unlock_irqrestore(&xencons->ring_lock, flags); pr_err_once("xencons: Illegal ring page indices"); return -EINVAL; } @@ -108,7 +99,6 @@ static int __write_console(struct xencons_info *xencons, wmb(); /* write ring before updating pointer */ intf->out_prod = prod; - spin_unlock_irqrestore(&xencons->ring_lock, flags); if (sent) notify_daemon(xencons); @@ -151,19 +141,16 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len) int recv = 0; struct xencons_info *xencons = vtermno_to_xencons(vtermno); unsigned int eoiflag = 0; - unsigned long flags; if (xencons == NULL) return -EINVAL; intf = xencons->intf; - spin_lock_irqsave(&xencons->ring_lock, flags); cons = intf->in_cons; prod = intf->in_prod; mb(); /* get pointers before reading ring */ if ((prod - cons) > sizeof(intf->in)) { - spin_unlock_irqrestore(&xencons->ring_lock, flags); pr_err_once("xencons: Illegal ring page indices"); return -EINVAL; } @@ -187,13 +174,10 @@ static int domU_read_console(uint32_t vtermno, char *buf, int len) xencons->out_cons = intf->out_cons; xencons->out_cons_same = 0; } - if (!recv && xencons->out_cons_same++ > 1) { - eoiflag = XEN_EOI_FLAG_SPURIOUS; - } - spin_unlock_irqrestore(&xencons->ring_lock, flags); - if (recv) { notify_daemon(xencons); + } else if (xencons->out_cons_same++ > 1) { + eoiflag = XEN_EOI_FLAG_SPURIOUS; } xen_irq_lateeoi(xencons->irq, eoiflag); @@ -239,7 +223,7 @@ static int xen_hvm_console_init(void) { int r; uint64_t v = 0; - unsigned long gfn, flags; + unsigned long gfn; struct xencons_info *info; if (!xen_hvm_domain()) @@ -250,7 +234,6 @@ static int xen_hvm_console_init(void) info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL); if (!info) return -ENOMEM; - spin_lock_init(&info->ring_lock); } else if (info->intf != NULL) { /* already configured */ return 0; @@ -275,9 +258,9 @@ static int xen_hvm_console_init(void) goto err; info->vtermno = HVC_COOKIE; - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); list_add_tail(&info->list, &xenconsoles); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); return 0; err: @@ -287,7 +270,6 @@ static int xen_hvm_console_init(void) static int xencons_info_pv_init(struct xencons_info *info, int vtermno) { - spin_lock_init(&info->ring_lock); info->evtchn = xen_start_info->console.domU.evtchn; /* GFN == MFN for PV guest */ info->intf = gfn_to_virt(xen_start_info->console.domU.mfn); @@ -301,7 +283,6 @@ static int xencons_info_pv_init(struct xencons_info *info, int vtermno) static int xen_pv_console_init(void) { struct xencons_info *info; - unsigned long flags; if (!xen_pv_domain()) return -ENODEV; @@ -318,9 +299,9 @@ static int xen_pv_console_init(void) /* already configured */ return 0; } - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); xencons_info_pv_init(info, HVC_COOKIE); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); return 0; } @@ -328,7 +309,6 @@ static int xen_pv_console_init(void) static int xen_initial_domain_console_init(void) { struct xencons_info *info; - unsigned long flags; if (!xen_initial_domain()) return -ENODEV; @@ -338,15 +318,14 @@ static int xen_initial_domain_console_init(void) info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL); if (!info) return -ENOMEM; - spin_lock_init(&info->ring_lock); } info->irq = bind_virq_to_irq(VIRQ_CONSOLE, 0, false); info->vtermno = HVC_COOKIE; - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); list_add_tail(&info->list, &xenconsoles); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); return 0; } @@ -401,12 +380,10 @@ static void xencons_free(struct xencons_info *info) static int xen_console_remove(struct xencons_info *info) { - unsigned long flags; - xencons_disconnect_backend(info); - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); list_del(&info->list); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); if (info->xbdev != NULL) xencons_free(info); else { @@ -487,7 +464,6 @@ static int xencons_probe(struct xenbus_device *dev, { int ret, devid; struct xencons_info *info; - unsigned long flags; devid = dev->nodename[strlen(dev->nodename) - 1] - '0'; if (devid == 0) @@ -496,7 +472,6 @@ static int xencons_probe(struct xenbus_device *dev, info = kzalloc(sizeof(struct xencons_info), GFP_KERNEL); if (!info) return -ENOMEM; - spin_lock_init(&info->ring_lock); dev_set_drvdata(&dev->dev, info); info->xbdev = dev; info->vtermno = xenbus_devid_to_vtermno(devid); @@ -507,9 +482,9 @@ static int xencons_probe(struct xenbus_device *dev, ret = xencons_connect_backend(dev, info); if (ret < 0) goto error; - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); list_add_tail(&info->list, &xenconsoles); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); return 0; @@ -608,12 +583,10 @@ static int __init xen_hvc_init(void) info->hvc = hvc_alloc(HVC_COOKIE, info->irq, ops, 256); if (IS_ERR(info->hvc)) { - unsigned long flags; - r = PTR_ERR(info->hvc); - spin_lock_irqsave(&xencons_lock, flags); + spin_lock(&xencons_lock); list_del(&info->list); - spin_unlock_irqrestore(&xencons_lock, flags); + spin_unlock(&xencons_lock); if (info->irq) unbind_from_irqhandler(info->irq, NULL); kfree(info);
diff --git a/drivers/tty/n_gsm.c b/drivers/tty/n_gsm.c index 98c67dd..907a4d0 100644 --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c
@@ -411,27 +411,6 @@ static int gsm_read_ea(unsigned int *val, u8 c) } /** - * gsm_read_ea_val - read a value until EA - * @val: variable holding value - * @data: buffer of data - * @dlen: length of data - * - * Processes an EA value. Updates the passed variable and - * returns the processed data length. - */ -static unsigned int gsm_read_ea_val(unsigned int *val, const u8 *data, int dlen) -{ - unsigned int len = 0; - - for (; dlen > 0; dlen--) { - len++; - if (gsm_read_ea(val, *data++)) - break; - } - return len; -} - -/** * gsm_encode_modem - encode modem data bits * @dlci: DLCI to encode from * @@ -679,37 +658,6 @@ static struct gsm_msg *gsm_data_alloc(struct gsm_mux *gsm, u8 addr, int len, } /** - * gsm_is_flow_ctrl_msg - checks if flow control message - * @msg: message to check - * - * Returns true if the given message is a flow control command of the - * control channel. False is returned in any other case. - */ -static bool gsm_is_flow_ctrl_msg(struct gsm_msg *msg) -{ - unsigned int cmd; - - if (msg->addr > 0) - return false; - - switch (msg->ctrl & ~PF) { - case UI: - case UIH: - cmd = 0; - if (gsm_read_ea_val(&cmd, msg->data + 2, msg->len - 2) < 1) - break; - switch (cmd & ~PF) { - case CMD_FCOFF: - case CMD_FCON: - return true; - } - break; - } - - return false; -} - -/** * gsm_data_kick - poke the queue * @gsm: GSM Mux * @@ -727,7 +675,7 @@ static void gsm_data_kick(struct gsm_mux *gsm, struct gsm_dlci *dlci) int len; list_for_each_entry_safe(msg, nmsg, &gsm->tx_list, list) { - if (gsm->constipated && !gsm_is_flow_ctrl_msg(msg)) + if (gsm->constipated && msg->addr) continue; if (gsm->encoding != 0) { gsm->txframe[0] = GSM1_SOF; @@ -1382,7 +1330,7 @@ static void gsm_control_retransmit(struct timer_list *t) spin_lock_irqsave(&gsm->control_lock, flags); ctrl = gsm->pending_cmd; if (ctrl) { - if (gsm->cretries == 0 || !gsm->dlci[0] || gsm->dlci[0]->dead) { + if (gsm->cretries == 0) { gsm->pending_cmd = NULL; ctrl->error = -ETIMEDOUT; ctrl->done = 1; @@ -1413,7 +1361,7 @@ static struct gsm_control *gsm_control_send(struct gsm_mux *gsm, unsigned int command, u8 *data, int clen) { struct gsm_control *ctrl = kzalloc(sizeof(struct gsm_control), - GFP_ATOMIC); + GFP_KERNEL); unsigned long flags; if (ctrl == NULL) return NULL; @@ -1534,8 +1482,8 @@ static void gsm_dlci_t1(struct timer_list *t) switch (dlci->state) { case DLCI_OPENING: + dlci->retries--; if (dlci->retries) { - dlci->retries--; gsm_command(dlci->gsm, dlci->addr, SABM|PF); mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100); } else if (!dlci->addr && gsm->control == (DM | PF)) { @@ -1550,8 +1498,8 @@ static void gsm_dlci_t1(struct timer_list *t) break; case DLCI_CLOSING: + dlci->retries--; if (dlci->retries) { - dlci->retries--; gsm_command(dlci->gsm, dlci->addr, DISC|PF); mod_timer(&dlci->t1, jiffies + gsm->t1 * HZ / 100); } else @@ -1894,7 +1842,7 @@ static void gsm_queue(struct gsm_mux *gsm) goto invalid; #endif if (dlci == NULL || dlci->state != DLCI_OPEN) { - gsm_response(gsm, address, DM|PF); + gsm_command(gsm, address, DM|PF); return; } dlci->data(dlci, gsm->buf, gsm->len); @@ -2651,24 +2599,11 @@ static ssize_t gsmld_read(struct tty_struct *tty, struct file *file, static ssize_t gsmld_write(struct tty_struct *tty, struct file *file, const unsigned char *buf, size_t nr) { - struct gsm_mux *gsm = tty->disc_data; - unsigned long flags; - int space; - int ret; - - if (!gsm) - return -ENODEV; - - ret = -ENOBUFS; - spin_lock_irqsave(&gsm->tx_lock, flags); - space = tty_write_room(tty); + int space = tty_write_room(tty); if (space >= nr) - ret = tty->ops->write(tty, buf, nr); - else - set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); - spin_unlock_irqrestore(&gsm->tx_lock, flags); - - return ret; + return tty->ops->write(tty, buf, nr); + set_bit(TTY_DO_WRITE_WAKEUP, &tty->flags); + return -ENOBUFS; } /** @@ -2693,15 +2628,12 @@ static __poll_t gsmld_poll(struct tty_struct *tty, struct file *file, poll_wait(file, &tty->read_wait, wait); poll_wait(file, &tty->write_wait, wait); - - if (gsm->dead) - mask |= EPOLLHUP; if (tty_hung_up_p(file)) mask |= EPOLLHUP; - if (test_bit(TTY_OTHER_CLOSED, &tty->flags)) - mask |= EPOLLHUP; if (!tty_is_writelocked(tty) && tty_write_room(tty) > 0) mask |= EPOLLOUT | EPOLLWRNORM; + if (gsm->dead) + mask |= EPOLLHUP; return mask; }
diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c index bdc7bb7..890fa7d 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c
@@ -46,39 +46,19 @@ static void __dma_rx_complete(void *param) struct uart_8250_dma *dma = p->dma; struct tty_port *tty_port = &p->port.state->port; struct dma_tx_state state; - enum dma_status dma_status; int count; - /* - * New DMA Rx can be started during the completion handler before it - * could acquire port's lock and it might still be ongoing. Don't to - * anything in such case. - */ - dma_status = dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); - if (dma_status == DMA_IN_PROGRESS) - return; + dma->rx_running = 0; + dmaengine_tx_status(dma->rxchan, dma->rx_cookie, &state); count = dma->rx_size - state.residue; tty_insert_flip_string(tty_port, dma->rx_buf, count); p->port.icount.rx += count; - dma->rx_running = 0; tty_flip_buffer_push(tty_port); } -static void dma_rx_complete(void *param) -{ - struct uart_8250_port *p = param; - struct uart_8250_dma *dma = p->dma; - unsigned long flags; - - spin_lock_irqsave(&p->port.lock, flags); - if (dma->rx_running) - __dma_rx_complete(p); - spin_unlock_irqrestore(&p->port.lock, flags); -} - int serial8250_tx_dma(struct uart_8250_port *p) { struct uart_8250_dma *dma = p->dma; @@ -141,7 +121,7 @@ int serial8250_rx_dma(struct uart_8250_port *p) return -EBUSY; dma->rx_running = 1; - desc->callback = dma_rx_complete; + desc->callback = __dma_rx_complete; desc->callback_param = p; dma->rx_cookie = dmaengine_submit(desc);
diff --git a/drivers/tty/serial/8250/8250_dw.c b/drivers/tty/serial/8250/8250_dw.c index 2d5a039..381c511 100644 --- a/drivers/tty/serial/8250/8250_dw.c +++ b/drivers/tty/serial/8250/8250_dw.c
@@ -110,15 +110,12 @@ static void dw8250_check_lcr(struct uart_port *p, int value) /* Returns once the transmitter is empty or we run out of retries */ static void dw8250_tx_wait_empty(struct uart_port *p) { - struct uart_8250_port *up = up_to_u8250p(p); unsigned int tries = 20000; unsigned int delay_threshold = tries - 1000; unsigned int lsr; while (tries--) { lsr = readb (p->membase + (UART_LSR << p->regshift)); - up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS; - if (lsr & UART_LSR_TEMT) break;
diff --git a/drivers/tty/serial/8250/8250_em.c b/drivers/tty/serial/8250/8250_em.c index 5670c8a..2a76e22 100644 --- a/drivers/tty/serial/8250/8250_em.c +++ b/drivers/tty/serial/8250/8250_em.c
@@ -102,8 +102,8 @@ static int serial8250_em_probe(struct platform_device *pdev) memset(&up, 0, sizeof(up)); up.port.mapbase = regs->start; up.port.irq = irq->start; - up.port.type = PORT_16750; - up.port.flags = UPF_FIXED_PORT | UPF_IOREMAP | UPF_FIXED_TYPE; + up.port.type = PORT_UNKNOWN; + up.port.flags = UPF_BOOT_AUTOCONF | UPF_FIXED_PORT | UPF_IOREMAP; up.port.dev = &pdev->dev; up.port.private_data = priv;
diff --git a/drivers/tty/serial/8250/8250_lpss.c b/drivers/tty/serial/8250/8250_lpss.c index 406af8b..5f72ef3 100644 --- a/drivers/tty/serial/8250/8250_lpss.c +++ b/drivers/tty/serial/8250/8250_lpss.c
@@ -258,13 +258,8 @@ static int lpss8250_dma_setup(struct lpss8250 *lpss, struct uart_8250_port *port struct dw_dma_slave *rx_param, *tx_param; struct device *dev = port->port.dev; - if (!lpss->dma_param.dma_dev) { - dma = port->dma; - if (dma) - goto out_configuration_only; - + if (!lpss->dma_param.dma_dev) return 0; - } rx_param = devm_kzalloc(dev, sizeof(*rx_param), GFP_KERNEL); if (!rx_param) @@ -275,18 +270,16 @@ static int lpss8250_dma_setup(struct lpss8250 *lpss, struct uart_8250_port *port return -ENOMEM; *rx_param = lpss->dma_param; + dma->rxconf.src_maxburst = lpss->dma_maxburst; + *tx_param = lpss->dma_param; + dma->txconf.dst_maxburst = lpss->dma_maxburst; dma->fn = lpss8250_dma_filter; dma->rx_param = rx_param; dma->tx_param = tx_param; port->dma = dma; - -out_configuration_only: - dma->rxconf.src_maxburst = lpss->dma_maxburst; - dma->txconf.dst_maxburst = lpss->dma_maxburst; - return 0; }
diff --git a/drivers/tty/serial/8250/8250_omap.c b/drivers/tty/serial/8250/8250_omap.c index 928b35b..efe793a 100644 --- a/drivers/tty/serial/8250/8250_omap.c +++ b/drivers/tty/serial/8250/8250_omap.c
@@ -169,10 +169,27 @@ static void omap8250_set_mctrl(struct uart_port *port, unsigned int mctrl) static void omap_8250_mdr1_errataset(struct uart_8250_port *up, struct omap8250_priv *priv) { + u8 timeout = 255; + serial_out(up, UART_OMAP_MDR1, priv->mdr1); udelay(2); serial_out(up, UART_FCR, up->fcr | UART_FCR_CLEAR_XMIT | UART_FCR_CLEAR_RCVR); + /* + * Wait for FIFO to empty: when empty, RX_FIFO_E bit is 0 and + * TX_FIFO_E bit is 1. + */ + while (UART_LSR_THRE != (serial_in(up, UART_LSR) & + (UART_LSR_THRE | UART_LSR_DR))) { + timeout--; + if (!timeout) { + /* Should *never* happen. we warn and carry on */ + dev_crit(up->port.dev, "Errata i202: timedout %x\n", + serial_in(up, UART_LSR)); + break; + } + udelay(1); + } } static void omap_8250_get_divisor(struct uart_port *port, unsigned int baud, @@ -251,7 +268,6 @@ static void omap8250_restore_regs(struct uart_8250_port *up) { struct omap8250_priv *priv = up->port.private_data; struct uart_8250_dma *dma = up->dma; - u8 mcr = serial8250_in_MCR(up); if (dma && dma->tx_running) { /* @@ -268,7 +284,7 @@ static void omap8250_restore_regs(struct uart_8250_port *up) serial_out(up, UART_EFR, UART_EFR_ECB); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A); - serial8250_out_MCR(up, mcr | UART_MCR_TCRTLR); + serial8250_out_MCR(up, UART_MCR_TCRTLR); serial_out(up, UART_FCR, up->fcr); omap8250_update_scr(up, priv); @@ -284,8 +300,7 @@ static void omap8250_restore_regs(struct uart_8250_port *up) serial_out(up, UART_LCR, 0); /* drop TCR + TLR access, we setup XON/XOFF later */ - serial8250_out_MCR(up, mcr); - + serial8250_out_MCR(up, up->mcr); serial_out(up, UART_IER, up->ier); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_B); @@ -596,6 +611,7 @@ static int omap_8250_startup(struct uart_port *port) pm_runtime_get_sync(port->dev); + up->mcr = 0; serial_out(up, UART_FCR, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); serial_out(up, UART_LCR, UART_LCR_WLEN8); @@ -1274,15 +1290,9 @@ static int omap8250_probe(struct platform_device *pdev) static int omap8250_remove(struct platform_device *pdev) { struct omap8250_priv *priv = platform_get_drvdata(pdev); - int err; - - err = pm_runtime_resume_and_get(&pdev->dev); - if (err) - return err; pm_runtime_dont_use_autosuspend(&pdev->dev); pm_runtime_put_sync(&pdev->dev); - flush_work(&priv->qos_work); pm_runtime_disable(&pdev->dev); serial8250_unregister_port(priv->line); pm_qos_remove_request(&priv->pm_qos_request);
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c index b47335d..f8819f7 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c
@@ -1820,13 +1820,10 @@ EXPORT_SYMBOL_GPL(serial8250_modem_status); static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir) { switch (iir & 0x3f) { - case UART_IIR_RDI: - if (!up->dma->rx_running) - break; - fallthrough; - case UART_IIR_RLSI: case UART_IIR_RX_TIMEOUT: serial8250_rx_dma_flush(up); + /* fall-through */ + case UART_IIR_RLSI: return true; } return up->dma->rx_dma(up);
diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 577612a..7ef60f8 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig
@@ -108,7 +108,7 @@ config SERIAL_8250_GSC tristate - depends on SERIAL_8250 && PARISC + depends on SERIAL_8250 && GSC default SERIAL_8250 config SERIAL_8250_DMA
diff --git a/drivers/tty/serial/altera_uart.c b/drivers/tty/serial/altera_uart.c index d91f76b..0e487ce 100644 --- a/drivers/tty/serial/altera_uart.c +++ b/drivers/tty/serial/altera_uart.c
@@ -199,8 +199,9 @@ static void altera_uart_set_termios(struct uart_port *port, */ } -static void altera_uart_rx_chars(struct uart_port *port) +static void altera_uart_rx_chars(struct altera_uart *pp) { + struct uart_port *port = &pp->port; unsigned char ch, flag; unsigned short status; @@ -247,8 +248,9 @@ static void altera_uart_rx_chars(struct uart_port *port) spin_lock(&port->lock); } -static void altera_uart_tx_chars(struct uart_port *port) +static void altera_uart_tx_chars(struct altera_uart *pp) { + struct uart_port *port = &pp->port; struct circ_buf *xmit = &port->state->xmit; if (port->x_char) { @@ -272,25 +274,26 @@ static void altera_uart_tx_chars(struct uart_port *port) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(port); - if (uart_circ_empty(xmit)) - altera_uart_stop_tx(port); + if (xmit->head == xmit->tail) { + pp->imr &= ~ALTERA_UART_CONTROL_TRDY_MSK; + altera_uart_update_ctrl_reg(pp); + } } static irqreturn_t altera_uart_interrupt(int irq, void *data) { struct uart_port *port = data; struct altera_uart *pp = container_of(port, struct altera_uart, port); - unsigned long flags; unsigned int isr; isr = altera_uart_readl(port, ALTERA_UART_STATUS_REG) & pp->imr; - spin_lock_irqsave(&port->lock, flags); + spin_lock(&port->lock); if (isr & ALTERA_UART_STATUS_RRDY_MSK) - altera_uart_rx_chars(port); + altera_uart_rx_chars(pp); if (isr & ALTERA_UART_STATUS_TRDY_MSK) - altera_uart_tx_chars(port); - spin_unlock_irqrestore(&port->lock, flags); + altera_uart_tx_chars(pp); + spin_unlock(&port->lock); return IRQ_RETVAL(isr); }
diff --git a/drivers/tty/serial/amba-pl011.c b/drivers/tty/serial/amba-pl011.c index 8608409..52b7d55 100644 --- a/drivers/tty/serial/amba-pl011.c +++ b/drivers/tty/serial/amba-pl011.c
@@ -1053,9 +1053,6 @@ static void pl011_dma_rx_callback(void *data) */ static inline void pl011_dma_rx_stop(struct uart_amba_port *uap) { - if (!uap->using_rx_dma) - return; - /* FIXME. Just disable the DMA enable */ uap->dmacr &= ~UART011_RXDMAE; pl011_write(uap->dmacr, uap, REG_DMACR); @@ -1771,17 +1768,8 @@ static void pl011_enable_interrupts(struct uart_amba_port *uap) static void pl011_unthrottle_rx(struct uart_port *port) { struct uart_amba_port *uap = container_of(port, struct uart_amba_port, port); - unsigned long flags; - spin_lock_irqsave(&uap->port.lock, flags); - - uap->im = UART011_RTIM; - if (!pl011_dma_rx_running(uap)) - uap->im |= UART011_RXIM; - - pl011_write(uap->im, uap, REG_IMSC); - - spin_unlock_irqrestore(&uap->port.lock, flags); + pl011_enable_interrupts(uap); } static int pl011_startup(struct uart_port *port)
diff --git a/drivers/tty/serial/atmel_serial.c b/drivers/tty/serial/atmel_serial.c index 6c0628c..3b2c25b 100644 --- a/drivers/tty/serial/atmel_serial.c +++ b/drivers/tty/serial/atmel_serial.c
@@ -306,16 +306,16 @@ static int atmel_config_rs485(struct uart_port *port, mode = atmel_uart_readl(port, ATMEL_US_MR); + /* Resetting serial mode to RS232 (0x0) */ + mode &= ~ATMEL_US_USMODE; + + port->rs485 = *rs485conf; + if (rs485conf->flags & SER_RS485_ENABLED) { dev_dbg(port->dev, "Setting UART to RS485\n"); - if (rs485conf->flags & SER_RS485_RX_DURING_TX) - atmel_port->tx_done_mask = ATMEL_US_TXRDY; - else - atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; - + atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; atmel_uart_writel(port, ATMEL_US_TTGR, rs485conf->delay_rts_after_send); - mode &= ~ATMEL_US_USMODE; mode |= ATMEL_US_USMODE_RS485; } else { dev_dbg(port->dev, "Setting UART to RS232\n"); @@ -832,7 +832,7 @@ static void atmel_tx_chars(struct uart_port *port) struct atmel_uart_port *atmel_port = to_atmel_uart_port(port); if (port->x_char && - (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXRDY)) { + (atmel_uart_readl(port, ATMEL_US_CSR) & atmel_port->tx_done_mask)) { atmel_uart_write_char(port, port->x_char); port->icount.tx++; port->x_char = 0; @@ -840,7 +840,8 @@ static void atmel_tx_chars(struct uart_port *port) if (uart_circ_empty(xmit) || uart_tx_stopped(port)) return; - while (atmel_uart_readl(port, ATMEL_US_CSR) & ATMEL_US_TXRDY) { + while (atmel_uart_readl(port, ATMEL_US_CSR) & + atmel_port->tx_done_mask) { atmel_uart_write_char(port, xmit->buf[xmit->tail]); xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); port->icount.tx++; @@ -851,20 +852,10 @@ static void atmel_tx_chars(struct uart_port *port) if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(port); - if (!uart_circ_empty(xmit)) { - /* we still have characters to transmit, so we should continue - * transmitting them when TX is ready, regardless of - * mode or duplexity - */ - atmel_port->tx_done_mask |= ATMEL_US_TXRDY; - + if (!uart_circ_empty(xmit)) /* Enable interrupts */ atmel_uart_writel(port, ATMEL_US_IER, atmel_port->tx_done_mask); - } else { - if (atmel_uart_is_half_duplex(port)) - atmel_port->tx_done_mask &= ~ATMEL_US_TXRDY; - } } static void atmel_complete_tx_dma(void *arg) @@ -2550,7 +2541,8 @@ static int atmel_init_port(struct atmel_uart_port *atmel_port, * Use TXEMPTY for interrupt when rs485 or ISO7816 else TXRDY or * ENDTX|TXBUFE */ - if (atmel_uart_is_half_duplex(port)) + if (port->rs485.flags & SER_RS485_ENABLED || + port->iso7816.flags & SER_ISO7816_ENABLED) atmel_port->tx_done_mask = ATMEL_US_TXEMPTY; else if (atmel_use_pdc_tx(port)) { port->fifosize = PDC_BUFFER_SIZE; @@ -2642,7 +2634,13 @@ static void __init atmel_console_get_options(struct uart_port *port, int *baud, else if (mr == ATMEL_US_PAR_ODD) *parity = 'o'; - *baud = port->uartclk / (16 * quot); + /* + * The serial core only rounds down when matching this to a + * supported baud rate. Make sure we don't end up slightly + * lower than one of those, as it would make us fall through + * to a much lower baud rate than we really want. + */ + *baud = port->uartclk / (16 * (quot - 1)); } static int __init atmel_console_setup(struct console *co, char *options)
diff --git a/drivers/tty/serial/fsl_lpuart.c b/drivers/tty/serial/fsl_lpuart.c index b722ab9..4bdc129 100644 --- a/drivers/tty/serial/fsl_lpuart.c +++ b/drivers/tty/serial/fsl_lpuart.c
@@ -807,17 +807,11 @@ static unsigned int lpuart32_tx_empty(struct uart_port *port) struct lpuart_port, port); unsigned long stat = lpuart32_read(port, UARTSTAT); unsigned long sfifo = lpuart32_read(port, UARTFIFO); - unsigned long ctrl = lpuart32_read(port, UARTCTRL); if (sport->dma_tx_in_progress) return 0; - /* - * LPUART Transmission Complete Flag may never be set while queuing a break - * character, so avoid checking for transmission complete when UARTCTRL_SBK - * is asserted. - */ - if ((stat & UARTSTAT_TC && sfifo & UARTFIFO_TXEMPT) || ctrl & UARTCTRL_SBK) + if (stat & UARTSTAT_TC && sfifo & UARTFIFO_TXEMPT) return TIOCSER_TEMT; return 0; @@ -1283,9 +1277,9 @@ static int lpuart_config_rs485(struct uart_port *port, * Note: UART is assumed to be active high. */ if (rs485->flags & SER_RS485_RTS_ON_SEND) - modem |= UARTMODEM_TXRTSPOL; - else if (rs485->flags & SER_RS485_RTS_AFTER_SEND) modem &= ~UARTMODEM_TXRTSPOL; + else if (rs485->flags & SER_RS485_RTS_AFTER_SEND) + modem |= UARTMODEM_TXRTSPOL; } /* Store the new configuration */ @@ -1376,32 +1370,12 @@ static void lpuart_break_ctl(struct uart_port *port, int break_state) static void lpuart32_break_ctl(struct uart_port *port, int break_state) { - unsigned long temp, modem; - struct tty_struct *tty; - unsigned int cflag = 0; - - tty = tty_port_tty_get(&port->state->port); - if (tty) { - cflag = tty->termios.c_cflag; - tty_kref_put(tty); - } + unsigned long temp; temp = lpuart32_read(port, UARTCTRL) & ~UARTCTRL_SBK; - modem = lpuart32_read(port, UARTMODIR); - if (break_state != 0) { + if (break_state != 0) temp |= UARTCTRL_SBK; - /* - * LPUART CTS has higher priority than SBK, need to disable CTS before - * asserting SBK to avoid any interference if flow control is enabled. - */ - if (cflag & CRTSCTS && modem & UARTMODIR_TXCTSE) - lpuart32_write(port, modem & ~UARTMODIR_TXCTSE, UARTMODIR); - } else { - /* Re-enable the CTS when break off. */ - if (cflag & CRTSCTS && !(modem & UARTMODIR_TXCTSE)) - lpuart32_write(port, modem | UARTMODIR_TXCTSE, UARTMODIR); - } lpuart32_write(port, temp, UARTCTRL); } @@ -1619,7 +1593,6 @@ static void lpuart_dma_shutdown(struct lpuart_port *sport) if (sport->lpuart_dma_rx_use) { del_timer_sync(&sport->lpuart_timer); lpuart_dma_rx_free(&sport->port); - sport->lpuart_dma_rx_use = false; } if (sport->lpuart_dma_tx_use) { @@ -1628,7 +1601,6 @@ static void lpuart_dma_shutdown(struct lpuart_port *sport) sport->dma_tx_in_progress = false; dmaengine_terminate_all(sport->dma_tx_chan); } - sport->lpuart_dma_tx_use = false; } } @@ -2008,15 +1980,8 @@ lpuart32_set_termios(struct uart_port *port, struct ktermios *termios, /* update the per-port timeout */ uart_update_timeout(port, termios->c_cflag, baud); - /* - * LPUART Transmission Complete Flag may never be set while queuing a break - * character, so skip waiting for transmission complete when UARTCTRL_SBK is - * asserted. - */ - if (!(old_ctrl & UARTCTRL_SBK)) { - lpuart32_write(&sport->port, 0, UARTMODIR); - lpuart32_wait_bit_set(&sport->port, UARTSTAT, UARTSTAT_TC); - } + /* wait transmit engin complete */ + lpuart32_wait_bit_set(&sport->port, UARTSTAT, UARTSTAT_TC); /* disable transmit and receive */ lpuart32_write(&sport->port, old_ctrl & ~(UARTCTRL_TE | UARTCTRL_RE),
diff --git a/drivers/tty/serial/imx.c b/drivers/tty/serial/imx.c index 3f5878e..8b41a78 100644 --- a/drivers/tty/serial/imx.c +++ b/drivers/tty/serial/imx.c
@@ -2551,7 +2551,6 @@ static const struct dev_pm_ops imx_uart_pm_ops = { .suspend_noirq = imx_uart_suspend_noirq, .resume_noirq = imx_uart_resume_noirq, .freeze_noirq = imx_uart_suspend_noirq, - .thaw_noirq = imx_uart_resume_noirq, .restore_noirq = imx_uart_resume_noirq, .suspend = imx_uart_suspend, .resume = imx_uart_resume,
diff --git a/drivers/tty/serial/jsm/jsm_driver.c b/drivers/tty/serial/jsm/jsm_driver.c index 07e9be9..592e51d 100644 --- a/drivers/tty/serial/jsm/jsm_driver.c +++ b/drivers/tty/serial/jsm/jsm_driver.c
@@ -212,8 +212,7 @@ static int jsm_probe_one(struct pci_dev *pdev, const struct pci_device_id *ent) break; default: - rc = -ENXIO; - goto out_kfree_brd; + return -ENXIO; } rc = request_irq(brd->irq, brd->bd_ops->intr, IRQF_SHARED, "JSM", brd);
diff --git a/drivers/tty/serial/mvebu-uart.c b/drivers/tty/serial/mvebu-uart.c index bc5f77a..2ce0d05 100644 --- a/drivers/tty/serial/mvebu-uart.c +++ b/drivers/tty/serial/mvebu-uart.c
@@ -238,7 +238,6 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status) struct tty_port *tport = &port->state->port; unsigned char ch = 0; char flag = 0; - int ret; do { if (status & STAT_RX_RDY(port)) { @@ -251,16 +250,6 @@ static void mvebu_uart_rx_chars(struct uart_port *port, unsigned int status) port->icount.parity++; } - /* - * For UART2, error bits are not cleared on buffer read. - * This causes interrupt loop and system hang. - */ - if (IS_EXTENDED(port) && (status & STAT_BRK_ERR)) { - ret = readl(port->membase + UART_STAT); - ret |= STAT_BRK_ERR; - writel(ret, port->membase + UART_STAT); - } - if (status & STAT_BRK_DET) { port->icount.brk++; status &= ~(STAT_FRM_ERR | STAT_PAR_ERR);
diff --git a/drivers/tty/serial/pch_uart.c b/drivers/tty/serial/pch_uart.c index 3170671..77f1844 100644 --- a/drivers/tty/serial/pch_uart.c +++ b/drivers/tty/serial/pch_uart.c
@@ -718,7 +718,6 @@ static void pch_request_dma(struct uart_port *port) if (!chan) { dev_err(priv->port.dev, "%s:dma_request_channel FAILS(Tx)\n", __func__); - pci_dev_put(dma_dev); return; } priv->chan_tx = chan; @@ -735,7 +734,6 @@ static void pch_request_dma(struct uart_port *port) __func__); dma_release_channel(priv->chan_tx); priv->chan_tx = NULL; - pci_dev_put(dma_dev); return; } @@ -743,8 +741,6 @@ static void pch_request_dma(struct uart_port *port) priv->rx_buf_virt = dma_alloc_coherent(port->dev, port->fifosize, &priv->rx_buf_dma, GFP_KERNEL); priv->chan_rx = chan; - - pci_dev_put(dma_dev); } static void pch_dma_rx_complete(void *arg) @@ -776,7 +772,7 @@ static void pch_dma_tx_complete(void *arg) } xmit->tail &= UART_XMIT_SIZE - 1; async_tx_ack(priv->desc_tx); - dma_unmap_sg(port->dev, priv->sg_tx_p, priv->orig_nent, DMA_TO_DEVICE); + dma_unmap_sg(port->dev, sg, priv->orig_nent, DMA_TO_DEVICE); priv->tx_dma_use = 0; priv->nent = 0; priv->orig_nent = 0;
diff --git a/drivers/tty/serial/serial-tegra.c b/drivers/tty/serial/serial-tegra.c index 7930f2a..74c2115 100644 --- a/drivers/tty/serial/serial-tegra.c +++ b/drivers/tty/serial/serial-tegra.c
@@ -141,7 +141,6 @@ struct tegra_uart_port { int configured_rate; bool use_rx_pio; bool use_tx_pio; - bool rx_dma_active; }; static void tegra_uart_start_next_tx(struct tegra_uart_port *tup); @@ -520,7 +519,7 @@ static void tegra_uart_tx_dma_complete(void *args) count = tup->tx_bytes_requested - state.residue; async_tx_ack(tup->tx_dma_desc); spin_lock_irqsave(&tup->uport.lock, flags); - uart_xmit_advance(&tup->uport, count); + xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1); tup->tx_in_progress = 0; if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) uart_write_wakeup(&tup->uport); @@ -607,18 +606,18 @@ static unsigned int tegra_uart_tx_empty(struct uart_port *u) static void tegra_uart_stop_tx(struct uart_port *u) { struct tegra_uart_port *tup = to_tegra_uport(u); + struct circ_buf *xmit = &tup->uport.state->xmit; struct dma_tx_state state; unsigned int count; if (tup->tx_in_progress != TEGRA_UART_TX_DMA) return; - dmaengine_pause(tup->tx_dma_chan); - dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state); dmaengine_terminate_all(tup->tx_dma_chan); + dmaengine_tx_status(tup->tx_dma_chan, tup->tx_cookie, &state); count = tup->tx_bytes_requested - state.residue; async_tx_ack(tup->tx_dma_desc); - uart_xmit_advance(&tup->uport, count); + xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1); tup->tx_in_progress = 0; } @@ -694,22 +693,11 @@ static void tegra_uart_copy_rx_to_tty(struct tegra_uart_port *tup, TEGRA_UART_RX_DMA_BUFFER_SIZE, DMA_TO_DEVICE); } -static void do_handle_rx_pio(struct tegra_uart_port *tup) -{ - struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port); - struct tty_port *port = &tup->uport.state->port; - - tegra_uart_handle_rx_pio(tup, port); - if (tty) { - tty_flip_buffer_push(port); - tty_kref_put(tty); - } -} - static void tegra_uart_rx_buffer_push(struct tegra_uart_port *tup, unsigned int residue) { struct tty_port *port = &tup->uport.state->port; + struct tty_struct *tty = tty_port_tty_get(port); unsigned int count; async_tx_ack(tup->rx_dma_desc); @@ -718,7 +706,11 @@ static void tegra_uart_rx_buffer_push(struct tegra_uart_port *tup, /* If we are here, DMA is stopped */ tegra_uart_copy_rx_to_tty(tup, port, count); - do_handle_rx_pio(tup); + tegra_uart_handle_rx_pio(tup, port); + if (tty) { + tty_flip_buffer_push(port); + tty_kref_put(tty); + } } static void tegra_uart_rx_dma_complete(void *args) @@ -742,7 +734,6 @@ static void tegra_uart_rx_dma_complete(void *args) if (tup->rts_active) set_rts(tup, false); - tup->rx_dma_active = false; tegra_uart_rx_buffer_push(tup, 0); tegra_uart_start_rx_dma(tup); @@ -754,30 +745,18 @@ static void tegra_uart_rx_dma_complete(void *args) spin_unlock_irqrestore(&u->lock, flags); } -static void tegra_uart_terminate_rx_dma(struct tegra_uart_port *tup) +static void tegra_uart_handle_rx_dma(struct tegra_uart_port *tup) { struct dma_tx_state state; - if (!tup->rx_dma_active) { - do_handle_rx_pio(tup); - return; - } - - dmaengine_pause(tup->rx_dma_chan); - dmaengine_tx_status(tup->rx_dma_chan, tup->rx_cookie, &state); - dmaengine_terminate_all(tup->rx_dma_chan); - - tegra_uart_rx_buffer_push(tup, state.residue); - tup->rx_dma_active = false; -} - -static void tegra_uart_handle_rx_dma(struct tegra_uart_port *tup) -{ /* Deactivate flow control to stop sender */ if (tup->rts_active) set_rts(tup, false); - tegra_uart_terminate_rx_dma(tup); + dmaengine_terminate_all(tup->rx_dma_chan); + dmaengine_tx_status(tup->rx_dma_chan, tup->rx_cookie, &state); + tegra_uart_rx_buffer_push(tup, state.residue); + tegra_uart_start_rx_dma(tup); if (tup->rts_active) set_rts(tup, true); @@ -787,9 +766,6 @@ static int tegra_uart_start_rx_dma(struct tegra_uart_port *tup) { unsigned int count = TEGRA_UART_RX_DMA_BUFFER_SIZE; - if (tup->rx_dma_active) - return 0; - tup->rx_dma_desc = dmaengine_prep_slave_single(tup->rx_dma_chan, tup->rx_dma_buf_phys, count, DMA_DEV_TO_MEM, DMA_PREP_INTERRUPT); @@ -798,7 +774,6 @@ static int tegra_uart_start_rx_dma(struct tegra_uart_port *tup) return -EIO; } - tup->rx_dma_active = true; tup->rx_dma_desc->callback = tegra_uart_rx_dma_complete; tup->rx_dma_desc->callback_param = tup; dma_sync_single_for_device(tup->uport.dev, tup->rx_dma_buf_phys, @@ -830,13 +805,24 @@ static void tegra_uart_handle_modem_signal_change(struct uart_port *u) uart_handle_cts_change(&tup->uport, msr & UART_MSR_CTS); } +static void do_handle_rx_pio(struct tegra_uart_port *tup) +{ + struct tty_struct *tty = tty_port_tty_get(&tup->uport.state->port); + struct tty_port *port = &tup->uport.state->port; + + tegra_uart_handle_rx_pio(tup, port); + if (tty) { + tty_flip_buffer_push(port); + tty_kref_put(tty); + } +} + static irqreturn_t tegra_uart_isr(int irq, void *data) { struct tegra_uart_port *tup = data; struct uart_port *u = &tup->uport; unsigned long iir; unsigned long ier; - bool is_rx_start = false; bool is_rx_int = false; unsigned long flags; @@ -849,12 +835,10 @@ static irqreturn_t tegra_uart_isr(int irq, void *data) if (tup->rx_in_progress) { ier = tup->ier_shadow; ier |= (UART_IER_RLSI | UART_IER_RTOIE | - TEGRA_UART_IER_EORD | UART_IER_RDI); + TEGRA_UART_IER_EORD); tup->ier_shadow = ier; tegra_uart_write(tup, ier, UART_IER); } - } else if (is_rx_start) { - tegra_uart_start_rx_dma(tup); } spin_unlock_irqrestore(&u->lock, flags); return IRQ_HANDLED; @@ -873,23 +857,17 @@ static irqreturn_t tegra_uart_isr(int irq, void *data) case 4: /* End of data */ case 6: /* Rx timeout */ - if (!tup->use_rx_pio) { - is_rx_int = tup->rx_in_progress; + case 2: /* Receive */ + if (!tup->use_rx_pio && !is_rx_int) { + is_rx_int = true; /* Disable Rx interrupts */ ier = tup->ier_shadow; + ier |= UART_IER_RDI; + tegra_uart_write(tup, ier, UART_IER); ier &= ~(UART_IER_RDI | UART_IER_RLSI | UART_IER_RTOIE | TEGRA_UART_IER_EORD); tup->ier_shadow = ier; tegra_uart_write(tup, ier, UART_IER); - break; - } - /* Fall through */ - case 2: /* Receive */ - if (!tup->use_rx_pio) { - is_rx_start = tup->rx_in_progress; - tup->ier_shadow &= ~UART_IER_RDI; - tegra_uart_write(tup, tup->ier_shadow, - UART_IER); } else { do_handle_rx_pio(tup); } @@ -911,6 +889,7 @@ static void tegra_uart_stop_rx(struct uart_port *u) { struct tegra_uart_port *tup = to_tegra_uport(u); struct tty_port *port = &tup->uport.state->port; + struct dma_tx_state state; unsigned long ier; if (tup->rts_active) @@ -927,11 +906,13 @@ static void tegra_uart_stop_rx(struct uart_port *u) tup->ier_shadow = ier; tegra_uart_write(tup, ier, UART_IER); tup->rx_in_progress = 0; - - if (!tup->use_rx_pio) - tegra_uart_terminate_rx_dma(tup); - else + if (tup->rx_dma_chan && !tup->use_rx_pio) { + dmaengine_terminate_all(tup->rx_dma_chan); + dmaengine_tx_status(tup->rx_dma_chan, tup->rx_cookie, &state); + tegra_uart_rx_buffer_push(tup, state.residue); + } else { tegra_uart_handle_rx_pio(tup, port); + } } static void tegra_uart_hw_deinit(struct tegra_uart_port *tup) @@ -1076,6 +1057,12 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) tup->lcr_shadow = TEGRA_UART_DEFAULT_LSR; tup->fcr_shadow |= UART_FCR_DMA_SELECT; tegra_uart_write(tup, tup->fcr_shadow, UART_FCR); + + ret = tegra_uart_start_rx_dma(tup); + if (ret < 0) { + dev_err(tup->uport.dev, "Not able to start Rx DMA\n"); + return ret; + } } else { tegra_uart_write(tup, tup->fcr_shadow, UART_FCR); } @@ -1085,6 +1072,10 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) * Enable IE_RXS for the receive status interrupts like line errros. * Enable IE_RX_TIMEOUT to get the bytes which cannot be DMA'd. * + * If using DMA mode, enable EORD instead of receive interrupt which + * will interrupt after the UART is done with the receive instead of + * the interrupt when the FIFO "threshold" is reached. + * * EORD is different interrupt than RX_TIMEOUT - RX_TIMEOUT occurs when * the DATA is sitting in the FIFO and couldn't be transferred to the * DMA as the DMA size alignment (4 bytes) is not met. EORD will be @@ -1095,14 +1086,11 @@ static int tegra_uart_hw_init(struct tegra_uart_port *tup) * both the EORD as well as RX_TIMEOUT - SW sees RX_TIMEOUT first * then the EORD. */ - tup->ier_shadow = UART_IER_RLSI | UART_IER_RTOIE | UART_IER_RDI; - - /* - * If using DMA mode, enable EORD interrupt to notify about RX - * completion. - */ if (!tup->use_rx_pio) - tup->ier_shadow |= TEGRA_UART_IER_EORD; + tup->ier_shadow = UART_IER_RLSI | UART_IER_RTOIE | + TEGRA_UART_IER_EORD; + else + tup->ier_shadow = UART_IER_RLSI | UART_IER_RTOIE | UART_IER_RDI; tegra_uart_write(tup, tup->ier_shadow, UART_IER); return 0;
diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c index 95db67c..c066bb7 100644 --- a/drivers/tty/serial/sh-sci.c +++ b/drivers/tty/serial/sh-sci.c
@@ -2925,13 +2925,6 @@ static int sci_init_single(struct platform_device *dev, sci_port->irqs[i] = platform_get_irq(dev, i); } - /* - * The fourth interrupt on SCI port is transmit end interrupt, so - * shuffle the interrupts. - */ - if (p->type == PORT_SCI) - swap(sci_port->irqs[SCIx_BRI_IRQ], sci_port->irqs[SCIx_TEI_IRQ]); - /* The SCI generates several interrupts. They can be muxed together or * connected to different interrupt lines. In the muxed case only one * interrupt resource is specified as there is only one interrupt ID. @@ -2997,7 +2990,7 @@ static int sci_init_single(struct platform_device *dev, port->flags = UPF_FIXED_PORT | UPF_BOOT_AUTOCONF | p->flags; port->fifosize = sci_port->params->fifosize; - if (port->type == PORT_SCI && !dev->dev.of_node) { + if (port->type == PORT_SCI) { if (sci_port->reg_size >= 0x20) port->regshift = 2; else
diff --git a/drivers/tty/serial/sunsab.c b/drivers/tty/serial/sunsab.c index beca02c..72131b5 100644 --- a/drivers/tty/serial/sunsab.c +++ b/drivers/tty/serial/sunsab.c
@@ -1140,13 +1140,7 @@ static int __init sunsab_init(void) } } - err = platform_driver_register(&sab_driver); - if (err) { - kfree(sunsab_ports); - sunsab_ports = NULL; - } - - return err; + return platform_driver_register(&sab_driver); } static void __exit sunsab_exit(void)
diff --git a/drivers/tty/serial/tegra-tcu.c b/drivers/tty/serial/tegra-tcu.c index 31ae705..aaf8748 100644 --- a/drivers/tty/serial/tegra-tcu.c +++ b/drivers/tty/serial/tegra-tcu.c
@@ -101,7 +101,7 @@ static void tegra_tcu_uart_start_tx(struct uart_port *port) break; tegra_tcu_write(tcu, &xmit->buf[xmit->tail], count); - uart_xmit_advance(port, count); + xmit->tail = (xmit->tail + count) & (UART_XMIT_SIZE - 1); } uart_write_wakeup(port);
diff --git a/drivers/tty/serial/ucc_uart.c b/drivers/tty/serial/ucc_uart.c index 181d55e..a0555ae 100644 --- a/drivers/tty/serial/ucc_uart.c +++ b/drivers/tty/serial/ucc_uart.c
@@ -1141,8 +1141,6 @@ static unsigned int soc_info(unsigned int *rev_h, unsigned int *rev_l) /* No compatible property, so try the name. */ soc_string = np->name; - of_node_put(np); - /* Extract the SOC number from the "PowerPC," string */ if ((sscanf(soc_string, "PowerPC,%u", &soc) != 1) || !soc) return 0;
diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c index 6842999..a140925 100644 --- a/drivers/tty/serial/xilinx_uartps.c +++ b/drivers/tty/serial/xilinx_uartps.c
@@ -369,8 +369,6 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id) isrstatus &= ~CDNS_UART_IXR_TXEMPTY; } - isrstatus &= port->read_status_mask; - isrstatus &= ~port->ignore_status_mask; /* * Skip RX processing if RX is disabled as RXEMPTY will never be set * as read bytes will not be removed from the FIFO.
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 37c46c6..ddfe873 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c
@@ -1156,16 +1156,14 @@ static struct tty_struct *tty_driver_lookup_tty(struct tty_driver *driver, { struct tty_struct *tty; - if (driver->ops->lookup) { + if (driver->ops->lookup) if (!file) tty = ERR_PTR(-EIO); else tty = driver->ops->lookup(driver, file, idx); - } else { - if (idx >= driver->num) - return ERR_PTR(-EINVAL); + else tty = driver->ttys[idx]; - } + if (!IS_ERR(tty)) tty_kref_get(tty); return tty;
diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c index 0da9e0a..68643f6 100644 --- a/drivers/tty/vt/keyboard.c +++ b/drivers/tty/vt/keyboard.c
@@ -1241,7 +1241,7 @@ static void kbd_bh(unsigned long dummy) } } -DECLARE_TASKLET_DISABLED_OLD(keyboard_tasklet, kbd_bh); +DECLARE_TASKLET_DISABLED(keyboard_tasklet, kbd_bh, 0); #if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_ALPHA) ||\ defined(CONFIG_MIPS) || defined(CONFIG_PPC) || defined(CONFIG_SPARC) ||\
diff --git a/drivers/tty/vt/vc_screen.c b/drivers/tty/vt/vc_screen.c index 90de333..778f83e 100644 --- a/drivers/tty/vt/vc_screen.c +++ b/drivers/tty/vt/vc_screen.c
@@ -265,6 +265,10 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) uni_mode = use_unicode(inode); attr = use_attributes(inode); + ret = -ENXIO; + vc = vcs_vc(inode, &viewed); + if (!vc) + goto unlock_out; ret = -EINVAL; if (pos < 0) @@ -284,20 +288,16 @@ vcs_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) ssize_t orig_count; long p = pos; - vc = vcs_vc(inode, &viewed); - if (!vc) { - ret = -ENXIO; - break; - } - /* Check whether we are above size each round, * as copy_to_user at the end of this loop * could sleep. */ size = vcs_size(inode); if (size < 0) { + if (read) + break; ret = size; - break; + goto unlock_out; } if (pos >= size) break;
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c index e00ebda..9d9e056 100644 --- a/drivers/tty/vt/vt.c +++ b/drivers/tty/vt/vt.c
@@ -351,7 +351,7 @@ static struct uni_screen *vc_uniscr_alloc(unsigned int cols, unsigned int rows) /* allocate everything in one go */ memsize = cols * rows * sizeof(char32_t); memsize += rows * sizeof(char32_t *); - p = vzalloc(memsize); + p = vmalloc(memsize); if (!p) return NULL; @@ -4587,11 +4587,9 @@ static int con_font_set(struct vc_data *vc, struct console_font_op *op) console_lock(); if (vc->vc_mode != KD_TEXT) rc = -EINVAL; - else if (vc->vc_sw->con_font_set) { - if (vc_is_sel(vc)) - clear_selection(); + else if (vc->vc_sw->con_font_set) rc = vc->vc_sw->con_font_set(vc, &font, op->flags); - } else + else rc = -ENOSYS; console_unlock(); kfree(font.data); @@ -4618,11 +4616,9 @@ static int con_font_default(struct vc_data *vc, struct console_font_op *op) console_unlock(); return -EINVAL; } - if (vc->vc_sw->con_font_default) { - if (vc_is_sel(vc)) - clear_selection(); + if (vc->vc_sw->con_font_default) rc = vc->vc_sw->con_font_default(vc, &font, s); - } else + else rc = -ENOSYS; console_unlock(); if (!rc) {
diff --git a/drivers/uio/uio_dmem_genirq.c b/drivers/uio/uio_dmem_genirq.c index 39dbd8c..44858f7 100644 --- a/drivers/uio/uio_dmem_genirq.c +++ b/drivers/uio/uio_dmem_genirq.c
@@ -110,10 +110,8 @@ static irqreturn_t uio_dmem_genirq_handler(int irq, struct uio_info *dev_info) * remember the state so we can allow user space to enable it later. */ - spin_lock(&priv->lock); if (!test_and_set_bit(0, &priv->flags)) disable_irq_nosync(irq); - spin_unlock(&priv->lock); return IRQ_HANDLED; } @@ -127,19 +125,20 @@ static int uio_dmem_genirq_irqcontrol(struct uio_info *dev_info, s32 irq_on) * in the interrupt controller, but keep track of the * state to prevent per-irq depth damage. * - * Serialize this operation to support multiple tasks and concurrency - * with irq handler on SMP systems. + * Serialize this operation to support multiple tasks. */ spin_lock_irqsave(&priv->lock, flags); if (irq_on) { if (test_and_clear_bit(0, &priv->flags)) enable_irq(dev_info->irq); + spin_unlock_irqrestore(&priv->lock, flags); } else { - if (!test_and_set_bit(0, &priv->flags)) - disable_irq_nosync(dev_info->irq); + if (!test_and_set_bit(0, &priv->flags)) { + spin_unlock_irqrestore(&priv->lock, flags); + disable_irq(dev_info->irq); + } } - spin_unlock_irqrestore(&priv->lock, flags); return 0; }
diff --git a/drivers/usb/cdns3/cdns3-pci-wrap.c b/drivers/usb/cdns3/cdns3-pci-wrap.c index 14878e3..b0a29ef 100644 --- a/drivers/usb/cdns3/cdns3-pci-wrap.c +++ b/drivers/usb/cdns3/cdns3-pci-wrap.c
@@ -60,11 +60,6 @@ static struct pci_dev *cdns3_get_second_fun(struct pci_dev *pdev) return NULL; } - if (func->devfn != PCI_DEV_FN_HOST_DEVICE && - func->devfn != PCI_DEV_FN_OTG) { - return NULL; - } - return func; }
diff --git a/drivers/usb/cdns3/gadget.c b/drivers/usb/cdns3/gadget.c index d111cf8..296f2ee 100644 --- a/drivers/usb/cdns3/gadget.c +++ b/drivers/usb/cdns3/gadget.c
@@ -549,9 +549,9 @@ static void cdns3_wa2_remove_old_request(struct cdns3_endpoint *priv_ep) trace_cdns3_wa2(priv_ep, "removes eldest request"); kfree(priv_req->request.buf); - list_del_init(&priv_req->list); cdns3_gadget_ep_free_request(&priv_ep->endpoint, &priv_req->request); + list_del_init(&priv_req->list); --priv_ep->wa2_counter; if (!chain) @@ -1259,7 +1259,6 @@ static int cdns3_check_ep_interrupt_proceed(struct cdns3_endpoint *priv_ep) ep_cfg &= ~EP_CFG_ENABLE; writel(ep_cfg, &priv_dev->regs->ep_cfg); priv_ep->flags &= ~EP_QUIRK_ISO_OUT_EN; - priv_ep->flags |= EP_UPDATE_EP_TRBADDR; } cdns3_transfer_completed(priv_dev, priv_ep); } else if (!(priv_ep->flags & EP_STALLED) && @@ -2167,7 +2166,6 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) struct usb_request *request; struct cdns3_request *priv_req; struct cdns3_trb *trb = NULL; - struct cdns3_trb trb_tmp; int ret; int val; @@ -2177,10 +2175,8 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) if (request) { priv_req = to_cdns3_request(request); trb = priv_req->trb; - if (trb) { - trb_tmp = *trb; + if (trb) trb->control = trb->control ^ TRB_CYCLE; - } } writel(EP_CMD_CSTALL | EP_CMD_EPRST, &priv_dev->regs->ep_cmd); @@ -2195,8 +2191,7 @@ int __cdns3_gadget_ep_clear_halt(struct cdns3_endpoint *priv_ep) if (request) { if (trb) - *trb = trb_tmp; - + trb->control = trb->control ^ TRB_CYCLE; cdns3_rearm_transfer(priv_ep, 1); }
diff --git a/drivers/usb/chipidea/ci.h b/drivers/usb/chipidea/ci.h index ff61f88..6911aef 100644 --- a/drivers/usb/chipidea/ci.h +++ b/drivers/usb/chipidea/ci.h
@@ -203,7 +203,6 @@ struct hw_bank { * @in_lpm: if the core in low power mode * @wakeup_int: if wakeup interrupt occur * @rev: The revision number for controller - * @mutex: protect code from concorrent running when doing role switch */ struct ci_hdrc { struct device *dev; @@ -257,7 +256,6 @@ struct ci_hdrc { bool in_lpm; bool wakeup_int; enum ci_revision rev; - struct mutex mutex; }; static inline struct ci_role_driver *ci_role(struct ci_hdrc *ci)
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c index 7a86979..74cdc7e 100644 --- a/drivers/usb/chipidea/core.c +++ b/drivers/usb/chipidea/core.c
@@ -960,16 +960,9 @@ static ssize_t role_store(struct device *dev, strlen(ci->roles[role]->name))) break; - if (role == CI_ROLE_END) + if (role == CI_ROLE_END || role == ci->role) return -EINVAL; - mutex_lock(&ci->mutex); - - if (role == ci->role) { - mutex_unlock(&ci->mutex); - return n; - } - pm_runtime_get_sync(dev); disable_irq(ci->irq); ci_role_stop(ci); @@ -978,7 +971,6 @@ static ssize_t role_store(struct device *dev, ci_handle_vbus_change(ci); enable_irq(ci->irq); pm_runtime_put_sync(dev); - mutex_unlock(&ci->mutex); return (ret == 0) ? n : ret; } @@ -1014,7 +1006,6 @@ static int ci_hdrc_probe(struct platform_device *pdev) return -ENOMEM; spin_lock_init(&ci->lock); - mutex_init(&ci->mutex); ci->dev = dev; ci->platdata = dev_get_platdata(dev); ci->imx28_write_fix = !!(ci->platdata->flags &
diff --git a/drivers/usb/chipidea/otg.c b/drivers/usb/chipidea/otg.c index 0fcb8d8..fbfb02e 100644 --- a/drivers/usb/chipidea/otg.c +++ b/drivers/usb/chipidea/otg.c
@@ -164,10 +164,8 @@ static int hw_wait_vbus_lower_bsv(struct ci_hdrc *ci) static void ci_handle_id_switch(struct ci_hdrc *ci) { - enum ci_role role; + enum ci_role role = ci_otg_role(ci); - mutex_lock(&ci->mutex); - role = ci_otg_role(ci); if (role != ci->role) { dev_dbg(ci->dev, "switching from %s to %s\n", ci_role(ci)->name, ci->roles[role]->name); @@ -190,7 +188,6 @@ static void ci_handle_id_switch(struct ci_hdrc *ci) if (role == CI_ROLE_GADGET) ci_handle_vbus_change(ci); } - mutex_unlock(&ci->mutex); } /** * ci_otg_work - perform otg (vbus/id) event handle
diff --git a/drivers/usb/chipidea/otg_fsm.c b/drivers/usb/chipidea/otg_fsm.c index 7a2a955..6ed4b00 100644 --- a/drivers/usb/chipidea/otg_fsm.c +++ b/drivers/usb/chipidea/otg_fsm.c
@@ -256,10 +256,8 @@ static void ci_otg_del_timer(struct ci_hdrc *ci, enum otg_fsm_timer t) ci->enabled_otg_timer_bits &= ~(1 << t); if (ci->next_otg_timer == t) { if (ci->enabled_otg_timer_bits == 0) { - spin_unlock_irqrestore(&ci->lock, flags); /* No enabled timers after delete it */ hrtimer_cancel(&ci->otg_fsm_hrtimer); - spin_lock_irqsave(&ci->lock, flags); ci->next_otg_timer = NUM_OTG_FSM_TIMERS; } else { /* Find the next timer */
diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c index edb62b4..5dc8827 100644 --- a/drivers/usb/class/cdc-acm.c +++ b/drivers/usb/class/cdc-acm.c
@@ -1843,9 +1843,6 @@ static const struct usb_device_id acm_ids[] = { { USB_DEVICE(0x09d8, 0x0320), /* Elatec GmbH TWN3 */ .driver_info = NO_UNION_NORMAL, /* has misplaced union descriptor */ }, - { USB_DEVICE(0x0c26, 0x0020), /* Icom ICF3400 Serie */ - .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ - }, { USB_DEVICE(0x0ca6, 0xa050), /* Castles VEGA3000 */ .driver_info = NO_UNION_NORMAL, /* reports zero length descriptor */ },
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c index 536aac4..c7e4788 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c
@@ -46,9 +46,6 @@ #define USB_PRODUCT_USB5534B 0x5534 #define USB_VENDOR_CYPRESS 0x04b4 #define USB_PRODUCT_CY7C65632 0x6570 -#define USB_VENDOR_TEXAS_INSTRUMENTS 0x0451 -#define USB_PRODUCT_TUSB8041_USB3 0x8140 -#define USB_PRODUCT_TUSB8041_USB2 0x8142 #define HUB_QUIRK_CHECK_PORT_AUTOSUSPEND 0x01 #define HUB_QUIRK_DISABLE_AUTOSUSPEND 0x02 @@ -2395,8 +2392,9 @@ static int usb_enumerate_device_otg(struct usb_device *udev) * usb_enumerate_device - Read device configs/intfs/otg (usbcore-internal) * @udev: newly addressed device (in ADDRESS state) * - * This is only called by usb_new_device() -- all comments that apply there - * apply here wrt to environment. + * This is only called by usb_new_device() and usb_authorize_device() + * and FIXME -- all comments that apply to them apply here wrt to + * environment. * * If the device is WUSB and not authorized, we don't attempt to read * the string descriptors, as they will be errored out by the device @@ -5634,16 +5632,6 @@ static const struct usb_device_id hub_id_table[] = { .idVendor = USB_VENDOR_GENESYS_LOGIC, .bInterfaceClass = USB_CLASS_HUB, .driver_info = HUB_QUIRK_CHECK_PORT_AUTOSUSPEND}, - { .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT, - .idVendor = USB_VENDOR_TEXAS_INSTRUMENTS, - .idProduct = USB_PRODUCT_TUSB8041_USB2, - .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND}, - { .match_flags = USB_DEVICE_ID_MATCH_VENDOR - | USB_DEVICE_ID_MATCH_PRODUCT, - .idVendor = USB_VENDOR_TEXAS_INSTRUMENTS, - .idProduct = USB_PRODUCT_TUSB8041_USB3, - .driver_info = HUB_QUIRK_DISABLE_AUTOSUSPEND}, { .match_flags = USB_DEVICE_ID_MATCH_DEV_CLASS, .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS,
diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c index 319df78..17a3497 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c
@@ -364,9 +364,6 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x0781, 0x5583), .driver_info = USB_QUIRK_NO_LPM }, { USB_DEVICE(0x0781, 0x5591), .driver_info = USB_QUIRK_NO_LPM }, - /* Realforce 87U Keyboard */ - { USB_DEVICE(0x0853, 0x011b), .driver_info = USB_QUIRK_NO_LPM }, - /* M-Systems Flash Disk Pioneers */ { USB_DEVICE(0x08ec, 0x1000), .driver_info = USB_QUIRK_RESET_RESUME }, @@ -393,15 +390,6 @@ static const struct usb_device_id usb_quirk_list[] = { /* Kingston DataTraveler 3.0 */ { USB_DEVICE(0x0951, 0x1666), .driver_info = USB_QUIRK_NO_LPM }, - /* NVIDIA Jetson devices in Force Recovery mode */ - { USB_DEVICE(0x0955, 0x7018), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7019), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7418), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7721), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7c18), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7e19), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x0955, 0x7f21), .driver_info = USB_QUIRK_RESET_RESUME }, - /* X-Rite/Gretag-Macbeth Eye-One Pro display colorimeter */ { USB_DEVICE(0x0971, 0x2000), .driver_info = USB_QUIRK_NO_SET_INTF }, @@ -452,10 +440,6 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x1532, 0x0116), .driver_info = USB_QUIRK_LINEAR_UFRAME_INTR_BINTERVAL }, - /* Lenovo ThinkPad OneLink+ Dock twin hub controllers (VIA Labs VL812) */ - { USB_DEVICE(0x17ef, 0x1018), .driver_info = USB_QUIRK_RESET_RESUME }, - { USB_DEVICE(0x17ef, 0x1019), .driver_info = USB_QUIRK_RESET_RESUME }, - /* Lenovo USB-C to Ethernet Adapter RTL8153-04 */ { USB_DEVICE(0x17ef, 0x720c), .driver_info = USB_QUIRK_NO_LPM }, @@ -529,9 +513,6 @@ static const struct usb_device_id usb_quirk_list[] = { /* DJI CineSSD */ { USB_DEVICE(0x2ca3, 0x0031), .driver_info = USB_QUIRK_NO_LPM }, - /* Alcor Link AK9563 SC Reader used in 2022 Lenovo ThinkPads */ - { USB_DEVICE(0x2ce3, 0x9563), .driver_info = USB_QUIRK_NO_LPM }, - /* DELL USB GEN2 */ { USB_DEVICE(0x413c, 0xb062), .driver_info = USB_QUIRK_NO_LPM | USB_QUIRK_RESET_RESUME },
diff --git a/drivers/usb/core/sysfs.c b/drivers/usb/core/sysfs.c index f19694e..2f594c8 100644 --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c
@@ -889,7 +889,11 @@ read_descriptors(struct file *filp, struct kobject *kobj, size_t srclen, n; int cfgno; void *src; + int retval; + retval = usb_lock_device_interruptible(udev); + if (retval < 0) + return -EINTR; /* The binary attribute begins with the device descriptor. * Following that are the raw descriptor entries for all the * configurations (config plus subsidiary descriptors). @@ -914,6 +918,7 @@ read_descriptors(struct file *filp, struct kobject *kobj, off -= srclen; } } + usb_unlock_device(udev); return count - nleft; }
diff --git a/drivers/usb/core/usb-acpi.c b/drivers/usb/core/usb-acpi.c index 14274b6..9043d72 100644 --- a/drivers/usb/core/usb-acpi.c +++ b/drivers/usb/core/usb-acpi.c
@@ -37,71 +37,6 @@ bool usb_acpi_power_manageable(struct usb_device *hdev, int index) } EXPORT_SYMBOL_GPL(usb_acpi_power_manageable); -#define UUID_USB_CONTROLLER_DSM "ce2ee385-00e6-48cb-9f05-2edb927c4899" -#define USB_DSM_DISABLE_U1_U2_FOR_PORT 5 - -/** - * usb_acpi_port_lpm_incapable - check if lpm should be disabled for a port. - * @hdev: USB device belonging to the usb hub - * @index: zero based port index - * - * Some USB3 ports may not support USB3 link power management U1/U2 states - * due to different retimer setup. ACPI provides _DSM method which returns 0x01 - * if U1 and U2 states should be disabled. Evaluate _DSM with: - * Arg0: UUID = ce2ee385-00e6-48cb-9f05-2edb927c4899 - * Arg1: Revision ID = 0 - * Arg2: Function Index = 5 - * Arg3: (empty) - * - * Return 1 if USB3 port is LPM incapable, negative on error, otherwise 0 - */ - -int usb_acpi_port_lpm_incapable(struct usb_device *hdev, int index) -{ - union acpi_object *obj; - acpi_handle port_handle; - int port1 = index + 1; - guid_t guid; - int ret; - - ret = guid_parse(UUID_USB_CONTROLLER_DSM, &guid); - if (ret) - return ret; - - port_handle = usb_get_hub_port_acpi_handle(hdev, port1); - if (!port_handle) { - dev_dbg(&hdev->dev, "port-%d no acpi handle\n", port1); - return -ENODEV; - } - - if (!acpi_check_dsm(port_handle, &guid, 0, - BIT(USB_DSM_DISABLE_U1_U2_FOR_PORT))) { - dev_dbg(&hdev->dev, "port-%d no _DSM function %d\n", - port1, USB_DSM_DISABLE_U1_U2_FOR_PORT); - return -ENODEV; - } - - obj = acpi_evaluate_dsm(port_handle, &guid, 0, - USB_DSM_DISABLE_U1_U2_FOR_PORT, NULL); - - if (!obj) - return -ENODEV; - - if (obj->type != ACPI_TYPE_INTEGER) { - dev_dbg(&hdev->dev, "evaluate port-%d _DSM failed\n", port1); - ACPI_FREE(obj); - return -EINVAL; - } - - if (obj->integer.value == 0x01) - ret = 1; - - ACPI_FREE(obj); - - return ret; -} -EXPORT_SYMBOL_GPL(usb_acpi_port_lpm_incapable); - /** * usb_acpi_set_power_state - control usb port's power via acpi power * resource
diff --git a/drivers/usb/dwc2/platform.c b/drivers/usb/dwc2/platform.c index 4f640c0..34bb612 100644 --- a/drivers/usb/dwc2/platform.c +++ b/drivers/usb/dwc2/platform.c
@@ -142,9 +142,9 @@ static int __dwc2_lowlevel_hw_enable(struct dwc2_hsotg *hsotg) } else if (hsotg->plat && hsotg->plat->phy_init) { ret = hsotg->plat->phy_init(pdev, hsotg->plat->phy_type); } else { - ret = phy_init(hsotg->phy); + ret = phy_power_on(hsotg->phy); if (ret == 0) - ret = phy_power_on(hsotg->phy); + ret = phy_init(hsotg->phy); } return ret; @@ -176,9 +176,9 @@ static int __dwc2_lowlevel_hw_disable(struct dwc2_hsotg *hsotg) } else if (hsotg->plat && hsotg->plat->phy_exit) { ret = hsotg->plat->phy_exit(pdev, hsotg->plat->phy_type); } else { - ret = phy_power_off(hsotg->phy); + ret = phy_exit(hsotg->phy); if (ret == 0) - ret = phy_exit(hsotg->phy); + ret = phy_power_off(hsotg->phy); } if (ret) return ret;
diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 8caea98..5831b6d 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c
@@ -232,7 +232,7 @@ u32 dwc3_core_fifo_space(struct dwc3_ep *dep, u8 type) * dwc3_core_soft_reset - Issues core soft reset and PHY reset * @dwc: pointer to our context structure */ -int dwc3_core_soft_reset(struct dwc3 *dwc) +static int dwc3_core_soft_reset(struct dwc3 *dwc) { u32 reg; int retries = 1000; @@ -300,7 +300,7 @@ int dwc3_core_soft_reset(struct dwc3 *dwc) return 0; } #else -int dwc3_core_soft_reset(struct dwc3 *dwc) +static int dwc3_core_soft_reset(struct dwc3 *dwc) { u32 reg; int ret; @@ -801,16 +801,15 @@ static void dwc3_core_exit(struct dwc3 *dwc) { dwc3_event_buffers_cleanup(dwc); - usb_phy_set_suspend(dwc->usb2_phy, 1); - usb_phy_set_suspend(dwc->usb3_phy, 1); - phy_power_off(dwc->usb2_generic_phy); - phy_power_off(dwc->usb3_generic_phy); - usb_phy_shutdown(dwc->usb2_phy); usb_phy_shutdown(dwc->usb3_phy); phy_exit(dwc->usb2_generic_phy); phy_exit(dwc->usb3_generic_phy); + usb_phy_set_suspend(dwc->usb2_phy, 1); + usb_phy_set_suspend(dwc->usb3_phy, 1); + phy_power_off(dwc->usb2_generic_phy); + phy_power_off(dwc->usb3_generic_phy); clk_bulk_disable_unprepare(dwc->num_clks, dwc->clks); reset_control_assert(dwc->reset); } @@ -1045,13 +1044,8 @@ static int dwc3_core_init(struct dwc3 *dwc) if (!dwc->ulpi_ready) { ret = dwc3_core_ulpi_init(dwc); - if (ret) { - if (ret == -ETIMEDOUT) { - dwc3_core_soft_reset(dwc); - ret = -EPROBE_DEFER; - } + if (ret) goto err0; - } dwc->ulpi_ready = true; } @@ -1722,16 +1716,16 @@ static int dwc3_probe(struct platform_device *pdev) dwc3_debugfs_exit(dwc); dwc3_event_buffers_cleanup(dwc); - usb_phy_set_suspend(dwc->usb2_phy, 1); - usb_phy_set_suspend(dwc->usb3_phy, 1); - phy_power_off(dwc->usb2_generic_phy); - phy_power_off(dwc->usb3_generic_phy); - usb_phy_shutdown(dwc->usb2_phy); usb_phy_shutdown(dwc->usb3_phy); phy_exit(dwc->usb2_generic_phy); phy_exit(dwc->usb3_generic_phy); + usb_phy_set_suspend(dwc->usb2_phy, 1); + usb_phy_set_suspend(dwc->usb3_phy, 1); + phy_power_off(dwc->usb2_generic_phy); + phy_power_off(dwc->usb3_generic_phy); + dwc3_ulpi_exit(dwc); err4:
diff --git a/drivers/usb/dwc3/core.h b/drivers/usb/dwc3/core.h index 7e4b828..d658287 100644 --- a/drivers/usb/dwc3/core.h +++ b/drivers/usb/dwc3/core.h
@@ -1015,7 +1015,6 @@ struct dwc3_scratchpad_array { * @tx_max_burst_prd: max periodic ESS transmit burst size * @hsphy_interface: "utmi" or "ulpi" * @connected: true when we're connected to a host, false otherwise - * @softconnect: true when gadget connect is called, false when disconnect runs * @delayed_status: true when gadget driver asks for delayed status * @ep0_bounced: true when we used bounce buffer * @ep0_expect_in: true when we expect a DATA IN transfer @@ -1220,7 +1219,6 @@ struct dwc3 { const char *hsphy_interface; unsigned connected:1; - unsigned softconnect:1; unsigned delayed_status:1; unsigned ep0_bounced:1; unsigned ep0_expect_in:1; @@ -1456,8 +1454,6 @@ bool dwc3_has_imod(struct dwc3 *dwc); int dwc3_event_buffers_setup(struct dwc3 *dwc); void dwc3_event_buffers_cleanup(struct dwc3 *dwc); -int dwc3_core_soft_reset(struct dwc3 *dwc); - #if IS_ENABLED(CONFIG_USB_DWC3_HOST) || IS_ENABLED(CONFIG_USB_DWC3_DUAL_ROLE) int dwc3_host_init(struct dwc3 *dwc); void dwc3_host_exit(struct dwc3 *dwc);
diff --git a/drivers/usb/dwc3/dwc3-exynos.c b/drivers/usb/dwc3/dwc3-exynos.c index c594e3e..c1e9ea6 100644 --- a/drivers/usb/dwc3/dwc3-exynos.c +++ b/drivers/usb/dwc3/dwc3-exynos.c
@@ -37,6 +37,15 @@ struct dwc3_exynos { struct regulator *vdd10; }; +static int dwc3_exynos_remove_child(struct device *dev, void *unused) +{ + struct platform_device *pdev = to_platform_device(dev); + + platform_device_unregister(pdev); + + return 0; +} + static int dwc3_exynos_probe(struct platform_device *pdev) { struct dwc3_exynos *exynos; @@ -133,7 +142,7 @@ static int dwc3_exynos_remove(struct platform_device *pdev) struct dwc3_exynos *exynos = platform_get_drvdata(pdev); int i; - of_platform_depopulate(&pdev->dev); + device_for_each_child(&pdev->dev, NULL, dwc3_exynos_remove_child); for (i = exynos->num_clks - 1; i >= 0; i--) clk_disable_unprepare(exynos->clks[i]);
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c index 2dcdeb5..7874b97 100644 --- a/drivers/usb/dwc3/dwc3-qcom.c +++ b/drivers/usb/dwc3/dwc3-qcom.c
@@ -102,7 +102,7 @@ static inline void dwc3_qcom_clrbits(void __iomem *base, u32 offset, u32 val) readl(base + offset); } -static void dwc3_qcom_vbus_override_enable(struct dwc3_qcom *qcom, bool enable) +static void dwc3_qcom_vbus_overrride_enable(struct dwc3_qcom *qcom, bool enable) { if (enable) { dwc3_qcom_setbits(qcom->qscratch_base, QSCRATCH_SS_PHY_CTRL, @@ -123,7 +123,7 @@ static int dwc3_qcom_vbus_notifier(struct notifier_block *nb, struct dwc3_qcom *qcom = container_of(nb, struct dwc3_qcom, vbus_nb); /* enable vbus override for device mode */ - dwc3_qcom_vbus_override_enable(qcom, event); + dwc3_qcom_vbus_overrride_enable(qcom, event); qcom->mode = event ? USB_DR_MODE_PERIPHERAL : USB_DR_MODE_HOST; return NOTIFY_DONE; @@ -135,7 +135,7 @@ static int dwc3_qcom_host_notifier(struct notifier_block *nb, struct dwc3_qcom *qcom = container_of(nb, struct dwc3_qcom, host_nb); /* disable vbus override in host mode */ - dwc3_qcom_vbus_override_enable(qcom, !event); + dwc3_qcom_vbus_overrride_enable(qcom, !event); qcom->mode = event ? USB_DR_MODE_HOST : USB_DR_MODE_PERIPHERAL; return NOTIFY_DONE; @@ -190,14 +190,6 @@ static int dwc3_qcom_register_extcon(struct dwc3_qcom *qcom) return 0; } -/* Only usable in contexts where the role can not change. */ -static bool dwc3_qcom_is_host(struct dwc3_qcom *qcom) -{ - struct dwc3 *dwc = platform_get_drvdata(qcom->dwc3); - - return dwc->xhci; -} - static void dwc3_qcom_disable_interrupts(struct dwc3_qcom *qcom) { if (qcom->hs_phy_irq) { @@ -305,11 +297,7 @@ static irqreturn_t qcom_dwc3_resume_irq(int irq, void *data) if (qcom->pm_suspended) return IRQ_HANDLED; - /* - * This is safe as role switching is done from a freezable workqueue - * and the wakeup interrupts are disabled as part of resume. - */ - if (dwc3_qcom_is_host(qcom)) + if (dwc->xhci) pm_runtime_resume(&dwc->xhci->dev); return IRQ_HANDLED; @@ -669,8 +657,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev) qcom->mode = usb_get_dr_mode(&qcom->dwc3->dev); /* enable vbus override for device mode */ - if (qcom->mode != USB_DR_MODE_HOST) - dwc3_qcom_vbus_override_enable(qcom, true); + if (qcom->mode == USB_DR_MODE_PERIPHERAL) + dwc3_qcom_vbus_overrride_enable(qcom, true); /* register extcon to override sw_vbus on Vbus change later */ ret = dwc3_qcom_register_extcon(qcom);
diff --git a/drivers/usb/dwc3/gadget.c b/drivers/usb/dwc3/gadget.c index a1e85d8..80fee7e 100644 --- a/drivers/usb/dwc3/gadget.c +++ b/drivers/usb/dwc3/gadget.c
@@ -981,8 +981,8 @@ static void __dwc3_prepare_one_trb(struct dwc3_ep *dep, struct dwc3_trb *trb, trb->ctrl = DWC3_TRBCTL_ISOCHRONOUS; } - if (!no_interrupt && !chain) - trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI; + /* always enable Interrupt on Missed ISOC */ + trb->ctrl |= DWC3_TRB_CTRL_ISP_IMI; break; case USB_ENDPOINT_XFER_BULK: @@ -2008,42 +2008,14 @@ static void dwc3_gadget_disable_irq(struct dwc3 *dwc); static void __dwc3_gadget_stop(struct dwc3 *dwc); static int __dwc3_gadget_start(struct dwc3 *dwc); -static int dwc3_gadget_soft_disconnect(struct dwc3 *dwc) -{ - unsigned long flags; - - spin_lock_irqsave(&dwc->lock, flags); - dwc->connected = false; - - /* - * In the Synopsys DesignWare Cores USB3 Databook Rev. 3.30a - * Section 4.1.8 Table 4-7, it states that for a device-initiated - * disconnect, the SW needs to ensure that it sends "a DEPENDXFER - * command for any active transfers" before clearing the RunStop - * bit. - */ - dwc3_stop_active_transfers(dwc); - __dwc3_gadget_stop(dwc); - spin_unlock_irqrestore(&dwc->lock, flags); - - /* - * Note: if the GEVNTCOUNT indicates events in the event buffer, the - * driver needs to acknowledge them before the controller can halt. - * Simply let the interrupt handler acknowledges and handle the - * remaining event generated by the controller while polling for - * DSTS.DEVCTLHLT. - */ - return dwc3_gadget_run_stop(dwc, false, false); -} - static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) { struct dwc3 *dwc = gadget_to_dwc(g); + unsigned long flags; int ret; is_on = !!is_on; - dwc->softconnect = is_on; /* * Per databook, when we want to stop the gadget, if a control transfer * is still in process, complete it and get the core into setup phase. @@ -2079,27 +2051,50 @@ static int dwc3_gadget_pullup(struct usb_gadget *g, int is_on) return 0; } - if (dwc->pullups_connected == is_on) { - pm_runtime_put(dwc->dev); - return 0; - } + /* + * Synchronize and disable any further event handling while controller + * is being enabled/disabled. + */ + disable_irq(dwc->irq_gadget); + + spin_lock_irqsave(&dwc->lock, flags); if (!is_on) { - ret = dwc3_gadget_soft_disconnect(dwc); - } else { - /* - * In the Synopsys DWC_usb31 1.90a programming guide section - * 4.1.9, it specifies that for a reconnect after a - * device-initiated disconnect requires a core soft reset - * (DCTL.CSftRst) before enabling the run/stop bit. - */ - dwc3_core_soft_reset(dwc); + u32 count; - dwc3_event_buffers_setup(dwc); + dwc->connected = false; + /* + * In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a + * Section 4.1.8 Table 4-7, it states that for a device-initiated + * disconnect, the SW needs to ensure that it sends "a DEPENDXFER + * command for any active transfers" before clearing the RunStop + * bit. + */ + dwc3_stop_active_transfers(dwc); + __dwc3_gadget_stop(dwc); + + /* + * In the Synopsis DesignWare Cores USB3 Databook Rev. 3.30a + * Section 1.3.4, it mentions that for the DEVCTRLHLT bit, the + * "software needs to acknowledge the events that are generated + * (by writing to GEVNTCOUNTn) while it is waiting for this bit + * to be set to '1'." + */ + count = dwc3_readl(dwc->regs, DWC3_GEVNTCOUNT(0)); + count &= DWC3_GEVNTCOUNT_MASK; + if (count > 0) { + dwc3_writel(dwc->regs, DWC3_GEVNTCOUNT(0), count); + dwc->ev_buf->lpos = (dwc->ev_buf->lpos + count) % + dwc->ev_buf->length; + } + } else { __dwc3_gadget_start(dwc); - ret = dwc3_gadget_run_stop(dwc, true, false); } + ret = dwc3_gadget_run_stop(dwc, is_on, false); + spin_unlock_irqrestore(&dwc->lock, flags); + enable_irq(dwc->irq_gadget); + pm_runtime_put(dwc->dev); return ret; @@ -2681,10 +2676,6 @@ static int dwc3_gadget_ep_reclaim_completed_trb(struct dwc3_ep *dep, if (event->status & DEPEVT_STATUS_SHORT && !chain) return 1; - if ((trb->ctrl & DWC3_TRB_CTRL_ISP_IMI) && - DWC3_TRB_SIZE_TRBSTS(trb->size) == DWC3_TRBSTS_MISSED_ISOC) - return 1; - if ((trb->ctrl & DWC3_TRB_CTRL_IOC) || (trb->ctrl & DWC3_TRB_CTRL_LST)) return 1; @@ -3800,7 +3791,7 @@ int dwc3_gadget_resume(struct dwc3 *dwc) { int ret; - if (!dwc->gadget_driver || !dwc->softconnect) + if (!dwc->gadget_driver) return 0; ret = __dwc3_gadget_start(dwc);
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c index e62f03e..20fa94c 100644 --- a/drivers/usb/dwc3/host.c +++ b/drivers/usb/dwc3/host.c
@@ -133,5 +133,4 @@ int dwc3_host_init(struct dwc3 *dwc) void dwc3_host_exit(struct dwc3 *dwc) { platform_device_unregister(dwc->xhci); - dwc->xhci = NULL; }
diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c index 4572672..73e7f96 100644 --- a/drivers/usb/gadget/function/f_fs.c +++ b/drivers/usb/gadget/function/f_fs.c
@@ -376,11 +376,6 @@ static int __ffs_ep0_queue_wait(struct ffs_data *ffs, char *data, size_t len) struct usb_request *req = ffs->ep0req; int ret; - if (!req) { - spin_unlock_irq(&ffs->ev.waitq.lock); - return -EINVAL; - } - req->zero = len < le16_to_cpu(ffs->ev.setup.wLength); spin_unlock_irq(&ffs->ev.waitq.lock); @@ -2127,14 +2122,10 @@ static void functionfs_unbind(struct ffs_data *ffs) ENTER(); if (!WARN_ON(!ffs->gadget)) { - /* dequeue before freeing ep0req */ - usb_ep_dequeue(ffs->gadget->ep0, ffs->ep0req); - mutex_lock(&ffs->mutex); usb_ep_free_request(ffs->gadget->ep0, ffs->ep0req); ffs->ep0req = NULL; ffs->gadget = NULL; clear_bit(FFS_FL_BOUND, &ffs->flags); - mutex_unlock(&ffs->mutex); ffs_data_put(ffs); } }
diff --git a/drivers/usb/gadget/function/f_hid.c b/drivers/usb/gadget/function/f_hid.c index c9d61d4..e4d7141 100644 --- a/drivers/usb/gadget/function/f_hid.c +++ b/drivers/usb/gadget/function/f_hid.c
@@ -45,25 +45,12 @@ struct f_hidg { unsigned short report_desc_length; char *report_desc; unsigned short report_length; - /* - * use_out_ep - if true, the OUT Endpoint (interrupt out method) - * will be used to receive reports from the host - * using functions with the "intout" suffix. - * Otherwise, the OUT Endpoint will not be configured - * and the SETUP/SET_REPORT method ("ssreport" suffix) - * will be used to receive reports. - */ - bool use_out_ep; /* recv report */ + struct list_head completed_out_req; spinlock_t read_spinlock; wait_queue_head_t read_queue; - /* recv report - interrupt out only (use_out_ep == 1) */ - struct list_head completed_out_req; unsigned int qlen; - /* recv report - setup set_report only (use_out_ep == 0) */ - char *set_report_buf; - unsigned int set_report_length; /* send report */ spinlock_t write_spinlock; @@ -71,7 +58,7 @@ struct f_hidg { wait_queue_head_t write_queue; struct usb_request *req; - struct device dev; + int minor; struct cdev cdev; struct usb_function func; @@ -84,14 +71,6 @@ static inline struct f_hidg *func_to_hidg(struct usb_function *f) return container_of(f, struct f_hidg, func); } -static void hidg_release(struct device *dev) -{ - struct f_hidg *hidg = container_of(dev, struct f_hidg, dev); - - kfree(hidg->set_report_buf); - kfree(hidg); -} - /*-------------------------------------------------------------------------*/ /* Static descriptors */ @@ -100,7 +79,7 @@ static struct usb_interface_descriptor hidg_interface_desc = { .bDescriptorType = USB_DT_INTERFACE, /* .bInterfaceNumber = DYNAMIC */ .bAlternateSetting = 0, - /* .bNumEndpoints = DYNAMIC (depends on use_out_ep) */ + .bNumEndpoints = 2, .bInterfaceClass = USB_CLASS_HID, /* .bInterfaceSubClass = DYNAMIC */ /* .bInterfaceProtocol = DYNAMIC */ @@ -161,7 +140,7 @@ static struct usb_ss_ep_comp_descriptor hidg_ss_out_comp_desc = { /* .wBytesPerInterval = DYNAMIC */ }; -static struct usb_descriptor_header *hidg_ss_descriptors_intout[] = { +static struct usb_descriptor_header *hidg_ss_descriptors[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_ss_in_ep_desc, @@ -171,14 +150,6 @@ static struct usb_descriptor_header *hidg_ss_descriptors_intout[] = { NULL, }; -static struct usb_descriptor_header *hidg_ss_descriptors_ssreport[] = { - (struct usb_descriptor_header *)&hidg_interface_desc, - (struct usb_descriptor_header *)&hidg_desc, - (struct usb_descriptor_header *)&hidg_ss_in_ep_desc, - (struct usb_descriptor_header *)&hidg_ss_in_comp_desc, - NULL, -}; - /* High-Speed Support */ static struct usb_endpoint_descriptor hidg_hs_in_ep_desc = { @@ -205,7 +176,7 @@ static struct usb_endpoint_descriptor hidg_hs_out_ep_desc = { */ }; -static struct usb_descriptor_header *hidg_hs_descriptors_intout[] = { +static struct usb_descriptor_header *hidg_hs_descriptors[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_hs_in_ep_desc, @@ -213,13 +184,6 @@ static struct usb_descriptor_header *hidg_hs_descriptors_intout[] = { NULL, }; -static struct usb_descriptor_header *hidg_hs_descriptors_ssreport[] = { - (struct usb_descriptor_header *)&hidg_interface_desc, - (struct usb_descriptor_header *)&hidg_desc, - (struct usb_descriptor_header *)&hidg_hs_in_ep_desc, - NULL, -}; - /* Full-Speed Support */ static struct usb_endpoint_descriptor hidg_fs_in_ep_desc = { @@ -246,7 +210,7 @@ static struct usb_endpoint_descriptor hidg_fs_out_ep_desc = { */ }; -static struct usb_descriptor_header *hidg_fs_descriptors_intout[] = { +static struct usb_descriptor_header *hidg_fs_descriptors[] = { (struct usb_descriptor_header *)&hidg_interface_desc, (struct usb_descriptor_header *)&hidg_desc, (struct usb_descriptor_header *)&hidg_fs_in_ep_desc, @@ -254,13 +218,6 @@ static struct usb_descriptor_header *hidg_fs_descriptors_intout[] = { NULL, }; -static struct usb_descriptor_header *hidg_fs_descriptors_ssreport[] = { - (struct usb_descriptor_header *)&hidg_interface_desc, - (struct usb_descriptor_header *)&hidg_desc, - (struct usb_descriptor_header *)&hidg_fs_in_ep_desc, - NULL, -}; - /*-------------------------------------------------------------------------*/ /* Strings */ @@ -284,8 +241,8 @@ static struct usb_gadget_strings *ct_func_strings[] = { /*-------------------------------------------------------------------------*/ /* Char Device */ -static ssize_t f_hidg_intout_read(struct file *file, char __user *buffer, - size_t count, loff_t *ptr) +static ssize_t f_hidg_read(struct file *file, char __user *buffer, + size_t count, loff_t *ptr) { struct f_hidg *hidg = file->private_data; struct f_hidg_req_list *list; @@ -301,15 +258,15 @@ static ssize_t f_hidg_intout_read(struct file *file, char __user *buffer, spin_lock_irqsave(&hidg->read_spinlock, flags); -#define READ_COND_INTOUT (!list_empty(&hidg->completed_out_req)) +#define READ_COND (!list_empty(&hidg->completed_out_req)) /* wait for at least one buffer to complete */ - while (!READ_COND_INTOUT) { + while (!READ_COND) { spin_unlock_irqrestore(&hidg->read_spinlock, flags); if (file->f_flags & O_NONBLOCK) return -EAGAIN; - if (wait_event_interruptible(hidg->read_queue, READ_COND_INTOUT)) + if (wait_event_interruptible(hidg->read_queue, READ_COND)) return -ERESTARTSYS; spin_lock_irqsave(&hidg->read_spinlock, flags); @@ -359,60 +316,6 @@ static ssize_t f_hidg_intout_read(struct file *file, char __user *buffer, return count; } -#define READ_COND_SSREPORT (hidg->set_report_buf != NULL) - -static ssize_t f_hidg_ssreport_read(struct file *file, char __user *buffer, - size_t count, loff_t *ptr) -{ - struct f_hidg *hidg = file->private_data; - char *tmp_buf = NULL; - unsigned long flags; - - if (!count) - return 0; - - spin_lock_irqsave(&hidg->read_spinlock, flags); - - while (!READ_COND_SSREPORT) { - spin_unlock_irqrestore(&hidg->read_spinlock, flags); - if (file->f_flags & O_NONBLOCK) - return -EAGAIN; - - if (wait_event_interruptible(hidg->read_queue, READ_COND_SSREPORT)) - return -ERESTARTSYS; - - spin_lock_irqsave(&hidg->read_spinlock, flags); - } - - count = min_t(unsigned int, count, hidg->set_report_length); - tmp_buf = hidg->set_report_buf; - hidg->set_report_buf = NULL; - - spin_unlock_irqrestore(&hidg->read_spinlock, flags); - - if (tmp_buf != NULL) { - count -= copy_to_user(buffer, tmp_buf, count); - kfree(tmp_buf); - } else { - count = -ENOMEM; - } - - wake_up(&hidg->read_queue); - - return count; -} - -static ssize_t f_hidg_read(struct file *file, char __user *buffer, - size_t count, loff_t *ptr) -{ - struct f_hidg *hidg = file->private_data; - - if (hidg->use_out_ep) - return f_hidg_intout_read(file, buffer, count, ptr); - else - return f_hidg_ssreport_read(file, buffer, count, ptr); -} - static void f_hidg_req_complete(struct usb_ep *ep, struct usb_request *req) { struct f_hidg *hidg = (struct f_hidg *)ep->driver_data; @@ -536,20 +439,14 @@ static __poll_t f_hidg_poll(struct file *file, poll_table *wait) if (WRITE_COND) ret |= EPOLLOUT | EPOLLWRNORM; - if (hidg->use_out_ep) { - if (READ_COND_INTOUT) - ret |= EPOLLIN | EPOLLRDNORM; - } else { - if (READ_COND_SSREPORT) - ret |= EPOLLIN | EPOLLRDNORM; - } + if (READ_COND) + ret |= EPOLLIN | EPOLLRDNORM; return ret; } #undef WRITE_COND -#undef READ_COND_SSREPORT -#undef READ_COND_INTOUT +#undef READ_COND static int f_hidg_release(struct inode *inode, struct file *fd) { @@ -576,7 +473,7 @@ static inline struct usb_request *hidg_alloc_ep_req(struct usb_ep *ep, return alloc_ep_req(ep, length); } -static void hidg_intout_complete(struct usb_ep *ep, struct usb_request *req) +static void hidg_set_report_complete(struct usb_ep *ep, struct usb_request *req) { struct f_hidg *hidg = (struct f_hidg *) req->context; struct usb_composite_dev *cdev = hidg->func.config->cdev; @@ -611,37 +508,6 @@ static void hidg_intout_complete(struct usb_ep *ep, struct usb_request *req) } } -static void hidg_ssreport_complete(struct usb_ep *ep, struct usb_request *req) -{ - struct f_hidg *hidg = (struct f_hidg *)req->context; - struct usb_composite_dev *cdev = hidg->func.config->cdev; - char *new_buf = NULL; - unsigned long flags; - - if (req->status != 0 || req->buf == NULL || req->actual == 0) { - ERROR(cdev, - "%s FAILED: status=%d, buf=%p, actual=%d\n", - __func__, req->status, req->buf, req->actual); - return; - } - - spin_lock_irqsave(&hidg->read_spinlock, flags); - - new_buf = krealloc(hidg->set_report_buf, req->actual, GFP_ATOMIC); - if (new_buf == NULL) { - spin_unlock_irqrestore(&hidg->read_spinlock, flags); - return; - } - hidg->set_report_buf = new_buf; - - hidg->set_report_length = req->actual; - memcpy(hidg->set_report_buf, req->buf, req->actual); - - spin_unlock_irqrestore(&hidg->read_spinlock, flags); - - wake_up(&hidg->read_queue); -} - static int hidg_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) { @@ -689,11 +555,7 @@ static int hidg_setup(struct usb_function *f, case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 | HID_REQ_SET_REPORT): VDBG(cdev, "set_report | wLength=%d\n", ctrl->wLength); - if (hidg->use_out_ep) - goto stall; - req->complete = hidg_ssreport_complete; - req->context = hidg; - goto respond; + goto stall; break; case ((USB_DIR_OUT | USB_TYPE_CLASS | USB_RECIP_INTERFACE) << 8 @@ -781,18 +643,15 @@ static void hidg_disable(struct usb_function *f) unsigned long flags; usb_ep_disable(hidg->in_ep); + usb_ep_disable(hidg->out_ep); - if (hidg->out_ep) { - usb_ep_disable(hidg->out_ep); - - spin_lock_irqsave(&hidg->read_spinlock, flags); - list_for_each_entry_safe(list, next, &hidg->completed_out_req, list) { - free_ep_req(hidg->out_ep, list->req); - list_del(&list->list); - kfree(list); - } - spin_unlock_irqrestore(&hidg->read_spinlock, flags); + spin_lock_irqsave(&hidg->read_spinlock, flags); + list_for_each_entry_safe(list, next, &hidg->completed_out_req, list) { + free_ep_req(hidg->out_ep, list->req); + list_del(&list->list); + kfree(list); } + spin_unlock_irqrestore(&hidg->read_spinlock, flags); spin_lock_irqsave(&hidg->write_spinlock, flags); if (!hidg->write_pending) { @@ -838,7 +697,8 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) } } - if (hidg->use_out_ep && hidg->out_ep != NULL) { + + if (hidg->out_ep != NULL) { /* restart endpoint */ usb_ep_disable(hidg->out_ep); @@ -863,7 +723,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) hidg_alloc_ep_req(hidg->out_ep, hidg->report_length); if (req) { - req->complete = hidg_intout_complete; + req->complete = hidg_set_report_complete; req->context = hidg; status = usb_ep_queue(hidg->out_ep, req, GFP_ATOMIC); @@ -889,8 +749,7 @@ static int hidg_set_alt(struct usb_function *f, unsigned intf, unsigned alt) } return 0; disable_out_ep: - if (hidg->out_ep) - usb_ep_disable(hidg->out_ep); + usb_ep_disable(hidg->out_ep); free_req_in: if (req_in) free_ep_req(hidg->in_ep, req_in); @@ -918,7 +777,9 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) struct usb_ep *ep; struct f_hidg *hidg = func_to_hidg(f); struct usb_string *us; + struct device *device; int status; + dev_t dev; /* maybe allocate device-global string IDs, and patch descriptors */ us = usb_gstrings_attach(c->cdev, ct_func_strings, @@ -940,21 +801,14 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) goto fail; hidg->in_ep = ep; - hidg->out_ep = NULL; - if (hidg->use_out_ep) { - ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_out_ep_desc); - if (!ep) - goto fail; - hidg->out_ep = ep; - } - - /* used only if use_out_ep == 1 */ - hidg->set_report_buf = NULL; + ep = usb_ep_autoconfig(c->cdev->gadget, &hidg_fs_out_ep_desc); + if (!ep) + goto fail; + hidg->out_ep = ep; /* set descriptor dynamic values */ hidg_interface_desc.bInterfaceSubClass = hidg->bInterfaceSubClass; hidg_interface_desc.bInterfaceProtocol = hidg->bInterfaceProtocol; - hidg_interface_desc.bNumEndpoints = hidg->use_out_ep ? 2 : 1; hidg->protocol = HID_REPORT_PROTOCOL; hidg->idle = 1; hidg_ss_in_ep_desc.wMaxPacketSize = cpu_to_le16(hidg->report_length); @@ -985,19 +839,9 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) hidg_ss_out_ep_desc.bEndpointAddress = hidg_fs_out_ep_desc.bEndpointAddress; - if (hidg->use_out_ep) - status = usb_assign_descriptors(f, - hidg_fs_descriptors_intout, - hidg_hs_descriptors_intout, - hidg_ss_descriptors_intout, - hidg_ss_descriptors_intout); - else - status = usb_assign_descriptors(f, - hidg_fs_descriptors_ssreport, - hidg_hs_descriptors_ssreport, - hidg_ss_descriptors_ssreport, - hidg_ss_descriptors_ssreport); - + status = usb_assign_descriptors(f, hidg_fs_descriptors, + hidg_hs_descriptors, hidg_ss_descriptors, + hidg_ss_descriptors); if (status) goto fail; @@ -1011,11 +855,21 @@ static int hidg_bind(struct usb_configuration *c, struct usb_function *f) /* create char device */ cdev_init(&hidg->cdev, &f_hidg_fops); - status = cdev_device_add(&hidg->cdev, &hidg->dev); + dev = MKDEV(major, hidg->minor); + status = cdev_add(&hidg->cdev, dev, 1); if (status) goto fail_free_descs; + device = device_create(hidg_class, NULL, dev, NULL, + "%s%d", "hidg", hidg->minor); + if (IS_ERR(device)) { + status = PTR_ERR(device); + goto del; + } + return 0; +del: + cdev_del(&hidg->cdev); fail_free_descs: usb_free_all_descriptors(f); fail: @@ -1102,7 +956,6 @@ CONFIGFS_ATTR(f_hid_opts_, name) F_HID_OPT(subclass, 8, 255); F_HID_OPT(protocol, 8, 255); -F_HID_OPT(no_out_endpoint, 8, 1); F_HID_OPT(report_length, 16, 65535); static ssize_t f_hid_opts_report_desc_show(struct config_item *item, char *page) @@ -1162,7 +1015,6 @@ CONFIGFS_ATTR_RO(f_hid_opts_, dev); static struct configfs_attribute *hid_attrs[] = { &f_hid_opts_attr_subclass, &f_hid_opts_attr_protocol, - &f_hid_opts_attr_no_out_endpoint, &f_hid_opts_attr_report_length, &f_hid_opts_attr_report_desc, &f_hid_opts_attr_dev, @@ -1246,7 +1098,8 @@ static void hidg_free(struct usb_function *f) hidg = func_to_hidg(f); opts = container_of(f->fi, struct f_hid_opts, func_inst); - put_device(&hidg->dev); + kfree(hidg->report_desc); + kfree(hidg); mutex_lock(&opts->lock); --opts->refcnt; mutex_unlock(&opts->lock); @@ -1256,7 +1109,8 @@ static void hidg_unbind(struct usb_configuration *c, struct usb_function *f) { struct f_hidg *hidg = func_to_hidg(f); - cdev_device_del(&hidg->cdev, &hidg->dev); + device_destroy(hidg_class, MKDEV(major, hidg->minor)); + cdev_del(&hidg->cdev); usb_free_all_descriptors(f); } @@ -1265,7 +1119,6 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) { struct f_hidg *hidg; struct f_hid_opts *opts; - int ret; /* allocate and initialize one new instance */ hidg = kzalloc(sizeof(*hidg), GFP_KERNEL); @@ -1277,33 +1130,21 @@ static struct usb_function *hidg_alloc(struct usb_function_instance *fi) mutex_lock(&opts->lock); ++opts->refcnt; - device_initialize(&hidg->dev); - hidg->dev.release = hidg_release; - hidg->dev.class = hidg_class; - hidg->dev.devt = MKDEV(major, opts->minor); - ret = dev_set_name(&hidg->dev, "hidg%d", opts->minor); - if (ret) { - --opts->refcnt; - mutex_unlock(&opts->lock); - return ERR_PTR(ret); - } - + hidg->minor = opts->minor; hidg->bInterfaceSubClass = opts->subclass; hidg->bInterfaceProtocol = opts->protocol; hidg->report_length = opts->report_length; hidg->report_desc_length = opts->report_desc_length; if (opts->report_desc) { - hidg->report_desc = devm_kmemdup(&hidg->dev, opts->report_desc, - opts->report_desc_length, - GFP_KERNEL); + hidg->report_desc = kmemdup(opts->report_desc, + opts->report_desc_length, + GFP_KERNEL); if (!hidg->report_desc) { - put_device(&hidg->dev); - --opts->refcnt; + kfree(hidg); mutex_unlock(&opts->lock); return ERR_PTR(-ENOMEM); } } - hidg->use_out_ep = !opts->no_out_endpoint; mutex_unlock(&opts->lock);
diff --git a/drivers/usb/gadget/function/f_ncm.c b/drivers/usb/gadget/function/f_ncm.c index 5558ea5..9b19d69 100644 --- a/drivers/usb/gadget/function/f_ncm.c +++ b/drivers/usb/gadget/function/f_ncm.c
@@ -85,9 +85,7 @@ static inline struct f_ncm *func_to_ncm(struct usb_function *f) /* peak (theoretical) bulk transfer rate in bits-per-second */ static inline unsigned ncm_bitrate(struct usb_gadget *g) { - if (!g) - return 0; - else if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS) + if (gadget_is_superspeed(g) && g->speed >= USB_SPEED_SUPER_PLUS) return 4250000000U; else if (gadget_is_superspeed(g) && g->speed == USB_SPEED_SUPER) return 3750000000U;
diff --git a/drivers/usb/gadget/function/f_printer.c b/drivers/usb/gadget/function/f_printer.c index dd5eb62..2a1868b 100644 --- a/drivers/usb/gadget/function/f_printer.c +++ b/drivers/usb/gadget/function/f_printer.c
@@ -87,7 +87,7 @@ struct printer_dev { u8 printer_cdev_open; wait_queue_head_t wait; unsigned q_len; - char **pnp_string; /* We don't own memory! */ + char *pnp_string; /* We don't own memory! */ struct usb_function function; }; @@ -963,16 +963,16 @@ static int printer_func_setup(struct usb_function *f, if ((wIndex>>8) != dev->interface) break; - if (!*dev->pnp_string) { + if (!dev->pnp_string) { value = 0; break; } - value = strlen(*dev->pnp_string); + value = strlen(dev->pnp_string); buf[0] = (value >> 8) & 0xFF; buf[1] = value & 0xFF; - memcpy(buf + 2, *dev->pnp_string, value); + memcpy(buf + 2, dev->pnp_string, value); DBG(dev, "1284 PNP String: %x %s\n", value, - *dev->pnp_string); + dev->pnp_string); break; case GET_PORT_STATUS: /* Get Port Status */ @@ -1435,7 +1435,7 @@ static struct usb_function *gprinter_alloc(struct usb_function_instance *fi) kref_init(&dev->kref); ++opts->refcnt; dev->minor = opts->minor; - dev->pnp_string = &opts->pnp_string; + dev->pnp_string = opts->pnp_string; dev->q_len = opts->q_len; mutex_unlock(&opts->lock);
diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 094a88f..c03b67a 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c
@@ -213,9 +213,8 @@ uvc_function_ep0_complete(struct usb_ep *ep, struct usb_request *req) memset(&v4l2_event, 0, sizeof(v4l2_event)); v4l2_event.type = UVC_EVENT_DATA; - uvc_event->data.length = min_t(unsigned int, req->actual, - sizeof(uvc_event->data.data)); - memcpy(&uvc_event->data.data, req->buf, uvc_event->data.length); + uvc_event->data.length = req->actual; + memcpy(&uvc_event->data.data, req->buf, req->actual); v4l2_event_queue(&uvc->vdev, &v4l2_event); } }
diff --git a/drivers/usb/gadget/function/storage_common.c b/drivers/usb/gadget/function/storage_common.c index 0219849..f7e6c42 100644 --- a/drivers/usb/gadget/function/storage_common.c +++ b/drivers/usb/gadget/function/storage_common.c
@@ -294,10 +294,8 @@ EXPORT_SYMBOL_GPL(fsg_lun_fsync_sub); void store_cdrom_address(u8 *dest, int msf, u32 addr) { if (msf) { - /* - * Convert to Minutes-Seconds-Frames. - * Sector size is already set to 2048 bytes. - */ + /* Convert to Minutes-Seconds-Frames */ + addr >>= 2; /* Convert to 2048-byte frames */ addr += 2*75; /* Lead-in occupies 2 seconds */ dest[3] = addr % 75; /* Frames */ addr /= 75;
diff --git a/drivers/usb/gadget/function/u_audio.c b/drivers/usb/gadget/function/u_audio.c index 53b30de..4e01ba0 100644 --- a/drivers/usb/gadget/function/u_audio.c +++ b/drivers/usb/gadget/function/u_audio.c
@@ -626,7 +626,7 @@ void g_audio_cleanup(struct g_audio *g_audio) uac = g_audio->uac; card = uac->card; if (card) - snd_card_free_when_closed(card); + snd_card_free(card); kfree(uac->p_prm.ureq); kfree(uac->c_prm.ureq);
diff --git a/drivers/usb/gadget/function/u_hid.h b/drivers/usb/gadget/function/u_hid.h index 90d8b1c..1594bfa 100644 --- a/drivers/usb/gadget/function/u_hid.h +++ b/drivers/usb/gadget/function/u_hid.h
@@ -20,7 +20,6 @@ struct f_hid_opts { int minor; unsigned char subclass; unsigned char protocol; - unsigned char no_out_endpoint; unsigned short report_length; unsigned short report_desc_length; unsigned char *report_desc;
diff --git a/drivers/usb/gadget/function/uvc_video.c b/drivers/usb/gadget/function/uvc_video.c index f9fad63..5c042f3 100644 --- a/drivers/usb/gadget/function/uvc_video.c +++ b/drivers/usb/gadget/function/uvc_video.c
@@ -191,7 +191,7 @@ uvc_video_complete(struct usb_ep *ep, struct usb_request *req) goto requeue; default: - uvcg_warn(&video->uvc->func, + uvcg_info(&video->uvc->func, "VS request completed with status %d.\n", req->status); uvcg_queue_cancel(queue, 0);
diff --git a/drivers/usb/gadget/legacy/inode.c b/drivers/usb/gadget/legacy/inode.c index dd72e75..9cd80ad 100644 --- a/drivers/usb/gadget/legacy/inode.c +++ b/drivers/usb/gadget/legacy/inode.c
@@ -229,7 +229,6 @@ static void put_ep (struct ep_data *data) */ static const char *CHIP; -static DEFINE_MUTEX(sb_mutex); /* Serialize superblock operations */ /*----------------------------------------------------------------------*/ @@ -363,7 +362,6 @@ ep_io (struct ep_data *epdata, void *buf, unsigned len) spin_unlock_irq (&epdata->dev->lock); DBG (epdata->dev, "endpoint gone\n"); - wait_for_completion(&done); epdata->status = -ENODEV; } } @@ -2014,20 +2012,13 @@ gadgetfs_fill_super (struct super_block *sb, struct fs_context *fc) { struct inode *inode; struct dev_data *dev; - int rc; - mutex_lock(&sb_mutex); - - if (the_device) { - rc = -ESRCH; - goto Done; - } + if (the_device) + return -ESRCH; CHIP = usb_get_gadget_udc_name(); - if (!CHIP) { - rc = -ENODEV; - goto Done; - } + if (!CHIP) + return -ENODEV; /* superblock */ sb->s_blocksize = PAGE_SIZE; @@ -2064,17 +2055,13 @@ gadgetfs_fill_super (struct super_block *sb, struct fs_context *fc) * from binding to a controller. */ the_device = dev; - rc = 0; - goto Done; + return 0; - Enomem: +Enomem: kfree(CHIP); CHIP = NULL; - rc = -ENOMEM; - Done: - mutex_unlock(&sb_mutex); - return rc; + return -ENOMEM; } /* "mount -t gadgetfs path /dev/gadget" ends up here */ @@ -2096,7 +2083,6 @@ static int gadgetfs_init_fs_context(struct fs_context *fc) static void gadgetfs_kill_sb (struct super_block *sb) { - mutex_lock(&sb_mutex); kill_litter_super (sb); if (the_device) { put_dev (the_device); @@ -2104,7 +2090,6 @@ gadgetfs_kill_sb (struct super_block *sb) } kfree(CHIP); CHIP = NULL; - mutex_unlock(&sb_mutex); } /*----------------------------------------------------------------------*/
diff --git a/drivers/usb/gadget/legacy/webcam.c b/drivers/usb/gadget/legacy/webcam.c index ff970a9..2c9eab2 100644 --- a/drivers/usb/gadget/legacy/webcam.c +++ b/drivers/usb/gadget/legacy/webcam.c
@@ -293,7 +293,6 @@ static const struct uvc_descriptor_header * const uvc_fs_streaming_cls[] = { (const struct uvc_descriptor_header *) &uvc_format_yuv, (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p, (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p, - (const struct uvc_descriptor_header *) &uvc_color_matching, (const struct uvc_descriptor_header *) &uvc_format_mjpg, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p, @@ -306,7 +305,6 @@ static const struct uvc_descriptor_header * const uvc_hs_streaming_cls[] = { (const struct uvc_descriptor_header *) &uvc_format_yuv, (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p, (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p, - (const struct uvc_descriptor_header *) &uvc_color_matching, (const struct uvc_descriptor_header *) &uvc_format_mjpg, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p, @@ -319,7 +317,6 @@ static const struct uvc_descriptor_header * const uvc_ss_streaming_cls[] = { (const struct uvc_descriptor_header *) &uvc_format_yuv, (const struct uvc_descriptor_header *) &uvc_frame_yuv_360p, (const struct uvc_descriptor_header *) &uvc_frame_yuv_720p, - (const struct uvc_descriptor_header *) &uvc_color_matching, (const struct uvc_descriptor_header *) &uvc_format_mjpg, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_360p, (const struct uvc_descriptor_header *) &uvc_frame_mjpg_720p,
diff --git a/drivers/usb/gadget/udc/Kconfig b/drivers/usb/gadget/udc/Kconfig index ccf2c73..f985bb4 100644 --- a/drivers/usb/gadget/udc/Kconfig +++ b/drivers/usb/gadget/udc/Kconfig
@@ -311,7 +311,7 @@ config USB_AMD5536UDC tristate "AMD5536 UDC" - depends on USB_PCI && HAS_DMA + depends on USB_PCI select USB_SNP_CORE help The AMD5536 UDC is part of the AMD Geode CS5536, an x86 southbridge.
diff --git a/drivers/usb/gadget/udc/bdc/bdc_udc.c b/drivers/usb/gadget/udc/bdc/bdc_udc.c index 71ed3a1..7bfd58c 100644 --- a/drivers/usb/gadget/udc/bdc/bdc_udc.c +++ b/drivers/usb/gadget/udc/bdc/bdc_udc.c
@@ -151,7 +151,6 @@ static void bdc_uspc_disconnected(struct bdc *bdc, bool reinit) bdc->delayed_status = false; bdc->reinit = reinit; bdc->test_mode = false; - usb_gadget_set_state(&bdc->gadget, USB_STATE_NOTATTACHED); } /* TNotify wkaeup timer */
diff --git a/drivers/usb/gadget/udc/fotg210-udc.c b/drivers/usb/gadget/udc/fotg210-udc.c index 30389e9..c313d07 100644 --- a/drivers/usb/gadget/udc/fotg210-udc.c +++ b/drivers/usb/gadget/udc/fotg210-udc.c
@@ -629,10 +629,10 @@ static void fotg210_request_error(struct fotg210_udc *fotg210) static void fotg210_set_address(struct fotg210_udc *fotg210, struct usb_ctrlrequest *ctrl) { - if (le16_to_cpu(ctrl->wValue) >= 0x0100) { + if (ctrl->wValue >= 0x0100) { fotg210_request_error(fotg210); } else { - fotg210_set_dev_addr(fotg210, le16_to_cpu(ctrl->wValue)); + fotg210_set_dev_addr(fotg210, ctrl->wValue); fotg210_set_cxdone(fotg210); } } @@ -713,17 +713,17 @@ static void fotg210_get_status(struct fotg210_udc *fotg210, switch (ctrl->bRequestType & USB_RECIP_MASK) { case USB_RECIP_DEVICE: - fotg210->ep0_data = cpu_to_le16(1 << USB_DEVICE_SELF_POWERED); + fotg210->ep0_data = 1 << USB_DEVICE_SELF_POWERED; break; case USB_RECIP_INTERFACE: - fotg210->ep0_data = cpu_to_le16(0); + fotg210->ep0_data = 0; break; case USB_RECIP_ENDPOINT: epnum = ctrl->wIndex & USB_ENDPOINT_NUMBER_MASK; if (epnum) fotg210->ep0_data = - cpu_to_le16(fotg210_is_epnstall(fotg210->ep[epnum]) - << USB_ENDPOINT_HALT); + fotg210_is_epnstall(fotg210->ep[epnum]) + << USB_ENDPOINT_HALT; else fotg210_request_error(fotg210); break;
diff --git a/drivers/usb/gadget/udc/renesas_usb3.c b/drivers/usb/gadget/udc/renesas_usb3.c index e04acf2..0bbd180 100644 --- a/drivers/usb/gadget/udc/renesas_usb3.c +++ b/drivers/usb/gadget/udc/renesas_usb3.c
@@ -2553,7 +2553,6 @@ static int renesas_usb3_remove(struct platform_device *pdev) debugfs_remove_recursive(usb3->dentry); device_remove_file(&pdev->dev, &dev_attr_role); - cancel_work_sync(&usb3->role_work); usb_role_switch_unregister(usb3->role_sw); usb_del_gadget_udc(&usb3->gadget);
diff --git a/drivers/usb/gadget/udc/snps_udc_core.c b/drivers/usb/gadget/udc/snps_udc_core.c index e76f1a5..3fcded3 100644 --- a/drivers/usb/gadget/udc/snps_udc_core.c +++ b/drivers/usb/gadget/udc/snps_udc_core.c
@@ -96,7 +96,9 @@ static int stop_pollstall_timer; static DECLARE_COMPLETION(on_pollstall_exit); /* tasklet for usb disconnect */ -static DECLARE_TASKLET_OLD(disconnect_tasklet, udc_tasklet_disconnect); +static DECLARE_TASKLET(disconnect_tasklet, udc_tasklet_disconnect, + (unsigned long) &udc); + /* endpoint names used for print */ static const char ep0_string[] = "ep0in"; @@ -1659,7 +1661,7 @@ static void usb_disconnect(struct udc *dev) /* Tasklet for disconnect to be outside of interrupt context */ static void udc_tasklet_disconnect(unsigned long par) { - struct udc *dev = udc; + struct udc *dev = (struct udc *)(*((struct udc **) par)); u32 tmp; DBG(dev, "Tasklet disconnect\n");
diff --git a/drivers/usb/host/ehci-fsl.c b/drivers/usb/host/ehci-fsl.c index b66cc64..9e9c232 100644 --- a/drivers/usb/host/ehci-fsl.c +++ b/drivers/usb/host/ehci-fsl.c
@@ -29,7 +29,7 @@ #include "ehci-fsl.h" #define DRIVER_DESC "Freescale EHCI Host controller driver" -#define DRV_NAME "fsl-ehci" +#define DRV_NAME "ehci-fsl" static struct hc_driver __read_mostly fsl_ehci_hc_driver;
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c index 28a1969..6bbaee7 100644 --- a/drivers/usb/host/ehci-ppc-of.c +++ b/drivers/usb/host/ehci-ppc-of.c
@@ -148,7 +148,6 @@ static int ehci_hcd_ppc_of_probe(struct platform_device *op) } else { ehci->has_amcc_usb23 = 1; } - of_node_put(np); } if (of_get_property(dn, "big-endian", NULL)) {
diff --git a/drivers/usb/host/fhci-sched.c b/drivers/usb/host/fhci-sched.c index 5c423f2..3235d53 100644 --- a/drivers/usb/host/fhci-sched.c +++ b/drivers/usb/host/fhci-sched.c
@@ -677,7 +677,7 @@ static void process_done_list(unsigned long data) enable_irq(fhci_to_hcd(fhci)->irq); } -DECLARE_TASKLET_OLD(fhci_tasklet, process_done_list); +DECLARE_TASKLET(fhci_tasklet, process_done_list, 0); /* transfer complted callback */ u32 fhci_transfer_confirm_callback(struct fhci_hcd *fhci)
diff --git a/drivers/usb/host/ohci-nxp.c b/drivers/usb/host/ohci-nxp.c index 07cee8c..c561881 100644 --- a/drivers/usb/host/ohci-nxp.c +++ b/drivers/usb/host/ohci-nxp.c
@@ -164,7 +164,6 @@ static int ohci_hcd_nxp_probe(struct platform_device *pdev) } isp1301_i2c_client = isp1301_get_client(isp1301_node); - of_node_put(isp1301_node); if (!isp1301_i2c_client) return -EPROBE_DEFER;
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c index 98e4672..45f7cce 100644 --- a/drivers/usb/host/ohci-ppc-of.c +++ b/drivers/usb/host/ohci-ppc-of.c
@@ -169,7 +169,6 @@ static int ohci_hcd_ppc_of_probe(struct platform_device *op) release_mem_region(res.start, 0x4); } else pr_debug("%s: cannot get ehci offset from fdt\n", __FILE__); - of_node_put(np); } irq_dispose_mapping(irq);
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c index 65c9b41..0d343b3 100644 --- a/drivers/usb/host/xhci-hub.c +++ b/drivers/usb/host/xhci-hub.c
@@ -570,7 +570,7 @@ struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd) * It will release and re-aquire the lock while calling ACPI * method. */ -static void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd, +void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd, u16 index, bool on, unsigned long *flags) { struct xhci_hub *rhub; @@ -1682,17 +1682,6 @@ int xhci_hub_status_data(struct usb_hcd *hcd, char *buf) status = bus_state->resuming_ports; - /* - * SS devices are only visible to roothub after link training completes. - * Keep polling roothubs for a grace period after xHC start - */ - if (xhci->run_graceperiod) { - if (time_before(jiffies, xhci->run_graceperiod)) - status = 1; - else - xhci->run_graceperiod = 0; - } - mask = PORT_CSC | PORT_PEC | PORT_OCC | PORT_PLC | PORT_WRC | PORT_CEC; /* For each port, did anything change? If so, set that bit in buf. */
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c index dad8eac..c23db37 100644 --- a/drivers/usb/host/xhci-mem.c +++ b/drivers/usb/host/xhci-mem.c
@@ -650,7 +650,7 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci, num_stream_ctxs, &stream_info->ctx_array_dma, mem_flags); if (!stream_info->stream_ctx_array) - goto cleanup_ring_array; + goto cleanup_ctx; memset(stream_info->stream_ctx_array, 0, sizeof(struct xhci_stream_ctx)*num_stream_ctxs); @@ -711,11 +711,6 @@ struct xhci_stream_info *xhci_alloc_stream_info(struct xhci_hcd *xhci, } xhci_free_command(xhci, stream_info->free_streams_command); cleanup_ctx: - xhci_free_stream_ctx(xhci, - stream_info->num_stream_ctxs, - stream_info->stream_ctx_array, - stream_info->ctx_array_dma); -cleanup_ring_array: kfree(stream_info->stream_rings); cleanup_info: kfree(stream_info); @@ -906,19 +901,15 @@ void xhci_free_virt_device(struct xhci_hcd *xhci, int slot_id) if (dev->eps[i].stream_info) xhci_free_stream_info(xhci, dev->eps[i].stream_info); - /* - * Endpoints are normally deleted from the bandwidth list when - * endpoints are dropped, before device is freed. - * If host is dying or being removed then endpoints aren't - * dropped cleanly, so delete the endpoint from list here. - * Only applicable for hosts with software bandwidth checking. + /* Endpoints on the TT/root port lists should have been removed + * when usb_disable_device() was called for the device. + * We can't drop them anyway, because the udev might have gone + * away by this point, and we can't tell what speed it was. */ - - if (!list_empty(&dev->eps[i].bw_endpoint_list)) { - list_del_init(&dev->eps[i].bw_endpoint_list); - xhci_dbg(xhci, "Slot %u endpoint %u not removed from BW list!\n", - slot_id, i); - } + if (!list_empty(&dev->eps[i].bw_endpoint_list)) + xhci_warn(xhci, "Slot %u endpoint %u " + "not removed from BW list!\n", + slot_id, i); } /* If this is a hub, free the TT(s) from the TT list */ xhci_free_tt_info(xhci, dev, slot_id);
diff --git a/drivers/usb/host/xhci-mtk-sch.c b/drivers/usb/host/xhci-mtk-sch.c index a73044b..0b59681 100644 --- a/drivers/usb/host/xhci-mtk-sch.c +++ b/drivers/usb/host/xhci-mtk-sch.c
@@ -425,17 +425,16 @@ static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset) u32 num_esit, tmp; int base; int i, j; - u8 uframes = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; - - if (sch_ep->ep_type == INT_IN_EP || sch_ep->ep_type == ISOC_IN_EP) - offset++; - for (i = 0; i < num_esit; i++) { base = offset + i * sch_ep->esit; - for (j = 0; j < uframes; j++) { + /* + * Compared with hs bus, no matter what ep type, + * the hub will always delay one uframe to send data + */ + for (j = 0; j < sch_ep->cs_count; j++) { tmp = tt->fs_bus_bw[base + j] + sch_ep->bw_cost_per_microframe; if (tmp > FS_PAYLOAD_MAX) return -ESCH_BW_OVERFLOW; @@ -447,9 +446,11 @@ static int check_fs_bus_bw(struct mu3h_sch_ep_info *sch_ep, int offset) static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) { + struct mu3h_sch_tt *tt = sch_ep->sch_tt; u32 extra_cs_count; u32 start_ss, last_ss; u32 start_cs, last_cs; + int i; start_ss = offset % 8; @@ -463,6 +464,10 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) if (!(start_ss == 7 || last_ss < 6)) return -ESCH_SS_Y6; + for (i = 0; i < sch_ep->cs_count; i++) + if (test_bit(offset + i, tt->ss_bit_map)) + return -ESCH_SS_OVERLAP; + } else { u32 cs_count = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); @@ -489,6 +494,9 @@ static int check_sch_tt(struct mu3h_sch_ep_info *sch_ep, u32 offset) if (cs_count > 7) cs_count = 7; /* HW limit */ + if (test_bit(offset, tt->ss_bit_map)) + return -ESCH_SS_OVERLAP; + sch_ep->cs_count = cs_count; /* one for ss, the other for idle */ sch_ep->num_budget_microframes = cs_count + 2; @@ -509,24 +517,28 @@ static void update_sch_tt(struct mu3h_sch_ep_info *sch_ep, bool used) struct mu3h_sch_tt *tt = sch_ep->sch_tt; u32 base, num_esit; int bw_updated; + int bits; int i, j; - int offset = sch_ep->offset; - u8 uframes = DIV_ROUND_UP(sch_ep->maxpkt, FS_PAYLOAD_MAX); num_esit = XHCI_MTK_MAX_ESIT / sch_ep->esit; + bits = (sch_ep->ep_type == ISOC_OUT_EP) ? sch_ep->cs_count : 1; if (used) bw_updated = sch_ep->bw_cost_per_microframe; else bw_updated = -sch_ep->bw_cost_per_microframe; - if (sch_ep->ep_type == INT_IN_EP || sch_ep->ep_type == ISOC_IN_EP) - offset++; - for (i = 0; i < num_esit; i++) { - base = offset + i * sch_ep->esit; + base = sch_ep->offset + i * sch_ep->esit; - for (j = 0; j < uframes; j++) + for (j = 0; j < bits; j++) { + if (used) + set_bit(base + j, tt->ss_bit_map); + else + clear_bit(base + j, tt->ss_bit_map); + } + + for (j = 0; j < sch_ep->cs_count; j++) tt->fs_bus_bw[base + j] += bw_updated; }
diff --git a/drivers/usb/host/xhci-mtk.h b/drivers/usb/host/xhci-mtk.h index e5be257..47876a9 100644 --- a/drivers/usb/host/xhci-mtk.h +++ b/drivers/usb/host/xhci-mtk.h
@@ -20,10 +20,12 @@ #define XHCI_MTK_MAX_ESIT 64 /** + * @ss_bit_map: used to avoid start split microframes overlay * @fs_bus_bw: array to keep track of bandwidth already used for FS * @ep_list: Endpoints using this TT */ struct mu3h_sch_tt { + DECLARE_BITMAP(ss_bit_map, XHCI_MTK_MAX_ESIT); u32 fs_bus_bw[XHCI_MTK_MAX_ESIT]; struct list_head ep_list; };
diff --git a/drivers/usb/host/xhci-mvebu.c b/drivers/usb/host/xhci-mvebu.c index bb70dcc..f27d5c2 100644 --- a/drivers/usb/host/xhci-mvebu.c +++ b/drivers/usb/host/xhci-mvebu.c
@@ -33,7 +33,7 @@ static void xhci_mvebu_mbus_config(void __iomem *base, /* Program each DRAM CS in a seperate window */ for (win = 0; win < dram->num_cs; win++) { - const struct mbus_dram_window *cs = &dram->cs[win]; + const struct mbus_dram_window *cs = dram->cs + win; writel(((cs->size - 1) & 0xffff0000) | (cs->mbus_attr << 8) | (dram->mbus_dram_target_id << 4) | 1,
diff --git a/drivers/usb/host/xhci-pci.c b/drivers/usb/host/xhci-pci.c index 6df1d29..3685bea 100644 --- a/drivers/usb/host/xhci-pci.c +++ b/drivers/usb/host/xhci-pci.c
@@ -79,12 +79,8 @@ static const char hcd_name[] = "xhci_hcd"; static struct hc_driver __read_mostly xhci_pci_hc_driver; -static int xhci_pci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, - struct usb_tt *tt, gfp_t mem_flags); - static const struct xhci_driver_overrides xhci_pci_overrides __initconst = { .reset = xhci_pci_setup, - .update_hub_device = xhci_pci_update_hub_device, }; /* called after powerup, by probe or system-pm "wakeup" */ @@ -275,14 +271,8 @@ static void xhci_pci_quirks(struct device *dev, struct xhci_hcd *xhci) xhci->quirks |= XHCI_BROKEN_STREAMS; if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && - pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) { - /* - * try to tame the ASMedia 1042 controller which reports 0.96 - * but appears to behave more like 1.0 - */ - xhci->quirks |= XHCI_SPURIOUS_SUCCESS; + pdev->device == PCI_DEVICE_ID_ASMEDIA_1042_XHCI) xhci->quirks |= XHCI_BROKEN_STREAMS; - } if (pdev->vendor == PCI_VENDOR_ID_ASMEDIA && pdev->device == PCI_DEVICE_ID_ASMEDIA_1042A_XHCI) { xhci->quirks |= XHCI_TRUST_TX_LENGTH; @@ -339,38 +329,8 @@ static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) NULL); ACPI_FREE(obj); } - -static void xhci_find_lpm_incapable_ports(struct usb_hcd *hcd, struct usb_device *hdev) -{ - struct xhci_hcd *xhci = hcd_to_xhci(hcd); - struct xhci_hub *rhub = &xhci->usb3_rhub; - int ret; - int i; - - /* This is not the usb3 roothub we are looking for */ - if (hcd != rhub->hcd) - return; - - if (hdev->maxchild > rhub->num_ports) { - dev_err(&hdev->dev, "USB3 roothub port number mismatch\n"); - return; - } - - for (i = 0; i < hdev->maxchild; i++) { - ret = usb_acpi_port_lpm_incapable(hdev, i); - - dev_dbg(&hdev->dev, "port-%d disable U1/U2 _DSM: %d\n", i + 1, ret); - - if (ret >= 0) { - rhub->ports[i]->lpm_incapable = ret; - continue; - } - } -} - #else static void xhci_pme_acpi_rtd3_enable(struct pci_dev *dev) { } -static void xhci_find_lpm_incapable_ports(struct usb_hcd *hcd, struct usb_device *hdev) { } #endif /* CONFIG_ACPI */ /* called during probe() after chip reset completes */ @@ -404,16 +364,6 @@ int xhci_pci_setup(struct usb_hcd *hcd) } EXPORT_SYMBOL_GPL(xhci_pci_setup); -static int xhci_pci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, - struct usb_tt *tt, gfp_t mem_flags) -{ - /* Check if acpi claims some USB3 roothub ports are lpm incapable */ - if (!hdev->parent) - xhci_find_lpm_incapable_ports(hcd, hdev); - - return xhci_update_hub_device(hcd, hdev, tt, mem_flags); -} - /* * We need to register our own PCI probe function (instead of the USB core's * function) in order to create a second roothub under xHCI. @@ -471,8 +421,6 @@ int xhci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) if (xhci->quirks & XHCI_DEFAULT_PM_RUNTIME_ALLOW) pm_runtime_allow(&dev->dev); - dma_set_max_seg_size(&dev->dev, UINT_MAX); - return 0; put_usb3_hcd:
diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c index d6d3b8f..db55365 100644 --- a/drivers/usb/host/xhci-plat.c +++ b/drivers/usb/host/xhci-plat.c
@@ -331,7 +331,7 @@ static int xhci_plat_probe(struct platform_device *pdev) *priv = *priv_match; } - device_set_wakeup_capable(&pdev->dev, true); + device_wakeup_enable(hcd->self.controller); xhci->main_hcd = hcd; xhci->shared_hcd = __usb_create_hcd(driver, sysdev, &pdev->dev,
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index c650f0a..cbb95e1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c
@@ -931,10 +931,7 @@ static void xhci_kill_endpoint_urbs(struct xhci_hcd *xhci, struct xhci_virt_ep *ep; struct xhci_ring *ring; - ep = xhci_get_virt_ep(xhci, slot_id, ep_index); - if (!ep) - return; - + ep = &xhci->devs[slot_id]->eps[ep_index]; if ((ep->ep_state & EP_HAS_STREAMS) || (ep->ep_state & EP_GETTING_NO_STREAMS)) { int stream_id;
diff --git a/drivers/usb/host/xhci-tegra.c b/drivers/usb/host/xhci-tegra.c index d53bdb7..6087b1f 100644 --- a/drivers/usb/host/xhci-tegra.c +++ b/drivers/usb/host/xhci-tegra.c
@@ -933,15 +933,15 @@ static int tegra_xusb_powerdomain_init(struct device *dev, int err; tegra->genpd_dev_host = dev_pm_domain_attach_by_name(dev, "xusb_host"); - if (IS_ERR_OR_NULL(tegra->genpd_dev_host)) { - err = PTR_ERR(tegra->genpd_dev_host) ? : -ENODATA; + if (IS_ERR(tegra->genpd_dev_host)) { + err = PTR_ERR(tegra->genpd_dev_host); dev_err(dev, "failed to get host pm-domain: %d\n", err); return err; } tegra->genpd_dev_ss = dev_pm_domain_attach_by_name(dev, "xusb_ss"); - if (IS_ERR_OR_NULL(tegra->genpd_dev_ss)) { - err = PTR_ERR(tegra->genpd_dev_ss) ? : -ENODATA; + if (IS_ERR(tegra->genpd_dev_ss)) { + err = PTR_ERR(tegra->genpd_dev_ss); dev_err(dev, "failed to get superspeed pm-domain: %d\n", err); return err; }
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index a217363..10cdba9 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c
@@ -9,7 +9,6 @@ */ #include <linux/pci.h> -#include <linux/iommu.h> #include <linux/iopoll.h> #include <linux/irq.h> #include <linux/log2.h> @@ -156,11 +155,9 @@ int xhci_start(struct xhci_hcd *xhci) xhci_err(xhci, "Host took too long to start, " "waited %u microseconds.\n", XHCI_MAX_HALT_USEC); - if (!ret) { + if (!ret) /* clear state flags. Including dying, halted or removing */ xhci->xhc_state = 0; - xhci->run_graceperiod = jiffies + msecs_to_jiffies(500); - } return ret; } @@ -233,7 +230,6 @@ int xhci_reset(struct xhci_hcd *xhci, u64 timeout_us) static void xhci_zero_64b_regs(struct xhci_hcd *xhci) { struct device *dev = xhci_to_hcd(xhci)->self.sysdev; - struct iommu_domain *domain; int err, i; u64 val; u32 intrs; @@ -252,9 +248,7 @@ static void xhci_zero_64b_regs(struct xhci_hcd *xhci) * an iommu. Doing anything when there is no iommu is definitely * unsafe... */ - domain = iommu_get_domain_for_dev(dev); - if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !domain || - domain->type == IOMMU_DOMAIN_IDENTITY) + if (!(xhci->quirks & XHCI_ZERO_64B_REGS) || !device_iommu_mapped(dev)) return; xhci_info(xhci, "Zeroing 64bit base registers, expecting fault\n"); @@ -703,7 +697,6 @@ int xhci_run(struct usb_hcd *hcd) if (ret) xhci_free_command(xhci, command); } - set_bit(HCD_FLAG_DEFER_RH_REGISTER, &hcd->flags); xhci_dbg_trace(xhci, trace_xhci_dbg_init, "Finished xhci_run for USB2 roothub"); @@ -788,6 +781,8 @@ static void xhci_stop(struct usb_hcd *hcd) void xhci_shutdown(struct usb_hcd *hcd) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); + unsigned long flags; + int i; if (xhci->quirks & XHCI_SPURIOUS_REBOOT) usb_disable_xhci_ports(to_pci_dev(hcd->self.sysdev)); @@ -803,12 +798,21 @@ void xhci_shutdown(struct usb_hcd *hcd) del_timer_sync(&xhci->shared_hcd->rh_timer); } - spin_lock_irq(&xhci->lock); + spin_lock_irqsave(&xhci->lock, flags); xhci_halt(xhci); + + /* Power off USB2 ports*/ + for (i = 0; i < xhci->usb2_rhub.num_ports; i++) + xhci_set_port_power(xhci, xhci->main_hcd, i, false, &flags); + + /* Power off USB3 ports*/ + for (i = 0; i < xhci->usb3_rhub.num_ports; i++) + xhci_set_port_power(xhci, xhci->shared_hcd, i, false, &flags); + /* Workaround for spurious wakeups at shutdown with HSW */ if (xhci->quirks & XHCI_SPURIOUS_WAKEUP) xhci_reset(xhci, XHCI_RESET_SHORT_USEC); - spin_unlock_irq(&xhci->lock); + spin_unlock_irqrestore(&xhci->lock, flags); xhci_cleanup_msix(xhci); @@ -1173,8 +1177,7 @@ int xhci_resume(struct xhci_hcd *xhci, bool hibernated) temp = readl(&xhci->op_regs->status); /* re-initialize the HC on Restore Error, or Host Controller Error */ if (temp & (STS_SRE | STS_HCE)) { - reinit_xhc = true; - if (!xhci->broken_suspend) + reinit_xhc = true; xhci_warn(xhci, "xHC error in resume, USBSTS 0x%x, Reinit\n", temp); } @@ -4084,7 +4087,6 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) struct xhci_hcd *xhci = hcd_to_xhci(hcd); struct xhci_virt_device *virt_dev; struct xhci_slot_ctx *slot_ctx; - unsigned long flags; int i, ret; /* @@ -4113,11 +4115,7 @@ static void xhci_free_dev(struct usb_hcd *hcd, struct usb_device *udev) } virt_dev->udev = NULL; xhci_disable_slot(xhci, udev->slot_id); - - spin_lock_irqsave(&xhci->lock, flags); xhci_free_virt_device(xhci, udev->slot_id); - spin_unlock_irqrestore(&xhci->lock, flags); - } int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id) @@ -5178,7 +5176,6 @@ static int xhci_enable_usb3_lpm_timeout(struct usb_hcd *hcd, struct usb_device *udev, enum usb3_link_state state) { struct xhci_hcd *xhci; - struct xhci_port *port; u16 hub_encoded_timeout; int mel; int ret; @@ -5192,13 +5189,6 @@ static int xhci_enable_usb3_lpm_timeout(struct usb_hcd *hcd, !xhci->devs[udev->slot_id]) return USB3_LPM_DISABLED; - /* If connected to root port then check port can handle lpm */ - if (udev->parent && !udev->parent->parent) { - port = xhci->usb3_rhub.ports[udev->portnum - 1]; - if (port->lpm_incapable) - return USB3_LPM_DISABLED; - } - hub_encoded_timeout = xhci_calculate_lpm_timeout(hcd, udev, state); mel = calculate_max_exit_latency(udev, state, hub_encoded_timeout); if (mel < 0) { @@ -5258,7 +5248,7 @@ static int xhci_disable_usb3_lpm_timeout(struct usb_hcd *hcd, /* Once a hub descriptor is fetched for a device, we need to update the xHC's * internal data structures for the device. */ -int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, +static int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, struct usb_tt *tt, gfp_t mem_flags) { struct xhci_hcd *xhci = hcd_to_xhci(hcd); @@ -5358,7 +5348,6 @@ int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, xhci_free_command(xhci, config_cmd); return ret; } -EXPORT_SYMBOL_GPL(xhci_update_hub_device); static int xhci_get_frame(struct usb_hcd *hcd) { @@ -5639,8 +5628,6 @@ void xhci_init_driver(struct hc_driver *drv, drv->check_bandwidth = over->check_bandwidth; if (over->reset_bandwidth) drv->reset_bandwidth = over->reset_bandwidth; - if (over->update_hub_device) - drv->update_hub_device = over->update_hub_device; } } EXPORT_SYMBOL_GPL(xhci_init_driver);
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h index 959c32c..c914d66 100644 --- a/drivers/usb/host/xhci.h +++ b/drivers/usb/host/xhci.h
@@ -1760,7 +1760,6 @@ struct xhci_port { int hcd_portnum; struct xhci_hub *rhub; struct xhci_port_cap *port_cap; - unsigned int lpm_incapable:1; }; struct xhci_hub { @@ -1851,7 +1850,7 @@ struct xhci_hcd { /* Host controller watchdog timer structures */ unsigned int xhc_state; - unsigned long run_graceperiod; + u32 command; struct s3_save s3; /* Host controller is dying - not responding to commands. "I'm not dead yet!" @@ -1974,8 +1973,6 @@ struct xhci_driver_overrides { struct usb_host_endpoint *ep); int (*check_bandwidth)(struct usb_hcd *, struct usb_device *); void (*reset_bandwidth)(struct usb_hcd *, struct usb_device *); - int (*update_hub_device)(struct usb_hcd *hcd, struct usb_device *hdev, - struct usb_tt *tt, gfp_t mem_flags); }; #define XHCI_CFC_DELAY 10 @@ -2134,8 +2131,6 @@ int xhci_drop_endpoint(struct usb_hcd *hcd, struct usb_device *udev, struct usb_host_endpoint *ep); int xhci_check_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); void xhci_reset_bandwidth(struct usb_hcd *hcd, struct usb_device *udev); -int xhci_update_hub_device(struct usb_hcd *hcd, struct usb_device *hdev, - struct usb_tt *tt, gfp_t mem_flags); int xhci_disable_slot(struct xhci_hcd *xhci, u32 slot_id); int xhci_ext_cap_init(struct xhci_hcd *xhci); @@ -2215,6 +2210,8 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, u16 wIndex, int xhci_hub_status_data(struct usb_hcd *hcd, char *buf); int xhci_find_raw_port_number(struct usb_hcd *hcd, int port1); struct xhci_hub *xhci_get_rhub(struct usb_hcd *hcd); +void xhci_set_port_power(struct xhci_hcd *xhci, struct usb_hcd *hcd, u16 index, + bool on, unsigned long *flags); void xhci_hc_died(struct xhci_hcd *xhci); @@ -2441,7 +2438,7 @@ static inline const char *xhci_decode_trb(char *str, size_t size, field3 & TRB_CYCLE ? 'C' : 'c'); break; case TRB_STOP_RING: - snprintf(str, size, + sprintf(str, "%s: slot %d sp %d ep %d flags %c", xhci_trb_type_string(type), TRB_TO_SLOT_ID(field3),
diff --git a/drivers/usb/misc/idmouse.c b/drivers/usb/misc/idmouse.c index ba2b6fb..bb24527 100644 --- a/drivers/usb/misc/idmouse.c +++ b/drivers/usb/misc/idmouse.c
@@ -178,6 +178,10 @@ static int idmouse_create_image(struct usb_idmouse *dev) bytes_read += bulk_read; } + /* reset the device */ +reset: + ftip_command(dev, FTIP_RELEASE, 0, 0); + /* check for valid image */ /* right border should be black (0x00) */ for (bytes_read = sizeof(HEADER)-1 + WIDTH-1; bytes_read < IMGSIZE; bytes_read += WIDTH) @@ -189,10 +193,6 @@ static int idmouse_create_image(struct usb_idmouse *dev) if (dev->bulk_in_buffer[bytes_read] != 0xFF) return -EAGAIN; - /* reset the device */ -reset: - ftip_command(dev, FTIP_RELEASE, 0, 0); - /* should be IMGSIZE == 65040 */ dev_dbg(&dev->interface->dev, "read %d bytes fingerprint data\n", bytes_read);
diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c index c366a65..888defd 100644 --- a/drivers/usb/misc/iowarrior.c +++ b/drivers/usb/misc/iowarrior.c
@@ -817,7 +817,7 @@ static int iowarrior_probe(struct usb_interface *interface, break; case USB_DEVICE_ID_CODEMERCS_IOW100: - dev->report_size = 12; + dev->report_size = 13; break; } }
diff --git a/drivers/usb/mon/mon_bin.c b/drivers/usb/mon/mon_bin.c index 094e812..f48a23a 100644 --- a/drivers/usb/mon/mon_bin.c +++ b/drivers/usb/mon/mon_bin.c
@@ -1268,11 +1268,6 @@ static int mon_bin_mmap(struct file *filp, struct vm_area_struct *vma) { /* don't do anything here: "fault" will set up page table entries */ vma->vm_ops = &mon_bin_vm_ops; - - if (vma->vm_flags & VM_WRITE) - return -EPERM; - - vma->vm_flags &= ~VM_MAYWRITE; vma->vm_flags |= VM_DONTEXPAND | VM_DONTDUMP; vma->vm_private_data = filp->private_data; mon_bin_vma_open(vma);
diff --git a/drivers/usb/musb/mediatek.c b/drivers/usb/musb/mediatek.c index e014447..4cc7037 100644 --- a/drivers/usb/musb/mediatek.c +++ b/drivers/usb/musb/mediatek.c
@@ -342,8 +342,7 @@ static int mtk_musb_init(struct musb *musb) err_phy_power_on: phy_exit(glue->phy); err_phy_init: - if (musb->port_mode == MUSB_OTG) - mtk_otg_switch_exit(glue); + mtk_otg_switch_exit(glue); return ret; }
diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c index b8fc818..4622400 100644 --- a/drivers/usb/musb/musb_gadget.c +++ b/drivers/usb/musb/musb_gadget.c
@@ -760,9 +760,6 @@ static void rxstate(struct musb *musb, struct musb_request *req) musb_writew(epio, MUSB_RXCSR, csr); buffer_aint_mapped: - fifo_count = min_t(unsigned int, - request->length - request->actual, - (unsigned int)fifo_count); musb_read_fifo(musb_ep->hw_ep, fifo_count, (u8 *) (request->buf + request->actual)); request->actual += fifo_count; @@ -1629,6 +1626,8 @@ static int musb_gadget_vbus_draw(struct usb_gadget *gadget, unsigned mA) { struct musb *musb = gadget_to_musb(gadget); + if (!musb->xceiv->set_power) + return -EOPNOTSUPP; return usb_phy_set_power(musb->xceiv, mA); }
diff --git a/drivers/usb/renesas_usbhs/rza.c b/drivers/usb/renesas_usbhs/rza.c index 2d77ede..24de64e 100644 --- a/drivers/usb/renesas_usbhs/rza.c +++ b/drivers/usb/renesas_usbhs/rza.c
@@ -23,10 +23,6 @@ static int usbhs_rza1_hardware_init(struct platform_device *pdev) extal_clk = of_find_node_by_name(NULL, "extal"); of_property_read_u32(usb_x1_clk, "clock-frequency", &freq_usb); of_property_read_u32(extal_clk, "clock-frequency", &freq_extal); - - of_node_put(usb_x1_clk); - of_node_put(extal_clk); - if (freq_usb == 0) { if (freq_extal == 12000000) { /* Select 12MHz XTAL */
diff --git a/drivers/usb/roles/class.c b/drivers/usb/roles/class.c index 873d898..97e3d75 100644 --- a/drivers/usb/roles/class.c +++ b/drivers/usb/roles/class.c
@@ -108,13 +108,10 @@ usb_role_switch_is_parent(struct fwnode_handle *fwnode) struct fwnode_handle *parent = fwnode_get_parent(fwnode); struct device *dev; - if (!fwnode_property_present(parent, "usb-role-switch")) { - fwnode_handle_put(parent); + if (!parent || !fwnode_property_present(parent, "usb-role-switch")) return NULL; - } dev = class_find_device_by_fwnode(role_class, parent); - fwnode_handle_put(parent); return dev ? to_role_switch(dev) : ERR_PTR(-EPROBE_DEFER); }
diff --git a/drivers/usb/serial/ch341.c b/drivers/usb/serial/ch341.c index f37bde8..f06a09e 100644 --- a/drivers/usb/serial/ch341.c +++ b/drivers/usb/serial/ch341.c
@@ -96,9 +96,7 @@ struct ch341_private { u8 mcr; u8 msr; u8 lcr; - unsigned long quirks; - u8 version; }; static void ch341_set_termios(struct tty_struct *tty, @@ -177,20 +175,13 @@ static int ch341_set_baudrate_lcr(struct usb_device *dev, /* * CH341A buffers data until a full endpoint-size packet (32 bytes) * has been received unless bit 7 is set. - * - * At least one device with version 0x27 appears to have this bit - * inverted. */ - if (priv->version > 0x27) - a |= BIT(7); + a |= BIT(7); r = ch341_control_out(dev, CH341_REQ_WRITE_REG, 0x1312, a); if (r) return r; - if (priv->version < 0x30) - return 0; - r = ch341_control_out(dev, CH341_REQ_WRITE_REG, 0x2518, lcr); if (r) return r; @@ -242,9 +233,7 @@ static int ch341_configure(struct usb_device *dev, struct ch341_private *priv) r = ch341_control_in(dev, CH341_REQ_READ_VERSION, 0, 0, buffer, size); if (r < 0) goto out; - - priv->version = buffer[0]; - dev_dbg(&dev->dev, "Chip version: 0x%02x\n", priv->version); + dev_dbg(&dev->dev, "Chip version: 0x%02x\n", buffer[0]); r = ch341_control_out(dev, CH341_REQ_SERIAL_INIT, 0, 0); if (r < 0)
diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c index 05d93ee..d5a1832 100644 --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c
@@ -61,7 +61,6 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x0846, 0x1100) }, /* NetGear Managed Switch M4100 series, M5300 series, M7100 series */ { USB_DEVICE(0x08e6, 0x5501) }, /* Gemalto Prox-PU/CU contactless smartcard reader */ { USB_DEVICE(0x08FD, 0x000A) }, /* Digianswer A/S , ZigBee/802.15.4 MAC Device */ - { USB_DEVICE(0x0908, 0x0070) }, /* Siemens SCALANCE LPE-9000 USB Serial Console */ { USB_DEVICE(0x0908, 0x01FF) }, /* Siemens RUGGEDCOM USB Serial Console */ { USB_DEVICE(0x0988, 0x0578) }, /* Teraoka AD2000 */ { USB_DEVICE(0x0B00, 0x3070) }, /* Ingenico 3070 */ @@ -121,7 +120,6 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x826B) }, /* Cygnal Integrated Products, Inc., Fasttrax GPS demonstration module */ { USB_DEVICE(0x10C4, 0x8281) }, /* Nanotec Plug & Drive */ { USB_DEVICE(0x10C4, 0x8293) }, /* Telegesis ETRX2USB */ - { USB_DEVICE(0x10C4, 0x82AA) }, /* Silicon Labs IFS-USB-DATACABLE used with Quint UPS */ { USB_DEVICE(0x10C4, 0x82EF) }, /* CESINEL FALCO 6105 AC Power Supply */ { USB_DEVICE(0x10C4, 0x82F1) }, /* CESINEL MEDCAL EFD Earth Fault Detector */ { USB_DEVICE(0x10C4, 0x82F2) }, /* CESINEL MEDCAL ST Network Analyzer */ @@ -133,7 +131,6 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x10C4, 0x83AA) }, /* Mark-10 Digital Force Gauge */ { USB_DEVICE(0x10C4, 0x83D8) }, /* DekTec DTA Plus VHF/UHF Booster/Attenuator */ { USB_DEVICE(0x10C4, 0x8411) }, /* Kyocera GPS Module */ - { USB_DEVICE(0x10C4, 0x8414) }, /* Decagon USB Cable Adapter */ { USB_DEVICE(0x10C4, 0x8418) }, /* IRZ Automation Teleport SG-10 GSM/GPRS Modem */ { USB_DEVICE(0x10C4, 0x846E) }, /* BEI USB Sensor Interface (VCP) */ { USB_DEVICE(0x10C4, 0x8470) }, /* Juniper Networks BX Series System Console */ @@ -198,8 +195,6 @@ static const struct usb_device_id id_table[] = { { USB_DEVICE(0x16DC, 0x0015) }, /* W-IE-NE-R Plein & Baus GmbH CML Control, Monitoring and Data Logger */ { USB_DEVICE(0x17A8, 0x0001) }, /* Kamstrup Optical Eye/3-wire */ { USB_DEVICE(0x17A8, 0x0005) }, /* Kamstrup M-Bus Master MultiPort 250D */ - { USB_DEVICE(0x17A8, 0x0011) }, /* Kamstrup 444 MHz RF sniffer */ - { USB_DEVICE(0x17A8, 0x0013) }, /* Kamstrup 870 MHz RF sniffer */ { USB_DEVICE(0x17A8, 0x0101) }, /* Kamstrup 868 MHz wM-Bus C-Mode Meter Reader (Int Ant) */ { USB_DEVICE(0x17A8, 0x0102) }, /* Kamstrup 868 MHz wM-Bus C-Mode Meter Reader (Ext Ant) */ { USB_DEVICE(0x17F4, 0xAAAA) }, /* Wavesense Jazz blood glucose meter */
diff --git a/drivers/usb/serial/f81232.c b/drivers/usb/serial/f81232.c index d257d38..43fa1f0 100644 --- a/drivers/usb/serial/f81232.c +++ b/drivers/usb/serial/f81232.c
@@ -78,6 +78,9 @@ static u8 const clock_table[] = { F81232_CLK_1_846_MHZ, F81232_CLK_14_77_MHZ, static int calc_baud_divisor(speed_t baudrate, speed_t clockrate) { + if (!baudrate) + return 0; + return DIV_ROUND_CLOSEST(clockrate, baudrate); } @@ -420,14 +423,9 @@ static void f81232_set_baudrate(struct tty_struct *tty, speed_t baud_list[] = { baudrate, old_baudrate, F81232_DEF_BAUDRATE }; for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { - baudrate = baud_list[i]; - if (baudrate == 0) { - tty_encode_baud_rate(tty, 0, 0); - return; - } - - idx = f81232_find_clk(baudrate); + idx = f81232_find_clk(baud_list[i]); if (idx >= 0) { + baudrate = baud_list[i]; tty_encode_baud_rate(tty, baudrate, baudrate); break; }
diff --git a/drivers/usb/serial/f81534.c b/drivers/usb/serial/f81534.c index 1b2d2c2..2b39bda 100644 --- a/drivers/usb/serial/f81534.c +++ b/drivers/usb/serial/f81534.c
@@ -538,6 +538,9 @@ static int f81534_submit_writer(struct usb_serial_port *port, gfp_t mem_flags) static u32 f81534_calc_baud_divisor(u32 baudrate, u32 clockrate) { + if (!baudrate) + return 0; + /* Round to nearest divisor */ return DIV_ROUND_CLOSEST(clockrate, baudrate); } @@ -567,14 +570,9 @@ static int f81534_set_port_config(struct usb_serial_port *port, u32 baud_list[] = {baudrate, old_baudrate, F81534_DEFAULT_BAUD_RATE}; for (i = 0; i < ARRAY_SIZE(baud_list); ++i) { - baudrate = baud_list[i]; - if (baudrate == 0) { - tty_encode_baud_rate(tty, 0, 0); - return 0; - } - - idx = f81534_find_clk(baudrate); + idx = f81534_find_clk(baud_list[i]); if (idx >= 0) { + baudrate = baud_list[i]; tty_encode_baud_rate(tty, baudrate, baudrate); break; }
diff --git a/drivers/usb/serial/ftdi_sio.c b/drivers/usb/serial/ftdi_sio.c index 9041051..d671e09 100644 --- a/drivers/usb/serial/ftdi_sio.c +++ b/drivers/usb/serial/ftdi_sio.c
@@ -1045,8 +1045,6 @@ static const struct usb_device_id id_table_combined[] = { /* IDS GmbH devices */ { USB_DEVICE(IDS_VID, IDS_SI31A_PID) }, { USB_DEVICE(IDS_VID, IDS_CM31A_PID) }, - /* Omron devices */ - { USB_DEVICE(OMRON_VID, OMRON_CS1W_CIF31_PID) }, /* U-Blox devices */ { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ZED_PID) }, { USB_DEVICE(UBLOX_VID, UBLOX_C099F9P_ODIN_PID) }, @@ -1320,7 +1318,8 @@ static u32 get_ftdi_divisor(struct tty_struct *tty, case 38400: div_value = ftdi_sio_b38400; break; case 57600: div_value = ftdi_sio_b57600; break; case 115200: div_value = ftdi_sio_b115200; break; - default: + } /* baud */ + if (div_value == 0) { dev_dbg(dev, "%s - Baudrate (%d) requested is not supported\n", __func__, baud); div_value = ftdi_sio_b9600;
diff --git a/drivers/usb/serial/ftdi_sio_ids.h b/drivers/usb/serial/ftdi_sio_ids.h index 31c8cca..4e92c16 100644 --- a/drivers/usb/serial/ftdi_sio_ids.h +++ b/drivers/usb/serial/ftdi_sio_ids.h
@@ -662,12 +662,6 @@ #define INFINEON_TRIBOARD_TC2X7_PID 0x0043 /* DAS JTAG TriBoard TC2X7 V1.0 */ /* - * Omron corporation (https://www.omron.com) - */ - #define OMRON_VID 0x0590 - #define OMRON_CS1W_CIF31_PID 0x00b2 - -/* * Acton Research Corp. */ #define ACTON_VID 0x0647 /* Vendor ID */
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e51ed6b..2317ed3 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c
@@ -162,8 +162,6 @@ static void option_instat_callback(struct urb *urb); #define NOVATELWIRELESS_PRODUCT_G2 0xA010 #define NOVATELWIRELESS_PRODUCT_MC551 0xB001 -#define UBLOX_VENDOR_ID 0x1546 - /* AMOI PRODUCTS */ #define AMOI_VENDOR_ID 0x1614 #define AMOI_PRODUCT_H01 0x0800 @@ -242,6 +240,7 @@ static void option_instat_callback(struct urb *urb); #define QUECTEL_PRODUCT_UC15 0x9090 /* These u-blox products use Qualcomm's vendor ID */ #define UBLOX_PRODUCT_R410M 0x90b2 +#define UBLOX_PRODUCT_R6XX 0x90fa /* These Yuga products use Qualcomm's vendor ID */ #define YUGA_PRODUCT_CLM920_NC5 0x9625 @@ -254,17 +253,8 @@ static void option_instat_callback(struct urb *urb); #define QUECTEL_PRODUCT_BG96 0x0296 #define QUECTEL_PRODUCT_EP06 0x0306 #define QUECTEL_PRODUCT_EM05G 0x030a -#define QUECTEL_PRODUCT_EM060K 0x030b -#define QUECTEL_PRODUCT_EM05G_CS 0x030c -#define QUECTEL_PRODUCT_EM05CN_SG 0x0310 -#define QUECTEL_PRODUCT_EM05G_SG 0x0311 -#define QUECTEL_PRODUCT_EM05CN 0x0312 -#define QUECTEL_PRODUCT_EM05G_GR 0x0313 -#define QUECTEL_PRODUCT_EM05G_RS 0x0314 #define QUECTEL_PRODUCT_EM12 0x0512 #define QUECTEL_PRODUCT_RM500Q 0x0800 -#define QUECTEL_PRODUCT_RM520N 0x0801 -#define QUECTEL_PRODUCT_EC200U 0x0901 #define QUECTEL_PRODUCT_EC200S_CN 0x6002 #define QUECTEL_PRODUCT_EC200T 0x6026 #define QUECTEL_PRODUCT_RM500K 0x7001 @@ -402,8 +392,6 @@ static void option_instat_callback(struct urb *urb); #define LONGCHEER_VENDOR_ID 0x1c9e /* 4G Systems products */ -/* This one was sold as the VW and Skoda "Carstick LTE" */ -#define FOUR_G_SYSTEMS_PRODUCT_CARSTICK_LTE 0x7605 /* This is the 4G XS Stick W14 a.k.a. Mobilcom Debitel Surf-Stick * * It seems to contain a Qualcomm QSC6240/6290 chipset */ #define FOUR_G_SYSTEMS_PRODUCT_W14 0x9603 @@ -450,8 +438,6 @@ static void option_instat_callback(struct urb *urb); #define CINTERION_PRODUCT_MV31_2_RMNET 0x00b9 #define CINTERION_PRODUCT_MV32_WA 0x00f1 #define CINTERION_PRODUCT_MV32_WB 0x00f2 -#define CINTERION_PRODUCT_MV32_WA_RMNET 0x00f3 -#define CINTERION_PRODUCT_MV32_WB_RMNET 0x00f4 /* Olivetti products */ #define OLIVETTI_VENDOR_ID 0x0b3c @@ -587,13 +573,6 @@ static void option_instat_callback(struct urb *urb); #define WETELECOM_PRODUCT_6802 0x6802 #define WETELECOM_PRODUCT_WMD300 0x6803 -/* OPPO products */ -#define OPPO_VENDOR_ID 0x22d9 -#define OPPO_PRODUCT_R11 0x276c - -/* Sierra Wireless products */ -#define SIERRA_VENDOR_ID 0x1199 -#define SIERRA_PRODUCT_EM9191 0x90d3 /* Device flags */ @@ -1137,16 +1116,8 @@ static const struct usb_device_id option_ids[] = { /* u-blox products using Qualcomm vendor ID */ { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R410M), .driver_info = RSVD(1) | RSVD(3) }, - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x908b), /* u-blox LARA-R6 00B */ - .driver_info = RSVD(4) }, - { USB_DEVICE(QUALCOMM_VENDOR_ID, 0x90fa), + { USB_DEVICE(QUALCOMM_VENDOR_ID, UBLOX_PRODUCT_R6XX), .driver_info = RSVD(3) }, - /* u-blox products */ - { USB_DEVICE(UBLOX_VENDOR_ID, 0x1341) }, /* u-blox LARA-L6 */ - { USB_DEVICE(UBLOX_VENDOR_ID, 0x1342), /* u-blox LARA-L6 (RMNET) */ - .driver_info = RSVD(4) }, - { USB_DEVICE(UBLOX_VENDOR_ID, 0x1343), /* u-blox LARA-L6 (ECM) */ - .driver_info = RSVD(4) }, /* Quectel products using Quectel vendor ID */ { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC21, 0xff, 0xff, 0xff), .driver_info = NUMEP2 }, @@ -1160,30 +1131,13 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0xff, 0xff), .driver_info = NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EG95, 0xff, 0, 0) }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, 0x0203, 0xff), /* BG95-M3 */ - .driver_info = ZLP }, { USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96), .driver_info = RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06, 0xff, 0, 0) }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05CN, 0xff), - .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05CN_SG, 0xff), - .driver_info = RSVD(6) | ZLP }, { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G, 0xff), .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_GR, 0xff), - .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_CS, 0xff), - .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_RS, 0xff), - .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_INTERFACE_CLASS(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM05G_SG, 0xff), - .driver_info = RSVD(6) | ZLP }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0x00, 0x40) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x30) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM060K, 0xff, 0xff, 0x40) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0xff, 0xff), .driver_info = RSVD(1) | RSVD(2) | RSVD(3) | RSVD(4) | NUMEP2 }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EM12, 0xff, 0, 0) }, @@ -1195,12 +1149,6 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500Q, 0xff, 0xff, 0x10), .driver_info = ZLP }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0xff, 0x30) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0x40) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM520N, 0xff, 0, 0) }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, 0x0900, 0xff, 0, 0), /* RM500U-CN */ - .driver_info = ZLP }, - { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200U, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200S_CN, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EC200T, 0xff, 0, 0) }, { USB_DEVICE_AND_INTERFACE_INFO(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_RM500K, 0xff, 0x00, 0x00) }, @@ -1302,14 +1250,6 @@ static const struct usb_device_id option_ids[] = { .driver_info = NCTRL(0) | RSVD(1) }, { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1075, 0xff), /* Telit FN990 (PCIe) */ .driver_info = RSVD(0) }, - { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1080, 0xff), /* Telit FE990 (rmnet) */ - .driver_info = NCTRL(0) | RSVD(1) | RSVD(2) }, - { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1081, 0xff), /* Telit FE990 (MBIM) */ - .driver_info = NCTRL(0) | RSVD(1) }, - { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1082, 0xff), /* Telit FE990 (RNDIS) */ - .driver_info = NCTRL(2) | RSVD(3) }, - { USB_DEVICE_INTERFACE_CLASS(TELIT_VENDOR_ID, 0x1083, 0xff), /* Telit FE990 (ECM) */ - .driver_info = NCTRL(0) | RSVD(1) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910), .driver_info = NCTRL(0) | RSVD(1) | RSVD(3) }, { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_ME910_DUAL_MODEM), @@ -1988,8 +1928,6 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(2) }, { USB_DEVICE(AIRPLUS_VENDOR_ID, AIRPLUS_PRODUCT_MCD650) }, { USB_DEVICE(TLAYTECH_VENDOR_ID, TLAYTECH_PRODUCT_TEU800) }, - { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_CARSTICK_LTE), - .driver_info = RSVD(0) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W14), .driver_info = NCTRL(0) | NCTRL(1) }, { USB_DEVICE(LONGCHEER_VENDOR_ID, FOUR_G_SYSTEMS_PRODUCT_W100), @@ -2055,12 +1993,8 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(0)}, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff), .driver_info = RSVD(3)}, - { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA_RMNET, 0xff), - .driver_info = RSVD(0) }, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff), .driver_info = RSVD(3)}, - { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB_RMNET, 0xff), - .driver_info = RSVD(0) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), .driver_info = RSVD(4) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120), @@ -2213,7 +2147,6 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x010a, 0xff) }, /* Fibocom MA510 (ECM mode) */ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0xff, 0x30) }, /* Fibocom FG150 Diag */ { USB_DEVICE_AND_INTERFACE_INFO(0x2cb7, 0x010b, 0xff, 0, 0) }, /* Fibocom FG150 AT */ - { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0111, 0xff) }, /* Fibocom FM160 (MBIM mode) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a0, 0xff) }, /* Fibocom NL668-AM/NL652-EU (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a2, 0xff) }, /* Fibocom FM101-GL (laptop MBIM) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x01a4, 0xff), /* Fibocom FM101-GL (laptop MBIM) */ @@ -2222,9 +2155,6 @@ static const struct usb_device_id option_ids[] = { { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1404, 0xff) }, /* GosunCn GM500 RNDIS */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1405, 0xff) }, /* GosunCn GM500 MBIM */ { USB_DEVICE_INTERFACE_CLASS(0x305a, 0x1406, 0xff) }, /* GosunCn GM500 ECM/NCM */ - { USB_DEVICE_AND_INTERFACE_INFO(OPPO_VENDOR_ID, OPPO_PRODUCT_R11, 0xff, 0xff, 0x30) }, - { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0xff, 0x30) }, - { USB_DEVICE_AND_INTERFACE_INFO(SIERRA_VENDOR_ID, SIERRA_PRODUCT_EM9191, 0xff, 0, 0) }, { } /* Terminating entry */ }; MODULE_DEVICE_TABLE(usb, option_ids);
diff --git a/drivers/usb/serial/qcserial.c b/drivers/usb/serial/qcserial.c index b7ba15d..3f437f0 100644 --- a/drivers/usb/serial/qcserial.c +++ b/drivers/usb/serial/qcserial.c
@@ -177,7 +177,6 @@ static const struct usb_device_id id_table[] = { {DEVICE_SWI(0x413c, 0x81b3)}, /* Dell Wireless 5809e Gobi(TM) 4G LTE Mobile Broadband Card (rev3) */ {DEVICE_SWI(0x413c, 0x81b5)}, /* Dell Wireless 5811e QDL */ {DEVICE_SWI(0x413c, 0x81b6)}, /* Dell Wireless 5811e QDL */ - {DEVICE_SWI(0x413c, 0x81c2)}, /* Dell Wireless 5811e */ {DEVICE_SWI(0x413c, 0x81cb)}, /* Dell Wireless 5816e QDL */ {DEVICE_SWI(0x413c, 0x81cc)}, /* Dell Wireless 5816e */ {DEVICE_SWI(0x413c, 0x81cf)}, /* Dell Wireless 5819 */
diff --git a/drivers/usb/serial/sierra.c b/drivers/usb/serial/sierra.c index 891e52b..a43263a 100644 --- a/drivers/usb/serial/sierra.c +++ b/drivers/usb/serial/sierra.c
@@ -757,8 +757,7 @@ static void sierra_close(struct usb_serial_port *port) /* * Need to take susp_lock to make sure port is not already being - * resumed, but no need to hold it due to the tty-port initialized - * flag. + * resumed, but no need to hold it due to initialized */ spin_lock_irq(&intfdata->susp_lock); if (--intfdata->open_ports == 0)
diff --git a/drivers/usb/serial/usb-serial.c b/drivers/usb/serial/usb-serial.c index 2a2469b..dc7a65b 100644 --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c
@@ -254,7 +254,7 @@ static int serial_open(struct tty_struct *tty, struct file *filp) * * Shut down a USB serial port. Serialized against activate by the * tport mutex and kept to matching open/close pairs - * of calls by the tty-port initialized flag. + * of calls by the initialized flag. * * Not called if tty is console. */
diff --git a/drivers/usb/serial/usb_wwan.c b/drivers/usb/serial/usb_wwan.c index 628a75d..b2285d5 100644 --- a/drivers/usb/serial/usb_wwan.c +++ b/drivers/usb/serial/usb_wwan.c
@@ -435,8 +435,7 @@ void usb_wwan_close(struct usb_serial_port *port) /* * Need to take susp_lock to make sure port is not already being - * resumed, but no need to hold it due to the tty-port initialized - * flag. + * resumed, but no need to hold it due to initialized */ spin_lock_irq(&intfdata->susp_lock); if (--intfdata->open_ports == 0)
diff --git a/drivers/usb/storage/alauda.c b/drivers/usb/storage/alauda.c index de62421..ddab2cd 100644 --- a/drivers/usb/storage/alauda.c +++ b/drivers/usb/storage/alauda.c
@@ -438,8 +438,6 @@ static int alauda_init_media(struct us_data *us) + MEDIA_INFO(us).blockshift + MEDIA_INFO(us).pageshift); MEDIA_INFO(us).pba_to_lba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); MEDIA_INFO(us).lba_to_pba = kcalloc(num_zones, sizeof(u16*), GFP_NOIO); - if (MEDIA_INFO(us).pba_to_lba == NULL || MEDIA_INFO(us).lba_to_pba == NULL) - return USB_STOR_TRANSPORT_ERROR; if (alauda_reset_media(us) != USB_STOR_XFER_GOOD) return USB_STOR_TRANSPORT_ERROR;
diff --git a/drivers/usb/storage/ene_ub6250.c b/drivers/usb/storage/ene_ub6250.c index b076260..9c984f3 100644 --- a/drivers/usb/storage/ene_ub6250.c +++ b/drivers/usb/storage/ene_ub6250.c
@@ -938,7 +938,7 @@ static int ms_lib_process_bootblock(struct us_data *us, u16 PhyBlock, u8 *PageDa struct ms_lib_type_extdat ExtraData; struct ene_ub6250_info *info = (struct ene_ub6250_info *) us->extra; - PageBuffer = kzalloc(MS_BYTES_PER_PAGE * 2, GFP_KERNEL); + PageBuffer = kmalloc(MS_BYTES_PER_PAGE, GFP_KERNEL); if (PageBuffer == NULL) return (u32)-1;
diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h index 44f0b78..3734a25 100644 --- a/drivers/usb/storage/uas-detect.h +++ b/drivers/usb/storage/uas-detect.h
@@ -116,19 +116,6 @@ static int uas_use_uas_driver(struct usb_interface *intf, if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bc2) flags |= US_FL_NO_ATA_1X; - /* - * RTL9210-based enclosure from HIKSEMI, MD202 reportedly have issues - * with UAS. This isn't distinguishable with just idVendor and - * idProduct, use manufacturer and product too. - * - * Reported-by: Hongling Zeng <zenghongling@kylinos.cn> - */ - if (le16_to_cpu(udev->descriptor.idVendor) == 0x0bda && - le16_to_cpu(udev->descriptor.idProduct) == 0x9210 && - (udev->manufacturer && !strcmp(udev->manufacturer, "HIKSEMI")) && - (udev->product && !strcmp(udev->product, "MD202"))) - flags |= US_FL_IGNORE_UAS; - usb_stor_adjust_quirks(udev, &flags); if (flags & US_FL_IGNORE_UAS) {
diff --git a/drivers/usb/storage/unusual_devs.h b/drivers/usb/storage/unusual_devs.h index b270be1..66e7f5d 100644 --- a/drivers/usb/storage/unusual_devs.h +++ b/drivers/usb/storage/unusual_devs.h
@@ -1275,6 +1275,12 @@ UNUSUAL_DEV( 0x090a, 0x1200, 0x0000, 0x9999, USB_SC_RBC, USB_PR_BULK, NULL, 0 ), +UNUSUAL_DEV(0x090c, 0x1000, 0x1100, 0x1100, + "Samsung", + "Flash Drive FIT", + USB_SC_DEVICE, USB_PR_DEVICE, NULL, + US_FL_MAX_SECTORS_64), + /* aeb */ UNUSUAL_DEV( 0x090c, 0x1132, 0x0000, 0xffff, "Feiya", @@ -2288,13 +2294,6 @@ UNUSUAL_DEV( 0x1e74, 0x4621, 0x0000, 0x0000, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BULK_IGNORE_TAG | US_FL_MAX_SECTORS_64 ), -/* Reported by Witold Lipieta <witold.lipieta@thaumatec.com> */ -UNUSUAL_DEV( 0x1fc9, 0x0117, 0x0100, 0x0100, - "NXP Semiconductors", - "PN7462AU", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_IGNORE_RESIDUE ), - /* Supplied with some Castlewood ORB removable drives */ UNUSUAL_DEV( 0x2027, 0xa001, 0x0000, 0x9999, "Double-H Technology",
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h index a4513dd..2f72753 100644 --- a/drivers/usb/storage/unusual_uas.h +++ b/drivers/usb/storage/unusual_uas.h
@@ -52,13 +52,6 @@ UNUSUAL_DEV(0x059f, 0x1061, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_OPCODES | US_FL_NO_SAME), -/* Reported-by: Hongling Zeng <zenghongling@kylinos.cn> */ -UNUSUAL_DEV(0x090c, 0x2000, 0x0000, 0x9999, - "Hiksemi", - "External HDD", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_IGNORE_UAS), - /* * Apricorn USB3 dongle sometimes returns "USBSUSBSUSBS" in response to SCSI * commands in UAS mode. Observed with the 1.28 firmware; are there others? @@ -69,13 +62,6 @@ UNUSUAL_DEV(0x0984, 0x0301, 0x0128, 0x0128, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_IGNORE_UAS), -/* Reported-by: Tom Hu <huxiaoying@kylinos.cn> */ -UNUSUAL_DEV(0x0b05, 0x1932, 0x0000, 0x9999, - "ASUS", - "External HDD", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_IGNORE_UAS), - /* Reported-by: David Webb <djw@noc.ac.uk> */ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x9999, "Seagate", @@ -111,13 +97,6 @@ UNUSUAL_DEV(0x152d, 0x0578, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_BROKEN_FUA), -/* Reported by: Yaroslav Furman <yaro330@gmail.com> */ -UNUSUAL_DEV(0x152d, 0x0583, 0x0000, 0x9999, - "JMicron", - "JMS583Gen 2", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_NO_REPORT_OPCODES), - /* Reported-by: Thinh Nguyen <thinhn@synopsys.com> */ UNUSUAL_DEV(0x154b, 0xf00b, 0x0000, 0x9999, "PNY", @@ -132,13 +111,6 @@ UNUSUAL_DEV(0x154b, 0xf00d, 0x0000, 0x9999, USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_ATA_1X), -/* Reported-by: Hongling Zeng <zenghongling@kylinos.cn> */ -UNUSUAL_DEV(0x17ef, 0x3899, 0x0000, 0x9999, - "Thinkplus", - "External HDD", - USB_SC_DEVICE, USB_PR_DEVICE, NULL, - US_FL_IGNORE_UAS), - /* Reported-by: Hans de Goede <hdegoede@redhat.com> */ UNUSUAL_DEV(0x2109, 0x0711, 0x0000, 0x9999, "VIA",
diff --git a/drivers/usb/typec/altmodes/displayport.c b/drivers/usb/typec/altmodes/displayport.c index ca22a05..4092248 100644 --- a/drivers/usb/typec/altmodes/displayport.c +++ b/drivers/usb/typec/altmodes/displayport.c
@@ -87,8 +87,8 @@ static int dp_altmode_configure(struct dp_altmode *dp, u8 con) case DP_STATUS_CON_UFP_D: case DP_STATUS_CON_BOTH: /* NOTE: First acting as DP source */ conf |= DP_CONF_UFP_U_AS_UFP_D; - pin_assign = DP_CAP_PIN_ASSIGN_UFP_D(dp->alt->vdo) & - DP_CAP_PIN_ASSIGN_DFP_D(dp->port->vdo); + pin_assign = DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo) & + DP_CAP_UFP_D_PIN_ASSIGN(dp->port->vdo); break; default: break; @@ -100,12 +100,8 @@ static int dp_altmode_configure(struct dp_altmode *dp, u8 con) if (dp->data.status & DP_STATUS_PREFER_MULTI_FUNC && pin_assign & DP_PIN_ASSIGN_MULTI_FUNC_MASK) pin_assign &= DP_PIN_ASSIGN_MULTI_FUNC_MASK; - else if (pin_assign & DP_PIN_ASSIGN_DP_ONLY_MASK) { + else if (pin_assign & DP_PIN_ASSIGN_DP_ONLY_MASK) pin_assign &= DP_PIN_ASSIGN_DP_ONLY_MASK; - /* Default to pin assign C if available */ - if (pin_assign & BIT(DP_PIN_ASSIGN_C)) - pin_assign = BIT(DP_PIN_ASSIGN_C); - } if (!pin_assign) return -EINVAL; @@ -411,18 +407,6 @@ static const char * const pin_assignments[] = { [DP_PIN_ASSIGN_F] = "F", }; -/* - * Helper function to extract a peripheral's currently supported - * Pin Assignments from its DisplayPort alternate mode state. - */ -static u8 get_current_pin_assignments(struct dp_altmode *dp) -{ - if (DP_CONF_CURRENTLY(dp->data.conf) == DP_CONF_DFP_D) - return DP_CAP_PIN_ASSIGN_DFP_D(dp->alt->vdo); - else - return DP_CAP_PIN_ASSIGN_UFP_D(dp->alt->vdo); -} - static ssize_t pin_assignment_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t size) @@ -449,7 +433,10 @@ pin_assignment_store(struct device *dev, struct device_attribute *attr, goto out_unlock; } - assignments = get_current_pin_assignments(dp); + if (DP_CONF_CURRENTLY(dp->data.conf) == DP_CONF_DFP_D) + assignments = DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo); + else + assignments = DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo); if (!(DP_CONF_GET_PIN_ASSIGN(conf) & assignments)) { ret = -EINVAL; @@ -486,7 +473,10 @@ static ssize_t pin_assignment_show(struct device *dev, cur = get_count_order(DP_CONF_GET_PIN_ASSIGN(dp->data.conf)); - assignments = get_current_pin_assignments(dp); + if (DP_CONF_CURRENTLY(dp->data.conf) == DP_CONF_DFP_D) + assignments = DP_CAP_UFP_D_PIN_ASSIGN(dp->alt->vdo); + else + assignments = DP_CAP_DFP_D_PIN_ASSIGN(dp->alt->vdo); for (i = 0; assignments; assignments >>= 1, i++) { if (assignments & 1) { @@ -526,10 +516,10 @@ int dp_altmode_probe(struct typec_altmode *alt) /* FIXME: Port can only be DFP_U. */ /* Make sure we have compatiple pin configurations */ - if (!(DP_CAP_PIN_ASSIGN_DFP_D(port->vdo) & - DP_CAP_PIN_ASSIGN_UFP_D(alt->vdo)) && - !(DP_CAP_PIN_ASSIGN_UFP_D(port->vdo) & - DP_CAP_PIN_ASSIGN_DFP_D(alt->vdo))) + if (!(DP_CAP_DFP_D_PIN_ASSIGN(port->vdo) & + DP_CAP_UFP_D_PIN_ASSIGN(alt->vdo)) && + !(DP_CAP_UFP_D_PIN_ASSIGN(port->vdo) & + DP_CAP_DFP_D_PIN_ASSIGN(alt->vdo))) return -ENODEV; ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group);
diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 0369ad9..c950171 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c
@@ -126,7 +126,7 @@ int typec_altmode_exit(struct typec_altmode *adev) if (!adev || !adev->active) return 0; - if (!pdev->ops || !pdev->ops->exit) + if (!pdev->ops || !pdev->ops->enter) return -EOPNOTSUPP; /* Moving to USB Safe State */
diff --git a/drivers/usb/typec/tcpm/tcpci.c b/drivers/usb/typec/tcpm/tcpci.c index 7494a09..519b556 100644 --- a/drivers/usb/typec/tcpm/tcpci.c +++ b/drivers/usb/typec/tcpm/tcpci.c
@@ -594,10 +594,8 @@ struct tcpci *tcpci_register_port(struct device *dev, struct tcpci_data *data) return ERR_PTR(err); tcpci->port = tcpm_register_port(tcpci->dev, &tcpci->tcpc); - if (IS_ERR(tcpci->port)) { - fwnode_handle_put(tcpci->tcpc.fwnode); + if (IS_ERR(tcpci->port)) return ERR_CAST(tcpci->port); - } return tcpci; } @@ -606,7 +604,6 @@ EXPORT_SYMBOL_GPL(tcpci_register_port); void tcpci_unregister_port(struct tcpci *tcpci) { tcpm_unregister_port(tcpci->port); - fwnode_handle_put(tcpci->tcpc.fwnode); } EXPORT_SYMBOL_GPL(tcpci_unregister_port);
diff --git a/drivers/vfio/platform/vfio_platform_common.c b/drivers/vfio/platform/vfio_platform_common.c index 46a72fe..6f72703 100644 --- a/drivers/vfio/platform/vfio_platform_common.c +++ b/drivers/vfio/platform/vfio_platform_common.c
@@ -72,11 +72,12 @@ static int vfio_platform_acpi_call_reset(struct vfio_platform_device *vdev, const char **extra_dbg) { #ifdef CONFIG_ACPI + struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL }; struct device *dev = vdev->device; acpi_handle handle = ACPI_HANDLE(dev); acpi_status acpi_ret; - acpi_ret = acpi_evaluate_object(handle, "_RST", NULL, NULL); + acpi_ret = acpi_evaluate_object(handle, "_RST", NULL, &buffer); if (ACPI_FAILURE(acpi_ret)) { if (extra_dbg) *extra_dbg = acpi_format_exception(acpi_ret);
diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c index efd3782..3885979 100644 --- a/drivers/vfio/vfio.c +++ b/drivers/vfio/vfio.c
@@ -1802,7 +1802,6 @@ struct vfio_info_cap_header *vfio_info_cap_add(struct vfio_info_cap *caps, buf = krealloc(caps->buf, caps->size + size, GFP_KERNEL); if (!buf) { kfree(caps->buf); - caps->buf = NULL; caps->size = 0; return ERR_PTR(-ENOMEM); }
diff --git a/drivers/vhost/vhost.c b/drivers/vhost/vhost.c index d4364ec..0167ba6 100644 --- a/drivers/vhost/vhost.c +++ b/drivers/vhost/vhost.c
@@ -2056,7 +2056,7 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len, struct vhost_dev *dev = vq->dev; struct vhost_umem *umem = dev->iotlb ? dev->iotlb : dev->umem; struct iovec *_iov; - u64 s = 0, last = addr + len - 1; + u64 s = 0; int ret = 0; while ((u64)len > s) { @@ -2067,7 +2067,7 @@ static int translate_desc(struct vhost_virtqueue *vq, u64 addr, u32 len, } node = vhost_umem_interval_tree_iter_first(&umem->umem_tree, - addr, last); + addr, addr + len - 1); if (node == NULL || node->start > addr) { if (umem != dev->iotlb) { ret = -EFAULT;
diff --git a/drivers/vhost/vsock.c b/drivers/vhost/vsock.c index bf38f42..59c7947 100644 --- a/drivers/vhost/vsock.c +++ b/drivers/vhost/vsock.c
@@ -353,7 +353,7 @@ vhost_vsock_alloc_pkt(struct vhost_virtqueue *vq, return NULL; } - pkt->buf = kvmalloc(pkt->len, GFP_KERNEL); + pkt->buf = kmalloc(pkt->len, GFP_KERNEL); if (!pkt->buf) { kfree(pkt); return NULL;
diff --git a/drivers/video/fbdev/Kconfig b/drivers/video/fbdev/Kconfig index 124ed0e..a7e5f12 100644 --- a/drivers/video/fbdev/Kconfig +++ b/drivers/video/fbdev/Kconfig
@@ -2243,6 +2243,7 @@ select FB_SYS_COPYAREA select FB_SYS_IMAGEBLIT select FB_DEFERRED_IO + select PWM select FB_BACKLIGHT help This driver implements support for the Solomon SSD1307
diff --git a/drivers/video/fbdev/amba-clcd.c b/drivers/video/fbdev/amba-clcd.c index 09774ad..3b7a7c7 100644 --- a/drivers/video/fbdev/amba-clcd.c +++ b/drivers/video/fbdev/amba-clcd.c
@@ -714,18 +714,16 @@ static int clcdfb_of_init_display(struct clcd_fb *fb) return -ENODEV; panel = of_graph_get_remote_port_parent(endpoint); - if (!panel) { - err = -ENODEV; - goto out_endpoint_put; - } + if (!panel) + return -ENODEV; err = clcdfb_of_get_backlight(panel, fb->panel); if (err) - goto out_panel_put; + return err; err = clcdfb_of_get_mode(&fb->dev->dev, panel, fb->panel); if (err) - goto out_panel_put; + return err; err = of_property_read_u32(fb->dev->dev.of_node, "max-memory-bandwidth", &max_bandwidth); @@ -754,21 +752,11 @@ static int clcdfb_of_init_display(struct clcd_fb *fb) if (of_property_read_u32_array(endpoint, "arm,pl11x,tft-r0g0b0-pads", - tft_r0b0g0, ARRAY_SIZE(tft_r0b0g0)) != 0) { - err = -ENOENT; - goto out_panel_put; - } - - of_node_put(panel); - of_node_put(endpoint); + tft_r0b0g0, ARRAY_SIZE(tft_r0b0g0)) != 0) + return -ENOENT; return clcdfb_of_init_tft_panel(fb, tft_r0b0g0[0], tft_r0b0g0[1], tft_r0b0g0[2]); -out_panel_put: - of_node_put(panel); -out_endpoint_put: - of_node_put(endpoint); - return err; } static int clcdfb_of_vram_setup(struct clcd_fb *fb)
diff --git a/drivers/video/fbdev/arkfb.c b/drivers/video/fbdev/arkfb.c index 6b1ad19..f940e8b 100644 --- a/drivers/video/fbdev/arkfb.c +++ b/drivers/video/fbdev/arkfb.c
@@ -778,12 +778,7 @@ static int arkfb_set_par(struct fb_info *info) return -EINVAL; } - value = (hdiv * info->var.pixclock) / hmul; - if (!value) { - fb_dbg(info, "invalid pixclock\n"); - value = 1; - } - ark_set_pixclock(info, value); + ark_set_pixclock(info, (hdiv * info->var.pixclock) / hmul); svga_set_timings(par->state.vgabase, &ark_timing_regs, &(info->var), hmul, hdiv, (info->var.vmode & FB_VMODE_DOUBLE) ? 2 : 1, (info->var.vmode & FB_VMODE_INTERLACED) ? 2 : 1, @@ -794,8 +789,6 @@ static int arkfb_set_par(struct fb_info *info) value = ((value * hmul / hdiv) / 8) - 5; vga_wcrt(par->state.vgabase, 0x42, (value + 1) / 2); - if (screen_size > info->screen_size) - screen_size = info->screen_size; memset_io(info->screen_base, 0x00, screen_size); /* Device and screen back on */ svga_wcrt_mask(par->state.vgabase, 0x17, 0x80, 0x80);
diff --git a/drivers/video/fbdev/au1200fb.c b/drivers/video/fbdev/au1200fb.c index 43a4ddd..265d3b4 100644 --- a/drivers/video/fbdev/au1200fb.c +++ b/drivers/video/fbdev/au1200fb.c
@@ -1040,9 +1040,6 @@ static int au1200fb_fb_check_var(struct fb_var_screeninfo *var, u32 pixclock; int screen_size, plane; - if (!var->pixclock) - return -EINVAL; - plane = fbdev->plane; /* Make sure that the mode respect all LCD controller and
diff --git a/drivers/video/fbdev/chipsfb.c b/drivers/video/fbdev/chipsfb.c index 57b1e01..80fdd3e 100644 --- a/drivers/video/fbdev/chipsfb.c +++ b/drivers/video/fbdev/chipsfb.c
@@ -430,7 +430,6 @@ static int chipsfb_pci_init(struct pci_dev *dp, const struct pci_device_id *ent) err_release_fb: framebuffer_release(p); err_disable: - pci_disable_device(dp); err_out: return rc; }
diff --git a/drivers/video/fbdev/core/fbcon.c b/drivers/video/fbdev/core/fbcon.c index e487928..8721b75 100644 --- a/drivers/video/fbdev/core/fbcon.c +++ b/drivers/video/fbdev/core/fbcon.c
@@ -123,8 +123,8 @@ static int logo_lines; enums. */ static int logo_shown = FBCON_LOGO_CANSHOW; /* console mappings */ -static unsigned int first_fb_vc; -static unsigned int last_fb_vc = MAX_NR_CONSOLES - 1; +static int first_fb_vc; +static int last_fb_vc = MAX_NR_CONSOLES - 1; static int fbcon_is_default = 1; static int primary_device = -1; static int fbcon_has_console_bind; @@ -474,12 +474,10 @@ static int __init fb_console_setup(char *this_opt) options += 3; if (*options) first_fb_vc = simple_strtoul(options, &options, 10) - 1; - if (first_fb_vc >= MAX_NR_CONSOLES) + if (first_fb_vc < 0) first_fb_vc = 0; if (*options++ == '-') last_fb_vc = simple_strtoul(options, &options, 10) - 1; - if (last_fb_vc < first_fb_vc || last_fb_vc >= MAX_NR_CONSOLES) - last_fb_vc = MAX_NR_CONSOLES - 1; fbcon_is_default = 0; continue; } @@ -604,7 +602,7 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info, if (scr_readw(r) != vc->vc_video_erase_char) break; if (r != q && new_rows >= rows + logo_lines) { - save = kzalloc(array3_size(logo_lines, new_cols, 2), + save = kmalloc(array3_size(logo_lines, new_cols, 2), GFP_KERNEL); if (save) { int i = cols < new_cols ? cols : new_cols; @@ -2497,12 +2495,9 @@ static int fbcon_set_font(struct vc_data *vc, struct console_font *font, h > FBCON_SWAP(info->var.rotate, info->var.yres, info->var.xres)) return -EINVAL; - if (font->width > 32 || font->height > 32) - return -EINVAL; - /* Make sure drawing engine can handle the font */ - if (!(info->pixmap.blit_x & BIT(font->width - 1)) || - !(info->pixmap.blit_y & BIT(font->height - 1))) + if (!(info->pixmap.blit_x & (1 << (font->width - 1))) || + !(info->pixmap.blit_y & (1 << (font->height - 1)))) return -EINVAL; /* Make sure driver can handle the font length */
diff --git a/drivers/video/fbdev/geode/lxfb_core.c b/drivers/video/fbdev/geode/lxfb_core.c index ffda250..b0f07d6 100644 --- a/drivers/video/fbdev/geode/lxfb_core.c +++ b/drivers/video/fbdev/geode/lxfb_core.c
@@ -234,9 +234,6 @@ static void get_modedb(struct fb_videomode **modedb, unsigned int *size) static int lxfb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { - if (!var->pixclock) - return -EINVAL; - if (var->xres > 1920 || var->yres > 1440) return -EINVAL;
diff --git a/drivers/video/fbdev/i740fb.c b/drivers/video/fbdev/i740fb.c index 1434eb0..347cf8b 100644 --- a/drivers/video/fbdev/i740fb.c +++ b/drivers/video/fbdev/i740fb.c
@@ -400,7 +400,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, u32 xres, right, hslen, left, xtotal; u32 yres, lower, vslen, upper, ytotal; u32 vxres, xoffset, vyres, yoffset; - u32 bpp, base, dacspeed24, mem, freq; + u32 bpp, base, dacspeed24, mem; u8 r7; int i; @@ -643,12 +643,7 @@ static int i740fb_decode_var(const struct fb_var_screeninfo *var, par->atc[VGA_ATC_OVERSCAN] = 0; /* Calculate VCLK that most closely matches the requested dot clock */ - freq = (((u32)1e9) / var->pixclock) * (u32)(1e3); - if (freq < I740_RFREQ_FIX) { - fb_dbg(info, "invalid pixclock\n"); - freq = I740_RFREQ_FIX; - } - i740_calc_vclk(freq, par); + i740_calc_vclk((((u32)1e9) / var->pixclock) * (u32)(1e3), par); /* Since we program the clocks ourselves, always use VCLK2. */ par->misc |= 0x0C;
diff --git a/drivers/video/fbdev/intelfb/intelfbdrv.c b/drivers/video/fbdev/intelfb/intelfbdrv.c index 274e6bb..a76c615 100644 --- a/drivers/video/fbdev/intelfb/intelfbdrv.c +++ b/drivers/video/fbdev/intelfb/intelfbdrv.c
@@ -1214,9 +1214,6 @@ static int intelfb_check_var(struct fb_var_screeninfo *var, dinfo = GET_DINFO(info); - if (!var->pixclock) - return -EINVAL; - /* update the pitch */ if (intelfbhw_validate_mode(dinfo, var) != 0) return -EINVAL;
diff --git a/drivers/video/fbdev/nvidia/nvidia.c b/drivers/video/fbdev/nvidia/nvidia.c index aa502b3..fbeeed5 100644 --- a/drivers/video/fbdev/nvidia/nvidia.c +++ b/drivers/video/fbdev/nvidia/nvidia.c
@@ -766,8 +766,6 @@ static int nvidiafb_check_var(struct fb_var_screeninfo *var, int pitch, err = 0; NVTRACE_ENTER(); - if (!var->pixclock) - return -EINVAL; var->transp.offset = 0; var->transp.length = 0;
diff --git a/drivers/video/fbdev/pm2fb.c b/drivers/video/fbdev/pm2fb.c index 0ec4be2..1dcf02e 100644 --- a/drivers/video/fbdev/pm2fb.c +++ b/drivers/video/fbdev/pm2fb.c
@@ -616,11 +616,6 @@ static int pm2fb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) return -EINVAL; } - if (!var->pixclock) { - DPRINTK("pixclock is zero\n"); - return -EINVAL; - } - if (PICOS2KHZ(var->pixclock) > PM2_MAX_PIXCLOCK) { DPRINTK("pixclock too high (%ldKHz)\n", PICOS2KHZ(var->pixclock)); @@ -1529,10 +1524,8 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) } info = framebuffer_alloc(sizeof(struct pm2fb_par), &pdev->dev); - if (!info) { - err = -ENOMEM; - goto err_exit_disable; - } + if (!info) + return -ENOMEM; default_par = info->par; switch (pdev->device) { @@ -1713,8 +1706,6 @@ static int pm2fb_probe(struct pci_dev *pdev, const struct pci_device_id *id) release_mem_region(pm2fb_fix.mmio_start, pm2fb_fix.mmio_len); err_exit_neither: framebuffer_release(info); - err_exit_disable: - pci_disable_device(pdev); return retval; } @@ -1741,7 +1732,6 @@ static void pm2fb_remove(struct pci_dev *pdev) fb_dealloc_cmap(&info->cmap); kfree(info->pixmap.addr); framebuffer_release(info); - pci_disable_device(pdev); } static const struct pci_device_id pm2fb_id_table[] = {
diff --git a/drivers/video/fbdev/s3fb.c b/drivers/video/fbdev/s3fb.c index 228e5ee..be16c34 100644 --- a/drivers/video/fbdev/s3fb.c +++ b/drivers/video/fbdev/s3fb.c
@@ -902,8 +902,6 @@ static int s3fb_set_par(struct fb_info *info) value = clamp((htotal + hsstart + 1) / 2 + 2, hsstart + 4, htotal + 1); svga_wcrt_multi(par->state.vgabase, s3_dtpc_regs, value); - if (screen_size > info->screen_size) - screen_size = info->screen_size; memset_io(info->screen_base, 0x00, screen_size); /* Device and screen back on */ svga_wcrt_mask(par->state.vgabase, 0x17, 0x80, 0x80);
diff --git a/drivers/video/fbdev/sis/init.c b/drivers/video/fbdev/sis/init.c index d6b2ce9..fde27fe 100644 --- a/drivers/video/fbdev/sis/init.c +++ b/drivers/video/fbdev/sis/init.c
@@ -355,12 +355,12 @@ SiS_GetModeID(int VGAEngine, unsigned int VBFlags, int HDisplay, int VDisplay, } break; case 400: - if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 800) && (LCDheight >= 600))) { + if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 800) && (LCDwidth >= 600))) { if(VDisplay == 300) ModeIndex = ModeIndex_400x300[Depth]; } break; case 512: - if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 1024) && (LCDheight >= 768))) { + if((!(VBFlags & CRT1_LCDA)) || ((LCDwidth >= 1024) && (LCDwidth >= 768))) { if(VDisplay == 384) ModeIndex = ModeIndex_512x384[Depth]; } break;
diff --git a/drivers/video/fbdev/smscufx.c b/drivers/video/fbdev/smscufx.c index 53fb34f..ad60f73 100644 --- a/drivers/video/fbdev/smscufx.c +++ b/drivers/video/fbdev/smscufx.c
@@ -97,6 +97,7 @@ struct ufx_data { struct kref kref; int fb_count; bool virtualized; /* true when physical usb device not present */ + struct delayed_work free_framebuffer_work; atomic_t usb_active; /* 0 = update virtual buffer, but no usb traffic */ atomic_t lost_pixels; /* 1 = a render op failed. Need screen refresh */ u8 *edid; /* null until we read edid from hw or get from sysfs */ @@ -136,8 +137,6 @@ static int ufx_submit_urb(struct ufx_data *dev, struct urb * urb, size_t len); static int ufx_alloc_urb_list(struct ufx_data *dev, int count, size_t size); static void ufx_free_urb_list(struct ufx_data *dev); -static DEFINE_MUTEX(disconnect_mutex); - /* reads a control register */ static int ufx_reg_read(struct ufx_data *dev, u32 index, u32 *data) { @@ -1071,13 +1070,9 @@ static int ufx_ops_open(struct fb_info *info, int user) if (user == 0 && !console) return -EBUSY; - mutex_lock(&disconnect_mutex); - /* If the USB device is gone, we don't accept new opens */ - if (dev->virtualized) { - mutex_unlock(&disconnect_mutex); + if (dev->virtualized) return -ENODEV; - } dev->fb_count++; @@ -1101,8 +1096,6 @@ static int ufx_ops_open(struct fb_info *info, int user) pr_debug("open /dev/fb%d user=%d fb_info=%p count=%d", info->node, user, info, dev->fb_count); - mutex_unlock(&disconnect_mutex); - return 0; } @@ -1115,24 +1108,15 @@ static void ufx_free(struct kref *kref) { struct ufx_data *dev = container_of(kref, struct ufx_data, kref); + /* this function will wait for all in-flight urbs to complete */ + if (dev->urbs.count > 0) + ufx_free_urb_list(dev); + + pr_debug("freeing ufx_data %p", dev); + kfree(dev); } -static void ufx_ops_destory(struct fb_info *info) -{ - struct ufx_data *dev = info->par; - int node = info->node; - - /* Assume info structure is freed after this point */ - framebuffer_release(info); - - pr_debug("fb_info for /dev/fb%d has been freed", node); - - /* release reference taken by kref_init in probe() */ - kref_put(&dev->kref, ufx_free); -} - - static void ufx_release_urb_work(struct work_struct *work) { struct urb_node *unode = container_of(work, struct urb_node, @@ -1141,9 +1125,14 @@ static void ufx_release_urb_work(struct work_struct *work) up(&unode->dev->urbs.limit_sem); } -static void ufx_free_framebuffer(struct ufx_data *dev) +static void ufx_free_framebuffer_work(struct work_struct *work) { + struct ufx_data *dev = container_of(work, struct ufx_data, + free_framebuffer_work.work); struct fb_info *info = dev->info; + int node = info->node; + + unregister_framebuffer(info); if (info->cmap.len != 0) fb_dealloc_cmap(&info->cmap); @@ -1155,6 +1144,11 @@ static void ufx_free_framebuffer(struct ufx_data *dev) dev->info = NULL; + /* Assume info structure is freed after this point */ + framebuffer_release(info); + + pr_debug("fb_info for /dev/fb%d has been freed", node); + /* ref taken in probe() as part of registering framebfufer */ kref_put(&dev->kref, ufx_free); } @@ -1166,13 +1160,11 @@ static int ufx_ops_release(struct fb_info *info, int user) { struct ufx_data *dev = info->par; - mutex_lock(&disconnect_mutex); - dev->fb_count--; /* We can't free fb_info here - fbmem will touch it when we return */ if (dev->virtualized && (dev->fb_count == 0)) - ufx_free_framebuffer(dev); + schedule_delayed_work(&dev->free_framebuffer_work, HZ); if ((dev->fb_count == 0) && (info->fbdefio)) { fb_deferred_io_cleanup(info); @@ -1186,8 +1178,6 @@ static int ufx_ops_release(struct fb_info *info, int user) kref_put(&dev->kref, ufx_free); - mutex_unlock(&disconnect_mutex); - return 0; } @@ -1294,7 +1284,6 @@ static struct fb_ops ufx_ops = { .fb_blank = ufx_ops_blank, .fb_check_var = ufx_ops_check_var, .fb_set_par = ufx_ops_set_par, - .fb_destroy = ufx_ops_destory, }; /* Assumes &info->lock held by caller @@ -1622,7 +1611,7 @@ static int ufx_usb_probe(struct usb_interface *interface, struct usb_device *usbdev; struct ufx_data *dev; struct fb_info *info; - int retval = -ENOMEM; + int retval; u32 id_rev, fpga_rev; /* usb initialization */ @@ -1654,17 +1643,15 @@ static int ufx_usb_probe(struct usb_interface *interface, if (!ufx_alloc_urb_list(dev, WRITES_IN_FLIGHT, MAX_TRANSFER)) { dev_err(dev->gdev, "ufx_alloc_urb_list failed\n"); - goto put_ref; + goto e_nomem; } /* We don't register a new USB class. Our client interface is fbdev */ /* allocates framebuffer driver structure, not framebuffer memory */ info = framebuffer_alloc(0, &usbdev->dev); - if (!info) { - dev_err(dev->gdev, "framebuffer_alloc failed\n"); - goto free_urb_list; - } + if (!info) + goto e_nomem; dev->info = info; info->par = dev; @@ -1678,6 +1665,9 @@ static int ufx_usb_probe(struct usb_interface *interface, goto destroy_modedb; } + INIT_DELAYED_WORK(&dev->free_framebuffer_work, + ufx_free_framebuffer_work); + retval = ufx_reg_read(dev, 0x3000, &id_rev); check_warn_goto_error(retval, "error %d reading 0x3000 register from device", retval); dev_dbg(dev->gdev, "ID_REV register value 0x%08x", id_rev); @@ -1707,34 +1697,22 @@ static int ufx_usb_probe(struct usb_interface *interface, check_warn_goto_error(retval, "unable to find common mode for display and adapter"); retval = ufx_reg_set_bits(dev, 0x4000, 0x00000001); - if (retval < 0) { - dev_err(dev->gdev, "error %d enabling graphics engine", retval); - goto setup_modes; - } + check_warn_goto_error(retval, "error %d enabling graphics engine", retval); /* ready to begin using device */ atomic_set(&dev->usb_active, 1); dev_dbg(dev->gdev, "checking var"); retval = ufx_ops_check_var(&info->var, info); - if (retval < 0) { - dev_err(dev->gdev, "error %d ufx_ops_check_var", retval); - goto reset_active; - } + check_warn_goto_error(retval, "error %d ufx_ops_check_var", retval); dev_dbg(dev->gdev, "setting par"); retval = ufx_ops_set_par(info); - if (retval < 0) { - dev_err(dev->gdev, "error %d ufx_ops_set_par", retval); - goto reset_active; - } + check_warn_goto_error(retval, "error %d ufx_ops_set_par", retval); dev_dbg(dev->gdev, "registering framebuffer"); retval = register_framebuffer(info); - if (retval < 0) { - dev_err(dev->gdev, "error %d register_framebuffer", retval); - goto reset_active; - } + check_warn_goto_error(retval, "error %d register_framebuffer", retval); dev_info(dev->gdev, "SMSC UDX USB device /dev/fb%d attached. %dx%d resolution." " Using %dK framebuffer memory\n", info->node, @@ -1742,34 +1720,28 @@ static int ufx_usb_probe(struct usb_interface *interface, return 0; -reset_active: - atomic_set(&dev->usb_active, 0); -setup_modes: - fb_destroy_modedb(info->monspecs.modedb); - vfree(info->screen_base); - fb_destroy_modelist(&info->modelist); error: fb_dealloc_cmap(&info->cmap); destroy_modedb: + fb_destroy_modedb(info->monspecs.modedb); + vfree(info->screen_base); + fb_destroy_modelist(&info->modelist); framebuffer_release(info); -free_urb_list: - if (dev->urbs.count > 0) - ufx_free_urb_list(dev); put_ref: kref_put(&dev->kref, ufx_free); /* ref for framebuffer */ kref_put(&dev->kref, ufx_free); /* last ref from kref_init */ return retval; + +e_nomem: + retval = -ENOMEM; + goto put_ref; } static void ufx_usb_disconnect(struct usb_interface *interface) { struct ufx_data *dev; - struct fb_info *info; - - mutex_lock(&disconnect_mutex); dev = usb_get_intfdata(interface); - info = dev->info; pr_debug("USB disconnect starting\n"); @@ -1783,17 +1755,12 @@ static void ufx_usb_disconnect(struct usb_interface *interface) /* if clients still have us open, will be freed on last close */ if (dev->fb_count == 0) - ufx_free_framebuffer(dev); + schedule_delayed_work(&dev->free_framebuffer_work, 0); - /* this function will wait for all in-flight urbs to complete */ - if (dev->urbs.count > 0) - ufx_free_urb_list(dev); + /* release reference taken by kref_init in probe() */ + kref_put(&dev->kref, ufx_free); - pr_debug("freeing ufx_data %p", dev); - - unregister_framebuffer(info); - - mutex_unlock(&disconnect_mutex); + /* consider ufx_data freed */ } static struct usb_driver ufx_driver = {
diff --git a/drivers/video/fbdev/stifb.c b/drivers/video/fbdev/stifb.c index e606fc7..9e88e3f 100644 --- a/drivers/video/fbdev/stifb.c +++ b/drivers/video/fbdev/stifb.c
@@ -922,28 +922,6 @@ SETUP_HCRX(struct stifb_info *fb) /* ------------------- driver specific functions --------------------------- */ static int -stifb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) -{ - struct stifb_info *fb = container_of(info, struct stifb_info, info); - - if (var->xres != fb->info.var.xres || - var->yres != fb->info.var.yres || - var->bits_per_pixel != fb->info.var.bits_per_pixel) - return -EINVAL; - - var->xres_virtual = var->xres; - var->yres_virtual = var->yres; - var->xoffset = 0; - var->yoffset = 0; - var->grayscale = fb->info.var.grayscale; - var->red.length = fb->info.var.red.length; - var->green.length = fb->info.var.green.length; - var->blue.length = fb->info.var.blue.length; - - return 0; -} - -static int stifb_setcolreg(u_int regno, u_int red, u_int green, u_int blue, u_int transp, struct fb_info *info) { @@ -1125,7 +1103,6 @@ stifb_init_display(struct stifb_info *fb) static struct fb_ops stifb_ops = { .owner = THIS_MODULE, - .fb_check_var = stifb_check_var, .fb_setcolreg = stifb_setcolreg, .fb_blank = stifb_blank, .fb_fillrect = cfb_fillrect, @@ -1145,7 +1122,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) struct stifb_info *fb; struct fb_info *info; unsigned long sti_rom_address; - char modestr[32]; char *dev_name; int bpp, xres, yres; @@ -1281,7 +1257,7 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) /* limit fbsize to max visible screen size */ if (fix->smem_len > yres*fix->line_length) - fix->smem_len = ALIGN(yres*fix->line_length, 4*1024*1024); + fix->smem_len = yres*fix->line_length; fix->accel = FB_ACCEL_NONE; @@ -1324,9 +1300,6 @@ static int __init stifb_init_fb(struct sti_struct *sti, int bpp_pref) info->flags = FBINFO_DEFAULT | FBINFO_HWACCEL_COPYAREA; info->pseudo_palette = &fb->pseudo_palette; - scnprintf(modestr, sizeof(modestr), "%dx%d-%d", xres, yres, bpp); - fb_find_mode(&info->var, info, modestr, NULL, 0, NULL, bpp); - /* This has to be done !!! */ if (fb_alloc_cmap(&info->cmap, NR_PALETTE, 0)) goto out_err1;
diff --git a/drivers/video/fbdev/tgafb.c b/drivers/video/fbdev/tgafb.c index eab2b4f..286b237 100644 --- a/drivers/video/fbdev/tgafb.c +++ b/drivers/video/fbdev/tgafb.c
@@ -166,9 +166,6 @@ tgafb_check_var(struct fb_var_screeninfo *var, struct fb_info *info) { struct tga_par *par = (struct tga_par *)info->par; - if (!var->pixclock) - return -EINVAL; - if (par->tga_type == TGA_TYPE_8PLANE) { if (var->bits_per_pixel != 8) return -EINVAL;
diff --git a/drivers/video/fbdev/uvesafb.c b/drivers/video/fbdev/uvesafb.c index 7d3af1d..439565c 100644 --- a/drivers/video/fbdev/uvesafb.c +++ b/drivers/video/fbdev/uvesafb.c
@@ -1756,7 +1756,6 @@ static int uvesafb_probe(struct platform_device *dev) out_unmap: iounmap(info->screen_base); out_mem: - arch_phys_wc_del(par->mtrr_handle); release_mem_region(info->fix.smem_start, info->fix.smem_len); out_reg: release_region(0x3c0, 32);
diff --git a/drivers/video/fbdev/vermilion/vermilion.c b/drivers/video/fbdev/vermilion/vermilion.c index ea66717..498038a 100644 --- a/drivers/video/fbdev/vermilion/vermilion.c +++ b/drivers/video/fbdev/vermilion/vermilion.c
@@ -277,10 +277,8 @@ static int vmlfb_get_gpu(struct vml_par *par) mutex_unlock(&vml_mutex); - if (pci_enable_device(par->gpu) < 0) { - pci_dev_put(par->gpu); + if (pci_enable_device(par->gpu) < 0) return -ENODEV; - } return 0; }
diff --git a/drivers/video/fbdev/via/via-core.c b/drivers/video/fbdev/via/via-core.c index ce366b8..ffa2ca2 100644 --- a/drivers/video/fbdev/via/via-core.c +++ b/drivers/video/fbdev/via/via-core.c
@@ -732,14 +732,7 @@ static int __init via_core_init(void) return ret; viafb_i2c_init(); viafb_gpio_init(); - ret = pci_register_driver(&via_driver); - if (ret) { - viafb_gpio_exit(); - viafb_i2c_exit(); - return ret; - } - - return 0; + return pci_register_driver(&via_driver); } static void __exit via_core_exit(void)
diff --git a/drivers/video/fbdev/vt8623fb.c b/drivers/video/fbdev/vt8623fb.c index 61e2028..c339a8f 100644 --- a/drivers/video/fbdev/vt8623fb.c +++ b/drivers/video/fbdev/vt8623fb.c
@@ -504,8 +504,6 @@ static int vt8623fb_set_par(struct fb_info *info) (info->var.vmode & FB_VMODE_DOUBLE) ? 2 : 1, 1, 1, info->node); - if (screen_size > info->screen_size) - screen_size = info->screen_size; memset_io(info->screen_base, 0x00, screen_size); /* Device and screen back on */
diff --git a/drivers/virt/vboxguest/vboxguest_linux.c b/drivers/virt/vboxguest/vboxguest_linux.c index 484c2f0..32c2c52 100644 --- a/drivers/virt/vboxguest/vboxguest_linux.c +++ b/drivers/virt/vboxguest/vboxguest_linux.c
@@ -361,8 +361,8 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) goto err_vbg_core_exit; } - ret = request_irq(pci->irq, vbg_core_isr, IRQF_SHARED, DEVICE_NAME, - gdev); + ret = devm_request_irq(dev, pci->irq, vbg_core_isr, IRQF_SHARED, + DEVICE_NAME, gdev); if (ret) { vbg_err("vboxguest: Error requesting irq: %d\n", ret); goto err_vbg_core_exit; @@ -372,7 +372,7 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) if (ret) { vbg_err("vboxguest: Error misc_register %s failed: %d\n", DEVICE_NAME, ret); - goto err_free_irq; + goto err_vbg_core_exit; } ret = misc_register(&gdev->misc_device_user); @@ -408,8 +408,6 @@ static int vbg_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) misc_deregister(&gdev->misc_device_user); err_unregister_misc_device: misc_deregister(&gdev->misc_device); -err_free_irq: - free_irq(pci->irq, gdev); err_vbg_core_exit: vbg_core_exit(gdev); err_disable_pcidev: @@ -426,7 +424,6 @@ static void vbg_pci_remove(struct pci_dev *pci) vbg_gdev = NULL; mutex_unlock(&vbg_gdev_mutex); - free_irq(pci->irq, gdev); device_remove_file(gdev->dev, &dev_attr_host_features); device_remove_file(gdev->dev, &dev_attr_host_version); misc_deregister(&gdev->misc_device_user);
diff --git a/drivers/vme/bridges/vme_fake.c b/drivers/vme/bridges/vme_fake.c index eae7836..6a1bc28 100644 --- a/drivers/vme/bridges/vme_fake.c +++ b/drivers/vme/bridges/vme_fake.c
@@ -1073,8 +1073,6 @@ static int __init fake_init(void) /* We need a fake parent device */ vme_root = __root_device_register("vme", THIS_MODULE); - if (IS_ERR(vme_root)) - return PTR_ERR(vme_root); /* If we want to support more than one bridge at some point, we need to * dynamically allocate this so we get one per device.
diff --git a/drivers/vme/bridges/vme_tsi148.c b/drivers/vme/bridges/vme_tsi148.c index f2da16b..7e079d3 100644 --- a/drivers/vme/bridges/vme_tsi148.c +++ b/drivers/vme/bridges/vme_tsi148.c
@@ -1771,7 +1771,6 @@ static int tsi148_dma_list_add(struct vme_dma_list *list, return 0; err_dma: - list_del(&entry->list); err_dest: err_source: err_align:
diff --git a/drivers/w1/w1.c b/drivers/w1/w1.c index 2a7970a..e58c759 100644 --- a/drivers/w1/w1.c +++ b/drivers/w1/w1.c
@@ -1131,8 +1131,6 @@ int w1_process(void *data) /* remainder if it woke up early */ unsigned long jremain = 0; - atomic_inc(&dev->refcnt); - for (;;) { if (!jremain && dev->search_count) { @@ -1160,10 +1158,8 @@ int w1_process(void *data) */ mutex_unlock(&dev->list_mutex); - if (kthread_should_stop()) { - __set_current_state(TASK_RUNNING); + if (kthread_should_stop()) break; - } /* Only sleep when the search is active. */ if (dev->search_count) {
diff --git a/drivers/w1/w1_int.c b/drivers/w1/w1_int.c index 3a71c5e..b3e1792 100644 --- a/drivers/w1/w1_int.c +++ b/drivers/w1/w1_int.c
@@ -51,9 +51,10 @@ static struct w1_master *w1_alloc_dev(u32 id, int slave_count, int slave_ttl, dev->search_count = w1_search_count; dev->enable_pullup = w1_enable_pullup; - /* For __w1_remove_master_device to decrement + /* 1 for w1_process to decrement + * 1 for __w1_remove_master_device to decrement */ - atomic_set(&dev->refcnt, 1); + atomic_set(&dev->refcnt, 2); INIT_LIST_HEAD(&dev->slist); INIT_LIST_HEAD(&dev->async_list);
diff --git a/drivers/watchdog/armada_37xx_wdt.c b/drivers/watchdog/armada_37xx_wdt.c index dcb3ffd..e5dcb26 100644 --- a/drivers/watchdog/armada_37xx_wdt.c +++ b/drivers/watchdog/armada_37xx_wdt.c
@@ -274,8 +274,6 @@ static int armada_37xx_wdt_probe(struct platform_device *pdev) if (!res) return -ENODEV; dev->reg = devm_ioremap(&pdev->dev, res->start, resource_size(res)); - if (!dev->reg) - return -ENOMEM; /* init clock */ dev->clk = devm_clk_get(&pdev->dev, NULL);
diff --git a/drivers/watchdog/at91sam9_wdt.c b/drivers/watchdog/at91sam9_wdt.c index fed7be2..292b5a1 100644 --- a/drivers/watchdog/at91sam9_wdt.c +++ b/drivers/watchdog/at91sam9_wdt.c
@@ -206,9 +206,10 @@ static int at91_wdt_init(struct platform_device *pdev, struct at91wdt *wdt) "min heartbeat and max heartbeat might be too close for the system to handle it correctly\n"); if ((tmp & AT91_WDT_WDFIEN) && wdt->irq) { - err = devm_request_irq(dev, wdt->irq, wdt_interrupt, - IRQF_SHARED | IRQF_IRQPOLL | IRQF_NO_SUSPEND, - pdev->name, wdt); + err = request_irq(wdt->irq, wdt_interrupt, + IRQF_SHARED | IRQF_IRQPOLL | + IRQF_NO_SUSPEND, + pdev->name, wdt); if (err) return err; }
diff --git a/drivers/watchdog/diag288_wdt.c b/drivers/watchdog/diag288_wdt.c index 370f648..aafc8d9 100644 --- a/drivers/watchdog/diag288_wdt.c +++ b/drivers/watchdog/diag288_wdt.c
@@ -86,7 +86,7 @@ static int __diag288(unsigned int func, unsigned int timeout, "1:\n" EX_TABLE(0b, 1b) : "+d" (err) : "d"(__func), "d"(__timeout), - "d"(__action), "d"(__len) : "1", "cc", "memory"); + "d"(__action), "d"(__len) : "1", "cc"); return err; } @@ -272,21 +272,12 @@ static int __init diag288_init(void) char ebc_begin[] = { 194, 197, 199, 201, 213 }; - char *ebc_cmd; watchdog_set_nowayout(&wdt_dev, nowayout_info); if (MACHINE_IS_VM) { - ebc_cmd = kmalloc(sizeof(ebc_begin), GFP_KERNEL); - if (!ebc_cmd) { - pr_err("The watchdog cannot be initialized\n"); - return -ENOMEM; - } - memcpy(ebc_cmd, ebc_begin, sizeof(ebc_begin)); - ret = __diag288_vm(WDT_FUNC_INIT, 15, - ebc_cmd, sizeof(ebc_begin)); - kfree(ebc_cmd); - if (ret != 0) { + if (__diag288_vm(WDT_FUNC_INIT, 15, + ebc_begin, sizeof(ebc_begin)) != 0) { pr_err("The watchdog cannot be initialized\n"); return -EINVAL; }
diff --git a/drivers/watchdog/pcwd_usb.c b/drivers/watchdog/pcwd_usb.c index ce94b6f..6727f8a 100644 --- a/drivers/watchdog/pcwd_usb.c +++ b/drivers/watchdog/pcwd_usb.c
@@ -325,8 +325,7 @@ static int usb_pcwd_set_heartbeat(struct usb_pcwd_private *usb_pcwd, int t) static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, int *temperature) { - unsigned char msb = 0x00; - unsigned char lsb = 0x00; + unsigned char msb, lsb; usb_pcwd_send_command(usb_pcwd, CMD_READ_TEMP, &msb, &lsb); @@ -342,8 +341,7 @@ static int usb_pcwd_get_temperature(struct usb_pcwd_private *usb_pcwd, static int usb_pcwd_get_timeleft(struct usb_pcwd_private *usb_pcwd, int *time_left) { - unsigned char msb = 0x00; - unsigned char lsb = 0x00; + unsigned char msb, lsb; /* Read the time that's left before rebooting */ /* Note: if the board is not yet armed then we will read 0xFFFF */
diff --git a/drivers/watchdog/sbsa_gwdt.c b/drivers/watchdog/sbsa_gwdt.c index 4cbe6ba..f0f1e3b 100644 --- a/drivers/watchdog/sbsa_gwdt.c +++ b/drivers/watchdog/sbsa_gwdt.c
@@ -121,7 +121,6 @@ static int sbsa_gwdt_set_timeout(struct watchdog_device *wdd, struct sbsa_gwdt *gwdt = watchdog_get_drvdata(wdd); wdd->timeout = timeout; - timeout = clamp_t(unsigned int, timeout, 1, wdd->max_hw_heartbeat_ms / 1000); if (action) writel(gwdt->clk * timeout,
diff --git a/drivers/watchdog/watchdog_dev.c b/drivers/watchdog/watchdog_dev.c index 7d1ef43..4062d9a 100644 --- a/drivers/watchdog/watchdog_dev.c +++ b/drivers/watchdog/watchdog_dev.c
@@ -1031,8 +1031,8 @@ static int watchdog_cdev_register(struct watchdog_device *wdd) if (wdd->id == 0) { misc_deregister(&watchdog_miscdev); old_wd_data = NULL; + put_device(&wd_data->dev); } - put_device(&wd_data->dev); return err; }
diff --git a/drivers/xen/events/events_base.c b/drivers/xen/events/events_base.c index 5447111..87cfadd 100644 --- a/drivers/xen/events/events_base.c +++ b/drivers/xen/events/events_base.c
@@ -2101,8 +2101,8 @@ void xen_callback_vector(void) void xen_callback_vector(void) {} #endif -bool xen_fifo_events = true; -module_param_named(fifo_events, xen_fifo_events, bool, 0); +static bool fifo_events = true; +module_param(fifo_events, bool, 0); static int xen_evtchn_cpu_prepare(unsigned int cpu) { @@ -2131,12 +2131,10 @@ void __init xen_init_IRQ(void) int ret = -EINVAL; unsigned int evtchn; - if (xen_fifo_events) + if (fifo_events) ret = xen_evtchn_fifo_init(); - if (ret < 0) { + if (ret < 0) xen_evtchn_2l_init(); - xen_fifo_events = false; - } xen_cpu_init_eoi(smp_processor_id());
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 4a2a540..bba849e 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c
@@ -384,7 +384,8 @@ int gntdev_map_grant_pages(struct gntdev_grant_map *map) for (i = 0; i < map->count; i++) { if (map->map_ops[i].status == GNTST_okay) { map->unmap_ops[i].handle = map->map_ops[i].handle; - alloced++; + if (!use_ptemod) + alloced++; } else if (!err) err = -EINVAL; @@ -393,7 +394,8 @@ int gntdev_map_grant_pages(struct gntdev_grant_map *map) if (use_ptemod) { if (map->kmap_ops[i].status == GNTST_okay) { - alloced++; + if (map->map_ops[i].status == GNTST_okay) + alloced++; map->kunmap_ops[i].handle = map->kmap_ops[i].handle; } else if (!err) err = -EINVAL; @@ -409,42 +411,20 @@ static void __unmap_grant_pages_done(int result, unsigned int i; struct gntdev_grant_map *map = data->data; unsigned int offset = data->unmap_ops - map->unmap_ops; - int successful_unmaps = 0; - int live_grants; for (i = 0; i < data->count; i++) { - if (map->unmap_ops[offset + i].status == GNTST_okay && - map->unmap_ops[offset + i].handle != -1) - successful_unmaps++; - WARN_ON(map->unmap_ops[offset+i].status && map->unmap_ops[offset+i].handle != -1); pr_debug("unmap handle=%d st=%d\n", map->unmap_ops[offset+i].handle, map->unmap_ops[offset+i].status); map->unmap_ops[offset+i].handle = -1; - if (use_ptemod) { - if (map->kunmap_ops[offset + i].status == GNTST_okay && - map->kunmap_ops[offset + i].handle != -1) - successful_unmaps++; - - WARN_ON(map->kunmap_ops[offset+i].status && - map->kunmap_ops[offset+i].handle != -1); - pr_debug("kunmap handle=%u st=%d\n", - map->kunmap_ops[offset+i].handle, - map->kunmap_ops[offset+i].status); - map->kunmap_ops[offset+i].handle = -1; - } } - /* * Decrease the live-grant counter. This must happen after the loop to * prevent premature reuse of the grants by gnttab_mmap(). */ - live_grants = atomic_sub_return(successful_unmaps, &map->live_grants); - if (WARN_ON(live_grants < 0)) - pr_err("%s: live_grants became negative (%d) after unmapping %d pages!\n", - __func__, live_grants, successful_unmaps); + atomic_sub(data->count, &map->live_grants); /* Release reference taken by __unmap_grant_pages */ gntdev_put_map(NULL, map);
diff --git a/drivers/xen/pcpu.c b/drivers/xen/pcpu.c index 9cf7085..cdc6daa 100644 --- a/drivers/xen/pcpu.c +++ b/drivers/xen/pcpu.c
@@ -228,7 +228,7 @@ static int register_pcpu(struct pcpu *pcpu) err = device_register(dev); if (err) { - put_device(dev); + pcpu_release(dev); return err; }
diff --git a/drivers/xen/platform-pci.c b/drivers/xen/platform-pci.c index e1cb277..c456464 100644 --- a/drivers/xen/platform-pci.c +++ b/drivers/xen/platform-pci.c
@@ -137,7 +137,7 @@ static int platform_pci_probe(struct pci_dev *pdev, if (ret) { dev_warn(&pdev->dev, "Unable to set the evtchn callback " "err=%d\n", ret); - goto irq_out; + goto out; } } @@ -145,16 +145,13 @@ static int platform_pci_probe(struct pci_dev *pdev, grant_frames = alloc_xen_mmio(PAGE_SIZE * max_nr_gframes); ret = gnttab_setup_auto_xlat_frames(grant_frames); if (ret) - goto irq_out; + goto out; ret = gnttab_init(); if (ret) goto grant_out; return 0; grant_out: gnttab_free_auto_xlat_frames(); -irq_out: - if (!xen_have_vector_callback) - free_irq(pdev->irq, pdev); out: pci_release_region(pdev, 0); mem_out:
diff --git a/drivers/xen/privcmd.c b/drivers/xen/privcmd.c index c4b0de4..d4ff944 100644 --- a/drivers/xen/privcmd.c +++ b/drivers/xen/privcmd.c
@@ -766,7 +766,7 @@ static long privcmd_ioctl_mmap_resource(struct file *file, goto out; } - pfns = kcalloc(kdata.num, sizeof(*pfns), GFP_KERNEL | __GFP_NOWARN); + pfns = kcalloc(kdata.num, sizeof(*pfns), GFP_KERNEL); if (!pfns) { rc = -ENOMEM; goto out;
diff --git a/drivers/xen/pvcalls-back.c b/drivers/xen/pvcalls-back.c index 9c267e2..9439de2 100644 --- a/drivers/xen/pvcalls-back.c +++ b/drivers/xen/pvcalls-back.c
@@ -129,13 +129,13 @@ static bool pvcalls_conn_back_read(void *opaque) if (masked_prod < masked_cons) { vec[0].iov_base = data->in + masked_prod; vec[0].iov_len = wanted; - iov_iter_kvec(&msg.msg_iter, READ, vec, 1, wanted); + iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, wanted); } else { vec[0].iov_base = data->in + masked_prod; vec[0].iov_len = array_size - masked_prod; vec[1].iov_base = data->in; vec[1].iov_len = wanted - vec[0].iov_len; - iov_iter_kvec(&msg.msg_iter, READ, vec, 2, wanted); + iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, wanted); } atomic_set(&map->read, 0); @@ -188,13 +188,13 @@ static bool pvcalls_conn_back_write(struct sock_mapping *map) if (pvcalls_mask(prod, array_size) > pvcalls_mask(cons, array_size)) { vec[0].iov_base = data->out + pvcalls_mask(cons, array_size); vec[0].iov_len = size; - iov_iter_kvec(&msg.msg_iter, WRITE, vec, 1, size); + iov_iter_kvec(&msg.msg_iter, READ, vec, 1, size); } else { vec[0].iov_base = data->out + pvcalls_mask(cons, array_size); vec[0].iov_len = array_size - pvcalls_mask(cons, array_size); vec[1].iov_base = data->out; vec[1].iov_len = size - vec[0].iov_len; - iov_iter_kvec(&msg.msg_iter, WRITE, vec, 2, size); + iov_iter_kvec(&msg.msg_iter, READ, vec, 2, size); } atomic_set(&map->write, 0);
diff --git a/drivers/xen/swiotlb-xen.c b/drivers/xen/swiotlb-xen.c index de24920..0634642 100644 --- a/drivers/xen/swiotlb-xen.c +++ b/drivers/xen/swiotlb-xen.c
@@ -411,7 +411,7 @@ static dma_addr_t xen_swiotlb_map_page(struct device *dev, struct page *page, done: if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_device(dev_addr, phys, size, dir); + xen_dma_sync_for_device(dev, dev_addr, phys, size, dir); return dev_addr; } @@ -431,7 +431,7 @@ static void xen_swiotlb_unmap_page(struct device *hwdev, dma_addr_t dev_addr, BUG_ON(dir == DMA_NONE); if (!dev_is_dma_coherent(hwdev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - xen_dma_sync_for_cpu(dev_addr, paddr, size, dir); + xen_dma_sync_for_cpu(hwdev, dev_addr, paddr, size, dir); /* NOTE: We use dev_addr here, not paddr! */ if (is_xen_swiotlb_buffer(dev_addr))
diff --git a/drivers/xen/xenbus/xenbus_dev_frontend.c b/drivers/xen/xenbus/xenbus_dev_frontend.c index 0792fda..597af45 100644 --- a/drivers/xen/xenbus/xenbus_dev_frontend.c +++ b/drivers/xen/xenbus/xenbus_dev_frontend.c
@@ -128,7 +128,7 @@ static ssize_t xenbus_file_read(struct file *filp, { struct xenbus_file_priv *u = filp->private_data; struct read_buffer *rb; - ssize_t i; + unsigned i; int ret; mutex_lock(&u->reply_mutex); @@ -148,7 +148,7 @@ static ssize_t xenbus_file_read(struct file *filp, rb = list_entry(u->read_buffers.next, struct read_buffer, list); i = 0; while (i < len) { - size_t sz = min_t(size_t, len - i, rb->len - rb->cons); + unsigned sz = min((unsigned)len - i, rb->len - rb->cons); ret = copy_to_user(ubuf + i, &rb->msg[rb->cons], sz);
diff --git a/fs/affs/file.c b/fs/affs/file.c index 82bb383..ba084b0 100644 --- a/fs/affs/file.c +++ b/fs/affs/file.c
@@ -878,7 +878,7 @@ affs_truncate(struct inode *inode) if (inode->i_size > AFFS_I(inode)->mmu_private) { struct address_space *mapping = inode->i_mapping; struct page *page; - void *fsdata = NULL; + void *fsdata; loff_t isize = inode->i_size; int res;
diff --git a/fs/afs/flock.c b/fs/afs/flock.c index 0fa0599..d5e5a6d 100644 --- a/fs/afs/flock.c +++ b/fs/afs/flock.c
@@ -75,7 +75,7 @@ void afs_lock_op_done(struct afs_call *call) if (call->error == 0) { spin_lock(&vnode->lock); trace_afs_flock_ev(vnode, NULL, afs_flock_timestamp, 0); - vnode->locked_at = call->issue_time; + vnode->locked_at = call->reply_time; afs_schedule_lock_extension(vnode); spin_unlock(&vnode->lock); }
diff --git a/fs/afs/fs_probe.c b/fs/afs/fs_probe.c index e9282e0..51ee3dd 100644 --- a/fs/afs/fs_probe.c +++ b/fs/afs/fs_probe.c
@@ -92,8 +92,8 @@ void afs_fileserver_probe_result(struct afs_call *call) } } - rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us); - if (rtt_us < server->probe.rtt) { + if (rxrpc_kernel_get_srtt(call->net->socket, call->rxcall, &rtt_us) && + rtt_us < server->probe.rtt) { server->probe.rtt = rtt_us; alist->preferred = index; have_result = true;
diff --git a/fs/afs/fsclient.c b/fs/afs/fsclient.c index 254580b..5c2729f 100644 --- a/fs/afs/fsclient.c +++ b/fs/afs/fsclient.c
@@ -136,7 +136,7 @@ static void xdr_decode_AFSFetchStatus(const __be32 **_bp, static time64_t xdr_decode_expiry(struct afs_call *call, u32 expiry) { - return ktime_divns(call->issue_time, NSEC_PER_SEC) + expiry; + return ktime_divns(call->reply_time, NSEC_PER_SEC) + expiry; } static void xdr_decode_AFSCallBack(const __be32 **_bp,
diff --git a/fs/afs/internal.h b/fs/afs/internal.h index 8d65827..c3ad582 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h
@@ -159,6 +159,7 @@ struct afs_call { bool need_attention; /* T if RxRPC poked us */ bool async; /* T if asynchronous */ bool upgrade; /* T to request service upgrade */ + bool have_reply_time; /* T if have got reply_time */ bool intr; /* T if interruptible */ bool unmarshalling_error; /* T if an unmarshalling error occurred */ u16 service_id; /* Actual service ID (after upgrade) */ @@ -172,7 +173,7 @@ struct afs_call { } __attribute__((packed)); __be64 tmp64; }; - ktime_t issue_time; /* Time of issue of operation */ + ktime_t reply_time; /* Time of first reply packet */ }; struct afs_call_type {
diff --git a/fs/afs/misc.c b/fs/afs/misc.c index 5171d6d..5334f1b 100644 --- a/fs/afs/misc.c +++ b/fs/afs/misc.c
@@ -69,7 +69,6 @@ int afs_abort_to_error(u32 abort_code) /* Unified AFS error table */ case UAEPERM: return -EPERM; case UAENOENT: return -ENOENT; - case UAEAGAIN: return -EAGAIN; case UAEACCES: return -EACCES; case UAEBUSY: return -EBUSY; case UAEEXIST: return -EEXIST;
diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 49fcce6..6adab30 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c
@@ -428,7 +428,6 @@ void afs_make_call(struct afs_addr_cursor *ac, struct afs_call *call, gfp_t gfp) if (call->max_lifespan) rxrpc_kernel_set_max_life(call->net->socket, rxcall, call->max_lifespan); - call->issue_time = ktime_get_real(); /* send the request */ iov[0].iov_base = call->request; @@ -533,6 +532,12 @@ static void afs_deliver_to_call(struct afs_call *call) return; } + if (!call->have_reply_time && + rxrpc_kernel_get_reply_time(call->net->socket, + call->rxcall, + &call->reply_time)) + call->have_reply_time = true; + ret = call->type->deliver(call); state = READ_ONCE(call->state); if (ret == 0 && call->unmarshalling_error)
diff --git a/fs/afs/yfsclient.c b/fs/afs/yfsclient.c index fa85b35..3b19b00 100644 --- a/fs/afs/yfsclient.c +++ b/fs/afs/yfsclient.c
@@ -241,7 +241,8 @@ static void xdr_decode_YFSCallBack(const __be32 **_bp, struct afs_callback *cb = &scb->callback; ktime_t cb_expiry; - cb_expiry = ktime_add(call->issue_time, xdr_to_u64(x->expiration_time) * 100); + cb_expiry = call->reply_time; + cb_expiry = ktime_add(cb_expiry, xdr_to_u64(x->expiration_time) * 100); cb->expires_at = ktime_divns(cb_expiry, NSEC_PER_SEC); scb->have_cb = true; *_bp += xdr_size(x);
diff --git a/fs/aio.c b/fs/aio.c index 1ec5a77..fb92c32 100644 --- a/fs/aio.c +++ b/fs/aio.c
@@ -336,9 +336,6 @@ static int aio_ring_mremap(struct vm_area_struct *vma) spin_lock(&mm->ioctx_lock); rcu_read_lock(); table = rcu_dereference(mm->ioctx_table); - if (!table) - goto out_unlock; - for (i = 0; i < table->nr; i++) { struct kioctx *ctx; @@ -352,7 +349,6 @@ static int aio_ring_mremap(struct vm_area_struct *vma) } } -out_unlock: rcu_read_unlock(); spin_unlock(&mm->ioctx_lock); return res;
diff --git a/fs/attr.c b/fs/attr.c index f1bb09c..03217e0 100644 --- a/fs/attr.c +++ b/fs/attr.c
@@ -134,8 +134,6 @@ EXPORT_SYMBOL(setattr_prepare); */ int inode_newsize_ok(const struct inode *inode, loff_t offset) { - if (offset < 0) - return -EINVAL; if (inode->i_size < offset) { unsigned long limit;
diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index ace587b..8e8346a 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c
@@ -162,7 +162,6 @@ static int load_aout_binary(struct linux_binprm * bprm) set_personality(PER_LINUX); #endif setup_new_exec(bprm); - install_exec_creds(bprm); current->mm->end_code = ex.a_text + (current->mm->start_code = N_TXTADDR(ex)); @@ -175,6 +174,7 @@ static int load_aout_binary(struct linux_binprm * bprm) if (retval < 0) return retval; + install_exec_creds(bprm); if (N_MAGIC(ex) == OMAGIC) { unsigned long text_addr, map_size;
diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 39bcbfa..d86ebd0 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c
@@ -353,7 +353,6 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) current->personality |= READ_IMPLIES_EXEC; setup_new_exec(bprm); - install_exec_creds(bprm); set_binfmt(&elf_fdpic_format); @@ -435,9 +434,9 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm) current->mm->start_stack = current->mm->start_brk + stack_size; #endif - retval = create_elf_fdpic_tables(bprm, current->mm, &exec_params, - &interp_params); - if (retval < 0) + install_exec_creds(bprm); + if (create_elf_fdpic_tables(bprm, current->mm, + &exec_params, &interp_params) < 0) goto error; kdebug("- start_code %lx", current->mm->start_code);
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 22a7d75..c999bc0 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c
@@ -565,7 +565,6 @@ static int load_flat_file(struct linux_binprm *bprm, /* OK, This is the point of no return */ set_personality(PER_LINUX_32BIT); setup_new_exec(bprm); - install_exec_creds(bprm); } /* @@ -993,6 +992,8 @@ static int load_flat_binary(struct linux_binprm *bprm) } } + install_exec_creds(bprm); + set_binfmt(&flat_format); #ifdef CONFIG_MMU
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c index 23b563f..056a682 100644 --- a/fs/binfmt_misc.c +++ b/fs/binfmt_misc.c
@@ -44,10 +44,10 @@ static LIST_HEAD(entries); static int enabled = 1; enum {Enabled, Magic}; -#define MISC_FMT_PRESERVE_ARGV0 (1UL << 31) -#define MISC_FMT_OPEN_BINARY (1UL << 30) -#define MISC_FMT_CREDENTIALS (1UL << 29) -#define MISC_FMT_OPEN_FILE (1UL << 28) +#define MISC_FMT_PRESERVE_ARGV0 (1 << 31) +#define MISC_FMT_OPEN_BINARY (1 << 30) +#define MISC_FMT_CREDENTIALS (1 << 29) +#define MISC_FMT_OPEN_FILE (1 << 28) typedef struct { struct list_head list;
diff --git a/fs/btrfs/backref.c b/fs/btrfs/backref.c index 89411e9..c701a19 100644 --- a/fs/btrfs/backref.c +++ b/fs/btrfs/backref.c
@@ -136,7 +136,6 @@ struct share_check { u64 root_objectid; u64 inum; int share_count; - bool have_delayed_delete_refs; }; static inline int extent_is_shared(struct share_check *sc) @@ -287,10 +286,8 @@ static void prelim_release(struct preftree *preftree) struct prelim_ref *ref, *next_ref; rbtree_postorder_for_each_entry_safe(ref, next_ref, - &preftree->root.rb_root, rbnode) { - free_inode_elem_list(ref->inode_list); + &preftree->root.rb_root, rbnode) free_pref(ref); - } preftree->root = RB_ROOT_CACHED; preftree->count = 0; @@ -431,7 +428,6 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, u64 wanted_disk_byte = ref->wanted_disk_byte; u64 count = 0; u64 data_offset; - u8 type; if (level != 0) { eb = path->nodes[level]; @@ -486,9 +482,6 @@ static int add_all_parents(struct btrfs_root *root, struct btrfs_path *path, continue; } fi = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item); - type = btrfs_file_extent_type(eb, fi); - if (type == BTRFS_FILE_EXTENT_INLINE) - goto next; disk_byte = btrfs_file_extent_disk_bytenr(eb, fi); data_offset = btrfs_file_extent_offset(eb, fi); @@ -648,18 +641,6 @@ unode_aux_to_inode_list(struct ulist_node *node) return (struct extent_inode_elem *)(uintptr_t)node->aux; } -static void free_leaf_list(struct ulist *ulist) -{ - struct ulist_node *node; - struct ulist_iterator uiter; - - ULIST_ITER_INIT(&uiter); - while ((node = ulist_next(ulist, &uiter))) - free_inode_elem_list(unode_aux_to_inode_list(node)); - - ulist_free(ulist); -} - /* * We maintain three separate rbtrees: one for direct refs, one for * indirect refs which have a key, and one for indirect refs which do not @@ -774,11 +755,7 @@ static int resolve_indirect_refs(struct btrfs_fs_info *fs_info, cond_resched(); } out: - /* - * We may have inode lists attached to refs in the parents ulist, so we - * must free them before freeing the ulist and its refs. - */ - free_leaf_list(parents); + ulist_free(parents); return ret; } @@ -835,11 +812,16 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, struct preftrees *preftrees, struct share_check *sc) { struct btrfs_delayed_ref_node *node; + struct btrfs_delayed_extent_op *extent_op = head->extent_op; struct btrfs_key key; + struct btrfs_key tmp_op_key; struct rb_node *n; int count; int ret = 0; + if (extent_op && extent_op->update_key) + btrfs_disk_key_to_cpu(&tmp_op_key, &extent_op->key); + spin_lock(&head->lock); for (n = rb_first_cached(&head->ref_tree); n; n = rb_next(n)) { node = rb_entry(n, struct btrfs_delayed_ref_node, @@ -865,16 +847,10 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, case BTRFS_TREE_BLOCK_REF_KEY: { /* NORMAL INDIRECT METADATA backref */ struct btrfs_delayed_tree_ref *ref; - struct btrfs_key *key_ptr = NULL; - - if (head->extent_op && head->extent_op->update_key) { - btrfs_disk_key_to_cpu(&key, &head->extent_op->key); - key_ptr = &key; - } ref = btrfs_delayed_node_to_tree_ref(node); ret = add_indirect_ref(fs_info, preftrees, ref->root, - key_ptr, ref->level + 1, + &tmp_op_key, ref->level + 1, node->bytenr, count, sc, GFP_ATOMIC); break; @@ -900,22 +876,13 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, key.offset = ref->offset; /* - * If we have a share check context and a reference for - * another inode, we can't exit immediately. This is - * because even if this is a BTRFS_ADD_DELAYED_REF - * reference we may find next a BTRFS_DROP_DELAYED_REF - * which cancels out this ADD reference. - * - * If this is a DROP reference and there was no previous - * ADD reference, then we need to signal that when we - * process references from the extent tree (through - * add_inline_refs() and add_keyed_refs()), we should - * not exit early if we find a reference for another - * inode, because one of the delayed DROP references - * may cancel that reference in the extent tree. + * Found a inum that doesn't match our known inum, we + * know it's shared. */ - if (sc && count < 0) - sc->have_delayed_delete_refs = true; + if (sc && sc->inum && ref->objectid != sc->inum) { + ret = BACKREF_FOUND_SHARED; + goto out; + } ret = add_indirect_ref(fs_info, preftrees, ref->root, &key, 0, node->bytenr, count, sc, @@ -945,7 +912,7 @@ static int add_delayed_refs(const struct btrfs_fs_info *fs_info, } if (!ret) ret = extent_is_shared(sc); - +out: spin_unlock(&head->lock); return ret; } @@ -1048,8 +1015,7 @@ static int add_inline_refs(const struct btrfs_fs_info *fs_info, key.type = BTRFS_EXTENT_DATA_KEY; key.offset = btrfs_extent_data_ref_offset(leaf, dref); - if (sc && sc->inum && key.objectid != sc->inum && - !sc->have_delayed_delete_refs) { + if (sc && sc->inum && key.objectid != sc->inum) { ret = BACKREF_FOUND_SHARED; break; } @@ -1059,7 +1025,6 @@ static int add_inline_refs(const struct btrfs_fs_info *fs_info, ret = add_indirect_ref(fs_info, preftrees, root, &key, 0, bytenr, count, sc, GFP_NOFS); - break; } default: @@ -1149,8 +1114,7 @@ static int add_keyed_refs(struct btrfs_fs_info *fs_info, key.type = BTRFS_EXTENT_DATA_KEY; key.offset = btrfs_extent_data_ref_offset(leaf, dref); - if (sc && sc->inum && key.objectid != sc->inum && - !sc->have_delayed_delete_refs) { + if (sc && sc->inum && key.objectid != sc->inum) { ret = BACKREF_FOUND_SHARED; break; } @@ -1389,12 +1353,6 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, if (ret < 0) goto out; ref->inode_list = eie; - /* - * We transferred the list ownership to the ref, - * so set to NULL to avoid a double free in case - * an error happens after this. - */ - eie = NULL; } ret = ulist_add_merge_ptr(refs, ref->parent, ref->inode_list, @@ -1420,14 +1378,6 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, eie->next = ref->inode_list; } eie = NULL; - /* - * We have transferred the inode list ownership from - * this ref to the ref we added to the 'refs' ulist. - * So set this ref's inode list to NULL to avoid - * use-after-free when our caller uses it or double - * frees in case an error happens before we return. - */ - ref->inode_list = NULL; } cond_resched(); } @@ -1444,6 +1394,24 @@ static int find_parent_nodes(struct btrfs_trans_handle *trans, return ret; } +static void free_leaf_list(struct ulist *blocks) +{ + struct ulist_node *node = NULL; + struct extent_inode_elem *eie; + struct ulist_iterator uiter; + + ULIST_ITER_INIT(&uiter); + while ((node = ulist_next(blocks, &uiter))) { + if (!node->aux) + continue; + eie = unode_aux_to_inode_list(node); + free_inode_elem_list(eie); + node->aux = 0; + } + + ulist_free(blocks); +} + /* * Finds all leafs with a reference to the specified combination of bytenr and * offset. key_list_head will point to a list of corresponding keys (caller must @@ -1569,7 +1537,6 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr, .root_objectid = root->root_key.objectid, .inum = inum, .share_count = 0, - .have_delayed_delete_refs = false, }; ulist_init(roots); @@ -1604,7 +1571,6 @@ int btrfs_check_shared(struct btrfs_root *root, u64 inum, u64 bytenr, break; bytenr = node->val; shared.share_count = 0; - shared.have_delayed_delete_refs = false; cond_resched(); }
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c index 278933c..bcf19df 100644 --- a/fs/btrfs/block-group.c +++ b/fs/btrfs/block-group.c
@@ -2938,7 +2938,6 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags, * attempt. */ wait_for_alloc = true; - force = CHUNK_ALLOC_NO_FORCE; spin_unlock(&space_info->lock); mutex_lock(&fs_info->chunk_mutex); mutex_unlock(&fs_info->chunk_mutex);
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index c2e5fe9..cd77c06 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h
@@ -2727,7 +2727,7 @@ struct btrfs_dir_item * btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, u64 dir, - u64 index, const char *name, int name_len, + u64 objectid, const char *name, int name_len, int mod); struct btrfs_dir_item * btrfs_search_dir_index_item(struct btrfs_root *root,
diff --git a/fs/btrfs/dev-replace.c b/fs/btrfs/dev-replace.c index 444e1e5..1cb7f5d 100644 --- a/fs/btrfs/dev-replace.c +++ b/fs/btrfs/dev-replace.c
@@ -125,7 +125,7 @@ int btrfs_init_dev_replace(struct btrfs_fs_info *fs_info) if (btrfs_find_device(fs_info->fs_devices, BTRFS_DEV_REPLACE_DEVID, NULL, NULL, false)) { btrfs_err(fs_info, -"replace without active item, run 'device scan --forget' on the target device"); + "replace devid present without an active replace item"); ret = -EUCLEAN; } else { dev_replace->srcdev = NULL; @@ -918,7 +918,8 @@ int btrfs_dev_replace_cancel(struct btrfs_fs_info *fs_info) up_write(&dev_replace->rwsem); /* Scrub for replace must not be running in suspended state */ - btrfs_scrub_cancel(fs_info); + ret = btrfs_scrub_cancel(fs_info); + ASSERT(ret != -ENOTCONN); trans = btrfs_start_transaction(root, 0); if (IS_ERR(trans)) {
diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 98c6faa..863367c 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c
@@ -171,40 +171,10 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name, return 0; } -static struct btrfs_dir_item *btrfs_lookup_match_dir( - struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct btrfs_path *path, - struct btrfs_key *key, const char *name, - int name_len, int mod) -{ - const int ins_len = (mod < 0 ? -1 : 0); - const int cow = (mod != 0); - int ret; - - ret = btrfs_search_slot(trans, root, key, path, ins_len, cow); - if (ret < 0) - return ERR_PTR(ret); - if (ret > 0) - return ERR_PTR(-ENOENT); - - return btrfs_match_dir_item_name(root->fs_info, path, name, name_len); -} - /* - * Lookup for a directory item by name. - * - * @trans: The transaction handle to use. Can be NULL if @mod is 0. - * @root: The root of the target tree. - * @path: Path to use for the search. - * @dir: The inode number (objectid) of the directory. - * @name: The name associated to the directory entry we are looking for. - * @name_len: The length of the name. - * @mod: Used to indicate if the tree search is meant for a read only - * lookup, for a modification lookup or for a deletion lookup, so - * its value should be 0, 1 or -1, respectively. - * - * Returns: NULL if the dir item does not exists, an error pointer if an error - * happened, or a pointer to a dir item if a dir item exists for the given name. + * lookup a directory item based on name. 'dir' is the objectid + * we're searching in, and 'mod' tells us if you plan on deleting the + * item (use mod < 0) or changing the options (use mod > 0) */ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, @@ -212,18 +182,23 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, const char *name, int name_len, int mod) { + int ret; struct btrfs_key key; - struct btrfs_dir_item *di; + int ins_len = mod < 0 ? -1 : 0; + int cow = mod != 0; key.objectid = dir; key.type = BTRFS_DIR_ITEM_KEY; + key.offset = btrfs_name_hash(name, name_len); - di = btrfs_lookup_match_dir(trans, root, path, &key, name, name_len, mod); - if (IS_ERR(di) && PTR_ERR(di) == -ENOENT) + ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); + if (ret < 0) + return ERR_PTR(ret); + if (ret > 0) return NULL; - return di; + return btrfs_match_dir_item_name(root->fs_info, path, name, name_len); } int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, @@ -237,6 +212,7 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, int slot; struct btrfs_path *path; + path = btrfs_alloc_path(); if (!path) return -ENOMEM; @@ -245,20 +221,20 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, key.type = BTRFS_DIR_ITEM_KEY; key.offset = btrfs_name_hash(name, name_len); - di = btrfs_lookup_match_dir(NULL, root, path, &key, name, name_len, 0); - if (IS_ERR(di)) { - ret = PTR_ERR(di); - /* Nothing found, we're safe */ - if (ret == -ENOENT) { - ret = 0; - goto out; - } + ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); - if (ret < 0) - goto out; + /* return back any errors */ + if (ret < 0) + goto out; + + /* nothing found, we're safe */ + if (ret > 0) { + ret = 0; + goto out; } /* we found an item, look for our name in the item */ + di = btrfs_match_dir_item_name(root->fs_info, path, name, name_len); if (di) { /* our exact name was found */ ret = -EEXIST; @@ -285,42 +261,35 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, } /* - * Lookup for a directory index item by name and index number. + * lookup a directory item based on index. 'dir' is the objectid + * we're searching in, and 'mod' tells us if you plan on deleting the + * item (use mod < 0) or changing the options (use mod > 0) * - * @trans: The transaction handle to use. Can be NULL if @mod is 0. - * @root: The root of the target tree. - * @path: Path to use for the search. - * @dir: The inode number (objectid) of the directory. - * @index: The index number. - * @name: The name associated to the directory entry we are looking for. - * @name_len: The length of the name. - * @mod: Used to indicate if the tree search is meant for a read only - * lookup, for a modification lookup or for a deletion lookup, so - * its value should be 0, 1 or -1, respectively. - * - * Returns: NULL if the dir index item does not exists, an error pointer if an - * error happened, or a pointer to a dir item if the dir index item exists and - * matches the criteria (name and index number). + * The name is used to make sure the index really points to the name you were + * looking for. */ struct btrfs_dir_item * btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_path *path, u64 dir, - u64 index, const char *name, int name_len, + u64 objectid, const char *name, int name_len, int mod) { - struct btrfs_dir_item *di; + int ret; struct btrfs_key key; + int ins_len = mod < 0 ? -1 : 0; + int cow = mod != 0; key.objectid = dir; key.type = BTRFS_DIR_INDEX_KEY; - key.offset = index; + key.offset = objectid; - di = btrfs_lookup_match_dir(trans, root, path, &key, name, name_len, mod); - if (di == ERR_PTR(-ENOENT)) - return NULL; - - return di; + ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); + if (ret < 0) + return ERR_PTR(ret); + if (ret > 0) + return ERR_PTR(-ENOENT); + return btrfs_match_dir_item_name(root->fs_info, path, name, name_len); } struct btrfs_dir_item * @@ -377,18 +346,21 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, const char *name, u16 name_len, int mod) { + int ret; struct btrfs_key key; - struct btrfs_dir_item *di; + int ins_len = mod < 0 ? -1 : 0; + int cow = mod != 0; key.objectid = dir; key.type = BTRFS_XATTR_ITEM_KEY; key.offset = btrfs_name_hash(name, name_len); - - di = btrfs_lookup_match_dir(trans, root, path, &key, name, name_len, mod); - if (IS_ERR(di) && PTR_ERR(di) == -ENOENT) + ret = btrfs_search_slot(trans, root, &key, path, ins_len, cow); + if (ret < 0) + return ERR_PTR(ret); + if (ret > 0) return NULL; - return di; + return btrfs_match_dir_item_name(root->fs_info, path, name, name_len); } /*
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 4536d8a..a4b3e6f 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c
@@ -2239,23 +2239,6 @@ static int btrfs_init_csum_hash(struct btrfs_fs_info *fs_info, u16 csum_type) fs_info->csum_shash = csum_shash; - /* - * Check if the checksum implementation is a fast accelerated one. - * As-is this is a bit of a hack and should be replaced once the csum - * implementations provide that information themselves. - */ - switch (csum_type) { - case BTRFS_CSUM_TYPE_CRC32: - if (!strstr(crypto_shash_driver_name(csum_shash), "generic")) - set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags); - break; - default: - break; - } - - btrfs_info(fs_info, "using %s (%s) checksum algorithm", - btrfs_super_csum_name(csum_type), - crypto_shash_driver_name(csum_shash)); return 0; } @@ -2987,20 +2970,6 @@ int open_ctree(struct super_block *sb, err = -EINVAL; goto fail_csum; } - /* - * We have unsupported RO compat features, although RO mounted, we - * should not cause any metadata write, including log replay. - * Or we could screw up whatever the new feature requires. - */ - if (unlikely(features && btrfs_super_log_root(disk_super) && - !btrfs_test_opt(fs_info, NOLOGREPLAY))) { - btrfs_err(fs_info, -"cannot replay dirty log with unsupported compat_ro features (0x%llx), try rescue=nologreplay", - features); - err = -EINVAL; - goto fail_alloc; - } - ret = btrfs_init_workqueues(fs_info, fs_devices); if (ret) {
diff --git a/fs/btrfs/export.c b/fs/btrfs/export.c index 6e47273..93cceeb 100644 --- a/fs/btrfs/export.c +++ b/fs/btrfs/export.c
@@ -58,7 +58,7 @@ static int btrfs_encode_fh(struct inode *inode, u32 *fh, int *max_len, } struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, - u64 root_objectid, u64 generation, + u64 root_objectid, u32 generation, int check_generation) { struct btrfs_fs_info *fs_info = btrfs_sb(sb);
diff --git a/fs/btrfs/export.h b/fs/btrfs/export.h index 5afb7ca..f32f411 100644 --- a/fs/btrfs/export.h +++ b/fs/btrfs/export.h
@@ -19,7 +19,7 @@ struct btrfs_fid { } __attribute__ ((packed)); struct dentry *btrfs_get_dentry(struct super_block *sb, u64 objectid, - u64 root_objectid, u64 generation, + u64 root_objectid, u32 generation, int check_generation); struct dentry *btrfs_get_parent(struct dentry *child);
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 20c5db8..7755a03 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c
@@ -9751,6 +9751,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, /* force full log commit if subvolume involved. */ btrfs_set_log_full_commit(trans); } else { + btrfs_pin_log_trans(root); + root_log_pinned = true; ret = btrfs_insert_inode_ref(trans, dest, new_dentry->d_name.name, new_dentry->d_name.len, @@ -9766,6 +9768,8 @@ static int btrfs_rename_exchange(struct inode *old_dir, /* force full log commit if subvolume involved. */ btrfs_set_log_full_commit(trans); } else { + btrfs_pin_log_trans(dest); + dest_log_pinned = true; ret = btrfs_insert_inode_ref(trans, root, old_dentry->d_name.name, old_dentry->d_name.len, @@ -9793,29 +9797,6 @@ static int btrfs_rename_exchange(struct inode *old_dir, BTRFS_I(new_inode), 1); } - /* - * Now pin the logs of the roots. We do it to ensure that no other task - * can sync the logs while we are in progress with the rename, because - * that could result in an inconsistency in case any of the inodes that - * are part of this rename operation were logged before. - * - * We pin the logs even if at this precise moment none of the inodes was - * logged before. This is because right after we checked for that, some - * other task fsyncing some other inode not involved with this rename - * operation could log that one of our inodes exists. - * - * We don't need to pin the logs before the above calls to - * btrfs_insert_inode_ref(), since those don't ever need to change a log. - */ - if (old_ino != BTRFS_FIRST_FREE_OBJECTID) { - btrfs_pin_log_trans(root); - root_log_pinned = true; - } - if (new_ino != BTRFS_FIRST_FREE_OBJECTID) { - btrfs_pin_log_trans(dest); - dest_log_pinned = true; - } - /* src is a subvolume */ if (old_ino == BTRFS_FIRST_FREE_OBJECTID) { ret = btrfs_unlink_subvol(trans, old_dir, old_dentry); @@ -10065,6 +10046,8 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, /* force full log commit if subvolume involved. */ btrfs_set_log_full_commit(trans); } else { + btrfs_pin_log_trans(root); + log_pinned = true; ret = btrfs_insert_inode_ref(trans, dest, new_dentry->d_name.name, new_dentry->d_name.len, @@ -10088,25 +10071,6 @@ static int btrfs_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlikely(old_ino == BTRFS_FIRST_FREE_OBJECTID)) { ret = btrfs_unlink_subvol(trans, old_dir, old_dentry); } else { - /* - * Now pin the log. We do it to ensure that no other task can - * sync the log while we are in progress with the rename, as - * that could result in an inconsistency in case any of the - * inodes that are part of this rename operation were logged - * before. - * - * We pin the log even if at this precise moment none of the - * inodes was logged before. This is because right after we - * checked for that, some other task fsyncing some other inode - * not involved with this rename operation could log that one of - * our inodes exists. - * - * We don't need to pin the logs before the above call to - * btrfs_insert_inode_ref(), since that does not need to change - * a log. - */ - btrfs_pin_log_trans(root); - log_pinned = true; ret = __btrfs_unlink_inode(trans, root, BTRFS_I(old_dir), BTRFS_I(d_inode(old_dentry)), old_dentry->d_name.name,
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 64b443a..675112a 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c
@@ -2824,8 +2824,6 @@ static int btrfs_ioctl_get_subvol_info(struct file *file, void __user *argp) } } - btrfs_free_path(path); - path = NULL; if (copy_to_user(argp, subvol_info, sizeof(*subvol_info))) ret = -EFAULT; @@ -2916,8 +2914,6 @@ static int btrfs_ioctl_get_subvol_rootref(struct file *file, void __user *argp) } out: - btrfs_free_path(path); - if (!ret || ret == -EOVERFLOW) { rootrefs->num_items = found; /* update min_treeid for next search */ @@ -2929,6 +2925,7 @@ static int btrfs_ioctl_get_subvol_rootref(struct file *file, void __user *argp) } kfree(rootrefs); + btrfs_free_path(path); return ret; } @@ -3299,10 +3296,13 @@ static long btrfs_ioctl_dev_info(struct btrfs_fs_info *fs_info, di_args->bytes_used = btrfs_device_get_bytes_used(dev); di_args->total_bytes = btrfs_device_get_total_bytes(dev); memcpy(di_args->uuid, dev->uuid, sizeof(di_args->uuid)); - if (dev->name) - strscpy(di_args->path, rcu_str_deref(dev->name), sizeof(di_args->path)); - else + if (dev->name) { + strncpy(di_args->path, rcu_str_deref(dev->name), + sizeof(di_args->path) - 1); + di_args->path[sizeof(di_args->path) - 1] = 0; + } else { di_args->path[0] = '\0'; + } out: rcu_read_unlock(); @@ -4515,8 +4515,6 @@ static long btrfs_ioctl_ino_to_path(struct btrfs_root *root, void __user *arg) ipath->fspath->val[i] = rel_ptr; } - btrfs_free_path(path); - path = NULL; ret = copy_to_user((void __user *)(unsigned long)ipa->fspath, ipath->fspath, size); if (ret) { @@ -4587,20 +4585,21 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, size = min_t(u32, loi->size, SZ_16M); } - inodes = init_data_container(size); - if (IS_ERR(inodes)) { - ret = PTR_ERR(inodes); - goto out_loi; - } - path = btrfs_alloc_path(); if (!path) { ret = -ENOMEM; goto out; } + + inodes = init_data_container(size); + if (IS_ERR(inodes)) { + ret = PTR_ERR(inodes); + inodes = NULL; + goto out; + } + ret = iterate_inodes_from_logical(loi->logical, fs_info, path, build_ino_list, inodes, ignore_offset); - btrfs_free_path(path); if (ret == -EINVAL) ret = -ENOENT; if (ret < 0) @@ -4612,6 +4611,7 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_fs_info *fs_info, ret = -EFAULT; out: + btrfs_free_path(path); kvfree(inodes); out_loi: kfree(loi);
diff --git a/fs/btrfs/qgroup.c b/fs/btrfs/qgroup.c index 353e89e..5a3006c 100644 --- a/fs/btrfs/qgroup.c +++ b/fs/btrfs/qgroup.c
@@ -1075,21 +1075,6 @@ int btrfs_quota_enable(struct btrfs_fs_info *fs_info) fs_info->qgroup_rescan_running = true; btrfs_queue_work(fs_info->qgroup_rescan_workers, &fs_info->qgroup_rescan_work); - } else { - /* - * We have set both BTRFS_FS_QUOTA_ENABLED and - * BTRFS_QGROUP_STATUS_FLAG_ON, so we can only fail with - * -EINPROGRESS. That can happen because someone started the - * rescan worker by calling quota rescan ioctl before we - * attempted to initialize the rescan worker. Failure due to - * quotas disabled in the meanwhile is not possible, because - * we are holding a write lock on fs_info->subvol_sem, which - * is also acquired when disabling quotas. - * Ignore such error, and any other error would need to undo - * everything we did in the transaction we just committed. - */ - ASSERT(ret == -EINPROGRESS); - ret = 0; } out_free_path: @@ -2824,7 +2809,14 @@ int btrfs_qgroup_inherit(struct btrfs_trans_handle *trans, u64 srcid, dstgroup->rsv_rfer = inherit->lim.rsv_rfer; dstgroup->rsv_excl = inherit->lim.rsv_excl; - qgroup_dirty(fs_info, dstgroup); + ret = update_qgroup_limit_item(trans, dstgroup); + if (ret) { + fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; + btrfs_info(fs_info, + "unable to update quota limit for %llu", + dstgroup->qgroupid); + goto unlock; + } } if (srcid) { @@ -3196,8 +3188,7 @@ static int qgroup_rescan_leaf(struct btrfs_trans_handle *trans, static bool rescan_should_stop(struct btrfs_fs_info *fs_info) { return btrfs_fs_closing(fs_info) || - test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state) || - !test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags); + test_bit(BTRFS_FS_STATE_REMOUNTING, &fs_info->fs_state); } static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) @@ -3209,7 +3200,6 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) int err = -ENOMEM; int ret = 0; bool stopped = false; - bool did_leaf_rescans = false; path = btrfs_alloc_path(); if (!path) @@ -3228,10 +3218,11 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) err = PTR_ERR(trans); break; } - - err = qgroup_rescan_leaf(trans, path); - did_leaf_rescans = true; - + if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) { + err = -EINTR; + } else { + err = qgroup_rescan_leaf(trans, path); + } if (err > 0) btrfs_commit_transaction(trans); else @@ -3245,29 +3236,22 @@ static void btrfs_qgroup_rescan_worker(struct btrfs_work *work) if (err > 0 && fs_info->qgroup_flags & BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT) { fs_info->qgroup_flags &= ~BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; - } else if (err < 0 || stopped) { + } else if (err < 0) { fs_info->qgroup_flags |= BTRFS_QGROUP_STATUS_FLAG_INCONSISTENT; } mutex_unlock(&fs_info->qgroup_rescan_lock); /* - * Only update status, since the previous part has already updated the - * qgroup info, and only if we did any actual work. This also prevents - * race with a concurrent quota disable, which has already set - * fs_info->quota_root to NULL and cleared BTRFS_FS_QUOTA_ENABLED at - * btrfs_quota_disable(). + * only update status, since the previous part has already updated the + * qgroup info. */ - if (did_leaf_rescans) { - trans = btrfs_start_transaction(fs_info->quota_root, 1); - if (IS_ERR(trans)) { - err = PTR_ERR(trans); - trans = NULL; - btrfs_err(fs_info, - "fail to start transaction for status update: %d", - err); - } - } else { + trans = btrfs_start_transaction(fs_info->quota_root, 1); + if (IS_ERR(trans)) { + err = PTR_ERR(trans); trans = NULL; + btrfs_err(fs_info, + "fail to start transaction for status update: %d", + err); } mutex_lock(&fs_info->qgroup_rescan_lock);
diff --git a/fs/btrfs/raid56.c b/fs/btrfs/raid56.c index 226a17a..7ac679e 100644 --- a/fs/btrfs/raid56.c +++ b/fs/btrfs/raid56.c
@@ -334,9 +334,6 @@ static void merge_rbio(struct btrfs_raid_bio *dest, { bio_list_merge(&dest->bio_list, &victim->bio_list); dest->bio_list_bytes += victim->bio_list_bytes; - /* Also inherit the bitmaps from @victim. */ - bitmap_or(dest->dbitmap, victim->dbitmap, dest->dbitmap, - dest->stripe_npages); dest->generic_bio_cnt += victim->generic_bio_cnt; bio_list_init(&victim->bio_list); } @@ -881,12 +878,6 @@ static void rbio_orig_end_io(struct btrfs_raid_bio *rbio, blk_status_t err) if (rbio->generic_bio_cnt) btrfs_bio_counter_sub(rbio->fs_info, rbio->generic_bio_cnt); - /* - * Clear the data bitmap, as the rbio may be cached for later usage. - * do this before before unlock_stripe() so there will be no new bio - * for this bio. - */ - bitmap_clear(rbio->dbitmap, 0, rbio->stripe_npages); /* * At this moment, rbio->bio_list is empty, however since rbio does not @@ -1221,9 +1212,6 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) else BUG(); - /* We should have at least one data sector. */ - ASSERT(bitmap_weight(rbio->dbitmap, rbio->stripe_npages)); - /* at this point we either have a full stripe, * or we've read the full stripe from the drive. * recalculate the parity and write the new results. @@ -1297,11 +1285,6 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) for (stripe = 0; stripe < rbio->real_stripes; stripe++) { for (pagenr = 0; pagenr < rbio->stripe_npages; pagenr++) { struct page *page; - - /* This vertical stripe has no data, skip it. */ - if (!test_bit(pagenr, rbio->dbitmap)) - continue; - if (stripe < rbio->nr_data) { page = page_in_rbio(rbio, stripe, pagenr, 1); if (!page) @@ -1326,11 +1309,6 @@ static noinline void finish_rmw(struct btrfs_raid_bio *rbio) for (pagenr = 0; pagenr < rbio->stripe_npages; pagenr++) { struct page *page; - - /* This vertical stripe has no data, skip it. */ - if (!test_bit(pagenr, rbio->dbitmap)) - continue; - if (stripe < rbio->nr_data) { page = page_in_rbio(rbio, stripe, pagenr, 1); if (!page) @@ -1770,33 +1748,6 @@ static void btrfs_raid_unplug(struct blk_plug_cb *cb, bool from_schedule) run_plug(plug); } -/* Add the original bio into rbio->bio_list, and update rbio::dbitmap. */ -static void rbio_add_bio(struct btrfs_raid_bio *rbio, struct bio *orig_bio) -{ - const struct btrfs_fs_info *fs_info = rbio->fs_info; - const u64 orig_logical = orig_bio->bi_iter.bi_sector << SECTOR_SHIFT; - const u64 full_stripe_start = rbio->bbio->raid_map[0]; - const u32 orig_len = orig_bio->bi_iter.bi_size; - const u32 sectorsize = fs_info->sectorsize; - u64 cur_logical; - - ASSERT(orig_logical >= full_stripe_start && - orig_logical + orig_len <= full_stripe_start + - rbio->nr_data * rbio->stripe_len); - - bio_list_add(&rbio->bio_list, orig_bio); - rbio->bio_list_bytes += orig_bio->bi_iter.bi_size; - - /* Update the dbitmap. */ - for (cur_logical = orig_logical; cur_logical < orig_logical + orig_len; - cur_logical += sectorsize) { - int bit = ((u32)(cur_logical - full_stripe_start) >> - PAGE_SHIFT) % rbio->stripe_npages; - - set_bit(bit, rbio->dbitmap); - } -} - /* * our main entry point for writes from the rest of the FS. */ @@ -1813,8 +1764,9 @@ int raid56_parity_write(struct btrfs_fs_info *fs_info, struct bio *bio, btrfs_put_bbio(bbio); return PTR_ERR(rbio); } + bio_list_add(&rbio->bio_list, bio); + rbio->bio_list_bytes = bio->bi_iter.bi_size; rbio->operation = BTRFS_RBIO_WRITE; - rbio_add_bio(rbio, bio); btrfs_bio_counter_inc_noblocked(fs_info); rbio->generic_bio_cnt = 1; @@ -2116,12 +2068,9 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio) atomic_set(&rbio->error, 0); /* - * Read everything that hasn't failed. However this time we will - * not trust any cached sector. - * As we may read out some stale data but higher layer is not reading - * that stale part. - * - * So here we always re-read everything in recovery path. + * read everything that hasn't failed. Thanks to the + * stripe cache, it is possible that some or all of these + * pages are going to be uptodate. */ for (stripe = 0; stripe < rbio->real_stripes; stripe++) { if (rbio->faila == stripe || rbio->failb == stripe) { @@ -2130,6 +2079,16 @@ static int __raid56_parity_recover(struct btrfs_raid_bio *rbio) } for (pagenr = 0; pagenr < rbio->stripe_npages; pagenr++) { + struct page *p; + + /* + * the rmw code may have already read this + * page in + */ + p = rbio_stripe_page(rbio, stripe, pagenr); + if (PageUptodate(p)) + continue; + ret = rbio_add_io_page(rbio, &bio_list, rbio_stripe_page(rbio, stripe, pagenr), stripe, pagenr, rbio->stripe_len); @@ -2211,7 +2170,8 @@ int raid56_parity_recover(struct btrfs_fs_info *fs_info, struct bio *bio, } rbio->operation = BTRFS_RBIO_READ_REBUILD; - rbio_add_bio(rbio, bio); + bio_list_add(&rbio->bio_list, bio); + rbio->bio_list_bytes = bio->bi_iter.bi_size; rbio->faila = find_logical_bio_stripe(rbio, bio); if (rbio->faila == -1) {
diff --git a/fs/btrfs/rcu-string.h b/fs/btrfs/rcu-string.h index 02f1532..a97dc74 100644 --- a/fs/btrfs/rcu-string.h +++ b/fs/btrfs/rcu-string.h
@@ -18,11 +18,7 @@ static inline struct rcu_string *rcu_string_strdup(const char *src, gfp_t mask) (len * sizeof(char)), mask); if (!ret) return ret; - /* Warn if the source got unexpectedly truncated. */ - if (WARN_ON(strscpy(ret->str, src, len) < 0)) { - kfree(ret); - return NULL; - } + strncpy(ret->str, src, len); return ret; }
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 2f7fa6c..ba68b0b 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c
@@ -4102,12 +4102,8 @@ int prepare_to_relocate(struct reloc_control *rc) */ return PTR_ERR(trans); } - - ret = btrfs_commit_transaction(trans); - if (ret) - unset_reloc_control(rc); - - return ret; + btrfs_commit_transaction(trans); + return 0; } static noinline_for_stack int relocate_block_group(struct reloc_control *rc)
diff --git a/fs/btrfs/root-tree.c b/fs/btrfs/root-tree.c index ba4e198..0d07ebe 100644 --- a/fs/btrfs/root-tree.c +++ b/fs/btrfs/root-tree.c
@@ -371,10 +371,9 @@ int btrfs_del_root_ref(struct btrfs_trans_handle *trans, u64 root_id, key.offset = ref_id; again: ret = btrfs_search_slot(trans, tree_root, &key, path, -1, 1); - if (ret < 0) { - err = ret; + if (ret < 0) goto out; - } else if (ret == 0) { + if (ret == 0) { leaf = path->nodes[0]; ref = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_root_ref);
diff --git a/fs/btrfs/scrub.c b/fs/btrfs/scrub.c index 45809f7..e5db948 100644 --- a/fs/btrfs/scrub.c +++ b/fs/btrfs/scrub.c
@@ -3849,7 +3849,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, int ret; struct btrfs_device *dev; unsigned int nofs_flag; - bool need_commit = false; if (btrfs_fs_closing(fs_info)) return -EAGAIN; @@ -3962,12 +3961,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, */ nofs_flag = memalloc_nofs_save(); if (!is_dev_replace) { - u64 old_super_errors; - - spin_lock(&sctx->stat_lock); - old_super_errors = sctx->stat.super_errors; - spin_unlock(&sctx->stat_lock); - btrfs_info(fs_info, "scrub: started on devid %llu", devid); /* * by holding device list mutex, we can @@ -3976,16 +3969,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, mutex_lock(&fs_info->fs_devices->device_list_mutex); ret = scrub_supers(sctx, dev); mutex_unlock(&fs_info->fs_devices->device_list_mutex); - - spin_lock(&sctx->stat_lock); - /* - * Super block errors found, but we can not commit transaction - * at current context, since btrfs_commit_transaction() needs - * to pause the current running scrub (hold by ourselves). - */ - if (sctx->stat.super_errors > old_super_errors && !sctx->readonly) - need_commit = true; - spin_unlock(&sctx->stat_lock); } if (!ret) @@ -4012,25 +3995,6 @@ int btrfs_scrub_dev(struct btrfs_fs_info *fs_info, u64 devid, u64 start, scrub_workers_put(fs_info); scrub_put_ctx(sctx); - /* - * We found some super block errors before, now try to force a - * transaction commit, as scrub has finished. - */ - if (need_commit) { - struct btrfs_trans_handle *trans; - - trans = btrfs_start_transaction(fs_info->tree_root, 0); - if (IS_ERR(trans)) { - ret = PTR_ERR(trans); - btrfs_err(fs_info, - "scrub: failed to start transaction to fix super block errors: %d", ret); - return ret; - } - ret = btrfs_commit_transaction(trans); - if (ret < 0) - btrfs_err(fs_info, - "scrub: failed to commit transaction to fix super block errors: %d", ret); - } return ret; out: scrub_workers_put(fs_info);
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c index 97417b5..e258fc4 100644 --- a/fs/btrfs/send.c +++ b/fs/btrfs/send.c
@@ -5405,7 +5405,6 @@ static int clone_range(struct send_ctx *sctx, u64 ext_len; u64 clone_len; u64 clone_data_offset; - bool crossed_src_i_size = false; if (slot >= btrfs_header_nritems(leaf)) { ret = btrfs_next_leaf(clone_root->root, path); @@ -5462,10 +5461,8 @@ static int clone_range(struct send_ctx *sctx, if (key.offset >= clone_src_i_size) break; - if (key.offset + ext_len > clone_src_i_size) { + if (key.offset + ext_len > clone_src_i_size) ext_len = clone_src_i_size - key.offset; - crossed_src_i_size = true; - } clone_data_offset = btrfs_file_extent_offset(leaf, ei); if (btrfs_file_extent_disk_bytenr(leaf, ei) == disk_byte) { @@ -5525,25 +5522,6 @@ static int clone_range(struct send_ctx *sctx, ret = send_clone(sctx, offset, clone_len, clone_root); } - } else if (crossed_src_i_size && clone_len < len) { - /* - * If we are at i_size of the clone source inode and we - * can not clone from it, terminate the loop. This is - * to avoid sending two write operations, one with a - * length matching clone_len and the final one after - * this loop with a length of len - clone_len. - * - * When using encoded writes (BTRFS_SEND_FLAG_COMPRESSED - * was passed to the send ioctl), this helps avoid - * sending an encoded write for an offset that is not - * sector size aligned, in case the i_size of the source - * inode is not sector size aligned. That will make the - * receiver fallback to decompression of the data and - * writing it using regular buffered IO, therefore while - * not incorrect, it's not optimal due decompression and - * possible re-compression at the receiver. - */ - break; } else { ret = send_extent_data(sctx, offset, clone_len); } @@ -7347,10 +7325,10 @@ long btrfs_ioctl_send(struct file *mnt_file, struct btrfs_ioctl_send_args *arg) /* * Check that we don't overflow at later allocations, we request * clone_sources_count + 1 items, and compare to unsigned long inside - * access_ok. Also set an upper limit for allocation size so this can't - * easily exhaust memory. Max number of clone sources is about 200K. + * access_ok. */ - if (arg->clone_sources_count > SZ_8M / sizeof(struct clone_root)) { + if (arg->clone_sources_count > + ULONG_MAX / sizeof(struct clone_root) - 1) { ret = -EINVAL; goto out; }
diff --git a/fs/btrfs/super.c b/fs/btrfs/super.c index 8d21019..1a69bdb 100644 --- a/fs/btrfs/super.c +++ b/fs/btrfs/super.c
@@ -1567,6 +1567,8 @@ static struct dentry *btrfs_mount_root(struct file_system_type *fs_type, } else { snprintf(s->s_id, sizeof(s->s_id), "%pg", bdev); btrfs_sb(s)->bdev_holder = fs_type; + if (!strstr(crc32c_impl(), "generic")) + set_bit(BTRFS_FS_CSUM_IMPL_FAST, &fs_info->flags); error = btrfs_fill_super(s, fs_devices, data); } if (!error)
diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c index 356f227..5c299e1 100644 --- a/fs/btrfs/sysfs.c +++ b/fs/btrfs/sysfs.c
@@ -1154,11 +1154,8 @@ int __init btrfs_init_sysfs(void) #ifdef CONFIG_BTRFS_DEBUG ret = sysfs_create_group(&btrfs_kset->kobj, &btrfs_debug_feature_attr_group); - if (ret) { - sysfs_unmerge_group(&btrfs_kset->kobj, - &btrfs_static_feature_attr_group); - goto out_remove_group; - } + if (ret) + goto out2; #endif return 0;
diff --git a/fs/btrfs/tests/btrfs-tests.c b/fs/btrfs/tests/btrfs-tests.c index 8e413c8..98f9684 100644 --- a/fs/btrfs/tests/btrfs-tests.c +++ b/fs/btrfs/tests/btrfs-tests.c
@@ -189,7 +189,7 @@ void btrfs_free_dummy_fs_info(struct btrfs_fs_info *fs_info) void btrfs_free_dummy_root(struct btrfs_root *root) { - if (IS_ERR_OR_NULL(root)) + if (!root) return; /* Will be freed by btrfs_free_fs_roots */ if (WARN_ON(test_bit(BTRFS_ROOT_IN_RADIX, &root->state)))
diff --git a/fs/btrfs/tests/qgroup-tests.c b/fs/btrfs/tests/qgroup-tests.c index f6169be..ac035a6 100644 --- a/fs/btrfs/tests/qgroup-tests.c +++ b/fs/btrfs/tests/qgroup-tests.c
@@ -230,21 +230,21 @@ static int test_no_shared_qgroup(struct btrfs_root *root, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false); if (ret) { + ulist_free(old_roots); test_err("couldn't find old roots: %d", ret); return ret; } ret = insert_normal_tree_ref(root, nodesize, nodesize, 0, BTRFS_FS_TREE_OBJECTID); - if (ret) { - ulist_free(old_roots); + if (ret) return ret; - } ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); if (ret) { ulist_free(old_roots); + ulist_free(new_roots); test_err("couldn't find old roots: %d", ret); return ret; } @@ -256,33 +256,31 @@ static int test_no_shared_qgroup(struct btrfs_root *root, return ret; } - /* btrfs_qgroup_account_extent() always frees the ulists passed to it. */ - old_roots = NULL; - new_roots = NULL; - if (btrfs_verify_qgroup_counts(fs_info, BTRFS_FS_TREE_OBJECTID, nodesize, nodesize)) { test_err("qgroup counts didn't match expected values"); return -EINVAL; } + old_roots = NULL; + new_roots = NULL; ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false); if (ret) { + ulist_free(old_roots); test_err("couldn't find old roots: %d", ret); return ret; } ret = remove_extent_item(root, nodesize, nodesize); - if (ret) { - ulist_free(old_roots); + if (ret) return -EINVAL; - } ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); if (ret) { ulist_free(old_roots); + ulist_free(new_roots); test_err("couldn't find old roots: %d", ret); return ret; } @@ -333,21 +331,21 @@ static int test_multiple_refs(struct btrfs_root *root, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false); if (ret) { + ulist_free(old_roots); test_err("couldn't find old roots: %d", ret); return ret; } ret = insert_normal_tree_ref(root, nodesize, nodesize, 0, BTRFS_FS_TREE_OBJECTID); - if (ret) { - ulist_free(old_roots); + if (ret) return ret; - } ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); if (ret) { ulist_free(old_roots); + ulist_free(new_roots); test_err("couldn't find old roots: %d", ret); return ret; } @@ -368,21 +366,21 @@ static int test_multiple_refs(struct btrfs_root *root, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false); if (ret) { + ulist_free(old_roots); test_err("couldn't find old roots: %d", ret); return ret; } ret = add_tree_ref(root, nodesize, nodesize, 0, BTRFS_FIRST_FREE_OBJECTID); - if (ret) { - ulist_free(old_roots); + if (ret) return ret; - } ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); if (ret) { ulist_free(old_roots); + ulist_free(new_roots); test_err("couldn't find old roots: %d", ret); return ret; } @@ -409,21 +407,21 @@ static int test_multiple_refs(struct btrfs_root *root, ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &old_roots, false); if (ret) { + ulist_free(old_roots); test_err("couldn't find old roots: %d", ret); return ret; } ret = remove_extent_ref(root, nodesize, nodesize, 0, BTRFS_FIRST_FREE_OBJECTID); - if (ret) { - ulist_free(old_roots); + if (ret) return ret; - } ret = btrfs_find_all_roots(&trans, fs_info, nodesize, 0, &new_roots, false); if (ret) { ulist_free(old_roots); + ulist_free(new_roots); test_err("couldn't find old roots: %d", ret); return ret; }
diff --git a/fs/btrfs/tree-checker.c b/fs/btrfs/tree-checker.c index d15de5a..368c43c 100644 --- a/fs/btrfs/tree-checker.c +++ b/fs/btrfs/tree-checker.c
@@ -1019,8 +1019,7 @@ static void extent_err(const struct extent_buffer *eb, int slot, } static int check_extent_item(struct extent_buffer *leaf, - struct btrfs_key *key, int slot, - struct btrfs_key *prev_key) + struct btrfs_key *key, int slot) { struct btrfs_fs_info *fs_info = leaf->fs_info; struct btrfs_extent_item *ei; @@ -1231,26 +1230,6 @@ static int check_extent_item(struct extent_buffer *leaf, total_refs, inline_refs); return -EUCLEAN; } - - if ((prev_key->type == BTRFS_EXTENT_ITEM_KEY) || - (prev_key->type == BTRFS_METADATA_ITEM_KEY)) { - u64 prev_end = prev_key->objectid; - - if (prev_key->type == BTRFS_METADATA_ITEM_KEY) - prev_end += fs_info->nodesize; - else - prev_end += prev_key->offset; - - if (unlikely(prev_end > key->objectid)) { - extent_err(leaf, slot, - "previous extent [%llu %u %llu] overlaps current extent [%llu %u %llu]", - prev_key->objectid, prev_key->type, - prev_key->offset, key->objectid, key->type, - key->offset); - return -EUCLEAN; - } - } - return 0; } @@ -1364,7 +1343,7 @@ static int check_leaf_item(struct extent_buffer *leaf, break; case BTRFS_EXTENT_ITEM_KEY: case BTRFS_METADATA_ITEM_KEY: - ret = check_extent_item(leaf, key, slot, prev_key); + ret = check_extent_item(leaf, key, slot); break; case BTRFS_TREE_BLOCK_REF_KEY: case BTRFS_SHARED_DATA_REF_KEY:
diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c index 926b1d3..b7bfecf 100644 --- a/fs/btrfs/tree-log.c +++ b/fs/btrfs/tree-log.c
@@ -918,7 +918,8 @@ static noinline int inode_in_dir(struct btrfs_root *root, di = btrfs_lookup_dir_index_item(NULL, root, path, dirid, index, name, name_len, 0); if (IS_ERR(di)) { - ret = PTR_ERR(di); + if (PTR_ERR(di) != -ENOENT) + ret = PTR_ERR(di); goto out; } else if (di) { btrfs_dir_item_key_to_cpu(path->nodes[0], di, &location); @@ -1099,9 +1100,7 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, extref = btrfs_lookup_inode_extref(NULL, root, path, name, namelen, inode_objectid, parent_objectid, 0, 0); - if (IS_ERR(extref)) { - return PTR_ERR(extref); - } else if (extref) { + if (!IS_ERR_OR_NULL(extref)) { u32 item_size; u32 cur_offset = 0; unsigned long base; @@ -1170,7 +1169,8 @@ static inline int __add_inode_ref(struct btrfs_trans_handle *trans, di = btrfs_lookup_dir_index_item(trans, root, path, btrfs_ino(dir), ref_index, name, namelen, 0); if (IS_ERR(di)) { - return PTR_ERR(di); + if (PTR_ERR(di) != -ENOENT) + return PTR_ERR(di); } else if (di) { ret = drop_one_dir_item(trans, root, path, dir, di); if (ret) @@ -2020,6 +2020,9 @@ static noinline int replay_one_name(struct btrfs_trans_handle *trans, goto out; } + if (dst_di == ERR_PTR(-ENOENT)) + dst_di = NULL; + if (IS_ERR(dst_di)) { ret = PTR_ERR(dst_di); goto out; @@ -2304,7 +2307,7 @@ static noinline int check_item_in_log(struct btrfs_trans_handle *trans, dir_key->offset, name, name_len, 0); } - if (!log_di) { + if (!log_di || log_di == ERR_PTR(-ENOENT)) { btrfs_dir_item_key_to_cpu(eb, di, &location); btrfs_release_path(path); btrfs_release_path(log_path); @@ -3517,7 +3520,8 @@ int btrfs_del_dir_entries_in_log(struct btrfs_trans_handle *trans, if (err == -ENOSPC) { btrfs_set_log_full_commit(trans); err = 0; - } else if (err < 0) { + } else if (err < 0 && err != -ENOENT) { + /* ENOENT can be returned if the entry hasn't been fsynced yet */ btrfs_abort_transaction(trans, err); }
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c5944c6..c7706a7 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c
@@ -354,7 +354,6 @@ void btrfs_free_device(struct btrfs_device *device) static void free_fs_devices(struct btrfs_fs_devices *fs_devices) { struct btrfs_device *device; - WARN_ON(fs_devices->opened); while (!list_empty(&fs_devices->devices)) { device = list_entry(fs_devices->devices.next, @@ -714,47 +713,15 @@ static void pending_bios_fn(struct btrfs_work *work) run_scheduled_bios(device); } -/* - * Check if the device in the path matches the device in the given struct device. - * - * Returns: - * true If it is the same device. - * false If it is not the same device or on error. - */ -static bool device_matched(const struct btrfs_device *device, const char *path) +static bool device_path_matched(const char *path, struct btrfs_device *device) { - char *device_name; - struct block_device *bdev_old; - struct block_device *bdev_new; - - /* - * If we are looking for a device with the matching dev_t, then skip - * device without a name (a missing device). - */ - if (!device->name) - return false; - - device_name = kzalloc(BTRFS_PATH_NAME_MAX, GFP_KERNEL); - if (!device_name) - return false; + int found; rcu_read_lock(); - scnprintf(device_name, BTRFS_PATH_NAME_MAX, "%s", rcu_str_deref(device->name)); + found = strcmp(rcu_str_deref(device->name), path); rcu_read_unlock(); - bdev_old = lookup_bdev(device_name); - kfree(device_name); - if (IS_ERR(bdev_old)) - return false; - - bdev_new = lookup_bdev(path); - if (IS_ERR(bdev_new)) - return false; - - if (bdev_old == bdev_new) - return true; - - return false; + return found == 0; } /* @@ -787,7 +754,9 @@ static int btrfs_free_stale_devices(const char *path, &fs_devices->devices, dev_list) { if (skip_device && skip_device == device) continue; - if (path && !device_matched(device, path)) + if (path && !device->name) + continue; + if (path && !device_path_matched(path, device)) continue; if (fs_devices->opened) { /* for an already deleted device return 0 */ @@ -1402,17 +1371,6 @@ int btrfs_close_devices(struct btrfs_fs_devices *fs_devices) if (!fs_devices->opened) { seed_devices = fs_devices->seed; fs_devices->seed = NULL; - - /* - * If the struct btrfs_fs_devices is not assembled with any - * other device, it can be re-initialized during the next mount - * without the needing device-scan step. Therefore, it can be - * fully freed. - */ - if (fs_devices->num_devices == 1) { - list_del(&fs_devices->fs_list); - free_fs_devices(fs_devices); - } } mutex_unlock(&uuid_mutex); @@ -1579,17 +1537,8 @@ struct btrfs_device *btrfs_scan_one_device(const char *path, fmode_t flags, * later supers, using BTRFS_SUPER_MIRROR_MAX instead */ bytenr = btrfs_sb_offset(0); + flags |= FMODE_EXCL; - /* - * Avoid using flag |= FMODE_EXCL here, as the systemd-udev may - * initiate the device scan which may race with the user's mount - * or mkfs command, resulting in failure. - * Since the device scan is solely for reading purposes, there is - * no need for FMODE_EXCL. Additionally, the devices are read again - * during the mount process. It is ok to get some inconsistent - * values temporarily, as the device paths of the fsid are the only - * required information for assembling the volume. - */ bdev = blkdev_get_by_path(path, flags, holder); if (IS_ERR(bdev)) return ERR_CAST(bdev); @@ -1722,7 +1671,7 @@ static int find_free_dev_extent_start(struct btrfs_device *device, goto out; } - while (search_start < search_end) { + while (1) { l = path->nodes[0]; slot = path->slots[0]; if (slot >= btrfs_header_nritems(l)) { @@ -1745,9 +1694,6 @@ static int find_free_dev_extent_start(struct btrfs_device *device, if (key.type != BTRFS_DEV_EXTENT_KEY) goto next; - if (key.offset > search_end) - break; - if (key.offset > search_start) { hole_size = key.offset - search_start; @@ -1818,7 +1764,6 @@ static int find_free_dev_extent_start(struct btrfs_device *device, else ret = 0; - ASSERT(max_hole_start + max_hole_size <= search_end); out: btrfs_free_path(path); *start = max_hole_start;
diff --git a/fs/btrfs/xattr.c b/fs/btrfs/xattr.c index 5d56a2f..c359e38 100644 --- a/fs/btrfs/xattr.c +++ b/fs/btrfs/xattr.c
@@ -388,9 +388,6 @@ static int btrfs_xattr_handler_set(const struct xattr_handler *handler, const char *name, const void *buffer, size_t size, int flags) { - if (btrfs_root_readonly(BTRFS_I(inode)->root)) - return -EROFS; - name = xattr_full_name(handler, name); return btrfs_setxattr_trans(inode, name, buffer, size, flags); }
diff --git a/fs/btrfs/zlib.c b/fs/btrfs/zlib.c index 9385d0b..df1aace 100644 --- a/fs/btrfs/zlib.c +++ b/fs/btrfs/zlib.c
@@ -74,7 +74,7 @@ static struct list_head *zlib_alloc_workspace(unsigned int level) workspacesize = max(zlib_deflate_workspacesize(MAX_WBITS, MAX_MEM_LEVEL), zlib_inflate_workspacesize()); - workspace->strm.workspace = kvzalloc(workspacesize, GFP_KERNEL); + workspace->strm.workspace = kvmalloc(workspacesize, GFP_KERNEL); workspace->level = level; workspace->buf = kmalloc(PAGE_SIZE, GFP_KERNEL); if (!workspace->strm.workspace || !workspace->buf)
diff --git a/fs/buffer.c b/fs/buffer.c index 559003a..eefc907 100644 --- a/fs/buffer.c +++ b/fs/buffer.c
@@ -2319,7 +2319,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size) { struct address_space *mapping = inode->i_mapping; struct page *page; - void *fsdata = NULL; + void *fsdata; int err; err = inode_newsize_ok(inode, size); @@ -2345,7 +2345,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, struct inode *inode = mapping->host; unsigned int blocksize = i_blocksize(inode); struct page *page; - void *fsdata = NULL; + void *fsdata; pgoff_t index, curidx; loff_t curpos; unsigned zerofrom, offset, len;
diff --git a/fs/ceph/file.c b/fs/ceph/file.c index 83122fc..aa1eac6 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c
@@ -452,12 +452,6 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, if (dentry->d_name.len > NAME_MAX) return -ENAMETOOLONG; - /* - * Do not truncate the file, since atomic_open is called before the - * permission check. The caller will do the truncation afterward. - */ - flags &= ~O_TRUNC; - if (flags & O_CREAT) { if (ceph_quota_is_max_files_exceeded(dir)) return -EDQUOT; @@ -496,7 +490,9 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, req->r_parent = dir; set_bit(CEPH_MDS_R_PARENT_LOCKED, &req->r_req_flags); - err = ceph_mdsc_do_request(mdsc, (flags & O_CREAT) ? dir : NULL, req); + err = ceph_mdsc_do_request(mdsc, + (flags & (O_CREAT|O_TRUNC)) ? dir : NULL, + req); err = ceph_handle_snapdir(req, dentry, err); if (err) goto out_req;
diff --git a/fs/ceph/mds_client.c b/fs/ceph/mds_client.c index 3bf81fe..37fb717 100644 --- a/fs/ceph/mds_client.c +++ b/fs/ceph/mds_client.c
@@ -3151,12 +3151,6 @@ static void handle_session(struct ceph_mds_session *session, break; case CEPH_SESSION_FLUSHMSG: - /* flush cap releases */ - spin_lock(&session->s_cap_lock); - if (session->s_num_cap_releases) - ceph_flush_cap_releases(mdsc, session); - spin_unlock(&session->s_cap_lock); - send_flushmsg_ack(mdsc, session, seq); break;
diff --git a/fs/ceph/snap.c b/fs/ceph/snap.c index 97ce1bd..e1b9b22 100644 --- a/fs/ceph/snap.c +++ b/fs/ceph/snap.c
@@ -694,10 +694,9 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, struct ceph_mds_snap_realm *ri; /* encoded */ __le64 *snaps; /* encoded */ __le64 *prior_parent_snaps; /* encoded */ - struct ceph_snap_realm *realm; + struct ceph_snap_realm *realm = NULL; struct ceph_snap_realm *first_realm = NULL; - struct ceph_snap_realm *realm_to_rebuild = NULL; - int rebuild_snapcs; + int invalidate = 0; int err = -ENOMEM; LIST_HEAD(dirty_realms); @@ -705,8 +704,6 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, dout("update_snap_trace deletion=%d\n", deletion); more: - realm = NULL; - rebuild_snapcs = 0; ceph_decode_need(&p, e, sizeof(*ri), bad); ri = p; p += sizeof(*ri); @@ -730,7 +727,7 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, err = adjust_snap_realm_parent(mdsc, realm, le64_to_cpu(ri->parent)); if (err < 0) goto fail; - rebuild_snapcs += err; + invalidate += err; if (le64_to_cpu(ri->seq) > realm->seq) { dout("update_snap_trace updating %llx %p %lld -> %lld\n", @@ -755,30 +752,22 @@ int ceph_update_snap_trace(struct ceph_mds_client *mdsc, if (realm->seq > mdsc->last_snap_seq) mdsc->last_snap_seq = realm->seq; - rebuild_snapcs = 1; + invalidate = 1; } else if (!realm->cached_context) { dout("update_snap_trace %llx %p seq %lld new\n", realm->ino, realm, realm->seq); - rebuild_snapcs = 1; + invalidate = 1; } else { dout("update_snap_trace %llx %p seq %lld unchanged\n", realm->ino, realm, realm->seq); } - dout("done with %llx %p, rebuild_snapcs=%d, %p %p\n", realm->ino, - realm, rebuild_snapcs, p, e); + dout("done with %llx %p, invalidated=%d, %p %p\n", realm->ino, + realm, invalidate, p, e); - /* - * this will always track the uppest parent realm from which - * we need to rebuild the snapshot contexts _downward_ in - * hierarchy. - */ - if (rebuild_snapcs) - realm_to_rebuild = realm; - - /* rebuild_snapcs when we reach the _end_ (root) of the trace */ - if (realm_to_rebuild && p >= e) - rebuild_snap_realms(realm_to_rebuild, &dirty_realms); + /* invalidate when we reach the _end_ (root) of the trace */ + if (invalidate && p >= e) + rebuild_snap_realms(realm, &dirty_realms); if (!first_realm) first_realm = realm;
diff --git a/fs/char_dev.c b/fs/char_dev.c index 36479b7..c5e6eff 100644 --- a/fs/char_dev.c +++ b/fs/char_dev.c
@@ -544,7 +544,7 @@ int cdev_device_add(struct cdev *cdev, struct device *dev) } rc = device_add(dev); - if (rc && dev->devt) + if (rc) cdev_del(cdev); return rc;
diff --git a/fs/cifs/cifsacl.c b/fs/cifs/cifsacl.c index 1766d6d..1f55072 100644 --- a/fs/cifs/cifsacl.c +++ b/fs/cifs/cifsacl.c
@@ -1056,7 +1056,7 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, struct cifs_ntsd *pntsd = NULL; int oplock = 0; unsigned int xid; - int rc; + int rc, create_options = 0; struct cifs_tcon *tcon; struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); struct cifs_fid fid; @@ -1068,10 +1068,13 @@ static struct cifs_ntsd *get_cifs_acl_by_path(struct cifs_sb_info *cifs_sb, tcon = tlink_tcon(tlink); xid = get_xid(); + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = READ_CONTROL; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = create_options; oparms.disposition = FILE_OPEN; oparms.path = path; oparms.fid = &fid; @@ -1116,7 +1119,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, { int oplock = 0; unsigned int xid; - int rc, access_flags; + int rc, access_flags, create_options = 0; struct cifs_tcon *tcon; struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); struct tcon_link *tlink = cifs_sb_tlink(cifs_sb); @@ -1129,6 +1132,9 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, tcon = tlink_tcon(tlink); xid = get_xid(); + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + if (aclflag == CIFS_ACL_OWNER || aclflag == CIFS_ACL_GROUP) access_flags = WRITE_OWNER; else @@ -1137,7 +1143,7 @@ int set_cifs_acl(struct cifs_ntsd *pnntsd, __u32 acllen, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = access_flags; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = create_options; oparms.disposition = FILE_OPEN; oparms.path = path; oparms.fid = &fid;
diff --git a/fs/cifs/cifsfs.c b/fs/cifs/cifsfs.c index 871a7b0..79a1869 100644 --- a/fs/cifs/cifsfs.c +++ b/fs/cifs/cifsfs.c
@@ -275,7 +275,7 @@ cifs_statfs(struct dentry *dentry, struct kstatfs *buf) buf->f_ffree = 0; /* unlimited */ if (server->ops->queryfs) - rc = server->ops->queryfs(xid, tcon, cifs_sb, buf); + rc = server->ops->queryfs(xid, tcon, buf); free_xid(xid); return rc; @@ -609,15 +609,9 @@ cifs_show_options(struct seq_file *s, struct dentry *root) seq_printf(s, ",echo_interval=%lu", tcon->ses->server->echo_interval / HZ); - /* Only display the following if overridden on mount */ + /* Only display max_credits if it was overridden on mount */ if (tcon->ses->server->max_credits != SMB2_MAX_CREDITS_AVAILABLE) seq_printf(s, ",max_credits=%u", tcon->ses->server->max_credits); - if (tcon->ses->server->tcp_nodelay) - seq_puts(s, ",tcpnodelay"); - if (tcon->ses->server->noautotune) - seq_puts(s, ",noautotune"); - if (tcon->ses->server->noblocksnd) - seq_puts(s, ",noblocksend"); if (tcon->snapshot_time) seq_printf(s, ",snapshot=%llu", tcon->snapshot_time);
diff --git a/fs/cifs/cifsfs.h b/fs/cifs/cifsfs.h index 7b155e1..bc4ca94 100644 --- a/fs/cifs/cifsfs.h +++ b/fs/cifs/cifsfs.h
@@ -125,10 +125,7 @@ extern const struct dentry_operations cifs_ci_dentry_ops; #ifdef CONFIG_CIFS_DFS_UPCALL extern struct vfsmount *cifs_dfs_d_automount(struct path *path); #else -static inline struct vfsmount *cifs_dfs_d_automount(struct path *path) -{ - return ERR_PTR(-EREMOTE); -} +#define cifs_dfs_d_automount NULL #endif /* Functions related to symlinks */
diff --git a/fs/cifs/cifsglob.h b/fs/cifs/cifsglob.h index 253321a..4149369 100644 --- a/fs/cifs/cifsglob.h +++ b/fs/cifs/cifsglob.h
@@ -22,8 +22,6 @@ #include <linux/in.h> #include <linux/in6.h> #include <linux/slab.h> -#include <linux/scatterlist.h> -#include <linux/mm.h> #include <linux/mempool.h> #include <linux/workqueue.h> #include "cifs_fs_sb.h" @@ -32,7 +30,6 @@ #include <linux/scatterlist.h> #include <uapi/linux/cifs/cifs_mount.h> #include "smb2pdu.h" -#include "smb2glob.h" #define CIFS_MAGIC_NUMBER 0xFF534D42 /* the first four bytes of SMB PDUs */ @@ -300,8 +297,7 @@ struct smb_version_operations { const char *, struct dfs_info3_param **, unsigned int *, const struct nls_table *, int); /* informational QFS call */ - void (*qfs_tcon)(const unsigned int, struct cifs_tcon *, - struct cifs_sb_info *); + void (*qfs_tcon)(const unsigned int, struct cifs_tcon *); /* check if a path is accessible or not */ int (*is_path_accessible)(const unsigned int, struct cifs_tcon *, struct cifs_sb_info *, const char *); @@ -409,7 +405,7 @@ struct smb_version_operations { struct cifsInodeInfo *); /* query remote filesystem */ int (*queryfs)(const unsigned int, struct cifs_tcon *, - struct cifs_sb_info *, struct kstatfs *); + struct kstatfs *); /* send mandatory brlock to the server */ int (*mand_lock)(const unsigned int, struct cifsFileInfo *, __u64, __u64, __u32, int, int, bool); @@ -490,7 +486,6 @@ struct smb_version_operations { /* ioctl passthrough for query_info */ int (*ioctl_query_info)(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, __le16 *path, int is_dir, unsigned long p); /* make unix special files (block, char, fifo, socket) */ @@ -1960,71 +1955,4 @@ extern struct smb_version_values smb302_values; #define ALT_SMB311_VERSION_STRING "3.11" extern struct smb_version_operations smb311_operations; extern struct smb_version_values smb311_values; - -static inline unsigned int cifs_get_num_sgs(const struct smb_rqst *rqst, - int num_rqst, - const u8 *sig) -{ - unsigned int len, skip; - unsigned int nents = 0; - unsigned long addr; - int i, j; - - /* Assumes the first rqst has a transform header as the first iov. - * I.e. - * rqst[0].rq_iov[0] is transform header - * rqst[0].rq_iov[1+] data to be encrypted/decrypted - * rqst[1+].rq_iov[0+] data to be encrypted/decrypted - */ - for (i = 0; i < num_rqst; i++) { - /* - * The first rqst has a transform header where the - * first 20 bytes are not part of the encrypted blob. - */ - for (j = 0; j < rqst[i].rq_nvec; j++) { - struct kvec *iov = &rqst[i].rq_iov[j]; - - skip = (i == 0) && (j == 0) ? 20 : 0; - addr = (unsigned long)iov->iov_base + skip; - if (unlikely(is_vmalloc_addr((void *)addr))) { - len = iov->iov_len - skip; - nents += DIV_ROUND_UP(offset_in_page(addr) + len, - PAGE_SIZE); - } else { - nents++; - } - } - nents += rqst[i].rq_npages; - } - nents += DIV_ROUND_UP(offset_in_page(sig) + SMB2_SIGNATURE_SIZE, PAGE_SIZE); - return nents; -} - -/* We can not use the normal sg_set_buf() as we will sometimes pass a - * stack object as buf. - */ -static inline struct scatterlist *cifs_sg_set_buf(struct scatterlist *sg, - const void *buf, - unsigned int buflen) -{ - unsigned long addr = (unsigned long)buf; - unsigned int off = offset_in_page(addr); - - addr &= PAGE_MASK; - if (unlikely(is_vmalloc_addr((void *)addr))) { - do { - unsigned int len = min_t(unsigned int, buflen, PAGE_SIZE - off); - - sg_set_page(sg++, vmalloc_to_page((void *)addr), len, off); - - off = 0; - addr += PAGE_SIZE; - buflen -= len; - } while (buflen); - } else { - sg_set_page(sg++, virt_to_page(addr), buflen, off); - } - return sg; -} - #endif /* _CIFS_GLOB_H */
diff --git a/fs/cifs/cifsproto.h b/fs/cifs/cifsproto.h index 2dde83a..f18da99 100644 --- a/fs/cifs/cifsproto.h +++ b/fs/cifs/cifsproto.h
@@ -583,8 +583,8 @@ int cifs_alloc_hash(const char *name, struct crypto_shash **shash, struct sdesc **sdesc); void cifs_free_hash(struct crypto_shash **shash, struct sdesc **sdesc); -void rqst_page_get_length(const struct smb_rqst *rqst, unsigned int page, - unsigned int *len, unsigned int *offset); +extern void rqst_page_get_length(struct smb_rqst *rqst, unsigned int page, + unsigned int *len, unsigned int *offset); void extract_unc_hostname(const char *unc, const char **h, size_t *len); int copy_path_name(char *dst, const char *src); @@ -600,12 +600,4 @@ static inline int get_dfs_path(const unsigned int xid, struct cifs_ses *ses, } #endif -static inline int cifs_create_options(struct cifs_sb_info *cifs_sb, int options) -{ - if (cifs_sb && (backup_cred(cifs_sb))) - return options | CREATE_OPEN_BACKUP_INTENT; - else - return options; -} - #endif /* _CIFSPROTO_H */
diff --git a/fs/cifs/cifssmb.c b/fs/cifs/cifssmb.c index f924f05..4b8632e 100644 --- a/fs/cifs/cifssmb.c +++ b/fs/cifs/cifssmb.c
@@ -4933,13 +4933,8 @@ CIFSGetDFSRefer(const unsigned int xid, struct cifs_ses *ses, return -ENODEV; getDFSRetry: - /* - * Use smb_init_no_reconnect() instead of smb_init() as - * CIFSGetDFSRefer() may be called from cifs_reconnect_tcon() and thus - * causing an infinite recursion. - */ - rc = smb_init_no_reconnect(SMB_COM_TRANSACTION2, 15, ses->tcon_ipc, - (void **)&pSMB, (void **)&pSMBr); + rc = smb_init(SMB_COM_TRANSACTION2, 15, ses->tcon_ipc, (void **) &pSMB, + (void **) &pSMBr); if (rc) return rc;
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 6c8dd7c..86bdebd 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c
@@ -791,6 +791,9 @@ cifs_readv_from_socket(struct TCP_Server_Info *server, struct msghdr *smb_msg) int length = 0; int total_read; + smb_msg->msg_control = NULL; + smb_msg->msg_controllen = 0; + for (total_read = 0; msg_data_left(smb_msg); total_read += length) { try_to_freeze(); @@ -841,7 +844,7 @@ int cifs_read_from_socket(struct TCP_Server_Info *server, char *buf, unsigned int to_read) { - struct msghdr smb_msg = {}; + struct msghdr smb_msg; struct kvec iov = {.iov_base = buf, .iov_len = to_read}; iov_iter_kvec(&smb_msg.msg_iter, READ, &iov, 1, to_read); @@ -852,7 +855,7 @@ int cifs_read_page_from_socket(struct TCP_Server_Info *server, struct page *page, unsigned int page_offset, unsigned int to_read) { - struct msghdr smb_msg = {}; + struct msghdr smb_msg; struct bio_vec bv = { .bv_page = page, .bv_len = to_read, .bv_offset = page_offset}; iov_iter_bvec(&smb_msg.msg_iter, READ, &bv, 1, to_read); @@ -3235,7 +3238,7 @@ cifs_set_cifscreds(struct smb_vol *vol __attribute__((unused)), struct cifs_ses * cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) { - int rc = 0; + int rc = -ENOMEM; unsigned int xid; struct cifs_ses *ses; struct sockaddr_in *addr = (struct sockaddr_in *)&server->dstaddr; @@ -3277,8 +3280,6 @@ cifs_get_smb_ses(struct TCP_Server_Info *server, struct smb_vol *volume_info) return ses; } - rc = -ENOMEM; - cifs_dbg(FYI, "Existing smb sess not found\n"); ses = sesInfoAlloc(); if (ses == NULL) @@ -4319,7 +4320,7 @@ static int mount_get_conns(struct smb_vol *vol, struct cifs_sb_info *cifs_sb, /* do not care if a following call succeed - informational */ if (!tcon->pipe && server->ops->qfs_tcon) { - server->ops->qfs_tcon(*xid, tcon, cifs_sb); + server->ops->qfs_tcon(*xid, tcon); if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RO_CACHE) { if (tcon->fsDevInfo.DeviceCharacteristics & cpu_to_le32(FILE_READ_ONLY_DEVICE))
diff --git a/fs/cifs/dir.c b/fs/cifs/dir.c index 548047a..9ae9a51 100644 --- a/fs/cifs/dir.c +++ b/fs/cifs/dir.c
@@ -357,10 +357,13 @@ cifs_do_create(struct inode *inode, struct dentry *direntry, unsigned int xid, if (!tcon->unix_ext && (mode & S_IWUGO) == 0) create_options |= CREATE_OPTION_READONLY; + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = desired_access; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + oparms.create_options = create_options; oparms.disposition = disposition; oparms.path = full_path; oparms.fid = fid;
diff --git a/fs/cifs/file.c b/fs/cifs/file.c index 4c8e41f..be9bbbe 100644 --- a/fs/cifs/file.c +++ b/fs/cifs/file.c
@@ -223,6 +223,9 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, if (!buf) return -ENOMEM; + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + /* O_SYNC also has bit for O_DSYNC so following check picks up either */ if (f_flags & O_SYNC) create_options |= CREATE_WRITE_THROUGH; @@ -233,7 +236,7 @@ cifs_nt_open(char *full_path, struct inode *inode, struct cifs_sb_info *cifs_sb, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = desired_access; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + oparms.create_options = create_options; oparms.disposition = disposition; oparms.path = full_path; oparms.fid = fid; @@ -748,6 +751,9 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) desired_access = cifs_convert_flags(cfile->f_flags); + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + /* O_SYNC also has bit for O_DSYNC so following check picks up either */ if (cfile->f_flags & O_SYNC) create_options |= CREATE_WRITE_THROUGH; @@ -761,7 +767,7 @@ cifs_reopen_file(struct cifsFileInfo *cfile, bool can_flush) oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = desired_access; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + oparms.create_options = create_options; oparms.disposition = disposition; oparms.path = full_path; oparms.fid = &cfile->fid; @@ -3188,9 +3194,6 @@ static ssize_t __cifs_writev( ssize_t cifs_direct_writev(struct kiocb *iocb, struct iov_iter *from) { - struct file *file = iocb->ki_filp; - - cifs_revalidate_mapping(file->f_inode); return __cifs_writev(iocb, from, true); } @@ -3871,15 +3874,6 @@ static ssize_t __cifs_readv( len = ctx->len; } - if (direct) { - rc = filemap_write_and_wait_range(file->f_inode->i_mapping, - offset, offset + len - 1); - if (rc) { - kref_put(&ctx->refcount, cifs_aio_ctx_release); - return -EAGAIN; - } - } - /* grab a lock here due to read response handlers can access ctx */ mutex_lock(&ctx->aio_mutex);
diff --git a/fs/cifs/inode.c b/fs/cifs/inode.c index af0980c..fd9e289 100644 --- a/fs/cifs/inode.c +++ b/fs/cifs/inode.c
@@ -472,7 +472,9 @@ cifs_sfu_type(struct cifs_fattr *fattr, const char *path, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_READ; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; + if (backup_cred(cifs_sb)) + oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; oparms.disposition = FILE_OPEN; oparms.path = path; oparms.fid = &fid; @@ -1223,7 +1225,7 @@ cifs_rename_pending_delete(const char *full_path, struct dentry *dentry, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = DELETE | FILE_WRITE_ATTRIBUTES; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; oparms.disposition = FILE_OPEN; oparms.path = full_path; oparms.fid = &fid; @@ -1761,7 +1763,7 @@ cifs_do_rename(const unsigned int xid, struct dentry *from_dentry, oparms.cifs_sb = cifs_sb; /* open the file to be renamed -- we need DELETE perms */ oparms.desired_access = DELETE; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; oparms.disposition = FILE_OPEN; oparms.path = from_path; oparms.fid = &fid;
diff --git a/fs/cifs/ioctl.c b/fs/cifs/ioctl.c index bc08d85..1a01e10 100644 --- a/fs/cifs/ioctl.c +++ b/fs/cifs/ioctl.c
@@ -65,7 +65,7 @@ static long cifs_ioctl_query_info(unsigned int xid, struct file *filep, if (tcon->ses->server->ops->ioctl_query_info) rc = tcon->ses->server->ops->ioctl_query_info( - xid, tcon, cifs_sb, utf16_path, + xid, tcon, utf16_path, filep->private_data ? 0 : 1, p); else rc = -EOPNOTSUPP; @@ -191,7 +191,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) rc = put_user(ExtAttrBits & FS_FL_USER_VISIBLE, (int __user *)arg); - if (rc != -EOPNOTSUPP) + if (rc != EOPNOTSUPP) break; } #endif /* CONFIG_CIFS_POSIX */ @@ -220,7 +220,7 @@ long cifs_ioctl(struct file *filep, unsigned int command, unsigned long arg) * pSMBFile->fid.netfid, * extAttrBits, * &ExtAttrMask); - * if (rc != -EOPNOTSUPP) + * if (rc != EOPNOTSUPP) * break; */
diff --git a/fs/cifs/link.c b/fs/cifs/link.c index 02949a2..a24bcbb 100644 --- a/fs/cifs/link.c +++ b/fs/cifs/link.c
@@ -318,7 +318,7 @@ cifs_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_READ; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; oparms.disposition = FILE_OPEN; oparms.path = path; oparms.fid = &fid; @@ -356,11 +356,15 @@ cifs_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid fid; struct cifs_open_parms oparms; struct cifs_io_parms io_parms; + int create_options = CREATE_NOT_DIR; + + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_WRITE; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = create_options; oparms.disposition = FILE_CREATE; oparms.path = path; oparms.fid = &fid; @@ -401,7 +405,9 @@ smb3_query_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_READ; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; + if (backup_cred(cifs_sb)) + oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; oparms.disposition = FILE_OPEN; oparms.fid = &fid; oparms.reconnect = false; @@ -454,10 +460,14 @@ smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid fid; struct cifs_open_parms oparms; struct cifs_io_parms io_parms; + int create_options = CREATE_NOT_DIR; __le16 *utf16_path; __u8 oplock = SMB2_OPLOCK_LEVEL_NONE; struct kvec iov[2]; + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + cifs_dbg(FYI, "%s: path: %s\n", __func__, path); utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); @@ -467,11 +477,10 @@ smb3_create_mf_symlink(unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_WRITE; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = create_options; oparms.disposition = FILE_CREATE; oparms.fid = &fid; oparms.reconnect = false; - oparms.mode = 0644; rc = SMB2_open(xid, &oparms, utf16_path, &oplock, NULL, NULL, NULL);
diff --git a/fs/cifs/misc.c b/fs/cifs/misc.c index f418913..40ca394 100644 --- a/fs/cifs/misc.c +++ b/fs/cifs/misc.c
@@ -972,8 +972,8 @@ cifs_free_hash(struct crypto_shash **shash, struct sdesc **sdesc) * Input: rqst - a smb_rqst, page - a page index for rqst * Output: *len - the length for this page, *offset - the offset for this page */ -void rqst_page_get_length(const struct smb_rqst *rqst, unsigned int page, - unsigned int *len, unsigned int *offset) +void rqst_page_get_length(struct smb_rqst *rqst, unsigned int page, + unsigned int *len, unsigned int *offset) { *len = rqst->rq_pagesz; *offset = (page == 0) ? rqst->rq_offset : 0;
diff --git a/fs/cifs/smb1ops.c b/fs/cifs/smb1ops.c index b130efa..e523c05 100644 --- a/fs/cifs/smb1ops.c +++ b/fs/cifs/smb1ops.c
@@ -504,8 +504,7 @@ cifs_negotiate_rsize(struct cifs_tcon *tcon, struct smb_vol *volume_info) } static void -cifs_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb) +cifs_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon) { CIFSSMBQFSDeviceInfo(xid, tcon); CIFSSMBQFSAttributeInfo(xid, tcon); @@ -566,7 +565,7 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = FILE_READ_ATTRIBUTES; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = 0; oparms.disposition = FILE_OPEN; oparms.path = full_path; oparms.fid = &fid; @@ -794,7 +793,7 @@ smb_set_file_info(struct inode *inode, const char *full_path, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = SYNCHRONIZE | FILE_WRITE_ATTRIBUTES; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR); + oparms.create_options = CREATE_NOT_DIR; oparms.disposition = FILE_OPEN; oparms.path = full_path; oparms.fid = &fid; @@ -873,7 +872,7 @@ cifs_oplock_response(struct cifs_tcon *tcon, struct cifs_fid *fid, static int cifs_queryfs(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, struct kstatfs *buf) + struct kstatfs *buf) { int rc = -EOPNOTSUPP; @@ -971,8 +970,7 @@ cifs_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = FILE_READ_ATTRIBUTES; - oparms.create_options = cifs_create_options(cifs_sb, - OPEN_REPARSE_POINT); + oparms.create_options = OPEN_REPARSE_POINT; oparms.disposition = FILE_OPEN; oparms.path = full_path; oparms.fid = &fid; @@ -1031,6 +1029,7 @@ cifs_make_node(unsigned int xid, struct inode *inode, struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); struct inode *newinode = NULL; int rc = -EPERM; + int create_options = CREATE_NOT_DIR | CREATE_OPTION_SPECIAL; FILE_ALL_INFO *buf = NULL; struct cifs_io_parms io_parms; __u32 oplock = 0; @@ -1091,11 +1090,13 @@ cifs_make_node(unsigned int xid, struct inode *inode, goto out; } + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_WRITE; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR | - CREATE_OPTION_SPECIAL); + oparms.create_options = create_options; oparms.disposition = FILE_CREATE; oparms.path = full_path; oparms.fid = &fid;
diff --git a/fs/cifs/smb2inode.c b/fs/cifs/smb2inode.c index c9abda9..f2a6f7f 100644 --- a/fs/cifs/smb2inode.c +++ b/fs/cifs/smb2inode.c
@@ -98,7 +98,9 @@ smb2_compound_op(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = desired_access; oparms.disposition = create_disposition; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + oparms.create_options = create_options; + if (backup_cred(cifs_sb)) + oparms.create_options |= CREATE_OPEN_BACKUP_INTENT; oparms.fid = &fid; oparms.reconnect = false; oparms.mode = mode; @@ -454,7 +456,7 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, /* If it is a root and its handle is cached then use it */ if (!strlen(full_path) && !no_cached_open) { - rc = open_shroot(xid, tcon, cifs_sb, &fid); + rc = open_shroot(xid, tcon, &fid); if (rc) goto out; @@ -471,6 +473,9 @@ smb2_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, goto out; } + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + cifs_get_readable_path(tcon, full_path, &cfile); rc = smb2_compound_op(xid, tcon, cifs_sb, full_path, FILE_READ_ATTRIBUTES, FILE_OPEN, create_options,
diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index a82d757..5716456 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c
@@ -587,7 +587,7 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) if (rc == -EOPNOTSUPP) { cifs_dbg(FYI, "server does not support query network interfaces\n"); - ret_data_len = 0; + goto out; } else if (rc != 0) { cifs_tcon_dbg(VFS, "error %d on ioctl to get interface list\n", rc); goto out; @@ -644,8 +644,7 @@ smb2_cached_lease_break(struct work_struct *work) /* * Open the directory at the root of a share */ -int open_shroot(unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, struct cifs_fid *pfid) +int open_shroot(unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid *pfid) { struct cifs_ses *ses = tcon->ses; struct TCP_Server_Info *server = ses->server; @@ -697,7 +696,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, rqst[0].rq_nvec = SMB2_CREATE_IOV_SIZE; oparms.tcon = tcon; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = 0; oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.disposition = FILE_OPEN; oparms.fid = pfid; @@ -813,8 +812,7 @@ int open_shroot(unsigned int xid, struct cifs_tcon *tcon, } static void -smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb) +smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon) { int rc; __le16 srch_path = 0; /* Null - open root of share */ @@ -823,19 +821,18 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid fid; bool no_cached_open = tcon->nohandlecache; - oparms = (struct cifs_open_parms) { - .tcon = tcon, - .desired_access = FILE_READ_ATTRIBUTES, - .disposition = FILE_OPEN, - .create_options = cifs_create_options(cifs_sb, 0), - .fid = &fid, - }; + oparms.tcon = tcon; + oparms.desired_access = FILE_READ_ATTRIBUTES; + oparms.disposition = FILE_OPEN; + oparms.create_options = 0; + oparms.fid = &fid; + oparms.reconnect = false; if (no_cached_open) rc = SMB2_open(xid, &oparms, &srch_path, &oplock, NULL, NULL, NULL); else - rc = open_shroot(xid, tcon, cifs_sb, &fid); + rc = open_shroot(xid, tcon, &fid); if (rc) return; @@ -857,8 +854,7 @@ smb3_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, } static void -smb2_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb) +smb2_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon) { int rc; __le16 srch_path = 0; /* Null - open root of share */ @@ -869,7 +865,7 @@ smb2_qfs_tcon(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = 0; oparms.fid = &fid; oparms.reconnect = false; @@ -904,7 +900,10 @@ smb2_is_path_accessible(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; oparms.fid = &fid; oparms.reconnect = false; @@ -961,7 +960,9 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, size_t name_len, value_len, user_name_len; while (src_size > 0) { + name = &src->ea_data[0]; name_len = (size_t)src->ea_name_length; + value = &src->ea_data[src->ea_name_length + 1]; value_len = (size_t)le16_to_cpu(src->ea_value_length); if (name_len == 0) @@ -973,9 +974,6 @@ move_smb2_ea_to_cifs(char *dst, size_t dst_size, goto out; } - name = &src->ea_data[0]; - value = &src->ea_data[src->ea_name_length + 1]; - if (ea_name) { if (ea_name_len == name_len && memcmp(ea_name, name, name_len) == 0) { @@ -1180,7 +1178,10 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = FILE_WRITE_EA; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; oparms.fid = &fid; oparms.reconnect = false; @@ -1214,8 +1215,6 @@ smb2_set_ea(const unsigned int xid, struct cifs_tcon *tcon, COMPOUND_FID, current->tgid, FILE_FULL_EA_INFORMATION, SMB2_O_INFO_FILE, 0, data, size); - if (rc) - goto sea_exit; smb2_set_next_command(tcon, &rqst[1]); smb2_set_related(&rqst[1]); @@ -1412,7 +1411,6 @@ SMB2_request_res_key(const unsigned int xid, struct cifs_tcon *tcon, static int smb2_ioctl_query_info(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, __le16 *path, int is_dir, unsigned long p) { @@ -1438,7 +1436,6 @@ smb2_ioctl_query_info(const unsigned int xid, struct kvec close_iov[1]; unsigned int size[2]; void *data[2]; - int create_options = is_dir ? CREATE_NOT_FILE : CREATE_NOT_DIR; memset(rqst, 0, sizeof(rqst)); resp_buftype[0] = resp_buftype[1] = resp_buftype[2] = CIFS_NO_BUFFER; @@ -1474,7 +1471,10 @@ smb2_ioctl_query_info(const unsigned int xid, memset(&oparms, 0, sizeof(oparms)); oparms.tcon = tcon; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + if (is_dir) + oparms.create_options = CREATE_NOT_FILE; + else + oparms.create_options = CREATE_NOT_DIR; oparms.fid = &fid; oparms.reconnect = false; @@ -2071,7 +2071,10 @@ smb2_query_dir_first(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = FILE_READ_ATTRIBUTES | FILE_READ_DATA; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; oparms.fid = fid; oparms.reconnect = false; @@ -2272,7 +2275,10 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = desired_access; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + if (cifs_sb && backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; oparms.fid = &fid; oparms.reconnect = false; @@ -2328,7 +2334,7 @@ smb2_query_info_compound(const unsigned int xid, struct cifs_tcon *tcon, static int smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, struct kstatfs *buf) + struct kstatfs *buf) { struct smb2_query_info_rsp *rsp; struct smb2_fs_full_size_info *info = NULL; @@ -2343,7 +2349,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, FS_FULL_SIZE_INFORMATION, SMB2_O_INFO_FILESYSTEM, sizeof(struct smb2_fs_full_size_info), - &rsp_iov, &buftype, cifs_sb); + &rsp_iov, &buftype, NULL); if (rc) goto qfs_exit; @@ -2365,7 +2371,7 @@ smb2_queryfs(const unsigned int xid, struct cifs_tcon *tcon, static int smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, struct kstatfs *buf) + struct kstatfs *buf) { int rc; __le16 srch_path = 0; /* Null - open root of share */ @@ -2374,12 +2380,12 @@ smb311_queryfs(const unsigned int xid, struct cifs_tcon *tcon, struct cifs_fid fid; if (!tcon->posix_extensions) - return smb2_queryfs(xid, tcon, cifs_sb, buf); + return smb2_queryfs(xid, tcon, buf); oparms.tcon = tcon; oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); + oparms.create_options = 0; oparms.fid = &fid; oparms.reconnect = false; @@ -2648,7 +2654,6 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, struct smb2_create_rsp *create_rsp; struct smb2_ioctl_rsp *ioctl_rsp; struct reparse_data_buffer *reparse_buf; - int create_options = is_reparse_point ? OPEN_REPARSE_POINT : 0; u32 plen; cifs_dbg(FYI, "%s: path: %s\n", __func__, full_path); @@ -2675,7 +2680,14 @@ smb2_query_symlink(const unsigned int xid, struct cifs_tcon *tcon, oparms.tcon = tcon; oparms.desired_access = FILE_READ_ATTRIBUTES; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, create_options); + + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; + if (is_reparse_point) + oparms.create_options = OPEN_REPARSE_POINT; + oparms.fid = &fid; oparms.reconnect = false; @@ -2854,6 +2866,11 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, tcon = tlink_tcon(tlink); xid = get_xid(); + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; + utf16_path = cifs_convert_path_to_utf16(path, cifs_sb); if (!utf16_path) { rc = -ENOMEM; @@ -2864,7 +2881,6 @@ get_smb2_acl_by_path(struct cifs_sb_info *cifs_sb, oparms.tcon = tcon; oparms.desired_access = READ_CONTROL; oparms.disposition = FILE_OPEN; - oparms.create_options = cifs_create_options(cifs_sb, 0); oparms.fid = &fid; oparms.reconnect = false; @@ -2906,6 +2922,11 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, tcon = tlink_tcon(tlink); xid = get_xid(); + if (backup_cred(cifs_sb)) + oparms.create_options = CREATE_OPEN_BACKUP_INTENT; + else + oparms.create_options = 0; + if (aclflag == CIFS_ACL_OWNER || aclflag == CIFS_ACL_GROUP) access_flags = WRITE_OWNER; else @@ -2920,7 +2941,6 @@ set_smb2_acl(struct cifs_ntsd *pnntsd, __u32 acllen, oparms.tcon = tcon; oparms.desired_access = access_flags; - oparms.create_options = cifs_create_options(cifs_sb, 0); oparms.disposition = FILE_OPEN; oparms.path = path; oparms.fid = &fid; @@ -3030,7 +3050,7 @@ static long smb3_zero_range(struct file *file, struct cifs_tcon *tcon, static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, loff_t offset, loff_t len) { - struct inode *inode = file_inode(file); + struct inode *inode; struct cifsFileInfo *cfile = file->private_data; struct file_zero_data_information fsctl_buf; long rc; @@ -3039,12 +3059,14 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, xid = get_xid(); - inode_lock(inode); + inode = d_inode(cfile->dentry); + /* Need to make file sparse, if not already, before freeing range. */ /* Consider adding equivalent for compressed since it could also work */ if (!smb2_set_sparse(xid, tcon, cfile, inode, set_sparse)) { rc = -EOPNOTSUPP; - goto out; + free_xid(xid); + return rc; } /* @@ -3063,8 +3085,6 @@ static long smb3_punch_hole(struct file *file, struct cifs_tcon *tcon, true /* is_fctl */, (char *)&fsctl_buf, sizeof(struct file_zero_data_information), CIFSMaxBufSize, NULL, NULL); -out: - inode_unlock(inode); free_xid(xid); return rc; } @@ -3602,82 +3622,69 @@ fill_transform_hdr(struct smb2_transform_hdr *tr_hdr, unsigned int orig_len, memcpy(&tr_hdr->SessionId, &shdr->SessionId, 8); } -static void *smb2_aead_req_alloc(struct crypto_aead *tfm, const struct smb_rqst *rqst, - int num_rqst, const u8 *sig, u8 **iv, - struct aead_request **req, struct scatterlist **sgl, - unsigned int *num_sgs) +/* We can not use the normal sg_set_buf() as we will sometimes pass a + * stack object as buf. + */ +static inline void smb2_sg_set_buf(struct scatterlist *sg, const void *buf, + unsigned int buflen) { - unsigned int req_size = sizeof(**req) + crypto_aead_reqsize(tfm); - unsigned int iv_size = crypto_aead_ivsize(tfm); - unsigned int len; - u8 *p; - - *num_sgs = cifs_get_num_sgs(rqst, num_rqst, sig); - - len = iv_size; - len += crypto_aead_alignmask(tfm) & ~(crypto_tfm_ctx_alignment() - 1); - len = ALIGN(len, crypto_tfm_ctx_alignment()); - len += req_size; - len = ALIGN(len, __alignof__(struct scatterlist)); - len += *num_sgs * sizeof(**sgl); - - p = kmalloc(len, GFP_ATOMIC); - if (!p) - return NULL; - - *iv = (u8 *)PTR_ALIGN(p, crypto_aead_alignmask(tfm) + 1); - *req = (struct aead_request *)PTR_ALIGN(*iv + iv_size, - crypto_tfm_ctx_alignment()); - *sgl = (struct scatterlist *)PTR_ALIGN((u8 *)*req + req_size, - __alignof__(struct scatterlist)); - return p; + void *addr; + /* + * VMAP_STACK (at least) puts stack into the vmalloc address space + */ + if (is_vmalloc_addr(buf)) + addr = vmalloc_to_page(buf); + else + addr = virt_to_page(buf); + sg_set_page(sg, addr, buflen, offset_in_page(buf)); } -static void *smb2_get_aead_req(struct crypto_aead *tfm, const struct smb_rqst *rqst, - int num_rqst, const u8 *sig, u8 **iv, - struct aead_request **req, struct scatterlist **sgl) +/* Assumes the first rqst has a transform header as the first iov. + * I.e. + * rqst[0].rq_iov[0] is transform header + * rqst[0].rq_iov[1+] data to be encrypted/decrypted + * rqst[1+].rq_iov[0+] data to be encrypted/decrypted + */ +static struct scatterlist * +init_sg(int num_rqst, struct smb_rqst *rqst, u8 *sign) { - unsigned int off, len, skip; + unsigned int sg_len; struct scatterlist *sg; - unsigned int num_sgs; - unsigned long addr; - int i, j; - void *p; + unsigned int i; + unsigned int j; + unsigned int idx = 0; + int skip; - p = smb2_aead_req_alloc(tfm, rqst, num_rqst, sig, iv, req, sgl, &num_sgs); - if (!p) + sg_len = 1; + for (i = 0; i < num_rqst; i++) + sg_len += rqst[i].rq_nvec + rqst[i].rq_npages; + + sg = kmalloc_array(sg_len, sizeof(struct scatterlist), GFP_KERNEL); + if (!sg) return NULL; - sg_init_table(*sgl, num_sgs); - sg = *sgl; - - /* Assumes the first rqst has a transform header as the first iov. - * I.e. - * rqst[0].rq_iov[0] is transform header - * rqst[0].rq_iov[1+] data to be encrypted/decrypted - * rqst[1+].rq_iov[0+] data to be encrypted/decrypted - */ + sg_init_table(sg, sg_len); for (i = 0; i < num_rqst; i++) { - /* - * The first rqst has a transform header where the - * first 20 bytes are not part of the encrypted blob. - */ for (j = 0; j < rqst[i].rq_nvec; j++) { - struct kvec *iov = &rqst[i].rq_iov[j]; - + /* + * The first rqst has a transform header where the + * first 20 bytes are not part of the encrypted blob + */ skip = (i == 0) && (j == 0) ? 20 : 0; - addr = (unsigned long)iov->iov_base + skip; - len = iov->iov_len - skip; - sg = cifs_sg_set_buf(sg, (void *)addr, len); - } + smb2_sg_set_buf(&sg[idx++], + rqst[i].rq_iov[j].iov_base + skip, + rqst[i].rq_iov[j].iov_len - skip); + } + for (j = 0; j < rqst[i].rq_npages; j++) { - rqst_page_get_length(&rqst[i], j, &len, &off); - sg_set_page(sg++, rqst[i].rq_pages[j], len, off); + unsigned int len, offset; + + rqst_page_get_length(&rqst[i], j, &len, &offset); + sg_set_page(&sg[idx++], rqst[i].rq_pages[j], len, offset); } } - cifs_sg_set_buf(sg, sig, SMB2_SIGNATURE_SIZE); - - return p; + smb2_sg_set_buf(&sg[idx], sign, SMB2_SIGNATURE_SIZE); + return sg; } static int @@ -3719,11 +3726,11 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, u8 sign[SMB2_SIGNATURE_SIZE] = {}; u8 key[SMB3_SIGN_KEY_SIZE]; struct aead_request *req; - u8 *iv; + char *iv; + unsigned int iv_len; DECLARE_CRYPTO_WAIT(wait); struct crypto_aead *tfm; unsigned int crypt_len = le32_to_cpu(tr_hdr->OriginalMessageSize); - void *creq; rc = smb2_get_enc_key(server, tr_hdr->SessionId, enc, key); if (rc) { @@ -3752,15 +3759,32 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, return rc; } - creq = smb2_get_aead_req(tfm, rqst, num_rqst, sign, &iv, &req, &sg); - if (unlikely(!creq)) + req = aead_request_alloc(tfm, GFP_KERNEL); + if (!req) { + cifs_server_dbg(VFS, "%s: Failed to alloc aead request\n", __func__); return -ENOMEM; + } if (!enc) { memcpy(sign, &tr_hdr->Signature, SMB2_SIGNATURE_SIZE); crypt_len += SMB2_SIGNATURE_SIZE; } + sg = init_sg(num_rqst, rqst, sign); + if (!sg) { + cifs_server_dbg(VFS, "%s: Failed to init sg\n", __func__); + rc = -ENOMEM; + goto free_req; + } + + iv_len = crypto_aead_ivsize(tfm); + iv = kzalloc(iv_len, GFP_KERNEL); + if (!iv) { + cifs_server_dbg(VFS, "%s: Failed to alloc iv\n", __func__); + rc = -ENOMEM; + goto free_sg; + } + if (server->cipher_type == SMB2_ENCRYPTION_AES128_GCM) memcpy(iv, (char *)tr_hdr->Nonce, SMB3_AES128GCM_NONCE); else { @@ -3768,7 +3792,6 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, memcpy(iv + 1, (char *)tr_hdr->Nonce, SMB3_AES128CCM_NONCE); } - aead_request_set_tfm(req, tfm); aead_request_set_crypt(req, sg, sg, crypt_len, iv); aead_request_set_ad(req, assoc_data_len); @@ -3781,7 +3804,11 @@ crypt_message(struct TCP_Server_Info *server, int num_rqst, if (!rc && enc) memcpy(&tr_hdr->Signature, sign, SMB2_SIGNATURE_SIZE); - kfree(creq); + kfree(iv); +free_sg: + kfree(sg); +free_req: + kfree(req); return rc; } @@ -4458,6 +4485,7 @@ smb2_make_node(unsigned int xid, struct inode *inode, { struct cifs_sb_info *cifs_sb = CIFS_SB(inode->i_sb); int rc = -EPERM; + int create_options = CREATE_NOT_DIR | CREATE_OPTION_SPECIAL; FILE_ALL_INFO *buf = NULL; struct cifs_io_parms io_parms; __u32 oplock = 0; @@ -4493,11 +4521,13 @@ smb2_make_node(unsigned int xid, struct inode *inode, goto out; } + if (backup_cred(cifs_sb)) + create_options |= CREATE_OPEN_BACKUP_INTENT; + oparms.tcon = tcon; oparms.cifs_sb = cifs_sb; oparms.desired_access = GENERIC_WRITE; - oparms.create_options = cifs_create_options(cifs_sb, CREATE_NOT_DIR | - CREATE_OPTION_SPECIAL); + oparms.create_options = create_options; oparms.disposition = FILE_CREATE; oparms.path = full_path; oparms.fid = &fid;
diff --git a/fs/cifs/smb2pdu.c b/fs/cifs/smb2pdu.c index da1a1b5..0857eb7 100644 --- a/fs/cifs/smb2pdu.c +++ b/fs/cifs/smb2pdu.c
@@ -1100,9 +1100,9 @@ int smb3_validate_negotiate(const unsigned int xid, struct cifs_tcon *tcon) pneg_inbuf->Dialects[0] = cpu_to_le16(server->vals->protocol_id); pneg_inbuf->DialectCount = cpu_to_le16(1); - /* structure is big enough for 4 dialects, sending only 1 */ + /* structure is big enough for 3 dialects, sending only 1 */ inbuflen = sizeof(*pneg_inbuf) - - sizeof(pneg_inbuf->Dialects[0]) * 3; + sizeof(pneg_inbuf->Dialects[0]) * 2; } rc = SMB2_ioctl(xid, tcon, NO_FILE_ID, NO_FILE_ID, @@ -3639,15 +3639,12 @@ smb2_readv_callback(struct mid_q_entry *mid) (struct smb2_sync_hdr *)rdata->iov[0].iov_base; struct cifs_credits credits = { .value = 0, .instance = 0 }; struct smb_rqst rqst = { .rq_iov = &rdata->iov[1], - .rq_nvec = 1, }; - - if (rdata->got_bytes) { - rqst.rq_pages = rdata->pages; - rqst.rq_offset = rdata->page_offset; - rqst.rq_npages = rdata->nr_pages; - rqst.rq_pagesz = rdata->pagesz; - rqst.rq_tailsz = rdata->tailsz; - } + .rq_nvec = 1, + .rq_pages = rdata->pages, + .rq_offset = rdata->page_offset, + .rq_npages = rdata->nr_pages, + .rq_pagesz = rdata->pagesz, + .rq_tailsz = rdata->tailsz }; cifs_dbg(FYI, "%s: mid=%llu state=%d result=%d bytes=%u\n", __func__, mid->mid, mid->mid_state, rdata->result,
diff --git a/fs/cifs/smb2proto.h b/fs/cifs/smb2proto.h index 4d4c0fa..57f7075 100644 --- a/fs/cifs/smb2proto.h +++ b/fs/cifs/smb2proto.h
@@ -67,7 +67,7 @@ extern int smb3_handle_read_data(struct TCP_Server_Info *server, struct mid_q_entry *mid); extern int open_shroot(unsigned int xid, struct cifs_tcon *tcon, - struct cifs_sb_info *cifs_sb, struct cifs_fid *pfid); + struct cifs_fid *pfid); extern void close_shroot(struct cached_fid *cfid); extern void move_smb2_info_to_cifs(FILE_ALL_INFO *dst, struct smb2_file_all_info *src);
diff --git a/fs/cifs/smbdirect.c b/fs/cifs/smbdirect.c index 2f2a1d9..5b1b97e 100644 --- a/fs/cifs/smbdirect.c +++ b/fs/cifs/smbdirect.c
@@ -1478,7 +1478,6 @@ void smbd_destroy(struct TCP_Server_Info *server) destroy_workqueue(info->workqueue); log_rdma_event(INFO, "rdma session destroyed\n"); kfree(info); - server->smbd_conn = NULL; } /* @@ -1784,7 +1783,6 @@ static struct smbd_connection *_smbd_get_connection( allocate_mr_failed: /* At this point, need to a full transport shutdown */ - server->smbd_conn = info; smbd_destroy(server); return NULL; @@ -2348,7 +2346,6 @@ static int allocate_mr_list(struct smbd_connection *info) atomic_set(&info->mr_ready_count, 0); atomic_set(&info->mr_used_count, 0); init_waitqueue_head(&info->wait_for_mr_cleanup); - INIT_WORK(&info->mr_recovery_work, smbd_mr_recovery_work); /* Allocate more MRs (2x) than hardware responder_resources */ for (i = 0; i < info->responder_resources * 2; i++) { smbdirect_mr = kzalloc(sizeof(*smbdirect_mr), GFP_KERNEL); @@ -2377,13 +2374,13 @@ static int allocate_mr_list(struct smbd_connection *info) list_add_tail(&smbdirect_mr->list, &info->mr_list); atomic_inc(&info->mr_ready_count); } + INIT_WORK(&info->mr_recovery_work, smbd_mr_recovery_work); return 0; out: kfree(smbdirect_mr); list_for_each_entry_safe(smbdirect_mr, tmp, &info->mr_list, list) { - list_del(&smbdirect_mr->list); ib_dereg_mr(smbdirect_mr->mr); kfree(smbdirect_mr->sgl); kfree(smbdirect_mr);
diff --git a/fs/cifs/transport.c b/fs/cifs/transport.c index 60141a7..61e7df4 100644 --- a/fs/cifs/transport.c +++ b/fs/cifs/transport.c
@@ -209,6 +209,10 @@ smb_send_kvec(struct TCP_Server_Info *server, struct msghdr *smb_msg, *sent = 0; + smb_msg->msg_name = (struct sockaddr *) &server->dstaddr; + smb_msg->msg_namelen = sizeof(struct sockaddr); + smb_msg->msg_control = NULL; + smb_msg->msg_controllen = 0; if (server->noblocksnd) smb_msg->msg_flags = MSG_DONTWAIT + MSG_NOSIGNAL; else @@ -312,7 +316,7 @@ static int __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, struct smb_rqst *rqst) { - int rc; + int rc = 0; struct kvec *iov; int n_vec; unsigned int send_length = 0; @@ -320,11 +324,10 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, sigset_t mask, oldmask; size_t total_len = 0, sent, size; struct socket *ssocket = server->ssocket; - struct msghdr smb_msg = {}; + struct msghdr smb_msg; int val = 1; __be32 rfc1002_marker; - cifs_in_send_inc(server); if (cifs_rdma_enabled(server)) { /* return -EAGAIN when connecting or reconnecting */ rc = -EAGAIN; @@ -333,17 +336,14 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, goto smbd_done; } - rc = -EAGAIN; if (ssocket == NULL) - goto out; + return -EAGAIN; - rc = -ERESTARTSYS; if (fatal_signal_pending(current)) { cifs_dbg(FYI, "signal pending before send request\n"); - goto out; + return -ERESTARTSYS; } - rc = 0; /* cork the socket */ kernel_setsockopt(ssocket, SOL_TCP, TCP_CORK, (char *)&val, sizeof(val)); @@ -457,8 +457,7 @@ __smb_send_rqst(struct TCP_Server_Info *server, int num_rqst, rc); else if (rc > 0) rc = 0; -out: - cifs_in_send_dec(server); + return rc; } @@ -835,7 +834,9 @@ cifs_call_async(struct TCP_Server_Info *server, struct smb_rqst *rqst, * I/O response may come back and free the mid entry on another thread. */ cifs_save_when_sent(mid); + cifs_in_send_inc(server); rc = smb_send_rqst(server, 1, rqst, flags); + cifs_in_send_dec(server); if (rc < 0) { revert_current_mid(server, mid->credits); @@ -1098,7 +1099,9 @@ compound_send_recv(const unsigned int xid, struct cifs_ses *ses, else midQ[i]->callback = cifs_compound_last_callback; } + cifs_in_send_inc(server); rc = smb_send_rqst(server, num_rqst, rqst, flags); + cifs_in_send_dec(server); for (i = 0; i < num_rqst; i++) cifs_save_when_sent(midQ[i]); @@ -1333,7 +1336,9 @@ SendReceive(const unsigned int xid, struct cifs_ses *ses, midQ->mid_state = MID_REQUEST_SUBMITTED; + cifs_in_send_inc(server); rc = smb_send(server, in_buf, len); + cifs_in_send_dec(server); cifs_save_when_sent(midQ); if (rc < 0) @@ -1470,7 +1475,9 @@ SendReceiveBlockingLock(const unsigned int xid, struct cifs_tcon *tcon, } midQ->mid_state = MID_REQUEST_SUBMITTED; + cifs_in_send_inc(server); rc = smb_send(server, in_buf, len); + cifs_in_send_dec(server); cifs_save_when_sent(midQ); if (rc < 0)
diff --git a/fs/coda/upcall.c b/fs/coda/upcall.c index 610484c..eb3b189 100644 --- a/fs/coda/upcall.c +++ b/fs/coda/upcall.c
@@ -790,7 +790,7 @@ static int coda_upcall(struct venus_comm *vcp, sig_req = kmalloc(sizeof(struct upc_req), GFP_KERNEL); if (!sig_req) goto exit; - sig_inputArgs = kvzalloc(sizeof(*sig_inputArgs), GFP_KERNEL); + sig_inputArgs = kvzalloc(sizeof(struct coda_in_hdr), GFP_KERNEL); if (!sig_inputArgs) { kfree(sig_req); goto exit;
diff --git a/fs/configfs/dir.c b/fs/configfs/dir.c index bc27e3a..d73d88d 100644 --- a/fs/configfs/dir.c +++ b/fs/configfs/dir.c
@@ -317,7 +317,6 @@ static int configfs_create_dir(struct config_item *item, struct dentry *dentry, return 0; out_remove: - configfs_put(dentry->d_fsdata); configfs_remove_dirent(dentry); return PTR_ERR(inode); } @@ -384,7 +383,6 @@ int configfs_create_link(struct configfs_dirent *target, struct dentry *parent, return 0; out_remove: - configfs_put(dentry->d_fsdata); configfs_remove_dirent(dentry); return PTR_ERR(inode); }
diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c index 9efc243..da87615 100644 --- a/fs/debugfs/file.c +++ b/fs/debugfs/file.c
@@ -377,8 +377,8 @@ ssize_t debugfs_attr_read(struct file *file, char __user *buf, } EXPORT_SYMBOL_GPL(debugfs_attr_read); -static ssize_t debugfs_attr_write_xsigned(struct file *file, const char __user *buf, - size_t len, loff_t *ppos, bool is_signed) +ssize_t debugfs_attr_write(struct file *file, const char __user *buf, + size_t len, loff_t *ppos) { struct dentry *dentry = F_DENTRY(file); ssize_t ret; @@ -386,28 +386,12 @@ static ssize_t debugfs_attr_write_xsigned(struct file *file, const char __user * ret = debugfs_file_get(dentry); if (unlikely(ret)) return ret; - if (is_signed) - ret = simple_attr_write_signed(file, buf, len, ppos); - else - ret = simple_attr_write(file, buf, len, ppos); + ret = simple_attr_write(file, buf, len, ppos); debugfs_file_put(dentry); return ret; } - -ssize_t debugfs_attr_write(struct file *file, const char __user *buf, - size_t len, loff_t *ppos) -{ - return debugfs_attr_write_xsigned(file, buf, len, ppos, false); -} EXPORT_SYMBOL_GPL(debugfs_attr_write); -ssize_t debugfs_attr_write_signed(struct file *file, const char __user *buf, - size_t len, loff_t *ppos) -{ - return debugfs_attr_write_xsigned(file, buf, len, ppos, true); -} -EXPORT_SYMBOL_GPL(debugfs_attr_write_signed); - static struct dentry *debugfs_create_mode_unsafe(const char *name, umode_t mode, struct dentry *parent, void *value, const struct file_operations *fops, @@ -800,11 +784,11 @@ static int debugfs_atomic_t_get(void *data, u64 *val) *val = atomic_read((atomic_t *)data); return 0; } -DEFINE_DEBUGFS_ATTRIBUTE_SIGNED(fops_atomic_t, debugfs_atomic_t_get, +DEFINE_DEBUGFS_ATTRIBUTE(fops_atomic_t, debugfs_atomic_t_get, debugfs_atomic_t_set, "%lld\n"); -DEFINE_DEBUGFS_ATTRIBUTE_SIGNED(fops_atomic_t_ro, debugfs_atomic_t_get, NULL, +DEFINE_DEBUGFS_ATTRIBUTE(fops_atomic_t_ro, debugfs_atomic_t_get, NULL, "%lld\n"); -DEFINE_DEBUGFS_ATTRIBUTE_SIGNED(fops_atomic_t_wo, NULL, debugfs_atomic_t_set, +DEFINE_DEBUGFS_ATTRIBUTE(fops_atomic_t_wo, NULL, debugfs_atomic_t_set, "%lld\n"); /**
diff --git a/fs/debugfs/inode.c b/fs/debugfs/inode.c index e0f0738..e595a29 100644 --- a/fs/debugfs/inode.c +++ b/fs/debugfs/inode.c
@@ -743,28 +743,6 @@ void debugfs_remove(struct dentry *dentry) EXPORT_SYMBOL_GPL(debugfs_remove); /** - * debugfs_lookup_and_remove - lookup a directory or file and recursively remove it - * @name: a pointer to a string containing the name of the item to look up. - * @parent: a pointer to the parent dentry of the item. - * - * This is the equlivant of doing something like - * debugfs_remove(debugfs_lookup(..)) but with the proper reference counting - * handled for the directory being looked up. - */ -void debugfs_lookup_and_remove(const char *name, struct dentry *parent) -{ - struct dentry *dentry; - - dentry = debugfs_lookup(name, parent); - if (!dentry) - return; - - debugfs_remove(dentry); - dput(dentry); -} -EXPORT_SYMBOL_GPL(debugfs_lookup_and_remove); - -/** * debugfs_remove_recursive - recursively removes a directory * @dentry: a pointer to a the dentry of the directory to be removed. If this * parameter is NULL or an error value, nothing will be done.
diff --git a/fs/dlm/ast.c b/fs/dlm/ast.c index ca06069..283c7b9 100644 --- a/fs/dlm/ast.c +++ b/fs/dlm/ast.c
@@ -198,13 +198,13 @@ void dlm_add_cb(struct dlm_lkb *lkb, uint32_t flags, int mode, int status, if (!prev_seq) { kref_get(&lkb->lkb_ref); - mutex_lock(&ls->ls_cb_mutex); if (test_bit(LSFL_CB_DELAY, &ls->ls_flags)) { + mutex_lock(&ls->ls_cb_mutex); list_add(&lkb->lkb_cb_list, &ls->ls_cb_delay); + mutex_unlock(&ls->ls_cb_mutex); } else { queue_work(ls->ls_callback_wq, &lkb->lkb_cb_work); } - mutex_unlock(&ls->ls_cb_mutex); } out: mutex_unlock(&lkb->lkb_cb_mutex); @@ -284,9 +284,7 @@ void dlm_callback_stop(struct dlm_ls *ls) void dlm_callback_suspend(struct dlm_ls *ls) { - mutex_lock(&ls->ls_cb_mutex); set_bit(LSFL_CB_DELAY, &ls->ls_flags); - mutex_unlock(&ls->ls_cb_mutex); if (ls->ls_callback_wq) flush_workqueue(ls->ls_callback_wq);
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index b624207..9165bf5 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c
@@ -2888,9 +2888,17 @@ static int set_unlock_args(uint32_t flags, void *astarg, struct dlm_args *args) static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, struct dlm_args *args) { - int rv = -EBUSY; + int rv = -EINVAL; if (args->flags & DLM_LKF_CONVERT) { + if (lkb->lkb_flags & DLM_IFL_MSTCPY) + goto out; + + if (args->flags & DLM_LKF_QUECVT && + !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1]) + goto out; + + rv = -EBUSY; if (lkb->lkb_status != DLM_LKSTS_GRANTED) goto out; @@ -2899,14 +2907,6 @@ static int validate_lock_args(struct dlm_ls *ls, struct dlm_lkb *lkb, if (is_overlap(lkb)) goto out; - - rv = -EINVAL; - if (lkb->lkb_flags & DLM_IFL_MSTCPY) - goto out; - - if (args->flags & DLM_LKF_QUECVT && - !__quecvt_compat_matrix[lkb->lkb_grmode+1][args->mode+1]) - goto out; } lkb->lkb_exflags = args->flags;
diff --git a/fs/erofs/decompressor.c b/fs/erofs/decompressor.c index 38eeec5..23b74b8 100644 --- a/fs/erofs/decompressor.c +++ b/fs/erofs/decompressor.c
@@ -56,18 +56,14 @@ static int z_erofs_lz4_prepare_destpages(struct z_erofs_decompress_req *rq, if (page) { __clear_bit(j, bounced); - if (!PageHighMem(page)) { - if (!i) { - kaddr = page_address(page); - continue; - } - if (kaddr && - kaddr + PAGE_SIZE == page_address(page)) { + if (kaddr) { + if (kaddr + PAGE_SIZE == page_address(page)) kaddr += PAGE_SIZE; - continue; - } + else + kaddr = NULL; + } else if (!i) { + kaddr = page_address(page); } - kaddr = NULL; continue; } kaddr = NULL;
diff --git a/fs/eventpoll.c b/fs/eventpoll.c index e39e4ce..2ffc294 100644 --- a/fs/eventpoll.c +++ b/fs/eventpoll.c
@@ -1804,21 +1804,6 @@ static inline struct timespec64 ep_set_mstimeout(long ms) return timespec64_add_safe(now, ts); } -/* - * autoremove_wake_function, but remove even on failure to wake up, because we - * know that default_wake_function/ttwu will only fail if the thread is already - * woken, and in that case the ep_poll loop will remove the entry anyways, not - * try to reuse it. - */ -static int ep_autoremove_wake_function(struct wait_queue_entry *wq_entry, - unsigned int mode, int sync, void *key) -{ - int ret = default_wake_function(wq_entry, mode, sync, key); - - list_del_init(&wq_entry->entry); - return ret; -} - /** * ep_poll - Retrieves ready events, and delivers them to the caller supplied * event buffer. @@ -1896,77 +1881,57 @@ static int ep_poll(struct eventpoll *ep, struct epoll_event __user *events, * normal wakeup path no need to call __remove_wait_queue() * explicitly, thus ep->lock is not taken, which halts the * event delivery. - * - * In fact, we now use an even more aggressive function that - * unconditionally removes, because we don't reuse the wait - * entry between loop iterations. This lets us also avoid the - * performance issue if a process is killed, causing all of its - * threads to wake up without being removed normally. */ init_wait(&wait); - wait.func = ep_autoremove_wake_function; write_lock_irq(&ep->lock); - /* - * Barrierless variant, waitqueue_active() is called under - * the same lock on wakeup ep_poll_callback() side, so it - * is safe to avoid an explicit barrier. - */ - __set_current_state(TASK_INTERRUPTIBLE); - - /* - * Do the final check under the lock. ep_scan_ready_list() - * plays with two lists (->rdllist and ->ovflist) and there - * is always a race when both lists are empty for short - * period of time although events are pending, so lock is - * important. - */ - eavail = ep_events_available(ep); - if (!eavail) { - if (signal_pending(current)) - res = -EINTR; - else - __add_wait_queue_exclusive(&ep->wq, &wait); - } + __add_wait_queue_exclusive(&ep->wq, &wait); write_unlock_irq(&ep->lock); - if (!eavail && !res) - timed_out = !freezable_schedule_hrtimeout_range(to, slack, - HRTIMER_MODE_ABS); - /* - * We were woken up, thus go and try to harvest some events. - * If timed out and still on the wait queue, recheck eavail - * carefully under lock, below. + * We don't want to sleep if the ep_poll_callback() sends us + * a wakeup in between. That's why we set the task state + * to TASK_INTERRUPTIBLE before doing the checks. */ - eavail = 1; - } while (0); - - __set_current_state(TASK_RUNNING); - - if (!list_empty_careful(&wait.entry)) { - write_lock_irq(&ep->lock); - /* - * If the thread timed out and is not on the wait queue, it - * means that the thread was woken up after its timeout expired - * before it could reacquire the lock. Thus, when wait.entry is - * empty, it needs to harvest events. - */ - if (timed_out) - eavail = list_empty(&wait.entry); - __remove_wait_queue(&ep->wq, &wait); - write_unlock_irq(&ep->lock); - } - -send_events: - if (fatal_signal_pending(current)) { + set_current_state(TASK_INTERRUPTIBLE); /* * Always short-circuit for fatal signals to allow * threads to make a timely exit without the chance of * finding more events available and fetching * repeatedly. */ - res = -EINTR; + if (fatal_signal_pending(current)) { + res = -EINTR; + break; + } + + eavail = ep_events_available(ep); + if (eavail) + break; + if (signal_pending(current)) { + res = -EINTR; + break; + } + + if (!freezable_schedule_hrtimeout_range(to, slack, + HRTIMER_MODE_ABS)) { + timed_out = 1; + break; + } + + /* We were woken up, thus go and try to harvest some events */ + eavail = 1; + + } while (0); + + __set_current_state(TASK_RUNNING); + + if (!list_empty_careful(&wait.entry)) { + write_lock_irq(&ep->lock); + __remove_wait_queue(&ep->wq, &wait); + write_unlock_irq(&ep->lock); } + +send_events: /* * Try to transfer events to user space. In case we get 0 events and * there's still timeout left over, we go trying again in search of
diff --git a/fs/ext2/super.c b/fs/ext2/super.c index 644c83c..db403c0 100644 --- a/fs/ext2/super.c +++ b/fs/ext2/super.c
@@ -1077,10 +1077,9 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) sbi->s_frags_per_group); goto failed_mount; } - if (sbi->s_inodes_per_group < sbi->s_inodes_per_block || - sbi->s_inodes_per_group > sb->s_blocksize * 8) { + if (sbi->s_inodes_per_group > sb->s_blocksize * 8) { ext2_msg(sb, KERN_ERR, - "error: invalid #inodes per group: %lu", + "error: #inodes per group too big: %lu", sbi->s_inodes_per_group); goto failed_mount; } @@ -1090,13 +1089,6 @@ static int ext2_fill_super(struct super_block *sb, void *data, int silent) sbi->s_groups_count = ((le32_to_cpu(es->s_blocks_count) - le32_to_cpu(es->s_first_data_block) - 1) / EXT2_BLOCKS_PER_GROUP(sb)) + 1; - if ((u64)sbi->s_groups_count * sbi->s_inodes_per_group != - le32_to_cpu(es->s_inodes_count)) { - ext2_msg(sb, KERN_ERR, "error: invalid #inodes: %u vs computed %llu", - le32_to_cpu(es->s_inodes_count), - (u64)sbi->s_groups_count * sbi->s_inodes_per_group); - goto failed_mount; - } db_count = (sbi->s_groups_count + EXT2_DESC_PER_BLOCK(sb) - 1) / EXT2_DESC_PER_BLOCK(sb); sbi->s_group_desc = kmalloc_array (db_count,
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 9e53eaf..52eaaa9 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h
@@ -501,7 +501,7 @@ enum { * * It's not paranoia if the Murphy's Law really *is* out to get you. :-) */ -#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1U << EXT4_INODE_##FLAG)) +#define TEST_FLAG_VALUE(FLAG) (EXT4_##FLAG##_FL == (1 << EXT4_INODE_##FLAG)) #define CHECK_FLAG_VALUE(FLAG) BUILD_BUG_ON(!TEST_FLAG_VALUE(FLAG)) static inline void ext4_check_flag_values(void) @@ -2643,8 +2643,7 @@ int do_journal_get_write_access(handle_t *handle, typedef enum { EXT4_IGET_NORMAL = 0, EXT4_IGET_SPECIAL = 0x0001, /* OK to iget a system inode */ - EXT4_IGET_HANDLE = 0x0002, /* Inode # is from a handle */ - EXT4_IGET_BAD = 0x0004 /* Allow to iget a bad inode */ + EXT4_IGET_HANDLE = 0x0002 /* Inode # is from a handle */ } ext4_iget_flags; extern struct inode *__ext4_iget(struct super_block *sb, unsigned long ino,
diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index 27760c3..d5e649e 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c
@@ -500,10 +500,6 @@ static int __ext4_ext_check(const char *function, unsigned int line, error_msg = "invalid eh_entries"; goto corrupted; } - if (unlikely((eh->eh_entries == 0) && (depth > 0))) { - error_msg = "eh_entries is 0 but eh_depth is > 0"; - goto corrupted; - } if (!ext4_valid_extent_entries(inode, eh, lblk, &pblk, depth)) { error_msg = "invalid extent entries"; goto corrupted; @@ -6022,14 +6018,6 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu) struct ext4_extent *extent; ext4_lblk_t first_lblk, first_lclu, last_lclu; - /* - * if data can be stored inline, the logical cluster isn't - * mapped - no physical clusters have been allocated, and the - * file has no extents - */ - if (ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) - return 0; - /* search for the extent closest to the first block in the cluster */ path = ext4_find_extent(inode, EXT4_C2B(sbi, lclu), NULL, 0); if (IS_ERR(path)) {
diff --git a/fs/ext4/extents_status.c b/fs/ext4/extents_status.c index 9d0bed2..43fba01 100644 --- a/fs/ext4/extents_status.c +++ b/fs/ext4/extents_status.c
@@ -1354,7 +1354,7 @@ static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, if (count_reserved) count_rsvd(inode, lblk, orig_es.es_len - len1 - len2, &orig_es, &rc); - goto out_get_reserved; + goto out; } if (len1 > 0) { @@ -1396,7 +1396,6 @@ static int __es_remove_extent(struct inode *inode, ext4_lblk_t lblk, } } -out_get_reserved: if (count_reserved) *reserved = get_rsvd(inode, end, es, &rc); out:
diff --git a/fs/ext4/file.c b/fs/ext4/file.c index 7ac55d0..1513e90 100644 --- a/fs/ext4/file.c +++ b/fs/ext4/file.c
@@ -505,12 +505,6 @@ loff_t ext4_llseek(struct file *file, loff_t offset, int whence) inode_unlock_shared(inode); break; } - /* - * Make sure inline data cannot be created anymore since we are going - * to allocate blocks for DIO. We know the inode does not have any - * inline data now because ext4_dio_supported() checked for that. - */ - ext4_clear_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); if (offset < 0) return offset;
diff --git a/fs/ext4/fsmap.c b/fs/ext4/fsmap.c index d1ef651..37347ba 100644 --- a/fs/ext4/fsmap.c +++ b/fs/ext4/fsmap.c
@@ -486,8 +486,6 @@ static int ext4_getfsmap_datadev(struct super_block *sb, keys[0].fmr_physical = bofs; if (keys[1].fmr_physical >= eofs) keys[1].fmr_physical = eofs - 1; - if (keys[1].fmr_physical < keys[0].fmr_physical) - return 0; start_fsb = keys[0].fmr_physical; end_fsb = keys[1].fmr_physical;
diff --git a/fs/ext4/ialloc.c b/fs/ext4/ialloc.c index 4ac77e6..279a9c1 100644 --- a/fs/ext4/ialloc.c +++ b/fs/ext4/ialloc.c
@@ -500,7 +500,7 @@ static int find_group_orlov(struct super_block *sb, struct inode *parent, goto fallback; } - max_dirs = ndirs / ngroups + inodes_per_group*flex_size / 16; + max_dirs = ndirs / ngroups + inodes_per_group / 16; min_inodes = avefreei - inodes_per_group*flex_size / 4; if (min_inodes < 1) min_inodes = 1;
diff --git a/fs/ext4/indirect.c b/fs/ext4/indirect.c index a131d27..36699a1 100644 --- a/fs/ext4/indirect.c +++ b/fs/ext4/indirect.c
@@ -148,7 +148,6 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth, struct super_block *sb = inode->i_sb; Indirect *p = chain; struct buffer_head *bh; - unsigned int key; int ret = -EIO; *err = 0; @@ -157,13 +156,7 @@ static Indirect *ext4_get_branch(struct inode *inode, int depth, if (!p->key) goto no_block; while (--depth) { - key = le32_to_cpu(p->key); - if (key > ext4_blocks_count(EXT4_SB(sb)->s_es)) { - /* the block was out of range */ - ret = -EFSCORRUPTED; - goto failure; - } - bh = sb_getblk(sb, key); + bh = sb_getblk(sb, le32_to_cpu(p->key)); if (unlikely(!bh)) { ret = -ENOMEM; goto failure;
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 3c2d04b..96a47b1 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c
@@ -35,9 +35,6 @@ static int get_max_inline_xattr_value_size(struct inode *inode, struct ext4_inode *raw_inode; int free, min_offs; - if (!EXT4_INODE_HAS_XATTR_SPACE(inode)) - return 0; - min_offs = EXT4_SB(inode->i_sb)->s_inode_size - EXT4_GOOD_OLD_INODE_SIZE - EXT4_I(inode)->i_extra_isize - @@ -158,6 +155,7 @@ int ext4_find_inline_data_nolock(struct inode *inode) (void *)ext4_raw_inode(&is.iloc)); EXT4_I(inode)->i_inline_size = EXT4_MIN_INLINE_DATA_SIZE + le32_to_cpu(is.s.here->e_value_size); + ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); } out: brelse(is.iloc.bh); @@ -207,7 +205,7 @@ static int ext4_read_inline_data(struct inode *inode, void *buffer, /* * write the buffer to the inline inode. * If 'create' is set, we don't need to do the extra copy in the xattr - * value since it is already handled by ext4_xattr_ibody_set. + * value since it is already handled by ext4_xattr_ibody_inline_set. * That saves us one memcpy. */ static void ext4_write_inline_data(struct inode *inode, struct ext4_iloc *iloc, @@ -289,7 +287,7 @@ static int ext4_create_inline_data(handle_t *handle, BUG_ON(!is.s.not_found); - error = ext4_xattr_ibody_set(handle, inode, &i, &is); + error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is); if (error) { if (error == -ENOSPC) ext4_clear_inode_state(inode, @@ -361,7 +359,7 @@ static int ext4_update_inline_data(handle_t *handle, struct inode *inode, i.value = value; i.value_len = len; - error = ext4_xattr_ibody_set(handle, inode, &i, &is); + error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is); if (error) goto out; @@ -434,7 +432,7 @@ static int ext4_destroy_inline_data_nolock(handle_t *handle, if (error) goto out; - error = ext4_xattr_ibody_set(handle, inode, &i, &is); + error = ext4_xattr_ibody_inline_set(handle, inode, &i, &is); if (error) goto out; @@ -1988,7 +1986,8 @@ int ext4_inline_data_truncate(struct inode *inode, int *has_inline) i.value = value; i.value_len = i_size > EXT4_MIN_INLINE_DATA_SIZE ? i_size - EXT4_MIN_INLINE_DATA_SIZE : 0; - err = ext4_xattr_ibody_set(handle, inode, &i, &is); + err = ext4_xattr_ibody_inline_set(handle, inode, + &i, &is); if (err) goto out_error; }
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index de47dba..b9f6b44 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c
@@ -208,8 +208,6 @@ void ext4_evict_inode(struct inode *inode) trace_ext4_evict_inode(inode); - if (EXT4_I(inode)->i_flags & EXT4_EA_INODE_FL) - ext4_evict_ea_inode(inode); if (inode->i_nlink) { /* * When journalling data dirty buffers are tracked only in the @@ -1366,13 +1364,6 @@ static int ext4_write_begin(struct file *file, struct address_space *mapping, page = grab_cache_page_write_begin(mapping, index, flags); if (!page) return -ENOMEM; - /* - * The same as page allocation, we prealloc buffer heads before - * starting the handle. - */ - if (!page_has_buffers(page)) - create_empty_buffers(page, inode->i_sb->s_blocksize, 0); - unlock_page(page); retry_journal: @@ -1487,8 +1478,7 @@ static int ext4_write_end(struct file *file, trace_android_fs_datawrite_end(inode, pos, len); trace_ext4_write_end(inode, pos, len, copied); - if (inline_data && - ext4_test_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA)) { + if (inline_data) { ret = ext4_write_inline_data_end(inode, pos, len, copied, page); if (ret < 0) { @@ -1776,14 +1766,7 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd, ext4_lblk_t start, last; start = index << (PAGE_SHIFT - inode->i_blkbits); last = end << (PAGE_SHIFT - inode->i_blkbits); - - /* - * avoid racing with extent status tree scans made by - * ext4_insert_delayed_block() - */ - down_write(&EXT4_I(inode)->i_data_sem); ext4_es_remove_extent(inode, start, last - start + 1); - up_write(&EXT4_I(inode)->i_data_sem); } pagevec_init(&pvec); @@ -4641,7 +4624,7 @@ int ext4_truncate(struct inode *inode) trace_ext4_truncate_enter(inode); if (!ext4_can_truncate(inode)) - goto out_trace; + return 0; ext4_clear_inode_flag(inode, EXT4_INODE_EOFBLOCKS); @@ -4652,15 +4635,16 @@ int ext4_truncate(struct inode *inode) int has_inline = 1; err = ext4_inline_data_truncate(inode, &has_inline); - if (err || has_inline) - goto out_trace; + if (err) + return err; + if (has_inline) + return 0; } /* If we zero-out tail of the page, we have to create jinode for jbd2 */ if (inode->i_size & (inode->i_sb->s_blocksize - 1)) { - err = ext4_inode_attach_jinode(inode); - if (err) - goto out_trace; + if (ext4_inode_attach_jinode(inode) < 0) + return 0; } if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS)) @@ -4669,10 +4653,8 @@ int ext4_truncate(struct inode *inode) credits = ext4_blocks_for_truncate(inode); handle = ext4_journal_start(inode, EXT4_HT_TRUNCATE, credits); - if (IS_ERR(handle)) { - err = PTR_ERR(handle); - goto out_trace; - } + if (IS_ERR(handle)) + return PTR_ERR(handle); if (inode->i_size & (inode->i_sb->s_blocksize - 1)) ext4_block_truncate_page(handle, mapping, inode->i_size); @@ -4721,7 +4703,6 @@ int ext4_truncate(struct inode *inode) ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); -out_trace: trace_ext4_truncate_exit(inode); return err; } @@ -4758,17 +4739,9 @@ static int __ext4_get_inode_loc(struct inode *inode, inodes_per_block = EXT4_SB(sb)->s_inodes_per_block; inode_offset = ((inode->i_ino - 1) % EXT4_INODES_PER_GROUP(sb)); + block = ext4_inode_table(sb, gdp) + (inode_offset / inodes_per_block); iloc->offset = (inode_offset % inodes_per_block) * EXT4_INODE_SIZE(sb); - block = ext4_inode_table(sb, gdp); - if ((block <= le32_to_cpu(EXT4_SB(sb)->s_es->s_first_data_block)) || - (block >= ext4_blocks_count(EXT4_SB(sb)->s_es))) { - ext4_error(sb, "Invalid inode table block %llu in " - "block_group %u", block, iloc->block_group); - return -EFSCORRUPTED; - } - block += (inode_offset / inodes_per_block); - bh = sb_getblk(sb, block); if (unlikely(!bh)) return -ENOMEM; @@ -4962,15 +4935,11 @@ static inline int ext4_iget_extra_inode(struct inode *inode, __le32 *magic = (void *)raw_inode + EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize; - if (EXT4_INODE_HAS_XATTR_SPACE(inode) && + if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize + sizeof(__le32) <= + EXT4_INODE_SIZE(inode->i_sb) && *magic == cpu_to_le32(EXT4_XATTR_MAGIC)) { - int err; - ext4_set_inode_state(inode, EXT4_STATE_XATTR); - err = ext4_find_inline_data_nolock(inode); - if (!err && ext4_has_inline_data(inode)) - ext4_set_inode_state(inode, EXT4_STATE_MAY_INLINE_DATA); - return err; + return ext4_find_inline_data_nolock(inode); } else EXT4_I(inode)->i_inline_off = 0; return 0; @@ -5046,6 +5015,13 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, goto bad_inode; raw_inode = ext4_raw_inode(&iloc); + if ((ino == EXT4_ROOT_INO) && (raw_inode->i_links_count == 0)) { + ext4_error_inode(inode, function, line, 0, + "iget: root inode unallocated"); + ret = -EFSCORRUPTED; + goto bad_inode; + } + if ((flags & EXT4_IGET_HANDLE) && (raw_inode->i_links_count == 0) && (raw_inode->i_mode == 0)) { ret = -ESTALE; @@ -5116,16 +5092,11 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, * NeilBrown 1999oct15 */ if (inode->i_nlink == 0) { - if ((inode->i_mode == 0 || flags & EXT4_IGET_SPECIAL || + if ((inode->i_mode == 0 || !(EXT4_SB(inode->i_sb)->s_mount_state & EXT4_ORPHAN_FS)) && ino != EXT4_BOOT_LOADER_INO) { - /* this inode is deleted or unallocated */ - if (flags & EXT4_IGET_SPECIAL) { - ext4_error_inode(inode, function, line, 0, - "iget: special inode unallocated"); - ret = -EFSCORRUPTED; - } else - ret = -ESTALE; + /* this inode is deleted */ + ret = -ESTALE; goto bad_inode; } /* The only unlinked inodes we let through here have @@ -5301,14 +5272,8 @@ struct inode *__ext4_iget(struct super_block *sb, unsigned long ino, if (IS_CASEFOLDED(inode) && !ext4_has_feature_casefold(inode->i_sb)) ext4_error_inode(inode, function, line, 0, "casefold flag without casefold feature"); - if (is_bad_inode(inode) && !(flags & EXT4_IGET_BAD)) { - ext4_error_inode(inode, function, line, 0, - "bad inode without EXT4_IGET_BAD flag"); - ret = -EUCLEAN; - goto bad_inode; - } - brelse(iloc.bh); + unlock_new_inode(inode); return inode; @@ -6171,14 +6136,6 @@ static int __ext4_expand_extra_isize(struct inode *inode, return 0; } - /* - * We may need to allocate external xattr block so we need quotas - * initialized. Here we can be called with various locks held so we - * cannot affort to initialize quotas ourselves. So just bail. - */ - if (dquot_initialize_needed(inode)) - return -EAGAIN; - /* try to expand with EAs present */ error = ext4_expand_extra_isize_ea(inode, new_extra_isize, raw_inode, handle);
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index 198c180..bb0557c 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c
@@ -121,8 +121,7 @@ static long swap_inode_boot_loader(struct super_block *sb, blkcnt_t blocks; unsigned short bytes; - inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO, - EXT4_IGET_SPECIAL | EXT4_IGET_BAD); + inode_bl = ext4_iget(sb, EXT4_BOOT_LOADER_INO, EXT4_IGET_SPECIAL); if (IS_ERR(inode_bl)) return PTR_ERR(inode_bl); ei_bl = EXT4_I(inode_bl); @@ -170,7 +169,7 @@ static long swap_inode_boot_loader(struct super_block *sb, /* Protect extent tree against block allocations via delalloc */ ext4_double_down_write_data_sem(inode, inode_bl); - if (is_bad_inode(inode_bl) || !S_ISREG(inode_bl->i_mode)) { + if (inode_bl->i_nlink == 0) { /* this inode has never been used as a BOOT_LOADER */ set_nlink(inode_bl, 1); i_uid_write(inode_bl, 0); @@ -179,7 +178,6 @@ static long swap_inode_boot_loader(struct super_block *sb, ei_bl->i_flags = 0; inode_set_iversion(inode_bl, 1); i_size_write(inode_bl, 0); - EXT4_I(inode_bl)->i_disksize = inode_bl->i_size; inode_bl->i_mode = S_IFREG; if (ext4_has_feature_extents(sb)) { ext4_set_inode_flag(inode_bl, EXT4_INODE_EXTENTS); @@ -462,10 +460,6 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) if (ext4_is_quota_file(inode)) return err; - err = dquot_initialize(inode); - if (err) - return err; - err = ext4_get_inode_loc(inode, &iloc); if (err) return err; @@ -481,6 +475,10 @@ static int ext4_ioctl_setproject(struct file *filp, __u32 projid) brelse(iloc.bh); } + err = dquot_initialize(inode); + if (err) + return err; + handle = ext4_journal_start(inode, EXT4_HT_QUOTA, EXT4_QUOTA_INIT_BLOCKS(sb) + EXT4_QUOTA_DEL_BLOCKS(sb) + 3);
diff --git a/fs/ext4/migrate.c b/fs/ext4/migrate.c index dbba3c3..c5b2ea1 100644 --- a/fs/ext4/migrate.c +++ b/fs/ext4/migrate.c
@@ -435,7 +435,7 @@ int ext4_ext_migrate(struct inode *inode) struct inode *tmp_inode = NULL; struct migrate_struct lb; unsigned long max_entries; - __u32 goal, tmp_csum_seed; + __u32 goal; uid_t owner[2]; /* @@ -443,8 +443,7 @@ int ext4_ext_migrate(struct inode *inode) * already is extent-based, error out. */ if (!ext4_has_feature_extents(inode->i_sb) || - ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) || - ext4_has_inline_data(inode)) + (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) return -EINVAL; if (S_ISLNK(inode->i_mode) && inode->i_blocks == 0) @@ -484,7 +483,6 @@ int ext4_ext_migrate(struct inode *inode) * the migration. */ ei = EXT4_I(inode); - tmp_csum_seed = EXT4_I(tmp_inode)->i_csum_seed; EXT4_I(tmp_inode)->i_csum_seed = ei->i_csum_seed; i_size_write(tmp_inode, i_size_read(inode)); /* @@ -595,7 +593,6 @@ int ext4_ext_migrate(struct inode *inode) * the inode is not visible to user space. */ tmp_inode->i_blocks = 0; - EXT4_I(tmp_inode)->i_csum_seed = tmp_csum_seed; /* Reset the extent details */ ext4_ext_tree_init(handle, tmp_inode);
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 27463f8..f5cd30f 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c
@@ -54,7 +54,6 @@ static struct buffer_head *ext4_append(handle_t *handle, struct inode *inode, ext4_lblk_t *block) { - struct ext4_map_blocks map; struct buffer_head *bh; int err; @@ -64,21 +63,6 @@ static struct buffer_head *ext4_append(handle_t *handle, return ERR_PTR(-ENOSPC); *block = inode->i_size >> inode->i_sb->s_blocksize_bits; - map.m_lblk = *block; - map.m_len = 1; - - /* - * We're appending new directory block. Make sure the block is not - * allocated yet, otherwise we will end up corrupting the - * directory. - */ - err = ext4_map_blocks(NULL, inode, &map, 0); - if (err < 0) - return ERR_PTR(err); - if (err) { - EXT4_ERROR_INODE(inode, "Logical block already allocated"); - return ERR_PTR(-EFSCORRUPTED); - } bh = ext4_bread(handle, inode, *block, EXT4_GET_BLOCKS_CREATE); if (IS_ERR(bh)) @@ -1572,10 +1556,11 @@ static struct buffer_head *__ext4_find_entry(struct inode *dir, int has_inline_data = 1; ret = ext4_find_inline_entry(dir, fname, res_dir, &has_inline_data); - if (inlined) - *inlined = has_inline_data; - if (has_inline_data) + if (has_inline_data) { + if (inlined) + *inlined = 1; goto cleanup_and_exit; + } } if ((namelen <= 2) && (name[0] == '.') && @@ -2222,16 +2207,8 @@ static int make_indexed_dir(handle_t *handle, struct ext4_filename *fname, memcpy(data2, de, len); de = (struct ext4_dir_entry_2 *) data2; top = data2 + len; - while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) { - if (ext4_check_dir_entry(dir, NULL, de, bh2, data2, len, - (data2 + (blocksize - csum_size) - - (char *) de))) { - brelse(bh2); - brelse(bh); - return -EFSCORRUPTED; - } + while ((char *)(de2 = ext4_next_entry(de, blocksize)) < top) de = de2; - } de->rec_len = ext4_rec_len_to_disk(data2 + (blocksize - csum_size) - (char *) de, blocksize); @@ -3027,8 +3004,11 @@ bool ext4_empty_dir(struct inode *inode) de = (struct ext4_dir_entry_2 *) (bh->b_data + (offset & (sb->s_blocksize - 1))); if (ext4_check_dir_entry(inode, NULL, de, bh, - bh->b_data, bh->b_size, offset) || - le32_to_cpu(de->inode)) { + bh->b_data, bh->b_size, offset)) { + offset = (offset | (sb->s_blocksize - 1)) + 1; + continue; + } + if (le32_to_cpu(de->inode)) { brelse(bh); return false; } @@ -3720,8 +3700,7 @@ static void ext4_resetent(handle_t *handle, struct ext4_renament *ent, * so the old->de may no longer valid and need to find it again * before reset old inode info. */ - old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, - &old.inlined); + old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL); if (IS_ERR(old.bh)) retval = PTR_ERR(old.bh); if (!old.bh) @@ -3871,9 +3850,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, retval = dquot_initialize(old.dir); if (retval) return retval; - retval = dquot_initialize(old.inode); - if (retval) - return retval; retval = dquot_initialize(new.dir); if (retval) return retval; @@ -3886,20 +3862,9 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, return retval; } - /* - * We need to protect against old.inode directory getting converted - * from inline directory format into a normal one. - */ - if (S_ISDIR(old.inode->i_mode)) - inode_lock_nested(old.inode, I_MUTEX_NONDIR2); - - old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, - &old.inlined); - if (IS_ERR(old.bh)) { - retval = PTR_ERR(old.bh); - goto unlock_moved_dir; - } - + old.bh = ext4_find_entry(old.dir, &old.dentry->d_name, &old.de, NULL); + if (IS_ERR(old.bh)) + return PTR_ERR(old.bh); /* * Check for inode number is _not_ due to possible IO errors. * We might rmdir the source, keep it as pwd of some process @@ -4058,11 +4023,6 @@ static int ext4_rename(struct inode *old_dir, struct dentry *old_dentry, brelse(old.dir_bh); brelse(old.bh); brelse(new.bh); - -unlock_moved_dir: - if (S_ISDIR(old.inode->i_mode)) - inode_unlock(old.inode); - return retval; }
diff --git a/fs/ext4/page-io.c b/fs/ext4/page-io.c index cdca96f..9a1ef56 100644 --- a/fs/ext4/page-io.c +++ b/fs/ext4/page-io.c
@@ -381,8 +381,7 @@ static int io_submit_init_bio(struct ext4_io_submit *io, static int io_submit_add_bh(struct ext4_io_submit *io, struct inode *inode, - struct page *pagecache_page, - struct page *bounce_page, + struct page *page, struct buffer_head *bh) { int ret; @@ -398,11 +397,10 @@ static int io_submit_add_bh(struct ext4_io_submit *io, return ret; io->io_bio->bi_write_hint = inode->i_write_hint; } - ret = bio_add_page(io->io_bio, bounce_page ?: pagecache_page, - bh->b_size, bh_offset(bh)); + ret = bio_add_page(io->io_bio, page, bh->b_size, bh_offset(bh)); if (ret != bh->b_size) goto submit_and_retry; - wbc_account_cgroup_owner(io->io_wbc, pagecache_page, bh->b_size); + wbc_account_cgroup_owner(io->io_wbc, page, bh->b_size); io->io_next_block++; return 0; } @@ -515,7 +513,7 @@ int ext4_bio_write_page(struct ext4_io_submit *io, do { if (!buffer_async_write(bh)) continue; - ret = io_submit_add_bh(io, inode, page, bounce_page, bh); + ret = io_submit_add_bh(io, inode, bounce_page ?: page, bh); if (ret) { /* * We only get here on ENOMEM. Not much else
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 880307b..6410c1e 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c
@@ -1483,7 +1483,6 @@ static void ext4_update_super(struct super_block *sb, * Update the fs overhead information */ ext4_calculate_overhead(sb); - es->s_overhead_clusters = cpu_to_le32(sbi->s_overhead); if (test_opt(sb, DEBUG)) printk(KERN_DEBUG "EXT4-fs: added group %u:" @@ -1567,8 +1566,8 @@ static int ext4_flex_group_add(struct super_block *sb, int meta_bg = ext4_has_feature_meta_bg(sb); sector_t old_gdb = 0; - update_backups(sb, ext4_group_first_block_no(sb, 0), - (char *)es, sizeof(struct ext4_super_block), 0); + update_backups(sb, sbi->s_sbh->b_blocknr, (char *)es, + sizeof(struct ext4_super_block), 0); for (; gdb_num <= gdb_num_end; gdb_num++) { struct buffer_head *gdb_bh; @@ -1775,7 +1774,7 @@ static int ext4_group_extend_no_check(struct super_block *sb, if (test_opt(sb, DEBUG)) printk(KERN_DEBUG "EXT4-fs: extended group to %llu " "blocks\n", ext4_blocks_count(es)); - update_backups(sb, ext4_group_first_block_no(sb, 0), + update_backups(sb, EXT4_SB(sb)->s_sbh->b_blocknr, (char *)es, sizeof(struct ext4_super_block), 0); } return err; @@ -1979,16 +1978,6 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) } brelse(bh); - /* - * For bigalloc, trim the requested size to the nearest cluster - * boundary to avoid creating an unusable filesystem. We do this - * silently, instead of returning an error, to avoid breaking - * callers that blindly resize the filesystem to the full size of - * the underlying block device. - */ - if (ext4_has_feature_bigalloc(sb)) - n_blocks_count &= ~((1 << EXT4_CLUSTER_BITS(sb)) - 1); - retry: o_blocks_count = ext4_blocks_count(es); @@ -2090,7 +2079,7 @@ int ext4_resize_fs(struct super_block *sb, ext4_fsblk_t n_blocks_count) goto out; } - if (ext4_blocks_count(es) == n_blocks_count && n_blocks_count_retry == 0) + if (ext4_blocks_count(es) == n_blocks_count) goto out; err = ext4_alloc_flex_bg_array(sb, n_group + 1);
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 6b4e892..8ee83b4 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c
@@ -1086,7 +1086,6 @@ static struct inode *ext4_alloc_inode(struct super_block *sb) return NULL; inode_set_iversion(&ei->vfs_inode, 1); - ei->i_flags = 0; spin_lock_init(&ei->i_raw_lock); INIT_LIST_HEAD(&ei->i_prealloc_list); spin_lock_init(&ei->i_prealloc_lock); @@ -2540,9 +2539,11 @@ static __le16 ext4_group_desc_csum(struct super_block *sb, __u32 block_group, crc = crc16(crc, (__u8 *)gdp, offset); offset += sizeof(gdp->bg_checksum); /* skip checksum */ /* for checksum of struct ext4_group_desc do the rest...*/ - if (ext4_has_feature_64bit(sb) && offset < sbi->s_desc_size) + if (ext4_has_feature_64bit(sb) && + offset < le16_to_cpu(sbi->s_es->s_desc_size)) crc = crc16(crc, (__u8 *)gdp + offset, - sbi->s_desc_size - offset); + le16_to_cpu(sbi->s_es->s_desc_size) - + offset); out: return cpu_to_le16(crc); @@ -3221,7 +3222,6 @@ static int ext4_lazyinit_thread(void *arg) unsigned long next_wakeup, cur; BUG_ON(NULL == eli); - set_freezable(); cont_thread: while (true) { @@ -4446,31 +4446,30 @@ static int ext4_fill_super(struct super_block *sb, void *data, int silent) ext4_has_feature_journal_needs_recovery(sb)) { ext4_msg(sb, KERN_ERR, "required journal recovery " "suppressed and not mounted read-only"); - goto failed_mount3a; + goto failed_mount_wq; } else { /* Nojournal mode, all journal mount options are illegal */ - if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) { - ext4_msg(sb, KERN_ERR, "can't mount with " - "journal_async_commit, fs mounted w/o journal"); - goto failed_mount3a; - } - if (test_opt2(sb, EXPLICIT_JOURNAL_CHECKSUM)) { ext4_msg(sb, KERN_ERR, "can't mount with " "journal_checksum, fs mounted w/o journal"); - goto failed_mount3a; + goto failed_mount_wq; + } + if (test_opt(sb, JOURNAL_ASYNC_COMMIT)) { + ext4_msg(sb, KERN_ERR, "can't mount with " + "journal_async_commit, fs mounted w/o journal"); + goto failed_mount_wq; } if (sbi->s_commit_interval != JBD2_DEFAULT_MAX_COMMIT_AGE*HZ) { ext4_msg(sb, KERN_ERR, "can't mount with " "commit=%lu, fs mounted w/o journal", sbi->s_commit_interval / HZ); - goto failed_mount3a; + goto failed_mount_wq; } if (EXT4_MOUNT_DATA_FLAGS & (sbi->s_mount_opt ^ sbi->s_def_mount_opt)) { ext4_msg(sb, KERN_ERR, "can't mount with " "data=, fs mounted w/o journal"); - goto failed_mount3a; + goto failed_mount_wq; } sbi->s_def_mount_opt &= ~EXT4_MOUNT_JOURNAL_CHECKSUM; clear_opt(sb, JOURNAL_CHECKSUM); @@ -4890,7 +4889,7 @@ static struct inode *ext4_get_journal_inode(struct super_block *sb, jbd_debug(2, "Journal inode found at %p: %lld bytes\n", journal_inode, journal_inode->i_size); - if (!S_ISREG(journal_inode->i_mode) || IS_ENCRYPTED(journal_inode)) { + if (!S_ISREG(journal_inode->i_mode)) { ext4_msg(sb, KERN_ERR, "invalid journal inode"); iput(journal_inode); return NULL; @@ -5892,7 +5891,7 @@ static int ext4_write_info(struct super_block *sb, int type) handle_t *handle; /* Data block + inode block */ - handle = ext4_journal_start_sb(sb, EXT4_HT_QUOTA, 2); + handle = ext4_journal_start(d_inode(sb->s_root), EXT4_HT_QUOTA, 2); if (IS_ERR(handle)) return PTR_ERR(handle); ret = dquot_commit_info(sb, type); @@ -6009,20 +6008,6 @@ static int ext4_quota_on(struct super_block *sb, int type, int format_id, return err; } -static inline bool ext4_check_quota_inum(int type, unsigned long qf_inum) -{ - switch (type) { - case USRQUOTA: - return qf_inum == EXT4_USR_QUOTA_INO; - case GRPQUOTA: - return qf_inum == EXT4_GRP_QUOTA_INO; - case PRJQUOTA: - return qf_inum >= EXT4_GOOD_OLD_FIRST_INO; - default: - BUG(); - } -} - static int ext4_quota_enable(struct super_block *sb, int type, int format_id, unsigned int flags) { @@ -6039,16 +6024,9 @@ static int ext4_quota_enable(struct super_block *sb, int type, int format_id, if (!qf_inums[type]) return -EPERM; - if (!ext4_check_quota_inum(type, qf_inums[type])) { - ext4_error(sb, "Bad quota inum: %lu, type: %d", - qf_inums[type], type); - return -EUCLEAN; - } - qf_inode = ext4_iget(sb, qf_inums[type], EXT4_IGET_SPECIAL); if (IS_ERR(qf_inode)) { - ext4_error(sb, "Bad quota inode: %lu, type: %d", - qf_inums[type], type); + ext4_error(sb, "Bad quota inode # %lu", qf_inums[type]); return PTR_ERR(qf_inode); } @@ -6087,9 +6065,8 @@ static int ext4_enable_quotas(struct super_block *sb) if (err) { ext4_warning(sb, "Failed to enable quota tracking " - "(type=%d, err=%d, ino=%lu). " - "Please run e2fsck to fix.", type, - err, qf_inums[type]); + "(type=%d, err=%d). Please run " + "e2fsck to fix.", type, err); for (type--; type >= 0; type--) { struct inode *inode;
diff --git a/fs/ext4/sysfs.c b/fs/ext4/sysfs.c index f30d5d3..4508e8b 100644 --- a/fs/ext4/sysfs.c +++ b/fs/ext4/sysfs.c
@@ -391,11 +391,6 @@ static void ext4_sb_release(struct kobject *kobj) complete(&sbi->s_kobj_unregister); } -static void ext4_feat_release(struct kobject *kobj) -{ - kfree(kobj); -} - static const struct sysfs_ops ext4_attr_ops = { .show = ext4_attr_show, .store = ext4_attr_store, @@ -410,7 +405,7 @@ static struct kobj_type ext4_sb_ktype = { static struct kobj_type ext4_feat_ktype = { .default_groups = ext4_feat_groups, .sysfs_ops = &ext4_attr_ops, - .release = ext4_feat_release, + .release = (void (*)(struct kobject *))kfree, }; static struct kobject *ext4_root;
diff --git a/fs/ext4/verity.c b/fs/ext4/verity.c index 8303233..4602d38 100644 --- a/fs/ext4/verity.c +++ b/fs/ext4/verity.c
@@ -79,7 +79,8 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, size_t n = min_t(size_t, count, PAGE_SIZE - offset_in_page(pos)); struct page *page; - void *fsdata = NULL; + void *fsdata; + void *addr; int res; res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0, @@ -87,7 +88,9 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, if (res) return res; - memcpy_to_page(page, offset_in_page(pos), buf, n); + addr = kmap_atomic(page); + memcpy(addr + offset_in_page(pos), buf, n); + kunmap_atomic(addr); res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n, page, fsdata);
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 498ef73..20e40ca 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c
@@ -384,17 +384,6 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, struct inode *inode; int err; - /* - * We have to check for this corruption early as otherwise - * iget_locked() could wait indefinitely for the state of our - * parent inode. - */ - if (parent->i_ino == ea_ino) { - ext4_error(parent->i_sb, - "Parent and EA inode have the same ino %lu", ea_ino); - return -EFSCORRUPTED; - } - inode = ext4_iget(parent->i_sb, ea_ino, EXT4_IGET_NORMAL); if (IS_ERR(inode)) { err = PTR_ERR(inode); @@ -445,21 +434,6 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino, return err; } -/* Remove entry from mbcache when EA inode is getting evicted */ -void ext4_evict_ea_inode(struct inode *inode) -{ - struct mb_cache_entry *oe; - - if (!EA_INODE_CACHE(inode)) - return; - /* Wait for entry to get unused so that we can remove it */ - while ((oe = mb_cache_entry_delete_or_get(EA_INODE_CACHE(inode), - ext4_xattr_inode_get_hash(inode), inode->i_ino))) { - mb_cache_entry_wait_unused(oe); - mb_cache_entry_put(EA_INODE_CACHE(inode), oe); - } -} - static int ext4_xattr_inode_verify_hashes(struct inode *ea_inode, struct ext4_xattr_entry *entry, void *buffer, @@ -1045,8 +1019,10 @@ static int ext4_xattr_ensure_credits(handle_t *handle, struct inode *inode, static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode, int ref_change) { + struct mb_cache *ea_inode_cache = EA_INODE_CACHE(ea_inode); struct ext4_iloc iloc; s64 ref_count; + u32 hash; int ret; inode_lock(ea_inode); @@ -1069,6 +1045,14 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode, set_nlink(ea_inode, 1); ext4_orphan_del(handle, ea_inode); + + if (ea_inode_cache) { + hash = ext4_xattr_inode_get_hash(ea_inode); + mb_cache_entry_create(ea_inode_cache, + GFP_NOFS, hash, + ea_inode->i_ino, + true /* reusable */); + } } } else { WARN_ONCE(ref_count < 0, "EA inode %lu ref_count=%lld", @@ -1081,6 +1065,12 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode, clear_nlink(ea_inode); ext4_orphan_add(handle, ea_inode); + + if (ea_inode_cache) { + hash = ext4_xattr_inode_get_hash(ea_inode); + mb_cache_entry_delete(ea_inode_cache, hash, + ea_inode->i_ino); + } } } @@ -1259,7 +1249,6 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode, if (error) goto out; -retry_ref: lock_buffer(bh); hash = le32_to_cpu(BHDR(bh)->h_hash); ref = le32_to_cpu(BHDR(bh)->h_refcount); @@ -1269,18 +1258,9 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode, * This must happen under buffer lock for * ext4_xattr_block_set() to reliably detect freed block */ - if (ea_block_cache) { - struct mb_cache_entry *oe; - - oe = mb_cache_entry_delete_or_get(ea_block_cache, hash, - bh->b_blocknr); - if (oe) { - unlock_buffer(bh); - mb_cache_entry_wait_unused(oe); - mb_cache_entry_put(ea_block_cache, oe); - goto retry_ref; - } - } + if (ea_block_cache) + mb_cache_entry_delete(ea_block_cache, hash, + bh->b_blocknr); get_bh(bh); unlock_buffer(bh); @@ -1304,7 +1284,7 @@ ext4_xattr_release_block(handle_t *handle, struct inode *inode, ce = mb_cache_entry_get(ea_block_cache, hash, bh->b_blocknr); if (ce) { - set_bit(MBE_REUSABLE_B, &ce->e_flags); + ce->e_reusable = 1; mb_cache_entry_put(ea_block_cache, ce); } } @@ -1443,13 +1423,6 @@ static struct inode *ext4_xattr_inode_create(handle_t *handle, uid_t owner[2] = { i_uid_read(inode), i_gid_read(inode) }; int err; - if (inode->i_sb->s_root == NULL) { - ext4_warning(inode->i_sb, - "refuse to create EA inode when umounting"); - WARN_ON(1); - return ERR_PTR(-EINVAL); - } - /* * Let the next inode be the goal, so we try and allocate the EA inode * in the same group, or nearby one. @@ -1469,9 +1442,6 @@ static struct inode *ext4_xattr_inode_create(handle_t *handle, if (!err) err = ext4_inode_attach_jinode(ea_inode); if (err) { - if (ext4_xattr_inode_dec_ref(handle, ea_inode)) - ext4_warning_inode(ea_inode, - "cleanup dec ref error %d", err); iput(ea_inode); return ERR_PTR(err); } @@ -1898,8 +1868,6 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, #define header(x) ((struct ext4_xattr_header *)(x)) if (s->base) { - int offset = (char *)s->here - bs->bh->b_data; - BUFFER_TRACE(bs->bh, "get_write_access"); error = ext4_journal_get_write_access(handle, bs->bh); if (error) @@ -1914,20 +1882,9 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, * ext4_xattr_block_set() to reliably detect modified * block */ - if (ea_block_cache) { - struct mb_cache_entry *oe; - - oe = mb_cache_entry_delete_or_get(ea_block_cache, - hash, bs->bh->b_blocknr); - if (oe) { - /* - * Xattr block is getting reused. Leave - * it alone. - */ - mb_cache_entry_put(ea_block_cache, oe); - goto clone_block; - } - } + if (ea_block_cache) + mb_cache_entry_delete(ea_block_cache, hash, + bs->bh->b_blocknr); ea_bdebug(bs->bh, "modifying in-place"); error = ext4_xattr_set_entry(i, s, handle, inode, true /* is_block */); @@ -1942,47 +1899,50 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, if (error) goto cleanup; goto inserted; - } -clone_block: - unlock_buffer(bs->bh); - ea_bdebug(bs->bh, "cloning"); - s->base = kmemdup(BHDR(bs->bh), bs->bh->b_size, GFP_NOFS); - error = -ENOMEM; - if (s->base == NULL) - goto cleanup; - s->first = ENTRY(header(s->base)+1); - header(s->base)->h_refcount = cpu_to_le32(1); - s->here = ENTRY(s->base + offset); - s->end = s->base + bs->bh->b_size; + } else { + int offset = (char *)s->here - bs->bh->b_data; - /* - * If existing entry points to an xattr inode, we need - * to prevent ext4_xattr_set_entry() from decrementing - * ref count on it because the reference belongs to the - * original block. In this case, make the entry look - * like it has an empty value. - */ - if (!s->not_found && s->here->e_value_inum) { - ea_ino = le32_to_cpu(s->here->e_value_inum); - error = ext4_xattr_inode_iget(inode, ea_ino, - le32_to_cpu(s->here->e_hash), - &tmp_inode); - if (error) + unlock_buffer(bs->bh); + ea_bdebug(bs->bh, "cloning"); + s->base = kmalloc(bs->bh->b_size, GFP_NOFS); + error = -ENOMEM; + if (s->base == NULL) goto cleanup; + memcpy(s->base, BHDR(bs->bh), bs->bh->b_size); + s->first = ENTRY(header(s->base)+1); + header(s->base)->h_refcount = cpu_to_le32(1); + s->here = ENTRY(s->base + offset); + s->end = s->base + bs->bh->b_size; - if (!ext4_test_inode_state(tmp_inode, - EXT4_STATE_LUSTRE_EA_INODE)) { - /* - * Defer quota free call for previous - * inode until success is guaranteed. - */ - old_ea_inode_quota = le32_to_cpu( - s->here->e_value_size); + /* + * If existing entry points to an xattr inode, we need + * to prevent ext4_xattr_set_entry() from decrementing + * ref count on it because the reference belongs to the + * original block. In this case, make the entry look + * like it has an empty value. + */ + if (!s->not_found && s->here->e_value_inum) { + ea_ino = le32_to_cpu(s->here->e_value_inum); + error = ext4_xattr_inode_iget(inode, ea_ino, + le32_to_cpu(s->here->e_hash), + &tmp_inode); + if (error) + goto cleanup; + + if (!ext4_test_inode_state(tmp_inode, + EXT4_STATE_LUSTRE_EA_INODE)) { + /* + * Defer quota free call for previous + * inode until success is guaranteed. + */ + old_ea_inode_quota = le32_to_cpu( + s->here->e_value_size); + } + iput(tmp_inode); + + s->here->e_value_inum = 0; + s->here->e_value_size = 0; } - iput(tmp_inode); - - s->here->e_value_inum = 0; - s->here->e_value_size = 0; } } else { /* Allocate a buffer where we construct the new block. */ @@ -2049,13 +2009,18 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, lock_buffer(new_bh); /* * We have to be careful about races with - * adding references to xattr block. Once we - * hold buffer lock xattr block's state is - * stable so we can check the additional - * reference fits. + * freeing, rehashing or adding references to + * xattr block. Once we hold buffer lock xattr + * block's state is stable so we can check + * whether the block got freed / rehashed or + * not. Since we unhash mbcache entry under + * buffer lock when freeing / rehashing xattr + * block, checking whether entry is still + * hashed is reliable. Same rules hold for + * e_reusable handling. */ - ref = le32_to_cpu(BHDR(new_bh)->h_refcount) + 1; - if (ref > EXT4_XATTR_REFCOUNT_MAX) { + if (hlist_bl_unhashed(&ce->e_hash_list) || + !ce->e_reusable) { /* * Undo everything and check mbcache * again. @@ -2070,9 +2035,10 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, new_bh = NULL; goto inserted; } + ref = le32_to_cpu(BHDR(new_bh)->h_refcount) + 1; BHDR(new_bh)->h_refcount = cpu_to_le32(ref); - if (ref == EXT4_XATTR_REFCOUNT_MAX) - clear_bit(MBE_REUSABLE_B, &ce->e_flags); + if (ref >= EXT4_XATTR_REFCOUNT_MAX) + ce->e_reusable = 0; ea_bdebug(new_bh, "reusing; refcount now=%d", ref); ext4_xattr_block_csum_set(inode, new_bh); @@ -2100,11 +2066,19 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode, goal = ext4_group_first_block_no(sb, EXT4_I(inode)->i_block_group); + + /* non-extent files can't have physical blocks past 2^32 */ + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) + goal = goal & EXT4_MAX_BLOCK_FILE_PHYS; + block = ext4_new_meta_blocks(handle, inode, goal, 0, NULL, &error); if (error) goto cleanup; + if (!(ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) + BUG_ON(block > EXT4_MAX_BLOCK_FILE_PHYS); + ea_idebug(inode, "creating block %llu", (unsigned long long)block); @@ -2210,9 +2184,8 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, struct ext4_inode *raw_inode; int error; - if (!EXT4_INODE_HAS_XATTR_SPACE(inode)) + if (EXT4_I(inode)->i_extra_isize == 0) return 0; - raw_inode = ext4_raw_inode(&is->iloc); header = IHDR(inode, raw_inode); is->s.base = is->s.first = IFIRST(header); @@ -2232,7 +2205,7 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, return 0; } -int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode, +int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode, struct ext4_xattr_info *i, struct ext4_xattr_ibody_find *is) { @@ -2240,9 +2213,32 @@ int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode, struct ext4_xattr_search *s = &is->s; int error; - if (!EXT4_INODE_HAS_XATTR_SPACE(inode)) + if (EXT4_I(inode)->i_extra_isize == 0) return -ENOSPC; + error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */); + if (error) + return error; + header = IHDR(inode, ext4_raw_inode(&is->iloc)); + if (!IS_LAST_ENTRY(s->first)) { + header->h_magic = cpu_to_le32(EXT4_XATTR_MAGIC); + ext4_set_inode_state(inode, EXT4_STATE_XATTR); + } else { + header->h_magic = cpu_to_le32(0); + ext4_clear_inode_state(inode, EXT4_STATE_XATTR); + } + return 0; +} +static int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode, + struct ext4_xattr_info *i, + struct ext4_xattr_ibody_find *is) +{ + struct ext4_xattr_ibody_header *header; + struct ext4_xattr_search *s = &is->s; + int error; + + if (EXT4_I(inode)->i_extra_isize == 0) + return -ENOSPC; error = ext4_xattr_set_entry(i, s, handle, inode, false /* is_block */); if (error) return error; @@ -2569,13 +2565,13 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, .in_inode = !!entry->e_value_inum, }; struct ext4_xattr_ibody_header *header = IHDR(inode, raw_inode); - int needs_kvfree = 0; int error; is = kzalloc(sizeof(struct ext4_xattr_ibody_find), GFP_NOFS); bs = kzalloc(sizeof(struct ext4_xattr_block_find), GFP_NOFS); + buffer = kmalloc(value_size, GFP_NOFS); b_entry_name = kmalloc(entry->e_name_len + 1, GFP_NOFS); - if (!is || !bs || !b_entry_name) { + if (!is || !bs || !buffer || !b_entry_name) { error = -ENOMEM; goto out; } @@ -2587,18 +2583,12 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, /* Save the entry name and the entry value */ if (entry->e_value_inum) { - buffer = kvmalloc(value_size, GFP_NOFS); - if (!buffer) { - error = -ENOMEM; - goto out; - } - needs_kvfree = 1; error = ext4_xattr_inode_get(inode, entry, buffer, value_size); if (error) goto out; } else { size_t value_offs = le16_to_cpu(entry->e_value_offs); - buffer = (void *)IFIRST(header) + value_offs; + memcpy(buffer, (void *)IFIRST(header) + value_offs, value_size); } memcpy(b_entry_name, entry->e_name, entry->e_name_len); @@ -2613,26 +2603,25 @@ static int ext4_xattr_move_to_block(handle_t *handle, struct inode *inode, if (error) goto out; + /* Remove the chosen entry from the inode */ + error = ext4_xattr_ibody_set(handle, inode, &i, is); + if (error) + goto out; + i.value = buffer; i.value_len = value_size; error = ext4_xattr_block_find(inode, &i, bs); if (error) goto out; - /* Move ea entry from the inode into the block */ + /* Add entry which was removed from the inode into the block */ error = ext4_xattr_block_set(handle, inode, &i, bs); if (error) goto out; - - /* Remove the chosen entry from the inode */ - i.value = NULL; - i.value_len = 0; - error = ext4_xattr_ibody_set(handle, inode, &i, is); - + error = 0; out: kfree(b_entry_name); - if (needs_kvfree && buffer) - kvfree(buffer); + kfree(buffer); if (is) brelse(is->iloc.bh); if (bs) @@ -2807,9 +2796,6 @@ int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, (void *)header, total_ino); EXT4_I(inode)->i_extra_isize = new_extra_isize; - if (ext4_has_inline_data(inode)) - error = ext4_find_inline_data_nolock(inode); - cleanup: if (error && (mnt_count != le16_to_cpu(sbi->s_es->s_mnt_count))) { ext4_warning(inode->i_sb, "Unable to expand inode %lu. Delete some EAs or run e2fsck.",
diff --git a/fs/ext4/xattr.h b/fs/ext4/xattr.h index 66911f8..f39cad2 100644 --- a/fs/ext4/xattr.h +++ b/fs/ext4/xattr.h
@@ -95,19 +95,6 @@ struct ext4_xattr_entry { #define EXT4_ZERO_XATTR_VALUE ((void *)-1) -/* - * If we want to add an xattr to the inode, we should make sure that - * i_extra_isize is not 0 and that the inode size is not less than - * EXT4_GOOD_OLD_INODE_SIZE + extra_isize + pad. - * EXT4_GOOD_OLD_INODE_SIZE extra_isize header entry pad data - * |--------------------------|------------|------|---------|---|-------| - */ -#define EXT4_INODE_HAS_XATTR_SPACE(inode) \ - ((EXT4_I(inode)->i_extra_isize != 0) && \ - (EXT4_GOOD_OLD_INODE_SIZE + EXT4_I(inode)->i_extra_isize + \ - sizeof(struct ext4_xattr_ibody_header) + EXT4_XATTR_PAD <= \ - EXT4_INODE_SIZE((inode)->i_sb))) - struct ext4_xattr_info { const char *name; const void *value; @@ -190,7 +177,6 @@ extern void ext4_xattr_inode_array_free(struct ext4_xattr_inode_array *array); extern int ext4_expand_extra_isize_ea(struct inode *inode, int new_extra_isize, struct ext4_inode *raw_inode, handle_t *handle); -extern void ext4_evict_ea_inode(struct inode *inode); extern const struct xattr_handler *ext4_xattr_handlers[]; @@ -199,9 +185,9 @@ extern int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i, extern int ext4_xattr_ibody_get(struct inode *inode, int name_index, const char *name, void *buffer, size_t buffer_size); -extern int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode, - struct ext4_xattr_info *i, - struct ext4_xattr_ibody_find *is); +extern int ext4_xattr_ibody_inline_set(handle_t *handle, struct inode *inode, + struct ext4_xattr_info *i, + struct ext4_xattr_ibody_find *is); extern struct mb_cache *ext4_xattr_create_cache(void); extern void ext4_xattr_destroy_cache(struct mb_cache *);
diff --git a/fs/f2fs/checkpoint.c b/fs/f2fs/checkpoint.c index a65f889..71a1d83 100644 --- a/fs/f2fs/checkpoint.c +++ b/fs/f2fs/checkpoint.c
@@ -142,7 +142,7 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, unsigned int segno, offset; bool exist; - if (type == DATA_GENERIC) + if (type != DATA_GENERIC_ENHANCE && type != DATA_GENERIC_ENHANCE_READ) return true; segno = GET_SEGNO(sbi, blkaddr); @@ -150,13 +150,6 @@ static bool __is_bitmap_valid(struct f2fs_sb_info *sbi, block_t blkaddr, se = get_seg_entry(sbi, segno); exist = f2fs_test_bit(offset, se->cur_valid_map); - if (exist && type == DATA_GENERIC_ENHANCE_UPDATE) { - f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", - blkaddr, exist); - set_sbi_flag(sbi, SBI_NEED_FSCK); - return exist; - } - if (!exist && type == DATA_GENERIC_ENHANCE) { f2fs_err(sbi, "Inconsistent error blkaddr:%u, sit bitmap:%d", blkaddr, exist); @@ -194,7 +187,6 @@ bool f2fs_is_valid_blkaddr(struct f2fs_sb_info *sbi, case DATA_GENERIC: case DATA_GENERIC_ENHANCE: case DATA_GENERIC_ENHANCE_READ: - case DATA_GENERIC_ENHANCE_UPDATE: if (unlikely(blkaddr >= MAX_BLKADDR(sbi) || blkaddr < MAIN_BLKADDR(sbi))) { f2fs_warn(sbi, "access invalid blkaddr:%u",
diff --git a/fs/f2fs/data.c b/fs/f2fs/data.c index 8f275cf..b2db8fc 100644 --- a/fs/f2fs/data.c +++ b/fs/f2fs/data.c
@@ -681,7 +681,7 @@ int f2fs_submit_page_bio(struct f2fs_io_info *fio) } if (fio->io_wbc && !is_read_io(fio->op)) - wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); + wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE); __attach_io_flag(fio); bio_set_op_attrs(bio, fio->op, fio->op_flags); @@ -891,7 +891,7 @@ int f2fs_merge_page_bio(struct f2fs_io_info *fio) } if (fio->io_wbc) - wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); + wbc_account_cgroup_owner(fio->io_wbc, page, PAGE_SIZE); inc_page_count(fio->sbi, WB_DATA_TYPE(page)); @@ -965,7 +965,7 @@ void f2fs_submit_page_write(struct f2fs_io_info *fio) } if (fio->io_wbc) - wbc_account_cgroup_owner(fio->io_wbc, fio->page, PAGE_SIZE); + wbc_account_cgroup_owner(fio->io_wbc, bio_page, PAGE_SIZE); io->last_block_in_bio = fio->new_blkaddr;
diff --git a/fs/f2fs/extent_cache.c b/fs/f2fs/extent_cache.c index ad0b83a..3ebf976 100644 --- a/fs/f2fs/extent_cache.c +++ b/fs/f2fs/extent_cache.c
@@ -414,8 +414,7 @@ static bool f2fs_lookup_extent_tree(struct inode *inode, pgoff_t pgofs, struct extent_node *en; bool ret = false; - if (!et) - return false; + f2fs_bug_on(sbi, !et); trace_f2fs_lookup_extent_tree_start(inode, pgofs); @@ -763,8 +762,9 @@ void f2fs_drop_extent_tree(struct inode *inode) if (!f2fs_may_extent_tree(inode)) return; - write_lock(&et->lock); set_inode_flag(inode, FI_NO_EXTENT); + + write_lock(&et->lock); __free_extent_tree(sbi, et); if (et->largest.len) { et->largest.len = 0;
diff --git a/fs/f2fs/f2fs.h b/fs/f2fs/f2fs.h index ed104be..32b15ee 100644 --- a/fs/f2fs/f2fs.h +++ b/fs/f2fs/f2fs.h
@@ -238,10 +238,6 @@ enum { * condition of read on truncated area * by extent_cache */ - DATA_GENERIC_ENHANCE_UPDATE, /* - * strong check on range and segment - * bitmap for update case - */ META_GENERIC, };
diff --git a/fs/f2fs/gc.c b/fs/f2fs/gc.c index b90fe57..15289f5 100644 --- a/fs/f2fs/gc.c +++ b/fs/f2fs/gc.c
@@ -1000,7 +1000,7 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, { struct page *node_page; nid_t nid; - unsigned int ofs_in_node, max_addrs, base; + unsigned int ofs_in_node; block_t source_blkaddr; nid = le32_to_cpu(sum->nid); @@ -1026,21 +1026,6 @@ static bool is_alive(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, return false; } - if (IS_INODE(node_page)) { - base = offset_in_addr(F2FS_INODE(node_page)); - max_addrs = DEF_ADDRS_PER_INODE; - } else { - base = 0; - max_addrs = DEF_ADDRS_PER_BLOCK; - } - - if (base + ofs_in_node >= max_addrs) { - f2fs_err(sbi, "Inconsistent blkaddr offset: base:%u, ofs_in_node:%u, max:%u, ino:%u, nid:%u", - base, ofs_in_node, max_addrs, dni->ino, dni->nid); - f2fs_put_page(node_page, 1); - return false; - } - *nofs = ofs_of_node(node_page); source_blkaddr = data_blkaddr(NULL, node_page, ofs_in_node); f2fs_put_page(node_page, 1); @@ -1677,9 +1662,8 @@ static int do_garbage_collect(struct f2fs_sb_info *sbi, get_valid_blocks(sbi, segno, false) == 0) seg_freed++; - if (__is_large_section(sbi)) - sbi->next_victim_seg[gc_type] = - (segno + 1 < end_segno) ? segno + 1 : NULL_SEGNO; + if (__is_large_section(sbi) && segno + 1 < end_segno) + sbi->next_victim_seg[gc_type] = segno + 1; skip: f2fs_put_page(sum_page, 0); }
diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c index 450c157..f8adf18 100644 --- a/fs/f2fs/inline.c +++ b/fs/f2fs/inline.c
@@ -45,6 +45,7 @@ bool f2fs_may_inline_dentry(struct inode *inode) void f2fs_do_read_inline_data(struct page *page, struct page *ipage) { struct inode *inode = page->mapping->host; + void *src_addr, *dst_addr; if (PageUptodate(page)) return; @@ -54,8 +55,11 @@ void f2fs_do_read_inline_data(struct page *page, struct page *ipage) zero_user_segment(page, MAX_INLINE_DATA(inode), PAGE_SIZE); /* Copy the whole inline data block */ - memcpy_to_page(page, 0, inline_data_addr(inode, ipage), - MAX_INLINE_DATA(inode)); + src_addr = inline_data_addr(inode, ipage); + dst_addr = kmap_atomic(page); + memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); + flush_dcache_page(page); + kunmap_atomic(dst_addr); if (!PageUptodate(page)) SetPageUptodate(page); } @@ -244,6 +248,7 @@ int f2fs_convert_inline_inode(struct inode *inode) int f2fs_write_inline_data(struct inode *inode, struct page *page) { + void *src_addr, *dst_addr; struct dnode_of_data dn; int err; @@ -260,8 +265,10 @@ int f2fs_write_inline_data(struct inode *inode, struct page *page) f2fs_bug_on(F2FS_I_SB(inode), page->index); f2fs_wait_on_page_writeback(dn.inode_page, NODE, true, true); - memcpy_from_page(inline_data_addr(inode, dn.inode_page), - page, 0, MAX_INLINE_DATA(inode)); + src_addr = kmap_atomic(page); + dst_addr = inline_data_addr(inode, dn.inode_page); + memcpy(dst_addr, src_addr, MAX_INLINE_DATA(inode)); + kunmap_atomic(src_addr); set_page_dirty(dn.inode_page); f2fs_clear_page_cache_dirty_tag(page); @@ -422,17 +429,18 @@ static int f2fs_move_inline_dirents(struct inode *dir, struct page *ipage, dentry_blk = page_address(page); - /* - * Start by zeroing the full block, to ensure that all unused space is - * zeroed and no uninitialized memory is leaked to disk. - */ - memset(dentry_blk, 0, F2FS_BLKSIZE); - make_dentry_ptr_inline(dir, &src, inline_dentry); make_dentry_ptr_block(dir, &dst, dentry_blk); /* copy data from inline dentry block to new dentry block */ memcpy(dst.bitmap, src.bitmap, src.nr_bitmap); + memset(dst.bitmap + src.nr_bitmap, 0, dst.nr_bitmap - src.nr_bitmap); + /* + * we do not need to zero out remainder part of dentry and filename + * field, since we have used bitmap for marking the usage status of + * them, besides, we can also ignore copying/zeroing reserved space + * of dentry block, because them haven't been used so far. + */ memcpy(dst.dentry, src.dentry, SIZE_OF_DIR_ENTRY * src.max); memcpy(dst.filename, src.filename, src.max * F2FS_SLOT_LEN);
diff --git a/fs/f2fs/node.c b/fs/f2fs/node.c index aedaeff..d40cbb1 100644 --- a/fs/f2fs/node.c +++ b/fs/f2fs/node.c
@@ -1260,11 +1260,7 @@ struct page *f2fs_new_node_page(struct dnode_of_data *dn, unsigned int ofs) dec_valid_node_count(sbi, dn->inode, !ofs); goto fail; } - if (unlikely(new_ni.blk_addr != NULL_ADDR)) { - err = -EFSCORRUPTED; - set_sbi_flag(sbi, SBI_NEED_FSCK); - goto fail; - } + f2fs_bug_on(sbi, new_ni.blk_addr != NULL_ADDR); #endif new_ni.nid = dn->nid; new_ni.ino = dn->inode->i_ino; @@ -1325,8 +1321,8 @@ static int read_node_page(struct page *page, int op_flags) if (err) return err; - /* NEW_ADDR can be seen, after cp_error drops some dirty node pages */ - if (unlikely(ni.blk_addr == NULL_ADDR || ni.blk_addr == NEW_ADDR)) { + if (unlikely(ni.blk_addr == NULL_ADDR) || + is_sbi_flag_set(sbi, SBI_IS_SHUTDOWN)) { ClearPageUptodate(page); return -ENOENT; }
diff --git a/fs/f2fs/recovery.c b/fs/f2fs/recovery.c index ce019cf..695eacf 100644 --- a/fs/f2fs/recovery.c +++ b/fs/f2fs/recovery.c
@@ -451,7 +451,7 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, struct dnode_of_data tdn = *dn; nid_t ino, nid; struct inode *inode; - unsigned int offset, ofs_in_node, max_addrs; + unsigned int offset; block_t bidx; int i; @@ -478,24 +478,15 @@ static int check_index_in_prev_nodes(struct f2fs_sb_info *sbi, got_it: /* Use the locked dnode page and inode */ nid = le32_to_cpu(sum.nid); - ofs_in_node = le16_to_cpu(sum.ofs_in_node); - - max_addrs = ADDRS_PER_PAGE(dn->node_page, dn->inode); - if (ofs_in_node >= max_addrs) { - f2fs_err(sbi, "Inconsistent ofs_in_node:%u in summary, ino:%lu, nid:%u, max:%u", - ofs_in_node, dn->inode->i_ino, nid, max_addrs); - return -EFSCORRUPTED; - } - if (dn->inode->i_ino == nid) { tdn.nid = nid; if (!dn->inode_page_locked) lock_page(dn->inode_page); tdn.node_page = dn->inode_page; - tdn.ofs_in_node = ofs_in_node; + tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node); goto truncate_out; } else if (dn->nid == nid) { - tdn.ofs_in_node = ofs_in_node; + tdn.ofs_in_node = le16_to_cpu(sum.ofs_in_node); goto truncate_out; } @@ -685,14 +676,6 @@ static int do_recover_data(struct f2fs_sb_info *sbi, struct inode *inode, goto err; } - if (f2fs_is_valid_blkaddr(sbi, dest, - DATA_GENERIC_ENHANCE_UPDATE)) { - f2fs_err(sbi, "Inconsistent dest blkaddr:%u, ino:%lu, ofs:%u", - dest, inode->i_ino, dn.ofs_in_node); - err = -EFSCORRUPTED; - goto err; - } - /* write dummy data page */ f2fs_replace_block(sbi, &dn, src, dest, ni.version, false, false);
diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index 6cdb1fc..df575de 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c
@@ -1541,7 +1541,7 @@ static int __issue_discard_cmd(struct f2fs_sb_info *sbi, if (i + 1 < dpolicy->granularity) break; - if (i + 1 < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) + if (i < DEFAULT_DISCARD_GRANULARITY && dpolicy->ordered) return __issue_discard_cmd_orderly(sbi, dpolicy); pend_list = &dcc->pend_list[i];
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index c1e1819..7438161 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c
@@ -2292,6 +2292,7 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, size_t toread; loff_t i_size = i_size_read(inode); struct page *page; + char *kaddr; if (off > i_size) return 0; @@ -2325,7 +2326,9 @@ static ssize_t f2fs_quota_read(struct super_block *sb, int type, char *data, return -EIO; } - memcpy_from_page(data, page, offset, tocopy); + kaddr = kmap_atomic(page); + memcpy(data, kaddr + offset, tocopy); + kunmap_atomic(kaddr); f2fs_put_page(page, 1); offset = 0; @@ -2347,6 +2350,7 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, size_t towrite = len; struct page *page; void *fsdata = NULL; + char *kaddr; int err = 0; int tocopy; @@ -2366,7 +2370,10 @@ static ssize_t f2fs_quota_write(struct super_block *sb, int type, break; } - memcpy_to_page(page, offset, data, tocopy); + kaddr = kmap_atomic(page); + memcpy(kaddr + offset, data, tocopy); + kunmap_atomic(kaddr); + flush_dcache_page(page); a_ops->write_end(NULL, mapping, off, tocopy, tocopy, page, fsdata);
diff --git a/fs/f2fs/verity.c b/fs/f2fs/verity.c index fbb87ae..ffd95b0 100644 --- a/fs/f2fs/verity.c +++ b/fs/f2fs/verity.c
@@ -47,13 +47,16 @@ static int pagecache_read(struct inode *inode, void *buf, size_t count, size_t n = min_t(size_t, count, PAGE_SIZE - offset_in_page(pos)); struct page *page; + void *addr; page = read_mapping_page(inode->i_mapping, pos >> PAGE_SHIFT, NULL); if (IS_ERR(page)) return PTR_ERR(page); - memcpy_from_page(buf, page, offset_in_page(pos), n); + addr = kmap_atomic(page); + memcpy(buf, addr + offset_in_page(pos), n); + kunmap_atomic(addr); put_page(page); @@ -78,7 +81,8 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, size_t n = min_t(size_t, count, PAGE_SIZE - offset_in_page(pos)); struct page *page; - void *fsdata = NULL; + void *fsdata; + void *addr; int res; res = pagecache_write_begin(NULL, inode->i_mapping, pos, n, 0, @@ -86,7 +90,9 @@ static int pagecache_write(struct inode *inode, const void *buf, size_t count, if (res) return res; - memcpy_to_page(page, offset_in_page(pos), buf, n); + addr = kmap_atomic(page); + memcpy(addr + offset_in_page(pos), buf, n); + kunmap_atomic(addr); res = pagecache_write_end(NULL, inode->i_mapping, pos, n, n, page, fsdata);
diff --git a/fs/file.c b/fs/file.c index e56059f..51f53a7 100644 --- a/fs/file.c +++ b/fs/file.c
@@ -654,7 +654,6 @@ int __close_fd_get_file(unsigned int fd, struct file **res) fdt = files_fdtable(files); if (fd >= fdt->max_fds) goto out_unlock; - fd = array_index_nospec(fd, fdt->max_fds); file = fdt->fd[fd]; if (!file) goto out_unlock;
diff --git a/fs/fuse/control.c b/fs/fuse/control.c index 2742d74..c23f6f2 100644 --- a/fs/fuse/control.c +++ b/fs/fuse/control.c
@@ -265,7 +265,7 @@ int fuse_ctl_add_conn(struct fuse_conn *fc) struct dentry *parent; char name[32]; - if (!fuse_control_sb || fc->no_control) + if (!fuse_control_sb) return 0; parent = fuse_control_sb->s_root; @@ -303,7 +303,7 @@ void fuse_ctl_remove_conn(struct fuse_conn *fc) { int i; - if (!fuse_control_sb || fc->no_control) + if (!fuse_control_sb) return; for (i = fc->ctl_ndents - 1; i >= 0; i--) {
diff --git a/fs/fuse/file.c b/fs/fuse/file.c index fe050b9..093006a 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c
@@ -3221,19 +3221,24 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, .mode = mode }; int err; + bool lock_inode = !(mode & FALLOC_FL_KEEP_SIZE) || + (mode & FALLOC_FL_PUNCH_HOLE); + if (mode & ~(FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE)) return -EOPNOTSUPP; if (fc->no_fallocate) return -EOPNOTSUPP; - inode_lock(inode); - if (mode & FALLOC_FL_PUNCH_HOLE) { - loff_t endbyte = offset + length - 1; + if (lock_inode) { + inode_lock(inode); + if (mode & FALLOC_FL_PUNCH_HOLE) { + loff_t endbyte = offset + length - 1; - err = fuse_writeback_range(inode, offset, endbyte); - if (err) - goto out; + err = fuse_writeback_range(inode, offset, endbyte); + if (err) + goto out; + } } if (!(mode & FALLOC_FL_KEEP_SIZE) && @@ -3243,10 +3248,6 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, goto out; } - err = file_modified(file); - if (err) - goto out; - if (!(mode & FALLOC_FL_KEEP_SIZE)) set_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); @@ -3280,7 +3281,8 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, if (!(mode & FALLOC_FL_KEEP_SIZE)) clear_bit(FUSE_I_SIZE_UNSTABLE, &fi->state); - inode_unlock(inode); + if (lock_inode) + inode_unlock(inode); return err; }
diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 1c982cd..cbe6d01 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c
@@ -162,12 +162,6 @@ void fuse_change_attributes_common(struct inode *inode, struct fuse_attr *attr, inode->i_uid = make_kuid(fc->user_ns, attr->uid); inode->i_gid = make_kgid(fc->user_ns, attr->gid); inode->i_blocks = attr->blocks; - - /* Sanitize nsecs */ - attr->atimensec = min_t(u32, attr->atimensec, NSEC_PER_SEC - 1); - attr->mtimensec = min_t(u32, attr->mtimensec, NSEC_PER_SEC - 1); - attr->ctimensec = min_t(u32, attr->ctimensec, NSEC_PER_SEC - 1); - inode->i_atime.tv_sec = attr->atime; inode->i_atime.tv_nsec = attr->atimensec; /* mtime from server may be stale due to local buffered write */
diff --git a/fs/gfs2/aops.c b/fs/gfs2/aops.c index 9dbe94c..b9fe975 100644 --- a/fs/gfs2/aops.c +++ b/fs/gfs2/aops.c
@@ -156,6 +156,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w { struct inode *inode = page->mapping->host; struct gfs2_inode *ip = GFS2_I(inode); + struct gfs2_sbd *sdp = GFS2_SB(inode); if (PageChecked(page)) { ClearPageChecked(page); @@ -163,7 +164,7 @@ static int __gfs2_jdata_writepage(struct page *page, struct writeback_control *w create_empty_buffers(page, inode->i_sb->s_blocksize, BIT(BH_Dirty)|BIT(BH_Uptodate)); } - gfs2_page_add_databufs(ip, page, 0, PAGE_SIZE); + gfs2_page_add_databufs(ip, page, 0, sdp->sd_vfs->s_blocksize); } return gfs2_write_full_page(page, gfs2_get_block_noalloc, wbc); } @@ -456,6 +457,8 @@ static int stuffed_readpage(struct gfs2_inode *ip, struct page *page) return error; kaddr = kmap_atomic(page); + if (dsize > gfs2_max_stuffed_size(ip)) + dsize = gfs2_max_stuffed_size(ip); memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); memset(kaddr + dsize, 0, PAGE_SIZE - dsize); kunmap_atomic(kaddr);
diff --git a/fs/gfs2/bmap.c b/fs/gfs2/bmap.c index b349ba3..77a497a 100644 --- a/fs/gfs2/bmap.c +++ b/fs/gfs2/bmap.c
@@ -70,6 +70,9 @@ static int gfs2_unstuffer_page(struct gfs2_inode *ip, struct buffer_head *dibh, void *kaddr = kmap(page); u64 dsize = i_size_read(inode); + if (dsize > gfs2_max_stuffed_size(ip)) + dsize = gfs2_max_stuffed_size(ip); + memcpy(kaddr, dibh->b_data + sizeof(struct gfs2_dinode), dsize); memset(kaddr + dsize, 0, PAGE_SIZE - dsize); kunmap(page);
diff --git a/fs/gfs2/glops.c b/fs/gfs2/glops.c index 69106a1..d5b9274 100644 --- a/fs/gfs2/glops.c +++ b/fs/gfs2/glops.c
@@ -411,9 +411,6 @@ static int gfs2_dinode_in(struct gfs2_inode *ip, const void *buf) ip->i_depth = (u8)depth; ip->i_entries = be32_to_cpu(str->di_entries); - if (gfs2_is_stuffed(ip) && ip->i_inode.i_size > gfs2_max_stuffed_size(ip)) - goto corrupt; - if (S_ISREG(ip->i_inode.i_mode)) gfs2_set_aops(&ip->i_inode);
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c index 2112ff7..29b27d7 100644 --- a/fs/gfs2/ops_fstype.c +++ b/fs/gfs2/ops_fstype.c
@@ -180,10 +180,7 @@ static int gfs2_check_sb(struct gfs2_sbd *sdp, int silent) pr_warn("Invalid superblock size\n"); return -EINVAL; } - if (sb->sb_bsize_shift != ffs(sb->sb_bsize) - 1) { - pr_warn("Invalid block size shift\n"); - return -EINVAL; - } + return 0; } @@ -380,10 +377,8 @@ static int init_names(struct gfs2_sbd *sdp, int silent) if (!table[0]) table = sdp->sd_vfs->s_id; - BUILD_BUG_ON(GFS2_LOCKNAME_LEN > GFS2_FSNAME_LEN); - - strscpy(sdp->sd_proto_name, proto, GFS2_LOCKNAME_LEN); - strscpy(sdp->sd_table_name, table, GFS2_LOCKNAME_LEN); + strlcpy(sdp->sd_proto_name, proto, GFS2_FSNAME_LEN); + strlcpy(sdp->sd_table_name, table, GFS2_FSNAME_LEN); table = sdp->sd_table_name; while ((table = strchr(table, '/'))) @@ -1354,13 +1349,13 @@ static int gfs2_parse_param(struct fs_context *fc, struct fs_parameter *param) switch (o) { case Opt_lockproto: - strscpy(args->ar_lockproto, param->string, GFS2_LOCKNAME_LEN); + strlcpy(args->ar_lockproto, param->string, GFS2_LOCKNAME_LEN); break; case Opt_locktable: - strscpy(args->ar_locktable, param->string, GFS2_LOCKNAME_LEN); + strlcpy(args->ar_locktable, param->string, GFS2_LOCKNAME_LEN); break; case Opt_hostdata: - strscpy(args->ar_hostdata, param->string, GFS2_LOCKNAME_LEN); + strlcpy(args->ar_hostdata, param->string, GFS2_LOCKNAME_LEN); break; case Opt_spectator: args->ar_spectator = 1;
diff --git a/fs/hfs/bnode.c b/fs/hfs/bnode.c index 397e02a..c0a73a6 100644 --- a/fs/hfs/bnode.c +++ b/fs/hfs/bnode.c
@@ -281,7 +281,6 @@ static struct hfs_bnode *__hfs_bnode_create(struct hfs_btree *tree, u32 cnid) tree->node_hash[hash] = node; tree->node_hash_cnt++; } else { - hfs_bnode_get(node2); spin_unlock(&tree->hash_lock); kfree(node); wait_event(node2->lock_wq, !test_bit(HFS_BNODE_NEW, &node2->flags));
diff --git a/fs/hfs/inode.c b/fs/hfs/inode.c index ee2ea55..da243c8 100644 --- a/fs/hfs/inode.c +++ b/fs/hfs/inode.c
@@ -453,16 +453,14 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc) /* panic? */ return -EIO; - res = -EIO; - if (HFS_I(main_inode)->cat_key.CName.len > HFS_NAMELEN) - goto out; fd.search_key->cat = HFS_I(main_inode)->cat_key; if (hfs_brec_find(&fd)) + /* panic? */ goto out; if (S_ISDIR(main_inode->i_mode)) { if (fd.entrylength < sizeof(struct hfs_cat_dir)) - goto out; + /* panic? */; hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_dir)); if (rec.type != HFS_CDR_DIR || @@ -475,8 +473,6 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc) hfs_bnode_write(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_dir)); } else if (HFS_IS_RSRC(inode)) { - if (fd.entrylength < sizeof(struct hfs_cat_file)) - goto out; hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); hfs_inode_write_fork(inode, rec.file.RExtRec, @@ -485,7 +481,7 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc) sizeof(struct hfs_cat_file)); } else { if (fd.entrylength < sizeof(struct hfs_cat_file)) - goto out; + /* panic? */; hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || @@ -502,10 +498,9 @@ int hfs_write_inode(struct inode *inode, struct writeback_control *wbc) hfs_bnode_write(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); } - res = 0; out: hfs_find_exit(&fd); - return res; + return 0; } static struct dentry *hfs_file_lookup(struct inode *dir, struct dentry *dentry,
diff --git a/fs/hfs/trans.c b/fs/hfs/trans.c index fdb0edb..39f5e34 100644 --- a/fs/hfs/trans.c +++ b/fs/hfs/trans.c
@@ -109,7 +109,7 @@ void hfs_asc2mac(struct super_block *sb, struct hfs_name *out, const struct qstr if (nls_io) { wchar_t ch; - while (srclen > 0 && dstlen > 0) { + while (srclen > 0) { size = nls_io->char2uni(src, srclen, &ch); if (size < 0) { ch = '?';
diff --git a/fs/hfsplus/hfsplus_fs.h b/fs/hfsplus/hfsplus_fs.h index 9580179..b8471bf 100644 --- a/fs/hfsplus/hfsplus_fs.h +++ b/fs/hfsplus/hfsplus_fs.h
@@ -198,8 +198,6 @@ struct hfsplus_sb_info { #define HFSPLUS_SB_HFSX 3 #define HFSPLUS_SB_CASEFOLD 4 #define HFSPLUS_SB_NOBARRIER 5 -#define HFSPLUS_SB_UID 6 -#define HFSPLUS_SB_GID 7 static inline struct hfsplus_sb_info *HFSPLUS_SB(struct super_block *sb) {
diff --git a/fs/hfsplus/inode.c b/fs/hfsplus/inode.c index 76501d9..d131c8e 100644 --- a/fs/hfsplus/inode.c +++ b/fs/hfsplus/inode.c
@@ -187,11 +187,11 @@ static void hfsplus_get_perms(struct inode *inode, mode = be16_to_cpu(perms->mode); i_uid_write(inode, be32_to_cpu(perms->owner)); - if ((test_bit(HFSPLUS_SB_UID, &sbi->flags)) || (!i_uid_read(inode) && !mode)) + if (!i_uid_read(inode) && !mode) inode->i_uid = sbi->uid; i_gid_write(inode, be32_to_cpu(perms->group)); - if ((test_bit(HFSPLUS_SB_GID, &sbi->flags)) || (!i_gid_read(inode) && !mode)) + if (!i_gid_read(inode) && !mode) inode->i_gid = sbi->gid; if (dir) { @@ -497,7 +497,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd) if (type == HFSPLUS_FOLDER) { struct hfsplus_cat_folder *folder = &entry.folder; - WARN_ON(fd->entrylength < sizeof(struct hfsplus_cat_folder)); + if (fd->entrylength < sizeof(struct hfsplus_cat_folder)) + /* panic? */; hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, sizeof(struct hfsplus_cat_folder)); hfsplus_get_perms(inode, &folder->permissions, 1); @@ -517,7 +518,8 @@ int hfsplus_cat_read_inode(struct inode *inode, struct hfs_find_data *fd) } else if (type == HFSPLUS_FILE) { struct hfsplus_cat_file *file = &entry.file; - WARN_ON(fd->entrylength < sizeof(struct hfsplus_cat_file)); + if (fd->entrylength < sizeof(struct hfsplus_cat_file)) + /* panic? */; hfs_bnode_read(fd->bnode, &entry, fd->entryoffset, sizeof(struct hfsplus_cat_file)); @@ -574,7 +576,8 @@ int hfsplus_cat_write_inode(struct inode *inode) if (S_ISDIR(main_inode->i_mode)) { struct hfsplus_cat_folder *folder = &entry.folder; - WARN_ON(fd.entrylength < sizeof(struct hfsplus_cat_folder)); + if (fd.entrylength < sizeof(struct hfsplus_cat_folder)) + /* panic? */; hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_folder)); /* simple node checks? */ @@ -599,7 +602,8 @@ int hfsplus_cat_write_inode(struct inode *inode) } else { struct hfsplus_cat_file *file = &entry.file; - WARN_ON(fd.entrylength < sizeof(struct hfsplus_cat_file)); + if (fd.entrylength < sizeof(struct hfsplus_cat_file)) + /* panic? */; hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork);
diff --git a/fs/hfsplus/options.c b/fs/hfsplus/options.c index c94a587..047e05c 100644 --- a/fs/hfsplus/options.c +++ b/fs/hfsplus/options.c
@@ -140,8 +140,6 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) if (!uid_valid(sbi->uid)) { pr_err("invalid uid specified\n"); return 0; - } else { - set_bit(HFSPLUS_SB_UID, &sbi->flags); } break; case opt_gid: @@ -153,8 +151,6 @@ int hfsplus_parse_options(char *input, struct hfsplus_sb_info *sbi) if (!gid_valid(sbi->gid)) { pr_err("invalid gid specified\n"); return 0; - } else { - set_bit(HFSPLUS_SB_GID, &sbi->flags); } break; case opt_part:
diff --git a/fs/hfsplus/super.c b/fs/hfsplus/super.c index 29a39af..2b9e574 100644 --- a/fs/hfsplus/super.c +++ b/fs/hfsplus/super.c
@@ -295,11 +295,11 @@ static void hfsplus_put_super(struct super_block *sb) hfsplus_sync_fs(sb, 1); } - iput(sbi->alloc_file); - iput(sbi->hidden_dir); hfs_btree_close(sbi->attr_tree); hfs_btree_close(sbi->cat_tree); hfs_btree_close(sbi->ext_tree); + iput(sbi->alloc_file); + iput(sbi->hidden_dir); kfree(sbi->s_vhdr_buf); kfree(sbi->s_backup_vhdr_buf); unload_nls(sbi->nls);
diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index b1d31c7..7d039ba 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c
@@ -1232,7 +1232,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par case Opt_size: /* memparse() will accept a K/M/G without a digit */ - if (!param->string || !isdigit(param->string[0])) + if (!isdigit(param->string[0])) goto bad_val; ctx->max_size_opt = memparse(param->string, &rest); ctx->max_val_type = SIZE_STD; @@ -1242,7 +1242,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par case Opt_nr_inodes: /* memparse() will accept a K/M/G without a digit */ - if (!param->string || !isdigit(param->string[0])) + if (!isdigit(param->string[0])) goto bad_val; ctx->nr_inodes = memparse(param->string, &rest); return 0; @@ -1258,7 +1258,7 @@ static int hugetlbfs_parse_param(struct fs_context *fc, struct fs_parameter *par case Opt_min_size: /* memparse() will accept a K/M/G without a digit */ - if (!param->string || !isdigit(param->string[0])) + if (!isdigit(param->string[0])) goto bad_val; ctx->min_size_opt = memparse(param->string, &rest); ctx->min_val_type = SIZE_STD;
diff --git a/fs/incfs/data_mgmt.c b/fs/incfs/data_mgmt.c index 2942281..bc272fc 100644 --- a/fs/incfs/data_mgmt.c +++ b/fs/incfs/data_mgmt.c
@@ -3,6 +3,7 @@ * Copyright 2019 Google LLC */ #include <linux/crc32.h> +#include <linux/delay.h> #include <linux/file.h> #include <linux/fsverity.h> #include <linux/gfp.h> @@ -1103,10 +1104,25 @@ static void notify_pending_reads(struct mount_info *mi, wake_up_all(&mi->mi_blocks_written_notif_wq); } +static int usleep_interruptible(u32 us) +{ + /* See: + * https://www.kernel.org/doc/Documentation/timers/timers-howto.txt + * for explanation + */ + if (us < 10) { + udelay(us); + return 0; + } else if (us < 20000) { + usleep_range(us, us + us / 10); + return 0; + } else + return msleep_interruptible(us / 1000); +} + static int wait_for_data_block(struct data_file *df, int block_index, struct data_file_block *res_block, - struct incfs_read_data_file_timeouts *timeouts, - unsigned int *delayed_min_us) + struct incfs_read_data_file_timeouts *timeouts) { struct data_file_block block = {}; struct data_file_segment *segment = NULL; @@ -1114,7 +1130,7 @@ static int wait_for_data_block(struct data_file *df, int block_index, struct mount_info *mi = NULL; int error; int wait_res = 0; - unsigned int delayed_pending_us = 0; + unsigned int delayed_pending_us = 0, delayed_min_us = 0; bool delayed_pending = false; if (!df || !res_block) @@ -1145,7 +1161,8 @@ static int wait_for_data_block(struct data_file *df, int block_index, if (is_data_block_present(&block)) { *res_block = block; if (timeouts && timeouts->min_time_us) { - *delayed_min_us = timeouts->min_time_us; + delayed_min_us = timeouts->min_time_us; + error = usleep_interruptible(delayed_min_us); goto out; } return 0; @@ -1192,9 +1209,13 @@ static int wait_for_data_block(struct data_file *df, int block_index, delayed_pending = true; delayed_pending_us = timeouts->max_pending_time_us - jiffies_to_usecs(wait_res); - if (timeouts->min_pending_time_us > delayed_pending_us) - *delayed_min_us = timeouts->min_pending_time_us - + if (timeouts->min_pending_time_us > delayed_pending_us) { + delayed_min_us = timeouts->min_pending_time_us - delayed_pending_us; + error = usleep_interruptible(delayed_min_us); + if (error) + return error; + } error = down_read_killable(&segment->rwsem); if (error) @@ -1229,9 +1250,9 @@ static int wait_for_data_block(struct data_file *df, int block_index, delayed_pending_us; } - if (delayed_min_us && *delayed_min_us) { + if (delayed_min_us) { mi->mi_reads_delayed_min++; - mi->mi_reads_delayed_min_us += *delayed_min_us; + mi->mi_reads_delayed_min_us += delayed_min_us; } return 0; @@ -1261,8 +1282,7 @@ static int incfs_update_sysfs_error(struct file *file, int index, int result, ssize_t incfs_read_data_file_block(struct mem_range dst, struct file *f, int index, struct mem_range tmp, - struct incfs_read_data_file_timeouts *timeouts, - unsigned int *delayed_min_us) + struct incfs_read_data_file_timeouts *timeouts) { loff_t pos; ssize_t result; @@ -1281,8 +1301,7 @@ ssize_t incfs_read_data_file_block(struct mem_range dst, struct file *f, mi = df->df_mount_info; bfc = df->df_backing_file_context; - result = wait_for_data_block(df, index, &block, timeouts, - delayed_min_us); + result = wait_for_data_block(df, index, &block, timeouts); if (result < 0) goto out; @@ -1360,8 +1379,7 @@ ssize_t incfs_read_merkle_tree_blocks(struct mem_range dst, } int incfs_process_new_data_block(struct data_file *df, - struct incfs_fill_block *block, u8 *data, - bool *complete) + struct incfs_fill_block *block, u8 *data) { struct mount_info *mi = NULL; struct backing_file_context *bfc = NULL; @@ -1400,42 +1418,27 @@ int incfs_process_new_data_block(struct data_file *df, if (error) return error; - if (is_data_block_present(&existing_block)) + if (is_data_block_present(&existing_block)) { /* Block is already present, nothing to do here */ return 0; + } error = down_write_killable(&segment->rwsem); if (error) return error; - /* Recheck inside write lock */ - error = get_data_file_block(df, block->block_index, &existing_block); - if (error) - goto out_up_write; - - if (is_data_block_present(&existing_block)) - goto out_up_write; - error = mutex_lock_interruptible(&bfc->bc_mutex); - if (error) - goto out_up_write; - - error = incfs_write_data_block_to_backing_file(bfc, - range(data, block->data_len), block->block_index, + if (!error) { + error = incfs_write_data_block_to_backing_file( + bfc, range(data, block->data_len), block->block_index, df->df_blockmap_off, flags); - if (error) - goto out_mutex_unlock; - - if (atomic_inc_return(&df->df_data_blocks_written) - >= df->df_data_block_count) - *complete = true; - -out_mutex_unlock: - mutex_unlock(&bfc->bc_mutex); - if (!error) + mutex_unlock(&bfc->bc_mutex); + } + if (!error) { notify_pending_reads(mi, segment, block->block_index); + atomic_inc(&df->df_data_blocks_written); + } -out_up_write: up_write(&segment->rwsem); if (error)
diff --git a/fs/incfs/data_mgmt.h b/fs/incfs/data_mgmt.h index 8bd5c2f..2227913 100644 --- a/fs/incfs/data_mgmt.h +++ b/fs/incfs/data_mgmt.h
@@ -429,8 +429,7 @@ struct incfs_read_data_file_timeouts { ssize_t incfs_read_data_file_block(struct mem_range dst, struct file *f, int index, struct mem_range tmp, - struct incfs_read_data_file_timeouts *timeouts, - unsigned int *delayed_min_us); + struct incfs_read_data_file_timeouts *timeouts); ssize_t incfs_read_merkle_tree_blocks(struct mem_range dst, struct data_file *df, size_t offset); @@ -442,8 +441,7 @@ int incfs_get_filled_blocks(struct data_file *df, int incfs_read_file_signature(struct data_file *df, struct mem_range dst); int incfs_process_new_data_block(struct data_file *df, - struct incfs_fill_block *block, u8 *data, - bool *complete); + struct incfs_fill_block *block, u8 *data); int incfs_process_new_hash_block(struct data_file *df, struct incfs_fill_block *block, u8 *data);
diff --git a/fs/incfs/pseudo_files.c b/fs/incfs/pseudo_files.c index d43ccb2..1b9bf00 100644 --- a/fs/incfs/pseudo_files.c +++ b/fs/incfs/pseudo_files.c
@@ -916,10 +916,10 @@ static long ioctl_get_read_timeouts(struct mount_info *mi, void __user *arg) if (copy_from_user(&args, args_usr_ptr, sizeof(args))) return -EINVAL; - if (args.timeouts_array_size > INCFS_DATA_FILE_BLOCK_SIZE) + if (args.timeouts_array_size_out > INCFS_DATA_FILE_BLOCK_SIZE) return -EINVAL; - buffer = kzalloc(args.timeouts_array_size, GFP_NOFS); + buffer = kzalloc(args.timeouts_array_size_out, GFP_NOFS); if (!buffer) return -ENOMEM;
diff --git a/fs/incfs/sysfs.c b/fs/incfs/sysfs.c index ba91c07..360f03c 100644 --- a/fs/incfs/sysfs.c +++ b/fs/incfs/sysfs.c
@@ -33,15 +33,11 @@ static struct kobj_attribute name##_attr = __ATTR_RO(name) DECLARE_FEATURE_FLAG(corefs); DECLARE_FEATURE_FLAG(zstd); DECLARE_FEATURE_FLAG(v2); -DECLARE_FEATURE_FLAG(bugfix_throttling); -DECLARE_FEATURE_FLAG(bugfix_inode_eviction); static struct attribute *attributes[] = { &corefs_attr.attr, &zstd_attr.attr, &v2_attr.attr, - &bugfix_throttling_attr.attr, - &bugfix_inode_eviction_attr.attr, NULL, };
diff --git a/fs/incfs/verity.c b/fs/incfs/verity.c index 22308f8..a3dc94b 100644 --- a/fs/incfs/verity.c +++ b/fs/incfs/verity.c
@@ -323,7 +323,7 @@ static int incfs_build_merkle_tree(struct file *f, struct data_file *df, if (lvl == 0) result = incfs_read_data_file_block(partial_buf, - f, i, tmp, NULL, NULL); + f, i, tmp, NULL); else { hash_level_offset = hash_offset + hash_tree->hash_level_suboffset[lvl - 1];
diff --git a/fs/incfs/vfs.c b/fs/incfs/vfs.c index 70af66a..cc47a07 100644 --- a/fs/incfs/vfs.c +++ b/fs/incfs/vfs.c
@@ -5,7 +5,6 @@ #include <linux/blkdev.h> #include <linux/compat.h> -#include <linux/delay.h> #include <linux/file.h> #include <linux/fs.h> #include <linux/fs_stack.h> @@ -477,8 +476,7 @@ static struct dentry *open_or_create_special_dir(struct dentry *backing_dir, static int read_single_page_timeouts(struct data_file *df, struct file *f, int block_index, struct mem_range range, - struct mem_range tmp, - unsigned int *delayed_min_us) + struct mem_range tmp) { struct mount_info *mi = df->df_mount_info; struct incfs_read_data_file_timeouts timeouts = { @@ -510,23 +508,7 @@ static int read_single_page_timeouts(struct data_file *df, struct file *f, } return incfs_read_data_file_block(range, f, block_index, tmp, - &timeouts, delayed_min_us); -} - -static int usleep_interruptible(u32 us) -{ - /* See: - * https://www.kernel.org/doc/Documentation/timers/timers-howto.txt - * for explanation - */ - if (us < 10) { - udelay(us); - return 0; - } else if (us < 20000) { - usleep_range(us, us + us / 10); - return 0; - } else - return msleep_interruptible(us / 1000); + &timeouts); } static int read_single_page(struct file *f, struct page *page) @@ -539,7 +521,6 @@ static int read_single_page(struct file *f, struct page *page) int result = 0; void *page_start; int block_index; - unsigned int delayed_min_us = 0; if (!df) { SetPageError(page); @@ -565,8 +546,7 @@ static int read_single_page(struct file *f, struct page *page) bytes_to_read = min_t(loff_t, size - offset, PAGE_SIZE); read_result = read_single_page_timeouts(df, f, block_index, - range(page_start, bytes_to_read), tmp, - &delayed_min_us); + range(page_start, bytes_to_read), tmp); free_pages((unsigned long)tmp.data, get_order(tmp.len)); } else { @@ -588,8 +568,6 @@ static int read_single_page(struct file *f, struct page *page) flush_dcache_page(page); kunmap(page); unlock_page(page); - if (delayed_min_us) - usleep_interruptible(delayed_min_us); return result; } @@ -683,7 +661,8 @@ static void notify_unlink(struct dentry *dentry, const char *file_id_str, dput(file); } -static void handle_file_completed(struct file *f, struct data_file *df) +static void maybe_delete_incomplete_file(struct file *f, + struct data_file *df) { struct backing_file_context *bfc; struct mount_info *mi = df->df_mount_info; @@ -692,6 +671,9 @@ static void handle_file_completed(struct file *f, struct data_file *df) const struct cred *old_cred = override_creds(mi->mi_owner); int error; + if (atomic_read(&df->df_data_blocks_written) < df->df_data_block_count) + goto out; + /* Truncate file to remove any preallocated space */ bfc = df->df_backing_file_context; if (bfc) { @@ -750,7 +732,6 @@ static long ioctl_fill_blocks(struct file *f, void __user *arg) u8 *data_buf = NULL; ssize_t error = 0; int i = 0; - bool complete = false; if (!df) return -EBADF; @@ -792,7 +773,7 @@ static long ioctl_fill_blocks(struct file *f, void __user *arg) data_buf); } else { error = incfs_process_new_data_block(df, &fill_block, - data_buf, &complete); + data_buf); } if (error) break; @@ -801,8 +782,7 @@ static long ioctl_fill_blocks(struct file *f, void __user *arg) if (data_buf) free_pages((unsigned long)data_buf, get_order(data_buf_size)); - if (complete) - handle_file_completed(f, df); + maybe_delete_incomplete_file(f, df); /* * Only report the error if no records were processed, otherwise @@ -1928,13 +1908,6 @@ void incfs_kill_sb(struct super_block *sb) pr_debug("incfs: unmount\n"); - /* - * We must kill the super before freeing mi, since killing the super - * triggers inode eviction, which triggers the final update of the - * backing file, which uses certain information for mi - */ - kill_anon_super(sb); - if (mi) { if (mi->mi_backing_dir_path.dentry) dinode = d_inode(mi->mi_backing_dir_path.dentry); @@ -1950,6 +1923,7 @@ void incfs_kill_sb(struct super_block *sb) incfs_free_mount_info(mi); sb->s_fs_info = NULL; } + kill_anon_super(sb); } static int show_options(struct seq_file *m, struct dentry *root)
diff --git a/fs/inode.c b/fs/inode.c index b4a13dc..624a327 100644 --- a/fs/inode.c +++ b/fs/inode.c
@@ -168,6 +168,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode) inode->i_wb_frn_history = 0; #endif + if (security_inode_alloc(inode)) + goto out; spin_lock_init(&inode->i_lock); lockdep_set_class(&inode->i_lock, &sb->s_type->i_lock_key); @@ -198,12 +200,11 @@ int inode_init_always(struct super_block *sb, struct inode *inode) inode->i_fsnotify_mask = 0; #endif inode->i_flctx = NULL; - - if (unlikely(security_inode_alloc(inode))) - return -ENOMEM; this_cpu_inc(nr_inodes); return 0; +out: + return -ENOMEM; } EXPORT_SYMBOL(inode_init_always);
diff --git a/fs/io_uring.c b/fs/io_uring.c index 1164597..e73969f 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c
@@ -551,8 +551,7 @@ static void io_kill_timeout(struct io_kiocb *req) atomic_inc(&req->ctx->cq_timeouts); list_del(&req->list); io_cqring_fill_event(req->ctx, req->user_data, 0); - if (refcount_dec_and_test(&req->refs)) - __io_free_req(req); + __io_free_req(req); } } @@ -2077,12 +2076,12 @@ static int io_timeout(struct io_kiocb *req, const struct io_uring_sqe *sqe) req->sequence -= span; add: list_add(&req->list, entry); + spin_unlock_irq(&ctx->completion_lock); hrtimer_init(&req->timeout.timer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); req->timeout.timer.function = io_timeout_fn; hrtimer_start(&req->timeout.timer, timespec64_to_ktime(ts), HRTIMER_MODE_REL); - spin_unlock_irq(&ctx->completion_lock); return 0; } @@ -3170,7 +3169,6 @@ static int __io_sqe_files_scm(struct io_ring_ctx *ctx, int nr, int offset) } skb->sk = sk; - skb->scm_io_uring = 1; skb->destructor = io_destruct_skb; fpl->user = get_uid(ctx->user); @@ -3736,6 +3734,9 @@ static void io_cancel_async_work(struct io_ring_ctx *ctx, { struct io_kiocb *req; + if (list_empty(&ctx->task_list)) + return; + spin_lock_irq(&ctx->task_lock); list_for_each_entry(req, &ctx->task_list, task_list) {
diff --git a/fs/jbd2/commit.c b/fs/jbd2/commit.c index 7bd4b1d..d45ceb2 100644 --- a/fs/jbd2/commit.c +++ b/fs/jbd2/commit.c
@@ -514,13 +514,13 @@ void jbd2_journal_commit_transaction(journal_t *journal) */ jbd2_journal_switch_revoke_table(journal); - write_lock(&journal->j_state_lock); /* * Reserved credits cannot be claimed anymore, free them */ atomic_sub(atomic_read(&journal->j_reserved_credits), &commit_transaction->t_outstanding_credits); + write_lock(&journal->j_state_lock); trace_jbd2_commit_flushing(journal, commit_transaction); stats.run.rs_flushing = jiffies; stats.run.rs_locked = jbd2_time_diff(stats.run.rs_locked, @@ -531,7 +531,7 @@ void jbd2_journal_commit_transaction(journal_t *journal) journal->j_running_transaction = NULL; start_time = ktime_get(); commit_transaction->t_log_start = journal->j_head; - wake_up_all(&journal->j_wait_transaction_locked); + wake_up(&journal->j_wait_transaction_locked); write_unlock(&journal->j_state_lock); jbd_debug(3, "JBD2: commit phase 2a\n");
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 09f4d00..be05fb9 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c
@@ -149,7 +149,7 @@ static void wait_transaction_locked(journal_t *journal) int need_to_start; tid_t tid = journal->j_running_transaction->t_tid; - prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait, + prepare_to_wait(&journal->j_wait_transaction_locked, &wait, TASK_UNINTERRUPTIBLE); need_to_start = !tid_geq(journal->j_commit_request, tid); read_unlock(&journal->j_state_lock); @@ -175,7 +175,7 @@ static void wait_transaction_switching(journal_t *journal) read_unlock(&journal->j_state_lock); return; } - prepare_to_wait_exclusive(&journal->j_wait_transaction_locked, &wait, + prepare_to_wait(&journal->j_wait_transaction_locked, &wait, TASK_UNINTERRUPTIBLE); read_unlock(&journal->j_state_lock); /* @@ -810,7 +810,7 @@ void jbd2_journal_unlock_updates (journal_t *journal) write_lock(&journal->j_state_lock); --journal->j_barrier_count; write_unlock(&journal->j_state_lock); - wake_up_all(&journal->j_wait_transaction_locked); + wake_up(&journal->j_wait_transaction_locked); } static void warn_dirty_buffer(struct buffer_head *bh) @@ -1375,6 +1375,8 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) struct journal_head *jh; int ret = 0; + if (is_handle_aborted(handle)) + return -EROFS; if (!buffer_jbd(bh)) return -EUCLEAN; @@ -1421,18 +1423,6 @@ int jbd2_journal_dirty_metadata(handle_t *handle, struct buffer_head *bh) journal = transaction->t_journal; jbd_lock_bh_state(bh); - if (is_handle_aborted(handle)) { - /* - * Check journal aborting with @jh->b_state_lock locked, - * since 'jh->b_transaction' could be replaced with - * 'jh->b_next_transaction' during old transaction - * committing if journal aborted, which may fail - * assertion on 'jh->b_frozen_data == NULL'. - */ - ret = -EROFS; - goto out_unlock_bh; - } - if (jh->b_modified == 0) { /* * This buffer's got modified and becoming part
diff --git a/fs/jffs2/file.c b/fs/jffs2/file.c index 94bd4bb..34880a4 100644 --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c
@@ -137,18 +137,19 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode); struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb); pgoff_t index = pos >> PAGE_SHIFT; + uint32_t pageofs = index << PAGE_SHIFT; int ret = 0; jffs2_dbg(1, "%s()\n", __func__); - if (pos > inode->i_size) { - /* Make new hole frag from old EOF to new position */ + if (pageofs > inode->i_size) { + /* Make new hole frag from old EOF to new page */ struct jffs2_raw_inode ri; struct jffs2_full_dnode *fn; uint32_t alloc_len; - jffs2_dbg(1, "Writing new hole frag 0x%x-0x%x between current EOF and new position\n", - (unsigned int)inode->i_size, (uint32_t)pos); + jffs2_dbg(1, "Writing new hole frag 0x%x-0x%x between current EOF and new page\n", + (unsigned int)inode->i_size, pageofs); ret = jffs2_reserve_space(c, sizeof(ri), &alloc_len, ALLOC_NORMAL, JFFS2_SUMMARY_INODE_SIZE); @@ -168,10 +169,10 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, ri.mode = cpu_to_jemode(inode->i_mode); ri.uid = cpu_to_je16(i_uid_read(inode)); ri.gid = cpu_to_je16(i_gid_read(inode)); - ri.isize = cpu_to_je32((uint32_t)pos); + ri.isize = cpu_to_je32(max((uint32_t)inode->i_size, pageofs)); ri.atime = ri.ctime = ri.mtime = cpu_to_je32(JFFS2_NOW()); ri.offset = cpu_to_je32(inode->i_size); - ri.dsize = cpu_to_je32((uint32_t)pos - inode->i_size); + ri.dsize = cpu_to_je32(pageofs - inode->i_size); ri.csize = cpu_to_je32(0); ri.compr = JFFS2_COMPR_ZERO; ri.node_crc = cpu_to_je32(crc32(0, &ri, sizeof(ri)-8)); @@ -201,7 +202,7 @@ static int jffs2_write_begin(struct file *filp, struct address_space *mapping, goto out_err; } jffs2_complete_reservation(c); - inode->i_size = pos; + inode->i_size = pageofs; mutex_unlock(&f->sem); }
diff --git a/fs/jfs/jfs_dmap.c b/fs/jfs/jfs_dmap.c index cc1fed2..d3cb274 100644 --- a/fs/jfs/jfs_dmap.c +++ b/fs/jfs/jfs_dmap.c
@@ -155,7 +155,7 @@ int dbMount(struct inode *ipbmap) struct bmap *bmp; struct dbmap_disk *dbmp_le; struct metapage *mp; - int i, err; + int i; /* * allocate/initialize the in-memory bmap descriptor @@ -170,8 +170,8 @@ int dbMount(struct inode *ipbmap) BMAPBLKNO << JFS_SBI(ipbmap->i_sb)->l2nbperpage, PSIZE, 0); if (mp == NULL) { - err = -EIO; - goto err_kfree_bmp; + kfree(bmp); + return -EIO; } /* copy the on-disk bmap descriptor to its in-memory version. */ @@ -181,8 +181,9 @@ int dbMount(struct inode *ipbmap) bmp->db_l2nbperpage = le32_to_cpu(dbmp_le->dn_l2nbperpage); bmp->db_numag = le32_to_cpu(dbmp_le->dn_numag); if (!bmp->db_numag) { - err = -EINVAL; - goto err_release_metapage; + release_metapage(mp); + kfree(bmp); + return -EINVAL; } bmp->db_maxlevel = le32_to_cpu(dbmp_le->dn_maxlevel); @@ -193,17 +194,6 @@ int dbMount(struct inode *ipbmap) bmp->db_agwidth = le32_to_cpu(dbmp_le->dn_agwidth); bmp->db_agstart = le32_to_cpu(dbmp_le->dn_agstart); bmp->db_agl2size = le32_to_cpu(dbmp_le->dn_agl2size); - if (bmp->db_agl2size > L2MAXL2SIZE - L2MAXAG || - bmp->db_agl2size < 0) { - err = -EINVAL; - goto err_release_metapage; - } - - if (((bmp->db_mapsize - 1) >> bmp->db_agl2size) > MAXAG) { - err = -EINVAL; - goto err_release_metapage; - } - for (i = 0; i < MAXAG; i++) bmp->db_agfree[i] = le64_to_cpu(dbmp_le->dn_agfree[i]); bmp->db_agsize = le64_to_cpu(dbmp_le->dn_agsize); @@ -224,12 +214,6 @@ int dbMount(struct inode *ipbmap) BMAP_LOCK_INIT(bmp); return (0); - -err_release_metapage: - release_metapage(mp); -err_kfree_bmp: - kfree(bmp); - return err; }
diff --git a/fs/kernfs/dir.c b/fs/kernfs/dir.c index d206856..99ee657 100644 --- a/fs/kernfs/dir.c +++ b/fs/kernfs/dir.c
@@ -1515,11 +1515,8 @@ int kernfs_remove_by_name_ns(struct kernfs_node *parent, const char *name, mutex_lock(&kernfs_mutex); kn = kernfs_find_ns(parent, name, ns); - if (kn) { - kernfs_get(kn); + if (kn) __kernfs_remove(kn); - kernfs_put(kn); - } mutex_unlock(&kernfs_mutex);
diff --git a/fs/libfs.c b/fs/libfs.c index 78476f1..d058128 100644 --- a/fs/libfs.c +++ b/fs/libfs.c
@@ -885,8 +885,8 @@ ssize_t simple_attr_read(struct file *file, char __user *buf, EXPORT_SYMBOL_GPL(simple_attr_read); /* interpret the buffer as a number to call the set function with */ -static ssize_t simple_attr_write_xsigned(struct file *file, const char __user *buf, - size_t len, loff_t *ppos, bool is_signed) +ssize_t simple_attr_write(struct file *file, const char __user *buf, + size_t len, loff_t *ppos) { struct simple_attr *attr; unsigned long long val; @@ -907,10 +907,7 @@ static ssize_t simple_attr_write_xsigned(struct file *file, const char __user *b goto out; attr->set_buf[size] = '\0'; - if (is_signed) - ret = kstrtoll(attr->set_buf, 0, &val); - else - ret = kstrtoull(attr->set_buf, 0, &val); + ret = kstrtoull(attr->set_buf, 0, &val); if (ret) goto out; ret = attr->set(attr->data, val); @@ -920,21 +917,8 @@ static ssize_t simple_attr_write_xsigned(struct file *file, const char __user *b mutex_unlock(&attr->mutex); return ret; } - -ssize_t simple_attr_write(struct file *file, const char __user *buf, - size_t len, loff_t *ppos) -{ - return simple_attr_write_xsigned(file, buf, len, ppos, false); -} EXPORT_SYMBOL_GPL(simple_attr_write); -ssize_t simple_attr_write_signed(struct file *file, const char __user *buf, - size_t len, loff_t *ppos) -{ - return simple_attr_write_xsigned(file, buf, len, ppos, true); -} -EXPORT_SYMBOL_GPL(simple_attr_write_signed); - /** * generic_fh_to_dentry - generic helper for the fh_to_dentry export operation * @sb: filesystem to do the file handle conversion on
diff --git a/fs/mbcache.c b/fs/mbcache.c index 95b0472..97c54d3 100644 --- a/fs/mbcache.c +++ b/fs/mbcache.c
@@ -11,7 +11,7 @@ /* * Mbcache is a simple key-value store. Keys need not be unique, however * key-value pairs are expected to be unique (we use this fact in - * mb_cache_entry_delete_or_get()). + * mb_cache_entry_delete()). * * Ext2 and ext4 use this cache for deduplication of extended attribute blocks. * Ext4 also uses it for deduplication of xattr values stored in inodes. @@ -90,19 +90,12 @@ int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key, return -ENOMEM; INIT_LIST_HEAD(&entry->e_list); - /* - * We create entry with two references. One reference is kept by the - * hash table, the other reference is used to protect us from - * mb_cache_entry_delete_or_get() until the entry is fully setup. This - * avoids nesting of cache->c_list_lock into hash table bit locks which - * is problematic for RT. - */ - atomic_set(&entry->e_refcnt, 2); + /* One ref for hash, one ref returned */ + atomic_set(&entry->e_refcnt, 1); entry->e_key = key; entry->e_value = value; - entry->e_flags = 0; - if (reusable) - set_bit(MBE_REUSABLE_B, &entry->e_flags); + entry->e_reusable = reusable; + entry->e_referenced = 0; head = mb_cache_entry_head(cache, key); hlist_bl_lock(head); hlist_bl_for_each_entry(dup, dup_node, head, e_hash_list) { @@ -114,41 +107,24 @@ int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key, } hlist_bl_add_head(&entry->e_hash_list, head); hlist_bl_unlock(head); + spin_lock(&cache->c_list_lock); list_add_tail(&entry->e_list, &cache->c_list); + /* Grab ref for LRU list */ + atomic_inc(&entry->e_refcnt); cache->c_entry_count++; spin_unlock(&cache->c_list_lock); - mb_cache_entry_put(cache, entry); return 0; } EXPORT_SYMBOL(mb_cache_entry_create); -void __mb_cache_entry_free(struct mb_cache *cache, struct mb_cache_entry *entry) +void __mb_cache_entry_free(struct mb_cache_entry *entry) { - struct hlist_bl_head *head; - - head = mb_cache_entry_head(cache, entry->e_key); - hlist_bl_lock(head); - hlist_bl_del(&entry->e_hash_list); - hlist_bl_unlock(head); kmem_cache_free(mb_entry_cache, entry); } EXPORT_SYMBOL(__mb_cache_entry_free); -/* - * mb_cache_entry_wait_unused - wait to be the last user of the entry - * - * @entry - entry to work on - * - * Wait to be the last user of the entry. - */ -void mb_cache_entry_wait_unused(struct mb_cache_entry *entry) -{ - wait_var_event(&entry->e_refcnt, atomic_read(&entry->e_refcnt) <= 2); -} -EXPORT_SYMBOL(mb_cache_entry_wait_unused); - static struct mb_cache_entry *__entry_find(struct mb_cache *cache, struct mb_cache_entry *entry, u32 key) @@ -166,10 +142,10 @@ static struct mb_cache_entry *__entry_find(struct mb_cache *cache, while (node) { entry = hlist_bl_entry(node, struct mb_cache_entry, e_hash_list); - if (entry->e_key == key && - test_bit(MBE_REUSABLE_B, &entry->e_flags) && - atomic_inc_not_zero(&entry->e_refcnt)) + if (entry->e_key == key && entry->e_reusable) { + atomic_inc(&entry->e_refcnt); goto out; + } node = node->next; } entry = NULL; @@ -229,9 +205,10 @@ struct mb_cache_entry *mb_cache_entry_get(struct mb_cache *cache, u32 key, head = mb_cache_entry_head(cache, key); hlist_bl_lock(head); hlist_bl_for_each_entry(entry, node, head, e_hash_list) { - if (entry->e_key == key && entry->e_value == value && - atomic_inc_not_zero(&entry->e_refcnt)) + if (entry->e_key == key && entry->e_value == value) { + atomic_inc(&entry->e_refcnt); goto out; + } } entry = NULL; out: @@ -240,7 +217,7 @@ struct mb_cache_entry *mb_cache_entry_get(struct mb_cache *cache, u32 key, } EXPORT_SYMBOL(mb_cache_entry_get); -/* mb_cache_entry_delete - try to remove a cache entry +/* mb_cache_entry_delete - remove a cache entry * @cache - cache we work with * @key - key * @value - value @@ -277,43 +254,6 @@ void mb_cache_entry_delete(struct mb_cache *cache, u32 key, u64 value) } EXPORT_SYMBOL(mb_cache_entry_delete); -/* mb_cache_entry_delete_or_get - remove a cache entry if it has no users - * @cache - cache we work with - * @key - key - * @value - value - * - * Remove entry from cache @cache with key @key and value @value. The removal - * happens only if the entry is unused. The function returns NULL in case the - * entry was successfully removed or there's no entry in cache. Otherwise the - * function grabs reference of the entry that we failed to delete because it - * still has users and return it. - */ -struct mb_cache_entry *mb_cache_entry_delete_or_get(struct mb_cache *cache, - u32 key, u64 value) -{ - struct mb_cache_entry *entry; - - entry = mb_cache_entry_get(cache, key, value); - if (!entry) - return NULL; - - /* - * Drop the ref we got from mb_cache_entry_get() and the initial hash - * ref if we are the last user - */ - if (atomic_cmpxchg(&entry->e_refcnt, 2, 0) != 2) - return entry; - - spin_lock(&cache->c_list_lock); - if (!list_empty(&entry->e_list)) - list_del_init(&entry->e_list); - cache->c_entry_count--; - spin_unlock(&cache->c_list_lock); - __mb_cache_entry_free(cache, entry); - return NULL; -} -EXPORT_SYMBOL(mb_cache_entry_delete_or_get); - /* mb_cache_entry_touch - cache entry got used * @cache - cache the entry belongs to * @entry - entry that got used @@ -323,7 +263,7 @@ EXPORT_SYMBOL(mb_cache_entry_delete_or_get); void mb_cache_entry_touch(struct mb_cache *cache, struct mb_cache_entry *entry) { - set_bit(MBE_REFERENCED_B, &entry->e_flags); + entry->e_referenced = 1; } EXPORT_SYMBOL(mb_cache_entry_touch); @@ -341,24 +281,34 @@ static unsigned long mb_cache_shrink(struct mb_cache *cache, unsigned long nr_to_scan) { struct mb_cache_entry *entry; + struct hlist_bl_head *head; unsigned long shrunk = 0; spin_lock(&cache->c_list_lock); while (nr_to_scan-- && !list_empty(&cache->c_list)) { entry = list_first_entry(&cache->c_list, struct mb_cache_entry, e_list); - /* Drop initial hash reference if there is no user */ - if (test_bit(MBE_REFERENCED_B, &entry->e_flags) || - atomic_cmpxchg(&entry->e_refcnt, 1, 0) != 1) { - clear_bit(MBE_REFERENCED_B, &entry->e_flags); + if (entry->e_referenced) { + entry->e_referenced = 0; list_move_tail(&entry->e_list, &cache->c_list); continue; } list_del_init(&entry->e_list); cache->c_entry_count--; + /* + * We keep LRU list reference so that entry doesn't go away + * from under us. + */ spin_unlock(&cache->c_list_lock); - __mb_cache_entry_free(cache, entry); - shrunk++; + head = mb_cache_entry_head(cache, entry->e_key); + hlist_bl_lock(head); + if (!hlist_bl_unhashed(&entry->e_hash_list)) { + hlist_bl_del_init(&entry->e_hash_list); + atomic_dec(&entry->e_refcnt); + } + hlist_bl_unlock(head); + if (mb_cache_entry_put(cache, entry)) + shrunk++; cond_resched(); spin_lock(&cache->c_list_lock); } @@ -450,6 +400,11 @@ void mb_cache_destroy(struct mb_cache *cache) * point. */ list_for_each_entry_safe(entry, next, &cache->c_list, e_list) { + if (!hlist_bl_unhashed(&entry->e_hash_list)) { + hlist_bl_del_init(&entry->e_hash_list); + atomic_dec(&entry->e_refcnt); + } else + WARN_ON(1); list_del(&entry->e_list); WARN_ON(atomic_read(&entry->e_refcnt) != 1); mb_cache_entry_put(cache, entry);
diff --git a/fs/namei.c b/fs/namei.c index c9b9156..d3b1140 100755 --- a/fs/namei.c +++ b/fs/namei.c
@@ -3589,8 +3589,6 @@ struct dentry *vfs_tmpfile(struct dentry *dentry, umode_t mode, int open_flag) child = d_alloc(dentry, &slash_name); if (unlikely(!child)) goto out_err; - if (!IS_POSIXACL(dir)) - mode &= ~current_umask(); error = dir->i_op->tmpfile(dir, child, mode); if (error) goto out_err; @@ -5010,7 +5008,7 @@ int __page_symlink(struct inode *inode, const char *symname, int len, int nofs) { struct address_space *mapping = inode->i_mapping; struct page *page; - void *fsdata = NULL; + void *fsdata; int err; unsigned int flags = 0; if (nofs)
diff --git a/fs/nfs/filelayout/filelayout.c b/fs/nfs/filelayout/filelayout.c index 8c72718..98b74cd 100644 --- a/fs/nfs/filelayout/filelayout.c +++ b/fs/nfs/filelayout/filelayout.c
@@ -837,12 +837,6 @@ filelayout_alloc_lseg(struct pnfs_layout_hdr *layoutid, return &fl->generic_hdr; } -static bool -filelayout_lseg_is_striped(const struct nfs4_filelayout_segment *flseg) -{ - return flseg->num_fh > 1; -} - /* * filelayout_pg_test(). Called by nfs_can_coalesce_requests() * @@ -863,8 +857,6 @@ filelayout_pg_test(struct nfs_pageio_descriptor *pgio, struct nfs_page *prev, size = pnfs_generic_pg_test(pgio, prev, req); if (!size) return 0; - else if (!filelayout_lseg_is_striped(FILELAYOUT_LSEG(pgio->pg_lseg))) - return size; /* see if req and prev are in the same stripe */ if (prev) {
diff --git a/fs/nfs/nfs4client.c b/fs/nfs/nfs4client.c index 1f4bdcd..3671a51 100644 --- a/fs/nfs/nfs4client.c +++ b/fs/nfs/nfs4client.c
@@ -346,7 +346,6 @@ int nfs40_init_client(struct nfs_client *clp) ret = nfs4_setup_slot_table(tbl, NFS4_MAX_SLOT_TABLE, "NFSv4.0 transport Slot table"); if (ret) { - nfs4_shutdown_slot_table(tbl); kfree(tbl); return ret; }
diff --git a/fs/nfs/nfs4idmap.c b/fs/nfs/nfs4idmap.c index 4e6dd26..1e72963 100644 --- a/fs/nfs/nfs4idmap.c +++ b/fs/nfs/nfs4idmap.c
@@ -560,20 +560,22 @@ nfs_idmap_prepare_pipe_upcall(struct idmap *idmap, return true; } -static void nfs_idmap_complete_pipe_upcall(struct idmap_legacy_upcalldata *data, - int ret) +static void +nfs_idmap_complete_pipe_upcall_locked(struct idmap *idmap, int ret) { - complete_request_key(data->authkey, ret); - key_put(data->authkey); - kfree(data); + struct key *authkey = idmap->idmap_upcall_data->authkey; + + kfree(idmap->idmap_upcall_data); + idmap->idmap_upcall_data = NULL; + complete_request_key(authkey, ret); + key_put(authkey); } -static void nfs_idmap_abort_pipe_upcall(struct idmap *idmap, - struct idmap_legacy_upcalldata *data, - int ret) +static void +nfs_idmap_abort_pipe_upcall(struct idmap *idmap, int ret) { - if (cmpxchg(&idmap->idmap_upcall_data, data, NULL) == data) - nfs_idmap_complete_pipe_upcall(data, ret); + if (idmap->idmap_upcall_data != NULL) + nfs_idmap_complete_pipe_upcall_locked(idmap, ret); } static int nfs_idmap_legacy_upcall(struct key *authkey, void *aux) @@ -610,7 +612,7 @@ static int nfs_idmap_legacy_upcall(struct key *authkey, void *aux) ret = rpc_queue_upcall(idmap->idmap_pipe, msg); if (ret < 0) - nfs_idmap_abort_pipe_upcall(idmap, data, ret); + nfs_idmap_abort_pipe_upcall(idmap, ret); return ret; out2: @@ -666,7 +668,6 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) struct request_key_auth *rka; struct rpc_inode *rpci = RPC_I(file_inode(filp)); struct idmap *idmap = (struct idmap *)rpci->private; - struct idmap_legacy_upcalldata *data; struct key *authkey; struct idmap_msg im; size_t namelen_in; @@ -676,11 +677,10 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) * will have been woken up and someone else may now have used * idmap_key_cons - so after this point we may no longer touch it. */ - data = xchg(&idmap->idmap_upcall_data, NULL); - if (data == NULL) + if (idmap->idmap_upcall_data == NULL) goto out_noupcall; - authkey = data->authkey; + authkey = idmap->idmap_upcall_data->authkey; rka = get_request_key_auth(authkey); if (mlen != sizeof(im)) { @@ -702,17 +702,18 @@ idmap_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) if (namelen_in == 0 || namelen_in == IDMAP_NAMESZ) { ret = -EINVAL; goto out; - } +} - ret = nfs_idmap_read_and_verify_message(&im, &data->idmap_msg, - rka->target_key, authkey); + ret = nfs_idmap_read_and_verify_message(&im, + &idmap->idmap_upcall_data->idmap_msg, + rka->target_key, authkey); if (ret >= 0) { key_set_timeout(rka->target_key, nfs_idmap_cache_timeout); ret = mlen; } out: - nfs_idmap_complete_pipe_upcall(data, ret); + nfs_idmap_complete_pipe_upcall_locked(idmap, ret); out_noupcall: return ret; } @@ -726,7 +727,7 @@ idmap_pipe_destroy_msg(struct rpc_pipe_msg *msg) struct idmap *idmap = data->idmap; if (msg->errno) - nfs_idmap_abort_pipe_upcall(idmap, data, msg->errno); + nfs_idmap_abort_pipe_upcall(idmap, msg->errno); } static void @@ -734,11 +735,8 @@ idmap_release_pipe(struct inode *inode) { struct rpc_inode *rpci = RPC_I(inode); struct idmap *idmap = (struct idmap *)rpci->private; - struct idmap_legacy_upcalldata *data; - data = xchg(&idmap->idmap_upcall_data, NULL); - if (data) - nfs_idmap_complete_pipe_upcall(data, -EPIPE); + nfs_idmap_abort_pipe_upcall(idmap, -EPIPE); } int nfs_map_name_to_uid(const struct nfs_server *server, const char *name, size_t namelen, kuid_t *uid)
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 4a4a051..a5301ff 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c
@@ -121,11 +121,6 @@ nfs4_label_init_security(struct inode *dir, struct dentry *dentry, if (nfs_server_capable(dir, NFS_CAP_SECURITY_LABEL) == 0) return NULL; - label->lfs = 0; - label->pi = 0; - label->len = 0; - label->label = NULL; - err = security_dentry_init_security(dentry, sattr->ia_mode, &dentry->d_name, (void **)&label->label, &label->len); if (err == 0) @@ -784,9 +779,10 @@ static void nfs4_slot_sequence_record_sent(struct nfs4_slot *slot, if ((s32)(seqnr - slot->seq_nr_highest_sent) > 0) slot->seq_nr_highest_sent = seqnr; } -static void nfs4_slot_sequence_acked(struct nfs4_slot *slot, u32 seqnr) +static void nfs4_slot_sequence_acked(struct nfs4_slot *slot, + u32 seqnr) { - nfs4_slot_sequence_record_sent(slot, seqnr); + slot->seq_nr_highest_sent = seqnr; slot->seq_nr_last_acked = seqnr; } @@ -853,6 +849,7 @@ static int nfs41_sequence_process(struct rpc_task *task, __func__, slot->slot_nr, slot->seq_nr); + nfs4_slot_sequence_acked(slot, slot->seq_nr); goto out_retry; case -NFS4ERR_RETRY_UNCACHED_REP: case -NFS4ERR_SEQ_FALSE_RETRY: @@ -1934,7 +1931,8 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) if (!data->rpc_done) { if (data->rpc_status) return ERR_PTR(data->rpc_status); - return nfs4_try_open_cached(data); + /* cached opens have already been processed */ + goto update; } ret = nfs_refresh_inode(inode, &data->f_attr); @@ -1943,7 +1941,7 @@ _nfs4_opendata_reclaim_to_nfs4_state(struct nfs4_opendata *data) if (data->o_res.delegation_type != 0) nfs4_opendata_check_deleg(data, state); - +update: if (!update_open_stateid(state, &data->o_res.stateid, NULL, data->o_arg.fmode)) return ERR_PTR(-EAGAIN); @@ -2084,18 +2082,18 @@ static struct nfs4_opendata *nfs4_open_recoverdata_alloc(struct nfs_open_context } static int nfs4_open_recover_helper(struct nfs4_opendata *opendata, - fmode_t fmode) + fmode_t fmode) { struct nfs4_state *newstate; - struct nfs_server *server = NFS_SB(opendata->dentry->d_sb); - int openflags = opendata->o_arg.open_flags; int ret; if (!nfs4_mode_match_open_stateid(opendata->state, fmode)) return 0; + opendata->o_arg.open_flags = 0; opendata->o_arg.fmode = fmode; - opendata->o_arg.share_access = - nfs4_map_atomic_open_share(server, fmode, openflags); + opendata->o_arg.share_access = nfs4_map_atomic_open_share( + NFS_SB(opendata->dentry->d_sb), + fmode, 0); memset(&opendata->o_res, 0, sizeof(opendata->o_res)); memset(&opendata->c_res, 0, sizeof(opendata->c_res)); nfs4_init_opendata_res(opendata); @@ -2670,15 +2668,10 @@ static int _nfs4_open_expired(struct nfs_open_context *ctx, struct nfs4_state *s struct nfs4_opendata *opendata; int ret; - opendata = nfs4_open_recoverdata_alloc(ctx, state, NFS4_OPEN_CLAIM_FH); + opendata = nfs4_open_recoverdata_alloc(ctx, state, + NFS4_OPEN_CLAIM_FH); if (IS_ERR(opendata)) return PTR_ERR(opendata); - /* - * We're not recovering a delegation, so ask for no delegation. - * Otherwise the recovery thread could deadlock with an outstanding - * delegation return. - */ - opendata->o_arg.open_flags = O_DIRECT; ret = nfs4_open_recover(opendata, state); if (ret == -ESTALE) d_drop(ctx->dentry); @@ -3048,13 +3041,12 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, } out: - if (!opendata->cancelled) { - if (opendata->lgp) { - nfs4_lgopen_release(opendata->lgp); - opendata->lgp = NULL; - } - nfs4_sequence_free_slot(&opendata->o_res.seq_res); + if (opendata->lgp) { + nfs4_lgopen_release(opendata->lgp); + opendata->lgp = NULL; } + if (!opendata->cancelled) + nfs4_sequence_free_slot(&opendata->o_res.seq_res); return ret; } @@ -3751,7 +3743,7 @@ nfs4_atomic_open(struct inode *dir, struct nfs_open_context *ctx, int open_flags, struct iattr *attr, int *opened) { struct nfs4_state *state; - struct nfs4_label l, *label; + struct nfs4_label l = {0, 0, 0, NULL}, *label = NULL; label = nfs4_label_init_security(dir, ctx->dentry, attr, &l); @@ -4506,7 +4498,7 @@ nfs4_proc_create(struct inode *dir, struct dentry *dentry, struct iattr *sattr, int flags) { struct nfs_server *server = NFS_SERVER(dir); - struct nfs4_label l, *ilabel; + struct nfs4_label l, *ilabel = NULL; struct nfs_open_context *ctx; struct nfs4_state *state; int status = 0; @@ -4859,7 +4851,7 @@ static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct nfs4_exception exception = { .interruptible = true, }; - struct nfs4_label l, *label; + struct nfs4_label l, *label = NULL; int err; label = nfs4_label_init_security(dir, dentry, sattr, &l); @@ -4900,7 +4892,7 @@ static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct nfs4_exception exception = { .interruptible = true, }; - struct nfs4_label l, *label; + struct nfs4_label l, *label = NULL; int err; label = nfs4_label_init_security(dir, dentry, sattr, &l); @@ -5021,7 +5013,7 @@ static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct nfs4_exception exception = { .interruptible = true, }; - struct nfs4_label l, *label; + struct nfs4_label l, *label = NULL; int err; label = nfs4_label_init_security(dir, dentry, sattr, &l); @@ -6863,7 +6855,6 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) { struct nfs4_lockdata *data = calldata; struct nfs4_lock_state *lsp = data->lsp; - struct nfs_server *server = NFS_SERVER(d_inode(data->ctx->dentry)); dprintk("%s: begin!\n", __func__); @@ -6873,7 +6864,8 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) data->rpc_status = task->tk_status; switch (task->tk_status) { case 0: - renew_lease(server, data->timestamp); + renew_lease(NFS_SERVER(d_inode(data->ctx->dentry)), + data->timestamp); if (data->arg.new_lock && !data->cancelled) { data->fl.fl_flags &= ~(FL_SLEEP | FL_ACCESS); if (locks_lock_inode_wait(lsp->ls_state->inode, &data->fl) < 0) @@ -6894,8 +6886,6 @@ static void nfs4_lock_done(struct rpc_task *task, void *calldata) if (!nfs4_stateid_match(&data->arg.open_stateid, &lsp->ls_state->open_stateid)) goto out_restart; - else if (nfs4_async_handle_error(task, server, lsp->ls_state, NULL) == -EAGAIN) - goto out_restart; } else if (!nfs4_stateid_match(&data->arg.lock_stateid, &lsp->ls_stateid)) goto out_restart; @@ -9000,9 +8990,6 @@ static int nfs41_reclaim_complete_handle_errors(struct rpc_task *task, struct nf rpc_delay(task, NFS4_POLL_RETRY_MAX); /* fall through */ case -NFS4ERR_RETRY_UNCACHED_REP: - case -EACCES: - dprintk("%s: failed to reclaim complete error %d for server %s, retrying\n", - __func__, task->tk_status, clp->cl_hostname); return -EAGAIN; case -NFS4ERR_BADSESSION: case -NFS4ERR_DEADSESSION:
diff --git a/fs/nfs/nfs4state.c b/fs/nfs/nfs4state.c index 2ee30ff..1d2b81a 100644 --- a/fs/nfs/nfs4state.c +++ b/fs/nfs/nfs4state.c
@@ -1224,8 +1224,6 @@ void nfs4_schedule_state_manager(struct nfs_client *clp) if (IS_ERR(task)) { printk(KERN_ERR "%s: kthread_run: %ld\n", __func__, PTR_ERR(task)); - if (!nfs_client_init_is_complete(clp)) - nfs_mark_client_ready(clp, PTR_ERR(task)); nfs4_clear_state_manager_bit(clp); nfs_put_client(clp); module_put(THIS_MODULE); @@ -1745,7 +1743,6 @@ static void nfs4_state_mark_reclaim_helper(struct nfs_client *clp, static void nfs4_state_start_reclaim_reboot(struct nfs_client *clp) { - set_bit(NFS4CLNT_RECLAIM_REBOOT, &clp->cl_state); /* Mark all delegations for reclaim */ nfs_delegation_mark_reclaim(clp); nfs4_state_mark_reclaim_helper(clp, nfs4_state_mark_reclaim_reboot); @@ -2591,7 +2588,6 @@ static void nfs4_state_manager(struct nfs_client *clp) if (status < 0) goto out_error; nfs4_state_end_reclaim_reboot(clp); - continue; } /* Detect expired delegations... */
diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c index a3592be..2b7741f 100644 --- a/fs/nfs/nfs4xdr.c +++ b/fs/nfs/nfs4xdr.c
@@ -4169,17 +4169,19 @@ static int decode_attr_security_label(struct xdr_stream *xdr, uint32_t *bitmap, p = xdr_inline_decode(xdr, len); if (unlikely(!p)) return -EIO; - bitmap[2] &= ~FATTR4_WORD2_SECURITY_LABEL; if (len < NFS4_MAXLABELLEN) { - if (label && label->len) { - if (label->len < len) - return -ERANGE; - memcpy(label->label, p, len); + if (label) { + if (label->len) { + if (label->len < len) + return -ERANGE; + memcpy(label->label, p, len); + } label->len = len; label->pi = pi; label->lfs = lfs; status = NFS_ATTR_FATTR_V4_SECURITY_LABEL; } + bitmap[2] &= ~FATTR4_WORD2_SECURITY_LABEL; } else printk(KERN_WARNING "%s: label too long (%u)!\n", __func__, len);
diff --git a/fs/nfs/super.c b/fs/nfs/super.c index ecc7277..a84df7d 100644 --- a/fs/nfs/super.c +++ b/fs/nfs/super.c
@@ -2375,31 +2375,22 @@ void nfs_fill_super(struct super_block *sb, struct nfs_mount_info *mount_info) if (data && data->bsize) sb->s_blocksize = nfs_block_size(data->bsize, &sb->s_blocksize_bits); - switch (server->nfs_client->rpc_ops->version) { - case 2: - sb->s_time_gran = 1000; - sb->s_time_min = 0; - sb->s_time_max = U32_MAX; - break; - case 3: - /* - * The VFS shouldn't apply the umask to mode bits. - * We will do so ourselves when necessary. + if (server->nfs_client->rpc_ops->version != 2) { + /* The VFS shouldn't apply the umask to mode bits. We will do + * so ourselves when necessary. */ sb->s_flags |= SB_POSIXACL; sb->s_time_gran = 1; + sb->s_export_op = &nfs_export_ops; + } else + sb->s_time_gran = 1000; + + if (server->nfs_client->rpc_ops->version != 4) { sb->s_time_min = 0; sb->s_time_max = U32_MAX; - sb->s_export_op = &nfs_export_ops; - break; - case 4: - sb->s_flags |= SB_POSIXACL; - sb->s_time_gran = 1; + } else { sb->s_time_min = S64_MIN; sb->s_time_max = S64_MAX; - if (server->caps & NFS_CAP_ATOMIC_OPEN_V1) - sb->s_export_op = &nfs_export_ops; - break; } nfs_initialise_sb(sb);
diff --git a/fs/nfsd/netns.h b/fs/nfsd/netns.h index 82329b5..ed53e20 100644 --- a/fs/nfsd/netns.h +++ b/fs/nfsd/netns.h
@@ -42,6 +42,9 @@ struct nfsd_net { bool grace_ended; time_t boot_time; + /* internal mount of the "nfsd" pseudofilesystem: */ + struct vfsmount *nfsd_mnt; + struct dentry *nfsd_client_dir; /* @@ -118,9 +121,6 @@ struct nfsd_net { wait_queue_head_t ntf_wq; atomic_t ntf_refcnt; - /* Allow umount to wait for nfsd state cleanup */ - struct completion nfsd_shutdown_complete; - /* * clientid and stateid data for construction of net unique COPY * stateids.
diff --git a/fs/nfsd/nfs4callback.c b/fs/nfsd/nfs4callback.c index 7717333..3c50d18 100644 --- a/fs/nfsd/nfs4callback.c +++ b/fs/nfsd/nfs4callback.c
@@ -840,8 +840,8 @@ static const struct cred *get_backchannel_cred(struct nfs4_client *clp, struct r if (!kcred) return NULL; - kcred->fsuid = ses->se_cb_sec.uid; - kcred->fsgid = ses->se_cb_sec.gid; + kcred->uid = ses->se_cb_sec.uid; + kcred->gid = ses->se_cb_sec.gid; return kcred; } } @@ -880,6 +880,7 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c } else { if (!conn->cb_xprt) return -EINVAL; + clp->cl_cb_conn.cb_xprt = conn->cb_xprt; clp->cl_cb_session = ses; args.bc_xprt = conn->cb_xprt; args.prognumber = clp->cl_cb_session->se_cb_prog; @@ -899,9 +900,6 @@ static int setup_callback_client(struct nfs4_client *clp, struct nfs4_cb_conn *c rpc_shutdown_client(client); return -ENOMEM; } - - if (clp->cl_minorversion != 0) - clp->cl_cb_conn.cb_xprt = conn->cb_xprt; clp->cl_cb_client = client; clp->cl_cb_cred = cred; return 0;
diff --git a/fs/nfsd/nfs4layouts.c b/fs/nfsd/nfs4layouts.c index 2153621..e12409e 100644 --- a/fs/nfsd/nfs4layouts.c +++ b/fs/nfsd/nfs4layouts.c
@@ -322,11 +322,11 @@ nfsd4_recall_file_layout(struct nfs4_layout_stateid *ls) if (ls->ls_recalled) goto out_unlock; + ls->ls_recalled = true; + atomic_inc(&ls->ls_stid.sc_file->fi_lo_recalls); if (list_empty(&ls->ls_layouts)) goto out_unlock; - ls->ls_recalled = true; - atomic_inc(&ls->ls_stid.sc_file->fi_lo_recalls); trace_nfsd_layout_recall(&ls->ls_stid.sc_stateid); refcount_inc(&ls->ls_stid.sc_count);
diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index bd78467..452ed63 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c
@@ -1059,10 +1059,8 @@ nfsd4_verify_copy(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate, return status; out_put_dst: nfsd_file_put(*dst); - *dst = NULL; out_put_src: nfsd_file_put(*src); - *src = NULL; goto out; }
diff --git a/fs/nfsd/nfs4recover.c b/fs/nfsd/nfs4recover.c index 14463e1..7d40895 100644 --- a/fs/nfsd/nfs4recover.c +++ b/fs/nfsd/nfs4recover.c
@@ -825,10 +825,8 @@ __cld_pipe_inprogress_downcall(const struct cld_msg_v2 __user *cmsg, princhash.data = memdup_user( &ci->cc_princhash.cp_data, princhashlen); - if (IS_ERR_OR_NULL(princhash.data)) { - kfree(name.data); + if (IS_ERR_OR_NULL(princhash.data)) return -EFAULT; - } princhash.len = princhashlen; } else princhash.len = 0;
diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index 5922ece..228c2b0 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c
@@ -508,26 +508,15 @@ find_any_file(struct nfs4_file *f) return ret; } -static struct nfsd_file *find_any_file_locked(struct nfs4_file *f) +static struct nfsd_file *find_deleg_file(struct nfs4_file *f) { - lockdep_assert_held(&f->fi_lock); + struct nfsd_file *ret = NULL; - if (f->fi_fds[O_RDWR]) - return f->fi_fds[O_RDWR]; - if (f->fi_fds[O_WRONLY]) - return f->fi_fds[O_WRONLY]; - if (f->fi_fds[O_RDONLY]) - return f->fi_fds[O_RDONLY]; - return NULL; -} - -static struct nfsd_file *find_deleg_file_locked(struct nfs4_file *f) -{ - lockdep_assert_held(&f->fi_lock); - + spin_lock(&f->fi_lock); if (f->fi_deleg_file) - return f->fi_deleg_file; - return NULL; + ret = nfsd_file_get(f->fi_deleg_file); + spin_unlock(&f->fi_lock); + return ret; } static atomic_long_t num_delegations; @@ -2413,11 +2402,9 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st) ols = openlockstateid(st); oo = ols->st_stateowner; nf = st->sc_file; - - spin_lock(&nf->fi_lock); - file = find_any_file_locked(nf); + file = find_any_file(nf); if (!file) - goto out; + return 0; seq_printf(s, "- 0x%16phN: { type: open, ", &st->sc_stateid); @@ -2435,8 +2422,8 @@ static int nfs4_show_open(struct seq_file *s, struct nfs4_stid *st) seq_printf(s, ", "); nfs4_show_owner(s, oo); seq_printf(s, " }\n"); -out: - spin_unlock(&nf->fi_lock); + nfsd_file_put(file); + return 0; } @@ -2450,10 +2437,9 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st) ols = openlockstateid(st); oo = ols->st_stateowner; nf = st->sc_file; - spin_lock(&nf->fi_lock); - file = find_any_file_locked(nf); + file = find_any_file(nf); if (!file) - goto out; + return 0; seq_printf(s, "- 0x%16phN: { type: lock, ", &st->sc_stateid); @@ -2469,8 +2455,8 @@ static int nfs4_show_lock(struct seq_file *s, struct nfs4_stid *st) seq_printf(s, ", "); nfs4_show_owner(s, oo); seq_printf(s, " }\n"); -out: - spin_unlock(&nf->fi_lock); + nfsd_file_put(file); + return 0; } @@ -2482,10 +2468,9 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st) ds = delegstateid(st); nf = st->sc_file; - spin_lock(&nf->fi_lock); - file = find_deleg_file_locked(nf); + file = find_deleg_file(nf); if (!file) - goto out; + return 0; seq_printf(s, "- 0x%16phN: { type: deleg, ", &st->sc_stateid); @@ -2497,8 +2482,8 @@ static int nfs4_show_deleg(struct seq_file *s, struct nfs4_stid *st) nfs4_show_superblock(s, file); seq_printf(s, " }\n"); -out: - spin_unlock(&nf->fi_lock); + nfsd_file_put(file); + return 0; } @@ -7754,9 +7739,14 @@ nfs4_state_start_net(struct net *net) struct nfsd_net *nn = net_generic(net, nfsd_net_id); int ret; - ret = nfs4_state_create_net(net); + ret = get_nfsdfs(net); if (ret) return ret; + ret = nfs4_state_create_net(net); + if (ret) { + mntput(nn->nfsd_mnt); + return ret; + } locks_start_grace(net, &nn->nfsd4_manager); nfsd4_client_tracking_init(net); if (nn->track_reclaim_completes && nn->reclaim_str_hashtbl_size == 0) @@ -7825,6 +7815,7 @@ nfs4_state_shutdown_net(struct net *net) nfsd4_client_tracking_exit(net); nfs4_state_destroy_net(net); + mntput(nn->nfsd_mnt); } void
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index a4f2c0c..e61d9c4 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c
@@ -3109,17 +3109,6 @@ nfsd4_encode_dirent(void *ccdv, const char *name, int namlen, case nfserr_noent: xdr_truncate_encode(xdr, start_offset); goto skip_entry; - case nfserr_jukebox: - /* - * The pseudoroot should only display dentries that lead to - * exports. If we get EJUKEBOX here, then we can't tell whether - * this entry should be included. Just fail the whole READDIR - * with NFS4ERR_DELAY in that case, and hope that the situation - * will resolve itself by the client's next attempt. - */ - if (cd->rd_fhp->fh_export->ex_flags & NFSEXP_V4ROOT) - goto fail; - fallthrough; default: /* * If the client requested the RDATTR_ERROR attribute, @@ -3611,7 +3600,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, if (resp->xdr.buf->page_len && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) { WARN_ON_ONCE(1); - return nfserr_serverfault; + return nfserr_resource; } xdr_commit_encode(xdr);
diff --git a/fs/nfsd/nfscache.c b/fs/nfsd/nfscache.c index 80c90fc..670e97d 100644 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c
@@ -20,7 +20,8 @@ #include "nfsd.h" #include "cache.h" -#include "trace.h" + +#define NFSDDBG_FACILITY NFSDDBG_REPCACHE /* * We use this value to determine the number of hash buckets from the max @@ -323,10 +324,8 @@ nfsd_cache_key_cmp(const struct svc_cacherep *key, const struct svc_cacherep *rp, struct nfsd_net *nn) { if (key->c_key.k_xid == rp->c_key.k_xid && - key->c_key.k_csum != rp->c_key.k_csum) { + key->c_key.k_csum != rp->c_key.k_csum) ++nn->payload_misses; - trace_nfsd_drc_mismatch(nn, key, rp); - } return memcmp(&key->c_key, &rp->c_key, sizeof(key->c_key)); } @@ -379,22 +378,15 @@ nfsd_cache_insert(struct nfsd_drc_bucket *b, struct svc_cacherep *key, return ret; } -/** - * nfsd_cache_lookup - Find an entry in the duplicate reply cache - * @rqstp: Incoming Call to find - * +/* * Try to find an entry matching the current call in the cache. When none * is found, we try to grab the oldest expired entry off the LRU list. If * a suitable one isn't there, then drop the cache_lock and allocate a * new one, then search again in case one got inserted while this thread * didn't hold the lock. - * - * Return values: - * %RC_DOIT: Process the request normally - * %RC_REPLY: Reply from cache - * %RC_DROPIT: Do not process the request further */ -int nfsd_cache_lookup(struct svc_rqst *rqstp) +int +nfsd_cache_lookup(struct svc_rqst *rqstp) { struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct svc_cacherep *rp, *found; @@ -408,7 +400,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) rqstp->rq_cacherep = NULL; if (type == RC_NOCACHE) { nfsdstats.rcnocache++; - goto out; + return rtn; } csum = nfsd_cache_csum(rqstp); @@ -418,8 +410,10 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) * preallocate an entry. */ rp = nfsd_reply_cache_alloc(rqstp, csum, nn); - if (!rp) - goto out; + if (!rp) { + dprintk("nfsd: unable to allocate DRC entry!\n"); + return rtn; + } spin_lock(&b->cache_lock); found = nfsd_cache_insert(b, rp, nn); @@ -438,10 +432,8 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) /* go ahead and prune the cache */ prune_bucket(b, nn); - -out_unlock: + out: spin_unlock(&b->cache_lock); -out: return rtn; found_entry: @@ -451,13 +443,13 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) /* Request being processed */ if (rp->c_state == RC_INPROG) - goto out_trace; + goto out; /* From the hall of fame of impractical attacks: * Is this a user who tries to snoop on the cache? */ rtn = RC_DOIT; if (!test_bit(RQ_SECURE, &rqstp->rq_flags) && rp->c_secure) - goto out_trace; + goto out; /* Compose RPC reply header */ switch (rp->c_type) { @@ -469,26 +461,20 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) break; case RC_REPLBUFF: if (!nfsd_cache_append(rqstp, &rp->c_replvec)) - goto out_unlock; /* should not happen */ + goto out; /* should not happen */ rtn = RC_REPLY; break; default: WARN_ONCE(1, "nfsd: bad repcache type %d\n", rp->c_type); } -out_trace: - trace_nfsd_drc_found(nn, rqstp, rtn); - goto out_unlock; + goto out; } -/** - * nfsd_cache_update - Update an entry in the duplicate reply cache. - * @rqstp: svc_rqst with a finished Reply - * @cachetype: which cache to update - * @statp: Reply's status code - * - * This is called from nfsd_dispatch when the procedure has been - * executed and the complete reply is in rqstp->rq_res. +/* + * Update a cache entry. This is called from nfsd_dispatch when + * the procedure has been executed and the complete reply is in + * rqstp->rq_res. * * We're copying around data here rather than swapping buffers because * the toplevel loop requires max-sized buffers, which would be a waste @@ -501,7 +487,8 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) * nfsd failed to encode a reply that otherwise would have been cached. * In this case, nfsd_cache_update is called with statp == NULL. */ -void nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) +void +nfsd_cache_update(struct svc_rqst *rqstp, int cachetype, __be32 *statp) { struct nfsd_net *nn = net_generic(SVC_NET(rqstp), nfsd_net_id); struct svc_cacherep *rp = rqstp->rq_cacherep;
diff --git a/fs/nfsd/nfsctl.c b/fs/nfsd/nfsctl.c index a245473..055cc04 100644 --- a/fs/nfsd/nfsctl.c +++ b/fs/nfsd/nfsctl.c
@@ -1417,8 +1417,6 @@ static void nfsd_umount(struct super_block *sb) { struct net *net = sb->s_fs_info; - nfsd_shutdown_threads(net); - kill_litter_super(sb); put_net(net); } @@ -1431,6 +1429,18 @@ static struct file_system_type nfsd_fs_type = { }; MODULE_ALIAS_FS("nfsd"); +int get_nfsdfs(struct net *net) +{ + struct nfsd_net *nn = net_generic(net, nfsd_net_id); + struct vfsmount *mnt; + + mnt = vfs_kern_mount(&nfsd_fs_type, SB_KERNMOUNT, "nfsd", NULL); + if (IS_ERR(mnt)) + return PTR_ERR(mnt); + nn->nfsd_mnt = mnt; + return 0; +} + #ifdef CONFIG_PROC_FS static int create_proc_exports_entry(void) {
diff --git a/fs/nfsd/nfsd.h b/fs/nfsd/nfsd.h index 3ae9811..4ff0c53 100644 --- a/fs/nfsd/nfsd.h +++ b/fs/nfsd/nfsd.h
@@ -84,10 +84,11 @@ int nfsd_get_nrthreads(int n, int *, struct net *); int nfsd_set_nrthreads(int n, int *, struct net *); int nfsd_pool_stats_open(struct inode *, struct file *); int nfsd_pool_stats_release(struct inode *, struct file *); -void nfsd_shutdown_threads(struct net *net); void nfsd_destroy(struct net *net); +int get_nfsdfs(struct net *); + struct nfsdfs_client { struct kref cl_ref; void (*cl_release)(struct kref *kref);
diff --git a/fs/nfsd/nfssvc.c b/fs/nfsd/nfssvc.c index 969a227..d63cdda 100644 --- a/fs/nfsd/nfssvc.c +++ b/fs/nfsd/nfssvc.c
@@ -420,8 +420,8 @@ static void nfsd_shutdown_net(struct net *net) { struct nfsd_net *nn = net_generic(net, nfsd_net_id); - nfs4_state_shutdown_net(net); nfsd_file_cache_shutdown_net(net); + nfs4_state_shutdown_net(net); if (nn->lockd_up) { lockd_down(net); nn->lockd_up = 0; @@ -594,37 +594,6 @@ static const struct svc_serv_ops nfsd_thread_sv_ops = { .svo_module = THIS_MODULE, }; -static void nfsd_complete_shutdown(struct net *net) -{ - struct nfsd_net *nn = net_generic(net, nfsd_net_id); - - WARN_ON(!mutex_is_locked(&nfsd_mutex)); - - nn->nfsd_serv = NULL; - complete(&nn->nfsd_shutdown_complete); -} - -void nfsd_shutdown_threads(struct net *net) -{ - struct nfsd_net *nn = net_generic(net, nfsd_net_id); - struct svc_serv *serv; - - mutex_lock(&nfsd_mutex); - serv = nn->nfsd_serv; - if (serv == NULL) { - mutex_unlock(&nfsd_mutex); - return; - } - - svc_get(serv); - /* Kill outstanding nfsd threads */ - serv->sv_ops->svo_setup(serv, NULL, 0); - nfsd_destroy(net); - mutex_unlock(&nfsd_mutex); - /* Wait for shutdown of nfsd_serv to complete */ - wait_for_completion(&nn->nfsd_shutdown_complete); -} - int nfsd_create_serv(struct net *net) { int error; @@ -642,13 +611,11 @@ int nfsd_create_serv(struct net *net) &nfsd_thread_sv_ops); if (nn->nfsd_serv == NULL) return -ENOMEM; - init_completion(&nn->nfsd_shutdown_complete); nn->nfsd_serv->sv_maxconn = nn->max_connections; error = svc_bind(nn->nfsd_serv, net); if (error < 0) { svc_destroy(nn->nfsd_serv); - nfsd_complete_shutdown(net); return error; } @@ -697,7 +664,7 @@ void nfsd_destroy(struct net *net) svc_shutdown_net(nn->nfsd_serv, net); svc_destroy(nn->nfsd_serv); if (destroy) - nfsd_complete_shutdown(net); + nn->nfsd_serv = NULL; } int nfsd_set_nrthreads(int n, int *nthreads, struct net *net)
diff --git a/fs/nfsd/trace.h b/fs/nfsd/trace.h index 9d37d09..127db53 100644 --- a/fs/nfsd/trace.h +++ b/fs/nfsd/trace.h
@@ -166,12 +166,6 @@ DEFINE_STATEID_EVENT(layout_recall_done); DEFINE_STATEID_EVENT(layout_recall_fail); DEFINE_STATEID_EVENT(layout_recall_release); -TRACE_DEFINE_ENUM(NFSD_FILE_HASHED); -TRACE_DEFINE_ENUM(NFSD_FILE_PENDING); -TRACE_DEFINE_ENUM(NFSD_FILE_BREAK_READ); -TRACE_DEFINE_ENUM(NFSD_FILE_BREAK_WRITE); -TRACE_DEFINE_ENUM(NFSD_FILE_REFERENCED); - #define show_nf_flags(val) \ __print_flags(val, "|", \ { 1 << NFSD_FILE_HASHED, "HASHED" }, \ @@ -310,65 +304,6 @@ TRACE_EVENT(nfsd_file_fsnotify_handle_event, __entry->nlink, __entry->mode, __entry->mask) ); -#include "cache.h" - -TRACE_DEFINE_ENUM(RC_DROPIT); -TRACE_DEFINE_ENUM(RC_REPLY); -TRACE_DEFINE_ENUM(RC_DOIT); - -#define show_drc_retval(x) \ - __print_symbolic(x, \ - { RC_DROPIT, "DROPIT" }, \ - { RC_REPLY, "REPLY" }, \ - { RC_DOIT, "DOIT" }) - -TRACE_EVENT(nfsd_drc_found, - TP_PROTO( - const struct nfsd_net *nn, - const struct svc_rqst *rqstp, - int result - ), - TP_ARGS(nn, rqstp, result), - TP_STRUCT__entry( - __field(unsigned long long, boot_time) - __field(unsigned long, result) - __field(u32, xid) - ), - TP_fast_assign( - __entry->boot_time = nn->boot_time; - __entry->result = result; - __entry->xid = be32_to_cpu(rqstp->rq_xid); - ), - TP_printk("boot_time=%16llx xid=0x%08x result=%s", - __entry->boot_time, __entry->xid, - show_drc_retval(__entry->result)) - -); - -TRACE_EVENT(nfsd_drc_mismatch, - TP_PROTO( - const struct nfsd_net *nn, - const struct svc_cacherep *key, - const struct svc_cacherep *rp - ), - TP_ARGS(nn, key, rp), - TP_STRUCT__entry( - __field(unsigned long long, boot_time) - __field(u32, xid) - __field(u32, cached) - __field(u32, ingress) - ), - TP_fast_assign( - __entry->boot_time = nn->boot_time; - __entry->xid = be32_to_cpu(key->c_key.k_xid); - __entry->cached = (__force u32)key->c_key.k_csum; - __entry->ingress = (__force u32)rp->c_key.k_csum; - ), - TP_printk("boot_time=%16llx xid=0x%08x cached-csum=0x%08x ingress-csum=0x%08x", - __entry->boot_time, __entry->xid, __entry->cached, - __entry->ingress) -); - #endif /* _NFSD_TRACE_H */ #undef TRACE_INCLUDE_PATH
diff --git a/fs/nilfs2/btree.c b/fs/nilfs2/btree.c index a0e3753..919d123 100644 --- a/fs/nilfs2/btree.c +++ b/fs/nilfs2/btree.c
@@ -480,18 +480,9 @@ static int __nilfs_btree_get_block(const struct nilfs_bmap *btree, __u64 ptr, ret = nilfs_btnode_submit_block(btnc, ptr, 0, REQ_OP_READ, 0, &bh, &submit_ptr); if (ret) { - if (likely(ret == -EEXIST)) - goto out_check; - if (ret == -ENOENT) { - /* - * Block address translation failed due to invalid - * value of 'ptr'. In this case, return internal code - * -EINVAL (broken bmap) to notify bmap layer of fatal - * metadata corruption. - */ - ret = -EINVAL; - } - return ret; + if (ret != -EEXIST) + return ret; + goto out_check; } if (ra) {
diff --git a/fs/nilfs2/dat.c b/fs/nilfs2/dat.c index e2a5320..a3523a2 100644 --- a/fs/nilfs2/dat.c +++ b/fs/nilfs2/dat.c
@@ -111,13 +111,6 @@ static void nilfs_dat_commit_free(struct inode *dat, kunmap_atomic(kaddr); nilfs_dat_commit_entry(dat, req); - - if (unlikely(req->pr_desc_bh == NULL || req->pr_bitmap_bh == NULL)) { - nilfs_error(dat->i_sb, - "state inconsistency probably due to duplicate use of vblocknr = %llu", - (unsigned long long)req->pr_entry_nr); - return; - } nilfs_palloc_commit_free_entry(dat, req); }
diff --git a/fs/nilfs2/inode.c b/fs/nilfs2/inode.c index cf01aa5..35b0bfe 100644 --- a/fs/nilfs2/inode.c +++ b/fs/nilfs2/inode.c
@@ -340,7 +340,6 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) struct inode *inode; struct nilfs_inode_info *ii; struct nilfs_root *root; - struct buffer_head *bh; int err = -ENOMEM; ino_t ino; @@ -356,26 +355,11 @@ struct inode *nilfs_new_inode(struct inode *dir, umode_t mode) ii->i_state = BIT(NILFS_I_NEW); ii->i_root = root; - err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); + err = nilfs_ifile_create_inode(root->ifile, &ino, &ii->i_bh); if (unlikely(err)) goto failed_ifile_create_inode; /* reference count of i_bh inherits from nilfs_mdt_read_block() */ - if (unlikely(ino < NILFS_USER_INO)) { - nilfs_msg(sb, KERN_WARNING, - "inode bitmap is inconsistent for reserved inodes"); - do { - brelse(bh); - err = nilfs_ifile_create_inode(root->ifile, &ino, &bh); - if (unlikely(err)) - goto failed_ifile_create_inode; - } while (ino < NILFS_USER_INO); - - nilfs_msg(sb, KERN_INFO, - "repaired inode bitmap for reserved inodes"); - } - ii->i_bh = bh; - atomic64_inc(&root->inodes_count); inode_init_owner(inode, dir, mode); inode->i_ino = ino; @@ -467,8 +451,6 @@ int nilfs_read_inode_common(struct inode *inode, inode->i_atime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); inode->i_ctime.tv_nsec = le32_to_cpu(raw_inode->i_ctime_nsec); inode->i_mtime.tv_nsec = le32_to_cpu(raw_inode->i_mtime_nsec); - if (nilfs_is_metadata_file_inode(inode) && !S_ISREG(inode->i_mode)) - return -EIO; /* this inode is for metadata and corrupted */ if (inode->i_nlink == 0) return -ESTALE; /* this inode is deleted */
diff --git a/fs/nilfs2/ioctl.c b/fs/nilfs2/ioctl.c index 83926b9..91b9dac 100644 --- a/fs/nilfs2/ioctl.c +++ b/fs/nilfs2/ioctl.c
@@ -70,7 +70,7 @@ static int nilfs_ioctl_wrap_copy(struct the_nilfs *nilfs, if (argv->v_index > ~(__u64)0 - argv->v_nmembs) return -EINVAL; - buf = (void *)get_zeroed_page(GFP_NOFS); + buf = (void *)__get_free_pages(GFP_NOFS, 0); if (unlikely(!buf)) return -ENOMEM; maxmembs = PAGE_SIZE / argv->v_size; @@ -1130,14 +1130,7 @@ static int nilfs_ioctl_set_alloc_range(struct inode *inode, void __user *argp) minseg = range[0] + segbytes - 1; do_div(minseg, segbytes); - - if (range[1] < 4096) - goto out; - maxseg = NILFS_SB2_OFFSET_BYTES(range[1]); - if (maxseg < segbytes) - goto out; - do_div(maxseg, segbytes); maxseg--;
diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c index b23ed9a..eb3ac76 100644 --- a/fs/nilfs2/segment.c +++ b/fs/nilfs2/segment.c
@@ -322,7 +322,7 @@ void nilfs_relax_pressure_in_lock(struct super_block *sb) struct the_nilfs *nilfs = sb->s_fs_info; struct nilfs_sc_info *sci = nilfs->ns_writer; - if (sb_rdonly(sb) || unlikely(!sci) || !sci->sc_flush_request) + if (!sci || !sci->sc_flush_request) return; set_bit(NILFS_SC_PRIOR_FLUSH, &sci->sc_flags); @@ -435,23 +435,6 @@ static int nilfs_segctor_reset_segment_buffer(struct nilfs_sc_info *sci) return 0; } -/** - * nilfs_segctor_zeropad_segsum - zero pad the rest of the segment summary area - * @sci: segment constructor object - * - * nilfs_segctor_zeropad_segsum() zero-fills unallocated space at the end of - * the current segment summary block. - */ -static void nilfs_segctor_zeropad_segsum(struct nilfs_sc_info *sci) -{ - struct nilfs_segsum_pointer *ssp; - - ssp = sci->sc_blk_cnt > 0 ? &sci->sc_binfo_ptr : &sci->sc_finfo_ptr; - if (ssp->offset < ssp->bh->b_size) - memset(ssp->bh->b_data + ssp->offset, 0, - ssp->bh->b_size - ssp->offset); -} - static int nilfs_segctor_feed_segment(struct nilfs_sc_info *sci) { sci->sc_nblk_this_inc += sci->sc_curseg->sb_sum.nblocks; @@ -460,7 +443,6 @@ static int nilfs_segctor_feed_segment(struct nilfs_sc_info *sci) * The current segment is filled up * (internal code) */ - nilfs_segctor_zeropad_segsum(sci); sci->sc_curseg = NILFS_NEXT_SEGBUF(sci->sc_curseg); return nilfs_segctor_reset_segment_buffer(sci); } @@ -565,7 +547,6 @@ static int nilfs_segctor_add_file_block(struct nilfs_sc_info *sci, goto retry; } if (unlikely(required)) { - nilfs_segctor_zeropad_segsum(sci); err = nilfs_segbuf_extend_segsum(segbuf); if (unlikely(err)) goto failed; @@ -899,11 +880,9 @@ static int nilfs_segctor_create_checkpoint(struct nilfs_sc_info *sci) nilfs_mdt_mark_dirty(nilfs->ns_cpfile); nilfs_cpfile_put_checkpoint( nilfs->ns_cpfile, nilfs->ns_cno, bh_cp); - } else if (err == -EINVAL || err == -ENOENT) { - nilfs_error(sci->sc_super, - "checkpoint creation failed due to metadata corruption."); - err = -EIO; - } + } else + WARN_ON(err == -EINVAL || err == -ENOENT); + return err; } @@ -917,11 +896,7 @@ static int nilfs_segctor_fill_in_checkpoint(struct nilfs_sc_info *sci) err = nilfs_cpfile_get_checkpoint(nilfs->ns_cpfile, nilfs->ns_cno, 0, &raw_cp, &bh_cp); if (unlikely(err)) { - if (err == -EINVAL || err == -ENOENT) { - nilfs_error(sci->sc_super, - "checkpoint finalization failed due to metadata corruption."); - err = -EIO; - } + WARN_ON(err == -EINVAL || err == -ENOENT); goto failed_ibh; } raw_cp->cp_snapshot_list.ssl_next = 0; @@ -1550,7 +1525,6 @@ static int nilfs_segctor_collect(struct nilfs_sc_info *sci, nadd = min_t(int, nadd << 1, SC_MAX_SEGDELTA); sci->sc_stage = prev_stage; } - nilfs_segctor_zeropad_segsum(sci); nilfs_segctor_truncate_segments(sci, sci->sc_curseg, nilfs->ns_sufile); return 0; @@ -2263,7 +2237,7 @@ int nilfs_construct_segment(struct super_block *sb) struct nilfs_transaction_info *ti; int err; - if (sb_rdonly(sb) || unlikely(!sci)) + if (!sci) return -EROFS; /* A call inside transactions causes a deadlock. */ @@ -2302,7 +2276,7 @@ int nilfs_construct_dsync_segment(struct super_block *sb, struct inode *inode, struct nilfs_transaction_info ti; int err = 0; - if (sb_rdonly(sb) || unlikely(!sci)) + if (!sci) return -EROFS; nilfs_transaction_lock(sb, &ti, 0); @@ -2629,10 +2603,11 @@ static int nilfs_segctor_thread(void *arg) goto loop; end_thread: + spin_unlock(&sci->sc_state_lock); + /* end sync. */ sci->sc_task = NULL; wake_up(&sci->sc_wait_task); /* for nilfs_segctor_kill_thread() */ - spin_unlock(&sci->sc_state_lock); return 0; } @@ -2797,12 +2772,11 @@ int nilfs_attach_log_writer(struct super_block *sb, struct nilfs_root *root) if (nilfs->ns_writer) { /* - * This happens if the filesystem is made read-only by - * __nilfs_error or nilfs_remount and then remounted - * read/write. In these cases, reuse the existing - * writer. + * This happens if the filesystem was remounted + * read/write after nilfs_error degenerated it into a + * read-only mount. */ - return 0; + nilfs_detach_log_writer(sb); } nilfs->ns_writer = nilfs_segctor_new(sb, root); @@ -2812,9 +2786,10 @@ int nilfs_attach_log_writer(struct super_block *sb, struct nilfs_root *root) inode_attach_wb(nilfs->ns_bdev->bd_inode, NULL); err = nilfs_segctor_start_thread(nilfs->ns_writer); - if (unlikely(err)) - nilfs_detach_log_writer(sb); - + if (err) { + kfree(nilfs->ns_writer); + nilfs->ns_writer = NULL; + } return err; }
diff --git a/fs/nilfs2/sufile.c b/fs/nilfs2/sufile.c index 150845a..bf3f8f0 100644 --- a/fs/nilfs2/sufile.c +++ b/fs/nilfs2/sufile.c
@@ -498,22 +498,14 @@ void nilfs_sufile_do_free(struct inode *sufile, __u64 segnum, int nilfs_sufile_mark_dirty(struct inode *sufile, __u64 segnum) { struct buffer_head *bh; - void *kaddr; - struct nilfs_segment_usage *su; int ret; - down_write(&NILFS_MDT(sufile)->mi_sem); ret = nilfs_sufile_get_segment_usage_block(sufile, segnum, 0, &bh); if (!ret) { mark_buffer_dirty(bh); nilfs_mdt_mark_dirty(sufile); - kaddr = kmap_atomic(bh->b_page); - su = nilfs_sufile_block_get_segment_usage(sufile, segnum, bh, kaddr); - nilfs_segment_usage_set_dirty(su); - kunmap_atomic(kaddr); brelse(bh); } - up_write(&NILFS_MDT(sufile)->mi_sem); return ret; }
diff --git a/fs/nilfs2/super.c b/fs/nilfs2/super.c index 94cf515..b5bc9f0 100644 --- a/fs/nilfs2/super.c +++ b/fs/nilfs2/super.c
@@ -404,15 +404,6 @@ int nilfs_resize_fs(struct super_block *sb, __u64 newsize) goto out; /* - * Prevent underflow in second superblock position calculation. - * The exact minimum size check is done in nilfs_sufile_resize(). - */ - if (newsize < 4096) { - ret = -ENOSPC; - goto out; - } - - /* * Write lock is required to protect some functions depending * on the number of segments, the number of reserved segments, * and so forth. @@ -477,7 +468,6 @@ static void nilfs_put_super(struct super_block *sb) up_write(&nilfs->ns_sem); } - nilfs_sysfs_delete_device_group(nilfs); iput(nilfs->ns_sufile); iput(nilfs->ns_cpfile); iput(nilfs->ns_dat); @@ -1104,7 +1094,6 @@ nilfs_fill_super(struct super_block *sb, void *data, int silent) nilfs_put_root(fsroot); failed_unload: - nilfs_sysfs_delete_device_group(nilfs); iput(nilfs->ns_sufile); iput(nilfs->ns_cpfile); iput(nilfs->ns_dat); @@ -1142,6 +1131,8 @@ static int nilfs_remount(struct super_block *sb, int *flags, char *data) if ((bool)(*flags & SB_RDONLY) == sb_rdonly(sb)) goto out; if (*flags & SB_RDONLY) { + /* Shutting down log writer */ + nilfs_detach_log_writer(sb); sb->s_flags |= SB_RDONLY; /*
diff --git a/fs/nilfs2/the_nilfs.c b/fs/nilfs2/the_nilfs.c index 24f626e..9318707 100644 --- a/fs/nilfs2/the_nilfs.c +++ b/fs/nilfs2/the_nilfs.c
@@ -13,7 +13,6 @@ #include <linux/blkdev.h> #include <linux/backing-dev.h> #include <linux/random.h> -#include <linux/log2.h> #include <linux/crc32.h> #include "nilfs.h" #include "segment.h" @@ -87,6 +86,7 @@ void destroy_nilfs(struct the_nilfs *nilfs) { might_sleep(); if (nilfs_init(nilfs)) { + nilfs_sysfs_delete_device_group(nilfs); brelse(nilfs->ns_sbh[0]); brelse(nilfs->ns_sbh[1]); } @@ -274,10 +274,6 @@ int load_nilfs(struct the_nilfs *nilfs, struct super_block *sb) goto failed; } - err = nilfs_sysfs_create_device_group(sb); - if (unlikely(err)) - goto sysfs_error; - if (valid_fs) goto skip_recovery; @@ -339,9 +335,6 @@ int load_nilfs(struct the_nilfs *nilfs, struct super_block *sb) goto failed; failed_unload: - nilfs_sysfs_delete_device_group(nilfs); - - sysfs_error: iput(nilfs->ns_cpfile); iput(nilfs->ns_sufile); iput(nilfs->ns_dat); @@ -455,33 +448,11 @@ static int nilfs_valid_sb(struct nilfs_super_block *sbp) return crc == le32_to_cpu(sbp->s_sum); } -/** - * nilfs_sb2_bad_offset - check the location of the second superblock - * @sbp: superblock raw data buffer - * @offset: byte offset of second superblock calculated from device size - * - * nilfs_sb2_bad_offset() checks if the position on the second - * superblock is valid or not based on the filesystem parameters - * stored in @sbp. If @offset points to a location within the segment - * area, or if the parameters themselves are not normal, it is - * determined to be invalid. - * - * Return Value: true if invalid, false if valid. - */ -static bool nilfs_sb2_bad_offset(struct nilfs_super_block *sbp, u64 offset) +static int nilfs_sb2_bad_offset(struct nilfs_super_block *sbp, u64 offset) { - unsigned int shift_bits = le32_to_cpu(sbp->s_log_block_size); - u32 blocks_per_segment = le32_to_cpu(sbp->s_blocks_per_segment); - u64 nsegments = le64_to_cpu(sbp->s_nsegments); - u64 index; - - if (blocks_per_segment < NILFS_SEG_MIN_BLOCKS || - shift_bits > ilog2(NILFS_MAX_BLOCK_SIZE) - BLOCK_SIZE_BITS) - return true; - - index = offset >> (shift_bits + BLOCK_SIZE_BITS); - do_div(index, blocks_per_segment); - return index < nsegments; + return offset < ((le64_to_cpu(sbp->s_nsegments) * + le32_to_cpu(sbp->s_blocks_per_segment)) << + (le32_to_cpu(sbp->s_log_block_size) + 10)); } static void nilfs_release_super_block(struct the_nilfs *nilfs) @@ -523,15 +494,9 @@ static int nilfs_load_super_block(struct the_nilfs *nilfs, { struct nilfs_super_block **sbp = nilfs->ns_sbp; struct buffer_head **sbh = nilfs->ns_sbh; - u64 sb2off, devsize = nilfs->ns_bdev->bd_inode->i_size; + u64 sb2off = NILFS_SB2_OFFSET_BYTES(nilfs->ns_bdev->bd_inode->i_size); int valid[2], swp = 0; - if (devsize < NILFS_SEG_MIN_BLOCKS * NILFS_MIN_BLOCK_SIZE + 4096) { - nilfs_msg(sb, KERN_ERR, "device size too small"); - return -EINVAL; - } - sb2off = NILFS_SB2_OFFSET_BYTES(devsize); - sbp[0] = nilfs_read_super_block(sb, NILFS_SB_OFFSET_BYTES, blocksize, &sbh[0]); sbp[1] = nilfs_read_super_block(sb, sb2off, blocksize, &sbh[1]); @@ -674,6 +639,10 @@ int init_nilfs(struct the_nilfs *nilfs, struct super_block *sb, char *data) if (err) goto failed_sbh; + err = nilfs_sysfs_create_device_group(sb); + if (err) + goto failed_sbh; + set_nilfs_init(nilfs); err = 0; out: @@ -726,7 +695,9 @@ int nilfs_count_free_blocks(struct the_nilfs *nilfs, sector_t *nblocks) { unsigned long ncleansegs; + down_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem); ncleansegs = nilfs_sufile_get_ncleansegs(nilfs->ns_sufile); + up_read(&NILFS_MDT(nilfs->ns_dat)->mi_sem); *nblocks = (sector_t)ncleansegs * nilfs->ns_blocks_per_segment; return 0; }
diff --git a/fs/ntfs/attrib.c b/fs/ntfs/attrib.c index c0881d3..914e991 100644 --- a/fs/ntfs/attrib.c +++ b/fs/ntfs/attrib.c
@@ -594,37 +594,17 @@ static int ntfs_attr_find(const ATTR_TYPE type, const ntfschar *name, for (;; a = (ATTR_RECORD*)((u8*)a + le32_to_cpu(a->length))) { u8 *mrec_end = (u8 *)ctx->mrec + le32_to_cpu(ctx->mrec->bytes_allocated); - u8 *name_end; - - /* check whether ATTR_RECORD wrap */ - if ((u8 *)a < (u8 *)ctx->mrec) + u8 *name_end = (u8 *)a + le16_to_cpu(a->name_offset) + + a->name_length * sizeof(ntfschar); + if ((u8*)a < (u8*)ctx->mrec || (u8*)a > mrec_end || + name_end > mrec_end) break; - - /* check whether Attribute Record Header is within bounds */ - if ((u8 *)a > mrec_end || - (u8 *)a + sizeof(ATTR_RECORD) > mrec_end) - break; - - /* check whether ATTR_RECORD's name is within bounds */ - name_end = (u8 *)a + le16_to_cpu(a->name_offset) + - a->name_length * sizeof(ntfschar); - if (name_end > mrec_end) - break; - ctx->attr = a; if (unlikely(le32_to_cpu(a->type) > le32_to_cpu(type) || a->type == AT_END)) return -ENOENT; if (unlikely(!a->length)) break; - - /* check whether ATTR_RECORD's length wrap */ - if ((u8 *)a + le32_to_cpu(a->length) < (u8 *)a) - break; - /* check whether ATTR_RECORD's length is within bounds */ - if ((u8 *)a + le32_to_cpu(a->length) > mrec_end) - break; - if (a->type != type) continue; /*
diff --git a/fs/ntfs/inode.c b/fs/ntfs/inode.c index 645c4b1..cf222c9 100644 --- a/fs/ntfs/inode.c +++ b/fs/ntfs/inode.c
@@ -1829,13 +1829,6 @@ int ntfs_read_inode_mount(struct inode *vi) goto err_out; } - /* Sanity check offset to the first attribute */ - if (le16_to_cpu(m->attrs_offset) >= le32_to_cpu(m->bytes_allocated)) { - ntfs_error(sb, "Incorrect mft offset to the first attribute %u in superblock.", - le16_to_cpu(m->attrs_offset)); - goto err_out; - } - /* Need this to sanity check attribute list references to $MFT. */ vi->i_generation = ni->seq_no = le16_to_cpu(m->sequence_number);
diff --git a/fs/ntfs/super.c b/fs/ntfs/super.c index 8f33382..7dc3bc6 100644 --- a/fs/ntfs/super.c +++ b/fs/ntfs/super.c
@@ -2092,8 +2092,7 @@ static bool load_system_files(ntfs_volume *vol) // TODO: Initialize security. /* Get the extended system files' directory inode. */ vol->extend_ino = ntfs_iget(sb, FILE_Extend); - if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino) || - !S_ISDIR(vol->extend_ino->i_mode)) { + if (IS_ERR(vol->extend_ino) || is_bad_inode(vol->extend_ino)) { if (!IS_ERR(vol->extend_ino)) iput(vol->extend_ino); ntfs_error(sb, "Failed to load $Extend.");
diff --git a/fs/ocfs2/aops.c b/fs/ocfs2/aops.c index 91702eb..7f66e33 100644 --- a/fs/ocfs2/aops.c +++ b/fs/ocfs2/aops.c
@@ -1990,25 +1990,11 @@ int ocfs2_write_end_nolock(struct address_space *mapping, } if (unlikely(copied < len) && wc->w_target_page) { - loff_t new_isize; - if (!PageUptodate(wc->w_target_page)) copied = 0; - new_isize = max_t(loff_t, i_size_read(inode), pos + copied); - if (new_isize > page_offset(wc->w_target_page)) - ocfs2_zero_new_buffers(wc->w_target_page, start+copied, - start+len); - else { - /* - * When page is fully beyond new isize (data copy - * failed), do not bother zeroing the page. Invalidate - * it instead so that writeback does not get confused - * put page & buffer dirty bits into inconsistent - * state. - */ - block_invalidatepage(wc->w_target_page, 0, PAGE_SIZE); - } + ocfs2_zero_new_buffers(wc->w_target_page, start+copied, + start+len); } if (wc->w_target_page) flush_dcache_page(wc->w_target_page);
diff --git a/fs/ocfs2/dlmglue.c b/fs/ocfs2/dlmglue.c index bcc4b5d..207ec61 100644 --- a/fs/ocfs2/dlmglue.c +++ b/fs/ocfs2/dlmglue.c
@@ -3396,12 +3396,10 @@ void ocfs2_dlm_shutdown(struct ocfs2_super *osb, ocfs2_lock_res_free(&osb->osb_nfs_sync_lockres); ocfs2_lock_res_free(&osb->osb_orphan_scan.os_lockres); - if (osb->cconn) { - ocfs2_cluster_disconnect(osb->cconn, hangup_pending); - osb->cconn = NULL; + ocfs2_cluster_disconnect(osb->cconn, hangup_pending); + osb->cconn = NULL; - ocfs2_dlm_shutdown_debug(osb); - } + ocfs2_dlm_shutdown_debug(osb); } static int ocfs2_drop_lock(struct ocfs2_super *osb,
diff --git a/fs/ocfs2/journal.c b/fs/ocfs2/journal.c index da95ed7..900e4ef 100644 --- a/fs/ocfs2/journal.c +++ b/fs/ocfs2/journal.c
@@ -159,7 +159,7 @@ static void ocfs2_queue_replay_slots(struct ocfs2_super *osb, replay_map->rm_state = REPLAY_DONE; } -void ocfs2_free_replay_slots(struct ocfs2_super *osb) +static void ocfs2_free_replay_slots(struct ocfs2_super *osb) { struct ocfs2_replay_map *replay_map = osb->replay_map;
diff --git a/fs/ocfs2/journal.h b/fs/ocfs2/journal.h index eb7a21b..bfe611e 100644 --- a/fs/ocfs2/journal.h +++ b/fs/ocfs2/journal.h
@@ -152,7 +152,6 @@ int ocfs2_recovery_init(struct ocfs2_super *osb); void ocfs2_recovery_exit(struct ocfs2_super *osb); int ocfs2_compute_replay_slots(struct ocfs2_super *osb); -void ocfs2_free_replay_slots(struct ocfs2_super *osb); /* * Journal Control: * Initialize, Load, Shutdown, Wipe a journal.
diff --git a/fs/ocfs2/move_extents.c b/fs/ocfs2/move_extents.c index 98e77ea..758d966 100644 --- a/fs/ocfs2/move_extents.c +++ b/fs/ocfs2/move_extents.c
@@ -107,6 +107,14 @@ static int __ocfs2_move_extent(handle_t *handle, */ replace_rec.e_flags = ext_flags & ~OCFS2_EXT_REFCOUNTED; + ret = ocfs2_journal_access_di(handle, INODE_CACHE(inode), + context->et.et_root_bh, + OCFS2_JOURNAL_ACCESS_WRITE); + if (ret) { + mlog_errno(ret); + goto out; + } + ret = ocfs2_split_extent(handle, &context->et, path, index, &replace_rec, context->meta_ac, &context->dealloc); @@ -115,6 +123,8 @@ static int __ocfs2_move_extent(handle_t *handle, goto out; } + ocfs2_journal_dirty(handle, context->et.et_root_bh); + context->new_phys_cpos = new_p_cpos; /* @@ -436,7 +446,7 @@ static int ocfs2_find_victim_alloc_group(struct inode *inode, bg = (struct ocfs2_group_desc *)gd_bh->b_data; if (vict_blkno < (le64_to_cpu(bg->bg_blkno) + - (le16_to_cpu(bg->bg_bits) << bits_per_unit))) { + le16_to_cpu(bg->bg_bits))) { *ret_bh = gd_bh; *vict_bit = (vict_blkno - blkno) >> @@ -551,7 +561,6 @@ static void ocfs2_probe_alloc_group(struct inode *inode, struct buffer_head *bh, last_free_bits++; if (last_free_bits == move_len) { - i -= move_len; *goal_bit = i; *phys_cpos = base_cpos + i; break; @@ -1023,19 +1032,18 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp) context->range = ⦥ - /* - * ok, the default theshold for the defragmentation - * is 1M, since our maximum clustersize was 1M also. - * any thought? - */ - if (!range.me_threshold) - range.me_threshold = 1024 * 1024; - - if (range.me_threshold > i_size_read(inode)) - range.me_threshold = i_size_read(inode); - if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) { context->auto_defrag = 1; + /* + * ok, the default theshold for the defragmentation + * is 1M, since our maximum clustersize was 1M also. + * any thought? + */ + if (!range.me_threshold) + range.me_threshold = 1024 * 1024; + + if (range.me_threshold > i_size_read(inode)) + range.me_threshold = i_size_read(inode); if (range.me_flags & OCFS2_MOVE_EXT_FL_PART_DEFRAG) context->partial = 1;
diff --git a/fs/ocfs2/namei.c b/fs/ocfs2/namei.c index e1a83fc..8ea51cf 100644 --- a/fs/ocfs2/namei.c +++ b/fs/ocfs2/namei.c
@@ -231,7 +231,6 @@ static int ocfs2_mknod(struct inode *dir, handle_t *handle = NULL; struct ocfs2_super *osb; struct ocfs2_dinode *dirfe; - struct ocfs2_dinode *fe = NULL; struct buffer_head *new_fe_bh = NULL; struct inode *inode = NULL; struct ocfs2_alloc_context *inode_ac = NULL; @@ -382,7 +381,6 @@ static int ocfs2_mknod(struct inode *dir, goto leave; } - fe = (struct ocfs2_dinode *) new_fe_bh->b_data; if (S_ISDIR(mode)) { status = ocfs2_fill_new_dir(osb, handle, dir, inode, new_fe_bh, data_ac, meta_ac); @@ -448,11 +446,8 @@ static int ocfs2_mknod(struct inode *dir, leave: if (status < 0 && did_quota_inode) dquot_free_inode(inode); - if (handle) { - if (status < 0 && fe) - ocfs2_set_links_count(fe, 0); + if (handle) ocfs2_commit_trans(osb, handle); - } ocfs2_inode_unlock(dir, 1); if (did_block_signals) @@ -630,9 +625,18 @@ static int ocfs2_mknod_locked(struct ocfs2_super *osb, return status; } - return __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh, + status = __ocfs2_mknod_locked(dir, inode, dev, new_fe_bh, parent_fe_bh, handle, inode_ac, fe_blkno, suballoc_loc, suballoc_bit); + if (status < 0) { + u64 bg_blkno = ocfs2_which_suballoc_group(fe_blkno, suballoc_bit); + int tmp = ocfs2_free_suballoc_bits(handle, inode_ac->ac_inode, + inode_ac->ac_bh, suballoc_bit, bg_blkno, 1); + if (tmp) + mlog_errno(tmp); + } + + return status; } static int ocfs2_mkdir(struct inode *dir, @@ -2013,11 +2017,8 @@ static int ocfs2_symlink(struct inode *dir, ocfs2_clusters_to_bytes(osb->sb, 1)); if (status < 0 && did_quota_inode) dquot_free_inode(inode); - if (handle) { - if (status < 0 && fe) - ocfs2_set_links_count(fe, 0); + if (handle) ocfs2_commit_trans(osb, handle); - } ocfs2_inode_unlock(dir, 1); if (did_block_signals)
diff --git a/fs/ocfs2/stackglue.c b/fs/ocfs2/stackglue.c index 9f03266..1880387 100644 --- a/fs/ocfs2/stackglue.c +++ b/fs/ocfs2/stackglue.c
@@ -707,8 +707,6 @@ static struct ctl_table_header *ocfs2_table_header; static int __init ocfs2_stack_glue_init(void) { - int ret; - strcpy(cluster_stack_name, OCFS2_STACK_PLUGIN_O2CB); ocfs2_table_header = register_sysctl_table(ocfs2_root_table); @@ -718,11 +716,7 @@ static int __init ocfs2_stack_glue_init(void) return -ENOMEM; /* or something. */ } - ret = ocfs2_sysfs_init(); - if (ret) - unregister_sysctl_table(ocfs2_table_header); - - return ret; + return ocfs2_sysfs_init(); } static void __exit ocfs2_stack_glue_exit(void)
diff --git a/fs/ocfs2/super.c b/fs/ocfs2/super.c index fb4104c..c1cf67b 100644 --- a/fs/ocfs2/super.c +++ b/fs/ocfs2/super.c
@@ -984,27 +984,28 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) if (!ocfs2_parse_options(sb, data, &parsed_options, 0)) { status = -EINVAL; - goto out; + goto read_super_error; } /* probe for superblock */ status = ocfs2_sb_probe(sb, &bh, §or_size, &stats); if (status < 0) { mlog(ML_ERROR, "superblock probe failed!\n"); - goto out; + goto read_super_error; } status = ocfs2_initialize_super(sb, bh, sector_size, &stats); + osb = OCFS2_SB(sb); + if (status < 0) { + mlog_errno(status); + goto read_super_error; + } brelse(bh); bh = NULL; - if (status < 0) - goto out; - - osb = OCFS2_SB(sb); if (!ocfs2_check_set_options(sb, &parsed_options)) { status = -EINVAL; - goto out_super; + goto read_super_error; } osb->s_mount_opt = parsed_options.mount_opt; osb->s_atime_quantum = parsed_options.atime_quantum; @@ -1021,7 +1022,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) status = ocfs2_verify_userspace_stack(osb, &parsed_options); if (status) - goto out_super; + goto read_super_error; sb->s_magic = OCFS2_SUPER_MAGIC; @@ -1035,7 +1036,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) status = -EACCES; mlog(ML_ERROR, "Readonly device detected but readonly " "mount was not specified.\n"); - goto out_super; + goto read_super_error; } /* You should not be able to start a local heartbeat @@ -1044,7 +1045,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) status = -EROFS; mlog(ML_ERROR, "Local heartbeat specified on readonly " "device.\n"); - goto out_super; + goto read_super_error; } status = ocfs2_check_journals_nolocks(osb); @@ -1053,7 +1054,9 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) mlog(ML_ERROR, "Recovery required on readonly " "file system, but write access is " "unavailable.\n"); - goto out_super; + else + mlog_errno(status); + goto read_super_error; } ocfs2_set_ro_flag(osb, 1); @@ -1069,8 +1072,10 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) } status = ocfs2_verify_heartbeat(osb); - if (status < 0) - goto out_super; + if (status < 0) { + mlog_errno(status); + goto read_super_error; + } osb->osb_debug_root = debugfs_create_dir(osb->uuid_str, ocfs2_debugfs_root); @@ -1084,14 +1089,15 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) status = ocfs2_mount_volume(sb); if (status < 0) - goto out_debugfs; + goto read_super_error; if (osb->root_inode) inode = igrab(osb->root_inode); if (!inode) { status = -EIO; - goto out_dismount; + mlog_errno(status); + goto read_super_error; } osb->osb_dev_kset = kset_create_and_add(sb->s_id, NULL, @@ -1099,7 +1105,7 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) if (!osb->osb_dev_kset) { status = -ENOMEM; mlog(ML_ERROR, "Unable to create device kset %s.\n", sb->s_id); - goto out_dismount; + goto read_super_error; } /* Create filecheck sysfs related directories/files at @@ -1108,13 +1114,14 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) status = -ENOMEM; mlog(ML_ERROR, "Unable to create filecheck sysfs directory at " "/sys/fs/ocfs2/%s/filecheck.\n", sb->s_id); - goto out_dismount; + goto read_super_error; } root = d_make_root(inode); if (!root) { status = -ENOMEM; - goto out_dismount; + mlog_errno(status); + goto read_super_error; } sb->s_root = root; @@ -1161,22 +1168,17 @@ static int ocfs2_fill_super(struct super_block *sb, void *data, int silent) return status; -out_dismount: - atomic_set(&osb->vol_state, VOLUME_DISABLED); - wake_up(&osb->osb_mount_event); - ocfs2_free_replay_slots(osb); - ocfs2_dismount_volume(sb, 1); - goto out; +read_super_error: + brelse(bh); -out_debugfs: - debugfs_remove_recursive(osb->osb_debug_root); -out_super: - ocfs2_release_system_inodes(osb); - kfree(osb->recovery_map); - ocfs2_delete_osb(osb); - kfree(osb); -out: - mlog_errno(status); + if (status) + mlog_errno(status); + + if (osb) { + atomic_set(&osb->vol_state, VOLUME_DISABLED); + wake_up(&osb->osb_mount_event); + ocfs2_dismount_volume(sb, 1); + } return status; } @@ -1785,10 +1787,11 @@ static int ocfs2_get_sector(struct super_block *sb, static int ocfs2_mount_volume(struct super_block *sb) { int status = 0; + int unlock_super = 0; struct ocfs2_super *osb = OCFS2_SB(sb); if (ocfs2_is_hard_readonly(osb)) - goto out; + goto leave; mutex_init(&osb->obs_trim_fs_mutex); @@ -1798,58 +1801,44 @@ static int ocfs2_mount_volume(struct super_block *sb) if (status == -EBADR && ocfs2_userspace_stack(osb)) mlog(ML_ERROR, "couldn't mount because cluster name on" " disk does not match the running cluster name.\n"); - goto out; + goto leave; } status = ocfs2_super_lock(osb, 1); if (status < 0) { mlog_errno(status); - goto out_dlm; + goto leave; } + unlock_super = 1; /* This will load up the node map and add ourselves to it. */ status = ocfs2_find_slot(osb); if (status < 0) { mlog_errno(status); - goto out_super_lock; + goto leave; } /* load all node-local system inodes */ status = ocfs2_init_local_system_inodes(osb); if (status < 0) { mlog_errno(status); - goto out_super_lock; + goto leave; } status = ocfs2_check_volume(osb); if (status < 0) { mlog_errno(status); - goto out_system_inodes; + goto leave; } status = ocfs2_truncate_log_init(osb); - if (status < 0) { + if (status < 0) mlog_errno(status); - goto out_check_volume; - } - ocfs2_super_unlock(osb, 1); - return 0; +leave: + if (unlock_super) + ocfs2_super_unlock(osb, 1); -out_check_volume: - ocfs2_free_replay_slots(osb); -out_system_inodes: - if (osb->local_alloc_state == OCFS2_LA_ENABLED) - ocfs2_shutdown_local_alloc(osb); - ocfs2_release_system_inodes(osb); - /* before journal shutdown, we should release slot_info */ - ocfs2_free_slot_info(osb); - ocfs2_journal_shutdown(osb); -out_super_lock: - ocfs2_super_unlock(osb, 1); -out_dlm: - ocfs2_dlm_shutdown(osb, 0); -out: return status; } @@ -1922,7 +1911,8 @@ static void ocfs2_dismount_volume(struct super_block *sb, int mnt_err) !ocfs2_is_hard_readonly(osb)) hangup_needed = 1; - ocfs2_dlm_shutdown(osb, hangup_needed); + if (osb->cconn) + ocfs2_dlm_shutdown(osb, hangup_needed); ocfs2_blockcheck_stats_debugfs_remove(&osb->osb_ecc_stats); debugfs_remove_recursive(osb->osb_debug_root);
diff --git a/fs/orangefs/orangefs-debugfs.c b/fs/orangefs/orangefs-debugfs.c index 1b508f5..29eaa45 100644 --- a/fs/orangefs/orangefs-debugfs.c +++ b/fs/orangefs/orangefs-debugfs.c
@@ -194,10 +194,15 @@ void orangefs_debugfs_init(int debug_mask) */ static void orangefs_kernel_debug_init(void) { - static char k_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN] = { }; + int rc = -ENOMEM; + char *k_buffer = NULL; gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__); + k_buffer = kzalloc(ORANGEFS_MAX_DEBUG_STRING_LEN, GFP_KERNEL); + if (!k_buffer) + goto out; + if (strlen(kernel_debug_string) + 1 < ORANGEFS_MAX_DEBUG_STRING_LEN) { strcpy(k_buffer, kernel_debug_string); strcat(k_buffer, "\n"); @@ -208,14 +213,15 @@ static void orangefs_kernel_debug_init(void) debugfs_create_file(ORANGEFS_KMOD_DEBUG_FILE, 0444, debug_dir, k_buffer, &kernel_debug_fops); + +out: + gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: rc:%d:\n", __func__, rc); } void orangefs_debugfs_cleanup(void) { debugfs_remove_recursive(debug_dir); - kfree(debug_help_string); - debug_help_string = NULL; } /* open ORANGEFS_KMOD_DEBUG_HELP_FILE */ @@ -291,13 +297,18 @@ static int help_show(struct seq_file *m, void *v) /* * initialize the client-debug file. */ -static void orangefs_client_debug_init(void) +static int orangefs_client_debug_init(void) { - static char c_buffer[ORANGEFS_MAX_DEBUG_STRING_LEN] = { }; + int rc = -ENOMEM; + char *c_buffer = NULL; gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: start\n", __func__); + c_buffer = kzalloc(ORANGEFS_MAX_DEBUG_STRING_LEN, GFP_KERNEL); + if (!c_buffer) + goto out; + if (strlen(client_debug_string) + 1 < ORANGEFS_MAX_DEBUG_STRING_LEN) { strcpy(c_buffer, client_debug_string); strcat(c_buffer, "\n"); @@ -311,6 +322,13 @@ static void orangefs_client_debug_init(void) debug_dir, c_buffer, &kernel_debug_fops); + + rc = 0; + +out: + + gossip_debug(GOSSIP_DEBUGFS_DEBUG, "%s: rc:%d:\n", __func__, rc); + return rc; } /* open ORANGEFS_KMOD_DEBUG_FILE or ORANGEFS_CLIENT_DEBUG_FILE.*/ @@ -653,7 +671,6 @@ int orangefs_prepare_debugfs_help_string(int at_boot) memset(debug_help_string, 0, DEBUG_HELP_STRING_SIZE); strlcat(debug_help_string, new, string_size); mutex_unlock(&orangefs_help_file_lock); - kfree(new); } rc = 0;
diff --git a/fs/orangefs/orangefs-mod.c b/fs/orangefs/orangefs-mod.c index 6aa7a23..c010c1f 100644 --- a/fs/orangefs/orangefs-mod.c +++ b/fs/orangefs/orangefs-mod.c
@@ -141,7 +141,7 @@ static int __init orangefs_init(void) gossip_err("%s: could not initialize device subsystem %d!\n", __func__, ret); - goto cleanup_sysfs; + goto cleanup_device; } ret = register_filesystem(&orangefs_fs_type); @@ -153,11 +153,11 @@ static int __init orangefs_init(void) goto out; } - orangefs_dev_cleanup(); - -cleanup_sysfs: orangefs_sysfs_exit(); +cleanup_device: + orangefs_dev_cleanup(); + sysfs_init_failed: orangefs_debugfs_cleanup();
diff --git a/fs/overlayfs/dir.c b/fs/overlayfs/dir.c index 445ec31..7a70ace 100644 --- a/fs/overlayfs/dir.c +++ b/fs/overlayfs/dir.c
@@ -557,43 +557,29 @@ static int ovl_create_or_link(struct dentry *dentry, struct inode *inode, goto out_revert_creds; } - if (!attr->hardlink) { - err = -ENOMEM; - override_cred = prepare_creds(); - if (!override_cred) - goto out_revert_creds; - /* - * In the creation cases(create, mkdir, mknod, symlink), - * ovl should transfer current's fs{u,g}id to underlying - * fs. Because underlying fs want to initialize its new - * inode owner using current's fs{u,g}id. And in this - * case, the @inode is a new inode that is initialized - * in inode_init_owner() to current's fs{u,g}id. So use - * the inode's i_{u,g}id to override the cred's fs{u,g}id. - * - * But in the other hardlink case, ovl_link() does not - * create a new inode, so just use the ovl mounter's - * fs{u,g}id. - */ + err = -ENOMEM; + override_cred = prepare_creds(); + if (override_cred) { override_cred->fsuid = inode->i_uid; override_cred->fsgid = inode->i_gid; - err = security_dentry_create_files_as(dentry, - attr->mode, &dentry->d_name, - old_cred ? old_cred : current_cred(), - override_cred); - if (err) { - put_cred(override_cred); - goto out_revert_creds; + if (!attr->hardlink) { + err = security_dentry_create_files_as(dentry, + attr->mode, &dentry->d_name, + old_cred ? old_cred : current_cred(), + override_cred); + if (err) { + put_cred(override_cred); + goto out_revert_creds; + } } hold_cred = override_creds(override_cred); put_cred(override_cred); + + if (!ovl_dentry_is_whiteout(dentry)) + err = ovl_create_upper(dentry, inode, attr); + else + err = ovl_create_over_whiteout(dentry, inode, attr); } - - if (!ovl_dentry_is_whiteout(dentry)) - err = ovl_create_upper(dentry, inode, attr); - else - err = ovl_create_over_whiteout(dentry, inode, attr); - out_revert_creds: ovl_revert_creds(dentry->d_sb, old_cred ?: hold_cred); if (old_cred && hold_cred)
diff --git a/fs/overlayfs/export.c b/fs/overlayfs/export.c index 984df24..19574ef 100644 --- a/fs/overlayfs/export.c +++ b/fs/overlayfs/export.c
@@ -274,7 +274,7 @@ static int ovl_encode_fh(struct inode *inode, u32 *fid, int *max_len, return FILEID_INVALID; dentry = d_find_any_alias(inode); - if (!dentry) + if (WARN_ON(!dentry)) return FILEID_INVALID; type = ovl_dentry_to_fh(dentry, fid, max_len);
diff --git a/fs/pnode.c b/fs/pnode.c index 6e03917..f6cf374 100644 --- a/fs/pnode.c +++ b/fs/pnode.c
@@ -244,7 +244,7 @@ static int propagate_one(struct mount *m) } do { struct mount *parent = last_source->mnt_parent; - if (peers(last_source, first_source)) + if (last_source == first_source) break; done = parent->mnt_master == p; if (done && peers(n, parent))
diff --git a/fs/proc/proc_sysctl.c b/fs/proc/proc_sysctl.c index f4264dd..d80989b 100644 --- a/fs/proc/proc_sysctl.c +++ b/fs/proc/proc_sysctl.c
@@ -14,7 +14,6 @@ #include <linux/mm.h> #include <linux/module.h> #include <linux/bpf-cgroup.h> -#include <linux/kmemleak.h> #include "internal.h" static const struct dentry_operations proc_sys_dentry_operations; @@ -1398,38 +1397,6 @@ struct ctl_table_header *register_sysctl(const char *path, struct ctl_table *tab } EXPORT_SYMBOL(register_sysctl); -/** - * __register_sysctl_init() - register sysctl table to path - * @path: path name for sysctl base - * @table: This is the sysctl table that needs to be registered to the path - * @table_name: The name of sysctl table, only used for log printing when - * registration fails - * - * The sysctl interface is used by userspace to query or modify at runtime - * a predefined value set on a variable. These variables however have default - * values pre-set. Code which depends on these variables will always work even - * if register_sysctl() fails. If register_sysctl() fails you'd just loose the - * ability to query or modify the sysctls dynamically at run time. Chances of - * register_sysctl() failing on init are extremely low, and so for both reasons - * this function does not return any error as it is used by initialization code. - * - * Context: Can only be called after your respective sysctl base path has been - * registered. So for instance, most base directories are registered early on - * init before init levels are processed through proc_sys_init() and - * sysctl_init(). - */ -void __init __register_sysctl_init(const char *path, struct ctl_table *table, - const char *table_name) -{ - struct ctl_table_header *hdr = register_sysctl(path, table); - - if (unlikely(!hdr)) { - pr_err("failed when register_sysctl %s to %s\n", table_name, path); - return; - } - kmemleak_not_leak(hdr); -} - static char *append_path(const char *path, char *pos, const char *name) { int namelen;
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index ef8119f..c1f0007 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c
@@ -785,7 +785,9 @@ static int smaps_hugetlb_range(pte_t *pte, unsigned long hmask, page = device_private_entry_to_page(swpent); } if (page) { - if (page_mapcount(page) >= 2 || hugetlb_pmd_shared(pte)) + int mapcount = page_mapcount(page); + + if (mapcount >= 2) mss->shared_hugetlb += huge_page_size(hstate_vma(vma)); else mss->private_hugetlb += huge_page_size(hstate_vma(vma)); @@ -949,7 +951,7 @@ static int show_smaps_rollup(struct seq_file *m, void *v) last_vma_end = vma->vm_end; } - show_vma_header_prefix(m, priv->mm->mmap ? priv->mm->mmap->vm_start : 0, + show_vma_header_prefix(m, priv->mm->mmap->vm_start, last_vma_end, 0, 0, 0, 0); seq_pad(m, ' '); seq_puts(m, "[rollup]\n");
diff --git a/fs/pstore/Kconfig b/fs/pstore/Kconfig index 71dbe9a..8efe604 100644 --- a/fs/pstore/Kconfig +++ b/fs/pstore/Kconfig
@@ -118,7 +118,6 @@ config PSTORE_PMSG bool "Log user space messages" depends on PSTORE - select RT_MUTEXES help When the option is enabled, pstore will export a character interface /dev/pmsg0 to log user space messages. On reboot
diff --git a/fs/pstore/pmsg.c b/fs/pstore/pmsg.c index 18cf94b..d8542ec 100644 --- a/fs/pstore/pmsg.c +++ b/fs/pstore/pmsg.c
@@ -7,10 +7,9 @@ #include <linux/device.h> #include <linux/fs.h> #include <linux/uaccess.h> -#include <linux/rtmutex.h> #include "internal.h" -static DEFINE_RT_MUTEX(pmsg_lock); +static DEFINE_MUTEX(pmsg_lock); static ssize_t write_pmsg(struct file *file, const char __user *buf, size_t count, loff_t *ppos) @@ -29,9 +28,9 @@ static ssize_t write_pmsg(struct file *file, const char __user *buf, if (!access_ok(buf, count)) return -EFAULT; - rt_mutex_lock(&pmsg_lock); + mutex_lock(&pmsg_lock); ret = psinfo->write_user(&record, buf); - rt_mutex_unlock(&pmsg_lock); + mutex_unlock(&pmsg_lock); return ret ? ret : count; }
diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index c18aee1..887b408 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c
@@ -773,7 +773,6 @@ static int ramoops_probe(struct platform_device *pdev) /* Make sure we didn't get bogus platform data pointer. */ if (!pdata) { pr_err("NULL platform data\n"); - err = -EINVAL; goto fail_out; } @@ -781,7 +780,6 @@ static int ramoops_probe(struct platform_device *pdev) !pdata->ftrace_size && !pdata->pmsg_size)) { pr_err("The memory size and the record/console size must be " "non-zero\n"); - err = -EINVAL; goto fail_out; }
diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index 41fce38..36e4e4d 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c
@@ -428,11 +428,7 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size, phys_addr_t addr = page_start + i * PAGE_SIZE; pages[i] = pfn_to_page(addr >> PAGE_SHIFT); } - /* - * VM_IOREMAP used here to bypass this region during vread() - * and kmap_atomic() (i.e. kcore) to avoid __va() failures. - */ - vaddr = vmap(pages, page_count, VM_MAP | VM_IOREMAP, prot); + vaddr = vmap(pages, page_count, VM_MAP, prot); kfree(pages); /*
diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c index 93bc48c..819428d 100644 --- a/fs/pstore/zone.c +++ b/fs/pstore/zone.c
@@ -761,7 +761,7 @@ static inline int notrace psz_kmsg_write_record(struct psz_context *cxt, /* avoid destroying old data, allocate a new one */ len = zone->buffer_size + sizeof(*zone->buffer); zone->oldbuf = zone->buffer; - zone->buffer = kzalloc(len, GFP_ATOMIC); + zone->buffer = kzalloc(len, GFP_KERNEL); if (!zone->buffer) { zone->buffer = zone->oldbuf; return -ENOMEM;
diff --git a/fs/quota/dquot.c b/fs/quota/dquot.c index 1d652af..dc5f865 100644 --- a/fs/quota/dquot.c +++ b/fs/quota/dquot.c
@@ -2306,62 +2306,28 @@ EXPORT_SYMBOL(dquot_quota_off); * Turn quotas on on a device */ -static int vfs_setup_quota_inode(struct inode *inode, int type) -{ - struct super_block *sb = inode->i_sb; - struct quota_info *dqopt = sb_dqopt(sb); - - if (is_bad_inode(inode)) - return -EUCLEAN; - if (!S_ISREG(inode->i_mode)) - return -EACCES; - if (IS_RDONLY(inode)) - return -EROFS; - if (sb_has_quota_loaded(sb, type)) - return -EBUSY; - - dqopt->files[type] = igrab(inode); - if (!dqopt->files[type]) - return -EIO; - if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) { - /* We don't want quota and atime on quota files (deadlocks - * possible) Also nobody should write to the file - we use - * special IO operations which ignore the immutable bit. */ - inode_lock(inode); - inode->i_flags |= S_NOQUOTA; - inode_unlock(inode); - /* - * When S_NOQUOTA is set, remove dquot references as no more - * references can be added - */ - __dquot_drop(inode); - } - return 0; -} - -static void vfs_cleanup_quota_inode(struct super_block *sb, int type) -{ - struct quota_info *dqopt = sb_dqopt(sb); - struct inode *inode = dqopt->files[type]; - - if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) { - inode_lock(inode); - inode->i_flags &= ~S_NOQUOTA; - inode_unlock(inode); - } - dqopt->files[type] = NULL; - iput(inode); -} - -int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, +/* + * Helper function to turn quotas on when we already have the inode of + * quota file and no quota information is loaded. + */ +static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, unsigned int flags) { struct quota_format_type *fmt = find_quota_format(format_id); + struct super_block *sb = inode->i_sb; struct quota_info *dqopt = sb_dqopt(sb); int error; if (!fmt) return -ESRCH; + if (!S_ISREG(inode->i_mode)) { + error = -EACCES; + goto out_fmt; + } + if (IS_RDONLY(inode)) { + error = -EROFS; + goto out_fmt; + } if (!sb->s_op->quota_write || !sb->s_op->quota_read || (type == PRJQUOTA && sb->dq_op->get_projid == NULL)) { error = -EINVAL; @@ -2393,9 +2359,27 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, invalidate_bdev(sb->s_bdev); } + if (!(dqopt->flags & DQUOT_QUOTA_SYS_FILE)) { + /* We don't want quota and atime on quota files (deadlocks + * possible) Also nobody should write to the file - we use + * special IO operations which ignore the immutable bit. */ + inode_lock(inode); + inode->i_flags |= S_NOQUOTA; + inode_unlock(inode); + /* + * When S_NOQUOTA is set, remove dquot references as no more + * references can be added + */ + __dquot_drop(inode); + } + + error = -EIO; + dqopt->files[type] = igrab(inode); + if (!dqopt->files[type]) + goto out_file_flags; error = -EINVAL; if (!fmt->qf_ops->check_quota_file(sb, type)) - goto out_fmt; + goto out_file_init; dqopt->ops[type] = fmt->qf_ops; dqopt->info[type].dqi_format = fmt; @@ -2403,7 +2387,7 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, INIT_LIST_HEAD(&dqopt->info[type].dqi_dirty_list); error = dqopt->ops[type]->read_file_info(sb, type); if (error < 0) - goto out_fmt; + goto out_file_init; if (dqopt->flags & DQUOT_QUOTA_SYS_FILE) { spin_lock(&dq_data_lock); dqopt->info[type].dqi_flags |= DQF_SYS_FILE; @@ -2418,30 +2402,18 @@ int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, dquot_disable(sb, type, flags); return error; +out_file_init: + dqopt->files[type] = NULL; + iput(inode); +out_file_flags: + inode_lock(inode); + inode->i_flags &= ~S_NOQUOTA; + inode_unlock(inode); out_fmt: put_quota_format(fmt); return error; } -EXPORT_SYMBOL(dquot_load_quota_sb); - -/* - * Helper function to turn quotas on when we already have the inode of - * quota file and no quota information is loaded. - */ -static int vfs_load_quota_inode(struct inode *inode, int type, int format_id, - unsigned int flags) -{ - int err; - - err = vfs_setup_quota_inode(inode, type); - if (err < 0) - return err; - err = dquot_load_quota_sb(inode->i_sb, type, format_id, flags); - if (err < 0) - vfs_cleanup_quota_inode(inode->i_sb, type); - return err; -} /* Reenable quotas on remount RW */ int dquot_resume(struct super_block *sb, int type)
diff --git a/fs/quota/quota_tree.c b/fs/quota/quota_tree.c index 07948f6..1a188fb 100644 --- a/fs/quota/quota_tree.c +++ b/fs/quota/quota_tree.c
@@ -80,35 +80,6 @@ static ssize_t write_blk(struct qtree_mem_dqinfo *info, uint blk, char *buf) return ret; } -static inline int do_check_range(struct super_block *sb, const char *val_name, - uint val, uint min_val, uint max_val) -{ - if (val < min_val || val > max_val) { - quota_error(sb, "Getting %s %u out of range %u-%u", - val_name, val, min_val, max_val); - return -EUCLEAN; - } - - return 0; -} - -static int check_dquot_block_header(struct qtree_mem_dqinfo *info, - struct qt_disk_dqdbheader *dh) -{ - int err = 0; - - err = do_check_range(info->dqi_sb, "dqdh_next_free", - le32_to_cpu(dh->dqdh_next_free), 0, - info->dqi_blocks - 1); - if (err) - return err; - err = do_check_range(info->dqi_sb, "dqdh_prev_free", - le32_to_cpu(dh->dqdh_prev_free), 0, - info->dqi_blocks - 1); - - return err; -} - /* Remove empty block from list and return it */ static int get_free_dqblk(struct qtree_mem_dqinfo *info) { @@ -123,9 +94,6 @@ static int get_free_dqblk(struct qtree_mem_dqinfo *info) ret = read_blk(info, blk, buf); if (ret < 0) goto out_buf; - ret = check_dquot_block_header(info, dh); - if (ret) - goto out_buf; info->dqi_free_blk = le32_to_cpu(dh->dqdh_next_free); } else { @@ -273,9 +241,6 @@ static uint find_free_dqentry(struct qtree_mem_dqinfo *info, *err = read_blk(info, blk, buf); if (*err < 0) goto out_buf; - *err = check_dquot_block_header(info, dh); - if (*err) - goto out_buf; } else { blk = get_free_dqblk(info); if ((int)blk < 0) { @@ -468,9 +433,6 @@ static int free_dqentry(struct qtree_mem_dqinfo *info, struct dquot *dquot, goto out_buf; } dh = (struct qt_disk_dqdbheader *)buf; - ret = check_dquot_block_header(info, dh); - if (ret) - goto out_buf; le16_add_cpu(&dh->dqdh_entries, -1); if (!le16_to_cpu(dh->dqdh_entries)) { /* Block got free? */ ret = remove_free_dqentry(info, buf, blk);
diff --git a/fs/reiserfs/namei.c b/fs/reiserfs/namei.c index 2843b7c..959a066 100644 --- a/fs/reiserfs/namei.c +++ b/fs/reiserfs/namei.c
@@ -695,7 +695,6 @@ static int reiserfs_create(struct inode *dir, struct dentry *dentry, umode_t mod out_failed: reiserfs_write_unlock(dir->i_sb); - reiserfs_security_free(&security); return retval; } @@ -779,7 +778,6 @@ static int reiserfs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode out_failed: reiserfs_write_unlock(dir->i_sb); - reiserfs_security_free(&security); return retval; } @@ -878,7 +876,6 @@ static int reiserfs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode retval = journal_end(&th); out_failed: reiserfs_write_unlock(dir->i_sb); - reiserfs_security_free(&security); return retval; } @@ -1194,7 +1191,6 @@ static int reiserfs_symlink(struct inode *parent_dir, retval = journal_end(&th); out_failed: reiserfs_write_unlock(parent_dir->i_sb); - reiserfs_security_free(&security); return retval; }
diff --git a/fs/reiserfs/super.c b/fs/reiserfs/super.c index 0ebb6e6..913f5af 100644 --- a/fs/reiserfs/super.c +++ b/fs/reiserfs/super.c
@@ -1437,6 +1437,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) unsigned long safe_mask = 0; unsigned int commit_max_age = (unsigned int)-1; struct reiserfs_journal *journal = SB_JOURNAL(s); + char *new_opts; int err; char *qf_names[REISERFS_MAXQUOTAS]; unsigned int qfmt = 0; @@ -1444,6 +1445,10 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) int i; #endif + new_opts = kstrdup(arg, GFP_KERNEL); + if (arg && !new_opts) + return -ENOMEM; + sync_filesystem(s); reiserfs_write_lock(s); @@ -1594,6 +1599,7 @@ static int reiserfs_remount(struct super_block *s, int *mount_flags, char *arg) out_err_unlock: reiserfs_write_unlock(s); out_err: + kfree(new_opts); return err; }
diff --git a/fs/reiserfs/xattr_security.c b/fs/reiserfs/xattr_security.c index ba6355b..eedfa07 100644 --- a/fs/reiserfs/xattr_security.c +++ b/fs/reiserfs/xattr_security.c
@@ -50,7 +50,6 @@ int reiserfs_security_init(struct inode *dir, struct inode *inode, int error; sec->name = NULL; - sec->value = NULL; /* Don't add selinux attributes on xattrs - they'll never get used */ if (IS_PRIVATE(dir)) @@ -96,6 +95,7 @@ int reiserfs_security_write(struct reiserfs_transaction_handle *th, void reiserfs_security_free(struct reiserfs_security_handle *sec) { + kfree(sec->name); kfree(sec->value); sec->name = NULL; sec->value = NULL;
diff --git a/fs/squashfs/squashfs_fs.h b/fs/squashfs/squashfs_fs.h index ccfaf8c..236664d 100644 --- a/fs/squashfs/squashfs_fs.h +++ b/fs/squashfs/squashfs_fs.h
@@ -183,7 +183,7 @@ static inline int squashfs_block_size(__le32 raw) #define SQUASHFS_ID_BLOCK_BYTES(A) (SQUASHFS_ID_BLOCKS(A) *\ sizeof(u64)) /* xattr id lookup table defines */ -#define SQUASHFS_XATTR_BYTES(A) (((u64) (A)) * sizeof(struct squashfs_xattr_id)) +#define SQUASHFS_XATTR_BYTES(A) ((A) * sizeof(struct squashfs_xattr_id)) #define SQUASHFS_XATTR_BLOCK(A) (SQUASHFS_XATTR_BYTES(A) / \ SQUASHFS_METADATA_SIZE)
diff --git a/fs/squashfs/squashfs_fs_sb.h b/fs/squashfs/squashfs_fs_sb.h index 8f9445e..166e988 100644 --- a/fs/squashfs/squashfs_fs_sb.h +++ b/fs/squashfs/squashfs_fs_sb.h
@@ -63,7 +63,7 @@ struct squashfs_sb_info { long long bytes_used; unsigned int inodes; unsigned int fragments; - unsigned int xattr_ids; + int xattr_ids; unsigned int ids; }; #endif
diff --git a/fs/squashfs/xattr.h b/fs/squashfs/xattr.h index f1a463d..d8a270d 100644 --- a/fs/squashfs/xattr.h +++ b/fs/squashfs/xattr.h
@@ -10,12 +10,12 @@ #ifdef CONFIG_SQUASHFS_XATTR extern __le64 *squashfs_read_xattr_id_table(struct super_block *, u64, - u64 *, unsigned int *); + u64 *, int *); extern int squashfs_xattr_lookup(struct super_block *, unsigned int, int *, unsigned int *, unsigned long long *); #else static inline __le64 *squashfs_read_xattr_id_table(struct super_block *sb, - u64 start, u64 *xattr_table_start, unsigned int *xattr_ids) + u64 start, u64 *xattr_table_start, int *xattr_ids) { struct squashfs_xattr_id_table *id_table;
diff --git a/fs/squashfs/xattr_id.c b/fs/squashfs/xattr_id.c index c8469c6..087cab8 100644 --- a/fs/squashfs/xattr_id.c +++ b/fs/squashfs/xattr_id.c
@@ -56,7 +56,7 @@ int squashfs_xattr_lookup(struct super_block *sb, unsigned int index, * Read uncompressed xattr id lookup table indexes from disk into memory */ __le64 *squashfs_read_xattr_id_table(struct super_block *sb, u64 table_start, - u64 *xattr_table_start, unsigned int *xattr_ids) + u64 *xattr_table_start, int *xattr_ids) { struct squashfs_sb_info *msblk = sb->s_fs_info; unsigned int len, indexes;
diff --git a/fs/sysv/itree.c b/fs/sysv/itree.c index 31f6605..bcb67b0 100644 --- a/fs/sysv/itree.c +++ b/fs/sysv/itree.c
@@ -438,7 +438,7 @@ static unsigned sysv_nblocks(struct super_block *s, loff_t size) res += blocks; direct = 1; } - return res; + return blocks; } int sysv_getattr(const struct path *path, struct kstat *stat,
diff --git a/fs/tracefs/inode.c b/fs/tracefs/inode.c index 7b75988..e30bdbb 100644 --- a/fs/tracefs/inode.c +++ b/fs/tracefs/inode.c
@@ -139,8 +139,6 @@ struct tracefs_mount_opts { kuid_t uid; kgid_t gid; umode_t mode; - /* Opt_* bitfield. */ - unsigned int opts; }; enum { @@ -241,7 +239,6 @@ static int tracefs_parse_options(char *data, struct tracefs_mount_opts *opts) kgid_t gid; char *p; - opts->opts = 0; opts->mode = TRACEFS_DEFAULT_MODE; while ((p = strsep(&data, ",")) != NULL) { @@ -276,36 +273,24 @@ static int tracefs_parse_options(char *data, struct tracefs_mount_opts *opts) * but traditionally tracefs has ignored all mount options */ } - - opts->opts |= BIT(token); } return 0; } -static int tracefs_apply_options(struct super_block *sb, bool remount) +static int tracefs_apply_options(struct super_block *sb) { struct tracefs_fs_info *fsi = sb->s_fs_info; struct inode *inode = sb->s_root->d_inode; struct tracefs_mount_opts *opts = &fsi->mount_opts; - /* - * On remount, only reset mode/uid/gid if they were provided as mount - * options. - */ + inode->i_mode &= ~S_IALLUGO; + inode->i_mode |= opts->mode; - if (!remount || opts->opts & BIT(Opt_mode)) { - inode->i_mode &= ~S_IALLUGO; - inode->i_mode |= opts->mode; - } + inode->i_uid = opts->uid; - if (!remount || opts->opts & BIT(Opt_uid)) - inode->i_uid = opts->uid; - - if (!remount || opts->opts & BIT(Opt_gid)) { - /* Set all the group ids to the mount option */ - set_gid(sb->s_root, opts->gid); - } + /* Set all the group ids to the mount option */ + set_gid(sb->s_root, opts->gid); return 0; } @@ -320,7 +305,7 @@ static int tracefs_remount(struct super_block *sb, int *flags, char *data) if (err) goto fail; - tracefs_apply_options(sb, true); + tracefs_apply_options(sb); fail: return err; @@ -372,7 +357,7 @@ static int trace_fill_super(struct super_block *sb, void *data, int silent) sb->s_op = &tracefs_super_operations; - tracefs_apply_options(sb, false); + tracefs_apply_options(sb); return 0;
diff --git a/fs/ubifs/budget.c b/fs/ubifs/budget.c index 9cb05ef..c0b84e9 100644 --- a/fs/ubifs/budget.c +++ b/fs/ubifs/budget.c
@@ -212,10 +212,11 @@ long long ubifs_calc_available(const struct ubifs_info *c, int min_idx_lebs) subtract_lebs += 1; /* - * Since different write types go to different heads, we should - * reserve one leb for each head. + * The GC journal head LEB is not really accessible. And since + * different write types go to different heads, we may count only on + * one head's space. */ - subtract_lebs += c->jhead_cnt; + subtract_lebs += c->jhead_cnt - 1; /* We also reserve one LEB for deletions, which bypass budgeting */ subtract_lebs += 1; @@ -402,7 +403,7 @@ static int calc_dd_growth(const struct ubifs_info *c, dd_growth = req->dirtied_page ? c->bi.page_budget : 0; if (req->dirtied_ino) - dd_growth += c->bi.inode_budget * req->dirtied_ino; + dd_growth += c->bi.inode_budget << (req->dirtied_ino - 1); if (req->mod_dent) dd_growth += c->bi.dent_budget; dd_growth += req->dirtied_ino_d;
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 94471d5..3a3abac 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c
@@ -1118,6 +1118,7 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, int err, sz_change, len = strlen(symname); struct fscrypt_str disk_link; struct ubifs_budget_req req = { .new_ino = 1, .new_dent = 1, + .new_ino_d = ALIGN(len, 8), .dirtied_ino = 1 }; struct fscrypt_name nm; @@ -1133,7 +1134,6 @@ static int ubifs_symlink(struct inode *dir, struct dentry *dentry, * Budget request settings: new inode, new direntry and changing parent * directory inode. */ - req.new_ino_d = ALIGN(disk_link.len - 1, 8); err = ubifs_budget_space(c, &req); if (err) return err; @@ -1289,8 +1289,6 @@ static int do_rename(struct inode *old_dir, struct dentry *old_dentry, if (unlink) { ubifs_assert(c, inode_is_locked(new_inode)); - /* Budget for old inode's data when its nlink > 1. */ - req.dirtied_ino_d = ALIGN(ubifs_inode(new_inode)->data_len, 8); err = ubifs_purge_xattrs(new_inode); if (err) return err; @@ -1533,10 +1531,6 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, return err; } - err = ubifs_budget_space(c, &req); - if (err) - goto out; - lock_4_inodes(old_dir, new_dir, NULL, NULL); time = current_time(old_dir); @@ -1562,7 +1556,6 @@ static int ubifs_xrename(struct inode *old_dir, struct dentry *old_dentry, unlock_4_inodes(old_dir, new_dir, NULL, NULL); ubifs_release_budget(c, &req); -out: fscrypt_free_filename(&fst_nm); fscrypt_free_filename(&snd_nm); return err;
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c index 622d2ef..6156724 100644 --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c
@@ -1031,7 +1031,7 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) if (page->index >= synced_i_size >> PAGE_SHIFT) { err = inode->i_sb->s_op->write_inode(inode, NULL); if (err) - goto out_redirty; + goto out_unlock; /* * The inode has been written, but the write-buffer has * not been synchronized, so in case of an unclean @@ -1059,17 +1059,11 @@ static int ubifs_writepage(struct page *page, struct writeback_control *wbc) if (i_size > synced_i_size) { err = inode->i_sb->s_op->write_inode(inode, NULL); if (err) - goto out_redirty; + goto out_unlock; } return do_writepage(page, len); -out_redirty: - /* - * redirty_page_for_writepage() won't call ubifs_dirty_inode() because - * it passes I_DIRTY_PAGES flag while calling __mark_inode_dirty(), so - * there is no need to do space budget for dirty inode. - */ - redirty_page_for_writepage(wbc, page); + out_unlock: unlock_page(page); return err;
diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c index 2952604..b37c6b1 100644 --- a/fs/ubifs/super.c +++ b/fs/ubifs/super.c
@@ -815,7 +815,7 @@ static int alloc_wbufs(struct ubifs_info *c) INIT_LIST_HEAD(&c->jheads[i].buds_list); err = ubifs_wbuf_init(c, &c->jheads[i].wbuf); if (err) - goto out_wbuf; + return err; c->jheads[i].wbuf.sync_callback = &bud_wbuf_callback; c->jheads[i].wbuf.jhead = i; @@ -823,7 +823,7 @@ static int alloc_wbufs(struct ubifs_info *c) c->jheads[i].log_hash = ubifs_hash_get_desc(c); if (IS_ERR(c->jheads[i].log_hash)) { err = PTR_ERR(c->jheads[i].log_hash); - goto out_log_hash; + goto out; } } @@ -836,18 +836,9 @@ static int alloc_wbufs(struct ubifs_info *c) return 0; -out_log_hash: - kfree(c->jheads[i].wbuf.buf); - kfree(c->jheads[i].wbuf.inodes); - -out_wbuf: - while (i--) { - kfree(c->jheads[i].wbuf.buf); - kfree(c->jheads[i].wbuf.inodes); +out: + while (i--) kfree(c->jheads[i].log_hash); - } - kfree(c->jheads); - c->jheads = NULL; return err; }
diff --git a/fs/ubifs/tnc.c b/fs/ubifs/tnc.c index 6461f61..33742ee 100644 --- a/fs/ubifs/tnc.c +++ b/fs/ubifs/tnc.c
@@ -267,18 +267,11 @@ static struct ubifs_znode *dirty_cow_znode(struct ubifs_info *c, if (zbr->len) { err = insert_old_idx(c, zbr->lnum, zbr->offs); if (unlikely(err)) - /* - * Obsolete znodes will be freed by tnc_destroy_cnext() - * or free_obsolete_znodes(), copied up znodes should - * be added back to tnc and freed by - * ubifs_destroy_tnc_subtree(). - */ - goto out; + return ERR_PTR(err); err = add_idx_dirt(c, zbr->lnum, zbr->len); } else err = 0; -out: zbr->znode = zn; zbr->lnum = 0; zbr->offs = 0; @@ -3061,21 +3054,6 @@ static void tnc_destroy_cnext(struct ubifs_info *c) cnext = cnext->cnext; if (ubifs_zn_obsolete(znode)) kfree(znode); - else if (!ubifs_zn_cow(znode)) { - /* - * Don't forget to update clean znode count after - * committing failed, because ubifs will check this - * count while closing tnc. Non-obsolete znode could - * be re-dirtied during committing process, so dirty - * flag is untrustable. The flag 'COW_ZNODE' is set - * for each dirty znode before committing, and it is - * cleared as long as the znode become clean, so we - * can statistic clean znode count according to this - * flag. - */ - atomic_long_inc(&c->clean_zn_cnt); - atomic_long_inc(&ubifs_clean_zn_cnt); - } } while (cnext && cnext != c->cnext); }
diff --git a/fs/ubifs/ubifs.h b/fs/ubifs/ubifs.h index 1ad35ed..0eca220 100644 --- a/fs/ubifs/ubifs.h +++ b/fs/ubifs/ubifs.h
@@ -1593,13 +1593,8 @@ static inline int ubifs_check_hmac(const struct ubifs_info *c, return crypto_memneq(expected, got, c->hmac_desc_len); } -#ifdef CONFIG_UBIFS_FS_AUTHENTICATION void ubifs_bad_hash(const struct ubifs_info *c, const void *node, const u8 *hash, int lnum, int offs); -#else -static inline void ubifs_bad_hash(const struct ubifs_info *c, const void *node, - const u8 *hash, int lnum, int offs) {}; -#endif int __ubifs_node_check_hash(const struct ubifs_info *c, const void *buf, const u8 *expected);
diff --git a/fs/udf/file.c b/fs/udf/file.c index 3b37297..628941a 100644 --- a/fs/udf/file.c +++ b/fs/udf/file.c
@@ -148,24 +148,26 @@ static ssize_t udf_file_write_iter(struct kiocb *iocb, struct iov_iter *from) goto out; down_write(&iinfo->i_data_sem); - if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB && - inode->i_sb->s_blocksize < (udf_file_entry_alloc_offset(inode) + - iocb->ki_pos + iov_iter_count(from))) { - err = udf_expand_file_adinicb(inode); - if (err) { - inode_unlock(inode); - udf_debug("udf_expand_adinicb: err=%d\n", err); - return err; + if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) { + loff_t end = iocb->ki_pos + iov_iter_count(from); + + if (inode->i_sb->s_blocksize < + (udf_file_entry_alloc_offset(inode) + end)) { + err = udf_expand_file_adinicb(inode); + if (err) { + inode_unlock(inode); + udf_debug("udf_expand_adinicb: err=%d\n", err); + return err; + } + } else { + iinfo->i_lenAlloc = max(end, inode->i_size); + up_write(&iinfo->i_data_sem); } } else up_write(&iinfo->i_data_sem); retval = __generic_file_write_iter(iocb, from); out: - down_write(&iinfo->i_data_sem); - if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB && retval > 0) - iinfo->i_lenAlloc = inode->i_size; - up_write(&iinfo->i_data_sem); inode_unlock(inode); if (retval > 0) {
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 4fddedd..eba9490 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c
@@ -440,12 +440,6 @@ static int udf_get_block(struct inode *inode, sector_t block, iinfo->i_next_alloc_goal++; } - /* - * Block beyond EOF and prealloc extents? Just discard preallocation - * as it is not useful and complicates things. - */ - if (((loff_t)block) << inode->i_blkbits > iinfo->i_lenExtents) - udf_discard_prealloc(inode); udf_clear_extent_cache(inode); phys = inode_getblk(inode, block, &err, &new); if (!phys) @@ -495,6 +489,8 @@ static int udf_do_extend_file(struct inode *inode, uint32_t add; int count = 0, fake = !(last_ext->extLength & UDF_EXTENT_LENGTH_MASK); struct super_block *sb = inode->i_sb; + struct kernel_lb_addr prealloc_loc = {}; + uint32_t prealloc_len = 0; struct udf_inode_info *iinfo; int err; @@ -515,6 +511,19 @@ static int udf_do_extend_file(struct inode *inode, ~(sb->s_blocksize - 1); } + /* Last extent are just preallocated blocks? */ + if ((last_ext->extLength & UDF_EXTENT_FLAG_MASK) == + EXT_NOT_RECORDED_ALLOCATED) { + /* Save the extent so that we can reattach it to the end */ + prealloc_loc = last_ext->extLocation; + prealloc_len = last_ext->extLength; + /* Mark the extent as a hole */ + last_ext->extLength = EXT_NOT_RECORDED_NOT_ALLOCATED | + (last_ext->extLength & UDF_EXTENT_LENGTH_MASK); + last_ext->extLocation.logicalBlockNum = 0; + last_ext->extLocation.partitionReferenceNum = 0; + } + /* Can we merge with the previous extent? */ if ((last_ext->extLength & UDF_EXTENT_FLAG_MASK) == EXT_NOT_RECORDED_NOT_ALLOCATED) { @@ -527,10 +536,8 @@ static int udf_do_extend_file(struct inode *inode, } if (fake) { - err = udf_add_aext(inode, last_pos, &last_ext->extLocation, - last_ext->extLength, 1); - if (err < 0) - goto out_err; + udf_add_aext(inode, last_pos, &last_ext->extLocation, + last_ext->extLength, 1); count++; } else { struct kernel_lb_addr tmploc; @@ -544,7 +551,7 @@ static int udf_do_extend_file(struct inode *inode, * more extents, we may need to enter possible following * empty indirect extent. */ - if (new_block_bytes) + if (new_block_bytes || prealloc_len) udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0); } @@ -564,7 +571,7 @@ static int udf_do_extend_file(struct inode *inode, err = udf_add_aext(inode, last_pos, &last_ext->extLocation, last_ext->extLength, 1); if (err) - goto out_err; + return err; count++; } if (new_block_bytes) { @@ -573,11 +580,22 @@ static int udf_do_extend_file(struct inode *inode, err = udf_add_aext(inode, last_pos, &last_ext->extLocation, last_ext->extLength, 1); if (err) - goto out_err; + return err; count++; } out: + /* Do we have some preallocated blocks saved? */ + if (prealloc_len) { + err = udf_add_aext(inode, last_pos, &prealloc_loc, + prealloc_len, 1); + if (err) + return err; + last_ext->extLocation = prealloc_loc; + last_ext->extLength = prealloc_len; + count++; + } + /* last_pos should point to the last written extent... */ if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT) last_pos->offset -= sizeof(struct short_ad); @@ -587,28 +605,19 @@ static int udf_do_extend_file(struct inode *inode, return -EIO; return count; -out_err: - /* Remove extents we've created so far */ - udf_clear_extent_cache(inode); - udf_truncate_extents(inode); - return err; } /* Extend the final block of the file to final_block_len bytes */ static void udf_do_extend_final_block(struct inode *inode, struct extent_position *last_pos, struct kernel_long_ad *last_ext, - uint32_t new_elen) + uint32_t final_block_len) { + struct super_block *sb = inode->i_sb; uint32_t added_bytes; - /* - * Extent already large enough? It may be already rounded up to block - * size... - */ - if (new_elen <= (last_ext->extLength & UDF_EXTENT_LENGTH_MASK)) - return; - added_bytes = new_elen - (last_ext->extLength & UDF_EXTENT_LENGTH_MASK); + added_bytes = final_block_len - + (last_ext->extLength & (sb->s_blocksize - 1)); last_ext->extLength += added_bytes; UDF_I(inode)->i_lenExtents += added_bytes; @@ -625,12 +634,12 @@ static int udf_extend_file(struct inode *inode, loff_t newsize) int8_t etype; struct super_block *sb = inode->i_sb; sector_t first_block = newsize >> sb->s_blocksize_bits, offset; - loff_t new_elen; + unsigned long partial_final_block; int adsize; struct udf_inode_info *iinfo = UDF_I(inode); struct kernel_long_ad extent; int err = 0; - bool within_last_ext; + int within_final_block; if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT) adsize = sizeof(struct short_ad); @@ -639,17 +648,8 @@ static int udf_extend_file(struct inode *inode, loff_t newsize) else BUG(); - /* - * When creating hole in file, just don't bother with preserving - * preallocation. It likely won't be very useful anyway. - */ - udf_discard_prealloc(inode); - etype = inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset); - within_last_ext = (etype != -1); - /* We don't expect extents past EOF... */ - WARN_ON_ONCE(within_last_ext && - elen > ((loff_t)offset + 1) << inode->i_blkbits); + within_final_block = (etype != -1); if ((!epos.bh && epos.offset == udf_file_entry_alloc_offset(inode)) || (epos.bh && epos.offset == sizeof(struct allocExtDesc))) { @@ -665,17 +665,19 @@ static int udf_extend_file(struct inode *inode, loff_t newsize) extent.extLength |= etype << 30; } - new_elen = ((loff_t)offset << inode->i_blkbits) | - (newsize & (sb->s_blocksize - 1)); + partial_final_block = newsize & (sb->s_blocksize - 1); /* File has extent covering the new size (could happen when extending * inside a block)? */ - if (within_last_ext) { + if (within_final_block) { /* Extending file within the last file block */ - udf_do_extend_final_block(inode, &epos, &extent, new_elen); + udf_do_extend_final_block(inode, &epos, &extent, + partial_final_block); } else { - err = udf_do_extend_file(inode, &epos, &extent, new_elen); + loff_t add = ((loff_t)offset << sb->s_blocksize_bits) | + partial_final_block; + err = udf_do_extend_file(inode, &epos, &extent, add); } if (err < 0) @@ -776,11 +778,10 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, goto out_free; } - /* Are we beyond EOF and preallocated extent? */ + /* Are we beyond EOF? */ if (etype == -1) { int ret; loff_t hole_len; - isBeyondEOF = true; if (count) { if (c) @@ -806,17 +807,19 @@ static sector_t inode_getblk(struct inode *inode, sector_t block, c = 0; offset = 0; count += ret; - /* - * Is there any real extent? - otherwise we overwrite the fake - * one... - */ - if (count) - c = !c; - laarr[c].extLength = EXT_NOT_RECORDED_NOT_ALLOCATED | - inode->i_sb->s_blocksize; - memset(&laarr[c].extLocation, 0x00, - sizeof(struct kernel_lb_addr)); - count++; + /* We are not covered by a preallocated extent? */ + if ((laarr[0].extLength & UDF_EXTENT_FLAG_MASK) != + EXT_NOT_RECORDED_ALLOCATED) { + /* Is there any real extent? - otherwise we overwrite + * the fake one... */ + if (count) + c = !c; + laarr[c].extLength = EXT_NOT_RECORDED_NOT_ALLOCATED | + inode->i_sb->s_blocksize; + memset(&laarr[c].extLocation, 0x00, + sizeof(struct kernel_lb_addr)); + count++; + } endnum = c + 1; lastblock = 1; } else { @@ -1093,8 +1096,23 @@ static void udf_merge_extents(struct inode *inode, struct kernel_long_ad *laarr, blocksize - 1) >> blocksize_bits)))) { if (((li->extLength & UDF_EXTENT_LENGTH_MASK) + - (lip1->extLength & UDF_EXTENT_LENGTH_MASK) + - blocksize - 1) <= UDF_EXTENT_LENGTH_MASK) { + (lip1->extLength & UDF_EXTENT_LENGTH_MASK) + + blocksize - 1) & ~UDF_EXTENT_LENGTH_MASK) { + lip1->extLength = (lip1->extLength - + (li->extLength & + UDF_EXTENT_LENGTH_MASK) + + UDF_EXTENT_LENGTH_MASK) & + ~(blocksize - 1); + li->extLength = (li->extLength & + UDF_EXTENT_FLAG_MASK) + + (UDF_EXTENT_LENGTH_MASK + 1) - + blocksize; + lip1->extLocation.logicalBlockNum = + li->extLocation.logicalBlockNum + + ((li->extLength & + UDF_EXTENT_LENGTH_MASK) >> + blocksize_bits); + } else { li->extLength = lip1->extLength + (((li->extLength & UDF_EXTENT_LENGTH_MASK) + @@ -1385,7 +1403,6 @@ static int udf_read_inode(struct inode *inode, bool hidden_inode) ret = -EIO; goto out; } - iinfo->i_hidden = hidden_inode; iinfo->i_unique = 0; iinfo->i_lenEAttr = 0; iinfo->i_lenExtents = 0; @@ -1721,12 +1738,8 @@ static int udf_update_inode(struct inode *inode, int do_sync) if (S_ISDIR(inode->i_mode) && inode->i_nlink > 0) fe->fileLinkCount = cpu_to_le16(inode->i_nlink - 1); - else { - if (iinfo->i_hidden) - fe->fileLinkCount = cpu_to_le16(0); - else - fe->fileLinkCount = cpu_to_le16(inode->i_nlink); - } + else + fe->fileLinkCount = cpu_to_le16(inode->i_nlink); fe->informationLength = cpu_to_le64(inode->i_size); @@ -1897,13 +1910,8 @@ struct inode *__udf_iget(struct super_block *sb, struct kernel_lb_addr *ino, if (!inode) return ERR_PTR(-ENOMEM); - if (!(inode->i_state & I_NEW)) { - if (UDF_I(inode)->i_hidden != hidden_inode) { - iput(inode); - return ERR_PTR(-EFSCORRUPTED); - } + if (!(inode->i_state & I_NEW)) return inode; - } memcpy(&UDF_I(inode)->i_location, ino, sizeof(struct kernel_lb_addr)); err = udf_read_inode(inode, hidden_inode);
diff --git a/fs/udf/namei.c b/fs/udf/namei.c index f673f8b..9ba0325 100644 --- a/fs/udf/namei.c +++ b/fs/udf/namei.c
@@ -240,7 +240,7 @@ static struct fileIdentDesc *udf_find_entry(struct inode *dir, poffset - lfi); else { if (!copy_name) { - copy_name = kmalloc(UDF_NAME_LEN_CS0, + copy_name = kmalloc(UDF_NAME_LEN, GFP_NOFS); if (!copy_name) { fi = ERR_PTR(-ENOMEM); @@ -1090,9 +1090,8 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, return -EINVAL; ofi = udf_find_entry(old_dir, &old_dentry->d_name, &ofibh, &ocfi); - if (!ofi || IS_ERR(ofi)) { - if (IS_ERR(ofi)) - retval = PTR_ERR(ofi); + if (IS_ERR(ofi)) { + retval = PTR_ERR(ofi); goto end_rename; } @@ -1101,7 +1100,8 @@ static int udf_rename(struct inode *old_dir, struct dentry *old_dentry, brelse(ofibh.sbh); tloc = lelb_to_cpu(ocfi.icb.extLocation); - if (udf_get_lb_pblock(old_dir->i_sb, &tloc, 0) != old_inode->i_ino) + if (!ofi || udf_get_lb_pblock(old_dir->i_sb, &tloc, 0) + != old_inode->i_ino) goto end_rename; nfi = udf_find_entry(new_dir, &new_dentry->d_name, &nfibh, &ncfi);
diff --git a/fs/udf/super.c b/fs/udf/super.c index 0f8b3cb..5193b94 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c
@@ -147,7 +147,6 @@ static struct inode *udf_alloc_inode(struct super_block *sb) ei->i_next_alloc_goal = 0; ei->i_strat4096 = 0; ei->i_streamdir = 0; - ei->i_hidden = 0; init_rwsem(&ei->i_data_sem); ei->cached_extent.lstart = -1; spin_lock_init(&ei->i_extent_cache_lock);
diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index fd3e4a8..63a47f1 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c
@@ -120,42 +120,60 @@ void udf_truncate_tail_extent(struct inode *inode) void udf_discard_prealloc(struct inode *inode) { - struct extent_position epos = {}; - struct extent_position prev_epos = {}; + struct extent_position epos = { NULL, 0, {0, 0} }; struct kernel_lb_addr eloc; uint32_t elen; uint64_t lbcount = 0; int8_t etype = -1, netype; + int adsize; struct udf_inode_info *iinfo = UDF_I(inode); - int bsize = 1 << inode->i_blkbits; if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB || - ALIGN(inode->i_size, bsize) == ALIGN(iinfo->i_lenExtents, bsize)) + inode->i_size == iinfo->i_lenExtents) return; + if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_SHORT) + adsize = sizeof(struct short_ad); + else if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_LONG) + adsize = sizeof(struct long_ad); + else + adsize = 0; + epos.block = iinfo->i_location; /* Find the last extent in the file */ - while ((netype = udf_next_aext(inode, &epos, &eloc, &elen, 0)) != -1) { - brelse(prev_epos.bh); - prev_epos = epos; - if (prev_epos.bh) - get_bh(prev_epos.bh); - - etype = udf_next_aext(inode, &epos, &eloc, &elen, 1); + while ((netype = udf_next_aext(inode, &epos, &eloc, &elen, 1)) != -1) { + etype = netype; lbcount += elen; } if (etype == (EXT_NOT_RECORDED_ALLOCATED >> 30)) { + epos.offset -= adsize; lbcount -= elen; - udf_delete_aext(inode, prev_epos); - udf_free_blocks(inode->i_sb, inode, &eloc, 0, - DIV_ROUND_UP(elen, 1 << inode->i_blkbits)); + extent_trunc(inode, &epos, &eloc, etype, elen, 0); + if (!epos.bh) { + iinfo->i_lenAlloc = + epos.offset - + udf_file_entry_alloc_offset(inode); + mark_inode_dirty(inode); + } else { + struct allocExtDesc *aed = + (struct allocExtDesc *)(epos.bh->b_data); + aed->lengthAllocDescs = + cpu_to_le32(epos.offset - + sizeof(struct allocExtDesc)); + if (!UDF_QUERY_FLAG(inode->i_sb, UDF_FLAG_STRICT) || + UDF_SB(inode->i_sb)->s_udfrev >= 0x0201) + udf_update_tag(epos.bh->b_data, epos.offset); + else + udf_update_tag(epos.bh->b_data, + sizeof(struct allocExtDesc)); + mark_buffer_dirty_inode(epos.bh, inode); + } } /* This inode entry is in-memory only and thus we don't have to mark * the inode dirty */ iinfo->i_lenExtents = lbcount; brelse(epos.bh); - brelse(prev_epos.bh); } static void udf_update_alloc_ext_desc(struct inode *inode,
diff --git a/fs/udf/udf_i.h b/fs/udf/udf_i.h index 0372d0d..4245d1f 100644 --- a/fs/udf/udf_i.h +++ b/fs/udf/udf_i.h
@@ -44,8 +44,7 @@ struct udf_inode_info { unsigned i_use : 1; /* unallocSpaceEntry */ unsigned i_strat4096 : 1; unsigned i_streamdir : 1; - unsigned i_hidden : 1; /* hidden system inode */ - unsigned reserved : 24; + unsigned reserved : 25; union { struct short_ad *i_sad; struct long_ad *i_lad;
diff --git a/fs/udf/udf_sb.h b/fs/udf/udf_sb.h index d91cbfb..8eace7a 100644 --- a/fs/udf/udf_sb.h +++ b/fs/udf/udf_sb.h
@@ -51,8 +51,6 @@ #define MF_DUPLICATE_MD 0x01 #define MF_MIRROR_FE_LOADED 0x02 -#define EFSCORRUPTED EUCLEAN - struct udf_meta_data { __u32 s_meta_file_loc; __u32 s_mirror_file_loc;
diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 2ec02c8..d9911ec 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c
@@ -1020,7 +1020,7 @@ static int resolve_userfault_fork(struct userfaultfd_ctx *new, int fd; fd = anon_inode_getfd_secure("[userfaultfd]", &userfaultfd_fops, new, - O_RDONLY | (new->flags & UFFD_SHARED_FCNTL_FLAGS), inode); + O_RDWR | (new->flags & UFFD_SHARED_FCNTL_FLAGS), inode); if (fd < 0) return fd; @@ -2069,7 +2069,7 @@ SYSCALL_DEFINE1(userfaultfd, int, flags) mmgrab(ctx->mm); fd = anon_inode_getfd_secure("[userfaultfd]", &userfaultfd_fops, ctx, - O_RDONLY | (flags & UFFD_SHARED_FCNTL_FLAGS), NULL); + O_RDWR | (flags & UFFD_SHARED_FCNTL_FLAGS), NULL); if (fd < 0) { mmdrop(ctx->mm); kmem_cache_free(userfaultfd_ctx_cachep, ctx);
diff --git a/fs/verity/enable.c b/fs/verity/enable.c index cb94b19..d988e8c 100644 --- a/fs/verity/enable.c +++ b/fs/verity/enable.c
@@ -391,27 +391,25 @@ int fsverity_ioctl_enable(struct file *filp, const void __user *uarg) goto out_drop_write; err = enable_verity(filp, &arg); + if (err) + goto out_allow_write_access; /* - * We no longer drop the inode's pagecache after enabling verity. This - * used to be done to try to avoid a race condition where pages could be - * evicted after being used in the Merkle tree construction, then - * re-instantiated by a concurrent read. Such pages are unverified, and - * the backing storage could have filled them with different content, so - * they shouldn't be used to fulfill reads once verity is enabled. - * - * But, dropping the pagecache has a big performance impact, and it - * doesn't fully solve the race condition anyway. So for those reasons, - * and also because this race condition isn't very important relatively - * speaking (especially for small-ish files, where the chance of a page - * being used, evicted, *and* re-instantiated all while enabling verity - * is quite small), we no longer drop the inode's pagecache. + * Some pages of the file may have been evicted from pagecache after + * being used in the Merkle tree construction, then read into pagecache + * again by another process reading from the file concurrently. Since + * these pages didn't undergo verification against the file digest which + * fs-verity now claims to be enforcing, we have to wipe the pagecache + * to ensure that all future reads are verified. */ + filemap_write_and_wait(inode->i_mapping); + invalidate_inode_pages2(inode->i_mapping); /* * allow_write_access() is needed to pair with deny_write_access(). * Regardless, the filesystem won't allow writing to verity files. */ +out_allow_write_access: allow_write_access(filp); out_drop_write: mnt_drop_write_file(filp);
diff --git a/fs/verity/verify.c b/fs/verity/verify.c index 10e4188..0adb970 100644 --- a/fs/verity/verify.c +++ b/fs/verity/verify.c
@@ -279,15 +279,15 @@ EXPORT_SYMBOL_GPL(fsverity_enqueue_verify_work); int __init fsverity_init_workqueue(void) { /* - * Use a high-priority workqueue to prioritize verification work, which - * blocks reads from completing, over regular application tasks. + * Use an unbound workqueue to allow bios to be verified in parallel + * even when they happen to complete on the same CPU. This sacrifices + * locality, but it's worthwhile since hashing is CPU-intensive. * - * For performance reasons, don't use an unbound workqueue. Using an - * unbound workqueue for crypto operations causes excessive scheduler - * latency on ARM64. + * Also use a high-priority workqueue to prioritize verification work, + * which blocks reads from completing, over regular application tasks. */ fsverity_read_workqueue = alloc_workqueue("fsverity_read_queue", - WQ_HIGHPRI, + WQ_UNBOUND | WQ_HIGHPRI, num_online_cpus()); if (!fsverity_read_workqueue) return -ENOMEM;
diff --git a/fs/xattr.c b/fs/xattr.c index 7082583..6b45eea 100644 --- a/fs/xattr.c +++ b/fs/xattr.c
@@ -1013,7 +1013,7 @@ static int xattr_list_one(char **buffer, ssize_t *remaining_size, ssize_t simple_xattr_list(struct inode *inode, struct simple_xattrs *xattrs, char *buffer, size_t size) { - bool trusted = ns_capable_noaudit(&init_user_ns, CAP_SYS_ADMIN); + bool trusted = capable(CAP_SYS_ADMIN); struct simple_xattr *xattr; ssize_t remaining_size = size; int err = 0;
diff --git a/fs/xfs/libxfs/xfs_alloc.c b/fs/xfs/libxfs/xfs_alloc.c index 1193fd6..436f686 100644 --- a/fs/xfs/libxfs/xfs_alloc.c +++ b/fs/xfs/libxfs/xfs_alloc.c
@@ -684,10 +684,8 @@ xfs_alloc_update_counters( xfs_trans_agblocks_delta(tp, len); if (unlikely(be32_to_cpu(agf->agf_freeblks) > - be32_to_cpu(agf->agf_length))) { - xfs_buf_mark_corrupt(agbp); + be32_to_cpu(agf->agf_length))) return -EFSCORRUPTED; - } xfs_alloc_log_agf(tp, agbp, XFS_AGF_FREEBLKS); return 0; @@ -753,7 +751,6 @@ xfs_alloc_ag_vextent_small( bp = xfs_btree_get_bufs(args->mp, args->tp, args->agno, fbno); if (!bp) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, args->mp); error = -EFSCORRUPTED; goto error; } @@ -1998,32 +1995,24 @@ xfs_alloc_longest_free_extent( return pag->pagf_flcount > 0 || pag->pagf_longest > 0; } -/* - * Compute the minimum length of the AGFL in the given AG. If @pag is NULL, - * return the largest possible minimum length. - */ unsigned int xfs_alloc_min_freelist( struct xfs_mount *mp, struct xfs_perag *pag) { - /* AG btrees have at least 1 level. */ - static const uint8_t fake_levels[XFS_BTNUM_AGF] = {1, 1, 1}; - const uint8_t *levels = pag ? pag->pagf_levels : fake_levels; unsigned int min_free; - ASSERT(mp->m_ag_maxlevels > 0); - /* space needed by-bno freespace btree */ - min_free = min_t(unsigned int, levels[XFS_BTNUM_BNOi] + 1, + min_free = min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_BNOi] + 1, mp->m_ag_maxlevels); /* space needed by-size freespace btree */ - min_free += min_t(unsigned int, levels[XFS_BTNUM_CNTi] + 1, + min_free += min_t(unsigned int, pag->pagf_levels[XFS_BTNUM_CNTi] + 1, mp->m_ag_maxlevels); /* space needed reverse mapping used space btree */ if (xfs_sb_version_hasrmapbt(&mp->m_sb)) - min_free += min_t(unsigned int, levels[XFS_BTNUM_RMAPi] + 1, - mp->m_rmap_maxlevels); + min_free += min_t(unsigned int, + pag->pagf_levels[XFS_BTNUM_RMAPi] + 1, + mp->m_rmap_maxlevels); return min_free; } @@ -2098,10 +2087,8 @@ xfs_free_agfl_block( return error; bp = xfs_btree_get_bufs(tp->t_mountp, tp, agno, agbno); - if (!bp) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, tp->t_mountp); + if (!bp) return -EFSCORRUPTED; - } xfs_trans_binval(tp, bp); return 0;
diff --git a/fs/xfs/libxfs/xfs_attr.c b/fs/xfs/libxfs/xfs_attr.c index c83ff61..510ca69 100644 --- a/fs/xfs/libxfs/xfs_attr.c +++ b/fs/xfs/libxfs/xfs_attr.c
@@ -1007,7 +1007,7 @@ xfs_attr_node_addname( * The INCOMPLETE flag means that we will find the "old" * attr, not the "new" one. */ - args->op_flags |= XFS_DA_OP_INCOMPLETE; + args->flags |= XFS_ATTR_INCOMPLETE; state = xfs_da_state_alloc(); state->args = args; state->mp = mp;
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.c b/fs/xfs/libxfs/xfs_attr_leaf.c index 2b74b6e..de33efc 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.c +++ b/fs/xfs/libxfs/xfs_attr_leaf.c
@@ -251,6 +251,14 @@ xfs_attr3_leaf_verify( return fa; /* + * In recovery there is a transient state where count == 0 is valid + * because we may have transitioned an empty shortform attr to a leaf + * if the attr didn't fit in shortform. + */ + if (!xfs_log_in_recovery(mp) && ichdr.count == 0) + return __this_address; + + /* * firstused is the block offset of the first name info structure. * Make sure it doesn't go off the block or crash into the header. */ @@ -435,7 +443,7 @@ xfs_attr_copy_value( *========================================================================*/ /* - * Query whether the total requested number of attr fork bytes of extended + * Query whether the requested number of additional bytes of extended * attribute space will be able to fit inline. * * Returns zero if not, else the di_forkoff fork offset to be used in the @@ -455,14 +463,8 @@ xfs_attr_shortform_bytesfit( int maxforkoff; int offset; - /* - * Check if the new size could fit at all first: - */ - if (bytes > XFS_LITINO(mp)) - return 0; - /* rounded down */ - offset = (XFS_LITINO(mp) - bytes) >> 3; + offset = (XFS_LITINO(mp, dp->i_d.di_version) - bytes) >> 3; if (dp->i_d.di_format == XFS_DINODE_FMT_DEV) { minforkoff = roundup(sizeof(xfs_dev_t), 8) >> 3; @@ -529,7 +531,8 @@ xfs_attr_shortform_bytesfit( minforkoff = roundup(minforkoff, 8) >> 3; /* attr fork btree root can have at least this many key/ptr pairs */ - maxforkoff = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); + maxforkoff = XFS_LITINO(mp, dp->i_d.di_version) - + XFS_BMDR_SPACE_CALC(MINABTPTRS); maxforkoff = maxforkoff >> 3; /* rounded down */ if (offset >= maxforkoff) @@ -2284,10 +2287,8 @@ xfs_attr3_leaf_lookup_int( leaf = bp->b_addr; xfs_attr3_leaf_hdr_from_disk(args->geo, &ichdr, leaf); entries = xfs_attr3_leaf_entryp(leaf); - if (ichdr.count >= args->geo->blksize / 8) { - xfs_buf_mark_corrupt(bp); + if (ichdr.count >= args->geo->blksize / 8) return -EFSCORRUPTED; - } /* * Binary search. (note: small blocks will skip this loop) @@ -2303,14 +2304,10 @@ xfs_attr3_leaf_lookup_int( else break; } - if (!(probe >= 0 && (!ichdr.count || probe < ichdr.count))) { - xfs_buf_mark_corrupt(bp); + if (!(probe >= 0 && (!ichdr.count || probe < ichdr.count))) return -EFSCORRUPTED; - } - if (!(span <= 4 || be32_to_cpu(entry->hashval) == hashval)) { - xfs_buf_mark_corrupt(bp); + if (!(span <= 4 || be32_to_cpu(entry->hashval) == hashval)) return -EFSCORRUPTED; - } /* * Since we may have duplicate hashval's, find the first matching @@ -2342,8 +2339,8 @@ xfs_attr3_leaf_lookup_int( * If we are looking for INCOMPLETE entries, show only those. * If we are looking for complete entries, show only those. */ - if (!!(args->op_flags & XFS_DA_OP_INCOMPLETE) != - !!(entry->flags & XFS_ATTR_INCOMPLETE)) { + if ((args->flags & XFS_ATTR_INCOMPLETE) != + (entry->flags & XFS_ATTR_INCOMPLETE)) { continue; } if (entry->flags & XFS_ATTR_LOCAL) {
diff --git a/fs/xfs/libxfs/xfs_attr_leaf.h b/fs/xfs/libxfs/xfs_attr_leaf.h index 38c05d6..7b74e18 100644 --- a/fs/xfs/libxfs/xfs_attr_leaf.h +++ b/fs/xfs/libxfs/xfs_attr_leaf.h
@@ -17,27 +17,13 @@ struct xfs_inode; struct xfs_trans; /* - * Incore version of the attribute leaf header. + * Used to keep a list of "remote value" extents when unlinking an inode. */ -struct xfs_attr3_icleaf_hdr { - uint32_t forw; - uint32_t back; - uint16_t magic; - uint16_t count; - uint16_t usedbytes; - /* - * Firstused is 32-bit here instead of 16-bit like the on-disk variant - * to support maximum fsb size of 64k without overflow issues throughout - * the attr code. Instead, the overflow condition is handled on - * conversion to/from disk. - */ - uint32_t firstused; - __u8 holes; - struct { - uint16_t base; - uint16_t size; - } freemap[XFS_ATTR_LEAF_MAPSIZE]; -}; +typedef struct xfs_attr_inactive_list { + xfs_dablk_t valueblk; /* block number of value bytes */ + int valuelen; /* number of bytes in value */ +} xfs_attr_inactive_list_t; + /*======================================================================== * Function prototypes for the kernel.
diff --git a/fs/xfs/libxfs/xfs_attr_remote.c b/fs/xfs/libxfs/xfs_attr_remote.c index de9096b..3e39b7d 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.c +++ b/fs/xfs/libxfs/xfs_attr_remote.c
@@ -25,23 +25,6 @@ #define ATTR_RMTVALUE_MAPSIZE 1 /* # of map entries at once */ /* - * Remote Attribute Values - * ======================= - * - * Remote extended attribute values are conceptually simple -- they're written - * to data blocks mapped by an inode's attribute fork, and they have an upper - * size limit of 64k. Setting a value does not involve the XFS log. - * - * However, on a v5 filesystem, maximally sized remote attr values require one - * block more than 64k worth of space to hold both the remote attribute value - * header (64 bytes). On a 4k block filesystem this results in a 68k buffer; - * on a 64k block filesystem, this would be a 128k buffer. Note that the log - * format can only handle a dirty buffer of XFS_MAX_BLOCKSIZE length (64k). - * Therefore, we /must/ ensure that remote attribute value buffers never touch - * the logging system and therefore never have a log item. - */ - -/* * Each contiguous block has a header, so it is not just a simple attribute * length to FSB conversion. */ @@ -417,25 +400,17 @@ xfs_attr_rmtval_get( (map[i].br_startblock != HOLESTARTBLOCK)); dblkno = XFS_FSB_TO_DADDR(mp, map[i].br_startblock); dblkcnt = XFS_FSB_TO_BB(mp, map[i].br_blockcount); - bp = xfs_buf_read(mp->m_ddev_targp, dblkno, dblkcnt, 0, - &xfs_attr3_rmt_buf_ops); - if (!bp) - return -ENOMEM; - error = bp->b_error; - if (error) { - xfs_buf_ioerror_alert(bp, __func__); - xfs_buf_relse(bp); - - /* bad CRC means corrupted metadata */ - if (error == -EFSBADCRC) - error = -EFSCORRUPTED; + error = xfs_trans_read_buf(mp, args->trans, + mp->m_ddev_targp, + dblkno, dblkcnt, 0, &bp, + &xfs_attr3_rmt_buf_ops); + if (error) return error; - } error = xfs_attr_rmtval_copyout(mp, bp, args->dp->i_ino, &offset, &valuelen, &dst); - xfs_buf_relse(bp); + xfs_trans_brelse(args->trans, bp); if (error) return error; @@ -576,32 +551,6 @@ xfs_attr_rmtval_set( return 0; } -/* Mark stale any incore buffers for the remote value. */ -int -xfs_attr_rmtval_stale( - struct xfs_inode *ip, - struct xfs_bmbt_irec *map, - xfs_buf_flags_t incore_flags) -{ - struct xfs_mount *mp = ip->i_mount; - struct xfs_buf *bp; - - ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); - - ASSERT((map->br_startblock != DELAYSTARTBLOCK) && - (map->br_startblock != HOLESTARTBLOCK)); - - bp = xfs_buf_incore(mp->m_ddev_targp, - XFS_FSB_TO_DADDR(mp, map->br_startblock), - XFS_FSB_TO_BB(mp, map->br_blockcount), incore_flags); - if (bp) { - xfs_buf_stale(bp); - xfs_buf_relse(bp); - } - - return 0; -} - /* * Remove the value associated with an attribute by deleting the * out-of-line buffer that it is stored on. @@ -610,6 +559,7 @@ int xfs_attr_rmtval_remove( struct xfs_da_args *args) { + struct xfs_mount *mp = args->dp->i_mount; xfs_dablk_t lblkno; int blkcnt; int error; @@ -624,6 +574,9 @@ xfs_attr_rmtval_remove( blkcnt = args->rmtblkcnt; while (blkcnt > 0) { struct xfs_bmbt_irec map; + struct xfs_buf *bp; + xfs_daddr_t dblkno; + int dblkcnt; int nmap; /* @@ -635,9 +588,21 @@ xfs_attr_rmtval_remove( if (error) return error; ASSERT(nmap == 1); - error = xfs_attr_rmtval_stale(args->dp, &map, XBF_TRYLOCK); - if (error) - return error; + ASSERT((map.br_startblock != DELAYSTARTBLOCK) && + (map.br_startblock != HOLESTARTBLOCK)); + + dblkno = XFS_FSB_TO_DADDR(mp, map.br_startblock), + dblkcnt = XFS_FSB_TO_BB(mp, map.br_blockcount); + + /* + * If the "remote" value is in the cache, remove it. + */ + bp = xfs_buf_incore(mp->m_ddev_targp, dblkno, dblkcnt, XBF_TRYLOCK); + if (bp) { + xfs_buf_stale(bp); + xfs_buf_relse(bp); + bp = NULL; + } lblkno += map.br_blockcount; blkcnt -= map.br_blockcount;
diff --git a/fs/xfs/libxfs/xfs_attr_remote.h b/fs/xfs/libxfs/xfs_attr_remote.h index 6fb4572..9d20b66 100644 --- a/fs/xfs/libxfs/xfs_attr_remote.h +++ b/fs/xfs/libxfs/xfs_attr_remote.h
@@ -11,7 +11,5 @@ int xfs_attr3_rmt_blocks(struct xfs_mount *mp, int attrlen); int xfs_attr_rmtval_get(struct xfs_da_args *args); int xfs_attr_rmtval_set(struct xfs_da_args *args); int xfs_attr_rmtval_remove(struct xfs_da_args *args); -int xfs_attr_rmtval_stale(struct xfs_inode *ip, struct xfs_bmbt_irec *map, - xfs_buf_flags_t incore_flags); #endif /* __XFS_ATTR_REMOTE_H__ */
diff --git a/fs/xfs/libxfs/xfs_bmap.c b/fs/xfs/libxfs/xfs_bmap.c index 1e0fab6..c114d24 100644 --- a/fs/xfs/libxfs/xfs_bmap.c +++ b/fs/xfs/libxfs/xfs_bmap.c
@@ -192,12 +192,14 @@ xfs_default_attroffset( struct xfs_mount *mp = ip->i_mount; uint offset; - if (mp->m_sb.sb_inodesize == 256) - offset = XFS_LITINO(mp) - XFS_BMDR_SPACE_CALC(MINABTPTRS); - else + if (mp->m_sb.sb_inodesize == 256) { + offset = XFS_LITINO(mp, ip->i_d.di_version) - + XFS_BMDR_SPACE_CALC(MINABTPTRS); + } else { offset = XFS_BMDR_SPACE_CALC(6 * MINABTPTRS); + } - ASSERT(offset < XFS_LITINO(mp)); + ASSERT(offset < XFS_LITINO(mp, ip->i_d.di_version)); return offset; } @@ -727,7 +729,6 @@ xfs_bmap_extents_to_btree( xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, 1L); abp = xfs_btree_get_bufl(mp, tp, args.fsbno); if (!abp) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp); error = -EFSCORRUPTED; goto out_unreserve_dquot; } @@ -1083,7 +1084,6 @@ xfs_bmap_add_attrfork( if (XFS_IFORK_Q(ip)) goto trans_cancel; if (ip->i_d.di_anextents != 0) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp); error = -EFSCORRUPTED; goto trans_cancel; } @@ -1374,8 +1374,7 @@ xfs_bmap_last_before( case XFS_DINODE_FMT_EXTENTS: break; default: - ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } if (!(ifp->if_flags & XFS_IFEXTENTS)) { @@ -1475,10 +1474,8 @@ xfs_bmap_last_offset( return 0; if (XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_BTREE && - XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) { - ASSERT(0); - return -EFSCORRUPTED; - } + XFS_IFORK_FORMAT(ip, whichfork) != XFS_DINODE_FMT_EXTENTS) + return -EIO; error = xfs_bmap_last_extent(NULL, ip, whichfork, &rec, &is_empty); if (error || is_empty) @@ -5874,9 +5871,8 @@ xfs_bmap_insert_extents( XFS_WANT_CORRUPTED_GOTO(mp, !isnullstartblock(got.br_startblock), del_cursor); - if (stop_fsb > got.br_startoff) { - ASSERT(0); - error = -EFSCORRUPTED; + if (stop_fsb >= got.br_startoff + got.br_blockcount) { + error = -EIO; goto del_cursor; } @@ -5923,8 +5919,8 @@ xfs_bmap_insert_extents( * @split_fsb is a block where the extents is split. If split_fsb lies in a * hole or the first block of extents, just return 0. */ -int -xfs_bmap_split_extent( +STATIC int +xfs_bmap_split_extent_at( struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t split_fsb) @@ -6035,6 +6031,34 @@ xfs_bmap_split_extent( return error; } +int +xfs_bmap_split_extent( + struct xfs_inode *ip, + xfs_fileoff_t split_fsb) +{ + struct xfs_mount *mp = ip->i_mount; + struct xfs_trans *tp; + int error; + + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, + XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp); + if (error) + return error; + + xfs_ilock(ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); + + error = xfs_bmap_split_extent_at(tp, ip, split_fsb); + if (error) + goto out; + + return xfs_trans_commit(tp); + +out: + xfs_trans_cancel(tp); + return error; +} + /* Deferred mapping is only for real extents in the data fork. */ static bool xfs_bmap_is_update_needed(
diff --git a/fs/xfs/libxfs/xfs_bmap.h b/fs/xfs/libxfs/xfs_bmap.h index a51c2b1..093716a 100644 --- a/fs/xfs/libxfs/xfs_bmap.h +++ b/fs/xfs/libxfs/xfs_bmap.h
@@ -158,22 +158,17 @@ static inline int xfs_bmapi_whichfork(int bmapi_flags) { BMAP_ATTRFORK, "ATTR" }, \ { BMAP_COWFORK, "COW" } -/* Return true if the extent is an allocated extent, written or not. */ -static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec) -{ - return irec->br_startblock != HOLESTARTBLOCK && - irec->br_startblock != DELAYSTARTBLOCK && - !isnullstartblock(irec->br_startblock); -} /* * Return true if the extent is a real, allocated extent, or false if it is a * delayed allocation, and unwritten extent or a hole. */ -static inline bool xfs_bmap_is_written_extent(struct xfs_bmbt_irec *irec) +static inline bool xfs_bmap_is_real_extent(struct xfs_bmbt_irec *irec) { - return xfs_bmap_is_real_extent(irec) && - irec->br_state != XFS_EXT_UNWRITTEN; + return irec->br_state != XFS_EXT_UNWRITTEN && + irec->br_startblock != HOLESTARTBLOCK && + irec->br_startblock != DELAYSTARTBLOCK && + !isnullstartblock(irec->br_startblock); } /* @@ -227,8 +222,7 @@ int xfs_bmap_can_insert_extents(struct xfs_inode *ip, xfs_fileoff_t off, int xfs_bmap_insert_extents(struct xfs_trans *tp, struct xfs_inode *ip, xfs_fileoff_t *next_fsb, xfs_fileoff_t offset_shift_fsb, bool *done, xfs_fileoff_t stop_fsb); -int xfs_bmap_split_extent(struct xfs_trans *tp, struct xfs_inode *ip, - xfs_fileoff_t split_offset); +int xfs_bmap_split_extent(struct xfs_inode *ip, xfs_fileoff_t split_offset); int xfs_bmapi_reserve_delalloc(struct xfs_inode *ip, int whichfork, xfs_fileoff_t off, xfs_filblks_t len, xfs_filblks_t prealloc, struct xfs_bmbt_irec *got, struct xfs_iext_cursor *cur,
diff --git a/fs/xfs/libxfs/xfs_btree.c b/fs/xfs/libxfs/xfs_btree.c index 1212516..71de937 100644 --- a/fs/xfs/libxfs/xfs_btree.c +++ b/fs/xfs/libxfs/xfs_btree.c
@@ -354,17 +354,20 @@ xfs_btree_free_block( */ void xfs_btree_del_cursor( - struct xfs_btree_cur *cur, /* btree cursor */ - int error) /* del because of error */ + xfs_btree_cur_t *cur, /* btree cursor */ + int error) /* del because of error */ { - int i; /* btree level */ + int i; /* btree level */ /* - * Clear the buffer pointers and release the buffers. If we're doing - * this because of an error, inspect all of the entries in the bc_bufs - * array for buffers to be unlocked. This is because some of the btree - * code works from level n down to 0, and if we get an error along the - * way we won't have initialized all the entries down to 0. + * Clear the buffer pointers, and release the buffers. + * If we're doing this in the face of an error, we + * need to make sure to inspect all of the entries + * in the bc_bufs array for buffers to be unlocked. + * This is because some of the btree code works from + * level n down to 0, and if we get an error along + * the way we won't have initialized all the entries + * down to 0. */ for (i = 0; i < cur->bc_nlevels; i++) { if (cur->bc_bufs[i]) @@ -372,10 +375,15 @@ xfs_btree_del_cursor( else if (!error) break; } - + /* + * Can't free a bmap cursor without having dealt with the + * allocated indirect blocks' accounting. + */ ASSERT(cur->bc_btnum != XFS_BTNUM_BMAP || - cur->bc_private.b.allocated == 0 || - XFS_FORCED_SHUTDOWN(cur->bc_mp)); + cur->bc_private.b.allocated == 0); + /* + * Free the cursor. + */ kmem_zone_free(xfs_btree_cur_zone, cur); } @@ -1812,7 +1820,6 @@ xfs_btree_lookup_get_block( out_bad: *blkp = NULL; - xfs_buf_mark_corrupt(bp); xfs_trans_brelse(cur->bc_tp, bp); return -EFSCORRUPTED; } @@ -1860,10 +1867,8 @@ xfs_btree_lookup( XFS_BTREE_STATS_INC(cur, lookup); /* No such thing as a zero-level tree. */ - if (cur->bc_nlevels == 0) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, cur->bc_mp); + if (cur->bc_nlevels == 0) return -EFSCORRUPTED; - } block = NULL; keyno = 0;
diff --git a/fs/xfs/libxfs/xfs_da_btree.c b/fs/xfs/libxfs/xfs_da_btree.c index 12ef16c..4fd1223 100644 --- a/fs/xfs/libxfs/xfs_da_btree.c +++ b/fs/xfs/libxfs/xfs_da_btree.c
@@ -504,7 +504,6 @@ xfs_da3_split( node = oldblk->bp->b_addr; if (node->hdr.info.forw) { if (be32_to_cpu(node->hdr.info.forw) != addblk->blkno) { - xfs_buf_mark_corrupt(oldblk->bp); error = -EFSCORRUPTED; goto out; } @@ -517,7 +516,6 @@ xfs_da3_split( node = oldblk->bp->b_addr; if (node->hdr.info.back) { if (be32_to_cpu(node->hdr.info.back) != addblk->blkno) { - xfs_buf_mark_corrupt(oldblk->bp); error = -EFSCORRUPTED; goto out; } @@ -1543,10 +1541,8 @@ xfs_da3_node_lookup_int( break; } - if (magic != XFS_DA_NODE_MAGIC && magic != XFS_DA3_NODE_MAGIC) { - xfs_buf_mark_corrupt(blk->bp); + if (magic != XFS_DA_NODE_MAGIC && magic != XFS_DA3_NODE_MAGIC) return -EFSCORRUPTED; - } blk->magic = XFS_DA_NODE_MAGIC; @@ -1558,18 +1554,15 @@ xfs_da3_node_lookup_int( btree = dp->d_ops->node_tree_p(node); /* Tree taller than we can handle; bail out! */ - if (nodehdr.level >= XFS_DA_NODE_MAXDEPTH) { - xfs_buf_mark_corrupt(blk->bp); + if (nodehdr.level >= XFS_DA_NODE_MAXDEPTH) return -EFSCORRUPTED; - } /* Check the level from the root. */ if (blkno == args->geo->leafblk) expected_level = nodehdr.level - 1; - else if (expected_level != nodehdr.level) { - xfs_buf_mark_corrupt(blk->bp); + else if (expected_level != nodehdr.level) return -EFSCORRUPTED; - } else + else expected_level--; max = nodehdr.count; @@ -1619,17 +1612,12 @@ xfs_da3_node_lookup_int( } /* We can't point back to the root. */ - if (blkno == args->geo->leafblk) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, - dp->i_mount); + if (blkno == args->geo->leafblk) return -EFSCORRUPTED; - } } - if (expected_level != 0) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, dp->i_mount); + if (expected_level != 0) return -EFSCORRUPTED; - } /* * A leaf block that ends in the hashval that we are interested in
diff --git a/fs/xfs/libxfs/xfs_da_btree.h b/fs/xfs/libxfs/xfs_da_btree.h index 588e467..ae0bbd2 100644 --- a/fs/xfs/libxfs/xfs_da_btree.h +++ b/fs/xfs/libxfs/xfs_da_btree.h
@@ -82,7 +82,6 @@ typedef struct xfs_da_args { #define XFS_DA_OP_OKNOENT 0x0008 /* lookup/add op, ENOENT ok, else die */ #define XFS_DA_OP_CILOOKUP 0x0010 /* lookup to return CI name if found */ #define XFS_DA_OP_ALLOCVAL 0x0020 /* lookup to alloc buffer if found */ -#define XFS_DA_OP_INCOMPLETE 0x0040 /* lookup INCOMPLETE attr keys */ #define XFS_DA_OP_FLAGS \ { XFS_DA_OP_JUSTCHECK, "JUSTCHECK" }, \ @@ -90,8 +89,7 @@ typedef struct xfs_da_args { { XFS_DA_OP_ADDNAME, "ADDNAME" }, \ { XFS_DA_OP_OKNOENT, "OKNOENT" }, \ { XFS_DA_OP_CILOOKUP, "CILOOKUP" }, \ - { XFS_DA_OP_ALLOCVAL, "ALLOCVAL" }, \ - { XFS_DA_OP_INCOMPLETE, "INCOMPLETE" } + { XFS_DA_OP_ALLOCVAL, "ALLOCVAL" } /* * Storage for holding state during Btree searches and split/join ops. @@ -127,19 +125,6 @@ typedef struct xfs_da_state { } xfs_da_state_t; /* - * In-core version of the node header to abstract the differences in the v2 and - * v3 disk format of the headers. Callers need to convert to/from disk format as - * appropriate. - */ -struct xfs_da3_icnode_hdr { - uint32_t forw; - uint32_t back; - uint16_t magic; - uint16_t count; - uint16_t level; -}; - -/* * Utility macros to aid in logging changed structure fields. */ #define XFS_DA_LOGOFF(BASE, ADDR) ((char *)(ADDR) - (char *)(BASE))
diff --git a/fs/xfs/libxfs/xfs_da_format.c b/fs/xfs/libxfs/xfs_da_format.c index 31bb250..b1ae572 100644 --- a/fs/xfs/libxfs/xfs_da_format.c +++ b/fs/xfs/libxfs/xfs_da_format.c
@@ -13,7 +13,6 @@ #include "xfs_mount.h" #include "xfs_inode.h" #include "xfs_dir2.h" -#include "xfs_dir2_priv.h" /* * Shortform directory ops
diff --git a/fs/xfs/libxfs/xfs_da_format.h b/fs/xfs/libxfs/xfs_da_format.h index 222ee48..ae654e0 100644 --- a/fs/xfs/libxfs/xfs_da_format.h +++ b/fs/xfs/libxfs/xfs_da_format.h
@@ -94,6 +94,19 @@ struct xfs_da3_intnode { }; /* + * In-core version of the node header to abstract the differences in the v2 and + * v3 disk format of the headers. Callers need to convert to/from disk format as + * appropriate. + */ +struct xfs_da3_icnode_hdr { + uint32_t forw; + uint32_t back; + uint16_t magic; + uint16_t count; + uint16_t level; +}; + +/* * Directory version 2. * * There are 4 possible formats: @@ -421,6 +434,14 @@ struct xfs_dir3_leaf_hdr { __be32 pad; /* 64 bit alignment */ }; +struct xfs_dir3_icleaf_hdr { + uint32_t forw; + uint32_t back; + uint16_t magic; + uint16_t count; + uint16_t stale; +}; + /* * Leaf block entry. */ @@ -500,6 +521,19 @@ struct xfs_dir3_free { #define XFS_DIR3_FREE_CRC_OFF offsetof(struct xfs_dir3_free, hdr.hdr.crc) /* + * In core version of the free block header, abstracted away from on-disk format + * differences. Use this in the code, and convert to/from the disk version using + * xfs_dir3_free_hdr_from_disk/xfs_dir3_free_hdr_to_disk. + */ +struct xfs_dir3_icfree_hdr { + uint32_t magic; + uint32_t firstdb; + uint32_t nvalid; + uint32_t nused; + +}; + +/* * Single block format. * * The single block format looks like the following drawing on disk: @@ -676,6 +710,29 @@ struct xfs_attr3_leafblock { }; /* + * incore, neutral version of the attribute leaf header + */ +struct xfs_attr3_icleaf_hdr { + uint32_t forw; + uint32_t back; + uint16_t magic; + uint16_t count; + uint16_t usedbytes; + /* + * firstused is 32-bit here instead of 16-bit like the on-disk variant + * to support maximum fsb size of 64k without overflow issues throughout + * the attr code. Instead, the overflow condition is handled on + * conversion to/from disk. + */ + uint32_t firstused; + __u8 holes; + struct { + uint16_t base; + uint16_t size; + } freemap[XFS_ATTR_LEAF_MAPSIZE]; +}; + +/* * Special value to represent fs block size in the leaf header firstused field. * Only used when block size overflows the 2-bytes available on disk. */ @@ -683,6 +740,8 @@ struct xfs_attr3_leafblock { /* * Flags used in the leaf_entry[i].flags field. + * NOTE: the INCOMPLETE bit must not collide with the flags bits specified + * on the system call, they are "or"ed together for various operations. */ #define XFS_ATTR_LOCAL_BIT 0 /* attr is stored locally */ #define XFS_ATTR_ROOT_BIT 1 /* limit access to trusted attrs */
diff --git a/fs/xfs/libxfs/xfs_defer.c b/fs/xfs/libxfs/xfs_defer.c index 3a78a18..2255752 100644 --- a/fs/xfs/libxfs/xfs_defer.c +++ b/fs/xfs/libxfs/xfs_defer.c
@@ -16,8 +16,6 @@ #include "xfs_inode.h" #include "xfs_inode_item.h" #include "xfs_trace.h" -#include "xfs_icache.h" -#include "xfs_log.h" /* * Deferred Operations in XFS @@ -180,19 +178,6 @@ static const struct xfs_defer_op_type *defer_op_types[] = { [XFS_DEFER_OPS_TYPE_AGFL_FREE] = &xfs_agfl_free_defer_type, }; -static void -xfs_defer_create_intent( - struct xfs_trans *tp, - struct xfs_defer_pending *dfp, - bool sort) -{ - const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type]; - - if (!dfp->dfp_intent) - dfp->dfp_intent = ops->create_intent(tp, &dfp->dfp_work, - dfp->dfp_count, sort); -} - /* * For each pending item in the intake list, log its intent item and the * associated extents, then add the entire intake list to the end of @@ -202,11 +187,17 @@ STATIC void xfs_defer_create_intents( struct xfs_trans *tp) { + struct list_head *li; struct xfs_defer_pending *dfp; + const struct xfs_defer_op_type *ops; list_for_each_entry(dfp, &tp->t_dfops, dfp_list) { + ops = defer_op_types[dfp->dfp_type]; + dfp->dfp_intent = ops->create_intent(tp, dfp->dfp_count); trace_xfs_defer_create_intent(tp->t_mountp, dfp); - xfs_defer_create_intent(tp, dfp, true); + list_sort(tp->t_mountp, &dfp->dfp_work, ops->diff_items); + list_for_each(li, &dfp->dfp_work) + ops->log_item(tp, dfp->dfp_intent, li); } } @@ -243,13 +234,10 @@ xfs_defer_trans_roll( struct xfs_log_item *lip; struct xfs_buf *bplist[XFS_DEFER_OPS_NR_BUFS]; struct xfs_inode *iplist[XFS_DEFER_OPS_NR_INODES]; - unsigned int ordered = 0; /* bitmap */ int bpcount = 0, ipcount = 0; int i; int error; - BUILD_BUG_ON(NBBY * sizeof(ordered) < XFS_DEFER_OPS_NR_BUFS); - list_for_each_entry(lip, &tp->t_items, li_trans) { switch (lip->li_type) { case XFS_LI_BUF: @@ -260,10 +248,7 @@ xfs_defer_trans_roll( ASSERT(0); return -EFSCORRUPTED; } - if (bli->bli_flags & XFS_BLI_ORDERED) - ordered |= (1U << bpcount); - else - xfs_trans_dirty_buf(tp, bli->bli_buf); + xfs_trans_dirty_buf(tp, bli->bli_buf); bplist[bpcount++] = bli->bli_buf; } break; @@ -304,8 +289,6 @@ xfs_defer_trans_roll( /* Rejoin the buffers and dirty them so the log moves forward. */ for (i = 0; i < bpcount; i++) { xfs_trans_bjoin(tp, bplist[i]); - if (ordered & (1U << i)) - xfs_trans_ordered_buf(tp, bplist[i]); xfs_trans_bhold(tp, bplist[i]); } @@ -363,106 +346,6 @@ xfs_defer_cancel_list( } /* - * Prevent a log intent item from pinning the tail of the log by logging a - * done item to release the intent item; and then log a new intent item. - * The caller should provide a fresh transaction and roll it after we're done. - */ -static int -xfs_defer_relog( - struct xfs_trans **tpp, - struct list_head *dfops) -{ - struct xlog *log = (*tpp)->t_mountp->m_log; - struct xfs_defer_pending *dfp; - xfs_lsn_t threshold_lsn = NULLCOMMITLSN; - - - ASSERT((*tpp)->t_flags & XFS_TRANS_PERM_LOG_RES); - - list_for_each_entry(dfp, dfops, dfp_list) { - /* - * If the log intent item for this deferred op is not a part of - * the current log checkpoint, relog the intent item to keep - * the log tail moving forward. We're ok with this being racy - * because an incorrect decision means we'll be a little slower - * at pushing the tail. - */ - if (dfp->dfp_intent == NULL || - xfs_log_item_in_current_chkpt(dfp->dfp_intent)) - continue; - - /* - * Figure out where we need the tail to be in order to maintain - * the minimum required free space in the log. Only sample - * the log threshold once per call. - */ - if (threshold_lsn == NULLCOMMITLSN) { - threshold_lsn = xlog_grant_push_threshold(log, 0); - if (threshold_lsn == NULLCOMMITLSN) - break; - } - if (XFS_LSN_CMP(dfp->dfp_intent->li_lsn, threshold_lsn) >= 0) - continue; - - trace_xfs_defer_relog_intent((*tpp)->t_mountp, dfp); - XFS_STATS_INC((*tpp)->t_mountp, defer_relog); - dfp->dfp_intent = xfs_trans_item_relog(dfp->dfp_intent, *tpp); - } - - if ((*tpp)->t_flags & XFS_TRANS_DIRTY) - return xfs_defer_trans_roll(tpp); - return 0; -} - -/* - * Log an intent-done item for the first pending intent, and finish the work - * items. - */ -static int -xfs_defer_finish_one( - struct xfs_trans *tp, - struct xfs_defer_pending *dfp) -{ - const struct xfs_defer_op_type *ops = defer_op_types[dfp->dfp_type]; - void *state = NULL; - struct list_head *li, *n; - int error; - - trace_xfs_defer_pending_finish(tp->t_mountp, dfp); - - dfp->dfp_done = ops->create_done(tp, dfp->dfp_intent, dfp->dfp_count); - list_for_each_safe(li, n, &dfp->dfp_work) { - list_del(li); - dfp->dfp_count--; - error = ops->finish_item(tp, li, dfp->dfp_done, &state); - if (error == -EAGAIN) { - /* - * Caller wants a fresh transaction; put the work item - * back on the list and log a new log intent item to - * replace the old one. See "Requesting a Fresh - * Transaction while Finishing Deferred Work" above. - */ - list_add(li, &dfp->dfp_work); - dfp->dfp_count++; - dfp->dfp_done = NULL; - dfp->dfp_intent = NULL; - xfs_defer_create_intent(tp, dfp, false); - } - - if (error) - goto out; - } - - /* Done with the dfp, free it. */ - list_del(&dfp->dfp_list); - kmem_free(dfp); -out: - if (ops->finish_cleanup) - ops->finish_cleanup(tp, state, error); - return error; -} - -/* * Finish all the pending work. This involves logging intent items for * any work items that wandered in since the last transaction roll (if * one has even happened), rolling the transaction, and finishing the @@ -475,7 +358,11 @@ xfs_defer_finish_noroll( struct xfs_trans **tp) { struct xfs_defer_pending *dfp; + struct list_head *li; + struct list_head *n; + void *state; int error = 0; + const struct xfs_defer_op_type *ops; LIST_HEAD(dop_pending); ASSERT((*tp)->t_flags & XFS_TRANS_PERM_LOG_RES); @@ -484,44 +371,87 @@ xfs_defer_finish_noroll( /* Until we run out of pending work to finish... */ while (!list_empty(&dop_pending) || !list_empty(&(*tp)->t_dfops)) { - /* - * Deferred items that are created in the process of finishing - * other deferred work items should be queued at the head of - * the pending list, which puts them ahead of the deferred work - * that was created by the caller. This keeps the number of - * pending work items to a minimum, which decreases the amount - * of time that any one intent item can stick around in memory, - * pinning the log tail. - */ + /* log intents and pull in intake items */ xfs_defer_create_intents(*tp); - list_splice_init(&(*tp)->t_dfops, &dop_pending); + list_splice_tail_init(&(*tp)->t_dfops, &dop_pending); + /* + * Roll the transaction. + */ error = xfs_defer_trans_roll(tp); if (error) - goto out_shutdown; + goto out; - /* Possibly relog intent items to keep the log moving. */ - error = xfs_defer_relog(tp, &dop_pending); - if (error) - goto out_shutdown; - + /* Log an intent-done item for the first pending item. */ dfp = list_first_entry(&dop_pending, struct xfs_defer_pending, dfp_list); - error = xfs_defer_finish_one(*tp, dfp); - if (error && error != -EAGAIN) - goto out_shutdown; + ops = defer_op_types[dfp->dfp_type]; + trace_xfs_defer_pending_finish((*tp)->t_mountp, dfp); + dfp->dfp_done = ops->create_done(*tp, dfp->dfp_intent, + dfp->dfp_count); + + /* Finish the work items. */ + state = NULL; + list_for_each_safe(li, n, &dfp->dfp_work) { + list_del(li); + dfp->dfp_count--; + error = ops->finish_item(*tp, li, dfp->dfp_done, + &state); + if (error == -EAGAIN) { + /* + * Caller wants a fresh transaction; + * put the work item back on the list + * and jump out. + */ + list_add(li, &dfp->dfp_work); + dfp->dfp_count++; + break; + } else if (error) { + /* + * Clean up after ourselves and jump out. + * xfs_defer_cancel will take care of freeing + * all these lists and stuff. + */ + if (ops->finish_cleanup) + ops->finish_cleanup(*tp, state, error); + goto out; + } + } + if (error == -EAGAIN) { + /* + * Caller wants a fresh transaction, so log a + * new log intent item to replace the old one + * and roll the transaction. See "Requesting + * a Fresh Transaction while Finishing + * Deferred Work" above. + */ + dfp->dfp_intent = ops->create_intent(*tp, + dfp->dfp_count); + dfp->dfp_done = NULL; + list_for_each(li, &dfp->dfp_work) + ops->log_item(*tp, dfp->dfp_intent, li); + } else { + /* Done with the dfp, free it. */ + list_del(&dfp->dfp_list); + kmem_free(dfp); + } + + if (ops->finish_cleanup) + ops->finish_cleanup(*tp, state, error); + } + +out: + if (error) { + xfs_defer_trans_abort(*tp, &dop_pending); + xfs_force_shutdown((*tp)->t_mountp, SHUTDOWN_CORRUPT_INCORE); + trace_xfs_defer_finish_error(*tp, error); + xfs_defer_cancel_list((*tp)->t_mountp, &dop_pending); + xfs_defer_cancel(*tp); + return error; } trace_xfs_defer_finish_done(*tp, _RET_IP_); return 0; - -out_shutdown: - xfs_defer_trans_abort(*tp, &dop_pending); - xfs_force_shutdown((*tp)->t_mountp, SHUTDOWN_CORRUPT_INCORE); - trace_xfs_defer_finish_error(*tp, error); - xfs_defer_cancel_list((*tp)->t_mountp, &dop_pending); - xfs_defer_cancel(*tp); - return error; } int @@ -622,137 +552,3 @@ xfs_defer_move( xfs_defer_reset(stp); } - -/* - * Prepare a chain of fresh deferred ops work items to be completed later. Log - * recovery requires the ability to put off until later the actual finishing - * work so that it can process unfinished items recovered from the log in - * correct order. - * - * Create and log intent items for all the work that we're capturing so that we - * can be assured that the items will get replayed if the system goes down - * before log recovery gets a chance to finish the work it put off. The entire - * deferred ops state is transferred to the capture structure and the - * transaction is then ready for the caller to commit it. If there are no - * intent items to capture, this function returns NULL. - * - * If capture_ip is not NULL, the capture structure will obtain an extra - * reference to the inode. - */ -static struct xfs_defer_capture * -xfs_defer_ops_capture( - struct xfs_trans *tp, - struct xfs_inode *capture_ip) -{ - struct xfs_defer_capture *dfc; - - if (list_empty(&tp->t_dfops)) - return NULL; - - /* Create an object to capture the defer ops. */ - dfc = kmem_zalloc(sizeof(*dfc), KM_NOFS); - INIT_LIST_HEAD(&dfc->dfc_list); - INIT_LIST_HEAD(&dfc->dfc_dfops); - - xfs_defer_create_intents(tp); - - /* Move the dfops chain and transaction state to the capture struct. */ - list_splice_init(&tp->t_dfops, &dfc->dfc_dfops); - dfc->dfc_tpflags = tp->t_flags & XFS_TRANS_LOWMODE; - tp->t_flags &= ~XFS_TRANS_LOWMODE; - - /* Capture the remaining block reservations along with the dfops. */ - dfc->dfc_blkres = tp->t_blk_res - tp->t_blk_res_used; - dfc->dfc_rtxres = tp->t_rtx_res - tp->t_rtx_res_used; - - /* Preserve the log reservation size. */ - dfc->dfc_logres = tp->t_log_res; - - /* - * Grab an extra reference to this inode and attach it to the capture - * structure. - */ - if (capture_ip) { - ihold(VFS_I(capture_ip)); - dfc->dfc_capture_ip = capture_ip; - } - - return dfc; -} - -/* Release all resources that we used to capture deferred ops. */ -void -xfs_defer_ops_release( - struct xfs_mount *mp, - struct xfs_defer_capture *dfc) -{ - xfs_defer_cancel_list(mp, &dfc->dfc_dfops); - if (dfc->dfc_capture_ip) - xfs_irele(dfc->dfc_capture_ip); - kmem_free(dfc); -} - -/* - * Capture any deferred ops and commit the transaction. This is the last step - * needed to finish a log intent item that we recovered from the log. If any - * of the deferred ops operate on an inode, the caller must pass in that inode - * so that the reference can be transferred to the capture structure. The - * caller must hold ILOCK_EXCL on the inode, and must unlock it before calling - * xfs_defer_ops_continue. - */ -int -xfs_defer_ops_capture_and_commit( - struct xfs_trans *tp, - struct xfs_inode *capture_ip, - struct list_head *capture_list) -{ - struct xfs_mount *mp = tp->t_mountp; - struct xfs_defer_capture *dfc; - int error; - - ASSERT(!capture_ip || xfs_isilocked(capture_ip, XFS_ILOCK_EXCL)); - - /* If we don't capture anything, commit transaction and exit. */ - dfc = xfs_defer_ops_capture(tp, capture_ip); - if (!dfc) - return xfs_trans_commit(tp); - - /* Commit the transaction and add the capture structure to the list. */ - error = xfs_trans_commit(tp); - if (error) { - xfs_defer_ops_release(mp, dfc); - return error; - } - - list_add_tail(&dfc->dfc_list, capture_list); - return 0; -} - -/* - * Attach a chain of captured deferred ops to a new transaction and free the - * capture structure. If an inode was captured, it will be passed back to the - * caller with ILOCK_EXCL held and joined to the transaction with lockflags==0. - * The caller now owns the inode reference. - */ -void -xfs_defer_ops_continue( - struct xfs_defer_capture *dfc, - struct xfs_trans *tp, - struct xfs_inode **captured_ipp) -{ - ASSERT(tp->t_flags & XFS_TRANS_PERM_LOG_RES); - ASSERT(!(tp->t_flags & XFS_TRANS_DIRTY)); - - /* Lock and join the captured inode to the new transaction. */ - if (dfc->dfc_capture_ip) { - xfs_ilock(dfc->dfc_capture_ip, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, dfc->dfc_capture_ip, 0); - } - *captured_ipp = dfc->dfc_capture_ip; - - /* Move captured dfops chain and state to the transaction. */ - list_splice_init(&dfc->dfc_dfops, &tp->t_dfops); - tp->t_flags |= dfc->dfc_tpflags; - - kmem_free(dfc); -}
diff --git a/fs/xfs/libxfs/xfs_defer.h b/fs/xfs/libxfs/xfs_defer.h index 4c3248d..7c28d76 100644 --- a/fs/xfs/libxfs/xfs_defer.h +++ b/fs/xfs/libxfs/xfs_defer.h
@@ -7,7 +7,6 @@ #define __XFS_DEFER_H__ struct xfs_defer_op_type; -struct xfs_defer_capture; /* * Header for deferred operation list. @@ -29,7 +28,7 @@ enum xfs_defer_ops_type { struct xfs_defer_pending { struct list_head dfp_list; /* pending items */ struct list_head dfp_work; /* work items */ - struct xfs_log_item *dfp_intent; /* log intent item */ + void *dfp_intent; /* log intent item */ void *dfp_done; /* log done item */ unsigned int dfp_count; /* # extent items */ enum xfs_defer_ops_type dfp_type; @@ -44,15 +43,15 @@ void xfs_defer_move(struct xfs_trans *dtp, struct xfs_trans *stp); /* Description of a deferred type. */ struct xfs_defer_op_type { - struct xfs_log_item *(*create_intent)(struct xfs_trans *tp, - struct list_head *items, unsigned int count, bool sort); - void (*abort_intent)(struct xfs_log_item *intent); - void *(*create_done)(struct xfs_trans *tp, struct xfs_log_item *intent, - unsigned int count); + void (*abort_intent)(void *); + void *(*create_done)(struct xfs_trans *, void *, unsigned int); int (*finish_item)(struct xfs_trans *, struct list_head *, void *, void **); void (*finish_cleanup)(struct xfs_trans *, void *, int); void (*cancel_item)(struct list_head *); + int (*diff_items)(void *, struct list_head *, struct list_head *); + void *(*create_intent)(struct xfs_trans *, uint); + void (*log_item)(struct xfs_trans *, void *, struct list_head *); unsigned int max_items; }; @@ -62,40 +61,4 @@ extern const struct xfs_defer_op_type xfs_rmap_update_defer_type; extern const struct xfs_defer_op_type xfs_extent_free_defer_type; extern const struct xfs_defer_op_type xfs_agfl_free_defer_type; -/* - * This structure enables a dfops user to detach the chain of deferred - * operations from a transaction so that they can be continued later. - */ -struct xfs_defer_capture { - /* List of other capture structures. */ - struct list_head dfc_list; - - /* Deferred ops state saved from the transaction. */ - struct list_head dfc_dfops; - unsigned int dfc_tpflags; - - /* Block reservations for the data and rt devices. */ - unsigned int dfc_blkres; - unsigned int dfc_rtxres; - - /* Log reservation saved from the transaction. */ - unsigned int dfc_logres; - - /* - * An inode reference that must be maintained to complete the deferred - * work. - */ - struct xfs_inode *dfc_capture_ip; -}; - -/* - * Functions to capture a chain of deferred operations and continue them later. - * This doesn't normally happen except log recovery. - */ -int xfs_defer_ops_capture_and_commit(struct xfs_trans *tp, - struct xfs_inode *capture_ip, struct list_head *capture_list); -void xfs_defer_ops_continue(struct xfs_defer_capture *d, struct xfs_trans *tp, - struct xfs_inode **captured_ipp); -void xfs_defer_ops_release(struct xfs_mount *mp, struct xfs_defer_capture *d); - #endif /* __XFS_DEFER_H__ */
diff --git a/fs/xfs/libxfs/xfs_dir2.c b/fs/xfs/libxfs/xfs_dir2.c index 452d04a..867c5de 100644 --- a/fs/xfs/libxfs/xfs_dir2.c +++ b/fs/xfs/libxfs/xfs_dir2.c
@@ -600,10 +600,8 @@ xfs_dir2_isblock( if ((rval = xfs_bmap_last_offset(args->dp, &last, XFS_DATA_FORK))) return rval; rval = XFS_FSB_TO_B(args->dp->i_mount, last) == args->geo->blksize; - if (rval != 0 && args->dp->i_d.di_size != args->geo->blksize) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, args->dp->i_mount); + if (rval != 0 && args->dp->i_d.di_size != args->geo->blksize) return -EFSCORRUPTED; - } *vp = rval; return 0; }
diff --git a/fs/xfs/libxfs/xfs_dir2.h b/fs/xfs/libxfs/xfs_dir2.h index e170792..f542447 100644 --- a/fs/xfs/libxfs/xfs_dir2.h +++ b/fs/xfs/libxfs/xfs_dir2.h
@@ -18,8 +18,6 @@ struct xfs_dir2_sf_entry; struct xfs_dir2_data_hdr; struct xfs_dir2_data_entry; struct xfs_dir2_data_unused; -struct xfs_dir3_icfree_hdr; -struct xfs_dir3_icleaf_hdr; extern struct xfs_name xfs_name_dotdot;
diff --git a/fs/xfs/libxfs/xfs_dir2_block.c b/fs/xfs/libxfs/xfs_dir2_block.c index d034d66..49e4bc3 100644 --- a/fs/xfs/libxfs/xfs_dir2_block.c +++ b/fs/xfs/libxfs/xfs_dir2_block.c
@@ -114,23 +114,6 @@ const struct xfs_buf_ops xfs_dir3_block_buf_ops = { .verify_struct = xfs_dir3_block_verify, }; -static xfs_failaddr_t -xfs_dir3_block_header_check( - struct xfs_inode *dp, - struct xfs_buf *bp) -{ - struct xfs_mount *mp = dp->i_mount; - - if (xfs_sb_version_hascrc(&mp->m_sb)) { - struct xfs_dir3_blk_hdr *hdr3 = bp->b_addr; - - if (be64_to_cpu(hdr3->owner) != dp->i_ino) - return __this_address; - } - - return NULL; -} - int xfs_dir3_block_read( struct xfs_trans *tp, @@ -138,24 +121,12 @@ xfs_dir3_block_read( struct xfs_buf **bpp) { struct xfs_mount *mp = dp->i_mount; - xfs_failaddr_t fa; int err; err = xfs_da_read_buf(tp, dp, mp->m_dir_geo->datablk, -1, bpp, XFS_DATA_FORK, &xfs_dir3_block_buf_ops); - if (err || !*bpp) - return err; - - /* Check things that we can't do in the verifier. */ - fa = xfs_dir3_block_header_check(dp, *bpp); - if (fa) { - __xfs_buf_mark_corrupt(*bpp, fa); - xfs_trans_brelse(tp, *bpp); - *bpp = NULL; - return -EFSCORRUPTED; - } - - xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF); + if (!err && tp && *bpp) + xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_BLOCK_BUF); return err; }
diff --git a/fs/xfs/libxfs/xfs_dir2_data.c b/fs/xfs/libxfs/xfs_dir2_data.c index 2d92bcd..2c79be4 100644 --- a/fs/xfs/libxfs/xfs_dir2_data.c +++ b/fs/xfs/libxfs/xfs_dir2_data.c
@@ -348,22 +348,6 @@ static const struct xfs_buf_ops xfs_dir3_data_reada_buf_ops = { .verify_write = xfs_dir3_data_write_verify, }; -static xfs_failaddr_t -xfs_dir3_data_header_check( - struct xfs_inode *dp, - struct xfs_buf *bp) -{ - struct xfs_mount *mp = dp->i_mount; - - if (xfs_sb_version_hascrc(&mp->m_sb)) { - struct xfs_dir3_data_hdr *hdr3 = bp->b_addr; - - if (be64_to_cpu(hdr3->hdr.owner) != dp->i_ino) - return __this_address; - } - - return NULL; -} int xfs_dir3_data_read( @@ -373,24 +357,12 @@ xfs_dir3_data_read( xfs_daddr_t mapped_bno, struct xfs_buf **bpp) { - xfs_failaddr_t fa; int err; err = xfs_da_read_buf(tp, dp, bno, mapped_bno, bpp, XFS_DATA_FORK, &xfs_dir3_data_buf_ops); - if (err || !*bpp) - return err; - - /* Check things that we can't do in the verifier. */ - fa = xfs_dir3_data_header_check(dp, *bpp); - if (fa) { - __xfs_buf_mark_corrupt(*bpp, fa); - xfs_trans_brelse(tp, *bpp); - *bpp = NULL; - return -EFSCORRUPTED; - } - - xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_DATA_BUF); + if (!err && tp && *bpp) + xfs_trans_buf_set_type(tp, *bpp, XFS_BLFT_DIR_DATA_BUF); return err; }
diff --git a/fs/xfs/libxfs/xfs_dir2_leaf.c b/fs/xfs/libxfs/xfs_dir2_leaf.c index c8ee325..a53e458 100644 --- a/fs/xfs/libxfs/xfs_dir2_leaf.c +++ b/fs/xfs/libxfs/xfs_dir2_leaf.c
@@ -1343,10 +1343,8 @@ xfs_dir2_leaf_removename( oldbest = be16_to_cpu(bf[0].length); ltp = xfs_dir2_leaf_tail_p(args->geo, leaf); bestsp = xfs_dir2_leaf_bests_p(ltp); - if (be16_to_cpu(bestsp[db]) != oldbest) { - xfs_buf_mark_corrupt(lbp); + if (be16_to_cpu(bestsp[db]) != oldbest) return -EFSCORRUPTED; - } /* * Mark the former data entry unused. */
diff --git a/fs/xfs/libxfs/xfs_dir2_node.c b/fs/xfs/libxfs/xfs_dir2_node.c index c8c3c3a..99d5b2e 100644 --- a/fs/xfs/libxfs/xfs_dir2_node.c +++ b/fs/xfs/libxfs/xfs_dir2_node.c
@@ -208,7 +208,7 @@ __xfs_dir3_free_read( /* Check things that we can't do in the verifier. */ fa = xfs_dir3_free_header_check(dp, fbno, *bpp); if (fa) { - __xfs_buf_mark_corrupt(*bpp, fa); + xfs_verifier_error(*bpp, -EFSCORRUPTED, fa); xfs_trans_brelse(tp, *bpp); *bpp = NULL; return -EFSCORRUPTED; @@ -374,10 +374,8 @@ xfs_dir2_leaf_to_node( leaf = lbp->b_addr; ltp = xfs_dir2_leaf_tail_p(args->geo, leaf); if (be32_to_cpu(ltp->bestcount) > - (uint)dp->i_d.di_size / args->geo->blksize) { - xfs_buf_mark_corrupt(lbp); + (uint)dp->i_d.di_size / args->geo->blksize) return -EFSCORRUPTED; - } /* * Copy freespace entries from the leaf block to the new block. @@ -448,10 +446,8 @@ xfs_dir2_leafn_add( * Quick check just to make sure we are not going to index * into other peoples memory */ - if (index < 0) { - xfs_buf_mark_corrupt(bp); + if (index < 0) return -EFSCORRUPTED; - } /* * If there are already the maximum number of leaf entries in @@ -744,10 +740,8 @@ xfs_dir2_leafn_lookup_for_entry( ents = dp->d_ops->leaf_ents_p(leaf); xfs_dir3_leaf_check(dp, bp); - if (leafhdr.count <= 0) { - xfs_buf_mark_corrupt(bp); + if (leafhdr.count <= 0) return -EFSCORRUPTED; - } /* * Look up the hash value in the leaf entries.
diff --git a/fs/xfs/libxfs/xfs_dir2_priv.h b/fs/xfs/libxfs/xfs_dir2_priv.h index d2eaea6..59f9fb2 100644 --- a/fs/xfs/libxfs/xfs_dir2_priv.h +++ b/fs/xfs/libxfs/xfs_dir2_priv.h
@@ -8,25 +8,6 @@ struct dir_context; -/* - * In-core version of the leaf and free block headers to abstract the - * differences in the v2 and v3 disk format of the headers. - */ -struct xfs_dir3_icleaf_hdr { - uint32_t forw; - uint32_t back; - uint16_t magic; - uint16_t count; - uint16_t stale; -}; - -struct xfs_dir3_icfree_hdr { - uint32_t magic; - uint32_t firstdb; - uint32_t nvalid; - uint32_t nused; -}; - /* xfs_dir2.c */ extern int xfs_dir2_grow_inode(struct xfs_da_args *args, int space, xfs_dir2_db_t *dbp);
diff --git a/fs/xfs/libxfs/xfs_dir2_sf.c b/fs/xfs/libxfs/xfs_dir2_sf.c index f980c3f..ae16ca7 100644 --- a/fs/xfs/libxfs/xfs_dir2_sf.c +++ b/fs/xfs/libxfs/xfs_dir2_sf.c
@@ -945,27 +945,6 @@ xfs_dir2_sf_removename( } /* - * Check whether the sf dir replace operation need more blocks. - */ -static bool -xfs_dir2_sf_replace_needblock( - struct xfs_inode *dp, - xfs_ino_t inum) -{ - int newsize; - struct xfs_dir2_sf_hdr *sfp; - - if (dp->i_d.di_format != XFS_DINODE_FMT_LOCAL) - return false; - - sfp = (struct xfs_dir2_sf_hdr *)dp->i_df.if_u1.if_data; - newsize = dp->i_df.if_bytes + (sfp->count + 1) * XFS_INO64_DIFF; - - return inum > XFS_DIR2_MAX_SHORT_INUM && - sfp->i8count == 0 && newsize > XFS_IFORK_DSIZE(dp); -} - -/* * Replace the inode number of an entry in a shortform directory. */ int /* error */ @@ -1001,14 +980,17 @@ xfs_dir2_sf_replace( */ if (args->inumber > XFS_DIR2_MAX_SHORT_INUM && sfp->i8count == 0) { int error; /* error return value */ + int newsize; /* new inode size */ + newsize = dp->i_df.if_bytes + (sfp->count + 1) * XFS_INO64_DIFF; /* * Won't fit as shortform, convert to block then do replace. */ - if (xfs_dir2_sf_replace_needblock(dp, args->inumber)) { + if (newsize > XFS_IFORK_DSIZE(dp)) { error = xfs_dir2_sf_to_block(args); - if (error) + if (error) { return error; + } return xfs_dir2_block_replace(args); } /*
diff --git a/fs/xfs/libxfs/xfs_dquot_buf.c b/fs/xfs/libxfs/xfs_dquot_buf.c index bedc1e7..e8bd688 100644 --- a/fs/xfs/libxfs/xfs_dquot_buf.c +++ b/fs/xfs/libxfs/xfs_dquot_buf.c
@@ -35,10 +35,10 @@ xfs_calc_dquots_per_chunk( xfs_failaddr_t xfs_dquot_verify( - struct xfs_mount *mp, - struct xfs_disk_dquot *ddq, - xfs_dqid_t id, - uint type) /* used only during quotacheck */ + struct xfs_mount *mp, + xfs_disk_dquot_t *ddq, + xfs_dqid_t id, + uint type) /* used only during quotacheck */ { /* * We can encounter an uninitialized dquot buffer for 2 reasons:
diff --git a/fs/xfs/libxfs/xfs_format.h b/fs/xfs/libxfs/xfs_format.h index 31fa9ab..c968b60 100644 --- a/fs/xfs/libxfs/xfs_format.h +++ b/fs/xfs/libxfs/xfs_format.h
@@ -497,23 +497,6 @@ static inline bool xfs_sb_version_hascrc(struct xfs_sb *sbp) return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; } -/* - * v5 file systems support V3 inodes only, earlier file systems support - * v2 and v1 inodes. - */ -static inline bool xfs_sb_version_has_v3inode(struct xfs_sb *sbp) -{ - return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; -} - -static inline bool xfs_dinode_good_version(struct xfs_sb *sbp, - uint8_t version) -{ - if (xfs_sb_version_has_v3inode(sbp)) - return version == 3; - return version == 1 || version == 2; -} - static inline bool xfs_sb_version_has_pquotino(struct xfs_sb *sbp) { return XFS_SB_VERSION_NUM(sbp) == XFS_SB_VERSION_5; @@ -963,12 +946,8 @@ typedef enum xfs_dinode_fmt { /* * Inode size for given fs. */ -#define XFS_DINODE_SIZE(sbp) \ - (xfs_sb_version_has_v3inode(sbp) ? \ - sizeof(struct xfs_dinode) : \ - offsetof(struct xfs_dinode, di_crc)) -#define XFS_LITINO(mp) \ - ((mp)->m_sb.sb_inodesize - XFS_DINODE_SIZE(&(mp)->m_sb)) +#define XFS_LITINO(mp, version) \ + ((int)(((mp)->m_sb.sb_inodesize) - xfs_dinode_size(version))) /* * Inode data & attribute fork sizes, per inode. @@ -977,9 +956,13 @@ typedef enum xfs_dinode_fmt { #define XFS_DFORK_BOFF(dip) ((int)((dip)->di_forkoff << 3)) #define XFS_DFORK_DSIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? XFS_DFORK_BOFF(dip) : XFS_LITINO(mp)) + (XFS_DFORK_Q(dip) ? \ + XFS_DFORK_BOFF(dip) : \ + XFS_LITINO(mp, (dip)->di_version)) #define XFS_DFORK_ASIZE(dip,mp) \ - (XFS_DFORK_Q(dip) ? XFS_LITINO(mp) - XFS_DFORK_BOFF(dip) : 0) + (XFS_DFORK_Q(dip) ? \ + XFS_LITINO(mp, (dip)->di_version) - XFS_DFORK_BOFF(dip) : \ + 0) #define XFS_DFORK_SIZE(dip,mp,w) \ ((w) == XFS_DATA_FORK ? \ XFS_DFORK_DSIZE(dip, mp) : \ @@ -1161,11 +1144,11 @@ static inline void xfs_dinode_put_rdev(struct xfs_dinode *dip, xfs_dev_t rdev) /* * This is the main portion of the on-disk representation of quota - * information for a user. This is the q_core of the struct xfs_dquot that + * information for a user. This is the q_core of the xfs_dquot_t that * is kept in kernel memory. We pad this with some more expansion room * to construct the on disk structure. */ -struct xfs_disk_dquot { +typedef struct xfs_disk_dquot { __be16 d_magic; /* dquot magic = XFS_DQUOT_MAGIC */ __u8 d_version; /* dquot version */ __u8 d_flags; /* XFS_DQ_USER/PROJ/GROUP */ @@ -1188,15 +1171,15 @@ struct xfs_disk_dquot { __be32 d_rtbtimer; /* similar to above; for RT disk blocks */ __be16 d_rtbwarns; /* warnings issued wrt RT disk blocks */ __be16 d_pad; -}; +} xfs_disk_dquot_t; /* * This is what goes on disk. This is separated from the xfs_disk_dquot because * carrying the unnecessary padding would be a waste of memory. */ typedef struct xfs_dqblk { - struct xfs_disk_dquot dd_diskdq; /* portion living incore as well */ - char dd_fill[4];/* filling for posterity */ + xfs_disk_dquot_t dd_diskdq; /* portion that lives incore as well */ + char dd_fill[4]; /* filling for posterity */ /* * These two are only present on filesystems with the CRC bits set. @@ -1557,13 +1540,6 @@ typedef struct xfs_bmdr_block { #define BMBT_BLOCKCOUNT_BITLEN 21 #define BMBT_STARTOFF_MASK ((1ULL << BMBT_STARTOFF_BITLEN) - 1) -#define BMBT_BLOCKCOUNT_MASK ((1ULL << BMBT_BLOCKCOUNT_BITLEN) - 1) - -/* - * bmbt records have a file offset (block) field that is 54 bits wide, so this - * is the largest xfs_fileoff_t that we ever expect to see. - */ -#define XFS_MAX_FILEOFF (BMBT_STARTOFF_MASK + BMBT_BLOCKCOUNT_MASK) typedef struct xfs_bmbt_rec { __be64 l0, l1;
diff --git a/fs/xfs/libxfs/xfs_ialloc.c b/fs/xfs/libxfs/xfs_ialloc.c index 391e441..443cf33 100644 --- a/fs/xfs/libxfs/xfs_ialloc.c +++ b/fs/xfs/libxfs/xfs_ialloc.c
@@ -303,7 +303,7 @@ xfs_ialloc_inode_init( * That means for v3 inode we log the entire buffer rather than just the * inode cores. */ - if (xfs_sb_version_has_v3inode(&mp->m_sb)) { + if (xfs_sb_version_hascrc(&mp->m_sb)) { version = 3; ino = XFS_AGINO_TO_INO(mp, agno, XFS_AGB_TO_AGINO(mp, agbno)); @@ -339,7 +339,7 @@ xfs_ialloc_inode_init( xfs_buf_zero(fbuf, 0, BBTOB(fbuf->b_length)); for (i = 0; i < M_IGEO(mp)->inodes_per_cluster; i++) { int ioffset = i << mp->m_sb.sb_inodelog; - uint isize = XFS_DINODE_SIZE(&mp->m_sb); + uint isize = xfs_dinode_size(version); free = xfs_make_iptr(mp, fbuf, i); free->di_magic = cpu_to_be16(XFS_DINODE_MAGIC); @@ -2818,7 +2818,7 @@ xfs_ialloc_setup_geometry( * cannot change the behavior. */ igeo->inode_cluster_size_raw = XFS_INODE_BIG_CLUSTER_SIZE; - if (xfs_sb_version_has_v3inode(&mp->m_sb)) { + if (xfs_sb_version_hascrc(&mp->m_sb)) { int new_size = igeo->inode_cluster_size_raw; new_size *= mp->m_sb.sb_inodesize / XFS_DINODE_MIN_SIZE; @@ -2854,67 +2854,3 @@ xfs_ialloc_setup_geometry( else igeo->ialloc_align = 0; } - -/* Compute the location of the root directory inode that is laid out by mkfs. */ -xfs_ino_t -xfs_ialloc_calc_rootino( - struct xfs_mount *mp, - int sunit) -{ - struct xfs_ino_geometry *igeo = M_IGEO(mp); - xfs_agblock_t first_bno; - - /* - * Pre-calculate the geometry of AG 0. We know what it looks like - * because libxfs knows how to create allocation groups now. - * - * first_bno is the first block in which mkfs could possibly have - * allocated the root directory inode, once we factor in the metadata - * that mkfs formats before it. Namely, the four AG headers... - */ - first_bno = howmany(4 * mp->m_sb.sb_sectsize, mp->m_sb.sb_blocksize); - - /* ...the two free space btree roots... */ - first_bno += 2; - - /* ...the inode btree root... */ - first_bno += 1; - - /* ...the initial AGFL... */ - first_bno += xfs_alloc_min_freelist(mp, NULL); - - /* ...the free inode btree root... */ - if (xfs_sb_version_hasfinobt(&mp->m_sb)) - first_bno++; - - /* ...the reverse mapping btree root... */ - if (xfs_sb_version_hasrmapbt(&mp->m_sb)) - first_bno++; - - /* ...the reference count btree... */ - if (xfs_sb_version_hasreflink(&mp->m_sb)) - first_bno++; - - /* - * ...and the log, if it is allocated in the first allocation group. - * - * This can happen with filesystems that only have a single - * allocation group, or very odd geometries created by old mkfs - * versions on very small filesystems. - */ - if (mp->m_sb.sb_logstart && - XFS_FSB_TO_AGNO(mp, mp->m_sb.sb_logstart) == 0) - first_bno += mp->m_sb.sb_logblocks; - - /* - * Now round first_bno up to whatever allocation alignment is given - * by the filesystem or was passed in. - */ - if (xfs_sb_version_hasdalign(&mp->m_sb) && igeo->ialloc_align > 0) - first_bno = roundup(first_bno, sunit); - else if (xfs_sb_version_hasalign(&mp->m_sb) && - mp->m_sb.sb_inoalignmt > 1) - first_bno = roundup(first_bno, mp->m_sb.sb_inoalignmt); - - return XFS_AGINO_TO_INO(mp, 0, XFS_AGB_TO_AGINO(mp, first_bno)); -}
diff --git a/fs/xfs/libxfs/xfs_ialloc.h b/fs/xfs/libxfs/xfs_ialloc.h index 72b3468..323592d 100644 --- a/fs/xfs/libxfs/xfs_ialloc.h +++ b/fs/xfs/libxfs/xfs_ialloc.h
@@ -152,6 +152,5 @@ int xfs_inobt_insert_rec(struct xfs_btree_cur *cur, uint16_t holemask, int xfs_ialloc_cluster_alignment(struct xfs_mount *mp); void xfs_ialloc_setup_geometry(struct xfs_mount *mp); -xfs_ino_t xfs_ialloc_calc_rootino(struct xfs_mount *mp, int sunit); #endif /* __XFS_IALLOC_H__ */
diff --git a/fs/xfs/libxfs/xfs_inode_buf.c b/fs/xfs/libxfs/xfs_inode_buf.c index 962e95d..28ab3c5 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.c +++ b/fs/xfs/libxfs/xfs_inode_buf.c
@@ -44,6 +44,17 @@ xfs_inobp_check( } #endif +bool +xfs_dinode_good_version( + struct xfs_mount *mp, + __u8 version) +{ + if (xfs_sb_version_hascrc(&mp->m_sb)) + return version == 3; + + return version == 1 || version == 2; +} + /* * If we are doing readahead on an inode buffer, we might be in log recovery * reading an inode allocation buffer that hasn't yet been replayed, and hence @@ -82,7 +93,7 @@ xfs_inode_buf_verify( dip = xfs_buf_offset(bp, (i << mp->m_sb.sb_inodelog)); unlinked_ino = be32_to_cpu(dip->di_next_unlinked); di_ok = xfs_verify_magic16(bp, dip->di_magic) && - xfs_dinode_good_version(&mp->m_sb, dip->di_version) && + xfs_dinode_good_version(mp, dip->di_version) && xfs_verify_agino_or_null(mp, agno, unlinked_ino); if (unlikely(XFS_TEST_ERROR(!di_ok, mp, XFS_ERRTAG_ITOBP_INOTOBP))) { @@ -194,23 +205,26 @@ xfs_inode_from_disk( struct xfs_icdinode *to = &ip->i_d; struct inode *inode = VFS_I(ip); + /* * Convert v1 inodes immediately to v2 inode format as this is the * minimum inode version format we support in the rest of the code. - * They will also be unconditionally written back to disk as v2 inodes. */ - if (unlikely(from->di_version == 1)) { + to->di_version = from->di_version; + if (to->di_version == 1) { set_nlink(inode, be16_to_cpu(from->di_onlink)); - to->di_projid = 0; + to->di_projid_lo = 0; + to->di_projid_hi = 0; + to->di_version = 2; } else { set_nlink(inode, be32_to_cpu(from->di_nlink)); - to->di_projid = (prid_t)be16_to_cpu(from->di_projid_hi) << 16 | - be16_to_cpu(from->di_projid_lo); + to->di_projid_lo = be16_to_cpu(from->di_projid_lo); + to->di_projid_hi = be16_to_cpu(from->di_projid_hi); } to->di_format = from->di_format; - i_uid_write(inode, be32_to_cpu(from->di_uid)); - i_gid_write(inode, be32_to_cpu(from->di_gid)); + to->di_uid = be32_to_cpu(from->di_uid); + to->di_gid = be32_to_cpu(from->di_gid); to->di_flushiter = be16_to_cpu(from->di_flushiter); /* @@ -239,7 +253,7 @@ xfs_inode_from_disk( to->di_dmstate = be16_to_cpu(from->di_dmstate); to->di_flags = be16_to_cpu(from->di_flags); - if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) { + if (to->di_version == 3) { inode_set_iversion_queried(inode, be64_to_cpu(from->di_changecount)); to->di_crtime.t_sec = be32_to_cpu(from->di_crtime.t_sec); @@ -261,11 +275,12 @@ xfs_inode_to_disk( to->di_magic = cpu_to_be16(XFS_DINODE_MAGIC); to->di_onlink = 0; + to->di_version = from->di_version; to->di_format = from->di_format; - to->di_uid = cpu_to_be32(i_uid_read(inode)); - to->di_gid = cpu_to_be32(i_gid_read(inode)); - to->di_projid_lo = cpu_to_be16(from->di_projid & 0xffff); - to->di_projid_hi = cpu_to_be16(from->di_projid >> 16); + to->di_uid = cpu_to_be32(from->di_uid); + to->di_gid = cpu_to_be32(from->di_gid); + to->di_projid_lo = cpu_to_be16(from->di_projid_lo); + to->di_projid_hi = cpu_to_be16(from->di_projid_hi); memset(to->di_pad, 0, sizeof(to->di_pad)); to->di_atime.t_sec = cpu_to_be32(inode->i_atime.tv_sec); @@ -289,8 +304,7 @@ xfs_inode_to_disk( to->di_dmstate = cpu_to_be16(from->di_dmstate); to->di_flags = cpu_to_be16(from->di_flags); - if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) { - to->di_version = 3; + if (from->di_version == 3) { to->di_changecount = cpu_to_be64(inode_peek_iversion(inode)); to->di_crtime.t_sec = cpu_to_be32(from->di_crtime.t_sec); to->di_crtime.t_nsec = cpu_to_be32(from->di_crtime.t_nsec); @@ -302,7 +316,6 @@ xfs_inode_to_disk( uuid_copy(&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter = 0; } else { - to->di_version = 2; to->di_flushiter = cpu_to_be16(from->di_flushiter); } } @@ -416,7 +429,7 @@ xfs_dinode_verify_forkoff( case XFS_DINODE_FMT_LOCAL: /* fall through ... */ case XFS_DINODE_FMT_EXTENTS: /* fall through ... */ case XFS_DINODE_FMT_BTREE: - if (dip->di_forkoff >= (XFS_LITINO(mp) >> 3)) + if (dip->di_forkoff >= (XFS_LITINO(mp, dip->di_version) >> 3)) return __this_address; break; default: @@ -442,7 +455,7 @@ xfs_dinode_verify( /* Verify v3 integrity information first */ if (dip->di_version >= 3) { - if (!xfs_sb_version_has_v3inode(&mp->m_sb)) + if (!xfs_sb_version_hascrc(&mp->m_sb)) return __this_address; if (!xfs_verify_cksum((char *)dip, mp->m_sb.sb_inodesize, XFS_DINODE_CRC_OFF)) @@ -617,11 +630,12 @@ xfs_iread( /* shortcut IO on inode allocation if possible */ if ((iget_flags & XFS_IGET_CREATE) && - xfs_sb_version_has_v3inode(&mp->m_sb) && + xfs_sb_version_hascrc(&mp->m_sb) && !(mp->m_flags & XFS_MOUNT_IKEEP)) { /* initialise the on-disk inode core */ memset(&ip->i_d, 0, sizeof(ip->i_d)); VFS_I(ip)->i_generation = prandom_u32(); + ip->i_d.di_version = 3; return 0; } @@ -663,6 +677,7 @@ xfs_iread( * Partial initialisation of the in-core inode. Just the bits * that xfs_ialloc won't overwrite or relies on being correct. */ + ip->i_d.di_version = dip->di_version; VFS_I(ip)->i_generation = be32_to_cpu(dip->di_gen); ip->i_d.di_flushiter = be16_to_cpu(dip->di_flushiter); @@ -676,6 +691,7 @@ xfs_iread( VFS_I(ip)->i_mode = 0; } + ASSERT(ip->i_d.di_version >= 2); ip->i_delayed_blks = 0; /*
diff --git a/fs/xfs/libxfs/xfs_inode_buf.h b/fs/xfs/libxfs/xfs_inode_buf.h index 80b5745..ab0f841 100644 --- a/fs/xfs/libxfs/xfs_inode_buf.h +++ b/fs/xfs/libxfs/xfs_inode_buf.h
@@ -16,9 +16,13 @@ struct xfs_dinode; * format specific structures at the appropriate time. */ struct xfs_icdinode { + int8_t di_version; /* inode version */ int8_t di_format; /* format of di_c data */ uint16_t di_flushiter; /* incremented on flush */ - uint32_t di_projid; /* owner's project id */ + uint32_t di_uid; /* owner's user id */ + uint32_t di_gid; /* owner's group id */ + uint16_t di_projid_lo; /* lower part of owner's project id */ + uint16_t di_projid_hi; /* higher part of owner's project id */ xfs_fsize_t di_size; /* number of bytes in file */ xfs_rfsblock_t di_nblocks; /* # of direct & btree blocks used */ xfs_extlen_t di_extsize; /* basic/minimum extent size for file */ @@ -58,6 +62,8 @@ void xfs_inode_from_disk(struct xfs_inode *ip, struct xfs_dinode *from); void xfs_log_dinode_to_disk(struct xfs_log_dinode *from, struct xfs_dinode *to); +bool xfs_dinode_good_version(struct xfs_mount *mp, __u8 version); + #if defined(DEBUG) void xfs_inobp_check(struct xfs_mount *, struct xfs_buf *); #else
diff --git a/fs/xfs/libxfs/xfs_inode_fork.c b/fs/xfs/libxfs/xfs_inode_fork.c index e758d74..8fdd042 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.c +++ b/fs/xfs/libxfs/xfs_inode_fork.c
@@ -75,15 +75,11 @@ xfs_iformat_fork( error = xfs_iformat_btree(ip, dip, XFS_DATA_FORK); break; default: - xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, - dip, sizeof(*dip), __this_address); return -EFSCORRUPTED; } break; default: - xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, dip, - sizeof(*dip), __this_address); return -EFSCORRUPTED; } if (error) @@ -114,8 +110,6 @@ xfs_iformat_fork( error = xfs_iformat_btree(ip, dip, XFS_ATTR_FORK); break; default: - xfs_inode_verifier_error(ip, error, __func__, dip, - sizeof(*dip), __this_address); error = -EFSCORRUPTED; break; } @@ -183,7 +177,7 @@ xfs_iformat_local( */ if (unlikely(size > XFS_DFORK_SIZE(dip, ip->i_mount, whichfork))) { xfs_warn(ip->i_mount, - "corrupt inode %Lu (bad size %d for local fork, size = %zd).", + "corrupt inode %Lu (bad size %d for local fork, size = %d).", (unsigned long long) ip->i_ino, size, XFS_DFORK_SIZE(dip, ip->i_mount, whichfork)); xfs_inode_verifier_error(ip, -EFSCORRUPTED, @@ -592,7 +586,7 @@ void xfs_iflush_fork( xfs_inode_t *ip, xfs_dinode_t *dip, - struct xfs_inode_log_item *iip, + xfs_inode_log_item_t *iip, int whichfork) { char *cp;
diff --git a/fs/xfs/libxfs/xfs_inode_fork.h b/fs/xfs/libxfs/xfs_inode_fork.h index a84a155..7b845c0 100644 --- a/fs/xfs/libxfs/xfs_inode_fork.h +++ b/fs/xfs/libxfs/xfs_inode_fork.h
@@ -46,9 +46,14 @@ struct xfs_ifork { (ip)->i_afp : \ (ip)->i_cowfp)) #define XFS_IFORK_DSIZE(ip) \ - (XFS_IFORK_Q(ip) ? XFS_IFORK_BOFF(ip) : XFS_LITINO((ip)->i_mount)) + (XFS_IFORK_Q(ip) ? \ + XFS_IFORK_BOFF(ip) : \ + XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version)) #define XFS_IFORK_ASIZE(ip) \ - (XFS_IFORK_Q(ip) ? XFS_LITINO((ip)->i_mount) - XFS_IFORK_BOFF(ip) : 0) + (XFS_IFORK_Q(ip) ? \ + XFS_LITINO((ip)->i_mount, (ip)->i_d.di_version) - \ + XFS_IFORK_BOFF(ip) : \ + 0) #define XFS_IFORK_SIZE(ip,w) \ ((w) == XFS_DATA_FORK ? \ XFS_IFORK_DSIZE(ip) : \
diff --git a/fs/xfs/libxfs/xfs_log_format.h b/fs/xfs/libxfs/xfs_log_format.h index d3b255f..e5f97c6 100644 --- a/fs/xfs/libxfs/xfs_log_format.h +++ b/fs/xfs/libxfs/xfs_log_format.h
@@ -424,10 +424,12 @@ struct xfs_log_dinode { /* structure must be padded to 64 bit alignment */ }; -#define xfs_log_dinode_size(mp) \ - (xfs_sb_version_has_v3inode(&(mp)->m_sb) ? \ - sizeof(struct xfs_log_dinode) : \ - offsetof(struct xfs_log_dinode, di_next_unlinked)) +static inline uint xfs_log_dinode_size(int version) +{ + if (version == 3) + return sizeof(struct xfs_log_dinode); + return offsetof(struct xfs_log_dinode, di_next_unlinked); +} /* * Buffer Log Format defintions
diff --git a/fs/xfs/libxfs/xfs_refcount.c b/fs/xfs/libxfs/xfs_refcount.c index 78236bd..9a7fadb 100644 --- a/fs/xfs/libxfs/xfs_refcount.c +++ b/fs/xfs/libxfs/xfs_refcount.c
@@ -1591,10 +1591,8 @@ xfs_refcount_recover_extent( struct list_head *debris = priv; struct xfs_refcount_recovery *rr; - if (be32_to_cpu(rec->refc.rc_refcount) != 1) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, cur->bc_mp); + if (be32_to_cpu(rec->refc.rc_refcount) != 1) return -EFSCORRUPTED; - } rr = kmem_alloc(sizeof(struct xfs_refcount_recovery), 0); xfs_refcount_btrec_to_irec(rec, &rr->rr_rrec);
diff --git a/fs/xfs/libxfs/xfs_rtbitmap.c b/fs/xfs/libxfs/xfs_rtbitmap.c index cf99e4c..42085e7 100644 --- a/fs/xfs/libxfs/xfs_rtbitmap.c +++ b/fs/xfs/libxfs/xfs_rtbitmap.c
@@ -15,7 +15,7 @@ #include "xfs_bmap.h" #include "xfs_trans.h" #include "xfs_rtalloc.h" -#include "xfs_error.h" + /* * Realtime allocator bitmap functions shared with userspace. @@ -70,10 +70,8 @@ xfs_rtbuf_get( if (error) return error; - if (nmap == 0 || !xfs_bmap_is_written_extent(&map)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp); + if (nmap == 0 || !xfs_bmap_is_real_extent(&map)) return -EFSCORRUPTED; - } ASSERT(map.br_startblock != NULLFSBLOCK); error = xfs_trans_read_buf(mp, tp, mp->m_ddev_targp,
diff --git a/fs/xfs/libxfs/xfs_shared.h b/fs/xfs/libxfs/xfs_shared.h index 708feb8..c45acbd 100644 --- a/fs/xfs/libxfs/xfs_shared.h +++ b/fs/xfs/libxfs/xfs_shared.h
@@ -65,7 +65,6 @@ void xfs_log_get_max_trans_res(struct xfs_mount *mp, #define XFS_TRANS_DQ_DIRTY 0x10 /* at least one dquot in trx dirty */ #define XFS_TRANS_RESERVE 0x20 /* OK to use reserved data blocks */ #define XFS_TRANS_NO_WRITECOUNT 0x40 /* do not elevate SB writecount */ -#define XFS_TRANS_RES_FDBLKS 0x80 /* reserve newly freed blocks */ /* * LOWMODE is used by the allocator to activate the lowspace algorithm - when * free space is running low the extent allocator may choose to allocate an
diff --git a/fs/xfs/libxfs/xfs_trans_inode.c b/fs/xfs/libxfs/xfs_trans_inode.c index 1d0e78e..0ba7368 100644 --- a/fs/xfs/libxfs/xfs_trans_inode.c +++ b/fs/xfs/libxfs/xfs_trans_inode.c
@@ -27,7 +27,7 @@ xfs_trans_ijoin( struct xfs_inode *ip, uint lock_flags) { - struct xfs_inode_log_item *iip; + xfs_inode_log_item_t *iip; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (ip->i_itemp == NULL)
diff --git a/fs/xfs/libxfs/xfs_trans_resv.c b/fs/xfs/libxfs/xfs_trans_resv.c index 8ece346..b3584cd 100644 --- a/fs/xfs/libxfs/xfs_trans_resv.c +++ b/fs/xfs/libxfs/xfs_trans_resv.c
@@ -187,7 +187,7 @@ xfs_calc_inode_chunk_res( XFS_FSB_TO_B(mp, 1)); if (alloc) { /* icreate tx uses ordered buffers */ - if (xfs_sb_version_has_v3inode(&mp->m_sb)) + if (xfs_sb_version_hascrc(&mp->m_sb)) return res; size = XFS_FSB_TO_B(mp, 1); } @@ -776,7 +776,7 @@ xfs_calc_clear_agi_bucket_reservation( /* * Adjusting quota limits. - * the disk quota buffer: sizeof(struct xfs_disk_dquot) + * the xfs_disk_dquot_t: sizeof(struct xfs_disk_dquot) */ STATIC uint xfs_calc_qm_setqlim_reservation(void) @@ -800,7 +800,7 @@ xfs_calc_qm_dqalloc_reservation( /* * Turning off quotas. - * the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 + * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 * the superblock for the quota flags: sector size */ STATIC uint @@ -813,7 +813,7 @@ xfs_calc_qm_quotaoff_reservation( /* * End of turning off quotas. - * the quota off logitems: sizeof(struct xfs_qoff_logitem) * 2 + * the xfs_qoff_logitem_t: sizeof(struct xfs_qoff_logitem) * 2 */ STATIC uint xfs_calc_qm_quotaoff_end_reservation(void)
diff --git a/fs/xfs/xfs_acl.c b/fs/xfs/xfs_acl.c index 6788b0c..96d7071 100644 --- a/fs/xfs/xfs_acl.c +++ b/fs/xfs/xfs_acl.c
@@ -12,7 +12,6 @@ #include "xfs_inode.h" #include "xfs_attr.h" #include "xfs_trace.h" -#include "xfs_error.h" #include <linux/posix_acl_xattr.h> @@ -24,7 +23,6 @@ STATIC struct posix_acl * xfs_acl_from_disk( - struct xfs_mount *mp, const struct xfs_acl *aclp, int len, int max_entries) @@ -34,18 +32,11 @@ xfs_acl_from_disk( const struct xfs_acl_entry *ace; unsigned int count, i; - if (len < sizeof(*aclp)) { - XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, aclp, - len); + if (len < sizeof(*aclp)) return ERR_PTR(-EFSCORRUPTED); - } - count = be32_to_cpu(aclp->acl_cnt); - if (count > max_entries || XFS_ACL_SIZE(count) != len) { - XFS_CORRUPTION_ERROR(__func__, XFS_ERRLEVEL_LOW, mp, aclp, - len); + if (count > max_entries || XFS_ACL_SIZE(count) != len) return ERR_PTR(-EFSCORRUPTED); - } acl = posix_acl_alloc(count, GFP_KERNEL); if (!acl) @@ -66,12 +57,10 @@ xfs_acl_from_disk( switch (acl_e->e_tag) { case ACL_USER: - acl_e->e_uid = make_kuid(&init_user_ns, - be32_to_cpu(ace->ae_id)); + acl_e->e_uid = xfs_uid_to_kuid(be32_to_cpu(ace->ae_id)); break; case ACL_GROUP: - acl_e->e_gid = make_kgid(&init_user_ns, - be32_to_cpu(ace->ae_id)); + acl_e->e_gid = xfs_gid_to_kgid(be32_to_cpu(ace->ae_id)); break; case ACL_USER_OBJ: case ACL_GROUP_OBJ: @@ -104,12 +93,10 @@ xfs_acl_to_disk(struct xfs_acl *aclp, const struct posix_acl *acl) ace->ae_tag = cpu_to_be32(acl_e->e_tag); switch (acl_e->e_tag) { case ACL_USER: - ace->ae_id = cpu_to_be32( - from_kuid(&init_user_ns, acl_e->e_uid)); + ace->ae_id = cpu_to_be32(xfs_kuid_to_uid(acl_e->e_uid)); break; case ACL_GROUP: - ace->ae_id = cpu_to_be32( - from_kgid(&init_user_ns, acl_e->e_gid)); + ace->ae_id = cpu_to_be32(xfs_kgid_to_gid(acl_e->e_gid)); break; default: ace->ae_id = cpu_to_be32(ACL_UNDEFINED_ID); @@ -158,7 +145,7 @@ xfs_get_acl(struct inode *inode, int type) if (error != -ENOATTR) acl = ERR_PTR(error); } else { - acl = xfs_acl_from_disk(ip->i_mount, xfs_acl, len, + acl = xfs_acl_from_disk(xfs_acl, len, XFS_ACL_MAX_ENTRIES(ip->i_mount)); kmem_free(xfs_acl); }
diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c index 5d9f8e4..f16d5f1 100644 --- a/fs/xfs/xfs_aops.c +++ b/fs/xfs/xfs_aops.c
@@ -495,7 +495,7 @@ xfs_map_blocks( ssize_t count = i_blocksize(inode); xfs_fileoff_t offset_fsb = XFS_B_TO_FSBT(mp, offset); xfs_fileoff_t end_fsb = XFS_B_TO_FSB(mp, offset + count); - xfs_fileoff_t cow_fsb; + xfs_fileoff_t cow_fsb = NULLFILEOFF; struct xfs_bmbt_irec imap; struct xfs_iext_cursor icur; int retries = 0; @@ -529,8 +529,6 @@ xfs_map_blocks( * landed in a hole and we skip the block. */ retry: - cow_fsb = NULLFILEOFF; - wpc->fork = XFS_DATA_FORK; xfs_ilock(ip, XFS_ILOCK_SHARED); ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || (ip->i_df.if_flags & XFS_IFEXTENTS));
diff --git a/fs/xfs/xfs_attr_inactive.c b/fs/xfs/xfs_attr_inactive.c index f052de1..a640a28 100644 --- a/fs/xfs/xfs_attr_inactive.c +++ b/fs/xfs/xfs_attr_inactive.c
@@ -22,21 +22,24 @@ #include "xfs_attr_leaf.h" #include "xfs_quota.h" #include "xfs_dir2.h" -#include "xfs_error.h" /* - * Invalidate any incore buffers associated with this remote attribute value - * extent. We never log remote attribute value buffers, which means that they - * won't be attached to a transaction and are therefore safe to mark stale. - * The actual bunmapi will be taken care of later. + * Look at all the extents for this logical region, + * invalidate any buffers that are incore/in transactions. */ STATIC int -xfs_attr3_rmt_stale( +xfs_attr3_leaf_freextent( + struct xfs_trans **trans, struct xfs_inode *dp, xfs_dablk_t blkno, int blkcnt) { struct xfs_bmbt_irec map; + struct xfs_buf *bp; + xfs_dablk_t tblkno; + xfs_daddr_t dblkno; + int tblkcnt; + int dblkcnt; int nmap; int error; @@ -44,28 +47,47 @@ xfs_attr3_rmt_stale( * Roll through the "value", invalidating the attribute value's * blocks. */ - while (blkcnt > 0) { + tblkno = blkno; + tblkcnt = blkcnt; + while (tblkcnt > 0) { /* * Try to remember where we decided to put the value. */ nmap = 1; - error = xfs_bmapi_read(dp, (xfs_fileoff_t)blkno, blkcnt, + error = xfs_bmapi_read(dp, (xfs_fileoff_t)tblkno, tblkcnt, &map, &nmap, XFS_BMAPI_ATTRFORK); - if (error) + if (error) { return error; + } ASSERT(nmap == 1); + ASSERT(map.br_startblock != DELAYSTARTBLOCK); /* - * Mark any incore buffers for the remote value as stale. We - * never log remote attr value buffers, so the buffer should be - * easy to kill. + * If it's a hole, these are already unmapped + * so there's nothing to invalidate. */ - error = xfs_attr_rmtval_stale(dp, &map, 0); - if (error) - return error; + if (map.br_startblock != HOLESTARTBLOCK) { - blkno += map.br_blockcount; - blkcnt -= map.br_blockcount; + dblkno = XFS_FSB_TO_DADDR(dp->i_mount, + map.br_startblock); + dblkcnt = XFS_FSB_TO_BB(dp->i_mount, + map.br_blockcount); + bp = xfs_trans_get_buf(*trans, + dp->i_mount->m_ddev_targp, + dblkno, dblkcnt, 0); + if (!bp) + return -ENOMEM; + xfs_trans_binval(*trans, bp); + /* + * Roll to next transaction. + */ + error = xfs_trans_roll_inode(trans, dp); + if (error) + return error; + } + + tblkno += map.br_blockcount; + tblkcnt -= map.br_blockcount; } return 0; @@ -79,45 +101,86 @@ xfs_attr3_rmt_stale( */ STATIC int xfs_attr3_leaf_inactive( - struct xfs_trans **trans, - struct xfs_inode *dp, - struct xfs_buf *bp) + struct xfs_trans **trans, + struct xfs_inode *dp, + struct xfs_buf *bp) { - struct xfs_attr3_icleaf_hdr ichdr; - struct xfs_mount *mp = bp->b_mount; - struct xfs_attr_leafblock *leaf = bp->b_addr; - struct xfs_attr_leaf_entry *entry; + struct xfs_attr_leafblock *leaf; + struct xfs_attr3_icleaf_hdr ichdr; + struct xfs_attr_leaf_entry *entry; struct xfs_attr_leaf_name_remote *name_rmt; - int error = 0; - int i; + struct xfs_attr_inactive_list *list; + struct xfs_attr_inactive_list *lp; + int error; + int count; + int size; + int tmp; + int i; + struct xfs_mount *mp = bp->b_mount; + leaf = bp->b_addr; xfs_attr3_leaf_hdr_from_disk(mp->m_attr_geo, &ichdr, leaf); /* - * Find the remote value extents for this leaf and invalidate their - * incore buffers. + * Count the number of "remote" value extents. */ + count = 0; entry = xfs_attr3_leaf_entryp(leaf); for (i = 0; i < ichdr.count; entry++, i++) { - int blkcnt; - - if (!entry->nameidx || (entry->flags & XFS_ATTR_LOCAL)) - continue; - - name_rmt = xfs_attr3_leaf_name_remote(leaf, i); - if (!name_rmt->valueblk) - continue; - - blkcnt = xfs_attr3_rmt_blocks(dp->i_mount, - be32_to_cpu(name_rmt->valuelen)); - error = xfs_attr3_rmt_stale(dp, - be32_to_cpu(name_rmt->valueblk), blkcnt); - if (error) - goto err; + if (be16_to_cpu(entry->nameidx) && + ((entry->flags & XFS_ATTR_LOCAL) == 0)) { + name_rmt = xfs_attr3_leaf_name_remote(leaf, i); + if (name_rmt->valueblk) + count++; + } } - xfs_trans_brelse(*trans, bp); -err: + /* + * If there are no "remote" values, we're done. + */ + if (count == 0) { + xfs_trans_brelse(*trans, bp); + return 0; + } + + /* + * Allocate storage for a list of all the "remote" value extents. + */ + size = count * sizeof(xfs_attr_inactive_list_t); + list = kmem_alloc(size, 0); + + /* + * Identify each of the "remote" value extents. + */ + lp = list; + entry = xfs_attr3_leaf_entryp(leaf); + for (i = 0; i < ichdr.count; entry++, i++) { + if (be16_to_cpu(entry->nameidx) && + ((entry->flags & XFS_ATTR_LOCAL) == 0)) { + name_rmt = xfs_attr3_leaf_name_remote(leaf, i); + if (name_rmt->valueblk) { + lp->valueblk = be32_to_cpu(name_rmt->valueblk); + lp->valuelen = xfs_attr3_rmt_blocks(dp->i_mount, + be32_to_cpu(name_rmt->valuelen)); + lp++; + } + } + } + xfs_trans_brelse(*trans, bp); /* unlock for trans. in freextent() */ + + /* + * Invalidate each of the "remote" value extents. + */ + error = 0; + for (lp = list, i = 0; i < count; i++, lp++) { + tmp = xfs_attr3_leaf_freextent(trans, dp, + lp->valueblk, lp->valuelen); + + if (error == 0) + error = tmp; /* save only the 1st errno */ + } + + kmem_free(list); return error; } @@ -145,9 +208,8 @@ xfs_attr3_node_inactive( * Since this code is recursive (gasp!) we must protect ourselves. */ if (level > XFS_DA_NODE_MAXDEPTH) { - xfs_buf_mark_corrupt(bp); xfs_trans_brelse(*trans, bp); /* no locks for later trans */ - return -EFSCORRUPTED; + return -EIO; } node = bp->b_addr; @@ -196,9 +258,8 @@ xfs_attr3_node_inactive( error = xfs_attr3_leaf_inactive(trans, dp, child_bp); break; default: - xfs_buf_mark_corrupt(child_bp); + error = -EIO; xfs_trans_brelse(*trans, child_bp); - error = -EFSCORRUPTED; break; } if (error) @@ -280,8 +341,7 @@ xfs_attr3_root_inactive( error = xfs_attr3_leaf_inactive(trans, dp, bp); break; default: - error = -EFSCORRUPTED; - xfs_buf_mark_corrupt(bp); + error = -EIO; xfs_trans_brelse(*trans, bp); break; }
diff --git a/fs/xfs/xfs_attr_list.c b/fs/xfs/xfs_attr_list.c index 8c09728..00758fd 100644 --- a/fs/xfs/xfs_attr_list.c +++ b/fs/xfs/xfs_attr_list.c
@@ -258,10 +258,8 @@ xfs_attr_node_list_lookup( return 0; /* We can't point back to the root. */ - if (cursor->blkno == 0) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp); + if (cursor->blkno == 0) return -EFSCORRUPTED; - } } if (expected_level != 0) @@ -271,7 +269,6 @@ xfs_attr_node_list_lookup( return 0; out_corruptbuf: - xfs_buf_mark_corrupt(bp); xfs_trans_brelse(tp, bp); return -EFSCORRUPTED; }
diff --git a/fs/xfs/xfs_bmap_item.c b/fs/xfs/xfs_bmap_item.c index 7b0c4d9..83d24e9 100644 --- a/fs/xfs/xfs_bmap_item.c +++ b/fs/xfs/xfs_bmap_item.c
@@ -21,8 +21,7 @@ #include "xfs_icache.h" #include "xfs_bmap_btree.h" #include "xfs_trans_space.h" -#include "xfs_error.h" -#include "xfs_quota.h" + kmem_zone_t *xfs_bui_zone; kmem_zone_t *xfs_bud_zone; @@ -125,6 +124,34 @@ xfs_bui_item_release( xfs_bui_release(BUI_ITEM(lip)); } +static const struct xfs_item_ops xfs_bui_item_ops = { + .iop_size = xfs_bui_item_size, + .iop_format = xfs_bui_item_format, + .iop_unpin = xfs_bui_item_unpin, + .iop_release = xfs_bui_item_release, +}; + +/* + * Allocate and initialize an bui item with the given number of extents. + */ +struct xfs_bui_log_item * +xfs_bui_init( + struct xfs_mount *mp) + +{ + struct xfs_bui_log_item *buip; + + buip = kmem_zone_zalloc(xfs_bui_zone, 0); + + xfs_log_item_init(mp, &buip->bui_item, XFS_LI_BUI, &xfs_bui_item_ops); + buip->bui_format.bui_nextents = XFS_BUI_MAX_FAST_EXTENTS; + buip->bui_format.bui_id = (uintptr_t)(void *)buip; + atomic_set(&buip->bui_next_extent, 0); + atomic_set(&buip->bui_refcount, 2); + + return buip; +} + static inline struct xfs_bud_log_item *BUD_ITEM(struct xfs_log_item *lip) { return container_of(lip, struct xfs_bud_log_item, bud_item); @@ -251,6 +278,27 @@ xfs_bmap_update_diff_items( return ba->bi_owner->i_ino - bb->bi_owner->i_ino; } +/* Get an BUI. */ +STATIC void * +xfs_bmap_update_create_intent( + struct xfs_trans *tp, + unsigned int count) +{ + struct xfs_bui_log_item *buip; + + ASSERT(count == XFS_BUI_MAX_FAST_EXTENTS); + ASSERT(tp != NULL); + + buip = xfs_bui_init(tp->t_mountp); + ASSERT(buip != NULL); + + /* + * Get a log_item_desc to point at the new item. + */ + xfs_trans_add_item(tp, &buip->bui_item); + return buip; +} + /* Set the map extent flags for this mapping. */ static void xfs_trans_set_bmap_flags( @@ -278,12 +326,16 @@ xfs_trans_set_bmap_flags( STATIC void xfs_bmap_update_log_item( struct xfs_trans *tp, - struct xfs_bui_log_item *buip, - struct xfs_bmap_intent *bmap) + void *intent, + struct list_head *item) { + struct xfs_bui_log_item *buip = intent; + struct xfs_bmap_intent *bmap; uint next_extent; struct xfs_map_extent *map; + bmap = container_of(item, struct xfs_bmap_intent, bi_list); + tp->t_flags |= XFS_TRANS_DIRTY; set_bit(XFS_LI_DIRTY, &buip->bui_item.li_flags); @@ -303,35 +355,14 @@ xfs_bmap_update_log_item( bmap->bi_bmap.br_state); } -static struct xfs_log_item * -xfs_bmap_update_create_intent( - struct xfs_trans *tp, - struct list_head *items, - unsigned int count, - bool sort) -{ - struct xfs_mount *mp = tp->t_mountp; - struct xfs_bui_log_item *buip = xfs_bui_init(mp); - struct xfs_bmap_intent *bmap; - - ASSERT(count == XFS_BUI_MAX_FAST_EXTENTS); - - xfs_trans_add_item(tp, &buip->bui_item); - if (sort) - list_sort(mp, items, xfs_bmap_update_diff_items); - list_for_each_entry(bmap, items, bi_list) - xfs_bmap_update_log_item(tp, buip, bmap); - return &buip->bui_item; -} - /* Get an BUD so we can process all the deferred rmap updates. */ STATIC void * xfs_bmap_update_create_done( struct xfs_trans *tp, - struct xfs_log_item *intent, + void *intent, unsigned int count) { - return xfs_trans_get_bud(tp, BUI_ITEM(intent)); + return xfs_trans_get_bud(tp, intent); } /* Process a deferred rmap update. */ @@ -367,9 +398,9 @@ xfs_bmap_update_finish_item( /* Abort all pending BUIs. */ STATIC void xfs_bmap_update_abort_intent( - struct xfs_log_item *intent) + void *intent) { - xfs_bui_release(BUI_ITEM(intent)); + xfs_bui_release(intent); } /* Cancel a deferred rmap update. */ @@ -385,8 +416,10 @@ xfs_bmap_update_cancel_item( const struct xfs_defer_op_type xfs_bmap_update_defer_type = { .max_items = XFS_BUI_MAX_FAST_EXTENTS, + .diff_items = xfs_bmap_update_diff_items, .create_intent = xfs_bmap_update_create_intent, .abort_intent = xfs_bmap_update_abort_intent, + .log_item = xfs_bmap_update_log_item, .create_done = xfs_bmap_update_create_done, .finish_item = xfs_bmap_update_finish_item, .cancel_item = xfs_bmap_update_cancel_item, @@ -398,8 +431,8 @@ const struct xfs_defer_op_type xfs_bmap_update_defer_type = { */ int xfs_bui_recover( - struct xfs_bui_log_item *buip, - struct list_head *capture_list) + struct xfs_trans *parent_tp, + struct xfs_bui_log_item *buip) { int error = 0; unsigned int bui_type; @@ -407,13 +440,15 @@ xfs_bui_recover( xfs_fsblock_t startblock_fsb; xfs_fsblock_t inode_fsb; xfs_filblks_t count; + bool op_ok; struct xfs_bud_log_item *budp; + enum xfs_bmap_intent_type type; int whichfork; xfs_exntst_t state; struct xfs_trans *tp; struct xfs_inode *ip = NULL; struct xfs_bmbt_irec irec; - struct xfs_mount *mp = buip->bui_item.li_mountp; + struct xfs_mount *mp = parent_tp->t_mountp; ASSERT(!test_bit(XFS_BUI_RECOVERED, &buip->bui_flags)); @@ -421,7 +456,7 @@ xfs_bui_recover( if (buip->bui_format.bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) { set_bit(XFS_BUI_RECOVERED, &buip->bui_flags); xfs_bui_release(buip); - return -EFSCORRUPTED; + return -EIO; } /* @@ -433,19 +468,16 @@ xfs_bui_recover( XFS_FSB_TO_DADDR(mp, bmap->me_startblock)); inode_fsb = XFS_BB_TO_FSB(mp, XFS_FSB_TO_DADDR(mp, XFS_INO_TO_FSB(mp, bmap->me_owner))); - state = (bmap->me_flags & XFS_BMAP_EXTENT_UNWRITTEN) ? - XFS_EXT_UNWRITTEN : XFS_EXT_NORM; - whichfork = (bmap->me_flags & XFS_BMAP_EXTENT_ATTR_FORK) ? - XFS_ATTR_FORK : XFS_DATA_FORK; - bui_type = bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK; - switch (bui_type) { + switch (bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK) { case XFS_BMAP_MAP: case XFS_BMAP_UNMAP: + op_ok = true; break; default: - return -EFSCORRUPTED; + op_ok = false; + break; } - if (startblock_fsb == 0 || + if (!op_ok || startblock_fsb == 0 || bmap->me_len == 0 || inode_fsb == 0 || startblock_fsb >= mp->m_sb.sb_dblocks || @@ -458,40 +490,54 @@ xfs_bui_recover( */ set_bit(XFS_BUI_RECOVERED, &buip->bui_flags); xfs_bui_release(buip); - return -EFSCORRUPTED; + return -EIO; } - /* Grab the inode. */ - error = xfs_iget(mp, NULL, bmap->me_owner, 0, 0, &ip); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, + XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp); if (error) return error; + /* + * Recovery stashes all deferred ops during intent processing and + * finishes them on completion. Transfer current dfops state to this + * transaction and transfer the result back before we return. + */ + xfs_defer_move(tp, parent_tp); + budp = xfs_trans_get_bud(tp, buip); - error = xfs_qm_dqattach(ip); + /* Grab the inode. */ + error = xfs_iget(mp, tp, bmap->me_owner, 0, XFS_ILOCK_EXCL, &ip); if (error) - goto err_rele; + goto err_inode; if (VFS_I(ip)->i_nlink == 0) xfs_iflags_set(ip, XFS_IRECOVERY); - /* Allocate transaction and do the work. */ - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, - XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK), 0, 0, &tp); - if (error) - goto err_rele; - - budp = xfs_trans_get_bud(tp, buip); - xfs_ilock(ip, XFS_ILOCK_EXCL); + /* Process deferred bmap item. */ + state = (bmap->me_flags & XFS_BMAP_EXTENT_UNWRITTEN) ? + XFS_EXT_UNWRITTEN : XFS_EXT_NORM; + whichfork = (bmap->me_flags & XFS_BMAP_EXTENT_ATTR_FORK) ? + XFS_ATTR_FORK : XFS_DATA_FORK; + bui_type = bmap->me_flags & XFS_BMAP_EXTENT_TYPE_MASK; + switch (bui_type) { + case XFS_BMAP_MAP: + case XFS_BMAP_UNMAP: + type = bui_type; + break; + default: + error = -EFSCORRUPTED; + goto err_inode; + } xfs_trans_ijoin(tp, ip, 0); count = bmap->me_len; - error = xfs_trans_log_finish_bmap_update(tp, budp, bui_type, ip, - whichfork, bmap->me_startoff, bmap->me_startblock, - &count, state); + error = xfs_trans_log_finish_bmap_update(tp, budp, type, ip, whichfork, + bmap->me_startoff, bmap->me_startblock, &count, state); if (error) - goto err_cancel; + goto err_inode; if (count > 0) { - ASSERT(bui_type == XFS_BMAP_UNMAP); + ASSERT(type == XFS_BMAP_UNMAP); irec.br_startblock = bmap->me_startblock; irec.br_blockcount = count; irec.br_startoff = bmap->me_startoff; @@ -500,78 +546,19 @@ xfs_bui_recover( } set_bit(XFS_BUI_RECOVERED, &buip->bui_flags); - /* - * Commit transaction, which frees the transaction and saves the inode - * for later replay activities. - */ - error = xfs_defer_ops_capture_and_commit(tp, ip, capture_list); - if (error) - goto err_unlock; - + xfs_defer_move(parent_tp, tp); + error = xfs_trans_commit(tp); xfs_iunlock(ip, XFS_ILOCK_EXCL); xfs_irele(ip); - return 0; -err_cancel: - xfs_trans_cancel(tp); -err_unlock: - xfs_iunlock(ip, XFS_ILOCK_EXCL); -err_rele: - xfs_irele(ip); return error; -} -/* Relog an intent item to push the log tail forward. */ -static struct xfs_log_item * -xfs_bui_item_relog( - struct xfs_log_item *intent, - struct xfs_trans *tp) -{ - struct xfs_bud_log_item *budp; - struct xfs_bui_log_item *buip; - struct xfs_map_extent *extp; - unsigned int count; - - count = BUI_ITEM(intent)->bui_format.bui_nextents; - extp = BUI_ITEM(intent)->bui_format.bui_extents; - - tp->t_flags |= XFS_TRANS_DIRTY; - budp = xfs_trans_get_bud(tp, BUI_ITEM(intent)); - set_bit(XFS_LI_DIRTY, &budp->bud_item.li_flags); - - buip = xfs_bui_init(tp->t_mountp); - memcpy(buip->bui_format.bui_extents, extp, count * sizeof(*extp)); - atomic_set(&buip->bui_next_extent, count); - xfs_trans_add_item(tp, &buip->bui_item); - set_bit(XFS_LI_DIRTY, &buip->bui_item.li_flags); - return &buip->bui_item; -} - -static const struct xfs_item_ops xfs_bui_item_ops = { - .iop_size = xfs_bui_item_size, - .iop_format = xfs_bui_item_format, - .iop_unpin = xfs_bui_item_unpin, - .iop_release = xfs_bui_item_release, - .iop_relog = xfs_bui_item_relog, -}; - -/* - * Allocate and initialize an bui item with the given number of extents. - */ -struct xfs_bui_log_item * -xfs_bui_init( - struct xfs_mount *mp) - -{ - struct xfs_bui_log_item *buip; - - buip = kmem_zone_zalloc(xfs_bui_zone, 0); - - xfs_log_item_init(mp, &buip->bui_item, XFS_LI_BUI, &xfs_bui_item_ops); - buip->bui_format.bui_nextents = XFS_BUI_MAX_FAST_EXTENTS; - buip->bui_format.bui_id = (uintptr_t)(void *)buip; - atomic_set(&buip->bui_next_extent, 0); - atomic_set(&buip->bui_refcount, 2); - - return buip; +err_inode: + xfs_defer_move(parent_tp, tp); + xfs_trans_cancel(tp); + if (ip) { + xfs_iunlock(ip, XFS_ILOCK_EXCL); + xfs_irele(ip); + } + return error; }
diff --git a/fs/xfs/xfs_bmap_item.h b/fs/xfs/xfs_bmap_item.h index a95e99c..ad479cc 100644 --- a/fs/xfs/xfs_bmap_item.h +++ b/fs/xfs/xfs_bmap_item.h
@@ -77,7 +77,6 @@ extern struct kmem_zone *xfs_bud_zone; struct xfs_bui_log_item *xfs_bui_init(struct xfs_mount *); void xfs_bui_item_free(struct xfs_bui_log_item *); void xfs_bui_release(struct xfs_bui_log_item *); -int xfs_bui_recover(struct xfs_bui_log_item *buip, - struct list_head *capture_list); +int xfs_bui_recover(struct xfs_trans *parent_tp, struct xfs_bui_log_item *buip); #endif /* __XFS_BMAP_ITEM_H__ */
diff --git a/fs/xfs/xfs_bmap_util.c b/fs/xfs/xfs_bmap_util.c index 2462dab..d6d78e1 100644 --- a/fs/xfs/xfs_bmap_util.c +++ b/fs/xfs/xfs_bmap_util.c
@@ -1167,7 +1167,6 @@ xfs_prepare_shift( struct xfs_inode *ip, loff_t offset) { - struct xfs_mount *mp = ip->i_mount; int error; /* @@ -1181,17 +1180,6 @@ xfs_prepare_shift( } /* - * Shift operations must stabilize the start block offset boundary along - * with the full range of the operation. If we don't, a COW writeback - * completion could race with an insert, front merge with the start - * extent (after split) during the shift and corrupt the file. Start - * with the block just prior to the start to stabilize the boundary. - */ - offset = round_down(offset, 1 << mp->m_sb.sb_blocklog); - if (offset) - offset -= (1 << mp->m_sb.sb_blocklog); - - /* * Writeback and invalidate cache for the remainder of the file as we're * about to shift down every extent from offset to EOF. */ @@ -1237,6 +1225,7 @@ xfs_collapse_file_space( int error; xfs_fileoff_t next_fsb = XFS_B_TO_FSB(mp, offset + len); xfs_fileoff_t shift_fsb = XFS_B_TO_FSB(mp, len); + uint resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0); bool done = false; ASSERT(xfs_isilocked(ip, XFS_IOLOCK_EXCL)); @@ -1252,34 +1241,32 @@ xfs_collapse_file_space( if (error) return error; - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, 0, 0, 0, &tp); - if (error) - return error; + while (!error && !done) { + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, + &tp); + if (error) + break; - xfs_ilock(ip, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, ip, 0); + xfs_ilock(ip, XFS_ILOCK_EXCL); + error = xfs_trans_reserve_quota(tp, mp, ip->i_udquot, + ip->i_gdquot, ip->i_pdquot, resblks, 0, + XFS_QMOPT_RES_REGBLKS); + if (error) + goto out_trans_cancel; + xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); - while (!done) { error = xfs_bmap_collapse_extents(tp, ip, &next_fsb, shift_fsb, &done); if (error) goto out_trans_cancel; - if (done) - break; - /* finish any deferred frees and roll the transaction */ - error = xfs_defer_finish(&tp); - if (error) - goto out_trans_cancel; + error = xfs_trans_commit(tp); } - error = xfs_trans_commit(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; out_trans_cancel: xfs_trans_cancel(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; } @@ -1322,41 +1309,35 @@ xfs_insert_file_space( if (error) return error; - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, - XFS_DIOSTRAT_SPACE_RES(mp, 0), 0, 0, &tp); - if (error) - return error; - - xfs_ilock(ip, XFS_ILOCK_EXCL); - xfs_trans_ijoin(tp, ip, 0); - /* * The extent shifting code works on extent granularity. So, if stop_fsb * is not the starting block of extent, we need to split the extent at * stop_fsb. */ - error = xfs_bmap_split_extent(tp, ip, stop_fsb); + error = xfs_bmap_split_extent(ip, stop_fsb); if (error) - goto out_trans_cancel; + return error; - do { - error = xfs_defer_finish(&tp); + while (!error && !done) { + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, 0, 0, 0, + &tp); if (error) - goto out_trans_cancel; + break; + xfs_ilock(ip, XFS_ILOCK_EXCL); + xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL); error = xfs_bmap_insert_extents(tp, ip, &next_fsb, shift_fsb, &done, stop_fsb); if (error) goto out_trans_cancel; - } while (!done); - error = xfs_trans_commit(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); + error = xfs_trans_commit(tp); + } + return error; out_trans_cancel: xfs_trans_cancel(tp); - xfs_iunlock(ip, XFS_ILOCK_EXCL); return error; } @@ -1624,12 +1605,12 @@ xfs_swap_extent_forks( * event of a crash. Set the owner change log flags now and leave the * bmbt scan as the last step. */ - if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) { - if (ip->i_d.di_format == XFS_DINODE_FMT_BTREE) - (*target_log_flags) |= XFS_ILOG_DOWNER; - if (tip->i_d.di_format == XFS_DINODE_FMT_BTREE) - (*src_log_flags) |= XFS_ILOG_DOWNER; - } + if (ip->i_d.di_version == 3 && + ip->i_d.di_format == XFS_DINODE_FMT_BTREE) + (*target_log_flags) |= XFS_ILOG_DOWNER; + if (tip->i_d.di_version == 3 && + tip->i_d.di_format == XFS_DINODE_FMT_BTREE) + (*src_log_flags) |= XFS_ILOG_DOWNER; /* * Swap the data forks of the inodes @@ -1664,7 +1645,7 @@ xfs_swap_extent_forks( (*src_log_flags) |= XFS_ILOG_DEXT; break; case XFS_DINODE_FMT_BTREE: - ASSERT(!xfs_sb_version_has_v3inode(&ip->i_mount->m_sb) || + ASSERT(ip->i_d.di_version < 3 || (*src_log_flags & XFS_ILOG_DOWNER)); (*src_log_flags) |= XFS_ILOG_DBROOT; break; @@ -1676,7 +1657,7 @@ xfs_swap_extent_forks( break; case XFS_DINODE_FMT_BTREE: (*target_log_flags) |= XFS_ILOG_DBROOT; - ASSERT(!xfs_sb_version_has_v3inode(&ip->i_mount->m_sb) || + ASSERT(tip->i_d.di_version < 3 || (*target_log_flags & XFS_ILOG_DOWNER)); break; } @@ -1740,7 +1721,6 @@ xfs_swap_extents( int lock_flags; uint64_t f; int resblks = 0; - unsigned int flags = 0; /* * Lock the inodes against other IO, page faults and truncate to @@ -1796,16 +1776,17 @@ xfs_swap_extents( resblks += XFS_SWAP_RMAP_SPACE_RES(mp, tipnext, w); /* - * If either inode straddles a bmapbt block allocation boundary, - * the rmapbt algorithm triggers repeated allocs and frees as - * extents are remapped. This can exhaust the block reservation - * prematurely and cause shutdown. Return freed blocks to the - * transaction reservation to counter this behavior. + * Handle the corner case where either inode might straddle the + * btree format boundary. If so, the inode could bounce between + * btree <-> extent format on unmap -> remap cycles, freeing and + * allocating a bmapbt block each time. */ - flags |= XFS_TRANS_RES_FDBLKS; + if (ipnext == (XFS_IFORK_MAXEXT(ip, w) + 1)) + resblks += XFS_IFORK_MAXEXT(ip, w); + if (tipnext == (XFS_IFORK_MAXEXT(tip, w) + 1)) + resblks += XFS_IFORK_MAXEXT(tip, w); } - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, flags, - &tp); + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, &tp); if (error) goto out_unlock;
diff --git a/fs/xfs/xfs_buf.c b/fs/xfs/xfs_buf.c index 4f18457..1264ac6 100644 --- a/fs/xfs/xfs_buf.c +++ b/fs/xfs/xfs_buf.c
@@ -1547,28 +1547,6 @@ xfs_buf_zero( } /* - * Log a message about and stale a buffer that a caller has decided is corrupt. - * - * This function should be called for the kinds of metadata corruption that - * cannot be detect from a verifier, such as incorrect inter-block relationship - * data. Do /not/ call this function from a verifier function. - * - * The buffer must be XBF_DONE prior to the call. Afterwards, the buffer will - * be marked stale, but b_error will not be set. The caller is responsible for - * releasing the buffer or fixing it. - */ -void -__xfs_buf_mark_corrupt( - struct xfs_buf *bp, - xfs_failaddr_t fa) -{ - ASSERT(bp->b_flags & XBF_DONE); - - xfs_buf_corruption_error(bp, fa); - xfs_buf_stale(bp); -} - -/* * Handling of buffer targets (buftargs). */
diff --git a/fs/xfs/xfs_buf.h b/fs/xfs/xfs_buf.h index 621467a..f6ce17d 100644 --- a/fs/xfs/xfs_buf.h +++ b/fs/xfs/xfs_buf.h
@@ -270,8 +270,6 @@ static inline int xfs_buf_submit(struct xfs_buf *bp) } void xfs_buf_zero(struct xfs_buf *bp, size_t boff, size_t bsize); -void __xfs_buf_mark_corrupt(struct xfs_buf *bp, xfs_failaddr_t fa); -#define xfs_buf_mark_corrupt(bp) __xfs_buf_mark_corrupt((bp), __this_address) /* Buffer Utility Routines */ extern void *xfs_buf_offset(struct xfs_buf *, size_t);
diff --git a/fs/xfs/xfs_buf_item.c b/fs/xfs/xfs_buf_item.c index f98260e..d74fbd1 100644 --- a/fs/xfs/xfs_buf_item.c +++ b/fs/xfs/xfs_buf_item.c
@@ -328,7 +328,7 @@ xfs_buf_item_format( * occurs during recovery. */ if (bip->bli_flags & XFS_BLI_INODE_BUF) { - if (xfs_sb_version_has_v3inode(&lip->li_mountp->m_sb) || + if (xfs_sb_version_hascrc(&lip->li_mountp->m_sb) || !((bip->bli_flags & XFS_BLI_INODE_ALLOC_BUF) && xfs_log_item_in_current_chkpt(lip))) bip->__bli_format.blf_flags |= XFS_BLF_INODE_BUF; @@ -956,7 +956,7 @@ xfs_buf_item_relse( struct xfs_buf_log_item *bip = bp->b_log_item; trace_xfs_buf_item_relse(bp, _RET_IP_); - ASSERT(!test_bit(XFS_LI_IN_AIL, &bip->bli_item.li_flags)); + ASSERT(!(bip->bli_item.li_flags & XFS_LI_IN_AIL)); bp->b_log_item = NULL; if (list_empty(&bp->b_li_list))
diff --git a/fs/xfs/xfs_dquot.c b/fs/xfs/xfs_dquot.c index 672286f..3cbf248 100644 --- a/fs/xfs/xfs_dquot.c +++ b/fs/xfs/xfs_dquot.c
@@ -48,7 +48,7 @@ static struct lock_class_key xfs_dquot_project_class; */ void xfs_qm_dqdestroy( - struct xfs_dquot *dqp) + xfs_dquot_t *dqp) { ASSERT(list_empty(&dqp->q_lru)); @@ -113,8 +113,8 @@ xfs_qm_adjust_dqlimits( */ void xfs_qm_adjust_dqtimers( - struct xfs_mount *mp, - struct xfs_disk_dquot *d) + xfs_mount_t *mp, + xfs_disk_dquot_t *d) { ASSERT(d->d_id); @@ -205,18 +205,16 @@ xfs_qm_adjust_dqtimers( */ STATIC void xfs_qm_init_dquot_blk( - struct xfs_trans *tp, - struct xfs_mount *mp, - xfs_dqid_t id, - uint type, - struct xfs_buf *bp) + xfs_trans_t *tp, + xfs_mount_t *mp, + xfs_dqid_t id, + uint type, + xfs_buf_t *bp) { struct xfs_quotainfo *q = mp->m_quotainfo; - struct xfs_dqblk *d; - xfs_dqid_t curid; - unsigned int qflag; - unsigned int blftype; - int i; + xfs_dqblk_t *d; + xfs_dqid_t curid; + int i; ASSERT(tp); ASSERT(xfs_buf_islocked(bp)); @@ -240,39 +238,11 @@ xfs_qm_init_dquot_blk( } } - if (type & XFS_DQ_USER) { - qflag = XFS_UQUOTA_CHKD; - blftype = XFS_BLF_UDQUOT_BUF; - } else if (type & XFS_DQ_PROJ) { - qflag = XFS_PQUOTA_CHKD; - blftype = XFS_BLF_PDQUOT_BUF; - } else { - qflag = XFS_GQUOTA_CHKD; - blftype = XFS_BLF_GDQUOT_BUF; - } - - xfs_trans_dquot_buf(tp, bp, blftype); - - /* - * quotacheck uses delayed writes to update all the dquots on disk in an - * efficient manner instead of logging the individual dquot changes as - * they are made. However if we log the buffer allocated here and crash - * after quotacheck while the logged initialisation is still in the - * active region of the log, log recovery can replay the dquot buffer - * initialisation over the top of the checked dquots and corrupt quota - * accounting. - * - * To avoid this problem, quotacheck cannot log the initialised buffer. - * We must still dirty the buffer and write it back before the - * allocation transaction clears the log. Therefore, mark the buffer as - * ordered instead of logging it directly. This is safe for quotacheck - * because it detects and repairs allocated but initialized dquot blocks - * in the quota inodes. - */ - if (!(mp->m_qflags & qflag)) - xfs_trans_ordered_buf(tp, bp); - else - xfs_trans_log_buf(tp, bp, 0, BBTOB(q->qi_dqchunklen) - 1); + xfs_trans_dquot_buf(tp, bp, + (type & XFS_DQ_USER ? XFS_BLF_UDQUOT_BUF : + ((type & XFS_DQ_PROJ) ? XFS_BLF_PDQUOT_BUF : + XFS_BLF_GDQUOT_BUF))); + xfs_trans_log_buf(tp, bp, 0, BBTOB(q->qi_dqchunklen) - 1); } /* @@ -527,7 +497,7 @@ xfs_dquot_from_disk( struct xfs_disk_dquot *ddqp = bp->b_addr + dqp->q_bufoffset; /* copy everything from disk dquot to the incore dquot */ - memcpy(&dqp->q_core, ddqp, sizeof(struct xfs_disk_dquot)); + memcpy(&dqp->q_core, ddqp, sizeof(xfs_disk_dquot_t)); /* * Reservation counters are defined as reservation plus current usage @@ -859,11 +829,11 @@ xfs_qm_id_for_quotatype( { switch (type) { case XFS_DQ_USER: - return i_uid_read(VFS_I(ip)); + return ip->i_d.di_uid; case XFS_DQ_GROUP: - return i_gid_read(VFS_I(ip)); + return ip->i_d.di_gid; case XFS_DQ_PROJ: - return ip->i_d.di_projid; + return xfs_get_projid(ip); } ASSERT(0); return 0; @@ -1019,7 +989,7 @@ xfs_qm_dqput( */ void xfs_qm_dqrele( - struct xfs_dquot *dqp) + xfs_dquot_t *dqp) { if (!dqp) return; @@ -1048,8 +1018,8 @@ xfs_qm_dqflush_done( struct xfs_buf *bp, struct xfs_log_item *lip) { - struct xfs_dq_logitem *qip = (struct xfs_dq_logitem *)lip; - struct xfs_dquot *dqp = qip->qli_dquot; + xfs_dq_logitem_t *qip = (struct xfs_dq_logitem *)lip; + xfs_dquot_t *dqp = qip->qli_dquot; struct xfs_ail *ailp = lip->li_ailp; /* @@ -1135,8 +1105,8 @@ xfs_qm_dqflush( * Get the buffer containing the on-disk dquot */ error = xfs_trans_read_buf(mp, NULL, mp->m_ddev_targp, dqp->q_blkno, - mp->m_quotainfo->qi_dqchunklen, XBF_TRYLOCK, - &bp, &xfs_dquot_buf_ops); + mp->m_quotainfo->qi_dqchunklen, 0, &bp, + &xfs_dquot_buf_ops); if (error) goto out_unlock; @@ -1155,11 +1125,11 @@ xfs_qm_dqflush( xfs_buf_relse(bp); xfs_dqfunlock(dqp); xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); - return -EFSCORRUPTED; + return -EIO; } /* This is the only portion of data that needs to persist */ - memcpy(ddqp, &dqp->q_core, sizeof(struct xfs_disk_dquot)); + memcpy(ddqp, &dqp->q_core, sizeof(xfs_disk_dquot_t)); /* * Clear the dirty field and remember the flush lsn for later use. @@ -1206,7 +1176,7 @@ xfs_qm_dqflush( out_unlock: xfs_dqfunlock(dqp); - return error; + return -EIO; } /* @@ -1217,8 +1187,8 @@ xfs_qm_dqflush( */ void xfs_dqlock2( - struct xfs_dquot *d1, - struct xfs_dquot *d2) + xfs_dquot_t *d1, + xfs_dquot_t *d2) { if (d1 && d2) { ASSERT(d1 != d2);
diff --git a/fs/xfs/xfs_dquot.h b/fs/xfs/xfs_dquot.h index fe3e46d..4fe8570 100644 --- a/fs/xfs/xfs_dquot.h +++ b/fs/xfs/xfs_dquot.h
@@ -30,36 +30,33 @@ enum { /* * The incore dquot structure */ -struct xfs_dquot { - uint dq_flags; - struct list_head q_lru; - struct xfs_mount *q_mount; - uint q_nrefs; - xfs_daddr_t q_blkno; - int q_bufoffset; - xfs_fileoff_t q_fileoffset; +typedef struct xfs_dquot { + uint dq_flags; /* various flags (XFS_DQ_*) */ + struct list_head q_lru; /* global free list of dquots */ + struct xfs_mount*q_mount; /* filesystem this relates to */ + uint q_nrefs; /* # active refs from inodes */ + xfs_daddr_t q_blkno; /* blkno of dquot buffer */ + int q_bufoffset; /* off of dq in buffer (# dquots) */ + xfs_fileoff_t q_fileoffset; /* offset in quotas file */ - struct xfs_disk_dquot q_core; - struct xfs_dq_logitem q_logitem; - /* total regular nblks used+reserved */ - xfs_qcnt_t q_res_bcount; - /* total inos allocd+reserved */ - xfs_qcnt_t q_res_icount; - /* total realtime blks used+reserved */ - xfs_qcnt_t q_res_rtbcount; - xfs_qcnt_t q_prealloc_lo_wmark; - xfs_qcnt_t q_prealloc_hi_wmark; - int64_t q_low_space[XFS_QLOWSP_MAX]; - struct mutex q_qlock; - struct completion q_flush; - atomic_t q_pincount; - struct wait_queue_head q_pinwait; -}; + xfs_disk_dquot_t q_core; /* actual usage & quotas */ + xfs_dq_logitem_t q_logitem; /* dquot log item */ + xfs_qcnt_t q_res_bcount; /* total regular nblks used+reserved */ + xfs_qcnt_t q_res_icount; /* total inos allocd+reserved */ + xfs_qcnt_t q_res_rtbcount;/* total realtime blks used+reserved */ + xfs_qcnt_t q_prealloc_lo_wmark;/* prealloc throttle wmark */ + xfs_qcnt_t q_prealloc_hi_wmark;/* prealloc disabled wmark */ + int64_t q_low_space[XFS_QLOWSP_MAX]; + struct mutex q_qlock; /* quota lock */ + struct completion q_flush; /* flush completion queue */ + atomic_t q_pincount; /* dquot pin count */ + wait_queue_head_t q_pinwait; /* dquot pinning wait queue */ +} xfs_dquot_t; /* * Lock hierarchy for q_qlock: * XFS_QLOCK_NORMAL is the implicit default, - * XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 + * XFS_QLOCK_NESTED is the dquot with the higher id in xfs_dqlock2 */ enum { XFS_QLOCK_NORMAL = 0, @@ -67,21 +64,21 @@ enum { }; /* - * Manage the q_flush completion queue embedded in the dquot. This completion + * Manage the q_flush completion queue embedded in the dquot. This completion * queue synchronizes processes attempting to flush the in-core dquot back to * disk. */ -static inline void xfs_dqflock(struct xfs_dquot *dqp) +static inline void xfs_dqflock(xfs_dquot_t *dqp) { wait_for_completion(&dqp->q_flush); } -static inline bool xfs_dqflock_nowait(struct xfs_dquot *dqp) +static inline bool xfs_dqflock_nowait(xfs_dquot_t *dqp) { return try_wait_for_completion(&dqp->q_flush); } -static inline void xfs_dqfunlock(struct xfs_dquot *dqp) +static inline void xfs_dqfunlock(xfs_dquot_t *dqp) { complete(&dqp->q_flush); } @@ -115,7 +112,7 @@ static inline int xfs_this_quota_on(struct xfs_mount *mp, int type) } } -static inline struct xfs_dquot *xfs_inode_dquot(struct xfs_inode *ip, int type) +static inline xfs_dquot_t *xfs_inode_dquot(struct xfs_inode *ip, int type) { switch (type & XFS_DQ_ALLTYPES) { case XFS_DQ_USER: @@ -150,30 +147,31 @@ static inline bool xfs_dquot_lowsp(struct xfs_dquot *dqp) #define XFS_QM_ISPDQ(dqp) ((dqp)->dq_flags & XFS_DQ_PROJ) #define XFS_QM_ISGDQ(dqp) ((dqp)->dq_flags & XFS_DQ_GROUP) -void xfs_qm_dqdestroy(struct xfs_dquot *dqp); -int xfs_qm_dqflush(struct xfs_dquot *dqp, struct xfs_buf **bpp); -void xfs_qm_dqunpin_wait(struct xfs_dquot *dqp); -void xfs_qm_adjust_dqtimers(struct xfs_mount *mp, - struct xfs_disk_dquot *d); -void xfs_qm_adjust_dqlimits(struct xfs_mount *mp, - struct xfs_dquot *d); -xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, uint type); -int xfs_qm_dqget(struct xfs_mount *mp, xfs_dqid_t id, +extern void xfs_qm_dqdestroy(xfs_dquot_t *); +extern int xfs_qm_dqflush(struct xfs_dquot *, struct xfs_buf **); +extern void xfs_qm_dqunpin_wait(xfs_dquot_t *); +extern void xfs_qm_adjust_dqtimers(xfs_mount_t *, + xfs_disk_dquot_t *); +extern void xfs_qm_adjust_dqlimits(struct xfs_mount *, + struct xfs_dquot *); +extern xfs_dqid_t xfs_qm_id_for_quotatype(struct xfs_inode *ip, + uint type); +extern int xfs_qm_dqget(struct xfs_mount *mp, xfs_dqid_t id, uint type, bool can_alloc, struct xfs_dquot **dqpp); -int xfs_qm_dqget_inode(struct xfs_inode *ip, uint type, - bool can_alloc, - struct xfs_dquot **dqpp); -int xfs_qm_dqget_next(struct xfs_mount *mp, xfs_dqid_t id, +extern int xfs_qm_dqget_inode(struct xfs_inode *ip, uint type, + bool can_alloc, + struct xfs_dquot **dqpp); +extern int xfs_qm_dqget_next(struct xfs_mount *mp, xfs_dqid_t id, uint type, struct xfs_dquot **dqpp); -int xfs_qm_dqget_uncached(struct xfs_mount *mp, - xfs_dqid_t id, uint type, - struct xfs_dquot **dqpp); -void xfs_qm_dqput(struct xfs_dquot *dqp); +extern int xfs_qm_dqget_uncached(struct xfs_mount *mp, + xfs_dqid_t id, uint type, + struct xfs_dquot **dqpp); +extern void xfs_qm_dqput(xfs_dquot_t *); -void xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *); +extern void xfs_dqlock2(struct xfs_dquot *, struct xfs_dquot *); -void xfs_dquot_set_prealloc_limits(struct xfs_dquot *); +extern void xfs_dquot_set_prealloc_limits(struct xfs_dquot *); static inline struct xfs_dquot *xfs_qm_dqhold(struct xfs_dquot *dqp) {
diff --git a/fs/xfs/xfs_dquot_item.c b/fs/xfs/xfs_dquot_item.c index baad174..d60647d 100644 --- a/fs/xfs/xfs_dquot_item.c +++ b/fs/xfs/xfs_dquot_item.c
@@ -189,8 +189,7 @@ xfs_qm_dquot_logitem_push( if (!xfs_buf_delwri_queue(bp, buffer_list)) rval = XFS_ITEM_FLUSHING; xfs_buf_relse(bp); - } else if (error == -EAGAIN) - rval = XFS_ITEM_LOCKED; + } spin_lock(&lip->li_ailp->ail_lock); out_unlock: @@ -308,62 +307,36 @@ xfs_qm_qoffend_logitem_committed( { struct xfs_qoff_logitem *qfe = QOFF_ITEM(lip); struct xfs_qoff_logitem *qfs = qfe->qql_start_lip; + struct xfs_ail *ailp = qfs->qql_item.li_ailp; - xfs_qm_qoff_logitem_relse(qfs); + /* + * Delete the qoff-start logitem from the AIL. + * xfs_trans_ail_delete() drops the AIL lock. + */ + spin_lock(&ailp->ail_lock); + xfs_trans_ail_delete(ailp, &qfs->qql_item, SHUTDOWN_LOG_IO_ERROR); + kmem_free(qfs->qql_item.li_lv_shadow); kmem_free(lip->li_lv_shadow); + kmem_free(qfs); kmem_free(qfe); return (xfs_lsn_t)-1; } -STATIC void -xfs_qm_qoff_logitem_release( - struct xfs_log_item *lip) -{ - struct xfs_qoff_logitem *qoff = QOFF_ITEM(lip); - - if (test_bit(XFS_LI_ABORTED, &lip->li_flags)) { - if (qoff->qql_start_lip) - xfs_qm_qoff_logitem_relse(qoff->qql_start_lip); - xfs_qm_qoff_logitem_relse(qoff); - } -} - static const struct xfs_item_ops xfs_qm_qoffend_logitem_ops = { .iop_size = xfs_qm_qoff_logitem_size, .iop_format = xfs_qm_qoff_logitem_format, .iop_committed = xfs_qm_qoffend_logitem_committed, .iop_push = xfs_qm_qoff_logitem_push, - .iop_release = xfs_qm_qoff_logitem_release, }; static const struct xfs_item_ops xfs_qm_qoff_logitem_ops = { .iop_size = xfs_qm_qoff_logitem_size, .iop_format = xfs_qm_qoff_logitem_format, .iop_push = xfs_qm_qoff_logitem_push, - .iop_release = xfs_qm_qoff_logitem_release, }; /* - * Delete the quotaoff intent from the AIL and free it. On success, - * this should only be called for the start item. It can be used for - * either on shutdown or abort. - */ -void -xfs_qm_qoff_logitem_relse( - struct xfs_qoff_logitem *qoff) -{ - struct xfs_log_item *lip = &qoff->qql_item; - - ASSERT(test_bit(XFS_LI_IN_AIL, &lip->li_flags) || - test_bit(XFS_LI_ABORTED, &lip->li_flags) || - XFS_FORCED_SHUTDOWN(lip->li_mountp)); - xfs_trans_ail_remove(lip, SHUTDOWN_LOG_IO_ERROR); - kmem_free(lip->li_lv_shadow); - kmem_free(qoff); -} - -/* * Allocate and initialize an quotaoff item of the correct quota type(s). */ struct xfs_qoff_logitem *
diff --git a/fs/xfs/xfs_dquot_item.h b/fs/xfs/xfs_dquot_item.h index 2b86a43..1aed34c 100644 --- a/fs/xfs/xfs_dquot_item.h +++ b/fs/xfs/xfs_dquot_item.h
@@ -11,28 +11,25 @@ struct xfs_trans; struct xfs_mount; struct xfs_qoff_logitem; -struct xfs_dq_logitem { - struct xfs_log_item qli_item; /* common portion */ - struct xfs_dquot *qli_dquot; /* dquot ptr */ - xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ -}; +typedef struct xfs_dq_logitem { + struct xfs_log_item qli_item; /* common portion */ + struct xfs_dquot *qli_dquot; /* dquot ptr */ + xfs_lsn_t qli_flush_lsn; /* lsn at last flush */ +} xfs_dq_logitem_t; -struct xfs_qoff_logitem { - struct xfs_log_item qql_item; /* common portion */ - struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ +typedef struct xfs_qoff_logitem { + struct xfs_log_item qql_item; /* common portion */ + struct xfs_qoff_logitem *qql_start_lip; /* qoff-start logitem, if any */ unsigned int qql_flags; -}; +} xfs_qoff_logitem_t; -void xfs_qm_dquot_logitem_init(struct xfs_dquot *dqp); -struct xfs_qoff_logitem *xfs_qm_qoff_logitem_init(struct xfs_mount *mp, - struct xfs_qoff_logitem *start, - uint flags); -void xfs_qm_qoff_logitem_relse(struct xfs_qoff_logitem *); -struct xfs_qoff_logitem *xfs_trans_get_qoff_item(struct xfs_trans *tp, - struct xfs_qoff_logitem *startqoff, - uint flags); -void xfs_trans_log_quotaoff_item(struct xfs_trans *tp, - struct xfs_qoff_logitem *qlp); +extern void xfs_qm_dquot_logitem_init(struct xfs_dquot *); +extern xfs_qoff_logitem_t *xfs_qm_qoff_logitem_init(struct xfs_mount *, + struct xfs_qoff_logitem *, uint); +extern xfs_qoff_logitem_t *xfs_trans_get_qoff_item(struct xfs_trans *, + struct xfs_qoff_logitem *, uint); +extern void xfs_trans_log_quotaoff_item(struct xfs_trans *, + struct xfs_qoff_logitem *); #endif /* __XFS_DQUOT_ITEM_H__ */
diff --git a/fs/xfs/xfs_error.c b/fs/xfs/xfs_error.c index 182b704..849fd44 100644 --- a/fs/xfs/xfs_error.c +++ b/fs/xfs/xfs_error.c
@@ -329,43 +329,19 @@ xfs_corruption_error( const char *tag, int level, struct xfs_mount *mp, - const void *buf, + void *buf, size_t bufsize, const char *filename, int linenum, xfs_failaddr_t failaddr) { - if (buf && level <= xfs_error_level) + if (level <= xfs_error_level) xfs_hex_dump(buf, bufsize); xfs_error_report(tag, level, mp, filename, linenum, failaddr); xfs_alert(mp, "Corruption detected. Unmount and run xfs_repair"); } /* - * Complain about the kinds of metadata corruption that we can't detect from a - * verifier, such as incorrect inter-block relationship data. Does not set - * bp->b_error. - * - * Call xfs_buf_mark_corrupt, not this function. - */ -void -xfs_buf_corruption_error( - struct xfs_buf *bp, - xfs_failaddr_t fa) -{ - struct xfs_mount *mp = bp->b_mount; - - xfs_alert_tag(mp, XFS_PTAG_VERIFIER_ERROR, - "Metadata corruption detected at %pS, %s block 0x%llx", - fa, bp->b_ops->name, bp->b_bn); - - xfs_alert(mp, "Unmount and run xfs_repair"); - - if (xfs_error_level >= XFS_ERRLEVEL_HIGH) - xfs_stack_trace(); -} - -/* * Warnings specifically for verifier errors. Differentiate CRC vs. invalid * values, and omit the stack trace unless the error level is tuned high. */ @@ -374,7 +350,7 @@ xfs_buf_verifier_error( struct xfs_buf *bp, int error, const char *name, - const void *buf, + void *buf, size_t bufsz, xfs_failaddr_t failaddr) { @@ -426,7 +402,7 @@ xfs_inode_verifier_error( struct xfs_inode *ip, int error, const char *name, - const void *buf, + void *buf, size_t bufsz, xfs_failaddr_t failaddr) {
diff --git a/fs/xfs/xfs_error.h b/fs/xfs/xfs_error.h index c6bb7d7..602aa7d 100644 --- a/fs/xfs/xfs_error.h +++ b/fs/xfs/xfs_error.h
@@ -12,17 +12,16 @@ extern void xfs_error_report(const char *tag, int level, struct xfs_mount *mp, const char *filename, int linenum, xfs_failaddr_t failaddr); extern void xfs_corruption_error(const char *tag, int level, - struct xfs_mount *mp, const void *buf, size_t bufsize, + struct xfs_mount *mp, void *buf, size_t bufsize, const char *filename, int linenum, xfs_failaddr_t failaddr); -void xfs_buf_corruption_error(struct xfs_buf *bp, xfs_failaddr_t fa); extern void xfs_buf_verifier_error(struct xfs_buf *bp, int error, - const char *name, const void *buf, size_t bufsz, + const char *name, void *buf, size_t bufsz, xfs_failaddr_t failaddr); extern void xfs_verifier_error(struct xfs_buf *bp, int error, xfs_failaddr_t failaddr); extern void xfs_inode_verifier_error(struct xfs_inode *ip, int error, - const char *name, const void *buf, size_t bufsz, + const char *name, void *buf, size_t bufsz, xfs_failaddr_t failaddr); #define XFS_ERROR_REPORT(e, lvl, mp) \
diff --git a/fs/xfs/xfs_export.c b/fs/xfs/xfs_export.c index 5a4b011..f1372f9 100644 --- a/fs/xfs/xfs_export.c +++ b/fs/xfs/xfs_export.c
@@ -15,6 +15,7 @@ #include "xfs_trans.h" #include "xfs_inode_item.h" #include "xfs_icache.h" +#include "xfs_log.h" #include "xfs_pnfs.h" /* @@ -220,7 +221,18 @@ STATIC int xfs_fs_nfs_commit_metadata( struct inode *inode) { - return xfs_log_force_inode(XFS_I(inode)); + struct xfs_inode *ip = XFS_I(inode); + struct xfs_mount *mp = ip->i_mount; + xfs_lsn_t lsn = 0; + + xfs_ilock(ip, XFS_ILOCK_SHARED); + if (xfs_ipincount(ip)) + lsn = ip->i_itemp->ili_last_lsn; + xfs_iunlock(ip, XFS_ILOCK_SHARED); + + if (!lsn) + return 0; + return xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL); } const struct export_operations xfs_export_operations = {
diff --git a/fs/xfs/xfs_extent_busy.c b/fs/xfs/xfs_extent_busy.c index ef17c1f..2183d87 100644 --- a/fs/xfs/xfs_extent_busy.c +++ b/fs/xfs/xfs_extent_busy.c
@@ -344,6 +344,7 @@ xfs_extent_busy_trim( ASSERT(*len > 0); spin_lock(&args->pag->pagb_lock); +restart: fbno = *bno; flen = *len; rbp = args->pag->pagb_tree.rb_node; @@ -362,6 +363,19 @@ xfs_extent_busy_trim( continue; } + /* + * If this is a metadata allocation, try to reuse the busy + * extent instead of trimming the allocation. + */ + if (!xfs_alloc_is_userdata(args->datatype) && + !(busyp->flags & XFS_EXTENT_BUSY_DISCARDED)) { + if (!xfs_extent_busy_update_extent(args->mp, args->pag, + busyp, fbno, flen, + false)) + goto restart; + continue; + } + if (bbno <= fbno) { /* start overlap */
diff --git a/fs/xfs/xfs_extfree_item.c b/fs/xfs/xfs_extfree_item.c index de3cdce..e44efc4 100644 --- a/fs/xfs/xfs_extfree_item.c +++ b/fs/xfs/xfs_extfree_item.c
@@ -21,7 +21,7 @@ #include "xfs_alloc.h" #include "xfs_bmap.h" #include "xfs_trace.h" -#include "xfs_error.h" + kmem_zone_t *xfs_efi_zone; kmem_zone_t *xfs_efd_zone; @@ -139,6 +139,44 @@ xfs_efi_item_release( xfs_efi_release(EFI_ITEM(lip)); } +static const struct xfs_item_ops xfs_efi_item_ops = { + .iop_size = xfs_efi_item_size, + .iop_format = xfs_efi_item_format, + .iop_unpin = xfs_efi_item_unpin, + .iop_release = xfs_efi_item_release, +}; + + +/* + * Allocate and initialize an efi item with the given number of extents. + */ +struct xfs_efi_log_item * +xfs_efi_init( + struct xfs_mount *mp, + uint nextents) + +{ + struct xfs_efi_log_item *efip; + uint size; + + ASSERT(nextents > 0); + if (nextents > XFS_EFI_MAX_FAST_EXTENTS) { + size = (uint)(sizeof(xfs_efi_log_item_t) + + ((nextents - 1) * sizeof(xfs_extent_t))); + efip = kmem_zalloc(size, 0); + } else { + efip = kmem_zone_zalloc(xfs_efi_zone, 0); + } + + xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops); + efip->efi_format.efi_nextents = nextents; + efip->efi_format.efi_id = (uintptr_t)(void *)efip; + atomic_set(&efip->efi_next_extent, 0); + atomic_set(&efip->efi_refcount, 2); + + return efip; +} + /* * Copy an EFI format buffer from the given buf, and into the destination * EFI format structure. @@ -190,7 +228,6 @@ xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt) } return 0; } - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); return -EFSCORRUPTED; } @@ -374,16 +411,41 @@ xfs_extent_free_diff_items( XFS_FSB_TO_AGNO(mp, rb->xefi_startblock); } +/* Get an EFI. */ +STATIC void * +xfs_extent_free_create_intent( + struct xfs_trans *tp, + unsigned int count) +{ + struct xfs_efi_log_item *efip; + + ASSERT(tp != NULL); + ASSERT(count > 0); + + efip = xfs_efi_init(tp->t_mountp, count); + ASSERT(efip != NULL); + + /* + * Get a log_item_desc to point at the new item. + */ + xfs_trans_add_item(tp, &efip->efi_item); + return efip; +} + /* Log a free extent to the intent item. */ STATIC void xfs_extent_free_log_item( struct xfs_trans *tp, - struct xfs_efi_log_item *efip, - struct xfs_extent_free_item *free) + void *intent, + struct list_head *item) { + struct xfs_efi_log_item *efip = intent; + struct xfs_extent_free_item *free; uint next_extent; struct xfs_extent *extp; + free = container_of(item, struct xfs_extent_free_item, xefi_list); + tp->t_flags |= XFS_TRANS_DIRTY; set_bit(XFS_LI_DIRTY, &efip->efi_item.li_flags); @@ -399,35 +461,14 @@ xfs_extent_free_log_item( extp->ext_len = free->xefi_blockcount; } -static struct xfs_log_item * -xfs_extent_free_create_intent( - struct xfs_trans *tp, - struct list_head *items, - unsigned int count, - bool sort) -{ - struct xfs_mount *mp = tp->t_mountp; - struct xfs_efi_log_item *efip = xfs_efi_init(mp, count); - struct xfs_extent_free_item *free; - - ASSERT(count > 0); - - xfs_trans_add_item(tp, &efip->efi_item); - if (sort) - list_sort(mp, items, xfs_extent_free_diff_items); - list_for_each_entry(free, items, xefi_list) - xfs_extent_free_log_item(tp, efip, free); - return &efip->efi_item; -} - /* Get an EFD so we can process all the free extents. */ STATIC void * xfs_extent_free_create_done( struct xfs_trans *tp, - struct xfs_log_item *intent, + void *intent, unsigned int count) { - return xfs_trans_get_efd(tp, EFI_ITEM(intent), count); + return xfs_trans_get_efd(tp, intent, count); } /* Process a free extent. */ @@ -453,9 +494,9 @@ xfs_extent_free_finish_item( /* Abort all pending EFIs. */ STATIC void xfs_extent_free_abort_intent( - struct xfs_log_item *intent) + void *intent) { - xfs_efi_release(EFI_ITEM(intent)); + xfs_efi_release(intent); } /* Cancel a free extent. */ @@ -471,8 +512,10 @@ xfs_extent_free_cancel_item( const struct xfs_defer_op_type xfs_extent_free_defer_type = { .max_items = XFS_EFI_MAX_FAST_EXTENTS, + .diff_items = xfs_extent_free_diff_items, .create_intent = xfs_extent_free_create_intent, .abort_intent = xfs_extent_free_abort_intent, + .log_item = xfs_extent_free_log_item, .create_done = xfs_extent_free_create_done, .finish_item = xfs_extent_free_finish_item, .cancel_item = xfs_extent_free_cancel_item, @@ -535,8 +578,10 @@ xfs_agfl_free_finish_item( /* sub-type with special handling for AGFL deferred frees */ const struct xfs_defer_op_type xfs_agfl_free_defer_type = { .max_items = XFS_EFI_MAX_FAST_EXTENTS, + .diff_items = xfs_extent_free_diff_items, .create_intent = xfs_extent_free_create_intent, .abort_intent = xfs_extent_free_abort_intent, + .log_item = xfs_extent_free_log_item, .create_done = xfs_extent_free_create_done, .finish_item = xfs_agfl_free_finish_item, .cancel_item = xfs_extent_free_cancel_item, @@ -548,10 +593,9 @@ const struct xfs_defer_op_type xfs_agfl_free_defer_type = { */ int xfs_efi_recover( - struct xfs_efi_log_item *efip, - struct list_head *capture_list) + struct xfs_mount *mp, + struct xfs_efi_log_item *efip) { - struct xfs_mount *mp = efip->efi_item.li_mountp; struct xfs_efd_log_item *efdp; struct xfs_trans *tp; int i; @@ -580,7 +624,7 @@ xfs_efi_recover( */ set_bit(XFS_EFI_RECOVERED, &efip->efi_flags); xfs_efi_release(efip); - return -EFSCORRUPTED; + return -EIO; } } @@ -600,76 +644,10 @@ xfs_efi_recover( } set_bit(XFS_EFI_RECOVERED, &efip->efi_flags); - - return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list); + error = xfs_trans_commit(tp); + return error; abort_error: xfs_trans_cancel(tp); return error; } - -/* Relog an intent item to push the log tail forward. */ -static struct xfs_log_item * -xfs_efi_item_relog( - struct xfs_log_item *intent, - struct xfs_trans *tp) -{ - struct xfs_efd_log_item *efdp; - struct xfs_efi_log_item *efip; - struct xfs_extent *extp; - unsigned int count; - - count = EFI_ITEM(intent)->efi_format.efi_nextents; - extp = EFI_ITEM(intent)->efi_format.efi_extents; - - tp->t_flags |= XFS_TRANS_DIRTY; - efdp = xfs_trans_get_efd(tp, EFI_ITEM(intent), count); - efdp->efd_next_extent = count; - memcpy(efdp->efd_format.efd_extents, extp, count * sizeof(*extp)); - set_bit(XFS_LI_DIRTY, &efdp->efd_item.li_flags); - - efip = xfs_efi_init(tp->t_mountp, count); - memcpy(efip->efi_format.efi_extents, extp, count * sizeof(*extp)); - atomic_set(&efip->efi_next_extent, count); - xfs_trans_add_item(tp, &efip->efi_item); - set_bit(XFS_LI_DIRTY, &efip->efi_item.li_flags); - return &efip->efi_item; -} - -static const struct xfs_item_ops xfs_efi_item_ops = { - .iop_size = xfs_efi_item_size, - .iop_format = xfs_efi_item_format, - .iop_unpin = xfs_efi_item_unpin, - .iop_release = xfs_efi_item_release, - .iop_relog = xfs_efi_item_relog, -}; - -/* - * Allocate and initialize an efi item with the given number of extents. - */ -struct xfs_efi_log_item * -xfs_efi_init( - struct xfs_mount *mp, - uint nextents) - -{ - struct xfs_efi_log_item *efip; - uint size; - - ASSERT(nextents > 0); - if (nextents > XFS_EFI_MAX_FAST_EXTENTS) { - size = (uint)(sizeof(struct xfs_efi_log_item) + - ((nextents - 1) * sizeof(xfs_extent_t))); - efip = kmem_zalloc(size, 0); - } else { - efip = kmem_zone_zalloc(xfs_efi_zone, 0); - } - - xfs_log_item_init(mp, &efip->efi_item, XFS_LI_EFI, &xfs_efi_item_ops); - efip->efi_format.efi_nextents = nextents; - efip->efi_format.efi_id = (uintptr_t)(void *)efip; - atomic_set(&efip->efi_next_extent, 0); - atomic_set(&efip->efi_refcount, 2); - - return efip; -}
diff --git a/fs/xfs/xfs_extfree_item.h b/fs/xfs/xfs_extfree_item.h index 883f0f1..16aaab0 100644 --- a/fs/xfs/xfs_extfree_item.h +++ b/fs/xfs/xfs_extfree_item.h
@@ -50,25 +50,25 @@ struct kmem_zone; * of commit failure or log I/O errors. Note that the EFD is not inserted in the * AIL, so at this point both the EFI and EFD are freed. */ -struct xfs_efi_log_item { +typedef struct xfs_efi_log_item { struct xfs_log_item efi_item; atomic_t efi_refcount; atomic_t efi_next_extent; unsigned long efi_flags; /* misc flags */ xfs_efi_log_format_t efi_format; -}; +} xfs_efi_log_item_t; /* * This is the "extent free done" log item. It is used to log * the fact that some extents earlier mentioned in an efi item * have been freed. */ -struct xfs_efd_log_item { +typedef struct xfs_efd_log_item { struct xfs_log_item efd_item; - struct xfs_efi_log_item *efd_efip; + xfs_efi_log_item_t *efd_efip; uint efd_next_extent; xfs_efd_log_format_t efd_format; -}; +} xfs_efd_log_item_t; /* * Max number of extents in fast allocation path. @@ -78,13 +78,13 @@ struct xfs_efd_log_item { extern struct kmem_zone *xfs_efi_zone; extern struct kmem_zone *xfs_efd_zone; -struct xfs_efi_log_item *xfs_efi_init(struct xfs_mount *, uint); +xfs_efi_log_item_t *xfs_efi_init(struct xfs_mount *, uint); int xfs_efi_copy_format(xfs_log_iovec_t *buf, xfs_efi_log_format_t *dst_efi_fmt); -void xfs_efi_item_free(struct xfs_efi_log_item *); +void xfs_efi_item_free(xfs_efi_log_item_t *); void xfs_efi_release(struct xfs_efi_log_item *); -int xfs_efi_recover(struct xfs_efi_log_item *efip, - struct list_head *capture_list); +int xfs_efi_recover(struct xfs_mount *mp, + struct xfs_efi_log_item *efip); #endif /* __XFS_EXTFREE_ITEM_H__ */
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c index b651715..203065a 100644 --- a/fs/xfs/xfs_file.c +++ b/fs/xfs/xfs_file.c
@@ -80,9 +80,19 @@ xfs_dir_fsync( int datasync) { struct xfs_inode *ip = XFS_I(file->f_mapping->host); + struct xfs_mount *mp = ip->i_mount; + xfs_lsn_t lsn = 0; trace_xfs_dir_fsync(ip); - return xfs_log_force_inode(ip); + + xfs_ilock(ip, XFS_ILOCK_SHARED); + if (xfs_ipincount(ip)) + lsn = ip->i_itemp->ili_last_lsn; + xfs_iunlock(ip, XFS_ILOCK_SHARED); + + if (!lsn) + return 0; + return xfs_log_force_lsn(mp, lsn, XFS_LOG_SYNC, NULL); } STATIC int @@ -177,12 +187,7 @@ xfs_file_dio_aio_read( file_accessed(iocb->ki_filp); - if (iocb->ki_flags & IOCB_NOWAIT) { - if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED)) - return -EAGAIN; - } else { - xfs_ilock(ip, XFS_IOLOCK_SHARED); - } + xfs_ilock(ip, XFS_IOLOCK_SHARED); ret = iomap_dio_rw(iocb, to, &xfs_iomap_ops, NULL); xfs_iunlock(ip, XFS_IOLOCK_SHARED); @@ -990,21 +995,6 @@ xfs_file_fadvise( return ret; } -/* Does this file, inode, or mount want synchronous writes? */ -static inline bool xfs_file_sync_writes(struct file *filp) -{ - struct xfs_inode *ip = XFS_I(file_inode(filp)); - - if (ip->i_mount->m_flags & XFS_MOUNT_WSYNC) - return true; - if (filp->f_flags & (__O_SYNC | O_DSYNC)) - return true; - if (IS_SYNC(file_inode(filp))) - return true; - - return false; -} - STATIC loff_t xfs_file_remap_range( struct file *file_in, @@ -1059,11 +1049,7 @@ xfs_file_remap_range( ret = xfs_reflink_update_dest(dest, pos_out + len, cowextsize, remap_flags); - if (ret) - goto out_unlock; - if (xfs_file_sync_writes(file_in) || xfs_file_sync_writes(file_out)) - xfs_log_force_inode(dest); out_unlock: xfs_reflink_remap_unlock(file_in, file_out); if (ret) @@ -1267,23 +1253,10 @@ xfs_filemap_pfn_mkwrite( return __xfs_filemap_fault(vmf, PE_SIZE_PTE, true); } -static void -xfs_filemap_map_pages( - struct vm_fault *vmf, - pgoff_t start_pgoff, - pgoff_t end_pgoff) -{ - struct inode *inode = file_inode(vmf->vma->vm_file); - - xfs_ilock(XFS_I(inode), XFS_MMAPLOCK_SHARED); - filemap_map_pages(vmf, start_pgoff, end_pgoff); - xfs_iunlock(XFS_I(inode), XFS_MMAPLOCK_SHARED); -} - static const struct vm_operations_struct xfs_file_vm_ops = { .fault = xfs_filemap_fault, .huge_fault = xfs_filemap_huge_fault, - .map_pages = xfs_filemap_map_pages, + .map_pages = filemap_map_pages, .page_mkwrite = xfs_filemap_page_mkwrite, .pfn_mkwrite = xfs_filemap_pfn_mkwrite, };
diff --git a/fs/xfs/xfs_fsmap.c b/fs/xfs/xfs_fsmap.c index 79e8af8..01c0933 100644 --- a/fs/xfs/xfs_fsmap.c +++ b/fs/xfs/xfs_fsmap.c
@@ -146,7 +146,6 @@ xfs_fsmap_owner_from_rmap( dest->fmr_owner = XFS_FMR_OWN_FREE; break; default: - ASSERT(0); return -EFSCORRUPTED; } return 0;
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c index f145164..a1135b8 100644 --- a/fs/xfs/xfs_icache.c +++ b/fs/xfs/xfs_icache.c
@@ -289,8 +289,6 @@ xfs_reinit_inode( uint64_t version = inode_peek_iversion(inode); umode_t mode = inode->i_mode; dev_t dev = inode->i_rdev; - kuid_t uid = inode->i_uid; - kgid_t gid = inode->i_gid; error = inode_init_always(mp->m_super, inode); @@ -299,8 +297,6 @@ xfs_reinit_inode( inode_set_iversion_queried(inode, version); inode->i_mode = mode; inode->i_rdev = dev; - inode->i_uid = uid; - inode->i_gid = gid; return error; } @@ -1434,7 +1430,7 @@ xfs_inode_match_id( return 0; if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) && - ip->i_d.di_projid != eofb->eof_prid) + xfs_get_projid(ip) != eofb->eof_prid) return 0; return 1; @@ -1458,7 +1454,7 @@ xfs_inode_match_id_union( return 1; if ((eofb->eof_flags & XFS_EOF_FLAGS_PRID) && - ip->i_d.di_projid == eofb->eof_prid) + xfs_get_projid(ip) == eofb->eof_prid) return 1; return 0;
diff --git a/fs/xfs/xfs_icreate_item.c b/fs/xfs/xfs_icreate_item.c index 7d940b2..3ebd1b7 100644 --- a/fs/xfs/xfs_icreate_item.c +++ b/fs/xfs/xfs_icreate_item.c
@@ -10,7 +10,6 @@ #include "xfs_trans.h" #include "xfs_trans_priv.h" #include "xfs_icreate_item.h" -#include "xfs_log_priv.h" #include "xfs_log.h" kmem_zone_t *xfs_icreate_zone; /* inode create item zone */
diff --git a/fs/xfs/xfs_inode.c b/fs/xfs/xfs_inode.c index 568a933..7a9048c 100644 --- a/fs/xfs/xfs_inode.c +++ b/fs/xfs/xfs_inode.c
@@ -750,7 +750,6 @@ xfs_ialloc( xfs_buf_t **ialloc_context, xfs_inode_t **ipp) { - struct inode *dir = pip ? VFS_I(pip) : NULL; struct xfs_mount *mp = tp->t_mountp; xfs_ino_t ino; xfs_inode_t *ip; @@ -796,17 +795,26 @@ xfs_ialloc( return error; ASSERT(ip != NULL); inode = VFS_I(ip); - set_nlink(inode, nlink); - inode->i_rdev = rdev; - ip->i_d.di_projid = prid; - if (dir && !(dir->i_mode & S_ISGID) && - (mp->m_flags & XFS_MOUNT_GRPID)) { - inode->i_uid = current_fsuid(); - inode->i_gid = dir->i_gid; - inode->i_mode = mode; - } else { - inode_init_owner(inode, dir, mode); + /* + * We always convert v1 inodes to v2 now - we only support filesystems + * with >= v2 inode capability, so there is no reason for ever leaving + * an inode in v1 format. + */ + if (ip->i_d.di_version == 1) + ip->i_d.di_version = 2; + + inode->i_mode = mode; + set_nlink(inode, nlink); + ip->i_d.di_uid = xfs_kuid_to_uid(current_fsuid()); + ip->i_d.di_gid = xfs_kgid_to_gid(current_fsgid()); + inode->i_rdev = rdev; + xfs_set_projid(ip, prid); + + if (pip && XFS_INHERIT_GID(pip)) { + ip->i_d.di_gid = pip->i_d.di_gid; + if ((VFS_I(pip)->i_mode & S_ISGID) && S_ISDIR(mode)) + inode->i_mode |= S_ISGID; } /* @@ -814,8 +822,9 @@ xfs_ialloc( * ID or one of the supplementary group IDs, the S_ISGID bit is cleared * (and only if the irix_sgid_inherit compatibility variable is set). */ - if (irix_sgid_inherit && - (inode->i_mode & S_ISGID) && !in_group_p(inode->i_gid)) + if ((irix_sgid_inherit) && + (inode->i_mode & S_ISGID) && + (!in_group_p(xfs_gid_to_kgid(ip->i_d.di_gid)))) inode->i_mode &= ~S_ISGID; ip->i_d.di_size = 0; @@ -832,7 +841,7 @@ xfs_ialloc( ip->i_d.di_dmstate = 0; ip->i_d.di_flags = 0; - if (xfs_sb_version_has_v3inode(&mp->m_sb)) { + if (ip->i_d.di_version == 3) { inode_set_iversion(inode, 1); ip->i_d.di_flags2 = 0; ip->i_d.di_cowextsize = 0; @@ -840,6 +849,7 @@ xfs_ialloc( ip->i_d.di_crtime.t_nsec = (int32_t)tv.tv_nsec; } + flags = XFS_ILOG_CORE; switch (mode & S_IFMT) { case S_IFIFO: @@ -892,13 +902,20 @@ xfs_ialloc( ip->i_d.di_flags |= di_flags; } - if (pip && (pip->i_d.di_flags2 & XFS_DIFLAG2_ANY)) { + if (pip && + (pip->i_d.di_flags2 & XFS_DIFLAG2_ANY) && + pip->i_d.di_version == 3 && + ip->i_d.di_version == 3) { + uint64_t di_flags2 = 0; + if (pip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE) { - ip->i_d.di_flags2 |= XFS_DIFLAG2_COWEXTSIZE; + di_flags2 |= XFS_DIFLAG2_COWEXTSIZE; ip->i_d.di_cowextsize = pip->i_d.di_cowextsize; } if (pip->i_d.di_flags2 & XFS_DIFLAG2_DAX) - ip->i_d.di_flags2 |= XFS_DIFLAG2_DAX; + di_flags2 |= XFS_DIFLAG2_DAX; + + ip->i_d.di_flags2 |= di_flags2; } /* FALLTHROUGH */ case S_IFLNK: @@ -1100,6 +1117,7 @@ xfs_bumplink( { xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); + ASSERT(ip->i_d.di_version > 1); inc_nlink(VFS_I(ip)); xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); } @@ -1135,7 +1153,8 @@ xfs_create( /* * Make sure that we have allocated dquot(s) on disk. */ - error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid, + error = xfs_qm_vop_dqalloc(dp, xfs_kuid_to_uid(current_fsuid()), + xfs_kgid_to_gid(current_fsgid()), prid, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp, &pdqp); if (error) @@ -1285,7 +1304,8 @@ xfs_create_tmpfile( /* * Make sure that we have allocated dquot(s) on disk. */ - error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid, + error = xfs_qm_vop_dqalloc(dp, xfs_kuid_to_uid(current_fsuid()), + xfs_kgid_to_gid(current_fsgid()), prid, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp, &pdqp); if (error) @@ -1398,7 +1418,7 @@ xfs_link( * the tree quota mechanism could be circumvented. */ if (unlikely((tdp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && - tdp->i_d.di_projid != sip->i_d.di_projid)) { + (xfs_get_projid(tdp) != xfs_get_projid(sip)))) { error = -EXDEV; goto error_return; } @@ -1493,8 +1513,10 @@ xfs_itruncate_extents_flags( struct xfs_mount *mp = ip->i_mount; struct xfs_trans *tp = *tpp; xfs_fileoff_t first_unmap_block; + xfs_fileoff_t last_block; xfs_filblks_t unmap_len; int error = 0; + int done = 0; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); ASSERT(!atomic_read(&VFS_I(ip)->i_count) || @@ -1514,22 +1536,21 @@ xfs_itruncate_extents_flags( * the end of the file (in a crash where the space is allocated * but the inode size is not yet updated), simply remove any * blocks which show up between the new EOF and the maximum - * possible file size. - * - * We have to free all the blocks to the bmbt maximum offset, even if - * the page cache can't scale that far. + * possible file size. If the first block to be removed is + * beyond the maximum file size (ie it is the same as last_block), + * then there is nothing to do. */ first_unmap_block = XFS_B_TO_FSB(mp, (xfs_ufsize_t)new_size); - if (first_unmap_block >= XFS_MAX_FILEOFF) { - WARN_ON_ONCE(first_unmap_block > XFS_MAX_FILEOFF); + last_block = XFS_B_TO_FSB(mp, mp->m_super->s_maxbytes); + if (first_unmap_block == last_block) return 0; - } - unmap_len = XFS_MAX_FILEOFF - first_unmap_block + 1; - while (unmap_len > 0) { + ASSERT(first_unmap_block < last_block); + unmap_len = last_block - first_unmap_block + 1; + while (!done) { ASSERT(tp->t_firstblock == NULLFSBLOCK); - error = __xfs_bunmapi(tp, ip, first_unmap_block, &unmap_len, - flags, XFS_ITRUNC_MAX_EXTENTS); + error = xfs_bunmapi(tp, ip, first_unmap_block, unmap_len, flags, + XFS_ITRUNC_MAX_EXTENTS, &done); if (error) goto out; @@ -1549,7 +1570,7 @@ xfs_itruncate_extents_flags( if (whichfork == XFS_DATA_FORK) { /* Remove all pending CoW reservations. */ error = xfs_reflink_cancel_cow_blocks(ip, &tp, - first_unmap_block, XFS_MAX_FILEOFF, true); + first_unmap_block, last_block, true); if (error) goto out; @@ -2128,10 +2149,8 @@ xfs_iunlink_update_bucket( * passed in because either we're adding or removing ourselves from the * head of the list. */ - if (old_value == new_agino) { - xfs_buf_mark_corrupt(agibp); + if (old_value == new_agino) return -EFSCORRUPTED; - } agi->agi_unlinked[bucket_index] = cpu_to_be32(new_agino); offset = offsetof(struct xfs_agi, agi_unlinked) + @@ -2194,8 +2213,6 @@ xfs_iunlink_update_inode( /* Make sure the old pointer isn't garbage. */ old_value = be32_to_cpu(dip->di_next_unlinked); if (!xfs_verify_agino_or_null(mp, agno, old_value)) { - xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, dip, - sizeof(*dip), __this_address); error = -EFSCORRUPTED; goto out; } @@ -2207,11 +2224,8 @@ xfs_iunlink_update_inode( */ *old_next_agino = old_value; if (old_value == next_agino) { - if (next_agino != NULLAGINO) { - xfs_inode_verifier_error(ip, -EFSCORRUPTED, __func__, - dip, sizeof(*dip), __this_address); + if (next_agino != NULLAGINO) error = -EFSCORRUPTED; - } goto out; } @@ -2262,10 +2276,8 @@ xfs_iunlink( */ next_agino = be32_to_cpu(agi->agi_unlinked[bucket_index]); if (next_agino == agino || - !xfs_verify_agino_or_null(mp, agno, next_agino)) { - xfs_buf_mark_corrupt(agibp); + !xfs_verify_agino_or_null(mp, agno, next_agino)) return -EFSCORRUPTED; - } if (next_agino != NULLAGINO) { struct xfs_perag *pag; @@ -2535,7 +2547,7 @@ xfs_ifree_cluster( xfs_daddr_t blkno; xfs_buf_t *bp; xfs_inode_t *ip; - struct xfs_inode_log_item *iip; + xfs_inode_log_item_t *iip; struct xfs_log_item *lip; struct xfs_perag *pag; struct xfs_ino_geometry *igeo = M_IGEO(mp); @@ -2572,10 +2584,8 @@ xfs_ifree_cluster( mp->m_bsize * igeo->blocks_per_cluster, XBF_UNMAPPED); - if (!bp) { - xfs_perag_put(pag); + if (!bp) return -ENOMEM; - } /* * This buffer may not have been correctly initialised as we @@ -2597,7 +2607,7 @@ xfs_ifree_cluster( */ list_for_each_entry(lip, &bp->b_li_list, li_bio_list) { if (lip->li_type == XFS_LI_INODE) { - iip = (struct xfs_inode_log_item *)lip; + iip = (xfs_inode_log_item_t *)lip; ASSERT(iip->ili_logged == 1); lip->li_cb = xfs_istale_done; xfs_trans_ail_copy_lsn(mp->m_ail, @@ -3205,7 +3215,6 @@ xfs_rename( struct xfs_trans *tp; struct xfs_inode *wip = NULL; /* whiteout inode */ struct xfs_inode *inodes[__XFS_SORT_INODES]; - int i; int num_inodes = __XFS_SORT_INODES; bool new_parent = (src_dp != target_dp); bool src_is_directory = S_ISDIR(VFS_I(src_ip)->i_mode); @@ -3279,7 +3288,7 @@ xfs_rename( * tree quota mechanism would be circumvented. */ if (unlikely((target_dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) && - target_dp->i_d.di_projid != src_ip->i_d.di_projid)) { + (xfs_get_projid(target_dp) != xfs_get_projid(src_ip)))) { error = -EXDEV; goto out_trans_cancel; } @@ -3318,30 +3327,6 @@ xfs_rename( } /* - * Lock the AGI buffers we need to handle bumping the nlink of the - * whiteout inode off the unlinked list and to handle dropping the - * nlink of the target inode. Per locking order rules, do this in - * increasing AG order and before directory block allocation tries to - * grab AGFs because we grab AGIs before AGFs. - * - * The (vfs) caller must ensure that if src is a directory then - * target_ip is either null or an empty directory. - */ - for (i = 0; i < num_inodes && inodes[i] != NULL; i++) { - if (inodes[i] == wip || - (inodes[i] == target_ip && - (VFS_I(target_ip)->i_nlink == 1 || src_is_directory))) { - struct xfs_buf *bp; - xfs_agnumber_t agno; - - agno = XFS_INO_TO_AGNO(mp, inodes[i]->i_ino); - error = xfs_read_agi(mp, tp, agno, &bp); - if (error) - goto out_trans_cancel; - } - } - - /* * Directory entry creation below may acquire the AGF. Remove * the whiteout from the unlinked list first to preserve correct * AGI/AGF locking order. This dirties the transaction so failures @@ -3811,6 +3796,7 @@ xfs_iflush_int( ASSERT(ip->i_d.di_format != XFS_DINODE_FMT_BTREE || ip->i_d.di_nextents > XFS_IFORK_MAXEXT(ip, XFS_DATA_FORK)); ASSERT(iip != NULL && iip->ili_fields != 0); + ASSERT(ip->i_d.di_version > 1); /* set *dip = inode's place in the buffer */ dip = xfs_buf_offset(bp, ip->i_imap.im_boffset); @@ -3871,7 +3857,7 @@ xfs_iflush_int( * backwards compatibility with old kernels that predate logging all * inode changes. */ - if (!xfs_sb_version_has_v3inode(&mp->m_sb)) + if (ip->i_d.di_version < 3) ip->i_d.di_flushiter++; /* Check the inline fork data before we write out. */ @@ -3954,22 +3940,3 @@ xfs_irele( trace_xfs_irele(ip, _RET_IP_); iput(VFS_I(ip)); } - -/* - * Ensure all commited transactions touching the inode are written to the log. - */ -int -xfs_log_force_inode( - struct xfs_inode *ip) -{ - xfs_lsn_t lsn = 0; - - xfs_ilock(ip, XFS_ILOCK_SHARED); - if (xfs_ipincount(ip)) - lsn = ip->i_itemp->ili_last_lsn; - xfs_iunlock(ip, XFS_ILOCK_SHARED); - - if (!lsn) - return 0; - return xfs_log_force_lsn(ip->i_mount, lsn, XFS_LOG_SYNC, NULL); -}
diff --git a/fs/xfs/xfs_inode.h b/fs/xfs/xfs_inode.h index 62b963d..558173f 100644 --- a/fs/xfs/xfs_inode.h +++ b/fs/xfs/xfs_inode.h
@@ -177,11 +177,30 @@ xfs_iflags_test_and_set(xfs_inode_t *ip, unsigned short flags) return ret; } +/* + * Project quota id helpers (previously projid was 16bit only + * and using two 16bit values to hold new 32bit projid was chosen + * to retain compatibility with "old" filesystems). + */ +static inline prid_t +xfs_get_projid(struct xfs_inode *ip) +{ + return (prid_t)ip->i_d.di_projid_hi << 16 | ip->i_d.di_projid_lo; +} + +static inline void +xfs_set_projid(struct xfs_inode *ip, + prid_t projid) +{ + ip->i_d.di_projid_hi = (uint16_t) (projid >> 16); + ip->i_d.di_projid_lo = (uint16_t) (projid & 0xffff); +} + static inline prid_t xfs_get_initial_prid(struct xfs_inode *dp) { if (dp->i_d.di_flags & XFS_DIFLAG_PROJINHERIT) - return dp->i_d.di_projid; + return xfs_get_projid(dp); return XFS_PROJID_DEFAULT; } @@ -422,7 +441,6 @@ int xfs_itruncate_extents_flags(struct xfs_trans **, struct xfs_inode *, int, xfs_fsize_t, int); void xfs_iext_realloc(xfs_inode_t *, int, int); -int xfs_log_force_inode(struct xfs_inode *ip); void xfs_iunpin_wait(xfs_inode_t *); #define xfs_ipincount(ip) ((unsigned int) atomic_read(&ip->i_pincount))
diff --git a/fs/xfs/xfs_inode_item.c b/fs/xfs/xfs_inode_item.c index 83bf96b..bb8f076 100644 --- a/fs/xfs/xfs_inode_item.c +++ b/fs/xfs/xfs_inode_item.c
@@ -17,7 +17,6 @@ #include "xfs_trans_priv.h" #include "xfs_buf_item.h" #include "xfs_log.h" -#include "xfs_error.h" #include <linux/iversion.h> @@ -125,7 +124,7 @@ xfs_inode_item_size( *nvecs += 2; *nbytes += sizeof(struct xfs_inode_log_format) + - xfs_log_dinode_size(ip->i_mount); + xfs_log_dinode_size(ip->i_d.di_version); xfs_inode_item_data_fork_size(iip, nvecs, nbytes); if (XFS_IFORK_Q(ip)) @@ -305,11 +304,13 @@ xfs_inode_to_log_dinode( struct inode *inode = VFS_I(ip); to->di_magic = XFS_DINODE_MAGIC; + + to->di_version = from->di_version; to->di_format = from->di_format; - to->di_uid = i_uid_read(inode); - to->di_gid = i_gid_read(inode); - to->di_projid_lo = from->di_projid & 0xffff; - to->di_projid_hi = from->di_projid >> 16; + to->di_uid = from->di_uid; + to->di_gid = from->di_gid; + to->di_projid_lo = from->di_projid_lo; + to->di_projid_hi = from->di_projid_hi; memset(to->di_pad, 0, sizeof(to->di_pad)); memset(to->di_pad3, 0, sizeof(to->di_pad3)); @@ -337,8 +338,7 @@ xfs_inode_to_log_dinode( /* log a dummy value to ensure log structure is fully initialised */ to->di_next_unlinked = NULLAGINO; - if (xfs_sb_version_has_v3inode(&ip->i_mount->m_sb)) { - to->di_version = 3; + if (from->di_version == 3) { to->di_changecount = inode_peek_iversion(inode); to->di_crtime.t_sec = from->di_crtime.t_sec; to->di_crtime.t_nsec = from->di_crtime.t_nsec; @@ -350,7 +350,6 @@ xfs_inode_to_log_dinode( uuid_copy(&to->di_uuid, &ip->i_mount->m_sb.sb_meta_uuid); to->di_flushiter = 0; } else { - to->di_version = 2; to->di_flushiter = from->di_flushiter; } } @@ -370,7 +369,7 @@ xfs_inode_item_format_core( dic = xlog_prepare_iovec(lv, vecp, XLOG_REG_TYPE_ICORE); xfs_inode_to_log_dinode(ip, dic, ip->i_itemp->ili_item.li_lsn); - xlog_finish_iovec(lv, *vecp, xfs_log_dinode_size(ip->i_mount)); + xlog_finish_iovec(lv, *vecp, xfs_log_dinode_size(ip->i_d.di_version)); } /* @@ -395,6 +394,8 @@ xfs_inode_item_format( struct xfs_log_iovec *vecp = NULL; struct xfs_inode_log_format *ilf; + ASSERT(ip->i_d.di_version > 1); + ilf = xlog_prepare_iovec(lv, &vecp, XLOG_REG_TYPE_IFORMAT); ilf->ilf_type = XFS_LI_INODE; ilf->ilf_ino = ip->i_ino; @@ -730,27 +731,29 @@ xfs_iflush_done( * holding the lock before removing the inode from the AIL. */ if (need_ail) { - xfs_lsn_t tail_lsn = 0; + bool mlip_changed = false; /* this is an opencoded batch version of xfs_trans_ail_delete */ spin_lock(&ailp->ail_lock); list_for_each_entry(blip, &tmp, li_bio_list) { if (INODE_ITEM(blip)->ili_logged && - blip->li_lsn == INODE_ITEM(blip)->ili_flush_lsn) { - /* - * xfs_ail_update_finish() only cares about the - * lsn of the first tail item removed, any - * others will be at the same or higher lsn so - * we just ignore them. - */ - xfs_lsn_t lsn = xfs_ail_delete_one(ailp, blip); - if (!tail_lsn && lsn) - tail_lsn = lsn; - } else { + blip->li_lsn == INODE_ITEM(blip)->ili_flush_lsn) + mlip_changed |= xfs_ail_delete_one(ailp, blip); + else { xfs_clear_li_failed(blip); } } - xfs_ail_update_finish(ailp, tail_lsn); + + if (mlip_changed) { + if (!XFS_FORCED_SHUTDOWN(ailp->ail_mount)) + xlog_assign_tail_lsn_locked(ailp->ail_mount); + if (list_empty(&ailp->ail_head)) + wake_up_all(&ailp->ail_empty); + } + spin_unlock(&ailp->ail_lock); + + if (mlip_changed) + xfs_log_space_wake(ailp->ail_mount); } /* @@ -779,7 +782,7 @@ xfs_iflush_abort( xfs_inode_t *ip, bool stale) { - struct xfs_inode_log_item *iip = ip->i_itemp; + xfs_inode_log_item_t *iip = ip->i_itemp; if (iip) { if (test_bit(XFS_LI_IN_AIL, &iip->ili_item.li_flags)) { @@ -825,10 +828,8 @@ xfs_inode_item_format_convert( { struct xfs_inode_log_format_32 *in_f32 = buf->i_addr; - if (buf->i_len != sizeof(*in_f32)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); + if (buf->i_len != sizeof(*in_f32)) return -EFSCORRUPTED; - } in_f->ilf_type = in_f32->ilf_type; in_f->ilf_size = in_f32->ilf_size;
diff --git a/fs/xfs/xfs_inode_item.h b/fs/xfs/xfs_inode_item.h index ad667fd..07a60e7 100644 --- a/fs/xfs/xfs_inode_item.h +++ b/fs/xfs/xfs_inode_item.h
@@ -13,7 +13,7 @@ struct xfs_bmbt_rec; struct xfs_inode; struct xfs_mount; -struct xfs_inode_log_item { +typedef struct xfs_inode_log_item { struct xfs_log_item ili_item; /* common portion */ struct xfs_inode *ili_inode; /* inode ptr */ xfs_lsn_t ili_flush_lsn; /* lsn at last flush */ @@ -23,7 +23,7 @@ struct xfs_inode_log_item { unsigned int ili_last_fields; /* fields when flushed */ unsigned int ili_fields; /* fields to be logged */ unsigned int ili_fsync_fields; /* logged since last fsync */ -}; +} xfs_inode_log_item_t; static inline int xfs_inode_clean(xfs_inode_t *ip) {
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index e7356e5..7b7a009 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c
@@ -1144,7 +1144,7 @@ xfs_fill_fsxattr( fa->fsx_extsize = ip->i_d.di_extsize << ip->i_mount->m_sb.sb_blocklog; fa->fsx_cowextsize = ip->i_d.di_cowextsize << ip->i_mount->m_sb.sb_blocklog; - fa->fsx_projid = ip->i_d.di_projid; + fa->fsx_projid = xfs_get_projid(ip); if (attr) { if (ip->i_afp) { @@ -1299,7 +1299,7 @@ xfs_ioctl_setattr_xflags( /* diflags2 only valid for v3 inodes. */ di_flags2 = xfs_flags2diflags2(ip, fa->fsx_xflags); - if (di_flags2 && !xfs_sb_version_has_v3inode(&mp->m_sb)) + if (di_flags2 && ip->i_d.di_version < 3) return -EINVAL; ip->i_d.di_flags = xfs_flags2diflags(ip, fa->fsx_xflags); @@ -1510,7 +1510,8 @@ xfs_ioctl_setattr_check_cowextsize( if (!(fa->fsx_xflags & FS_XFLAG_COWEXTSIZE)) return 0; - if (!xfs_sb_version_hasreflink(&ip->i_mount->m_sb)) + if (!xfs_sb_version_hasreflink(&ip->i_mount->m_sb) || + ip->i_d.di_version != 3) return -EINVAL; if (fa->fsx_cowextsize == 0) @@ -1571,9 +1572,9 @@ xfs_ioctl_setattr( * because the i_*dquot fields will get updated anyway. */ if (XFS_IS_QUOTA_ON(mp)) { - code = xfs_qm_vop_dqalloc(ip, VFS_I(ip)->i_uid, - VFS_I(ip)->i_gid, fa->fsx_projid, - XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp); + code = xfs_qm_vop_dqalloc(ip, ip->i_d.di_uid, + ip->i_d.di_gid, fa->fsx_projid, + XFS_QMOPT_PQUOTA, &udqp, NULL, &pdqp); if (code) return code; } @@ -1596,7 +1597,7 @@ xfs_ioctl_setattr( } if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp) && - ip->i_d.di_projid != fa->fsx_projid) { + xfs_get_projid(ip) != fa->fsx_projid) { code = xfs_qm_vop_chown_reserve(tp, ip, udqp, NULL, pdqp, capable(CAP_FOWNER) ? XFS_QMOPT_FORCE_RES : 0); if (code) /* out of quota */ @@ -1633,12 +1634,13 @@ xfs_ioctl_setattr( VFS_I(ip)->i_mode &= ~(S_ISUID|S_ISGID); /* Change the ownerships and register project quota modifications */ - if (ip->i_d.di_projid != fa->fsx_projid) { + if (xfs_get_projid(ip) != fa->fsx_projid) { if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_PQUOTA_ON(mp)) { olddquot = xfs_qm_vop_chown(tp, ip, &ip->i_pdquot, pdqp); } - ip->i_d.di_projid = fa->fsx_projid; + ASSERT(ip->i_d.di_version > 1); + xfs_set_projid(ip, fa->fsx_projid); } /* @@ -1650,7 +1652,7 @@ xfs_ioctl_setattr( ip->i_d.di_extsize = fa->fsx_extsize >> mp->m_sb.sb_blocklog; else ip->i_d.di_extsize = 0; - if (xfs_sb_version_has_v3inode(&mp->m_sb) && + if (ip->i_d.di_version == 3 && (ip->i_d.di_flags2 & XFS_DIFLAG2_COWEXTSIZE)) ip->i_d.di_cowextsize = fa->fsx_cowextsize >> mp->m_sb.sb_blocklog;
diff --git a/fs/xfs/xfs_iomap.c b/fs/xfs/xfs_iomap.c index 7088042..239c954 100644 --- a/fs/xfs/xfs_iomap.c +++ b/fs/xfs/xfs_iomap.c
@@ -765,11 +765,6 @@ xfs_iomap_write_unwritten( */ resblks = XFS_DIOSTRAT_SPACE_RES(mp, 0) << 1; - /* Attach dquots so that bmbt splits are accounted correctly. */ - error = xfs_qm_dqattach(ip); - if (error) - return error; - do { /* * Set up a transaction to convert the range of extents @@ -788,11 +783,6 @@ xfs_iomap_write_unwritten( xfs_ilock(ip, XFS_ILOCK_EXCL); xfs_trans_ijoin(tp, ip, 0); - error = xfs_trans_reserve_quota_nblks(tp, ip, resblks, 0, - XFS_QMOPT_RES_REGBLKS | XFS_QMOPT_FORCE_RES); - if (error) - goto error_on_bmapi_transaction; - /* * Modify the unwritten extent state of the buffer. */ @@ -1065,13 +1055,6 @@ xfs_file_iomap_begin( trace_xfs_iomap_alloc(ip, offset, length, XFS_DATA_FORK, &imap); out_finish: - /* - * Writes that span EOF might trigger an IO size update on completion, - * so consider them to be dirty for the purposes of O_DSYNC even if - * there is no other metadata changes pending or have been made here. - */ - if ((flags & IOMAP_WRITE) && offset + length > i_size_read(inode)) - iomap->flags |= IOMAP_F_DIRTY; return xfs_bmbt_to_iomap(ip, iomap, &imap, shared); out_found:
diff --git a/fs/xfs/xfs_iops.c b/fs/xfs/xfs_iops.c index a7efc88..ca8c763 100644 --- a/fs/xfs/xfs_iops.c +++ b/fs/xfs/xfs_iops.c
@@ -20,7 +20,6 @@ #include "xfs_symlink.h" #include "xfs_dir2.h" #include "xfs_iomap.h" -#include "xfs_error.h" #include <linux/xattr.h> #include <linux/posix_acl.h> @@ -471,20 +470,17 @@ xfs_vn_get_link_inline( struct inode *inode, struct delayed_call *done) { - struct xfs_inode *ip = XFS_I(inode); char *link; - ASSERT(ip->i_df.if_flags & XFS_IFINLINE); + ASSERT(XFS_I(inode)->i_df.if_flags & XFS_IFINLINE); /* * The VFS crashes on a NULL pointer, so return -EFSCORRUPTED if * if_data is junk. */ - link = ip->i_df.if_u1.if_data; - if (!link) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, ip->i_mount); + link = XFS_I(inode)->i_df.if_u1.if_data; + if (!link) return ERR_PTR(-EFSCORRUPTED); - } return link; } @@ -517,7 +513,7 @@ xfs_vn_getattr( stat->blocks = XFS_FSB_TO_BB(mp, ip->i_d.di_nblocks + ip->i_delayed_blks); - if (xfs_sb_version_has_v3inode(&mp->m_sb)) { + if (ip->i_d.di_version == 3) { if (request_mask & STATX_BTIME) { stat->result_mask |= STATX_BTIME; stat->btime.tv_sec = ip->i_d.di_crtime.t_sec; @@ -666,7 +662,9 @@ xfs_setattr_nonsize( */ ASSERT(udqp == NULL); ASSERT(gdqp == NULL); - error = xfs_qm_vop_dqalloc(ip, uid, gid, ip->i_d.di_projid, + error = xfs_qm_vop_dqalloc(ip, xfs_kuid_to_uid(uid), + xfs_kgid_to_gid(gid), + xfs_get_projid(ip), qflags, &udqp, &gdqp, NULL); if (error) return error; @@ -735,6 +733,7 @@ xfs_setattr_nonsize( olddquot1 = xfs_qm_vop_chown(tp, ip, &ip->i_udquot, udqp); } + ip->i_d.di_uid = xfs_kuid_to_uid(uid); inode->i_uid = uid; } if (!gid_eq(igid, gid)) { @@ -746,6 +745,7 @@ xfs_setattr_nonsize( olddquot2 = xfs_qm_vop_chown(tp, ip, &ip->i_gdquot, gdqp); } + ip->i_d.di_gid = xfs_kgid_to_gid(gid); inode->i_gid = gid; } } @@ -1284,6 +1284,9 @@ xfs_setup_inode( /* make the inode look hashed for the writeback code */ inode_fake_hash(inode); + inode->i_uid = xfs_uid_to_kuid(ip->i_d.di_uid); + inode->i_gid = xfs_gid_to_kgid(ip->i_d.di_gid); + i_size_write(inode, ip->i_d.di_size); xfs_diflags_to_iflags(inode, ip);
diff --git a/fs/xfs/xfs_itable.c b/fs/xfs/xfs_itable.c index 42e9377..884950a 100644 --- a/fs/xfs/xfs_itable.c +++ b/fs/xfs/xfs_itable.c
@@ -84,10 +84,10 @@ xfs_bulkstat_one_int( /* xfs_iget returns the following without needing * further change. */ - buf->bs_projectid = ip->i_d.di_projid; + buf->bs_projectid = xfs_get_projid(ip); buf->bs_ino = ino; - buf->bs_uid = i_uid_read(inode); - buf->bs_gid = i_gid_read(inode); + buf->bs_uid = dic->di_uid; + buf->bs_gid = dic->di_gid; buf->bs_size = dic->di_size; buf->bs_nlink = inode->i_nlink; @@ -110,7 +110,7 @@ xfs_bulkstat_one_int( buf->bs_forkoff = XFS_IFORK_BOFF(ip); buf->bs_version = XFS_BULKSTAT_VERSION_V5; - if (xfs_sb_version_has_v3inode(&mp->m_sb)) { + if (dic->di_version == 3) { if (dic->di_flags2 & XFS_DIFLAG2_COWEXTSIZE) buf->bs_cowextsize_blks = dic->di_cowextsize; }
diff --git a/fs/xfs/xfs_iwalk.c b/fs/xfs/xfs_iwalk.c index cc5c0c8..aa375cf 100644 --- a/fs/xfs/xfs_iwalk.c +++ b/fs/xfs/xfs_iwalk.c
@@ -55,9 +55,6 @@ struct xfs_iwalk_ag { /* Where do we start the traversal? */ xfs_ino_t startino; - /* What was the last inode number we saw when iterating the inobt? */ - xfs_ino_t lastino; - /* Array of inobt records we cache. */ struct xfs_inobt_rec_incore *recs; @@ -303,9 +300,6 @@ xfs_iwalk_ag_start( return error; XFS_WANT_CORRUPTED_RETURN(mp, *has_more == 1); - iwag->lastino = XFS_AGINO_TO_INO(mp, agno, - irec->ir_startino + XFS_INODES_PER_CHUNK - 1); - /* * If the LE lookup yielded an inobt record before the cursor position, * skip it and see if there's another one after it. @@ -352,17 +346,15 @@ xfs_iwalk_run_callbacks( struct xfs_mount *mp = iwag->mp; struct xfs_trans *tp = iwag->tp; struct xfs_inobt_rec_incore *irec; - xfs_agino_t next_agino; + xfs_agino_t restart; int error; - next_agino = XFS_INO_TO_AGINO(mp, iwag->lastino) + 1; - ASSERT(iwag->nr_recs > 0); /* Delete cursor but remember the last record we cached... */ xfs_iwalk_del_inobt(tp, curpp, agi_bpp, 0); irec = &iwag->recs[iwag->nr_recs - 1]; - ASSERT(next_agino >= irec->ir_startino + XFS_INODES_PER_CHUNK); + restart = irec->ir_startino + XFS_INODES_PER_CHUNK - 1; error = xfs_iwalk_ag_recs(iwag); if (error) @@ -379,7 +371,7 @@ xfs_iwalk_run_callbacks( if (error) return error; - return xfs_inobt_lookup(*curpp, next_agino, XFS_LOOKUP_GE, has_more); + return xfs_inobt_lookup(*curpp, restart, XFS_LOOKUP_GE, has_more); } /* Walk all inodes in a single AG, from @iwag->startino to the end of the AG. */ @@ -403,7 +395,6 @@ xfs_iwalk_ag( while (!error && has_more) { struct xfs_inobt_rec_incore *irec; - xfs_ino_t rec_fsino; cond_resched(); if (xfs_pwork_want_abort(&iwag->pwork)) @@ -415,15 +406,6 @@ xfs_iwalk_ag( if (error || !has_more) break; - /* Make sure that we always move forward. */ - rec_fsino = XFS_AGINO_TO_INO(mp, agno, irec->ir_startino); - if (iwag->lastino != NULLFSINO && iwag->lastino >= rec_fsino) { - ASSERT(iwag->lastino < rec_fsino); - error = -EFSCORRUPTED; - goto out; - } - iwag->lastino = rec_fsino + XFS_INODES_PER_CHUNK - 1; - /* No allocated inodes in this chunk; skip it. */ if (iwag->skip_empty && irec->ir_freecount == irec->ir_count) { error = xfs_btree_increment(cur, 0, &has_more); @@ -552,7 +534,6 @@ xfs_iwalk( .trim_start = 1, .skip_empty = 1, .pwork = XFS_PWORK_SINGLE_THREADED, - .lastino = NULLFSINO, }; xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, startino); int error; @@ -641,7 +622,6 @@ xfs_iwalk_threaded( iwag->data = data; iwag->startino = startino; iwag->sz_recs = xfs_iwalk_prefetch(inode_records); - iwag->lastino = NULLFSINO; xfs_pwork_queue(&pctl, &iwag->pwork); startino = XFS_AGINO_TO_INO(mp, agno + 1, 0); if (flags & XFS_INOBT_WALK_SAME_AG) @@ -715,7 +695,6 @@ xfs_inobt_walk( .startino = startino, .sz_recs = xfs_inobt_walk_prefetch(inobt_records), .pwork = XFS_PWORK_SINGLE_THREADED, - .lastino = NULLFSINO, }; xfs_agnumber_t agno = XFS_INO_TO_AGNO(mp, startino); int error;
diff --git a/fs/xfs/xfs_linux.h b/fs/xfs/xfs_linux.h index 4f6f091..ca15105 100644 --- a/fs/xfs/xfs_linux.h +++ b/fs/xfs/xfs_linux.h
@@ -163,6 +163,32 @@ struct xstats { extern struct xstats xfsstats; +/* Kernel uid/gid conversion. These are used to convert to/from the on disk + * uid_t/gid_t types to the kuid_t/kgid_t types that the kernel uses internally. + * The conversion here is type only, the value will remain the same since we + * are converting to the init_user_ns. The uid is later mapped to a particular + * user namespace value when crossing the kernel/user boundary. + */ +static inline uint32_t xfs_kuid_to_uid(kuid_t uid) +{ + return from_kuid(&init_user_ns, uid); +} + +static inline kuid_t xfs_uid_to_kuid(uint32_t uid) +{ + return make_kuid(&init_user_ns, uid); +} + +static inline uint32_t xfs_kgid_to_gid(kgid_t gid) +{ + return from_kgid(&init_user_ns, gid); +} + +static inline kgid_t xfs_gid_to_kgid(uint32_t gid) +{ + return make_kgid(&init_user_ns, gid); +} + static inline dev_t xfs_to_linux_dev_t(xfs_dev_t dev) { return MKDEV(sysv_major(dev) & 0x1ff, sysv_minor(dev)); @@ -217,12 +243,6 @@ int xfs_rw_bdev(struct block_device *bdev, sector_t sector, unsigned int count, #endif /* XFS_WARN */ #endif /* DEBUG */ -#define XFS_IS_CORRUPT(mp, expr) \ - (unlikely(expr) ? xfs_corruption_error(#expr, XFS_ERRLEVEL_LOW, (mp), \ - NULL, 0, __FILE__, __LINE__, \ - __this_address), \ - true : false) - #define STATIC static noinline #ifdef CONFIG_XFS_RT
diff --git a/fs/xfs/xfs_log.c b/fs/xfs/xfs_log.c index 03a52b3..7b0d9ad 100644 --- a/fs/xfs/xfs_log.c +++ b/fs/xfs/xfs_log.c
@@ -369,25 +369,6 @@ xlog_tic_add_region(xlog_ticket_t *tic, uint len, uint type) tic->t_res_num++; } -bool -xfs_log_writable( - struct xfs_mount *mp) -{ - /* - * Never write to the log on norecovery mounts, if the block device is - * read-only, or if the filesystem is shutdown. Read-only mounts still - * allow internal writes for log recovery and unmount purposes, so don't - * restrict that case here. - */ - if (mp->m_flags & XFS_MOUNT_NORECOVERY) - return false; - if (xfs_readonly_buftarg(mp->m_log->l_targ)) - return false; - if (XFS_FORCED_SHUTDOWN(mp)) - return false; - return true; -} - /* * Replenish the byte reservation required by moving the grant write head. */ @@ -856,6 +837,19 @@ xfs_log_write_unmount_record( if (error) goto out_err; + /* + * If we think the summary counters are bad, clear the unmount header + * flag in the unmount record so that the summary counters will be + * recalculated during log recovery at next mount. Refer to + * xlog_check_unmount_rec for more details. + */ + if (XFS_TEST_ERROR(xfs_fs_has_sickness(mp, XFS_SICK_FS_COUNTERS), mp, + XFS_ERRTAG_FORCE_SUMMARY_RECALC)) { + xfs_alert(mp, "%s: will fix summary counters at next mount", + __func__); + flags &= ~XLOG_UNMOUNT_TRANS; + } + /* remove inited flag, and account for space used */ tic->t_flags = 0; tic->t_curr_res -= sizeof(magic); @@ -914,8 +908,15 @@ xfs_log_unmount_write(xfs_mount_t *mp) #endif int error; - if (!xfs_log_writable(mp)) + /* + * Don't write out unmount record on norecovery mounts or ro devices. + * Or, if we are doing a forced umount (typically because of IO errors). + */ + if (mp->m_flags & XFS_MOUNT_NORECOVERY || + xfs_readonly_buftarg(log->l_targ)) { + ASSERT(mp->m_flags & XFS_MOUNT_RDONLY); return 0; + } error = xfs_log_force(mp, XFS_LOG_SYNC); ASSERT(error || !(XLOG_FORCED_SHUTDOWN(log))); @@ -931,19 +932,6 @@ xfs_log_unmount_write(xfs_mount_t *mp) } while (iclog != first_iclog); #endif if (! (XLOG_FORCED_SHUTDOWN(log))) { - /* - * If we think the summary counters are bad, avoid writing the - * unmount record to force log recovery at next mount, after - * which the summary counters will be recalculated. Refer to - * xlog_check_unmount_rec for more details. - */ - if (XFS_TEST_ERROR(xfs_fs_has_sickness(mp, XFS_SICK_FS_COUNTERS), - mp, XFS_ERRTAG_FORCE_SUMMARY_RECALC)) { - xfs_alert(mp, - "%s: will fix summary counters at next mount", - __func__); - return 0; - } xfs_log_write_unmount_record(mp); } else { /* @@ -1549,14 +1537,14 @@ xlog_commit_record( } /* - * Compute the LSN that we'd need to push the log tail towards in order to have - * (a) enough on-disk log space to log the number of bytes specified, (b) at - * least 25% of the log space free, and (c) at least 256 blocks free. If the - * log free space already meets all three thresholds, this function returns - * NULLCOMMITLSN. + * Push on the buffer cache code if we ever use more than 75% of the on-disk + * log space. This code pushes on the lsn which would supposedly free up + * the 25% which we want to leave free. We may need to adopt a policy which + * pushes on an lsn which is further along in the log once we reach the high + * water mark. In this manner, we would be creating a low water mark. */ -xfs_lsn_t -xlog_grant_push_threshold( +STATIC void +xlog_grant_push_ail( struct xlog *log, int need_bytes) { @@ -1582,7 +1570,7 @@ xlog_grant_push_threshold( free_threshold = max(free_threshold, (log->l_logBBsize >> 2)); free_threshold = max(free_threshold, 256); if (free_blocks >= free_threshold) - return NULLCOMMITLSN; + return; xlog_crack_atomic_lsn(&log->l_tail_lsn, &threshold_cycle, &threshold_block); @@ -1602,33 +1590,13 @@ xlog_grant_push_threshold( if (XFS_LSN_CMP(threshold_lsn, last_sync_lsn) > 0) threshold_lsn = last_sync_lsn; - return threshold_lsn; -} - -/* - * Push the tail of the log if we need to do so to maintain the free log space - * thresholds set out by xlog_grant_push_threshold. We may need to adopt a - * policy which pushes on an lsn which is further along in the log once we - * reach the high water mark. In this manner, we would be creating a low water - * mark. - */ -STATIC void -xlog_grant_push_ail( - struct xlog *log, - int need_bytes) -{ - xfs_lsn_t threshold_lsn; - - threshold_lsn = xlog_grant_push_threshold(log, need_bytes); - if (threshold_lsn == NULLCOMMITLSN || XLOG_FORCED_SHUTDOWN(log)) - return; - /* * Get the transaction layer to kick the dirty buffers out to * disk asynchronously. No point in trying to do this if * the filesystem is shutting down. */ - xfs_ail_push(log->l_ailp, threshold_lsn); + if (!XLOG_FORCED_SHUTDOWN(log)) + xfs_ail_push(log->l_ailp, threshold_lsn); } /*
diff --git a/fs/xfs/xfs_log.h b/fs/xfs/xfs_log.h index dc9229e..84e0680 100644 --- a/fs/xfs/xfs_log.h +++ b/fs/xfs/xfs_log.h
@@ -132,7 +132,6 @@ int xfs_log_reserve(struct xfs_mount *mp, int xfs_log_regrant(struct xfs_mount *mp, struct xlog_ticket *tic); void xfs_log_unmount(struct xfs_mount *mp); int xfs_log_force_umount(struct xfs_mount *mp, int logerror); -bool xfs_log_writable(struct xfs_mount *mp); struct xlog_ticket *xfs_log_ticket_get(struct xlog_ticket *ticket); void xfs_log_ticket_put(struct xlog_ticket *ticket); @@ -147,6 +146,4 @@ void xfs_log_quiesce(struct xfs_mount *mp); bool xfs_log_check_lsn(struct xfs_mount *, xfs_lsn_t); bool xfs_log_in_recovery(struct xfs_mount *); -xfs_lsn_t xlog_grant_push_threshold(struct xlog *log, int need_bytes); - #endif /* __XFS_LOG_H__ */
diff --git a/fs/xfs/xfs_log_cil.c b/fs/xfs/xfs_log_cil.c index ae9b8ef..ef652ab 100644 --- a/fs/xfs/xfs_log_cil.c +++ b/fs/xfs/xfs_log_cil.c
@@ -671,12 +671,6 @@ xlog_cil_push( ASSERT(push_seq <= ctx->sequence); /* - * Wake up any background push waiters now this context is being pushed. - */ - if (ctx->space_used >= XLOG_CIL_BLOCKING_SPACE_LIMIT(log)) - wake_up_all(&cil->xc_push_wait); - - /* * Check if we've anything to push. If there is nothing, then we don't * move on to a new sequence number and so we have to be able to push * this sequence again later. @@ -746,7 +740,7 @@ xlog_cil_push( /* * initialise the new context and attach it to the CIL. Then attach - * the current context to the CIL committing list so it can be found + * the current context to the CIL committing lsit so it can be found * during log forces to extract the commit lsn of the sequence that * needs to be forced. */ @@ -906,7 +900,7 @@ xlog_cil_push_work( */ static void xlog_cil_push_background( - struct xlog *log) __releases(cil->xc_ctx_lock) + struct xlog *log) { struct xfs_cil *cil = log->l_cilp; @@ -920,36 +914,14 @@ xlog_cil_push_background( * don't do a background push if we haven't used up all the * space available yet. */ - if (cil->xc_ctx->space_used < XLOG_CIL_SPACE_LIMIT(log)) { - up_read(&cil->xc_ctx_lock); + if (cil->xc_ctx->space_used < XLOG_CIL_SPACE_LIMIT(log)) return; - } spin_lock(&cil->xc_push_lock); if (cil->xc_push_seq < cil->xc_current_sequence) { cil->xc_push_seq = cil->xc_current_sequence; queue_work(log->l_mp->m_cil_workqueue, &cil->xc_push_work); } - - /* - * Drop the context lock now, we can't hold that if we need to sleep - * because we are over the blocking threshold. The push_lock is still - * held, so blocking threshold sleep/wakeup is still correctly - * serialised here. - */ - up_read(&cil->xc_ctx_lock); - - /* - * If we are well over the space limit, throttle the work that is being - * done until the push work on this context has begun. - */ - if (cil->xc_ctx->space_used >= XLOG_CIL_BLOCKING_SPACE_LIMIT(log)) { - trace_xfs_log_cil_wait(log, cil->xc_ctx->ticket); - ASSERT(cil->xc_ctx->space_used < log->l_logsize); - xlog_wait(&cil->xc_push_wait, &cil->xc_push_lock); - return; - } - spin_unlock(&cil->xc_push_lock); } @@ -1066,9 +1038,9 @@ xfs_log_commit_cil( if (lip->li_ops->iop_committing) lip->li_ops->iop_committing(lip, xc_commit_lsn); } - - /* xlog_cil_push_background() releases cil->xc_ctx_lock */ xlog_cil_push_background(log); + + up_read(&cil->xc_ctx_lock); } /* @@ -1178,19 +1150,21 @@ xlog_cil_force_lsn( */ bool xfs_log_item_in_current_chkpt( - struct xfs_log_item *lip) + struct xfs_log_item *lip) { - struct xfs_cil *cil = lip->li_mountp->m_log->l_cilp; + struct xfs_cil_ctx *ctx; if (list_empty(&lip->li_cil)) return false; + ctx = lip->li_mountp->m_log->l_cilp->xc_ctx; + /* * li_seq is written on the first commit of a log item to record the * first checkpoint it is written to. Hence if it is different to the * current sequence, we're in a new checkpoint. */ - if (XFS_LSN_CMP(lip->li_seq, READ_ONCE(cil->xc_current_sequence)) != 0) + if (XFS_LSN_CMP(lip->li_seq, ctx->sequence) != 0) return false; return true; } @@ -1220,7 +1194,6 @@ xlog_cil_init( INIT_LIST_HEAD(&cil->xc_committing); spin_lock_init(&cil->xc_cil_lock); spin_lock_init(&cil->xc_push_lock); - init_waitqueue_head(&cil->xc_push_wait); init_rwsem(&cil->xc_ctx_lock); init_waitqueue_head(&cil->xc_commit_wait);
diff --git a/fs/xfs/xfs_log_priv.h b/fs/xfs/xfs_log_priv.h index 3a5d7fb..b880c23 100644 --- a/fs/xfs/xfs_log_priv.h +++ b/fs/xfs/xfs_log_priv.h
@@ -280,7 +280,6 @@ struct xfs_cil { wait_queue_head_t xc_commit_wait; xfs_lsn_t xc_current_sequence; struct work_struct xc_push_work; - wait_queue_head_t xc_push_wait; /* background push throttle */ } ____cacheline_aligned_in_smp; /* @@ -324,53 +323,13 @@ struct xfs_cil { * tries to keep 25% of the log free, so we need to keep below that limit or we * risk running out of free log space to start any new transactions. * - * In order to keep background CIL push efficient, we only need to ensure the - * CIL is large enough to maintain sufficient in-memory relogging to avoid - * repeated physical writes of frequently modified metadata. If we allow the CIL - * to grow to a substantial fraction of the log, then we may be pinning hundreds - * of megabytes of metadata in memory until the CIL flushes. This can cause - * issues when we are running low on memory - pinned memory cannot be reclaimed, - * and the CIL consumes a lot of memory. Hence we need to set an upper physical - * size limit for the CIL that limits the maximum amount of memory pinned by the - * CIL but does not limit performance by reducing relogging efficiency - * significantly. - * - * As such, the CIL push threshold ends up being the smaller of two thresholds: - * - a threshold large enough that it allows CIL to be pushed and progress to be - * made without excessive blocking of incoming transaction commits. This is - * defined to be 12.5% of the log space - half the 25% push threshold of the - * AIL. - * - small enough that it doesn't pin excessive amounts of memory but maintains - * close to peak relogging efficiency. This is defined to be 16x the iclog - * buffer window (32MB) as measurements have shown this to be roughly the - * point of diminishing performance increases under highly concurrent - * modification workloads. - * - * To prevent the CIL from overflowing upper commit size bounds, we introduce a - * new threshold at which we block committing transactions until the background - * CIL commit commences and switches to a new context. While this is not a hard - * limit, it forces the process committing a transaction to the CIL to block and - * yeild the CPU, giving the CIL push work a chance to be scheduled and start - * work. This prevents a process running lots of transactions from overfilling - * the CIL because it is not yielding the CPU. We set the blocking limit at - * twice the background push space threshold so we keep in line with the AIL - * push thresholds. - * - * Note: this is not a -hard- limit as blocking is applied after the transaction - * is inserted into the CIL and the push has been triggered. It is largely a - * throttling mechanism that allows the CIL push to be scheduled and run. A hard - * limit will be difficult to implement without introducing global serialisation - * in the CIL commit fast path, and it's not at all clear that we actually need - * such hard limits given the ~7 years we've run without a hard limit before - * finding the first situation where a checkpoint size overflow actually - * occurred. Hence the simple throttle, and an ASSERT check to tell us that - * we've overrun the max size. + * In order to keep background CIL push efficient, we will set a lower + * threshold at which background pushing is attempted without blocking current + * transaction commits. A separate, higher bound defines when CIL pushes are + * enforced to ensure we stay within our maximum checkpoint size bounds. + * threshold, yet give us plenty of space for aggregation on large logs. */ -#define XLOG_CIL_SPACE_LIMIT(log) \ - min_t(int, (log)->l_logsize >> 3, BBTOB(XLOG_TOTAL_REC_SHIFT(log)) << 4) - -#define XLOG_CIL_BLOCKING_SPACE_LIMIT(log) \ - (XLOG_CIL_SPACE_LIMIT(log) * 2) +#define XLOG_CIL_SPACE_LIMIT(log) (log->l_logsize >> 3) /* * ticket grant locks, queues and accounting have their own cachlines
diff --git a/fs/xfs/xfs_log_recover.c b/fs/xfs/xfs_log_recover.c index 84f6c86..c1a514f 100644 --- a/fs/xfs/xfs_log_recover.c +++ b/fs/xfs/xfs_log_recover.c
@@ -471,7 +471,7 @@ xlog_find_verify_log_record( xfs_warn(log->l_mp, "Log inconsistent (didn't find previous header)"); ASSERT(0); - error = -EFSCORRUPTED; + error = -EIO; goto out; } @@ -1347,11 +1347,10 @@ xlog_find_tail( error = xlog_rseek_logrec_hdr(log, *head_blk, *head_blk, 1, buffer, &rhead_blk, &rhead, &wrapped); if (error < 0) - goto done; + return error; if (!error) { xfs_warn(log->l_mp, "%s: couldn't find sync record", __func__); - error = -EFSCORRUPTED; - goto done; + return -EIO; } *tail_blk = BLOCK_LSN(be64_to_cpu(rhead->h_tail_lsn)); @@ -2206,8 +2205,6 @@ xlog_recover_get_buf_lsn( case XFS_ABTC_MAGIC: case XFS_RMAP_CRC_MAGIC: case XFS_REFC_CRC_MAGIC: - case XFS_FIBT_CRC_MAGIC: - case XFS_FIBT_MAGIC: case XFS_IBT_CRC_MAGIC: case XFS_IBT_MAGIC: { struct xfs_btree_block *btb = blk; @@ -2579,7 +2576,6 @@ xlog_recover_do_reg_buffer( int bit; int nbits; xfs_failaddr_t fa; - const size_t size_disk_dquot = sizeof(struct xfs_disk_dquot); trace_xfs_log_recover_buf_reg_buf(mp->m_log, buf_f); @@ -2622,7 +2618,7 @@ xlog_recover_do_reg_buffer( "XFS: NULL dquot in %s.", __func__); goto next; } - if (item->ri_buf[i].i_len < size_disk_dquot) { + if (item->ri_buf[i].i_len < sizeof(xfs_disk_dquot_t)) { xfs_alert(mp, "XFS: dquot too small (%d) in %s.", item->ri_buf[i].i_len, __func__); @@ -2879,8 +2875,8 @@ xfs_recover_inode_owner_change( return -ENOMEM; /* instantiate the inode */ - ASSERT(dip->di_version >= 3); xfs_inode_from_disk(ip, dip); + ASSERT(ip->i_d.di_version >= 3); error = xfs_iformat_fork(ip, dip); if (error) @@ -3018,7 +3014,7 @@ xlog_recover_inode_pass2( * superblock flag to determine whether we need to look at di_flushiter * to skip replay when the on disk inode is newer than the log one */ - if (!xfs_sb_version_has_v3inode(&mp->m_sb) && + if (!xfs_sb_version_hascrc(&mp->m_sb) && ldip->di_flushiter < be16_to_cpu(dip->di_flushiter)) { /* * Deal with the wrap case, DI_MAX_FLUSH is less @@ -3089,7 +3085,7 @@ xlog_recover_inode_pass2( error = -EFSCORRUPTED; goto out_release; } - isize = xfs_log_dinode_size(mp); + isize = xfs_log_dinode_size(ldip->di_version); if (unlikely(item->ri_buf[1].i_len > isize)) { XFS_CORRUPTION_ERROR("xlog_recover_inode_pass2(7)", XFS_ERRLEVEL_LOW, mp, ldip, @@ -3170,7 +3166,7 @@ xlog_recover_inode_pass2( default: xfs_warn(log->l_mp, "%s: Invalid flag", __func__); ASSERT(0); - error = -EFSCORRUPTED; + error = -EIO; goto out_release; } } @@ -3251,12 +3247,12 @@ xlog_recover_dquot_pass2( recddq = item->ri_buf[1].i_addr; if (recddq == NULL) { xfs_alert(log->l_mp, "NULL dquot in %s.", __func__); - return -EFSCORRUPTED; + return -EIO; } - if (item->ri_buf[1].i_len < sizeof(struct xfs_disk_dquot)) { + if (item->ri_buf[1].i_len < sizeof(xfs_disk_dquot_t)) { xfs_alert(log->l_mp, "dquot too small (%d) in %s.", item->ri_buf[1].i_len, __func__); - return -EFSCORRUPTED; + return -EIO; } /* @@ -3283,7 +3279,7 @@ xlog_recover_dquot_pass2( if (fa) { xfs_alert(mp, "corrupt dquot ID 0x%x in log at %pS", dq_f->qlf_id, fa); - return -EFSCORRUPTED; + return -EIO; } ASSERT(dq_f->qlf_len == 1); @@ -3386,7 +3382,7 @@ xlog_recover_efd_pass2( struct xlog_recover_item *item) { xfs_efd_log_format_t *efd_formatp; - struct xfs_efi_log_item *efip = NULL; + xfs_efi_log_item_t *efip = NULL; struct xfs_log_item *lip; uint64_t efi_id; struct xfs_ail_cursor cur; @@ -3407,7 +3403,7 @@ xlog_recover_efd_pass2( lip = xfs_trans_ail_cursor_first(ailp, &cur, 0); while (lip != NULL) { if (lip->li_type == XFS_LI_EFI) { - efip = (struct xfs_efi_log_item *)lip; + efip = (xfs_efi_log_item_t *)lip; if (efip->efi_format.efi_id == efi_id) { /* * Drop the EFD reference to the EFI. This @@ -3541,7 +3537,6 @@ xfs_cui_copy_format( memcpy(dst_cui_fmt, src_cui_fmt, len); return 0; } - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); return -EFSCORRUPTED; } @@ -3606,10 +3601,8 @@ xlog_recover_cud_pass2( struct xfs_ail *ailp = log->l_ailp; cud_formatp = item->ri_buf[0].i_addr; - if (item->ri_buf[0].i_len != sizeof(struct xfs_cud_log_format)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + if (item->ri_buf[0].i_len != sizeof(struct xfs_cud_log_format)) return -EFSCORRUPTED; - } cui_id = cud_formatp->cud_cui_id; /* @@ -3661,7 +3654,6 @@ xfs_bui_copy_format( memcpy(dst_bui_fmt, src_bui_fmt, len); return 0; } - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); return -EFSCORRUPTED; } @@ -3685,10 +3677,8 @@ xlog_recover_bui_pass2( bui_formatp = item->ri_buf[0].i_addr; - if (bui_formatp->bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + if (bui_formatp->bui_nextents != XFS_BUI_MAX_FAST_EXTENTS) return -EFSCORRUPTED; - } buip = xfs_bui_init(mp); error = xfs_bui_copy_format(&item->ri_buf[0], &buip->bui_format); if (error) { @@ -3730,10 +3720,8 @@ xlog_recover_bud_pass2( struct xfs_ail *ailp = log->l_ailp; bud_formatp = item->ri_buf[0].i_addr; - if (item->ri_buf[0].i_len != sizeof(struct xfs_bud_log_format)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + if (item->ri_buf[0].i_len != sizeof(struct xfs_bud_log_format)) return -EFSCORRUPTED; - } bui_id = bud_formatp->bud_bui_id; /* @@ -4030,7 +4018,7 @@ xlog_recover_commit_pass1( xfs_warn(log->l_mp, "%s: invalid item type (%d)", __func__, ITEM_TYPE(item)); ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } } @@ -4078,7 +4066,7 @@ xlog_recover_commit_pass2( xfs_warn(log->l_mp, "%s: invalid item type (%d)", __func__, ITEM_TYPE(item)); ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } } @@ -4199,7 +4187,7 @@ xlog_recover_add_to_cont_trans( ASSERT(len <= sizeof(struct xfs_trans_header)); if (len > sizeof(struct xfs_trans_header)) { xfs_warn(log->l_mp, "%s: bad header length", __func__); - return -EFSCORRUPTED; + return -EIO; } xlog_recover_add_item(&trans->r_itemq); @@ -4255,13 +4243,13 @@ xlog_recover_add_to_trans( xfs_warn(log->l_mp, "%s: bad header magic number", __func__); ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } if (len > sizeof(struct xfs_trans_header)) { xfs_warn(log->l_mp, "%s: bad header length", __func__); ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } /* @@ -4297,7 +4285,7 @@ xlog_recover_add_to_trans( in_f->ilf_size); ASSERT(0); kmem_free(ptr); - return -EFSCORRUPTED; + return -EIO; } item->ri_total = in_f->ilf_size; @@ -4305,16 +4293,7 @@ xlog_recover_add_to_trans( kmem_zalloc(item->ri_total * sizeof(xfs_log_iovec_t), 0); } - - if (item->ri_total <= item->ri_cnt) { - xfs_warn(log->l_mp, - "log item region count (%d) overflowed size (%d)", - item->ri_cnt, item->ri_total); - ASSERT(0); - kmem_free(ptr); - return -EFSCORRUPTED; - } - + ASSERT(item->ri_total > item->ri_cnt); /* Description region is ri_buf[0] */ item->ri_buf[item->ri_cnt].i_addr = ptr; item->ri_buf[item->ri_cnt].i_len = len; @@ -4401,7 +4380,7 @@ xlog_recovery_process_trans( default: xfs_warn(log->l_mp, "%s: bad flag 0x%x", __func__, flags); ASSERT(0); - error = -EFSCORRUPTED; + error = -EIO; break; } if (error || freeit) @@ -4481,7 +4460,7 @@ xlog_recover_process_ophdr( xfs_warn(log->l_mp, "%s: bad clientid 0x%x", __func__, ohead->oh_clientid); ASSERT(0); - return -EFSCORRUPTED; + return -EIO; } /* @@ -4491,7 +4470,7 @@ xlog_recover_process_ophdr( if (dp + len > end) { xfs_warn(log->l_mp, "%s: bad length 0x%x", __func__, len); WARN_ON(1); - return -EFSCORRUPTED; + return -EIO; } trans = xlog_recover_ophdr_to_trans(rhash, rhead, ohead); @@ -4587,9 +4566,9 @@ xlog_recover_process_data( /* Recover the EFI if necessary. */ STATIC int xlog_recover_process_efi( + struct xfs_mount *mp, struct xfs_ail *ailp, - struct xfs_log_item *lip, - struct list_head *capture_list) + struct xfs_log_item *lip) { struct xfs_efi_log_item *efip; int error; @@ -4602,7 +4581,7 @@ xlog_recover_process_efi( return 0; spin_unlock(&ailp->ail_lock); - error = xfs_efi_recover(efip, capture_list); + error = xfs_efi_recover(mp, efip); spin_lock(&ailp->ail_lock); return error; @@ -4627,9 +4606,9 @@ xlog_recover_cancel_efi( /* Recover the RUI if necessary. */ STATIC int xlog_recover_process_rui( + struct xfs_mount *mp, struct xfs_ail *ailp, - struct xfs_log_item *lip, - struct list_head *capture_list) + struct xfs_log_item *lip) { struct xfs_rui_log_item *ruip; int error; @@ -4642,7 +4621,7 @@ xlog_recover_process_rui( return 0; spin_unlock(&ailp->ail_lock); - error = xfs_rui_recover(ruip, capture_list); + error = xfs_rui_recover(mp, ruip); spin_lock(&ailp->ail_lock); return error; @@ -4667,9 +4646,9 @@ xlog_recover_cancel_rui( /* Recover the CUI if necessary. */ STATIC int xlog_recover_process_cui( + struct xfs_trans *parent_tp, struct xfs_ail *ailp, - struct xfs_log_item *lip, - struct list_head *capture_list) + struct xfs_log_item *lip) { struct xfs_cui_log_item *cuip; int error; @@ -4682,7 +4661,7 @@ xlog_recover_process_cui( return 0; spin_unlock(&ailp->ail_lock); - error = xfs_cui_recover(cuip, capture_list); + error = xfs_cui_recover(parent_tp, cuip); spin_lock(&ailp->ail_lock); return error; @@ -4707,9 +4686,9 @@ xlog_recover_cancel_cui( /* Recover the BUI if necessary. */ STATIC int xlog_recover_process_bui( + struct xfs_trans *parent_tp, struct xfs_ail *ailp, - struct xfs_log_item *lip, - struct list_head *capture_list) + struct xfs_log_item *lip) { struct xfs_bui_log_item *buip; int error; @@ -4722,7 +4701,7 @@ xlog_recover_process_bui( return 0; spin_unlock(&ailp->ail_lock); - error = xfs_bui_recover(buip, capture_list); + error = xfs_bui_recover(parent_tp, buip); spin_lock(&ailp->ail_lock); return error; @@ -4761,66 +4740,37 @@ static inline bool xlog_item_is_intent(struct xfs_log_item *lip) /* Take all the collected deferred ops and finish them in order. */ static int xlog_finish_defer_ops( - struct xfs_mount *mp, - struct list_head *capture_list) + struct xfs_trans *parent_tp) { - struct xfs_defer_capture *dfc, *next; + struct xfs_mount *mp = parent_tp->t_mountp; struct xfs_trans *tp; - struct xfs_inode *ip; - int error = 0; + int64_t freeblks; + uint resblks; + int error; - list_for_each_entry_safe(dfc, next, capture_list, dfc_list) { - struct xfs_trans_res resv; + /* + * We're finishing the defer_ops that accumulated as a result of + * recovering unfinished intent items during log recovery. We + * reserve an itruncate transaction because it is the largest + * permanent transaction type. Since we're the only user of the fs + * right now, take 93% (15/16) of the available free blocks. Use + * weird math to avoid a 64-bit division. + */ + freeblks = percpu_counter_sum(&mp->m_fdblocks); + if (freeblks <= 0) + return -ENOSPC; + resblks = min_t(int64_t, UINT_MAX, freeblks); + resblks = (resblks * 15) >> 4; + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_itruncate, resblks, + 0, XFS_TRANS_RESERVE, &tp); + if (error) + return error; + /* transfer all collected dfops to this transaction */ + xfs_defer_move(tp, parent_tp); - /* - * Create a new transaction reservation from the captured - * information. Set logcount to 1 to force the new transaction - * to regrant every roll so that we can make forward progress - * in recovery no matter how full the log might be. - */ - resv.tr_logres = dfc->dfc_logres; - resv.tr_logcount = 1; - resv.tr_logflags = XFS_TRANS_PERM_LOG_RES; - - error = xfs_trans_alloc(mp, &resv, dfc->dfc_blkres, - dfc->dfc_rtxres, XFS_TRANS_RESERVE, &tp); - if (error) - return error; - - /* - * Transfer to this new transaction all the dfops we captured - * from recovering a single intent item. - */ - list_del_init(&dfc->dfc_list); - xfs_defer_ops_continue(dfc, tp, &ip); - - error = xfs_trans_commit(tp); - if (ip) { - xfs_iunlock(ip, XFS_ILOCK_EXCL); - xfs_irele(ip); - } - if (error) - return error; - } - - ASSERT(list_empty(capture_list)); - return 0; + return xfs_trans_commit(tp); } -/* Release all the captured defer ops and capture structures in this list. */ -static void -xlog_abort_defer_ops( - struct xfs_mount *mp, - struct list_head *capture_list) -{ - struct xfs_defer_capture *dfc; - struct xfs_defer_capture *next; - - list_for_each_entry_safe(dfc, next, capture_list, dfc_list) { - list_del_init(&dfc->dfc_list); - xfs_defer_ops_release(mp, dfc); - } -} /* * When this is called, all of the log intent items which did not have * corresponding log done items should be in the AIL. What we do now @@ -4841,23 +4791,35 @@ STATIC int xlog_recover_process_intents( struct xlog *log) { - LIST_HEAD(capture_list); + struct xfs_trans *parent_tp; struct xfs_ail_cursor cur; struct xfs_log_item *lip; struct xfs_ail *ailp; - int error = 0; + int error; #if defined(DEBUG) || defined(XFS_WARN) xfs_lsn_t last_lsn; #endif + /* + * The intent recovery handlers commit transactions to complete recovery + * for individual intents, but any new deferred operations that are + * queued during that process are held off until the very end. The + * purpose of this transaction is to serve as a container for deferred + * operations. Each intent recovery handler must transfer dfops here + * before its local transaction commits, and we'll finish the entire + * list below. + */ + error = xfs_trans_alloc_empty(log->l_mp, &parent_tp); + if (error) + return error; + ailp = log->l_ailp; spin_lock(&ailp->ail_lock); + lip = xfs_trans_ail_cursor_first(ailp, &cur, 0); #if defined(DEBUG) || defined(XFS_WARN) last_lsn = xlog_assign_lsn(log->l_curr_cycle, log->l_curr_block); #endif - for (lip = xfs_trans_ail_cursor_first(ailp, &cur, 0); - lip != NULL; - lip = xfs_trans_ail_cursor_next(ailp, &cur)) { + while (lip != NULL) { /* * We're done when we see something other than an intent. * There should be no intents left in the AIL now. @@ -4879,40 +4841,35 @@ xlog_recover_process_intents( /* * NOTE: If your intent processing routine can create more - * deferred ops, you /must/ attach them to the capture list in - * the recover routine or else those subsequent intents will be + * deferred ops, you /must/ attach them to the dfops in this + * routine or else those subsequent intents will get * replayed in the wrong order! */ switch (lip->li_type) { case XFS_LI_EFI: - error = xlog_recover_process_efi(ailp, lip, &capture_list); + error = xlog_recover_process_efi(log->l_mp, ailp, lip); break; case XFS_LI_RUI: - error = xlog_recover_process_rui(ailp, lip, &capture_list); + error = xlog_recover_process_rui(log->l_mp, ailp, lip); break; case XFS_LI_CUI: - error = xlog_recover_process_cui(ailp, lip, &capture_list); + error = xlog_recover_process_cui(parent_tp, ailp, lip); break; case XFS_LI_BUI: - error = xlog_recover_process_bui(ailp, lip, &capture_list); + error = xlog_recover_process_bui(parent_tp, ailp, lip); break; } if (error) - break; + goto out; + lip = xfs_trans_ail_cursor_next(ailp, &cur); } - +out: xfs_trans_ail_cursor_done(&cur); spin_unlock(&ailp->ail_lock); - if (error) - goto err; + if (!error) + error = xlog_finish_defer_ops(parent_tp); + xfs_trans_cancel(parent_tp); - error = xlog_finish_defer_ops(log->l_mp, &capture_list); - if (error) - goto err; - - return 0; -err: - xlog_abort_defer_ops(log->l_mp, &capture_list); return error; } @@ -5215,10 +5172,8 @@ xlog_recover_process( * If the filesystem is CRC enabled, this mismatch becomes a * fatal log corruption failure. */ - if (xfs_sb_version_hascrc(&log->l_mp->m_sb)) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, log->l_mp); + if (xfs_sb_version_hascrc(&log->l_mp->m_sb)) return -EFSCORRUPTED; - } } xlog_unpack_data(rhead, dp, log); @@ -5245,7 +5200,7 @@ xlog_valid_rec_header( (be32_to_cpu(rhead->h_version) & (~XLOG_VERSION_OKBITS))))) { xfs_warn(log->l_mp, "%s: unrecognised log version (%d).", __func__, be32_to_cpu(rhead->h_version)); - return -EFSCORRUPTED; + return -EIO; } /* LR body must have data or it wouldn't have been written */ @@ -5341,12 +5296,8 @@ xlog_do_recovery_pass( "invalid iclog size (%d bytes), using lsunit (%d bytes)", h_size, log->l_mp->m_logbsize); h_size = log->l_mp->m_logbsize; - } else { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, - log->l_mp); - error = -EFSCORRUPTED; - goto bread_err1; - } + } else + return -EFSCORRUPTED; } if ((be32_to_cpu(rhead->h_version) & XLOG_VERSION_2) &&
diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c index c57e8ad..9804efe 100644 --- a/fs/xfs/xfs_message.c +++ b/fs/xfs/xfs_message.c
@@ -105,7 +105,7 @@ assfail(char *expr, char *file, int line) } void -xfs_hex_dump(const void *p, int length) +xfs_hex_dump(void *p, int length) { print_hex_dump(KERN_ALERT, "", DUMP_PREFIX_OFFSET, 16, 1, p, length, 1); }
diff --git a/fs/xfs/xfs_message.h b/fs/xfs/xfs_message.h index 7f040b0..34447dc 100644 --- a/fs/xfs/xfs_message.h +++ b/fs/xfs/xfs_message.h
@@ -60,6 +60,6 @@ do { \ extern void assfail(char *expr, char *f, int l); extern void asswarn(char *expr, char *f, int l); -extern void xfs_hex_dump(const void *p, int length); +extern void xfs_hex_dump(void *p, int length); #endif /* __XFS_MESSAGE_H */
diff --git a/fs/xfs/xfs_mount.c b/fs/xfs/xfs_mount.c index 2277f21..5a0ce0c 100644 --- a/fs/xfs/xfs_mount.c +++ b/fs/xfs/xfs_mount.c
@@ -31,7 +31,7 @@ #include "xfs_reflink.h" #include "xfs_extent_busy.h" #include "xfs_health.h" -#include "xfs_trace.h" + static DEFINE_MUTEX(xfs_uuid_table_mutex); static int xfs_uuid_table_size; @@ -365,119 +365,66 @@ xfs_readsb( } /* - * If the sunit/swidth change would move the precomputed root inode value, we - * must reject the ondisk change because repair will stumble over that. - * However, we allow the mount to proceed because we never rejected this - * combination before. Returns true to update the sb, false otherwise. - */ -static inline int -xfs_check_new_dalign( - struct xfs_mount *mp, - int new_dalign, - bool *update_sb) -{ - struct xfs_sb *sbp = &mp->m_sb; - xfs_ino_t calc_ino; - - calc_ino = xfs_ialloc_calc_rootino(mp, new_dalign); - trace_xfs_check_new_dalign(mp, new_dalign, calc_ino); - - if (sbp->sb_rootino == calc_ino) { - *update_sb = true; - return 0; - } - - xfs_warn(mp, -"Cannot change stripe alignment; would require moving root inode."); - - /* - * XXX: Next time we add a new incompat feature, this should start - * returning -EINVAL to fail the mount. Until then, spit out a warning - * that we're ignoring the administrator's instructions. - */ - xfs_warn(mp, "Skipping superblock stripe alignment update."); - *update_sb = false; - return 0; -} - -/* - * If we were provided with new sunit/swidth values as mount options, make sure - * that they pass basic alignment and superblock feature checks, and convert - * them into the same units (FSB) that everything else expects. This step - * /must/ be done before computing the inode geometry. + * Update alignment values based on mount options and sb values */ STATIC int -xfs_validate_new_dalign( - struct xfs_mount *mp) +xfs_update_alignment(xfs_mount_t *mp) { - if (mp->m_dalign == 0) - return 0; - - /* - * If stripe unit and stripe width are not multiples - * of the fs blocksize turn off alignment. - */ - if ((BBTOB(mp->m_dalign) & mp->m_blockmask) || - (BBTOB(mp->m_swidth) & mp->m_blockmask)) { - xfs_warn(mp, - "alignment check failed: sunit/swidth vs. blocksize(%d)", - mp->m_sb.sb_blocksize); - return -EINVAL; - } else { - /* - * Convert the stripe unit and width to FSBs. - */ - mp->m_dalign = XFS_BB_TO_FSBT(mp, mp->m_dalign); - if (mp->m_dalign && (mp->m_sb.sb_agblocks % mp->m_dalign)) { - xfs_warn(mp, - "alignment check failed: sunit/swidth vs. agsize(%d)", - mp->m_sb.sb_agblocks); - return -EINVAL; - } else if (mp->m_dalign) { - mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth); - } else { - xfs_warn(mp, - "alignment check failed: sunit(%d) less than bsize(%d)", - mp->m_dalign, mp->m_sb.sb_blocksize); - return -EINVAL; - } - } - - if (!xfs_sb_version_hasdalign(&mp->m_sb)) { - xfs_warn(mp, -"cannot change alignment: superblock does not support data alignment"); - return -EINVAL; - } - - return 0; -} - -/* Update alignment values based on mount options and sb values. */ -STATIC int -xfs_update_alignment( - struct xfs_mount *mp) -{ - struct xfs_sb *sbp = &mp->m_sb; + xfs_sb_t *sbp = &(mp->m_sb); if (mp->m_dalign) { - bool update_sb; - int error; + /* + * If stripe unit and stripe width are not multiples + * of the fs blocksize turn off alignment. + */ + if ((BBTOB(mp->m_dalign) & mp->m_blockmask) || + (BBTOB(mp->m_swidth) & mp->m_blockmask)) { + xfs_warn(mp, + "alignment check failed: sunit/swidth vs. blocksize(%d)", + sbp->sb_blocksize); + return -EINVAL; + } else { + /* + * Convert the stripe unit and width to FSBs. + */ + mp->m_dalign = XFS_BB_TO_FSBT(mp, mp->m_dalign); + if (mp->m_dalign && (sbp->sb_agblocks % mp->m_dalign)) { + xfs_warn(mp, + "alignment check failed: sunit/swidth vs. agsize(%d)", + sbp->sb_agblocks); + return -EINVAL; + } else if (mp->m_dalign) { + mp->m_swidth = XFS_BB_TO_FSBT(mp, mp->m_swidth); + } else { + xfs_warn(mp, + "alignment check failed: sunit(%d) less than bsize(%d)", + mp->m_dalign, sbp->sb_blocksize); + return -EINVAL; + } + } - if (sbp->sb_unit == mp->m_dalign && - sbp->sb_width == mp->m_swidth) - return 0; - - error = xfs_check_new_dalign(mp, mp->m_dalign, &update_sb); - if (error || !update_sb) - return error; - - sbp->sb_unit = mp->m_dalign; - sbp->sb_width = mp->m_swidth; - mp->m_update_sb = true; + /* + * Update superblock with new values + * and log changes + */ + if (xfs_sb_version_hasdalign(sbp)) { + if (sbp->sb_unit != mp->m_dalign) { + sbp->sb_unit = mp->m_dalign; + mp->m_update_sb = true; + } + if (sbp->sb_width != mp->m_swidth) { + sbp->sb_width = mp->m_swidth; + mp->m_update_sb = true; + } + } else { + xfs_warn(mp, + "cannot change alignment: superblock does not support data alignment"); + return -EINVAL; + } } else if ((mp->m_flags & XFS_MOUNT_NOALIGN) != XFS_MOUNT_NOALIGN && xfs_sb_version_hasdalign(&mp->m_sb)) { - mp->m_dalign = sbp->sb_unit; - mp->m_swidth = sbp->sb_width; + mp->m_dalign = sbp->sb_unit; + mp->m_swidth = sbp->sb_width; } return 0; @@ -675,47 +622,6 @@ xfs_check_summary_counts( } /* - * Flush and reclaim dirty inodes in preparation for unmount. Inodes and - * internal inode structures can be sitting in the CIL and AIL at this point, - * so we need to unpin them, write them back and/or reclaim them before unmount - * can proceed. - * - * An inode cluster that has been freed can have its buffer still pinned in - * memory because the transaction is still sitting in a iclog. The stale inodes - * on that buffer will be pinned to the buffer until the transaction hits the - * disk and the callbacks run. Pushing the AIL will skip the stale inodes and - * may never see the pinned buffer, so nothing will push out the iclog and - * unpin the buffer. - * - * Hence we need to force the log to unpin everything first. However, log - * forces don't wait for the discards they issue to complete, so we have to - * explicitly wait for them to complete here as well. - * - * Then we can tell the world we are unmounting so that error handling knows - * that the filesystem is going away and we should error out anything that we - * have been retrying in the background. This will prevent never-ending - * retries in AIL pushing from hanging the unmount. - * - * Finally, we can push the AIL to clean all the remaining dirty objects, then - * reclaim the remaining inodes that are still in memory at this point in time. - */ -static void -xfs_unmount_flush_inodes( - struct xfs_mount *mp) -{ - xfs_log_force(mp, XFS_LOG_SYNC); - xfs_extent_busy_wait_all(mp); - flush_workqueue(xfs_discard_wq); - - mp->m_flags |= XFS_MOUNT_UNMOUNTING; - - xfs_ail_push_all_sync(mp->m_ail); - cancel_delayed_work_sync(&mp->m_reclaim_work); - xfs_reclaim_inodes(mp, SYNC_WAIT); - xfs_health_unmount(mp); -} - -/* * This function does the following on an initial mount of a file system: * - reads the superblock from disk and init the mount struct * - if we're a 32-bit kernel, do a size check on the superblock @@ -786,12 +692,12 @@ xfs_mountfs( } /* - * If we were given new sunit/swidth options, do some basic validation - * checks and convert the incore dalign and swidth values to the - * same units (FSB) that everything else uses. This /must/ happen - * before computing the inode geometry. + * Check if sb_agblocks is aligned at stripe boundary + * If sb_agblocks is NOT aligned turn off m_dalign since + * allocator alignment is within an ag, therefore ag has + * to be aligned at stripe boundary. */ - error = xfs_validate_new_dalign(mp); + error = xfs_update_alignment(mp); if (error) goto out; @@ -802,17 +708,6 @@ xfs_mountfs( xfs_rmapbt_compute_maxlevels(mp); xfs_refcountbt_compute_maxlevels(mp); - /* - * Check if sb_agblocks is aligned at stripe boundary. If sb_agblocks - * is NOT aligned turn off m_dalign since allocator alignment is within - * an ag, therefore ag has to be aligned at stripe boundary. Note that - * we must compute the free space and rmap btree geometry before doing - * this. - */ - error = xfs_update_alignment(mp); - if (error) - goto out; - /* enable fail_at_unmount as default */ mp->m_fail_unmount = true; @@ -1088,7 +983,7 @@ xfs_mountfs( /* Clean out dquots that might be in memory after quotacheck. */ xfs_qm_unmount(mp); /* - * Flush all inode reclamation work and flush the log. + * Cancel all delayed reclaim work and reclaim the inodes directly. * We have to do this /after/ rtunmount and qm_unmount because those * two will have scheduled delayed reclaim for the rt/quota inodes. * @@ -1098,8 +993,11 @@ xfs_mountfs( * qm_unmount_quotas and therefore rely on qm_unmount to release the * quota inodes. */ - xfs_unmount_flush_inodes(mp); + cancel_delayed_work_sync(&mp->m_reclaim_work); + xfs_reclaim_inodes(mp, SYNC_WAIT); + xfs_health_unmount(mp); out_log_dealloc: + mp->m_flags |= XFS_MOUNT_UNMOUNTING; xfs_log_mount_cancel(mp); out_fail_wait: if (mp->m_logdev_targp && mp->m_logdev_targp != mp->m_ddev_targp) @@ -1140,7 +1038,47 @@ xfs_unmountfs( xfs_rtunmount_inodes(mp); xfs_irele(mp->m_rootip); - xfs_unmount_flush_inodes(mp); + /* + * We can potentially deadlock here if we have an inode cluster + * that has been freed has its buffer still pinned in memory because + * the transaction is still sitting in a iclog. The stale inodes + * on that buffer will have their flush locks held until the + * transaction hits the disk and the callbacks run. the inode + * flush takes the flush lock unconditionally and with nothing to + * push out the iclog we will never get that unlocked. hence we + * need to force the log first. + */ + xfs_log_force(mp, XFS_LOG_SYNC); + + /* + * Wait for all busy extents to be freed, including completion of + * any discard operation. + */ + xfs_extent_busy_wait_all(mp); + flush_workqueue(xfs_discard_wq); + + /* + * We now need to tell the world we are unmounting. This will allow + * us to detect that the filesystem is going away and we should error + * out anything that we have been retrying in the background. This will + * prevent neverending retries in AIL pushing from hanging the unmount. + */ + mp->m_flags |= XFS_MOUNT_UNMOUNTING; + + /* + * Flush all pending changes from the AIL. + */ + xfs_ail_push_all_sync(mp->m_ail); + + /* + * And reclaim all inodes. At this point there should be no dirty + * inodes and none should be pinned or locked, but use synchronous + * reclaim just to be sure. We can stop background inode reclaim + * here as well if it is still running. + */ + cancel_delayed_work_sync(&mp->m_reclaim_work); + xfs_reclaim_inodes(mp, SYNC_WAIT); + xfs_health_unmount(mp); xfs_qm_unmount(mp); @@ -1216,7 +1154,8 @@ xfs_fs_writable( int xfs_log_sbcount(xfs_mount_t *mp) { - if (!xfs_log_writable(mp)) + /* allow this to proceed during the freeze sequence... */ + if (!xfs_fs_writable(mp, SB_FREEZE_COMPLETE)) return 0; /*
diff --git a/fs/xfs/xfs_mount.h b/fs/xfs/xfs_mount.h index ca7e0c6..fdb60e0 100644 --- a/fs/xfs/xfs_mount.h +++ b/fs/xfs/xfs_mount.h
@@ -179,11 +179,6 @@ typedef struct xfs_mount { struct xfs_error_cfg m_error_cfg[XFS_ERR_CLASS_MAX][XFS_ERR_ERRNO_MAX]; struct xstats m_stats; /* per-fs stats */ - /* - * Workqueue item so that we can coalesce multiple inode flush attempts - * into a single flush. - */ - struct work_struct m_flush_inodes_work; struct workqueue_struct *m_buf_workqueue; struct workqueue_struct *m_unwritten_workqueue; struct workqueue_struct *m_cil_workqueue;
diff --git a/fs/xfs/xfs_pnfs.c b/fs/xfs/xfs_pnfs.c index 058af69..f63fe8d 100644 --- a/fs/xfs/xfs_pnfs.c +++ b/fs/xfs/xfs_pnfs.c
@@ -147,11 +147,11 @@ xfs_fs_map_blocks( if (error) goto out_unlock; - ASSERT(!nimaps || imap.br_startblock != DELAYSTARTBLOCK); - if (write) { enum xfs_prealloc_flags flags = 0; + ASSERT(imap.br_startblock != DELAYSTARTBLOCK); + if (!nimaps || imap.br_startblock == HOLESTARTBLOCK) { /* * xfs_iomap_write_direct() expects to take ownership of
diff --git a/fs/xfs/xfs_qm.c b/fs/xfs/xfs_qm.c index 6b108a4..ecd8ce1 100644 --- a/fs/xfs/xfs_qm.c +++ b/fs/xfs/xfs_qm.c
@@ -22,7 +22,6 @@ #include "xfs_qm.h" #include "xfs_trace.h" #include "xfs_icache.h" -#include "xfs_error.h" /* * The global quota manager. There is only one of these for the entire @@ -121,11 +120,12 @@ xfs_qm_dqpurge( { struct xfs_mount *mp = dqp->q_mount; struct xfs_quotainfo *qi = mp->m_quotainfo; - int error = -EAGAIN; xfs_dqlock(dqp); - if ((dqp->dq_flags & XFS_DQ_FREEING) || dqp->q_nrefs != 0) - goto out_unlock; + if ((dqp->dq_flags & XFS_DQ_FREEING) || dqp->q_nrefs != 0) { + xfs_dqunlock(dqp); + return -EAGAIN; + } dqp->dq_flags |= XFS_DQ_FREEING; @@ -138,6 +138,7 @@ xfs_qm_dqpurge( */ if (XFS_DQ_IS_DIRTY(dqp)) { struct xfs_buf *bp = NULL; + int error; /* * We don't care about getting disk errors here. We need @@ -147,9 +148,6 @@ xfs_qm_dqpurge( if (!error) { error = xfs_bwrite(bp); xfs_buf_relse(bp); - } else if (error == -EAGAIN) { - dqp->dq_flags &= ~XFS_DQ_FREEING; - goto out_unlock; } xfs_dqflock(dqp); } @@ -175,10 +173,6 @@ xfs_qm_dqpurge( xfs_qm_dqdestroy(dqp); return 0; - -out_unlock: - xfs_dqunlock(dqp); - return error; } /* @@ -249,14 +243,14 @@ xfs_qm_unmount_quotas( STATIC int xfs_qm_dqattach_one( - struct xfs_inode *ip, - xfs_dqid_t id, - uint type, - bool doalloc, - struct xfs_dquot **IO_idqpp) + xfs_inode_t *ip, + xfs_dqid_t id, + uint type, + bool doalloc, + xfs_dquot_t **IO_idqpp) { - struct xfs_dquot *dqp; - int error; + xfs_dquot_t *dqp; + int error; ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); error = 0; @@ -331,23 +325,23 @@ xfs_qm_dqattach_locked( ASSERT(xfs_isilocked(ip, XFS_ILOCK_EXCL)); if (XFS_IS_UQUOTA_ON(mp) && !ip->i_udquot) { - error = xfs_qm_dqattach_one(ip, i_uid_read(VFS_I(ip)), - XFS_DQ_USER, doalloc, &ip->i_udquot); + error = xfs_qm_dqattach_one(ip, ip->i_d.di_uid, XFS_DQ_USER, + doalloc, &ip->i_udquot); if (error) goto done; ASSERT(ip->i_udquot); } if (XFS_IS_GQUOTA_ON(mp) && !ip->i_gdquot) { - error = xfs_qm_dqattach_one(ip, i_gid_read(VFS_I(ip)), - XFS_DQ_GROUP, doalloc, &ip->i_gdquot); + error = xfs_qm_dqattach_one(ip, ip->i_d.di_gid, XFS_DQ_GROUP, + doalloc, &ip->i_gdquot); if (error) goto done; ASSERT(ip->i_gdquot); } if (XFS_IS_PQUOTA_ON(mp) && !ip->i_pdquot) { - error = xfs_qm_dqattach_one(ip, ip->i_d.di_projid, XFS_DQ_PROJ, + error = xfs_qm_dqattach_one(ip, xfs_get_projid(ip), XFS_DQ_PROJ, doalloc, &ip->i_pdquot); if (error) goto done; @@ -549,8 +543,8 @@ xfs_qm_set_defquota( uint type, xfs_quotainfo_t *qinf) { - struct xfs_dquot *dqp; - struct xfs_def_quota *defq; + xfs_dquot_t *dqp; + struct xfs_def_quota *defq; struct xfs_disk_dquot *ddqp; int error; @@ -760,19 +754,11 @@ xfs_qm_qino_alloc( if ((flags & XFS_QMOPT_PQUOTA) && (mp->m_sb.sb_gquotino != NULLFSINO)) { ino = mp->m_sb.sb_gquotino; - if (mp->m_sb.sb_pquotino != NULLFSINO) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, - mp); - return -EFSCORRUPTED; - } + ASSERT(mp->m_sb.sb_pquotino == NULLFSINO); } else if ((flags & XFS_QMOPT_GQUOTA) && (mp->m_sb.sb_pquotino != NULLFSINO)) { ino = mp->m_sb.sb_pquotino; - if (mp->m_sb.sb_gquotino != NULLFSINO) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, - mp); - return -EFSCORRUPTED; - } + ASSERT(mp->m_sb.sb_gquotino == NULLFSINO); } if (ino != NULLFSINO) { error = xfs_iget(mp, NULL, ino, 0, 0, ip); @@ -880,20 +866,12 @@ xfs_qm_reset_dqcounts( ddq->d_bcount = 0; ddq->d_icount = 0; ddq->d_rtbcount = 0; - - /* - * dquot id 0 stores the default grace period and the maximum - * warning limit that were set by the administrator, so we - * should not reset them. - */ - if (ddq->d_id != 0) { - ddq->d_btimer = 0; - ddq->d_itimer = 0; - ddq->d_rtbtimer = 0; - ddq->d_bwarns = 0; - ddq->d_iwarns = 0; - ddq->d_rtbwarns = 0; - } + ddq->d_btimer = 0; + ddq->d_itimer = 0; + ddq->d_rtbtimer = 0; + ddq->d_bwarns = 0; + ddq->d_iwarns = 0; + ddq->d_rtbwarns = 0; if (xfs_sb_version_hascrc(&mp->m_sb)) { xfs_update_cksum((char *)&dqb[j], @@ -1630,8 +1608,8 @@ xfs_qm_dqfree_one( int xfs_qm_vop_dqalloc( struct xfs_inode *ip, - kuid_t uid, - kgid_t gid, + xfs_dqid_t uid, + xfs_dqid_t gid, prid_t prid, uint flags, struct xfs_dquot **O_udqpp, @@ -1639,8 +1617,6 @@ xfs_qm_vop_dqalloc( struct xfs_dquot **O_pdqpp) { struct xfs_mount *mp = ip->i_mount; - struct inode *inode = VFS_I(ip); - struct user_namespace *user_ns = inode->i_sb->s_user_ns; struct xfs_dquot *uq = NULL; struct xfs_dquot *gq = NULL; struct xfs_dquot *pq = NULL; @@ -1654,7 +1630,7 @@ xfs_qm_vop_dqalloc( xfs_ilock(ip, lockflags); if ((flags & XFS_QMOPT_INHERIT) && XFS_INHERIT_GID(ip)) - gid = inode->i_gid; + gid = ip->i_d.di_gid; /* * Attach the dquot(s) to this inode, doing a dquot allocation @@ -1669,7 +1645,7 @@ xfs_qm_vop_dqalloc( } if ((flags & XFS_QMOPT_UQUOTA) && XFS_IS_UQUOTA_ON(mp)) { - if (!uid_eq(inode->i_uid, uid)) { + if (ip->i_d.di_uid != uid) { /* * What we need is the dquot that has this uid, and * if we send the inode to dqget, the uid of the inode @@ -1680,8 +1656,7 @@ xfs_qm_vop_dqalloc( * holding ilock. */ xfs_iunlock(ip, lockflags); - error = xfs_qm_dqget(mp, from_kuid(user_ns, uid), - XFS_DQ_USER, true, &uq); + error = xfs_qm_dqget(mp, uid, XFS_DQ_USER, true, &uq); if (error) { ASSERT(error != -ENOENT); return error; @@ -1702,10 +1677,9 @@ xfs_qm_vop_dqalloc( } } if ((flags & XFS_QMOPT_GQUOTA) && XFS_IS_GQUOTA_ON(mp)) { - if (!gid_eq(inode->i_gid, gid)) { + if (ip->i_d.di_gid != gid) { xfs_iunlock(ip, lockflags); - error = xfs_qm_dqget(mp, from_kgid(user_ns, gid), - XFS_DQ_GROUP, true, &gq); + error = xfs_qm_dqget(mp, gid, XFS_DQ_GROUP, true, &gq); if (error) { ASSERT(error != -ENOENT); goto error_rele; @@ -1719,7 +1693,7 @@ xfs_qm_vop_dqalloc( } } if ((flags & XFS_QMOPT_PQUOTA) && XFS_IS_PQUOTA_ON(mp)) { - if (ip->i_d.di_projid != prid) { + if (xfs_get_projid(ip) != prid) { xfs_iunlock(ip, lockflags); error = xfs_qm_dqget(mp, (xfs_dqid_t)prid, XFS_DQ_PROJ, true, &pq); @@ -1763,14 +1737,14 @@ xfs_qm_vop_dqalloc( * Actually transfer ownership, and do dquot modifications. * These were already reserved. */ -struct xfs_dquot * +xfs_dquot_t * xfs_qm_vop_chown( - struct xfs_trans *tp, - struct xfs_inode *ip, - struct xfs_dquot **IO_olddq, - struct xfs_dquot *newdq) + xfs_trans_t *tp, + xfs_inode_t *ip, + xfs_dquot_t **IO_olddq, + xfs_dquot_t *newdq) { - struct xfs_dquot *prevdq; + xfs_dquot_t *prevdq; uint bfield = XFS_IS_REALTIME_INODE(ip) ? XFS_TRANS_DQ_RTBCOUNT : XFS_TRANS_DQ_BCOUNT; @@ -1831,7 +1805,7 @@ xfs_qm_vop_chown_reserve( XFS_QMOPT_RES_RTBLKS : XFS_QMOPT_RES_REGBLKS; if (XFS_IS_UQUOTA_ON(mp) && udqp && - i_uid_read(VFS_I(ip)) != be32_to_cpu(udqp->q_core.d_id)) { + ip->i_d.di_uid != be32_to_cpu(udqp->q_core.d_id)) { udq_delblks = udqp; /* * If there are delayed allocation blocks, then we have to @@ -1844,7 +1818,7 @@ xfs_qm_vop_chown_reserve( } } if (XFS_IS_GQUOTA_ON(ip->i_mount) && gdqp && - i_gid_read(VFS_I(ip)) != be32_to_cpu(gdqp->q_core.d_id)) { + ip->i_d.di_gid != be32_to_cpu(gdqp->q_core.d_id)) { gdq_delblks = gdqp; if (delblks) { ASSERT(ip->i_gdquot); @@ -1853,7 +1827,7 @@ xfs_qm_vop_chown_reserve( } if (XFS_IS_PQUOTA_ON(ip->i_mount) && pdqp && - ip->i_d.di_projid != be32_to_cpu(pdqp->q_core.d_id)) { + xfs_get_projid(ip) != be32_to_cpu(pdqp->q_core.d_id)) { prjflags = XFS_QMOPT_ENOSPC; pdq_delblks = pdqp; if (delblks) { @@ -1941,21 +1915,20 @@ xfs_qm_vop_create_dqattach( if (udqp && XFS_IS_UQUOTA_ON(mp)) { ASSERT(ip->i_udquot == NULL); - ASSERT(i_uid_read(VFS_I(ip)) == be32_to_cpu(udqp->q_core.d_id)); + ASSERT(ip->i_d.di_uid == be32_to_cpu(udqp->q_core.d_id)); ip->i_udquot = xfs_qm_dqhold(udqp); xfs_trans_mod_dquot(tp, udqp, XFS_TRANS_DQ_ICOUNT, 1); } if (gdqp && XFS_IS_GQUOTA_ON(mp)) { ASSERT(ip->i_gdquot == NULL); - ASSERT(i_gid_read(VFS_I(ip)) == be32_to_cpu(gdqp->q_core.d_id)); - + ASSERT(ip->i_d.di_gid == be32_to_cpu(gdqp->q_core.d_id)); ip->i_gdquot = xfs_qm_dqhold(gdqp); xfs_trans_mod_dquot(tp, gdqp, XFS_TRANS_DQ_ICOUNT, 1); } if (pdqp && XFS_IS_PQUOTA_ON(mp)) { ASSERT(ip->i_pdquot == NULL); - ASSERT(ip->i_d.di_projid == be32_to_cpu(pdqp->q_core.d_id)); + ASSERT(xfs_get_projid(ip) == be32_to_cpu(pdqp->q_core.d_id)); ip->i_pdquot = xfs_qm_dqhold(pdqp); xfs_trans_mod_dquot(tp, pdqp, XFS_TRANS_DQ_ICOUNT, 1);
diff --git a/fs/xfs/xfs_qm_bhv.c b/fs/xfs/xfs_qm_bhv.c index fc2fa41..5d72e88 100644 --- a/fs/xfs/xfs_qm_bhv.c +++ b/fs/xfs/xfs_qm_bhv.c
@@ -54,13 +54,13 @@ xfs_fill_statvfs_from_dquot( */ void xfs_qm_statvfs( - struct xfs_inode *ip, + xfs_inode_t *ip, struct kstatfs *statp) { - struct xfs_mount *mp = ip->i_mount; - struct xfs_dquot *dqp; + xfs_mount_t *mp = ip->i_mount; + xfs_dquot_t *dqp; - if (!xfs_qm_dqget(mp, ip->i_d.di_projid, XFS_DQ_PROJ, false, &dqp)) { + if (!xfs_qm_dqget(mp, xfs_get_projid(ip), XFS_DQ_PROJ, false, &dqp)) { xfs_fill_statvfs_from_dquot(statp, dqp); xfs_qm_dqput(dqp); }
diff --git a/fs/xfs/xfs_qm_syscalls.c b/fs/xfs/xfs_qm_syscalls.c index 5d5ac65..da7ad03 100644 --- a/fs/xfs/xfs_qm_syscalls.c +++ b/fs/xfs/xfs_qm_syscalls.c
@@ -19,71 +19,9 @@ #include "xfs_qm.h" #include "xfs_icache.h" -STATIC int -xfs_qm_log_quotaoff( - struct xfs_mount *mp, - struct xfs_qoff_logitem **qoffstartp, - uint flags) -{ - struct xfs_trans *tp; - int error; - struct xfs_qoff_logitem *qoffi; - - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_quotaoff, 0, 0, 0, &tp); - if (error) - goto out; - - qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT); - xfs_trans_log_quotaoff_item(tp, qoffi); - - spin_lock(&mp->m_sb_lock); - mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL; - spin_unlock(&mp->m_sb_lock); - - xfs_log_sb(tp); - - /* - * We have to make sure that the transaction is secure on disk before we - * return and actually stop quota accounting. So, make it synchronous. - * We don't care about quotoff's performance. - */ - xfs_trans_set_sync(tp); - error = xfs_trans_commit(tp); - if (error) - goto out; - - *qoffstartp = qoffi; -out: - return error; -} - -STATIC int -xfs_qm_log_quotaoff_end( - struct xfs_mount *mp, - struct xfs_qoff_logitem **startqoff, - uint flags) -{ - struct xfs_trans *tp; - int error; - struct xfs_qoff_logitem *qoffi; - - error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp); - if (error) - return error; - - qoffi = xfs_trans_get_qoff_item(tp, *startqoff, - flags & XFS_ALL_QUOTA_ACCT); - xfs_trans_log_quotaoff_item(tp, qoffi); - *startqoff = NULL; - - /* - * We have to make sure that the transaction is secure on disk before we - * return and actually stop quota accounting. So, make it synchronous. - * We don't care about quotoff's performance. - */ - xfs_trans_set_sync(tp); - return xfs_trans_commit(tp); -} +STATIC int xfs_qm_log_quotaoff(xfs_mount_t *, xfs_qoff_logitem_t **, uint); +STATIC int xfs_qm_log_quotaoff_end(xfs_mount_t *, xfs_qoff_logitem_t *, + uint); /* * Turn off quota accounting and/or enforcement for all udquots and/or @@ -102,7 +40,7 @@ xfs_qm_scall_quotaoff( uint dqtype; int error; uint inactivate_flags; - struct xfs_qoff_logitem *qoffstart = NULL; + xfs_qoff_logitem_t *qoffstart; /* * No file system can have quotas enabled on disk but not in core. @@ -227,7 +165,7 @@ xfs_qm_scall_quotaoff( * So, we have QUOTAOFF start and end logitems; the start * logitem won't get overwritten until the end logitem appears... */ - error = xfs_qm_log_quotaoff_end(mp, &qoffstart, flags); + error = xfs_qm_log_quotaoff_end(mp, qoffstart, flags); if (error) { /* We're screwed now. Shutdown is the only option. */ xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); @@ -260,8 +198,6 @@ xfs_qm_scall_quotaoff( } out_unlock: - if (error && qoffstart) - xfs_qm_qoff_logitem_relse(qoffstart); mutex_unlock(&q->qi_quotaofflock); return error; } @@ -602,6 +538,74 @@ xfs_qm_scall_setqlim( return error; } +STATIC int +xfs_qm_log_quotaoff_end( + xfs_mount_t *mp, + xfs_qoff_logitem_t *startqoff, + uint flags) +{ + xfs_trans_t *tp; + int error; + xfs_qoff_logitem_t *qoffi; + + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_equotaoff, 0, 0, 0, &tp); + if (error) + return error; + + qoffi = xfs_trans_get_qoff_item(tp, startqoff, + flags & XFS_ALL_QUOTA_ACCT); + xfs_trans_log_quotaoff_item(tp, qoffi); + + /* + * We have to make sure that the transaction is secure on disk before we + * return and actually stop quota accounting. So, make it synchronous. + * We don't care about quotoff's performance. + */ + xfs_trans_set_sync(tp); + return xfs_trans_commit(tp); +} + + +STATIC int +xfs_qm_log_quotaoff( + xfs_mount_t *mp, + xfs_qoff_logitem_t **qoffstartp, + uint flags) +{ + xfs_trans_t *tp; + int error; + xfs_qoff_logitem_t *qoffi; + + *qoffstartp = NULL; + + error = xfs_trans_alloc(mp, &M_RES(mp)->tr_qm_quotaoff, 0, 0, 0, &tp); + if (error) + goto out; + + qoffi = xfs_trans_get_qoff_item(tp, NULL, flags & XFS_ALL_QUOTA_ACCT); + xfs_trans_log_quotaoff_item(tp, qoffi); + + spin_lock(&mp->m_sb_lock); + mp->m_sb.sb_qflags = (mp->m_qflags & ~(flags)) & XFS_MOUNT_QUOTA_ALL; + spin_unlock(&mp->m_sb_lock); + + xfs_log_sb(tp); + + /* + * We have to make sure that the transaction is secure on disk before we + * return and actually stop quota accounting. So, make it synchronous. + * We don't care about quotoff's performance. + */ + xfs_trans_set_sync(tp); + error = xfs_trans_commit(tp); + if (error) + goto out; + + *qoffstartp = qoffi; +out: + return error; +} + /* Fill out the quota context. */ static void xfs_qm_scall_getquota_fill_qc(
diff --git a/fs/xfs/xfs_quota.h b/fs/xfs/xfs_quota.h index aa8fc1f..efe42ae 100644 --- a/fs/xfs/xfs_quota.h +++ b/fs/xfs/xfs_quota.h
@@ -86,7 +86,7 @@ extern int xfs_trans_reserve_quota_bydquots(struct xfs_trans *, struct xfs_mount *, struct xfs_dquot *, struct xfs_dquot *, struct xfs_dquot *, int64_t, long, uint); -extern int xfs_qm_vop_dqalloc(struct xfs_inode *, kuid_t, kgid_t, +extern int xfs_qm_vop_dqalloc(struct xfs_inode *, xfs_dqid_t, xfs_dqid_t, prid_t, uint, struct xfs_dquot **, struct xfs_dquot **, struct xfs_dquot **); extern void xfs_qm_vop_create_dqattach(struct xfs_trans *, struct xfs_inode *, @@ -109,7 +109,7 @@ extern void xfs_qm_unmount_quotas(struct xfs_mount *); #else static inline int -xfs_qm_vop_dqalloc(struct xfs_inode *ip, kuid_t kuid, kgid_t kgid, +xfs_qm_vop_dqalloc(struct xfs_inode *ip, xfs_dqid_t uid, xfs_dqid_t gid, prid_t prid, uint flags, struct xfs_dquot **udqp, struct xfs_dquot **gdqp, struct xfs_dquot **pdqp) {
diff --git a/fs/xfs/xfs_refcount_item.c b/fs/xfs/xfs_refcount_item.c index fa1018a..2328268 100644 --- a/fs/xfs/xfs_refcount_item.c +++ b/fs/xfs/xfs_refcount_item.c
@@ -17,7 +17,7 @@ #include "xfs_refcount_item.h" #include "xfs_log.h" #include "xfs_refcount.h" -#include "xfs_error.h" + kmem_zone_t *xfs_cui_zone; kmem_zone_t *xfs_cud_zone; @@ -123,6 +123,40 @@ xfs_cui_item_release( xfs_cui_release(CUI_ITEM(lip)); } +static const struct xfs_item_ops xfs_cui_item_ops = { + .iop_size = xfs_cui_item_size, + .iop_format = xfs_cui_item_format, + .iop_unpin = xfs_cui_item_unpin, + .iop_release = xfs_cui_item_release, +}; + +/* + * Allocate and initialize an cui item with the given number of extents. + */ +struct xfs_cui_log_item * +xfs_cui_init( + struct xfs_mount *mp, + uint nextents) + +{ + struct xfs_cui_log_item *cuip; + + ASSERT(nextents > 0); + if (nextents > XFS_CUI_MAX_FAST_EXTENTS) + cuip = kmem_zalloc(xfs_cui_log_item_sizeof(nextents), + 0); + else + cuip = kmem_zone_zalloc(xfs_cui_zone, 0); + + xfs_log_item_init(mp, &cuip->cui_item, XFS_LI_CUI, &xfs_cui_item_ops); + cuip->cui_format.cui_nextents = nextents; + cuip->cui_format.cui_id = (uintptr_t)(void *)cuip; + atomic_set(&cuip->cui_next_extent, 0); + atomic_set(&cuip->cui_refcount, 2); + + return cuip; +} + static inline struct xfs_cud_log_item *CUD_ITEM(struct xfs_log_item *lip) { return container_of(lip, struct xfs_cud_log_item, cud_item); @@ -250,6 +284,27 @@ xfs_refcount_update_diff_items( XFS_FSB_TO_AGNO(mp, rb->ri_startblock); } +/* Get an CUI. */ +STATIC void * +xfs_refcount_update_create_intent( + struct xfs_trans *tp, + unsigned int count) +{ + struct xfs_cui_log_item *cuip; + + ASSERT(tp != NULL); + ASSERT(count > 0); + + cuip = xfs_cui_init(tp->t_mountp, count); + ASSERT(cuip != NULL); + + /* + * Get a log_item_desc to point at the new item. + */ + xfs_trans_add_item(tp, &cuip->cui_item); + return cuip; +} + /* Set the phys extent flags for this reverse mapping. */ static void xfs_trans_set_refcount_flags( @@ -273,12 +328,16 @@ xfs_trans_set_refcount_flags( STATIC void xfs_refcount_update_log_item( struct xfs_trans *tp, - struct xfs_cui_log_item *cuip, - struct xfs_refcount_intent *refc) + void *intent, + struct list_head *item) { + struct xfs_cui_log_item *cuip = intent; + struct xfs_refcount_intent *refc; uint next_extent; struct xfs_phys_extent *ext; + refc = container_of(item, struct xfs_refcount_intent, ri_list); + tp->t_flags |= XFS_TRANS_DIRTY; set_bit(XFS_LI_DIRTY, &cuip->cui_item.li_flags); @@ -295,35 +354,14 @@ xfs_refcount_update_log_item( xfs_trans_set_refcount_flags(ext, refc->ri_type); } -static struct xfs_log_item * -xfs_refcount_update_create_intent( - struct xfs_trans *tp, - struct list_head *items, - unsigned int count, - bool sort) -{ - struct xfs_mount *mp = tp->t_mountp; - struct xfs_cui_log_item *cuip = xfs_cui_init(mp, count); - struct xfs_refcount_intent *refc; - - ASSERT(count > 0); - - xfs_trans_add_item(tp, &cuip->cui_item); - if (sort) - list_sort(mp, items, xfs_refcount_update_diff_items); - list_for_each_entry(refc, items, ri_list) - xfs_refcount_update_log_item(tp, cuip, refc); - return &cuip->cui_item; -} - /* Get an CUD so we can process all the deferred refcount updates. */ STATIC void * xfs_refcount_update_create_done( struct xfs_trans *tp, - struct xfs_log_item *intent, + void *intent, unsigned int count) { - return xfs_trans_get_cud(tp, CUI_ITEM(intent)); + return xfs_trans_get_cud(tp, intent); } /* Process a deferred refcount update. */ @@ -373,9 +411,9 @@ xfs_refcount_update_finish_cleanup( /* Abort all pending CUIs. */ STATIC void xfs_refcount_update_abort_intent( - struct xfs_log_item *intent) + void *intent) { - xfs_cui_release(CUI_ITEM(intent)); + xfs_cui_release(intent); } /* Cancel a deferred refcount update. */ @@ -391,8 +429,10 @@ xfs_refcount_update_cancel_item( const struct xfs_defer_op_type xfs_refcount_update_defer_type = { .max_items = XFS_CUI_MAX_FAST_EXTENTS, + .diff_items = xfs_refcount_update_diff_items, .create_intent = xfs_refcount_update_create_intent, .abort_intent = xfs_refcount_update_abort_intent, + .log_item = xfs_refcount_update_log_item, .create_done = xfs_refcount_update_create_done, .finish_item = xfs_refcount_update_finish_item, .finish_cleanup = xfs_refcount_update_finish_cleanup, @@ -405,8 +445,8 @@ const struct xfs_defer_op_type xfs_refcount_update_defer_type = { */ int xfs_cui_recover( - struct xfs_cui_log_item *cuip, - struct list_head *capture_list) + struct xfs_trans *parent_tp, + struct xfs_cui_log_item *cuip) { int i; int error = 0; @@ -422,7 +462,7 @@ xfs_cui_recover( xfs_extlen_t new_len; struct xfs_bmbt_irec irec; bool requeue_only = false; - struct xfs_mount *mp = cuip->cui_item.li_mountp; + struct xfs_mount *mp = parent_tp->t_mountp; ASSERT(!test_bit(XFS_CUI_RECOVERED, &cuip->cui_flags)); @@ -457,7 +497,7 @@ xfs_cui_recover( */ set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags); xfs_cui_release(cuip); - return -EFSCORRUPTED; + return -EIO; } } @@ -477,7 +517,12 @@ xfs_cui_recover( mp->m_refc_maxlevels * 2, 0, XFS_TRANS_RESERVE, &tp); if (error) return error; - + /* + * Recovery stashes all deferred ops during intent processing and + * finishes them on completion. Transfer current dfops state to this + * transaction and transfer the result back before we return. + */ + xfs_defer_move(tp, parent_tp); cudp = xfs_trans_get_cud(tp, cuip); for (i = 0; i < cuip->cui_format.cui_nextents; i++) { @@ -491,7 +536,6 @@ xfs_cui_recover( type = refc_type; break; default: - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, mp); error = -EFSCORRUPTED; goto abort_error; } @@ -535,71 +579,13 @@ xfs_cui_recover( xfs_refcount_finish_one_cleanup(tp, rcur, error); set_bit(XFS_CUI_RECOVERED, &cuip->cui_flags); - return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list); + xfs_defer_move(parent_tp, tp); + error = xfs_trans_commit(tp); + return error; abort_error: xfs_refcount_finish_one_cleanup(tp, rcur, error); + xfs_defer_move(parent_tp, tp); xfs_trans_cancel(tp); return error; } - -/* Relog an intent item to push the log tail forward. */ -static struct xfs_log_item * -xfs_cui_item_relog( - struct xfs_log_item *intent, - struct xfs_trans *tp) -{ - struct xfs_cud_log_item *cudp; - struct xfs_cui_log_item *cuip; - struct xfs_phys_extent *extp; - unsigned int count; - - count = CUI_ITEM(intent)->cui_format.cui_nextents; - extp = CUI_ITEM(intent)->cui_format.cui_extents; - - tp->t_flags |= XFS_TRANS_DIRTY; - cudp = xfs_trans_get_cud(tp, CUI_ITEM(intent)); - set_bit(XFS_LI_DIRTY, &cudp->cud_item.li_flags); - - cuip = xfs_cui_init(tp->t_mountp, count); - memcpy(cuip->cui_format.cui_extents, extp, count * sizeof(*extp)); - atomic_set(&cuip->cui_next_extent, count); - xfs_trans_add_item(tp, &cuip->cui_item); - set_bit(XFS_LI_DIRTY, &cuip->cui_item.li_flags); - return &cuip->cui_item; -} - -static const struct xfs_item_ops xfs_cui_item_ops = { - .iop_size = xfs_cui_item_size, - .iop_format = xfs_cui_item_format, - .iop_unpin = xfs_cui_item_unpin, - .iop_release = xfs_cui_item_release, - .iop_relog = xfs_cui_item_relog, -}; - -/* - * Allocate and initialize an cui item with the given number of extents. - */ -struct xfs_cui_log_item * -xfs_cui_init( - struct xfs_mount *mp, - uint nextents) - -{ - struct xfs_cui_log_item *cuip; - - ASSERT(nextents > 0); - if (nextents > XFS_CUI_MAX_FAST_EXTENTS) - cuip = kmem_zalloc(xfs_cui_log_item_sizeof(nextents), - 0); - else - cuip = kmem_zone_zalloc(xfs_cui_zone, 0); - - xfs_log_item_init(mp, &cuip->cui_item, XFS_LI_CUI, &xfs_cui_item_ops); - cuip->cui_format.cui_nextents = nextents; - cuip->cui_format.cui_id = (uintptr_t)(void *)cuip; - atomic_set(&cuip->cui_next_extent, 0); - atomic_set(&cuip->cui_refcount, 2); - - return cuip; -}
diff --git a/fs/xfs/xfs_refcount_item.h b/fs/xfs/xfs_refcount_item.h index de5f48f..e47530f 100644 --- a/fs/xfs/xfs_refcount_item.h +++ b/fs/xfs/xfs_refcount_item.h
@@ -80,7 +80,6 @@ extern struct kmem_zone *xfs_cud_zone; struct xfs_cui_log_item *xfs_cui_init(struct xfs_mount *, uint); void xfs_cui_item_free(struct xfs_cui_log_item *); void xfs_cui_release(struct xfs_cui_log_item *); -int xfs_cui_recover(struct xfs_cui_log_item *cuip, - struct list_head *capture_list); +int xfs_cui_recover(struct xfs_trans *parent_tp, struct xfs_cui_log_item *cuip); #endif /* __XFS_REFCOUNT_ITEM_H__ */
diff --git a/fs/xfs/xfs_reflink.c b/fs/xfs/xfs_reflink.c index 01191ff..904d828 100644 --- a/fs/xfs/xfs_reflink.c +++ b/fs/xfs/xfs_reflink.c
@@ -181,7 +181,7 @@ xfs_reflink_trim_around_shared( int error = 0; /* Holes, unwritten, and delalloc extents cannot be shared */ - if (!xfs_is_cow_inode(ip) || !xfs_bmap_is_written_extent(irec)) { + if (!xfs_is_cow_inode(ip) || !xfs_bmap_is_real_extent(irec)) { *shared = false; return 0; } @@ -657,7 +657,7 @@ xfs_reflink_end_cow_extent( * preallocations can leak into the range we are called upon, and we * need to skip them. */ - if (!xfs_bmap_is_written_extent(&got)) { + if (!xfs_bmap_is_real_extent(&got)) { *end_fsb = del.br_startoff; goto out_cancel; } @@ -986,28 +986,41 @@ xfs_reflink_ag_has_free_space( } /* - * Remap the given extent into the file. The dmap blockcount will be set to - * the number of blocks that were actually remapped. + * Unmap a range of blocks from a file, then map other blocks into the hole. + * The range to unmap is (destoff : destoff + srcioff + irec->br_blockcount). + * The extent irec is mapped into dest at irec->br_startoff. */ STATIC int xfs_reflink_remap_extent( struct xfs_inode *ip, - struct xfs_bmbt_irec *dmap, + struct xfs_bmbt_irec *irec, + xfs_fileoff_t destoff, xfs_off_t new_isize) { - struct xfs_bmbt_irec smap; struct xfs_mount *mp = ip->i_mount; + bool real_extent = xfs_bmap_is_real_extent(irec); struct xfs_trans *tp; - xfs_off_t newlen; - int64_t qres, qdelta; unsigned int resblks; - bool smap_real; - bool dmap_written = xfs_bmap_is_written_extent(dmap); - int nimaps; + struct xfs_bmbt_irec uirec; + xfs_filblks_t rlen; + xfs_filblks_t unmap_len; + xfs_off_t newlen; + int64_t qres; int error; + unmap_len = irec->br_startoff + irec->br_blockcount - destoff; + trace_xfs_reflink_punch_range(ip, destoff, unmap_len); + + /* No reflinking if we're low on space */ + if (real_extent) { + error = xfs_reflink_ag_has_free_space(mp, + XFS_FSB_TO_AGNO(mp, irec->br_startblock)); + if (error) + goto out; + } + /* Start a rolling transaction to switch the mappings */ - resblks = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK); + resblks = XFS_EXTENTADD_SPACE_RES(ip->i_mount, XFS_DATA_FORK); error = xfs_trans_alloc(mp, &M_RES(mp)->tr_write, resblks, 0, 0, &tp); if (error) goto out; @@ -1016,121 +1029,92 @@ xfs_reflink_remap_extent( xfs_trans_ijoin(tp, ip, 0); /* - * Read what's currently mapped in the destination file into smap. - * If smap isn't a hole, we will have to remove it before we can add - * dmap to the destination file. + * Reserve quota for this operation. We don't know if the first unmap + * in the dest file will cause a bmap btree split, so we always reserve + * at least enough blocks for that split. If the extent being mapped + * in is written, we need to reserve quota for that too. */ - nimaps = 1; - error = xfs_bmapi_read(ip, dmap->br_startoff, dmap->br_blockcount, - &smap, &nimaps, 0); - if (error) - goto out_cancel; - ASSERT(nimaps == 1 && smap.br_startoff == dmap->br_startoff); - smap_real = xfs_bmap_is_real_extent(&smap); - - /* - * We can only remap as many blocks as the smaller of the two extent - * maps, because we can only remap one extent at a time. - */ - dmap->br_blockcount = min(dmap->br_blockcount, smap.br_blockcount); - ASSERT(dmap->br_blockcount == smap.br_blockcount); - - trace_xfs_reflink_remap_extent_dest(ip, &smap); - - /* No reflinking if the AG of the dest mapping is low on space. */ - if (dmap_written) { - error = xfs_reflink_ag_has_free_space(mp, - XFS_FSB_TO_AGNO(mp, dmap->br_startblock)); - if (error) - goto out_cancel; - } - - /* - * Compute quota reservation if we think the quota block counter for - * this file could increase. - * - * We start by reserving enough blocks to handle a bmbt split. - * - * If we are mapping a written extent into the file, we need to have - * enough quota block count reservation to handle the blocks in that - * extent. - * - * Note that if we're replacing a delalloc reservation with a written - * extent, we have to take the full quota reservation because removing - * the delalloc reservation gives the block count back to the quota - * count. This is suboptimal, but the VFS flushed the dest range - * before we started. That should have removed all the delalloc - * reservations, but we code defensively. - */ - qdelta = 0; qres = XFS_EXTENTADD_SPACE_RES(mp, XFS_DATA_FORK); - if (dmap_written) - qres += dmap->br_blockcount; + if (real_extent) + qres += irec->br_blockcount; error = xfs_trans_reserve_quota_nblks(tp, ip, qres, 0, XFS_QMOPT_RES_REGBLKS); if (error) goto out_cancel; - if (smap_real) { - /* - * If the extent we're unmapping is backed by storage (written - * or not), unmap the extent and drop its refcount. - */ - xfs_bmap_unmap_extent(tp, ip, &smap); - xfs_refcount_decrease_extent(tp, &smap); - qdelta -= smap.br_blockcount; - } else if (smap.br_startblock == DELAYSTARTBLOCK) { - xfs_filblks_t len = smap.br_blockcount; + trace_xfs_reflink_remap(ip, irec->br_startoff, + irec->br_blockcount, irec->br_startblock); - /* - * If the extent we're unmapping is a delalloc reservation, - * we can use the regular bunmapi function to release the - * incore state. Dropping the delalloc reservation takes care - * of the quota reservation for us. - */ - error = __xfs_bunmapi(NULL, ip, smap.br_startoff, &len, 0, 1); + /* Unmap the old blocks in the data fork. */ + rlen = unmap_len; + while (rlen) { + ASSERT(tp->t_firstblock == NULLFSBLOCK); + error = __xfs_bunmapi(tp, ip, destoff, &rlen, 0, 1); if (error) goto out_cancel; - ASSERT(len == 0); + + /* + * Trim the extent to whatever got unmapped. + * Remember, bunmapi works backwards. + */ + uirec.br_startblock = irec->br_startblock + rlen; + uirec.br_startoff = irec->br_startoff + rlen; + uirec.br_blockcount = unmap_len - rlen; + uirec.br_state = irec->br_state; + unmap_len = rlen; + + /* If this isn't a real mapping, we're done. */ + if (!real_extent || uirec.br_blockcount == 0) + goto next_extent; + + trace_xfs_reflink_remap(ip, uirec.br_startoff, + uirec.br_blockcount, uirec.br_startblock); + + /* Update the refcount tree */ + xfs_refcount_increase_extent(tp, &uirec); + + /* Map the new blocks into the data fork. */ + xfs_bmap_map_extent(tp, ip, &uirec); + + /* Update quota accounting. */ + xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, + uirec.br_blockcount); + + /* Update dest isize if needed. */ + newlen = XFS_FSB_TO_B(mp, + uirec.br_startoff + uirec.br_blockcount); + newlen = min_t(xfs_off_t, newlen, new_isize); + if (newlen > i_size_read(VFS_I(ip))) { + trace_xfs_reflink_update_inode_size(ip, newlen); + i_size_write(VFS_I(ip), newlen); + ip->i_d.di_size = newlen; + xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); + } + +next_extent: + /* Process all the deferred stuff. */ + error = xfs_defer_finish(&tp); + if (error) + goto out_cancel; } - /* - * If the extent we're sharing is backed by written storage, increase - * its refcount and map it into the file. - */ - if (dmap_written) { - xfs_refcount_increase_extent(tp, dmap); - xfs_bmap_map_extent(tp, ip, dmap); - qdelta += dmap->br_blockcount; - } - - xfs_trans_mod_dquot_byino(tp, ip, XFS_TRANS_DQ_BCOUNT, qdelta); - - /* Update dest isize if needed. */ - newlen = XFS_FSB_TO_B(mp, dmap->br_startoff + dmap->br_blockcount); - newlen = min_t(xfs_off_t, newlen, new_isize); - if (newlen > i_size_read(VFS_I(ip))) { - trace_xfs_reflink_update_inode_size(ip, newlen); - i_size_write(VFS_I(ip), newlen); - ip->i_d.di_size = newlen; - xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); - } - - /* Commit everything and unlock. */ error = xfs_trans_commit(tp); - goto out_unlock; + xfs_iunlock(ip, XFS_ILOCK_EXCL); + if (error) + goto out; + return 0; out_cancel: xfs_trans_cancel(tp); -out_unlock: xfs_iunlock(ip, XFS_ILOCK_EXCL); out: - if (error) - trace_xfs_reflink_remap_extent_error(ip, error, _RET_IP_); + trace_xfs_reflink_remap_extent_error(ip, error, _RET_IP_); return error; } -/* Remap a range of one file to the other. */ +/* + * Iteratively remap one file's extents (and holes) to another's. + */ int xfs_reflink_remap_blocks( struct xfs_inode *src, @@ -1141,22 +1125,25 @@ xfs_reflink_remap_blocks( loff_t *remapped) { struct xfs_bmbt_irec imap; - struct xfs_mount *mp = src->i_mount; - xfs_fileoff_t srcoff = XFS_B_TO_FSBT(mp, pos_in); - xfs_fileoff_t destoff = XFS_B_TO_FSBT(mp, pos_out); + xfs_fileoff_t srcoff; + xfs_fileoff_t destoff; xfs_filblks_t len; + xfs_filblks_t range_len; xfs_filblks_t remapped_len = 0; xfs_off_t new_isize = pos_out + remap_len; int nimaps; int error = 0; - len = min_t(xfs_filblks_t, XFS_B_TO_FSB(mp, remap_len), - XFS_MAX_FILEOFF); + destoff = XFS_B_TO_FSBT(src->i_mount, pos_out); + srcoff = XFS_B_TO_FSBT(src->i_mount, pos_in); + len = XFS_B_TO_FSB(src->i_mount, remap_len); - trace_xfs_reflink_remap_blocks(src, srcoff, len, dest, destoff); + /* drange = (destoff, destoff + len); srange = (srcoff, srcoff + len) */ + while (len) { + uint lock_mode; - while (len > 0) { - unsigned int lock_mode; + trace_xfs_reflink_remap_blocks_loop(src, srcoff, len, + dest, destoff); /* Read extent from the source file */ nimaps = 1; @@ -1165,25 +1152,18 @@ xfs_reflink_remap_blocks( xfs_iunlock(src, lock_mode); if (error) break; - /* - * The caller supposedly flushed all dirty pages in the source - * file range, which means that writeback should have allocated - * or deleted all delalloc reservations in that range. If we - * find one, that's a good sign that something is seriously - * wrong here. - */ - ASSERT(nimaps == 1 && imap.br_startoff == srcoff); - if (imap.br_startblock == DELAYSTARTBLOCK) { - ASSERT(imap.br_startblock != DELAYSTARTBLOCK); - error = -EFSCORRUPTED; - break; - } + ASSERT(nimaps == 1); - trace_xfs_reflink_remap_extent_src(src, &imap); + trace_xfs_reflink_remap_imap(src, srcoff, len, XFS_DATA_FORK, + &imap); - /* Remap into the destination file at the given offset. */ - imap.br_startoff = destoff; - error = xfs_reflink_remap_extent(dest, &imap, new_isize); + /* Translate imap into the destination file. */ + range_len = imap.br_startoff + imap.br_blockcount - srcoff; + imap.br_startoff += destoff - srcoff; + + /* Clear dest from destoff to the end of imap and map it in. */ + error = xfs_reflink_remap_extent(dest, &imap, destoff, + new_isize); if (error) break; @@ -1193,10 +1173,10 @@ xfs_reflink_remap_blocks( } /* Advance drange/srange */ - srcoff += imap.br_blockcount; - destoff += imap.br_blockcount; - len -= imap.br_blockcount; - remapped_len += imap.br_blockcount; + srcoff += range_len; + destoff += range_len; + len -= range_len; + remapped_len += range_len; } if (error) @@ -1447,7 +1427,7 @@ xfs_reflink_dirty_extents( goto out; if (nmaps == 0) break; - if (!xfs_bmap_is_written_extent(&map[0])) + if (!xfs_bmap_is_real_extent(&map[0])) goto next; map[1] = map[0]; @@ -1564,8 +1544,7 @@ xfs_reflink_clear_inode_flag( * We didn't find any shared blocks so turn off the reflink flag. * First, get rid of any leftover CoW mappings. */ - error = xfs_reflink_cancel_cow_blocks(ip, tpp, 0, XFS_MAX_FILEOFF, - true); + error = xfs_reflink_cancel_cow_blocks(ip, tpp, 0, NULLFILEOFF, true); if (error) return error;
diff --git a/fs/xfs/xfs_rmap_item.c b/fs/xfs/xfs_rmap_item.c index ba1dbb6..8939e0e 100644 --- a/fs/xfs/xfs_rmap_item.c +++ b/fs/xfs/xfs_rmap_item.c
@@ -17,7 +17,7 @@ #include "xfs_rmap_item.h" #include "xfs_log.h" #include "xfs_rmap.h" -#include "xfs_error.h" + kmem_zone_t *xfs_rui_zone; kmem_zone_t *xfs_rud_zone; @@ -122,6 +122,39 @@ xfs_rui_item_release( xfs_rui_release(RUI_ITEM(lip)); } +static const struct xfs_item_ops xfs_rui_item_ops = { + .iop_size = xfs_rui_item_size, + .iop_format = xfs_rui_item_format, + .iop_unpin = xfs_rui_item_unpin, + .iop_release = xfs_rui_item_release, +}; + +/* + * Allocate and initialize an rui item with the given number of extents. + */ +struct xfs_rui_log_item * +xfs_rui_init( + struct xfs_mount *mp, + uint nextents) + +{ + struct xfs_rui_log_item *ruip; + + ASSERT(nextents > 0); + if (nextents > XFS_RUI_MAX_FAST_EXTENTS) + ruip = kmem_zalloc(xfs_rui_log_item_sizeof(nextents), 0); + else + ruip = kmem_zone_zalloc(xfs_rui_zone, 0); + + xfs_log_item_init(mp, &ruip->rui_item, XFS_LI_RUI, &xfs_rui_item_ops); + ruip->rui_format.rui_nextents = nextents; + ruip->rui_format.rui_id = (uintptr_t)(void *)ruip; + atomic_set(&ruip->rui_next_extent, 0); + atomic_set(&ruip->rui_refcount, 2); + + return ruip; +} + /* * Copy an RUI format buffer from the given buf, and into the destination * RUI format structure. The RUI/RUD items were designed not to need any @@ -138,10 +171,8 @@ xfs_rui_copy_format( src_rui_fmt = buf->i_addr; len = xfs_rui_log_format_sizeof(src_rui_fmt->rui_nextents); - if (buf->i_len != len) { - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); + if (buf->i_len != len) return -EFSCORRUPTED; - } memcpy(dst_rui_fmt, src_rui_fmt, len); return 0; @@ -319,16 +350,41 @@ xfs_rmap_update_diff_items( XFS_FSB_TO_AGNO(mp, rb->ri_bmap.br_startblock); } +/* Get an RUI. */ +STATIC void * +xfs_rmap_update_create_intent( + struct xfs_trans *tp, + unsigned int count) +{ + struct xfs_rui_log_item *ruip; + + ASSERT(tp != NULL); + ASSERT(count > 0); + + ruip = xfs_rui_init(tp->t_mountp, count); + ASSERT(ruip != NULL); + + /* + * Get a log_item_desc to point at the new item. + */ + xfs_trans_add_item(tp, &ruip->rui_item); + return ruip; +} + /* Log rmap updates in the intent item. */ STATIC void xfs_rmap_update_log_item( struct xfs_trans *tp, - struct xfs_rui_log_item *ruip, - struct xfs_rmap_intent *rmap) + void *intent, + struct list_head *item) { + struct xfs_rui_log_item *ruip = intent; + struct xfs_rmap_intent *rmap; uint next_extent; struct xfs_map_extent *map; + rmap = container_of(item, struct xfs_rmap_intent, ri_list); + tp->t_flags |= XFS_TRANS_DIRTY; set_bit(XFS_LI_DIRTY, &ruip->rui_item.li_flags); @@ -348,35 +404,14 @@ xfs_rmap_update_log_item( rmap->ri_bmap.br_state); } -static struct xfs_log_item * -xfs_rmap_update_create_intent( - struct xfs_trans *tp, - struct list_head *items, - unsigned int count, - bool sort) -{ - struct xfs_mount *mp = tp->t_mountp; - struct xfs_rui_log_item *ruip = xfs_rui_init(mp, count); - struct xfs_rmap_intent *rmap; - - ASSERT(count > 0); - - xfs_trans_add_item(tp, &ruip->rui_item); - if (sort) - list_sort(mp, items, xfs_rmap_update_diff_items); - list_for_each_entry(rmap, items, ri_list) - xfs_rmap_update_log_item(tp, ruip, rmap); - return &ruip->rui_item; -} - /* Get an RUD so we can process all the deferred rmap updates. */ STATIC void * xfs_rmap_update_create_done( struct xfs_trans *tp, - struct xfs_log_item *intent, + void *intent, unsigned int count) { - return xfs_trans_get_rud(tp, RUI_ITEM(intent)); + return xfs_trans_get_rud(tp, intent); } /* Process a deferred rmap update. */ @@ -418,9 +453,9 @@ xfs_rmap_update_finish_cleanup( /* Abort all pending RUIs. */ STATIC void xfs_rmap_update_abort_intent( - struct xfs_log_item *intent) + void *intent) { - xfs_rui_release(RUI_ITEM(intent)); + xfs_rui_release(intent); } /* Cancel a deferred rmap update. */ @@ -436,8 +471,10 @@ xfs_rmap_update_cancel_item( const struct xfs_defer_op_type xfs_rmap_update_defer_type = { .max_items = XFS_RUI_MAX_FAST_EXTENTS, + .diff_items = xfs_rmap_update_diff_items, .create_intent = xfs_rmap_update_create_intent, .abort_intent = xfs_rmap_update_abort_intent, + .log_item = xfs_rmap_update_log_item, .create_done = xfs_rmap_update_create_done, .finish_item = xfs_rmap_update_finish_item, .finish_cleanup = xfs_rmap_update_finish_cleanup, @@ -450,10 +487,9 @@ const struct xfs_defer_op_type xfs_rmap_update_defer_type = { */ int xfs_rui_recover( - struct xfs_rui_log_item *ruip, - struct list_head *capture_list) + struct xfs_mount *mp, + struct xfs_rui_log_item *ruip) { - struct xfs_mount *mp = ruip->rui_item.li_mountp; int i; int error = 0; struct xfs_map_extent *rmap; @@ -503,7 +539,7 @@ xfs_rui_recover( */ set_bit(XFS_RUI_RECOVERED, &ruip->rui_flags); xfs_rui_release(ruip); - return -EFSCORRUPTED; + return -EIO; } } @@ -545,7 +581,6 @@ xfs_rui_recover( type = XFS_RMAP_FREE; break; default: - XFS_ERROR_REPORT(__func__, XFS_ERRLEVEL_LOW, NULL); error = -EFSCORRUPTED; goto abort_error; } @@ -560,70 +595,11 @@ xfs_rui_recover( xfs_rmap_finish_one_cleanup(tp, rcur, error); set_bit(XFS_RUI_RECOVERED, &ruip->rui_flags); - return xfs_defer_ops_capture_and_commit(tp, NULL, capture_list); + error = xfs_trans_commit(tp); + return error; abort_error: xfs_rmap_finish_one_cleanup(tp, rcur, error); xfs_trans_cancel(tp); return error; } - -/* Relog an intent item to push the log tail forward. */ -static struct xfs_log_item * -xfs_rui_item_relog( - struct xfs_log_item *intent, - struct xfs_trans *tp) -{ - struct xfs_rud_log_item *rudp; - struct xfs_rui_log_item *ruip; - struct xfs_map_extent *extp; - unsigned int count; - - count = RUI_ITEM(intent)->rui_format.rui_nextents; - extp = RUI_ITEM(intent)->rui_format.rui_extents; - - tp->t_flags |= XFS_TRANS_DIRTY; - rudp = xfs_trans_get_rud(tp, RUI_ITEM(intent)); - set_bit(XFS_LI_DIRTY, &rudp->rud_item.li_flags); - - ruip = xfs_rui_init(tp->t_mountp, count); - memcpy(ruip->rui_format.rui_extents, extp, count * sizeof(*extp)); - atomic_set(&ruip->rui_next_extent, count); - xfs_trans_add_item(tp, &ruip->rui_item); - set_bit(XFS_LI_DIRTY, &ruip->rui_item.li_flags); - return &ruip->rui_item; -} - -static const struct xfs_item_ops xfs_rui_item_ops = { - .iop_size = xfs_rui_item_size, - .iop_format = xfs_rui_item_format, - .iop_unpin = xfs_rui_item_unpin, - .iop_release = xfs_rui_item_release, - .iop_relog = xfs_rui_item_relog, -}; - -/* - * Allocate and initialize an rui item with the given number of extents. - */ -struct xfs_rui_log_item * -xfs_rui_init( - struct xfs_mount *mp, - uint nextents) - -{ - struct xfs_rui_log_item *ruip; - - ASSERT(nextents > 0); - if (nextents > XFS_RUI_MAX_FAST_EXTENTS) - ruip = kmem_zalloc(xfs_rui_log_item_sizeof(nextents), 0); - else - ruip = kmem_zone_zalloc(xfs_rui_zone, 0); - - xfs_log_item_init(mp, &ruip->rui_item, XFS_LI_RUI, &xfs_rui_item_ops); - ruip->rui_format.rui_nextents = nextents; - ruip->rui_format.rui_id = (uintptr_t)(void *)ruip; - atomic_set(&ruip->rui_next_extent, 0); - atomic_set(&ruip->rui_refcount, 2); - - return ruip; -}
diff --git a/fs/xfs/xfs_rmap_item.h b/fs/xfs/xfs_rmap_item.h index 5cf4acb..8708e4a 100644 --- a/fs/xfs/xfs_rmap_item.h +++ b/fs/xfs/xfs_rmap_item.h
@@ -82,7 +82,6 @@ int xfs_rui_copy_format(struct xfs_log_iovec *buf, struct xfs_rui_log_format *dst_rui_fmt); void xfs_rui_item_free(struct xfs_rui_log_item *); void xfs_rui_release(struct xfs_rui_log_item *); -int xfs_rui_recover(struct xfs_rui_log_item *ruip, - struct list_head *capture_list); +int xfs_rui_recover(struct xfs_mount *mp, struct xfs_rui_log_item *ruip); #endif /* __XFS_RMAP_ITEM_H__ */
diff --git a/fs/xfs/xfs_stats.c b/fs/xfs/xfs_stats.c index 20e0534..113883c 100644 --- a/fs/xfs/xfs_stats.c +++ b/fs/xfs/xfs_stats.c
@@ -23,7 +23,6 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf) uint64_t xs_xstrat_bytes = 0; uint64_t xs_write_bytes = 0; uint64_t xs_read_bytes = 0; - uint64_t defer_relog = 0; static const struct xstats_entry { char *desc; @@ -58,27 +57,24 @@ int xfs_stats_format(struct xfsstats __percpu *stats, char *buf) /* Loop over all stats groups */ for (i = j = 0; i < ARRAY_SIZE(xstats); i++) { - len += scnprintf(buf + len, PATH_MAX - len, "%s", + len += snprintf(buf + len, PATH_MAX - len, "%s", xstats[i].desc); /* inner loop does each group */ for (; j < xstats[i].endpoint; j++) - len += scnprintf(buf + len, PATH_MAX - len, " %u", + len += snprintf(buf + len, PATH_MAX - len, " %u", counter_val(stats, j)); - len += scnprintf(buf + len, PATH_MAX - len, "\n"); + len += snprintf(buf + len, PATH_MAX - len, "\n"); } /* extra precision counters */ for_each_possible_cpu(i) { xs_xstrat_bytes += per_cpu_ptr(stats, i)->s.xs_xstrat_bytes; xs_write_bytes += per_cpu_ptr(stats, i)->s.xs_write_bytes; xs_read_bytes += per_cpu_ptr(stats, i)->s.xs_read_bytes; - defer_relog += per_cpu_ptr(stats, i)->s.defer_relog; } - len += scnprintf(buf + len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n", + len += snprintf(buf + len, PATH_MAX-len, "xpc %Lu %Lu %Lu\n", xs_xstrat_bytes, xs_write_bytes, xs_read_bytes); - len += scnprintf(buf + len, PATH_MAX-len, "defer_relog %llu\n", - defer_relog); - len += scnprintf(buf + len, PATH_MAX-len, "debug %u\n", + len += snprintf(buf + len, PATH_MAX-len, "debug %u\n", #if defined(DEBUG) 1); #else
diff --git a/fs/xfs/xfs_stats.h b/fs/xfs/xfs_stats.h index 43ffba7..34d704f 100644 --- a/fs/xfs/xfs_stats.h +++ b/fs/xfs/xfs_stats.h
@@ -137,7 +137,6 @@ struct __xfsstats { uint64_t xs_xstrat_bytes; uint64_t xs_write_bytes; uint64_t xs_read_bytes; - uint64_t defer_relog; }; #define xfsstats_offset(f) (offsetof(struct __xfsstats, f)/sizeof(uint32_t))
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index e802cbc..8d1df9f 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c
@@ -490,12 +490,10 @@ xfs_showargs( seq_printf(m, ",swidth=%d", (int)XFS_FSB_TO_BB(mp, mp->m_swidth)); - if (mp->m_qflags & XFS_UQUOTA_ACCT) { - if (mp->m_qflags & XFS_UQUOTA_ENFD) - seq_puts(m, ",usrquota"); - else - seq_puts(m, ",uqnoenforce"); - } + if (mp->m_qflags & (XFS_UQUOTA_ACCT|XFS_UQUOTA_ENFD)) + seq_puts(m, ",usrquota"); + else if (mp->m_qflags & XFS_UQUOTA_ACCT) + seq_puts(m, ",uqnoenforce"); if (mp->m_qflags & XFS_PQUOTA_ACCT) { if (mp->m_qflags & XFS_PQUOTA_ENFD) @@ -514,6 +512,32 @@ xfs_showargs( seq_puts(m, ",noquota"); } +static uint64_t +xfs_max_file_offset( + unsigned int blockshift) +{ + unsigned int pagefactor = 1; + unsigned int bitshift = BITS_PER_LONG - 1; + + /* Figure out maximum filesize, on Linux this can depend on + * the filesystem blocksize (on 32 bit platforms). + * __block_write_begin does this in an [unsigned] long long... + * page->index << (PAGE_SHIFT - bbits) + * So, for page sized blocks (4K on 32 bit platforms), + * this wraps at around 8Tb (hence MAX_LFS_FILESIZE which is + * (((u64)PAGE_SIZE << (BITS_PER_LONG-1))-1) + * but for smaller blocksizes it is less (bbits = log2 bsize). + */ + +#if BITS_PER_LONG == 32 + ASSERT(sizeof(sector_t) == 8); + pagefactor = PAGE_SIZE; + bitshift = BITS_PER_LONG; +#endif + + return (((uint64_t)pagefactor) << bitshift) - 1; +} + /* * Set parameters for inode allocation heuristics, taking into account * filesystem size and inode32/inode64 mount options; i.e. specifically @@ -842,20 +866,6 @@ xfs_destroy_mount_workqueues( destroy_workqueue(mp->m_buf_workqueue); } -static void -xfs_flush_inodes_worker( - struct work_struct *work) -{ - struct xfs_mount *mp = container_of(work, struct xfs_mount, - m_flush_inodes_work); - struct super_block *sb = mp->m_super; - - if (down_read_trylock(&sb->s_umount)) { - sync_inodes_sb(sb); - up_read(&sb->s_umount); - } -} - /* * Flush all dirty data to disk. Must not be called while holding an XFS_ILOCK * or a page lock. We use sync_inodes_sb() here to ensure we block while waiting @@ -866,15 +876,12 @@ void xfs_flush_inodes( struct xfs_mount *mp) { - /* - * If flush_work() returns true then that means we waited for a flush - * which was already in progress. Don't bother running another scan. - */ - if (flush_work(&mp->m_flush_inodes_work)) - return; + struct super_block *sb = mp->m_super; - queue_work(mp->m_sync_workqueue, &mp->m_flush_inodes_work); - flush_work(&mp->m_flush_inodes_work); + if (down_read_trylock(&sb->s_umount)) { + sync_inodes_sb(sb); + up_read(&sb->s_umount); + } } /* Catch misguided souls that try to use this interface on XFS */ @@ -1230,10 +1237,6 @@ xfs_fs_remount( char *p; int error; - /* version 5 superblocks always support version counters. */ - if (XFS_SB_VERSION_NUM(&mp->m_sb) == XFS_SB_VERSION_5) - *flags |= SB_I_VERSION; - /* First, check for complete junk; i.e. invalid options */ error = xfs_test_remount_options(sb, options); if (error) @@ -1555,7 +1558,6 @@ xfs_mount_alloc( spin_lock_init(&mp->m_perag_lock); mutex_init(&mp->m_growlock); atomic_set(&mp->m_active_trans, 0); - INIT_WORK(&mp->m_flush_inodes_work, xfs_flush_inodes_worker); INIT_DELAYED_WORK(&mp->m_reclaim_work, xfs_reclaim_worker); INIT_DELAYED_WORK(&mp->m_eofblocks_work, xfs_eofblocks_worker); INIT_DELAYED_WORK(&mp->m_cowblocks_work, xfs_cowblocks_worker); @@ -1648,26 +1650,6 @@ xfs_fs_fill_super( if (error) goto out_free_sb; - /* - * XFS block mappings use 54 bits to store the logical block offset. - * This should suffice to handle the maximum file size that the VFS - * supports (currently 2^63 bytes on 64-bit and ULONG_MAX << PAGE_SHIFT - * bytes on 32-bit), but as XFS and VFS have gotten the s_maxbytes - * calculation wrong on 32-bit kernels in the past, we'll add a WARN_ON - * to check this assertion. - * - * Avoid integer overflow by comparing the maximum bmbt offset to the - * maximum pagecache offset in units of fs blocks. - */ - if (XFS_B_TO_FSBT(mp, MAX_LFS_FILESIZE) > XFS_MAX_FILEOFF) { - xfs_warn(mp, -"MAX_LFS_FILESIZE block offset (%llu) exceeds extent map maximum (%llu)!", - XFS_B_TO_FSBT(mp, MAX_LFS_FILESIZE), - XFS_MAX_FILEOFF); - error = -EINVAL; - goto out_free_sb; - } - error = xfs_filestream_mount(mp); if (error) goto out_free_sb; @@ -1679,7 +1661,7 @@ xfs_fs_fill_super( sb->s_magic = XFS_SUPER_MAGIC; sb->s_blocksize = mp->m_sb.sb_blocksize; sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; - sb->s_maxbytes = MAX_LFS_FILESIZE; + sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); sb->s_max_links = XFS_MAXLINK; sb->s_time_gran = 1; sb->s_time_min = S32_MIN; @@ -1916,13 +1898,13 @@ xfs_init_zones(void) if (!xfs_buf_item_zone) goto out_destroy_trans_zone; - xfs_efd_zone = kmem_zone_init((sizeof(struct xfs_efd_log_item) + + xfs_efd_zone = kmem_zone_init((sizeof(xfs_efd_log_item_t) + ((XFS_EFD_MAX_FAST_EXTENTS - 1) * sizeof(xfs_extent_t))), "xfs_efd_item"); if (!xfs_efd_zone) goto out_destroy_buf_item_zone; - xfs_efi_zone = kmem_zone_init((sizeof(struct xfs_efi_log_item) + + xfs_efi_zone = kmem_zone_init((sizeof(xfs_efi_log_item_t) + ((XFS_EFI_MAX_FAST_EXTENTS - 1) * sizeof(xfs_extent_t))), "xfs_efi_item"); if (!xfs_efi_zone) @@ -1936,8 +1918,8 @@ xfs_init_zones(void) goto out_destroy_efi_zone; xfs_ili_zone = - kmem_zone_init_flags(sizeof(struct xfs_inode_log_item), - "xfs_ili", KM_ZONE_SPREAD, NULL); + kmem_zone_init_flags(sizeof(xfs_inode_log_item_t), "xfs_ili", + KM_ZONE_SPREAD, NULL); if (!xfs_ili_zone) goto out_destroy_inode_zone; xfs_icreate_zone = kmem_zone_init(sizeof(struct xfs_icreate_item),
diff --git a/fs/xfs/xfs_symlink.c b/fs/xfs/xfs_symlink.c index a2037e2..ed66fd2 100644 --- a/fs/xfs/xfs_symlink.c +++ b/fs/xfs/xfs_symlink.c
@@ -191,7 +191,9 @@ xfs_symlink( /* * Make sure that we have allocated dquot(s) on disk. */ - error = xfs_qm_vop_dqalloc(dp, current_fsuid(), current_fsgid(), prid, + error = xfs_qm_vop_dqalloc(dp, + xfs_kuid_to_uid(current_fsuid()), + xfs_kgid_to_gid(current_fsgid()), prid, XFS_QMOPT_QUOTALL | XFS_QMOPT_INHERIT, &udqp, &gdqp, &pdqp); if (error) @@ -201,7 +203,7 @@ xfs_symlink( * The symlink will fit into the inode data fork? * There can't be any attributes so we get the whole variable part. */ - if (pathlen <= XFS_LITINO(mp)) + if (pathlen <= XFS_LITINO(mp, dp->i_d.di_version)) fs_blocks = 0; else fs_blocks = xfs_symlink_blocks(mp, pathlen); @@ -314,7 +316,6 @@ xfs_symlink( } ASSERT(pathlen == 0); } - i_size_write(VFS_I(ip), ip->i_d.di_size); /* * Create the directory entry for the symlink.
diff --git a/fs/xfs/xfs_trace.h b/fs/xfs/xfs_trace.h index 4b58183..eaae275 100644 --- a/fs/xfs/xfs_trace.h +++ b/fs/xfs/xfs_trace.h
@@ -1011,7 +1011,6 @@ DEFINE_LOGGRANT_EVENT(xfs_log_regrant_reserve_sub); DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_enter); DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_exit); DEFINE_LOGGRANT_EVENT(xfs_log_ungrant_sub); -DEFINE_LOGGRANT_EVENT(xfs_log_cil_wait); DECLARE_EVENT_CLASS(xfs_log_item_class, TP_PROTO(struct xfs_log_item *lip), @@ -2418,7 +2417,6 @@ DEFINE_DEFER_PENDING_EVENT(xfs_defer_create_intent); DEFINE_DEFER_PENDING_EVENT(xfs_defer_cancel_list); DEFINE_DEFER_PENDING_EVENT(xfs_defer_pending_finish); DEFINE_DEFER_PENDING_EVENT(xfs_defer_pending_abort); -DEFINE_DEFER_PENDING_EVENT(xfs_defer_relog_intent); #define DEFINE_BMAP_FREE_DEFERRED_EVENT DEFINE_PHYS_EXTENT_DEFERRED_EVENT DEFINE_BMAP_FREE_DEFERRED_EVENT(xfs_bmap_free_defer); @@ -3079,7 +3077,8 @@ DEFINE_EVENT(xfs_inode_irec_class, name, \ DEFINE_INODE_EVENT(xfs_reflink_set_inode_flag); DEFINE_INODE_EVENT(xfs_reflink_unset_inode_flag); DEFINE_ITRUNC_EVENT(xfs_reflink_update_inode_size); -TRACE_EVENT(xfs_reflink_remap_blocks, +DEFINE_IMAP_EVENT(xfs_reflink_remap_imap); +TRACE_EVENT(xfs_reflink_remap_blocks_loop, TP_PROTO(struct xfs_inode *src, xfs_fileoff_t soffset, xfs_filblks_t len, struct xfs_inode *dest, xfs_fileoff_t doffset), @@ -3110,14 +3109,59 @@ TRACE_EVENT(xfs_reflink_remap_blocks, __entry->dest_ino, __entry->dest_lblk) ); +TRACE_EVENT(xfs_reflink_punch_range, + TP_PROTO(struct xfs_inode *ip, xfs_fileoff_t lblk, + xfs_extlen_t len), + TP_ARGS(ip, lblk, len), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(xfs_fileoff_t, lblk) + __field(xfs_extlen_t, len) + ), + TP_fast_assign( + __entry->dev = VFS_I(ip)->i_sb->s_dev; + __entry->ino = ip->i_ino; + __entry->lblk = lblk; + __entry->len = len; + ), + TP_printk("dev %d:%d ino 0x%llx lblk 0x%llx len 0x%x", + MAJOR(__entry->dev), MINOR(__entry->dev), + __entry->ino, + __entry->lblk, + __entry->len) +); +TRACE_EVENT(xfs_reflink_remap, + TP_PROTO(struct xfs_inode *ip, xfs_fileoff_t lblk, + xfs_extlen_t len, xfs_fsblock_t new_pblk), + TP_ARGS(ip, lblk, len, new_pblk), + TP_STRUCT__entry( + __field(dev_t, dev) + __field(xfs_ino_t, ino) + __field(xfs_fileoff_t, lblk) + __field(xfs_extlen_t, len) + __field(xfs_fsblock_t, new_pblk) + ), + TP_fast_assign( + __entry->dev = VFS_I(ip)->i_sb->s_dev; + __entry->ino = ip->i_ino; + __entry->lblk = lblk; + __entry->len = len; + __entry->new_pblk = new_pblk; + ), + TP_printk("dev %d:%d ino 0x%llx lblk 0x%llx len 0x%x new_pblk %llu", + MAJOR(__entry->dev), MINOR(__entry->dev), + __entry->ino, + __entry->lblk, + __entry->len, + __entry->new_pblk) +); DEFINE_DOUBLE_IO_EVENT(xfs_reflink_remap_range); DEFINE_INODE_ERROR_EVENT(xfs_reflink_remap_range_error); DEFINE_INODE_ERROR_EVENT(xfs_reflink_set_inode_flag_error); DEFINE_INODE_ERROR_EVENT(xfs_reflink_update_inode_size_error); DEFINE_INODE_ERROR_EVENT(xfs_reflink_remap_blocks_error); DEFINE_INODE_ERROR_EVENT(xfs_reflink_remap_extent_error); -DEFINE_INODE_IREC_EVENT(xfs_reflink_remap_extent_src); -DEFINE_INODE_IREC_EVENT(xfs_reflink_remap_extent_dest); /* dedupe tracepoints */ DEFINE_DOUBLE_IO_EVENT(xfs_reflink_compare_extents); @@ -3565,27 +3609,6 @@ DEFINE_KMEM_EVENT(kmem_alloc_large); DEFINE_KMEM_EVENT(kmem_realloc); DEFINE_KMEM_EVENT(kmem_zone_alloc); -TRACE_EVENT(xfs_check_new_dalign, - TP_PROTO(struct xfs_mount *mp, int new_dalign, xfs_ino_t calc_rootino), - TP_ARGS(mp, new_dalign, calc_rootino), - TP_STRUCT__entry( - __field(dev_t, dev) - __field(int, new_dalign) - __field(xfs_ino_t, sb_rootino) - __field(xfs_ino_t, calc_rootino) - ), - TP_fast_assign( - __entry->dev = mp->m_super->s_dev; - __entry->new_dalign = new_dalign; - __entry->sb_rootino = mp->m_sb.sb_rootino; - __entry->calc_rootino = calc_rootino; - ), - TP_printk("dev %d:%d new_dalign %d sb_rootino %llu calc_rootino %llu", - MAJOR(__entry->dev), MINOR(__entry->dev), - __entry->new_dalign, __entry->sb_rootino, - __entry->calc_rootino) -) - #endif /* _TRACE_XFS_H */ #undef TRACE_INCLUDE_PATH
diff --git a/fs/xfs/xfs_trans.c b/fs/xfs/xfs_trans.c index 47acf40..b32a664 100644 --- a/fs/xfs/xfs_trans.c +++ b/fs/xfs/xfs_trans.c
@@ -107,8 +107,7 @@ xfs_trans_dup( ntp->t_flags = XFS_TRANS_PERM_LOG_RES | (tp->t_flags & XFS_TRANS_RESERVE) | - (tp->t_flags & XFS_TRANS_NO_WRITECOUNT) | - (tp->t_flags & XFS_TRANS_RES_FDBLKS); + (tp->t_flags & XFS_TRANS_NO_WRITECOUNT); /* We gave our writer reference to the new transaction */ tp->t_flags |= XFS_TRANS_NO_WRITECOUNT; ntp->t_ticket = xfs_log_ticket_get(tp->t_ticket); @@ -274,8 +273,6 @@ xfs_trans_alloc( */ WARN_ON(resp->tr_logres > 0 && mp->m_super->s_writers.frozen == SB_FREEZE_COMPLETE); - ASSERT(!(flags & XFS_TRANS_RES_FDBLKS) || - xfs_sb_version_haslazysbcount(&mp->m_sb)); atomic_inc(&mp->m_active_trans); tp->t_magic = XFS_TRANS_HEADER_MAGIC; @@ -371,20 +368,6 @@ xfs_trans_mod_sb( tp->t_blk_res_used += (uint)-delta; if (tp->t_blk_res_used > tp->t_blk_res) xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); - } else if (delta > 0 && (tp->t_flags & XFS_TRANS_RES_FDBLKS)) { - int64_t blkres_delta; - - /* - * Return freed blocks directly to the reservation - * instead of the global pool, being careful not to - * overflow the trans counter. This is used to preserve - * reservation across chains of transaction rolls that - * repeatedly free and allocate blocks. - */ - blkres_delta = min_t(int64_t, delta, - UINT_MAX - tp->t_blk_res); - tp->t_blk_res += blkres_delta; - delta -= blkres_delta; } tp->t_fdblocks_delta += delta; if (xfs_sb_version_haslazysbcount(&mp->m_sb)) @@ -549,9 +532,57 @@ xfs_trans_apply_sb_deltas( sizeof(sbp->sb_frextents) - 1); } +STATIC int +xfs_sb_mod8( + uint8_t *field, + int8_t delta) +{ + int8_t counter = *field; + + counter += delta; + if (counter < 0) { + ASSERT(0); + return -EINVAL; + } + *field = counter; + return 0; +} + +STATIC int +xfs_sb_mod32( + uint32_t *field, + int32_t delta) +{ + int32_t counter = *field; + + counter += delta; + if (counter < 0) { + ASSERT(0); + return -EINVAL; + } + *field = counter; + return 0; +} + +STATIC int +xfs_sb_mod64( + uint64_t *field, + int64_t delta) +{ + int64_t counter = *field; + + counter += delta; + if (counter < 0) { + ASSERT(0); + return -EINVAL; + } + *field = counter; + return 0; +} + /* - * xfs_trans_unreserve_and_mod_sb() is called to release unused reservations and - * apply superblock counter changes to the in-core superblock. The + * xfs_trans_unreserve_and_mod_sb() is called to release unused reservations + * and apply superblock counter changes to the in-core superblock. The * t_res_fdblocks_delta and t_res_frextents_delta fields are explicitly NOT * applied to the in-core superblock. The idea is that that has already been * done. @@ -596,17 +627,20 @@ xfs_trans_unreserve_and_mod_sb( /* apply the per-cpu counters */ if (blkdelta) { error = xfs_mod_fdblocks(mp, blkdelta, rsvd); - ASSERT(!error); + if (error) + goto out; } if (idelta) { error = xfs_mod_icount(mp, idelta); - ASSERT(!error); + if (error) + goto out_undo_fdblocks; } if (ifreedelta) { error = xfs_mod_ifree(mp, ifreedelta); - ASSERT(!error); + if (error) + goto out_undo_icount; } if (rtxdelta == 0 && !(tp->t_flags & XFS_TRANS_SB_DIRTY)) @@ -614,23 +648,95 @@ xfs_trans_unreserve_and_mod_sb( /* apply remaining deltas */ spin_lock(&mp->m_sb_lock); - mp->m_sb.sb_frextents += rtxdelta; - mp->m_sb.sb_dblocks += tp->t_dblocks_delta; - mp->m_sb.sb_agcount += tp->t_agcount_delta; - mp->m_sb.sb_imax_pct += tp->t_imaxpct_delta; - mp->m_sb.sb_rextsize += tp->t_rextsize_delta; - mp->m_sb.sb_rbmblocks += tp->t_rbmblocks_delta; - mp->m_sb.sb_rblocks += tp->t_rblocks_delta; - mp->m_sb.sb_rextents += tp->t_rextents_delta; - mp->m_sb.sb_rextslog += tp->t_rextslog_delta; - spin_unlock(&mp->m_sb_lock); + if (rtxdelta) { + error = xfs_sb_mod64(&mp->m_sb.sb_frextents, rtxdelta); + if (error) + goto out_undo_ifree; + } - /* - * Debug checks outside of the spinlock so they don't lock up the - * machine if they fail. - */ - ASSERT(mp->m_sb.sb_imax_pct >= 0); - ASSERT(mp->m_sb.sb_rextslog >= 0); + if (tp->t_dblocks_delta != 0) { + error = xfs_sb_mod64(&mp->m_sb.sb_dblocks, tp->t_dblocks_delta); + if (error) + goto out_undo_frextents; + } + if (tp->t_agcount_delta != 0) { + error = xfs_sb_mod32(&mp->m_sb.sb_agcount, tp->t_agcount_delta); + if (error) + goto out_undo_dblocks; + } + if (tp->t_imaxpct_delta != 0) { + error = xfs_sb_mod8(&mp->m_sb.sb_imax_pct, tp->t_imaxpct_delta); + if (error) + goto out_undo_agcount; + } + if (tp->t_rextsize_delta != 0) { + error = xfs_sb_mod32(&mp->m_sb.sb_rextsize, + tp->t_rextsize_delta); + if (error) + goto out_undo_imaxpct; + } + if (tp->t_rbmblocks_delta != 0) { + error = xfs_sb_mod32(&mp->m_sb.sb_rbmblocks, + tp->t_rbmblocks_delta); + if (error) + goto out_undo_rextsize; + } + if (tp->t_rblocks_delta != 0) { + error = xfs_sb_mod64(&mp->m_sb.sb_rblocks, tp->t_rblocks_delta); + if (error) + goto out_undo_rbmblocks; + } + if (tp->t_rextents_delta != 0) { + error = xfs_sb_mod64(&mp->m_sb.sb_rextents, + tp->t_rextents_delta); + if (error) + goto out_undo_rblocks; + } + if (tp->t_rextslog_delta != 0) { + error = xfs_sb_mod8(&mp->m_sb.sb_rextslog, + tp->t_rextslog_delta); + if (error) + goto out_undo_rextents; + } + spin_unlock(&mp->m_sb_lock); + return; + +out_undo_rextents: + if (tp->t_rextents_delta) + xfs_sb_mod64(&mp->m_sb.sb_rextents, -tp->t_rextents_delta); +out_undo_rblocks: + if (tp->t_rblocks_delta) + xfs_sb_mod64(&mp->m_sb.sb_rblocks, -tp->t_rblocks_delta); +out_undo_rbmblocks: + if (tp->t_rbmblocks_delta) + xfs_sb_mod32(&mp->m_sb.sb_rbmblocks, -tp->t_rbmblocks_delta); +out_undo_rextsize: + if (tp->t_rextsize_delta) + xfs_sb_mod32(&mp->m_sb.sb_rextsize, -tp->t_rextsize_delta); +out_undo_imaxpct: + if (tp->t_rextsize_delta) + xfs_sb_mod8(&mp->m_sb.sb_imax_pct, -tp->t_imaxpct_delta); +out_undo_agcount: + if (tp->t_agcount_delta) + xfs_sb_mod32(&mp->m_sb.sb_agcount, -tp->t_agcount_delta); +out_undo_dblocks: + if (tp->t_dblocks_delta) + xfs_sb_mod64(&mp->m_sb.sb_dblocks, -tp->t_dblocks_delta); +out_undo_frextents: + if (rtxdelta) + xfs_sb_mod64(&mp->m_sb.sb_frextents, -rtxdelta); +out_undo_ifree: + spin_unlock(&mp->m_sb_lock); + if (ifreedelta) + xfs_mod_ifree(mp, -ifreedelta); +out_undo_icount: + if (idelta) + xfs_mod_icount(mp, -idelta); +out_undo_fdblocks: + if (blkdelta) + xfs_mod_fdblocks(mp, -blkdelta, rsvd); +out: + ASSERT(error == 0); return; }
diff --git a/fs/xfs/xfs_trans.h b/fs/xfs/xfs_trans.h index 9416470..64d7f17 100644 --- a/fs/xfs/xfs_trans.h +++ b/fs/xfs/xfs_trans.h
@@ -77,8 +77,6 @@ struct xfs_item_ops { void (*iop_release)(struct xfs_log_item *); xfs_lsn_t (*iop_committed)(struct xfs_log_item *, xfs_lsn_t); void (*iop_error)(struct xfs_log_item *, xfs_buf_t *); - struct xfs_log_item *(*iop_relog)(struct xfs_log_item *intent, - struct xfs_trans *tp); }; /* @@ -246,12 +244,4 @@ void xfs_trans_buf_copy_type(struct xfs_buf *dst_bp, extern kmem_zone_t *xfs_trans_zone; -static inline struct xfs_log_item * -xfs_trans_item_relog( - struct xfs_log_item *lip, - struct xfs_trans *tp) -{ - return lip->li_ops->iop_relog(lip, tp); -} - #endif /* __XFS_TRANS_H__ */
diff --git a/fs/xfs/xfs_trans_ail.c b/fs/xfs/xfs_trans_ail.c index a41ba15..812108f 100644 --- a/fs/xfs/xfs_trans_ail.c +++ b/fs/xfs/xfs_trans_ail.c
@@ -108,25 +108,17 @@ xfs_ail_next( * We need the AIL lock in order to get a coherent read of the lsn of the last * item in the AIL. */ -static xfs_lsn_t -__xfs_ail_min_lsn( - struct xfs_ail *ailp) -{ - struct xfs_log_item *lip = xfs_ail_min(ailp); - - if (lip) - return lip->li_lsn; - return 0; -} - xfs_lsn_t xfs_ail_min_lsn( struct xfs_ail *ailp) { - xfs_lsn_t lsn; + xfs_lsn_t lsn = 0; + struct xfs_log_item *lip; spin_lock(&ailp->ail_lock); - lsn = __xfs_ail_min_lsn(ailp); + lip = xfs_ail_min(ailp); + if (lip) + lsn = lip->li_lsn; spin_unlock(&ailp->ail_lock); return lsn; @@ -402,10 +394,16 @@ xfsaild_push( target = ailp->ail_target; ailp->ail_target_prev = target; - /* we're done if the AIL is empty or our push has reached the end */ lip = xfs_trans_ail_cursor_first(ailp, &cur, ailp->ail_last_pushed_lsn); - if (!lip) + if (!lip) { + /* + * If the AIL is empty or our push has reached the end we are + * done now. + */ + xfs_trans_ail_cursor_done(&cur); + spin_unlock(&ailp->ail_lock); goto out_done; + } XFS_STATS_INC(mp, xs_push_ail); @@ -487,8 +485,6 @@ xfsaild_push( break; lsn = lip->li_lsn; } - -out_done: xfs_trans_ail_cursor_done(&cur); spin_unlock(&ailp->ail_lock); @@ -496,6 +492,7 @@ xfsaild_push( ailp->ail_log_flush++; if (!count || XFS_LSN_CMP(lsn, target) >= 0) { +out_done: /* * We reached the target or the AIL is empty, so wait a bit * longer for I/O to complete and remove pushed items from the @@ -587,8 +584,7 @@ xfsaild( */ smp_rmb(); if (!xfs_ail_min(ailp) && - ailp->ail_target == ailp->ail_target_prev && - list_empty(&ailp->ail_buf_list)) { + ailp->ail_target == ailp->ail_target_prev) { spin_unlock(&ailp->ail_lock); freezable_schedule(); tout = 0; @@ -684,28 +680,6 @@ xfs_ail_push_all_sync( finish_wait(&ailp->ail_empty, &wait); } -void -xfs_ail_update_finish( - struct xfs_ail *ailp, - xfs_lsn_t old_lsn) __releases(ailp->ail_lock) -{ - struct xfs_mount *mp = ailp->ail_mount; - - /* if the tail lsn hasn't changed, don't do updates or wakeups. */ - if (!old_lsn || old_lsn == __xfs_ail_min_lsn(ailp)) { - spin_unlock(&ailp->ail_lock); - return; - } - - if (!XFS_FORCED_SHUTDOWN(mp)) - xlog_assign_tail_lsn_locked(mp); - - if (list_empty(&ailp->ail_head)) - wake_up_all(&ailp->ail_empty); - spin_unlock(&ailp->ail_lock); - xfs_log_space_wake(mp); -} - /* * xfs_trans_ail_update - bulk AIL insertion operation. * @@ -737,7 +711,7 @@ xfs_trans_ail_update_bulk( xfs_lsn_t lsn) __releases(ailp->ail_lock) { struct xfs_log_item *mlip; - xfs_lsn_t tail_lsn = 0; + int mlip_changed = 0; int i; LIST_HEAD(tmp); @@ -752,10 +726,9 @@ xfs_trans_ail_update_bulk( continue; trace_xfs_ail_move(lip, lip->li_lsn, lsn); - if (mlip == lip && !tail_lsn) - tail_lsn = lip->li_lsn; - xfs_ail_delete(ailp, lip); + if (mlip == lip) + mlip_changed = 1; } else { trace_xfs_ail_insert(lip, 0, lsn); } @@ -766,23 +739,23 @@ xfs_trans_ail_update_bulk( if (!list_empty(&tmp)) xfs_ail_splice(ailp, cur, &tmp, lsn); - xfs_ail_update_finish(ailp, tail_lsn); + if (mlip_changed) { + if (!XFS_FORCED_SHUTDOWN(ailp->ail_mount)) + xlog_assign_tail_lsn_locked(ailp->ail_mount); + spin_unlock(&ailp->ail_lock); + + xfs_log_space_wake(ailp->ail_mount); + } else { + spin_unlock(&ailp->ail_lock); + } } -/* - * Delete one log item from the AIL. - * - * If this item was at the tail of the AIL, return the LSN of the log item so - * that we can use it to check if the LSN of the tail of the log has moved - * when finishing up the AIL delete process in xfs_ail_update_finish(). - */ -xfs_lsn_t +bool xfs_ail_delete_one( struct xfs_ail *ailp, struct xfs_log_item *lip) { struct xfs_log_item *mlip = xfs_ail_min(ailp); - xfs_lsn_t lsn = lip->li_lsn; trace_xfs_ail_delete(lip, mlip->li_lsn, lip->li_lsn); xfs_ail_delete(ailp, lip); @@ -790,9 +763,7 @@ xfs_ail_delete_one( clear_bit(XFS_LI_IN_AIL, &lip->li_flags); lip->li_lsn = 0; - if (mlip == lip) - return lsn; - return 0; + return mlip == lip; } /** @@ -820,10 +791,10 @@ void xfs_trans_ail_delete( struct xfs_ail *ailp, struct xfs_log_item *lip, - int shutdown_type) + int shutdown_type) __releases(ailp->ail_lock) { struct xfs_mount *mp = ailp->ail_mount; - xfs_lsn_t tail_lsn; + bool mlip_changed; if (!test_bit(XFS_LI_IN_AIL, &lip->li_flags)) { spin_unlock(&ailp->ail_lock); @@ -836,8 +807,17 @@ xfs_trans_ail_delete( return; } - tail_lsn = xfs_ail_delete_one(ailp, lip); - xfs_ail_update_finish(ailp, tail_lsn); + mlip_changed = xfs_ail_delete_one(ailp, lip); + if (mlip_changed) { + if (!XFS_FORCED_SHUTDOWN(mp)) + xlog_assign_tail_lsn_locked(mp); + if (list_empty(&ailp->ail_head)) + wake_up_all(&ailp->ail_empty); + } + + spin_unlock(&ailp->ail_lock); + if (mlip_changed) + xfs_log_space_wake(ailp->ail_mount); } int
diff --git a/fs/xfs/xfs_trans_dquot.c b/fs/xfs/xfs_trans_dquot.c index 4e43d41..904780d 100644 --- a/fs/xfs/xfs_trans_dquot.c +++ b/fs/xfs/xfs_trans_dquot.c
@@ -15,7 +15,6 @@ #include "xfs_trans_priv.h" #include "xfs_quota.h" #include "xfs_qm.h" -#include "xfs_error.h" STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *); @@ -26,8 +25,8 @@ STATIC void xfs_trans_alloc_dqinfo(xfs_trans_t *); */ void xfs_trans_dqjoin( - struct xfs_trans *tp, - struct xfs_dquot *dqp) + xfs_trans_t *tp, + xfs_dquot_t *dqp) { ASSERT(XFS_DQ_IS_LOCKED(dqp)); ASSERT(dqp->q_logitem.qli_dquot == dqp); @@ -50,8 +49,8 @@ xfs_trans_dqjoin( */ void xfs_trans_log_dquot( - struct xfs_trans *tp, - struct xfs_dquot *dqp) + xfs_trans_t *tp, + xfs_dquot_t *dqp) { ASSERT(XFS_DQ_IS_LOCKED(dqp)); @@ -487,12 +486,12 @@ xfs_trans_apply_dquot_deltas( */ void xfs_trans_unreserve_and_mod_dquots( - struct xfs_trans *tp) + xfs_trans_t *tp) { int i, j; - struct xfs_dquot *dqp; + xfs_dquot_t *dqp; struct xfs_dqtrx *qtrx, *qa; - bool locked; + bool locked; if (!tp->t_dqinfo || !(tp->t_flags & XFS_TRANS_DQ_DIRTY)) return; @@ -572,21 +571,21 @@ xfs_quota_warn( */ STATIC int xfs_trans_dqresv( - struct xfs_trans *tp, - struct xfs_mount *mp, - struct xfs_dquot *dqp, - int64_t nblks, - long ninos, - uint flags) + xfs_trans_t *tp, + xfs_mount_t *mp, + xfs_dquot_t *dqp, + int64_t nblks, + long ninos, + uint flags) { - xfs_qcnt_t hardlimit; - xfs_qcnt_t softlimit; - time_t timer; - xfs_qwarncnt_t warns; - xfs_qwarncnt_t warnlimit; - xfs_qcnt_t total_count; - xfs_qcnt_t *resbcountp; - xfs_quotainfo_t *q = mp->m_quotainfo; + xfs_qcnt_t hardlimit; + xfs_qcnt_t softlimit; + time_t timer; + xfs_qwarncnt_t warns; + xfs_qwarncnt_t warnlimit; + xfs_qcnt_t total_count; + xfs_qcnt_t *resbcountp; + xfs_quotainfo_t *q = mp->m_quotainfo; struct xfs_def_quota *defq; @@ -701,14 +700,9 @@ xfs_trans_dqresv( XFS_TRANS_DQ_RES_INOS, ninos); } - - if (XFS_IS_CORRUPT(mp, - dqp->q_res_bcount < be64_to_cpu(dqp->q_core.d_bcount)) || - XFS_IS_CORRUPT(mp, - dqp->q_res_rtbcount < be64_to_cpu(dqp->q_core.d_rtbcount)) || - XFS_IS_CORRUPT(mp, - dqp->q_res_icount < be64_to_cpu(dqp->q_core.d_icount))) - goto error_corrupt; + ASSERT(dqp->q_res_bcount >= be64_to_cpu(dqp->q_core.d_bcount)); + ASSERT(dqp->q_res_rtbcount >= be64_to_cpu(dqp->q_core.d_rtbcount)); + ASSERT(dqp->q_res_icount >= be64_to_cpu(dqp->q_core.d_icount)); xfs_dqunlock(dqp); return 0; @@ -718,10 +712,6 @@ xfs_trans_dqresv( if (flags & XFS_QMOPT_ENOSPC) return -ENOSPC; return -EDQUOT; -error_corrupt: - xfs_dqunlock(dqp); - xfs_force_shutdown(mp, SHUTDOWN_CORRUPT_INCORE); - return -EFSCORRUPTED; } @@ -766,8 +756,7 @@ xfs_trans_reserve_quota_bydquots( } if (gdqp) { - error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, - (flags & ~XFS_QMOPT_ENOSPC)); + error = xfs_trans_dqresv(tp, mp, gdqp, nblks, ninos, flags); if (error) goto unwind_usr; } @@ -835,13 +824,13 @@ xfs_trans_reserve_quota_nblks( /* * This routine is called to allocate a quotaoff log item. */ -struct xfs_qoff_logitem * +xfs_qoff_logitem_t * xfs_trans_get_qoff_item( - struct xfs_trans *tp, - struct xfs_qoff_logitem *startqoff, + xfs_trans_t *tp, + xfs_qoff_logitem_t *startqoff, uint flags) { - struct xfs_qoff_logitem *q; + xfs_qoff_logitem_t *q; ASSERT(tp != NULL); @@ -863,8 +852,8 @@ xfs_trans_get_qoff_item( */ void xfs_trans_log_quotaoff_item( - struct xfs_trans *tp, - struct xfs_qoff_logitem *qlp) + xfs_trans_t *tp, + xfs_qoff_logitem_t *qlp) { tp->t_flags |= XFS_TRANS_DIRTY; set_bit(XFS_LI_DIRTY, &qlp->qql_item.li_flags);
diff --git a/fs/xfs/xfs_trans_priv.h b/fs/xfs/xfs_trans_priv.h index 35655ea..2e073c1 100644 --- a/fs/xfs/xfs_trans_priv.h +++ b/fs/xfs/xfs_trans_priv.h
@@ -91,11 +91,9 @@ xfs_trans_ail_update( xfs_trans_ail_update_bulk(ailp, NULL, &lip, 1, lsn); } -xfs_lsn_t xfs_ail_delete_one(struct xfs_ail *ailp, struct xfs_log_item *lip); -void xfs_ail_update_finish(struct xfs_ail *ailp, xfs_lsn_t old_lsn) - __releases(ailp->ail_lock); +bool xfs_ail_delete_one(struct xfs_ail *ailp, struct xfs_log_item *lip); void xfs_trans_ail_delete(struct xfs_ail *ailp, struct xfs_log_item *lip, - int shutdown_type); + int shutdown_type) __releases(ailp->ail_lock); static inline void xfs_trans_ail_remove(
diff --git a/include/acpi/cppc_acpi.h b/include/acpi/cppc_acpi.h index d9417ab..a6a9373 100644 --- a/include/acpi/cppc_acpi.h +++ b/include/acpi/cppc_acpi.h
@@ -16,7 +16,7 @@ #include <acpi/pcc.h> #include <acpi/processor.h> -/* CPPCv2 and CPPCv3 support */ +/* Support CPPCv2 and CPPCv3 */ #define CPPC_V2_REV 2 #define CPPC_V3_REV 3 #define CPPC_V2_NUM_ENT 21
diff --git a/include/asm-generic/bitops/atomic.h b/include/asm-generic/bitops/atomic.h index 21aa26e..0e7316a 100644 --- a/include/asm-generic/bitops/atomic.h +++ b/include/asm-generic/bitops/atomic.h
@@ -35,6 +35,9 @@ static inline int test_and_set_bit(unsigned int nr, volatile unsigned long *p) unsigned long mask = BIT_MASK(nr); p += BIT_WORD(nr); + if (READ_ONCE(*p) & mask) + return 1; + old = atomic_long_fetch_or(mask, (atomic_long_t *)p); return !!(old & mask); } @@ -45,6 +48,9 @@ static inline int test_and_clear_bit(unsigned int nr, volatile unsigned long *p) unsigned long mask = BIT_MASK(nr); p += BIT_WORD(nr); + if (!(READ_ONCE(*p) & mask)) + return 0; + old = atomic_long_fetch_andnot(mask, (atomic_long_t *)p); return !!(old & mask); }
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h index 69ab594..66397ed 100644 --- a/include/asm-generic/sections.h +++ b/include/asm-generic/sections.h
@@ -114,7 +114,7 @@ static inline bool memory_contains(void *begin, void *end, void *virt, /** * memory_intersects - checks if the region occupied by an object intersects * with another memory region - * @begin: virtual address of the beginning of the memory region + * @begin: virtual address of the beginning of the memory regien * @end: virtual address of the end of the memory region * @virt: virtual address of the memory object * @size: size of the memory object @@ -127,10 +127,7 @@ static inline bool memory_intersects(void *begin, void *end, void *virt, { void *vend = virt + size; - if (virt < end && vend > begin) - return true; - - return false; + return (virt >= begin && virt < end) || (vend >= begin && vend < end); } /**
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h index b06240b..268674c 100644 --- a/include/asm-generic/tlb.h +++ b/include/asm-generic/tlb.h
@@ -190,16 +190,12 @@ extern void tlb_remove_table(struct mmu_gather *tlb, void *table); #define tlb_needs_table_invalidate() (true) #endif -void tlb_remove_table_sync_one(void); - #else #ifdef tlb_needs_table_invalidate #error tlb_needs_table_invalidate() requires HAVE_RCU_TABLE_FREE #endif -static inline void tlb_remove_table_sync_one(void) { } - #endif /* CONFIG_HAVE_RCU_TABLE_FREE */
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index f189e34..448e001 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h
@@ -278,7 +278,6 @@ #define DATA_DATA \ *(.xiptext) \ *(DATA_MAIN) \ - *(.data..decrypted) \ *(.ref.data) \ *(.data..shared_aligned) /* percpu related */ \ MEM_KEEP(init.data*) \ @@ -832,12 +831,7 @@ #define TRACEDATA #endif -/* - * Discard .note.GNU-stack, which is emitted as PROGBITS by the compiler. - * Otherwise, the type of .notes section would become PROGBITS instead of NOTES. - */ #define NOTES \ - /DISCARD/ : { *(.note.GNU-stack) } \ .notes : AT(ADDR(.notes) - LOAD_OFFSET) { \ __start_notes = .; \ KEEP(*(.note.*)) \ @@ -896,6 +890,7 @@ #ifdef CONFIG_AMD_MEM_ENCRYPT #define PERCPU_DECRYPTED_SECTION \ . = ALIGN(PAGE_SIZE); \ + *(.data..decrypted) \ *(.data..percpu..decrypted) \ . = ALIGN(PAGE_SIZE); #else @@ -912,17 +907,10 @@ * section definitions so that such archs put those in earlier section * definitions. */ -#ifdef RUNTIME_DISCARD_EXIT -#define EXIT_DISCARDS -#else -#define EXIT_DISCARDS \ - EXIT_TEXT \ - EXIT_DATA -#endif - #define DISCARDS \ /DISCARD/ : { \ - EXIT_DISCARDS \ + EXIT_TEXT \ + EXIT_DATA \ EXIT_CALL \ *(.discard) \ *(.discard.*) \
diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h index f307f01..efd0590 100644 --- a/include/drm/drm_mipi_dsi.h +++ b/include/drm/drm_mipi_dsi.h
@@ -291,10 +291,6 @@ int mipi_dsi_dcs_set_display_brightness(struct mipi_dsi_device *dsi, u16 brightness); int mipi_dsi_dcs_get_display_brightness(struct mipi_dsi_device *dsi, u16 *brightness); -int mipi_dsi_dcs_set_display_brightness_large(struct mipi_dsi_device *dsi, - u16 brightness); -int mipi_dsi_dcs_get_display_brightness_large(struct mipi_dsi_device *dsi, - u16 *brightness); /** * struct mipi_dsi_driver - DSI driver
diff --git a/include/dt-bindings/leds/common.h b/include/dt-bindings/leds/common.h index 0bac542..9e1256a 100644 --- a/include/dt-bindings/leds/common.h +++ b/include/dt-bindings/leds/common.h
@@ -58,11 +58,6 @@ #define LED_FUNCTION_MUTE "mute" #define LED_FUNCTION_NUMLOCK "numlock" #define LED_FUNCTION_PANIC "panic" -#define LED_FUNCTION_PLAYER1 "player-1" -#define LED_FUNCTION_PLAYER2 "player-2" -#define LED_FUNCTION_PLAYER3 "player-3" -#define LED_FUNCTION_PLAYER4 "player-4" -#define LED_FUNCTION_PLAYER5 "player-5" #define LED_FUNCTION_PROGRAMMING "programming" #define LED_FUNCTION_POWER "power" #define LED_FUNCTION_RX "rx"
diff --git a/include/linux/ata.h b/include/linux/ata.h index 6d2d31b..6e67ade 100644 --- a/include/linux/ata.h +++ b/include/linux/ata.h
@@ -565,18 +565,6 @@ struct ata_bmdma_prd { ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ ((id)[ATA_ID_FEATURE_SUPP] & (1 << 2))) -#define ata_id_has_devslp(id) \ - ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ - ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ - ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8))) -#define ata_id_has_ncq_autosense(id) \ - ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ - ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ - ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7))) -#define ata_id_has_dipm(id) \ - ((((id)[ATA_ID_SATA_CAPABILITY] != 0x0000) && \ - ((id)[ATA_ID_SATA_CAPABILITY] != 0xffff)) && \ - ((id)[ATA_ID_FEATURE_SUPP] & (1 << 3))) #define ata_id_iordy_disable(id) ((id)[ATA_ID_CAPABILITY] & (1 << 10)) #define ata_id_has_iordy(id) ((id)[ATA_ID_CAPABILITY] & (1 << 11)) #define ata_id_u32(id,n) \ @@ -589,6 +577,9 @@ struct ata_bmdma_prd { #define ata_id_cdb_intr(id) (((id)[ATA_ID_CONFIG] & 0x60) == 0x20) #define ata_id_has_da(id) ((id)[ATA_ID_SATA_CAPABILITY_2] & (1 << 4)) +#define ata_id_has_devslp(id) ((id)[ATA_ID_FEATURE_SUPP] & (1 << 8)) +#define ata_id_has_ncq_autosense(id) \ + ((id)[ATA_ID_FEATURE_SUPP] & (1 << 7)) static inline bool ata_id_has_hipm(const u16 *id) { @@ -600,6 +591,17 @@ static inline bool ata_id_has_hipm(const u16 *id) return val & (1 << 9); } +static inline bool ata_id_has_dipm(const u16 *id) +{ + u16 val = id[ATA_ID_FEATURE_SUPP]; + + if (val == 0 || val == 0xffff) + return false; + + return val & (1 << 3); +} + + static inline bool ata_id_has_fua(const u16 *id) { if ((id[ATA_ID_CFSSE] & 0xC000) != 0x4000) @@ -768,21 +770,16 @@ static inline bool ata_id_has_read_log_dma_ext(const u16 *id) static inline bool ata_id_has_sense_reporting(const u16 *id) { - if (!(id[ATA_ID_CFS_ENABLE_2] & BIT(15))) + if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15))) return false; - if ((id[ATA_ID_COMMAND_SET_3] & (BIT(15) | BIT(14))) != BIT(14)) - return false; - return id[ATA_ID_COMMAND_SET_3] & BIT(6); + return id[ATA_ID_COMMAND_SET_3] & (1 << 6); } static inline bool ata_id_sense_reporting_enabled(const u16 *id) { - if (!ata_id_has_sense_reporting(id)) + if (!(id[ATA_ID_CFS_ENABLE_2] & (1 << 15))) return false; - /* ata_id_has_sense_reporting() == true, word 86 must have bit 15 set */ - if ((id[ATA_ID_COMMAND_SET_4] & (BIT(15) | BIT(14))) != BIT(14)) - return false; - return id[ATA_ID_COMMAND_SET_4] & BIT(6); + return id[ATA_ID_COMMAND_SET_4] & (1 << 6); } /**
diff --git a/include/linux/blk-crypto.h b/include/linux/blk-crypto.h index d89f521..c495572 100644 --- a/include/linux/blk-crypto.h +++ b/include/linux/blk-crypto.h
@@ -104,8 +104,8 @@ int blk_crypto_init_key(struct blk_crypto_key *blk_key, int blk_crypto_start_using_key(const struct blk_crypto_key *key, struct request_queue *q); -void blk_crypto_evict_key(struct request_queue *q, - const struct blk_crypto_key *key); +int blk_crypto_evict_key(struct request_queue *q, + const struct blk_crypto_key *key); bool blk_crypto_config_supported(struct request_queue *q, const struct blk_crypto_config *cfg);
diff --git a/include/linux/buffer_head.h b/include/linux/buffer_head.h index 0575ad8..b56cc82 100644 --- a/include/linux/buffer_head.h +++ b/include/linux/buffer_head.h
@@ -117,6 +117,7 @@ static __always_inline int test_clear_buffer_##name(struct buffer_head *bh) \ * of the form "mark_buffer_foo()". These are higher-level functions which * do something in addition to setting a b_state bit. */ +BUFFER_FNS(Uptodate, uptodate) BUFFER_FNS(Dirty, dirty) TAS_BUFFER_FNS(Dirty, dirty) BUFFER_FNS(Lock, locked) @@ -134,41 +135,6 @@ BUFFER_FNS(Meta, meta) BUFFER_FNS(Prio, prio) BUFFER_FNS(Defer_Completion, defer_completion) -static __always_inline void set_buffer_uptodate(struct buffer_head *bh) -{ - /* - * If somebody else already set this uptodate, they will - * have done the memory barrier, and a reader will thus - * see *some* valid buffer state. - * - * Any other serialization (with IO errors or whatever that - * might clear the bit) has to come from other state (eg BH_Lock). - */ - if (test_bit(BH_Uptodate, &bh->b_state)) - return; - - /* - * make it consistent with folio_mark_uptodate - * pairs with smp_load_acquire in buffer_uptodate - */ - smp_mb__before_atomic(); - set_bit(BH_Uptodate, &bh->b_state); -} - -static __always_inline void clear_buffer_uptodate(struct buffer_head *bh) -{ - clear_bit(BH_Uptodate, &bh->b_state); -} - -static __always_inline int buffer_uptodate(const struct buffer_head *bh) -{ - /* - * make it consistent with folio_test_uptodate - * pairs with smp_mb__before_atomic in set_buffer_uptodate - */ - return (smp_load_acquire(&bh->b_state) & (1UL << BH_Uptodate)) != 0; -} - #define bh_offset(bh) ((unsigned long)(bh)->b_data & ~PAGE_MASK) /* If we *know* page->private refers to buffer_heads */
diff --git a/include/linux/can/platform/sja1000.h b/include/linux/can/platform/sja1000.h index 6a86968..5755ae5 100644 --- a/include/linux/can/platform/sja1000.h +++ b/include/linux/can/platform/sja1000.h
@@ -14,7 +14,7 @@ #define OCR_MODE_TEST 0x01 #define OCR_MODE_NORMAL 0x02 #define OCR_MODE_CLOCK 0x03 -#define OCR_MODE_MASK 0x03 +#define OCR_MODE_MASK 0x07 #define OCR_TX0_INVERT 0x04 #define OCR_TX0_PULLDOWN 0x08 #define OCR_TX0_PULLUP 0x10
diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h index 357b9db..4a368d3 100644 --- a/include/linux/cgroup.h +++ b/include/linux/cgroup.h
@@ -72,7 +72,6 @@ struct css_task_iter { ANDROID_KABI_RESERVE(1); }; -extern struct file_system_type cgroup_fs_type; extern struct cgroup_root cgrp_dfl_root; extern struct css_set init_css_set;
diff --git a/include/linux/clk.h b/include/linux/clk.h index 8773033..18b7b95 100644 --- a/include/linux/clk.h +++ b/include/linux/clk.h
@@ -419,47 +419,6 @@ int __must_check devm_clk_bulk_get_all(struct device *dev, struct clk *devm_clk_get(struct device *dev, const char *id); /** - * devm_clk_get_prepared - devm_clk_get() + clk_prepare() - * @dev: device for clock "consumer" - * @id: clock consumer ID - * - * Context: May sleep. - * - * Return: a struct clk corresponding to the clock producer, or - * valid IS_ERR() condition containing errno. The implementation - * uses @dev and @id to determine the clock consumer, and thereby - * the clock producer. (IOW, @id may be identical strings, but - * clk_get may return different clock producers depending on @dev.) - * - * The returned clk (if valid) is prepared. Drivers must however assume - * that the clock is not enabled. - * - * The clock will automatically be unprepared and freed when the device - * is unbound from the bus. - */ -struct clk *devm_clk_get_prepared(struct device *dev, const char *id); - -/** - * devm_clk_get_enabled - devm_clk_get() + clk_prepare_enable() - * @dev: device for clock "consumer" - * @id: clock consumer ID - * - * Context: May sleep. - * - * Return: a struct clk corresponding to the clock producer, or - * valid IS_ERR() condition containing errno. The implementation - * uses @dev and @id to determine the clock consumer, and thereby - * the clock producer. (IOW, @id may be identical strings, but - * clk_get may return different clock producers depending on @dev.) - * - * The returned clk (if valid) is prepared and enabled. - * - * The clock will automatically be disabled, unprepared and freed - * when the device is unbound from the bus. - */ -struct clk *devm_clk_get_enabled(struct device *dev, const char *id); - -/** * devm_clk_get_optional - lookup and obtain a managed reference to an optional * clock producer. * @dev: device for clock "consumer" @@ -471,50 +430,6 @@ struct clk *devm_clk_get_enabled(struct device *dev, const char *id); struct clk *devm_clk_get_optional(struct device *dev, const char *id); /** - * devm_clk_get_optional_prepared - devm_clk_get_optional() + clk_prepare() - * @dev: device for clock "consumer" - * @id: clock consumer ID - * - * Context: May sleep. - * - * Return: a struct clk corresponding to the clock producer, or - * valid IS_ERR() condition containing errno. The implementation - * uses @dev and @id to determine the clock consumer, and thereby - * the clock producer. If no such clk is found, it returns NULL - * which serves as a dummy clk. That's the only difference compared - * to devm_clk_get_prepared(). - * - * The returned clk (if valid) is prepared. Drivers must however - * assume that the clock is not enabled. - * - * The clock will automatically be unprepared and freed when the - * device is unbound from the bus. - */ -struct clk *devm_clk_get_optional_prepared(struct device *dev, const char *id); - -/** - * devm_clk_get_optional_enabled - devm_clk_get_optional() + - * clk_prepare_enable() - * @dev: device for clock "consumer" - * @id: clock consumer ID - * - * Context: May sleep. - * - * Return: a struct clk corresponding to the clock producer, or - * valid IS_ERR() condition containing errno. The implementation - * uses @dev and @id to determine the clock consumer, and thereby - * the clock producer. If no such clk is found, it returns NULL - * which serves as a dummy clk. That's the only difference compared - * to devm_clk_get_enabled(). - * - * The returned clk (if valid) is prepared and enabled. - * - * The clock will automatically be disabled, unprepared and freed - * when the device is unbound from the bus. - */ -struct clk *devm_clk_get_optional_enabled(struct device *dev, const char *id); - -/** * devm_get_clk_from_child - lookup and obtain a managed reference to a * clock producer from child node. * @dev: device for clock "consumer" @@ -855,36 +770,12 @@ static inline struct clk *devm_clk_get(struct device *dev, const char *id) return NULL; } -static inline struct clk *devm_clk_get_prepared(struct device *dev, - const char *id) -{ - return NULL; -} - -static inline struct clk *devm_clk_get_enabled(struct device *dev, - const char *id) -{ - return NULL; -} - static inline struct clk *devm_clk_get_optional(struct device *dev, const char *id) { return NULL; } -static inline struct clk *devm_clk_get_optional_prepared(struct device *dev, - const char *id) -{ - return NULL; -} - -static inline struct clk *devm_clk_get_optional_enabled(struct device *dev, - const char *id) -{ - return NULL; -} - static inline int __must_check devm_clk_bulk_get(struct device *dev, int num_clks, struct clk_bulk_data *clks) {
diff --git a/include/linux/cpu.h b/include/linux/cpu.h index b42e9c4..29a6fa2 100644 --- a/include/linux/cpu.h +++ b/include/linux/cpu.h
@@ -68,8 +68,6 @@ extern ssize_t cpu_show_srbds(struct device *dev, struct device_attribute *attr, extern ssize_t cpu_show_mmio_stale_data(struct device *dev, struct device_attribute *attr, char *buf); -extern ssize_t cpu_show_retbleed(struct device *dev, - struct device_attribute *attr, char *buf); extern __printf(4, 5) struct device *cpu_device_create(struct device *parent, void *drvdata,
diff --git a/include/linux/debugfs.h b/include/linux/debugfs.h index d0238d3..798f0b9 100644 --- a/include/linux/debugfs.h +++ b/include/linux/debugfs.h
@@ -39,7 +39,7 @@ struct debugfs_regset32 { extern struct dentry *arch_debugfs_dir; -#define DEFINE_DEBUGFS_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, __is_signed) \ +#define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \ static int __fops ## _open(struct inode *inode, struct file *file) \ { \ __simple_attr_check_format(__fmt, 0ull); \ @@ -50,16 +50,10 @@ static const struct file_operations __fops = { \ .open = __fops ## _open, \ .release = simple_attr_release, \ .read = debugfs_attr_read, \ - .write = (__is_signed) ? debugfs_attr_write_signed : debugfs_attr_write, \ + .write = debugfs_attr_write, \ .llseek = no_llseek, \ } -#define DEFINE_DEBUGFS_ATTRIBUTE(__fops, __get, __set, __fmt) \ - DEFINE_DEBUGFS_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, false) - -#define DEFINE_DEBUGFS_ATTRIBUTE_SIGNED(__fops, __get, __set, __fmt) \ - DEFINE_DEBUGFS_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, true) - typedef struct vfsmount *(*debugfs_automount_t)(struct dentry *, void *); #if defined(CONFIG_DEBUG_FS) @@ -91,8 +85,6 @@ struct dentry *debugfs_create_automount(const char *name, void debugfs_remove(struct dentry *dentry); void debugfs_remove_recursive(struct dentry *dentry); -void debugfs_lookup_and_remove(const char *name, struct dentry *parent); - const struct file_operations *debugfs_real_fops(const struct file *filp); int debugfs_file_get(struct dentry *dentry); @@ -102,8 +94,6 @@ ssize_t debugfs_attr_read(struct file *file, char __user *buf, size_t len, loff_t *ppos); ssize_t debugfs_attr_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos); -ssize_t debugfs_attr_write_signed(struct file *file, const char __user *buf, - size_t len, loff_t *ppos); struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, struct dentry *new_dir, const char *new_name); @@ -226,10 +216,6 @@ static inline void debugfs_remove(struct dentry *dentry) static inline void debugfs_remove_recursive(struct dentry *dentry) { } -static inline void debugfs_lookup_and_remove(const char *name, - struct dentry *parent) -{ } - const struct file_operations *debugfs_real_fops(const struct file *filp); static inline int debugfs_file_get(struct dentry *dentry) @@ -253,13 +239,6 @@ static inline ssize_t debugfs_attr_write(struct file *file, return -ENODEV; } -static inline ssize_t debugfs_attr_write_signed(struct file *file, - const char __user *buf, - size_t len, loff_t *ppos) -{ - return -ENODEV; -} - static inline struct dentry *debugfs_rename(struct dentry *old_dir, struct dentry *old_dentry, struct dentry *new_dir, char *new_name) {
diff --git a/include/linux/dma-noncoherent.h b/include/linux/dma-noncoherent.h index 47d4830..dd3de6d 100644 --- a/include/linux/dma-noncoherent.h +++ b/include/linux/dma-noncoherent.h
@@ -75,29 +75,29 @@ static inline void arch_dma_cache_sync(struct device *dev, void *vaddr, #endif /* CONFIG_DMA_NONCOHERENT_CACHE_SYNC */ #ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_DEVICE -void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir); +void arch_sync_dma_for_device(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir); #else -static inline void arch_sync_dma_for_device(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +static inline void arch_sync_dma_for_device(struct device *dev, + phys_addr_t paddr, size_t size, enum dma_data_direction dir) { } #endif /* ARCH_HAS_SYNC_DMA_FOR_DEVICE */ #ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU -void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir); +void arch_sync_dma_for_cpu(struct device *dev, phys_addr_t paddr, + size_t size, enum dma_data_direction dir); #else -static inline void arch_sync_dma_for_cpu(phys_addr_t paddr, size_t size, - enum dma_data_direction dir) +static inline void arch_sync_dma_for_cpu(struct device *dev, + phys_addr_t paddr, size_t size, enum dma_data_direction dir) { } #endif /* ARCH_HAS_SYNC_DMA_FOR_CPU */ #ifdef CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL -void arch_sync_dma_for_cpu_all(void); +void arch_sync_dma_for_cpu_all(struct device *dev); #else -static inline void arch_sync_dma_for_cpu_all(void) +static inline void arch_sync_dma_for_cpu_all(struct device *dev) { } #endif /* CONFIG_ARCH_HAS_SYNC_DMA_FOR_CPU_ALL */
diff --git a/include/linux/dynamic_debug.h b/include/linux/dynamic_debug.h index de47e3f..abcd5fd 100644 --- a/include/linux/dynamic_debug.h +++ b/include/linux/dynamic_debug.h
@@ -191,7 +191,7 @@ static inline int ddebug_remove_module(const char *mod) static inline int ddebug_dyndbg_module_param_cb(char *param, char *val, const char *modname) { - if (!strcmp(param, "dyndbg")) { + if (strstr(param, "dyndbg")) { /* avoid pr_warn(), which wants pr_fmt() fully defined */ printk(KERN_WARNING "dyndbg param is supported only in " "CONFIG_DYNAMIC_DEBUG builds\n");
diff --git a/include/linux/efi.h b/include/linux/efi.h index 880cd86..f9b9f9a 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h
@@ -1715,7 +1715,7 @@ efi_status_t efi_exit_boot_services(efi_system_table_t *sys_table, void *priv, efi_exit_boot_map_processing priv_func); -#define EFI_RANDOM_SEED_SIZE 32U // BLAKE2S_HASH_SIZE +#define EFI_RANDOM_SEED_SIZE 64U struct linux_efi_random_seed { u32 size;
diff --git a/include/linux/eventfd.h b/include/linux/eventfd.h index 3482f93..dc4fd8a 100644 --- a/include/linux/eventfd.h +++ b/include/linux/eventfd.h
@@ -61,7 +61,7 @@ static inline struct eventfd_ctx *eventfd_ctx_fdget(int fd) return ERR_PTR(-ENOSYS); } -static inline int eventfd_signal(struct eventfd_ctx *ctx, __u64 n) +static inline int eventfd_signal(struct eventfd_ctx *ctx, int n) { return -ENOSYS; }
diff --git a/include/linux/fs.h b/include/linux/fs.h index d2c5201..8e253b5 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h
@@ -554,11 +554,6 @@ static inline void i_mmap_unlock_write(struct address_space *mapping) up_write(&mapping->i_mmap_rwsem); } -static inline int i_mmap_trylock_read(struct address_space *mapping) -{ - return down_read_trylock(&mapping->i_mmap_rwsem); -} - static inline void i_mmap_lock_read(struct address_space *mapping) { down_read(&mapping->i_mmap_rwsem); @@ -3617,7 +3612,7 @@ void simple_transaction_set(struct file *file, size_t n); * All attributes contain a text representation of a numeric value * that are accessed with the get() and set() functions. */ -#define DEFINE_SIMPLE_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, __is_signed) \ +#define DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt) \ static int __fops ## _open(struct inode *inode, struct file *file) \ { \ __simple_attr_check_format(__fmt, 0ull); \ @@ -3628,16 +3623,10 @@ static const struct file_operations __fops = { \ .open = __fops ## _open, \ .release = simple_attr_release, \ .read = simple_attr_read, \ - .write = (__is_signed) ? simple_attr_write_signed : simple_attr_write, \ + .write = simple_attr_write, \ .llseek = generic_file_llseek, \ } -#define DEFINE_SIMPLE_ATTRIBUTE(__fops, __get, __set, __fmt) \ - DEFINE_SIMPLE_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, false) - -#define DEFINE_SIMPLE_ATTRIBUTE_SIGNED(__fops, __get, __set, __fmt) \ - DEFINE_SIMPLE_ATTRIBUTE_XSIGNED(__fops, __get, __set, __fmt, true) - static inline __printf(1, 2) void __simple_attr_check_format(const char *fmt, ...) { @@ -3652,8 +3641,6 @@ ssize_t simple_attr_read(struct file *file, char __user *buf, size_t len, loff_t *ppos); ssize_t simple_attr_write(struct file *file, const char __user *buf, size_t len, loff_t *ppos); -ssize_t simple_attr_write_signed(struct file *file, const char __user *buf, - size_t len, loff_t *ppos); struct ctl_table; int proc_nr_files(struct ctl_table *table, int write,
diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 52c1c6f..9141f22 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h
@@ -712,7 +712,7 @@ static inline void __ftrace_enabled_restore(int enabled) #define CALLER_ADDR5 ((unsigned long)ftrace_return_address(5)) #define CALLER_ADDR6 ((unsigned long)ftrace_return_address(6)) -static __always_inline unsigned long get_lock_parent_ip(void) +static inline unsigned long get_lock_parent_ip(void) { unsigned long addr = CALLER_ADDR0;
diff --git a/include/linux/highmem.h b/include/linux/highmem.h index e32cf59..9d6afc3 100644 --- a/include/linux/highmem.h +++ b/include/linux/highmem.h
@@ -281,22 +281,4 @@ static inline void copy_highpage(struct page *to, struct page *from) #endif -static inline void memcpy_from_page(char *to, struct page *page, - size_t offset, size_t len) -{ - char *from = kmap_atomic(page); - - memcpy(to, from + offset, len); - kunmap_atomic(from); -} - -static inline void memcpy_to_page(struct page *page, size_t offset, - const char *from, size_t len) -{ - char *to = kmap_atomic(page); - - memcpy(to + offset, from, len); - kunmap_atomic(to); -} - #endif /* _LINUX_HIGHMEM_H */
diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 6624a40..db16dee 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h
@@ -7,7 +7,6 @@ #include <linux/fs.h> #include <linux/hugetlb_inline.h> #include <linux/cgroup.h> -#include <linux/page_ref.h> #include <linux/list.h> #include <linux/kref.h> #include <asm/pgtable.h> @@ -133,8 +132,8 @@ struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address, struct page *follow_huge_pd(struct vm_area_struct *vma, unsigned long address, hugepd_t hpd, int flags, int pdshift); -struct page *follow_huge_pmd_pte(struct vm_area_struct *vma, unsigned long address, - int flags); +struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address, + pmd_t *pmd, int flags); struct page *follow_huge_pud(struct mm_struct *mm, unsigned long address, pud_t *pud, int flags); struct page *follow_huge_pgd(struct mm_struct *mm, unsigned long address, @@ -182,7 +181,7 @@ static inline void hugetlb_show_meminfo(void) { } #define follow_huge_pd(vma, addr, hpd, flags, pdshift) NULL -#define follow_huge_pmd_pte(vma, addr, flags) NULL +#define follow_huge_pmd(mm, addr, pmd, flags) NULL #define follow_huge_pud(mm, addr, pud, flags) NULL #define follow_huge_pgd(mm, addr, pgd, flags) NULL #define prepare_hugepage_range(file, addr, len) (-EINVAL) @@ -407,10 +406,7 @@ static inline struct hstate *hstate_sizelog(int page_size_log) if (!page_size_log) return &default_hstate; - if (page_size_log < BITS_PER_LONG) - return size_to_hstate(1UL << page_size_log); - - return NULL; + return size_to_hstate(1UL << page_size_log); } static inline struct hstate *hstate_vma(struct vm_area_struct *vma) @@ -758,18 +754,6 @@ static inline spinlock_t *huge_pte_lock(struct hstate *h, return ptl; } -#ifdef CONFIG_ARCH_WANT_HUGE_PMD_SHARE -static inline bool hugetlb_pmd_shared(pte_t *pte) -{ - return page_count(virt_to_page(pte)) > 1; -} -#else -static inline bool hugetlb_pmd_shared(pte_t *pte) -{ - return false; -} -#endif - bool want_pmd_share(struct vm_area_struct *vma, unsigned long addr); #ifndef __HAVE_ARCH_FLUSH_HUGETLB_TLB_RANGE
diff --git a/include/linux/ima.h b/include/linux/ima.h index 5d52478..1c37f17 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h
@@ -17,8 +17,7 @@ extern int ima_bprm_check(struct linux_binprm *bprm); extern int ima_file_check(struct file *file, int mask); extern void ima_post_create_tmpfile(struct inode *inode); extern void ima_file_free(struct file *file); -extern int ima_file_mmap(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags); +extern int ima_file_mmap(struct file *file, unsigned long prot); extern int ima_load_data(enum kernel_load_data_id id); extern int ima_read_file(struct file *file, enum kernel_read_file_id id); extern int ima_post_read_file(struct file *file, void *buf, loff_t size, @@ -65,8 +64,7 @@ static inline void ima_file_free(struct file *file) return; } -static inline int ima_file_mmap(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) +static inline int ima_file_mmap(struct file *file, unsigned long prot) { return 0; }
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 30e9253..89fc59d 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h
@@ -598,17 +598,12 @@ struct tasklet_struct unsigned long data; }; -#define DECLARE_TASKLET_OLD(name, _func) \ -struct tasklet_struct name = { \ - .count = ATOMIC_INIT(0), \ - .func = _func, \ -} +#define DECLARE_TASKLET(name, func, data) \ +struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(0), func, data } -#define DECLARE_TASKLET_DISABLED_OLD(name, _func) \ -struct tasklet_struct name = { \ - .count = ATOMIC_INIT(1), \ - .func = _func, \ -} +#define DECLARE_TASKLET_DISABLED(name, func, data) \ +struct tasklet_struct name = { NULL, 0, ATOMIC_INIT(1), func, data } + enum {
diff --git a/include/linux/iomap.h b/include/linux/iomap.h index bef196d..a04c9ff 100644 --- a/include/linux/iomap.h +++ b/include/linux/iomap.h
@@ -33,8 +33,6 @@ struct vm_fault; * * IOMAP_F_DIRTY indicates the inode has uncommitted metadata needed to access * written data and requires fdatasync to commit them to persistent storage. - * This needs to take into account metadata changes that *may* be made at IO - * completion, such as file size updates from direct IO. */ #define IOMAP_F_NEW 0x01 /* blocks have been newly allocated */ #define IOMAP_F_DIRTY 0x02 /* uncommitted metadata */
diff --git a/include/linux/iova.h b/include/linux/iova.h index 0b6e1fb..58713bb 100644 --- a/include/linux/iova.h +++ b/include/linux/iova.h
@@ -133,7 +133,7 @@ static inline unsigned long iova_pfn(struct iova_domain *iovad, dma_addr_t iova) return iova >> iova_shift(iovad); } -#if IS_REACHABLE(CONFIG_IOMMU_IOVA) +#if IS_ENABLED(CONFIG_IOMMU_IOVA) int iova_cache_get(void); void iova_cache_put(void);
diff --git a/include/linux/irqdomain.h b/include/linux/irqdomain.h index ac2b42d..add3408 100644 --- a/include/linux/irqdomain.h +++ b/include/linux/irqdomain.h
@@ -261,11 +261,7 @@ static inline struct fwnode_handle *irq_domain_alloc_fwnode(phys_addr_t *pa) } void irq_domain_free_fwnode(struct fwnode_handle *fwnode); -#ifdef __GENKSYMS__ /* Android KABI hack to preserve CRC checker */ struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, -#else -struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, unsigned int size, -#endif irq_hw_number_t hwirq_max, int direct_max, const struct irq_domain_ops *ops, void *host_data);
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 39d918c..88b3821 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h
@@ -321,7 +321,6 @@ extern long (*panic_blink)(int state); __printf(1, 2) void panic(const char *fmt, ...) __noreturn __cold; void nmi_panic(struct pt_regs *regs, const char *msg); -void check_panic_on_warn(const char *origin); extern void oops_enter(void); extern void oops_exit(void); void print_oops_end_marker(void);
diff --git a/include/linux/kernel_stat.h b/include/linux/kernel_stat.h index f7f20cf..7ee2bb4 100644 --- a/include/linux/kernel_stat.h +++ b/include/linux/kernel_stat.h
@@ -73,7 +73,7 @@ extern unsigned int kstat_irqs_usr(unsigned int irq); /* * Number of interrupts per cpu, since bootup */ -static inline unsigned long kstat_cpu_irqs_sum(unsigned int cpu) +static inline unsigned int kstat_cpu_irqs_sum(unsigned int cpu) { return kstat_cpu(cpu).irqs_sum; }
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h index d3e0f9d..fc4b0b1 100644 --- a/include/linux/kfifo.h +++ b/include/linux/kfifo.h
@@ -615,7 +615,7 @@ __kfifo_uint_must_check_helper( \ * writer, you don't need extra locking to use these macro. */ #define kfifo_to_user(fifo, to, len, copied) \ -__kfifo_int_must_check_helper( \ +__kfifo_uint_must_check_helper( \ ({ \ typeof((fifo) + 1) __tmp = (fifo); \ void __user *__to = (to); \
diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index 0be024d..c7764d9 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h
@@ -318,8 +318,6 @@ extern int proc_kprobes_optimization_handler(struct ctl_table *table, size_t *length, loff_t *ppos); #endif extern void wait_for_kprobe_optimizer(void); -bool optprobe_queued_unopt(struct optimized_kprobe *op); -bool kprobe_disarmed(struct kprobe *p); #else static inline void wait_for_kprobe_optimizer(void) { } #endif /* CONFIG_OPTPROBES */
diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h index ee7d574..19e8344 100644 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h
@@ -146,7 +146,6 @@ static inline bool is_error_page(struct page *page) #define KVM_REQ_MMU_RELOAD (1 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQ_PENDING_TIMER 2 #define KVM_REQ_UNHALT 3 -#define KVM_REQ_VM_BUGGED (4 | KVM_REQUEST_WAIT | KVM_REQUEST_NO_WAKEUP) #define KVM_REQUEST_ARCH_BASE 8 #define KVM_ARCH_REQ_FLAGS(nr, flags) ({ \ @@ -503,7 +502,6 @@ struct kvm { struct srcu_struct srcu; struct srcu_struct irq_srcu; pid_t userspace_pid; - bool vm_bugged; }; #define kvm_err(fmt, ...) \ @@ -532,31 +530,6 @@ struct kvm { #define vcpu_err(vcpu, fmt, ...) \ kvm_err("vcpu%i " fmt, (vcpu)->vcpu_id, ## __VA_ARGS__) -bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req); -static inline void kvm_vm_bugged(struct kvm *kvm) -{ - kvm->vm_bugged = true; - kvm_make_all_cpus_request(kvm, KVM_REQ_VM_BUGGED); -} - -#define KVM_BUG(cond, kvm, fmt...) \ -({ \ - int __ret = (cond); \ - \ - if (WARN_ONCE(__ret && !(kvm)->vm_bugged, fmt)) \ - kvm_vm_bugged(kvm); \ - unlikely(__ret); \ -}) - -#define KVM_BUG_ON(cond, kvm) \ -({ \ - int __ret = (cond); \ - \ - if (WARN_ON_ONCE(__ret && !(kvm)->vm_bugged)) \ - kvm_vm_bugged(kvm); \ - unlikely(__ret); \ -}) - static inline struct kvm_io_bus *kvm_get_bus(struct kvm *kvm, enum kvm_bus idx) { return srcu_dereference_check(kvm->buses[idx], &kvm->srcu, @@ -817,6 +790,7 @@ void kvm_reload_remote_mmus(struct kvm *kvm); bool kvm_make_vcpus_request_mask(struct kvm *kvm, unsigned int req, unsigned long *vcpu_bitmap, cpumask_var_t tmp); +bool kvm_make_all_cpus_request(struct kvm *kvm, unsigned int req); long kvm_arch_dev_ioctl(struct file *filp, unsigned int ioctl, unsigned long arg); @@ -955,7 +929,7 @@ static inline void kvm_arch_end_assignment(struct kvm *kvm) { } -static __always_inline bool kvm_arch_has_assigned_device(struct kvm *kvm) +static inline bool kvm_arch_has_assigned_device(struct kvm *kvm) { return false; }
diff --git a/include/linux/led-class-multicolor.h b/include/linux/led-class-multicolor.h deleted file mode 100644 index 210d57b..0000000 --- a/include/linux/led-class-multicolor.h +++ /dev/null
@@ -1,109 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* LED Multicolor class interface - * Copyright (C) 2019-20 Texas Instruments Incorporated - http://www.ti.com/ - */ - -#ifndef _LINUX_MULTICOLOR_LEDS_H_INCLUDED -#define _LINUX_MULTICOLOR_LEDS_H_INCLUDED - -#include <linux/leds.h> -#include <dt-bindings/leds/common.h> - -struct mc_subled { - unsigned int color_index; - unsigned int brightness; - unsigned int intensity; - unsigned int channel; -}; - -struct led_classdev_mc { - /* led class device */ - struct led_classdev led_cdev; - unsigned int num_colors; - - struct mc_subled *subled_info; -}; - -static inline struct led_classdev_mc *lcdev_to_mccdev( - struct led_classdev *led_cdev) -{ - return container_of(led_cdev, struct led_classdev_mc, led_cdev); -} - -#if IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR) -/** - * led_classdev_multicolor_register_ext - register a new object of led_classdev - * class with support for multicolor LEDs - * @parent: the multicolor LED to register - * @mcled_cdev: the led_classdev_mc structure for this device - * @init_data: the LED class multicolor device initialization data - * - * Returns: 0 on success or negative error value on failure - */ -int led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data); - -/** - * led_classdev_multicolor_unregister - unregisters an object of led_classdev - * class with support for multicolor LEDs - * @mcled_cdev: the multicolor LED to unregister - * - * Unregister a previously registered via led_classdev_multicolor_register - * object - */ -void led_classdev_multicolor_unregister(struct led_classdev_mc *mcled_cdev); - -/* Calculate brightness for the monochrome LED cluster */ -int led_mc_calc_color_components(struct led_classdev_mc *mcled_cdev, - enum led_brightness brightness); - -int devm_led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data); - -void devm_led_classdev_multicolor_unregister(struct device *parent, - struct led_classdev_mc *mcled_cdev); -#else - -static inline int led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data) -{ - return 0; -} - -static inline void led_classdev_multicolor_unregister(struct led_classdev_mc *mcled_cdev) {}; -static inline int led_mc_calc_color_components(struct led_classdev_mc *mcled_cdev, - enum led_brightness brightness) -{ - return 0; -} - -static inline int devm_led_classdev_multicolor_register_ext(struct device *parent, - struct led_classdev_mc *mcled_cdev, - struct led_init_data *init_data) -{ - return 0; -} - -static inline void devm_led_classdev_multicolor_unregister(struct device *parent, - struct led_classdev_mc *mcled_cdev) -{}; - -#endif /* IS_ENABLED(CONFIG_LEDS_CLASS_MULTICOLOR) */ - -static inline int led_classdev_multicolor_register(struct device *parent, - struct led_classdev_mc *mcled_cdev) -{ - return led_classdev_multicolor_register_ext(parent, mcled_cdev, NULL); -} - -static inline int devm_led_classdev_multicolor_register(struct device *parent, - struct led_classdev_mc *mcled_cdev) -{ - return devm_led_classdev_multicolor_register_ext(parent, mcled_cdev, - NULL); -} - -#endif /* _LINUX_MULTICOLOR_LEDS_H_INCLUDED */
diff --git a/include/linux/mbcache.h b/include/linux/mbcache.h index 591bc4c..20f1e3f 100644 --- a/include/linux/mbcache.h +++ b/include/linux/mbcache.h
@@ -10,29 +10,16 @@ struct mb_cache; -/* Cache entry flags */ -enum { - MBE_REFERENCED_B = 0, - MBE_REUSABLE_B -}; - struct mb_cache_entry { /* List of entries in cache - protected by cache->c_list_lock */ struct list_head e_list; - /* - * Hash table list - protected by hash chain bitlock. The entry is - * guaranteed to be hashed while e_refcnt > 0. - */ + /* Hash table list - protected by hash chain bitlock */ struct hlist_bl_node e_hash_list; - /* - * Entry refcount. Once it reaches zero, entry is unhashed and freed. - * While refcount > 0, the entry is guaranteed to stay in the hash and - * e.g. mb_cache_entry_try_delete() will fail. - */ atomic_t e_refcnt; /* Key in hash - stable during lifetime of the entry */ u32 e_key; - unsigned long e_flags; + u32 e_referenced:1; + u32 e_reusable:1; /* User provided value - stable during lifetime of the entry */ u64 e_value; }; @@ -42,24 +29,16 @@ void mb_cache_destroy(struct mb_cache *cache); int mb_cache_entry_create(struct mb_cache *cache, gfp_t mask, u32 key, u64 value, bool reusable); -void __mb_cache_entry_free(struct mb_cache *cache, - struct mb_cache_entry *entry); -void mb_cache_entry_wait_unused(struct mb_cache_entry *entry); -static inline void mb_cache_entry_put(struct mb_cache *cache, - struct mb_cache_entry *entry) +void __mb_cache_entry_free(struct mb_cache_entry *entry); +static inline int mb_cache_entry_put(struct mb_cache *cache, + struct mb_cache_entry *entry) { - unsigned int cnt = atomic_dec_return(&entry->e_refcnt); - - if (cnt > 0) { - if (cnt <= 2) - wake_up_var(&entry->e_refcnt); - return; - } - __mb_cache_entry_free(cache, entry); + if (!atomic_dec_and_test(&entry->e_refcnt)) + return 0; + __mb_cache_entry_free(entry); + return 1; } -struct mb_cache_entry *mb_cache_entry_delete_or_get(struct mb_cache *cache, - u32 key, u64 value); void mb_cache_entry_delete(struct mb_cache *cache, u32 key, u64 value); struct mb_cache_entry *mb_cache_entry_get(struct mb_cache *cache, u32 key, u64 value);
diff --git a/include/linux/mfd/t7l66xb.h b/include/linux/mfd/t7l66xb.h index ae3e7a5..69632c1 100644 --- a/include/linux/mfd/t7l66xb.h +++ b/include/linux/mfd/t7l66xb.h
@@ -12,6 +12,7 @@ struct t7l66xb_platform_data { int (*enable)(struct platform_device *dev); + int (*disable)(struct platform_device *dev); int (*suspend)(struct platform_device *dev); int (*resume)(struct platform_device *dev);
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h index 3a19b92..2b65ffb 100644 --- a/include/linux/mlx5/driver.h +++ b/include/linux/mlx5/driver.h
@@ -904,7 +904,7 @@ void mlx5_cmd_allowed_opcode(struct mlx5_core_dev *dev, u16 opcode); struct mlx5_async_ctx { struct mlx5_core_dev *dev; atomic_t num_inflight; - struct completion inflight_done; + struct wait_queue_head wait; }; struct mlx5_async_work;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h index 99ae809..3219304 100644 --- a/include/linux/mmc/mmc.h +++ b/include/linux/mmc/mmc.h
@@ -435,7 +435,7 @@ static inline bool mmc_op_multi(u32 opcode) #define MMC_SECURE_TRIM1_ARG 0x80000001 #define MMC_SECURE_TRIM2_ARG 0x80008000 #define MMC_SECURE_ARGS 0x80000000 -#define MMC_TRIM_OR_DISCARD_ARGS 0x00008003 +#define MMC_TRIM_ARGS 0x00008001 #define mmc_driver_type_mask(n) (1 << (n))
diff --git a/include/linux/mmdebug.h b/include/linux/mmdebug.h index 4ed5287..5d0767c 100644 --- a/include/linux/mmdebug.h +++ b/include/linux/mmdebug.h
@@ -38,7 +38,7 @@ void dump_mm(const struct mm_struct *mm); } \ } while (0) #define VM_WARN_ON_ONCE_PAGE(cond, page) ({ \ - static bool __section(.data.once) __warned; \ + static bool __section(".data.once") __warned; \ int __ret_warn_once = !!(cond); \ \ if (unlikely(__ret_warn_once && !__warned)) { \
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index 8265b99..4c56404 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h
@@ -672,7 +672,9 @@ struct x86_cpu_id { __u16 steppings; }; -/* Wild cards for x86_cpu_id::vendor, family, model and feature */ +#define X86_FEATURE_MATCH(x) \ + { X86_VENDOR_ANY, X86_FAMILY_ANY, X86_MODEL_ANY, x } + #define X86_VENDOR_ANY 0xffff #define X86_FAMILY_ANY 0 #define X86_MODEL_ANY 0
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index a604340..5a73296 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h
@@ -259,11 +259,9 @@ struct hh_cache { * relationship HH alignment <= LL alignment. */ #define LL_RESERVED_SPACE(dev) \ - ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom)) \ - & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD) + ((((dev)->hard_header_len+(dev)->needed_headroom)&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) #define LL_RESERVED_SPACE_EXTRA(dev,extra) \ - ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom) + (extra)) \ - & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD) + ((((dev)->hard_header_len+(dev)->needed_headroom+(extra))&~(HH_DATA_MOD - 1)) + HH_DATA_MOD) struct header_ops { int (*create) (struct sk_buff *skb, struct net_device *dev, @@ -2012,7 +2010,7 @@ struct net_device { struct netdev_queue *_tx ____cacheline_aligned_in_smp; unsigned int num_tx_queues; unsigned int real_num_tx_queues; - struct Qdisc __rcu *qdisc; + struct Qdisc *qdisc; #ifdef CONFIG_NET_SCHED DECLARE_HASHTABLE (qdisc_hash, 4); #endif
diff --git a/include/linux/netfilter_bridge/ebtables.h b/include/linux/netfilter_bridge/ebtables.h index f0d846d..db472c9 100644 --- a/include/linux/netfilter_bridge/ebtables.h +++ b/include/linux/netfilter_bridge/ebtables.h
@@ -94,6 +94,10 @@ struct ebt_table { struct ebt_replace_kernel *table; unsigned int valid_hooks; rwlock_t lock; + /* e.g. could be the table explicitly only allows certain + * matches, targets, ... 0 == let it in */ + int (*check)(const struct ebt_table_info *info, + unsigned int valid_hooks); /* the data used by the kernel */ struct ebt_table_info *private; struct module *me;
diff --git a/include/linux/nmi.h b/include/linux/nmi.h index 0844f60..b6c9a8d 100644 --- a/include/linux/nmi.h +++ b/include/linux/nmi.h
@@ -122,8 +122,6 @@ int watchdog_nmi_probe(void); int watchdog_nmi_enable(unsigned int cpu); void watchdog_nmi_disable(unsigned int cpu); -void lockup_detector_reconfigure(void); - /** * touch_nmi_watchdog - restart NMI watchdog timeout. *
diff --git a/include/linux/nospec.h b/include/linux/nospec.h index 207ef2a..0c5ef54 100644 --- a/include/linux/nospec.h +++ b/include/linux/nospec.h
@@ -9,10 +9,6 @@ struct task_struct; -#ifndef barrier_nospec -# define barrier_nospec() do { } while (0) -#endif - /** * array_index_mask_nospec() - generate a ~0 mask when index < size, 0 otherwise * @index: array element index
diff --git a/include/linux/nvme-tcp.h b/include/linux/nvme-tcp.h index 73364ae..959e0bd 100644 --- a/include/linux/nvme-tcp.h +++ b/include/linux/nvme-tcp.h
@@ -114,9 +114,8 @@ struct nvme_tcp_icresp_pdu { struct nvme_tcp_term_pdu { struct nvme_tcp_hdr hdr; __le16 fes; - __le16 feil; - __le16 feiu; - __u8 rsvd[10]; + __le32 fei; + __u8 rsvd[8]; }; /**
diff --git a/include/linux/nvme.h b/include/linux/nvme.h index ff0ee07..a260cd7 100644 --- a/include/linux/nvme.h +++ b/include/linux/nvme.h
@@ -7,7 +7,6 @@ #ifndef _LINUX_NVME_H #define _LINUX_NVME_H -#include <linux/bits.h> #include <linux/types.h> #include <linux/uuid.h> @@ -108,22 +107,8 @@ enum { NVME_REG_AQA = 0x0024, /* Admin Queue Attributes */ NVME_REG_ASQ = 0x0028, /* Admin SQ Base Address */ NVME_REG_ACQ = 0x0030, /* Admin CQ Base Address */ - NVME_REG_CMBLOC = 0x0038, /* Controller Memory Buffer Location */ + NVME_REG_CMBLOC = 0x0038, /* Controller Memory Buffer Location */ NVME_REG_CMBSZ = 0x003c, /* Controller Memory Buffer Size */ - NVME_REG_BPINFO = 0x0040, /* Boot Partition Information */ - NVME_REG_BPRSEL = 0x0044, /* Boot Partition Read Select */ - NVME_REG_BPMBL = 0x0048, /* Boot Partition Memory Buffer - * Location - */ - NVME_REG_PMRCAP = 0x0e00, /* Persistent Memory Capabilities */ - NVME_REG_PMRCTL = 0x0e04, /* Persistent Memory Region Control */ - NVME_REG_PMRSTS = 0x0e08, /* Persistent Memory Region Status */ - NVME_REG_PMREBS = 0x0e0c, /* Persistent Memory Region Elasticity - * Buffer Size - */ - NVME_REG_PMRSWTP = 0x0e10, /* Persistent Memory Region Sustained - * Write Throughput - */ NVME_REG_DBS = 0x1000, /* SQ 0 Tail Doorbell */ }; @@ -310,14 +295,6 @@ enum { NVME_CTRL_OACS_DIRECTIVES = 1 << 5, NVME_CTRL_OACS_DBBUF_SUPP = 1 << 8, NVME_CTRL_LPA_CMD_EFFECTS_LOG = 1 << 1, - NVME_CTRL_CTRATT_128_ID = 1 << 0, - NVME_CTRL_CTRATT_NON_OP_PSP = 1 << 1, - NVME_CTRL_CTRATT_NVM_SETS = 1 << 2, - NVME_CTRL_CTRATT_READ_RECV_LVLS = 1 << 3, - NVME_CTRL_CTRATT_ENDURANCE_GROUPS = 1 << 4, - NVME_CTRL_CTRATT_PREDICTABLE_LAT = 1 << 5, - NVME_CTRL_CTRATT_NAMESPACE_GRANULARITY = 1 << 7, - NVME_CTRL_CTRATT_UUID_LIST = 1 << 9, }; struct nvme_lbaf { @@ -375,9 +352,6 @@ enum { NVME_ID_CNS_NS_PRESENT = 0x11, NVME_ID_CNS_CTRL_NS_LIST = 0x12, NVME_ID_CNS_CTRL_LIST = 0x13, - NVME_ID_CNS_SCNDRY_CTRL_LIST = 0x15, - NVME_ID_CNS_NS_GRANULARITY = 0x16, - NVME_ID_CNS_UUID_LIST = 0x17, }; enum { @@ -435,8 +409,7 @@ struct nvme_smart_log { __u8 avail_spare; __u8 spare_thresh; __u8 percent_used; - __u8 endu_grp_crit_warn_sumry; - __u8 rsvd7[25]; + __u8 rsvd6[26]; __u8 data_units_read[16]; __u8 data_units_written[16]; __u8 host_reads[16]; @@ -450,11 +423,7 @@ struct nvme_smart_log { __le32 warning_temp_time; __le32 critical_comp_time; __le16 temp_sensor[8]; - __le32 thm_temp1_trans_count; - __le32 thm_temp2_trans_count; - __le32 thm_temp1_total_time; - __le32 thm_temp2_total_time; - __u8 rsvd232[280]; + __u8 rsvd216[296]; }; struct nvme_fw_slot_info_log { @@ -470,8 +439,7 @@ enum { NVME_CMD_EFFECTS_NCC = 1 << 2, NVME_CMD_EFFECTS_NIC = 1 << 3, NVME_CMD_EFFECTS_CCC = 1 << 4, - NVME_CMD_EFFECTS_CSE_MASK = GENMASK(18, 16), - NVME_CMD_EFFECTS_UUID_SEL = 1 << 19, + NVME_CMD_EFFECTS_CSE_MASK = 3 << 16, }; struct nvme_effects_log { @@ -595,7 +563,6 @@ enum nvme_opcode { nvme_cmd_compare = 0x05, nvme_cmd_write_zeroes = 0x08, nvme_cmd_dsm = 0x09, - nvme_cmd_verify = 0x0c, nvme_cmd_resv_register = 0x0d, nvme_cmd_resv_report = 0x0e, nvme_cmd_resv_acquire = 0x11, @@ -839,14 +806,10 @@ enum nvme_admin_opcode { nvme_admin_ns_mgmt = 0x0d, nvme_admin_activate_fw = 0x10, nvme_admin_download_fw = 0x11, - nvme_admin_dev_self_test = 0x14, nvme_admin_ns_attach = 0x15, nvme_admin_keep_alive = 0x18, nvme_admin_directive_send = 0x19, nvme_admin_directive_recv = 0x1a, - nvme_admin_virtual_mgmt = 0x1c, - nvme_admin_nvme_mi_send = 0x1d, - nvme_admin_nvme_mi_recv = 0x1e, nvme_admin_dbbuf = 0x7C, nvme_admin_format_nvm = 0x80, nvme_admin_security_send = 0x81, @@ -910,7 +873,6 @@ enum { NVME_FEAT_PLM_CONFIG = 0x13, NVME_FEAT_PLM_WINDOW = 0x14, NVME_FEAT_HOST_BEHAVIOR = 0x16, - NVME_FEAT_SANITIZE = 0x17, NVME_FEAT_SW_PROGRESS = 0x80, NVME_FEAT_HOST_ID = 0x81, NVME_FEAT_RESV_MASK = 0x82, @@ -921,10 +883,6 @@ enum { NVME_LOG_FW_SLOT = 0x03, NVME_LOG_CHANGED_NS = 0x04, NVME_LOG_CMD_EFFECTS = 0x05, - NVME_LOG_DEVICE_SELF_TEST = 0x06, - NVME_LOG_TELEMETRY_HOST = 0x07, - NVME_LOG_TELEMETRY_CTRL = 0x08, - NVME_LOG_ENDURANCE_GROUP = 0x09, NVME_LOG_ANA = 0x0c, NVME_LOG_DISC = 0x70, NVME_LOG_RESERVATION = 0x80, @@ -1332,11 +1290,7 @@ enum { NVME_SC_SGL_INVALID_OFFSET = 0x16, NVME_SC_SGL_INVALID_SUBTYPE = 0x17, - NVME_SC_SANITIZE_FAILED = 0x1C, - NVME_SC_SANITIZE_IN_PROGRESS = 0x1D, - NVME_SC_NS_WRITE_PROTECTED = 0x20, - NVME_SC_CMD_INTERRUPTED = 0x21, NVME_SC_LBA_RANGE = 0x80, NVME_SC_CAP_EXCEEDED = 0x81, @@ -1374,8 +1328,6 @@ enum { NVME_SC_NS_NOT_ATTACHED = 0x11a, NVME_SC_THIN_PROV_NOT_SUPP = 0x11b, NVME_SC_CTRL_LIST_INVALID = 0x11c, - NVME_SC_BP_WRITE_PROHIBITED = 0x11e, - NVME_SC_PMR_SAN_PROHIBITED = 0x123, /* * I/O Command Set Specific - NVM commands:
diff --git a/include/linux/once.h b/include/linux/once.h index 93ff138..9225ee6 100644 --- a/include/linux/once.h +++ b/include/linux/once.h
@@ -5,18 +5,10 @@ #include <linux/types.h> #include <linux/jump_label.h> -/* Helpers used from arbitrary contexts. - * Hard irqs are blocked, be cautious. - */ bool __do_once_start(bool *done, unsigned long *flags); void __do_once_done(bool *done, struct static_key_true *once_key, unsigned long *flags); -/* Variant for process contexts only. */ -bool __do_once_slow_start(bool *done); -void __do_once_slow_done(bool *done, struct static_key_true *once_key, - struct module *mod); - /* Call a function exactly once. The idea of DO_ONCE() is to perform * a function call such as initialization of random seeds, etc, only * once, where DO_ONCE() can live in the fast-path. After @func has @@ -60,29 +52,9 @@ void __do_once_slow_done(bool *done, struct static_key_true *once_key, ___ret; \ }) -/* Variant of DO_ONCE() for process/sleepable contexts. */ -#define DO_ONCE_SLOW(func, ...) \ - ({ \ - bool ___ret = false; \ - static bool __section(.data.once) ___done = false; \ - static DEFINE_STATIC_KEY_TRUE(___once_key); \ - if (static_branch_unlikely(&___once_key)) { \ - ___ret = __do_once_slow_start(&___done); \ - if (unlikely(___ret)) { \ - func(__VA_ARGS__); \ - __do_once_slow_done(&___done, &___once_key, \ - THIS_MODULE); \ - } \ - } \ - ___ret; \ - }) - #define get_random_once(buf, nbytes) \ DO_ONCE(get_random_bytes, (buf), (nbytes)) #define get_random_once_wait(buf, nbytes) \ DO_ONCE(get_random_bytes_wait, (buf), (nbytes)) \ -#define get_random_slow_once(buf, nbytes) \ - DO_ONCE_SLOW(get_random_bytes, (buf), (nbytes)) - #endif /* _LINUX_ONCE_H */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 35c7413..635e8da 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h
@@ -59,8 +59,6 @@ #define PCI_CLASS_BRIDGE_EISA 0x0602 #define PCI_CLASS_BRIDGE_MC 0x0603 #define PCI_CLASS_BRIDGE_PCI 0x0604 -#define PCI_CLASS_BRIDGE_PCI_NORMAL 0x060400 -#define PCI_CLASS_BRIDGE_PCI_SUBTRACTIVE 0x060401 #define PCI_CLASS_BRIDGE_PCMCIA 0x0605 #define PCI_CLASS_BRIDGE_NUBUS 0x0606 #define PCI_CLASS_BRIDGE_CARDBUS 0x0607 @@ -3026,8 +3024,6 @@ #define PCI_DEVICE_ID_INTEL_VMD_9A0B 0x9a0b #define PCI_DEVICE_ID_INTEL_S21152BB 0xb152 -#define PCI_VENDOR_ID_WANGXUN 0x8088 - #define PCI_VENDOR_ID_SCALEMP 0x8686 #define PCI_DEVICE_ID_SCALEMP_VSMP_CTL 0x1010 @@ -3108,8 +3104,6 @@ #define PCI_VENDOR_ID_3COM_2 0xa727 -#define PCI_VENDOR_ID_SOLIDRUN 0xd063 - #define PCI_VENDOR_ID_DIGIUM 0xd161 #define PCI_DEVICE_ID_DIGIUM_HFC4S 0xb410
diff --git a/include/linux/platform_data/x86/pmc_atom.h b/include/linux/platform_data/x86/pmc_atom.h index 99a9b09..022bcea 100644 --- a/include/linux/platform_data/x86/pmc_atom.h +++ b/include/linux/platform_data/x86/pmc_atom.h
@@ -7,8 +7,6 @@ #ifndef PMC_ATOM_H #define PMC_ATOM_H -#include <linux/bits.h> - /* ValleyView Power Control Unit PCI Device ID */ #define PCI_DEVICE_ID_VLV_PMC 0x0F1C /* CherryTrail Power Control Unit PCI Device ID */ @@ -141,9 +139,9 @@ #define ACPI_MMIO_REG_LEN 0x100 #define PM1_CNT 0x4 -#define SLEEP_TYPE_MASK GENMASK(12, 10) +#define SLEEP_TYPE_MASK 0xFFFFECFF #define SLEEP_TYPE_S5 0x1C00 -#define SLEEP_ENABLE BIT(13) +#define SLEEP_ENABLE 0x2000 extern int pmc_atom_read(int offset, u32 *value); extern int pmc_atom_write(int offset, u32 value);
diff --git a/include/linux/proc_fs.h b/include/linux/proc_fs.h index b8d41d0..865d02c 100644 --- a/include/linux/proc_fs.h +++ b/include/linux/proc_fs.h
@@ -127,10 +127,8 @@ static inline void proc_remove(struct proc_dir_entry *de) {} static inline int remove_proc_subtree(const char *name, struct proc_dir_entry *parent) { return 0; } #define proc_create_net_data(name, mode, parent, ops, state_size, data) ({NULL;}) -#define proc_create_net_data_write(name, mode, parent, ops, write, state_size, data) ({NULL;}) #define proc_create_net(name, mode, parent, state_size, ops) ({NULL;}) #define proc_create_net_single(name, mode, parent, show, data) ({NULL;}) -#define proc_create_net_single_write(name, mode, parent, show, write, data) ({NULL;}) static inline struct pid *tgid_pidfd_to_pid(const struct file *file) {
diff --git a/include/linux/quotaops.h b/include/linux/quotaops.h index ec10897..91e0b76 100644 --- a/include/linux/quotaops.h +++ b/include/linux/quotaops.h
@@ -99,8 +99,6 @@ int dquot_file_open(struct inode *inode, struct file *file); int dquot_enable(struct inode *inode, int type, int format_id, unsigned int flags); -int dquot_load_quota_sb(struct super_block *sb, int type, int format_id, - unsigned int flags); int dquot_quota_on(struct super_block *sb, int type, int format_id, const struct path *path); int dquot_quota_on_mount(struct super_block *sb, char *qf_name,
diff --git a/include/linux/random.h b/include/linux/random.h index 8ed2e24..72f1100 100644 --- a/include/linux/random.h +++ b/include/linux/random.h
@@ -19,14 +19,14 @@ void add_input_randomness(unsigned int type, unsigned int code, void add_interrupt_randomness(int irq) __latent_entropy; void add_hwgenerator_randomness(const void *buf, size_t len, size_t entropy); +#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__) static inline void add_latent_entropy(void) { -#if defined(LATENT_ENTROPY_PLUGIN) && !defined(__CHECKER__) add_device_randomness((const void *)&latent_entropy, sizeof(latent_entropy)); -#else - add_device_randomness(NULL, 0); -#endif } +#else +static inline void add_latent_entropy(void) { } +#endif void get_random_bytes(void *buf, int len); size_t __must_check get_random_bytes_arch(void *buf, size_t len);
diff --git a/include/linux/rmap.h b/include/linux/rmap.h index 148e6b0..2adf15b 100644 --- a/include/linux/rmap.h +++ b/include/linux/rmap.h
@@ -40,7 +40,13 @@ struct anon_vma { */ atomic_t refcount; - unsigned degree; /* ANDROID: KABI preservation, DO NOT USE! */ + /* + * Count of child anon_vmas and VMAs which points to this anon_vma. + * + * This counter is used for making decision about reusing anon_vma + * instead of forking new one. See comments in function anon_vma_clone. + */ + unsigned degree; struct anon_vma *parent; /* Parent of this anon_vma */ @@ -55,25 +61,6 @@ struct anon_vma { /* Interval tree of private "related" vmas */ struct rb_root_cached rb_root; - - /* - * ANDROID: KABI preservation, it's safe to put these at the end of this structure as it's - * only passed by a pointer everywhere, the size and internal structures are local to the - * core kernel. - */ -#ifndef __GENKSYMS__ - /* - * Count of child anon_vmas. Equals to the count of all anon_vmas that - * have ->parent pointing to this one, including itself. - * - * This counter is used for making decision about reusing anon_vma - * instead of forking new one. See comments in function anon_vma_clone. - */ - unsigned long num_children; - /* Count of VMAs whose ->anon_vma pointer points to this object. */ - unsigned long num_active_vmas; -#endif - }; /* @@ -146,11 +133,6 @@ static inline void anon_vma_lock_read(struct anon_vma *anon_vma) down_read(&anon_vma->root->rwsem); } -static inline int anon_vma_trylock_read(struct anon_vma *anon_vma) -{ - return down_read_trylock(&anon_vma->root->rwsem); -} - static inline void anon_vma_unlock_read(struct anon_vma *anon_vma) { up_read(&anon_vma->root->rwsem); @@ -265,14 +247,17 @@ void try_to_munlock(struct page *); void remove_migration_ptes(struct page *old, struct page *new, bool locked); +/* + * Called by memory-failure.c to kill processes. + */ +struct anon_vma *page_lock_anon_vma_read(struct page *page); +void page_unlock_anon_vma_read(struct anon_vma *anon_vma); int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma); /* * rmap_walk_control: To control rmap traversing for specific needs * * arg: passed to rmap_one() and invalid_vma() - * try_lock: bail out if the rmap lock is contended - * contended: indicate the rmap traversal bailed out due to lock contention * rmap_one: executed on each vma where page is mapped * done: for checking traversing termination condition * anon_lock: for getting anon_lock by optimized way rather than default @@ -280,8 +265,6 @@ int page_mapped_in_vma(struct page *page, struct vm_area_struct *vma); */ struct rmap_walk_control { void *arg; - bool try_lock; - bool contended; /* * Return false if page table scanning in rmap_walk should be stopped. * Otherwise, return true. @@ -289,21 +272,13 @@ struct rmap_walk_control { bool (*rmap_one)(struct page *page, struct vm_area_struct *vma, unsigned long addr, void *arg); int (*done)(struct page *page); - struct anon_vma *(*anon_lock)(struct page *page, - struct rmap_walk_control *rwc); + struct anon_vma *(*anon_lock)(struct page *page); bool (*invalid_vma)(struct vm_area_struct *vma, void *arg); }; void rmap_walk(struct page *page, struct rmap_walk_control *rwc); void rmap_walk_locked(struct page *page, struct rmap_walk_control *rwc); -/* - * Called by memory-failure.c to kill processes. - */ -struct anon_vma *page_lock_anon_vma_read(struct page *page, - struct rmap_walk_control *rwc); -void page_unlock_anon_vma_read(struct anon_vma *anon_vma); - #else /* !CONFIG_MMU */ #define anon_vma_init() do {} while (0)
diff --git a/include/linux/sched/task.h b/include/linux/sched/task.h index c5b5fac..a7bfe6b 100644 --- a/include/linux/sched/task.h +++ b/include/linux/sched/task.h
@@ -52,7 +52,6 @@ extern void sched_post_fork(struct task_struct *p); extern void sched_dead(struct task_struct *p); void __noreturn do_task_dead(void); -void __noreturn make_task_dead(int signr); extern void proc_caches_init(void);
diff --git a/include/linux/sched/task_stack.h b/include/linux/sched/task_stack.h index f4d2064..864a739 100644 --- a/include/linux/sched/task_stack.h +++ b/include/linux/sched/task_stack.h
@@ -16,7 +16,7 @@ * try_get_task_stack() instead. task_stack_page will return a pointer * that could get freed out from under you. */ -static __always_inline void *task_stack_page(const struct task_struct *task) +static inline void *task_stack_page(const struct task_struct *task) { return task->stack; }
diff --git a/include/linux/seccomp.h b/include/linux/seccomp.h index 9181ee5..a6f90d9 100644 --- a/include/linux/seccomp.h +++ b/include/linux/seccomp.h
@@ -21,7 +21,6 @@ struct seccomp_filter; * * @mode: indicates one of the valid values above for controlled * system calls available to a process. - * @filter_count: number of seccomp filters * @filter: must always point to a valid seccomp-filter or NULL as it is * accessed without locking during system call entry. *
diff --git a/include/linux/serial_core.h b/include/linux/serial_core.h index 2a1e3ec..d80c6b7 100644 --- a/include/linux/serial_core.h +++ b/include/linux/serial_core.h
@@ -304,23 +304,6 @@ struct uart_state { /* number of characters left in xmit buffer before we ask for more */ #define WAKEUP_CHARS 256 -/** - * uart_xmit_advance - Advance xmit buffer and account Tx'ed chars - * @up: uart_port structure describing the port - * @chars: number of characters sent - * - * This function advances the tail of circular xmit buffer by the number of - * @chars transmitted and handles accounting of transmitted bytes (into - * @up's icount.tx). - */ -static inline void uart_xmit_advance(struct uart_port *up, unsigned int chars) -{ - struct circ_buf *xmit = &up->state->xmit; - - xmit->tail = (xmit->tail + chars) & (UART_XMIT_SIZE - 1); - up->icount.tx += chars; -} - struct module; struct tty_driver;
diff --git a/include/linux/sh_intc.h b/include/linux/sh_intc.h index 37ad810..c255273 100644 --- a/include/linux/sh_intc.h +++ b/include/linux/sh_intc.h
@@ -97,10 +97,7 @@ struct intc_hw_desc { unsigned int nr_subgroups; }; -#define _INTC_SIZEOF_OR_ZERO(a) (_Generic(a, \ - typeof(NULL): 0, \ - default: sizeof(a))) -#define _INTC_ARRAY(a) a, _INTC_SIZEOF_OR_ZERO(a)/sizeof(*a) +#define _INTC_ARRAY(a) a, __same_type(a, NULL) ? 0 : sizeof(a)/sizeof(*a) #define INTC_HW_DESC(vectors, groups, mask_regs, \ prio_regs, sense_regs, ack_regs) \
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 560901c..2e79184 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h
@@ -259,7 +259,6 @@ struct nf_bridge_info { u8 pkt_otherhost:1; u8 in_prerouting:1; u8 bridged_dnat:1; - u8 sabotage_in_done:1; __u16 frag_max_size; struct net_device *physindev; @@ -666,7 +665,6 @@ typedef unsigned char *sk_buff_data_t; * @wifi_acked: whether frame was acked on wifi or not * @no_fcs: Request NIC to treat last 4 bytes as Ethernet FCS * @csum_not_inet: use CRC32c to resolve CHECKSUM_PARTIAL - * @scm_io_uring: SKB holds io_uring registered files * @dst_pending_confirm: need to confirm neighbour * @decrypted: Decrypted SKB * @napi_id: id of the NAPI struct this skb came from @@ -832,7 +830,6 @@ struct sk_buff { #ifdef CONFIG_TLS_DEVICE __u8 decrypted:1; #endif - __u8 scm_io_uring:1; #ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */ @@ -883,25 +880,7 @@ struct sk_buff { __u32 headers_end[0]; /* public: */ - /* Android KABI preservation. - * - * "open coded" version of ANDROID_KABI_USE() to pack more - * fields/variables into the space that we have. - * - * scm_io_uring is from 04df9719df18 ("io_uring/af_unix: defer - * registered files gc to io_uring release") - */ - /* NOTE: due to these fields ending up after headers_end, we have to - * manually copy them in the __copy_skb_header() call in skbuf.c. Be - * very aware of that if you change these fields. - */ - _ANDROID_KABI_REPLACE(_ANDROID_KABI_RESERVE(1), - struct { - __u8 scm_io_uring:1; - __u8 android_kabi_reserved1_padding1; - __u16 android_kabi_reserved1_padding2; - __u32 android_kabi_reserved1_padding3; - }); + ANDROID_KABI_RESERVE(1); ANDROID_KABI_RESERVE(2); /* These elements must be at the end, see alloc_skb() for details. */ @@ -2247,14 +2226,6 @@ static inline void skb_set_tail_pointer(struct sk_buff *skb, const int offset) #endif /* NET_SKBUFF_DATA_USES_OFFSET */ -static inline void skb_assert_len(struct sk_buff *skb) -{ -#ifdef CONFIG_DEBUG_NET - if (WARN_ONCE(!skb->len, "%s\n", __func__)) - DO_ONCE_LITE(skb_dump, KERN_ERR, skb, false); -#endif /* CONFIG_DEBUG_NET */ -} - /* * Add data to an sk_buff */ @@ -4273,7 +4244,7 @@ static inline void nf_reset_ct(struct sk_buff *skb) static inline void nf_reset_trace(struct sk_buff *skb) { -#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES) +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES) skb->nf_trace = 0; #endif } @@ -4293,7 +4264,7 @@ static inline void __nf_copy(struct sk_buff *dst, const struct sk_buff *src, dst->_nfct = src->_nfct; nf_conntrack_get(skb_nfct(src)); #endif -#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || IS_ENABLED(CONFIG_NF_TABLES) +#if IS_ENABLED(CONFIG_NETFILTER_XT_TARGET_TRACE) || defined(CONFIG_NF_TABLES) if (copy) dst->nf_trace = src->nf_trace; #endif
diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h index 88b107e..0b35747 100644 --- a/include/linux/stmmac.h +++ b/include/linux/stmmac.h
@@ -178,7 +178,6 @@ struct plat_stmmacenet_data { int rss_en; int mac_port_sel_speed; bool en_tx_lpi_clockgating; - bool rx_clk_runs_in_lpi; int has_xgmac; bool sph_disable; };
diff --git a/include/linux/sunrpc/rpc_pipe_fs.h b/include/linux/sunrpc/rpc_pipe_fs.h index 396de2e..e90b9bd 100644 --- a/include/linux/sunrpc/rpc_pipe_fs.h +++ b/include/linux/sunrpc/rpc_pipe_fs.h
@@ -94,11 +94,6 @@ extern ssize_t rpc_pipe_generic_upcall(struct file *, struct rpc_pipe_msg *, char __user *, size_t); extern int rpc_queue_upcall(struct rpc_pipe *, struct rpc_pipe_msg *); -/* returns true if the msg is in-flight, i.e., already eaten by the peer */ -static inline bool rpc_msg_is_inflight(const struct rpc_pipe_msg *msg) { - return (msg->copied != 0 && list_empty(&msg->list)); -} - struct rpc_clnt; extern struct dentry *rpc_create_client_dir(struct dentry *, const char *, struct rpc_clnt *); extern int rpc_remove_client_dir(struct rpc_clnt *);
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index aa615a0..6df4773 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h
@@ -208,9 +208,6 @@ struct ctl_table_header *register_sysctl_paths(const struct ctl_path *path, void unregister_sysctl_table(struct ctl_table_header * table); extern int sysctl_init(void); -extern void __register_sysctl_init(const char *path, struct ctl_table *table, - const char *table_name); -#define register_sysctl_init(path, table) __register_sysctl_init(path, table, #table) extern struct ctl_table sysctl_mount_point[];
diff --git a/include/linux/tcp.h b/include/linux/tcp.h index 2cde5f9..a4253fa 100644 --- a/include/linux/tcp.h +++ b/include/linux/tcp.h
@@ -259,7 +259,7 @@ struct tcp_sock { u32 packets_out; /* Packets which are "in flight" */ u32 retrans_out; /* Retransmitted packets out */ u32 max_packets_out; /* max packets_out in last window */ - u32 cwnd_usage_seq; /* right edge of cwnd usage tracking flight */ + u32 max_packets_seq; /* right edge of max_packets_out flight */ u16 urg_data; /* Saved octet of OOB data and control flags */ u8 ecn_flags; /* ECN status bits. */
diff --git a/include/linux/timerqueue.h b/include/linux/timerqueue.h index adc80e2..9388408 100644 --- a/include/linux/timerqueue.h +++ b/include/linux/timerqueue.h
@@ -35,7 +35,7 @@ struct timerqueue_node *timerqueue_getnext(struct timerqueue_head *head) { struct rb_node *leftmost = rb_first_cached(&head->rb_root); - return rb_entry_safe(leftmost, struct timerqueue_node, node); + return rb_entry(leftmost, struct timerqueue_node, node); } static inline void timerqueue_init(struct timerqueue_node *node)
diff --git a/include/linux/tpm_eventlog.h b/include/linux/tpm_eventlog.h index 6c79070..f3caeeb 100644 --- a/include/linux/tpm_eventlog.h +++ b/include/linux/tpm_eventlog.h
@@ -157,7 +157,7 @@ struct tcg_algorithm_info { * Return: size of the event on success, 0 on failure */ -static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, +static inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *event, struct tcg_pcr_event *event_header, bool do_mapping) { @@ -198,8 +198,8 @@ static __always_inline int __calc_tpm2_event_size(struct tcg_pcr_event2_head *ev * The loop below will unmap these fields if the log is larger than * one page, so save them here for reference: */ - count = event->count; - event_type = event->event_type; + count = READ_ONCE(event->count); + event_type = READ_ONCE(event->event_type); /* Verify that it's the log header */ if (event_header->pcr_idx != 0 ||
diff --git a/include/linux/tracepoint.h b/include/linux/tracepoint.h index bee7573..eede1a7 100644 --- a/include/linux/tracepoint.h +++ b/include/linux/tracepoint.h
@@ -231,11 +231,12 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) * not add unwanted padding between the beginning of the section and the * structure. Force alignment to the same alignment as the section start. * - * When lockdep is enabled, we make sure to always test if RCU is - * "watching" regardless if the tracepoint is enabled or not. Tracepoints - * require RCU to be active, and it should always warn at the tracepoint - * site if it is not watching, as it will need to be active when the - * tracepoint is enabled. + * When lockdep is enabled, we make sure to always do the RCU portions of + * the tracepoint code, regardless of whether tracing is on. However, + * don't check if the condition is false, due to interaction with idle + * instrumentation. This lets us find RCU issues triggered with tracepoints + * even when this tracepoint is off. This code has no purpose other than + * poking RCU a bit. */ #define __DECLARE_TRACE(name, proto, args, cond, data_proto, data_args) \ extern struct tracepoint __tracepoint_##name; \ @@ -247,7 +248,9 @@ static inline struct tracepoint *tracepoint_ptr_deref(tracepoint_ptr_t *p) TP_ARGS(data_args), \ TP_CONDITION(cond), 0); \ if (IS_ENABLED(CONFIG_LOCKDEP) && (cond)) { \ - WARN_ON_ONCE(!rcu_is_watching()); \ + rcu_read_lock_sched_notrace(); \ + rcu_dereference_sched(__tracepoint_##name.funcs);\ + rcu_read_unlock_sched_notrace(); \ } \ } \ __DECLARE_TRACE_RCU(name, PARAMS(proto), PARAMS(args), \
diff --git a/include/linux/uaccess.h b/include/linux/uaccess.h index 70941f4..3855543 100644 --- a/include/linux/uaccess.h +++ b/include/linux/uaccess.h
@@ -287,10 +287,6 @@ copy_struct_from_user(void *dst, size_t ksize, const void __user *src, size_t size = min(ksize, usize); size_t rest = max(ksize, usize) - size; - /* Double check if ksize is larger than a known object size. */ - if (WARN_ON_ONCE(ksize > __builtin_object_size(dst, 1))) - return -E2BIG; - /* Deal with trailing bytes. */ if (usize < ksize) { memset(dst + size, 0, rest);
diff --git a/include/linux/usb.h b/include/linux/usb.h index ce2a2f6..1bd5739 100644 --- a/include/linux/usb.h +++ b/include/linux/usb.h
@@ -773,14 +773,11 @@ extern void usb_queue_reset_device(struct usb_interface *dev); extern int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable); extern bool usb_acpi_power_manageable(struct usb_device *hdev, int index); -extern int usb_acpi_port_lpm_incapable(struct usb_device *hdev, int index); #else static inline int usb_acpi_set_power_state(struct usb_device *hdev, int index, bool enable) { return 0; } static inline bool usb_acpi_power_manageable(struct usb_device *hdev, int index) { return true; } -static inline int usb_acpi_port_lpm_incapable(struct usb_device *hdev, int index) - { return 0; } #endif /* USB autosuspend and autoresume */
diff --git a/include/linux/usb/cdc_ncm.h b/include/linux/usb/cdc_ncm.h index 0ce4377..1646c06 100644 --- a/include/linux/usb/cdc_ncm.h +++ b/include/linux/usb/cdc_ncm.h
@@ -46,12 +46,9 @@ #define CDC_NCM_DATA_ALTSETTING_NCM 1 #define CDC_NCM_DATA_ALTSETTING_MBIM 2 -/* CDC NCM subclass 3.3.1 */ +/* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 -/* CDC NCM subclass 3.3.2 */ -#define USB_CDC_NCM_NDP32_LENGTH_MIN 0x20 - /* Maximum NTB length */ #define CDC_NCM_NTB_MAX_SIZE_TX 32768 /* bytes */ #define CDC_NCM_NTB_MAX_SIZE_RX 32768 /* bytes */ @@ -87,7 +84,7 @@ /* Driver flags */ #define CDC_NCM_FLAG_NDP_TO_END 0x02 /* NDP is placed at end of frame */ #define CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE 0x04 /* Avoid altsetting toggle during init */ -#define CDC_NCM_FLAG_PREFER_NTB32 0x08 /* prefer NDP32 over NDP16 */ +#define CDC_NCM_FLAG_RESET_NTB16 0x08 /* set NDP16 one more time after altsetting switch */ #define cdc_ncm_comm_intf_is_mbim(x) ((x)->desc.bInterfaceSubClass == USB_CDC_SUBCLASS_MBIM && \ (x)->desc.bInterfaceProtocol == USB_CDC_PROTO_NONE) @@ -116,11 +113,7 @@ struct cdc_ncm_ctx { u32 timer_interval; u32 max_ndp_size; - u8 is_ndp16; - union { - struct usb_cdc_ncm_ndp16 *delayed_ndp16; - struct usb_cdc_ncm_ndp32 *delayed_ndp32; - }; + struct usb_cdc_ncm_ndp16 *delayed_ndp16; u32 tx_timer_pending; u32 tx_curr_frame_num; @@ -157,8 +150,6 @@ void cdc_ncm_unbind(struct usbnet *dev, struct usb_interface *intf); struct sk_buff *cdc_ncm_fill_tx_frame(struct usbnet *dev, struct sk_buff *skb, __le32 sign); int cdc_ncm_rx_verify_nth16(struct cdc_ncm_ctx *ctx, struct sk_buff *skb_in); int cdc_ncm_rx_verify_ndp16(struct sk_buff *skb_in, int ndpoffset); -int cdc_ncm_rx_verify_nth32(struct cdc_ncm_ctx *ctx, struct sk_buff *skb_in); -int cdc_ncm_rx_verify_ndp32(struct sk_buff *skb_in, int ndpoffset); struct sk_buff * cdc_ncm_tx_fixup(struct usbnet *dev, struct sk_buff *skb, gfp_t flags); int cdc_ncm_rx_fixup(struct usbnet *dev, struct sk_buff *skb_in);
diff --git a/include/linux/usb/typec_dp.h b/include/linux/usb/typec_dp.h index 296909e..fc4c7ed 100644 --- a/include/linux/usb/typec_dp.h +++ b/include/linux/usb/typec_dp.h
@@ -73,11 +73,6 @@ enum { #define DP_CAP_USB BIT(7) #define DP_CAP_DFP_D_PIN_ASSIGN(_cap_) (((_cap_) & GENMASK(15, 8)) >> 8) #define DP_CAP_UFP_D_PIN_ASSIGN(_cap_) (((_cap_) & GENMASK(23, 16)) >> 16) -/* Get pin assignment taking plug & receptacle into consideration */ -#define DP_CAP_PIN_ASSIGN_UFP_D(_cap_) ((_cap_ & DP_CAP_RECEPTACLE) ? \ - DP_CAP_UFP_D_PIN_ASSIGN(_cap_) : DP_CAP_DFP_D_PIN_ASSIGN(_cap_)) -#define DP_CAP_PIN_ASSIGN_DFP_D(_cap_) ((_cap_ & DP_CAP_RECEPTACLE) ? \ - DP_CAP_DFP_D_PIN_ASSIGN(_cap_) : DP_CAP_UFP_D_PIN_ASSIGN(_cap_)) /* DisplayPort Status Update VDO bits */ #define DP_STATUS_CONNECTION(_status_) ((_status_) & 3)
diff --git a/include/linux/wait.h b/include/linux/wait.h index 7d04c1b..5903b1d 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h
@@ -529,11 +529,10 @@ do { \ \ hrtimer_init_sleeper_on_stack(&__t, CLOCK_MONOTONIC, \ HRTIMER_MODE_REL); \ - if ((timeout) != KTIME_MAX) { \ - hrtimer_set_expires_range_ns(&__t.timer, timeout, \ - current->timer_slack_ns); \ - hrtimer_sleeper_start_expires(&__t, HRTIMER_MODE_REL); \ - } \ + if ((timeout) != KTIME_MAX) \ + hrtimer_start_range_ns(&__t.timer, timeout, \ + current->timer_slack_ns, \ + HRTIMER_MODE_REL); \ \ __ret = ___wait_event(wq_head, condition, state, 0, 0, \ if (!__t.task) { \
diff --git a/include/media/dvbdev.h b/include/media/dvbdev.h index 73c1df5..5513258 100644 --- a/include/media/dvbdev.h +++ b/include/media/dvbdev.h
@@ -126,7 +126,6 @@ struct dvb_adapter { * struct dvb_device - represents a DVB device node * * @list_head: List head with all DVB devices - * @ref: reference counter * @fops: pointer to struct file_operations * @adapter: pointer to the adapter that holds this device node * @type: type of the device, as defined by &enum dvb_device_type. @@ -157,7 +156,6 @@ struct dvb_adapter { */ struct dvb_device { struct list_head list_head; - struct kref ref; const struct file_operations *fops; struct dvb_adapter *adapter; enum dvb_device_type type; @@ -190,20 +188,6 @@ struct dvb_device { }; /** - * dvb_device_get - Increase dvb_device reference - * - * @dvbdev: pointer to struct dvb_device - */ -struct dvb_device *dvb_device_get(struct dvb_device *dvbdev); - -/** - * dvb_device_put - Decrease dvb_device reference - * - * @dvbdev: pointer to struct dvb_device - */ -void dvb_device_put(struct dvb_device *dvbdev); - -/** * dvb_register_adapter - Registers a new DVB adapter * * @adap: pointer to struct dvb_adapter @@ -247,17 +231,29 @@ int dvb_register_device(struct dvb_adapter *adap, /** * dvb_remove_device - Remove a registered DVB device * - * This does not free memory. dvb_free_device() will do that when - * reference counter is empty + * This does not free memory. To do that, call dvb_free_device(). * * @dvbdev: pointer to struct dvb_device */ void dvb_remove_device(struct dvb_device *dvbdev); +/** + * dvb_free_device - Free memory occupied by a DVB device. + * + * Call dvb_unregister_device() before calling this function. + * + * @dvbdev: pointer to struct dvb_device + */ +void dvb_free_device(struct dvb_device *dvbdev); /** * dvb_unregister_device - Unregisters a DVB device * + * This is a combination of dvb_remove_device() and dvb_free_device(). + * Using this function is usually a mistake, and is often an indicator + * for a use-after-free bug (when a userspace process keeps a file + * handle to a detached device). + * * @dvbdev: pointer to struct dvb_device */ void dvb_unregister_device(struct dvb_device *dvbdev);
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h index 97c6209..d8c29e0 100644 --- a/include/media/v4l2-common.h +++ b/include/media/v4l2-common.h
@@ -174,8 +174,7 @@ struct v4l2_subdev *v4l2_i2c_new_subdev_board(struct v4l2_device *v4l2_dev, * * @sd: pointer to &struct v4l2_subdev * @client: pointer to struct i2c_client - * @devname: the name of the device; if NULL, the I²C device drivers's name - * will be used + * @devname: the name of the device; if NULL, the I²C device's name will be used * @postfix: sub-device specific string to put right after the I²C device name; * may be NULL */
diff --git a/include/net/TEST_MAPPING b/include/net/TEST_MAPPING deleted file mode 100644 index c8614a6..0000000 --- a/include/net/TEST_MAPPING +++ /dev/null
@@ -1,7 +0,0 @@ -{ - "presubmit": [ - { - "name": "CtsNetTestCases" - } - ] -}
diff --git a/include/net/bonding.h b/include/net/bonding.h index 69ceb5b..1bee8fd 100644 --- a/include/net/bonding.h +++ b/include/net/bonding.h
@@ -205,7 +205,7 @@ struct bonding { struct slave __rcu *curr_active_slave; struct slave __rcu *current_arp_slave; struct slave __rcu *primary_slave; - struct bond_up_slave __rcu *usable_slaves; /* Array of usable slaves */ + struct bond_up_slave __rcu *slave_arr; /* Array of usable slaves */ bool force_primary; s32 slave_cnt; /* never change this value outside the attach/detach wrappers */ int (*recv_probe)(const struct sk_buff *, struct bonding *,
diff --git a/include/net/busy_poll.h b/include/net/busy_poll.h index 16258c0..9899b9a 100644 --- a/include/net/busy_poll.h +++ b/include/net/busy_poll.h
@@ -31,7 +31,7 @@ extern unsigned int sysctl_net_busy_poll __read_mostly; static inline bool net_busy_loop_on(void) { - return READ_ONCE(sysctl_net_busy_poll); + return sysctl_net_busy_poll; } static inline bool sk_can_busy_loop(const struct sock *sk)
diff --git a/include/net/ieee802154_netdev.h b/include/net/ieee802154_netdev.h index 03b64bf..d0d188c 100644 --- a/include/net/ieee802154_netdev.h +++ b/include/net/ieee802154_netdev.h
@@ -15,22 +15,6 @@ #ifndef IEEE802154_NETDEVICE_H #define IEEE802154_NETDEVICE_H -#define IEEE802154_REQUIRED_SIZE(struct_type, member) \ - (offsetof(typeof(struct_type), member) + \ - sizeof(((typeof(struct_type) *)(NULL))->member)) - -#define IEEE802154_ADDR_OFFSET \ - offsetof(typeof(struct sockaddr_ieee802154), addr) - -#define IEEE802154_MIN_NAMELEN (IEEE802154_ADDR_OFFSET + \ - IEEE802154_REQUIRED_SIZE(struct ieee802154_addr_sa, addr_type)) - -#define IEEE802154_NAMELEN_SHORT (IEEE802154_ADDR_OFFSET + \ - IEEE802154_REQUIRED_SIZE(struct ieee802154_addr_sa, short_addr)) - -#define IEEE802154_NAMELEN_LONG (IEEE802154_ADDR_OFFSET + \ - IEEE802154_REQUIRED_SIZE(struct ieee802154_addr_sa, hwaddr)) - #include <net/af_ieee802154.h> #include <linux/netdevice.h> #include <linux/skbuff.h> @@ -181,33 +165,6 @@ static inline void ieee802154_devaddr_to_raw(void *raw, __le64 addr) memcpy(raw, &temp, IEEE802154_ADDR_LEN); } -static inline int -ieee802154_sockaddr_check_size(struct sockaddr_ieee802154 *daddr, int len) -{ - struct ieee802154_addr_sa *sa; - int ret = 0; - - sa = &daddr->addr; - if (len < IEEE802154_MIN_NAMELEN) - return -EINVAL; - switch (sa->addr_type) { - case IEEE802154_ADDR_NONE: - break; - case IEEE802154_ADDR_SHORT: - if (len < IEEE802154_NAMELEN_SHORT) - ret = -EINVAL; - break; - case IEEE802154_ADDR_LONG: - if (len < IEEE802154_NAMELEN_LONG) - ret = -EINVAL; - break; - default: - ret = -EINVAL; - break; - } - return ret; -} - static inline void ieee802154_addr_from_sa(struct ieee802154_addr *a, const struct ieee802154_addr_sa *sa) {
diff --git a/include/net/ipv6.h b/include/net/ipv6.h index 0e031a4..b59b3da 100644 --- a/include/net/ipv6.h +++ b/include/net/ipv6.h
@@ -1100,8 +1100,6 @@ void ipv6_icmp_error(struct sock *sk, struct sk_buff *skb, int err, __be16 port, void ipv6_local_error(struct sock *sk, int err, struct flowi6 *fl6, u32 info); void ipv6_local_rxpmtu(struct sock *sk, struct flowi6 *fl6, u32 mtu); -void inet6_cleanup_sock(struct sock *sk); -void inet6_sock_destruct(struct sock *sk); int inet6_release(struct socket *sock); int inet6_bind(struct socket *sock, struct sockaddr *uaddr, int addr_len); int inet6_getname(struct socket *sock, struct sockaddr *uaddr,
diff --git a/include/net/mrp.h b/include/net/mrp.h index c6c5337..ef58b4a 100644 --- a/include/net/mrp.h +++ b/include/net/mrp.h
@@ -120,7 +120,6 @@ struct mrp_applicant { struct sk_buff *pdu; struct rb_root mad; struct rcu_head rcu; - bool active; }; struct mrp_port {
diff --git a/include/net/netfilter/nf_tproxy.h b/include/net/netfilter/nf_tproxy.h index faa108b..82d0e41 100644 --- a/include/net/netfilter/nf_tproxy.h +++ b/include/net/netfilter/nf_tproxy.h
@@ -17,13 +17,6 @@ static inline bool nf_tproxy_sk_is_transparent(struct sock *sk) return false; } -static inline void nf_tproxy_twsk_deschedule_put(struct inet_timewait_sock *tw) -{ - local_bh_disable(); - inet_twsk_deschedule_put(tw); - local_bh_enable(); -} - /* assign a socket to the skb -- consumes sk */ static inline void nf_tproxy_assign_sock(struct sk_buff *skb, struct sock *sk) {
diff --git a/include/net/protocol.h b/include/net/protocol.h index 0fd2df8..2b778e1 100644 --- a/include/net/protocol.h +++ b/include/net/protocol.h
@@ -35,6 +35,8 @@ /* This is used to register protocols. */ struct net_protocol { + int (*early_demux)(struct sk_buff *skb); + int (*early_demux_handler)(struct sk_buff *skb); int (*handler)(struct sk_buff *skb); /* This returns an error if we weren't able to handle the error. */ @@ -51,6 +53,8 @@ struct net_protocol { #if IS_ENABLED(CONFIG_IPV6) struct inet6_protocol { + void (*early_demux)(struct sk_buff *skb); + void (*early_demux_handler)(struct sk_buff *skb); int (*handler)(struct sk_buff *skb); /* This returns an error if we weren't able to handle the error. */
diff --git a/include/net/sch_generic.h b/include/net/sch_generic.h index 2201b2b..aa99d3e 100644 --- a/include/net/sch_generic.h +++ b/include/net/sch_generic.h
@@ -1337,11 +1337,4 @@ static inline void skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res) qstats_overlimit_inc(res->qstats); } -/* Make sure qdisc is no longer in SCHED state. */ -static inline void qdisc_synchronize(const struct Qdisc *q) -{ - while (test_bit(__QDISC_STATE_SCHED, &q->state)) - msleep(1); -} - #endif
diff --git a/include/net/sctp/stream_sched.h b/include/net/sctp/stream_sched.h index 65058fa..01a70b2 100644 --- a/include/net/sctp/stream_sched.h +++ b/include/net/sctp/stream_sched.h
@@ -26,8 +26,6 @@ struct sctp_sched_ops { int (*init)(struct sctp_stream *stream); /* Init a stream */ int (*init_sid)(struct sctp_stream *stream, __u16 sid, gfp_t gfp); - /* free a stream */ - void (*free_sid)(struct sctp_stream *stream, __u16 sid); /* Frees the entire thing */ void (*free)(struct sctp_stream *stream);
diff --git a/include/net/sctp/structs.h b/include/net/sctp/structs.h index 48cbf33..cb05e50 100644 --- a/include/net/sctp/structs.h +++ b/include/net/sctp/structs.h
@@ -1400,7 +1400,6 @@ struct sctp_stream_priorities { /* The next stream stream in line */ struct sctp_stream_out_ext *next; __u16 prio; - __u16 users; }; struct sctp_stream_out_ext {
diff --git a/include/net/sock.h b/include/net/sock.h index 041b5c1..379e697 100644 --- a/include/net/sock.h +++ b/include/net/sock.h
@@ -302,7 +302,7 @@ struct bpf_sk_storage; * @sk_tskey: counter to disambiguate concurrent tstamp requests * @sk_zckey: counter to order MSG_ZEROCOPY notifications * @sk_socket: Identd and reporting IO signals - * @sk_user_data: RPC layer private data. Write-protected by @sk_callback_lock. + * @sk_user_data: RPC layer private data * @sk_frag: cached page frag * @sk_peek_off: current peek_offset value * @sk_send_head: front of stuff to transmit @@ -401,7 +401,7 @@ struct sock { #ifdef CONFIG_XFRM struct xfrm_policy __rcu *sk_policy[2]; #endif - struct dst_entry __rcu *sk_rx_dst; + struct dst_entry *sk_rx_dst; struct dst_entry __rcu *sk_dst_cache; atomic_t sk_omem_alloc; int sk_sndbuf; @@ -1730,12 +1730,7 @@ void sk_common_release(struct sock *sk); * Default socket callbacks and setup code */ -/* Initialise core socket variables using an explicit uid. */ -void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid); - -/* Initialise core socket variables. - * Assumes struct socket *sock is embedded in a struct socket_alloc. - */ +/* Initialise core socket variables */ void sock_init_data(struct socket *sock, struct sock *sk); /* @@ -2196,26 +2191,11 @@ static inline __must_check bool skb_set_owner_sk_safe(struct sk_buff *skb, struc return false; } -static inline struct sk_buff *skb_clone_and_charge_r(struct sk_buff *skb, struct sock *sk) -{ - skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC)); - if (skb) { - if (sk_rmem_schedule(sk, skb, skb->truesize)) { - skb_set_owner_r(skb, sk); - return skb; - } - __kfree_skb(skb); - } - return NULL; -} - void sk_reset_timer(struct sock *sk, struct timer_list *timer, unsigned long expires); void sk_stop_timer(struct sock *sk, struct timer_list *timer); -void sk_stop_timer_sync(struct sock *sk, struct timer_list *timer); - int __sk_queue_drop_skb(struct sock *sk, struct sk_buff_head *sk_queue, struct sk_buff *skb, unsigned int flags, void (*destructor)(struct sock *sk,
diff --git a/include/net/tcp.h b/include/net/tcp.h index 338b06b..016522e 100644 --- a/include/net/tcp.h +++ b/include/net/tcp.h
@@ -938,8 +938,6 @@ static inline int tcp_v6_sdif(const struct sk_buff *skb) #endif return 0; } - -void tcp_v6_early_demux(struct sk_buff *skb); #endif static inline bool inet_exact_dif_match(struct net *net, struct sk_buff *skb) @@ -1270,14 +1268,11 @@ static inline bool tcp_is_cwnd_limited(const struct sock *sk) { const struct tcp_sock *tp = tcp_sk(sk); - if (tp->is_cwnd_limited) - return true; - /* If in slow start, ensure cwnd grows to twice what was ACKed. */ if (tcp_in_slow_start(tp)) return tp->snd_cwnd < 2 * tp->max_packets_out; - return false; + return tp->is_cwnd_limited; } /* BBR congestion control needs pacing.
diff --git a/include/net/udp.h b/include/net/udp.h index 4a18dc3..8ac1522 100644 --- a/include/net/udp.h +++ b/include/net/udp.h
@@ -169,7 +169,6 @@ typedef struct sock *(*udp_lookup_t)(struct sk_buff *skb, __be16 sport, struct sk_buff *udp_gro_receive(struct list_head *head, struct sk_buff *skb, struct udphdr *uh, struct sock *sk); int udp_gro_complete(struct sk_buff *skb, int nhoff, udp_lookup_t lookup); -void udp_v6_early_demux(struct sk_buff *skb); struct sk_buff *__udp_gso_segment(struct sk_buff *gso_skb, netdev_features_t features, bool is_ipv6); @@ -261,7 +260,7 @@ static inline bool udp_sk_bound_dev_eq(struct net *net, int bound_dev_if, } /* net/ipv4/udp.c */ -void udp_destruct_common(struct sock *sk); +void udp_destruct_sock(struct sock *sk); void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len); int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb); void udp_skb_destructor(struct sock *sk, struct sk_buff *skb);
diff --git a/include/net/udplite.h b/include/net/udplite.h index c59ba86..9185e45 100644 --- a/include/net/udplite.h +++ b/include/net/udplite.h
@@ -24,6 +24,14 @@ static __inline__ int udplite_getfrag(void *from, char *to, int offset, return copy_from_iter_full(to, len, &msg->msg_iter) ? 0 : -EFAULT; } +/* Designate sk as UDP-Lite socket */ +static inline int udplite_sk_init(struct sock *sk) +{ + udp_init_sock(sk); + udp_sk(sk)->pcflag = UDPLITE_BIT; + return 0; +} + /* * Checksumming routines */
diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index dcb0763..e998148 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h
@@ -210,7 +210,7 @@ static inline int scsi_get_resid(struct scsi_cmnd *cmd) for_each_sg(scsi_sglist(cmd), sg, nseg, __i) static inline int scsi_sg_copy_from_buffer(struct scsi_cmnd *cmd, - const void *buf, int buflen) + void *buf, int buflen) { return sg_copy_from_buffer(scsi_sglist(cmd), scsi_sg_count(cmd), buf, buflen);
diff --git a/include/sound/core.h b/include/sound/core.h index fd14e47..b3cc03a 100644 --- a/include/sound/core.h +++ b/include/sound/core.h
@@ -450,12 +450,4 @@ snd_pci_quirk_lookup_id(u16 vendor, u16 device, } #endif -/* async signal helpers */ -struct snd_fasync; - -int snd_fasync_helper(int fd, struct file *file, int on, - struct snd_fasync **fasyncp); -void snd_kill_fasync(struct snd_fasync *fasync, int signal, int poll); -void snd_fasync_free(struct snd_fasync *fasync); - #endif /* __SOUND_CORE_H */
diff --git a/include/sound/hdaudio.h b/include/sound/hdaudio.h index 749b1bc..44e57bc 100644 --- a/include/sound/hdaudio.h +++ b/include/sound/hdaudio.h
@@ -555,8 +555,6 @@ int snd_hdac_stream_set_params(struct hdac_stream *azx_dev, void snd_hdac_stream_start(struct hdac_stream *azx_dev, bool fresh_start); void snd_hdac_stream_clear(struct hdac_stream *azx_dev); void snd_hdac_stream_stop(struct hdac_stream *azx_dev); -void snd_hdac_stop_streams(struct hdac_bus *bus); -void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus); void snd_hdac_stream_reset(struct hdac_stream *azx_dev); void snd_hdac_stream_sync_trigger(struct hdac_stream *azx_dev, bool set, unsigned int streams, unsigned int reg);
diff --git a/include/sound/hdaudio_ext.h b/include/sound/hdaudio_ext.h index 9144047..23dc8de 100644 --- a/include/sound/hdaudio_ext.h +++ b/include/sound/hdaudio_ext.h
@@ -92,6 +92,7 @@ void snd_hdac_ext_stream_decouple_locked(struct hdac_bus *bus, struct hdac_ext_stream *azx_dev, bool decouple); void snd_hdac_ext_stream_decouple(struct hdac_bus *bus, struct hdac_ext_stream *azx_dev, bool decouple); +void snd_hdac_ext_stop_streams(struct hdac_bus *bus); int snd_hdac_ext_stream_set_spib(struct hdac_bus *bus, struct hdac_ext_stream *stream, u32 value);
diff --git a/include/sound/pcm.h b/include/sound/pcm.h index 0d93108..6bf8484 100644 --- a/include/sound/pcm.h +++ b/include/sound/pcm.h
@@ -104,24 +104,24 @@ struct snd_pcm_ops { #define SNDRV_PCM_POS_XRUN ((snd_pcm_uframes_t)-1) /* If you change this don't forget to change rates[] table in pcm_native.c */ -#define SNDRV_PCM_RATE_5512 (1U<<0) /* 5512Hz */ -#define SNDRV_PCM_RATE_8000 (1U<<1) /* 8000Hz */ -#define SNDRV_PCM_RATE_11025 (1U<<2) /* 11025Hz */ -#define SNDRV_PCM_RATE_16000 (1U<<3) /* 16000Hz */ -#define SNDRV_PCM_RATE_22050 (1U<<4) /* 22050Hz */ -#define SNDRV_PCM_RATE_32000 (1U<<5) /* 32000Hz */ -#define SNDRV_PCM_RATE_44100 (1U<<6) /* 44100Hz */ -#define SNDRV_PCM_RATE_48000 (1U<<7) /* 48000Hz */ -#define SNDRV_PCM_RATE_64000 (1U<<8) /* 64000Hz */ -#define SNDRV_PCM_RATE_88200 (1U<<9) /* 88200Hz */ -#define SNDRV_PCM_RATE_96000 (1U<<10) /* 96000Hz */ -#define SNDRV_PCM_RATE_176400 (1U<<11) /* 176400Hz */ -#define SNDRV_PCM_RATE_192000 (1U<<12) /* 192000Hz */ -#define SNDRV_PCM_RATE_352800 (1U<<13) /* 352800Hz */ -#define SNDRV_PCM_RATE_384000 (1U<<14) /* 384000Hz */ +#define SNDRV_PCM_RATE_5512 (1<<0) /* 5512Hz */ +#define SNDRV_PCM_RATE_8000 (1<<1) /* 8000Hz */ +#define SNDRV_PCM_RATE_11025 (1<<2) /* 11025Hz */ +#define SNDRV_PCM_RATE_16000 (1<<3) /* 16000Hz */ +#define SNDRV_PCM_RATE_22050 (1<<4) /* 22050Hz */ +#define SNDRV_PCM_RATE_32000 (1<<5) /* 32000Hz */ +#define SNDRV_PCM_RATE_44100 (1<<6) /* 44100Hz */ +#define SNDRV_PCM_RATE_48000 (1<<7) /* 48000Hz */ +#define SNDRV_PCM_RATE_64000 (1<<8) /* 64000Hz */ +#define SNDRV_PCM_RATE_88200 (1<<9) /* 88200Hz */ +#define SNDRV_PCM_RATE_96000 (1<<10) /* 96000Hz */ +#define SNDRV_PCM_RATE_176400 (1<<11) /* 176400Hz */ +#define SNDRV_PCM_RATE_192000 (1<<12) /* 192000Hz */ +#define SNDRV_PCM_RATE_352800 (1<<13) /* 352800Hz */ +#define SNDRV_PCM_RATE_384000 (1<<14) /* 384000Hz */ -#define SNDRV_PCM_RATE_CONTINUOUS (1U<<30) /* continuous range */ -#define SNDRV_PCM_RATE_KNOT (1U<<31) /* supports more non-continuos rates */ +#define SNDRV_PCM_RATE_CONTINUOUS (1<<30) /* continuous range */ +#define SNDRV_PCM_RATE_KNOT (1<<31) /* supports more non-continuos rates */ #define SNDRV_PCM_RATE_8000_44100 (SNDRV_PCM_RATE_8000|SNDRV_PCM_RATE_11025|\ SNDRV_PCM_RATE_16000|SNDRV_PCM_RATE_22050|\
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 659400d..6e8a312 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h
@@ -16,9 +16,6 @@ #include <sound/asoc.h> struct device; -struct snd_pcm_substream; -struct snd_soc_pcm_runtime; -struct soc_enum; /* widget has no PM register bit */ #define SND_SOC_NOPM -1
diff --git a/include/trace/events/f2fs.h b/include/trace/events/f2fs.h index 7a72406..ffcc4ea 100644 --- a/include/trace/events/f2fs.h +++ b/include/trace/events/f2fs.h
@@ -513,7 +513,7 @@ TRACE_EVENT(f2fs_truncate_partial_nodes, TP_STRUCT__entry( __field(dev_t, dev) __field(ino_t, ino) - __array(nid_t, nid, 3) + __field(nid_t, nid[3]) __field(int, depth) __field(int, err) ),
diff --git a/include/trace/events/jbd2.h b/include/trace/events/jbd2.h index c9fb7b9..2310b25 100644 --- a/include/trace/events/jbd2.h +++ b/include/trace/events/jbd2.h
@@ -40,7 +40,7 @@ DECLARE_EVENT_CLASS(jbd2_commit, TP_STRUCT__entry( __field( dev_t, dev ) __field( char, sync_commit ) - __field( tid_t, transaction ) + __field( int, transaction ) ), TP_fast_assign( @@ -49,7 +49,7 @@ DECLARE_EVENT_CLASS(jbd2_commit, __entry->transaction = commit_transaction->t_tid; ), - TP_printk("dev %d,%d transaction %u sync %d", + TP_printk("dev %d,%d transaction %d sync %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->transaction, __entry->sync_commit) ); @@ -97,8 +97,8 @@ TRACE_EVENT(jbd2_end_commit, TP_STRUCT__entry( __field( dev_t, dev ) __field( char, sync_commit ) - __field( tid_t, transaction ) - __field( tid_t, head ) + __field( int, transaction ) + __field( int, head ) ), TP_fast_assign( @@ -108,7 +108,7 @@ TRACE_EVENT(jbd2_end_commit, __entry->head = journal->j_tail_sequence; ), - TP_printk("dev %d,%d transaction %u sync %d head %u", + TP_printk("dev %d,%d transaction %d sync %d head %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->transaction, __entry->sync_commit, __entry->head) ); @@ -134,14 +134,14 @@ TRACE_EVENT(jbd2_submit_inode_data, ); TRACE_EVENT(jbd2_handle_start, - TP_PROTO(dev_t dev, tid_t tid, unsigned int type, + TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, unsigned int line_no, int requested_blocks), TP_ARGS(dev, tid, type, line_no, requested_blocks), TP_STRUCT__entry( __field( dev_t, dev ) - __field( tid_t, tid ) + __field( unsigned long, tid ) __field( unsigned int, type ) __field( unsigned int, line_no ) __field( int, requested_blocks) @@ -155,14 +155,14 @@ TRACE_EVENT(jbd2_handle_start, __entry->requested_blocks = requested_blocks; ), - TP_printk("dev %d,%d tid %u type %u line_no %u " + TP_printk("dev %d,%d tid %lu type %u line_no %u " "requested_blocks %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, __entry->type, __entry->line_no, __entry->requested_blocks) ); TRACE_EVENT(jbd2_handle_extend, - TP_PROTO(dev_t dev, tid_t tid, unsigned int type, + TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, unsigned int line_no, int buffer_credits, int requested_blocks), @@ -170,7 +170,7 @@ TRACE_EVENT(jbd2_handle_extend, TP_STRUCT__entry( __field( dev_t, dev ) - __field( tid_t, tid ) + __field( unsigned long, tid ) __field( unsigned int, type ) __field( unsigned int, line_no ) __field( int, buffer_credits ) @@ -186,7 +186,7 @@ TRACE_EVENT(jbd2_handle_extend, __entry->requested_blocks = requested_blocks; ), - TP_printk("dev %d,%d tid %u type %u line_no %u " + TP_printk("dev %d,%d tid %lu type %u line_no %u " "buffer_credits %d requested_blocks %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, __entry->type, __entry->line_no, __entry->buffer_credits, @@ -194,7 +194,7 @@ TRACE_EVENT(jbd2_handle_extend, ); TRACE_EVENT(jbd2_handle_stats, - TP_PROTO(dev_t dev, tid_t tid, unsigned int type, + TP_PROTO(dev_t dev, unsigned long tid, unsigned int type, unsigned int line_no, int interval, int sync, int requested_blocks, int dirtied_blocks), @@ -203,7 +203,7 @@ TRACE_EVENT(jbd2_handle_stats, TP_STRUCT__entry( __field( dev_t, dev ) - __field( tid_t, tid ) + __field( unsigned long, tid ) __field( unsigned int, type ) __field( unsigned int, line_no ) __field( int, interval ) @@ -223,7 +223,7 @@ TRACE_EVENT(jbd2_handle_stats, __entry->dirtied_blocks = dirtied_blocks; ), - TP_printk("dev %d,%d tid %u type %u line_no %u interval %d " + TP_printk("dev %d,%d tid %lu type %u line_no %u interval %d " "sync %d requested_blocks %d dirtied_blocks %d", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, __entry->type, __entry->line_no, __entry->interval, @@ -232,14 +232,14 @@ TRACE_EVENT(jbd2_handle_stats, ); TRACE_EVENT(jbd2_run_stats, - TP_PROTO(dev_t dev, tid_t tid, + TP_PROTO(dev_t dev, unsigned long tid, struct transaction_run_stats_s *stats), TP_ARGS(dev, tid, stats), TP_STRUCT__entry( __field( dev_t, dev ) - __field( tid_t, tid ) + __field( unsigned long, tid ) __field( unsigned long, wait ) __field( unsigned long, request_delay ) __field( unsigned long, running ) @@ -265,7 +265,7 @@ TRACE_EVENT(jbd2_run_stats, __entry->blocks_logged = stats->rs_blocks_logged; ), - TP_printk("dev %d,%d tid %u wait %u request_delay %u running %u " + TP_printk("dev %d,%d tid %lu wait %u request_delay %u running %u " "locked %u flushing %u logging %u handle_count %u " "blocks %u blocks_logged %u", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, @@ -280,14 +280,14 @@ TRACE_EVENT(jbd2_run_stats, ); TRACE_EVENT(jbd2_checkpoint_stats, - TP_PROTO(dev_t dev, tid_t tid, + TP_PROTO(dev_t dev, unsigned long tid, struct transaction_chp_stats_s *stats), TP_ARGS(dev, tid, stats), TP_STRUCT__entry( __field( dev_t, dev ) - __field( tid_t, tid ) + __field( unsigned long, tid ) __field( unsigned long, chp_time ) __field( __u32, forced_to_close ) __field( __u32, written ) @@ -303,7 +303,7 @@ TRACE_EVENT(jbd2_checkpoint_stats, __entry->dropped = stats->cs_dropped; ), - TP_printk("dev %d,%d tid %u chp_time %u forced_to_close %u " + TP_printk("dev %d,%d tid %lu chp_time %u forced_to_close %u " "written %u dropped %u", MAJOR(__entry->dev), MINOR(__entry->dev), __entry->tid, jiffies_to_msecs(__entry->chp_time),
diff --git a/include/trace/events/spmi.h b/include/trace/events/spmi.h index a6819fd..8b60efe 100644 --- a/include/trace/events/spmi.h +++ b/include/trace/events/spmi.h
@@ -21,15 +21,15 @@ TRACE_EVENT(spmi_write_begin, __field ( u8, sid ) __field ( u16, addr ) __field ( u8, len ) - __dynamic_array ( u8, buf, len ) + __dynamic_array ( u8, buf, len + 1 ) ), TP_fast_assign( __entry->opcode = opcode; __entry->sid = sid; __entry->addr = addr; - __entry->len = len; - memcpy(__get_dynamic_array(buf), buf, len); + __entry->len = len + 1; + memcpy(__get_dynamic_array(buf), buf, len + 1); ), TP_printk("opc=%d sid=%02d addr=0x%04x len=%d buf=0x[%*phD]", @@ -92,7 +92,7 @@ TRACE_EVENT(spmi_read_end, __field ( u16, addr ) __field ( int, ret ) __field ( u8, len ) - __dynamic_array ( u8, buf, len ) + __dynamic_array ( u8, buf, len + 1 ) ), TP_fast_assign( @@ -100,8 +100,8 @@ TRACE_EVENT(spmi_read_end, __entry->sid = sid; __entry->addr = addr; __entry->ret = ret; - __entry->len = len; - memcpy(__get_dynamic_array(buf), buf, len); + __entry->len = len + 1; + memcpy(__get_dynamic_array(buf), buf, len + 1); ), TP_printk("opc=%d sid=%02d addr=0x%04x ret=%d len=%02d buf=0x[%*phD]",
diff --git a/include/uapi/drm/meson_drm.h b/include/uapi/drm/meson_drm.h index 8a74d46..e56e4fd 100644 --- a/include/uapi/drm/meson_drm.h +++ b/include/uapi/drm/meson_drm.h
@@ -36,17 +36,8 @@ struct drm_meson_gem_create { __u32 handle; }; -struct drm_meson_present_fence { - __u32 crtc_idx; - __u32 fd; -}; - /*Memory related.*/ #define DRM_IOCTL_MESON_GEM_CREATE DRM_IOWR(DRM_COMMAND_BASE + \ 0x00, struct drm_meson_gem_create) -/*present fence*/ -#define DRM_IOCTL_MESON_CREAT_PRESENT_FENCE DRM_IOWR(DRM_COMMAND_BASE + \ - 0x20, struct drm_meson_present_fence) - #endif /* _MESON_DRM_H */
diff --git a/include/uapi/linux/audit.h b/include/uapi/linux/audit.h index a79f8c2..c89c649 100644 --- a/include/uapi/linux/audit.h +++ b/include/uapi/linux/audit.h
@@ -179,7 +179,7 @@ #define AUDIT_MAX_KEY_LEN 256 #define AUDIT_BITMASK_SIZE 64 #define AUDIT_WORD(nr) ((__u32)((nr)/32)) -#define AUDIT_BIT(nr) (1U << ((nr) - AUDIT_WORD(nr)*32)) +#define AUDIT_BIT(nr) (1 << ((nr) - AUDIT_WORD(nr)*32)) #define AUDIT_SYSCALL_CLASSES 16 #define AUDIT_CLASS_DIR_WRITE 0
diff --git a/include/uapi/linux/can/error.h b/include/uapi/linux/can/error.h index a1000cb..3463328 100644 --- a/include/uapi/linux/can/error.h +++ b/include/uapi/linux/can/error.h
@@ -120,9 +120,6 @@ #define CAN_ERR_TRX_CANL_SHORT_TO_GND 0x70 /* 0111 0000 */ #define CAN_ERR_TRX_CANL_SHORT_TO_CANH 0x80 /* 1000 0000 */ -/* data[5] is reserved (do not use) */ - -/* TX error counter / data[6] */ -/* RX error counter / data[7] */ +/* controller specific additional information / data[5..7] */ #endif /* _UAPI_CAN_ERROR_H */
diff --git a/include/uapi/linux/capability.h b/include/uapi/linux/capability.h index 6e0d68e..240fdb9 100644 --- a/include/uapi/linux/capability.h +++ b/include/uapi/linux/capability.h
@@ -376,7 +376,7 @@ struct vfs_ns_cap_data { */ #define CAP_TO_INDEX(x) ((x) >> 5) /* 1 << 5 == bits in __u32 */ -#define CAP_TO_MASK(x) (1U << ((x) & 31)) /* mask for indexed __u32 */ +#define CAP_TO_MASK(x) (1 << ((x) & 31)) /* mask for indexed __u32 */ #endif /* _UAPI_LINUX_CAPABILITY_H */
diff --git a/include/uapi/linux/netfilter/nf_conntrack_sctp.h b/include/uapi/linux/netfilter/nf_conntrack_sctp.h index 2d6f80d..edc6dda 100644 --- a/include/uapi/linux/netfilter/nf_conntrack_sctp.h +++ b/include/uapi/linux/netfilter/nf_conntrack_sctp.h
@@ -15,7 +15,7 @@ enum sctp_conntrack { SCTP_CONNTRACK_SHUTDOWN_RECD, SCTP_CONNTRACK_SHUTDOWN_ACK_SENT, SCTP_CONNTRACK_HEARTBEAT_SENT, - SCTP_CONNTRACK_HEARTBEAT_ACKED, /* no longer used */ + SCTP_CONNTRACK_HEARTBEAT_ACKED, SCTP_CONNTRACK_MAX };
diff --git a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h index aa805e6..6b20fb2 100644 --- a/include/uapi/linux/netfilter/nfnetlink_cttimeout.h +++ b/include/uapi/linux/netfilter/nfnetlink_cttimeout.h
@@ -94,7 +94,7 @@ enum ctattr_timeout_sctp { CTA_TIMEOUT_SCTP_SHUTDOWN_RECD, CTA_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT, CTA_TIMEOUT_SCTP_HEARTBEAT_SENT, - CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED, /* no longer used */ + CTA_TIMEOUT_SCTP_HEARTBEAT_ACKED, __CTA_TIMEOUT_SCTP_MAX }; #define CTA_TIMEOUT_SCTP_MAX (__CTA_TIMEOUT_SCTP_MAX - 1)
diff --git a/include/uapi/linux/swab.h b/include/uapi/linux/swab.h index 3736f2f..7272f85 100644 --- a/include/uapi/linux/swab.h +++ b/include/uapi/linux/swab.h
@@ -3,7 +3,7 @@ #define _UAPI_LINUX_SWAB_H #include <linux/types.h> -#include <linux/stddef.h> +#include <linux/compiler.h> #include <asm/bitsperlong.h> #include <asm/swab.h>
diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h index c58854f..bfdae12 100644 --- a/include/uapi/linux/usb/video.h +++ b/include/uapi/linux/usb/video.h
@@ -179,36 +179,6 @@ #define UVC_CONTROL_CAP_AUTOUPDATE (1 << 3) #define UVC_CONTROL_CAP_ASYNCHRONOUS (1 << 4) -/* 3.9.2.6 Color Matching Descriptor Values */ -enum uvc_color_primaries_values { - UVC_COLOR_PRIMARIES_UNSPECIFIED, - UVC_COLOR_PRIMARIES_BT_709_SRGB, - UVC_COLOR_PRIMARIES_BT_470_2_M, - UVC_COLOR_PRIMARIES_BT_470_2_B_G, - UVC_COLOR_PRIMARIES_SMPTE_170M, - UVC_COLOR_PRIMARIES_SMPTE_240M, -}; - -enum uvc_transfer_characteristics_values { - UVC_TRANSFER_CHARACTERISTICS_UNSPECIFIED, - UVC_TRANSFER_CHARACTERISTICS_BT_709, - UVC_TRANSFER_CHARACTERISTICS_BT_470_2_M, - UVC_TRANSFER_CHARACTERISTICS_BT_470_2_B_G, - UVC_TRANSFER_CHARACTERISTICS_SMPTE_170M, - UVC_TRANSFER_CHARACTERISTICS_SMPTE_240M, - UVC_TRANSFER_CHARACTERISTICS_LINEAR, - UVC_TRANSFER_CHARACTERISTICS_SRGB, -}; - -enum uvc_matrix_coefficients { - UVC_MATRIX_COEFFICIENTS_UNSPECIFIED, - UVC_MATRIX_COEFFICIENTS_BT_709, - UVC_MATRIX_COEFFICIENTS_FCC, - UVC_MATRIX_COEFFICIENTS_BT_470_2_B_G, - UVC_MATRIX_COEFFICIENTS_SMPTE_170M, - UVC_MATRIX_COEFFICIENTS_SMPTE_240M, -}; - /* ------------------------------------------------------------------------ * UVC structures */
diff --git a/include/uapi/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h index 2140923..f80f05b 100644 --- a/include/uapi/linux/uvcvideo.h +++ b/include/uapi/linux/uvcvideo.h
@@ -86,7 +86,7 @@ struct uvc_xu_control_query { * struct. The first two fields are added by the driver, they can be used for * clock synchronisation. The rest is an exact copy of a UVC payload header. * Only complete objects with complete buffers are included. Therefore it's - * always sizeof(meta->ns) + sizeof(meta->sof) + meta->length bytes large. + * always sizeof(meta->ts) + sizeof(meta->sof) + meta->length bytes large. */ struct uvc_meta_buf { __u64 ns;
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h index 9aa86bf..5673e60 100644 --- a/include/uapi/linux/videodev2.h +++ b/include/uapi/linux/videodev2.h
@@ -1510,8 +1510,7 @@ struct v4l2_bt_timings { ((bt)->width + V4L2_DV_BT_BLANKING_WIDTH(bt)) #define V4L2_DV_BT_BLANKING_HEIGHT(bt) \ ((bt)->vfrontporch + (bt)->vsync + (bt)->vbackporch + \ - ((bt)->interlaced ? \ - ((bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) : 0)) + (bt)->il_vfrontporch + (bt)->il_vsync + (bt)->il_vbackporch) #define V4L2_DV_BT_FRAME_HEIGHT(bt) \ ((bt)->height + V4L2_DV_BT_BLANKING_HEIGHT(bt))
diff --git a/include/uapi/sound/asequencer.h b/include/uapi/sound/asequencer.h index dbd60f4..a75e14e 100644 --- a/include/uapi/sound/asequencer.h +++ b/include/uapi/sound/asequencer.h
@@ -344,10 +344,10 @@ typedef int __bitwise snd_seq_client_type_t; #define KERNEL_CLIENT ((__force snd_seq_client_type_t) 2) /* event filter flags */ -#define SNDRV_SEQ_FILTER_BROADCAST (1U<<0) /* accept broadcast messages */ -#define SNDRV_SEQ_FILTER_MULTICAST (1U<<1) /* accept multicast messages */ -#define SNDRV_SEQ_FILTER_BOUNCE (1U<<2) /* accept bounce event in error */ -#define SNDRV_SEQ_FILTER_USE_EVENT (1U<<31) /* use event filter */ +#define SNDRV_SEQ_FILTER_BROADCAST (1<<0) /* accept broadcast messages */ +#define SNDRV_SEQ_FILTER_MULTICAST (1<<1) /* accept multicast messages */ +#define SNDRV_SEQ_FILTER_BOUNCE (1<<2) /* accept bounce event in error */ +#define SNDRV_SEQ_FILTER_USE_EVENT (1<<31) /* use event filter */ struct snd_seq_client_info { int client; /* client number to inquire */
diff --git a/include/xen/swiotlb-xen.h b/include/xen/swiotlb-xen.h index ffc0d39..d71380f 100644 --- a/include/xen/swiotlb-xen.h +++ b/include/xen/swiotlb-xen.h
@@ -4,10 +4,10 @@ #include <linux/swiotlb.h> -void xen_dma_sync_for_cpu(dma_addr_t handle, phys_addr_t paddr, size_t size, - enum dma_data_direction dir); -void xen_dma_sync_for_device(dma_addr_t handle, phys_addr_t paddr, size_t size, - enum dma_data_direction dir); +void xen_dma_sync_for_cpu(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, enum dma_data_direction dir); +void xen_dma_sync_for_device(struct device *dev, dma_addr_t handle, + phys_addr_t paddr, size_t size, enum dma_data_direction dir); extern int xen_swiotlb_init(int verbose, bool early); extern const struct dma_map_ops xen_swiotlb_dma_ops;
diff --git a/init/Kconfig b/init/Kconfig index 8af8b7b..3371298 100644 --- a/init/Kconfig +++ b/init/Kconfig
@@ -57,7 +57,7 @@ config CC_HAS_ASM_GOTO_TIED_OUTPUT depends on CC_HAS_ASM_GOTO_OUTPUT # Detect buggy gcc and clang, fixed in gcc-11 clang-14. - def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) + def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) config CC_HAS_ASM_GOTO_OUTPUT depends on CC_HAS_ASM_GOTO
diff --git a/ipc/msg.c b/ipc/msg.c index 46a870e..767587a 100644 --- a/ipc/msg.c +++ b/ipc/msg.c
@@ -137,7 +137,7 @@ static int newque(struct ipc_namespace *ns, struct ipc_params *params) key_t key = params->key; int msgflg = params->flg; - msq = kvmalloc(sizeof(*msq), GFP_KERNEL_ACCOUNT); + msq = kvmalloc(sizeof(*msq), GFP_KERNEL); if (unlikely(!msq)) return -ENOMEM;
diff --git a/ipc/sem.c b/ipc/sem.c index 31cfe0f..fe12ea8 100644 --- a/ipc/sem.c +++ b/ipc/sem.c
@@ -492,7 +492,7 @@ static struct sem_array *sem_alloc(size_t nsems) if (nsems > (INT_MAX - sizeof(*sma)) / sizeof(sma->sems[0])) return NULL; - sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL_ACCOUNT); + sma = kvzalloc(struct_size(sma, sems, nsems), GFP_KERNEL); if (unlikely(!sma)) return NULL; @@ -1835,7 +1835,7 @@ static inline int get_undo_list(struct sem_undo_list **undo_listp) undo_list = current->sysvsem.undo_list; if (!undo_list) { - undo_list = kzalloc(sizeof(*undo_list), GFP_KERNEL_ACCOUNT); + undo_list = kzalloc(sizeof(*undo_list), GFP_KERNEL); if (undo_list == NULL) return -ENOMEM; spin_lock_init(&undo_list->lock); @@ -1920,7 +1920,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid) rcu_read_unlock(); /* step 2: allocate new undo structure */ - new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL_ACCOUNT); + new = kzalloc(sizeof(struct sem_undo) + sizeof(short)*nsems, GFP_KERNEL); if (!new) { ipc_rcu_putref(&sma->sem_perm, sem_rcu_free); return ERR_PTR(-ENOMEM); @@ -2171,7 +2171,6 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops, * scenarios where we were awakened externally, during the * window between wake_q_add() and wake_up_q(). */ - rcu_read_lock(); error = READ_ONCE(queue.status); if (error != -EINTR) { /* @@ -2181,10 +2180,10 @@ static long do_semtimedop(int semid, struct sembuf __user *tsops, * overwritten by the previous owner of the semaphore. */ smp_mb(); - rcu_read_unlock(); goto out_free; } + rcu_read_lock(); locknum = sem_lock(sma, sops, nsops); if (!ipc_valid_object(&sma->sem_perm))
diff --git a/ipc/shm.c b/ipc/shm.c index 0145767..984addb 100644 --- a/ipc/shm.c +++ b/ipc/shm.c
@@ -711,7 +711,7 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params) ns->shm_tot + numpages > ns->shm_ctlall) return -ENOSPC; - shp = kvmalloc(sizeof(*shp), GFP_KERNEL_ACCOUNT); + shp = kvmalloc(sizeof(*shp), GFP_KERNEL); if (unlikely(!shp)) return -ENOMEM;
diff --git a/kernel/acct.c b/kernel/acct.c index 6d98aed..81f9831 100644 --- a/kernel/acct.c +++ b/kernel/acct.c
@@ -331,8 +331,6 @@ static comp_t encode_comp_t(unsigned long value) exp++; } - if (exp > (((comp_t) ~0U) >> MANTSIZE)) - return (comp_t) ~0U; /* * Clean it up and polish it off. */
diff --git a/kernel/audit_fsnotify.c b/kernel/audit_fsnotify.c index 2973878..f0d2433 100644 --- a/kernel/audit_fsnotify.c +++ b/kernel/audit_fsnotify.c
@@ -102,7 +102,6 @@ struct audit_fsnotify_mark *audit_alloc_mark(struct audit_krule *krule, char *pa ret = fsnotify_add_inode_mark(&audit_mark->mark, inode, true); if (ret < 0) { - audit_mark->path = NULL; fsnotify_put_mark(&audit_mark->mark); audit_mark = ERR_PTR(ret); }
diff --git a/kernel/backtracetest.c b/kernel/backtracetest.c index 370217d..a2a97fa 100644 --- a/kernel/backtracetest.c +++ b/kernel/backtracetest.c
@@ -29,7 +29,7 @@ static void backtrace_test_irq_callback(unsigned long data) complete(&backtrace_work); } -static DECLARE_TASKLET_OLD(backtrace_tasklet, &backtrace_test_irq_callback); +static DECLARE_TASKLET(backtrace_tasklet, &backtrace_test_irq_callback, 0); static void backtrace_test_irq(void) {
diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index 5189bc5..b03087f 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c
@@ -2148,7 +2148,7 @@ static int btf_struct_resolve(struct btf_verifier_env *env, if (v->next_member) { const struct btf_type *last_member_type; const struct btf_member *last_member; - u32 last_member_type_id; + u16 last_member_type_id; last_member = btf_type_member(v->t) + v->next_member - 1; last_member_type_id = last_member->type; @@ -2719,7 +2719,6 @@ static int btf_datasec_resolve(struct btf_verifier_env *env, struct btf *btf = env->btf; u16 i; - env->resolve_mode = RESOLVE_TBD; for_each_vsi_from(i, v->next_member, v->t, vsi) { u32 var_type_id = vsi->type, type_id, type_size = 0; const struct btf_type *var_type = btf_type_by_id(env->btf, @@ -2850,11 +2849,6 @@ static int btf_func_proto_check(struct btf_verifier_env *env, break; } - if (btf_type_is_resolve_source_only(arg_type)) { - btf_verifier_log_type(env, t, "Invalid arg#%u", i + 1); - return -EINVAL; - } - if (args[i].name_off && (!btf_name_offset_valid(btf, args[i].name_off) || !btf_name_valid_identifier(btf, args[i].name_off))) {
diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 0f83b1a..d077fb9 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c
@@ -30,7 +30,6 @@ #include <linux/kallsyms.h> #include <linux/rcupdate.h> #include <linux/perf_event.h> -#include <linux/nospec.h> #include <asm/barrier.h> #include <asm/unaligned.h> @@ -764,7 +763,7 @@ static int __init bpf_jit_charge_init(void) { /* Only used as heuristic here to derive limit. */ bpf_jit_limit_max = bpf_jit_alloc_exec_limit(); - bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 1, + bpf_jit_limit = min_t(u64, round_up(bpf_jit_limit_max >> 2, PAGE_SIZE), LONG_MAX); return 0; } @@ -1577,7 +1576,9 @@ static u64 ___bpf_prog_run(u64 *regs, const struct bpf_insn *insn, u64 *stack) * reuse preexisting logic from Spectre v1 mitigation that * happens to produce the required code on x86 for v4 as well. */ +#ifdef CONFIG_X86 barrier_nospec(); +#endif CONT; #define LDST(SIZEOP, SIZE) \ STX_MEM_##SIZEOP: \
diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index de78876..9ebdcda 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c
@@ -2787,9 +2787,7 @@ static int bpf_task_fd_query(const union bpf_attr *attr, if (attr->task_fd_query.flags != 0) return -EINVAL; - rcu_read_lock(); task = get_pid_task(find_vpid(pid), PIDTYPE_PID); - rcu_read_unlock(); if (!task) return -ENOENT;
diff --git a/kernel/bpf/verifier.c b/kernel/bpf/verifier.c index 2e19042..fe554b2 100644 --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c
@@ -1563,21 +1563,6 @@ static int backtrack_insn(struct bpf_verifier_env *env, int idx, } } else if (opcode == BPF_EXIT) { return -ENOTSUPP; - } else if (BPF_SRC(insn->code) == BPF_X) { - if (!(*reg_mask & (dreg | sreg))) - return 0; - /* dreg <cond> sreg - * Both dreg and sreg need precision before - * this insn. If only sreg was marked precise - * before it would be equally necessary to - * propagate it to dreg. - */ - *reg_mask |= (sreg | dreg); - /* else dreg <cond> K - * Only dreg still needs precision before - * this insn, so for the K-based conditional - * there is nothing new to be marked. - */ } } else if (class == BPF_LD) { if (!(*reg_mask & dreg)) @@ -1939,9 +1924,7 @@ static int check_stack_write(struct bpf_verifier_env *env, bool sanitize = reg && is_spillable_regtype(reg->type); for (i = 0; i < size; i++) { - u8 type = state->stack[spi].slot_type[i]; - - if (type != STACK_MISC && type != STACK_ZERO) { + if (state->stack[spi].slot_type[i] == STACK_INVALID) { sanitize = true; break; } @@ -5157,11 +5140,6 @@ static int adjust_reg_min_max_vals(struct bpf_verifier_env *env, return err; return adjust_ptr_min_max_vals(env, insn, dst_reg, src_reg); - } else if (dst_reg->precise) { - /* if dst_reg is precise, src_reg should be precise as well */ - err = mark_chain_precision(env, insn->src_reg); - if (err) - return err; } } else { /* Pretend the src is a reg with a known value, since we only
diff --git a/kernel/cgroup/cgroup-internal.h b/kernel/cgroup/cgroup-internal.h index 803989e..236f290 100644 --- a/kernel/cgroup/cgroup-internal.h +++ b/kernel/cgroup/cgroup-internal.h
@@ -169,6 +169,7 @@ extern struct mutex cgroup_mutex; extern spinlock_t css_set_lock; extern struct cgroup_subsys *cgroup_subsys[]; extern struct list_head cgroup_roots; +extern struct file_system_type cgroup_fs_type; /* iterate across the hierarchies */ #define for_each_root(root) \ @@ -249,10 +250,9 @@ int cgroup_migrate(struct task_struct *leader, bool threadgroup, int cgroup_attach_task(struct cgroup *dst_cgrp, struct task_struct *leader, bool threadgroup); -struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup, - bool *locked) +struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup) __acquires(&cgroup_threadgroup_rwsem); -void cgroup_procs_write_finish(struct task_struct *task, bool locked) +void cgroup_procs_write_finish(struct task_struct *task) __releases(&cgroup_threadgroup_rwsem); void cgroup_lock_and_drain_offline(struct cgroup *cgrp);
diff --git a/kernel/cgroup/cgroup-v1.c b/kernel/cgroup/cgroup-v1.c index e7a8bb2..dc5586e 100644 --- a/kernel/cgroup/cgroup-v1.c +++ b/kernel/cgroup/cgroup-v1.c
@@ -15,7 +15,6 @@ #include <linux/pid_namespace.h> #include <linux/cgroupstats.h> #include <linux/fs_parser.h> -#include <linux/cpu.h> #include <trace/events/cgroup.h> #include <trace/hooks/cgroup.h> @@ -64,7 +63,6 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) int retval = 0; mutex_lock(&cgroup_mutex); - cpus_read_lock(); percpu_down_write(&cgroup_threadgroup_rwsem); for_each_root(root) { struct cgroup *from_cgrp; @@ -81,7 +79,6 @@ int cgroup_attach_task_all(struct task_struct *from, struct task_struct *tsk) break; } percpu_up_write(&cgroup_threadgroup_rwsem); - cpus_read_unlock(); mutex_unlock(&cgroup_mutex); return retval; @@ -502,13 +499,12 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, struct task_struct *task; const struct cred *cred, *tcred; ssize_t ret; - bool locked; cgrp = cgroup_kn_lock_live(of->kn, false); if (!cgrp) return -ENODEV; - task = cgroup_procs_write_start(buf, threadgroup, &locked); + task = cgroup_procs_write_start(buf, threadgroup); ret = PTR_ERR_OR_ZERO(task); if (ret) goto out_unlock; @@ -533,7 +529,7 @@ static ssize_t __cgroup1_procs_write(struct kernfs_open_file *of, trace_android_vh_cgroup_set_task(ret, task); out_finish: - cgroup_procs_write_finish(task, locked); + cgroup_procs_write_finish(task); out_unlock: cgroup_kn_unlock(of->kn); @@ -949,9 +945,6 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) for_each_subsys(ss, i) { if (strcmp(param->key, ss->legacy_name)) continue; - if (!cgroup_ssid_enabled(i) || cgroup1_ssid_disabled(i)) - return invalf(fc, "Disabled controller '%s'", - param->key); ctx->subsys_mask |= (1 << i); return 0; }
diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c index a6df9e6..d860958 100644 --- a/kernel/cgroup/cgroup.c +++ b/kernel/cgroup/cgroup.c
@@ -30,7 +30,6 @@ #include "cgroup-internal.h" -#include <linux/cpu.h> #include <linux/cred.h> #include <linux/errno.h> #include <linux/init_task.h> @@ -2392,47 +2391,6 @@ int task_cgroup_path(struct task_struct *task, char *buf, size_t buflen) EXPORT_SYMBOL_GPL(task_cgroup_path); /** - * cgroup_attach_lock - Lock for ->attach() - * @lock_threadgroup: whether to down_write cgroup_threadgroup_rwsem - * - * cgroup migration sometimes needs to stabilize threadgroups against forks and - * exits by write-locking cgroup_threadgroup_rwsem. However, some ->attach() - * implementations (e.g. cpuset), also need to disable CPU hotplug. - * Unfortunately, letting ->attach() operations acquire cpus_read_lock() can - * lead to deadlocks. - * - * Bringing up a CPU may involve creating and destroying tasks which requires - * read-locking threadgroup_rwsem, so threadgroup_rwsem nests inside - * cpus_read_lock(). If we call an ->attach() which acquires the cpus lock while - * write-locking threadgroup_rwsem, the locking order is reversed and we end up - * waiting for an on-going CPU hotplug operation which in turn is waiting for - * the threadgroup_rwsem to be released to create new tasks. For more details: - * - * http://lkml.kernel.org/r/20220711174629.uehfmqegcwn2lqzu@wubuntu - * - * Resolve the situation by always acquiring cpus_read_lock() before optionally - * write-locking cgroup_threadgroup_rwsem. This allows ->attach() to assume that - * CPU hotplug is disabled on entry. - */ -static void cgroup_attach_lock(bool lock_threadgroup) -{ - cpus_read_lock(); - if (lock_threadgroup) - percpu_down_write(&cgroup_threadgroup_rwsem); -} - -/** - * cgroup_attach_unlock - Undo cgroup_attach_lock() - * @lock_threadgroup: whether to up_write cgroup_threadgroup_rwsem - */ -static void cgroup_attach_unlock(bool lock_threadgroup) -{ - if (lock_threadgroup) - percpu_up_write(&cgroup_threadgroup_rwsem); - cpus_read_unlock(); -} - -/** * cgroup_migrate_add_task - add a migration target task to a migration context * @task: target task * @mgctx: target migration context @@ -2906,8 +2864,8 @@ int cgroup_attach_task(struct cgroup *dst_cgrp, struct task_struct *leader, return ret; } -struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup, - bool *threadgroup_locked) +struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup) + __acquires(&cgroup_threadgroup_rwsem) { struct task_struct *tsk; pid_t pid; @@ -2915,17 +2873,7 @@ struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup, if (kstrtoint(strstrip(buf), 0, &pid) || pid < 0) return ERR_PTR(-EINVAL); - /* - * If we migrate a single thread, we don't care about threadgroup - * stability. If the thread is `current`, it won't exit(2) under our - * hands or change PID through exec(2). We exclude - * cgroup_update_dfl_csses and other cgroup_{proc,thread}s_write - * callers by cgroup_mutex. - * Therefore, we can skip the global lock. - */ - lockdep_assert_held(&cgroup_mutex); - *threadgroup_locked = pid || threadgroup; - cgroup_attach_lock(*threadgroup_locked); + percpu_down_write(&cgroup_threadgroup_rwsem); rcu_read_lock(); if (pid) { @@ -2956,14 +2904,14 @@ struct task_struct *cgroup_procs_write_start(char *buf, bool threadgroup, goto out_unlock_rcu; out_unlock_threadgroup: - cgroup_attach_unlock(*threadgroup_locked); - *threadgroup_locked = false; + percpu_up_write(&cgroup_threadgroup_rwsem); out_unlock_rcu: rcu_read_unlock(); return tsk; } -void cgroup_procs_write_finish(struct task_struct *task, bool threadgroup_locked) +void cgroup_procs_write_finish(struct task_struct *task) + __releases(&cgroup_threadgroup_rwsem) { struct cgroup_subsys *ss; int ssid; @@ -2971,8 +2919,7 @@ void cgroup_procs_write_finish(struct task_struct *task, bool threadgroup_locked /* release reference from cgroup_procs_write_start() */ put_task_struct(task); - cgroup_attach_unlock(threadgroup_locked); - + percpu_up_write(&cgroup_threadgroup_rwsem); for_each_subsys(ss, ssid) if (ss->post_attach) ss->post_attach(); @@ -3027,11 +2974,12 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) struct cgroup_subsys_state *d_css; struct cgroup *dsct; struct css_set *src_cset; - bool has_tasks; int ret; lockdep_assert_held(&cgroup_mutex); + percpu_down_write(&cgroup_threadgroup_rwsem); + /* look up all csses currently attached to @cgrp's subtree */ spin_lock_irq(&css_set_lock); cgroup_for_each_live_descendant_pre(dsct, d_css, cgrp) { @@ -3042,15 +2990,6 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) } spin_unlock_irq(&css_set_lock); - /* - * We need to write-lock threadgroup_rwsem while migrating tasks. - * However, if there are no source csets for @cgrp, changing its - * controllers isn't gonna produce any task migrations and the - * write-locking can be skipped safely. - */ - has_tasks = !list_empty(&mgctx.preloaded_src_csets); - cgroup_attach_lock(has_tasks); - /* NULL dst indicates self on default hierarchy */ ret = cgroup_migrate_prepare_dst(&mgctx); if (ret) @@ -3069,7 +3008,7 @@ static int cgroup_update_dfl_csses(struct cgroup *cgrp) ret = cgroup_migrate_execute(&mgctx); out_finish: cgroup_migrate_finish(&mgctx); - cgroup_attach_unlock(has_tasks); + percpu_up_write(&cgroup_threadgroup_rwsem); return ret; } @@ -4915,13 +4854,12 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, struct task_struct *task; const struct cred *saved_cred; ssize_t ret; - bool threadgroup_locked; dst_cgrp = cgroup_kn_lock_live(of->kn, false); if (!dst_cgrp) return -ENODEV; - task = cgroup_procs_write_start(buf, true, &threadgroup_locked); + task = cgroup_procs_write_start(buf, true); ret = PTR_ERR_OR_ZERO(task); if (ret) goto out_unlock; @@ -4947,7 +4885,7 @@ static ssize_t cgroup_procs_write(struct kernfs_open_file *of, ret = cgroup_attach_task(dst_cgrp, task, true); out_finish: - cgroup_procs_write_finish(task, threadgroup_locked); + cgroup_procs_write_finish(task); out_unlock: cgroup_kn_unlock(of->kn); @@ -4967,7 +4905,6 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of, struct task_struct *task; const struct cred *saved_cred; ssize_t ret; - bool locked; buf = strstrip(buf); @@ -4975,7 +4912,7 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of, if (!dst_cgrp) return -ENODEV; - task = cgroup_procs_write_start(buf, false, &locked); + task = cgroup_procs_write_start(buf, false); ret = PTR_ERR_OR_ZERO(task); if (ret) goto out_unlock; @@ -5006,7 +4943,7 @@ static ssize_t cgroup_threads_write(struct kernfs_open_file *of, ret = cgroup_attach_task(dst_cgrp, task, false); out_finish: - cgroup_procs_write_finish(task, locked); + cgroup_procs_write_finish(task); out_unlock: cgroup_kn_unlock(of->kn);
diff --git a/kernel/cgroup/cpuset.c b/kernel/cgroup/cpuset.c index 91bf427..cfc2004 100644 --- a/kernel/cgroup/cpuset.c +++ b/kernel/cgroup/cpuset.c
@@ -33,7 +33,6 @@ #include <linux/interrupt.h> #include <linux/kernel.h> #include <linux/kmod.h> -#include <linux/kthread.h> #include <linux/list.h> #include <linux/mempolicy.h> #include <linux/mm.h> @@ -1055,18 +1054,10 @@ static void update_tasks_cpumask(struct cpuset *cs) { struct css_task_iter it; struct task_struct *task; - bool top_cs = cs == &top_cpuset; css_task_iter_start(&cs->css, 0, &it); - while ((task = css_task_iter_next(&it))) { - /* - * Percpu kthreads in top_cpuset are ignored - */ - if (top_cs && (task->flags & PF_KTHREAD) && - kthread_is_per_cpu(task)) - continue; + while ((task = css_task_iter_next(&it))) set_cpus_allowed_ptr(task, cs->effective_cpus); - } css_task_iter_end(&it); } @@ -2022,7 +2013,12 @@ static int update_prstate(struct cpuset *cs, int val) update_flag(CS_CPU_EXCLUSIVE, cs, 0); } - update_tasks_cpumask(parent); + /* + * Update cpumask of parent's tasks except when it is the top + * cpuset as some system daemons cannot be mapped to other CPUs. + */ + if (parent != &top_cpuset) + update_tasks_cpumask(parent); if (parent->child_ecpus_count) update_sibling_cpumasks(parent, cs, &tmp); @@ -2179,15 +2175,11 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) static void cpuset_cancel_attach(struct cgroup_taskset *tset) { struct cgroup_subsys_state *css; - struct cpuset *cs; cgroup_taskset_first(tset, &css); - cs = css_cs(css); percpu_down_write(&cpuset_rwsem); - cs->attach_in_progress--; - if (!cs->attach_in_progress) - wake_up(&cpuset_attach_wq); + css_cs(css)->attach_in_progress--; percpu_up_write(&cpuset_rwsem); } @@ -2211,7 +2203,7 @@ static void cpuset_attach(struct cgroup_taskset *tset) cgroup_taskset_first(tset, &css); cs = css_cs(css); - lockdep_assert_cpus_held(); /* see cgroup_attach_lock() */ + cpus_read_lock(); percpu_down_write(&cpuset_rwsem); /* prepare for attach */ @@ -2267,6 +2259,7 @@ static void cpuset_attach(struct cgroup_taskset *tset) wake_up(&cpuset_attach_wq); percpu_up_write(&cpuset_rwsem); + cpus_read_unlock(); } /* The various types of files and directories in a cpuset file system */
diff --git a/kernel/compat.c b/kernel/compat.c index 241516f..a2bc1d6 100644 --- a/kernel/compat.c +++ b/kernel/compat.c
@@ -240,7 +240,7 @@ COMPAT_SYSCALL_DEFINE3(sched_getaffinity, compat_pid_t, pid, unsigned int, len, if (len & (sizeof(compat_ulong_t)-1)) return -EINVAL; - if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) + if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; ret = sched_getaffinity(pid, mask);
diff --git a/kernel/debug/debug_core.c b/kernel/debug/debug_core.c index f88611f..5659875 100644 --- a/kernel/debug/debug_core.c +++ b/kernel/debug/debug_core.c
@@ -1043,7 +1043,7 @@ static void kgdb_tasklet_bpt(unsigned long ing) atomic_set(&kgdb_break_tasklet_var, 0); } -static DECLARE_TASKLET_OLD(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt); +static DECLARE_TASKLET(kgdb_tasklet_breakpoint, kgdb_tasklet_bpt, 0); void kgdb_schedule_breakpoint(void) {
diff --git a/kernel/dma/direct.c b/kernel/dma/direct.c index 36cc52b..f186f30 100644 --- a/kernel/dma/direct.c +++ b/kernel/dma/direct.c
@@ -235,7 +235,7 @@ void dma_direct_sync_single_for_device(struct device *dev, swiotlb_tbl_sync_single(dev, paddr, size, dir, SYNC_FOR_DEVICE); if (!dev_is_dma_coherent(dev)) - arch_sync_dma_for_device(paddr, size, dir); + arch_sync_dma_for_device(dev, paddr, size, dir); } EXPORT_SYMBOL(dma_direct_sync_single_for_device); @@ -253,7 +253,7 @@ void dma_direct_sync_sg_for_device(struct device *dev, dir, SYNC_FOR_DEVICE); if (!dev_is_dma_coherent(dev)) - arch_sync_dma_for_device(paddr, sg->length, + arch_sync_dma_for_device(dev, paddr, sg->length, dir); } } @@ -269,8 +269,8 @@ void dma_direct_sync_single_for_cpu(struct device *dev, phys_addr_t paddr = dma_to_phys(dev, addr); if (!dev_is_dma_coherent(dev)) { - arch_sync_dma_for_cpu(paddr, size, dir); - arch_sync_dma_for_cpu_all(); + arch_sync_dma_for_cpu(dev, paddr, size, dir); + arch_sync_dma_for_cpu_all(dev); } if (unlikely(is_swiotlb_buffer(paddr))) @@ -288,7 +288,7 @@ void dma_direct_sync_sg_for_cpu(struct device *dev, phys_addr_t paddr = dma_to_phys(dev, sg_dma_address(sg)); if (!dev_is_dma_coherent(dev)) - arch_sync_dma_for_cpu(paddr, sg->length, dir); + arch_sync_dma_for_cpu(dev, paddr, sg->length, dir); if (unlikely(is_swiotlb_buffer(paddr))) swiotlb_tbl_sync_single(dev, paddr, sg->length, dir, @@ -296,7 +296,7 @@ void dma_direct_sync_sg_for_cpu(struct device *dev, } if (!dev_is_dma_coherent(dev)) - arch_sync_dma_for_cpu_all(); + arch_sync_dma_for_cpu_all(dev); } EXPORT_SYMBOL(dma_direct_sync_sg_for_cpu); @@ -348,7 +348,7 @@ dma_addr_t dma_direct_map_page(struct device *dev, struct page *page, } if (!dev_is_dma_coherent(dev) && !(attrs & DMA_ATTR_SKIP_CPU_SYNC)) - arch_sync_dma_for_device(phys, size, dir); + arch_sync_dma_for_device(dev, phys, size, dir); return dma_addr; } EXPORT_SYMBOL(dma_direct_map_page);
diff --git a/kernel/events/core.c b/kernel/events/core.c index 82a36b8..0253f36 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c
@@ -10051,15 +10051,13 @@ static int pmu_dev_alloc(struct pmu *pmu) pmu->dev->groups = pmu->attr_groups; device_initialize(pmu->dev); - - dev_set_drvdata(pmu->dev, pmu); - pmu->dev->bus = &pmu_bus; - pmu->dev->release = pmu_dev_release; - ret = dev_set_name(pmu->dev, "%s", pmu->name); if (ret) goto free_dev; + dev_set_drvdata(pmu->dev, pmu); + pmu->dev->bus = &pmu_bus; + pmu->dev->release = pmu_dev_release; ret = device_add(pmu->dev); if (ret) goto free_dev; @@ -10825,7 +10823,7 @@ perf_event_set_output(struct perf_event *event, struct perf_event *output_event) /* * If its not a per-cpu rb, it must be the same task. */ - if (output_event->cpu == -1 && output_event->hw.target != event->hw.target) + if (output_event->cpu == -1 && output_event->ctx != event->ctx) goto out; /* @@ -10984,12 +10982,12 @@ SYSCALL_DEFINE5(perf_event_open, if (flags & ~PERF_FLAG_ALL) return -EINVAL; - err = perf_copy_attr(attr_uptr, &attr); + /* Do we allow access to perf_event_open(2) ? */ + err = security_perf_event_open(&attr, PERF_SECURITY_OPEN); if (err) return err; - /* Do we allow access to perf_event_open(2) ? */ - err = security_perf_event_open(&attr, PERF_SECURITY_OPEN); + err = perf_copy_attr(attr_uptr, &attr); if (err) return err;
diff --git a/kernel/exit.c b/kernel/exit.c index 747a1a9..37bfafd 100644 --- a/kernel/exit.c +++ b/kernel/exit.c
@@ -63,59 +63,12 @@ #include <linux/random.h> #include <linux/rcuwait.h> #include <linux/compat.h> -#include <linux/sysfs.h> #include <linux/uaccess.h> #include <asm/unistd.h> #include <asm/pgtable.h> #include <asm/mmu_context.h> -/* - * The default value should be high enough to not crash a system that randomly - * crashes its kernel from time to time, but low enough to at least not permit - * overflowing 32-bit refcounts or the ldsem writer count. - */ -static unsigned int oops_limit = 10000; - -#ifdef CONFIG_SYSCTL -static struct ctl_table kern_exit_table[] = { - { - .procname = "oops_limit", - .data = &oops_limit, - .maxlen = sizeof(oops_limit), - .mode = 0644, - .proc_handler = proc_douintvec, - }, - { } -}; - -static __init int kernel_exit_sysctls_init(void) -{ - register_sysctl_init("kernel", kern_exit_table); - return 0; -} -late_initcall(kernel_exit_sysctls_init); -#endif - -static atomic_t oops_count = ATOMIC_INIT(0); - -#ifdef CONFIG_SYSFS -static ssize_t oops_count_show(struct kobject *kobj, struct kobj_attribute *attr, - char *page) -{ - return sysfs_emit(page, "%d\n", atomic_read(&oops_count)); -} - -static struct kobj_attribute oops_count_attr = __ATTR_RO(oops_count); - -static __init int kernel_exit_sysfs_init(void) -{ - sysfs_add_file_to_group(kernel_kobj, &oops_count_attr.attr, NULL); - return 0; -} -late_initcall(kernel_exit_sysfs_init); -#endif - static void __unhash_process(struct task_struct *p, bool group_dead) { nr_threads--; @@ -912,31 +865,6 @@ void __noreturn do_exit(long code) } EXPORT_SYMBOL_GPL(do_exit); -void __noreturn make_task_dead(int signr) -{ - /* - * Take the task off the cpu after something catastrophic has - * happened. - */ - unsigned int limit; - - /* - * Every time the system oopses, if the oops happens while a reference - * to an object was held, the reference leaks. - * If the oops doesn't also leak memory, repeated oopsing can cause - * reference counters to wrap around (if they're not using refcount_t). - * This means that repeated oopsing can make unexploitable-looking bugs - * exploitable through repeated oopsing. - * To make sure this can't happen, place an upper bound on how often the - * kernel may oops without panic(). - */ - limit = READ_ONCE(oops_limit); - if (atomic_inc_return(&oops_count) >= limit && limit) - panic("Oopsed too often (kernel.oops_limit is %d)", limit); - - do_exit(signr); -} - void complete_and_exit(struct completion *comp, long code) { if (comp)
diff --git a/kernel/fail_function.c b/kernel/fail_function.c index 8f3795d..b0b1ad9 100644 --- a/kernel/fail_function.c +++ b/kernel/fail_function.c
@@ -163,7 +163,10 @@ static void fei_debugfs_add_attr(struct fei_attr *attr) static void fei_debugfs_remove_attr(struct fei_attr *attr) { - debugfs_lookup_and_remove(attr->kp.symbol_name, fei_debugfs_dir); + struct dentry *dir; + + dir = debugfs_lookup(attr->kp.symbol_name, fei_debugfs_dir); + debugfs_remove_recursive(dir); } static int fei_kprobe_handler(struct kprobe *kp, struct pt_regs *regs)
diff --git a/kernel/fork.c b/kernel/fork.c index f7a3c5e..74b03cf 100644 --- a/kernel/fork.c +++ b/kernel/fork.c
@@ -469,9 +469,6 @@ void put_task_stack(struct task_struct *tsk) void free_task(struct task_struct *tsk) { -#ifdef CONFIG_SECCOMP - WARN_ON_ONCE(tsk->seccomp.filter); -#endif cpufreq_task_times_exit(tsk); scs_release(tsk); @@ -2195,6 +2192,12 @@ static __latent_entropy struct task_struct *copy_process( spin_lock(¤t->sighand->siglock); + /* + * Copy seccomp details explicitly here, in case they were changed + * before holding sighand lock. + */ + copy_seccomp(p); + rseq_fork(p, clone_flags); /* Don't start children in a dying pid namespace */ @@ -2209,14 +2212,6 @@ static __latent_entropy struct task_struct *copy_process( goto bad_fork_cancel_cgroup; } - /* No more failure paths after this point. */ - - /* - * Copy seccomp details explicitly here, in case they were changed - * before holding sighand lock. - */ - copy_seccomp(p); - init_task_pid_links(p); if (likely(p->pid)) { ptrace_init_task(p, (clone_flags & CLONE_PTRACE) || trace);
diff --git a/kernel/gcov/clang.c b/kernel/gcov/clang.c index ea6b45d..c466c7f 100644 --- a/kernel/gcov/clang.c +++ b/kernel/gcov/clang.c
@@ -327,8 +327,6 @@ void gcov_info_add(struct gcov_info *dst, struct gcov_info *src) for (i = 0; i < sfn_ptr->num_counters; i++) dfn_ptr->counters[i] += sfn_ptr->counters[i]; - - sfn_ptr = list_next_entry(sfn_ptr, head); } }
diff --git a/kernel/gcov/gcc_4_7.c b/kernel/gcov/gcc_4_7.c index 0f8a7af..60c7be5 100644 --- a/kernel/gcov/gcc_4_7.c +++ b/kernel/gcov/gcc_4_7.c
@@ -33,13 +33,6 @@ #define GCOV_TAG_FUNCTION_LENGTH 3 -/* Since GCC 12.1 sizes are in BYTES and not in WORDS (4B). */ -#if (__GNUC__ >= 12) -#define GCOV_UNIT_SIZE 4 -#else -#define GCOV_UNIT_SIZE 1 -#endif - static struct gcov_info *gcov_info_head; /** @@ -85,7 +78,6 @@ struct gcov_fn_info { * @version: gcov version magic indicating the gcc version used for compilation * @next: list head for a singly-linked list * @stamp: uniquifying time stamp - * @checksum: unique object checksum * @filename: name of the associated gcov data file * @merge: merge functions (null for unused counter type) * @n_functions: number of instrumented functions @@ -98,10 +90,6 @@ struct gcov_info { unsigned int version; struct gcov_info *next; unsigned int stamp; - /* Since GCC 12.1 a checksum field is added. */ -#if (__GNUC__ >= 12) - unsigned int checksum; -#endif const char *filename; void (*merge[GCOV_COUNTERS])(gcov_type *, unsigned int); unsigned int n_functions; @@ -463,18 +451,12 @@ static size_t convert_to_gcda(char *buffer, struct gcov_info *info) pos += store_gcov_u32(buffer, pos, info->version); pos += store_gcov_u32(buffer, pos, info->stamp); -#if (__GNUC__ >= 12) - /* Use zero as checksum of the compilation unit. */ - pos += store_gcov_u32(buffer, pos, 0); -#endif - for (fi_idx = 0; fi_idx < info->n_functions; fi_idx++) { fi_ptr = info->functions[fi_idx]; /* Function record. */ pos += store_gcov_u32(buffer, pos, GCOV_TAG_FUNCTION); - pos += store_gcov_u32(buffer, pos, - GCOV_TAG_FUNCTION_LENGTH * GCOV_UNIT_SIZE); + pos += store_gcov_u32(buffer, pos, GCOV_TAG_FUNCTION_LENGTH); pos += store_gcov_u32(buffer, pos, fi_ptr->ident); pos += store_gcov_u32(buffer, pos, fi_ptr->lineno_checksum); pos += store_gcov_u32(buffer, pos, fi_ptr->cfg_checksum); @@ -488,8 +470,7 @@ static size_t convert_to_gcda(char *buffer, struct gcov_info *info) /* Counter record. */ pos += store_gcov_u32(buffer, pos, GCOV_TAG_FOR_COUNTER(ct_idx)); - pos += store_gcov_u32(buffer, pos, - ci_ptr->num * 2 * GCOV_UNIT_SIZE); + pos += store_gcov_u32(buffer, pos, ci_ptr->num * 2); for (cv_idx = 0; cv_idx < ci_ptr->num; cv_idx++) { pos += store_gcov_u64(buffer, pos,
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 3897505..b6adfe4 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c
@@ -1580,8 +1580,7 @@ int irq_chip_request_resources_parent(struct irq_data *data) if (data->chip->irq_request_resources) return data->chip->irq_request_resources(data); - /* no error on missing optional irq_chip::irq_request_resources */ - return 0; + return -ENOSYS; } EXPORT_SYMBOL_GPL(irq_chip_request_resources_parent);
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index 7057b60..ba4d742 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h
@@ -52,7 +52,6 @@ enum { * IRQS_PENDING - irq is pending and replayed later * IRQS_SUSPENDED - irq is suspended * IRQS_NMI - irq line is used to deliver NMIs - * IRQS_SYSFS - descriptor has been added to sysfs */ enum { IRQS_AUTODETECT = 0x00000001, @@ -65,7 +64,6 @@ enum { IRQS_SUSPENDED = 0x00000800, IRQS_TIMINGS = 0x00001000, IRQS_NMI = 0x00002000, - IRQS_SYSFS = 0x00004000, }; #include "debug.h"
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c index 0272a2e..172b5e6 100644 --- a/kernel/irq/irqdesc.c +++ b/kernel/irq/irqdesc.c
@@ -288,25 +288,22 @@ static void irq_sysfs_add(int irq, struct irq_desc *desc) if (irq_kobj_base) { /* * Continue even in case of failure as this is nothing - * crucial and failures in the late irq_sysfs_init() - * cannot be rolled back. + * crucial. */ if (kobject_add(&desc->kobj, irq_kobj_base, "%d", irq)) pr_warn("Failed to add kobject for irq %d\n", irq); - else - desc->istate |= IRQS_SYSFS; } } static void irq_sysfs_del(struct irq_desc *desc) { /* - * Only invoke kobject_del() when kobject_add() was successfully - * invoked for the descriptor. This covers both early boot, where - * sysfs is not initialized yet, and the case of a failed - * kobject_add() invocation. + * If irq_sysfs_init() has not yet been invoked (early boot), then + * irq_kobj_base is NULL and the descriptor was never added. + * kobject_del() complains about a object with no parent, so make + * it conditional. */ - if (desc->istate & IRQS_SYSFS) + if (irq_kobj_base) kobject_del(&desc->kobj); }
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index c78485e..f7c98c3 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c
@@ -25,9 +25,6 @@ static DEFINE_MUTEX(irq_domain_mutex); static struct irq_domain *irq_default_domain; -static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, - unsigned int nr_irqs, int node, void *arg, - bool realloc, const struct irq_affinity_desc *affinity); static void irq_domain_check_hierarchy(struct irq_domain *domain); struct irqchip_fwid { @@ -117,12 +114,23 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode) } EXPORT_SYMBOL_GPL(irq_domain_free_fwnode); -static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode, - unsigned int size, - irq_hw_number_t hwirq_max, - int direct_max, - const struct irq_domain_ops *ops, - void *host_data) +/** + * __irq_domain_add() - Allocate a new irq_domain data structure + * @fwnode: firmware node for the interrupt controller + * @size: Size of linear map; 0 for radix mapping only + * @hwirq_max: Maximum number of interrupts supported by controller + * @direct_max: Maximum value of direct maps; Use ~0 for no limit; 0 for no + * direct mapping + * @ops: domain callbacks + * @host_data: Controller private data pointer + * + * Allocates and initializes an irq_domain structure. + * Returns pointer to IRQ domain, or NULL on failure. + */ +struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, int size, + irq_hw_number_t hwirq_max, int direct_max, + const struct irq_domain_ops *ops, + void *host_data) { struct device_node *of_node = to_of_node(fwnode); struct irqchip_fwid *fwid; @@ -214,44 +222,12 @@ static struct irq_domain *__irq_domain_create(struct fwnode_handle *fwnode, domain->revmap_direct_max_irq = direct_max; irq_domain_check_hierarchy(domain); - return domain; -} - -static void __irq_domain_publish(struct irq_domain *domain) -{ mutex_lock(&irq_domain_mutex); debugfs_add_domain_dir(domain); list_add(&domain->link, &irq_domain_list); mutex_unlock(&irq_domain_mutex); pr_debug("Added domain %s\n", domain->name); -} - -/** - * __irq_domain_add() - Allocate a new irq_domain data structure - * @fwnode: firmware node for the interrupt controller - * @size: Size of linear map; 0 for radix mapping only - * @hwirq_max: Maximum number of interrupts supported by controller - * @direct_max: Maximum value of direct maps; Use ~0 for no limit; 0 for no - * direct mapping - * @ops: domain callbacks - * @host_data: Controller private data pointer - * - * Allocates and initializes an irq_domain structure. - * Returns pointer to IRQ domain, or NULL on failure. - */ -struct irq_domain *__irq_domain_add(struct fwnode_handle *fwnode, unsigned int size, - irq_hw_number_t hwirq_max, int direct_max, - const struct irq_domain_ops *ops, - void *host_data) -{ - struct irq_domain *domain; - - domain = __irq_domain_create(fwnode, size, hwirq_max, direct_max, - ops, host_data); - if (domain) - __irq_domain_publish(domain); - return domain; } EXPORT_SYMBOL_GPL(__irq_domain_add); @@ -534,9 +510,6 @@ void irq_domain_disassociate(struct irq_domain *domain, unsigned int irq) return; hwirq = irq_data->hwirq; - - mutex_lock(&irq_domain_mutex); - irq_set_status_flags(irq, IRQ_NOREQUEST); /* remove chip and handler */ @@ -556,12 +529,10 @@ void irq_domain_disassociate(struct irq_domain *domain, unsigned int irq) /* Clear reverse map for this hwirq */ irq_domain_clear_mapping(domain, hwirq); - - mutex_unlock(&irq_domain_mutex); } -static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int virq, - irq_hw_number_t hwirq) +int irq_domain_associate(struct irq_domain *domain, unsigned int virq, + irq_hw_number_t hwirq) { struct irq_data *irq_data = irq_get_irq_data(virq); int ret; @@ -574,6 +545,7 @@ static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int v if (WARN(irq_data->domain, "error: virq%i is already associated", virq)) return -EINVAL; + mutex_lock(&irq_domain_mutex); irq_data->hwirq = hwirq; irq_data->domain = domain; if (domain->ops->map) { @@ -590,6 +562,7 @@ static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int v } irq_data->domain = NULL; irq_data->hwirq = 0; + mutex_unlock(&irq_domain_mutex); return ret; } @@ -600,23 +573,12 @@ static int irq_domain_associate_locked(struct irq_domain *domain, unsigned int v domain->mapcount++; irq_domain_set_mapping(domain, hwirq, irq_data); + mutex_unlock(&irq_domain_mutex); irq_clear_status_flags(virq, IRQ_NOREQUEST); return 0; } - -int irq_domain_associate(struct irq_domain *domain, unsigned int virq, - irq_hw_number_t hwirq) -{ - int ret; - - mutex_lock(&irq_domain_mutex); - ret = irq_domain_associate_locked(domain, virq, hwirq); - mutex_unlock(&irq_domain_mutex); - - return ret; -} EXPORT_SYMBOL_GPL(irq_domain_associate); void irq_domain_associate_many(struct irq_domain *domain, unsigned int irq_base, @@ -676,34 +638,6 @@ unsigned int irq_create_direct_mapping(struct irq_domain *domain) } EXPORT_SYMBOL_GPL(irq_create_direct_mapping); -static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) -{ - struct device_node *of_node = irq_domain_get_of_node(domain); - int virq; - - pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); - - /* Allocate a virtual interrupt number */ - virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), - affinity); - if (virq <= 0) { - pr_debug("-> virq allocation failed\n"); - return 0; - } - - if (irq_domain_associate_locked(domain, virq, hwirq)) { - irq_free_desc(virq); - return 0; - } - - pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", - hwirq, of_node_full_name(of_node), virq); - - return virq; -} - /** * irq_create_mapping_affinity() - Map a hardware interrupt into linux irq space * @domain: domain owning this hardware interrupt or NULL for default domain @@ -716,31 +650,47 @@ static unsigned int irq_create_mapping_affinity_locked(struct irq_domain *domain * on the number returned from that call. */ unsigned int irq_create_mapping_affinity(struct irq_domain *domain, - irq_hw_number_t hwirq, - const struct irq_affinity_desc *affinity) + irq_hw_number_t hwirq, + const struct irq_affinity_desc *affinity) { + struct device_node *of_node; int virq; - /* Look for default domain if necessary */ + pr_debug("irq_create_mapping(0x%p, 0x%lx)\n", domain, hwirq); + + /* Look for default domain if nececssary */ if (domain == NULL) domain = irq_default_domain; if (domain == NULL) { WARN(1, "%s(, %lx) called with NULL domain\n", __func__, hwirq); return 0; } + pr_debug("-> using domain @%p\n", domain); - mutex_lock(&irq_domain_mutex); + of_node = irq_domain_get_of_node(domain); /* Check if mapping already exists */ virq = irq_find_mapping(domain, hwirq); if (virq) { - pr_debug("existing mapping on virq %d\n", virq); - goto out; + pr_debug("-> existing mapping on virq %d\n", virq); + return virq; } - virq = irq_create_mapping_affinity_locked(domain, hwirq, affinity); -out: - mutex_unlock(&irq_domain_mutex); + /* Allocate a virtual interrupt number */ + virq = irq_domain_alloc_descs(-1, 1, hwirq, of_node_to_nid(of_node), + affinity); + if (virq <= 0) { + pr_debug("-> virq allocation failed\n"); + return 0; + } + + if (irq_domain_associate(domain, virq, hwirq)) { + irq_free_desc(virq); + return 0; + } + + pr_debug("irq %lu on domain %s mapped to virtual irq %u\n", + hwirq, of_node_full_name(of_node), virq); return virq; } @@ -844,8 +794,6 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) if (WARN_ON(type & ~IRQ_TYPE_SENSE_MASK)) type &= IRQ_TYPE_SENSE_MASK; - mutex_lock(&irq_domain_mutex); - /* * If we've already configured this interrupt, * don't do it again, or hell will break loose. @@ -858,7 +806,7 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) * interrupt number. */ if (type == IRQ_TYPE_NONE || type == irq_get_trigger_type(virq)) - goto out; + return virq; /* * If the trigger type has not been set yet, then set @@ -866,45 +814,40 @@ unsigned int irq_create_fwspec_mapping(struct irq_fwspec *fwspec) */ if (irq_get_trigger_type(virq) == IRQ_TYPE_NONE) { irq_data = irq_get_irq_data(virq); - if (!irq_data) { - virq = 0; - goto out; - } + if (!irq_data) + return 0; irqd_set_trigger_type(irq_data, type); - goto out; + return virq; } pr_warn("type mismatch, failed to map hwirq-%lu for %s!\n", hwirq, of_node_full_name(to_of_node(fwspec->fwnode))); - virq = 0; - goto out; + return 0; } if (irq_domain_is_hierarchy(domain)) { - virq = irq_domain_alloc_irqs_locked(domain, -1, 1, NUMA_NO_NODE, - fwspec, false, NULL); - if (virq <= 0) { - virq = 0; - goto out; - } + virq = irq_domain_alloc_irqs(domain, 1, NUMA_NO_NODE, fwspec); + if (virq <= 0) + return 0; } else { /* Create mapping */ - virq = irq_create_mapping_affinity_locked(domain, hwirq, NULL); + virq = irq_create_mapping(domain, hwirq); if (!virq) - goto out; + return virq; } irq_data = irq_get_irq_data(virq); - if (WARN_ON(!irq_data)) { - virq = 0; - goto out; + if (!irq_data) { + if (irq_domain_is_hierarchy(domain)) + irq_domain_free_irqs(virq, 1); + else + irq_dispose_mapping(virq); + return 0; } /* Store trigger type */ irqd_set_trigger_type(irq_data, type); -out: - mutex_unlock(&irq_domain_mutex); return virq; } @@ -1117,15 +1060,12 @@ struct irq_domain *irq_domain_create_hierarchy(struct irq_domain *parent, struct irq_domain *domain; if (size) - domain = __irq_domain_create(fwnode, size, size, 0, ops, host_data); + domain = irq_domain_create_linear(fwnode, size, ops, host_data); else - domain = __irq_domain_create(fwnode, 0, ~0, 0, ops, host_data); - + domain = irq_domain_create_tree(fwnode, ops, host_data); if (domain) { domain->parent = parent; domain->flags |= flags; - - __irq_domain_publish(domain); } return domain; @@ -1372,45 +1312,6 @@ int irq_domain_alloc_irqs_hierarchy(struct irq_domain *domain, return domain->ops->alloc(domain, irq_base, nr_irqs, arg); } -static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, - unsigned int nr_irqs, int node, void *arg, - bool realloc, const struct irq_affinity_desc *affinity) -{ - int i, ret, virq; - - if (realloc && irq_base >= 0) { - virq = irq_base; - } else { - virq = irq_domain_alloc_descs(irq_base, nr_irqs, 0, node, - affinity); - if (virq < 0) { - pr_debug("cannot allocate IRQ(base %d, count %d)\n", - irq_base, nr_irqs); - return virq; - } - } - - if (irq_domain_alloc_irq_data(domain, virq, nr_irqs)) { - pr_debug("cannot allocate memory for IRQ%d\n", virq); - ret = -ENOMEM; - goto out_free_desc; - } - - ret = irq_domain_alloc_irqs_hierarchy(domain, virq, nr_irqs, arg); - if (ret < 0) - goto out_free_irq_data; - for (i = 0; i < nr_irqs; i++) - irq_domain_insert_irq(virq + i); - - return virq; - -out_free_irq_data: - irq_domain_free_irq_data(virq, nr_irqs); -out_free_desc: - irq_free_descs(virq, nr_irqs); - return ret; -} - /** * __irq_domain_alloc_irqs - Allocate IRQs from domain * @domain: domain to allocate from @@ -1437,7 +1338,7 @@ int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, unsigned int nr_irqs, int node, void *arg, bool realloc, const struct irq_affinity_desc *affinity) { - int ret; + int i, ret, virq; if (domain == NULL) { domain = irq_default_domain; @@ -1445,11 +1346,40 @@ int __irq_domain_alloc_irqs(struct irq_domain *domain, int irq_base, return -EINVAL; } + if (realloc && irq_base >= 0) { + virq = irq_base; + } else { + virq = irq_domain_alloc_descs(irq_base, nr_irqs, 0, node, + affinity); + if (virq < 0) { + pr_debug("cannot allocate IRQ(base %d, count %d)\n", + irq_base, nr_irqs); + return virq; + } + } + + if (irq_domain_alloc_irq_data(domain, virq, nr_irqs)) { + pr_debug("cannot allocate memory for IRQ%d\n", virq); + ret = -ENOMEM; + goto out_free_desc; + } + mutex_lock(&irq_domain_mutex); - ret = irq_domain_alloc_irqs_locked(domain, irq_base, nr_irqs, node, arg, - realloc, affinity); + ret = irq_domain_alloc_irqs_hierarchy(domain, virq, nr_irqs, arg); + if (ret < 0) { + mutex_unlock(&irq_domain_mutex); + goto out_free_irq_data; + } + for (i = 0; i < nr_irqs; i++) + irq_domain_insert_irq(virq + i); mutex_unlock(&irq_domain_mutex); + return virq; + +out_free_irq_data: + irq_domain_free_irq_data(virq, nr_irqs); +out_free_desc: + irq_free_descs(virq, nr_irqs); return ret; } @@ -1810,13 +1740,6 @@ void irq_domain_set_info(struct irq_domain *domain, unsigned int virq, irq_set_handler_data(virq, handler_data); } -static int irq_domain_alloc_irqs_locked(struct irq_domain *domain, int irq_base, - unsigned int nr_irqs, int node, void *arg, - bool realloc, const struct irq_affinity_desc *affinity) -{ - return -EINVAL; -} - static void irq_domain_check_hierarchy(struct irq_domain *domain) { }
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c index b7af39e..98c04ca 100644 --- a/kernel/irq/resend.c +++ b/kernel/irq/resend.c
@@ -45,7 +45,7 @@ static void resend_irqs(unsigned long arg) } /* Tasklet to handle resend: */ -static DECLARE_TASKLET_OLD(resend_tasklet, resend_irqs); +static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0); #endif
diff --git a/kernel/kprobes.c b/kernel/kprobes.c index aecf434..c93340b 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c
@@ -406,8 +406,8 @@ static inline int kprobe_optready(struct kprobe *p) return 0; } -/* Return true if the kprobe is disarmed. Note: p must be on hash list */ -bool kprobe_disarmed(struct kprobe *p) +/* Return true(!0) if the kprobe is disarmed. Note: p must be on hash list */ +static inline int kprobe_disarmed(struct kprobe *p) { struct optimized_kprobe *op; @@ -614,7 +614,7 @@ void wait_for_kprobe_optimizer(void) mutex_unlock(&kprobe_mutex); } -bool optprobe_queued_unopt(struct optimized_kprobe *op) +static bool optprobe_queued_unopt(struct optimized_kprobe *op) { struct optimized_kprobe *_op; @@ -1594,9 +1594,7 @@ static int check_kprobe_address_safe(struct kprobe *p, preempt_disable(); /* Ensure it is not in reserved area nor out of text */ - if (!(core_kernel_text((unsigned long) p->addr) || - is_module_text_address((unsigned long) p->addr)) || - in_gate_area_no_mm((unsigned long) p->addr) || + if (!kernel_text_address((unsigned long) p->addr) || within_kprobe_blacklist((unsigned long) p->addr) || jump_label_text_reserved(p->addr, p->addr) || find_bug((unsigned long)p->addr)) { @@ -1738,12 +1736,11 @@ static struct kprobe *__disable_kprobe(struct kprobe *p) /* Try to disarm and disable this/parent probe */ if (p == orig_p || aggr_kprobe_disabled(orig_p)) { /* - * Don't be lazy here. Even if 'kprobes_all_disarmed' - * is false, 'orig_p' might not have been armed yet. - * Note arm_all_kprobes() __tries__ to arm all kprobes - * on the best effort basis. + * If kprobes_all_disarmed is set, orig_p + * should have already been disarmed, so + * skip unneed disarming process. */ - if (!kprobes_all_disarmed && !kprobe_disabled(orig_p)) { + if (!kprobes_all_disarmed) { ret = disarm_kprobe(orig_p, true); if (ret) { p->flags &= ~KPROBE_FLAG_DISABLED; @@ -1792,13 +1789,7 @@ static int __unregister_kprobe_top(struct kprobe *p) if ((list_p != p) && (list_p->post_handler)) goto noclean; } - /* - * For the kprobe-on-ftrace case, we keep the - * post_handler setting to identify this aggrprobe - * armed with kprobe_ipmodify_ops. - */ - if (!kprobe_ftrace(ap)) - ap->post_handler = NULL; + ap->post_handler = NULL; } noclean: /* @@ -2205,11 +2196,8 @@ int enable_kprobe(struct kprobe *kp) if (!kprobes_all_disarmed && kprobe_disabled(p)) { p->flags &= ~KPROBE_FLAG_DISABLED; ret = arm_kprobe(p); - if (ret) { + if (ret) p->flags |= KPROBE_FLAG_DISABLED; - if (p != kp) - kp->flags |= KPROBE_FLAG_DISABLED; - } } out: mutex_unlock(&kprobe_mutex);
diff --git a/kernel/livepatch/transition.c b/kernel/livepatch/transition.c index 1fe7c45..cdf318d 100644 --- a/kernel/livepatch/transition.c +++ b/kernel/livepatch/transition.c
@@ -611,23 +611,9 @@ void klp_reverse_transition(void) /* Called from copy_process() during fork */ void klp_copy_process(struct task_struct *child) { - - /* - * The parent process may have gone through a KLP transition since - * the thread flag was copied in setup_thread_stack earlier. Bring - * the task flag up to date with the parent here. - * - * The operation is serialized against all klp_*_transition() - * operations by the tasklist_lock. The only exception is - * klp_update_patch_state(current), but we cannot race with - * that because we are current. - */ - if (test_tsk_thread_flag(current, TIF_PATCH_PENDING)) - set_tsk_thread_flag(child, TIF_PATCH_PENDING); - else - clear_tsk_thread_flag(child, TIF_PATCH_PENDING); - child->patch_state = current->patch_state; + + /* TIF_PATCH_PENDING gets copied in setup_thread_stack() */ } /*
diff --git a/kernel/module.c b/kernel/module.c index c09b1bf..7e2048d 100644 --- a/kernel/module.c +++ b/kernel/module.c
@@ -3689,8 +3689,7 @@ static bool finished_loading(const char *name) sched_annotate_sleep(); mutex_lock(&module_mutex); mod = find_module_all(name, strlen(name), true); - ret = !mod || mod->state == MODULE_STATE_LIVE - || mod->state == MODULE_STATE_GOING; + ret = !mod || mod->state == MODULE_STATE_LIVE; mutex_unlock(&module_mutex); return ret; @@ -3866,35 +3865,20 @@ static int add_unformed_module(struct module *mod) mod->state = MODULE_STATE_UNFORMED; +again: mutex_lock(&module_mutex); old = find_module_all(mod->name, strlen(mod->name), true); if (old != NULL) { - if (old->state == MODULE_STATE_COMING - || old->state == MODULE_STATE_UNFORMED) { + if (old->state != MODULE_STATE_LIVE) { /* Wait in case it fails to load. */ mutex_unlock(&module_mutex); err = wait_event_interruptible(module_wq, finished_loading(mod->name)); if (err) goto out_unlocked; - - /* The module might have gone in the meantime. */ - mutex_lock(&module_mutex); - old = find_module_all(mod->name, strlen(mod->name), - true); + goto again; } - - /* - * We are here only when the same module was being loaded. Do - * not try to load it again right now. It prevents long delays - * caused by serialized module load failures. It might happen - * when more devices of the same type trigger load of - * a particular module. - */ - if (old && old->state == MODULE_STATE_LIVE) - err = -EEXIST; - else - err = -EBUSY; + err = -EEXIST; goto out; } mod_update_bounds(mod);
diff --git a/kernel/panic.c b/kernel/panic.c index cef7946..f470a03 100644 --- a/kernel/panic.c +++ b/kernel/panic.c
@@ -31,7 +31,6 @@ #include <linux/bug.h> #include <linux/ratelimit.h> #include <linux/debugfs.h> -#include <linux/sysfs.h> #include <asm/sections.h> #define PANIC_TIMER_STEP 100 @@ -45,7 +44,6 @@ static int pause_on_oops_flag; static DEFINE_SPINLOCK(pause_on_oops_lock); bool crash_kexec_post_notifiers; int panic_on_warn __read_mostly; -static unsigned int warn_limit __read_mostly; int panic_timeout = CONFIG_PANIC_TIMEOUT; EXPORT_SYMBOL_GPL(panic_timeout); @@ -62,45 +60,6 @@ ATOMIC_NOTIFIER_HEAD(panic_notifier_list); EXPORT_SYMBOL(panic_notifier_list); -#ifdef CONFIG_SYSCTL -static struct ctl_table kern_panic_table[] = { - { - .procname = "warn_limit", - .data = &warn_limit, - .maxlen = sizeof(warn_limit), - .mode = 0644, - .proc_handler = proc_douintvec, - }, - { } -}; - -static __init int kernel_panic_sysctls_init(void) -{ - register_sysctl_init("kernel", kern_panic_table); - return 0; -} -late_initcall(kernel_panic_sysctls_init); -#endif - -static atomic_t warn_count = ATOMIC_INIT(0); - -#ifdef CONFIG_SYSFS -static ssize_t warn_count_show(struct kobject *kobj, struct kobj_attribute *attr, - char *page) -{ - return sysfs_emit(page, "%d\n", atomic_read(&warn_count)); -} - -static struct kobj_attribute warn_count_attr = __ATTR_RO(warn_count); - -static __init int kernel_panic_sysfs_init(void) -{ - sysfs_add_file_to_group(kernel_kobj, &warn_count_attr.attr, NULL); - return 0; -} -late_initcall(kernel_panic_sysfs_init); -#endif - static long no_blink(int state) { return 0; @@ -197,19 +156,6 @@ static void panic_print_sys_info(void) ftrace_dump(DUMP_ALL); } -void check_panic_on_warn(const char *origin) -{ - unsigned int limit; - - if (panic_on_warn) - panic("%s: panic_on_warn set ...\n", origin); - - limit = READ_ONCE(warn_limit); - if (atomic_inc_return(&warn_count) >= limit && limit) - panic("%s: system warned too often (kernel.warn_limit is %d)", - origin, limit); -} - /** * panic - halt the system * @fmt: The text string to print @@ -227,16 +173,6 @@ void panic(const char *fmt, ...) int old_cpu, this_cpu; bool _crash_kexec_post_notifiers = crash_kexec_post_notifiers; - if (panic_on_warn) { - /* - * This thread may hit another WARN() in the panic path. - * Resetting this prevents additional WARN() from panicking the - * system on this thread. Other threads are blocked by the - * panic_mutex in panic(). - */ - panic_on_warn = 0; - } - /* * Disable local interrupts. This will prevent panic_smp_self_stop * from deadlocking the first cpu that invokes the panic, since @@ -635,7 +571,16 @@ void __warn(const char *file, int line, void *caller, unsigned taint, if (args) vprintk(args->fmt, args->args); - check_panic_on_warn("kernel"); + if (panic_on_warn) { + /* + * This thread may hit another WARN() in the panic path. + * Resetting this prevents additional WARN() from panicking the + * system on this thread. Other threads are blocked by the + * panic_mutex in panic(). + */ + panic_on_warn = 0; + panic("panic_on_warn set ...\n"); + } print_modules();
diff --git a/kernel/power/hibernate.c b/kernel/power/hibernate.c index f8934f9..406b4cb 100644 --- a/kernel/power/hibernate.c +++ b/kernel/power/hibernate.c
@@ -625,7 +625,7 @@ static void power_down(void) int error; if (hibernation_mode == HIBERNATION_SUSPEND) { - error = suspend_devices_and_enter(mem_sleep_current); + error = suspend_devices_and_enter(PM_SUSPEND_MEM); if (error) { hibernation_mode = hibernation_ops ? HIBERNATION_PLATFORM :
diff --git a/kernel/power/snapshot.c b/kernel/power/snapshot.c index 5092b8b..46455aa 100644 --- a/kernel/power/snapshot.c +++ b/kernel/power/snapshot.c
@@ -1680,8 +1680,8 @@ static unsigned long minimum_image_size(unsigned long saveable) * /sys/power/reserved_size, respectively). To make this happen, we compute the * total number of available page frames and allocate at least * - * ([page frames total] - PAGES_FOR_IO - [metadata pages]) / 2 - * - 2 * DIV_ROUND_UP(reserved_size, PAGE_SIZE) + * ([page frames total] + PAGES_FOR_IO + [metadata pages]) / 2 + * + 2 * DIV_ROUND_UP(reserved_size, PAGE_SIZE) * * of them, which corresponds to the maximum size of a hibernation image. *
diff --git a/kernel/power/user.c b/kernel/power/user.c index 672d4e2..7743895 100644 --- a/kernel/power/user.c +++ b/kernel/power/user.c
@@ -26,7 +26,6 @@ #include "power.h" -static bool need_wait; #define SNAPSHOT_MINOR 231 @@ -80,7 +79,7 @@ static int snapshot_open(struct inode *inode, struct file *filp) * Resuming. We may need to wait for the image device to * appear. */ - need_wait = true; + wait_for_device_probe(); data->swap = -1; data->mode = O_WRONLY; @@ -172,11 +171,6 @@ static ssize_t snapshot_write(struct file *filp, const char __user *buf, ssize_t res; loff_t pg_offp = *offp & ~PAGE_MASK; - if (need_wait) { - wait_for_device_probe(); - need_wait = false; - } - lock_system_sleep(); data = filp->private_data; @@ -212,11 +206,6 @@ static long snapshot_ioctl(struct file *filp, unsigned int cmd, loff_t size; sector_t offset; - if (need_wait) { - wait_for_device_probe(); - need_wait = false; - } - if (_IOC_TYPE(cmd) != SNAPSHOT_IOC_MAGIC) return -ENOTTY; if (_IOC_NR(cmd) > SNAPSHOT_IOC_MAXNR)
diff --git a/kernel/profile.c b/kernel/profile.c index b5ce18b..e97e42a 100644 --- a/kernel/profile.c +++ b/kernel/profile.c
@@ -109,13 +109,6 @@ int __ref profile_init(void) /* only text is profiled */ prof_len = (_etext - _stext) >> prof_shift; - - if (!prof_len) { - pr_warn("profiling shift: %u too large\n", prof_shift); - prof_on = 0; - return -EINVAL; - } - buffer_bytes = prof_len*sizeof(atomic_t); if (!alloc_cpumask_var(&prof_cpu_mask, GFP_KERNEL))
diff --git a/kernel/rcu/tree.c b/kernel/rcu/tree.c index 59ce9e2..c05065f 100644 --- a/kernel/rcu/tree.c +++ b/kernel/rcu/tree.c
@@ -2319,7 +2319,7 @@ void rcu_force_quiescent_state(void) struct rcu_node *rnp_old = NULL; /* Funnel through hierarchy to reduce memory contention. */ - rnp = raw_cpu_read(rcu_data.mynode); + rnp = __this_cpu_read(rcu_data.mynode); for (; rnp != NULL; rnp = rnp->parent) { ret = (READ_ONCE(rcu_state.gp_flags) & RCU_GP_FLAG_FQS) || !raw_spin_trylock(&rnp->fqslock);
diff --git a/kernel/rcu/tree_exp.h b/kernel/rcu/tree_exp.h index eca3df7..173e3ce 100644 --- a/kernel/rcu/tree_exp.h +++ b/kernel/rcu/tree_exp.h
@@ -523,9 +523,7 @@ static void synchronize_sched_expedited_wait(void) mask = leaf_node_cpu_bit(rnp, cpu); if (!(READ_ONCE(rnp->expmask) & mask)) continue; - preempt_disable(); // For smp_processor_id() in dump_cpu_task(). dump_cpu_task(cpu); - preempt_enable(); } } jiffies_stall = 3 * rcu_jiffies_till_stall_check() + 3;
diff --git a/kernel/relay.c b/kernel/relay.c index 9b1cfcd..d3940be 100644 --- a/kernel/relay.c +++ b/kernel/relay.c
@@ -163,13 +163,13 @@ static struct rchan_buf *relay_create_buf(struct rchan *chan) { struct rchan_buf *buf; - if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t)) + if (chan->n_subbufs > KMALLOC_MAX_SIZE / sizeof(size_t *)) return NULL; buf = kzalloc(sizeof(struct rchan_buf), GFP_KERNEL); if (!buf) return NULL; - buf->padding = kmalloc_array(chan->n_subbufs, sizeof(size_t), + buf->padding = kmalloc_array(chan->n_subbufs, sizeof(size_t *), GFP_KERNEL); if (!buf->padding) goto free_buf;
diff --git a/kernel/sched/core.c b/kernel/sched/core.c index c1bcb5c..9276fb6 100644 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -1522,9 +1522,6 @@ static inline void dequeue_task(struct rq *rq, struct task_struct *p, int flags) void activate_task(struct rq *rq, struct task_struct *p, int flags) { - if (task_on_rq_migrating(p)) - flags |= ENQUEUE_MIGRATED; - if (task_contributes_to_load(p)) rq->nr_uninterruptible--; @@ -4091,7 +4088,8 @@ static noinline void __schedule_bug(struct task_struct *prev) print_ip_sym(preempt_disable_ip); pr_cont("\n"); } - check_panic_on_warn("scheduling while atomic"); + if (panic_on_warn) + panic("scheduling while atomic\n"); dump_stack(); add_taint(TAINT_WARN, LOCKDEP_STILL_OK); @@ -5781,14 +5779,14 @@ SYSCALL_DEFINE3(sched_getaffinity, pid_t, pid, unsigned int, len, if (len & (sizeof(unsigned long)-1)) return -EINVAL; - if (!zalloc_cpumask_var(&mask, GFP_KERNEL)) + if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; ret = sched_getaffinity(pid, mask); if (ret == 0) { unsigned int retlen = min(len, cpumask_size()); - if (copy_to_user(user_mask_ptr, cpumask_bits(mask), retlen)) + if (copy_to_user(user_mask_ptr, mask, retlen)) ret = -EFAULT; else ret = retlen;
diff --git a/kernel/sched/deadline.c b/kernel/sched/deadline.c index 50fdd78..2bda9fd 100644 --- a/kernel/sched/deadline.c +++ b/kernel/sched/deadline.c
@@ -1484,38 +1484,14 @@ static void enqueue_task_dl(struct rq *rq, struct task_struct *p, int flags) */ if (pi_task && dl_prio(pi_task->normal_prio) && p->dl.dl_boosted) { pi_se = &pi_task->dl; - /* - * Because of delays in the detection of the overrun of a - * thread's runtime, it might be the case that a thread - * goes to sleep in a rt mutex with negative runtime. As - * a consequence, the thread will be throttled. - * - * While waiting for the mutex, this thread can also be - * boosted via PI, resulting in a thread that is throttled - * and boosted at the same time. - * - * In this case, the boost overrides the throttle. - */ - if (p->dl.dl_throttled) { - /* - * The replenish timer needs to be canceled. No - * problem if it fires concurrently: boosted threads - * are ignored in dl_task_timer(). - */ - hrtimer_try_to_cancel(&p->dl.dl_timer); - p->dl.dl_throttled = 0; - } } else if (!dl_prio(p->normal_prio)) { /* - * Special case in which we have a !SCHED_DEADLINE task that is going - * to be deboosted, but exceeds its runtime while doing so. No point in - * replenishing it, as it's going to return back to its original - * scheduling class after this. If it has been throttled, we need to - * clear the flag, otherwise the task may wake up as throttled after - * being boosted again with no means to replenish the runtime and clear - * the throttle. + * Special case in which we have a !SCHED_DEADLINE task + * that is going to be deboosted, but exceeds its + * runtime while doing so. No point in replenishing + * it, as it's going to return back to its original + * scheduling class after this. */ - p->dl.dl_throttled = 0; BUG_ON(!p->dl.dl_boosted || flags != ENQUEUE_REPLENISH); return; } @@ -1787,7 +1763,8 @@ static void set_next_task_dl(struct rq *rq, struct task_struct *p, bool first) deadline_queue_push_tasks(rq); } -static struct sched_dl_entity *pick_next_dl_entity(struct dl_rq *dl_rq) +static struct sched_dl_entity *pick_next_dl_entity(struct rq *rq, + struct dl_rq *dl_rq) { struct rb_node *left = rb_first_cached(&dl_rq->root); @@ -1809,7 +1786,7 @@ pick_next_task_dl(struct rq *rq, struct task_struct *prev, struct rq_flags *rf) if (!sched_dl_runnable(rq)) return NULL; - dl_se = pick_next_dl_entity(dl_rq); + dl_se = pick_next_dl_entity(rq, dl_rq); BUG_ON(!dl_se); p = dl_task_of(dl_se); set_next_task_dl(rq, p, true);
diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 4c95035..98a64ca 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c
@@ -3905,29 +3905,6 @@ static void check_spread(struct cfs_rq *cfs_rq, struct sched_entity *se) #endif } -static inline bool entity_is_long_sleeper(struct sched_entity *se) -{ - struct cfs_rq *cfs_rq; - u64 sleep_time; - - if (se->exec_start == 0) - return false; - - cfs_rq = cfs_rq_of(se); - - sleep_time = rq_clock_task(rq_of(cfs_rq)); - - /* Happen while migrating because of clock task divergence */ - if (sleep_time <= se->exec_start) - return false; - - sleep_time -= se->exec_start; - if (sleep_time > ((1ULL << 63) / scale_load_down(NICE_0_LOAD))) - return true; - - return false; -} - static void place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) { @@ -3956,29 +3933,8 @@ place_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int initial) vruntime -= thresh; } - /* - * Pull vruntime of the entity being placed to the base level of - * cfs_rq, to prevent boosting it if placed backwards. - * However, min_vruntime can advance much faster than real time, with - * the extreme being when an entity with the minimal weight always runs - * on the cfs_rq. If the waking entity slept for a long time, its - * vruntime difference from min_vruntime may overflow s64 and their - * comparison may get inversed, so ignore the entity's original - * vruntime in that case. - * The maximal vruntime speedup is given by the ratio of normal to - * minimal weight: scale_load_down(NICE_0_LOAD) / MIN_SHARES. - * When placing a migrated waking entity, its exec_start has been set - * from a different rq. In order to take into account a possible - * divergence between new and prev rq's clocks task because of irq and - * stolen time, we take an additional margin. - * So, cutting off on the sleep time of - * 2^63 / scale_load_down(NICE_0_LOAD) ~ 104 days - * should be safe. - */ - if (entity_is_long_sleeper(se)) - se->vruntime = vruntime; - else - se->vruntime = max_vruntime(se->vruntime, vruntime); + /* ensure we never gain time by being placed backwards. */ + se->vruntime = max_vruntime(se->vruntime, vruntime); } static void check_enqueue_throttle(struct cfs_rq *cfs_rq); @@ -4074,9 +4030,6 @@ enqueue_entity(struct cfs_rq *cfs_rq, struct sched_entity *se, int flags) if (flags & ENQUEUE_WAKEUP) place_entity(cfs_rq, se, 0); - /* Entity has migrated, no longer consider this task hot */ - if (flags & ENQUEUE_MIGRATED) - se->exec_start = 0; check_schedstat_required(); update_stats_enqueue(cfs_rq, se, flags); @@ -6819,6 +6772,9 @@ static void migrate_task_rq_fair(struct task_struct *p, int new_cpu) /* Tell new CPU we are migrated */ p->se.avg.last_update_time = 0; + /* We have migrated, no longer consider this task hot */ + p->se.exec_start = 0; + update_scan_period(p, new_cpu); }
diff --git a/kernel/sched/psi.c b/kernel/sched/psi.c index 00d1c88..d30ea9d 100644 --- a/kernel/sched/psi.c +++ b/kernel/sched/psi.c
@@ -1115,11 +1115,10 @@ void psi_trigger_destroy(struct psi_trigger *t) group = t->group; /* - * Wakeup waiters to stop polling and clear the queue to prevent it from - * being accessed later. Can happen if cgroup is deleted from under a - * polling process. + * Wakeup waiters to stop polling. Can happen if cgroup is deleted + * from under a polling process. */ - wake_up_pollfree(&t->event_wait); + wake_up_interruptible(&t->event_wait); mutex_lock(&group->trigger_lock);
diff --git a/kernel/sched/rt.c b/kernel/sched/rt.c index 7e93330..749dcc4 100644 --- a/kernel/sched/rt.c +++ b/kernel/sched/rt.c
@@ -443,7 +443,7 @@ static inline void rt_queue_push_tasks(struct rq *rq) #endif /* CONFIG_SMP */ static void enqueue_top_rt_rq(struct rt_rq *rt_rq); -static void dequeue_top_rt_rq(struct rt_rq *rt_rq, unsigned int count); +static void dequeue_top_rt_rq(struct rt_rq *rt_rq); static inline int on_rt_rq(struct sched_rt_entity *rt_se) { @@ -564,7 +564,7 @@ static void sched_rt_rq_dequeue(struct rt_rq *rt_rq) rt_se = rt_rq->tg->rt_se[cpu]; if (!rt_se) { - dequeue_top_rt_rq(rt_rq, rt_rq->rt_nr_running); + dequeue_top_rt_rq(rt_rq); /* Kick cpufreq (see the comment in kernel/sched/sched.h). */ cpufreq_update_util(rq_of_rt_rq(rt_rq), 0); } @@ -650,7 +650,7 @@ static inline void sched_rt_rq_enqueue(struct rt_rq *rt_rq) static inline void sched_rt_rq_dequeue(struct rt_rq *rt_rq) { - dequeue_top_rt_rq(rt_rq, rt_rq->rt_nr_running); + dequeue_top_rt_rq(rt_rq); } static inline int rt_rq_throttled(struct rt_rq *rt_rq) @@ -1065,7 +1065,7 @@ static void update_curr_rt(struct rq *rq) } static void -dequeue_top_rt_rq(struct rt_rq *rt_rq, unsigned int count) +dequeue_top_rt_rq(struct rt_rq *rt_rq) { struct rq *rq = rq_of_rt_rq(rt_rq); @@ -1076,7 +1076,7 @@ dequeue_top_rt_rq(struct rt_rq *rt_rq, unsigned int count) BUG_ON(!rq->nr_running); - sub_nr_running(rq, count); + sub_nr_running(rq, rt_rq->rt_nr_running); rt_rq->rt_queued = 0; } @@ -1355,21 +1355,18 @@ static void __dequeue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flag static void dequeue_rt_stack(struct sched_rt_entity *rt_se, unsigned int flags) { struct sched_rt_entity *back = NULL; - unsigned int rt_nr_running; for_each_sched_rt_entity(rt_se) { rt_se->back = back; back = rt_se; } - rt_nr_running = rt_rq_of_se(back)->rt_nr_running; + dequeue_top_rt_rq(rt_rq_of_se(back)); for (rt_se = back; rt_se; rt_se = rt_se->back) { if (on_rt_rq(rt_se)) __dequeue_rt_entity(rt_se, flags); } - - dequeue_top_rt_rq(rt_rq_of_se(back), rt_nr_running); } static void enqueue_rt_entity(struct sched_rt_entity *rt_se, unsigned int flags) @@ -1633,7 +1630,8 @@ static inline void set_next_task_rt(struct rq *rq, struct task_struct *p, bool f rt_queue_push_tasks(rq); } -static struct sched_rt_entity *pick_next_rt_entity(struct rt_rq *rt_rq) +static struct sched_rt_entity *pick_next_rt_entity(struct rq *rq, + struct rt_rq *rt_rq) { struct rt_prio_array *array = &rt_rq->active; struct sched_rt_entity *next = NULL; @@ -1644,8 +1642,6 @@ static struct sched_rt_entity *pick_next_rt_entity(struct rt_rq *rt_rq) BUG_ON(idx >= MAX_RT_PRIO); queue = array->queue + idx; - if (SCHED_WARN_ON(list_empty(queue))) - return NULL; next = list_entry(queue->next, struct sched_rt_entity, run_list); return next; @@ -1657,9 +1653,8 @@ static struct task_struct *_pick_next_task_rt(struct rq *rq) struct rt_rq *rt_rq = &rq->rt; do { - rt_se = pick_next_rt_entity(rt_rq); - if (unlikely(!rt_se)) - return NULL; + rt_se = pick_next_rt_entity(rq, rt_rq); + BUG_ON(!rt_se); rt_rq = group_rt_rq(rt_se); } while (rt_rq);
diff --git a/kernel/sys.c b/kernel/sys.c index 125edee..0394658 100644 --- a/kernel/sys.c +++ b/kernel/sys.c
@@ -1538,8 +1538,6 @@ int do_prlimit(struct task_struct *tsk, unsigned int resource, if (resource >= RLIM_NLIMITS) return -EINVAL; - resource = array_index_nospec(resource, RLIM_NLIMITS); - if (new_rlim) { if (new_rlim->rlim_cur > new_rlim->rlim_max) return -EINVAL;
diff --git a/kernel/sys_ni.c b/kernel/sys_ni.c index 9925446..8159cdb 100644 --- a/kernel/sys_ni.c +++ b/kernel/sys_ni.c
@@ -268,7 +268,6 @@ COND_SYSCALL_COMPAT(keyctl); /* mm/fadvise.c */ COND_SYSCALL(fadvise64_64); -COND_SYSCALL_COMPAT(fadvise64_64); /* mm/, CONFIG_MMU only */ COND_SYSCALL(swapon);
diff --git a/kernel/sysctl.c b/kernel/sysctl.c index b227231..785928c 100644 --- a/kernel/sysctl.c +++ b/kernel/sysctl.c
@@ -2173,14 +2173,13 @@ int proc_dostring(struct ctl_table *table, int write, (char __user *)buffer, lenp, ppos); } -static void proc_skip_spaces(char **buf, size_t *size) +static size_t proc_skip_spaces(char **buf) { - while (*size) { - if (!isspace(**buf)) - break; - (*size)--; - (*buf)++; - } + size_t ret; + char *tmp = skip_spaces(*buf); + ret = tmp - *buf; + *buf = tmp; + return ret; } static void proc_skip_char(char **buf, size_t *size, const char v) @@ -2249,12 +2248,13 @@ static int proc_get_long(char **buf, size_t *size, unsigned long *val, bool *neg, const char *perm_tr, unsigned perm_tr_len, char *tr) { + int len; char *p, tmp[TMPBUFLEN]; - ssize_t len = *size; - if (len <= 0) + if (!*size) return -EINVAL; + len = *size; if (len > TMPBUFLEN - 1) len = TMPBUFLEN - 1; @@ -2417,7 +2417,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, bool neg; if (write) { - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); if (!left) break; @@ -2448,7 +2448,7 @@ static int __do_proc_dointvec(void *tbl_data, struct ctl_table *table, if (!write && !first && left && !err) err = proc_put_char(&buffer, &left, '\n'); if (write && !err && left) - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); if (write) { kfree(kbuf); if (first) @@ -2497,7 +2497,7 @@ static int do_proc_douintvec_w(unsigned int *tbl_data, if (IS_ERR(kbuf)) return -EINVAL; - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); if (!left) { err = -EINVAL; goto out_free; @@ -2517,7 +2517,7 @@ static int do_proc_douintvec_w(unsigned int *tbl_data, } if (!err && left) - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); out_free: kfree(kbuf); @@ -2931,7 +2931,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int if (write) { bool neg; - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); if (!left) break; @@ -2964,7 +2964,7 @@ static int __do_proc_doulongvec_minmax(void *data, struct ctl_table *table, int if (!write && !first && left && !err) err = proc_put_char(&buffer, &left, '\n'); if (write && !err) - proc_skip_spaces(&p, &left); + left -= proc_skip_spaces(&p); if (write) { kfree(kbuf); if (first)
diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c index 9bd4e49..0e96c38 100644 --- a/kernel/time/alarmtimer.c +++ b/kernel/time/alarmtimer.c
@@ -479,35 +479,11 @@ u64 alarm_forward(struct alarm *alarm, ktime_t now, ktime_t interval) } EXPORT_SYMBOL_GPL(alarm_forward); -static u64 __alarm_forward_now(struct alarm *alarm, ktime_t interval, bool throttle) -{ - struct alarm_base *base = &alarm_bases[alarm->type]; - ktime_t now = base->gettime(); - - if (IS_ENABLED(CONFIG_HIGH_RES_TIMERS) && throttle) { - /* - * Same issue as with posix_timer_fn(). Timers which are - * periodic but the signal is ignored can starve the system - * with a very small interval. The real fix which was - * promised in the context of posix_timer_fn() never - * materialized, but someone should really work on it. - * - * To prevent DOS fake @now to be 1 jiffie out which keeps - * the overrun accounting correct but creates an - * inconsistency vs. timer_gettime(2). - */ - ktime_t kj = NSEC_PER_SEC / HZ; - - if (interval < kj) - now = ktime_add(now, kj); - } - - return alarm_forward(alarm, now, interval); -} - u64 alarm_forward_now(struct alarm *alarm, ktime_t interval) { - return __alarm_forward_now(alarm, interval, false); + struct alarm_base *base = &alarm_bases[alarm->type]; + + return alarm_forward(alarm, base->gettime(), interval); } EXPORT_SYMBOL_GPL(alarm_forward_now); @@ -581,10 +557,9 @@ static enum alarmtimer_restart alarm_handle_timer(struct alarm *alarm, if (posix_timer_event(ptr, si_private) && ptr->it_interval) { /* * Handle ignored signals and rearm the timer. This will go - * away once we handle ignored signals proper. Ensure that - * small intervals cannot starve the system. + * away once we handle ignored signals proper. */ - ptr->it_overrun += __alarm_forward_now(alarm, ptr->it_interval, true); + ptr->it_overrun += alarm_forward_now(alarm, ptr->it_interval); ++ptr->it_requeue_pending; ptr->it_active = 1; result = ALARMTIMER_RESTART;
diff --git a/kernel/time/hrtimer.c b/kernel/time/hrtimer.c index b621314..e91b5dc 100644 --- a/kernel/time/hrtimer.c +++ b/kernel/time/hrtimer.c
@@ -2020,7 +2020,6 @@ SYSCALL_DEFINE2(nanosleep, struct __kernel_timespec __user *, rqtp, if (!timespec64_valid(&tu)) return -EINVAL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE; current->restart_block.nanosleep.rmtp = rmtp; return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC); @@ -2041,7 +2040,6 @@ SYSCALL_DEFINE2(nanosleep_time32, struct old_timespec32 __user *, rqtp, if (!timespec64_valid(&tu)) return -EINVAL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE; current->restart_block.nanosleep.compat_rmtp = rmtp; return hrtimer_nanosleep(&tu, HRTIMER_MODE_REL, CLOCK_MONOTONIC);
diff --git a/kernel/time/posix-stubs.c b/kernel/time/posix-stubs.c index 8ddb35d..67df65f 100644 --- a/kernel/time/posix-stubs.c +++ b/kernel/time/posix-stubs.c
@@ -142,7 +142,6 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, return -EINVAL; if (flags & TIMER_ABSTIME) rmtp = NULL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE; current->restart_block.nanosleep.rmtp = rmtp; return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ? @@ -229,7 +228,6 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, return -EINVAL; if (flags & TIMER_ABSTIME) rmtp = NULL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE; current->restart_block.nanosleep.compat_rmtp = rmtp; return hrtimer_nanosleep(&t, flags & TIMER_ABSTIME ?
diff --git a/kernel/time/posix-timers.c b/kernel/time/posix-timers.c index efe3873..97d4a9d 100644 --- a/kernel/time/posix-timers.c +++ b/kernel/time/posix-timers.c
@@ -1224,7 +1224,6 @@ SYSCALL_DEFINE4(clock_nanosleep, const clockid_t, which_clock, int, flags, return -EINVAL; if (flags & TIMER_ABSTIME) rmtp = NULL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_NATIVE : TT_NONE; current->restart_block.nanosleep.rmtp = rmtp; @@ -1252,7 +1251,6 @@ SYSCALL_DEFINE4(clock_nanosleep_time32, clockid_t, which_clock, int, flags, return -EINVAL; if (flags & TIMER_ABSTIME) rmtp = NULL; - current->restart_block.fn = do_no_restart_syscall; current->restart_block.nanosleep.type = rmtp ? TT_COMPAT : TT_NONE; current->restart_block.nanosleep.compat_rmtp = rmtp;
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index 2bc278d..e23c9e7 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c
@@ -23,7 +23,6 @@ #include <linux/pvclock_gtod.h> #include <linux/compiler.h> #include <linux/audit.h> -#include <linux/random.h> #include "tick-internal.h" #include "ntp_internal.h" @@ -1257,10 +1256,8 @@ int do_settimeofday64(const struct timespec64 *ts) /* signal hrtimers about time change */ clock_was_set(); - if (!ret) { + if (!ret) audit_tk_injoffset(ts_delta); - add_device_randomness(ts, sizeof(*ts)); - } return ret; } @@ -2339,7 +2336,6 @@ int do_adjtimex(struct __kernel_timex *txc) ret = timekeeping_validate_timex(txc); if (ret) return ret; - add_device_randomness(txc, sizeof(*txc)); if (txc->modes & ADJ_SETOFFSET) { struct timespec64 delta; @@ -2357,7 +2353,6 @@ int do_adjtimex(struct __kernel_timex *txc) audit_ntp_init(&ad); ktime_get_real_ts64(&ts); - add_device_randomness(&ts, sizeof(ts)); raw_spin_lock_irqsave(&timekeeper_lock, flags); write_seqcount_begin(&tk_core.seq);
diff --git a/kernel/trace/blktrace.c b/kernel/trace/blktrace.c index abf5cbb..749b278 100644 --- a/kernel/trace/blktrace.c +++ b/kernel/trace/blktrace.c
@@ -1589,8 +1589,7 @@ blk_trace_event_print_binary(struct trace_iterator *iter, int flags, static enum print_line_t blk_tracer_print_line(struct trace_iterator *iter) { - if ((iter->ent->type != TRACE_BLK) || - !(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC)) + if (!(blk_tracer_flags.val & TRACE_BLK_OPT_CLASSIC)) return TRACE_TYPE_UNHANDLED; return print_one_line(iter, true);
diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 6aef239..45abbde 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c
@@ -649,9 +649,6 @@ BPF_CALL_1(bpf_send_signal, u32, sig) return -EPERM; if (unlikely(!nmi_uaccess_okay())) return -EPERM; - /* Task should not be pid=1 to avoid kernel panic. */ - if (unlikely(is_global_init(current))) - return -EPERM; if (irqs_disabled()) { /* Do an early check on signal validity. Otherwise,
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index f0b3392..5bb15ec 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c
@@ -1307,7 +1307,6 @@ static int ftrace_add_mod(struct trace_array *tr, if (!ftrace_mod) return -ENOMEM; - INIT_LIST_HEAD(&ftrace_mod->list); ftrace_mod->func = kstrdup(func, GFP_KERNEL); ftrace_mod->module = kstrdup(module, GFP_KERNEL); ftrace_mod->enable = enable; @@ -1557,8 +1556,7 @@ unsigned long ftrace_location_range(unsigned long start, unsigned long end) key.flags = end; /* overload flags, as it is unsigned long */ for (pg = ftrace_pages_start; pg; pg = pg->next) { - if (pg->index == 0 || - end < pg->records[0].ip || + if (end < pg->records[0].ip || start >= (pg->records[pg->index - 1].ip + MCOUNT_INSN_SIZE)) continue; rec = bsearch(&key, pg->records, pg->index, @@ -2734,16 +2732,6 @@ int ftrace_startup(struct ftrace_ops *ops, int command) ftrace_startup_enable(command); - /* - * If ftrace is in an undefined state, we just remove ops from list - * to prevent the NULL pointer, instead of totally rolling it back and - * free trampoline, because those actions could cause further damage. - */ - if (unlikely(ftrace_disabled)) { - __unregister_ftrace_function(ops); - return -ENODEV; - } - ops->flags &= ~FTRACE_OPS_FL_ADDING; return 0; @@ -3019,7 +3007,7 @@ static int ftrace_allocate_records(struct ftrace_page *pg, int count) /* if we can't allocate this size, try something smaller */ if (!order) return -ENOMEM; - order--; + order >>= 1; goto again; } @@ -5086,12 +5074,8 @@ int ftrace_regex_release(struct inode *inode, struct file *file) if (filter_hash) { orig_hash = &iter->ops->func_hash->filter_hash; - if (iter->tr) { - if (list_empty(&iter->tr->mod_trace)) - iter->hash->flags &= ~FTRACE_HASH_FL_MOD; - else - iter->hash->flags |= FTRACE_HASH_FL_MOD; - } + if (iter->tr && !list_empty(&iter->tr->mod_trace)) + iter->hash->flags |= FTRACE_HASH_FL_MOD; } else orig_hash = &iter->ops->func_hash->notrace_hash; @@ -6261,7 +6245,7 @@ void __init ftrace_init(void) } pr_info("ftrace: allocating %ld entries in %ld pages\n", - count, DIV_ROUND_UP(count, ENTRIES_PER_PAGE)); + count, count / ENTRIES_PER_PAGE + 1); last_ftrace_enabled = ftrace_enabled = 1;
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 8fb0d86..5e1b9f6 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c
@@ -477,7 +477,6 @@ struct ring_buffer_per_cpu { local_t committing; local_t commits; local_t pages_touched; - local_t pages_lost; local_t pages_read; long last_pages_touch; size_t shortest_full; @@ -545,18 +544,10 @@ size_t ring_buffer_nr_pages(struct ring_buffer *buffer, int cpu) size_t ring_buffer_nr_dirty_pages(struct ring_buffer *buffer, int cpu) { size_t read; - size_t lost; size_t cnt; read = local_read(&buffer->buffers[cpu]->pages_read); - lost = local_read(&buffer->buffers[cpu]->pages_lost); cnt = local_read(&buffer->buffers[cpu]->pages_touched); - - if (WARN_ON_ONCE(cnt < lost)) - return 0; - - cnt -= lost; - /* The reader can read an empty page, but not more than that */ if (cnt < read) { WARN_ON_ONCE(read > cnt + 1); @@ -577,9 +568,8 @@ static void rb_wake_up_waiters(struct irq_work *work) struct rb_irq_work *rbwork = container_of(work, struct rb_irq_work, work); wake_up_all(&rbwork->waiters); - if (rbwork->full_waiters_pending || rbwork->wakeup_full) { + if (rbwork->wakeup_full) { rbwork->wakeup_full = false; - rbwork->full_waiters_pending = false; wake_up_all(&rbwork->full_waiters); } } @@ -672,7 +662,7 @@ int ring_buffer_wait(struct ring_buffer *buffer, int cpu, int full) nr_pages = cpu_buffer->nr_pages; dirty = ring_buffer_nr_dirty_pages(buffer, cpu); if (!cpu_buffer->shortest_full || - cpu_buffer->shortest_full > full) + cpu_buffer->shortest_full < full) cpu_buffer->shortest_full = full; raw_spin_unlock_irqrestore(&cpu_buffer->reader_lock, flags); if (!pagebusy && @@ -1371,9 +1361,9 @@ static void rb_free_cpu_buffer(struct ring_buffer_per_cpu *cpu_buffer) free_buffer_page(cpu_buffer->reader_page); - if (head) { - rb_head_page_deactivate(cpu_buffer); + rb_head_page_deactivate(cpu_buffer); + if (head) { list_for_each_entry_safe(bpage, tmp, head, list) { list_del_init(&bpage->list); free_buffer_page(bpage); @@ -1608,7 +1598,6 @@ rb_remove_pages(struct ring_buffer_per_cpu *cpu_buffer, unsigned long nr_pages) */ local_add(page_entries, &cpu_buffer->overrun); local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); - local_inc(&cpu_buffer->pages_lost); } /* @@ -2033,7 +2022,6 @@ rb_handle_head_page(struct ring_buffer_per_cpu *cpu_buffer, */ local_add(entries, &cpu_buffer->overrun); local_sub(BUF_PAGE_SIZE, &cpu_buffer->entries_bytes); - local_inc(&cpu_buffer->pages_lost); /* * The entries will be zeroed out when we move the @@ -2202,9 +2190,6 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, /* Mark the rest of the page with padding */ rb_event_set_padding(event); - /* Make sure the padding is visible before the write update */ - smp_wmb(); - /* Set the write back to the previous setting */ local_sub(length, &tail_page->write); return; @@ -2216,9 +2201,6 @@ rb_reset_tail(struct ring_buffer_per_cpu *cpu_buffer, /* time delta must be non zero */ event->time_delta = 1; - /* Make sure the padding is visible before the tail_page->write update */ - smp_wmb(); - /* Set write to end of buffer */ length = (tail + length) - BUF_PAGE_SIZE; local_sub(length, &tail_page->write); @@ -2508,10 +2490,6 @@ rb_set_commit_to_write(struct ring_buffer_per_cpu *cpu_buffer) if (RB_WARN_ON(cpu_buffer, rb_is_reader_page(cpu_buffer->tail_page))) return; - /* - * No need for a memory barrier here, as the update - * of the tail_page did it for this page. - */ local_set(&cpu_buffer->commit_page->page->commit, rb_page_write(cpu_buffer->commit_page)); rb_inc_page(cpu_buffer, &cpu_buffer->commit_page); @@ -2525,8 +2503,6 @@ rb_set_commit_to_write(struct ring_buffer_per_cpu *cpu_buffer) while (rb_commit_index(cpu_buffer) != rb_page_write(cpu_buffer->commit_page)) { - /* Make sure the readers see the content of what is committed. */ - smp_wmb(); local_set(&cpu_buffer->commit_page->page->commit, rb_page_write(cpu_buffer->commit_page)); RB_WARN_ON(cpu_buffer, @@ -3887,38 +3863,6 @@ rb_get_reader_page(struct ring_buffer_per_cpu *cpu_buffer) arch_spin_unlock(&cpu_buffer->lock); local_irq_restore(flags); - /* - * The writer has preempt disable, wait for it. But not forever - * Although, 1 second is pretty much "forever" - */ -#define USECS_WAIT 1000000 - for (nr_loops = 0; nr_loops < USECS_WAIT; nr_loops++) { - /* If the write is past the end of page, a writer is still updating it */ - if (likely(!reader || rb_page_write(reader) <= BUF_PAGE_SIZE)) - break; - - udelay(1); - - /* Get the latest version of the reader write value */ - smp_rmb(); - } - - /* The writer is not moving forward? Something is wrong */ - if (RB_WARN_ON(cpu_buffer, nr_loops == USECS_WAIT)) - reader = NULL; - - /* - * Make sure we see any padding after the write update - * (see rb_reset_tail()). - * - * In addition, a writer may be writing on the reader page - * if the page has not been fully filled, so the read barrier - * is also needed to make sure we see the content of what is - * committed by the writer (see rb_set_commit_to_write()). - */ - smp_rmb(); - - return reader; } @@ -4497,7 +4441,6 @@ rb_reset_cpu(struct ring_buffer_per_cpu *cpu_buffer) local_set(&cpu_buffer->committing, 0); local_set(&cpu_buffer->commits, 0); local_set(&cpu_buffer->pages_touched, 0); - local_set(&cpu_buffer->pages_lost, 0); local_set(&cpu_buffer->pages_read, 0); cpu_buffer->last_pages_touch = 0; cpu_buffer->shortest_full = 0; @@ -4763,16 +4706,11 @@ EXPORT_SYMBOL_GPL(ring_buffer_alloc_read_page); */ void ring_buffer_free_read_page(struct ring_buffer *buffer, int cpu, void *data) { - struct ring_buffer_per_cpu *cpu_buffer; + struct ring_buffer_per_cpu *cpu_buffer = buffer->buffers[cpu]; struct buffer_data_page *bpage = data; struct page *page = virt_to_page(bpage); unsigned long flags; - if (!buffer || !buffer->buffers || !buffer->buffers[cpu]) - return; - - cpu_buffer = buffer->buffers[cpu]; - /* If the page is still in use someplace else, we can't reuse it */ if (page_ref_count(page) > 1) goto out; @@ -4887,15 +4825,7 @@ int ring_buffer_read_page(struct ring_buffer *buffer, unsigned int pos = 0; unsigned int size; - /* - * If a full page is expected, this can still be returned - * if there's been a previous partial read and the - * rest of the page can be read and the commit page is off - * the reader page. - */ - if (full && - (!read || (len < (commit - read)) || - cpu_buffer->reader_page == cpu_buffer->commit_page)) + if (full) goto out_unlock; if (len > (commit - read))
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 58765ff..8dc6a87 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c
@@ -1015,14 +1015,12 @@ void *tracing_cond_snapshot_data(struct trace_array *tr) { void *cond_data = NULL; - local_irq_disable(); arch_spin_lock(&tr->max_lock); if (tr->cond_snapshot) cond_data = tr->cond_snapshot->cond_data; arch_spin_unlock(&tr->max_lock); - local_irq_enable(); return cond_data; } @@ -1158,11 +1156,9 @@ int tracing_snapshot_cond_enable(struct trace_array *tr, void *cond_data, goto fail_unlock; } - local_irq_disable(); arch_spin_lock(&tr->max_lock); tr->cond_snapshot = cond_snapshot; arch_spin_unlock(&tr->max_lock); - local_irq_enable(); mutex_unlock(&trace_types_lock); @@ -1189,7 +1185,6 @@ int tracing_snapshot_cond_disable(struct trace_array *tr) { int ret = 0; - local_irq_disable(); arch_spin_lock(&tr->max_lock); if (!tr->cond_snapshot) @@ -1200,7 +1195,6 @@ int tracing_snapshot_cond_disable(struct trace_array *tr) } arch_spin_unlock(&tr->max_lock); - local_irq_enable(); return ret; } @@ -1957,11 +1951,6 @@ static size_t tgid_map_max; #define SAVED_CMDLINES_DEFAULT 128 #define NO_CMDLINE_MAP UINT_MAX -/* - * Preemption must be disabled before acquiring trace_cmdline_lock. - * The various trace_arrays' max_lock must be acquired in a context - * where interrupt is disabled. - */ static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED; struct saved_cmdlines_buffer { unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1]; @@ -2174,9 +2163,6 @@ static int trace_save_cmdline(struct task_struct *tsk) * the lock, but we also don't want to spin * nor do we want to disable interrupts, * so if we miss here, then better luck next time. - * - * This is called within the scheduler and wake up, so interrupts - * had better been disabled and run queue lock been held. */ if (!arch_spin_trylock(&trace_cmdline_lock)) return 0; @@ -5257,11 +5243,9 @@ tracing_saved_cmdlines_size_read(struct file *filp, char __user *ubuf, char buf[64]; int r; - preempt_disable(); arch_spin_lock(&trace_cmdline_lock); r = scnprintf(buf, sizeof(buf), "%u\n", savedcmd->cmdline_num); arch_spin_unlock(&trace_cmdline_lock); - preempt_enable(); return simple_read_from_buffer(ubuf, cnt, ppos, buf, r); } @@ -5286,12 +5270,10 @@ static int tracing_resize_saved_cmdlines(unsigned int val) return -ENOMEM; } - preempt_disable(); arch_spin_lock(&trace_cmdline_lock); savedcmd_temp = savedcmd; savedcmd = s; arch_spin_unlock(&trace_cmdline_lock); - preempt_enable(); free_saved_cmdlines_buffer(savedcmd_temp); return 0; @@ -5746,12 +5728,10 @@ static int tracing_set_tracer(struct trace_array *tr, const char *buf) #ifdef CONFIG_TRACER_SNAPSHOT if (t->use_max_tr) { - local_irq_disable(); arch_spin_lock(&tr->max_lock); if (tr->cond_snapshot) ret = -EBUSY; arch_spin_unlock(&tr->max_lock); - local_irq_enable(); if (ret) goto out; } @@ -6145,20 +6125,7 @@ tracing_read_pipe(struct file *filp, char __user *ubuf, ret = print_trace_line(iter); if (ret == TRACE_TYPE_PARTIAL_LINE) { - /* - * If one print_trace_line() fills entire trace_seq in one shot, - * trace_seq_to_user() will returns -EBUSY because save_len == 0, - * In this case, we need to consume it, otherwise, loop will peek - * this event next time, resulting in an infinite loop. - */ - if (save_len == 0) { - iter->seq.full = 0; - trace_seq_puts(&iter->seq, "[LINE TOO BIG]\n"); - trace_consume(iter); - break; - } - - /* In other cases, don't print partial lines */ + /* don't print partial lines */ iter->seq.seq.len = save_len; break; } @@ -6844,12 +6811,10 @@ tracing_snapshot_write(struct file *filp, const char __user *ubuf, size_t cnt, goto out; } - local_irq_disable(); arch_spin_lock(&tr->max_lock); if (tr->cond_snapshot) ret = -EBUSY; arch_spin_unlock(&tr->max_lock); - local_irq_enable(); if (ret) goto out; @@ -8342,6 +8307,9 @@ buffer_percent_write(struct file *filp, const char __user *ubuf, if (val > 100) return -EINVAL; + if (!val) + val = 1; + tr->buffer_percent = val; (*ppos)++; @@ -8586,7 +8554,6 @@ static int __remove_instance(struct trace_array *tr) ftrace_destroy_function_files(tr); tracefs_remove_recursive(tr->dir); free_trace_buffers(tr); - clear_tracing_err_log(tr); for (i = 0; i < tr->nr_topts; i++) { kfree(tr->topts[i].topts); @@ -9361,8 +9328,6 @@ void __init early_trace_init(void) static_key_enable(&tracepoint_printk_key.key); } tracer_alloc_buffers(); - - init_events(); } void __init trace_init(void)
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 5bd8ba0..dead0a5 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h
@@ -1589,7 +1589,6 @@ extern void trace_event_enable_cmd_record(bool enable); extern void trace_event_enable_tgid_record(bool enable); extern int event_trace_init(void); -extern int init_events(void); extern int event_trace_add_tracer(struct dentry *parent, struct trace_array *tr); extern int event_trace_del_tracer(struct trace_array *tr);
diff --git a/kernel/trace/trace_dynevent.c b/kernel/trace/trace_dynevent.c index 2dafeab..89779eb 100644 --- a/kernel/trace/trace_dynevent.c +++ b/kernel/trace/trace_dynevent.c
@@ -70,7 +70,6 @@ int dyn_event_release(int argc, char **argv, struct dyn_event_operations *type) if (ret) break; } - tracing_reset_all_online_cpus(); mutex_unlock(&event_mutex); return ret; @@ -166,7 +165,6 @@ int dyn_events_release_all(struct dyn_event_operations *type) break; } out: - tracing_reset_all_online_cpus(); mutex_unlock(&event_mutex); return ret;
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 8f2cbc9..4acc77e 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c
@@ -166,7 +166,6 @@ static int trace_define_generic_fields(void) __generic_field(int, CPU, FILTER_CPU); __generic_field(int, cpu, FILTER_CPU); - __generic_field(int, common_cpu, FILTER_CPU); __generic_field(char *, COMM, FILTER_COMM); __generic_field(char *, comm, FILTER_COMM); @@ -2351,10 +2350,7 @@ static int probe_remove_event_call(struct trace_event_call *call) * TRACE_REG_UNREGISTER. */ if (file->flags & EVENT_FILE_FL_ENABLED) - goto busy; - - if (file->flags & EVENT_FILE_FL_WAS_ENABLED) - tr->clear_trace = true; + return -EBUSY; /* * The do_for_each_event_file_safe() is * a double loop. After finding the call for this @@ -2367,12 +2363,6 @@ static int probe_remove_event_call(struct trace_event_call *call) __trace_remove_event_call(call); return 0; - busy: - /* No need to clear the trace now */ - list_for_each_entry(tr, &ftrace_trace_arrays, list) { - tr->clear_trace = false; - } - return -EBUSY; } /* Remove an event_call */
diff --git a/kernel/trace/trace_events_hist.c b/kernel/trace/trace_events_hist.c index 3cb937c..b8f1f0e 100644 --- a/kernel/trace/trace_events_hist.c +++ b/kernel/trace/trace_events_hist.c
@@ -479,7 +479,7 @@ struct action_data { * event param, and is passed to the synthetic event * invocation. */ - unsigned int var_ref_idx[SYNTH_FIELDS_MAX]; + unsigned int var_ref_idx[TRACING_MAP_VARS_MAX]; struct synth_event *synth_event; bool use_trace_keyword; char *synth_event_name; @@ -1996,9 +1996,6 @@ static const char *hist_field_name(struct hist_field *field, { const char *field_name = ""; - if (WARN_ON_ONCE(!field)) - return field_name; - if (level > 1) return field_name; @@ -2555,8 +2552,6 @@ static struct hist_field *create_hist_field(struct hist_trigger_data *hist_data, unsigned long fl = flags & ~HIST_FIELD_FL_LOG2; hist_field->fn = hist_field_log2; hist_field->operands[0] = create_hist_field(hist_data, field, fl, NULL); - if (!hist_field->operands[0]) - goto free; hist_field->size = hist_field->operands[0]->size; hist_field->type = kstrdup(hist_field->operands[0]->type, GFP_KERNEL); if (!hist_field->type) @@ -2757,9 +2752,7 @@ static struct hist_field *create_var_ref(struct hist_trigger_data *hist_data, return ref_field; } } - /* Sanity check to avoid out-of-bound write on 'hist_data->var_refs' */ - if (hist_data->n_var_refs >= TRACING_MAP_VARS_MAX) - return NULL; + ref_field = create_hist_field(var_field->hist_data, NULL, flags, NULL); if (ref_field) { if (init_var_ref(ref_field, var_field, system, event_name)) { @@ -4021,7 +4014,6 @@ static int parse_action_params(struct trace_array *tr, char *params, while (params) { if (data->n_params >= SYNTH_FIELDS_MAX) { hist_err(tr, HIST_ERR_TOO_MANY_PARAMS, 0); - ret = -EINVAL; goto out; } @@ -4346,10 +4338,6 @@ static int trace_action_create(struct hist_trigger_data *hist_data, lockdep_assert_held(&event_mutex); - /* Sanity check to avoid out-of-bound write on 'data->var_ref_idx' */ - if (data->n_params > SYNTH_FIELDS_MAX) - return -EINVAL; - if (data->use_trace_keyword) synth_event_name = data->synth_event_name; else @@ -6445,7 +6433,7 @@ static int event_hist_trigger_func(struct event_command *cmd_ops, /* Just return zero, not the number of registered triggers */ ret = 0; out: - if (ret == 0 && glob[0]) + if (ret == 0) hist_err_clear(); return ret;
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index b194dd1..a0a4590 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c
@@ -1366,7 +1366,7 @@ static struct trace_event *events[] __initdata = { NULL }; -__init int init_events(void) +__init static int init_events(void) { struct trace_event *event; int i, ret; @@ -1384,3 +1384,4 @@ __init int init_events(void) return 0; } +early_initcall(init_events);
diff --git a/kernel/trace/trace_preemptirq.c b/kernel/trace/trace_preemptirq.c index e9645f8..26b06b0 100644 --- a/kernel/trace/trace_preemptirq.c +++ b/kernel/trace/trace_preemptirq.c
@@ -56,14 +56,14 @@ __visible void trace_hardirqs_on_caller(unsigned long caller_addr) this_cpu_write(tracing_irq_cpu, 0); } - lockdep_hardirqs_on(caller_addr); + lockdep_hardirqs_on(CALLER_ADDR0); } EXPORT_SYMBOL(trace_hardirqs_on_caller); NOKPROBE_SYMBOL(trace_hardirqs_on_caller); __visible void trace_hardirqs_off_caller(unsigned long caller_addr) { - lockdep_hardirqs_off(caller_addr); + lockdep_hardirqs_off(CALLER_ADDR0); if (!this_cpu_read(tracing_irq_cpu)) { this_cpu_write(tracing_irq_cpu, 1);
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 476a685..23e85cb 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c
@@ -300,7 +300,7 @@ static int parse_probe_vars(char *arg, const struct fetch_type *t, } } else goto inval_var; - } else if (strcmp(arg, "comm") == 0 || strcmp(arg, "COMM") == 0) { + } else if (strcmp(arg, "comm") == 0) { code->op = FETCH_OP_COMM; #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API } else if (((flags & TPARG_FL_MASK) == @@ -595,8 +595,7 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size, * Since $comm and immediate string can not be dereferred, * we can find those by strcmp. */ - if (strcmp(arg, "$comm") == 0 || strcmp(arg, "$COMM") == 0 || - strncmp(arg, "\\\"", 2) == 0) { + if (strcmp(arg, "$comm") == 0 || strncmp(arg, "\\\"", 2) == 0) { /* The type of $comm must be "string", and not an array. */ if (parg->count || (t && strcmp(t, "string"))) return -EINVAL;
diff --git a/kernel/watchdog.c b/kernel/watchdog.c index 632d47f..b3b35ca 100644 --- a/kernel/watchdog.c +++ b/kernel/watchdog.c
@@ -590,7 +590,7 @@ int lockup_detector_offline_cpu(unsigned int cpu) return 0; } -static void __lockup_detector_reconfigure(void) +static void lockup_detector_reconfigure(void) { cpus_read_lock(); watchdog_nmi_stop(); @@ -610,13 +610,6 @@ static void __lockup_detector_reconfigure(void) __lockup_detector_cleanup(); } -void lockup_detector_reconfigure(void) -{ - mutex_lock(&watchdog_mutex); - __lockup_detector_reconfigure(); - mutex_unlock(&watchdog_mutex); -} - /* * Create the watchdog thread infrastructure and configure the detector(s). * @@ -637,13 +630,13 @@ static __init void lockup_detector_setup(void) return; mutex_lock(&watchdog_mutex); - __lockup_detector_reconfigure(); + lockup_detector_reconfigure(); softlockup_initialized = true; mutex_unlock(&watchdog_mutex); } #else /* CONFIG_SOFTLOCKUP_DETECTOR */ -static void __lockup_detector_reconfigure(void) +static void lockup_detector_reconfigure(void) { cpus_read_lock(); watchdog_nmi_stop(); @@ -651,13 +644,9 @@ static void __lockup_detector_reconfigure(void) watchdog_nmi_start(); cpus_read_unlock(); } -void lockup_detector_reconfigure(void) -{ - __lockup_detector_reconfigure(); -} static inline void lockup_detector_setup(void) { - __lockup_detector_reconfigure(); + lockup_detector_reconfigure(); } #endif /* !CONFIG_SOFTLOCKUP_DETECTOR */ @@ -697,7 +686,7 @@ static void proc_watchdog_update(void) { /* Remove impossible cpus to keep sysctl output clean. */ cpumask_and(&watchdog_cpumask, &watchdog_cpumask, cpu_possible_mask); - __lockup_detector_reconfigure(); + lockup_detector_reconfigure(); } /*
diff --git a/kernel/workqueue.c b/kernel/workqueue.c index b89d10e..9e62c74 100644 --- a/kernel/workqueue.c +++ b/kernel/workqueue.c
@@ -3074,8 +3074,10 @@ static bool __flush_work(struct work_struct *work, bool from_cancel) if (WARN_ON(!work->func)) return false; - lock_map_acquire(&work->lockdep_map); - lock_map_release(&work->lockdep_map); + if (!from_cancel) { + lock_map_acquire(&work->lockdep_map); + lock_map_release(&work->lockdep_map); + } if (start_flush_work(work, &barr, from_cancel)) { wait_for_completion(&barr.done);
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 7805322..8791d47 100644 --- a/lib/Kconfig.debug +++ b/lib/Kconfig.debug
@@ -266,10 +266,8 @@ int "Warn for stack frames larger than (needs gcc 4.4)" range 0 8192 default 2048 if GCC_PLUGIN_LATENT_ENTROPY - default 2048 if PARISC - default 1536 if (!64BIT && XTENSA) - default 1280 if KASAN && !64BIT - default 1024 if !64BIT + default 1280 if (!64BIT && PARISC) + default 1024 if (!64BIT && !PARISC) default 2048 if 64BIT help Tell gcc to warn at build time for stack frames larger than this. @@ -1551,14 +1549,8 @@ If unsure, say N. config FUNCTION_ERROR_INJECTION - bool "Fault-injections of functions" + def_bool y depends on HAVE_FUNCTION_ERROR_INJECTION && KPROBES - help - Add fault injections into various functions that are annotated with - ALLOW_ERROR_INJECTION() in the kernel. BPF may also modify the return - value of theses functions. This is useful to test error paths of code. - - If unsure, say N config FAULT_INJECTION bool "Fault-injection framework"
diff --git a/lib/dynamic_debug.c b/lib/dynamic_debug.c index 0bb2e22..f428e83 100644 --- a/lib/dynamic_debug.c +++ b/lib/dynamic_debug.c
@@ -329,6 +329,10 @@ static int ddebug_parse_query(char *words[], int nwords, } memset(query, 0, sizeof(*query)); + if (modname) + /* support $modname.dyndbg=<multiple queries> */ + query->module = modname; + for (i = 0; i < nwords; i += 2) { if (!strcmp(words[i], "func")) { rc = check_set(&query->function, words[i+1], "func"); @@ -377,13 +381,6 @@ static int ddebug_parse_query(char *words[], int nwords, if (rc) return rc; } - if (!query->module && modname) - /* - * support $modname.dyndbg=<multiple queries>, when - * not given in the query itself - */ - query->module = modname; - vpr_info_dq(query, "parsed"); return 0; }
diff --git a/lib/fonts/fonts.c b/lib/fonts/fonts.c index 4da9707..e7258d8 100644 --- a/lib/fonts/fonts.c +++ b/lib/fonts/fonts.c
@@ -132,8 +132,8 @@ const struct font_desc *get_default_font(int xres, int yres, u32 font_w, if (res > 20) c += 20 - res; - if ((font_w & (1U << (f->width - 1))) && - (font_h & (1U << (f->height - 1)))) + if ((font_w & (1 << (f->width - 1))) && + (font_h & (1 << (f->height - 1)))) c += 1000; if (c > cc) {
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 5c6a0b8..9d3bda3 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c
@@ -455,6 +455,20 @@ void iov_iter_init(struct iov_iter *i, unsigned int direction, } EXPORT_SYMBOL(iov_iter_init); +static void memcpy_from_page(char *to, struct page *page, size_t offset, size_t len) +{ + char *from = kmap_atomic(page); + memcpy(to, from + offset, len); + kunmap_atomic(from); +} + +static void memcpy_to_page(struct page *page, size_t offset, const char *from, size_t len) +{ + char *to = kmap_atomic(page); + memcpy(to + offset, from, len); + kunmap_atomic(to); +} + static void memzero_page(struct page *page, size_t offset, size_t len) { char *addr = kmap_atomic(page);
diff --git a/lib/list_debug.c b/lib/list_debug.c index 413daa7..5d5424b 100644 --- a/lib/list_debug.c +++ b/lib/list_debug.c
@@ -20,11 +20,7 @@ bool __list_add_valid(struct list_head *new, struct list_head *prev, struct list_head *next) { - if (CHECK_DATA_CORRUPTION(prev == NULL, - "list_add corruption. prev is NULL.\n") || - CHECK_DATA_CORRUPTION(next == NULL, - "list_add corruption. next is NULL.\n") || - CHECK_DATA_CORRUPTION(next->prev != prev, + if (CHECK_DATA_CORRUPTION(next->prev != prev, "list_add corruption. next->prev should be prev (%px), but was %px. (next=%px).\n", prev, next->prev, next) || CHECK_DATA_CORRUPTION(prev->next != next, @@ -46,11 +42,7 @@ bool __list_del_entry_valid(struct list_head *entry) prev = entry->prev; next = entry->next; - if (CHECK_DATA_CORRUPTION(next == NULL, - "list_del corruption, %px->next is NULL\n", entry) || - CHECK_DATA_CORRUPTION(prev == NULL, - "list_del corruption, %px->prev is NULL\n", entry) || - CHECK_DATA_CORRUPTION(next == LIST_POISON1, + if (CHECK_DATA_CORRUPTION(next == LIST_POISON1, "list_del corruption, %px->next is LIST_POISON1 (%px)\n", entry, LIST_POISON1) || CHECK_DATA_CORRUPTION(prev == LIST_POISON2,
diff --git a/lib/lockref.c b/lib/lockref.c index 81ac5f3..5b34bbd 100644 --- a/lib/lockref.c +++ b/lib/lockref.c
@@ -24,6 +24,7 @@ } \ if (!--retry) \ break; \ + cpu_relax(); \ } \ } while (0)
diff --git a/lib/mpi/mpicoder.c b/lib/mpi/mpicoder.c index 4f73db2..eead4b3 100644 --- a/lib/mpi/mpicoder.c +++ b/lib/mpi/mpicoder.c
@@ -397,8 +397,7 @@ MPI mpi_read_raw_from_sgl(struct scatterlist *sgl, unsigned int nbytes) while (sg_miter_next(&miter)) { buff = miter.addr; - len = min_t(unsigned, miter.length, nbytes); - nbytes -= len; + len = miter.length; for (x = 0; x < len; x++) { a <<= 8;
diff --git a/lib/nlattr.c b/lib/nlattr.c index b5ce5e4..0d84f79 100644 --- a/lib/nlattr.c +++ b/lib/nlattr.c
@@ -10,7 +10,6 @@ #include <linux/kernel.h> #include <linux/errno.h> #include <linux/jiffies.h> -#include <linux/nospec.h> #include <linux/skbuff.h> #include <linux/string.h> #include <linux/types.h> @@ -170,7 +169,6 @@ static int validate_nla(const struct nlattr *nla, int maxtype, if (type <= 0 || type > maxtype) return 0; - type = array_index_nospec(type, maxtype + 1); pt = &policy[type]; BUG_ON(pt->type > NLA_TYPE_MAX); @@ -379,7 +377,6 @@ static int __nla_validate_parse(const struct nlattr *head, int len, int maxtype, } continue; } - type = array_index_nospec(type, maxtype + 1); if (policy) { int err = validate_nla(nla, maxtype, policy, validate, extack);
diff --git a/lib/notifier-error-inject.c b/lib/notifier-error-inject.c index 2b24ea6..21016b3 100644 --- a/lib/notifier-error-inject.c +++ b/lib/notifier-error-inject.c
@@ -15,7 +15,7 @@ static int debugfs_errno_get(void *data, u64 *val) return 0; } -DEFINE_SIMPLE_ATTRIBUTE_SIGNED(fops_errno, debugfs_errno_get, debugfs_errno_set, +DEFINE_SIMPLE_ATTRIBUTE(fops_errno, debugfs_errno_get, debugfs_errno_set, "%lld\n"); static struct dentry *debugfs_create_errno(const char *name, umode_t mode,
diff --git a/lib/once.c b/lib/once.c index 1b71cd7..8b7d623 100644 --- a/lib/once.c +++ b/lib/once.c
@@ -61,33 +61,3 @@ void __do_once_done(bool *done, struct static_key_true *once_key, once_disable_jump(once_key); } EXPORT_SYMBOL(__do_once_done); - -static DEFINE_MUTEX(once_mutex); - -bool __do_once_slow_start(bool *done) - __acquires(once_mutex) -{ - mutex_lock(&once_mutex); - if (*done) { - mutex_unlock(&once_mutex); - /* Keep sparse happy by restoring an even lock count on - * this mutex. In case we return here, we don't call into - * __do_once_done but return early in the DO_ONCE_SLOW() macro. - */ - __acquire(once_mutex); - return false; - } - - return true; -} -EXPORT_SYMBOL(__do_once_slow_start); - -void __do_once_slow_done(bool *done, struct static_key_true *once_key, - struct module *mod) - __releases(once_mutex) -{ - *done = true; - mutex_unlock(&once_mutex); - once_disable_jump(once_key); -} -EXPORT_SYMBOL(__do_once_slow_done);
diff --git a/lib/ratelimit.c b/lib/ratelimit.c index ce945c1..e01a93f 100644 --- a/lib/ratelimit.c +++ b/lib/ratelimit.c
@@ -26,16 +26,10 @@ */ int ___ratelimit(struct ratelimit_state *rs, const char *func) { - /* Paired with WRITE_ONCE() in .proc_handler(). - * Changing two values seperately could be inconsistent - * and some message could be lost. (See: net_ratelimit_state). - */ - int interval = READ_ONCE(rs->interval); - int burst = READ_ONCE(rs->burst); unsigned long flags; int ret; - if (!interval) + if (!rs->interval) return 1; /* @@ -50,7 +44,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) if (!rs->begin) rs->begin = jiffies; - if (time_is_before_jiffies(rs->begin + interval)) { + if (time_is_before_jiffies(rs->begin + rs->interval)) { if (rs->missed) { if (!(rs->flags & RATELIMIT_MSG_ON_RELEASE)) { printk_deferred(KERN_WARNING @@ -62,7 +56,7 @@ int ___ratelimit(struct ratelimit_state *rs, const char *func) rs->begin = jiffies; rs->printed = 0; } - if (burst && burst > rs->printed) { + if (rs->burst && rs->burst > rs->printed) { rs->printed++; ret = 1; } else {
diff --git a/lib/string.c b/lib/string.c index 592c106..abfaa05 100644 --- a/lib/string.c +++ b/lib/string.c
@@ -29,7 +29,6 @@ #include <linux/errno.h> #include <linux/slab.h> -#include <asm/unaligned.h> #include <asm/byteorder.h> #include <asm/word-at-a-time.h> #include <asm/page.h> @@ -906,21 +905,6 @@ __visible int memcmp(const void *cs, const void *ct, size_t count) const unsigned char *su1, *su2; int res = 0; -#ifdef CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS - if (count >= sizeof(unsigned long)) { - const unsigned long *u1 = cs; - const unsigned long *u2 = ct; - do { - if (get_unaligned(u1) != get_unaligned(u2)) - break; - u1++; - u2++; - count -= sizeof(unsigned long); - } while (count >= sizeof(unsigned long)); - cs = u1; - ct = u2; - } -#endif for (su1 = cs, su2 = ct; 0 < count; ++su1, ++su2, count--) if ((res = *su1 - *su2) != 0) break;
diff --git a/lib/test_firmware.c b/lib/test_firmware.c index 0169073..251213c 100644 --- a/lib/test_firmware.c +++ b/lib/test_firmware.c
@@ -940,7 +940,6 @@ static int __init test_firmware_init(void) rc = misc_register(&test_fw_misc_device); if (rc) { - __test_firmware_config_free(); kfree(test_fw_config); pr_err("could not register misc device: %d\n", rc); return rc;
diff --git a/lib/usercopy.c b/lib/usercopy.c index 82881e0..cbb4d9e 100644 --- a/lib/usercopy.c +++ b/lib/usercopy.c
@@ -1,7 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 #include <linux/uaccess.h> #include <linux/bitops.h> -#include <linux/nospec.h> /* out-of-line parts */ @@ -11,12 +10,6 @@ unsigned long _copy_from_user(void *to, const void __user *from, unsigned long n unsigned long res = n; might_fault(); if (likely(access_ok(from, n))) { - /* - * Ensure that bad access_ok() speculation will not - * lead to nasty side effects *after* the copy is - * finished: - */ - barrier_nospec(); kasan_check_write(to, n); res = raw_copy_from_user(to, from, n); }
diff --git a/lib/vdso/Makefile b/lib/vdso/Makefile index e814061..c415a68 100644 --- a/lib/vdso/Makefile +++ b/lib/vdso/Makefile
@@ -17,6 +17,6 @@ endif quiet_cmd_vdso_check = VDSOCHK $@ - cmd_vdso_check = if $(OBJDUMP) -R $@ | grep -E -h "$(ARCH_REL_TYPE_ABS)"; \ + cmd_vdso_check = if $(OBJDUMP) -R $@ | egrep -h "$(ARCH_REL_TYPE_ABS)"; \ then (echo >&2 "$@: dynamic relocations are not supported"; \ rm -f $@; /bin/false); fi
diff --git a/mm/compaction.c b/mm/compaction.c index 17eadef..1dbeb83 100644 --- a/mm/compaction.c +++ b/mm/compaction.c
@@ -1330,7 +1330,7 @@ move_freelist_tail(struct list_head *freelist, struct page *freepage) } static void -fast_isolate_around(struct compact_control *cc, unsigned long pfn) +fast_isolate_around(struct compact_control *cc, unsigned long pfn, unsigned long nr_isolated) { unsigned long start_pfn, end_pfn; struct page *page = pfn_to_page(pfn); @@ -1347,13 +1347,21 @@ fast_isolate_around(struct compact_control *cc, unsigned long pfn) start_pfn = pageblock_start_pfn(pfn); end_pfn = min(pageblock_end_pfn(pfn), zone_end_pfn(cc->zone)) - 1; - isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false); + /* Scan before */ + if (start_pfn != pfn) { + isolate_freepages_block(cc, &start_pfn, pfn, &cc->freepages, 1, false); + if (cc->nr_freepages >= cc->nr_migratepages) + return; + } + + /* Scan after */ + start_pfn = pfn + nr_isolated; + if (start_pfn < end_pfn) + isolate_freepages_block(cc, &start_pfn, end_pfn, &cc->freepages, 1, false); /* Skip this pageblock in the future as it's full or nearly full */ if (cc->nr_freepages < cc->nr_migratepages) set_pageblock_skip(page); - - return; } /* Search orders in round-robin fashion */ @@ -1525,7 +1533,7 @@ fast_isolate_freepages(struct compact_control *cc) return cc->free_pfn; low_pfn = page_to_pfn(page); - fast_isolate_around(cc, low_pfn); + fast_isolate_around(cc, low_pfn, nr_isolated); return low_pfn; }
diff --git a/mm/filemap.c b/mm/filemap.c index 2d7ea29..cf69201 100644 --- a/mm/filemap.c +++ b/mm/filemap.c
@@ -3281,7 +3281,7 @@ ssize_t generic_perform_write(struct file *file, unsigned long offset; /* Offset into pagecache page */ unsigned long bytes; /* Bytes to write to page */ size_t copied; /* Bytes copied from user */ - void *fsdata = NULL; + void *fsdata; offset = (pos & (PAGE_SIZE - 1)); bytes = min_t(unsigned long, PAGE_SIZE - offset,
diff --git a/mm/frame_vector.c b/mm/frame_vector.c index 5779c1b..c431ca8 100644 --- a/mm/frame_vector.c +++ b/mm/frame_vector.c
@@ -37,6 +37,7 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, struct mm_struct *mm = current->mm; struct vm_area_struct *vma; int ret = 0; + int err; int locked; if (nr_frames == 0) @@ -73,14 +74,32 @@ int get_vaddr_frames(unsigned long start, unsigned int nr_frames, vec->is_pfns = false; ret = get_user_pages_locked(start, nr_frames, gup_flags, (struct page **)(vec->ptrs), &locked); - if (likely(ret > 0)) - goto out; + goto out; } - /* This used to (racily) return non-refcounted pfns. Let people know */ - WARN_ONCE(1, "get_vaddr_frames() cannot follow VM_IO mapping"); - vec->nr_frames = 0; + vec->got_ref = false; + vec->is_pfns = true; + do { + unsigned long *nums = frame_vector_pfns(vec); + while (ret < nr_frames && start + PAGE_SIZE <= vma->vm_end) { + err = follow_pfn(vma, start, &nums[ret]); + if (err) { + if (ret == 0) + ret = err; + goto out; + } + start += PAGE_SIZE; + ret++; + } + /* + * We stop if we have enough pages or if VMA doesn't completely + * cover the tail page. + */ + if (ret >= nr_frames || start < vma->vm_end) + break; + vma = find_vma_intersection(mm, start, start + 1); + } while (vma && vma->vm_flags & (VM_IO | VM_PFNMAP)); out: if (locked) up_read(&mm->mmap_sem);
diff --git a/mm/gup.c b/mm/gup.c index 0f8cfda..9bc215d 100644 --- a/mm/gup.c +++ b/mm/gup.c
@@ -205,17 +205,6 @@ static struct page *follow_page_pte(struct vm_area_struct *vma, struct address_space *mapping; #endif - /* - * Considering PTE level hugetlb, like continuous-PTE hugetlb on - * ARM64 architecture. - */ - if (is_vm_hugetlb_page(vma)) { - page = follow_huge_pmd_pte(vma, address, flags); - if (page) - return page; - return no_page_table(vma, flags); - } - retry: if (unlikely(pmd_bad(*pmd))) return no_page_table(vma, flags); @@ -375,7 +364,7 @@ static struct page *follow_pmd_mask(struct vm_area_struct *vma, if (pmd_none(pmdval)) return no_page_table(vma, flags); if (pmd_huge(pmdval) && vma->vm_flags & VM_HUGETLB) { - page = follow_huge_pmd_pte(vma, address, flags); + page = follow_huge_pmd(mm, address, pmd, flags); if (page) return page; return no_page_table(vma, flags); @@ -2321,7 +2310,7 @@ static int gup_pud_range(p4d_t *p4dp, p4d_t p4d, unsigned long addr, unsigned lo next = pud_addr_end(addr, end); if (pud_none(pud)) return 0; - if (unlikely(pud_huge(pud) || pud_devmap(pud))) { + if (unlikely(pud_huge(pud))) { if (!gup_huge_pud(pud, pudp, addr, next, flags, pages, nr)) return 0;
diff --git a/mm/huge_memory.c b/mm/huge_memory.c index ddfff56..d90076b 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c
@@ -1607,7 +1607,7 @@ vm_fault_t do_huge_pmd_numa_page(struct vm_fault *vmf, pmd_t pmd) */ get_page(page); spin_unlock(vmf->ptl); - anon_vma = page_lock_anon_vma_read(page, NULL); + anon_vma = page_lock_anon_vma_read(page); /* Confirm the PMD did not change while page_table_lock was released */ spin_lock(vmf->ptl); @@ -2913,9 +2913,6 @@ void deferred_split_huge_page(struct page *page) if (PageSwapCache(page)) return; - if (!list_empty(page_deferred_list(page))) - return; - spin_lock_irqsave(&ds_queue->split_queue_lock, flags); if (list_empty(page_deferred_list(page))) { count_vm_event(THP_DEFERRED_SPLIT_PAGE);
diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 5fbc62a..b3fcc06 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c
@@ -2217,11 +2217,11 @@ struct page *alloc_huge_page(struct vm_area_struct *vma, page = alloc_buddy_huge_page_with_mpol(h, vma, addr); if (!page) goto out_uncharge_cgroup; - spin_lock(&hugetlb_lock); if (!avoid_reserve && vma_has_reserves(vma, gbl_chg)) { SetPagePrivate(page); h->resv_huge_pages--; } + spin_lock(&hugetlb_lock); list_move(&page->lru, &h->hugepage_activelist); /* Fall through */ } @@ -5202,30 +5202,30 @@ follow_huge_pd(struct vm_area_struct *vma, } struct page * __weak -follow_huge_pmd_pte(struct vm_area_struct *vma, unsigned long address, int flags) +follow_huge_pmd(struct mm_struct *mm, unsigned long address, + pmd_t *pmd, int flags) { - struct hstate *h = hstate_vma(vma); - struct mm_struct *mm = vma->vm_mm; struct page *page = NULL; spinlock_t *ptl; - pte_t *ptep, pte; - + pte_t pte; retry: - ptep = huge_pte_offset(mm, address, huge_page_size(h)); - if (!ptep) - return NULL; - - ptl = huge_pte_lock(h, mm, ptep); - pte = huge_ptep_get(ptep); + ptl = pmd_lockptr(mm, pmd); + spin_lock(ptl); + /* + * make sure that the address range covered by this pmd is not + * unmapped from other threads. + */ + if (!pmd_huge(*pmd)) + goto out; + pte = huge_ptep_get((pte_t *)pmd); if (pte_present(pte)) { - page = pte_page(pte) + - ((address & ~huge_page_mask(h)) >> PAGE_SHIFT); + page = pmd_page(*pmd) + ((address & ~PMD_MASK) >> PAGE_SHIFT); if (flags & FOLL_GET) get_page(page); } else { if (is_hugetlb_entry_migration(pte)) { spin_unlock(ptl); - __migration_entry_wait(mm, ptep, ptl); + __migration_entry_wait(mm, (pte_t *)pmd, ptl); goto retry; } /* @@ -5233,7 +5233,7 @@ follow_huge_pmd_pte(struct vm_area_struct *vma, unsigned long address, int flags * follow_page_mask(). */ } - +out: spin_unlock(ptl); return page; }
diff --git a/mm/kasan/report.c b/mm/kasan/report.c index 2eb7fe0..7f575d2 100644 --- a/mm/kasan/report.c +++ b/mm/kasan/report.c
@@ -94,7 +94,7 @@ static void end_report(unsigned long *flags, unsigned long addr) pr_err("==================================================================\n"); add_taint(TAINT_BAD_PAGE, LOCKDEP_NOW_UNRELIABLE); spin_unlock_irqrestore(&report_lock, *flags); - if (!test_bit(KASAN_BIT_MULTI_SHOT, &kasan_flags)) { + if (panic_on_warn) { /* * This thread may hit another WARN() in the panic path. * Resetting this prevents additional WARN() from panicking the @@ -102,7 +102,7 @@ static void end_report(unsigned long *flags, unsigned long addr) * panic_mutex in panic(). */ panic_on_warn = 0; - check_panic_on_warn("KASAN"); + panic("panic_on_warn set ...\n"); } kasan_enable_current(); }
diff --git a/mm/khugepaged.c b/mm/khugepaged.c index 149a824..284a15f 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c
@@ -1060,7 +1060,6 @@ static void collapse_huge_page(struct mm_struct *mm, _pmd = pmdp_collapse_flush(vma, address, pmd); spin_unlock(pmd_ptl); mmu_notifier_invalidate_range_end(&range); - tlb_remove_table_sync_one(); spin_lock(pte_ptl); isolated = __collapse_huge_page_isolate(vma, address, pte); @@ -1313,7 +1312,6 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) spinlock_t *ptl; int count = 0; int i; - struct mmu_notifier_range range; if (!vma || !vma->vm_file || vma->vm_start > haddr || vma->vm_end < haddr + HPAGE_PMD_SIZE) @@ -1340,19 +1338,6 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) if (!pmd) goto drop_hpage; - /* - * We need to lock the mapping so that from here on, only GUP-fast and - * hardware page walks can access the parts of the page tables that - * we're operating on. - */ - i_mmap_lock_write(vma->vm_file->f_mapping); - - /* - * This spinlock should be unnecessary: Nobody else should be accessing - * the page tables under spinlock protection here, only - * lockless_pages_from_mm() and the hardware page walker can access page - * tables while all the high-level locks are held in write mode. - */ start_pte = pte_offset_map_lock(mm, pmd, haddr, &ptl); /* step 1: check all mapped PTEs are to the right huge page */ @@ -1399,23 +1384,12 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) } /* step 4: collapse pmd */ - /* we make no change to anon, but protect concurrent anon page lookup */ - if (vma->anon_vma) - anon_vma_lock_write(vma->anon_vma); - - mmu_notifier_range_init(&range, MMU_NOTIFY_CLEAR, 0, NULL, mm, haddr, - haddr + HPAGE_PMD_SIZE); - mmu_notifier_invalidate_range_start(&range); + ptl = pmd_lock(vma->vm_mm, pmd); _pmd = pmdp_collapse_flush(vma, haddr, pmd); + spin_unlock(ptl); mm_dec_nr_ptes(mm); - tlb_remove_table_sync_one(); - mmu_notifier_invalidate_range_end(&range); pte_free(mm, pmd_pgtable(_pmd)); - if (vma->anon_vma) - anon_vma_unlock_write(vma->anon_vma); - i_mmap_unlock_write(vma->vm_file->f_mapping); - drop_hpage: unlock_page(hpage); put_page(hpage); @@ -1423,7 +1397,6 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) abort: pte_unmap_unlock(start_pte, ptl); - i_mmap_unlock_write(vma->vm_file->f_mapping); goto drop_hpage; } @@ -1473,8 +1446,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) * An alternative would be drop the check, but check that page * table is clear before calling pmdp_collapse_flush() under * ptl. It has higher chance to recover THP for the VMA, but - * has higher cost too. It would also probably require locking - * the anon_vma. + * has higher cost too. */ if (vma->anon_vma) continue; @@ -1496,19 +1468,12 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) */ if (down_write_trylock(&mm->mmap_sem)) { if (!khugepaged_test_exit(mm)) { - struct mmu_notifier_range range; - - mmu_notifier_range_init(&range, - MMU_NOTIFY_CLEAR, 0, - NULL, mm, addr, - addr + HPAGE_PMD_SIZE); - mmu_notifier_invalidate_range_start(&range); + spinlock_t *ptl = pmd_lock(mm, pmd); /* assume page table is clear */ _pmd = pmdp_collapse_flush(vma, addr, pmd); + spin_unlock(ptl); mm_dec_nr_ptes(mm); - tlb_remove_table_sync_one(); pte_free(mm, pmd_pgtable(_pmd)); - mmu_notifier_invalidate_range_end(&range); } up_write(&mm->mmap_sem); } else {
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 3903117..bda2295 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c
@@ -1127,7 +1127,7 @@ EXPORT_SYMBOL(kmemleak_no_scan); void __ref kmemleak_alloc_phys(phys_addr_t phys, size_t size, int min_count, gfp_t gfp) { - if (!IS_ENABLED(CONFIG_HIGHMEM) || PHYS_PFN(phys) < max_low_pfn) + if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) kmemleak_alloc(__va(phys), size, min_count, gfp); } EXPORT_SYMBOL(kmemleak_alloc_phys); @@ -1141,7 +1141,7 @@ EXPORT_SYMBOL(kmemleak_alloc_phys); */ void __ref kmemleak_free_part_phys(phys_addr_t phys, size_t size) { - if (!IS_ENABLED(CONFIG_HIGHMEM) || PHYS_PFN(phys) < max_low_pfn) + if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) kmemleak_free_part(__va(phys), size); } EXPORT_SYMBOL(kmemleak_free_part_phys); @@ -1153,7 +1153,7 @@ EXPORT_SYMBOL(kmemleak_free_part_phys); */ void __ref kmemleak_not_leak_phys(phys_addr_t phys) { - if (!IS_ENABLED(CONFIG_HIGHMEM) || PHYS_PFN(phys) < max_low_pfn) + if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) kmemleak_not_leak(__va(phys)); } EXPORT_SYMBOL(kmemleak_not_leak_phys); @@ -1165,7 +1165,7 @@ EXPORT_SYMBOL(kmemleak_not_leak_phys); */ void __ref kmemleak_ignore_phys(phys_addr_t phys) { - if (!IS_ENABLED(CONFIG_HIGHMEM) || PHYS_PFN(phys) < max_low_pfn) + if (PHYS_PFN(phys) >= min_low_pfn && PHYS_PFN(phys) < max_low_pfn) kmemleak_ignore(__va(phys)); } EXPORT_SYMBOL(kmemleak_ignore_phys);
diff --git a/mm/ksm.c b/mm/ksm.c index d54eeda..5487655 100644 --- a/mm/ksm.c +++ b/mm/ksm.c
@@ -2631,13 +2631,7 @@ void rmap_walk_ksm(struct page *page, struct rmap_walk_control *rwc) struct vm_area_struct *vma; cond_resched(); - if (!anon_vma_trylock_read(anon_vma)) { - if (rwc->try_lock) { - rwc->contended = true; - return; - } - anon_vma_lock_read(anon_vma); - } + anon_vma_lock_read(anon_vma); anon_vma_interval_tree_foreach(vmac, &anon_vma->rb_root, 0, ULONG_MAX) { unsigned long addr;
diff --git a/mm/madvise.c b/mm/madvise.c index 755976c..2e2ecaf 100644 --- a/mm/madvise.c +++ b/mm/madvise.c
@@ -430,11 +430,8 @@ static int madvise_cold_or_pageout_pte_range(pmd_t *pmd, continue; } - /* - * Do not interfere with other mappings of this page and - * non-LRU page. - */ - if (!PageLRU(page) || page_mapcount(page) != 1) + /* Do not interfere with other mappings of this page */ + if (page_mapcount(page) != 1) continue; VM_BUG_ON_PAGE(PageTransCompound(page), page); @@ -1254,9 +1251,16 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec, while (iov_iter_count(&iter)) { iovec = iov_iter_iovec(&iter); + /* + * do_madvise returns ENOMEM if unmapped holes are present + * in the passed VMA. process_madvise() is expected to skip + * unmapped holes passed to it in the 'struct iovec' list + * and not fail because of them. Thus treat -ENOMEM return + * from do_madvise as valid and continue processing. + */ ret = do_madvise(mm, (unsigned long)iovec.iov_base, iovec.iov_len, behavior); - if (ret < 0) + if (ret < 0 && ret != -ENOMEM) break; iov_iter_advance(&iter, iovec.iov_len); }
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3dd43e9..fea9330 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c
@@ -3775,10 +3775,6 @@ static int mem_cgroup_move_charge_write(struct cgroup_subsys_state *css, { struct mem_cgroup *memcg = mem_cgroup_from_css(css); - pr_warn_once("Cgroup memory moving (move_charge_at_immigrate) is deprecated. " - "Please report your usecase to linux-mm@kvack.org if you " - "depend on this functionality.\n"); - if (val & ~MOVE_MASK) return -EINVAL; @@ -4707,7 +4703,6 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, unsigned int efd, cfd; struct fd efile; struct fd cfile; - struct dentry *cdentry; const char *name; char *endp; int ret; @@ -4759,16 +4754,6 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, goto out_put_cfile; /* - * The control file must be a regular cgroup1 file. As a regular cgroup - * file can't be renamed, it's safe to access its name afterwards. - */ - cdentry = cfile.file->f_path.dentry; - if (cdentry->d_sb->s_type != &cgroup_fs_type || !d_is_reg(cdentry)) { - ret = -EINVAL; - goto out_put_cfile; - } - - /* * Determine the event callbacks and set them in @event. This used * to be done via struct cftype but cgroup core no longer knows * about these events. The following is crude but the whole thing @@ -4776,7 +4761,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, * * DO NOT ADD NEW FILES. */ - name = cdentry->d_name.name; + name = cfile.file->f_path.dentry->d_name.name; if (!strcmp(name, "memory.usage_in_bytes")) { event->register_event = mem_cgroup_usage_register_event; @@ -4800,7 +4785,7 @@ static ssize_t memcg_write_event_control(struct kernfs_open_file *of, * automatically removed on cgroup destruction but the removal is * asynchronous, so take an extra ref on @css. */ - cfile_css = css_tryget_online_from_dir(cdentry->d_parent, + cfile_css = css_tryget_online_from_dir(cfile.file->f_path.dentry->d_parent, &memory_cgrp_subsys); ret = -EINVAL; if (IS_ERR(cfile_css))
diff --git a/mm/memory-failure.c b/mm/memory-failure.c index 5b7e404..9030ab0 100644 --- a/mm/memory-failure.c +++ b/mm/memory-failure.c
@@ -443,7 +443,7 @@ static void collect_procs_anon(struct page *page, struct list_head *to_kill, struct anon_vma *av; pgoff_t pgoff; - av = page_lock_anon_vma_read(page, NULL); + av = page_lock_anon_vma_read(page); if (av == NULL) /* Not actually mapped anymore */ return;
diff --git a/mm/mempolicy.c b/mm/mempolicy.c index 8dabb0f..203bf9a 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c
@@ -571,8 +571,7 @@ static int queue_pages_hugetlb(pte_t *pte, unsigned long hmask, goto unlock; /* With MPOL_MF_MOVE, we migrate only unshared hugepage. */ if (flags & (MPOL_MF_MOVE_ALL) || - (flags & MPOL_MF_MOVE && page_mapcount(page) == 1 && - !hugetlb_pmd_shared(pte))) + (flags & MPOL_MF_MOVE && page_mapcount(page) == 1)) isolate_huge_page(page, qp->pagelist); unlock: spin_unlock(ptl);
diff --git a/mm/migrate.c b/mm/migrate.c index ed1f487..aa7fc7f 100644 --- a/mm/migrate.c +++ b/mm/migrate.c
@@ -2401,14 +2401,13 @@ static int migrate_vma_collect_pmd(pmd_t *pmdp, migrate->dst[migrate->npages] = 0; migrate->src[migrate->npages++] = mpfn; } + arch_leave_lazy_mmu_mode(); + pte_unmap_unlock(ptep - 1, ptl); /* Only flush the TLB if we actually modified any entries */ if (unmapped) flush_tlb_range(walk->vma, start, end); - arch_leave_lazy_mmu_mode(); - pte_unmap_unlock(ptep - 1, ptl); - return 0; }
diff --git a/mm/mmap.c b/mm/mmap.c index 8f17162..17a85c3 100644 --- a/mm/mmap.c +++ b/mm/mmap.c
@@ -1688,12 +1688,8 @@ int vma_wants_writenotify(struct vm_area_struct *vma, pgprot_t vm_page_prot) pgprot_val(vm_pgprot_modify(vm_page_prot, vm_flags))) return 0; - /* - * Do we need to track softdirty? hugetlb does not support softdirty - * tracking yet. - */ - if (IS_ENABLED(CONFIG_MEM_SOFT_DIRTY) && !(vm_flags & VM_SOFTDIRTY) && - !is_vm_hugetlb_page(vma)) + /* Do we need to track softdirty? */ + if (IS_ENABLED(CONFIG_MEM_SOFT_DIRTY) && !(vm_flags & VM_SOFTDIRTY)) return 1; /* Specialty mapping? */ @@ -1873,6 +1869,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, /* Undo any partial mapping done by a device driver. */ unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); + charged = 0; if (vm_flags & VM_SHARED) mapping_unmap_writable(file->f_mapping); allow_write_and_free_vma:
diff --git a/mm/mmu_gather.c b/mm/mmu_gather.c index 341aa03..7c1b8f6 100644 --- a/mm/mmu_gather.c +++ b/mm/mmu_gather.c
@@ -117,11 +117,6 @@ static void tlb_remove_table_smp_sync(void *arg) /* Simply deliver the interrupt */ } -void tlb_remove_table_sync_one(void) -{ - smp_call_function(tlb_remove_table_smp_sync, NULL, 1); -} - static void tlb_remove_table_one(void *table) { /*
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 136bd89..32c49f9 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c
@@ -3721,14 +3721,6 @@ bool __zone_watermark_ok(struct zone *z, unsigned int order, unsigned long mark, continue; for (mt = 0; mt < MIGRATE_PCPTYPES; mt++) { -#ifdef CONFIG_CMA - /* - * Note that this check is needed only - * when MIGRATE_CMA < MIGRATE_PCPTYPES. - */ - if (mt == MIGRATE_CMA) - continue; -#endif if (!free_area_empty(area, mt)) return true; } @@ -4398,30 +4390,6 @@ void fs_reclaim_release(gfp_t gfp_mask) EXPORT_SYMBOL_GPL(fs_reclaim_release); #endif -/* - * Zonelists may change due to hotplug during allocation. Detect when zonelists - * have been rebuilt so allocation retries. Reader side does not lock and - * retries the allocation if zonelist changes. Writer side is protected by the - * embedded spin_lock. - */ -static DEFINE_SEQLOCK(zonelist_update_seq); - -static unsigned int zonelist_iter_begin(void) -{ - if (IS_ENABLED(CONFIG_MEMORY_HOTREMOVE)) - return read_seqbegin(&zonelist_update_seq); - - return 0; -} - -static unsigned int check_retry_zonelist(unsigned int seq) -{ - if (IS_ENABLED(CONFIG_MEMORY_HOTREMOVE)) - return read_seqretry(&zonelist_update_seq, seq); - - return seq; -} - /* Perform direct synchronous page reclaim */ static int __perform_reclaim(gfp_t gfp_mask, unsigned int order, @@ -4729,7 +4697,6 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, int compaction_retries; int no_progress_loops; unsigned int cpuset_mems_cookie; - unsigned int zonelist_iter_cookie; int reserve_flags; /* @@ -4740,12 +4707,11 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, (__GFP_ATOMIC|__GFP_DIRECT_RECLAIM))) gfp_mask &= ~__GFP_ATOMIC; -restart: +retry_cpuset: compaction_retries = 0; no_progress_loops = 0; compact_priority = DEF_COMPACT_PRIORITY; cpuset_mems_cookie = read_mems_allowed_begin(); - zonelist_iter_cookie = zonelist_iter_begin(); /* * The fast path uses conservative alloc_flags to succeed only until @@ -4918,13 +4884,9 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, goto retry; - /* - * Deal with possible cpuset update races or zonelist updates to avoid - * a unnecessary OOM kill. - */ - if (check_retry_cpuset(cpuset_mems_cookie, ac) || - check_retry_zonelist(zonelist_iter_cookie)) - goto restart; + /* Deal with possible cpuset update races before we start OOM killing */ + if (check_retry_cpuset(cpuset_mems_cookie, ac)) + goto retry_cpuset; /* Reclaim has failed us, start killing things */ page = __alloc_pages_may_oom(gfp_mask, order, ac, &did_some_progress); @@ -4944,13 +4906,9 @@ __alloc_pages_slowpath(gfp_t gfp_mask, unsigned int order, } nopage: - /* - * Deal with possible cpuset update races or zonelist updates to avoid - * a unnecessary OOM kill. - */ - if (check_retry_cpuset(cpuset_mems_cookie, ac) || - check_retry_zonelist(zonelist_iter_cookie)) - goto restart; + /* Deal with possible cpuset update races before we fail */ + if (check_retry_cpuset(cpuset_mems_cookie, ac)) + goto retry_cpuset; /* * Make sure that __GFP_NOFAIL request doesn't leak out and make sure @@ -5260,18 +5218,6 @@ void *page_frag_alloc(struct page_frag_cache *nc, /* reset page count bias and offset to start of new frag */ nc->pagecnt_bias = PAGE_FRAG_CACHE_MAX_SIZE + 1; offset = size - fragsz; - if (unlikely(offset < 0)) { - /* - * The caller is trying to allocate a fragment - * with fragsz > PAGE_SIZE but the cache isn't big - * enough to satisfy the request, this may - * happen in low memory conditions. - * We don't release the cache page because - * it could make memory pressure worse - * so we simply return NULL here. - */ - return NULL; - } } nc->pagecnt_bias--; @@ -6134,8 +6080,9 @@ static void __build_all_zonelists(void *data) int nid; int __maybe_unused cpu; pg_data_t *self = data; + static DEFINE_SPINLOCK(lock); - write_seqlock(&zonelist_update_seq); + spin_lock(&lock); #ifdef CONFIG_NUMA memset(node_load, 0, sizeof(node_load)); @@ -6168,7 +6115,7 @@ static void __build_all_zonelists(void *data) #endif } - write_sequnlock(&zonelist_update_seq); + spin_unlock(&lock); } static noinline void __init
diff --git a/mm/page_idle.c b/mm/page_idle.c index d74a030..2955124 100644 --- a/mm/page_idle.c +++ b/mm/page_idle.c
@@ -95,10 +95,10 @@ static bool page_idle_clear_pte_refs_one(struct page *page, static void page_idle_clear_pte_refs(struct page *page) { /* - * Since rwc.try_lock is unused, rwc is effectively immutable, so we - * can make it static to save some cycles and stack. + * Since rwc.arg is unused, rwc is effectively immutable, so we + * can make it static const to save some cycles and stack. */ - static struct rmap_walk_control rwc = { + static const struct rmap_walk_control rwc = { .rmap_one = page_idle_clear_pte_refs_one, .anon_lock = page_lock_anon_vma_read, };
diff --git a/mm/page_isolation.c b/mm/page_isolation.c index 69a6544..8ebf483 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c
@@ -224,12 +224,12 @@ int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, } nr_isolate_pageblock++; } - } #ifdef CONFIG_AMLOGIC_CMA if (migratetype == MIGRATE_CMA && page) mod_zone_page_state(page_zone(page), NR_CMA_ISOLATED, end_pfn - start_pfn); #endif /* CONFIG_AMLOGIC_CMA */ + } return nr_isolate_pageblock; undo: for (pfn = start_pfn;
diff --git a/mm/pagewalk.c b/mm/pagewalk.c index ec41e75..4eb09e0 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c
@@ -38,7 +38,7 @@ static int walk_pmd_range(pud_t *pud, unsigned long addr, unsigned long end, do { again: next = pmd_addr_end(addr, end); - if (pmd_none(*pmd)) { + if (pmd_none(*pmd) || !walk->vma) { if (ops->pte_hole) err = ops->pte_hole(addr, next, walk); if (err) @@ -84,7 +84,7 @@ static int walk_pud_range(p4d_t *p4d, unsigned long addr, unsigned long end, do { again: next = pud_addr_end(addr, end); - if (pud_none(*pud)) { + if (pud_none(*pud) || !walk->vma) { if (ops->pte_hole) err = ops->pte_hole(addr, next, walk); if (err) @@ -254,7 +254,7 @@ static int __walk_page_range(unsigned long start, unsigned long end, int err = 0; struct vm_area_struct *vma = walk->vma; - if (is_vm_hugetlb_page(vma)) { + if (vma && is_vm_hugetlb_page(vma)) { if (walk->ops->hugetlb_entry) err = walk_hugetlb_range(start, end, walk); } else @@ -324,13 +324,9 @@ int walk_page_range(struct mm_struct *mm, unsigned long start, if (!vma) { /* after the last vma */ walk.vma = NULL; next = end; - if (ops->pte_hole) - err = ops->pte_hole(start, next, &walk); } else if (start < vma->vm_start) { /* outside vma */ walk.vma = NULL; next = min(end, vma->vm_start); - if (ops->pte_hole) - err = ops->pte_hole(start, next, &walk); } else { /* inside vma */ walk.vma = vma; next = min(end, vma->vm_end); @@ -348,8 +344,9 @@ int walk_page_range(struct mm_struct *mm, unsigned long start, } if (err < 0) break; - err = __walk_page_range(start, next, &walk); } + if (walk.vma || walk.ops->pte_hole) + err = __walk_page_range(start, next, &walk); if (err) break; } while (start = next, start < end);
diff --git a/mm/rmap.c b/mm/rmap.c index a3bd3b0..0394a5d 100644 --- a/mm/rmap.c +++ b/mm/rmap.c
@@ -83,8 +83,7 @@ static inline struct anon_vma *anon_vma_alloc(void) anon_vma = kmem_cache_alloc(anon_vma_cachep, GFP_KERNEL); if (anon_vma) { atomic_set(&anon_vma->refcount, 1); - anon_vma->num_children = 0; - anon_vma->num_active_vmas = 0; + anon_vma->degree = 1; /* Reference for first vma */ anon_vma->parent = anon_vma; /* * Initialise the anon_vma root to point to itself. If called @@ -192,7 +191,6 @@ int __anon_vma_prepare(struct vm_area_struct *vma) anon_vma = anon_vma_alloc(); if (unlikely(!anon_vma)) goto out_enomem_free_avc; - anon_vma->num_children++; /* self-parent link for new root */ allocated = anon_vma; } @@ -202,7 +200,8 @@ int __anon_vma_prepare(struct vm_area_struct *vma) if (likely(!vma->anon_vma)) { vma->anon_vma = anon_vma; anon_vma_chain_link(vma, avc, anon_vma); - anon_vma->num_active_vmas++; + /* vma reference or self-parent link for new root */ + anon_vma->degree++; allocated = NULL; avc = NULL; } @@ -281,19 +280,19 @@ int anon_vma_clone(struct vm_area_struct *dst, struct vm_area_struct *src) anon_vma_chain_link(dst, avc, anon_vma); /* - * Reuse existing anon_vma if it has no vma and only one - * anon_vma child. + * Reuse existing anon_vma if its degree lower than two, + * that means it has no vma and only one anon_vma child. * - * Root anon_vma is never reused: + * Do not chose parent anon_vma, otherwise first child + * will always reuse it. Root anon_vma is never reused: * it has self-parent reference and at least one child. */ - if (!dst->anon_vma && src->anon_vma && - anon_vma->num_children < 2 && - anon_vma->num_active_vmas == 0) + if (!dst->anon_vma && anon_vma != src->anon_vma && + anon_vma->degree < 2) dst->anon_vma = anon_vma; } if (dst->anon_vma) - dst->anon_vma->num_active_vmas++; + dst->anon_vma->degree++; unlock_anon_vma_root(root); return 0; @@ -343,7 +342,6 @@ int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma) anon_vma = anon_vma_alloc(); if (!anon_vma) goto out_error; - anon_vma->num_active_vmas++; avc = anon_vma_chain_alloc(GFP_KERNEL); if (!avc) goto out_error_free_anon_vma; @@ -364,7 +362,7 @@ int anon_vma_fork(struct vm_area_struct *vma, struct vm_area_struct *pvma) vma->anon_vma = anon_vma; anon_vma_lock_write(anon_vma); anon_vma_chain_link(vma, avc, anon_vma); - anon_vma->parent->num_children++; + anon_vma->parent->degree++; anon_vma_unlock_write(anon_vma); return 0; @@ -396,7 +394,7 @@ void unlink_anon_vmas(struct vm_area_struct *vma) * to free them outside the lock. */ if (RB_EMPTY_ROOT(&anon_vma->rb_root.rb_root)) { - anon_vma->parent->num_children--; + anon_vma->parent->degree--; continue; } @@ -404,8 +402,7 @@ void unlink_anon_vmas(struct vm_area_struct *vma) anon_vma_chain_free(avc); } if (vma->anon_vma) - vma->anon_vma->num_active_vmas--; - + vma->anon_vma->degree--; unlock_anon_vma_root(root); /* @@ -416,8 +413,7 @@ void unlink_anon_vmas(struct vm_area_struct *vma) list_for_each_entry_safe(avc, next, &vma->anon_vma_chain, same_vma) { struct anon_vma *anon_vma = avc->anon_vma; - VM_WARN_ON(anon_vma->num_children); - VM_WARN_ON(anon_vma->num_active_vmas); + VM_WARN_ON(anon_vma->degree); put_anon_vma(anon_vma); list_del(&avc->same_vma); @@ -507,11 +503,9 @@ struct anon_vma *page_get_anon_vma(struct page *page) * * Its a little more complex as it tries to keep the fast path to a single * atomic op -- the trylock. If we fail the trylock, we fall back to getting a - * reference like with page_get_anon_vma() and then block on the mutex - * on !rwc->try_lock case. + * reference like with page_get_anon_vma() and then block on the mutex. */ -struct anon_vma *page_lock_anon_vma_read(struct page *page, - struct rmap_walk_control *rwc) +struct anon_vma *page_lock_anon_vma_read(struct page *page) { struct anon_vma *anon_vma = NULL; struct anon_vma *root_anon_vma; @@ -539,12 +533,6 @@ struct anon_vma *page_lock_anon_vma_read(struct page *page, goto out; } - if (rwc && rwc->try_lock) { - anon_vma = NULL; - rwc->contended = true; - goto out; - } - /* trylock failed, we got to sleep */ if (!atomic_inc_not_zero(&anon_vma->refcount)) { anon_vma = NULL; @@ -840,10 +828,8 @@ static bool invalid_page_referenced_vma(struct vm_area_struct *vma, void *arg) * @memcg: target memory cgroup * @vm_flags: collect encountered vma->vm_flags who actually referenced the page * - * Quick test_and_clear_referenced for all mappings of a page, - * - * Return: The number of mappings which referenced the page. Return -1 if - * the function bailed out due to rmap lock contention. + * Quick test_and_clear_referenced for all mappings to a page, + * returns the number of ptes which referenced the page. */ int page_referenced(struct page *page, int is_locked, @@ -859,7 +845,6 @@ int page_referenced(struct page *page, .rmap_one = page_referenced_one, .arg = (void *)&pra, .anon_lock = page_lock_anon_vma_read, - .try_lock = true, }; *vm_flags = 0; @@ -890,7 +875,7 @@ int page_referenced(struct page *page, if (we_locked) unlock_page(page); - return rwc.contended ? -1 : pra.referenced; + return pra.referenced; } static bool page_mkclean_one(struct page *page, struct vm_area_struct *vma, @@ -1831,7 +1816,7 @@ static struct anon_vma *rmap_walk_anon_lock(struct page *page, struct anon_vma *anon_vma; if (rwc->anon_lock) - return rwc->anon_lock(page, rwc); + return rwc->anon_lock(page); /* * Note: remove_migration_ptes() cannot use page_lock_anon_vma_read() @@ -1843,17 +1828,7 @@ static struct anon_vma *rmap_walk_anon_lock(struct page *page, if (!anon_vma) return NULL; - if (anon_vma_trylock_read(anon_vma)) - goto out; - - if (rwc->try_lock) { - anon_vma = NULL; - rwc->contended = true; - goto out; - } - anon_vma_lock_read(anon_vma); -out: return anon_vma; } @@ -1944,18 +1919,8 @@ static void rmap_walk_file(struct page *page, struct rmap_walk_control *rwc, pgoff_start = page_to_pgoff(page); pgoff_end = pgoff_start + hpage_nr_pages(page) - 1; - if (!locked) { - if (i_mmap_trylock_read(mapping)) - goto lookup; - - if (rwc->try_lock) { - rwc->contended = true; - return; - } - + if (!locked) i_mmap_lock_read(mapping); - } -lookup: vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff_start, pgoff_end) { unsigned long address = vma_address(page, vma);
diff --git a/mm/slub.c b/mm/slub.c index 0349db6..2368c63 100644 --- a/mm/slub.c +++ b/mm/slub.c
@@ -5872,8 +5872,7 @@ static char *create_unique_id(struct kmem_cache *s) char *name = kmalloc(ID_STR_LENGTH, GFP_KERNEL); char *p = name; - if (!name) - return ERR_PTR(-ENOMEM); + BUG_ON(!name); *p++ = ':'; /* @@ -5955,8 +5954,6 @@ static int sysfs_slab_add(struct kmem_cache *s) * for the symlinks. */ name = create_unique_id(s); - if (IS_ERR(name)) - return PTR_ERR(name); } s->kobj.kset = kset;
diff --git a/mm/swapfile.c b/mm/swapfile.c index 2b5e1b2..8096cfe 100644 --- a/mm/swapfile.c +++ b/mm/swapfile.c
@@ -674,7 +674,6 @@ static void __del_from_avail_list(struct swap_info_struct *p) { int nid; - assert_spin_locked(&p->lock); for_each_node(nid) plist_del(&p->avail_lists[nid], &swap_avail_heads[nid]); } @@ -1123,7 +1122,6 @@ int get_swap_pages(int n_goal, swp_entry_t swp_entries[], int entry_size) goto check_out; pr_debug("scan_swap_map of si %d failed to find offset\n", si->type); - cond_resched(); spin_lock(&swap_avail_lock); nextsi: @@ -2641,8 +2639,8 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile) spin_unlock(&swap_lock); goto out_dput; } - spin_lock(&p->lock); del_from_avail_list(p); + spin_lock(&p->lock); if (p->prio < 0) { struct swap_info_struct *si = p; int nid;
diff --git a/mm/userfaultfd.c b/mm/userfaultfd.c index 1f6ff1f..592fe1d 100644 --- a/mm/userfaultfd.c +++ b/mm/userfaultfd.c
@@ -33,7 +33,7 @@ int mfill_atomic_install_pte(struct mm_struct *dst_mm, pmd_t *dst_pmd, pte_t _dst_pte, *dst_pte; bool writable = dst_vma->vm_flags & VM_WRITE; bool vm_shared = dst_vma->vm_flags & VM_SHARED; - bool page_in_cache = page_mapping(page); + bool page_in_cache = page->mapping; spinlock_t *ptl; struct inode *inode; pgoff_t offset, max_off;
diff --git a/mm/vmscan.c b/mm/vmscan.c index ad04a9d..76b3044 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c
@@ -1054,10 +1054,6 @@ static enum page_references page_check_references(struct page *page, if (vm_flags & VM_LOCKED) return PAGEREF_RECLAIM; - /* rmap lock contention: rotate */ - if (referenced_ptes == -1) - return PAGEREF_KEEP; - if (referenced_ptes) { if (PageSwapBacked(page)) return PAGEREF_ACTIVATE; @@ -2201,9 +2197,8 @@ static void shrink_active_list(unsigned long nr_to_scan, } } - /* Referenced or rmap lock contention: rotate */ if (page_referenced(page, 0, sc->target_mem_cgroup, - &vm_flags) != 0) { + &vm_flags)) { /* * Identify referenced, file-backed active pages and * give them one more trip around the active list. So
diff --git a/net/802/mrp.c b/net/802/mrp.c index 486becf..5b804db 100644 --- a/net/802/mrp.c +++ b/net/802/mrp.c
@@ -606,10 +606,7 @@ static void mrp_join_timer(struct timer_list *t) spin_unlock(&app->lock); mrp_queue_xmit(app); - spin_lock(&app->lock); - if (likely(app->active)) - mrp_join_timer_arm(app); - spin_unlock(&app->lock); + mrp_join_timer_arm(app); } static void mrp_periodic_timer_arm(struct mrp_applicant *app) @@ -623,12 +620,11 @@ static void mrp_periodic_timer(struct timer_list *t) struct mrp_applicant *app = from_timer(app, t, periodic_timer); spin_lock(&app->lock); - if (likely(app->active)) { - mrp_mad_event(app, MRP_EVENT_PERIODIC); - mrp_pdu_queue(app); - mrp_periodic_timer_arm(app); - } + mrp_mad_event(app, MRP_EVENT_PERIODIC); + mrp_pdu_queue(app); spin_unlock(&app->lock); + + mrp_periodic_timer_arm(app); } static int mrp_pdu_parse_end_mark(struct sk_buff *skb, int *offset) @@ -876,7 +872,6 @@ int mrp_init_applicant(struct net_device *dev, struct mrp_application *appl) app->dev = dev; app->app = appl; app->mad = RB_ROOT; - app->active = true; spin_lock_init(&app->lock); skb_queue_head_init(&app->queue); rcu_assign_pointer(dev->mrp_port->applicants[appl->type], app); @@ -905,9 +900,6 @@ void mrp_uninit_applicant(struct net_device *dev, struct mrp_application *appl) RCU_INIT_POINTER(port->applicants[appl->type], NULL); - spin_lock_bh(&app->lock); - app->active = false; - spin_unlock_bh(&app->lock); /* Delete timer and generate a final TX event to flush out * all pending messages before the applicant is gone. */
diff --git a/net/9p/client.c b/net/9p/client.c index 9368a1c..b03fce6 100644 --- a/net/9p/client.c +++ b/net/9p/client.c
@@ -893,13 +893,16 @@ static struct p9_fid *p9_fid_create(struct p9_client *clnt) struct p9_fid *fid; p9_debug(P9_DEBUG_FID, "clnt %p\n", clnt); - fid = kzalloc(sizeof(struct p9_fid), GFP_KERNEL); + fid = kmalloc(sizeof(struct p9_fid), GFP_KERNEL); if (!fid) return NULL; + memset(&fid->qid, 0, sizeof(struct p9_qid)); fid->mode = -1; fid->uid = current_fsuid(); fid->clnt = clnt; + fid->rdir = NULL; + fid->fid = 0; idr_preload(GFP_KERNEL); spin_lock_irq(&clnt->lock);
diff --git a/net/9p/trans_fd.c b/net/9p/trans_fd.c index 872568c..60eb9a2 100644 --- a/net/9p/trans_fd.c +++ b/net/9p/trans_fd.c
@@ -118,7 +118,7 @@ struct p9_conn { struct list_head unsent_req_list; struct p9_req_t *rreq; struct p9_req_t *wreq; - char tmp_buf[P9_HDRSZ]; + char tmp_buf[7]; struct p9_fcall rc; int wpos; int wsize; @@ -200,15 +200,11 @@ static void p9_conn_cancel(struct p9_conn *m, int err) list_for_each_entry_safe(req, rtmp, &m->req_list, req_list) { list_move(&req->req_list, &cancel_list); - req->status = REQ_STATUS_ERROR; } list_for_each_entry_safe(req, rtmp, &m->unsent_req_list, req_list) { list_move(&req->req_list, &cancel_list); - req->status = REQ_STATUS_ERROR; } - spin_unlock(&m->client->lock); - list_for_each_entry_safe(req, rtmp, &cancel_list, req_list) { p9_debug(P9_DEBUG_ERROR, "call back req %p\n", req); list_del(&req->req_list); @@ -216,6 +212,7 @@ static void p9_conn_cancel(struct p9_conn *m, int err) req->t_err = err; p9_client_cb(m->client, req, REQ_STATUS_ERROR); } + spin_unlock(&m->client->lock); } static __poll_t @@ -291,7 +288,7 @@ static void p9_read_work(struct work_struct *work) if (!m->rc.sdata) { m->rc.sdata = m->tmp_buf; m->rc.offset = 0; - m->rc.capacity = P9_HDRSZ; /* start by reading header */ + m->rc.capacity = 7; /* start by reading header */ } clear_bit(Rpending, &m->wsched); @@ -314,7 +311,7 @@ static void p9_read_work(struct work_struct *work) p9_debug(P9_DEBUG_TRANS, "got new header\n"); /* Header size */ - m->rc.size = P9_HDRSZ; + m->rc.size = 7; err = p9_parse_header(&m->rc, &m->rc.size, NULL, NULL, 0); if (err) { p9_debug(P9_DEBUG_ERROR, @@ -823,14 +820,11 @@ static int p9_fd_open(struct p9_client *client, int rfd, int wfd) goto out_free_ts; if (!(ts->rd->f_mode & FMODE_READ)) goto out_put_rd; - /* prevent workers from hanging on IO when fd is a pipe */ - ts->rd->f_flags |= O_NONBLOCK; ts->wr = fget(wfd); if (!ts->wr) goto out_put_rd; if (!(ts->wr->f_mode & FMODE_WRITE)) goto out_put_wr; - ts->wr->f_flags |= O_NONBLOCK; client->trans = ts; client->status = Connected; @@ -852,10 +846,8 @@ static int p9_socket_open(struct p9_client *client, struct socket *csocket) struct file *file; p = kzalloc(sizeof(struct p9_trans_fd), GFP_KERNEL); - if (!p) { - sock_release(csocket); + if (!p) return -ENOMEM; - } csocket->sk->sk_allocation = GFP_NOIO; file = sock_alloc_file(csocket, 0, NULL);
diff --git a/net/9p/trans_rdma.c b/net/9p/trans_rdma.c index c00e965..b21c3c2 100644 --- a/net/9p/trans_rdma.c +++ b/net/9p/trans_rdma.c
@@ -385,7 +385,6 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c) struct p9_trans_rdma *rdma = client->trans; struct ib_recv_wr wr; struct ib_sge sge; - int ret; c->busa = ib_dma_map_single(rdma->cm_id->device, c->rc.sdata, client->msize, @@ -403,12 +402,7 @@ post_recv(struct p9_client *client, struct p9_rdma_context *c) wr.wr_cqe = &c->cqe; wr.sg_list = &sge; wr.num_sge = 1; - - ret = ib_post_recv(rdma->qp, &wr, NULL); - if (ret) - ib_dma_unmap_single(rdma->cm_id->device, c->busa, - client->msize, DMA_FROM_DEVICE); - return ret; + return ib_post_recv(rdma->qp, &wr, NULL); error: p9_debug(P9_DEBUG_ERROR, "EIO\n"); @@ -505,7 +499,7 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) if (down_interruptible(&rdma->sq_sem)) { err = -EINTR; - goto dma_unmap; + goto send_error; } /* Mark request as `sent' *before* we actually send it, @@ -515,14 +509,11 @@ static int rdma_request(struct p9_client *client, struct p9_req_t *req) req->status = REQ_STATUS_SENT; err = ib_post_send(rdma->qp, &wr, NULL); if (err) - goto dma_unmap; + goto send_error; /* Success */ return 0; -dma_unmap: - ib_dma_unmap_single(rdma->cm_id->device, c->busa, - c->req->tc.size, DMA_TO_DEVICE); /* Handle errors that happened during or while preparing the send: */ send_error: req->status = REQ_STATUS_ERROR;
diff --git a/net/9p/trans_xen.c b/net/9p/trans_xen.c index 4a16c5d..2779ec1 100644 --- a/net/9p/trans_xen.c +++ b/net/9p/trans_xen.c
@@ -230,14 +230,6 @@ static void p9_xen_response(struct work_struct *work) continue; } - if (h.size > req->rc.capacity) { - dev_warn(&priv->dev->dev, - "requested packet size too big: %d for tag %d with capacity %zd\n", - h.size, h.tag, req->rc.capacity); - req->status = REQ_STATUS_ERROR; - goto recv_error; - } - memcpy(&req->rc, &h, sizeof(h)); req->rc.offset = 0; @@ -247,7 +239,6 @@ static void p9_xen_response(struct work_struct *work) masked_prod, &masked_cons, XEN_9PFS_RING_SIZE); -recv_error: virt_mb(); cons += h.size; ring->intf->in_cons = cons; @@ -299,10 +290,6 @@ static void xen_9pfs_front_free(struct xen_9pfs_front_priv *priv) write_unlock(&xen_9pfs_lock); for (i = 0; i < priv->num_rings; i++) { - struct xen_9pfs_dataring *ring = &priv->rings[i]; - - cancel_work_sync(&ring->work); - if (!priv->rings[i].intf) break; if (priv->rings[i].irq > 0) @@ -393,24 +380,19 @@ static int xen_9pfs_front_alloc_dataring(struct xenbus_device *dev, return ret; } -static int xen_9pfs_front_init(struct xenbus_device *dev) +static int xen_9pfs_front_probe(struct xenbus_device *dev, + const struct xenbus_device_id *id) { int ret, i; struct xenbus_transaction xbt; - struct xen_9pfs_front_priv *priv = dev_get_drvdata(&dev->dev); - char *versions, *v; + struct xen_9pfs_front_priv *priv = NULL; + char *versions; unsigned int max_rings, max_ring_order, len = 0; versions = xenbus_read(XBT_NIL, dev->otherend, "versions", &len); if (IS_ERR(versions)) return PTR_ERR(versions); - for (v = versions; *v; v++) { - if (simple_strtoul(v, &v, 10) == 1) { - v = NULL; - break; - } - } - if (v) { + if (strcmp(versions, "1")) { kfree(versions); return -EINVAL; } @@ -423,6 +405,11 @@ static int xen_9pfs_front_init(struct xenbus_device *dev) if (max_ring_order < XEN_9PFS_RING_ORDER) return -EINVAL; + priv = kzalloc(sizeof(*priv), GFP_KERNEL); + if (!priv) + return -ENOMEM; + + priv->dev = dev; priv->num_rings = XEN_9PFS_NUM_RINGS; priv->rings = kcalloc(priv->num_rings, sizeof(*priv->rings), GFP_KERNEL); @@ -480,35 +467,23 @@ static int xen_9pfs_front_init(struct xenbus_device *dev) goto error; } + write_lock(&xen_9pfs_lock); + list_add_tail(&priv->list, &xen_9pfs_devs); + write_unlock(&xen_9pfs_lock); + dev_set_drvdata(&dev->dev, priv); + xenbus_switch_state(dev, XenbusStateInitialised); + return 0; error_xenbus: xenbus_transaction_end(xbt, 1); xenbus_dev_fatal(dev, ret, "writing xenstore"); error: + dev_set_drvdata(&dev->dev, NULL); xen_9pfs_front_free(priv); return ret; } -static int xen_9pfs_front_probe(struct xenbus_device *dev, - const struct xenbus_device_id *id) -{ - struct xen_9pfs_front_priv *priv = NULL; - - priv = kzalloc(sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - - priv->dev = dev; - dev_set_drvdata(&dev->dev, priv); - - write_lock(&xen_9pfs_lock); - list_add_tail(&priv->list, &xen_9pfs_devs); - write_unlock(&xen_9pfs_lock); - - return 0; -} - static int xen_9pfs_front_resume(struct xenbus_device *dev) { dev_warn(&dev->dev, "suspend/resume unsupported\n"); @@ -527,8 +502,6 @@ static void xen_9pfs_front_changed(struct xenbus_device *dev, break; case XenbusStateInitWait: - if (!xen_9pfs_front_init(dev)) - xenbus_switch_state(dev, XenbusStateInitialised); break; case XenbusStateConnected:
diff --git a/net/TEST_MAPPING b/net/TEST_MAPPING deleted file mode 100644 index c8614a6..0000000 --- a/net/TEST_MAPPING +++ /dev/null
@@ -1,7 +0,0 @@ -{ - "presubmit": [ - { - "name": "CtsNetTestCases" - } - ] -}
diff --git a/net/atm/mpoa_proc.c b/net/atm/mpoa_proc.c index c4e9538..46d6cd9 100644 --- a/net/atm/mpoa_proc.c +++ b/net/atm/mpoa_proc.c
@@ -222,12 +222,11 @@ static ssize_t proc_mpc_write(struct file *file, const char __user *buff, if (!page) return -ENOMEM; - for (p = page, len = 0; len < nbytes; p++) { + for (p = page, len = 0; len < nbytes; p++, len++) { if (get_user(*p, buff++)) { free_page((unsigned long)page); return -EFAULT; } - len += 1; if (*p == '\0' || *p == '\n') break; }
diff --git a/net/atm/pppoatm.c b/net/atm/pppoatm.c index 579b66d..45d8e1d 100644 --- a/net/atm/pppoatm.c +++ b/net/atm/pppoatm.c
@@ -393,7 +393,7 @@ static int pppoatm_assign_vcc(struct atm_vcc *atmvcc, void __user *arg) * Each PPPoATM instance has its own tasklet - this is just a * prototypical one used to initialize them */ - static const DECLARE_TASKLET_OLD(tasklet_proto, pppoatm_wakeup_sender); + static const DECLARE_TASKLET(tasklet_proto, pppoatm_wakeup_sender, 0); if (copy_from_user(&be, arg, sizeof be)) return -EFAULT; if (be.encaps != PPPOATM_ENCAPS_AUTODETECT &&
diff --git a/net/bluetooth/6lowpan.c b/net/bluetooth/6lowpan.c index bccad8c..52fb6d6 100644 --- a/net/bluetooth/6lowpan.c +++ b/net/bluetooth/6lowpan.c
@@ -1002,7 +1002,6 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type, hci_dev_lock(hdev); hcon = hci_conn_hash_lookup_le(hdev, addr, *addr_type); hci_dev_unlock(hdev); - hci_dev_put(hdev); if (!hcon) return -ENOENT;
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c index 8031526..5f508c5 100644 --- a/net/bluetooth/af_bluetooth.c +++ b/net/bluetooth/af_bluetooth.c
@@ -735,7 +735,7 @@ static int __init bt_init(void) err = bt_sysfs_init(); if (err < 0) - goto cleanup_led; + return err; err = sock_register(&bt_sock_family_ops); if (err) @@ -771,8 +771,6 @@ static int __init bt_init(void) sock_unregister(PF_BLUETOOTH); cleanup_sysfs: bt_sysfs_cleanup(); -cleanup_led: - bt_leds_cleanup(); return err; }
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c index eb5b2f4..2ebb648 100644 --- a/net/bluetooth/hci_core.c +++ b/net/bluetooth/hci_core.c
@@ -1582,7 +1582,6 @@ static int hci_dev_do_open(struct hci_dev *hdev) hdev->flush(hdev); if (hdev->sent_cmd) { - cancel_delayed_work_sync(&hdev->cmd_timer); kfree_skb(hdev->sent_cmd); hdev->sent_cmd = NULL; } @@ -4456,7 +4455,7 @@ void hci_req_cmd_complete(struct hci_dev *hdev, u16 opcode, u8 status, *req_complete_skb = bt_cb(skb)->hci.req_complete_skb; else *req_complete = bt_cb(skb)->hci.req_complete; - dev_kfree_skb_irq(skb); + kfree_skb(skb); } spin_unlock_irqrestore(&hdev->cmd_q.lock, flags); }
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c index 84b4309..ff66254 100644 --- a/net/bluetooth/hci_event.c +++ b/net/bluetooth/hci_event.c
@@ -4177,19 +4177,6 @@ static void hci_sync_conn_complete_evt(struct hci_dev *hdev, struct hci_ev_sync_conn_complete *ev = (void *) skb->data; struct hci_conn *conn; - switch (ev->link_type) { - case SCO_LINK: - case ESCO_LINK: - break; - default: - /* As per Core 5.3 Vol 4 Part E 7.7.35 (p.2219), Link_Type - * for HCI_Synchronous_Connection_Complete is limited to - * either SCO or eSCO - */ - bt_dev_err(hdev, "Ignoring connect complete event for invalid link type"); - return; - } - BT_DBG("%s status 0x%2.2x", hdev->name, ev->status); hci_dev_lock(hdev);
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c index 4f8f520..befab85 100644 --- a/net/bluetooth/hci_sock.c +++ b/net/bluetooth/hci_sock.c
@@ -881,6 +881,10 @@ static int hci_sock_release(struct socket *sock) } sock_orphan(sk); + + skb_queue_purge(&sk->sk_receive_queue); + skb_queue_purge(&sk->sk_write_queue); + release_sock(sk); sock_put(sk); return 0; @@ -989,14 +993,7 @@ static int hci_sock_ioctl(struct socket *sock, unsigned int cmd, if (hci_sock_gen_cookie(sk)) { struct sk_buff *skb; - /* Perform careful checks before setting the HCI_SOCK_TRUSTED - * flag. Make sure that not only the current task but also - * the socket opener has the required capability, since - * privileged programs can be tricked into making ioctl calls - * on HCI sockets, and the socket should not be marked as - * trusted simply because the ioctl caller is privileged. - */ - if (sk_capable(sk, CAP_NET_ADMIN)) + if (capable(CAP_NET_ADMIN)) hci_sock_set_flag(sk, HCI_SOCK_TRUSTED); /* Send event to monitor */ @@ -1988,12 +1985,6 @@ static int hci_sock_getsockopt(struct socket *sock, int level, int optname, return err; } -static void hci_sock_destruct(struct sock *sk) -{ - skb_queue_purge(&sk->sk_receive_queue); - skb_queue_purge(&sk->sk_write_queue); -} - static const struct proto_ops hci_sock_ops = { .family = PF_BLUETOOTH, .owner = THIS_MODULE, @@ -2044,7 +2035,6 @@ static int hci_sock_create(struct net *net, struct socket *sock, int protocol, sock->state = SS_UNCONNECTED; sk->sk_state = BT_OPEN; - sk->sk_destruct = hci_sock_destruct; bt_sock_link(&hci_sk_list, sk); return 0;
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index ccd2c37..b69d88b 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c
@@ -48,9 +48,6 @@ void hci_conn_add_sysfs(struct hci_conn *conn) BT_DBG("conn %p", conn); - if (device_is_registered(&conn->dev)) - return; - dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle); if (device_add(&conn->dev) < 0) {
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c index a94ec22..ac98e3b 100644 --- a/net/bluetooth/hidp/core.c +++ b/net/bluetooth/hidp/core.c
@@ -433,7 +433,7 @@ static void hidp_set_timer(struct hidp_session *session) static void hidp_del_timer(struct hidp_session *session) { if (session->idle_to > 0) - del_timer_sync(&session->timer); + del_timer(&session->timer); } static void hidp_process_report(struct hidp_session *session, int type,
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 3c559a1..7aa64f3 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c
@@ -60,9 +60,6 @@ static void l2cap_send_disconn_req(struct l2cap_chan *chan, int err); static void l2cap_tx(struct l2cap_chan *chan, struct l2cap_ctrl *control, struct sk_buff_head *skbs, u8 event); -static void l2cap_retrans_timeout(struct work_struct *work); -static void l2cap_monitor_timeout(struct work_struct *work); -static void l2cap_ack_timeout(struct work_struct *work); static inline u8 bdaddr_type(u8 link_type, u8 bdaddr_type) { @@ -478,9 +475,6 @@ struct l2cap_chan *l2cap_chan_create(void) write_unlock(&chan_list_lock); INIT_DELAYED_WORK(&chan->chan_timer, l2cap_chan_timeout); - INIT_DELAYED_WORK(&chan->retrans_timer, l2cap_retrans_timeout); - INIT_DELAYED_WORK(&chan->monitor_timer, l2cap_monitor_timeout); - INIT_DELAYED_WORK(&chan->ack_timer, l2cap_ack_timeout); chan->state = BT_OPEN; @@ -1833,7 +1827,7 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, if (link_type == LE_LINK && c->src_type == BDADDR_BREDR) continue; - if (c->chan_type != L2CAP_CHAN_FIXED && c->psm == psm) { + if (c->psm == psm) { int src_match, dst_match; int src_any, dst_any; @@ -1841,11 +1835,11 @@ static struct l2cap_chan *l2cap_global_chan_by_psm(int state, __le16 psm, src_match = !bacmp(&c->src, src); dst_match = !bacmp(&c->dst, dst); if (src_match && dst_match) { - if (!l2cap_chan_hold_unless_zero(c)) - continue; - - read_unlock(&chan_list_lock); - return c; + c = l2cap_chan_hold_unless_zero(c); + if (c) { + read_unlock(&chan_list_lock); + return c; + } } /* Closest match */ @@ -2526,6 +2520,14 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len) if (IS_ERR(skb)) return PTR_ERR(skb); + /* Channel lock is released before requesting new skb and then + * reacquired thus we need to recheck channel state. + */ + if (chan->state != BT_CONNECTED) { + kfree_skb(skb); + return -ENOTCONN; + } + l2cap_do_send(chan, skb); return len; } @@ -2569,6 +2571,14 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len) if (IS_ERR(skb)) return PTR_ERR(skb); + /* Channel lock is released before requesting new skb and then + * reacquired thus we need to recheck channel state. + */ + if (chan->state != BT_CONNECTED) { + kfree_skb(skb); + return -ENOTCONN; + } + l2cap_do_send(chan, skb); err = len; break; @@ -2589,6 +2599,14 @@ int l2cap_chan_send(struct l2cap_chan *chan, struct msghdr *msg, size_t len) */ err = l2cap_segment_sdu(chan, &seg_queue, msg, len); + /* The channel could have been closed while segmenting, + * check that it is still connected. + */ + if (chan->state != BT_CONNECTED) { + __skb_queue_purge(&seg_queue); + err = -ENOTCONN; + } + if (err) break; @@ -3145,6 +3163,10 @@ int l2cap_ertm_init(struct l2cap_chan *chan) chan->rx_state = L2CAP_RX_STATE_RECV; chan->tx_state = L2CAP_TX_STATE_XMIT; + INIT_DELAYED_WORK(&chan->retrans_timer, l2cap_retrans_timeout); + INIT_DELAYED_WORK(&chan->monitor_timer, l2cap_monitor_timeout); + INIT_DELAYED_WORK(&chan->ack_timer, l2cap_ack_timeout); + skb_queue_head_init(&chan->srej_q); err = l2cap_seq_list_init(&chan->srej_list, chan->tx_win); @@ -3536,8 +3558,7 @@ static int l2cap_parse_conf_req(struct l2cap_chan *chan, void *data, size_t data l2cap_add_conf_opt(&ptr, L2CAP_CONF_RFC, sizeof(rfc), (unsigned long) &rfc, endptr - ptr); - if (remote_efs && - test_bit(FLAG_EFS_ENABLE, &chan->flags)) { + if (test_bit(FLAG_EFS_ENABLE, &chan->flags)) { chan->remote_id = efs.id; chan->remote_stype = efs.stype; chan->remote_msdu = le16_to_cpu(efs.msdu); @@ -4043,12 +4064,6 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn, } } - chan = l2cap_chan_hold_unless_zero(chan); - if (!chan) { - err = -EBADSLT; - goto unlock; - } - err = 0; l2cap_chan_lock(chan); @@ -4078,7 +4093,6 @@ static int l2cap_connect_create_rsp(struct l2cap_conn *conn, } l2cap_chan_unlock(chan); - l2cap_chan_put(chan); unlock: mutex_unlock(&conn->chan_lock); @@ -4186,8 +4200,7 @@ static inline int l2cap_config_req(struct l2cap_conn *conn, chan->ident = cmd->ident; l2cap_send_cmd(conn, cmd->ident, L2CAP_CONF_RSP, len, rsp); - if (chan->num_conf_rsp < L2CAP_CONF_MAX_CONF_RSP) - chan->num_conf_rsp++; + chan->num_conf_rsp++; /* Reset config buffer. */ chan->conf_len = 0; @@ -4368,27 +4381,33 @@ static inline int l2cap_disconnect_req(struct l2cap_conn *conn, BT_DBG("scid 0x%4.4x dcid 0x%4.4x", scid, dcid); - chan = l2cap_get_chan_by_scid(conn, dcid); + mutex_lock(&conn->chan_lock); + + chan = __l2cap_get_chan_by_scid(conn, dcid); if (!chan) { + mutex_unlock(&conn->chan_lock); cmd_reject_invalid_cid(conn, cmd->ident, dcid, scid); return 0; } + l2cap_chan_hold(chan); + l2cap_chan_lock(chan); + rsp.dcid = cpu_to_le16(chan->scid); rsp.scid = cpu_to_le16(chan->dcid); l2cap_send_cmd(conn, cmd->ident, L2CAP_DISCONN_RSP, sizeof(rsp), &rsp); chan->ops->set_shutdown(chan); - mutex_lock(&conn->chan_lock); l2cap_chan_del(chan, ECONNRESET); - mutex_unlock(&conn->chan_lock); chan->ops->close(chan); l2cap_chan_unlock(chan); l2cap_chan_put(chan); + mutex_unlock(&conn->chan_lock); + return 0; } @@ -4408,27 +4427,33 @@ static inline int l2cap_disconnect_rsp(struct l2cap_conn *conn, BT_DBG("dcid 0x%4.4x scid 0x%4.4x", dcid, scid); - chan = l2cap_get_chan_by_scid(conn, scid); + mutex_lock(&conn->chan_lock); + + chan = __l2cap_get_chan_by_scid(conn, scid); if (!chan) { mutex_unlock(&conn->chan_lock); return 0; } + l2cap_chan_hold(chan); + l2cap_chan_lock(chan); + if (chan->state != BT_DISCONN) { l2cap_chan_unlock(chan); l2cap_chan_put(chan); + mutex_unlock(&conn->chan_lock); return 0; } - mutex_lock(&conn->chan_lock); l2cap_chan_del(chan, 0); - mutex_unlock(&conn->chan_lock); chan->ops->close(chan); l2cap_chan_unlock(chan); l2cap_chan_put(chan); + mutex_unlock(&conn->chan_lock); + return 0; } @@ -5536,19 +5561,6 @@ static int l2cap_le_connect_req(struct l2cap_conn *conn, BT_DBG("psm 0x%2.2x scid 0x%4.4x mtu %u mps %u", __le16_to_cpu(psm), scid, mtu, mps); - /* BLUETOOTH CORE SPECIFICATION Version 5.3 | Vol 3, Part A - * page 1059: - * - * Valid range: 0x0001-0x00ff - * - * Table 4.15: L2CAP_LE_CREDIT_BASED_CONNECTION_REQ SPSM ranges - */ - if (!psm || __le16_to_cpu(psm) > L2CAP_PSM_LE_DYN_END) { - result = L2CAP_CR_LE_BAD_PSM; - chan = NULL; - goto response; - } - /* Check if we have socket listening on psm */ pchan = l2cap_global_chan_by_psm(BT_LISTEN, psm, &conn->hcon->src, &conn->hcon->dst, LE_LINK); @@ -6252,7 +6264,6 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan, struct l2cap_ctrl *control, struct sk_buff *skb, u8 event) { - struct l2cap_ctrl local_control; int err = 0; bool skb_in_use = false; @@ -6277,32 +6288,15 @@ static int l2cap_rx_state_recv(struct l2cap_chan *chan, chan->buffer_seq = chan->expected_tx_seq; skb_in_use = true; - /* l2cap_reassemble_sdu may free skb, hence invalidate - * control, so make a copy in advance to use it after - * l2cap_reassemble_sdu returns and to avoid the race - * condition, for example: - * - * The current thread calls: - * l2cap_reassemble_sdu - * chan->ops->recv == l2cap_sock_recv_cb - * __sock_queue_rcv_skb - * Another thread calls: - * bt_sock_recvmsg - * skb_recv_datagram - * skb_free_datagram - * Then the current thread tries to access control, but - * it was freed by skb_free_datagram. - */ - local_control = *control; err = l2cap_reassemble_sdu(chan, skb, control); if (err) break; - if (local_control.final) { + if (control->final) { if (!test_and_clear_bit(CONN_REJ_ACT, &chan->conn_state)) { - local_control.final = 0; - l2cap_retransmit_all(chan, &local_control); + control->final = 0; + l2cap_retransmit_all(chan, control); l2cap_ertm_send(chan); } } @@ -6682,27 +6676,11 @@ static int l2cap_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control, static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control, struct sk_buff *skb) { - /* l2cap_reassemble_sdu may free skb, hence invalidate control, so store - * the txseq field in advance to use it after l2cap_reassemble_sdu - * returns and to avoid the race condition, for example: - * - * The current thread calls: - * l2cap_reassemble_sdu - * chan->ops->recv == l2cap_sock_recv_cb - * __sock_queue_rcv_skb - * Another thread calls: - * bt_sock_recvmsg - * skb_recv_datagram - * skb_free_datagram - * Then the current thread tries to access control, but it was freed by - * skb_free_datagram. - */ - u16 txseq = control->txseq; - BT_DBG("chan %p, control %p, skb %p, state %d", chan, control, skb, chan->rx_state); - if (l2cap_classify_txseq(chan, txseq) == L2CAP_TXSEQ_EXPECTED) { + if (l2cap_classify_txseq(chan, control->txseq) == + L2CAP_TXSEQ_EXPECTED) { l2cap_pass_to_tx(chan, control); BT_DBG("buffer_seq %d->%d", chan->buffer_seq, @@ -6725,8 +6703,8 @@ static int l2cap_stream_rx(struct l2cap_chan *chan, struct l2cap_ctrl *control, } } - chan->last_acked_seq = txseq; - chan->expected_tx_seq = __next_seq(chan, txseq); + chan->last_acked_seq = control->txseq; + chan->expected_tx_seq = __next_seq(chan, control->txseq); return 0; } @@ -6980,7 +6958,6 @@ static void l2cap_data_channel(struct l2cap_conn *conn, u16 cid, return; } - l2cap_chan_hold(chan); l2cap_chan_lock(chan); } else { BT_DBG("unknown cid 0x%4.4x", cid);
diff --git a/net/bluetooth/l2cap_sock.c b/net/bluetooth/l2cap_sock.c index 0fa5ced..08e9f33 100644 --- a/net/bluetooth/l2cap_sock.c +++ b/net/bluetooth/l2cap_sock.c
@@ -1433,14 +1433,6 @@ static struct sk_buff *l2cap_sock_alloc_skb_cb(struct l2cap_chan *chan, if (!skb) return ERR_PTR(err); - /* Channel lock is released before requesting new skb and then - * reacquired thus we need to recheck channel state. - */ - if (chan->state != BT_CONNECTED) { - kfree_skb(skb); - return ERR_PTR(-ENOTCONN); - } - skb->priority = sk->sk_priority; bt_cb(skb)->l2cap.chan = chan;
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c index 2db9e28..83a8c48 100644 --- a/net/bluetooth/rfcomm/core.c +++ b/net/bluetooth/rfcomm/core.c
@@ -594,7 +594,7 @@ int rfcomm_dlc_send(struct rfcomm_dlc *d, struct sk_buff *skb) ret = rfcomm_dlc_send_frag(d, frag); if (ret < 0) { - dev_kfree_skb_irq(frag); + kfree_skb(frag); goto unlock; }
diff --git a/net/bpf/test_run.c b/net/bpf/test_run.c index 591d146..1153bbc 100644 --- a/net/bpf/test_run.c +++ b/net/bpf/test_run.c
@@ -114,7 +114,6 @@ static void *bpf_test_init(const union bpf_attr *kattr, u32 size, if (size < ETH_HLEN || size > PAGE_SIZE - headroom - tailroom) return ERR_PTR(-EINVAL); - size = SKB_DATA_ALIGN(size); data = kzalloc(size + headroom + tailroom, GFP_USER); if (!data) return ERR_PTR(-ENOMEM);
diff --git a/net/bridge/br_netfilter_hooks.c b/net/bridge/br_netfilter_hooks.c index 277b6fb..19726d8 100644 --- a/net/bridge/br_netfilter_hooks.c +++ b/net/bridge/br_netfilter_hooks.c
@@ -384,7 +384,6 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_ /* - Bridged-and-DNAT'ed traffic doesn't * require ip_forwarding. */ if (rt->dst.dev == dev) { - skb_dst_drop(skb); skb_dst_set(skb, &rt->dst); goto bridged_dnat; } @@ -414,7 +413,6 @@ static int br_nf_pre_routing_finish(struct net *net, struct sock *sk, struct sk_ kfree_skb(skb); return 0; } - skb_dst_drop(skb); skb_dst_set_noref(skb, &rt->dst); } @@ -868,17 +866,11 @@ static unsigned int ip_sabotage_in(void *priv, { struct nf_bridge_info *nf_bridge = nf_bridge_info_get(skb); - if (nf_bridge) { - if (nf_bridge->sabotage_in_done) - return NF_ACCEPT; - - if (!nf_bridge->in_prerouting && - !netif_is_l3_master(skb->dev) && - !netif_is_l3_slave(skb->dev)) { - nf_bridge->sabotage_in_done = 1; - state->okfn(state->net, state->sk, skb); - return NF_STOLEN; - } + if (nf_bridge && !nf_bridge->in_prerouting && + !netif_is_l3_master(skb->dev) && + !netif_is_l3_slave(skb->dev)) { + state->okfn(state->net, state->sk, skb); + return NF_STOLEN; } return NF_ACCEPT;
diff --git a/net/bridge/br_netfilter_ipv6.c b/net/bridge/br_netfilter_ipv6.c index 6b07f30..e4e0c83 100644 --- a/net/bridge/br_netfilter_ipv6.c +++ b/net/bridge/br_netfilter_ipv6.c
@@ -197,7 +197,6 @@ static int br_nf_pre_routing_finish_ipv6(struct net *net, struct sock *sk, struc kfree_skb(skb); return 0; } - skb_dst_drop(skb); skb_dst_set_noref(skb, &rt->dst); }
diff --git a/net/bridge/netfilter/ebtable_broute.c b/net/bridge/netfilter/ebtable_broute.c index 57f91ef..32bc282 100644 --- a/net/bridge/netfilter/ebtable_broute.c +++ b/net/bridge/netfilter/ebtable_broute.c
@@ -36,10 +36,18 @@ static struct ebt_replace_kernel initial_table = { .entries = (char *)&initial_chain, }; +static int check(const struct ebt_table_info *info, unsigned int valid_hooks) +{ + if (valid_hooks & ~(1 << NF_BR_BROUTING)) + return -EINVAL; + return 0; +} + static const struct ebt_table broute_table = { .name = "broute", .table = &initial_table, .valid_hooks = 1 << NF_BR_BROUTING, + .check = check, .me = THIS_MODULE, };
diff --git a/net/bridge/netfilter/ebtable_filter.c b/net/bridge/netfilter/ebtable_filter.c index 7f2e620..bcf982e 100644 --- a/net/bridge/netfilter/ebtable_filter.c +++ b/net/bridge/netfilter/ebtable_filter.c
@@ -43,10 +43,18 @@ static struct ebt_replace_kernel initial_table = { .entries = (char *)initial_chains, }; +static int check(const struct ebt_table_info *info, unsigned int valid_hooks) +{ + if (valid_hooks & ~FILTER_VALID_HOOKS) + return -EINVAL; + return 0; +} + static const struct ebt_table frame_filter = { .name = "filter", .table = &initial_table, .valid_hooks = FILTER_VALID_HOOKS, + .check = check, .me = THIS_MODULE, };
diff --git a/net/bridge/netfilter/ebtable_nat.c b/net/bridge/netfilter/ebtable_nat.c index 1743a10..0d09277 100644 --- a/net/bridge/netfilter/ebtable_nat.c +++ b/net/bridge/netfilter/ebtable_nat.c
@@ -43,10 +43,18 @@ static struct ebt_replace_kernel initial_table = { .entries = (char *)initial_chains, }; +static int check(const struct ebt_table_info *info, unsigned int valid_hooks) +{ + if (valid_hooks & ~NAT_VALID_HOOKS) + return -EINVAL; + return 0; +} + static const struct ebt_table frame_nat = { .name = "nat", .table = &initial_table, .valid_hooks = NAT_VALID_HOOKS, + .check = check, .me = THIS_MODULE, };
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c index f6853fc..d9375c5 100644 --- a/net/bridge/netfilter/ebtables.c +++ b/net/bridge/netfilter/ebtables.c
@@ -999,10 +999,9 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl, goto free_iterate; } - if (repl->valid_hooks != t->valid_hooks) { - ret = -EINVAL; + /* the table doesn't like it */ + if (t->check && (ret = t->check(newinfo, repl->valid_hooks))) goto free_unlock; - } if (repl->num_counters && repl->num_counters != t->private->nentries) { ret = -EINVAL; @@ -1194,6 +1193,11 @@ int ebt_register_table(struct net *net, const struct ebt_table *input_table, if (ret != 0) goto free_chainstack; + if (table->check && table->check(newinfo, table->valid_hooks)) { + ret = -EINVAL; + goto free_chainstack; + } + table->private = newinfo; rwlock_init(&table->lock); mutex_lock(&ebt_mutex);
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c index 53f19ee..8fa98c6 100644 --- a/net/caif/caif_socket.c +++ b/net/caif/caif_socket.c
@@ -1022,7 +1022,6 @@ static void caif_sock_destructor(struct sock *sk) return; } sk_stream_kill_queues(&cf_sk->sk); - WARN_ON(sk->sk_forward_alloc); caif_free_client(&cf_sk->layer); }
diff --git a/net/caif/caif_usb.c b/net/caif/caif_usb.c index 862226b..46c62dd 100644 --- a/net/caif/caif_usb.c +++ b/net/caif/caif_usb.c
@@ -134,9 +134,6 @@ static int cfusbl_device_notify(struct notifier_block *me, unsigned long what, struct usb_device *usbdev; int res; - if (what == NETDEV_UNREGISTER && dev->reg_state >= NETREG_UNREGISTERED) - return 0; - /* Check whether we have a NCM device, and find its VID/PID. */ if (!(dev->dev.parent && dev->dev.parent->driver && strcmp(dev->dev.parent->driver->name, "cdc_ncm") == 0))
diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c index d8cb4b2..2809cbd 100644 --- a/net/caif/cfctrl.c +++ b/net/caif/cfctrl.c
@@ -269,15 +269,11 @@ int cfctrl_linkup_request(struct cflayer *layer, default: pr_warn("Request setup of bad link type = %d\n", param->linktype); - cfpkt_destroy(pkt); return -EINVAL; } req = kzalloc(sizeof(*req), GFP_KERNEL); - if (!req) { - cfpkt_destroy(pkt); + if (!req) return -ENOMEM; - } - req->client_layer = user_layer; req->cmd = CFCTRL_CMD_LINK_SETUP; req->param = *param;
diff --git a/net/caif/chnl_net.c b/net/caif/chnl_net.c index 4dfac31..910f164 100644 --- a/net/caif/chnl_net.c +++ b/net/caif/chnl_net.c
@@ -314,6 +314,9 @@ static int chnl_net_open(struct net_device *dev) if (result == 0) { pr_debug("connect timeout\n"); + caif_disconnect_client(dev_net(dev), &priv->chnl); + priv->state = CAIF_DISCONNECTED; + pr_debug("state disconnected\n"); result = -ETIMEDOUT; goto error; }
diff --git a/net/can/af_can.c b/net/can/af_can.c index b396c23..c758a12 100644 --- a/net/can/af_can.c +++ b/net/can/af_can.c
@@ -450,7 +450,7 @@ int can_rx_register(struct net *net, struct net_device *dev, canid_t can_id, /* insert new receiver (dev,canid,mask) -> (func,data) */ - if (dev && (dev->type != ARPHRD_CAN || !can_get_ml_priv(dev))) + if (dev && dev->type != ARPHRD_CAN) return -ENODEV; if (dev && !net_eq(net, dev_net(dev))) @@ -678,7 +678,7 @@ static int can_rcv(struct sk_buff *skb, struct net_device *dev, { struct canfd_frame *cfd = (struct canfd_frame *)skb->data; - if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || skb->len != CAN_MTU)) { + if (unlikely(dev->type != ARPHRD_CAN || skb->len != CAN_MTU)) { pr_warn_once("PF_CAN: dropped non conform CAN skbuff: dev type %d, len %d\n", dev->type, skb->len); goto free_skb; @@ -704,7 +704,7 @@ static int canfd_rcv(struct sk_buff *skb, struct net_device *dev, { struct canfd_frame *cfd = (struct canfd_frame *)skb->data; - if (unlikely(dev->type != ARPHRD_CAN || !can_get_ml_priv(dev) || skb->len != CANFD_MTU)) { + if (unlikely(dev->type != ARPHRD_CAN || skb->len != CANFD_MTU)) { pr_warn_once("PF_CAN: dropped non conform CAN FD skbuff: dev type %d, len %d\n", dev->type, skb->len); goto free_skb;
diff --git a/net/can/bcm.c b/net/can/bcm.c index 23c7d5f..63d8114 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c
@@ -276,7 +276,6 @@ static void bcm_can_tx(struct bcm_op *op) struct sk_buff *skb; struct net_device *dev; struct canfd_frame *cf = op->frames + op->cfsiz * op->currframe; - int err; /* no target device? => exit */ if (!op->ifindex) @@ -301,11 +300,11 @@ static void bcm_can_tx(struct bcm_op *op) /* send with loopback */ skb->dev = dev; can_skb_set_owner(skb, op->sk); - err = can_send(skb, 1); - if (!err) - op->frames_abs++; + can_send(skb, 1); + /* update statistics */ op->currframe++; + op->frames_abs++; /* reached last frame? */ if (op->currframe >= op->nframes) @@ -938,8 +937,6 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, cf = op->frames + op->cfsiz * i; err = memcpy_from_msg((u8 *)cf, msg, op->cfsiz); - if (err < 0) - goto free_op; if (op->flags & CAN_FD_FRAME) { if (cf->len > 64) @@ -949,8 +946,12 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, err = -EINVAL; } - if (err < 0) - goto free_op; + if (err < 0) { + if (op->frames != &op->sframe) + kfree(op->frames); + kfree(op); + return err; + } if (msg_head->flags & TX_CP_CAN_ID) { /* copy can_id into frame */ @@ -1021,12 +1022,6 @@ static int bcm_tx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg, bcm_tx_start_timer(op); return msg_head->nframes * op->cfsiz + MHSIZ; - -free_op: - if (op->frames != &op->sframe) - kfree(op->frames); - kfree(op); - return err; } /*
diff --git a/net/can/j1939/address-claim.c b/net/can/j1939/address-claim.c index ca4ad6c..f33c473 100644 --- a/net/can/j1939/address-claim.c +++ b/net/can/j1939/address-claim.c
@@ -165,46 +165,6 @@ static void j1939_ac_process(struct j1939_priv *priv, struct sk_buff *skb) * leaving this function. */ ecu = j1939_ecu_get_by_name_locked(priv, name); - - if (ecu && ecu->addr == skcb->addr.sa) { - /* The ISO 11783-5 standard, in "4.5.2 - Address claim - * requirements", states: - * d) No CF shall begin, or resume, transmission on the - * network until 250 ms after it has successfully claimed - * an address except when responding to a request for - * address-claimed. - * - * But "Figure 6" and "Figure 7" in "4.5.4.2 - Address-claim - * prioritization" show that the CF begins the transmission - * after 250 ms from the first AC (address-claimed) message - * even if it sends another AC message during that time window - * to resolve the address contention with another CF. - * - * As stated in "4.4.2.3 - Address-claimed message": - * In order to successfully claim an address, the CF sending - * an address claimed message shall not receive a contending - * claim from another CF for at least 250 ms. - * - * As stated in "4.4.3.2 - NAME management (NM) message": - * 1) A commanding CF can - * d) request that a CF with a specified NAME transmit - * the address-claimed message with its current NAME. - * 2) A target CF shall - * d) send an address-claimed message in response to a - * request for a matching NAME - * - * Taking the above arguments into account, the 250 ms wait is - * requested only during network initialization. - * - * Do not restart the timer on AC message if both the NAME and - * the address match and so if the address has already been - * claimed (timer has expired) or the AC message has been sent - * to resolve the contention with another CF (timer is still - * running). - */ - goto out_ecu_put; - } - if (!ecu && j1939_address_is_unicast(skcb->addr.sa)) ecu = j1939_ecu_create_locked(priv, name);
diff --git a/net/can/j1939/main.c b/net/can/j1939/main.c index 9da8fbc..ca75d1b 100644 --- a/net/can/j1939/main.c +++ b/net/can/j1939/main.c
@@ -332,9 +332,6 @@ int j1939_send_one(struct j1939_priv *priv, struct sk_buff *skb) /* re-claim the CAN_HDR from the SKB */ cf = skb_push(skb, J1939_CAN_HDR); - /* initialize header structure */ - memset(cf, 0, J1939_CAN_HDR); - /* make it a full can frame again */ skb_put(skb, J1939_CAN_FTR + (8 - dlc));
diff --git a/net/can/j1939/socket.c b/net/can/j1939/socket.c index 8817a25..51bfb22 100644 --- a/net/can/j1939/socket.c +++ b/net/can/j1939/socket.c
@@ -178,10 +178,7 @@ static void j1939_sk_queue_activate_next_locked(struct j1939_session *session) if (!first) return; - if (j1939_session_activate(first)) { - netdev_warn_once(first->priv->ndev, - "%s: 0x%p: Identical session is already activated.\n", - __func__, first); + if (WARN_ON_ONCE(j1939_session_activate(first))) { first->err = -EBUSY; goto activate_next; } else {
diff --git a/net/can/j1939/transport.c b/net/can/j1939/transport.c index 42fb836..22f4b79 100644 --- a/net/can/j1939/transport.c +++ b/net/can/j1939/transport.c
@@ -260,8 +260,6 @@ static void __j1939_session_drop(struct j1939_session *session) static void j1939_session_destroy(struct j1939_session *session) { - struct sk_buff *skb; - if (session->err) j1939_sk_errqueue(session, J1939_ERRQUEUE_ABORT); else @@ -272,11 +270,7 @@ static void j1939_session_destroy(struct j1939_session *session) WARN_ON_ONCE(!list_empty(&session->sk_session_queue_entry)); WARN_ON_ONCE(!list_empty(&session->active_session_list_entry)); - while ((skb = skb_dequeue(&session->skb_queue)) != NULL) { - /* drop ref taken in j1939_session_skb_queue() */ - skb_unref(skb); - kfree_skb(skb); - } + skb_queue_purge(&session->skb_queue); __j1939_session_drop(session); j1939_priv_put(session->priv); kfree(session); @@ -338,12 +332,10 @@ static void j1939_session_skb_drop_old(struct j1939_session *session) __skb_unlink(do_skb, &session->skb_queue); /* drop ref taken in j1939_session_skb_queue() */ skb_unref(do_skb); - spin_unlock_irqrestore(&session->skb_queue.lock, flags); kfree_skb(do_skb); - } else { - spin_unlock_irqrestore(&session->skb_queue.lock, flags); } + spin_unlock_irqrestore(&session->skb_queue.lock, flags); } void j1939_session_skb_queue(struct j1939_session *session, @@ -600,10 +592,7 @@ sk_buff *j1939_tp_tx_dat_new(struct j1939_priv *priv, /* reserve CAN header */ skb_reserve(skb, offsetof(struct can_frame, data)); - /* skb->cb must be large enough to hold a j1939_sk_buff_cb structure */ - BUILD_BUG_ON(sizeof(skb->cb) < sizeof(*re_skcb)); - - memcpy(skb->cb, re_skcb, sizeof(*re_skcb)); + memcpy(skb->cb, re_skcb, sizeof(skb->cb)); skcb = j1939_skb_to_cb(skb); if (swap_src_dst) j1939_skbcb_swap(skcb); @@ -1090,6 +1079,10 @@ static bool j1939_session_deactivate(struct j1939_session *session) bool active; j1939_session_list_lock(priv); + /* This function should be called with a session ref-count of at + * least 2. + */ + WARN_ON_ONCE(kref_read(&session->kref) < 2); active = j1939_session_deactivate_locked(session); j1939_session_list_unlock(priv);
diff --git a/net/core/dev.c b/net/core/dev.c index e5593bd..fd7d665 100644 --- a/net/core/dev.c +++ b/net/core/dev.c
@@ -2740,10 +2740,8 @@ void __dev_kfree_skb_any(struct sk_buff *skb, enum skb_free_reason reason) { if (in_irq() || irqs_disabled()) __dev_kfree_skb_irq(skb, reason); - else if (unlikely(reason == SKB_REASON_DROPPED)) - kfree_skb(skb); else - consume_skb(skb); + dev_kfree_skb(skb); } EXPORT_SYMBOL(__dev_kfree_skb_any); @@ -3719,7 +3717,6 @@ static int __dev_queue_xmit(struct sk_buff *skb, struct net_device *sb_dev) bool again = false; skb_reset_mac_header(skb); - skb_assert_len(skb); if (unlikely(skb_shinfo(skb)->tx_flags & SKBTX_SCHED_TSTAMP)) __skb_tstamp_tx(skb, NULL, skb->sk, SCM_TSTAMP_SCHED); @@ -4419,7 +4416,7 @@ static int netif_rx_internal(struct sk_buff *skb) { int ret; - net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); + net_timestamp_check(netdev_tstamp_prequeue, skb); trace_netif_rx(skb); @@ -4761,7 +4758,7 @@ static int __netif_receive_skb_core(struct sk_buff **pskb, bool pfmemalloc, int ret = NET_RX_DROP; __be16 type; - net_timestamp_check(!READ_ONCE(netdev_tstamp_prequeue), skb); + net_timestamp_check(!netdev_tstamp_prequeue, skb); trace_netif_receive_skb(skb); @@ -5143,7 +5140,7 @@ static int netif_receive_skb_internal(struct sk_buff *skb) { int ret; - net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); + net_timestamp_check(netdev_tstamp_prequeue, skb); if (skb_defer_rx_timestamp(skb)) return NET_RX_SUCCESS; @@ -5173,7 +5170,7 @@ static void netif_receive_skb_list_internal(struct list_head *head) INIT_LIST_HEAD(&sublist); list_for_each_entry_safe(skb, next, head, list) { - net_timestamp_check(READ_ONCE(netdev_tstamp_prequeue), skb); + net_timestamp_check(netdev_tstamp_prequeue, skb); skb_list_del_init(skb); if (!skb_defer_rx_timestamp(skb)) list_add_tail(&skb->list, &sublist); @@ -5900,7 +5897,7 @@ static int process_backlog(struct napi_struct *napi, int quota) net_rps_action_and_irq_enable(sd); } - napi->weight = READ_ONCE(dev_rx_weight); + napi->weight = dev_rx_weight; while (again) { struct sk_buff *skb; @@ -6401,8 +6398,8 @@ static __latent_entropy void net_rx_action(struct softirq_action *h) { struct softnet_data *sd = this_cpu_ptr(&softnet_data); unsigned long time_limit = jiffies + - usecs_to_jiffies(READ_ONCE(netdev_budget_usecs)); - int budget = READ_ONCE(netdev_budget); + usecs_to_jiffies(netdev_budget_usecs); + int budget = netdev_budget; LIST_HEAD(list); LIST_HEAD(repoll);
diff --git a/net/core/devlink.c b/net/core/devlink.c index 2dd354d..0ac02ca 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c
@@ -2953,7 +2953,7 @@ static int devlink_param_get(struct devlink *devlink, const struct devlink_param *param, struct devlink_param_gset_ctx *ctx) { - if (!param->get || devlink->reload_failed) + if (!param->get) return -EOPNOTSUPP; return param->get(devlink, param->id, ctx); } @@ -2962,7 +2962,7 @@ static int devlink_param_set(struct devlink *devlink, const struct devlink_param *param, struct devlink_param_gset_ctx *ctx) { - if (!param->set || devlink->reload_failed) + if (!param->set) return -EOPNOTSUPP; return param->set(devlink, param->id, ctx); }
diff --git a/net/core/ethtool.c b/net/core/ethtool.c index 85da036..155ec9c 100644 --- a/net/core/ethtool.c +++ b/net/core/ethtool.c
@@ -1948,8 +1948,7 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr) return n_stats; if (n_stats > S32_MAX / sizeof(u64)) return -ENOMEM; - if (WARN_ON_ONCE(!n_stats)) - return -EOPNOTSUPP; + WARN_ON_ONCE(!n_stats); if (copy_from_user(&stats, useraddr, sizeof(stats))) return -EFAULT;
diff --git a/net/core/filter.c b/net/core/filter.c index 2a0436b..e0477e0 100644 --- a/net/core/filter.c +++ b/net/core/filter.c
@@ -2071,17 +2071,8 @@ static int __bpf_redirect_no_mac(struct sk_buff *skb, struct net_device *dev, { unsigned int mlen = skb_network_offset(skb); - if (unlikely(skb->len <= mlen)) { - kfree_skb(skb); - return -ERANGE; - } - if (mlen) { __skb_pull(skb, mlen); - if (unlikely(!skb->len)) { - kfree_skb(skb); - return -ERANGE; - } /* At ingress, the mac header has already been pulled once. * At egress, skb_pospull_rcsum has to be done in case that @@ -2101,7 +2092,7 @@ static int __bpf_redirect_common(struct sk_buff *skb, struct net_device *dev, u32 flags) { /* Verify that a link layer header is carried */ - if (unlikely(skb->mac_header >= skb->network_header || skb->len == 0)) { + if (unlikely(skb->mac_header >= skb->network_header)) { kfree_skb(skb); return -ERANGE; } @@ -2795,18 +2786,15 @@ static int bpf_skb_generic_push(struct sk_buff *skb, u32 off, u32 len) static int bpf_skb_generic_pop(struct sk_buff *skb, u32 off, u32 len) { - void *old_data; - /* skb_ensure_writable() is not needed here, as we're * already working on an uncloned skb. */ if (unlikely(!pskb_may_pull(skb, off + len))) return -ENOMEM; - old_data = skb->data; + skb_postpull_rcsum(skb, skb->data + off, len); + memmove(skb->data + len, skb->data, off); __skb_pull(skb, len); - skb_postpull_rcsum(skb, old_data + off, len); - memmove(skb->data, old_data, off); return 0; } @@ -4617,6 +4605,7 @@ static int bpf_fib_set_fwd_params(struct bpf_fib_lookup *params, memcpy(params->smac, dev->dev_addr, ETH_ALEN); params->h_vlan_TCI = 0; params->h_vlan_proto = 0; + params->ifindex = dev->ifindex; return 0; } @@ -4713,7 +4702,6 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, dev = nhc->nhc_dev; params->rt_metric = res.fi->fib_priority; - params->ifindex = dev->ifindex; /* xdp and cls_bpf programs are run in RCU-bh so * rcu_read_lock_bh is not needed here @@ -4732,7 +4720,7 @@ static int bpf_ipv4_fib_lookup(struct net *net, struct bpf_fib_lookup *params, neigh = __ipv6_neigh_lookup_noref_stub(dev, dst); } - if (!neigh || !(neigh->nud_state & NUD_VALID)) + if (!neigh) return BPF_FIB_LKUP_RET_NO_NEIGH; return bpf_fib_set_fwd_params(params, neigh, dev); @@ -4839,13 +4827,12 @@ static int bpf_ipv6_fib_lookup(struct net *net, struct bpf_fib_lookup *params, dev = res.nh->fib_nh_dev; params->rt_metric = res.f6i->fib6_metric; - params->ifindex = dev->ifindex; /* xdp and cls_bpf programs are run in RCU-bh so rcu_read_lock_bh is * not needed here. */ neigh = __ipv6_neigh_lookup_noref_stub(dev, dst); - if (!neigh || !(neigh->nud_state & NUD_VALID)) + if (!neigh) return BPF_FIB_LKUP_RET_NO_NEIGH; return bpf_fib_set_fwd_params(params, neigh, dev);
diff --git a/net/core/neighbour.c b/net/core/neighbour.c index ed75421..8b6140e 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c
@@ -242,7 +242,7 @@ static int neigh_forced_gc(struct neigh_table *tbl) (n->nud_state == NUD_NOARP) || (tbl->is_multicast && tbl->is_multicast(n->primary_key)) || - !time_in_range(n->updated, tref, jiffies)) + time_after(tref, n->updated)) remove = true; write_unlock(&n->lock); @@ -262,17 +262,7 @@ static int neigh_forced_gc(struct neigh_table *tbl) static void neigh_add_timer(struct neighbour *n, unsigned long when) { - /* Use safe distance from the jiffies - LONG_MAX point while timer - * is running in DELAY/PROBE state but still show to user space - * large times in the past. - */ - unsigned long mint = jiffies - (LONG_MAX - 86400 * HZ); - neigh_hold(n); - if (!time_in_range(n->confirmed, mint, jiffies)) - n->confirmed = mint; - if (time_before(n->used, n->confirmed)) - n->used = n->confirmed; if (unlikely(mod_timer(&n->timer, when))) { printk("NEIGH: BUG, double timer add, state is %x\n", n->nud_state); @@ -290,26 +280,11 @@ static int neigh_del_timer(struct neighbour *n) return 0; } -static void pneigh_queue_purge(struct sk_buff_head *list, struct net *net) +static void pneigh_queue_purge(struct sk_buff_head *list) { - struct sk_buff_head tmp; - unsigned long flags; struct sk_buff *skb; - skb_queue_head_init(&tmp); - spin_lock_irqsave(&list->lock, flags); - skb = skb_peek(list); - while (skb != NULL) { - struct sk_buff *skb_next = skb_peek_next(skb, list); - if (net == NULL || net_eq(dev_net(skb->dev), net)) { - __skb_unlink(skb, list); - __skb_queue_tail(&tmp, skb); - } - skb = skb_next; - } - spin_unlock_irqrestore(&list->lock, flags); - - while ((skb = __skb_dequeue(&tmp))) { + while ((skb = skb_dequeue(list)) != NULL) { dev_put(skb->dev); kfree_skb(skb); } @@ -383,9 +358,9 @@ static int __neigh_ifdown(struct neigh_table *tbl, struct net_device *dev, write_lock_bh(&tbl->lock); neigh_flush_dev(tbl, dev, skip_perm); pneigh_ifdown_and_unlock(tbl, dev); - pneigh_queue_purge(&tbl->proxy_queue, dev ? dev_net(dev) : NULL); - if (skb_queue_empty_lockless(&tbl->proxy_queue)) - del_timer_sync(&tbl->proxy_timer); + + del_timer_sync(&tbl->proxy_timer); + pneigh_queue_purge(&tbl->proxy_queue); return 0; } @@ -958,14 +933,12 @@ static void neigh_periodic_work(struct work_struct *work) goto next_elt; } - if (time_before(n->used, n->confirmed) && - time_is_before_eq_jiffies(n->confirmed)) + if (time_before(n->used, n->confirmed)) n->used = n->confirmed; if (refcount_read(&n->refcnt) == 1 && (state == NUD_FAILED || - !time_in_range_open(jiffies, n->used, - n->used + NEIGH_VAR(n->parms, GC_STALETIME)))) { + time_after(jiffies, n->used + NEIGH_VAR(n->parms, GC_STALETIME)))) { *np = n->next; neigh_mark_dead(n); write_unlock(&n->lock); @@ -1768,7 +1741,7 @@ int neigh_table_clear(int index, struct neigh_table *tbl) /* It is not clean... Fix it to unload IPv6 module safely */ cancel_delayed_work_sync(&tbl->gc_work); del_timer_sync(&tbl->proxy_timer); - pneigh_queue_purge(&tbl->proxy_queue, NULL); + pneigh_queue_purge(&tbl->proxy_queue); neigh_ifdown(tbl, NULL); if (atomic_read(&tbl->entries)) pr_crit("neighbour leakage\n");
diff --git a/net/core/net_namespace.c b/net/core/net_namespace.c index 534a531..62a972f 100644 --- a/net/core/net_namespace.c +++ b/net/core/net_namespace.c
@@ -120,7 +120,6 @@ static int net_assign_generic(struct net *net, unsigned int id, void *data) static int ops_init(const struct pernet_operations *ops, struct net *net) { - struct net_generic *ng; int err = -ENOMEM; void *data = NULL; @@ -139,12 +138,6 @@ static int ops_init(const struct pernet_operations *ops, struct net *net) if (!err) return 0; - if (ops->id && ops->size) { - ng = rcu_dereference_protected(net->gen, - lockdep_is_held(&pernet_ops_rwsem)); - ng->ptr[*ops->id] = NULL; - } - cleanup: kfree(data);
diff --git a/net/core/netpoll.c b/net/core/netpoll.c index 9b263a5..78bbb91 100644 --- a/net/core/netpoll.c +++ b/net/core/netpoll.c
@@ -136,20 +136,6 @@ static void queue_process(struct work_struct *work) } } -static int netif_local_xmit_active(struct net_device *dev) -{ - int i; - - for (i = 0; i < dev->num_tx_queues; i++) { - struct netdev_queue *txq = netdev_get_tx_queue(dev, i); - - if (READ_ONCE(txq->xmit_lock_owner) == smp_processor_id()) - return 1; - } - - return 0; -} - static void poll_one_napi(struct napi_struct *napi) { int work; @@ -196,10 +182,7 @@ void netpoll_poll_dev(struct net_device *dev) if (!ni || down_trylock(&ni->dev_lock)) return; - /* Some drivers will take the same locks in poll and xmit, - * we can't poll if local CPU is already in xmit. - */ - if (!netif_running(dev) || netif_local_xmit_active(dev)) { + if (!netif_running(dev)) { up(&ni->dev_lock); return; }
diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index da1ef00..dbc9b2f 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c
@@ -1593,7 +1593,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, { struct ifinfomsg *ifm; struct nlmsghdr *nlh; - struct Qdisc *qdisc; ASSERT_RTNL(); nlh = nlmsg_put(skb, pid, seq, type, sizeof(*ifm), flags); @@ -1611,7 +1610,6 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, if (tgt_netnsid >= 0 && nla_put_s32(skb, IFLA_TARGET_NETNSID, tgt_netnsid)) goto nla_put_failure; - qdisc = rtnl_dereference(dev->qdisc); if (nla_put_string(skb, IFLA_IFNAME, dev->name) || nla_put_u32(skb, IFLA_TXQLEN, dev->tx_queue_len) || nla_put_u8(skb, IFLA_OPERSTATE, @@ -1630,8 +1628,8 @@ static int rtnl_fill_ifinfo(struct sk_buff *skb, #endif put_master_ifindex(skb, dev) || nla_put_u8(skb, IFLA_CARRIER, netif_carrier_ok(dev)) || - (qdisc && - nla_put_string(skb, IFLA_QDISC, qdisc->ops->id)) || + (dev->qdisc && + nla_put_string(skb, IFLA_QDISC, dev->qdisc->ops->id)) || nla_put_ifalias(skb, dev) || nla_put_u32(skb, IFLA_CARRIER_CHANGES, atomic_read(&dev->carrier_up_count) +
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index dcf9967..e8f3849 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c
@@ -982,15 +982,7 @@ static void __copy_skb_header(struct sk_buff *new, const struct sk_buff *old) #ifdef CONFIG_NET_SCHED CHECK_SKB_FIELD(tc_index); #endif - /* ANDROID: - * Due to attempts to keep the ABI stable for struct sk_buff, the new - * fields were incorrectly added _AFTER_ the headers_end field, which - * requires that we manually copy the fields here from the old to the - * new one. - * Be sure to add any new field that is added in the - * ANDROID_KABI_REPLACE() macros below here as well. - */ - new->scm_io_uring = old->scm_io_uring; + } /* @@ -2125,9 +2117,6 @@ void *__pskb_pull_tail(struct sk_buff *skb, int delta) insp = list; } else { /* Eaten partially. */ - if (skb_is_gso(skb) && !list->head_frag && - skb_headlen(list)) - skb_shinfo(skb)->gso_type |= SKB_GSO_DODGY; if (skb_shared(list)) { /* Sucks! We need to fork list. :-( */ @@ -3685,7 +3674,7 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb, skb_shinfo(skb)->frag_list = NULL; - while (list_skb) { + do { nskb = list_skb; list_skb = list_skb->next; @@ -3731,7 +3720,8 @@ struct sk_buff *skb_segment_list(struct sk_buff *skb, if (skb_needs_linearize(nskb, features) && __skb_linearize(nskb)) goto err_linearize; - } + + } while (list_skb); skb->truesize = skb->truesize - delta_truesize; skb->data_len = skb->data_len - delta_len; @@ -3812,25 +3802,23 @@ struct sk_buff *skb_segment(struct sk_buff *head_skb, int pos; int dummy; - if ((skb_shinfo(head_skb)->gso_type & SKB_GSO_DODGY) && - mss != GSO_BY_FRAGS && mss != skb_headlen(head_skb)) { - struct sk_buff *check_skb; - - for (check_skb = list_skb; check_skb; check_skb = check_skb->next) { - if (skb_headlen(check_skb) && !check_skb->head_frag) { - /* gso_size is untrusted, and we have a frag_list with - * a linear non head_frag item. - * - * If head_skb's headlen does not fit requested gso_size, - * it means that the frag_list members do NOT terminate - * on exact gso_size boundaries. Hence we cannot perform - * skb_frag_t page sharing. Therefore we must fallback to - * copying the frag_list skbs; we do so by disabling SG. - */ - features &= ~NETIF_F_SG; - break; - } - } + if (list_skb && !list_skb->head_frag && skb_headlen(list_skb) && + (skb_shinfo(head_skb)->gso_type & SKB_GSO_DODGY)) { + /* gso_size is untrusted, and we have a frag_list with a linear + * non head_frag head. + * + * (we assume checking the first list_skb member suffices; + * i.e if either of the list_skb members have non head_frag + * head, then the first one has too). + * + * If head_skb's headlen does not fit requested gso_size, it + * means that the frag_list members do NOT terminate on exact + * gso_size boundaries. Hence we cannot perform skb_frag_t page + * sharing. Therefore we must fallback to copying the frag_list + * skbs; we do so by disabling SG. + */ + if (mss != GSO_BY_FRAGS && mss != skb_headlen(head_skb)) + features &= ~NETIF_F_SG; } __skb_push(head_skb, doffset); @@ -4678,7 +4666,7 @@ static bool skb_may_tx_timestamp(struct sock *sk, bool tsonly) { bool ret; - if (likely(READ_ONCE(sysctl_tstamp_allow_data) || tsonly)) + if (likely(sysctl_tstamp_allow_data || tsonly)) return true; read_lock_bh(&sk->sk_callback_lock);
diff --git a/net/core/sock.c b/net/core/sock.c index 0a5ef25..0b4fb39 100644 --- a/net/core/sock.c +++ b/net/core/sock.c
@@ -2887,14 +2887,7 @@ void sk_stop_timer(struct sock *sk, struct timer_list* timer) } EXPORT_SYMBOL(sk_stop_timer); -void sk_stop_timer_sync(struct sock *sk, struct timer_list *timer) -{ - if (del_timer_sync(timer)) - __sock_put(sk); -} -EXPORT_SYMBOL(sk_stop_timer_sync); - -void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid) +void sock_init_data(struct socket *sock, struct sock *sk) { sk_init_common(sk); sk->sk_send_head = NULL; @@ -2913,10 +2906,11 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid) sk->sk_type = sock->type; RCU_INIT_POINTER(sk->sk_wq, &sock->wq); sock->sk = sk; + sk->sk_uid = SOCK_INODE(sock)->i_uid; } else { RCU_INIT_POINTER(sk->sk_wq, NULL); + sk->sk_uid = make_kuid(sock_net(sk)->user_ns, 0); } - sk->sk_uid = uid; rwlock_init(&sk->sk_callback_lock); if (sk->sk_kern_sock) @@ -2957,7 +2951,7 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid) #ifdef CONFIG_NET_RX_BUSY_POLL sk->sk_napi_id = 0; - sk->sk_ll_usec = READ_ONCE(sysctl_net_busy_read); + sk->sk_ll_usec = sysctl_net_busy_read; #endif sk->sk_max_pacing_rate = ~0UL; @@ -2974,16 +2968,6 @@ void sock_init_data_uid(struct socket *sock, struct sock *sk, kuid_t uid) refcount_set(&sk->sk_refcnt, 1); atomic_set(&sk->sk_drops, 0); } -EXPORT_SYMBOL(sock_init_data_uid); - -void sock_init_data(struct socket *sock, struct sock *sk) -{ - kuid_t uid = sock ? - SOCK_INODE(sock)->i_uid : - make_kuid(sock_net(sk)->user_ns, 0); - - sock_init_data_uid(sock, sk, uid); -} EXPORT_SYMBOL(sock_init_data); void lock_sock_nested(struct sock *sk, int subclass)
diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 5bce6d4..2646e8f 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c
@@ -279,13 +279,11 @@ static void sock_map_free(struct bpf_map *map) sk = xchg(psk, NULL); if (sk) { - sock_hold(sk); lock_sock(sk); rcu_read_lock(); sock_map_unref(sk, psk); rcu_read_unlock(); release_sock(sk); - sock_put(sk); } }
diff --git a/net/core/stream.c b/net/core/stream.c index cd60746..a166a32 100644 --- a/net/core/stream.c +++ b/net/core/stream.c
@@ -159,8 +159,7 @@ int sk_stream_wait_memory(struct sock *sk, long *timeo_p) *timeo_p = current_timeo; } out: - if (!sock_flag(sk, SOCK_DEAD)) - remove_wait_queue(sk_sleep(sk), &wait); + remove_wait_queue(sk_sleep(sk), &wait); return err; do_error: @@ -196,12 +195,6 @@ void sk_stream_kill_queues(struct sock *sk) /* First the read buffer. */ __skb_queue_purge(&sk->sk_receive_queue); - /* Next, the error queue. - * We need to use queue lock, because other threads might - * add packets to the queue without socket lock being held. - */ - skb_queue_purge(&sk->sk_error_queue); - /* Next, the write queue. */ WARN_ON(!skb_queue_empty(&sk->sk_write_queue)); @@ -209,6 +202,7 @@ void sk_stream_kill_queues(struct sock *sk) sk_mem_reclaim(sk); WARN_ON(sk->sk_wmem_queued); + WARN_ON(sk->sk_forward_alloc); /* It is _impossible_ for the backlog to contain anything * when we get here. All user references to this socket
diff --git a/net/core/sysctl_net_core.c b/net/core/sysctl_net_core.c index 0fd749f..06384da 100644 --- a/net/core/sysctl_net_core.c +++ b/net/core/sysctl_net_core.c
@@ -238,17 +238,14 @@ static int set_default_qdisc(struct ctl_table *table, int write, static int proc_do_dev_weight(struct ctl_table *table, int write, void __user *buffer, size_t *lenp, loff_t *ppos) { - static DEFINE_MUTEX(dev_weight_mutex); - int ret, weight; + int ret; - mutex_lock(&dev_weight_mutex); ret = proc_dointvec(table, write, buffer, lenp, ppos); - if (!ret && write) { - weight = READ_ONCE(weight_p); - WRITE_ONCE(dev_rx_weight, weight * dev_weight_rx_bias); - WRITE_ONCE(dev_tx_weight, weight * dev_weight_tx_bias); - } - mutex_unlock(&dev_weight_mutex); + if (ret != 0) + return ret; + + dev_rx_weight = weight_p * dev_weight_rx_bias; + dev_tx_weight = weight_p * dev_weight_tx_bias; return ret; }
diff --git a/net/dccp/dccp.h b/net/dccp/dccp.h index 8c9a63e..cb81861 100644 --- a/net/dccp/dccp.h +++ b/net/dccp/dccp.h
@@ -288,7 +288,6 @@ int dccp_rcv_state_process(struct sock *sk, struct sk_buff *skb, int dccp_rcv_established(struct sock *sk, struct sk_buff *skb, const struct dccp_hdr *dh, const unsigned int len); -void dccp_destruct_common(struct sock *sk); int dccp_init_sock(struct sock *sk, const __u8 ctl_sock_initialized); void dccp_destroy_sock(struct sock *sk);
diff --git a/net/dccp/ipv4.c b/net/dccp/ipv4.c index cd59a66..7cf903f 100644 --- a/net/dccp/ipv4.c +++ b/net/dccp/ipv4.c
@@ -130,8 +130,6 @@ int dccp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) * This unhashes the socket and releases the local port, if necessary. */ dccp_set_state(sk, DCCP_CLOSED); - if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) - inet_reset_saddr(sk); ip_rt_put(rt); sk->sk_route_caps = 0; inet->inet_dport = 0;
diff --git a/net/dccp/ipv6.c b/net/dccp/ipv6.c index 77cb431..7c24927 100644 --- a/net/dccp/ipv6.c +++ b/net/dccp/ipv6.c
@@ -541,9 +541,11 @@ static struct sock *dccp_v6_request_recv_sock(const struct sock *sk, *own_req = inet_ehash_nolisten(newsk, req_to_sk(req_unhash), NULL); /* Clone pktoptions received with SYN, if we own the req */ if (*own_req && ireq->pktopts) { - newnp->pktoptions = skb_clone_and_charge_r(ireq->pktopts, newsk); + newnp->pktoptions = skb_clone(ireq->pktopts, GFP_ATOMIC); consume_skb(ireq->pktopts); ireq->pktopts = NULL; + if (newnp->pktoptions) + skb_set_owner_r(newnp->pktoptions, newsk); } return newsk; @@ -603,7 +605,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) --ANK (980728) */ if (np->rxopt.all) - opt_skb = skb_clone_and_charge_r(skb, sk); + opt_skb = skb_clone(skb, GFP_ATOMIC); if (sk->sk_state == DCCP_OPEN) { /* Fast path */ if (dccp_rcv_established(sk, skb, dccp_hdr(skb), skb->len)) @@ -667,6 +669,7 @@ static int dccp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) np->flow_label = ip6_flowlabel(ipv6_hdr(opt_skb)); if (ipv6_opt_accepted(sk, opt_skb, &DCCP_SKB_CB(opt_skb)->header.h6)) { + skb_set_owner_r(opt_skb, sk); memmove(IP6CB(opt_skb), &DCCP_SKB_CB(opt_skb)->header.h6, sizeof(struct inet6_skb_parm)); @@ -954,8 +957,6 @@ static int dccp_v6_connect(struct sock *sk, struct sockaddr *uaddr, late_failure: dccp_set_state(sk, DCCP_CLOSED); - if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) - inet_reset_saddr(sk); __sk_dst_reset(sk); failure: inet->inet_dport = 0; @@ -1000,12 +1001,6 @@ static const struct inet_connection_sock_af_ops dccp_ipv6_mapped = { #endif }; -static void dccp_v6_sk_destruct(struct sock *sk) -{ - dccp_destruct_common(sk); - inet6_sock_destruct(sk); -} - /* NOTE: A lot of things set to zero explicitly by call to * sk_alloc() so need not be done here. */ @@ -1018,12 +1013,17 @@ static int dccp_v6_init_sock(struct sock *sk) if (unlikely(!dccp_v6_ctl_sock_initialized)) dccp_v6_ctl_sock_initialized = 1; inet_csk(sk)->icsk_af_ops = &dccp_ipv6_af_ops; - sk->sk_destruct = dccp_v6_sk_destruct; } return err; } +static void dccp_v6_destroy_sock(struct sock *sk) +{ + dccp_destroy_sock(sk); + inet6_destroy_sock(sk); +} + static struct timewait_sock_ops dccp6_timewait_sock_ops = { .twsk_obj_size = sizeof(struct dccp6_timewait_sock), }; @@ -1046,7 +1046,7 @@ static struct proto dccp_v6_prot = { .accept = inet_csk_accept, .get_port = inet_csk_get_port, .shutdown = dccp_shutdown, - .destroy = dccp_destroy_sock, + .destroy = dccp_v6_destroy_sock, .orphan_count = &dccp_orphan_count, .max_header = MAX_DCCP_HEADER, .obj_size = sizeof(struct dccp6_sock),
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index 3a3a2e1..cb61a9d 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c
@@ -171,18 +171,12 @@ const char *dccp_packet_name(const int type) EXPORT_SYMBOL_GPL(dccp_packet_name); -void dccp_destruct_common(struct sock *sk) +static void dccp_sk_destruct(struct sock *sk) { struct dccp_sock *dp = dccp_sk(sk); ccid_hc_tx_delete(dp->dccps_hc_tx_ccid, sk); dp->dccps_hc_tx_ccid = NULL; -} -EXPORT_SYMBOL_GPL(dccp_destruct_common); - -static void dccp_sk_destruct(struct sock *sk) -{ - dccp_destruct_common(sk); inet_sock_destruct(sk); } @@ -771,6 +765,11 @@ int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) lock_sock(sk); + if (dccp_qpolicy_full(sk)) { + rc = -EAGAIN; + goto out_release; + } + timeo = sock_sndtimeo(sk, noblock); /* @@ -789,11 +788,6 @@ int dccp_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) if (skb == NULL) goto out_release; - if (dccp_qpolicy_full(sk)) { - rc = -EAGAIN; - goto out_discard; - } - if (sk->sk_state == DCCP_CLOSED) { rc = -ENOTCONN; goto out_discard;
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c index 7354c5d..73605bc 100644 --- a/net/dsa/tag_ksz.c +++ b/net/dsa/tag_ksz.c
@@ -62,8 +62,7 @@ static struct sk_buff *ksz_common_rcv(struct sk_buff *skb, if (!skb->dev) return NULL; - if (pskb_trim_rcsum(skb, skb->len - len)) - return NULL; + pskb_trim_rcsum(skb, skb->len - len); skb->offload_fwd_mark = true;
diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c index 7073724..bf3ecf7 100644 --- a/net/hsr/hsr_forward.c +++ b/net/hsr/hsr_forward.c
@@ -198,18 +198,17 @@ static void hsr_deliver_master(struct sk_buff *skb, struct net_device *dev, struct hsr_node *node_src) { bool was_multicast_frame; - int res, recv_len; + int res; was_multicast_frame = (skb->pkt_type == PACKET_MULTICAST); hsr_addr_subst_source(node_src, skb); skb_pull(skb, ETH_HLEN); - recv_len = skb->len; res = netif_rx(skb); if (res == NET_RX_DROP) { dev->stats.rx_dropped++; } else { dev->stats.rx_packets++; - dev->stats.rx_bytes += recv_len; + dev->stats.rx_bytes += skb->len; if (was_multicast_frame) dev->stats.multicast++; }
diff --git a/net/hsr/hsr_framereg.c b/net/hsr/hsr_framereg.c index 783e741..4a92007 100644 --- a/net/hsr/hsr_framereg.c +++ b/net/hsr/hsr_framereg.c
@@ -269,12 +269,9 @@ void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr, node_real->addr_B_port = port_rcv->type; spin_lock_bh(&hsr->list_lock); - if (!node_curr->removed) { - list_del_rcu(&node_curr->mac_list); - node_curr->removed = true; - kfree_rcu(node_curr, rcu_head); - } + list_del_rcu(&node_curr->mac_list); spin_unlock_bh(&hsr->list_lock); + kfree_rcu(node_curr, rcu_head); done: skb_push(skb, sizeof(struct hsrv1_ethhdr_sp)); @@ -439,12 +436,9 @@ void hsr_prune_nodes(struct timer_list *t) if (time_is_before_jiffies(timestamp + msecs_to_jiffies(HSR_NODE_FORGET_TIME))) { hsr_nl_nodedown(hsr, node->macaddress_A); - if (!node->removed) { - list_del_rcu(&node->mac_list); - node->removed = true; - /* Note that we need to free this entry later: */ - kfree_rcu(node, rcu_head); - } + list_del_rcu(&node->mac_list); + /* Note that we need to free this entry later: */ + kfree_rcu(node, rcu_head); } } spin_unlock_bh(&hsr->list_lock);
diff --git a/net/hsr/hsr_framereg.h b/net/hsr/hsr_framereg.h index 01f4ef4..0f0fa12 100644 --- a/net/hsr/hsr_framereg.h +++ b/net/hsr/hsr_framereg.h
@@ -56,7 +56,6 @@ struct hsr_node { unsigned long time_in[HSR_PT_PORTS]; bool time_in_stale[HSR_PT_PORTS]; u16 seq_out[HSR_PT_PORTS]; - bool removed; struct rcu_head rcu_head; };
diff --git a/net/ieee802154/socket.c b/net/ieee802154/socket.c index ce5f25c..9a675ba 100644 --- a/net/ieee802154/socket.c +++ b/net/ieee802154/socket.c
@@ -201,9 +201,8 @@ static int raw_bind(struct sock *sk, struct sockaddr *_uaddr, int len) int err = 0; struct net_device *dev = NULL; - err = ieee802154_sockaddr_check_size(uaddr, len); - if (err < 0) - return err; + if (len < sizeof(*uaddr)) + return -EINVAL; uaddr = (struct sockaddr_ieee802154 *)_uaddr; if (uaddr->family != AF_IEEE802154) @@ -273,10 +272,6 @@ static int raw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) err = -EMSGSIZE; goto out_dev; } - if (!size) { - err = 0; - goto out_dev; - } hlen = LL_RESERVED_SPACE(dev); tlen = dev->needed_tailroom; @@ -503,14 +498,11 @@ static int dgram_bind(struct sock *sk, struct sockaddr *uaddr, int len) ro->bound = 0; - err = ieee802154_sockaddr_check_size(addr, len); - if (err < 0) + if (len < sizeof(*addr)) goto out; - if (addr->family != AF_IEEE802154) { - err = -EINVAL; + if (addr->family != AF_IEEE802154) goto out; - } ieee802154_addr_from_sa(&haddr, &addr->addr); dev = ieee802154_get_dev(sock_net(sk), &haddr); @@ -577,9 +569,8 @@ static int dgram_connect(struct sock *sk, struct sockaddr *uaddr, struct dgram_sock *ro = dgram_sk(sk); int err = 0; - err = ieee802154_sockaddr_check_size(addr, len); - if (err < 0) - return err; + if (len < sizeof(*addr)) + return -EINVAL; if (addr->family != AF_IEEE802154) return -EINVAL; @@ -618,7 +609,6 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) struct ieee802154_mac_cb *cb; struct dgram_sock *ro = dgram_sk(sk); struct ieee802154_addr dst_addr; - DECLARE_SOCKADDR(struct sockaddr_ieee802154*, daddr, msg->msg_name); int hlen, tlen; int err; @@ -627,20 +617,10 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) return -EOPNOTSUPP; } - if (msg->msg_name) { - if (ro->connected) - return -EISCONN; - if (msg->msg_namelen < IEEE802154_MIN_NAMELEN) - return -EINVAL; - err = ieee802154_sockaddr_check_size(daddr, msg->msg_namelen); - if (err < 0) - return err; - ieee802154_addr_from_sa(&dst_addr, &daddr->addr); - } else { - if (!ro->connected) - return -EDESTADDRREQ; - dst_addr = ro->dst_addr; - } + if (!ro->connected && !msg->msg_name) + return -EDESTADDRREQ; + else if (ro->connected && msg->msg_name) + return -EISCONN; if (!ro->bound) dev = dev_getfirstbyhwtype(sock_net(sk), ARPHRD_IEEE802154); @@ -676,6 +656,16 @@ static int dgram_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) cb = mac_cb_init(skb); cb->type = IEEE802154_FC_TYPE_DATA; cb->ackreq = ro->want_ack; + + if (msg->msg_name) { + DECLARE_SOCKADDR(struct sockaddr_ieee802154*, + daddr, msg->msg_name); + + ieee802154_addr_from_sa(&dst_addr, &daddr->addr); + } else { + dst_addr = ro->dst_addr; + } + cb->secen = ro->secen; cb->secen_override = ro->secen_override; cb->seclevel = ro->seclevel;
diff --git a/net/ipv4/Kconfig b/net/ipv4/Kconfig index f5af8c6..a926de2 100644 --- a/net/ipv4/Kconfig +++ b/net/ipv4/Kconfig
@@ -389,16 +389,6 @@ If unsure, say Y. -config INET_TABLE_PERTURB_ORDER - int "INET: Source port perturbation table size (as power of 2)" if EXPERT - default 16 - help - Source port perturbation table size (as power of 2) for - RFC 6056 3.3.4. Algorithm 4: Double-Hash Port Selection Algorithm. - - The default is almost always what you want. - Only change this if you know what you are doing. - config INET_XFRM_TUNNEL tristate select INET_TUNNEL
diff --git a/net/ipv4/af_inet.c b/net/ipv4/af_inet.c index ac88429..11e68cf 100644 --- a/net/ipv4/af_inet.c +++ b/net/ipv4/af_inet.c
@@ -157,7 +157,7 @@ void inet_sock_destruct(struct sock *sk) kfree(rcu_dereference_protected(inet->inet_opt, 1)); dst_release(rcu_dereference_protected(sk->sk_dst_cache, 1)); - dst_release(rcu_dereference_protected(sk->sk_rx_dst, 1)); + dst_release(sk->sk_rx_dst); sk_refcnt_debug_dec(sk); } EXPORT_SYMBOL(inet_sock_destruct); @@ -1706,7 +1706,12 @@ static const struct net_protocol igmp_protocol = { }; #endif -static const struct net_protocol tcp_protocol = { +/* thinking of making this const? Don't. + * early_demux can change based on sysctl. + */ +static struct net_protocol tcp_protocol = { + .early_demux = tcp_v4_early_demux, + .early_demux_handler = tcp_v4_early_demux, .handler = tcp_v4_rcv, .err_handler = tcp_v4_err, .no_policy = 1, @@ -1714,7 +1719,12 @@ static const struct net_protocol tcp_protocol = { .icmp_strict_tag_validation = 1, }; -static const struct net_protocol udp_protocol = { +/* thinking of making this const? Don't. + * early_demux can change based on sysctl. + */ +static struct net_protocol udp_protocol = { + .early_demux = udp_v4_early_demux, + .early_demux_handler = udp_v4_early_demux, .handler = udp_rcv, .err_handler = udp_err, .no_policy = 1,
diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index c31003d..ef3e7a3 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c
@@ -399,7 +399,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, dev_match = dev_match || (res.type == RTN_LOCAL && dev == net->loopback_dev); if (dev_match) { - ret = FIB_RES_NHC(res)->nhc_scope >= RT_SCOPE_LINK; + ret = FIB_RES_NHC(res)->nhc_scope >= RT_SCOPE_HOST; return ret; } if (no_addr) @@ -411,7 +411,7 @@ static int __fib_validate_source(struct sk_buff *skb, __be32 src, __be32 dst, ret = 0; if (fib_lookup(net, &fl4, &res, FIB_LOOKUP_IGNORE_LINKSTATE) == 0) { if (res.type == RTN_UNICAST) - ret = FIB_RES_NHC(res)->nhc_scope >= RT_SCOPE_LINK; + ret = FIB_RES_NHC(res)->nhc_scope >= RT_SCOPE_HOST; } return ret; @@ -583,9 +583,6 @@ static int rtentry_to_fib_config(struct net *net, int cmd, struct rtentry *rt, cfg->fc_scope = RT_SCOPE_UNIVERSE; } - if (!cfg->fc_table) - cfg->fc_table = RT_TABLE_MAIN; - if (cmd == SIOCDELRT) return 0; @@ -843,9 +840,6 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, return -EINVAL; } - if (!cfg->fc_table) - cfg->fc_table = RT_TABLE_MAIN; - return 0; errout: return err;
diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c index 42a4ee1..28da044 100644 --- a/net/ipv4/fib_semantics.c +++ b/net/ipv4/fib_semantics.c
@@ -30,7 +30,6 @@ #include <linux/slab.h> #include <linux/netlink.h> #include <linux/hash.h> -#include <linux/nospec.h> #include <net/arp.h> #include <net/ip.h> @@ -421,7 +420,6 @@ static struct fib_info *fib_find_info(struct fib_info *nfi) nfi->fib_prefsrc == fi->fib_prefsrc && nfi->fib_priority == fi->fib_priority && nfi->fib_type == fi->fib_type && - nfi->fib_tb_id == fi->fib_tb_id && memcmp(nfi->fib_metrics, fi->fib_metrics, sizeof(u32) * RTAX_MAX) == 0 && !((nfi->fib_flags ^ fi->fib_flags) & ~RTNH_COMPARE_MASK) && @@ -877,15 +875,13 @@ int fib_nh_match(struct fib_config *cfg, struct fib_info *fi, return 1; } - if (fi->nh) { - if (cfg->fc_oif || cfg->fc_gw_family || cfg->fc_mp) - return 1; - return 0; - } - if (cfg->fc_oif || cfg->fc_gw_family) { struct fib_nh *nh; + /* cannot match on nexthop object attributes */ + if (fi->nh) + return 1; + nh = fib_info_nh(fi, 0); if (cfg->fc_encap) { if (fib_encap_match(cfg->fc_encap_type, cfg->fc_encap, @@ -1010,7 +1006,6 @@ bool fib_metrics_match(struct fib_config *cfg, struct fib_info *fi) if (type > RTAX_MAX) return false; - type = array_index_nospec(type, RTAX_MAX + 1); if (type == RTAX_CC_ALGO) { char tmp[TCP_CA_NAME_MAX]; bool ecn_ca = false;
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index ac82a41..b44f51e 100644 --- a/net/ipv4/icmp.c +++ b/net/ipv4/icmp.c
@@ -754,11 +754,6 @@ void __icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info, room = 576; room -= sizeof(struct iphdr) + icmp_param.replyopts.opt.opt.optlen; room -= sizeof(struct icmphdr); - /* Guard against tiny mtu. We need to include at least one - * IP network header for this message to make any sense. - */ - if (room <= (int)sizeof(struct iphdr)) - goto ende; icmp_param.data_len = skb_in->len - icmp_param.offset; if (icmp_param.data_len > room)
diff --git a/net/ipv4/inet_connection_sock.c b/net/ipv4/inet_connection_sock.c index 0459389..6cbf0db 100644 --- a/net/ipv4/inet_connection_sock.c +++ b/net/ipv4/inet_connection_sock.c
@@ -902,25 +902,11 @@ void inet_csk_prepare_forced_close(struct sock *sk) } EXPORT_SYMBOL(inet_csk_prepare_forced_close); -static int inet_ulp_can_listen(const struct sock *sk) -{ - const struct inet_connection_sock *icsk = inet_csk(sk); - - if (icsk->icsk_ulp_ops) - return -EINVAL; - - return 0; -} - int inet_csk_listen_start(struct sock *sk, int backlog) { struct inet_connection_sock *icsk = inet_csk(sk); struct inet_sock *inet = inet_sk(sk); - int err; - - err = inet_ulp_can_listen(sk); - if (unlikely(err)) - return err; + int err = -EADDRINUSE; reqsk_queue_alloc(&icsk->icsk_accept_queue); @@ -932,7 +918,6 @@ int inet_csk_listen_start(struct sock *sk, int backlog) * It is OK, because this socket enters to hash table only * after validation is complete. */ - err = -EADDRINUSE; inet_sk_state_store(sk, TCP_LISTEN); if (!sk->sk_prot->get_port(sk, inet->inet_num)) { inet->inet_sport = htons(inet->inet_num);
diff --git a/net/ipv4/inet_hashtables.c b/net/ipv4/inet_hashtables.c index 9d14b32..d9bee15 100644 --- a/net/ipv4/inet_hashtables.c +++ b/net/ipv4/inet_hashtables.c
@@ -536,20 +536,8 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk) spin_lock(lock); if (osk) { WARN_ON_ONCE(sk->sk_hash != osk->sk_hash); - ret = sk_hashed(osk); - if (ret) { - /* Before deleting the node, we insert a new one to make - * sure that the look-up-sk process would not miss either - * of them and that at least one node would exist in ehash - * table all the time. Otherwise there's a tiny chance - * that lookup process could find nothing in ehash table. - */ - __sk_nulls_add_node_tail_rcu(sk, list); - sk_nulls_del_node_init_rcu(osk); - } - goto unlock; - } - if (found_dup_sk) { + ret = sk_nulls_del_node_init_rcu(osk); + } else if (found_dup_sk) { *found_dup_sk = inet_ehash_lookup_by_sk(sk, list); if (*found_dup_sk) ret = false; @@ -558,7 +546,6 @@ bool inet_ehash_insert(struct sock *sk, struct sock *osk, bool *found_dup_sk) if (ret) __sk_nulls_add_node_rcu(sk, list); -unlock: spin_unlock(lock); return ret; @@ -688,13 +675,13 @@ EXPORT_SYMBOL_GPL(inet_unhash); * Note that we use 32bit integers (vs RFC 'short integers') * because 2^16 is not a multiple of num_ephemeral and this * property might be used by clever attacker. - * * RFC claims using TABLE_LENGTH=10 buckets gives an improvement, though - * attacks were since demonstrated, thus we use 65536 by default instead - * to really give more isolation and privacy, at the expense of 256kB - * of kernel memory. + * attacks were since demonstrated, thus we use 65536 instead to really + * give more isolation and privacy, at the expense of 256kB of kernel + * memory. */ -#define INET_TABLE_PERTURB_SIZE (1 << CONFIG_INET_TABLE_PERTURB_ORDER) +#define INET_TABLE_PERTURB_SHIFT 16 +#define INET_TABLE_PERTURB_SIZE (1 << INET_TABLE_PERTURB_SHIFT) static u32 *table_perturb; int __inet_hash_connect(struct inet_timewait_death_row *death_row, @@ -714,7 +701,17 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, u32 index; if (port) { - local_bh_disable(); + head = &hinfo->bhash[inet_bhashfn(net, port, + hinfo->bhash_size)]; + tb = inet_csk(sk)->icsk_bind_hash; + spin_lock_bh(&head->lock); + if (sk_head(&tb->owners) == sk && !sk->sk_bind_node.next) { + inet_ehash_nolisten(sk, NULL, NULL); + spin_unlock_bh(&head->lock); + return 0; + } + spin_unlock(&head->lock); + /* No definite answer... Walk to established hash table */ ret = check_established(death_row, sk, port, NULL); local_bh_enable(); return ret; @@ -728,8 +725,8 @@ int __inet_hash_connect(struct inet_timewait_death_row *death_row, if (likely(remaining > 1)) remaining &= ~1U; - get_random_slow_once(table_perturb, - INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb)); + net_get_random_once(table_perturb, + INET_TABLE_PERTURB_SIZE * sizeof(*table_perturb)); index = port_offset & (INET_TABLE_PERTURB_SIZE - 1); offset = READ_ONCE(table_perturb[index]) + (port_offset >> 32);
diff --git a/net/ipv4/inet_timewait_sock.c b/net/ipv4/inet_timewait_sock.c index a00102d..c411c87 100644 --- a/net/ipv4/inet_timewait_sock.c +++ b/net/ipv4/inet_timewait_sock.c
@@ -81,10 +81,10 @@ void inet_twsk_put(struct inet_timewait_sock *tw) } EXPORT_SYMBOL_GPL(inet_twsk_put); -static void inet_twsk_add_node_tail_rcu(struct inet_timewait_sock *tw, - struct hlist_nulls_head *list) +static void inet_twsk_add_node_rcu(struct inet_timewait_sock *tw, + struct hlist_nulls_head *list) { - hlist_nulls_add_tail_rcu(&tw->tw_node, list); + hlist_nulls_add_head_rcu(&tw->tw_node, list); } static void inet_twsk_add_bind_node(struct inet_timewait_sock *tw, @@ -120,7 +120,7 @@ void inet_twsk_hashdance(struct inet_timewait_sock *tw, struct sock *sk, spin_lock(lock); - inet_twsk_add_node_tail_rcu(tw, &ehead->chain); + inet_twsk_add_node_rcu(tw, &ehead->chain); /* Step 3: Remove SK from hash chain */ if (__sk_nulls_del_node_init_rcu(sk))
diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index 317fdb9..52dbffb 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c
@@ -525,7 +525,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev) truncate = true; } - nhoff = skb_network_offset(skb); + nhoff = skb_network_header(skb) - skb_mac_header(skb); if (skb->protocol == htons(ETH_P_IP) && (ntohs(ip_hdr(skb)->tot_len) > skb->len - nhoff)) truncate = true; @@ -534,7 +534,7 @@ static void erspan_fb_xmit(struct sk_buff *skb, struct net_device *dev) int thoff; if (skb_transport_header_was_set(skb)) - thoff = skb_transport_offset(skb); + thoff = skb_transport_header(skb) - skb_mac_header(skb); else thoff = nhoff + sizeof(struct ipv6hdr); if (ntohs(ipv6_hdr(skb)->payload_len) > skb->len - thoff)
diff --git a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c index 1464e27..c59a78a 100644 --- a/net/ipv4/ip_input.c +++ b/net/ipv4/ip_input.c
@@ -302,38 +302,31 @@ static inline bool ip_rcv_options(struct sk_buff *skb, struct net_device *dev) return true; } -int udp_v4_early_demux(struct sk_buff *); -int tcp_v4_early_demux(struct sk_buff *); +INDIRECT_CALLABLE_DECLARE(int udp_v4_early_demux(struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(int tcp_v4_early_demux(struct sk_buff *)); static int ip_rcv_finish_core(struct net *net, struct sock *sk, struct sk_buff *skb, struct net_device *dev) { const struct iphdr *iph = ip_hdr(skb); + int (*edemux)(struct sk_buff *skb); struct rtable *rt; int err; - if (READ_ONCE(net->ipv4.sysctl_ip_early_demux) && + if (net->ipv4.sysctl_ip_early_demux && !skb_dst(skb) && !skb->sk && !ip_is_fragment(iph)) { - switch (iph->protocol) { - case IPPROTO_TCP: - if (READ_ONCE(net->ipv4.sysctl_tcp_early_demux)) { - tcp_v4_early_demux(skb); + const struct net_protocol *ipprot; + int protocol = iph->protocol; - /* must reload iph, skb->head might have changed */ - iph = ip_hdr(skb); - } - break; - case IPPROTO_UDP: - if (READ_ONCE(net->ipv4.sysctl_udp_early_demux)) { - err = udp_v4_early_demux(skb); - if (unlikely(err)) - goto drop_error; - - /* must reload iph, skb->head might have changed */ - iph = ip_hdr(skb); - } - break; + ipprot = rcu_dereference(inet_protos[protocol]); + if (ipprot && (edemux = READ_ONCE(ipprot->early_demux))) { + err = INDIRECT_CALL_2(edemux, tcp_v4_early_demux, + udp_v4_early_demux, skb); + if (unlikely(err)) + goto drop_error; + /* must reload iph, skb->head might have changed */ + iph = ip_hdr(skb); } }
diff --git a/net/ipv4/ip_tunnel.c b/net/ipv4/ip_tunnel.c index 4559eda..38d3095 100644 --- a/net/ipv4/ip_tunnel.c +++ b/net/ipv4/ip_tunnel.c
@@ -620,10 +620,10 @@ void ip_md_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, } headroom += LL_RESERVED_SPACE(rt->dst.dev) + rt->dst.header_len; - if (headroom > READ_ONCE(dev->needed_headroom)) - WRITE_ONCE(dev->needed_headroom, headroom); + if (headroom > dev->needed_headroom) + dev->needed_headroom = headroom; - if (skb_cow_head(skb, READ_ONCE(dev->needed_headroom))) { + if (skb_cow_head(skb, dev->needed_headroom)) { ip_rt_put(rt); goto tx_dropped; } @@ -804,10 +804,10 @@ void ip_tunnel_xmit(struct sk_buff *skb, struct net_device *dev, max_headroom = LL_RESERVED_SPACE(rt->dst.dev) + sizeof(struct iphdr) + rt->dst.header_len + ip_encap_hlen(&tunnel->encap); - if (max_headroom > READ_ONCE(dev->needed_headroom)) - WRITE_ONCE(dev->needed_headroom, max_headroom); + if (max_headroom > dev->needed_headroom) + dev->needed_headroom = max_headroom; - if (skb_cow_head(skb, READ_ONCE(dev->needed_headroom))) { + if (skb_cow_head(skb, dev->needed_headroom)) { ip_rt_put(rt); dev->stats.tx_dropped++; kfree_skb(skb);
diff --git a/net/ipv4/metrics.c b/net/ipv4/metrics.c index 4966ac2..3205d5f 100644 --- a/net/ipv4/metrics.c +++ b/net/ipv4/metrics.c
@@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-only #include <linux/netlink.h> -#include <linux/nospec.h> #include <linux/rtnetlink.h> #include <linux/types.h> #include <net/ip.h> @@ -29,7 +28,6 @@ static int ip_metrics_convert(struct net *net, struct nlattr *fc_mx, return -EINVAL; } - type = array_index_nospec(type, RTAX_MAX + 1); if (type == RTAX_CC_ALGO) { char tmp[TCP_CA_NAME_MAX];
diff --git a/net/ipv4/netfilter/nf_tproxy_ipv4.c b/net/ipv4/netfilter/nf_tproxy_ipv4.c index 61cb234..b2bae0b 100644 --- a/net/ipv4/netfilter/nf_tproxy_ipv4.c +++ b/net/ipv4/netfilter/nf_tproxy_ipv4.c
@@ -38,7 +38,7 @@ nf_tproxy_handle_time_wait4(struct net *net, struct sk_buff *skb, hp->source, lport ? lport : hp->dest, skb->dev, NF_TPROXY_LOOKUP_LISTENER); if (sk2) { - nf_tproxy_twsk_deschedule_put(inet_twsk(sk)); + inet_twsk_deschedule_put(inet_twsk(sk)); sk = sk2; } }
diff --git a/net/ipv4/netfilter/nft_fib_ipv4.c b/net/ipv4/netfilter/nft_fib_ipv4.c index 85eac5a..ce29411 100644 --- a/net/ipv4/netfilter/nft_fib_ipv4.c +++ b/net/ipv4/netfilter/nft_fib_ipv4.c
@@ -83,9 +83,6 @@ void nft_fib4_eval(const struct nft_expr *expr, struct nft_regs *regs, else oif = NULL; - if (priv->flags & NFTA_FIB_F_IIF) - fl4.flowi4_oif = l3mdev_master_ifindex_rcu(oif); - if (nft_hook(pkt) == NF_INET_PRE_ROUTING && nft_fib_is_loopback(pkt->skb, nft_in(pkt))) { nft_fib_store_result(dest, priv, nft_in(pkt));
diff --git a/net/ipv4/nexthop.c b/net/ipv4/nexthop.c index da78db4..8bdffdf 100644 --- a/net/ipv4/nexthop.c +++ b/net/ipv4/nexthop.c
@@ -1201,7 +1201,7 @@ static int nh_create_ipv4(struct net *net, struct nexthop *nh, if (!err) { nh->nh_flags = fib_nh->fib_nh_flags; fib_info_update_nhc_saddr(net, &fib_nh->nh_common, - !fib_nh->fib_nh_scope ? 0 : fib_nh->fib_nh_scope - 1); + fib_nh->fib_nh_scope); } else { fib_nh_release(net, fib_nh); }
diff --git a/net/ipv4/sysctl_net_ipv4.c b/net/ipv4/sysctl_net_ipv4.c index 7398316..b32c9ac 100644 --- a/net/ipv4/sysctl_net_ipv4.c +++ b/net/ipv4/sysctl_net_ipv4.c
@@ -370,6 +370,61 @@ static int proc_tcp_fastopen_key(struct ctl_table *table, int write, return ret; } +static void proc_configure_early_demux(int enabled, int protocol) +{ + struct net_protocol *ipprot; +#if IS_ENABLED(CONFIG_IPV6) + struct inet6_protocol *ip6prot; +#endif + + rcu_read_lock(); + + ipprot = rcu_dereference(inet_protos[protocol]); + if (ipprot) + ipprot->early_demux = enabled ? ipprot->early_demux_handler : + NULL; + +#if IS_ENABLED(CONFIG_IPV6) + ip6prot = rcu_dereference(inet6_protos[protocol]); + if (ip6prot) + ip6prot->early_demux = enabled ? ip6prot->early_demux_handler : + NULL; +#endif + rcu_read_unlock(); +} + +static int proc_tcp_early_demux(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + int ret = 0; + + ret = proc_dointvec(table, write, buffer, lenp, ppos); + + if (write && !ret) { + int enabled = init_net.ipv4.sysctl_tcp_early_demux; + + proc_configure_early_demux(enabled, IPPROTO_TCP); + } + + return ret; +} + +static int proc_udp_early_demux(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + int ret = 0; + + ret = proc_dointvec(table, write, buffer, lenp, ppos); + + if (write && !ret) { + int enabled = init_net.ipv4.sysctl_udp_early_demux; + + proc_configure_early_demux(enabled, IPPROTO_UDP); + } + + return ret; +} + static int proc_tfo_blackhole_detect_timeout(struct ctl_table *table, int write, void __user *buffer, @@ -673,14 +728,14 @@ static struct ctl_table ipv4_net_table[] = { .data = &init_net.ipv4.sysctl_udp_early_demux, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_douintvec_minmax, + .proc_handler = proc_udp_early_demux }, { .procname = "tcp_early_demux", .data = &init_net.ipv4.sysctl_tcp_early_demux, .maxlen = sizeof(int), .mode = 0644, - .proc_handler = proc_douintvec_minmax, + .proc_handler = proc_tcp_early_demux }, { .procname = "ip_default_ttl",
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index f805c86..042cf03 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c
@@ -437,7 +437,6 @@ void tcp_init_sock(struct sock *sk) /* There's a bubble in the pipe until at least the first ACK. */ tp->app_limited = ~0U; - tp->rate_app_limited = 1; /* See draft-stevens-tcpca-spec-01 for discussion of the * initialization of these values. @@ -2652,8 +2651,6 @@ int tcp_disconnect(struct sock *sk, int flags) tp->snd_ssthresh = TCP_INFINITE_SSTHRESH; tp->snd_cwnd = TCP_INIT_CWND; tp->snd_cwnd_cnt = 0; - tp->is_cwnd_limited = 0; - tp->max_packets_out = 0; tp->window_clamp = 0; tp->delivered = 0; tp->delivered_ce = 0; @@ -2671,7 +2668,8 @@ int tcp_disconnect(struct sock *sk, int flags) icsk->icsk_ack.rcv_mss = TCP_MIN_MSS; memset(&tp->rx_opt, 0, sizeof(tp->rx_opt)); __sk_dst_reset(sk); - dst_release(xchg((__force struct dst_entry **)&sk->sk_rx_dst, NULL)); + dst_release(sk->sk_rx_dst); + sk->sk_rx_dst = NULL; tcp_saved_syn_free(tp); tp->compressed_ack = 0; tp->segs_in = 0; @@ -2692,7 +2690,6 @@ int tcp_disconnect(struct sock *sk, int flags) tp->last_oow_ack_time = 0; /* There's a bubble in the pipe until at least the first ACK. */ tp->app_limited = ~0U; - tp->rate_app_limited = 1; tp->rack.mstamp = 0; tp->rack.advanced = 0; tp->rack.reo_wnd_steps = 1; @@ -3787,16 +3784,12 @@ static void __tcp_alloc_md5sig_pool(void) * to memory. See smp_rmb() in tcp_get_md5sig_pool() */ smp_wmb(); - /* Paired with READ_ONCE() from tcp_alloc_md5sig_pool() - * and tcp_get_md5sig_pool(). - */ - WRITE_ONCE(tcp_md5sig_pool_populated, true); + tcp_md5sig_pool_populated = true; } bool tcp_alloc_md5sig_pool(void) { - /* Paired with WRITE_ONCE() from __tcp_alloc_md5sig_pool() */ - if (unlikely(!READ_ONCE(tcp_md5sig_pool_populated))) { + if (unlikely(!tcp_md5sig_pool_populated)) { mutex_lock(&tcp_md5sig_mutex); if (!tcp_md5sig_pool_populated) { @@ -3807,8 +3800,7 @@ bool tcp_alloc_md5sig_pool(void) mutex_unlock(&tcp_md5sig_mutex); } - /* Paired with WRITE_ONCE() from __tcp_alloc_md5sig_pool() */ - return READ_ONCE(tcp_md5sig_pool_populated); + return tcp_md5sig_pool_populated; } EXPORT_SYMBOL(tcp_alloc_md5sig_pool); @@ -3824,8 +3816,7 @@ struct tcp_md5sig_pool *tcp_get_md5sig_pool(void) { local_bh_disable(); - /* Paired with WRITE_ONCE() from __tcp_alloc_md5sig_pool() */ - if (READ_ONCE(tcp_md5sig_pool_populated)) { + if (tcp_md5sig_pool_populated) { /* coupled with smp_wmb() in __tcp_alloc_md5sig_pool() */ smp_rmb(); return this_cpu_ptr(&tcp_md5sig_pool);
diff --git a/net/ipv4/tcp_bpf.c b/net/ipv4/tcp_bpf.c index ca49d68..bcc1336 100644 --- a/net/ipv4/tcp_bpf.c +++ b/net/ipv4/tcp_bpf.c
@@ -203,11 +203,8 @@ static int bpf_tcp_ingress(struct sock *sk, struct sk_psock *psock, tmp->sg.end = i; if (apply) { apply_bytes -= size; - if (!apply_bytes) { - if (sge->length) - sk_msg_iter_var_prev(i); + if (!apply_bytes) break; - } } } while (i != msg->sg.end); @@ -314,8 +311,8 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, { bool cork = false, enospc = sk_msg_full(msg); struct sock *sk_redir; - u32 tosend, origsize, sent, delta = 0; - u32 eval; + u32 tosend, delta = 0; + u32 eval = __SK_NONE; int ret; more_data: @@ -346,7 +343,6 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, tosend = msg->sg.size; if (psock->apply_bytes && psock->apply_bytes < tosend) tosend = psock->apply_bytes; - eval = __SK_NONE; switch (psock->eval) { case __SK_PASS: @@ -370,12 +366,10 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, cork = true; psock->cork = NULL; } - sk_msg_return(sk, msg, tosend); + sk_msg_return(sk, msg, msg->sg.size); release_sock(sk); - origsize = msg->sg.size; ret = tcp_bpf_sendmsg_redir(sk_redir, msg, tosend, flags); - sent = origsize - msg->sg.size; if (eval == __SK_REDIRECT) sock_put(sk_redir); @@ -414,7 +408,7 @@ static int tcp_bpf_send_verdict(struct sock *sk, struct sk_psock *psock, msg->sg.data[msg->sg.start].page_link && msg->sg.data[msg->sg.start].length) { if (eval == __SK_REDIRECT) - sk_mem_charge(sk, tosend - sent); + sk_mem_charge(sk, msg->sg.size); goto more_data; } }
diff --git a/net/ipv4/tcp_cdg.c b/net/ipv4/tcp_cdg.c index 56dede4..709d238 100644 --- a/net/ipv4/tcp_cdg.c +++ b/net/ipv4/tcp_cdg.c
@@ -375,7 +375,6 @@ static void tcp_cdg_init(struct sock *sk) struct cdg *ca = inet_csk_ca(sk); struct tcp_sock *tp = tcp_sk(sk); - ca->gradients = NULL; /* We silently fall back to window = 1 if allocation fails. */ if (window > 1) ca->gradients = kcalloc(window, sizeof(ca->gradients[0]), @@ -389,7 +388,6 @@ static void tcp_cdg_release(struct sock *sk) struct cdg *ca = inet_csk_ca(sk); kfree(ca->gradients); - ca->gradients = NULL; } static struct tcp_congestion_ops tcp_cdg __read_mostly = {
diff --git a/net/ipv4/tcp_input.c b/net/ipv4/tcp_input.c index b0c0c82..167bbda 100644 --- a/net/ipv4/tcp_input.c +++ b/net/ipv4/tcp_input.c
@@ -2048,8 +2048,7 @@ void tcp_enter_loss(struct sock *sk) */ static bool tcp_check_sack_reneging(struct sock *sk, int flag) { - if (flag & FLAG_SACK_RENEGING && - flag & FLAG_SND_UNA_ADVANCED) { + if (flag & FLAG_SACK_RENEGING) { struct tcp_sock *tp = tcp_sk(sk); unsigned long delay = max(usecs_to_jiffies(tp->srtt_us >> 4), msecs_to_jiffies(10)); @@ -2386,21 +2385,6 @@ static inline bool tcp_may_undo(const struct tcp_sock *tp) return tp->undo_marker && (!tp->undo_retrans || tcp_packet_delayed(tp)); } -static bool tcp_is_non_sack_preventing_reopen(struct sock *sk) -{ - struct tcp_sock *tp = tcp_sk(sk); - - if (tp->snd_una == tp->high_seq && tcp_is_reno(tp)) { - /* Hold old state until something *above* high_seq - * is ACKed. For Reno it is MUST to prevent false - * fast retransmits (RFC2582). SACK TCP is safe. */ - if (!tcp_any_retrans_done(sk)) - tp->retrans_stamp = 0; - return true; - } - return false; -} - /* People celebrate: "We love our President!" */ static bool tcp_try_undo_recovery(struct sock *sk) { @@ -2423,8 +2407,14 @@ static bool tcp_try_undo_recovery(struct sock *sk) } else if (tp->rack.reo_wnd_persist) { tp->rack.reo_wnd_persist--; } - if (tcp_is_non_sack_preventing_reopen(sk)) + if (tp->snd_una == tp->high_seq && tcp_is_reno(tp)) { + /* Hold old state until something *above* high_seq + * is ACKed. For Reno it is MUST to prevent false + * fast retransmits (RFC2582). SACK TCP is safe. */ + if (!tcp_any_retrans_done(sk)) + tp->retrans_stamp = 0; return true; + } tcp_set_ca_state(sk, TCP_CA_Open); tp->is_sack_reneg = 0; return false; @@ -2460,8 +2450,6 @@ static bool tcp_try_undo_loss(struct sock *sk, bool frto_undo) NET_INC_STATS(sock_net(sk), LINUX_MIB_TCPSPURIOUSRTOS); inet_csk(sk)->icsk_retransmits = 0; - if (tcp_is_non_sack_preventing_reopen(sk)) - return true; if (frto_undo || tcp_is_sack(tp)) { tcp_set_ca_state(sk, TCP_CA_Open); tp->is_sack_reneg = 0; @@ -3497,11 +3485,11 @@ static void tcp_send_challenge_ack(struct sock *sk, const struct sk_buff *skb) /* Then check host-wide RFC 5961 rate limit. */ now = jiffies / HZ; - if (now != READ_ONCE(challenge_timestamp)) { + if (now != challenge_timestamp) { u32 ack_limit = READ_ONCE(net->ipv4.sysctl_tcp_challenge_ack_limit); u32 half = (ack_limit + 1) >> 1; - WRITE_ONCE(challenge_timestamp, now); + challenge_timestamp = now; WRITE_ONCE(challenge_count, half + prandom_u32_max(ack_limit)); } count = READ_ONCE(challenge_count); @@ -5625,7 +5613,7 @@ void tcp_rcv_established(struct sock *sk, struct sk_buff *skb) trace_tcp_probe(sk, skb); tcp_mstamp_refresh(tp); - if (unlikely(!rcu_access_pointer(sk->sk_rx_dst))) + if (unlikely(!sk->sk_rx_dst)) inet_csk(sk)->icsk_af_ops->sk_rx_dst_set(sk, skb); /* * Header prediction.
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index a54505c..b95e1a3 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c
@@ -323,8 +323,6 @@ int tcp_v4_connect(struct sock *sk, struct sockaddr *uaddr, int addr_len) * if necessary. */ tcp_set_state(sk, TCP_CLOSE); - if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) - inet_reset_saddr(sk); ip_rt_put(rt); sk->sk_route_caps = 0; inet->inet_dport = 0; @@ -1572,18 +1570,15 @@ int tcp_v4_do_rcv(struct sock *sk, struct sk_buff *skb) struct sock *rsk; if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst; - - dst = rcu_dereference_protected(sk->sk_rx_dst, - lockdep_sock_is_held(sk)); + struct dst_entry *dst = sk->sk_rx_dst; sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || !dst->ops->check(dst, 0)) { - RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); + sk->sk_rx_dst = NULL; } } tcp_rcv_established(sk, skb); @@ -1658,7 +1653,7 @@ int tcp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); + struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0); @@ -2064,7 +2059,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) struct dst_entry *dst = skb_dst(skb); if (dst && dst_hold_safe(dst)) { - rcu_assign_pointer(sk->sk_rx_dst, dst); + sk->sk_rx_dst = dst; inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; } }
diff --git a/net/ipv4/tcp_minisocks.c b/net/ipv4/tcp_minisocks.c index e5dc085..324f43f 100644 --- a/net/ipv4/tcp_minisocks.c +++ b/net/ipv4/tcp_minisocks.c
@@ -563,9 +563,6 @@ EXPORT_SYMBOL(tcp_create_openreq_child); * validation and inside tcp_v4_reqsk_send_ack(). Can we do better? * * We don't need to initialize tmp_opt.sack_ok as we don't use the results - * - * Note: If @fastopen is true, this can be called from process context. - * Otherwise, this is from BH context. */ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, @@ -718,7 +715,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, &tcp_rsk(req)->last_oow_ack_time)) req->rsk_ops->send_ack(sk, skb, req); if (paws_reject) - NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED); + __NET_INC_STATS(sock_net(sk), LINUX_MIB_PAWSESTABREJECTED); return NULL; } @@ -737,7 +734,7 @@ struct sock *tcp_check_req(struct sock *sk, struct sk_buff *skb, * "fourth, check the SYN bit" */ if (flg & (TCP_FLAG_RST|TCP_FLAG_SYN)) { - TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); + __TCP_INC_STATS(sock_net(sk), TCP_MIB_ATTEMPTFAILS); goto embryonic_reset; }
diff --git a/net/ipv4/tcp_output.c b/net/ipv4/tcp_output.c index 95e5835..bde0e21 100644 --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c
@@ -1653,20 +1653,15 @@ static void tcp_cwnd_validate(struct sock *sk, bool is_cwnd_limited) const struct tcp_congestion_ops *ca_ops = inet_csk(sk)->icsk_ca_ops; struct tcp_sock *tp = tcp_sk(sk); - /* Track the strongest available signal of the degree to which the cwnd - * is fully utilized. If cwnd-limited then remember that fact for the - * current window. If not cwnd-limited then track the maximum number of - * outstanding packets in the current window. (If cwnd-limited then we - * chose to not update tp->max_packets_out to avoid an extra else - * clause with no functional impact.) + /* Track the maximum number of outstanding packets in each + * window, and remember whether we were cwnd-limited then. */ - if (!before(tp->snd_una, tp->cwnd_usage_seq) || - is_cwnd_limited || - (!tp->is_cwnd_limited && - tp->packets_out > tp->max_packets_out)) { - tp->is_cwnd_limited = is_cwnd_limited; + if (!before(tp->snd_una, tp->max_packets_seq) || + tp->packets_out > tp->max_packets_out || + is_cwnd_limited) { tp->max_packets_out = tp->packets_out; - tp->cwnd_usage_seq = tp->snd_nxt; + tp->max_packets_seq = tp->snd_nxt; + tp->is_cwnd_limited = is_cwnd_limited; } if (tcp_is_cwnd_limited(sk)) { @@ -2916,7 +2911,7 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) struct tcp_sock *tp = tcp_sk(sk); unsigned int cur_mss; int diff, len, err; - int avail_wnd; + /* Inconclusive MTU probe */ if (icsk->icsk_mtup.probe_size) @@ -2946,25 +2941,17 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) return -EHOSTUNREACH; /* Routing failure or similar. */ cur_mss = tcp_current_mss(sk); - avail_wnd = tcp_wnd_end(tp) - TCP_SKB_CB(skb)->seq; /* If receiver has shrunk his window, and skb is out of * new window, do not retransmit it. The exception is the * case, when window is shrunk to zero. In this case - * our retransmit of one segment serves as a zero window probe. + * our retransmit serves as a zero window probe. */ - if (avail_wnd <= 0) { - if (TCP_SKB_CB(skb)->seq != tp->snd_una) - return -EAGAIN; - avail_wnd = cur_mss; - } + if (!before(TCP_SKB_CB(skb)->seq, tcp_wnd_end(tp)) && + TCP_SKB_CB(skb)->seq != tp->snd_una) + return -EAGAIN; len = cur_mss * segs; - if (len > avail_wnd) { - len = rounddown(avail_wnd, cur_mss); - if (!len) - len = avail_wnd; - } if (skb->len > len) { if (tcp_fragment(sk, TCP_FRAG_IN_RTX_QUEUE, skb, len, cur_mss, GFP_ATOMIC)) @@ -2978,9 +2965,8 @@ int __tcp_retransmit_skb(struct sock *sk, struct sk_buff *skb, int segs) diff -= tcp_skb_pcount(skb); if (diff) tcp_adjust_pcount(sk, skb, diff); - avail_wnd = min_t(int, avail_wnd, cur_mss); - if (skb->len < avail_wnd) - tcp_retrans_try_collapse(sk, skb, avail_wnd); + if (skb->len < cur_mss) + tcp_retrans_try_collapse(sk, skb, cur_mss); } /* RFC3168, section 6.1.1.1. ECN fallback */ @@ -3148,12 +3134,11 @@ void tcp_xmit_retransmit_queue(struct sock *sk) */ void sk_forced_mem_schedule(struct sock *sk, int size) { - int delta, amt; + int amt; - delta = size - sk->sk_forward_alloc; - if (delta <= 0) + if (size <= sk->sk_forward_alloc) return; - amt = sk_mem_pages(delta); + amt = sk_mem_pages(size); sk->sk_forward_alloc += amt * SK_MEM_QUANTUM; sk_memory_allocated_add(sk, amt); @@ -3374,7 +3359,7 @@ struct sk_buff *tcp_make_synack(const struct sock *sk, struct dst_entry *dst, th->window = htons(min(req->rsk_rcv_wnd, 65535U)); tcp_options_write((__be32 *)(th + 1), NULL, &opts); th->doff = (tcp_header_size >> 2); - TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); + __TCP_INC_STATS(sock_net(sk), TCP_MIB_OUTSEGS); #ifdef CONFIG_TCP_MD5SIG /* Okay, we have all we need - do the md5 hash if needed */
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index 20f0750..87082f5 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c
@@ -1528,7 +1528,7 @@ int __udp_enqueue_schedule_skb(struct sock *sk, struct sk_buff *skb) } EXPORT_SYMBOL_GPL(__udp_enqueue_schedule_skb); -void udp_destruct_common(struct sock *sk) +void udp_destruct_sock(struct sock *sk) { /* reclaim completely the forward allocated memory */ struct udp_sock *up = udp_sk(sk); @@ -1541,14 +1541,10 @@ void udp_destruct_common(struct sock *sk) kfree_skb(skb); } udp_rmem_release(sk, total, 0, true); -} -EXPORT_SYMBOL_GPL(udp_destruct_common); -static void udp_destruct_sock(struct sock *sk) -{ - udp_destruct_common(sk); inet_sock_destruct(sk); } +EXPORT_SYMBOL_GPL(udp_destruct_sock); int udp_init_sock(struct sock *sk) { @@ -1556,6 +1552,7 @@ int udp_init_sock(struct sock *sk) sk->sk_destruct = udp_destruct_sock; return 0; } +EXPORT_SYMBOL_GPL(udp_init_sock); void skb_consume_udp(struct sock *sk, struct sk_buff *skb, int len) { @@ -2140,7 +2137,7 @@ bool udp_sk_rx_dst_set(struct sock *sk, struct dst_entry *dst) struct dst_entry *old; if (dst_hold_safe(dst)) { - old = xchg((__force struct dst_entry **)&sk->sk_rx_dst, dst); + old = xchg(&sk->sk_rx_dst, dst); dst_release(old); return old != dst; } @@ -2329,7 +2326,7 @@ int __udp4_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) + if (unlikely(sk->sk_rx_dst != dst)) udp_sk_rx_dst_set(sk, dst); ret = udp_unicast_rcv_skb(sk, skb, uh); @@ -2487,7 +2484,7 @@ int udp_v4_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = rcu_dereference(sk->sk_rx_dst); + dst = READ_ONCE(sk->sk_rx_dst); if (dst) dst = dst_check(dst, 0);
diff --git a/net/ipv4/udp_tunnel.c b/net/ipv4/udp_tunnel.c index bbe4eca..150e6f0 100644 --- a/net/ipv4/udp_tunnel.c +++ b/net/ipv4/udp_tunnel.c
@@ -196,7 +196,6 @@ EXPORT_SYMBOL_GPL(udp_tunnel_xmit_skb); void udp_tunnel_sock_release(struct socket *sock) { rcu_assign_sk_user_data(sock->sk, NULL); - synchronize_rcu(); kernel_sock_shutdown(sock, SHUT_RDWR); sock_release(sock); }
diff --git a/net/ipv4/udplite.c b/net/ipv4/udplite.c index f4fad91..5936d66 100644 --- a/net/ipv4/udplite.c +++ b/net/ipv4/udplite.c
@@ -17,14 +17,6 @@ struct udp_table udplite_table __read_mostly; EXPORT_SYMBOL(udplite_table); -/* Designate sk as UDP-Lite socket */ -static int udplite_sk_init(struct sock *sk) -{ - udp_init_sock(sk); - udp_sk(sk)->pcflag = UDPLITE_BIT; - return 0; -} - static int udplite_rcv(struct sk_buff *skb) { return __udp4_lib_rcv(skb, &udplite_table, IPPROTO_UDPLITE);
diff --git a/net/ipv6/addrlabel.c b/net/ipv6/addrlabel.c index 17ac45a..8a22486 100644 --- a/net/ipv6/addrlabel.c +++ b/net/ipv6/addrlabel.c
@@ -437,7 +437,6 @@ static void ip6addrlbl_putmsg(struct nlmsghdr *nlh, { struct ifaddrlblmsg *ifal = nlmsg_data(nlh); ifal->ifal_family = AF_INET6; - ifal->__ifal_reserved = 0; ifal->ifal_prefixlen = prefixlen; ifal->ifal_flags = 0; ifal->ifal_index = ifindex;
diff --git a/net/ipv6/af_inet6.c b/net/ipv6/af_inet6.c index e0c6c10..83d4eb7 100644 --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c
@@ -104,13 +104,6 @@ static __inline__ struct ipv6_pinfo *inet6_sk_generic(struct sock *sk) return (struct ipv6_pinfo *)(((u8 *)sk) + offset); } -void inet6_sock_destruct(struct sock *sk) -{ - inet6_cleanup_sock(sk); - inet_sock_destruct(sk); -} -EXPORT_SYMBOL_GPL(inet6_sock_destruct); - static int inet6_create(struct net *net, struct socket *sock, int protocol, int kern) { @@ -203,7 +196,7 @@ static int inet6_create(struct net *net, struct socket *sock, int protocol, inet->hdrincl = 1; } - sk->sk_destruct = inet6_sock_destruct; + sk->sk_destruct = inet_sock_destruct; sk->sk_family = PF_INET6; sk->sk_protocol = protocol; @@ -507,12 +500,6 @@ void inet6_destroy_sock(struct sock *sk) } EXPORT_SYMBOL_GPL(inet6_destroy_sock); -void inet6_cleanup_sock(struct sock *sk) -{ - inet6_destroy_sock(sk); -} -EXPORT_SYMBOL_GPL(inet6_cleanup_sock); - /* * This does both peername and sockname. */
diff --git a/net/ipv6/datagram.c b/net/ipv6/datagram.c index 0626160..390bedd 100644 --- a/net/ipv6/datagram.c +++ b/net/ipv6/datagram.c
@@ -50,7 +50,7 @@ static void ip6_datagram_flow_key_init(struct flowi6 *fl6, struct sock *sk) fl6->flowi6_mark = sk->sk_mark; fl6->fl6_dport = inet->inet_dport; fl6->fl6_sport = inet->inet_sport; - fl6->flowlabel = ip6_make_flowinfo(np->tclass, np->flow_label); + fl6->flowlabel = np->flow_label; fl6->flowi6_uid = sk->sk_uid; if (!fl6->flowi6_oif)
diff --git a/net/ipv6/ila/ila_xlat.c b/net/ipv6/ila/ila_xlat.c index 10f1367..5fc1f4e 100644 --- a/net/ipv6/ila/ila_xlat.c +++ b/net/ipv6/ila/ila_xlat.c
@@ -477,7 +477,6 @@ int ila_xlat_nl_cmd_get_mapping(struct sk_buff *skb, struct genl_info *info) rcu_read_lock(); - ret = -ESRCH; ila = ila_lookup_by_params(&xp, ilan); if (ila) { ret = ila_dump_info(ila,
diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 85ec466..4a6396d 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c
@@ -942,7 +942,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, truncate = true; } - nhoff = skb_network_offset(skb); + nhoff = skb_network_header(skb) - skb_mac_header(skb); if (skb->protocol == htons(ETH_P_IP) && (ntohs(ip_hdr(skb)->tot_len) > skb->len - nhoff)) truncate = true; @@ -951,7 +951,7 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, int thoff; if (skb_transport_header_was_set(skb)) - thoff = skb_transport_offset(skb); + thoff = skb_transport_header(skb) - skb_mac_header(skb); else thoff = nhoff + sizeof(struct ipv6hdr); if (ntohs(ipv6_hdr(skb)->payload_len) > skb->len - thoff) @@ -1137,16 +1137,14 @@ static void ip6gre_tnl_link_config_route(struct ip6_tnl *t, int set_mtu, dev->needed_headroom = dst_len; if (set_mtu) { - int mtu = rt->dst.dev->mtu - t_hlen; - + dev->mtu = rt->dst.dev->mtu - t_hlen; if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT)) - mtu -= 8; + dev->mtu -= 8; if (dev->type == ARPHRD_ETHER) - mtu -= ETH_HLEN; + dev->mtu -= ETH_HLEN; - if (mtu < IPV6_MIN_MTU) - mtu = IPV6_MIN_MTU; - WRITE_ONCE(dev->mtu, mtu); + if (dev->mtu < IPV6_MIN_MTU) + dev->mtu = IPV6_MIN_MTU; } } ip6_rt_put(rt);
diff --git a/net/ipv6/ip6_input.c b/net/ipv6/ip6_input.c index ebf90bc..e6c4966 100644 --- a/net/ipv6/ip6_input.c +++ b/net/ipv6/ip6_input.c
@@ -44,25 +44,21 @@ #include <net/inet_ecn.h> #include <net/dst_metadata.h> -void udp_v6_early_demux(struct sk_buff *); -void tcp_v6_early_demux(struct sk_buff *); +INDIRECT_CALLABLE_DECLARE(void udp_v6_early_demux(struct sk_buff *)); +INDIRECT_CALLABLE_DECLARE(void tcp_v6_early_demux(struct sk_buff *)); static void ip6_rcv_finish_core(struct net *net, struct sock *sk, struct sk_buff *skb) { - if (READ_ONCE(net->ipv4.sysctl_ip_early_demux) && - !skb_dst(skb) && !skb->sk) { - switch (ipv6_hdr(skb)->nexthdr) { - case IPPROTO_TCP: - if (READ_ONCE(net->ipv4.sysctl_tcp_early_demux)) - tcp_v6_early_demux(skb); - break; - case IPPROTO_UDP: - if (READ_ONCE(net->ipv4.sysctl_udp_early_demux)) - udp_v6_early_demux(skb); - break; - } - } + void (*edemux)(struct sk_buff *skb); + if (net->ipv4.sysctl_ip_early_demux && !skb_dst(skb) && skb->sk == NULL) { + const struct inet6_protocol *ipprot; + + ipprot = rcu_dereference(inet6_protos[ipv6_hdr(skb)->nexthdr]); + if (ipprot && (edemux = READ_ONCE(ipprot->early_demux))) + INDIRECT_CALL_2(edemux, tcp_v6_early_demux, + udp_v6_early_demux, skb); + } if (!skb_valid_dst(skb)) ip6_route_input(skb); }
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 8231a7a..5585e3a 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c
@@ -919,9 +919,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, if (err < 0) goto fail; - /* We prevent @rt from being freed. */ - rcu_read_lock(); - for (;;) { /* Prepare header of the next frame, * before previous one went down. */ @@ -945,7 +942,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, if (err == 0) { IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), IPSTATS_MIB_FRAGOKS); - rcu_read_unlock(); return 0; } @@ -953,7 +949,6 @@ int ip6_fragment(struct net *net, struct sock *sk, struct sk_buff *skb, IP6_INC_STATS(net, ip6_dst_idev(&rt->dst), IPSTATS_MIB_FRAGFAILS); - rcu_read_unlock(); return err; slow_path_clean: @@ -1855,13 +1850,8 @@ struct sk_buff *__ip6_make_skb(struct sock *sk, IP6_UPD_PO_STATS(net, rt->rt6i_idev, IPSTATS_MIB_OUT, skb->len); if (proto == IPPROTO_ICMPV6) { struct inet6_dev *idev = ip6_dst_idev(skb_dst(skb)); - u8 icmp6_type; - if (sk->sk_socket->type == SOCK_RAW && !inet_sk(sk)->hdrincl) - icmp6_type = fl6->fl6_icmp_type; - else - icmp6_type = icmp6_hdr(skb)->icmp6_type; - ICMP6MSGOUT_INC_STATS(net, idev, icmp6_type); + ICMP6MSGOUT_INC_STATS(net, idev, icmp6_hdr(skb)->icmp6_type); ICMP6_INC_STATS(net, idev, ICMP6_MIB_OUTMSGS); }
diff --git a/net/ipv6/ip6_tunnel.c b/net/ipv6/ip6_tunnel.c index b976118..878a08c 100644 --- a/net/ipv6/ip6_tunnel.c +++ b/net/ipv6/ip6_tunnel.c
@@ -1201,8 +1201,8 @@ int ip6_tnl_xmit(struct sk_buff *skb, struct net_device *dev, __u8 dsfield, */ max_headroom = LL_RESERVED_SPACE(dst->dev) + sizeof(struct ipv6hdr) + dst->header_len + t->hlen; - if (max_headroom > READ_ONCE(dev->needed_headroom)) - WRITE_ONCE(dev->needed_headroom, max_headroom); + if (max_headroom > dev->needed_headroom) + dev->needed_headroom = max_headroom; err = ip6_tnl_encap(skb, t, &proto, fl6); if (err) @@ -1430,7 +1430,6 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) struct __ip6_tnl_parm *p = &t->parms; struct flowi6 *fl6 = &t->fl.u.ip6; int t_hlen; - int mtu; memcpy(dev->dev_addr, &p->laddr, sizeof(struct in6_addr)); memcpy(dev->broadcast, &p->raddr, sizeof(struct in6_addr)); @@ -1473,13 +1472,12 @@ static void ip6_tnl_link_config(struct ip6_tnl *t) dev->hard_header_len = rt->dst.dev->hard_header_len + t_hlen; - mtu = rt->dst.dev->mtu - t_hlen; + dev->mtu = rt->dst.dev->mtu - t_hlen; if (!(t->parms.flags & IP6_TNL_F_IGN_ENCAP_LIMIT)) - mtu -= 8; + dev->mtu -= 8; - if (mtu < IPV6_MIN_MTU) - mtu = IPV6_MIN_MTU; - WRITE_ONCE(dev->mtu, mtu); + if (dev->mtu < IPV6_MIN_MTU) + dev->mtu = IPV6_MIN_MTU; } ip6_rt_put(rt); }
diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c index 86c550d..5352c7e 100644 --- a/net/ipv6/ipv6_sockglue.c +++ b/net/ipv6/ipv6_sockglue.c
@@ -164,18 +164,15 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, rtnl_lock(); lock_sock(sk); - /* Another thread has converted the socket into IPv4 with - * IPV6_ADDRFORM concurrently. - */ - if (unlikely(sk->sk_family != AF_INET6)) - goto unlock; - switch (optname) { case IPV6_ADDRFORM: if (optlen < sizeof(int)) goto e_inval; if (val == PF_INET) { + struct ipv6_txoptions *opt; + struct sk_buff *pktopt; + if (sk->sk_type == SOCK_RAW) break; @@ -206,6 +203,7 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, break; } + fl6_free_socklist(sk); __ipv6_sock_mc_close(sk); __ipv6_sock_ac_close(sk); @@ -240,14 +238,14 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, sk->sk_socket->ops = &inet_dgram_ops; sk->sk_family = PF_INET; } - - /* Disable all options not to allocate memory anymore, - * but there is still a race. See the lockless path - * in udpv6_sendmsg() and ipv6_local_rxpmtu(). - */ - np->rxopt.all = 0; - - inet6_cleanup_sock(sk); + opt = xchg((__force struct ipv6_txoptions **)&np->opt, + NULL); + if (opt) { + atomic_sub(opt->tot_len, &sk->sk_omem_alloc); + txopt_put(opt); + } + pktopt = xchg(&np->pktoptions, NULL); + kfree_skb(pktopt); /* * ... and add it to the refcnt debug socks count @@ -926,7 +924,6 @@ static int do_ipv6_setsockopt(struct sock *sk, int level, int optname, break; } -unlock: release_sock(sk); if (needs_rtnl) rtnl_unlock();
diff --git a/net/ipv6/netfilter/nf_tproxy_ipv6.c b/net/ipv6/netfilter/nf_tproxy_ipv6.c index 0076192..34d51cd4 100644 --- a/net/ipv6/netfilter/nf_tproxy_ipv6.c +++ b/net/ipv6/netfilter/nf_tproxy_ipv6.c
@@ -63,7 +63,7 @@ nf_tproxy_handle_time_wait6(struct sk_buff *skb, int tproto, int thoff, lport ? lport : hp->dest, skb->dev, NF_TPROXY_LOOKUP_LISTENER); if (sk2) { - nf_tproxy_twsk_deschedule_put(inet_twsk(sk)); + inet_twsk_deschedule_put(inet_twsk(sk)); sk = sk2; } }
diff --git a/net/ipv6/netfilter/nft_fib_ipv6.c b/net/ipv6/netfilter/nft_fib_ipv6.c index 03dbd16..7ece86a 100644 --- a/net/ipv6/netfilter/nft_fib_ipv6.c +++ b/net/ipv6/netfilter/nft_fib_ipv6.c
@@ -37,9 +37,6 @@ static int nft_fib6_flowi_init(struct flowi6 *fl6, const struct nft_fib *priv, if (ipv6_addr_type(&fl6->daddr) & IPV6_ADDR_LINKLOCAL) { lookup_flags |= RT6_LOOKUP_F_IFACE; fl6->flowi6_oif = get_ifindex(dev ? dev : pkt->skb->dev); - } else if ((priv->flags & NFTA_FIB_F_IIF) && - (netif_is_l3_master(dev) || netif_is_l3_slave(dev))) { - fl6->flowi6_oif = dev->ifindex; } if (ipv6_addr_type(&fl6->saddr) & IPV6_ADDR_UNICAST) @@ -182,8 +179,7 @@ void nft_fib6_eval(const struct nft_expr *expr, struct nft_regs *regs, if (rt->rt6i_flags & (RTF_REJECT | RTF_ANYCAST | RTF_LOCAL)) goto put_rt_err; - if (oif && oif != rt->rt6i_idev->dev && - l3mdev_master_ifindex_rcu(rt->rt6i_idev->dev) != oif->ifindex) + if (oif && oif != rt->rt6i_idev->dev) goto put_rt_err; nft_fib_store_result(dest, priv, rt->rt6i_idev->dev);
diff --git a/net/ipv6/ping.c b/net/ipv6/ping.c index 98ac32b..051bbd0 100644 --- a/net/ipv6/ping.c +++ b/net/ipv6/ping.c
@@ -22,6 +22,11 @@ #include <linux/proc_fs.h> #include <net/ping.h> +static void ping_v6_destroy(struct sock *sk) +{ + inet6_destroy_sock(sk); +} + /* Compatibility glue so we can support IPv6 when it's compiled as a module */ static int dummy_ipv6_recv_error(struct sock *sk, struct msghdr *msg, int len, int *addr_len) @@ -165,6 +170,7 @@ struct proto pingv6_prot = { .owner = THIS_MODULE, .init = ping_init_sock, .close = ping_close, + .destroy = ping_v6_destroy, .connect = ip6_datagram_connect_v6_only, .disconnect = __udp_disconnect, .setsockopt = ipv6_setsockopt,
diff --git a/net/ipv6/raw.c b/net/ipv6/raw.c index bf052d6..828dd95 100644 --- a/net/ipv6/raw.c +++ b/net/ipv6/raw.c
@@ -539,7 +539,6 @@ static int rawv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, struct raw6_sock *rp) { - struct ipv6_txoptions *opt; struct sk_buff *skb; int err = 0; int offset; @@ -557,9 +556,6 @@ static int rawv6_push_pending_frames(struct sock *sk, struct flowi6 *fl6, offset = rp->offset; total_len = inet_sk(sk)->cork.base.length; - opt = inet6_sk(sk)->cork.opt; - total_len -= opt ? opt->opt_flen : 0; - if (offset >= total_len - 1) { err = -EINVAL; ip6_flush_pending_frames(sk); @@ -1256,6 +1252,8 @@ static void raw6_destroy(struct sock *sk) lock_sock(sk); ip6_flush_pending_frames(sk); release_sock(sk); + + inet6_destroy_sock(sk); } static int rawv6_init_sk(struct sock *sk)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index defd581..e679599 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c
@@ -5366,17 +5366,16 @@ static size_t rt6_nlmsg_size(struct fib6_info *f6i) nexthop_for_each_fib6_nh(f6i->nh, rt6_nh_nlmsg_size, &nexthop_len); } else { - struct fib6_info *sibling, *next_sibling; struct fib6_nh *nh = f6i->fib6_nh; nexthop_len = 0; if (f6i->fib6_nsiblings) { - rt6_nh_nlmsg_size(nh, &nexthop_len); + nexthop_len = nla_total_size(0) /* RTA_MULTIPATH */ + + NLA_ALIGN(sizeof(struct rtnexthop)) + + nla_total_size(16) /* RTA_GATEWAY */ + + lwtunnel_get_encap_size(nh->fib_nh_lws); - list_for_each_entry_safe(sibling, next_sibling, - &f6i->fib6_siblings, fib6_siblings) { - rt6_nh_nlmsg_size(sibling->fib6_nh, &nexthop_len); - } + nexthop_len *= f6i->fib6_nsiblings; } nexthop_len += lwtunnel_get_encap_size(nh->fib_nh_lws); } @@ -6318,16 +6317,10 @@ static void __net_exit ip6_route_net_exit(struct net *net) static int __net_init ip6_route_net_init_late(struct net *net) { #ifdef CONFIG_PROC_FS - if (!proc_create_net("ipv6_route", 0, net->proc_net, - &ipv6_route_seq_ops, - sizeof(struct ipv6_route_iter))) - return -ENOMEM; - - if (!proc_create_net_single("rt6_stats", 0444, net->proc_net, - rt6_stats_seq_show, NULL)) { - remove_proc_entry("ipv6_route", net->proc_net); - return -ENOMEM; - } + proc_create_net("ipv6_route", 0, net->proc_net, &ipv6_route_seq_ops, + sizeof(struct ipv6_route_iter)); + proc_create_net_single("rt6_stats", 0444, net->proc_net, + rt6_stats_seq_show, NULL); #endif return 0; }
diff --git a/net/ipv6/seg6.c b/net/ipv6/seg6.c index f5c448c..75421a4 100644 --- a/net/ipv6/seg6.c +++ b/net/ipv6/seg6.c
@@ -125,11 +125,6 @@ static int seg6_genl_sethmac(struct sk_buff *skb, struct genl_info *info) goto out_unlock; } - if (slen > nla_len(info->attrs[SEG6_ATTR_SECRET])) { - err = -EINVAL; - goto out_unlock; - } - if (hinfo) { err = seg6_hmac_info_del(net, hmackeyid); if (err)
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index 1179608..117d374 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c
@@ -1083,12 +1083,10 @@ static void ipip6_tunnel_bind_dev(struct net_device *dev) if (tdev && !netif_is_l3_master(tdev)) { int t_hlen = tunnel->hlen + sizeof(struct iphdr); - int mtu; - mtu = tdev->mtu - t_hlen; - if (mtu < IPV6_MIN_MTU) - mtu = IPV6_MIN_MTU; - WRITE_ONCE(dev->mtu, mtu); + dev->mtu = tdev->mtu - t_hlen; + if (dev->mtu < IPV6_MIN_MTU) + dev->mtu = IPV6_MIN_MTU; } }
diff --git a/net/ipv6/tcp_ipv6.c b/net/ipv6/tcp_ipv6.c index 7cb622d..063898c 100644 --- a/net/ipv6/tcp_ipv6.c +++ b/net/ipv6/tcp_ipv6.c
@@ -106,7 +106,7 @@ static void inet6_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb) if (dst && dst_hold_safe(dst)) { const struct rt6_info *rt = (const struct rt6_info *)dst; - rcu_assign_pointer(sk->sk_rx_dst, dst); + sk->sk_rx_dst = dst; inet_sk(sk)->rx_dst_ifindex = skb->skb_iif; tcp_inet6_sk(sk)->rx_dst_cookie = rt6_get_cookie(rt); } @@ -264,7 +264,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, fl6.flowi6_proto = IPPROTO_TCP; fl6.daddr = sk->sk_v6_daddr; fl6.saddr = saddr ? *saddr : np->saddr; - fl6.flowlabel = ip6_make_flowinfo(np->tclass, np->flow_label); fl6.flowi6_oif = sk->sk_bound_dev_if; fl6.flowi6_mark = sk->sk_mark; fl6.fl6_dport = usin->sin6_port; @@ -335,8 +334,6 @@ static int tcp_v6_connect(struct sock *sk, struct sockaddr *uaddr, late_failure: tcp_set_state(sk, TCP_CLOSE); - if (!(sk->sk_userlocks & SOCK_BINDADDR_LOCK)) - inet_reset_saddr(sk); failure: inet->inet_dport = 0; sk->sk_route_caps = 0; @@ -1319,11 +1316,14 @@ static struct sock *tcp_v6_syn_recv_sock(const struct sock *sk, struct sk_buff * /* Clone pktoptions received with SYN, if we own the req */ if (ireq->pktopts) { - newnp->pktoptions = skb_clone_and_charge_r(ireq->pktopts, newsk); + newnp->pktoptions = skb_clone(ireq->pktopts, + sk_gfp_mask(sk, GFP_ATOMIC)); consume_skb(ireq->pktopts); ireq->pktopts = NULL; - if (newnp->pktoptions) + if (newnp->pktoptions) { tcp_v6_restore_cb(newnp->pktoptions); + skb_set_owner_r(newnp->pktoptions, newsk); + } } } else { if (!req_unhash && found_dup_sk) { @@ -1391,21 +1391,18 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) --ANK (980728) */ if (np->rxopt.all) - opt_skb = skb_clone_and_charge_r(skb, sk); + opt_skb = skb_clone(skb, sk_gfp_mask(sk, GFP_ATOMIC)); if (sk->sk_state == TCP_ESTABLISHED) { /* Fast path */ - struct dst_entry *dst; - - dst = rcu_dereference_protected(sk->sk_rx_dst, - lockdep_sock_is_held(sk)); + struct dst_entry *dst = sk->sk_rx_dst; sock_rps_save_rxhash(sk, skb); sk_mark_napi_id(sk, skb); if (dst) { if (inet_sk(sk)->rx_dst_ifindex != skb->skb_iif || dst->ops->check(dst, np->rx_dst_cookie) == NULL) { - RCU_INIT_POINTER(sk->sk_rx_dst, NULL); dst_release(dst); + sk->sk_rx_dst = NULL; } } @@ -1473,6 +1470,7 @@ static int tcp_v6_do_rcv(struct sock *sk, struct sk_buff *skb) if (np->repflow) np->flow_label = ip6_flowlabel(ipv6_hdr(opt_skb)); if (ipv6_opt_accepted(sk, opt_skb, &TCP_SKB_CB(opt_skb)->header.h6)) { + skb_set_owner_r(opt_skb, sk); tcp_v6_restore_cb(opt_skb); opt_skb = xchg(&np->pktoptions, opt_skb); } else { @@ -1728,7 +1726,7 @@ INDIRECT_CALLABLE_SCOPE int tcp_v6_rcv(struct sk_buff *skb) goto discard_it; } -void tcp_v6_early_demux(struct sk_buff *skb) +INDIRECT_CALLABLE_SCOPE void tcp_v6_early_demux(struct sk_buff *skb) { const struct ipv6hdr *hdr; const struct tcphdr *th; @@ -1755,7 +1753,7 @@ void tcp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_edemux; if (sk_fullsock(sk)) { - struct dst_entry *dst = rcu_dereference(sk->sk_rx_dst); + struct dst_entry *dst = READ_ONCE(sk->sk_rx_dst); if (dst) dst = dst_check(dst, tcp_inet6_sk(sk)->rx_dst_cookie); @@ -1848,6 +1846,12 @@ static int tcp_v6_init_sock(struct sock *sk) return 0; } +static void tcp_v6_destroy_sock(struct sock *sk) +{ + tcp_v4_destroy_sock(sk); + inet6_destroy_sock(sk); +} + #ifdef CONFIG_PROC_FS /* Proc filesystem TCPv6 sock list dumping. */ static void get_openreq6(struct seq_file *seq, @@ -2040,7 +2044,7 @@ struct proto tcpv6_prot = { .accept = inet_csk_accept, .ioctl = tcp_ioctl, .init = tcp_v6_init_sock, - .destroy = tcp_v4_destroy_sock, + .destroy = tcp_v6_destroy_sock, .shutdown = tcp_shutdown, .setsockopt = tcp_setsockopt, .getsockopt = tcp_getsockopt, @@ -2077,7 +2081,12 @@ struct proto tcpv6_prot = { .diag_destroy = tcp_abort, }; -static const struct inet6_protocol tcpv6_protocol = { +/* thinking of making this const? Don't. + * early_demux can change based on sysctl. + */ +static struct inet6_protocol tcpv6_protocol = { + .early_demux = tcp_v6_early_demux, + .early_demux_handler = tcp_v6_early_demux, .handler = tcp_v6_rcv, .err_handler = tcp_v6_err, .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL,
diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 797d45c..040869f 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c
@@ -54,19 +54,6 @@ #include <trace/events/skb.h> #include "udp_impl.h" -static void udpv6_destruct_sock(struct sock *sk) -{ - udp_destruct_common(sk); - inet6_sock_destruct(sk); -} - -int udpv6_init_sock(struct sock *sk) -{ - skb_queue_head_init(&udp_sk(sk)->reader_queue); - sk->sk_destruct = udpv6_destruct_sock; - return 0; -} - static u32 udp6_ehashfn(const struct net *net, const struct in6_addr *laddr, const u16 lport, @@ -902,7 +889,7 @@ int __udp6_lib_rcv(struct sk_buff *skb, struct udp_table *udptable, struct dst_entry *dst = skb_dst(skb); int ret; - if (unlikely(rcu_dereference(sk->sk_rx_dst) != dst)) + if (unlikely(sk->sk_rx_dst != dst)) udp6_sk_rx_dst_set(sk, dst); if (!uh->check && !udp_sk(sk)->no_check6_rx) { @@ -986,7 +973,7 @@ static struct sock *__udp6_lib_demux_lookup(struct net *net, return NULL; } -void udp_v6_early_demux(struct sk_buff *skb) +INDIRECT_CALLABLE_SCOPE void udp_v6_early_demux(struct sk_buff *skb) { struct net *net = dev_net(skb->dev); const struct udphdr *uh; @@ -1014,7 +1001,7 @@ void udp_v6_early_demux(struct sk_buff *skb) skb->sk = sk; skb->destructor = sock_efree; - dst = rcu_dereference(sk->sk_rx_dst); + dst = READ_ONCE(sk->sk_rx_dst); if (dst) dst = dst_check(dst, inet6_sk(sk)->rx_dst_cookie); @@ -1296,11 +1283,9 @@ int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len) msg->msg_name = &sin; msg->msg_namelen = sizeof(sin); do_udp_sendmsg: - err = __ipv6_only_sock(sk) ? - -ENETUNREACH : udp_sendmsg(sk, msg, len); - msg->msg_name = sin6; - msg->msg_namelen = addr_len; - return err; + if (__ipv6_only_sock(sk)) + return -ENETUNREACH; + return udp_sendmsg(sk, msg, len); } } @@ -1573,6 +1558,8 @@ void udpv6_destroy_sock(struct sock *sk) udp_encap_disable(); } } + + inet6_destroy_sock(sk); } /* @@ -1616,7 +1603,12 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname, } #endif -static const struct inet6_protocol udpv6_protocol = { +/* thinking of making this const? Don't. + * early_demux can change based on sysctl. + */ +static struct inet6_protocol udpv6_protocol = { + .early_demux = udp_v6_early_demux, + .early_demux_handler = udp_v6_early_demux, .handler = udpv6_rcv, .err_handler = udpv6_err, .flags = INET6_PROTO_NOPOLICY|INET6_PROTO_FINAL, @@ -1676,7 +1668,7 @@ struct proto udpv6_prot = { .connect = ip6_datagram_connect, .disconnect = udp_disconnect, .ioctl = udp_ioctl, - .init = udpv6_init_sock, + .init = udp_init_sock, .destroy = udpv6_destroy_sock, .setsockopt = udpv6_setsockopt, .getsockopt = udpv6_getsockopt,
diff --git a/net/ipv6/udp_impl.h b/net/ipv6/udp_impl.h index 16516bd..20e324b 100644 --- a/net/ipv6/udp_impl.h +++ b/net/ipv6/udp_impl.h
@@ -12,7 +12,6 @@ int __udp6_lib_rcv(struct sk_buff *, struct udp_table *, int); int __udp6_lib_err(struct sk_buff *, struct inet6_skb_parm *, u8, u8, int, __be32, struct udp_table *); -int udpv6_init_sock(struct sock *sk); int udp_v6_get_port(struct sock *sk, unsigned short snum); void udp_v6_rehash(struct sock *sk);
diff --git a/net/ipv6/udplite.c b/net/ipv6/udplite.c index 3466b88..bf7a7ac 100644 --- a/net/ipv6/udplite.c +++ b/net/ipv6/udplite.c
@@ -12,13 +12,6 @@ #include <linux/proc_fs.h> #include "udp_impl.h" -static int udplitev6_sk_init(struct sock *sk) -{ - udpv6_init_sock(sk); - udp_sk(sk)->pcflag = UDPLITE_BIT; - return 0; -} - static int udplitev6_rcv(struct sk_buff *skb) { return __udp6_lib_rcv(skb, &udplite_table, IPPROTO_UDPLITE); @@ -45,7 +38,7 @@ struct proto udplitev6_prot = { .connect = ip6_datagram_connect, .disconnect = udp_disconnect, .ioctl = udp_ioctl, - .init = udplitev6_sk_init, + .init = udplite_sk_init, .destroy = udpv6_destroy_sock, .setsockopt = udpv6_setsockopt, .getsockopt = udpv6_getsockopt,
diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c index 247296e..af7a4b8 100644 --- a/net/ipv6/xfrm6_policy.c +++ b/net/ipv6/xfrm6_policy.c
@@ -289,13 +289,9 @@ int __init xfrm6_init(void) if (ret) goto out_state; - ret = register_pernet_subsys(&xfrm6_net_ops); - if (ret) - goto out_protocol; + register_pernet_subsys(&xfrm6_net_ops); out: return ret; -out_protocol: - xfrm6_protocol_fini(); out_state: xfrm6_state_fini(); out_policy:
diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c index 392f8dd..9a2d023 100644 --- a/net/iucv/iucv.c +++ b/net/iucv/iucv.c
@@ -106,7 +106,7 @@ struct iucv_irq_data { u16 ippathid; u8 ipflags1; u8 iptype; - u32 res2[9]; + u32 res2[8]; }; struct iucv_irq_list { @@ -128,7 +128,7 @@ static LIST_HEAD(iucv_task_queue); * The tasklet for fast delivery of iucv interrupts. */ static void iucv_tasklet_fn(unsigned long); -static DECLARE_TASKLET_OLD(iucv_tasklet, iucv_tasklet_fn); +static DECLARE_TASKLET(iucv_tasklet, iucv_tasklet_fn,0); /* * Queue of interrupt buffers for delivery via a work queue
diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index 1975403..ea9e734 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c
@@ -161,8 +161,7 @@ static void kcm_rcv_ready(struct kcm_sock *kcm) /* Buffer limit is okay now, add to ready list */ list_add_tail(&kcm->wait_rx_list, &kcm->mux->kcm_rx_waiters); - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_wait, true); + kcm->rx_wait = true; } static void kcm_rfree(struct sk_buff *skb) @@ -178,7 +177,7 @@ static void kcm_rfree(struct sk_buff *skb) /* For reading rx_wait and rx_psock without holding lock */ smp_mb__after_atomic(); - if (!READ_ONCE(kcm->rx_wait) && !READ_ONCE(kcm->rx_psock) && + if (!kcm->rx_wait && !kcm->rx_psock && sk_rmem_alloc_get(sk) < sk->sk_rcvlowat) { spin_lock_bh(&mux->rx_lock); kcm_rcv_ready(kcm); @@ -221,7 +220,7 @@ static void requeue_rx_msgs(struct kcm_mux *mux, struct sk_buff_head *head) struct sk_buff *skb; struct kcm_sock *kcm; - while ((skb = skb_dequeue(head))) { + while ((skb = __skb_dequeue(head))) { /* Reset destructor to avoid calling kcm_rcv_ready */ skb->destructor = sock_rfree; skb_orphan(skb); @@ -237,8 +236,7 @@ static void requeue_rx_msgs(struct kcm_mux *mux, struct sk_buff_head *head) if (kcm_queue_rcv_skb(&kcm->sk, skb)) { /* Should mean socket buffer full */ list_del(&kcm->wait_rx_list); - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_wait, false); + kcm->rx_wait = false; /* Commit rx_wait to read in kcm_free */ smp_wmb(); @@ -281,12 +279,10 @@ static struct kcm_sock *reserve_rx_kcm(struct kcm_psock *psock, kcm = list_first_entry(&mux->kcm_rx_waiters, struct kcm_sock, wait_rx_list); list_del(&kcm->wait_rx_list); - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_wait, false); + kcm->rx_wait = false; psock->rx_kcm = kcm; - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_psock, psock); + kcm->rx_psock = psock; spin_unlock_bh(&mux->rx_lock); @@ -313,8 +309,7 @@ static void unreserve_rx_kcm(struct kcm_psock *psock, spin_lock_bh(&mux->rx_lock); psock->rx_kcm = NULL; - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_psock, NULL); + kcm->rx_psock = NULL; /* Commit kcm->rx_psock before sk_rmem_alloc_get to sync with * kcm_rfree @@ -1086,18 +1081,53 @@ static int kcm_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) return err; } +static struct sk_buff *kcm_wait_data(struct sock *sk, int flags, + long timeo, int *err) +{ + struct sk_buff *skb; + + while (!(skb = skb_peek(&sk->sk_receive_queue))) { + if (sk->sk_err) { + *err = sock_error(sk); + return NULL; + } + + if (sock_flag(sk, SOCK_DONE)) + return NULL; + + if ((flags & MSG_DONTWAIT) || !timeo) { + *err = -EAGAIN; + return NULL; + } + + sk_wait_data(sk, &timeo, NULL); + + /* Handle signals */ + if (signal_pending(current)) { + *err = sock_intr_errno(timeo); + return NULL; + } + } + + return skb; +} + static int kcm_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags) { - int noblock = flags & MSG_DONTWAIT; struct sock *sk = sock->sk; struct kcm_sock *kcm = kcm_sk(sk); int err = 0; + long timeo; struct strp_msg *stm; int copied = 0; struct sk_buff *skb; - skb = skb_recv_datagram(sk, flags, noblock, &err); + timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); + + lock_sock(sk); + + skb = kcm_wait_data(sk, flags, timeo, &err); if (!skb) goto out; @@ -1128,11 +1158,14 @@ static int kcm_recvmsg(struct socket *sock, struct msghdr *msg, /* Finished with message */ msg->msg_flags |= MSG_EOR; KCM_STATS_INCR(kcm->stats.rx_msgs); + skb_unlink(skb, &sk->sk_receive_queue); + kfree_skb(skb); } } out: - skb_free_datagram(sk, skb); + release_sock(sk); + return copied ? : err; } @@ -1140,9 +1173,9 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos, struct pipe_inode_info *pipe, size_t len, unsigned int flags) { - int noblock = flags & MSG_DONTWAIT; struct sock *sk = sock->sk; struct kcm_sock *kcm = kcm_sk(sk); + long timeo; struct strp_msg *stm; int err = 0; ssize_t copied; @@ -1150,7 +1183,11 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos, /* Only support splice for SOCKSEQPACKET */ - skb = skb_recv_datagram(sk, flags, noblock, &err); + timeo = sock_rcvtimeo(sk, flags & MSG_DONTWAIT); + + lock_sock(sk); + + skb = kcm_wait_data(sk, flags, timeo, &err); if (!skb) goto err_out; @@ -1178,11 +1215,13 @@ static ssize_t kcm_splice_read(struct socket *sock, loff_t *ppos, * finish reading the message. */ - skb_free_datagram(sk, skb); + release_sock(sk); + return copied; err_out: - skb_free_datagram(sk, skb); + release_sock(sk); + return err; } @@ -1202,8 +1241,7 @@ static void kcm_recv_disable(struct kcm_sock *kcm) if (!kcm->rx_psock) { if (kcm->rx_wait) { list_del(&kcm->wait_rx_list); - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_wait, false); + kcm->rx_wait = false; } requeue_rx_msgs(mux, &kcm->sk.sk_receive_queue); @@ -1375,6 +1413,12 @@ static int kcm_attach(struct socket *sock, struct socket *csock, psock->sk = csk; psock->bpf_prog = prog; + err = strp_init(&psock->strp, csk, &cb); + if (err) { + kmem_cache_free(kcm_psockp, psock); + goto out; + } + write_lock_bh(&csk->sk_callback_lock); /* Check if sk_user_data is aready by KCM or someone else. @@ -1382,18 +1426,13 @@ static int kcm_attach(struct socket *sock, struct socket *csock, */ if (csk->sk_user_data) { write_unlock_bh(&csk->sk_callback_lock); + strp_stop(&psock->strp); + strp_done(&psock->strp); kmem_cache_free(kcm_psockp, psock); err = -EALREADY; goto out; } - err = strp_init(&psock->strp, csk, &cb); - if (err) { - write_unlock_bh(&csk->sk_callback_lock); - kmem_cache_free(kcm_psockp, psock); - goto out; - } - psock->save_data_ready = csk->sk_data_ready; psock->save_write_space = csk->sk_write_space; psock->save_state_change = csk->sk_state_change; @@ -1756,8 +1795,7 @@ static void kcm_done(struct kcm_sock *kcm) if (kcm->rx_wait) { list_del(&kcm->wait_rx_list); - /* paired with lockless reads in kcm_rfree() */ - WRITE_ONCE(kcm->rx_wait, false); + kcm->rx_wait = false; } /* Move any pending receive messages to other kcm sockets */ requeue_rx_msgs(mux, &sk->sk_receive_queue); @@ -1802,10 +1840,10 @@ static int kcm_release(struct socket *sock) kcm = kcm_sk(sk); mux = kcm->mux; - lock_sock(sk); sock_orphan(sk); kfree_skb(kcm->seq_skb); + lock_sock(sk); /* Purge queue under lock to avoid race condition with tx_work trying * to act when queue is nonempty. If tx_work runs after this point * it will just return.
diff --git a/net/key/af_key.c b/net/key/af_key.c index 92f71e8..c06cc48 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c
@@ -2909,7 +2909,7 @@ static int count_ah_combs(const struct xfrm_tmpl *t) break; if (!aalg->pfkey_supported) continue; - if (aalg_tmpl_set(t, aalg)) + if (aalg_tmpl_set(t, aalg) && aalg->available) sz += sizeof(struct sadb_comb); } return sz + sizeof(struct sadb_prop); @@ -2927,7 +2927,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t) if (!ealg->pfkey_supported) continue; - if (!(ealg_tmpl_set(t, ealg))) + if (!(ealg_tmpl_set(t, ealg) && ealg->available)) continue; for (k = 1; ; k++) { @@ -2938,17 +2938,16 @@ static int count_esp_combs(const struct xfrm_tmpl *t) if (!aalg->pfkey_supported) continue; - if (aalg_tmpl_set(t, aalg)) + if (aalg_tmpl_set(t, aalg) && aalg->available) sz += sizeof(struct sadb_comb); } } return sz + sizeof(struct sadb_prop); } -static int dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) +static void dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) { struct sadb_prop *p; - int sz = 0; int i; p = skb_put(skb, sizeof(struct sadb_prop)); @@ -2976,17 +2975,13 @@ static int dump_ah_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) c->sadb_comb_soft_addtime = 20*60*60; c->sadb_comb_hard_usetime = 8*60*60; c->sadb_comb_soft_usetime = 7*60*60; - sz += sizeof(*c); } } - - return sz + sizeof(*p); } -static int dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) +static void dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) { struct sadb_prop *p; - int sz = 0; int i, k; p = skb_put(skb, sizeof(struct sadb_prop)); @@ -3028,11 +3023,8 @@ static int dump_esp_combs(struct sk_buff *skb, const struct xfrm_tmpl *t) c->sadb_comb_soft_addtime = 20*60*60; c->sadb_comb_hard_usetime = 8*60*60; c->sadb_comb_soft_usetime = 7*60*60; - sz += sizeof(*c); } } - - return sz + sizeof(*p); } static int key_notify_policy_expire(struct xfrm_policy *xp, const struct km_event *c) @@ -3162,7 +3154,6 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct struct sadb_x_sec_ctx *sec_ctx; struct xfrm_sec_ctx *xfrm_ctx; int ctx_size = 0; - int alg_size = 0; sockaddr_size = pfkey_sockaddr_size(x->props.family); if (!sockaddr_size) @@ -3174,16 +3165,16 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct sizeof(struct sadb_x_policy); if (x->id.proto == IPPROTO_AH) - alg_size = count_ah_combs(t); + size += count_ah_combs(t); else if (x->id.proto == IPPROTO_ESP) - alg_size = count_esp_combs(t); + size += count_esp_combs(t); if ((xfrm_ctx = x->security)) { ctx_size = PFKEY_ALIGN8(xfrm_ctx->ctx_len); size += sizeof(struct sadb_x_sec_ctx) + ctx_size; } - skb = alloc_skb(size + alg_size + 16, GFP_ATOMIC); + skb = alloc_skb(size + 16, GFP_ATOMIC); if (skb == NULL) return -ENOMEM; @@ -3237,13 +3228,10 @@ static int pfkey_send_acquire(struct xfrm_state *x, struct xfrm_tmpl *t, struct pol->sadb_x_policy_priority = xp->priority; /* Set sadb_comb's. */ - alg_size = 0; if (x->id.proto == IPPROTO_AH) - alg_size = dump_ah_combs(skb, t); + dump_ah_combs(skb, t); else if (x->id.proto == IPPROTO_ESP) - alg_size = dump_esp_combs(skb, t); - - hdr->sadb_msg_len += alg_size / 8; + dump_esp_combs(skb, t); /* security context */ if (xfrm_ctx) {
diff --git a/net/l2tp/l2tp_core.c b/net/l2tp/l2tp_core.c index d001e25..421b2c8 100644 --- a/net/l2tp/l2tp_core.c +++ b/net/l2tp/l2tp_core.c
@@ -1171,10 +1171,8 @@ static void l2tp_tunnel_destruct(struct sock *sk) } /* Remove hooks into tunnel socket */ - write_lock_bh(&sk->sk_callback_lock); sk->sk_destruct = tunnel->old_sk_destruct; sk->sk_user_data = NULL; - write_unlock_bh(&sk->sk_callback_lock); /* Call the original destructor */ if (sk->sk_destruct) @@ -1493,27 +1491,20 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, sock = sockfd_lookup(tunnel->fd, &ret); if (!sock) goto err; - } - sk = sock->sk; - write_lock_bh(&sk->sk_callback_lock); - ret = l2tp_validate_socket(sk, net, tunnel->encap); - if (ret < 0) - goto err_inval_sock; - rcu_assign_sk_user_data(sk, tunnel); - write_unlock_bh(&sk->sk_callback_lock); + ret = l2tp_validate_socket(sock->sk, net, tunnel->encap); + if (ret < 0) + goto err_sock; + } tunnel->l2tp_net = net; pn = l2tp_pernet(net); - sock_hold(sk); - tunnel->sock = sk; - spin_lock_bh(&pn->l2tp_tunnel_list_lock); list_for_each_entry(tunnel_walk, &pn->l2tp_tunnel_list, list) { if (tunnel_walk->tunnel_id == tunnel->tunnel_id) { spin_unlock_bh(&pn->l2tp_tunnel_list_lock); - sock_put(sk); + ret = -EEXIST; goto err_sock; } @@ -1521,6 +1512,10 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, list_add_rcu(&tunnel->list, &pn->l2tp_tunnel_list); spin_unlock_bh(&pn->l2tp_tunnel_list_lock); + sk = sock->sk; + sock_hold(sk); + tunnel->sock = sk; + if (tunnel->encap == L2TP_ENCAPTYPE_UDP) { struct udp_tunnel_sock_cfg udp_cfg = { .sk_user_data = tunnel, @@ -1530,6 +1525,8 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, }; setup_udp_tunnel_sock(net, sock, &udp_cfg); + } else { + sk->sk_user_data = tunnel; } tunnel->old_sk_destruct = sk->sk_destruct; @@ -1544,11 +1541,6 @@ int l2tp_tunnel_register(struct l2tp_tunnel *tunnel, struct net *net, return 0; err_sock: - write_lock_bh(&sk->sk_callback_lock); - rcu_assign_sk_user_data(sk, NULL); -err_inval_sock: - write_unlock_bh(&sk->sk_callback_lock); - if (tunnel->fd < 0) sock_release(sock); else
diff --git a/net/l2tp/l2tp_ip6.c b/net/l2tp/l2tp_ip6.c index 307cf20..23e9ce9 100644 --- a/net/l2tp/l2tp_ip6.c +++ b/net/l2tp/l2tp_ip6.c
@@ -268,6 +268,8 @@ static void l2tp_ip6_destroy_sock(struct sock *sk) if (tunnel) l2tp_tunnel_delete(tunnel); + + inet6_destroy_sock(sk); } static int l2tp_ip6_bind(struct sock *sk, struct sockaddr *uaddr, int addr_len)
diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c index 9e3bff5..16f37fd 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c
@@ -3280,6 +3280,9 @@ static int ieee80211_set_csa_beacon(struct ieee80211_sub_if_data *sdata, case NL80211_IFTYPE_MESH_POINT: { struct ieee80211_if_mesh *ifmsh = &sdata->u.mesh; + if (params->chandef.width != sdata->vif.bss_conf.chandef.width) + return -EINVAL; + /* changes into another band are not supported */ if (sdata->vif.bss_conf.chandef.chan->band != params->chandef.chan->band)
diff --git a/net/mac80211/ibss.c b/net/mac80211/ibss.c index d5b8568..0e26c83 100644 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c
@@ -542,10 +542,6 @@ int ieee80211_ibss_finish_csa(struct ieee80211_sub_if_data *sdata) sdata_assert_lock(sdata); - /* When not connected/joined, sending CSA doesn't make sense. */ - if (ifibss->state != IEEE80211_IBSS_MLME_JOINED) - return -ENOLINK; - /* update cfg80211 bss information with the new channel */ if (!is_zero_ether_addr(ifibss->bssid)) { cbss = cfg80211_get_bss(sdata->local->hw.wiphy,
diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h index bd79d8a..069b2f1 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h
@@ -631,26 +631,6 @@ struct mesh_csa_settings { struct cfg80211_csa_settings settings; }; -/** - * struct mesh_table - * - * @known_gates: list of known mesh gates and their mpaths by the station. The - * gate's mpath may or may not be resolved and active. - * @gates_lock: protects updates to known_gates - * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr - * @walk_head: linked list containing all mesh_path objects - * @walk_lock: lock protecting walk_head - * @entries: number of entries in the table - */ -struct mesh_table { - struct hlist_head known_gates; - spinlock_t gates_lock; - struct rhashtable rhead; - struct hlist_head walk_head; - spinlock_t walk_lock; - atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */ -}; - struct ieee80211_if_mesh { struct timer_list housekeeping_timer; struct timer_list mesh_path_timer; @@ -725,8 +705,8 @@ struct ieee80211_if_mesh { /* offset from skb->data while building IE */ int meshconf_offset; - struct mesh_table mesh_paths; - struct mesh_table mpp_paths; /* Store paths for MPP&MAP */ + struct mesh_table *mesh_paths; + struct mesh_table *mpp_paths; /* Store paths for MPP&MAP */ int mesh_paths_generation; int mpp_paths_generation; };
diff --git a/net/mac80211/main.c b/net/mac80211/main.c index fa2ac02..f215218 100644 --- a/net/mac80211/main.c +++ b/net/mac80211/main.c
@@ -1315,10 +1315,8 @@ int ieee80211_register_hw(struct ieee80211_hw *hw) ieee80211_led_exit(local); destroy_workqueue(local->workqueue); fail_workqueue: - if (local->wiphy_ciphers_allocated) { + if (local->wiphy_ciphers_allocated) kfree(local->hw.wiphy->cipher_suites); - local->wiphy_ciphers_allocated = false; - } kfree(local->int_scan_req); return result; } @@ -1388,10 +1386,8 @@ void ieee80211_free_hw(struct ieee80211_hw *hw) mutex_destroy(&local->iflist_mtx); mutex_destroy(&local->mtx); - if (local->wiphy_ciphers_allocated) { + if (local->wiphy_ciphers_allocated) kfree(local->hw.wiphy->cipher_suites); - local->wiphy_ciphers_allocated = false; - } idr_for_each(&local->ack_status_frames, ieee80211_free_ack_frame, NULL);
diff --git a/net/mac80211/mesh.h b/net/mac80211/mesh.h index b2b717a..40492d1 100644 --- a/net/mac80211/mesh.h +++ b/net/mac80211/mesh.h
@@ -127,6 +127,26 @@ struct mesh_path { u32 path_change_count; }; +/** + * struct mesh_table + * + * @known_gates: list of known mesh gates and their mpaths by the station. The + * gate's mpath may or may not be resolved and active. + * @gates_lock: protects updates to known_gates + * @rhead: the rhashtable containing struct mesh_paths, keyed by dest addr + * @walk_head: linked list containging all mesh_path objects + * @walk_lock: lock protecting walk_head + * @entries: number of entries in the table + */ +struct mesh_table { + struct hlist_head known_gates; + spinlock_t gates_lock; + struct rhashtable rhead; + struct hlist_head walk_head; + spinlock_t walk_lock; + atomic_t entries; /* Up to MAX_MESH_NEIGHBOURS */ +}; + /* Recent multicast cache */ /* RMC_BUCKETS must be a power of 2, maximum 256 */ #define RMC_BUCKETS 256 @@ -288,7 +308,7 @@ int mesh_path_error_tx(struct ieee80211_sub_if_data *sdata, void mesh_path_assign_nexthop(struct mesh_path *mpath, struct sta_info *sta); void mesh_path_flush_pending(struct mesh_path *mpath); void mesh_path_tx_pending(struct mesh_path *mpath); -void mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata); +int mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata); void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata); int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr); void mesh_path_timer(struct timer_list *t);
diff --git a/net/mac80211/mesh_pathtbl.c b/net/mac80211/mesh_pathtbl.c index 7e27e52..d7ae741 100644 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c
@@ -47,24 +47,32 @@ static void mesh_path_rht_free(void *ptr, void *tblptr) mesh_path_free_rcu(tbl, mpath); } -static void mesh_table_init(struct mesh_table *tbl) +static struct mesh_table *mesh_table_alloc(void) { - INIT_HLIST_HEAD(&tbl->known_gates); - INIT_HLIST_HEAD(&tbl->walk_head); - atomic_set(&tbl->entries, 0); - spin_lock_init(&tbl->gates_lock); - spin_lock_init(&tbl->walk_lock); + struct mesh_table *newtbl; - /* rhashtable_init() may fail only in case of wrong - * mesh_rht_params - */ - WARN_ON(rhashtable_init(&tbl->rhead, &mesh_rht_params)); + newtbl = kmalloc(sizeof(struct mesh_table), GFP_ATOMIC); + if (!newtbl) + return NULL; + + INIT_HLIST_HEAD(&newtbl->known_gates); + INIT_HLIST_HEAD(&newtbl->walk_head); + atomic_set(&newtbl->entries, 0); + spin_lock_init(&newtbl->gates_lock); + spin_lock_init(&newtbl->walk_lock); + if (rhashtable_init(&newtbl->rhead, &mesh_rht_params)) { + kfree(newtbl); + return NULL; + } + + return newtbl; } static void mesh_table_free(struct mesh_table *tbl) { rhashtable_free_and_destroy(&tbl->rhead, mesh_path_rht_free, tbl); + kfree(tbl); } /** @@ -232,13 +240,13 @@ static struct mesh_path *mpath_lookup(struct mesh_table *tbl, const u8 *dst, struct mesh_path * mesh_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst) { - return mpath_lookup(&sdata->u.mesh.mesh_paths, dst, sdata); + return mpath_lookup(sdata->u.mesh.mesh_paths, dst, sdata); } struct mesh_path * mpp_path_lookup(struct ieee80211_sub_if_data *sdata, const u8 *dst) { - return mpath_lookup(&sdata->u.mesh.mpp_paths, dst, sdata); + return mpath_lookup(sdata->u.mesh.mpp_paths, dst, sdata); } static struct mesh_path * @@ -275,7 +283,7 @@ __mesh_path_lookup_by_idx(struct mesh_table *tbl, int idx) struct mesh_path * mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx) { - return __mesh_path_lookup_by_idx(&sdata->u.mesh.mesh_paths, idx); + return __mesh_path_lookup_by_idx(sdata->u.mesh.mesh_paths, idx); } /** @@ -290,7 +298,7 @@ mesh_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx) struct mesh_path * mpp_path_lookup_by_idx(struct ieee80211_sub_if_data *sdata, int idx) { - return __mesh_path_lookup_by_idx(&sdata->u.mesh.mpp_paths, idx); + return __mesh_path_lookup_by_idx(sdata->u.mesh.mpp_paths, idx); } /** @@ -303,7 +311,7 @@ int mesh_path_add_gate(struct mesh_path *mpath) int err; rcu_read_lock(); - tbl = &mpath->sdata->u.mesh.mesh_paths; + tbl = mpath->sdata->u.mesh.mesh_paths; spin_lock_bh(&mpath->state_lock); if (mpath->is_gate) { @@ -412,7 +420,7 @@ struct mesh_path *mesh_path_add(struct ieee80211_sub_if_data *sdata, if (!new_mpath) return ERR_PTR(-ENOMEM); - tbl = &sdata->u.mesh.mesh_paths; + tbl = sdata->u.mesh.mesh_paths; spin_lock_bh(&tbl->walk_lock); mpath = rhashtable_lookup_get_insert_fast(&tbl->rhead, &new_mpath->rhash, @@ -454,7 +462,7 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata, return -ENOMEM; memcpy(new_mpath->mpp, mpp, ETH_ALEN); - tbl = &sdata->u.mesh.mpp_paths; + tbl = sdata->u.mesh.mpp_paths; spin_lock_bh(&tbl->walk_lock); ret = rhashtable_lookup_insert_fast(&tbl->rhead, @@ -483,7 +491,7 @@ int mpp_path_add(struct ieee80211_sub_if_data *sdata, void mesh_plink_broken(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - struct mesh_table *tbl = &sdata->u.mesh.mesh_paths; + struct mesh_table *tbl = sdata->u.mesh.mesh_paths; static const u8 bcast[ETH_ALEN] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff}; struct mesh_path *mpath; @@ -542,7 +550,7 @@ static void __mesh_path_del(struct mesh_table *tbl, struct mesh_path *mpath) void mesh_path_flush_by_nexthop(struct sta_info *sta) { struct ieee80211_sub_if_data *sdata = sta->sdata; - struct mesh_table *tbl = &sdata->u.mesh.mesh_paths; + struct mesh_table *tbl = sdata->u.mesh.mesh_paths; struct mesh_path *mpath; struct hlist_node *n; @@ -557,7 +565,7 @@ void mesh_path_flush_by_nexthop(struct sta_info *sta) static void mpp_flush_by_proxy(struct ieee80211_sub_if_data *sdata, const u8 *proxy) { - struct mesh_table *tbl = &sdata->u.mesh.mpp_paths; + struct mesh_table *tbl = sdata->u.mesh.mpp_paths; struct mesh_path *mpath; struct hlist_node *n; @@ -591,8 +599,8 @@ static void table_flush_by_iface(struct mesh_table *tbl) */ void mesh_path_flush_by_iface(struct ieee80211_sub_if_data *sdata) { - table_flush_by_iface(&sdata->u.mesh.mesh_paths); - table_flush_by_iface(&sdata->u.mesh.mpp_paths); + table_flush_by_iface(sdata->u.mesh.mesh_paths); + table_flush_by_iface(sdata->u.mesh.mpp_paths); } /** @@ -638,7 +646,7 @@ int mesh_path_del(struct ieee80211_sub_if_data *sdata, const u8 *addr) /* flush relevant mpp entries first */ mpp_flush_by_proxy(sdata, addr); - err = table_path_del(&sdata->u.mesh.mesh_paths, sdata, addr); + err = table_path_del(sdata->u.mesh.mesh_paths, sdata, addr); sdata->u.mesh.mesh_paths_generation++; return err; } @@ -676,7 +684,7 @@ int mesh_path_send_to_gates(struct mesh_path *mpath) struct mesh_path *gate; bool copy = false; - tbl = &sdata->u.mesh.mesh_paths; + tbl = sdata->u.mesh.mesh_paths; rcu_read_lock(); hlist_for_each_entry_rcu(gate, &tbl->known_gates, gate_list) { @@ -712,7 +720,7 @@ int mesh_path_send_to_gates(struct mesh_path *mpath) void mesh_path_discard_frame(struct ieee80211_sub_if_data *sdata, struct sk_buff *skb) { - ieee80211_free_txskb(&sdata->local->hw, skb); + kfree_skb(skb); sdata->u.mesh.mshstats.dropped_frames_no_route++; } @@ -756,10 +764,29 @@ void mesh_path_fix_nexthop(struct mesh_path *mpath, struct sta_info *next_hop) mesh_path_tx_pending(mpath); } -void mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata) +int mesh_pathtbl_init(struct ieee80211_sub_if_data *sdata) { - mesh_table_init(&sdata->u.mesh.mesh_paths); - mesh_table_init(&sdata->u.mesh.mpp_paths); + struct mesh_table *tbl_path, *tbl_mpp; + int ret; + + tbl_path = mesh_table_alloc(); + if (!tbl_path) + return -ENOMEM; + + tbl_mpp = mesh_table_alloc(); + if (!tbl_mpp) { + ret = -ENOMEM; + goto free_path; + } + + sdata->u.mesh.mesh_paths = tbl_path; + sdata->u.mesh.mpp_paths = tbl_mpp; + + return 0; + +free_path: + mesh_table_free(tbl_path); + return ret; } static @@ -781,12 +808,12 @@ void mesh_path_tbl_expire(struct ieee80211_sub_if_data *sdata, void mesh_path_expire(struct ieee80211_sub_if_data *sdata) { - mesh_path_tbl_expire(sdata, &sdata->u.mesh.mesh_paths); - mesh_path_tbl_expire(sdata, &sdata->u.mesh.mpp_paths); + mesh_path_tbl_expire(sdata, sdata->u.mesh.mesh_paths); + mesh_path_tbl_expire(sdata, sdata->u.mesh.mpp_paths); } void mesh_pathtbl_unregister(struct ieee80211_sub_if_data *sdata) { - mesh_table_free(&sdata->u.mesh.mesh_paths); - mesh_table_free(&sdata->u.mesh.mpp_paths); + mesh_table_free(sdata->u.mesh.mesh_paths); + mesh_table_free(sdata->u.mesh.mpp_paths); }
diff --git a/net/mac80211/scan.c b/net/mac80211/scan.c index 70072d2..08bd2ef 100644 --- a/net/mac80211/scan.c +++ b/net/mac80211/scan.c
@@ -437,19 +437,16 @@ static void __ieee80211_scan_completed(struct ieee80211_hw *hw, bool aborted) scan_req = rcu_dereference_protected(local->scan_req, lockdep_is_held(&local->mtx)); + if (scan_req != local->int_scan_req) { + local->scan_info.aborted = aborted; + cfg80211_scan_done(scan_req, &local->scan_info); + } RCU_INIT_POINTER(local->scan_req, NULL); RCU_INIT_POINTER(local->scan_sdata, NULL); local->scanning = 0; local->scan_chandef.chan = NULL; - synchronize_rcu(); - - if (scan_req != local->int_scan_req) { - local->scan_info.aborted = aborted; - cfg80211_scan_done(scan_req, &local->scan_info); - } - /* Set power back to normal operating levels. */ ieee80211_hw_config(local, 0);
diff --git a/net/mac80211/sta_info.c b/net/mac80211/sta_info.c index 0f97c6f..7b2e8c8 100644 --- a/net/mac80211/sta_info.c +++ b/net/mac80211/sta_info.c
@@ -1023,8 +1023,7 @@ static int __must_check __sta_info_destroy_part1(struct sta_info *sta) list_del_rcu(&sta->list); sta->removed = true; - if (sta->uploaded) - drv_sta_pre_rcu_remove(local, sta->sdata, sta); + drv_sta_pre_rcu_remove(local, sta->sdata, sta); if (sdata->vif.type == NL80211_IFTYPE_AP_VLAN && rcu_access_pointer(sdata->u.vlan.sta) == sta) @@ -2122,7 +2121,7 @@ static void sta_stats_decode_rate(struct ieee80211_local *local, u32 rate, static int sta_set_rate_info_rx(struct sta_info *sta, struct rate_info *rinfo) { - u32 rate = READ_ONCE(sta_get_last_rx_stats(sta)->last_rate); + u16 rate = READ_ONCE(sta_get_last_rx_stats(sta)->last_rate); if (rate == STA_STATS_RATE_INVALID) return -EINVAL;
diff --git a/net/mac80211/wme.c b/net/mac80211/wme.c index d6e5850..ace44ff 100644 --- a/net/mac80211/wme.c +++ b/net/mac80211/wme.c
@@ -141,14 +141,12 @@ u16 ieee80211_select_queue_80211(struct ieee80211_sub_if_data *sdata, u16 __ieee80211_select_queue(struct ieee80211_sub_if_data *sdata, struct sta_info *sta, struct sk_buff *skb) { - const struct ethhdr *eth = (void *)skb->data; struct mac80211_qos_map *qos_map; bool qos; /* all mesh/ocb stations are required to support WME */ - if ((sdata->vif.type == NL80211_IFTYPE_MESH_POINT && - !is_multicast_ether_addr(eth->h_dest)) || - (sdata->vif.type == NL80211_IFTYPE_OCB && sta)) + if (sta && (sdata->vif.type == NL80211_IFTYPE_MESH_POINT || + sdata->vif.type == NL80211_IFTYPE_OCB)) qos = true; else if (sta) qos = sta->sta.wme;
diff --git a/net/mac802154/iface.c b/net/mac802154/iface.c index a08240f..1cf5ac0 100644 --- a/net/mac802154/iface.c +++ b/net/mac802154/iface.c
@@ -661,7 +661,6 @@ ieee802154_if_add(struct ieee802154_local *local, const char *name, sdata->dev = ndev; sdata->wpan_dev.wpan_phy = local->hw.phy; sdata->local = local; - INIT_LIST_HEAD(&sdata->wpan_dev.list); /* setup type-dependent data */ ret = ieee802154_setup_sdata(sdata, type);
diff --git a/net/mac802154/rx.c b/net/mac802154/rx.c index 726b47a..b8ce846 100644 --- a/net/mac802154/rx.c +++ b/net/mac802154/rx.c
@@ -44,7 +44,7 @@ ieee802154_subif_frame(struct ieee802154_sub_if_data *sdata, switch (mac_cb(skb)->dest.mode) { case IEEE802154_ADDR_NONE: - if (hdr->source.mode != IEEE802154_ADDR_NONE) + if (mac_cb(skb)->dest.mode != IEEE802154_ADDR_NONE) /* FIXME: check if we are PAN coordinator */ skb->pkt_type = PACKET_OTHERHOST; else @@ -132,7 +132,7 @@ static int ieee802154_parse_frame_start(struct sk_buff *skb, struct ieee802154_hdr *hdr) { int hlen; - struct ieee802154_mac_cb *cb = mac_cb(skb); + struct ieee802154_mac_cb *cb = mac_cb_init(skb); skb_reset_mac_header(skb); @@ -294,9 +294,8 @@ void ieee802154_rx_irqsafe(struct ieee802154_hw *hw, struct sk_buff *skb, u8 lqi) { struct ieee802154_local *local = hw_to_local(hw); - struct ieee802154_mac_cb *cb = mac_cb_init(skb); - cb->lqi = lqi; + mac_cb(skb)->lqi = lqi; skb->pkt_type = IEEE802154_RX_MSG; skb_queue_tail(&local->skb_queue, skb); tasklet_schedule(&local->tasklet);
diff --git a/net/mpls/af_mpls.c b/net/mpls/af_mpls.c index 3a55a39..d5e3656 100644 --- a/net/mpls/af_mpls.c +++ b/net/mpls/af_mpls.c
@@ -1428,7 +1428,6 @@ static int mpls_dev_sysctl_register(struct net_device *dev, free: kfree(table); out: - mdev->sysctl = NULL; return -ENOBUFS; } @@ -1438,9 +1437,6 @@ static void mpls_dev_sysctl_unregister(struct net_device *dev, struct net *net = dev_net(dev); struct ctl_table *table; - if (!mdev->sysctl) - return; - table = mdev->sysctl->ctl_table_arg; unregister_net_sysctl_table(mdev->sysctl); kfree(table);
diff --git a/net/netfilter/ipset/ip_set_bitmap_ip.c b/net/netfilter/ipset/ip_set_bitmap_ip.c index 194d775..6e3cf4d 100644 --- a/net/netfilter/ipset/ip_set_bitmap_ip.c +++ b/net/netfilter/ipset/ip_set_bitmap_ip.c
@@ -296,8 +296,8 @@ bitmap_ip_create(struct net *net, struct ip_set *set, struct nlattr *tb[], return -IPSET_ERR_BITMAP_RANGE; pr_debug("mask_bits %u, netmask %u\n", mask_bits, netmask); - hosts = 2U << (32 - netmask - 1); - elements = 2UL << (netmask - mask_bits - 1); + hosts = 2 << (32 - netmask - 1); + elements = 2 << (netmask - mask_bits - 1); } if (elements > IPSET_BITMAP_MAX_RANGE + 1) return -IPSET_ERR_BITMAP_RANGE_SIZE;
diff --git a/net/netfilter/ipvs/ip_vs_app.c b/net/netfilter/ipvs/ip_vs_app.c index fdacbc3..f9b16f2 100644 --- a/net/netfilter/ipvs/ip_vs_app.c +++ b/net/netfilter/ipvs/ip_vs_app.c
@@ -599,19 +599,13 @@ static const struct seq_operations ip_vs_app_seq_ops = { int __net_init ip_vs_app_net_init(struct netns_ipvs *ipvs) { INIT_LIST_HEAD(&ipvs->app_list); -#ifdef CONFIG_PROC_FS - if (!proc_create_net("ip_vs_app", 0, ipvs->net->proc_net, - &ip_vs_app_seq_ops, - sizeof(struct seq_net_private))) - return -ENOMEM; -#endif + proc_create_net("ip_vs_app", 0, ipvs->net->proc_net, &ip_vs_app_seq_ops, + sizeof(struct seq_net_private)); return 0; } void __net_exit ip_vs_app_net_cleanup(struct netns_ipvs *ipvs) { unregister_ip_vs_app(ipvs, NULL /* all */); -#ifdef CONFIG_PROC_FS remove_proc_entry("ip_vs_app", ipvs->net->proc_net); -#endif }
diff --git a/net/netfilter/ipvs/ip_vs_conn.c b/net/netfilter/ipvs/ip_vs_conn.c index d66548d..a189079 100644 --- a/net/netfilter/ipvs/ip_vs_conn.c +++ b/net/netfilter/ipvs/ip_vs_conn.c
@@ -1225,8 +1225,8 @@ static inline int todrop_entry(struct ip_vs_conn *cp) * The drop rate array needs tuning for real environments. * Called from timer bh only => no locking */ - static const signed char todrop_rate[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; - static signed char todrop_counter[9] = {0}; + static const char todrop_rate[9] = {0, 1, 2, 3, 4, 5, 6, 7, 8}; + static char todrop_counter[9] = {0}; int i; /* if the conn entry hasn't lasted for 60 seconds, don't drop it. @@ -1373,36 +1373,20 @@ int __net_init ip_vs_conn_net_init(struct netns_ipvs *ipvs) { atomic_set(&ipvs->conn_count, 0); -#ifdef CONFIG_PROC_FS - if (!proc_create_net("ip_vs_conn", 0, ipvs->net->proc_net, - &ip_vs_conn_seq_ops, - sizeof(struct ip_vs_iter_state))) - goto err_conn; - - if (!proc_create_net("ip_vs_conn_sync", 0, ipvs->net->proc_net, - &ip_vs_conn_sync_seq_ops, - sizeof(struct ip_vs_iter_state))) - goto err_conn_sync; -#endif - + proc_create_net("ip_vs_conn", 0, ipvs->net->proc_net, + &ip_vs_conn_seq_ops, sizeof(struct ip_vs_iter_state)); + proc_create_net("ip_vs_conn_sync", 0, ipvs->net->proc_net, + &ip_vs_conn_sync_seq_ops, + sizeof(struct ip_vs_iter_state)); return 0; - -#ifdef CONFIG_PROC_FS -err_conn_sync: - remove_proc_entry("ip_vs_conn", ipvs->net->proc_net); -err_conn: - return -ENOMEM; -#endif } void __net_exit ip_vs_conn_net_cleanup(struct netns_ipvs *ipvs) { /* flush all the connection entries first */ ip_vs_conn_flush(ipvs); -#ifdef CONFIG_PROC_FS remove_proc_entry("ip_vs_conn", ipvs->net->proc_net); remove_proc_entry("ip_vs_conn_sync", ipvs->net->proc_net); -#endif } int __init ip_vs_conn_init(void)
diff --git a/net/netfilter/nf_conntrack_irc.c b/net/netfilter/nf_conntrack_irc.c index 65b5b05..e40988a 100644 --- a/net/netfilter/nf_conntrack_irc.c +++ b/net/netfilter/nf_conntrack_irc.c
@@ -148,37 +148,15 @@ static int help(struct sk_buff *skb, unsigned int protoff, data = ib_ptr; data_limit = ib_ptr + skb->len - dataoff; - /* Skip any whitespace */ - while (data < data_limit - 10) { - if (*data == ' ' || *data == '\r' || *data == '\n') - data++; - else - break; - } - - /* strlen("PRIVMSG x ")=10 */ - if (data < data_limit - 10) { - if (strncasecmp("PRIVMSG ", data, 8)) - goto out; - data += 8; - } - - /* strlen(" :\1DCC SENT t AAAAAAAA P\1\n")=26 - * 7+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=26 - */ - while (data < data_limit - (21 + MINMATCHLEN)) { - /* Find first " :", the start of message */ - if (memcmp(data, " :", 2)) { + /* strlen("\1DCC SENT t AAAAAAAA P\1\n")=24 + * 5+MINMATCHLEN+strlen("t AAAAAAAA P\1\n")=14 */ + while (data < data_limit - (19 + MINMATCHLEN)) { + if (memcmp(data, "\1DCC ", 5)) { data++; continue; } - data += 2; - - /* then check that place only for the DCC command */ - if (memcmp(data, "\1DCC ", 5)) - goto out; data += 5; - /* we have at least (21+MINMATCHLEN)-(2+5) bytes valid data left */ + /* we have at least (19+MINMATCHLEN)-5 bytes valid data left */ iph = ip_hdr(skb); pr_debug("DCC found in master %pI4:%u %pI4:%u\n", @@ -194,7 +172,7 @@ static int help(struct sk_buff *skb, unsigned int protoff, pr_debug("DCC %s detected\n", dccprotos[i]); /* we have at least - * (21+MINMATCHLEN)-7-dccprotos[i].matchlen bytes valid + * (19+MINMATCHLEN)-5-dccprotos[i].matchlen bytes valid * data left (== 14/13 bytes) */ if (parse_dcc(data, data_limit, &dcc_ip, &dcc_port, &addr_beg_p, &addr_end_p)) { @@ -207,9 +185,8 @@ static int help(struct sk_buff *skb, unsigned int protoff, /* dcc_ip can be the internal OR external (NAT'ed) IP */ tuple = &ct->tuplehash[dir].tuple; - if ((tuple->src.u3.ip != dcc_ip && - ct->tuplehash[!dir].tuple.dst.u3.ip != dcc_ip) || - dcc_port == 0) { + if (tuple->src.u3.ip != dcc_ip && + tuple->dst.u3.ip != dcc_ip) { net_warn_ratelimited("Forged DCC command from %pI4: %pI4:%u\n", &tuple->src.u3.ip, &dcc_ip, dcc_port);
diff --git a/net/netfilter/nf_conntrack_netlink.c b/net/netfilter/nf_conntrack_netlink.c index 4747daf..bc6f0c8 100644 --- a/net/netfilter/nf_conntrack_netlink.c +++ b/net/netfilter/nf_conntrack_netlink.c
@@ -2086,15 +2086,12 @@ ctnetlink_create_conntrack(struct net *net, err = nf_conntrack_hash_check_insert(ct); if (err < 0) - goto err3; + goto err2; rcu_read_unlock(); return ct; -err3: - if (ct->master) - nf_ct_put(ct->master); err2: rcu_read_unlock(); err1:
diff --git a/net/netfilter/nf_conntrack_proto_icmpv6.c b/net/netfilter/nf_conntrack_proto_icmpv6.c index ee45dbf..6f9144e 100644 --- a/net/netfilter/nf_conntrack_proto_icmpv6.c +++ b/net/netfilter/nf_conntrack_proto_icmpv6.c
@@ -128,56 +128,6 @@ static void icmpv6_error_log(const struct sk_buff *skb, IPPROTO_ICMPV6, "%s", msg); } -static noinline_for_stack int -nf_conntrack_icmpv6_redirect(struct nf_conn *tmpl, struct sk_buff *skb, - unsigned int dataoff, - const struct nf_hook_state *state) -{ - u8 hl = ipv6_hdr(skb)->hop_limit; - union nf_inet_addr outer_daddr; - union { - struct nd_opt_hdr nd_opt; - struct rd_msg rd_msg; - } tmp; - const struct nd_opt_hdr *nd_opt; - const struct rd_msg *rd_msg; - - rd_msg = skb_header_pointer(skb, dataoff, sizeof(*rd_msg), &tmp.rd_msg); - if (!rd_msg) { - icmpv6_error_log(skb, state, "short redirect"); - return -NF_ACCEPT; - } - - if (rd_msg->icmph.icmp6_code != 0) - return NF_ACCEPT; - - if (hl != 255 || !(ipv6_addr_type(&ipv6_hdr(skb)->saddr) & IPV6_ADDR_LINKLOCAL)) { - icmpv6_error_log(skb, state, "invalid saddr or hoplimit for redirect"); - return -NF_ACCEPT; - } - - dataoff += sizeof(*rd_msg); - - /* warning: rd_msg no longer usable after this call */ - nd_opt = skb_header_pointer(skb, dataoff, sizeof(*nd_opt), &tmp.nd_opt); - if (!nd_opt || nd_opt->nd_opt_len == 0) { - icmpv6_error_log(skb, state, "redirect without options"); - return -NF_ACCEPT; - } - - /* We could call ndisc_parse_options(), but it would need - * skb_linearize() and a bit more work. - */ - if (nd_opt->nd_opt_type != ND_OPT_REDIRECT_HDR) - return NF_ACCEPT; - - memcpy(&outer_daddr.ip6, &ipv6_hdr(skb)->daddr, - sizeof(outer_daddr.ip6)); - dataoff += 8; - return nf_conntrack_inet_error(tmpl, skb, dataoff, state, - IPPROTO_ICMPV6, &outer_daddr); -} - int nf_conntrack_icmpv6_error(struct nf_conn *tmpl, struct sk_buff *skb, unsigned int dataoff, @@ -208,9 +158,6 @@ int nf_conntrack_icmpv6_error(struct nf_conn *tmpl, return NF_ACCEPT; } - if (icmp6h->icmp6_type == NDISC_REDIRECT) - return nf_conntrack_icmpv6_redirect(tmpl, skb, dataoff, state); - /* is not error message ? */ if (icmp6h->icmp6_type >= 128) return NF_ACCEPT;
diff --git a/net/netfilter/nf_conntrack_proto_sctp.c b/net/netfilter/nf_conntrack_proto_sctp.c index cec4b16..7626f3e 100644 --- a/net/netfilter/nf_conntrack_proto_sctp.c +++ b/net/netfilter/nf_conntrack_proto_sctp.c
@@ -27,16 +27,22 @@ #include <net/netfilter/nf_conntrack_ecache.h> #include <net/netfilter/nf_conntrack_timeout.h> +/* FIXME: Examine ipfilter's timeouts and conntrack transitions more + closely. They're more complex. --RR + + And so for me for SCTP :D -Kiran */ + static const char *const sctp_conntrack_names[] = { - [SCTP_CONNTRACK_NONE] = "NONE", - [SCTP_CONNTRACK_CLOSED] = "CLOSED", - [SCTP_CONNTRACK_COOKIE_WAIT] = "COOKIE_WAIT", - [SCTP_CONNTRACK_COOKIE_ECHOED] = "COOKIE_ECHOED", - [SCTP_CONNTRACK_ESTABLISHED] = "ESTABLISHED", - [SCTP_CONNTRACK_SHUTDOWN_SENT] = "SHUTDOWN_SENT", - [SCTP_CONNTRACK_SHUTDOWN_RECD] = "SHUTDOWN_RECD", - [SCTP_CONNTRACK_SHUTDOWN_ACK_SENT] = "SHUTDOWN_ACK_SENT", - [SCTP_CONNTRACK_HEARTBEAT_SENT] = "HEARTBEAT_SENT", + "NONE", + "CLOSED", + "COOKIE_WAIT", + "COOKIE_ECHOED", + "ESTABLISHED", + "SHUTDOWN_SENT", + "SHUTDOWN_RECD", + "SHUTDOWN_ACK_SENT", + "HEARTBEAT_SENT", + "HEARTBEAT_ACKED", }; #define SECS * HZ @@ -48,11 +54,12 @@ static const unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] = { [SCTP_CONNTRACK_CLOSED] = 10 SECS, [SCTP_CONNTRACK_COOKIE_WAIT] = 3 SECS, [SCTP_CONNTRACK_COOKIE_ECHOED] = 3 SECS, - [SCTP_CONNTRACK_ESTABLISHED] = 210 SECS, + [SCTP_CONNTRACK_ESTABLISHED] = 5 DAYS, [SCTP_CONNTRACK_SHUTDOWN_SENT] = 300 SECS / 1000, [SCTP_CONNTRACK_SHUTDOWN_RECD] = 300 SECS / 1000, [SCTP_CONNTRACK_SHUTDOWN_ACK_SENT] = 3 SECS, [SCTP_CONNTRACK_HEARTBEAT_SENT] = 30 SECS, + [SCTP_CONNTRACK_HEARTBEAT_ACKED] = 210 SECS, }; #define SCTP_FLAG_HEARTBEAT_VTAG_FAILED 1 @@ -66,6 +73,7 @@ static const unsigned int sctp_timeouts[SCTP_CONNTRACK_MAX] = { #define sSR SCTP_CONNTRACK_SHUTDOWN_RECD #define sSA SCTP_CONNTRACK_SHUTDOWN_ACK_SENT #define sHS SCTP_CONNTRACK_HEARTBEAT_SENT +#define sHA SCTP_CONNTRACK_HEARTBEAT_ACKED #define sIV SCTP_CONNTRACK_MAX /* @@ -88,6 +96,9 @@ SHUTDOWN_ACK_SENT - We have seen a SHUTDOWN_ACK chunk in the direction opposite CLOSED - We have seen a SHUTDOWN_COMPLETE chunk in the direction of the SHUTDOWN chunk. Connection is closed. HEARTBEAT_SENT - We have seen a HEARTBEAT in a new flow. +HEARTBEAT_ACKED - We have seen a HEARTBEAT-ACK in the direction opposite to + that of the HEARTBEAT chunk. Secondary connection is + established. */ /* TODO @@ -104,33 +115,33 @@ cookie echoed to closed. static const u8 sctp_conntracks[2][11][SCTP_CONNTRACK_MAX] = { { /* ORIGINAL */ -/* sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS */ -/* init */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCW}, -/* init_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL}, -/* abort */ {sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL}, -/* shutdown */ {sCL, sCL, sCW, sCE, sSS, sSS, sSR, sSA, sCL}, -/* shutdown_ack */ {sSA, sCL, sCW, sCE, sES, sSA, sSA, sSA, sSA}, -/* error */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL},/* Can't have Stale cookie*/ -/* cookie_echo */ {sCL, sCL, sCE, sCE, sES, sSS, sSR, sSA, sCL},/* 5.2.4 - Big TODO */ -/* cookie_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL},/* Can't come in orig dir */ -/* shutdown_comp*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sCL, sCL}, -/* heartbeat */ {sHS, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS}, -/* heartbeat_ack*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS}, +/* sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS, sHA */ +/* init */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCW, sHA}, +/* init_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL, sHA}, +/* abort */ {sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL, sCL}, +/* shutdown */ {sCL, sCL, sCW, sCE, sSS, sSS, sSR, sSA, sCL, sSS}, +/* shutdown_ack */ {sSA, sCL, sCW, sCE, sES, sSA, sSA, sSA, sSA, sHA}, +/* error */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL, sHA},/* Can't have Stale cookie*/ +/* cookie_echo */ {sCL, sCL, sCE, sCE, sES, sSS, sSR, sSA, sCL, sHA},/* 5.2.4 - Big TODO */ +/* cookie_ack */ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sCL, sHA},/* Can't come in orig dir */ +/* shutdown_comp*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sCL, sCL, sHA}, +/* heartbeat */ {sHS, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS, sHA}, +/* heartbeat_ack*/ {sCL, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS, sHA} }, { /* REPLY */ -/* sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS */ -/* init */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sIV},/* INIT in sCL Big TODO */ -/* init_ack */ {sIV, sCW, sCW, sCE, sES, sSS, sSR, sSA, sIV}, -/* abort */ {sIV, sCL, sCL, sCL, sCL, sCL, sCL, sCL, sIV}, -/* shutdown */ {sIV, sCL, sCW, sCE, sSR, sSS, sSR, sSA, sIV}, -/* shutdown_ack */ {sIV, sCL, sCW, sCE, sES, sSA, sSA, sSA, sIV}, -/* error */ {sIV, sCL, sCW, sCL, sES, sSS, sSR, sSA, sIV}, -/* cookie_echo */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sIV},/* Can't come in reply dir */ -/* cookie_ack */ {sIV, sCL, sCW, sES, sES, sSS, sSR, sSA, sIV}, -/* shutdown_comp*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sCL, sIV}, -/* heartbeat */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS}, -/* heartbeat_ack*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sES}, +/* sNO, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS, sHA */ +/* init */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sIV, sHA},/* INIT in sCL Big TODO */ +/* init_ack */ {sIV, sCW, sCW, sCE, sES, sSS, sSR, sSA, sIV, sHA}, +/* abort */ {sIV, sCL, sCL, sCL, sCL, sCL, sCL, sCL, sIV, sCL}, +/* shutdown */ {sIV, sCL, sCW, sCE, sSR, sSS, sSR, sSA, sIV, sSR}, +/* shutdown_ack */ {sIV, sCL, sCW, sCE, sES, sSA, sSA, sSA, sIV, sHA}, +/* error */ {sIV, sCL, sCW, sCL, sES, sSS, sSR, sSA, sIV, sHA}, +/* cookie_echo */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sIV, sHA},/* Can't come in reply dir */ +/* cookie_ack */ {sIV, sCL, sCW, sES, sES, sSS, sSR, sSA, sIV, sHA}, +/* shutdown_comp*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sCL, sIV, sHA}, +/* heartbeat */ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHS, sHA}, +/* heartbeat_ack*/ {sIV, sCL, sCW, sCE, sES, sSS, sSR, sSA, sHA, sHA} } }; @@ -401,29 +412,22 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct, for_each_sctp_chunk (skb, sch, _sch, offset, dataoff, count) { /* Special cases of Verification tag check (Sec 8.5.1) */ if (sch->type == SCTP_CID_INIT) { - /* (A) vtag MUST be zero */ + /* Sec 8.5.1 (A) */ if (sh->vtag != 0) goto out_unlock; } else if (sch->type == SCTP_CID_ABORT) { - /* (B) vtag MUST match own vtag if T flag is unset OR - * MUST match peer's vtag if T flag is set - */ - if ((!(sch->flags & SCTP_CHUNK_FLAG_T) && - sh->vtag != ct->proto.sctp.vtag[dir]) || - ((sch->flags & SCTP_CHUNK_FLAG_T) && - sh->vtag != ct->proto.sctp.vtag[!dir])) + /* Sec 8.5.1 (B) */ + if (sh->vtag != ct->proto.sctp.vtag[dir] && + sh->vtag != ct->proto.sctp.vtag[!dir]) goto out_unlock; } else if (sch->type == SCTP_CID_SHUTDOWN_COMPLETE) { - /* (C) vtag MUST match own vtag if T flag is unset OR - * MUST match peer's vtag if T flag is set - */ - if ((!(sch->flags & SCTP_CHUNK_FLAG_T) && - sh->vtag != ct->proto.sctp.vtag[dir]) || - ((sch->flags & SCTP_CHUNK_FLAG_T) && - sh->vtag != ct->proto.sctp.vtag[!dir])) + /* Sec 8.5.1 (C) */ + if (sh->vtag != ct->proto.sctp.vtag[dir] && + sh->vtag != ct->proto.sctp.vtag[!dir] && + sch->flags & SCTP_CHUNK_FLAG_T) goto out_unlock; } else if (sch->type == SCTP_CID_COOKIE_ECHO) { - /* (D) vtag must be same as init_vtag as found in INIT_ACK */ + /* Sec 8.5.1 (D) */ if (sh->vtag != ct->proto.sctp.vtag[dir]) goto out_unlock; } else if (sch->type == SCTP_CID_HEARTBEAT) { @@ -497,12 +501,8 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct, } ct->proto.sctp.state = new_state; - if (old_state != new_state) { + if (old_state != new_state) nf_conntrack_event_cache(IPCT_PROTOINFO, ct); - if (new_state == SCTP_CONNTRACK_ESTABLISHED && - !test_and_set_bit(IPS_ASSURED_BIT, &ct->status)) - nf_conntrack_event_cache(IPCT_ASSURED, ct); - } } spin_unlock_bh(&ct->lock); @@ -516,6 +516,14 @@ int nf_conntrack_sctp_packet(struct nf_conn *ct, nf_ct_refresh_acct(ct, ctinfo, skb, timeouts[new_state]); + if (old_state == SCTP_CONNTRACK_COOKIE_ECHOED && + dir == IP_CT_DIR_REPLY && + new_state == SCTP_CONNTRACK_ESTABLISHED) { + pr_debug("Setting assured bit\n"); + set_bit(IPS_ASSURED_BIT, &ct->status); + nf_conntrack_event_cache(IPCT_ASSURED, ct); + } + return NF_ACCEPT; out_unlock:
diff --git a/net/netfilter/nf_conntrack_proto_tcp.c b/net/netfilter/nf_conntrack_proto_tcp.c index aed967e..b8cc333 100644 --- a/net/netfilter/nf_conntrack_proto_tcp.c +++ b/net/netfilter/nf_conntrack_proto_tcp.c
@@ -1158,16 +1158,6 @@ int nf_conntrack_tcp_packet(struct nf_conn *ct, nf_ct_kill_acct(ct, ctinfo, skb); return NF_ACCEPT; } - - if (index == TCP_SYN_SET && old_state == TCP_CONNTRACK_SYN_SENT) { - /* do not renew timeout on SYN retransmit. - * - * Else port reuse by client or NAT middlebox can keep - * entry alive indefinitely (including nat info). - */ - return NF_ACCEPT; - } - /* ESTABLISHED without SEEN_REPLY, i.e. mid-connection * pickup with loose=1. Avoid large ESTABLISHED timeout. */
diff --git a/net/netfilter/nf_conntrack_sip.c b/net/netfilter/nf_conntrack_sip.c index 78fd912..b83dc9b 100644 --- a/net/netfilter/nf_conntrack_sip.c +++ b/net/netfilter/nf_conntrack_sip.c
@@ -477,7 +477,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr, return ret; if (ret == 0) break; - dataoff = *matchoff; + dataoff += *matchoff; } *in_header = 0; } @@ -489,7 +489,7 @@ static int ct_sip_walk_headers(const struct nf_conn *ct, const char *dptr, break; if (ret == 0) return ret; - dataoff = *matchoff; + dataoff += *matchoff; } if (in_header)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c index 43c3c3b..a3faeac 100644 --- a/net/netfilter/nf_conntrack_standalone.c +++ b/net/netfilter/nf_conntrack_standalone.c
@@ -581,6 +581,7 @@ enum nf_ct_sysctl_index { NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_SHUTDOWN_RECD, NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_SHUTDOWN_ACK_SENT, NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_SENT, + NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_ACKED, #endif #ifdef CONFIG_NF_CT_PROTO_DCCP NF_SYSCTL_CT_PROTO_TIMEOUT_DCCP_REQUEST, @@ -850,6 +851,12 @@ static struct ctl_table nf_ct_sysctl_table[] = { .mode = 0644, .proc_handler = proc_dointvec_jiffies, }, + [NF_SYSCTL_CT_PROTO_TIMEOUT_SCTP_HEARTBEAT_ACKED] = { + .procname = "nf_conntrack_sctp_timeout_heartbeat_acked", + .maxlen = sizeof(unsigned int), + .mode = 0644, + .proc_handler = proc_dointvec_jiffies, + }, #endif #ifdef CONFIG_NF_CT_PROTO_DCCP [NF_SYSCTL_CT_PROTO_TIMEOUT_DCCP_REQUEST] = { @@ -978,6 +985,7 @@ static void nf_conntrack_standalone_init_sctp_sysctl(struct net *net, XASSIGN(SHUTDOWN_RECD, sn); XASSIGN(SHUTDOWN_ACK_SENT, sn); XASSIGN(HEARTBEAT_SENT, sn); + XASSIGN(HEARTBEAT_ACKED, sn); #undef XASSIGN #endif }
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c index 140c24f..58a7d89 100644 --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c
@@ -113,7 +113,6 @@ static struct nft_trans *nft_trans_alloc_gfp(const struct nft_ctx *ctx, if (trans == NULL) return NULL; - INIT_LIST_HEAD(&trans->list); trans->msg_type = msg_type; trans->ctx = *ctx; @@ -2714,7 +2713,6 @@ static int nft_table_validate(struct net *net, const struct nft_table *table) } static struct nft_rule *nft_rule_lookup_byid(const struct net *net, - const struct nft_chain *chain, const struct nlattr *nla); #define NFT_RULE_MAXEXPRS 128 @@ -2788,7 +2786,7 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk, return PTR_ERR(old_rule); } } else if (nla[NFTA_RULE_POSITION_ID]) { - old_rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_POSITION_ID]); + old_rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_POSITION_ID]); if (IS_ERR(old_rule)) { NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_POSITION_ID]); return PTR_ERR(old_rule); @@ -2923,7 +2921,6 @@ static int nf_tables_newrule(struct net *net, struct sock *nlsk, } static struct nft_rule *nft_rule_lookup_byid(const struct net *net, - const struct nft_chain *chain, const struct nlattr *nla) { u32 id = ntohl(nla_get_be32(nla)); @@ -2933,7 +2930,6 @@ static struct nft_rule *nft_rule_lookup_byid(const struct net *net, struct nft_rule *rule = nft_trans_rule(trans); if (trans->msg_type == NFT_MSG_NEWRULE && - trans->ctx.chain == chain && id == nft_trans_rule_id(trans)) return rule; } @@ -2980,7 +2976,7 @@ static int nf_tables_delrule(struct net *net, struct sock *nlsk, err = nft_delrule(&ctx, rule); } else if (nla[NFTA_RULE_ID]) { - rule = nft_rule_lookup_byid(net, chain, nla[NFTA_RULE_ID]); + rule = nft_rule_lookup_byid(net, nla[NFTA_RULE_ID]); if (IS_ERR(rule)) { NL_SET_BAD_ATTR(extack, nla[NFTA_RULE_ID]); return PTR_ERR(rule); @@ -3195,7 +3191,6 @@ static struct nft_set *nft_set_lookup_byhandle(const struct nft_table *table, } static struct nft_set *nft_set_lookup_byid(const struct net *net, - const struct nft_table *table, const struct nlattr *nla, u8 genmask) { struct nft_trans *trans; @@ -3206,7 +3201,6 @@ static struct nft_set *nft_set_lookup_byid(const struct net *net, struct nft_set *set = nft_trans_set(trans); if (id == nft_trans_set_id(trans) && - set->table == table && nft_active_genmask(set, genmask)) return set; } @@ -3227,7 +3221,7 @@ struct nft_set *nft_set_lookup_global(const struct net *net, if (!nla_set_id) return set; - set = nft_set_lookup_byid(net, table, nla_set_id, genmask); + set = nft_set_lookup_byid(net, nla_set_id, genmask); } return set; } @@ -3253,7 +3247,7 @@ static int nf_tables_set_alloc_name(struct nft_ctx *ctx, struct nft_set *set, list_for_each_entry(i, &ctx->table->sets, list) { int tmp; - if (!nft_is_active_next(ctx->net, i)) + if (!nft_is_active_next(ctx->net, set)) continue; if (!sscanf(i->name, name, &tmp)) continue; @@ -6576,6 +6570,9 @@ static void nft_commit_release(struct nft_trans *trans) nf_tables_chain_destroy(&trans->ctx); break; case NFT_MSG_DELRULE: + if (trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD) + nft_flow_rule_destroy(nft_trans_flow_rule(trans)); + nf_tables_rule_destroy(&trans->ctx, nft_trans_rule(trans)); break; case NFT_MSG_DELSET: @@ -6910,9 +6907,6 @@ static int nf_tables_commit(struct net *net, struct sk_buff *skb) nft_rule_expr_deactivate(&trans->ctx, nft_trans_rule(trans), NFT_TRANS_COMMIT); - - if (trans->ctx.chain->flags & NFT_CHAIN_HW_OFFLOAD) - nft_flow_rule_destroy(nft_trans_flow_rule(trans)); break; case NFT_MSG_NEWSET: nft_clear(net, nft_trans_set(trans));
diff --git a/net/netfilter/nfnetlink_osf.c b/net/netfilter/nfnetlink_osf.c index 51e3953..79fbf37 100644 --- a/net/netfilter/nfnetlink_osf.c +++ b/net/netfilter/nfnetlink_osf.c
@@ -269,7 +269,6 @@ bool nf_osf_find(const struct sk_buff *skb, struct nf_osf_hdr_ctx ctx; const struct tcphdr *tcp; struct tcphdr _tcph; - bool found = false; memset(&ctx, 0, sizeof(ctx)); @@ -284,11 +283,10 @@ bool nf_osf_find(const struct sk_buff *skb, data->genre = f->genre; data->version = f->version; - found = true; break; } - return found; + return true; } EXPORT_SYMBOL_GPL(nf_osf_find);
diff --git a/net/netfilter/nft_osf.c b/net/netfilter/nft_osf.c index d966a3a..4911f8e 100644 --- a/net/netfilter/nft_osf.c +++ b/net/netfilter/nft_osf.c
@@ -115,21 +115,9 @@ static int nft_osf_validate(const struct nft_ctx *ctx, const struct nft_expr *expr, const struct nft_data **data) { - unsigned int hooks; - - switch (ctx->family) { - case NFPROTO_IPV4: - case NFPROTO_IPV6: - case NFPROTO_INET: - hooks = (1 << NF_INET_LOCAL_IN) | - (1 << NF_INET_PRE_ROUTING) | - (1 << NF_INET_FORWARD); - break; - default: - return -EOPNOTSUPP; - } - - return nft_chain_validate_hooks(ctx->chain, hooks); + return nft_chain_validate_hooks(ctx->chain, (1 << NF_INET_LOCAL_IN) | + (1 << NF_INET_PRE_ROUTING) | + (1 << NF_INET_FORWARD)); } static struct nft_expr_type nft_osf_type;
diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index 6ed6cce..cf0512f 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c
@@ -558,8 +558,6 @@ static int nft_payload_set_init(const struct nft_ctx *ctx, const struct nlattr * const tb[]) { struct nft_payload_set *priv = nft_expr_priv(expr); - u32 csum_offset, csum_type = NFT_PAYLOAD_CSUM_NONE; - int err; priv->base = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_BASE])); priv->offset = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_OFFSET])); @@ -567,15 +565,11 @@ static int nft_payload_set_init(const struct nft_ctx *ctx, priv->sreg = nft_parse_register(tb[NFTA_PAYLOAD_SREG]); if (tb[NFTA_PAYLOAD_CSUM_TYPE]) - csum_type = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_CSUM_TYPE])); - if (tb[NFTA_PAYLOAD_CSUM_OFFSET]) { - err = nft_parse_u32_check(tb[NFTA_PAYLOAD_CSUM_OFFSET], U8_MAX, - &csum_offset); - if (err < 0) - return err; - - priv->csum_offset = csum_offset; - } + priv->csum_type = + ntohl(nla_get_be32(tb[NFTA_PAYLOAD_CSUM_TYPE])); + if (tb[NFTA_PAYLOAD_CSUM_OFFSET]) + priv->csum_offset = + ntohl(nla_get_be32(tb[NFTA_PAYLOAD_CSUM_OFFSET])); if (tb[NFTA_PAYLOAD_CSUM_FLAGS]) { u32 flags; @@ -586,14 +580,13 @@ static int nft_payload_set_init(const struct nft_ctx *ctx, priv->csum_flags = flags; } - switch (csum_type) { + switch (priv->csum_type) { case NFT_PAYLOAD_CSUM_NONE: case NFT_PAYLOAD_CSUM_INET: break; default: return -EOPNOTSUPP; } - priv->csum_type = csum_type; return nft_validate_register_load(priv->sreg, priv->len); } @@ -631,7 +624,6 @@ nft_payload_select_ops(const struct nft_ctx *ctx, { enum nft_payload_bases base; unsigned int offset, len; - int err; if (tb[NFTA_PAYLOAD_BASE] == NULL || tb[NFTA_PAYLOAD_OFFSET] == NULL || @@ -657,13 +649,8 @@ nft_payload_select_ops(const struct nft_ctx *ctx, if (tb[NFTA_PAYLOAD_DREG] == NULL) return ERR_PTR(-EINVAL); - err = nft_parse_u32_check(tb[NFTA_PAYLOAD_OFFSET], U8_MAX, &offset); - if (err < 0) - return ERR_PTR(err); - - err = nft_parse_u32_check(tb[NFTA_PAYLOAD_LEN], U8_MAX, &len); - if (err < 0) - return ERR_PTR(err); + offset = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_OFFSET])); + len = ntohl(nla_get_be32(tb[NFTA_PAYLOAD_LEN])); if (len <= 4 && is_power_of_2(len) && IS_ALIGNED(offset, len) && base != NFT_PAYLOAD_LL_HEADER)
diff --git a/net/netfilter/nft_redir.c b/net/netfilter/nft_redir.c index d75de63..43eeb1f 100644 --- a/net/netfilter/nft_redir.c +++ b/net/netfilter/nft_redir.c
@@ -236,7 +236,7 @@ static struct nft_expr_type nft_redir_inet_type __read_mostly = { .name = "redir", .ops = &nft_redir_inet_ops, .policy = nft_redir_policy, - .maxattr = NFTA_REDIR_MAX, + .maxattr = NFTA_MASQ_MAX, .owner = THIS_MODULE, };
diff --git a/net/netfilter/nft_set_rbtree.c b/net/netfilter/nft_set_rbtree.c index 093eea0..ee7c29e 100644 --- a/net/netfilter/nft_set_rbtree.c +++ b/net/netfilter/nft_set_rbtree.c
@@ -389,37 +389,23 @@ static void nft_rbtree_gc(struct work_struct *work) struct nft_rbtree *priv; struct rb_node *node; struct nft_set *set; - struct net *net; - u8 genmask; priv = container_of(work, struct nft_rbtree, gc_work.work); set = nft_set_container_of(priv); - net = read_pnet(&set->net); - genmask = nft_genmask_cur(net); write_lock_bh(&priv->lock); write_seqcount_begin(&priv->count); for (node = rb_first(&priv->root); node != NULL; node = rb_next(node)) { rbe = rb_entry(node, struct nft_rbtree_elem, node); - if (!nft_set_elem_active(&rbe->ext, genmask)) - continue; - - /* elements are reversed in the rbtree for historical reasons, - * from highest to lowest value, that is why end element is - * always visited before the start element. - */ if (nft_rbtree_interval_end(rbe)) { rbe_end = rbe; continue; } if (!nft_set_elem_expired(&rbe->ext)) continue; - - if (nft_set_elem_mark_busy(&rbe->ext)) { - rbe_end = NULL; + if (nft_set_elem_mark_busy(&rbe->ext)) continue; - } if (rbe_prev) { rb_erase(&rbe_prev->node, &priv->root);
diff --git a/net/netfilter/nft_tproxy.c b/net/netfilter/nft_tproxy.c index a0e30bf..b97ab11 100644 --- a/net/netfilter/nft_tproxy.c +++ b/net/netfilter/nft_tproxy.c
@@ -289,13 +289,6 @@ static int nft_tproxy_dump(struct sk_buff *skb, return 0; } -static int nft_tproxy_validate(const struct nft_ctx *ctx, - const struct nft_expr *expr, - const struct nft_data **data) -{ - return nft_chain_validate_hooks(ctx->chain, 1 << NF_INET_PRE_ROUTING); -} - static struct nft_expr_type nft_tproxy_type; static const struct nft_expr_ops nft_tproxy_ops = { .type = &nft_tproxy_type, @@ -303,7 +296,6 @@ static const struct nft_expr_ops nft_tproxy_ops = { .eval = nft_tproxy_eval, .init = nft_tproxy_init, .dump = nft_tproxy_dump, - .validate = nft_tproxy_validate, }; static struct nft_expr_type nft_tproxy_type __read_mostly = {
diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c index 4e850c8..1effd48 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c
@@ -134,7 +134,6 @@ static const struct nft_expr_ops nft_tunnel_get_ops = { static struct nft_expr_type nft_tunnel_type __read_mostly = { .name = "tunnel", - .family = NFPROTO_NETDEV, .ops = &nft_tunnel_get_ops, .policy = nft_tunnel_policy, .maxattr = NFTA_TUNNEL_MAX,
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index a232fcb..86b7038 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c
@@ -569,9 +569,7 @@ static int netlink_insert(struct sock *sk, u32 portid) if (nlk_sk(sk)->bound) goto err; - /* portid can be read locklessly from netlink_getname(). */ - WRITE_ONCE(nlk_sk(sk)->portid, portid); - + nlk_sk(sk)->portid = portid; sock_hold(sk); err = __netlink_insert(table, sk); @@ -1080,11 +1078,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr, return -EINVAL; if (addr->sa_family == AF_UNSPEC) { - /* paired with READ_ONCE() in netlink_getsockbyportid() */ - WRITE_ONCE(sk->sk_state, NETLINK_UNCONNECTED); - /* dst_portid and dst_group can be read locklessly */ - WRITE_ONCE(nlk->dst_portid, 0); - WRITE_ONCE(nlk->dst_group, 0); + sk->sk_state = NETLINK_UNCONNECTED; + nlk->dst_portid = 0; + nlk->dst_group = 0; return 0; } if (addr->sa_family != AF_NETLINK) @@ -1105,11 +1101,9 @@ static int netlink_connect(struct socket *sock, struct sockaddr *addr, err = netlink_autobind(sock); if (err == 0) { - /* paired with READ_ONCE() in netlink_getsockbyportid() */ - WRITE_ONCE(sk->sk_state, NETLINK_CONNECTED); - /* dst_portid and dst_group can be read locklessly */ - WRITE_ONCE(nlk->dst_portid, nladdr->nl_pid); - WRITE_ONCE(nlk->dst_group, ffs(nladdr->nl_groups)); + sk->sk_state = NETLINK_CONNECTED; + nlk->dst_portid = nladdr->nl_pid; + nlk->dst_group = ffs(nladdr->nl_groups); } return err; @@ -1126,12 +1120,10 @@ static int netlink_getname(struct socket *sock, struct sockaddr *addr, nladdr->nl_pad = 0; if (peer) { - /* Paired with WRITE_ONCE() in netlink_connect() */ - nladdr->nl_pid = READ_ONCE(nlk->dst_portid); - nladdr->nl_groups = netlink_group_mask(READ_ONCE(nlk->dst_group)); + nladdr->nl_pid = nlk->dst_portid; + nladdr->nl_groups = netlink_group_mask(nlk->dst_group); } else { - /* Paired with WRITE_ONCE() in netlink_insert() */ - nladdr->nl_pid = READ_ONCE(nlk->portid); + nladdr->nl_pid = nlk->portid; netlink_lock_table(); nladdr->nl_groups = nlk->groups ? nlk->groups[0] : 0; netlink_unlock_table(); @@ -1158,9 +1150,8 @@ static struct sock *netlink_getsockbyportid(struct sock *ssk, u32 portid) /* Don't bother queuing skb if kernel socket has no input function */ nlk = nlk_sk(sock); - /* dst_portid and sk_state can be changed in netlink_connect() */ - if (READ_ONCE(sock->sk_state) == NETLINK_CONNECTED && - READ_ONCE(nlk->dst_portid) != nlk_sk(ssk)->portid) { + if (sock->sk_state == NETLINK_CONNECTED && + nlk->dst_portid != nlk_sk(ssk)->portid) { sock_put(sock); return ERR_PTR(-ECONNREFUSED); } @@ -1896,9 +1887,8 @@ static int netlink_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) goto out; netlink_skb_flags |= NETLINK_SKB_DST; } else { - /* Paired with WRITE_ONCE() in netlink_connect() */ - dst_portid = READ_ONCE(nlk->dst_portid); - dst_group = READ_ONCE(nlk->dst_group); + dst_portid = nlk->dst_portid; + dst_group = nlk->dst_group; } /* Paired with WRITE_ONCE() in netlink_insert() */
diff --git a/net/netrom/af_netrom.c b/net/netrom/af_netrom.c index 7da77dd..58d5373 100644 --- a/net/netrom/af_netrom.c +++ b/net/netrom/af_netrom.c
@@ -378,11 +378,6 @@ static int nr_listen(struct socket *sock, int backlog) struct sock *sk = sock->sk; lock_sock(sk); - if (sock->state != SS_UNCONNECTED) { - release_sock(sk); - return -EINVAL; - } - if (sk->sk_state != TCP_LISTEN) { memset(&nr_sk(sk)->user_addr, 0, AX25_ADDR_LEN); sk->sk_max_ack_backlog = backlog;
diff --git a/net/netrom/nr_timer.c b/net/netrom/nr_timer.c index 4e7c968..a8da88d 100644 --- a/net/netrom/nr_timer.c +++ b/net/netrom/nr_timer.c
@@ -121,7 +121,6 @@ static void nr_heartbeat_expiry(struct timer_list *t) is accepted() it isn't 'dead' so doesn't get removed. */ if (sock_flag(sk, SOCK_DESTROY) || (sk->sk_state == TCP_LISTEN && sock_flag(sk, SOCK_DEAD))) { - sock_hold(sk); bh_unlock_sock(sk); nr_destroy_socket(sk); goto out;
diff --git a/net/nfc/llcp_core.c b/net/nfc/llcp_core.c index edadebb..cc99751 100644 --- a/net/nfc/llcp_core.c +++ b/net/nfc/llcp_core.c
@@ -159,7 +159,6 @@ static void local_cleanup(struct nfc_llcp_local *local) cancel_work_sync(&local->rx_work); cancel_work_sync(&local->timeout_work); kfree_skb(local->rx_pending); - local->rx_pending = NULL; del_timer_sync(&local->sdreq_timer); cancel_work_sync(&local->sdreq_timeout_work); nfc_llcp_free_sdp_tlv_list(&local->pending_sdreqs);
diff --git a/net/nfc/nci/core.c b/net/nfc/nci/core.c index 57849ba..b2e922f 100644 --- a/net/nfc/nci/core.c +++ b/net/nfc/nci/core.c
@@ -530,7 +530,7 @@ static int nci_open_device(struct nci_dev *ndev) skb_queue_purge(&ndev->tx_q); ndev->ops->close(ndev); - ndev->flags &= BIT(NCI_UNREG); + ndev->flags = 0; } done:
diff --git a/net/nfc/nci/data.c b/net/nfc/nci/data.c index b4548d8..b002e18 100644 --- a/net/nfc/nci/data.c +++ b/net/nfc/nci/data.c
@@ -279,10 +279,8 @@ void nci_rx_data_packet(struct nci_dev *ndev, struct sk_buff *skb) nci_plen(skb->data)); conn_info = nci_get_conn_info_by_conn_id(ndev, nci_conn_id(skb->data)); - if (!conn_info) { - kfree_skb(skb); + if (!conn_info) return; - } /* strip the nci data header */ skb_pull(skb, NCI_DATA_HDR_SIZE);
diff --git a/net/nfc/nci/ntf.c b/net/nfc/nci/ntf.c index f8b20cd..33e1170 100644 --- a/net/nfc/nci/ntf.c +++ b/net/nfc/nci/ntf.c
@@ -218,8 +218,6 @@ static int nci_add_new_protocol(struct nci_dev *ndev, target->sens_res = nfca_poll->sens_res; target->sel_res = nfca_poll->sel_res; target->nfcid1_len = nfca_poll->nfcid1_len; - if (target->nfcid1_len > ARRAY_SIZE(target->nfcid1)) - return -EPROTO; if (target->nfcid1_len > 0) { memcpy(target->nfcid1, nfca_poll->nfcid1, target->nfcid1_len); @@ -228,8 +226,6 @@ static int nci_add_new_protocol(struct nci_dev *ndev, nfcb_poll = (struct rf_tech_specific_params_nfcb_poll *)params; target->sensb_res_len = nfcb_poll->sensb_res_len; - if (target->sensb_res_len > ARRAY_SIZE(target->sensb_res)) - return -EPROTO; if (target->sensb_res_len > 0) { memcpy(target->sensb_res, nfcb_poll->sensb_res, target->sensb_res_len); @@ -238,8 +234,6 @@ static int nci_add_new_protocol(struct nci_dev *ndev, nfcf_poll = (struct rf_tech_specific_params_nfcf_poll *)params; target->sensf_res_len = nfcf_poll->sensf_res_len; - if (target->sensf_res_len > ARRAY_SIZE(target->sensf_res)) - return -EPROTO; if (target->sensf_res_len > 0) { memcpy(target->sensf_res, nfcf_poll->sensf_res, target->sensf_res_len);
diff --git a/net/nfc/netlink.c b/net/nfc/netlink.c index 66ab971..9e94f73 100644 --- a/net/nfc/netlink.c +++ b/net/nfc/netlink.c
@@ -1450,12 +1450,8 @@ static int nfc_se_io(struct nfc_dev *dev, u32 se_idx, rc = dev->ops->se_io(dev, se_idx, apdu, apdu_length, cb, cb_context); - device_unlock(&dev->dev); - return rc; - error: device_unlock(&dev->dev); - kfree(cb_context); return rc; } @@ -1509,7 +1505,6 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info) u32 dev_idx, se_idx; u8 *apdu; size_t apdu_len; - int rc; if (!info->attrs[NFC_ATTR_DEVICE_INDEX] || !info->attrs[NFC_ATTR_SE_INDEX] || @@ -1523,37 +1518,25 @@ static int nfc_genl_se_io(struct sk_buff *skb, struct genl_info *info) if (!dev) return -ENODEV; - if (!dev->ops || !dev->ops->se_io) { - rc = -EOPNOTSUPP; - goto put_dev; - } + if (!dev->ops || !dev->ops->se_io) + return -ENOTSUPP; apdu_len = nla_len(info->attrs[NFC_ATTR_SE_APDU]); - if (apdu_len == 0) { - rc = -EINVAL; - goto put_dev; - } + if (apdu_len == 0) + return -EINVAL; apdu = nla_data(info->attrs[NFC_ATTR_SE_APDU]); - if (!apdu) { - rc = -EINVAL; - goto put_dev; - } + if (!apdu) + return -EINVAL; ctx = kzalloc(sizeof(struct se_io_ctx), GFP_KERNEL); - if (!ctx) { - rc = -ENOMEM; - goto put_dev; - } + if (!ctx) + return -ENOMEM; ctx->dev_idx = dev_idx; ctx->se_idx = se_idx; - rc = nfc_se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx); - -put_dev: - nfc_put_device(dev); - return rc; + return nfc_se_io(dev, se_idx, apdu, apdu_len, se_io_cb, ctx); } static int nfc_genl_vendor_cmd(struct sk_buff *skb, @@ -1576,21 +1559,14 @@ static int nfc_genl_vendor_cmd(struct sk_buff *skb, subcmd = nla_get_u32(info->attrs[NFC_ATTR_VENDOR_SUBCMD]); dev = nfc_get_device(dev_idx); - if (!dev) + if (!dev || !dev->vendor_cmds || !dev->n_vendor_cmds) return -ENODEV; - if (!dev->vendor_cmds || !dev->n_vendor_cmds) { - err = -ENODEV; - goto put_dev; - } - if (info->attrs[NFC_ATTR_VENDOR_DATA]) { data = nla_data(info->attrs[NFC_ATTR_VENDOR_DATA]); data_len = nla_len(info->attrs[NFC_ATTR_VENDOR_DATA]); - if (data_len == 0) { - err = -EINVAL; - goto put_dev; - } + if (data_len == 0) + return -EINVAL; } else { data = NULL; data_len = 0; @@ -1605,14 +1581,10 @@ static int nfc_genl_vendor_cmd(struct sk_buff *skb, dev->cur_cmd_info = info; err = cmd->doit(dev, data, data_len); dev->cur_cmd_info = NULL; - goto put_dev; + return err; } - err = -EOPNOTSUPP; - -put_dev: - nfc_put_device(dev); - return err; + return -EOPNOTSUPP; } /* message building helper */
diff --git a/net/openvswitch/datapath.c b/net/openvswitch/datapath.c index 4c537e7..4f097bd 100644 --- a/net/openvswitch/datapath.c +++ b/net/openvswitch/datapath.c
@@ -236,17 +236,10 @@ void ovs_dp_process_packet(struct sk_buff *skb, struct sw_flow_key *key) upcall.portid = ovs_vport_find_upcall_portid(p, skb); upcall.mru = OVS_CB(skb)->mru; error = ovs_dp_upcall(dp, skb, key, &upcall, 0); - switch (error) { - case 0: - case -EAGAIN: - case -ERESTARTSYS: - case -EINTR: - consume_skb(skb); - break; - default: + if (unlikely(error)) kfree_skb(skb); - break; - } + else + consume_skb(skb); stats_counter = &stats->n_missed; goto out; } @@ -532,9 +525,8 @@ static int queue_userspace_packet(struct datapath *dp, struct sk_buff *skb, out: if (err) skb_tx_error(skb); - consume_skb(user_skb); - consume_skb(nskb); - + kfree_skb(user_skb); + kfree_skb(nskb); return err; } @@ -910,7 +902,6 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) struct sw_flow_mask mask; struct sk_buff *reply; struct datapath *dp; - struct sw_flow_key *key; struct sw_flow_actions *acts; struct sw_flow_match match; u32 ufid_flags = ovs_nla_get_ufid_flags(a[OVS_FLOW_ATTR_UFID_FLAGS]); @@ -938,32 +929,30 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) } /* Extract key. */ - key = kzalloc(sizeof(*key), GFP_KERNEL); - if (!key) { - error = -ENOMEM; - goto err_kfree_flow; - } - - ovs_match_init(&match, key, false, &mask); + ovs_match_init(&match, &new_flow->key, false, &mask); error = ovs_nla_get_match(net, &match, a[OVS_FLOW_ATTR_KEY], a[OVS_FLOW_ATTR_MASK], log); if (error) - goto err_kfree_key; - - ovs_flow_mask_key(&new_flow->key, key, true, &mask); + goto err_kfree_flow; /* Extract flow identifier. */ error = ovs_nla_get_identifier(&new_flow->id, a[OVS_FLOW_ATTR_UFID], - key, log); + &new_flow->key, log); if (error) - goto err_kfree_key; + goto err_kfree_flow; + + /* unmasked key is needed to match when ufid is not used. */ + if (ovs_identifier_is_key(&new_flow->id)) + match.key = new_flow->id.unmasked_key; + + ovs_flow_mask_key(&new_flow->key, &new_flow->key, true, &mask); /* Validate actions. */ error = ovs_nla_copy_actions(net, a[OVS_FLOW_ATTR_ACTIONS], &new_flow->key, &acts, log); if (error) { OVS_NLERR(log, "Flow actions may not be safe on all matching packets."); - goto err_kfree_key; + goto err_kfree_flow; } reply = ovs_flow_cmd_alloc_info(acts, &new_flow->id, info, false, @@ -984,7 +973,7 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) if (ovs_identifier_is_ufid(&new_flow->id)) flow = ovs_flow_tbl_lookup_ufid(&dp->table, &new_flow->id); if (!flow) - flow = ovs_flow_tbl_lookup(&dp->table, key); + flow = ovs_flow_tbl_lookup(&dp->table, &new_flow->key); if (likely(!flow)) { rcu_assign_pointer(new_flow->sf_acts, acts); @@ -1054,8 +1043,6 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) if (reply) ovs_notify(&dp_flow_genl_family, reply, info); - - kfree(key); return 0; err_unlock_ovs: @@ -1063,8 +1050,6 @@ static int ovs_flow_cmd_new(struct sk_buff *skb, struct genl_info *info) kfree_skb(reply); err_kfree_acts: ovs_nla_free_flow_actions(acts); -err_kfree_key: - kfree(key); err_kfree_flow: ovs_flow_free(new_flow, false); error: @@ -1567,8 +1552,7 @@ static void ovs_dp_reset_user_features(struct sk_buff *skb, struct genl_info *in if (IS_ERR(dp)) return; - pr_warn("%s: Dropping previously announced user features\n", - ovs_dp_name(dp)); + WARN(dp->user_features, "Dropping previously announced user features\n"); dp->user_features = 0; }
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c index b4a525c..9165e00 100644 --- a/net/packet/af_packet.c +++ b/net/packet/af_packet.c
@@ -1863,22 +1863,12 @@ static int packet_rcv_spkt(struct sk_buff *skb, struct net_device *dev, static void packet_parse_headers(struct sk_buff *skb, struct socket *sock) { - int depth; - if ((!skb->protocol || skb->protocol == htons(ETH_P_ALL)) && sock->type == SOCK_RAW) { skb_reset_mac_header(skb); skb->protocol = dev_parse_header_protocol(skb); } - /* Move network header to the right position for VLAN tagged packets */ - if (likely(skb->dev->type == ARPHRD_ETHER) && - eth_type_vlan(skb->protocol) && - __vlan_get_protocol(skb, skb->protocol, &depth) != 0) { - if (pskb_may_pull(skb, depth)) - skb_set_network_header(skb, depth); - } - skb_probe_transport_header(skb); } @@ -2231,7 +2221,8 @@ static int tpacket_rcv(struct sk_buff *skb, struct net_device *dev, if (skb->ip_summed == CHECKSUM_PARTIAL) status |= TP_STATUS_CSUMNOTREADY; else if (skb->pkt_type != PACKET_OUTGOING && - skb_csum_unnecessary(skb)) + (skb->ip_summed == CHECKSUM_COMPLETE || + skb_csum_unnecessary(skb))) status |= TP_STATUS_CSUM_VALID; if (snaplen > res) @@ -2968,8 +2959,8 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) if (err) goto out_free; - if ((sock->type == SOCK_RAW && - !dev_validate_header(dev, skb->data, len)) || !skb->len) { + if (sock->type == SOCK_RAW && + !dev_validate_header(dev, skb->data, len)) { err = -EINVAL; goto out_free; } @@ -2988,11 +2979,6 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) skb->mark = sockc.mark; skb->tstamp = sockc.transmit_time; - if (unlikely(extra_len == 4)) - skb->no_fcs = 1; - - packet_parse_headers(skb, sock); - if (has_vnet_hdr) { err = virtio_net_hdr_to_skb(skb, &vnet_hdr, vio_le()); if (err) @@ -3001,6 +2987,11 @@ static int packet_snd(struct socket *sock, struct msghdr *msg, size_t len) virtio_net_hdr_set_proto(skb, &vnet_hdr); } + packet_parse_headers(skb, sock); + + if (unlikely(extra_len == 4)) + skb->no_fcs = 1; + err = po->xmit(skb); if (unlikely(err != 0)) { if (err > 0) @@ -3458,7 +3449,8 @@ static int packet_recvmsg(struct socket *sock, struct msghdr *msg, size_t len, if (skb->ip_summed == CHECKSUM_PARTIAL) aux.tp_status |= TP_STATUS_CSUMNOTREADY; else if (skb->pkt_type != PACKET_OUTGOING && - skb_csum_unnecessary(skb)) + (skb->ip_summed == CHECKSUM_COMPLETE || + skb_csum_unnecessary(skb))) aux.tp_status |= TP_STATUS_CSUM_VALID; aux.tp_len = origlen;
diff --git a/net/rds/ib_recv.c b/net/rds/ib_recv.c index 6dd3f45..a0f99bb 100644 --- a/net/rds/ib_recv.c +++ b/net/rds/ib_recv.c
@@ -363,7 +363,6 @@ static int acquire_refill(struct rds_connection *conn) static void release_refill(struct rds_connection *conn) { clear_bit(RDS_RECV_REFILL, &conn->c_flags); - smp_mb__after_atomic(); /* We don't use wait_on_bit()/wake_up_bit() because our waking is in a * hot path and finding waiters is very rare. We don't want to walk
diff --git a/net/rds/message.c b/net/rds/message.c index 7504374..92b6b22 100644 --- a/net/rds/message.c +++ b/net/rds/message.c
@@ -104,9 +104,9 @@ static void rds_rm_zerocopy_callback(struct rds_sock *rs, spin_lock_irqsave(&q->lock, flags); head = &q->zcookie_head; if (!list_empty(head)) { - info = list_first_entry(head, struct rds_msg_zcopy_info, - rs_zcookie_next); - if (rds_zcookie_add(info, cookie)) { + info = list_entry(head, struct rds_msg_zcopy_info, + rs_zcookie_next); + if (info && rds_zcookie_add(info, cookie)) { spin_unlock_irqrestore(&q->lock, flags); kfree(rds_info_from_znotifier(znotif)); /* caller invokes rds_wake_sk_sleep() */ @@ -118,7 +118,7 @@ static void rds_rm_zerocopy_callback(struct rds_sock *rs, ck = &info->zcookies; memset(ck, 0, sizeof(*ck)); WARN_ON(!rds_zcookie_add(info, cookie)); - list_add_tail(&info->rs_zcookie_next, &q->zcookie_head); + list_add_tail(&q->zcookie_head, &info->rs_zcookie_next); spin_unlock_irqrestore(&q->lock, flags); /* caller invokes rds_wake_sk_sleep() */
diff --git a/net/rds/tcp.c b/net/rds/tcp.c index bfb8d4d..d55d81b 100644 --- a/net/rds/tcp.c +++ b/net/rds/tcp.c
@@ -176,10 +176,10 @@ void rds_tcp_reset_callbacks(struct socket *sock, */ atomic_set(&cp->cp_state, RDS_CONN_RESETTING); wait_event(cp->cp_waitq, !test_bit(RDS_IN_XMIT, &cp->cp_flags)); + lock_sock(osock->sk); /* reset receive side state for rds_tcp_data_recv() for osock */ cancel_delayed_work_sync(&cp->cp_send_w); cancel_delayed_work_sync(&cp->cp_recv_w); - lock_sock(osock->sk); if (tc->t_tinc) { rds_inc_put(&tc->t_tinc->ti_inc); tc->t_tinc = NULL;
diff --git a/net/rose/af_rose.c b/net/rose/af_rose.c index 6fb1581..6a0df7c 100644 --- a/net/rose/af_rose.c +++ b/net/rose/af_rose.c
@@ -169,7 +169,6 @@ static void rose_kill_by_device(struct net_device *dev) rose_disconnect(s, ENETUNREACH, ROSE_OUT_OF_ORDER, 0); if (rose->neighbour) rose->neighbour->use--; - dev_put(rose->device); rose->device = NULL; } } @@ -465,12 +464,6 @@ static int rose_listen(struct socket *sock, int backlog) { struct sock *sk = sock->sk; - lock_sock(sk); - if (sock->state != SS_UNCONNECTED) { - release_sock(sk); - return -EINVAL; - } - if (sk->sk_state != TCP_LISTEN) { struct rose_sock *rose = rose_sk(sk); @@ -480,10 +473,8 @@ static int rose_listen(struct socket *sock, int backlog) memset(rose->dest_digis, 0, AX25_ADDR_LEN * ROSE_MAX_DIGIS); sk->sk_max_ack_backlog = backlog; sk->sk_state = TCP_LISTEN; - release_sock(sk); return 0; } - release_sock(sk); return -EOPNOTSUPP; } @@ -578,8 +569,6 @@ static struct sock *rose_make_new(struct sock *osk) rose->idle = orose->idle; rose->defer = orose->defer; rose->device = orose->device; - if (rose->device) - dev_hold(rose->device); rose->qbitincl = orose->qbitincl; return sk; @@ -633,7 +622,6 @@ static int rose_release(struct socket *sock) break; } - dev_put(rose->device); sock->sk = NULL; release_sock(sk); sock_put(sk); @@ -710,6 +698,7 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le struct rose_sock *rose = rose_sk(sk); struct sockaddr_rose *addr = (struct sockaddr_rose *)uaddr; unsigned char cause, diagnostic; + struct net_device *dev; ax25_uid_assoc *user; int n, err = 0; @@ -766,12 +755,9 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le } if (sock_flag(sk, SOCK_ZAPPED)) { /* Must bind first - autobinding in this may or may not work */ - struct net_device *dev; - sock_reset_flag(sk, SOCK_ZAPPED); - dev = rose_dev_first(); - if (!dev) { + if ((dev = rose_dev_first()) == NULL) { err = -ENETUNREACH; goto out_release; } @@ -779,7 +765,6 @@ static int rose_connect(struct socket *sock, struct sockaddr *uaddr, int addr_le user = ax25_findbyuid(current_euid()); if (!user) { err = -EINVAL; - dev_put(dev); goto out_release; }
diff --git a/net/rose/rose_link.c b/net/rose/rose_link.c index 730d220..f6102e6 100644 --- a/net/rose/rose_link.c +++ b/net/rose/rose_link.c
@@ -236,9 +236,6 @@ void rose_transmit_clear_request(struct rose_neigh *neigh, unsigned int lci, uns unsigned char *dptr; int len; - if (!neigh->dev) - return; - len = AX25_BPQ_HEADER_LEN + AX25_MAX_HEADER_LEN + ROSE_MIN_LEN + 3; if ((skb = alloc_skb(len, GFP_ATOMIC)) == NULL)
diff --git a/net/rose/rose_loopback.c b/net/rose/rose_loopback.c index 036d92c..11c45c8 100644 --- a/net/rose/rose_loopback.c +++ b/net/rose/rose_loopback.c
@@ -96,8 +96,7 @@ static void rose_loopback_timer(struct timer_list *unused) } if (frametype == ROSE_CALL_REQUEST) { - if (!rose_loopback_neigh->dev && - !rose_loopback_neigh->loopback) { + if (!rose_loopback_neigh->dev) { kfree_skb(skb); continue; }
diff --git a/net/rose/rose_route.c b/net/rose/rose_route.c index 64d441d..5f32113 100644 --- a/net/rose/rose_route.c +++ b/net/rose/rose_route.c
@@ -613,8 +613,6 @@ struct net_device *rose_dev_first(void) if (first == NULL || strncmp(dev->name, first->name, 3) < 0) first = dev; } - if (first) - dev_hold(first); rcu_read_unlock(); return first;
diff --git a/net/rxrpc/call_event.c b/net/rxrpc/call_event.c index b5f1739..8574e70 100644 --- a/net/rxrpc/call_event.c +++ b/net/rxrpc/call_event.c
@@ -166,7 +166,7 @@ static void rxrpc_resend(struct rxrpc_call *call, unsigned long now_j) _enter("{%d,%d}", call->tx_hard_ack, call->tx_top); now = ktime_get_real(); - max_age = ktime_sub_us(now, jiffies_to_usecs(call->peer->rto_j)); + max_age = ktime_sub(now, jiffies_to_usecs(call->peer->rto_j)); spin_lock_bh(&call->lock);
diff --git a/net/rxrpc/local_object.c b/net/rxrpc/local_object.c index fc784fc..01135e5 100644 --- a/net/rxrpc/local_object.c +++ b/net/rxrpc/local_object.c
@@ -448,9 +448,6 @@ static void rxrpc_local_processor(struct work_struct *work) container_of(work, struct rxrpc_local, processor); bool again; - if (local->dead) - return; - trace_rxrpc_local(local->debug_id, rxrpc_local_processing, atomic_read(&local->usage), NULL);
diff --git a/net/rxrpc/output.c b/net/rxrpc/output.c index 09fcc54..6202d2e 100644 --- a/net/rxrpc/output.c +++ b/net/rxrpc/output.c
@@ -93,7 +93,7 @@ static size_t rxrpc_fill_out_ack(struct rxrpc_connection *conn, *_hard_ack = hard_ack; *_top = top; - pkt->ack.bufferSpace = htons(0); + pkt->ack.bufferSpace = htons(8); pkt->ack.maxSkew = htons(0); pkt->ack.firstPacket = htonl(hard_ack + 1); pkt->ack.previousPacket = htonl(call->ackr_highest_seq);
diff --git a/net/rxrpc/rxkad.c b/net/rxrpc/rxkad.c index 2ba6197..52a24d4 100644 --- a/net/rxrpc/rxkad.c +++ b/net/rxrpc/rxkad.c
@@ -451,7 +451,7 @@ static int rxkad_verify_packet_2(struct rxrpc_call *call, struct sk_buff *skb, * directly into the target buffer. */ sg = _sg; - nsg = skb_shinfo(skb)->nr_frags + 1; + nsg = skb_shinfo(skb)->nr_frags; if (nsg <= 4) { nsg = 4; } else {
diff --git a/net/rxrpc/sendmsg.c b/net/rxrpc/sendmsg.c index 1cb90d3..22f0200 100644 --- a/net/rxrpc/sendmsg.c +++ b/net/rxrpc/sendmsg.c
@@ -718,7 +718,7 @@ int rxrpc_do_sendmsg(struct rxrpc_sock *rx, struct msghdr *msg, size_t len) if (call->tx_total_len != -1 || call->tx_pending || call->tx_top != 0) - goto out_put_unlock; + goto error_put; call->tx_total_len = p.call.tx_total_len; } }
diff --git a/net/sched/Kconfig b/net/sched/Kconfig index 2e4604c..2985509 100644 --- a/net/sched/Kconfig +++ b/net/sched/Kconfig
@@ -469,6 +469,17 @@ To compile this code as a module, choose M here: the module will be called cls_basic. +config NET_CLS_TCINDEX + tristate "Traffic-Control Index (TCINDEX)" + select NET_CLS + ---help--- + Say Y here if you want to be able to classify packets based on + traffic control indices. You will want this feature if you want + to implement Differentiated Services together with DSMARK. + + To compile this code as a module, choose M here: the + module will be called cls_tcindex. + config NET_CLS_ROUTE4 tristate "Routing decision (ROUTE)" depends on INET
diff --git a/net/sched/Makefile b/net/sched/Makefile index 9e1f904..415d1e1 100644 --- a/net/sched/Makefile +++ b/net/sched/Makefile
@@ -66,6 +66,7 @@ obj-$(CONFIG_NET_CLS_ROUTE4) += cls_route.o obj-$(CONFIG_NET_CLS_FW) += cls_fw.o obj-$(CONFIG_NET_CLS_RSVP) += cls_rsvp.o +obj-$(CONFIG_NET_CLS_TCINDEX) += cls_tcindex.o obj-$(CONFIG_NET_CLS_RSVP6) += cls_rsvp6.o obj-$(CONFIG_NET_CLS_BASIC) += cls_basic.o obj-$(CONFIG_NET_CLS_FLOW) += cls_flow.o
diff --git a/net/sched/act_mpls.c b/net/sched/act_mpls.c index 1979153..0fccae3 100644 --- a/net/sched/act_mpls.c +++ b/net/sched/act_mpls.c
@@ -116,11 +116,6 @@ static int valid_label(const struct nlattr *attr, { const u32 *label = nla_data(attr); - if (nla_len(attr) != sizeof(*label)) { - NL_SET_ERR_MSG_MOD(extack, "Invalid MPLS label length"); - return -EINVAL; - } - if (*label & ~MPLS_LABEL_MASK || *label == MPLS_LABEL_IMPLNULL) { NL_SET_ERR_MSG_MOD(extack, "MPLS label out of range"); return -EINVAL; @@ -133,8 +128,7 @@ static const struct nla_policy mpls_policy[TCA_MPLS_MAX + 1] = { [TCA_MPLS_UNSPEC] = { .strict_start_type = TCA_MPLS_UNSPEC + 1 }, [TCA_MPLS_PARMS] = NLA_POLICY_EXACT_LEN(sizeof(struct tc_mpls)), [TCA_MPLS_PROTO] = { .type = NLA_U16 }, - [TCA_MPLS_LABEL] = NLA_POLICY_VALIDATE_FN(NLA_BINARY, - valid_label), + [TCA_MPLS_LABEL] = NLA_POLICY_VALIDATE_FN(NLA_U32, valid_label), [TCA_MPLS_TC] = NLA_POLICY_RANGE(NLA_U8, 0, 7), [TCA_MPLS_TTL] = NLA_POLICY_MIN(NLA_U8, 1), [TCA_MPLS_BOS] = NLA_POLICY_RANGE(NLA_U8, 0, 1),
diff --git a/net/sched/act_sample.c b/net/sched/act_sample.c index 909a685..214f4ef 100644 --- a/net/sched/act_sample.c +++ b/net/sched/act_sample.c
@@ -54,8 +54,8 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, sample_policy, NULL); if (ret < 0) return ret; - - if (!tb[TCA_SAMPLE_PARMS]) + if (!tb[TCA_SAMPLE_PARMS] || !tb[TCA_SAMPLE_RATE] || + !tb[TCA_SAMPLE_PSAMPLE_GROUP]) return -EINVAL; parm = nla_data(tb[TCA_SAMPLE_PARMS]); @@ -79,13 +79,6 @@ static int tcf_sample_init(struct net *net, struct nlattr *nla, tcf_idr_release(*a, bind); return -EEXIST; } - - if (!tb[TCA_SAMPLE_RATE] || !tb[TCA_SAMPLE_PSAMPLE_GROUP]) { - NL_SET_ERR_MSG(extack, "sample rate and group are required"); - err = -EINVAL; - goto release_idr; - } - err = tcf_action_check_ctrlact(parm->action, tp, &goto_ch, extack); if (err < 0) goto release_idr;
diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c index 77a1988..919c7fa 100644 --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c
@@ -1079,7 +1079,7 @@ static int __tcf_qdisc_find(struct net *net, struct Qdisc **q, /* Find qdisc */ if (!*parent) { - *q = rcu_dereference(dev->qdisc); + *q = dev->qdisc; *parent = (*q)->handle; } else { *q = qdisc_lookup_rcu(dev, TC_H_MAJ(*parent)); @@ -2098,7 +2098,6 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, } if (chain->tmplt_ops && chain->tmplt_ops != tp->ops) { - tfilter_put(tp, fh); NL_SET_ERR_MSG(extack, "Chain template is set to a different filter kind"); err = -EINVAL; goto errout; @@ -2552,7 +2551,7 @@ static int tc_dump_tfilter(struct sk_buff *skb, struct netlink_callback *cb) parent = tcm->tcm_parent; if (!parent) - q = rtnl_dereference(dev->qdisc); + q = dev->qdisc; else q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent)); if (!q) @@ -2938,7 +2937,7 @@ static int tc_dump_chain(struct sk_buff *skb, struct netlink_callback *cb) parent = tcm->tcm_parent; if (!parent) { - q = rtnl_dereference(dev->qdisc); + q = dev->qdisc; parent = q->handle; } else { q = qdisc_lookup(dev, TC_H_MAJ(tcm->tcm_parent));
diff --git a/net/sched/cls_flower.c b/net/sched/cls_flower.c index 63f53aa..007fbc1 100644 --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flower.c
@@ -870,9 +870,6 @@ static int fl_set_geneve_opt(const struct nlattr *nla, struct fl_flow_key *key, if (option_len > sizeof(struct geneve_opt)) data_len = option_len - sizeof(struct geneve_opt); - if (key->enc_opts.len > FLOW_DIS_TUN_OPTS_MAX - 4) - return -ERANGE; - opt = (struct geneve_opt *)&key->enc_opts.data[key->enc_opts.len]; memset(opt, 0xff, option_len); opt->length = data_len / 4;
diff --git a/net/sched/cls_route.c b/net/sched/cls_route.c index b775e68..5efa3e7 100644 --- a/net/sched/cls_route.c +++ b/net/sched/cls_route.c
@@ -424,11 +424,6 @@ static int route4_set_parms(struct net *net, struct tcf_proto *tp, return -EINVAL; } - if (!nhandle) { - NL_SET_ERR_MSG(extack, "Replacing with handle of 0 is invalid"); - return -EINVAL; - } - h1 = to_hash(nhandle); b = rtnl_dereference(head->table[h1]); if (!b) { @@ -482,11 +477,6 @@ static int route4_change(struct net *net, struct sk_buff *in_skb, int err; bool new = true; - if (!handle) { - NL_SET_ERR_MSG(extack, "Creating with handle of 0 is invalid"); - return -EINVAL; - } - if (opt == NULL) return handle ? -EINVAL : 0; @@ -536,7 +526,7 @@ static int route4_change(struct net *net, struct sk_buff *in_skb, rcu_assign_pointer(f->next, f1); rcu_assign_pointer(*fp, f); - if (fold) { + if (fold && fold->handle && f->handle != fold->handle) { th = to_hash(fold->handle); h = from_hash(fold->handle >> 16); b = rtnl_dereference(head->table[th]);
diff --git a/net/sched/cls_tcindex.c b/net/sched/cls_tcindex.c new file mode 100644 index 0000000..684187a --- /dev/null +++ b/net/sched/cls_tcindex.c
@@ -0,0 +1,738 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * net/sched/cls_tcindex.c Packet classifier for skb->tc_index + * + * Written 1998,1999 by Werner Almesberger, EPFL ICA + */ + +#include <linux/module.h> +#include <linux/types.h> +#include <linux/kernel.h> +#include <linux/skbuff.h> +#include <linux/errno.h> +#include <linux/slab.h> +#include <linux/refcount.h> +#include <net/act_api.h> +#include <net/netlink.h> +#include <net/pkt_cls.h> +#include <net/sch_generic.h> + +/* + * Passing parameters to the root seems to be done more awkwardly than really + * necessary. At least, u32 doesn't seem to use such dirty hacks. To be + * verified. FIXME. + */ + +#define PERFECT_HASH_THRESHOLD 64 /* use perfect hash if not bigger */ +#define DEFAULT_HASH_SIZE 64 /* optimized for diffserv */ + + +struct tcindex_data; + +struct tcindex_filter_result { + struct tcf_exts exts; + struct tcf_result res; + struct tcindex_data *p; + struct rcu_work rwork; +}; + +struct tcindex_filter { + u16 key; + struct tcindex_filter_result result; + struct tcindex_filter __rcu *next; + struct rcu_work rwork; +}; + + +struct tcindex_data { + struct tcindex_filter_result *perfect; /* perfect hash; NULL if none */ + struct tcindex_filter __rcu **h; /* imperfect hash; */ + struct tcf_proto *tp; + u16 mask; /* AND key with mask */ + u32 shift; /* shift ANDed key to the right */ + u32 hash; /* hash table size; 0 if undefined */ + u32 alloc_hash; /* allocated size */ + u32 fall_through; /* 0: only classify if explicit match */ + refcount_t refcnt; /* a temporary refcnt for perfect hash */ + struct rcu_work rwork; +}; + +static inline int tcindex_filter_is_set(struct tcindex_filter_result *r) +{ + return tcf_exts_has_actions(&r->exts) || r->res.classid; +} + +static void tcindex_data_get(struct tcindex_data *p) +{ + refcount_inc(&p->refcnt); +} + +static void tcindex_data_put(struct tcindex_data *p) +{ + if (refcount_dec_and_test(&p->refcnt)) { + kfree(p->perfect); + kfree(p->h); + kfree(p); + } +} + +static struct tcindex_filter_result *tcindex_lookup(struct tcindex_data *p, + u16 key) +{ + if (p->perfect) { + struct tcindex_filter_result *f = p->perfect + key; + + return tcindex_filter_is_set(f) ? f : NULL; + } else if (p->h) { + struct tcindex_filter __rcu **fp; + struct tcindex_filter *f; + + fp = &p->h[key % p->hash]; + for (f = rcu_dereference_bh_rtnl(*fp); + f; + fp = &f->next, f = rcu_dereference_bh_rtnl(*fp)) + if (f->key == key) + return &f->result; + } + + return NULL; +} + + +static int tcindex_classify(struct sk_buff *skb, const struct tcf_proto *tp, + struct tcf_result *res) +{ + struct tcindex_data *p = rcu_dereference_bh(tp->root); + struct tcindex_filter_result *f; + int key = (skb->tc_index & p->mask) >> p->shift; + + pr_debug("tcindex_classify(skb %p,tp %p,res %p),p %p\n", + skb, tp, res, p); + + f = tcindex_lookup(p, key); + if (!f) { + struct Qdisc *q = tcf_block_q(tp->chain->block); + + if (!p->fall_through) + return -1; + res->classid = TC_H_MAKE(TC_H_MAJ(q->handle), key); + res->class = 0; + pr_debug("alg 0x%x\n", res->classid); + return 0; + } + *res = f->res; + pr_debug("map 0x%x\n", res->classid); + + return tcf_exts_exec(skb, &f->exts, res); +} + + +static void *tcindex_get(struct tcf_proto *tp, u32 handle) +{ + struct tcindex_data *p = rtnl_dereference(tp->root); + struct tcindex_filter_result *r; + + pr_debug("tcindex_get(tp %p,handle 0x%08x)\n", tp, handle); + if (p->perfect && handle >= p->alloc_hash) + return NULL; + r = tcindex_lookup(p, handle); + return r && tcindex_filter_is_set(r) ? r : NULL; +} + +static int tcindex_init(struct tcf_proto *tp) +{ + struct tcindex_data *p; + + pr_debug("tcindex_init(tp %p)\n", tp); + p = kzalloc(sizeof(struct tcindex_data), GFP_KERNEL); + if (!p) + return -ENOMEM; + + p->mask = 0xffff; + p->hash = DEFAULT_HASH_SIZE; + p->fall_through = 1; + refcount_set(&p->refcnt, 1); /* Paired with tcindex_destroy_work() */ + + rcu_assign_pointer(tp->root, p); + return 0; +} + +static void __tcindex_destroy_rexts(struct tcindex_filter_result *r) +{ + tcf_exts_destroy(&r->exts); + tcf_exts_put_net(&r->exts); + tcindex_data_put(r->p); +} + +static void tcindex_destroy_rexts_work(struct work_struct *work) +{ + struct tcindex_filter_result *r; + + r = container_of(to_rcu_work(work), + struct tcindex_filter_result, + rwork); + rtnl_lock(); + __tcindex_destroy_rexts(r); + rtnl_unlock(); +} + +static void __tcindex_destroy_fexts(struct tcindex_filter *f) +{ + tcf_exts_destroy(&f->result.exts); + tcf_exts_put_net(&f->result.exts); + kfree(f); +} + +static void tcindex_destroy_fexts_work(struct work_struct *work) +{ + struct tcindex_filter *f = container_of(to_rcu_work(work), + struct tcindex_filter, + rwork); + + rtnl_lock(); + __tcindex_destroy_fexts(f); + rtnl_unlock(); +} + +static int tcindex_delete(struct tcf_proto *tp, void *arg, bool *last, + bool rtnl_held, struct netlink_ext_ack *extack) +{ + struct tcindex_data *p = rtnl_dereference(tp->root); + struct tcindex_filter_result *r = arg; + struct tcindex_filter __rcu **walk; + struct tcindex_filter *f = NULL; + + pr_debug("tcindex_delete(tp %p,arg %p),p %p\n", tp, arg, p); + if (p->perfect) { + if (!r->res.class) + return -ENOENT; + } else { + int i; + + for (i = 0; i < p->hash; i++) { + walk = p->h + i; + for (f = rtnl_dereference(*walk); f; + walk = &f->next, f = rtnl_dereference(*walk)) { + if (&f->result == r) + goto found; + } + } + return -ENOENT; + +found: + rcu_assign_pointer(*walk, rtnl_dereference(f->next)); + } + tcf_unbind_filter(tp, &r->res); + /* all classifiers are required to call tcf_exts_destroy() after rcu + * grace period, since converted-to-rcu actions are relying on that + * in cleanup() callback + */ + if (f) { + if (tcf_exts_get_net(&f->result.exts)) + tcf_queue_work(&f->rwork, tcindex_destroy_fexts_work); + else + __tcindex_destroy_fexts(f); + } else { + tcindex_data_get(p); + + if (tcf_exts_get_net(&r->exts)) + tcf_queue_work(&r->rwork, tcindex_destroy_rexts_work); + else + __tcindex_destroy_rexts(r); + } + + *last = false; + return 0; +} + +static void tcindex_destroy_work(struct work_struct *work) +{ + struct tcindex_data *p = container_of(to_rcu_work(work), + struct tcindex_data, + rwork); + + tcindex_data_put(p); +} + +static inline int +valid_perfect_hash(struct tcindex_data *p) +{ + return p->hash > (p->mask >> p->shift); +} + +static const struct nla_policy tcindex_policy[TCA_TCINDEX_MAX + 1] = { + [TCA_TCINDEX_HASH] = { .type = NLA_U32 }, + [TCA_TCINDEX_MASK] = { .type = NLA_U16 }, + [TCA_TCINDEX_SHIFT] = { .type = NLA_U32 }, + [TCA_TCINDEX_FALL_THROUGH] = { .type = NLA_U32 }, + [TCA_TCINDEX_CLASSID] = { .type = NLA_U32 }, +}; + +static int tcindex_filter_result_init(struct tcindex_filter_result *r, + struct tcindex_data *p, + struct net *net) +{ + memset(r, 0, sizeof(*r)); + r->p = p; + return tcf_exts_init(&r->exts, net, TCA_TCINDEX_ACT, + TCA_TCINDEX_POLICE); +} + +static void tcindex_free_perfect_hash(struct tcindex_data *cp); + +static void tcindex_partial_destroy_work(struct work_struct *work) +{ + struct tcindex_data *p = container_of(to_rcu_work(work), + struct tcindex_data, + rwork); + + rtnl_lock(); + if (p->perfect) + tcindex_free_perfect_hash(p); + kfree(p); + rtnl_unlock(); +} + +static void tcindex_free_perfect_hash(struct tcindex_data *cp) +{ + int i; + + for (i = 0; i < cp->hash; i++) + tcf_exts_destroy(&cp->perfect[i].exts); + kfree(cp->perfect); +} + +static int tcindex_alloc_perfect_hash(struct net *net, struct tcindex_data *cp) +{ + int i, err = 0; + + cp->perfect = kcalloc(cp->hash, sizeof(struct tcindex_filter_result), + GFP_KERNEL | __GFP_NOWARN); + if (!cp->perfect) + return -ENOMEM; + + for (i = 0; i < cp->hash; i++) { + err = tcf_exts_init(&cp->perfect[i].exts, net, + TCA_TCINDEX_ACT, TCA_TCINDEX_POLICE); + if (err < 0) + goto errout; + cp->perfect[i].p = cp; + } + + return 0; + +errout: + tcindex_free_perfect_hash(cp); + return err; +} + +static int +tcindex_set_parms(struct net *net, struct tcf_proto *tp, unsigned long base, + u32 handle, struct tcindex_data *p, + struct tcindex_filter_result *r, struct nlattr **tb, + struct nlattr *est, bool ovr, struct netlink_ext_ack *extack) +{ + struct tcindex_filter_result new_filter_result, *old_r = r; + struct tcindex_data *cp = NULL, *oldp; + struct tcindex_filter *f = NULL; /* make gcc behave */ + struct tcf_result cr = {}; + int err, balloc = 0; + struct tcf_exts e; + + err = tcf_exts_init(&e, net, TCA_TCINDEX_ACT, TCA_TCINDEX_POLICE); + if (err < 0) + return err; + err = tcf_exts_validate(net, tp, tb, est, &e, ovr, true, extack); + if (err < 0) + goto errout; + + err = -ENOMEM; + /* tcindex_data attributes must look atomic to classifier/lookup so + * allocate new tcindex data and RCU assign it onto root. Keeping + * perfect hash and hash pointers from old data. + */ + cp = kzalloc(sizeof(*cp), GFP_KERNEL); + if (!cp) + goto errout; + + cp->mask = p->mask; + cp->shift = p->shift; + cp->hash = p->hash; + cp->alloc_hash = p->alloc_hash; + cp->fall_through = p->fall_through; + cp->tp = tp; + refcount_set(&cp->refcnt, 1); /* Paired with tcindex_destroy_work() */ + + if (tb[TCA_TCINDEX_HASH]) + cp->hash = nla_get_u32(tb[TCA_TCINDEX_HASH]); + + if (tb[TCA_TCINDEX_MASK]) + cp->mask = nla_get_u16(tb[TCA_TCINDEX_MASK]); + + if (tb[TCA_TCINDEX_SHIFT]) { + cp->shift = nla_get_u32(tb[TCA_TCINDEX_SHIFT]); + if (cp->shift > 16) { + err = -EINVAL; + goto errout; + } + } + if (!cp->hash) { + /* Hash not specified, use perfect hash if the upper limit + * of the hashing index is below the threshold. + */ + if ((cp->mask >> cp->shift) < PERFECT_HASH_THRESHOLD) + cp->hash = (cp->mask >> cp->shift) + 1; + else + cp->hash = DEFAULT_HASH_SIZE; + } + + if (p->perfect) { + int i; + + if (tcindex_alloc_perfect_hash(net, cp) < 0) + goto errout; + cp->alloc_hash = cp->hash; + for (i = 0; i < min(cp->hash, p->hash); i++) + cp->perfect[i].res = p->perfect[i].res; + balloc = 1; + } + cp->h = p->h; + + err = tcindex_filter_result_init(&new_filter_result, cp, net); + if (err < 0) + goto errout_alloc; + if (old_r) + cr = r->res; + + err = -EBUSY; + + /* Hash already allocated, make sure that we still meet the + * requirements for the allocated hash. + */ + if (cp->perfect) { + if (!valid_perfect_hash(cp) || + cp->hash > cp->alloc_hash) + goto errout_alloc; + } else if (cp->h && cp->hash != cp->alloc_hash) { + goto errout_alloc; + } + + err = -EINVAL; + if (tb[TCA_TCINDEX_FALL_THROUGH]) + cp->fall_through = nla_get_u32(tb[TCA_TCINDEX_FALL_THROUGH]); + + if (!cp->perfect && !cp->h) + cp->alloc_hash = cp->hash; + + /* Note: this could be as restrictive as if (handle & ~(mask >> shift)) + * but then, we'd fail handles that may become valid after some future + * mask change. While this is extremely unlikely to ever matter, + * the check below is safer (and also more backwards-compatible). + */ + if (cp->perfect || valid_perfect_hash(cp)) + if (handle >= cp->alloc_hash) + goto errout_alloc; + + + err = -ENOMEM; + if (!cp->perfect && !cp->h) { + if (valid_perfect_hash(cp)) { + if (tcindex_alloc_perfect_hash(net, cp) < 0) + goto errout_alloc; + balloc = 1; + } else { + struct tcindex_filter __rcu **hash; + + hash = kcalloc(cp->hash, + sizeof(struct tcindex_filter *), + GFP_KERNEL); + + if (!hash) + goto errout_alloc; + + cp->h = hash; + balloc = 2; + } + } + + if (cp->perfect) + r = cp->perfect + handle; + else + r = tcindex_lookup(cp, handle) ? : &new_filter_result; + + if (r == &new_filter_result) { + f = kzalloc(sizeof(*f), GFP_KERNEL); + if (!f) + goto errout_alloc; + f->key = handle; + f->next = NULL; + err = tcindex_filter_result_init(&f->result, cp, net); + if (err < 0) { + kfree(f); + goto errout_alloc; + } + } + + if (tb[TCA_TCINDEX_CLASSID]) { + cr.classid = nla_get_u32(tb[TCA_TCINDEX_CLASSID]); + tcf_bind_filter(tp, &cr, base); + } + + if (old_r && old_r != r) { + err = tcindex_filter_result_init(old_r, cp, net); + if (err < 0) { + kfree(f); + goto errout_alloc; + } + } + + oldp = p; + r->res = cr; + tcf_exts_change(&r->exts, &e); + + rcu_assign_pointer(tp->root, cp); + + if (r == &new_filter_result) { + struct tcindex_filter *nfp; + struct tcindex_filter __rcu **fp; + + f->result.res = r->res; + tcf_exts_change(&f->result.exts, &r->exts); + + fp = cp->h + (handle % cp->hash); + for (nfp = rtnl_dereference(*fp); + nfp; + fp = &nfp->next, nfp = rtnl_dereference(*fp)) + ; /* nothing */ + + rcu_assign_pointer(*fp, f); + } else { + tcf_exts_destroy(&new_filter_result.exts); + } + + if (oldp) + tcf_queue_work(&oldp->rwork, tcindex_partial_destroy_work); + return 0; + +errout_alloc: + if (balloc == 1) + tcindex_free_perfect_hash(cp); + else if (balloc == 2) + kfree(cp->h); + tcf_exts_destroy(&new_filter_result.exts); +errout: + kfree(cp); + tcf_exts_destroy(&e); + return err; +} + +static int +tcindex_change(struct net *net, struct sk_buff *in_skb, + struct tcf_proto *tp, unsigned long base, u32 handle, + struct nlattr **tca, void **arg, bool ovr, + bool rtnl_held, struct netlink_ext_ack *extack) +{ + struct nlattr *opt = tca[TCA_OPTIONS]; + struct nlattr *tb[TCA_TCINDEX_MAX + 1]; + struct tcindex_data *p = rtnl_dereference(tp->root); + struct tcindex_filter_result *r = *arg; + int err; + + pr_debug("tcindex_change(tp %p,handle 0x%08x,tca %p,arg %p),opt %p," + "p %p,r %p,*arg %p\n", + tp, handle, tca, arg, opt, p, r, arg ? *arg : NULL); + + if (!opt) + return 0; + + err = nla_parse_nested_deprecated(tb, TCA_TCINDEX_MAX, opt, + tcindex_policy, NULL); + if (err < 0) + return err; + + return tcindex_set_parms(net, tp, base, handle, p, r, tb, + tca[TCA_RATE], ovr, extack); +} + +static void tcindex_walk(struct tcf_proto *tp, struct tcf_walker *walker, + bool rtnl_held) +{ + struct tcindex_data *p = rtnl_dereference(tp->root); + struct tcindex_filter *f, *next; + int i; + + pr_debug("tcindex_walk(tp %p,walker %p),p %p\n", tp, walker, p); + if (p->perfect) { + for (i = 0; i < p->hash; i++) { + if (!p->perfect[i].res.class) + continue; + if (walker->count >= walker->skip) { + if (walker->fn(tp, p->perfect + i, walker) < 0) { + walker->stop = 1; + return; + } + } + walker->count++; + } + } + if (!p->h) + return; + for (i = 0; i < p->hash; i++) { + for (f = rtnl_dereference(p->h[i]); f; f = next) { + next = rtnl_dereference(f->next); + if (walker->count >= walker->skip) { + if (walker->fn(tp, &f->result, walker) < 0) { + walker->stop = 1; + return; + } + } + walker->count++; + } + } +} + +static void tcindex_destroy(struct tcf_proto *tp, bool rtnl_held, + struct netlink_ext_ack *extack) +{ + struct tcindex_data *p = rtnl_dereference(tp->root); + int i; + + pr_debug("tcindex_destroy(tp %p),p %p\n", tp, p); + + if (p->perfect) { + for (i = 0; i < p->hash; i++) { + struct tcindex_filter_result *r = p->perfect + i; + + /* tcf_queue_work() does not guarantee the ordering we + * want, so we have to take this refcnt temporarily to + * ensure 'p' is freed after all tcindex_filter_result + * here. Imperfect hash does not need this, because it + * uses linked lists rather than an array. + */ + tcindex_data_get(p); + + tcf_unbind_filter(tp, &r->res); + if (tcf_exts_get_net(&r->exts)) + tcf_queue_work(&r->rwork, + tcindex_destroy_rexts_work); + else + __tcindex_destroy_rexts(r); + } + } + + for (i = 0; p->h && i < p->hash; i++) { + struct tcindex_filter *f, *next; + bool last; + + for (f = rtnl_dereference(p->h[i]); f; f = next) { + next = rtnl_dereference(f->next); + tcindex_delete(tp, &f->result, &last, rtnl_held, NULL); + } + } + + tcf_queue_work(&p->rwork, tcindex_destroy_work); +} + + +static int tcindex_dump(struct net *net, struct tcf_proto *tp, void *fh, + struct sk_buff *skb, struct tcmsg *t, bool rtnl_held) +{ + struct tcindex_data *p = rtnl_dereference(tp->root); + struct tcindex_filter_result *r = fh; + struct nlattr *nest; + + pr_debug("tcindex_dump(tp %p,fh %p,skb %p,t %p),p %p,r %p\n", + tp, fh, skb, t, p, r); + pr_debug("p->perfect %p p->h %p\n", p->perfect, p->h); + + nest = nla_nest_start_noflag(skb, TCA_OPTIONS); + if (nest == NULL) + goto nla_put_failure; + + if (!fh) { + t->tcm_handle = ~0; /* whatever ... */ + if (nla_put_u32(skb, TCA_TCINDEX_HASH, p->hash) || + nla_put_u16(skb, TCA_TCINDEX_MASK, p->mask) || + nla_put_u32(skb, TCA_TCINDEX_SHIFT, p->shift) || + nla_put_u32(skb, TCA_TCINDEX_FALL_THROUGH, p->fall_through)) + goto nla_put_failure; + nla_nest_end(skb, nest); + } else { + if (p->perfect) { + t->tcm_handle = r - p->perfect; + } else { + struct tcindex_filter *f; + struct tcindex_filter __rcu **fp; + int i; + + t->tcm_handle = 0; + for (i = 0; !t->tcm_handle && i < p->hash; i++) { + fp = &p->h[i]; + for (f = rtnl_dereference(*fp); + !t->tcm_handle && f; + fp = &f->next, f = rtnl_dereference(*fp)) { + if (&f->result == r) + t->tcm_handle = f->key; + } + } + } + pr_debug("handle = %d\n", t->tcm_handle); + if (r->res.class && + nla_put_u32(skb, TCA_TCINDEX_CLASSID, r->res.classid)) + goto nla_put_failure; + + if (tcf_exts_dump(skb, &r->exts) < 0) + goto nla_put_failure; + nla_nest_end(skb, nest); + + if (tcf_exts_dump_stats(skb, &r->exts) < 0) + goto nla_put_failure; + } + + return skb->len; + +nla_put_failure: + nla_nest_cancel(skb, nest); + return -1; +} + +static void tcindex_bind_class(void *fh, u32 classid, unsigned long cl, + void *q, unsigned long base) +{ + struct tcindex_filter_result *r = fh; + + if (r && r->res.classid == classid) { + if (cl) + __tcf_bind_filter(q, &r->res, base); + else + __tcf_unbind_filter(q, &r->res); + } +} + +static struct tcf_proto_ops cls_tcindex_ops __read_mostly = { + .kind = "tcindex", + .classify = tcindex_classify, + .init = tcindex_init, + .destroy = tcindex_destroy, + .get = tcindex_get, + .change = tcindex_change, + .delete = tcindex_delete, + .walk = tcindex_walk, + .dump = tcindex_dump, + .bind_class = tcindex_bind_class, + .owner = THIS_MODULE, +}; + +static int __init init_tcindex(void) +{ + return register_tcf_proto_ops(&cls_tcindex_ops); +} + +static void __exit exit_tcindex(void) +{ + unregister_tcf_proto_ops(&cls_tcindex_ops); +} + +module_init(init_tcindex) +module_exit(exit_tcindex) +MODULE_LICENSE("GPL");
diff --git a/net/sched/cls_u32.c b/net/sched/cls_u32.c index e5cc2b4..ed8d26e 100644 --- a/net/sched/cls_u32.c +++ b/net/sched/cls_u32.c
@@ -716,18 +716,12 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp, struct nlattr *est, bool ovr, struct netlink_ext_ack *extack) { - int err, ifindex = -1; + int err; err = tcf_exts_validate(net, tp, tb, est, &n->exts, ovr, true, extack); if (err < 0) return err; - if (tb[TCA_U32_INDEV]) { - ifindex = tcf_change_indev(net, tb[TCA_U32_INDEV], extack); - if (ifindex < 0) - return -EINVAL; - } - if (tb[TCA_U32_LINK]) { u32 handle = nla_get_u32(tb[TCA_U32_LINK]); struct tc_u_hnode *ht_down = NULL, *ht_old; @@ -762,9 +756,13 @@ static int u32_set_parms(struct net *net, struct tcf_proto *tp, tcf_bind_filter(tp, &n->res, base); } - if (ifindex >= 0) - n->ifindex = ifindex; - + if (tb[TCA_U32_INDEV]) { + int ret; + ret = tcf_change_indev(net, tb[TCA_U32_INDEV], extack); + if (ret < 0) + return -EINVAL; + n->ifindex = ret; + } return 0; }
diff --git a/net/sched/ematch.c b/net/sched/ematch.c index 43bfb33..dd3b8c1 100644 --- a/net/sched/ematch.c +++ b/net/sched/ematch.c
@@ -255,8 +255,6 @@ static int tcf_em_validate(struct tcf_proto *tp, * the value carried. */ if (em_hdr->flags & TCF_EM_SIMPLE) { - if (em->ops->datalen > 0) - goto errout; if (data_len < sizeof(u32)) goto errout; em->data = *(u32 *) data;
diff --git a/net/sched/sch_api.c b/net/sched/sch_api.c index 67d6bc9..6f36df8 100644 --- a/net/sched/sch_api.c +++ b/net/sched/sch_api.c
@@ -298,7 +298,7 @@ struct Qdisc *qdisc_lookup(struct net_device *dev, u32 handle) if (!handle) return NULL; - q = qdisc_match_from_root(rtnl_dereference(dev->qdisc), handle); + q = qdisc_match_from_root(dev->qdisc, handle); if (q) goto out; @@ -317,7 +317,7 @@ struct Qdisc *qdisc_lookup_rcu(struct net_device *dev, u32 handle) if (!handle) return NULL; - q = qdisc_match_from_root(rcu_dereference(dev->qdisc), handle); + q = qdisc_match_from_root(dev->qdisc, handle); if (q) goto out; @@ -1071,12 +1071,11 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, skip: if (!ingress) { - old = rtnl_dereference(dev->qdisc); + notify_and_destroy(net, skb, n, classid, + dev->qdisc, new); if (new && !new->ops->attach) qdisc_refcount_inc(new); - rcu_assign_pointer(dev->qdisc, new ? : &noop_qdisc); - - notify_and_destroy(net, skb, n, classid, old, new); + dev->qdisc = new ? : &noop_qdisc; if (new && new->ops->attach) new->ops->attach(new); @@ -1105,11 +1104,6 @@ static int qdisc_graft(struct net_device *dev, struct Qdisc *parent, return -ENOENT; } - if (new && new->ops == &noqueue_qdisc_ops) { - NL_SET_ERR_MSG(extack, "Cannot assign noqueue to a class"); - return -EINVAL; - } - err = cops->graft(parent, cl, new, &old, extack); if (err) return err; @@ -1456,7 +1450,7 @@ static int tc_get_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q = dev_ingress_queue(dev)->qdisc_sleeping; } } else { - q = rtnl_dereference(dev->qdisc); + q = dev->qdisc; } if (!q) { NL_SET_ERR_MSG(extack, "Cannot find specified qdisc on specified device"); @@ -1545,7 +1539,7 @@ static int tc_modify_qdisc(struct sk_buff *skb, struct nlmsghdr *n, q = dev_ingress_queue(dev)->qdisc_sleeping; } } else { - q = rtnl_dereference(dev->qdisc); + q = dev->qdisc; } /* It may be default qdisc, ignore it */ @@ -1767,8 +1761,7 @@ static int tc_dump_qdisc(struct sk_buff *skb, struct netlink_callback *cb) s_q_idx = 0; q_idx = 0; - if (tc_dump_qdisc_root(rtnl_dereference(dev->qdisc), - skb, cb, &q_idx, s_q_idx, + if (tc_dump_qdisc_root(dev->qdisc, skb, cb, &q_idx, s_q_idx, true, tca[TCA_DUMP_INVISIBLE]) < 0) goto done; @@ -2044,7 +2037,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, } else if (qid1) { qid = qid1; } else if (qid == 0) - qid = rtnl_dereference(dev->qdisc)->handle; + qid = dev->qdisc->handle; /* Now qid is genuine qdisc handle consistent * both with parent and child. @@ -2055,7 +2048,7 @@ static int tc_ctl_tclass(struct sk_buff *skb, struct nlmsghdr *n, portid = TC_H_MAKE(qid, portid); } else { if (qid == 0) - qid = rtnl_dereference(dev->qdisc)->handle; + qid = dev->qdisc->handle; } /* OK. Locate qdisc */ @@ -2216,8 +2209,7 @@ static int tc_dump_tclass(struct sk_buff *skb, struct netlink_callback *cb) s_t = cb->args[0]; t = 0; - if (tc_dump_tclass_root(rtnl_dereference(dev->qdisc), - skb, tcm, cb, &t, s_t, true) < 0) + if (tc_dump_tclass_root(dev->qdisc, skb, tcm, cb, &t, s_t, true) < 0) goto done; dev_queue = dev_ingress_queue(dev);
diff --git a/net/sched/sch_atm.c b/net/sched/sch_atm.c index 34dd043..6385995 100644 --- a/net/sched/sch_atm.c +++ b/net/sched/sch_atm.c
@@ -396,13 +396,10 @@ static int atm_tc_enqueue(struct sk_buff *skb, struct Qdisc *sch, result = tcf_classify(skb, fl, &res, true); if (result < 0) continue; - if (result == TC_ACT_SHOT) - goto done; - flow = (struct atm_flow_data *)res.class; if (!flow) flow = lookup_flow(sch, res.classid); - goto drop; + goto done; } } flow = NULL;
diff --git a/net/sched/sch_cake.c b/net/sched/sch_cake.c index 9e5e7fd..0eb4d4a 100644 --- a/net/sched/sch_cake.c +++ b/net/sched/sch_cake.c
@@ -2190,12 +2190,8 @@ static struct sk_buff *cake_dequeue(struct Qdisc *sch) static void cake_reset(struct Qdisc *sch) { - struct cake_sched_data *q = qdisc_priv(sch); u32 c; - if (!q->tins) - return; - for (c = 0; c < CAKE_MAX_TINS; c++) cake_clear_tin(sch, c); }
diff --git a/net/sched/sch_cbq.c b/net/sched/sch_cbq.c index 12893da..e597288 100644 --- a/net/sched/sch_cbq.c +++ b/net/sched/sch_cbq.c
@@ -231,8 +231,6 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) result = tcf_classify(skb, fl, &res, true); if (!fl || result < 0) goto fallback; - if (result == TC_ACT_SHOT) - return NULL; cl = (void *)res.class; if (!cl) { @@ -253,7 +251,8 @@ cbq_classify(struct sk_buff *skb, struct Qdisc *sch, int *qerr) case TC_ACT_TRAP: *qerr = NET_XMIT_SUCCESS | __NET_XMIT_STOLEN; /* fall through */ - fallthrough; + case TC_ACT_SHOT: + return NULL; case TC_ACT_RECLASSIFY: return cbq_reclassify(skb, cl); }
diff --git a/net/sched/sch_generic.c b/net/sched/sch_generic.c index c91ca42..f0796cb 100644 --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c
@@ -403,7 +403,7 @@ static inline bool qdisc_restart(struct Qdisc *q, int *packets) void __qdisc_run(struct Qdisc *q) { - int quota = READ_ONCE(dev_tx_weight); + int quota = dev_tx_weight; int packets; while (qdisc_restart(q, &packets)) { @@ -1106,21 +1106,18 @@ static void attach_default_qdiscs(struct net_device *dev) if (!netif_is_multiqueue(dev) || dev->priv_flags & IFF_NO_QUEUE) { netdev_for_each_tx_queue(dev, attach_one_default_qdisc, NULL); - qdisc = txq->qdisc_sleeping; - rcu_assign_pointer(dev->qdisc, qdisc); - qdisc_refcount_inc(qdisc); + dev->qdisc = txq->qdisc_sleeping; + qdisc_refcount_inc(dev->qdisc); } else { qdisc = qdisc_create_dflt(txq, &mq_qdisc_ops, TC_H_ROOT, NULL); if (qdisc) { - rcu_assign_pointer(dev->qdisc, qdisc); + dev->qdisc = qdisc; qdisc->ops->attach(qdisc); } } - qdisc = rtnl_dereference(dev->qdisc); - #ifdef CONFIG_NET_SCHED - if (qdisc != &noop_qdisc) - qdisc_hash_add(qdisc, false); + if (dev->qdisc != &noop_qdisc) + qdisc_hash_add(dev->qdisc, false); #endif } @@ -1150,7 +1147,7 @@ void dev_activate(struct net_device *dev) * and noqueue_qdisc for virtual interfaces */ - if (rtnl_dereference(dev->qdisc) == &noop_qdisc) + if (dev->qdisc == &noop_qdisc) attach_default_qdiscs(dev); if (!netif_carrier_ok(dev)) @@ -1350,7 +1347,7 @@ static void dev_init_scheduler_queue(struct net_device *dev, void dev_init_scheduler(struct net_device *dev) { - rcu_assign_pointer(dev->qdisc, &noop_qdisc); + dev->qdisc = &noop_qdisc; netdev_for_each_tx_queue(dev, dev_init_scheduler_queue, &noop_qdisc); if (dev_ingress_queue(dev)) dev_init_scheduler_queue(dev, dev_ingress_queue(dev), &noop_qdisc); @@ -1378,8 +1375,8 @@ void dev_shutdown(struct net_device *dev) netdev_for_each_tx_queue(dev, shutdown_scheduler_queue, &noop_qdisc); if (dev_ingress_queue(dev)) shutdown_scheduler_queue(dev, dev_ingress_queue(dev), &noop_qdisc); - qdisc_put(rtnl_dereference(dev->qdisc)); - rcu_assign_pointer(dev->qdisc, &noop_qdisc); + qdisc_put(dev->qdisc); + dev->qdisc = &noop_qdisc; WARN_ON(timer_pending(&dev->watchdog_timer)); }
diff --git a/net/sched/sch_htb.c b/net/sched/sch_htb.c index 27cb82b..8184c87 100644 --- a/net/sched/sch_htb.c +++ b/net/sched/sch_htb.c
@@ -405,10 +405,7 @@ static void htb_activate_prios(struct htb_sched *q, struct htb_class *cl) while (cl->cmode == HTB_MAY_BORROW && p && mask) { m = mask; while (m) { - unsigned int prio = ffz(~m); - - if (WARN_ON_ONCE(prio >= ARRAY_SIZE(p->inner.clprio))) - break; + int prio = ffz(~m); m &= ~(1 << prio); if (p->inner.clprio[prio].feed.rb_node)
diff --git a/net/sched/sch_qfq.c b/net/sched/sch_qfq.c index 603bd30..1eb339d 100644 --- a/net/sched/sch_qfq.c +++ b/net/sched/sch_qfq.c
@@ -421,16 +421,15 @@ static int qfq_change_class(struct Qdisc *sch, u32 classid, u32 parentid, } else weight = 1; - if (tb[TCA_QFQ_LMAX]) + if (tb[TCA_QFQ_LMAX]) { lmax = nla_get_u32(tb[TCA_QFQ_LMAX]); - else + if (lmax < QFQ_MIN_LMAX || lmax > (1UL << QFQ_MTU_SHIFT)) { + pr_notice("qfq: invalid max length %u\n", lmax); + return -EINVAL; + } + } else lmax = psched_mtu(qdisc_dev(sch)); - if (lmax < QFQ_MIN_LMAX || lmax > (1UL << QFQ_MTU_SHIFT)) { - pr_notice("qfq: invalid max length %u\n", lmax); - return -EINVAL; - } - inv_w = ONE_FP / weight; weight = ONE_FP / inv_w;
diff --git a/net/sched/sch_red.c b/net/sched/sch_red.c index 476853f..7741f10 100644 --- a/net/sched/sch_red.c +++ b/net/sched/sch_red.c
@@ -59,7 +59,6 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch, { struct red_sched_data *q = qdisc_priv(sch); struct Qdisc *child = q->qdisc; - unsigned int len; int ret; q->vars.qavg = red_calc_qavg(&q->parms, @@ -95,10 +94,9 @@ static int red_enqueue(struct sk_buff *skb, struct Qdisc *sch, break; } - len = qdisc_pkt_len(skb); ret = qdisc_enqueue(skb, child, to_free); if (likely(ret == NET_XMIT_SUCCESS)) { - sch->qstats.backlog += len; + qdisc_qstats_backlog_inc(sch, skb); sch->q.qlen++; } else if (net_xmit_drop_count(ret)) { q->stats.pdrop++;
diff --git a/net/sched/sch_sfb.c b/net/sched/sch_sfb.c index 3aa6b4d..4074c50 100644 --- a/net/sched/sch_sfb.c +++ b/net/sched/sch_sfb.c
@@ -135,15 +135,15 @@ static void increment_one_qlen(u32 sfbhash, u32 slot, struct sfb_sched_data *q) } } -static void increment_qlen(const struct sfb_skb_cb *cb, struct sfb_sched_data *q) +static void increment_qlen(const struct sk_buff *skb, struct sfb_sched_data *q) { u32 sfbhash; - sfbhash = cb->hashes[0]; + sfbhash = sfb_hash(skb, 0); if (sfbhash) increment_one_qlen(sfbhash, 0, q); - sfbhash = cb->hashes[1]; + sfbhash = sfb_hash(skb, 1); if (sfbhash) increment_one_qlen(sfbhash, 1, q); } @@ -281,10 +281,8 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch, { struct sfb_sched_data *q = qdisc_priv(sch); - unsigned int len = qdisc_pkt_len(skb); struct Qdisc *child = q->qdisc; struct tcf_proto *fl; - struct sfb_skb_cb cb; int i; u32 p_min = ~0; u32 minqlen = ~0; @@ -401,12 +399,11 @@ static int sfb_enqueue(struct sk_buff *skb, struct Qdisc *sch, } enqueue: - memcpy(&cb, sfb_skb_cb(skb), sizeof(cb)); ret = qdisc_enqueue(skb, child, to_free); if (likely(ret == NET_XMIT_SUCCESS)) { - sch->qstats.backlog += len; + qdisc_qstats_backlog_inc(sch, skb); sch->q.qlen++; - increment_qlen(&cb, q); + increment_qlen(skb, q); } else if (net_xmit_drop_count(ret)) { q->stats.childdrop++; qdisc_qstats_drop(sch);
diff --git a/net/sched/sch_taprio.c b/net/sched/sch_taprio.c index e4c4d23..4c26f7f 100644 --- a/net/sched/sch_taprio.c +++ b/net/sched/sch_taprio.c
@@ -65,7 +65,6 @@ struct taprio_sched { u32 flags; enum tk_offsets tk_offset; int clockid; - bool offloaded; atomic64_t picos_per_byte; /* Using picoseconds because for 10Gbps+ * speeds it's sub-nanoseconds per byte */ @@ -1269,8 +1268,6 @@ static int taprio_enable_offload(struct net_device *dev, goto done; } - q->offloaded = true; - done: taprio_offload_free(offload); @@ -1285,9 +1282,12 @@ static int taprio_disable_offload(struct net_device *dev, struct tc_taprio_qopt_offload *offload; int err; - if (!q->offloaded) + if (!FULL_OFFLOAD_IS_ENABLED(q->flags)) return 0; + if (!ops->ndo_setup_tc) + return -EOPNOTSUPP; + offload = taprio_offload_alloc(0); if (!offload) { NL_SET_ERR_MSG(extack, @@ -1303,8 +1303,6 @@ static int taprio_disable_offload(struct net_device *dev, goto out; } - q->offloaded = false; - out: taprio_offload_free(offload); @@ -1622,7 +1620,6 @@ static void taprio_reset(struct Qdisc *sch) int i; hrtimer_cancel(&q->advance_timer); - if (q->qdiscs) { for (i = 0; i < dev->num_tx_queues && q->qdiscs[i]; i++) qdisc_reset(q->qdiscs[i]); @@ -1645,7 +1642,6 @@ static void taprio_destroy(struct Qdisc *sch) * happens in qdisc_create(), after taprio_init() has been called. */ hrtimer_cancel(&q->advance_timer); - qdisc_synchronize(sch); taprio_disable_offload(dev, q, NULL);
diff --git a/net/sched/sch_tbf.c b/net/sched/sch_tbf.c index a7f60bb..5f72f3f 100644 --- a/net/sched/sch_tbf.c +++ b/net/sched/sch_tbf.c
@@ -297,7 +297,6 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt, struct nlattr *tb[TCA_TBF_MAX + 1]; struct tc_tbf_qopt *qopt; struct Qdisc *child = NULL; - struct Qdisc *old = NULL; struct psched_ratecfg rate; struct psched_ratecfg peak; u64 max_size; @@ -389,7 +388,7 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt, sch_tree_lock(sch); if (child) { qdisc_tree_flush_backlog(q->qdisc); - old = q->qdisc; + qdisc_put(q->qdisc); q->qdisc = child; } q->limit = qopt->limit; @@ -409,7 +408,6 @@ static int tbf_change(struct Qdisc *sch, struct nlattr *opt, memcpy(&q->peak, &peak, sizeof(struct psched_ratecfg)); sch_tree_unlock(sch); - qdisc_put(old); err = 0; done: return err;
diff --git a/net/sctp/auth.c b/net/sctp/auth.c index 6b97b73..3b2d0bd 100644 --- a/net/sctp/auth.c +++ b/net/sctp/auth.c
@@ -869,17 +869,12 @@ int sctp_auth_set_key(struct sctp_endpoint *ep, } list_del_init(&shkey->key_list); + sctp_auth_shkey_release(shkey); list_add(&cur_key->key_list, sh_keys); - if (asoc && asoc->active_key_id == auth_key->sca_keynumber && - sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL)) { - list_del_init(&cur_key->key_list); - sctp_auth_shkey_release(cur_key); - list_add(&shkey->key_list, sh_keys); - return -ENOMEM; - } + if (asoc && asoc->active_key_id == auth_key->sca_keynumber) + sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL); - sctp_auth_shkey_release(shkey); return 0; } @@ -913,13 +908,8 @@ int sctp_auth_set_active_key(struct sctp_endpoint *ep, return -EINVAL; if (asoc) { - __u16 active_key_id = asoc->active_key_id; - asoc->active_key_id = key_id; - if (sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL)) { - asoc->active_key_id = active_key_id; - return -ENOMEM; - } + sctp_auth_asoc_init_active_key(asoc, GFP_KERNEL); } else ep->active_key_id = key_id;
diff --git a/net/sctp/bind_addr.c b/net/sctp/bind_addr.c index 614bc08..a825e74 100644 --- a/net/sctp/bind_addr.c +++ b/net/sctp/bind_addr.c
@@ -73,12 +73,6 @@ int sctp_bind_addr_copy(struct net *net, struct sctp_bind_addr *dest, } } - /* If somehow no addresses were found that can be used with this - * scope, it's an error. - */ - if (list_empty(&dest->address_list)) - error = -ENETUNREACH; - out: if (error) sctp_bind_addr_clean(dest);
diff --git a/net/sctp/diag.c b/net/sctp/diag.c index 2d0318a..5a918e7 100644 --- a/net/sctp/diag.c +++ b/net/sctp/diag.c
@@ -349,9 +349,11 @@ static int sctp_sock_filter(struct sctp_endpoint *ep, struct sctp_transport *tsp struct sctp_comm_param *commp = p; struct sock *sk = ep->base.sk; const struct inet_diag_req_v2 *r = commp->r; + struct sctp_association *assoc = + list_entry(ep->asocs.next, struct sctp_association, asocs); /* find the ep only once through the transports by this condition */ - if (!list_is_first(&tsp->asoc->asocs, &ep->asocs)) + if (tsp->asoc != assoc) return 0; if (r->sdiag_family != AF_UNSPEC && sk->sk_family != r->sdiag_family)
diff --git a/net/sctp/socket.c b/net/sctp/socket.c index cc691b9..3342409 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c
@@ -1855,10 +1855,6 @@ static int sctp_sendmsg_to_asoc(struct sctp_association *asoc, err = sctp_wait_for_sndbuf(asoc, &timeo, msg_len); if (err) goto err; - if (unlikely(sinfo->sinfo_stream >= asoc->stream.outcnt)) { - err = -EINVAL; - goto err; - } } if (sctp_state(asoc, CLOSED)) { @@ -5172,17 +5168,13 @@ static void sctp_destroy_sock(struct sock *sk) } /* Triggered when there are no references on the socket anymore */ -static void sctp_destruct_common(struct sock *sk) +static void sctp_destruct_sock(struct sock *sk) { struct sctp_sock *sp = sctp_sk(sk); /* Free up the HMAC transform. */ crypto_free_shash(sp->hmac); -} -static void sctp_destruct_sock(struct sock *sk) -{ - sctp_destruct_common(sk); inet_sock_destruct(sk); } @@ -9317,7 +9309,7 @@ void sctp_copy_sock(struct sock *newsk, struct sock *sk, sctp_sk(newsk)->reuse = sp->reuse; newsk->sk_shutdown = sk->sk_shutdown; - newsk->sk_destruct = sk->sk_destruct; + newsk->sk_destruct = sctp_destruct_sock; newsk->sk_family = sk->sk_family; newsk->sk_protocol = IPPROTO_SCTP; newsk->sk_backlog_rcv = sk->sk_prot->backlog_rcv; @@ -9548,20 +9540,11 @@ struct proto sctp_prot = { #if IS_ENABLED(CONFIG_IPV6) -static void sctp_v6_destruct_sock(struct sock *sk) +#include <net/transp_v6.h> +static void sctp_v6_destroy_sock(struct sock *sk) { - sctp_destruct_common(sk); - inet6_sock_destruct(sk); -} - -static int sctp_v6_init_sock(struct sock *sk) -{ - int ret = sctp_init_sock(sk); - - if (!ret) - sk->sk_destruct = sctp_v6_destruct_sock; - - return ret; + sctp_destroy_sock(sk); + inet6_destroy_sock(sk); } struct proto sctpv6_prot = { @@ -9571,8 +9554,8 @@ struct proto sctpv6_prot = { .disconnect = sctp_disconnect, .accept = sctp_accept, .ioctl = sctp_ioctl, - .init = sctp_v6_init_sock, - .destroy = sctp_destroy_sock, + .init = sctp_init_sock, + .destroy = sctp_v6_destroy_sock, .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt,
diff --git a/net/sctp/stream.c b/net/sctp/stream.c index ca8fdc9..5676274 100644 --- a/net/sctp/stream.c +++ b/net/sctp/stream.c
@@ -52,19 +52,6 @@ static void sctp_stream_shrink_out(struct sctp_stream *stream, __u16 outcnt) } } -static void sctp_stream_free_ext(struct sctp_stream *stream, __u16 sid) -{ - struct sctp_sched_ops *sched; - - if (!SCTP_SO(stream, sid)->ext) - return; - - sched = sctp_sched_ops_from_stream(stream); - sched->free_sid(stream, sid); - kfree(SCTP_SO(stream, sid)->ext); - SCTP_SO(stream, sid)->ext = NULL; -} - /* Migrates chunks from stream queues to new stream queues if needed, * but not across associations. Also, removes those chunks to streams * higher than the new max. @@ -83,14 +70,16 @@ static void sctp_stream_outq_migrate(struct sctp_stream *stream, * sctp_stream_update will swap ->out pointers. */ for (i = 0; i < outcnt; i++) { - sctp_stream_free_ext(new, i); + kfree(SCTP_SO(new, i)->ext); SCTP_SO(new, i)->ext = SCTP_SO(stream, i)->ext; SCTP_SO(stream, i)->ext = NULL; } } - for (i = outcnt; i < stream->outcnt; i++) - sctp_stream_free_ext(stream, i); + for (i = outcnt; i < stream->outcnt; i++) { + kfree(SCTP_SO(stream, i)->ext); + SCTP_SO(stream, i)->ext = NULL; + } } static int sctp_stream_alloc_out(struct sctp_stream *stream, __u16 outcnt, @@ -185,9 +174,9 @@ void sctp_stream_free(struct sctp_stream *stream) struct sctp_sched_ops *sched = sctp_sched_ops_from_stream(stream); int i; - sched->unsched_all(stream); + sched->free(stream); for (i = 0; i < stream->outcnt; i++) - sctp_stream_free_ext(stream, i); + kfree(SCTP_SO(stream, i)->ext); genradix_free(&stream->out); genradix_free(&stream->in); }
diff --git a/net/sctp/stream_interleave.c b/net/sctp/stream_interleave.c index c982f99..40c40be 100644 --- a/net/sctp/stream_interleave.c +++ b/net/sctp/stream_interleave.c
@@ -1165,8 +1165,7 @@ static void sctp_generate_iftsn(struct sctp_outq *q, __u32 ctsn) #define _sctp_walk_ifwdtsn(pos, chunk, end) \ for (pos = chunk->subh.ifwdtsn_hdr->skip; \ - (void *)pos <= (void *)chunk->subh.ifwdtsn_hdr->skip + (end) - \ - sizeof(struct sctp_ifwdtsn_skip); pos++) + (void *)pos < (void *)chunk->subh.ifwdtsn_hdr->skip + (end); pos++) #define sctp_walk_ifwdtsn(pos, ch) \ _sctp_walk_ifwdtsn((pos), (ch), ntohs((ch)->chunk_hdr->length) - \
diff --git a/net/sctp/stream_sched.c b/net/sctp/stream_sched.c index 33c2630..a2e1d34 100644 --- a/net/sctp/stream_sched.c +++ b/net/sctp/stream_sched.c
@@ -46,10 +46,6 @@ static int sctp_sched_fcfs_init_sid(struct sctp_stream *stream, __u16 sid, return 0; } -static void sctp_sched_fcfs_free_sid(struct sctp_stream *stream, __u16 sid) -{ -} - static void sctp_sched_fcfs_free(struct sctp_stream *stream) { } @@ -100,7 +96,6 @@ static struct sctp_sched_ops sctp_sched_fcfs = { .get = sctp_sched_fcfs_get, .init = sctp_sched_fcfs_init, .init_sid = sctp_sched_fcfs_init_sid, - .free_sid = sctp_sched_fcfs_free_sid, .free = sctp_sched_fcfs_free, .enqueue = sctp_sched_fcfs_enqueue, .dequeue = sctp_sched_fcfs_dequeue,
diff --git a/net/sctp/stream_sched_prio.c b/net/sctp/stream_sched_prio.c index 7dd9f8b..80b5a2c 100644 --- a/net/sctp/stream_sched_prio.c +++ b/net/sctp/stream_sched_prio.c
@@ -25,18 +25,6 @@ static void sctp_sched_prio_unsched_all(struct sctp_stream *stream); -static struct sctp_stream_priorities *sctp_sched_prio_head_get(struct sctp_stream_priorities *p) -{ - p->users++; - return p; -} - -static void sctp_sched_prio_head_put(struct sctp_stream_priorities *p) -{ - if (p && --p->users == 0) - kfree(p); -} - static struct sctp_stream_priorities *sctp_sched_prio_new_head( struct sctp_stream *stream, int prio, gfp_t gfp) { @@ -50,7 +38,6 @@ static struct sctp_stream_priorities *sctp_sched_prio_new_head( INIT_LIST_HEAD(&p->active); p->next = NULL; p->prio = prio; - p->users = 1; return p; } @@ -66,7 +53,7 @@ static struct sctp_stream_priorities *sctp_sched_prio_get_head( */ list_for_each_entry(p, &stream->prio_list, prio_sched) { if (p->prio == prio) - return sctp_sched_prio_head_get(p); + return p; if (p->prio > prio) break; } @@ -83,7 +70,7 @@ static struct sctp_stream_priorities *sctp_sched_prio_get_head( */ break; if (p->prio == prio) - return sctp_sched_prio_head_get(p); + return p; } /* If not even there, allocate a new one. */ @@ -167,21 +154,32 @@ static int sctp_sched_prio_set(struct sctp_stream *stream, __u16 sid, struct sctp_stream_out_ext *soute = sout->ext; struct sctp_stream_priorities *prio_head, *old; bool reschedule = false; - - old = soute->prio_head; - if (old && old->prio == prio) - return 0; + int i; prio_head = sctp_sched_prio_get_head(stream, prio, gfp); if (!prio_head) return -ENOMEM; reschedule = sctp_sched_prio_unsched(soute); + old = soute->prio_head; soute->prio_head = prio_head; if (reschedule) sctp_sched_prio_sched(stream, soute); - sctp_sched_prio_head_put(old); + if (!old) + /* Happens when we set the priority for the first time */ + return 0; + + for (i = 0; i < stream->outcnt; i++) { + soute = SCTP_SO(stream, i)->ext; + if (soute && soute->prio_head == old) + /* It's still in use, nothing else to do here. */ + return 0; + } + + /* No hits, we are good to free it. */ + kfree(old); + return 0; } @@ -206,12 +204,6 @@ static int sctp_sched_prio_init_sid(struct sctp_stream *stream, __u16 sid, return sctp_sched_prio_set(stream, sid, 0, gfp); } -static void sctp_sched_prio_free_sid(struct sctp_stream *stream, __u16 sid) -{ - sctp_sched_prio_head_put(SCTP_SO(stream, sid)->ext->prio_head); - SCTP_SO(stream, sid)->ext->prio_head = NULL; -} - static void sctp_sched_prio_free(struct sctp_stream *stream) { struct sctp_stream_priorities *prio, *n; @@ -331,7 +323,6 @@ static struct sctp_sched_ops sctp_sched_prio = { .get = sctp_sched_prio_get, .init = sctp_sched_prio_init, .init_sid = sctp_sched_prio_init_sid, - .free_sid = sctp_sched_prio_free_sid, .free = sctp_sched_prio_free, .enqueue = sctp_sched_prio_enqueue, .dequeue = sctp_sched_prio_dequeue,
diff --git a/net/sctp/stream_sched_rr.c b/net/sctp/stream_sched_rr.c index cc444fe..ff425ae 100644 --- a/net/sctp/stream_sched_rr.c +++ b/net/sctp/stream_sched_rr.c
@@ -90,10 +90,6 @@ static int sctp_sched_rr_init_sid(struct sctp_stream *stream, __u16 sid, return 0; } -static void sctp_sched_rr_free_sid(struct sctp_stream *stream, __u16 sid) -{ -} - static void sctp_sched_rr_free(struct sctp_stream *stream) { sctp_sched_rr_unsched_all(stream); @@ -181,7 +177,6 @@ static struct sctp_sched_ops sctp_sched_rr = { .get = sctp_sched_rr_get, .init = sctp_sched_rr_init, .init_sid = sctp_sched_rr_init_sid, - .free_sid = sctp_sched_rr_free_sid, .free = sctp_sched_rr_free, .enqueue = sctp_sched_rr_enqueue, .dequeue = sctp_sched_rr_dequeue,
diff --git a/net/smc/af_smc.c b/net/smc/af_smc.c index b398d72..3944916 100644 --- a/net/smc/af_smc.c +++ b/net/smc/af_smc.c
@@ -1093,6 +1093,7 @@ static void smc_listen_out_connected(struct smc_sock *new_smc) { struct sock *newsmcsk = &new_smc->sk; + sk_refcnt_debug_inc(newsmcsk); if (newsmcsk->sk_state == SMC_INIT) newsmcsk->sk_state = SMC_ACTIVE; @@ -1542,14 +1543,16 @@ static int smc_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) { struct sock *sk = sock->sk; struct smc_sock *smc; - int rc; + int rc = -EPIPE; smc = smc_sk(sk); lock_sock(sk); + if ((sk->sk_state != SMC_ACTIVE) && + (sk->sk_state != SMC_APPCLOSEWAIT1) && + (sk->sk_state != SMC_INIT)) + goto out; - /* SMC does not support connect with fastopen */ if (msg->msg_flags & MSG_FASTOPEN) { - /* not connected yet, fallback */ if (sk->sk_state == SMC_INIT && !smc->connect_nonblock) { smc_switch_to_fallback(smc); smc->fallback_rsn = SMC_CLC_DECL_OPTUNSUPP; @@ -1557,11 +1560,6 @@ static int smc_sendmsg(struct socket *sock, struct msghdr *msg, size_t len) rc = -EINVAL; goto out; } - } else if ((sk->sk_state != SMC_ACTIVE) && - (sk->sk_state != SMC_APPCLOSEWAIT1) && - (sk->sk_state != SMC_INIT)) { - rc = -EPIPE; - goto out; } if (smc->use_fallback)
diff --git a/net/socket.c b/net/socket.c index cdc3d94..ca3d422 100644 --- a/net/socket.c +++ b/net/socket.c
@@ -1662,7 +1662,7 @@ int __sys_listen(int fd, int backlog) sock = sockfd_lookup_light(fd, &err, &fput_needed); if (sock) { - somaxconn = READ_ONCE(sock_net(sock->sk)->core.sysctl_somaxconn); + somaxconn = sock_net(sock->sk)->core.sysctl_somaxconn; if ((unsigned int)backlog > somaxconn) backlog = somaxconn;
diff --git a/net/sunrpc/auth.c b/net/sunrpc/auth.c index e8fa21a..cdb05b4 100644 --- a/net/sunrpc/auth.c +++ b/net/sunrpc/auth.c
@@ -494,7 +494,7 @@ rpcauth_prune_expired(struct list_head *free, int nr_to_scan) * Enforce a 60 second garbage collection moratorium * Note that the cred_unused list must be time-ordered. */ - if (time_in_range(cred->cr_expire, expired, jiffies)) + if (!time_in_range(cred->cr_expire, expired, jiffies)) continue; if (!rpcauth_unhash_cred(cred)) continue;
diff --git a/net/sunrpc/auth_gss/auth_gss.c b/net/sunrpc/auth_gss/auth_gss.c index 4d3cf14..b7a7157 100644 --- a/net/sunrpc/auth_gss/auth_gss.c +++ b/net/sunrpc/auth_gss/auth_gss.c
@@ -301,7 +301,7 @@ __gss_find_upcall(struct rpc_pipe *pipe, kuid_t uid, const struct gss_auth *auth list_for_each_entry(pos, &pipe->in_downcall, list) { if (!uid_eq(pos->uid, uid)) continue; - if (pos->auth->service != auth->service) + if (auth && pos->auth->service != auth->service) continue; refcount_inc(&pos->count); return pos; @@ -683,21 +683,6 @@ gss_create_upcall(struct gss_auth *gss_auth, struct gss_cred *gss_cred) return err; } -static struct gss_upcall_msg * -gss_find_downcall(struct rpc_pipe *pipe, kuid_t uid) -{ - struct gss_upcall_msg *pos; - list_for_each_entry(pos, &pipe->in_downcall, list) { - if (!uid_eq(pos->uid, uid)) - continue; - if (!rpc_msg_is_inflight(&pos->msg)) - continue; - refcount_inc(&pos->count); - return pos; - } - return NULL; -} - #define MSG_BUF_MAXSIZE 1024 static ssize_t @@ -744,7 +729,7 @@ gss_pipe_downcall(struct file *filp, const char __user *src, size_t mlen) err = -ENOENT; /* Find a matching upcall */ spin_lock(&pipe->lock); - gss_msg = gss_find_downcall(pipe, uid); + gss_msg = __gss_find_upcall(pipe, uid, NULL); if (gss_msg == NULL) { spin_unlock(&pipe->lock); goto err_put_ctx;
diff --git a/net/sunrpc/auth_gss/svcauth_gss.c b/net/sunrpc/auth_gss/svcauth_gss.c index 1a869a2..c001647 100644 --- a/net/sunrpc/auth_gss/svcauth_gss.c +++ b/net/sunrpc/auth_gss/svcauth_gss.c
@@ -1104,23 +1104,18 @@ static int gss_read_proxy_verf(struct svc_rqst *rqstp, return res; inlen = svc_getnl(argv); - if (inlen > (argv->iov_len + rqstp->rq_arg.page_len)) { - kfree(in_handle->data); + if (inlen > (argv->iov_len + rqstp->rq_arg.page_len)) return SVC_DENIED; - } pages = DIV_ROUND_UP(inlen, PAGE_SIZE); in_token->pages = kcalloc(pages, sizeof(struct page *), GFP_KERNEL); - if (!in_token->pages) { - kfree(in_handle->data); + if (!in_token->pages) return SVC_DENIED; - } in_token->page_base = 0; in_token->page_len = inlen; for (i = 0; i < pages; i++) { in_token->pages[i] = alloc_page(GFP_KERNEL); if (!in_token->pages[i]) { - kfree(in_handle->data); gss_free_in_token_pages(in_token); return SVC_DENIED; }
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c index 266f3e5..195b40c 100644 --- a/net/sunrpc/backchannel_rqst.c +++ b/net/sunrpc/backchannel_rqst.c
@@ -64,17 +64,6 @@ static void xprt_free_allocation(struct rpc_rqst *req) kfree(req); } -static void xprt_bc_reinit_xdr_buf(struct xdr_buf *buf) -{ - buf->head[0].iov_len = PAGE_SIZE; - buf->tail[0].iov_len = 0; - buf->pages = NULL; - buf->page_len = 0; - buf->flags = 0; - buf->len = 0; - buf->buflen = PAGE_SIZE; -} - static int xprt_alloc_xdr_buf(struct xdr_buf *buf, gfp_t gfp_flags) { struct page *page; @@ -303,9 +292,6 @@ void xprt_free_bc_rqst(struct rpc_rqst *req) */ spin_lock_bh(&xprt->bc_pa_lock); if (xprt_need_to_requeue(xprt)) { - xprt_bc_reinit_xdr_buf(&req->rq_snd_buf); - xprt_bc_reinit_xdr_buf(&req->rq_rcv_buf); - req->rq_rcv_buf.len = PAGE_SIZE; list_add_tail(&req->rq_bc_pa_list, &xprt->bc_pa_list); xprt->bc_alloc_count++; atomic_inc(&xprt->bc_slot_count);
diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c index 012b050..08e1ccc 100644 --- a/net/sunrpc/clnt.c +++ b/net/sunrpc/clnt.c
@@ -1354,7 +1354,7 @@ static int rpc_sockname(struct net *net, struct sockaddr *sap, size_t salen, break; default: err = -EAFNOSUPPORT; - goto out_release; + goto out; } if (err < 0) { dprintk("RPC: can't bind UDP socket (%d)\n", err); @@ -1896,7 +1896,7 @@ call_encode(struct rpc_task *task) break; case -EKEYEXPIRED: if (!task->tk_cred_retry) { - rpc_call_rpcerror(task, task->tk_status); + rpc_exit(task, task->tk_status); } else { task->tk_action = call_refresh; task->tk_cred_retry--;
diff --git a/net/sunrpc/svcauth_unix.c b/net/sunrpc/svcauth_unix.c index 5b47e33..5c04ba7 100644 --- a/net/sunrpc/svcauth_unix.c +++ b/net/sunrpc/svcauth_unix.c
@@ -428,23 +428,14 @@ static int unix_gid_hash(kuid_t uid) return hash_long(from_kuid(&init_user_ns, uid), GID_HASHBITS); } -static void unix_gid_free(struct rcu_head *rcu) -{ - struct unix_gid *ug = container_of(rcu, struct unix_gid, rcu); - struct cache_head *item = &ug->h; - - if (test_bit(CACHE_VALID, &item->flags) && - !test_bit(CACHE_NEGATIVE, &item->flags)) - put_group_info(ug->gi); - kfree(ug); -} - static void unix_gid_put(struct kref *kref) { struct cache_head *item = container_of(kref, struct cache_head, ref); struct unix_gid *ug = container_of(item, struct unix_gid, h); - - call_rcu(&ug->rcu, unix_gid_free); + if (test_bit(CACHE_VALID, &item->flags) && + !test_bit(CACHE_NEGATIVE, &item->flags)) + put_group_info(ug->gi); + kfree_rcu(ug, rcu); } static int unix_gid_match(struct cache_head *corig, struct cache_head *cnew)
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index cfae1a8..0f4d39f 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c
@@ -1034,9 +1034,9 @@ struct rpcrdma_req *rpcrdma_req_create(struct rpcrdma_xprt *r_xprt, size_t size, return req; out4: - rpcrdma_regbuf_free(req->rl_sendbuf); + kfree(req->rl_sendbuf); out3: - rpcrdma_regbuf_free(req->rl_rdmabuf); + kfree(req->rl_rdmabuf); out2: kfree(req); out1:
diff --git a/net/tipc/core.c b/net/tipc/core.c index 58ee5ee..90cf7e0 100644 --- a/net/tipc/core.c +++ b/net/tipc/core.c
@@ -112,15 +112,6 @@ static void __net_exit tipc_exit_net(struct net *net) cond_resched(); } -static void __net_exit tipc_pernet_pre_exit(struct net *net) -{ - tipc_node_pre_cleanup_net(net); -} - -static struct pernet_operations tipc_pernet_pre_exit_ops = { - .pre_exit = tipc_pernet_pre_exit, -}; - static struct pernet_operations tipc_net_ops = { .init = tipc_init_net, .exit = tipc_exit_net, @@ -159,10 +150,6 @@ static int __init tipc_init(void) if (err) goto out_pernet_topsrv; - err = register_pernet_subsys(&tipc_pernet_pre_exit_ops); - if (err) - goto out_register_pernet_subsys; - err = tipc_bearer_setup(); if (err) goto out_bearer; @@ -183,8 +170,6 @@ static int __init tipc_init(void) out_netlink: tipc_bearer_cleanup(); out_bearer: - unregister_pernet_subsys(&tipc_pernet_pre_exit_ops); -out_register_pernet_subsys: unregister_pernet_device(&tipc_topsrv_net_ops); out_pernet_topsrv: tipc_socket_stop(); @@ -202,7 +187,6 @@ static void __exit tipc_exit(void) tipc_netlink_compat_stop(); tipc_netlink_stop(); tipc_bearer_cleanup(); - unregister_pernet_subsys(&tipc_pernet_pre_exit_ops); unregister_pernet_device(&tipc_topsrv_net_ops); tipc_socket_stop(); unregister_pernet_device(&tipc_net_ops);
diff --git a/net/tipc/core.h b/net/tipc/core.h index 59f97ef..c6bda91 100644 --- a/net/tipc/core.h +++ b/net/tipc/core.h
@@ -59,7 +59,6 @@ #include <net/netns/generic.h> #include <linux/rhashtable.h> #include <net/genetlink.h> -#include <net/netns/hash.h> #ifdef pr_fmt #undef pr_fmt @@ -203,11 +202,6 @@ static inline int in_range(u16 val, u16 min, u16 max) return !less(val, min) && !more(val, max); } -static inline u32 tipc_net_hash_mixes(struct net *net, int tn_rand) -{ - return net_hash_mix(&init_net) ^ net_hash_mix(net) ^ tn_rand; -} - #ifdef CONFIG_SYSCTL int tipc_register_sysctl(void); void tipc_unregister_sysctl(void);
diff --git a/net/tipc/discover.c b/net/tipc/discover.c index 9c64567..c138d68 100644 --- a/net/tipc/discover.c +++ b/net/tipc/discover.c
@@ -94,7 +94,6 @@ static void tipc_disc_init_msg(struct net *net, struct sk_buff *skb, msg_set_dest_domain(hdr, dest_domain); msg_set_bc_netid(hdr, tn->net_id); b->media->addr2msg(msg_media_addr(hdr), &b->addr); - msg_set_peer_net_hash(hdr, tipc_net_hash_mixes(net, tn->random)); msg_set_node_id(hdr, tipc_own_id(net)); } @@ -147,8 +146,8 @@ static bool tipc_disc_addr_trial_msg(struct tipc_discoverer *d, { struct net *net = d->net; struct tipc_net *tn = tipc_net(net); + bool trial = time_before(jiffies, tn->addr_trial_end); u32 self = tipc_own_addr(net); - bool trial = time_before(jiffies, tn->addr_trial_end) && !self; if (mtyp == DSC_TRIAL_FAIL_MSG) { if (!trial) @@ -194,7 +193,6 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *skb, { struct tipc_net *tn = tipc_net(net); struct tipc_msg *hdr = buf_msg(skb); - u32 pnet_hash = msg_peer_net_hash(hdr); u16 caps = msg_node_capabilities(hdr); bool legacy = tn->legacy_addr_format; u32 sugg = msg_sugg_node_addr(hdr); @@ -210,10 +208,7 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *skb, u32 self; int err; - if (skb_linearize(skb)) { - kfree_skb(skb); - return; - } + skb_linearize(skb); hdr = buf_msg(skb); if (caps & TIPC_NODE_ID128) @@ -246,7 +241,7 @@ void tipc_disc_rcv(struct net *net, struct sk_buff *skb, return; if (!tipc_in_scope(legacy, b->domain, src)) return; - tipc_node_check_dest(net, src, peer_id, b, caps, signature, pnet_hash, + tipc_node_check_dest(net, src, peer_id, b, caps, signature, &maddr, &respond, &dupl_addr); if (dupl_addr) disc_dupl_alert(b, src, &maddr);
diff --git a/net/tipc/link.c b/net/tipc/link.c index a5675db..cb8ad59 100644 --- a/net/tipc/link.c +++ b/net/tipc/link.c
@@ -1971,9 +1971,7 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb, if (tipc_own_addr(l->net) > msg_prevnode(hdr)) l->net_plane = msg_net_plane(hdr); - if (skb_linearize(skb)) - goto exit; - + skb_linearize(skb); hdr = buf_msg(skb); data = msg_data(hdr);
diff --git a/net/tipc/monitor.c b/net/tipc/monitor.c index 0b9ad3b..e7155a7 100644 --- a/net/tipc/monitor.c +++ b/net/tipc/monitor.c
@@ -130,7 +130,7 @@ static void map_set(u64 *up_map, int i, unsigned int v) static int map_get(u64 up_map, int i) { - return (up_map & (1ULL << i)) >> i; + return (up_map & (1 << i)) >> i; } static struct tipc_peer *peer_prev(struct tipc_peer *peer)
diff --git a/net/tipc/msg.h b/net/tipc/msg.h index 6d69254..0daa6f0 100644 --- a/net/tipc/msg.h +++ b/net/tipc/msg.h
@@ -358,11 +358,6 @@ static inline u32 msg_connected(struct tipc_msg *m) return msg_type(m) == TIPC_CONN_MSG; } -static inline u32 msg_direct(struct tipc_msg *m) -{ - return msg_type(m) == TIPC_DIRECT_MSG; -} - static inline u32 msg_errcode(struct tipc_msg *m) { return msg_bits(m, 1, 25, 0xf); @@ -1031,20 +1026,6 @@ static inline bool msg_is_reset(struct tipc_msg *hdr) return (msg_user(hdr) == LINK_PROTOCOL) && (msg_type(hdr) == RESET_MSG); } -/* Word 13 - */ -static inline void msg_set_peer_net_hash(struct tipc_msg *m, u32 n) -{ - msg_set_word(m, 13, n); -} - -static inline u32 msg_peer_net_hash(struct tipc_msg *m) -{ - return msg_word(m, 13); -} - -/* Word 14 - */ static inline u32 msg_sugg_node_addr(struct tipc_msg *m) { return msg_word(m, 14);
diff --git a/net/tipc/name_distr.c b/net/tipc/name_distr.c index 6ac84e7..661bc25 100644 --- a/net/tipc/name_distr.c +++ b/net/tipc/name_distr.c
@@ -146,7 +146,7 @@ static void named_distribute(struct net *net, struct sk_buff_head *list, struct publication *publ; struct sk_buff *skb = NULL; struct distr_item *item = NULL; - u32 msg_dsz = ((tipc_node_get_mtu(net, dnode, 0, false) - INT_H_SIZE) / + u32 msg_dsz = ((tipc_node_get_mtu(net, dnode, 0) - INT_H_SIZE) / ITEM_SIZE) * ITEM_SIZE; u32 msg_rem = msg_dsz;
diff --git a/net/tipc/netlink_compat.c b/net/tipc/netlink_compat.c index bef28e9..561ea83 100644 --- a/net/tipc/netlink_compat.c +++ b/net/tipc/netlink_compat.c
@@ -857,7 +857,7 @@ static int tipc_nl_compat_name_table_dump_header(struct tipc_nl_compat_msg *msg) }; ntq = (struct tipc_name_table_query *)TLV_DATA(msg->req); - if (TLV_GET_DATA_LEN(msg->req) < (int)sizeof(struct tipc_name_table_query)) + if (TLV_GET_DATA_LEN(msg->req) < sizeof(struct tipc_name_table_query)) return -EINVAL; depth = ntohl(ntq->depth);
diff --git a/net/tipc/node.c b/net/tipc/node.c index 535a4a7..c8f6177 100644 --- a/net/tipc/node.c +++ b/net/tipc/node.c
@@ -126,8 +126,6 @@ struct tipc_node { struct timer_list timer; struct rcu_head rcu; unsigned long delete_at; - struct net *peer_net; - u32 peer_hash_mix; }; /* Node FSM states and events: @@ -186,7 +184,7 @@ static struct tipc_link *node_active_link(struct tipc_node *n, int sel) return n->links[bearer_id].link; } -int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel, bool connected) +int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel) { struct tipc_node *n; int bearer_id; @@ -196,14 +194,6 @@ int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel, bool connected) if (unlikely(!n)) return mtu; - /* Allow MAX_MSG_SIZE when building connection oriented message - * if they are in the same core network - */ - if (n->peer_net && connected) { - tipc_node_put(n); - return mtu; - } - bearer_id = n->active_links[sel & 1]; if (likely(bearer_id != INVALID_BEARER_ID)) mtu = n->links[bearer_id].mtu; @@ -370,37 +360,8 @@ static void tipc_node_write_unlock(struct tipc_node *n) } } -static void tipc_node_assign_peer_net(struct tipc_node *n, u32 hash_mixes) -{ - int net_id = tipc_netid(n->net); - struct tipc_net *tn_peer; - struct net *tmp; - u32 hash_chk; - - if (n->peer_net) - return; - - for_each_net_rcu(tmp) { - tn_peer = tipc_net(tmp); - if (!tn_peer) - continue; - /* Integrity checking whether node exists in namespace or not */ - if (tn_peer->net_id != net_id) - continue; - if (memcmp(n->peer_id, tn_peer->node_id, NODE_ID_LEN)) - continue; - hash_chk = tipc_net_hash_mixes(tmp, tn_peer->random); - if (hash_mixes ^ hash_chk) - continue; - n->peer_net = tmp; - n->peer_hash_mix = hash_mixes; - break; - } -} - static struct tipc_node *tipc_node_create(struct net *net, u32 addr, - u8 *peer_id, u16 capabilities, - u32 signature, u32 hash_mixes) + u8 *peer_id, u16 capabilities) { struct tipc_net *tn = net_generic(net, tipc_net_id); struct tipc_node *n, *temp_node; @@ -411,8 +372,6 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr, spin_lock_bh(&tn->node_list_lock); n = tipc_node_find(net, addr); if (n) { - if (n->peer_hash_mix ^ hash_mixes) - tipc_node_assign_peer_net(n, hash_mixes); if (n->capabilities == capabilities) goto exit; /* Same node may come back with new capabilities */ @@ -430,7 +389,6 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr, list_for_each_entry_rcu(temp_node, &tn->node_list, list) { tn->capabilities &= temp_node->capabilities; } - goto exit; } n = kzalloc(sizeof(*n), GFP_ATOMIC); @@ -441,10 +399,6 @@ static struct tipc_node *tipc_node_create(struct net *net, u32 addr, n->addr = addr; memcpy(&n->peer_id, peer_id, 16); n->net = net; - n->peer_net = NULL; - n->peer_hash_mix = 0; - /* Assign kernel local namespace if exists */ - tipc_node_assign_peer_net(n, hash_mixes); n->capabilities = capabilities; kref_init(&n->kref); rwlock_init(&n->lock); @@ -1025,7 +979,7 @@ u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr) void tipc_node_check_dest(struct net *net, u32 addr, u8 *peer_id, struct tipc_bearer *b, - u16 capabilities, u32 signature, u32 hash_mixes, + u16 capabilities, u32 signature, struct tipc_media_addr *maddr, bool *respond, bool *dupl_addr) { @@ -1035,9 +989,8 @@ void tipc_node_check_dest(struct net *net, u32 addr, bool addr_match = false; bool sign_match = false; bool link_up = false; - bool link_is_reset = false; bool accept_addr = false; - bool reset = false; + bool reset = true; char *if_name; unsigned long intv; u16 session; @@ -1045,8 +998,7 @@ void tipc_node_check_dest(struct net *net, u32 addr, *dupl_addr = false; *respond = false; - n = tipc_node_create(net, addr, peer_id, capabilities, signature, - hash_mixes); + n = tipc_node_create(net, addr, peer_id, capabilities); if (!n) return; @@ -1057,17 +1009,14 @@ void tipc_node_check_dest(struct net *net, u32 addr, /* Prepare to validate requesting node's signature and media address */ l = le->link; link_up = l && tipc_link_is_up(l); - link_is_reset = l && tipc_link_is_reset(l); addr_match = l && !memcmp(&le->maddr, maddr, sizeof(*maddr)); sign_match = (signature == n->signature); /* These three flags give us eight permutations: */ if (sign_match && addr_match && link_up) { - /* All is fine. Ignore requests. */ - /* Peer node is not a container/local namespace */ - if (!n->peer_hash_mix) - n->peer_hash_mix = hash_mixes; + /* All is fine. Do nothing. */ + reset = false; } else if (sign_match && addr_match && !link_up) { /* Respond. The link will come up in due time */ *respond = true; @@ -1089,7 +1038,6 @@ void tipc_node_check_dest(struct net *net, u32 addr, */ accept_addr = true; *respond = true; - reset = true; } else if (!sign_match && addr_match && link_up) { /* Peer node rebooted. Two possibilities: * - Delayed re-discovery; this link endpoint has already @@ -1121,7 +1069,6 @@ void tipc_node_check_dest(struct net *net, u32 addr, n->signature = signature; accept_addr = true; *respond = true; - reset = true; } if (!accept_addr) @@ -1150,7 +1097,6 @@ void tipc_node_check_dest(struct net *net, u32 addr, tipc_link_fsm_evt(l, LINK_RESET_EVT); if (n->state == NODE_FAILINGOVER) tipc_link_fsm_evt(l, LINK_FAILOVER_BEGIN_EVT); - link_is_reset = tipc_link_is_reset(l); le->link = l; n->link_cnt++; tipc_node_calculate_timer(n, l); @@ -1163,7 +1109,7 @@ void tipc_node_check_dest(struct net *net, u32 addr, memcpy(&le->maddr, maddr, sizeof(*maddr)); exit: tipc_node_write_unlock(n); - if (reset && !link_is_reset) + if (reset && l && !tipc_link_is_reset(l)) tipc_node_link_down(n, b->identity, false); tipc_node_put(n); } @@ -1396,8 +1342,7 @@ static void node_lost_contact(struct tipc_node *n, /* Notify publications from this node */ n->action_flags |= TIPC_NOTIFY_NODE_DOWN; - n->peer_net = NULL; - n->peer_hash_mix = 0; + /* Notify sockets connected to node */ list_for_each_entry_safe(conn, safe, conns, list) { skb = tipc_msg_create(TIPC_CRITICAL_IMPORTANCE, TIPC_CONN_MSG, @@ -1479,57 +1424,6 @@ static int __tipc_nl_add_node(struct tipc_nl_msg *msg, struct tipc_node *node) return -EMSGSIZE; } -static void tipc_lxc_xmit(struct net *peer_net, struct sk_buff_head *list) -{ - struct tipc_msg *hdr = buf_msg(skb_peek(list)); - struct sk_buff_head inputq; - - switch (msg_user(hdr)) { - case TIPC_LOW_IMPORTANCE: - case TIPC_MEDIUM_IMPORTANCE: - case TIPC_HIGH_IMPORTANCE: - case TIPC_CRITICAL_IMPORTANCE: - if (msg_connected(hdr) || msg_named(hdr) || - msg_direct(hdr)) { - tipc_loopback_trace(peer_net, list); - spin_lock_init(&list->lock); - tipc_sk_rcv(peer_net, list); - return; - } - if (msg_mcast(hdr)) { - tipc_loopback_trace(peer_net, list); - skb_queue_head_init(&inputq); - tipc_sk_mcast_rcv(peer_net, list, &inputq); - __skb_queue_purge(list); - skb_queue_purge(&inputq); - return; - } - return; - case MSG_FRAGMENTER: - if (tipc_msg_assemble(list)) { - tipc_loopback_trace(peer_net, list); - skb_queue_head_init(&inputq); - tipc_sk_mcast_rcv(peer_net, list, &inputq); - __skb_queue_purge(list); - skb_queue_purge(&inputq); - } - return; - case GROUP_PROTOCOL: - case CONN_MANAGER: - tipc_loopback_trace(peer_net, list); - spin_lock_init(&list->lock); - tipc_sk_rcv(peer_net, list); - return; - case LINK_PROTOCOL: - case NAME_DISTRIBUTOR: - case TUNNEL_PROTOCOL: - case BCAST_PROTOCOL: - return; - default: - return; - }; -} - /** * tipc_node_xmit() is the general link level function for message sending * @net: the applicable net namespace @@ -1545,8 +1439,6 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, struct tipc_link_entry *le = NULL; struct tipc_node *n; struct sk_buff_head xmitq; - bool node_up = false; - struct net *peer_net; int bearer_id; int rc; @@ -1563,22 +1455,6 @@ int tipc_node_xmit(struct net *net, struct sk_buff_head *list, return -EHOSTUNREACH; } - rcu_read_lock(); - tipc_node_read_lock(n); - node_up = node_is_up(n); - peer_net = n->peer_net; - tipc_node_read_unlock(n); - if (node_up && peer_net && check_net(peer_net)) { - /* xmit inner linux container */ - tipc_lxc_xmit(peer_net, list); - if (likely(skb_queue_empty(list))) { - rcu_read_unlock(); - tipc_node_put(n); - return 0; - } - } - rcu_read_unlock(); - tipc_node_read_lock(n); bearer_id = n->active_links[selector & 1]; if (unlikely(bearer_id == INVALID_BEARER_ID)) { @@ -2715,33 +2591,3 @@ int tipc_node_dump(struct tipc_node *n, bool more, char *buf) return i; } - -void tipc_node_pre_cleanup_net(struct net *exit_net) -{ - struct tipc_node *n; - struct tipc_net *tn; - struct net *tmp; - - rcu_read_lock(); - for_each_net_rcu(tmp) { - if (tmp == exit_net) - continue; - tn = tipc_net(tmp); - if (!tn) - continue; - spin_lock_bh(&tn->node_list_lock); - list_for_each_entry_rcu(n, &tn->node_list, list) { - if (!n->peer_net) - continue; - if (n->peer_net != exit_net) - continue; - tipc_node_write_lock(n); - n->peer_net = NULL; - n->peer_hash_mix = 0; - tipc_node_write_unlock_fast(n); - break; - } - spin_unlock_bh(&tn->node_list_lock); - } - rcu_read_unlock(); -}
diff --git a/net/tipc/node.h b/net/tipc/node.h index 30563c4..291d0ec 100644 --- a/net/tipc/node.h +++ b/net/tipc/node.h
@@ -75,7 +75,7 @@ u32 tipc_node_get_addr(struct tipc_node *node); u32 tipc_node_try_addr(struct net *net, u8 *id, u32 addr); void tipc_node_check_dest(struct net *net, u32 onode, u8 *peer_id128, struct tipc_bearer *bearer, - u16 capabilities, u32 signature, u32 hash_mixes, + u16 capabilities, u32 signature, struct tipc_media_addr *maddr, bool *respond, bool *dupl_addr); void tipc_node_delete_links(struct net *net, int bearer_id); @@ -92,7 +92,7 @@ void tipc_node_unsubscribe(struct net *net, struct list_head *subscr, u32 addr); void tipc_node_broadcast(struct net *net, struct sk_buff *skb); int tipc_node_add_conn(struct net *net, u32 dnode, u32 port, u32 peer_port); void tipc_node_remove_conn(struct net *net, u32 dnode, u32 port); -int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel, bool connected); +int tipc_node_get_mtu(struct net *net, u32 addr, u32 sel); bool tipc_node_is_up(struct net *net, u32 addr); u16 tipc_node_get_capabilities(struct net *net, u32 addr); int tipc_nl_node_dump(struct sk_buff *skb, struct netlink_callback *cb); @@ -107,5 +107,4 @@ int tipc_nl_node_get_monitor(struct sk_buff *skb, struct genl_info *info); int tipc_nl_node_dump_monitor(struct sk_buff *skb, struct netlink_callback *cb); int tipc_nl_node_dump_monitor_peer(struct sk_buff *skb, struct netlink_callback *cb); -void tipc_node_pre_cleanup_net(struct net *exit_net); #endif
diff --git a/net/tipc/socket.c b/net/tipc/socket.c index cf4f90d..58c4d61 100644 --- a/net/tipc/socket.c +++ b/net/tipc/socket.c
@@ -866,7 +866,7 @@ static int tipc_send_group_msg(struct net *net, struct tipc_sock *tsk, /* Build message as chain of buffers */ __skb_queue_head_init(&pkts); - mtu = tipc_node_get_mtu(net, dnode, tsk->portid, false); + mtu = tipc_node_get_mtu(net, dnode, tsk->portid); rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts); if (unlikely(rc != dlen)) return rc; @@ -1407,7 +1407,7 @@ static int __tipc_sendmsg(struct socket *sock, struct msghdr *m, size_t dlen) } __skb_queue_head_init(&pkts); - mtu = tipc_node_get_mtu(net, dnode, tsk->portid, true); + mtu = tipc_node_get_mtu(net, dnode, tsk->portid); rc = tipc_msg_build(hdr, m, 0, dlen, mtu, &pkts); if (unlikely(rc != dlen)) return rc; @@ -1547,7 +1547,7 @@ static void tipc_sk_finish_conn(struct tipc_sock *tsk, u32 peer_port, sk_reset_timer(sk, &sk->sk_timer, jiffies + CONN_PROBING_INTV); tipc_set_sk_state(sk, TIPC_ESTABLISHED); tipc_node_add_conn(net, peer_node, tsk->portid, peer_port); - tsk->max_pkt = tipc_node_get_mtu(net, peer_node, tsk->portid, true); + tsk->max_pkt = tipc_node_get_mtu(net, peer_node, tsk->portid); tsk->peer_caps = tipc_node_get_capabilities(net, peer_node); __skb_queue_purge(&sk->sk_write_queue); if (tsk->peer_caps & TIPC_BLOCK_FLOWCTL)
diff --git a/net/tipc/topsrv.c b/net/tipc/topsrv.c index 88e8e8d..444e179 100644 --- a/net/tipc/topsrv.c +++ b/net/tipc/topsrv.c
@@ -177,7 +177,7 @@ static void tipc_conn_close(struct tipc_conn *con) conn_put(con); } -static struct tipc_conn *tipc_conn_alloc(struct tipc_topsrv *s, struct socket *sock) +static struct tipc_conn *tipc_conn_alloc(struct tipc_topsrv *s) { struct tipc_conn *con; int ret; @@ -203,12 +203,10 @@ static struct tipc_conn *tipc_conn_alloc(struct tipc_topsrv *s, struct socket *s } con->conid = ret; s->idr_in_use++; + spin_unlock_bh(&s->idr_lock); set_bit(CF_CONNECTED, &con->flags); con->server = s; - con->sock = sock; - conn_get(con); - spin_unlock_bh(&s->idr_lock); return con; } @@ -452,24 +450,17 @@ static void tipc_conn_data_ready(struct sock *sk) static void tipc_topsrv_accept(struct work_struct *work) { struct tipc_topsrv *srv = container_of(work, struct tipc_topsrv, awork); - struct socket *newsock, *lsock; + struct socket *lsock = srv->listener; + struct socket *newsock; struct tipc_conn *con; struct sock *newsk; int ret; - spin_lock_bh(&srv->idr_lock); - if (!srv->listener) { - spin_unlock_bh(&srv->idr_lock); - return; - } - lsock = srv->listener; - spin_unlock_bh(&srv->idr_lock); - while (1) { ret = kernel_accept(lsock, &newsock, O_NONBLOCK); if (ret < 0) return; - con = tipc_conn_alloc(srv, newsock); + con = tipc_conn_alloc(srv); if (IS_ERR(con)) { ret = PTR_ERR(con); sock_release(newsock); @@ -481,11 +472,11 @@ static void tipc_topsrv_accept(struct work_struct *work) newsk->sk_data_ready = tipc_conn_data_ready; newsk->sk_write_space = tipc_conn_write_space; newsk->sk_user_data = con; + con->sock = newsock; write_unlock_bh(&newsk->sk_callback_lock); /* Wake up receive process in case of 'SYN+' message */ newsk->sk_data_ready(newsk); - conn_put(con); } } @@ -498,7 +489,7 @@ static void tipc_topsrv_listener_data_ready(struct sock *sk) read_lock_bh(&sk->sk_callback_lock); srv = sk->sk_user_data; - if (srv) + if (srv->listener) queue_work(srv->rcv_wq, &srv->awork); read_unlock_bh(&sk->sk_callback_lock); } @@ -577,19 +568,19 @@ bool tipc_topsrv_kern_subscr(struct net *net, u32 port, u32 type, u32 lower, sub.seq.upper = upper; sub.timeout = TIPC_WAIT_FOREVER; sub.filter = filter; - *(u64 *)&sub.usr_handle = (u64)port; + *(u32 *)&sub.usr_handle = port; - con = tipc_conn_alloc(tipc_topsrv(net), NULL); + con = tipc_conn_alloc(tipc_topsrv(net)); if (IS_ERR(con)) return false; *conid = con->conid; + con->sock = NULL; rc = tipc_conn_rcv_sub(tipc_topsrv(net), con, &sub); - if (rc) - conn_put(con); - + if (rc >= 0) + return true; conn_put(con); - return !rc; + return false; } void tipc_topsrv_kern_unsubscr(struct net *net, int conid) @@ -708,9 +699,8 @@ static void tipc_topsrv_stop(struct net *net) __module_get(lsock->sk->sk_prot_creator->owner); srv->listener = NULL; spin_unlock_bh(&srv->idr_lock); - - tipc_topsrv_work_stop(srv); sock_release(lsock); + tipc_topsrv_work_stop(srv); idr_destroy(&srv->conn_idr); kfree(srv); }
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index cb51a2f..7aba4ee 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c
@@ -371,11 +371,13 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval, rc = -EINVAL; goto out; } + lock_sock(sk); memcpy(crypto_info_aes_gcm_128->iv, ctx->tx.iv + TLS_CIPHER_AES_GCM_128_SALT_SIZE, TLS_CIPHER_AES_GCM_128_IV_SIZE); memcpy(crypto_info_aes_gcm_128->rec_seq, ctx->tx.rec_seq, TLS_CIPHER_AES_GCM_128_REC_SEQ_SIZE); + release_sock(sk); if (copy_to_user(optval, crypto_info_aes_gcm_128, sizeof(*crypto_info_aes_gcm_128))) @@ -393,11 +395,13 @@ static int do_tls_getsockopt_tx(struct sock *sk, char __user *optval, rc = -EINVAL; goto out; } + lock_sock(sk); memcpy(crypto_info_aes_gcm_256->iv, ctx->tx.iv + TLS_CIPHER_AES_GCM_256_SALT_SIZE, TLS_CIPHER_AES_GCM_256_IV_SIZE); memcpy(crypto_info_aes_gcm_256->rec_seq, ctx->tx.rec_seq, TLS_CIPHER_AES_GCM_256_REC_SEQ_SIZE); + release_sock(sk); if (copy_to_user(optval, crypto_info_aes_gcm_256, sizeof(*crypto_info_aes_gcm_256))) @@ -417,8 +421,6 @@ static int do_tls_getsockopt(struct sock *sk, int optname, { int rc = 0; - lock_sock(sk); - switch (optname) { case TLS_TX: rc = do_tls_getsockopt_tx(sk, optval, optlen); @@ -427,9 +429,6 @@ static int do_tls_getsockopt(struct sock *sk, int optname, rc = -ENOPROTOOPT; break; } - - release_sock(sk); - return rc; }
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 7614dec..af3be9a 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c
@@ -945,9 +945,7 @@ int tls_sw_sendmsg(struct sock *sk, struct msghdr *msg, size_t size) if (msg->msg_flags & ~(MSG_MORE | MSG_DONTWAIT | MSG_NOSIGNAL)) return -EOPNOTSUPP; - ret = mutex_lock_interruptible(&tls_ctx->tx_lock); - if (ret) - return ret; + mutex_lock(&tls_ctx->tx_lock); lock_sock(sk); if (unlikely(msg->msg_controllen)) { @@ -1281,9 +1279,7 @@ int tls_sw_sendpage(struct sock *sk, struct page *page, MSG_SENDPAGE_NOTLAST | MSG_SENDPAGE_NOPOLICY)) return -EOPNOTSUPP; - ret = mutex_lock_interruptible(&tls_ctx->tx_lock); - if (ret) - return ret; + mutex_lock(&tls_ctx->tx_lock); lock_sock(sk); ret = tls_sw_do_sendpage(sk, page, offset, size, flags); release_sock(sk); @@ -2267,19 +2263,11 @@ static void tx_work_handler(struct work_struct *work) if (!test_and_clear_bit(BIT_TX_SCHEDULED, &ctx->tx_bitmask)) return; - - if (mutex_trylock(&tls_ctx->tx_lock)) { - lock_sock(sk); - tls_tx_records(sk, -1); - release_sock(sk); - mutex_unlock(&tls_ctx->tx_lock); - } else if (!test_and_set_bit(BIT_TX_SCHEDULED, &ctx->tx_bitmask)) { - /* Someone is holding the tx_lock, they will likely run Tx - * and cancel the work on their way out of the lock section. - * Schedule a long delay just in case. - */ - schedule_delayed_work(&ctx->tx_work.work, msecs_to_jiffies(10)); - } + mutex_lock(&tls_ctx->tx_lock); + lock_sock(sk); + tls_tx_records(sk, -1); + release_sock(sk); + mutex_unlock(&tls_ctx->tx_lock); } void tls_sw_write_space(struct sock *sk, struct tls_context *ctx)
diff --git a/net/unix/diag.c b/net/unix/diag.c index 951b33f..9ff64f9 100644 --- a/net/unix/diag.c +++ b/net/unix/diag.c
@@ -113,16 +113,14 @@ static int sk_diag_show_rqlen(struct sock *sk, struct sk_buff *nlskb) return nla_put(nlskb, UNIX_DIAG_RQLEN, sizeof(rql), &rql); } -static int sk_diag_dump_uid(struct sock *sk, struct sk_buff *nlskb, - struct user_namespace *user_ns) +static int sk_diag_dump_uid(struct sock *sk, struct sk_buff *nlskb) { - uid_t uid = from_kuid_munged(user_ns, sock_i_uid(sk)); + uid_t uid = from_kuid_munged(sk_user_ns(nlskb->sk), sock_i_uid(sk)); return nla_put(nlskb, UNIX_DIAG_UID, sizeof(uid_t), &uid); } static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req, - struct user_namespace *user_ns, - u32 portid, u32 seq, u32 flags, int sk_ino) + u32 portid, u32 seq, u32 flags, int sk_ino) { struct nlmsghdr *nlh; struct unix_diag_msg *rep; @@ -168,7 +166,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r goto out_nlmsg_trim; if ((req->udiag_show & UDIAG_SHOW_UID) && - sk_diag_dump_uid(sk, skb, user_ns)) + sk_diag_dump_uid(sk, skb)) goto out_nlmsg_trim; nlmsg_end(skb, nlh); @@ -180,8 +178,7 @@ static int sk_diag_fill(struct sock *sk, struct sk_buff *skb, struct unix_diag_r } static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_req *req, - struct user_namespace *user_ns, - u32 portid, u32 seq, u32 flags) + u32 portid, u32 seq, u32 flags) { int sk_ino; @@ -192,7 +189,7 @@ static int sk_diag_dump(struct sock *sk, struct sk_buff *skb, struct unix_diag_r if (!sk_ino) return 0; - return sk_diag_fill(sk, skb, req, user_ns, portid, seq, flags, sk_ino); + return sk_diag_fill(sk, skb, req, portid, seq, flags, sk_ino); } static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) @@ -220,7 +217,7 @@ static int unix_diag_dump(struct sk_buff *skb, struct netlink_callback *cb) goto next; if (!(req->udiag_states & (1 << sk->sk_state))) goto next; - if (sk_diag_dump(sk, skb, req, sk_user_ns(skb->sk), + if (sk_diag_dump(sk, skb, req, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, NLM_F_MULTI) < 0) @@ -288,8 +285,7 @@ static int unix_diag_get_exact(struct sk_buff *in_skb, if (!rep) goto out; - err = sk_diag_fill(sk, rep, req, sk_user_ns(NETLINK_CB(in_skb).sk), - NETLINK_CB(in_skb).portid, + err = sk_diag_fill(sk, rep, req, NETLINK_CB(in_skb).portid, nlh->nlmsg_seq, 0, req->udiag_ino); if (err < 0) { nlmsg_free(rep);
diff --git a/net/unix/garbage.c b/net/unix/garbage.c index dc27635..d45d536 100644 --- a/net/unix/garbage.c +++ b/net/unix/garbage.c
@@ -204,7 +204,6 @@ void wait_for_unix_gc(void) /* The external entry point: unix_gc() */ void unix_gc(void) { - struct sk_buff *next_skb, *skb; struct unix_sock *u; struct unix_sock *next; struct sk_buff_head hitlist; @@ -298,30 +297,11 @@ void unix_gc(void) spin_unlock(&unix_gc_lock); - /* We need io_uring to clean its registered files, ignore all io_uring - * originated skbs. It's fine as io_uring doesn't keep references to - * other io_uring instances and so killing all other files in the cycle - * will put all io_uring references forcing it to go through normal - * release.path eventually putting registered files. - */ - skb_queue_walk_safe(&hitlist, skb, next_skb) { - if (skb->scm_io_uring) { - __skb_unlink(skb, &hitlist); - skb_queue_tail(&skb->sk->sk_receive_queue, skb); - } - } - /* Here we are. Hitlist is filled. Die. */ __skb_queue_purge(&hitlist); spin_lock(&unix_gc_lock); - /* There could be io_uring registered files, just push them back to - * the inflight list - */ - list_for_each_entry_safe(u, next, &gc_candidates, link) - list_move_tail(&u->link, &gc_inflight_list); - /* All candidates should have been detached by now. */ BUG_ON(!list_empty(&gc_candidates));
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index 47f512b..5e3cf97 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c
@@ -1218,7 +1218,6 @@ static void vsock_connect_timeout(struct work_struct *work) if (sk->sk_state == TCP_SYN_SENT && (sk->sk_shutdown != SHUTDOWN_MASK)) { sk->sk_state = TCP_CLOSE; - sk->sk_socket->state = SS_UNCONNECTED; sk->sk_err = ETIMEDOUT; sk->sk_error_report(sk); vsock_transport_cancel_pkt(vsk); @@ -1324,14 +1323,7 @@ static int vsock_stream_connect(struct socket *sock, struct sockaddr *addr, * timeout fires. */ sock_hold(sk); - - /* If the timeout function is already scheduled, - * reschedule it, then ungrab the socket refcount to - * keep it balanced. - */ - if (mod_delayed_work(system_wq, &vsk->connect_work, - timeout)) - sock_put(sk); + schedule_delayed_work(&vsk->connect_work, timeout); /* Skip ahead to preserve error code set above. */ goto out_wait;
diff --git a/net/vmw_vsock/virtio_transport_common.c b/net/vmw_vsock/virtio_transport_common.c index a57190b..22f5aec 100644 --- a/net/vmw_vsock/virtio_transport_common.c +++ b/net/vmw_vsock/virtio_transport_common.c
@@ -1132,7 +1132,7 @@ EXPORT_SYMBOL_GPL(virtio_transport_recv_pkt); void virtio_transport_free_pkt(struct virtio_vsock_pkt *pkt) { - kvfree(pkt->buf); + kfree(pkt->buf); kfree(pkt); } EXPORT_SYMBOL_GPL(virtio_transport_free_pkt);
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c index 5e47b6f..1f619b6 100644 --- a/net/vmw_vsock/vmci_transport.c +++ b/net/vmw_vsock/vmci_transport.c
@@ -1717,11 +1717,7 @@ static int vmci_transport_dgram_enqueue( if (!dg) return -ENOMEM; - err = memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); - if (err) { - kfree(dg); - return err; - } + memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); dg->dst = vmci_make_handle(remote_addr->svm_cid, remote_addr->svm_port);
diff --git a/net/wireless/debugfs.c b/net/wireless/debugfs.c index d80b06d..76b845f 100644 --- a/net/wireless/debugfs.c +++ b/net/wireless/debugfs.c
@@ -65,10 +65,9 @@ static ssize_t ht40allow_map_read(struct file *file, { struct wiphy *wiphy = file->private_data; char *buf; - unsigned int offset = 0, buf_size = PAGE_SIZE, i; + unsigned int offset = 0, buf_size = PAGE_SIZE, i, r; enum nl80211_band band; struct ieee80211_supported_band *sband; - ssize_t r; buf = kzalloc(buf_size, GFP_KERNEL); if (!buf)
diff --git a/net/wireless/reg.c b/net/wireless/reg.c index 70556b6..d5a6105 100644 --- a/net/wireless/reg.c +++ b/net/wireless/reg.c
@@ -1075,8 +1075,6 @@ static void regdb_fw_cb(const struct firmware *fw, void *context) static int query_regdb_file(const char *alpha2) { - int err; - ASSERT_RTNL(); if (regdb) @@ -1086,13 +1084,9 @@ static int query_regdb_file(const char *alpha2) if (!alpha2) return -ENOMEM; - err = request_firmware_nowait(THIS_MODULE, true, "regulatory.db", - ®_pdev->dev, GFP_KERNEL, - (void *)alpha2, regdb_fw_cb); - if (err) - kfree(alpha2); - - return err; + return request_firmware_nowait(THIS_MODULE, true, "regulatory.db", + ®_pdev->dev, GFP_KERNEL, + (void *)alpha2, regdb_fw_cb); } #endif /* CONFIG_CFG80211_FAKE_REGDB */ @@ -4002,10 +3996,8 @@ static int __init regulatory_init_db(void) return -EINVAL; err = load_builtin_regdb_keys(); - if (err) { - platform_device_unregister(reg_pdev); + if (err) return err; - } /* We always try to get an update for the static regdomain */ err = regulatory_hint_core(cfg80211_world_regdom->alpha2);
diff --git a/net/wireless/scan.c b/net/wireless/scan.c index f381c18..ef07b84 100644 --- a/net/wireless/scan.c +++ b/net/wireless/scan.c
@@ -291,8 +291,7 @@ static size_t cfg80211_gen_new_ie(const u8 *ie, size_t ielen, * determine if they are the same ie. */ if (tmp_old[0] == WLAN_EID_VENDOR_SPECIFIC) { - if (tmp_old[1] >= 5 && tmp[1] >= 5 && - !memcmp(tmp_old + 2, tmp + 2, 5)) { + if (!memcmp(tmp_old + 2, tmp + 2, 5)) { /* same vendor ie, copy from * subelement */ @@ -1167,9 +1166,7 @@ cfg80211_update_known_bss(struct cfg80211_registered_device *rdev, if (old == rcu_access_pointer(known->pub.ies)) rcu_assign_pointer(known->pub.ies, new->pub.beacon_ies); - cfg80211_update_hidden_bsses(known, - rcu_access_pointer(new->pub.beacon_ies), - old); + cfg80211_update_hidden_bsses(known, new->pub.beacon_ies, old); if (old) kfree_rcu((struct cfg80211_bss_ies *)old, rcu_head);
diff --git a/net/wireless/sme.c b/net/wireless/sme.c index a260cd6..63f8968 100644 --- a/net/wireless/sme.c +++ b/net/wireless/sme.c
@@ -269,15 +269,6 @@ void cfg80211_conn_work(struct work_struct *work) rtnl_unlock(); } -static void cfg80211_step_auth_next(struct cfg80211_conn *conn, - struct cfg80211_bss *bss) -{ - memcpy(conn->bssid, bss->bssid, ETH_ALEN); - conn->params.bssid = conn->bssid; - conn->params.channel = bss->channel; - conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; -} - /* Returned bss is reference counted and must be cleaned up appropriately. */ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) { @@ -295,7 +286,10 @@ static struct cfg80211_bss *cfg80211_get_conn_bss(struct wireless_dev *wdev) if (!bss) return NULL; - cfg80211_step_auth_next(wdev->conn, bss); + memcpy(wdev->conn->bssid, bss->bssid, ETH_ALEN); + wdev->conn->params.bssid = wdev->conn->bssid; + wdev->conn->params.channel = bss->channel; + wdev->conn->state = CFG80211_CONN_AUTHENTICATE_NEXT; schedule_work(&rdev->conn_work); return bss; @@ -574,12 +568,7 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, wdev->conn->params.ssid_len = wdev->ssid_len; /* see if we have the bss already */ - bss = cfg80211_get_bss(wdev->wiphy, wdev->conn->params.channel, - wdev->conn->params.bssid, - wdev->conn->params.ssid, - wdev->conn->params.ssid_len, - wdev->conn_bss_type, - IEEE80211_PRIVACY(wdev->conn->params.privacy)); + bss = cfg80211_get_conn_bss(wdev); if (prev_bssid) { memcpy(wdev->conn->prev_bssid, prev_bssid, ETH_ALEN); @@ -590,7 +579,6 @@ static int cfg80211_sme_connect(struct wireless_dev *wdev, if (bss) { enum nl80211_timeout_reason treason; - cfg80211_step_auth_next(wdev->conn, bss); err = cfg80211_conn_do_work(wdev, &treason); cfg80211_put_bss(wdev->wiphy, bss); } else { @@ -1245,13 +1233,6 @@ int cfg80211_connect(struct cfg80211_registered_device *rdev, } else { if (WARN_ON(connkeys)) return -EINVAL; - - /* connect can point to wdev->wext.connect which - * can hold key data from a previous connection - */ - connect->key = NULL; - connect->key_len = 0; - connect->key_idx = 0; } wdev->connect_keys = connkeys;
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c index 43dd489..c94aa58 100644 --- a/net/x25/af_x25.c +++ b/net/x25/af_x25.c
@@ -492,12 +492,6 @@ static int x25_listen(struct socket *sock, int backlog) int rc = -EOPNOTSUPP; lock_sock(sk); - if (sock->state != SS_UNCONNECTED) { - rc = -EINVAL; - release_sock(sk); - return rc; - } - if (sk->sk_state != TCP_LISTEN) { memset(&x25_sk(sk)->dest_addr, 0, X25_ADDR_LEN); sk->sk_max_ack_backlog = backlog;
diff --git a/net/x25/x25_dev.c b/net/x25/x25_dev.c index 226397a..25bf72e 100644 --- a/net/x25/x25_dev.c +++ b/net/x25/x25_dev.c
@@ -117,7 +117,7 @@ int x25_lapb_receive_frame(struct sk_buff *skb, struct net_device *dev, if (!pskb_may_pull(skb, 1)) { x25_neigh_put(nb); - goto drop; + return 0; } switch (skb->data[0]) {
diff --git a/net/xfrm/xfrm_compat.c b/net/xfrm/xfrm_compat.c index 14c6a31..2bf2693 100644 --- a/net/xfrm/xfrm_compat.c +++ b/net/xfrm/xfrm_compat.c
@@ -5,7 +5,6 @@ * Based on code and translator idea by: Florian Westphal <fw@strlen.de> */ #include <linux/compat.h> -#include <linux/nospec.h> #include <linux/xfrm.h> #include <net/xfrm.h> @@ -301,7 +300,7 @@ static int xfrm_xlate64(struct sk_buff *dst, const struct nlmsghdr *nlh_src) nla_for_each_attr(nla, attrs, len, remaining) { int err; - switch (nlh_src->nlmsg_type) { + switch (type) { case XFRM_MSG_NEWSPDINFO: err = xfrm_nla_cpy(dst, nla, nla_len(nla)); break; @@ -436,7 +435,6 @@ static int xfrm_xlate32_attr(void *dst, const struct nlattr *nla, NL_SET_ERR_MSG(extack, "Bad attribute"); return -EOPNOTSUPP; } - type = array_index_nospec(type, XFRMA_MAX + 1); if (nla_len(nla) < compat_policy[type].len) { NL_SET_ERR_MSG(extack, "Attribute bad length"); return -EOPNOTSUPP;
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c index 4d8d7cf..e120df0 100644 --- a/net/xfrm/xfrm_input.c +++ b/net/xfrm/xfrm_input.c
@@ -274,7 +274,8 @@ static int xfrm6_remove_tunnel_encap(struct xfrm_state *x, struct sk_buff *skb) goto out; if (x->props.flags & XFRM_STATE_DECAP_DSCP) - ipv6_copy_dscp(XFRM_MODE_SKB_CB(skb)->tos, ipipv6_hdr(skb)); + ipv6_copy_dscp(ipv6_get_dsfield(ipv6_hdr(skb)), + ipipv6_hdr(skb)); if (!(x->props.flags & XFRM_STATE_NOECN)) ipip6_ecn_decapsulate(skb);
diff --git a/net/xfrm/xfrm_ipcomp.c b/net/xfrm/xfrm_ipcomp.c index 4fca4b6..4d42244 100644 --- a/net/xfrm/xfrm_ipcomp.c +++ b/net/xfrm/xfrm_ipcomp.c
@@ -212,7 +212,6 @@ static void ipcomp_free_scratches(void) vfree(*per_cpu_ptr(scratches, i)); free_percpu(scratches); - ipcomp_scratches = NULL; } static void * __percpu *ipcomp_alloc_scratches(void)
diff --git a/net/xfrm/xfrm_policy.c b/net/xfrm/xfrm_policy.c index 6c5bc83..907e12a 100644 --- a/net/xfrm/xfrm_policy.c +++ b/net/xfrm/xfrm_policy.c
@@ -3623,7 +3623,6 @@ int __xfrm_policy_check(struct sock *sk, int dir, struct sk_buff *skb, if (pols[1]) { if (IS_ERR(pols[1])) { XFRM_INC_STATS(net, LINUX_MIB_XFRMINPOLERROR); - xfrm_pol_put(pols[0]); return 0; } pols[1]->curlft.use_time = ktime_get_real_seconds();
diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c index ce31ef4..08e0d99 100644 --- a/net/xfrm/xfrm_state.c +++ b/net/xfrm/xfrm_state.c
@@ -2587,6 +2587,9 @@ int __xfrm_init_state(struct xfrm_state *x, bool init_replay, bool offload) if (inner_mode == NULL) goto error; + if (!(inner_mode->flags & XFRM_MODE_FLAG_TUNNEL)) + goto error; + x->inner_mode = *inner_mode; if (x->props.family == AF_INET)
diff --git a/samples/vfio-mdev/mdpy-fb.c b/samples/vfio-mdev/mdpy-fb.c index 8ad1aa1..a760e13 100644 --- a/samples/vfio-mdev/mdpy-fb.c +++ b/samples/vfio-mdev/mdpy-fb.c
@@ -109,7 +109,7 @@ static int mdpy_fb_probe(struct pci_dev *pdev, ret = pci_request_regions(pdev, "mdpy-fb"); if (ret < 0) - goto err_disable_dev; + return ret; pci_read_config_dword(pdev, MDPY_FORMAT_OFFSET, &format); pci_read_config_dword(pdev, MDPY_WIDTH_OFFSET, &width); @@ -191,9 +191,6 @@ static int mdpy_fb_probe(struct pci_dev *pdev, err_release_regions: pci_release_regions(pdev); -err_disable_dev: - pci_disable_device(pdev); - return ret; } @@ -202,10 +199,7 @@ static void mdpy_fb_remove(struct pci_dev *pdev) struct fb_info *info = pci_get_drvdata(pdev); unregister_framebuffer(info); - iounmap(info->screen_base); framebuffer_release(info); - pci_release_regions(pdev); - pci_disable_device(pdev); } static struct pci_device_id mdpy_fb_pci_table[] = {
diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include index 5d247d8..b14a7d4 100644 --- a/scripts/Kbuild.include +++ b/scripts/Kbuild.include
@@ -187,29 +187,8 @@ quiet_redirect := silent_redirect := exec >/dev/null; -# Delete the target on interruption -# -# GNU Make automatically deletes the target if it has already been changed by -# the interrupted recipe. So, you can safely stop the build by Ctrl-C (Make -# will delete incomplete targets), and resume it later. -# -# However, this does not work when the stderr is piped to another program, like -# $ make >&2 | tee log -# Make dies with SIGPIPE before cleaning the targets. -# -# To address it, we clean the target in signal traps. -# -# Make deletes the target when it catches SIGHUP, SIGINT, SIGQUIT, SIGTERM. -# So, we cover them, and also SIGPIPE just in case. -# -# Of course, this is unneeded for phony targets. -delete-on-interrupt = \ - $(if $(filter-out $(PHONY), $@), \ - $(foreach sig, HUP INT QUIT TERM PIPE, \ - trap 'rm -f $@; trap - $(sig); kill -s $(sig) $$$$' $(sig);)) - # printing commands -cmd = @set -e; $(echo-cmd) $($(quiet)redirect) $(delete-on-interrupt) $(cmd_$(1)) +cmd = @set -e; $(echo-cmd) $($(quiet)redirect) $(cmd_$(1)) ### # if_changed - execute command if any prerequisite is newer than
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn index 6a78afc..854e2ba 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn
@@ -50,7 +50,6 @@ KBUILD_CFLAGS += -Wno-format-zero-length KBUILD_CFLAGS += $(call cc-disable-warning, pointer-to-enum-cast) KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) -KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) endif endif
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins index ba4e271..63d2148 100644 --- a/scripts/Makefile.gcc-plugins +++ b/scripts/Makefile.gcc-plugins
@@ -6,7 +6,7 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_LATENT_ENTROPY) \ += -DLATENT_ENTROPY_PLUGIN ifdef CONFIG_GCC_PLUGIN_LATENT_ENTROPY - DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable -ULATENT_ENTROPY_PLUGIN + DISABLE_LATENT_ENTROPY_PLUGIN += -fplugin-arg-latent_entropy_plugin-disable endif export DISABLE_LATENT_ENTROPY_PLUGIN
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost index 7626732..1c64df6 100644 --- a/scripts/Makefile.modpost +++ b/scripts/Makefile.modpost
@@ -78,7 +78,8 @@ src := $(obj) # Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS -include $(if $(wildcard $(src)/Kbuild), $(src)/Kbuild, $(src)/Makefile) +include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \ + $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile) endif MODPOST += $(subst -i,-n,$(filter -i,$(MAKEFLAGS))) -s -T - $(wildcard vmlinux)
diff --git a/scripts/asn1_compiler.c b/scripts/asn1_compiler.c index 985fb81..adabd41 100644 --- a/scripts/asn1_compiler.c +++ b/scripts/asn1_compiler.c
@@ -625,7 +625,7 @@ int main(int argc, char **argv) p = strrchr(argv[1], '/'); p = p ? p + 1 : argv[1]; grammar_name = strdup(p); - if (!grammar_name) { + if (!p) { perror(NULL); exit(1); }
diff --git a/scripts/extract-cert.c b/scripts/extract-cert.c index dd1a4bd..b071bf4 100644 --- a/scripts/extract-cert.c +++ b/scripts/extract-cert.c
@@ -23,13 +23,6 @@ #include <openssl/err.h> #include <openssl/engine.h> -/* - * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. - * - * Remove this if/when that API is no longer used - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - #define PKEY_ID_PKCS7 2 static __attribute__((noreturn))
diff --git a/scripts/faddr2line b/scripts/faddr2line index 9e730b8..94ed98d 100755 --- a/scripts/faddr2line +++ b/scripts/faddr2line
@@ -73,8 +73,7 @@ find_dir_prefix() { local objfile=$1 - local start_kernel_addr=$(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | - ${AWK} '$8 == "start_kernel" {printf "0x%s", $2}') + local start_kernel_addr=$(${READELF} --symbols --wide $objfile | ${AWK} '$8 == "start_kernel" {printf "0x%s", $2}') [[ -z $start_kernel_addr ]] && return local file_line=$(${ADDR2LINE} -e $objfile $start_kernel_addr) @@ -113,9 +112,7 @@ # section offsets. local file_type=$(${READELF} --file-header $objfile | ${AWK} '$1 == "Type:" { print $2; exit }') - if [[ $file_type = "EXEC" ]] || [[ $file_type == "DYN" ]]; then - is_vmlinux=1 - fi + [[ $file_type = "EXEC" ]] && is_vmlinux=1 # Go through each of the object's symbols which match the func name. # In rare cases there might be duplicates, in which case we print all @@ -178,7 +175,7 @@ found=2 break fi - done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2) + done < <(${READELF} --symbols --wide $objfile | ${AWK} -v sec=$sym_sec '$7 == sec' | sort --key=2) if [[ $found = 0 ]]; then warn "can't find symbol: sym_name: $sym_name sym_sec: $sym_sec sym_addr: $sym_addr sym_elf_size: $sym_elf_size" @@ -259,7 +256,7 @@ DONE=1 - done < <(${READELF} --symbols --wide $objfile | sed 's/\[.*\]//' | ${AWK} -v fn=$sym_name '$4 == "FUNC" && $8 == fn') + done < <(${READELF} --symbols --wide $objfile | ${AWK} -v fn=$sym_name '$4 == "FUNC" && $8 == fn') } [[ $# -lt 2 ]] && usage
diff --git a/scripts/mksysmap b/scripts/mksysmap index ad8bbc5..9aa23d1 100755 --- a/scripts/mksysmap +++ b/scripts/mksysmap
@@ -41,4 +41,4 @@ # so we just ignore them to let readprofile continue to work. # (At least sparc64 has __crc_ in the middle). -$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( \.L\)\|\( L0\)' > $2 +$NM -n $1 | grep -v '\( [aNUw] \)\|\(__crc_\)\|\( \$[adt]\)\|\( \.L\)' > $2
diff --git a/scripts/selinux/install_policy.sh b/scripts/selinux/install_policy.sh index 20af56c..2dccf14 100755 --- a/scripts/selinux/install_policy.sh +++ b/scripts/selinux/install_policy.sh
@@ -78,7 +78,7 @@ $SF -F file_contexts / mounts=`cat /proc/$$/mounts | \ - grep -E "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ + egrep "ext[234]|jfs|xfs|reiserfs|jffs2|gfs2|btrfs|f2fs|ocfs2" | \ awk '{ print $2 '}` $SF -F file_contexts $mounts
diff --git a/scripts/sign-file.c b/scripts/sign-file.c index 7434e9e..fbd34b8 100644 --- a/scripts/sign-file.c +++ b/scripts/sign-file.c
@@ -30,13 +30,6 @@ #include <openssl/engine.h> /* - * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. - * - * Remove this if/when that API is no longer used - */ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -/* * Use CMS if we have openssl-1.0.0 or newer available - otherwise we have to * assume that it's not available and its header file is missing and that we * should use PKCS#7 instead. Switching to the older PKCS#7 format restricts
diff --git a/scripts/tracing/ftrace-bisect.sh b/scripts/tracing/ftrace-bisect.sh index bb4f592..9267011 100755 --- a/scripts/tracing/ftrace-bisect.sh +++ b/scripts/tracing/ftrace-bisect.sh
@@ -12,7 +12,7 @@ # (note, if this is a problem with function_graph tracing, then simply # replace "function" with "function_graph" in the following steps). # -# # cd /sys/kernel/tracing +# # cd /sys/kernel/debug/tracing # # echo schedule > set_ftrace_filter # # echo function > current_tracer # @@ -20,40 +20,22 @@ # # # echo nop > current_tracer # -# Starting with v5.1 this can be done with numbers, making it much faster: -# -# The old (slow) way, for kernels before v5.1. -# -# [old-way] # cat available_filter_functions > ~/full-file -# -# [old-way] *** Note *** this process will take several minutes to update the -# [old-way] filters. Setting multiple functions is an O(n^2) operation, and we -# [old-way] are dealing with thousands of functions. So go have coffee, talk -# [old-way] with your coworkers, read facebook. And eventually, this operation -# [old-way] will end. -# -# The new way (using numbers) is an O(n) operation, and usually takes less than a second. -# -# seq `wc -l available_filter_functions | cut -d' ' -f1` > ~/full-file -# -# This will create a sequence of numbers that match the functions in -# available_filter_functions, and when echoing in a number into the -# set_ftrace_filter file, it will enable the corresponding function in -# O(1) time. Making enabling all functions O(n) where n is the number of -# functions to enable. -# -# For either the new or old way, the rest of the operations remain the same. -# +# # cat available_filter_functions > ~/full-file # # ftrace-bisect ~/full-file ~/test-file ~/non-test-file # # cat ~/test-file > set_ftrace_filter # +# *** Note *** this will take several minutes. Setting multiple functions is +# an O(n^2) operation, and we are dealing with thousands of functions. So go +# have coffee, talk with your coworkers, read facebook. And eventually, this +# operation will end. +# # # echo function > current_tracer # # If it crashes, we know that ~/test-file has a bad function. # # Reboot back to test kernel. # -# # cd /sys/kernel/tracing +# # cd /sys/kernel/debug/tracing # # mv ~/test-file ~/full-file # # If it didn't crash.
diff --git a/security/apparmor/apparmorfs.c b/security/apparmor/apparmorfs.c index 6273646..7a88136 100644 --- a/security/apparmor/apparmorfs.c +++ b/security/apparmor/apparmorfs.c
@@ -403,7 +403,7 @@ static struct aa_loaddata *aa_simple_write_to_buffer(const char __user *userbuf, data->size = copy_size; if (copy_from_user(data->data, userbuf, copy_size)) { - aa_put_loaddata(data); + kvfree(data); return ERR_PTR(-EFAULT); } @@ -869,10 +869,8 @@ static struct multi_transaction *multi_transaction_new(struct file *file, if (!t) return ERR_PTR(-ENOMEM); kref_init(&t->count); - if (copy_from_user(t->data, buf, size)) { - put_multi_transaction(t); + if (copy_from_user(t->data, buf, size)) return ERR_PTR(-EFAULT); - } return t; }
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index 68e06d8..5977325 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c
@@ -139,7 +139,7 @@ int aa_audit(int type, struct aa_profile *profile, struct common_audit_data *sa, } if (AUDIT_MODE(profile) == AUDIT_QUIET || (type == AUDIT_APPARMOR_DENIED && - AUDIT_MODE(profile) == AUDIT_QUIET_DENIED)) + AUDIT_MODE(profile) == AUDIT_QUIET)) return aad(sa)->error; if (KILL_MODE(profile) && type == AUDIT_APPARMOR_DENIED)
diff --git a/security/apparmor/domain.c b/security/apparmor/domain.c index 2f61b4c..1a33f49 100644 --- a/security/apparmor/domain.c +++ b/security/apparmor/domain.c
@@ -460,7 +460,7 @@ static struct aa_label *find_attach(const struct linux_binprm *bprm, * xattrs, or a longer match */ candidate = profile; - candidate_len = max(count, profile->xmatch_len); + candidate_len = profile->xmatch_len; candidate_xattrs = ret; conflict = false; }
diff --git a/security/apparmor/include/lib.h b/security/apparmor/include/lib.h index ac50548..7d27db7 100644 --- a/security/apparmor/include/lib.h +++ b/security/apparmor/include/lib.h
@@ -22,11 +22,6 @@ */ #define DEBUG_ON (aa_g_debug) -/* - * split individual debug cases out in preparation for finer grained - * debug controls in the future. - */ -#define AA_DEBUG_LABEL DEBUG_ON #define dbg_printk(__fmt, __args...) pr_debug(__fmt, ##__args) #define AA_DEBUG(fmt, args...) \ do { \
diff --git a/security/apparmor/include/policy.h b/security/apparmor/include/policy.h index b5aa423..b5b4b81 100644 --- a/security/apparmor/include/policy.h +++ b/security/apparmor/include/policy.h
@@ -135,7 +135,7 @@ struct aa_profile { const char *attach; struct aa_dfa *xmatch; - unsigned int xmatch_len; + int xmatch_len; enum audit_mode audit; long mode; u32 path_flags;
diff --git a/security/apparmor/label.c b/security/apparmor/label.c index e2674e4..747a734 100644 --- a/security/apparmor/label.c +++ b/security/apparmor/label.c
@@ -1637,9 +1637,9 @@ int aa_label_snxprint(char *str, size_t size, struct aa_ns *ns, AA_BUG(!str && size != 0); AA_BUG(!label); - if (AA_DEBUG_LABEL && (flags & FLAG_ABS_ROOT)) { + if (flags & FLAG_ABS_ROOT) { ns = root_ns; - len = snprintf(str, size, "_"); + len = snprintf(str, size, "="); update_for_len(total, len, size, str); } else if (!ns) { ns = labels_ns(label); @@ -1750,7 +1750,7 @@ void aa_label_xaudit(struct audit_buffer *ab, struct aa_ns *ns, if (!use_label_hname(ns, label, flags) || display_mode(ns, label, flags)) { len = aa_label_asxprint(&name, ns, label, flags, gfp); - if (len < 0) { + if (len == -1) { AA_DEBUG("label print error"); return; } @@ -1778,7 +1778,7 @@ void aa_label_seq_xprint(struct seq_file *f, struct aa_ns *ns, int len; len = aa_label_asxprint(&str, ns, label, flags, gfp); - if (len < 0) { + if (len == -1) { AA_DEBUG("label print error"); return; } @@ -1801,7 +1801,7 @@ void aa_label_xprintk(struct aa_ns *ns, struct aa_label *label, int flags, int len; len = aa_label_asxprint(&str, ns, label, flags, gfp); - if (len < 0) { + if (len == -1) { AA_DEBUG("label print error"); return; } @@ -1901,8 +1901,7 @@ struct aa_label *aa_label_strn_parse(struct aa_label *base, const char *str, AA_BUG(!str); str = skipn_spaces(str, n); - if (str == NULL || (AA_DEBUG_LABEL && *str == '_' && - base != &root_ns->unconfined->label)) + if (str == NULL || (*str == '=' && base != &root_ns->unconfined->label)) return ERR_PTR(-EINVAL); len = label_count_strn_entries(str, end - str);
diff --git a/security/apparmor/lsm.c b/security/apparmor/lsm.c index 21e0338..e31965d 100644 --- a/security/apparmor/lsm.c +++ b/security/apparmor/lsm.c
@@ -1148,10 +1148,10 @@ static int apparmor_inet_conn_request(struct sock *sk, struct sk_buff *skb, #endif /* - * The cred blob is a pointer to, not an instance of, an aa_label. + * The cred blob is a pointer to, not an instance of, an aa_task_ctx. */ struct lsm_blob_sizes apparmor_blob_sizes __lsm_ro_after_init = { - .lbs_cred = sizeof(struct aa_label *), + .lbs_cred = sizeof(struct aa_task_ctx *), .lbs_file = sizeof(struct aa_file_ctx), .lbs_task = sizeof(struct aa_task_ctx), };
diff --git a/security/apparmor/mount.c b/security/apparmor/mount.c index 4b433cf..17081c8 100644 --- a/security/apparmor/mount.c +++ b/security/apparmor/mount.c
@@ -229,8 +229,7 @@ static const char * const mnt_info_table[] = { "failed srcname match", "failed type match", "failed flags match", - "failed data match", - "failed perms check" + "failed data match" }; /* @@ -285,8 +284,8 @@ static int do_match_mnt(struct aa_dfa *dfa, unsigned int start, return 0; } - /* failed at perms check, don't confuse with flags match */ - return 6; + /* failed at end of flags match */ + return 4; } @@ -683,7 +682,6 @@ int aa_pivotroot(struct aa_label *label, const struct path *old_path, aa_put_label(target); goto out; } - aa_put_label(target); } else /* already audited error */ error = PTR_ERR(target);
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index e38ceba..0635571 100644 --- a/security/apparmor/policy.c +++ b/security/apparmor/policy.c
@@ -1123,7 +1123,7 @@ ssize_t aa_remove_profiles(struct aa_ns *policy_ns, struct aa_label *subj, if (!name) { /* remove namespace - can only happen if fqname[0] == ':' */ - mutex_lock_nested(&ns->parent->lock, ns->parent->level); + mutex_lock_nested(&ns->parent->lock, ns->level); __aa_bump_ns_revision(ns); __aa_remove_ns(ns); mutex_unlock(&ns->parent->lock);
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c index 7e32c09..8cfc949 100644 --- a/security/apparmor/policy_unpack.c +++ b/security/apparmor/policy_unpack.c
@@ -955,7 +955,7 @@ static int verify_header(struct aa_ext *e, int required, const char **ns) * if not specified use previous version * Mask off everything that is not kernel abi version */ - if (VERSION_LT(e->version, v5) || VERSION_GT(e->version, v8)) { + if (VERSION_LT(e->version, v5) || VERSION_GT(e->version, v7)) { audit_iface(NULL, NULL, NULL, "unsupported interface version", e, error); return error;
diff --git a/security/commoncap.c b/security/commoncap.c index 1c9cbd8..d8a9ffc 100644 --- a/security/commoncap.c +++ b/security/commoncap.c
@@ -392,10 +392,8 @@ int cap_inode_getsecurity(struct inode *inode, const char *name, void **buffer, &tmpbuf, size, GFP_NOFS); dput(dentry); - if (ret < 0 || !tmpbuf) { - size = ret; - goto out_free; - } + if (ret < 0 || !tmpbuf) + return ret; fs_ns = inode->i_sb->s_user_ns; cap = (struct vfs_cap_data *) tmpbuf;
diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 9bc8f4b..5d7bb91 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c
@@ -79,17 +79,6 @@ static int dev_exceptions_copy(struct list_head *dest, struct list_head *orig) return -ENOMEM; } -static void dev_exceptions_move(struct list_head *dest, struct list_head *orig) -{ - struct dev_exception_item *ex, *tmp; - - lockdep_assert_held(&devcgroup_mutex); - - list_for_each_entry_safe(ex, tmp, orig, list) { - list_move_tail(&ex->list, dest); - } -} - /* * called under devcgroup_mutex */ @@ -612,13 +601,11 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, int count, rc = 0; struct dev_exception_item ex; struct dev_cgroup *parent = css_to_devcgroup(devcgroup->css.parent); - struct dev_cgroup tmp_devcgrp; if (!capable(CAP_SYS_ADMIN)) return -EPERM; memset(&ex, 0, sizeof(ex)); - memset(&tmp_devcgrp, 0, sizeof(tmp_devcgrp)); b = buffer; switch (*b) { @@ -630,27 +617,15 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, if (!may_allow_all(parent)) return -EPERM; - if (!parent) { - devcgroup->behavior = DEVCG_DEFAULT_ALLOW; - dev_exception_clean(devcgroup); - break; - } - - INIT_LIST_HEAD(&tmp_devcgrp.exceptions); - rc = dev_exceptions_copy(&tmp_devcgrp.exceptions, - &devcgroup->exceptions); - if (rc) - return rc; dev_exception_clean(devcgroup); + devcgroup->behavior = DEVCG_DEFAULT_ALLOW; + if (!parent) + break; + rc = dev_exceptions_copy(&devcgroup->exceptions, &parent->exceptions); - if (rc) { - dev_exceptions_move(&devcgroup->exceptions, - &tmp_devcgrp.exceptions); + if (rc) return rc; - } - devcgroup->behavior = DEVCG_DEFAULT_ALLOW; - dev_exception_clean(&tmp_devcgrp); break; case DEVCG_DENY: if (css_has_online_children(&devcgroup->css))
diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c index 12bae47..ea1aae3 100644 --- a/security/integrity/digsig.c +++ b/security/integrity/digsig.c
@@ -121,7 +121,6 @@ int __init integrity_init_keyring(const unsigned int id) { struct key_restriction *restriction; key_perm_t perm; - int ret; perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ | KEY_USR_SEARCH; @@ -142,10 +141,7 @@ int __init integrity_init_keyring(const unsigned int id) perm |= KEY_USR_WRITE; out: - ret = __integrity_init_keyring(id, perm, restriction); - if (ret) - kfree(restriction); - return ret; + return __integrity_init_keyring(id, perm, restriction); } int __init integrity_add_key(const unsigned int id, const void *data,
diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h index 146154e..5fae6cf 100644 --- a/security/integrity/ima/ima.h +++ b/security/integrity/ima/ima.h
@@ -361,24 +361,24 @@ static inline void ima_free_modsig(struct modsig *modsig) /* LSM based policy rules require audit */ #ifdef CONFIG_IMA_LSM_RULES -#define ima_filter_rule_init security_audit_rule_init -#define ima_filter_rule_free security_audit_rule_free -#define ima_filter_rule_match security_audit_rule_match +#define security_filter_rule_init security_audit_rule_init +#define security_filter_rule_free security_audit_rule_free +#define security_filter_rule_match security_audit_rule_match #else -static inline int ima_filter_rule_init(u32 field, u32 op, char *rulestr, - void **lsmrule) +static inline int security_filter_rule_init(u32 field, u32 op, char *rulestr, + void **lsmrule) { return -EINVAL; } -static inline void ima_filter_rule_free(void *lsmrule) +static inline void security_filter_rule_free(void *lsmrule) { } -static inline int ima_filter_rule_match(u32 secid, u32 field, u32 op, - void *lsmrule) +static inline int security_filter_rule_match(u32 secid, u32 field, u32 op, + void *lsmrule) { return -EINVAL; }
diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c index 6a2377e..a768f37 100644 --- a/security/integrity/ima/ima_main.c +++ b/security/integrity/ima/ima_main.c
@@ -370,9 +370,7 @@ static int process_measurement(struct file *file, const struct cred *cred, /** * ima_file_mmap - based on policy, collect/store measurement. * @file: pointer to the file to be measured (May be NULL) - * @reqprot: protection requested by the application - * @prot: protection that will be applied by the kernel - * @flags: operational flags + * @prot: contains the protection that will be applied by the kernel. * * Measure files being mmapped executable based on the ima_must_measure() * policy decision. @@ -380,8 +378,7 @@ static int process_measurement(struct file *file, const struct cred *cred, * On success return 0. On integrity appraisal error, assuming the file * is in policy and IMA-appraisal is in enforcing mode, return -EACCES. */ -int ima_file_mmap(struct file *file, unsigned long reqprot, - unsigned long prot, unsigned long flags) +int ima_file_mmap(struct file *file, unsigned long prot) { u32 secid; @@ -618,7 +615,6 @@ int ima_load_data(enum kernel_load_data_id id) pr_err("impossible to appraise a module without a file descriptor. sig_enforce kernel parameter might help\n"); return -EACCES; /* INTEGRITY_UNKNOWN */ } - break; default: break; }
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c index 6df0436..14aef74 100644 --- a/security/integrity/ima/ima_policy.c +++ b/security/integrity/ima/ima_policy.c
@@ -254,7 +254,7 @@ static void ima_lsm_free_rule(struct ima_rule_entry *entry) int i; for (i = 0; i < MAX_LSM_RULES; i++) { - ima_filter_rule_free(entry->lsm[i].rule); + security_filter_rule_free(entry->lsm[i].rule); kfree(entry->lsm[i].args_p); } kfree(entry); @@ -286,9 +286,10 @@ static struct ima_rule_entry *ima_lsm_copy_rule(struct ima_rule_entry *entry) if (!nentry->lsm[i].args_p) goto out_err; - ima_filter_rule_init(nentry->lsm[i].type, Audit_equal, - nentry->lsm[i].args_p, - &nentry->lsm[i].rule); + security_filter_rule_init(nentry->lsm[i].type, + Audit_equal, + nentry->lsm[i].args_p, + &nentry->lsm[i].rule); if (!nentry->lsm[i].rule) pr_warn("rule for LSM \'%s\' is undefined\n", (char *)entry->lsm[i].args_p); @@ -370,9 +371,6 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, enum ima_hooks func, int mask) { int i; - bool result = false; - struct ima_rule_entry *lsm_rule = rule; - bool rule_reinitialized = false; if (func == KEXEC_CMDLINE) { if ((rule->flags & IMA_FUNC) && (rule->func == func)) @@ -416,55 +414,36 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode, int rc = 0; u32 osid; - if (!lsm_rule->lsm[i].rule) { - if (!lsm_rule->lsm[i].args_p) + if (!rule->lsm[i].rule) { + if (!rule->lsm[i].args_p) continue; else return false; } - -retry: switch (i) { case LSM_OBJ_USER: case LSM_OBJ_ROLE: case LSM_OBJ_TYPE: security_inode_getsecid(inode, &osid); - rc = ima_filter_rule_match(osid, lsm_rule->lsm[i].type, - Audit_equal, - lsm_rule->lsm[i].rule); + rc = security_filter_rule_match(osid, + rule->lsm[i].type, + Audit_equal, + rule->lsm[i].rule); break; case LSM_SUBJ_USER: case LSM_SUBJ_ROLE: case LSM_SUBJ_TYPE: - rc = ima_filter_rule_match(secid, lsm_rule->lsm[i].type, - Audit_equal, - lsm_rule->lsm[i].rule); - break; + rc = security_filter_rule_match(secid, + rule->lsm[i].type, + Audit_equal, + rule->lsm[i].rule); default: break; } - - if (rc == -ESTALE && !rule_reinitialized) { - lsm_rule = ima_lsm_copy_rule(rule); - if (lsm_rule) { - rule_reinitialized = true; - goto retry; - } - } - if (!rc) { - result = false; - goto out; - } + if (!rc) + return false; } - result = true; - -out: - if (rule_reinitialized) { - for (i = 0; i < MAX_LSM_RULES; i++) - ima_filter_rule_free(lsm_rule->lsm[i].rule); - kfree(lsm_rule); - } - return result; + return true; } /* @@ -690,7 +669,6 @@ void __init ima_init_policy(void) add_rules(default_measurement_rules, ARRAY_SIZE(default_measurement_rules), IMA_DEFAULT_POLICY); - break; default: break; } @@ -843,9 +821,10 @@ static int ima_lsm_rule_init(struct ima_rule_entry *entry, return -ENOMEM; entry->lsm[lsm_rule].type = audit_type; - result = ima_filter_rule_init(entry->lsm[lsm_rule].type, Audit_equal, - entry->lsm[lsm_rule].args_p, - &entry->lsm[lsm_rule].rule); + result = security_filter_rule_init(entry->lsm[lsm_rule].type, + Audit_equal, + entry->lsm[lsm_rule].args_p, + &entry->lsm[lsm_rule].rule); if (!entry->lsm[lsm_rule].rule) { pr_warn("rule for LSM \'%s\' is undefined\n", (char *)entry->lsm[lsm_rule].args_p);
diff --git a/security/integrity/ima/ima_template.c b/security/integrity/ima/ima_template.c index 7b8be19..2283051 100644 --- a/security/integrity/ima/ima_template.c +++ b/security/integrity/ima/ima_template.c
@@ -222,11 +222,11 @@ int template_desc_init_fields(const char *template_fmt, } if (fields && num_fields) { - *fields = kmalloc_array(i, sizeof(**fields), GFP_KERNEL); + *fields = kmalloc_array(i, sizeof(*fields), GFP_KERNEL); if (*fields == NULL) return -ENOMEM; - memcpy(*fields, found_fields, i * sizeof(**fields)); + memcpy(*fields, found_fields, i * sizeof(*fields)); *num_fields = i; } @@ -292,11 +292,8 @@ static struct ima_template_desc *restore_template_fmt(char *template_name) template_desc->name = ""; template_desc->fmt = kstrdup(template_name, GFP_KERNEL); - if (!template_desc->fmt) { - kfree(template_desc); - template_desc = NULL; + if (!template_desc->fmt) goto out; - } spin_lock(&template_list); list_add_tail_rcu(&template_desc->list, &defined_templates);
diff --git a/security/integrity/platform_certs/load_uefi.c b/security/integrity/platform_certs/load_uefi.c index 0fabdea..4520114 100644 --- a/security/integrity/platform_certs/load_uefi.c +++ b/security/integrity/platform_certs/load_uefi.c
@@ -30,11 +30,10 @@ static const struct dmi_system_id uefi_skip_cert[] = { { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,1") }, { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir8,2") }, { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacBookAir9,1") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "Macmini8,1") }, + { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacMini8,1") }, { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "MacPro7,1") }, { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,1") }, { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMac20,2") }, - { UEFI_QUIRK_SKIP_CERT("Apple Inc.", "iMacPro1,1") }, { } };
diff --git a/security/keys/request_key.c b/security/keys/request_key.c index 17c9c0c..957b9e3 100644 --- a/security/keys/request_key.c +++ b/security/keys/request_key.c
@@ -38,12 +38,9 @@ static void cache_requested_key(struct key *key) #ifdef CONFIG_KEYS_REQUEST_CACHE struct task_struct *t = current; - /* Do not cache key if it is a kernel thread */ - if (!(t->flags & PF_KTHREAD)) { - key_put(t->cached_requested_key); - t->cached_requested_key = key_get(key); - set_tsk_thread_flag(t, TIF_NOTIFY_RESUME); - } + key_put(t->cached_requested_key); + t->cached_requested_key = key_get(key); + set_tsk_thread_flag(t, TIF_NOTIFY_RESUME); #endif }
diff --git a/security/security.c b/security/security.c index 9e3d406..b7a2f49 100644 --- a/security/security.c +++ b/security/security.c
@@ -1468,13 +1468,12 @@ static inline unsigned long mmap_prot(struct file *file, unsigned long prot) int security_mmap_file(struct file *file, unsigned long prot, unsigned long flags) { - unsigned long prot_adj = mmap_prot(file, prot); int ret; - - ret = call_int_hook(mmap_file, 0, file, prot, prot_adj, flags); + ret = call_int_hook(mmap_file, 0, file, prot, + mmap_prot(file, prot), flags); if (ret) return ret; - return ima_file_mmap(file, prot, prot_adj, flags); + return ima_file_mmap(file, prot); } int security_mmap_addr(unsigned long addr)
diff --git a/security/selinux/ss/policydb.h b/security/selinux/ss/policydb.h index 34f4c24..eefacd4 100644 --- a/security/selinux/ss/policydb.h +++ b/security/selinux/ss/policydb.h
@@ -360,8 +360,6 @@ static inline int put_entry(const void *buf, size_t bytes, int num, struct polic { size_t len = bytes * num; - if (len > fp->len) - return -EINVAL; memcpy(fp->data, buf, len); fp->data += len; fp->len -= len;
diff --git a/security/tomoyo/Makefile b/security/tomoyo/Makefile index 221eaad..cca5a30 100644 --- a/security/tomoyo/Makefile +++ b/security/tomoyo/Makefile
@@ -10,7 +10,7 @@ quiet_cmd_policy = POLICY $@ cmd_policy = ($(call do_policy,profile); $(call do_policy,exception_policy); $(call do_policy,domain_policy); $(call do_policy,manager); $(call do_policy,stat)) >$@ -$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(srctree)/$(src)/policy/*.conf.default) FORCE +$(obj)/builtin-policy.h: $(wildcard $(obj)/policy/*.conf $(src)/policy/*.conf.default) FORCE $(call if_changed,policy) $(obj)/common.o: $(obj)/builtin-policy.h
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c index 3f5ee9f..17df288 100644 --- a/sound/aoa/soundbus/i2sbus/core.c +++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -147,7 +147,6 @@ static int i2sbus_get_and_fixup_rsrc(struct device_node *np, int index, return rc; } -/* Returns 1 if added, 0 for otherwise; don't return a negative value! */ /* FIXME: look at device node refcounting */ static int i2sbus_add_dev(struct macio_dev *macio, struct i2sbus_control *control, @@ -214,7 +213,7 @@ static int i2sbus_add_dev(struct macio_dev *macio, * either as the second one in that case is just a modem. */ if (!ok) { kfree(dev); - return 0; + return -ENODEV; } mutex_init(&dev->lock); @@ -303,10 +302,6 @@ static int i2sbus_add_dev(struct macio_dev *macio, if (soundbus_add_one(&dev->sound)) { printk(KERN_DEBUG "i2sbus: device registration error!\n"); - if (dev->sound.ofdev.dev.kobj.state_initialized) { - soundbus_dev_put(&dev->sound); - return 0; - } goto err; }
diff --git a/sound/core/info.c b/sound/core/info.c index d670bd5..f18f4ef 100644 --- a/sound/core/info.c +++ b/sound/core/info.c
@@ -112,9 +112,9 @@ static loff_t snd_info_entry_llseek(struct file *file, loff_t offset, int orig) entry = data->entry; mutex_lock(&entry->access); if (entry->c.ops->llseek) { - ret = entry->c.ops->llseek(entry, - data->file_private_data, - file, offset, orig); + offset = entry->c.ops->llseek(entry, + data->file_private_data, + file, offset, orig); goto out; }
diff --git a/sound/core/misc.c b/sound/core/misc.c index c3f3d94..3579dd7 100644 --- a/sound/core/misc.c +++ b/sound/core/misc.c
@@ -10,7 +10,6 @@ #include <linux/time.h> #include <linux/slab.h> #include <linux/ioport.h> -#include <linux/fs.h> #include <sound/core.h> #ifdef CONFIG_SND_DEBUG @@ -146,96 +145,3 @@ snd_pci_quirk_lookup(struct pci_dev *pci, const struct snd_pci_quirk *list) } EXPORT_SYMBOL(snd_pci_quirk_lookup); #endif - -/* - * Deferred async signal helpers - * - * Below are a few helper functions to wrap the async signal handling - * in the deferred work. The main purpose is to avoid the messy deadlock - * around tasklist_lock and co at the kill_fasync() invocation. - * fasync_helper() and kill_fasync() are replaced with snd_fasync_helper() - * and snd_kill_fasync(), respectively. In addition, snd_fasync_free() has - * to be called at releasing the relevant file object. - */ -struct snd_fasync { - struct fasync_struct *fasync; - int signal; - int poll; - int on; - struct list_head list; -}; - -static DEFINE_SPINLOCK(snd_fasync_lock); -static LIST_HEAD(snd_fasync_list); - -static void snd_fasync_work_fn(struct work_struct *work) -{ - struct snd_fasync *fasync; - - spin_lock_irq(&snd_fasync_lock); - while (!list_empty(&snd_fasync_list)) { - fasync = list_first_entry(&snd_fasync_list, struct snd_fasync, list); - list_del_init(&fasync->list); - spin_unlock_irq(&snd_fasync_lock); - if (fasync->on) - kill_fasync(&fasync->fasync, fasync->signal, fasync->poll); - spin_lock_irq(&snd_fasync_lock); - } - spin_unlock_irq(&snd_fasync_lock); -} - -static DECLARE_WORK(snd_fasync_work, snd_fasync_work_fn); - -int snd_fasync_helper(int fd, struct file *file, int on, - struct snd_fasync **fasyncp) -{ - struct snd_fasync *fasync = NULL; - - if (on) { - fasync = kzalloc(sizeof(*fasync), GFP_KERNEL); - if (!fasync) - return -ENOMEM; - INIT_LIST_HEAD(&fasync->list); - } - - spin_lock_irq(&snd_fasync_lock); - if (*fasyncp) { - kfree(fasync); - fasync = *fasyncp; - } else { - if (!fasync) { - spin_unlock_irq(&snd_fasync_lock); - return 0; - } - *fasyncp = fasync; - } - fasync->on = on; - spin_unlock_irq(&snd_fasync_lock); - return fasync_helper(fd, file, on, &fasync->fasync); -} -EXPORT_SYMBOL_GPL(snd_fasync_helper); - -void snd_kill_fasync(struct snd_fasync *fasync, int signal, int poll) -{ - unsigned long flags; - - if (!fasync || !fasync->on) - return; - spin_lock_irqsave(&snd_fasync_lock, flags); - fasync->signal = signal; - fasync->poll = poll; - list_move(&fasync->list, &snd_fasync_list); - schedule_work(&snd_fasync_work); - spin_unlock_irqrestore(&snd_fasync_lock, flags); -} -EXPORT_SYMBOL_GPL(snd_kill_fasync); - -void snd_fasync_free(struct snd_fasync *fasync) -{ - if (!fasync) - return; - fasync->on = 0; - flush_work(&snd_fasync_work); - kfree(fasync); -} -EXPORT_SYMBOL_GPL(snd_fasync_free);
diff --git a/sound/core/oss/pcm_oss.c b/sound/core/oss/pcm_oss.c index 51d2911..ad4e0af 100644 --- a/sound/core/oss/pcm_oss.c +++ b/sound/core/oss/pcm_oss.c
@@ -1661,14 +1661,13 @@ static int snd_pcm_oss_sync(struct snd_pcm_oss_file *pcm_oss_file) runtime = substream->runtime; if (atomic_read(&substream->mmap_count)) goto __direct; + if ((err = snd_pcm_oss_make_ready(substream)) < 0) + return err; atomic_inc(&runtime->oss.rw_ref); if (mutex_lock_interruptible(&runtime->oss.params_lock)) { atomic_dec(&runtime->oss.rw_ref); return -ERESTARTSYS; } - err = snd_pcm_oss_make_ready_locked(substream); - if (err < 0) - goto unlock; format = snd_pcm_oss_format_from(runtime->oss.format); width = snd_pcm_format_physical_width(format); if (runtime->oss.buffer_used > 0) {
diff --git a/sound/core/pcm_dmaengine.c b/sound/core/pcm_dmaengine.c index 5d9a24c..89a0592 100644 --- a/sound/core/pcm_dmaengine.c +++ b/sound/core/pcm_dmaengine.c
@@ -130,14 +130,12 @@ EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_set_config_from_dai_data); static void dmaengine_pcm_dma_complete(void *arg) { - unsigned int new_pos; struct snd_pcm_substream *substream = arg; struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream); - new_pos = prtd->pos + snd_pcm_lib_period_bytes(substream); - if (new_pos >= snd_pcm_lib_buffer_bytes(substream)) - new_pos = 0; - prtd->pos = new_pos; + prtd->pos += snd_pcm_lib_period_bytes(substream); + if (prtd->pos >= snd_pcm_lib_buffer_bytes(substream)) + prtd->pos = 0; snd_pcm_period_elapsed(substream); }
diff --git a/sound/core/rawmidi.c b/sound/core/rawmidi.c index 6b50c3d..6a3543b 100644 --- a/sound/core/rawmidi.c +++ b/sound/core/rawmidi.c
@@ -1662,8 +1662,10 @@ static int snd_rawmidi_free(struct snd_rawmidi *rmidi) snd_info_free_entry(rmidi->proc_entry); rmidi->proc_entry = NULL; + mutex_lock(®ister_mutex); if (rmidi->ops && rmidi->ops->dev_unregister) rmidi->ops->dev_unregister(rmidi); + mutex_unlock(®ister_mutex); snd_rawmidi_free_substreams(&rmidi->streams[SNDRV_RAWMIDI_STREAM_INPUT]); snd_rawmidi_free_substreams(&rmidi->streams[SNDRV_RAWMIDI_STREAM_OUTPUT]);
diff --git a/sound/core/seq/oss/seq_oss_midi.c b/sound/core/seq/oss/seq_oss_midi.c index f73ee07..2ddfe22 100644 --- a/sound/core/seq/oss/seq_oss_midi.c +++ b/sound/core/seq/oss/seq_oss_midi.c
@@ -267,9 +267,7 @@ snd_seq_oss_midi_clear_all(void) void snd_seq_oss_midi_setup(struct seq_oss_devinfo *dp) { - spin_lock_irq(®ister_lock); dp->max_mididev = max_midi_devs; - spin_unlock_irq(®ister_lock); } /*
diff --git a/sound/core/seq/seq_clientmgr.c b/sound/core/seq/seq_clientmgr.c index 0363670..cc93157 100644 --- a/sound/core/seq/seq_clientmgr.c +++ b/sound/core/seq/seq_clientmgr.c
@@ -121,13 +121,13 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) spin_unlock_irqrestore(&clients_lock, flags); #ifdef CONFIG_MODULES if (!in_interrupt()) { - static DECLARE_BITMAP(client_requested, SNDRV_SEQ_GLOBAL_CLIENTS); - static DECLARE_BITMAP(card_requested, SNDRV_CARDS); - + static char client_requested[SNDRV_SEQ_GLOBAL_CLIENTS]; + static char card_requested[SNDRV_CARDS]; if (clientid < SNDRV_SEQ_GLOBAL_CLIENTS) { int idx; - if (!test_and_set_bit(clientid, client_requested)) { + if (!client_requested[clientid]) { + client_requested[clientid] = 1; for (idx = 0; idx < 15; idx++) { if (seq_client_load[idx] < 0) break; @@ -142,8 +142,10 @@ struct snd_seq_client *snd_seq_client_use_ptr(int clientid) int card = (clientid - SNDRV_SEQ_GLOBAL_CLIENTS) / SNDRV_SEQ_CLIENTS_PER_CARD; if (card < snd_ecards_limit) { - if (!test_and_set_bit(card, card_requested)) + if (! card_requested[card]) { + card_requested[card] = 1; snd_request_card(card); + } snd_seq_device_load_drivers(); } }
diff --git a/sound/core/seq/seq_memory.c b/sound/core/seq/seq_memory.c index bb76a2d..65db1a7 100644 --- a/sound/core/seq/seq_memory.c +++ b/sound/core/seq/seq_memory.c
@@ -112,19 +112,15 @@ EXPORT_SYMBOL(snd_seq_dump_var_event); * expand the variable length event to linear buffer space. */ -static int seq_copy_in_kernel(void *ptr, void *src, int size) +static int seq_copy_in_kernel(char **bufptr, const void *src, int size) { - char **bufptr = ptr; - memcpy(*bufptr, src, size); *bufptr += size; return 0; } -static int seq_copy_in_user(void *ptr, void *src, int size) +static int seq_copy_in_user(char __user **bufptr, const void *src, int size) { - char __user **bufptr = ptr; - if (copy_to_user(*bufptr, src, size)) return -EFAULT; *bufptr += size; @@ -153,7 +149,8 @@ int snd_seq_expand_var_event(const struct snd_seq_event *event, int count, char return newlen; } err = snd_seq_dump_var_event(event, - in_kernel ? seq_copy_in_kernel : seq_copy_in_user, + in_kernel ? (snd_seq_dump_func_t)seq_copy_in_kernel : + (snd_seq_dump_func_t)seq_copy_in_user, &buf); return err < 0 ? err : newlen; }
diff --git a/sound/core/sound_oss.c b/sound/core/sound_oss.c index 99874e8..610f317 100644 --- a/sound/core/sound_oss.c +++ b/sound/core/sound_oss.c
@@ -162,6 +162,7 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev) mutex_unlock(&sound_oss_mutex); return -ENOENT; } + unregister_sound_special(minor); switch (SNDRV_MINOR_OSS_DEVICE(minor)) { case SNDRV_MINOR_OSS_PCM: track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_AUDIO); @@ -173,18 +174,12 @@ int snd_unregister_oss_device(int type, struct snd_card *card, int dev) track2 = SNDRV_MINOR_OSS(cidx, SNDRV_MINOR_OSS_DMMIDI1); break; } - if (track2 >= 0) + if (track2 >= 0) { + unregister_sound_special(track2); snd_oss_minors[track2] = NULL; + } snd_oss_minors[minor] = NULL; mutex_unlock(&sound_oss_mutex); - - /* call unregister_sound_special() outside sound_oss_mutex; - * otherwise may deadlock, as it can trigger the release of a card - */ - unregister_sound_special(minor); - if (track2 >= 0) - unregister_sound_special(track2); - kfree(mptr); return 0; }
diff --git a/sound/core/timer.c b/sound/core/timer.c index 420cc07..d684aa4 100644 --- a/sound/core/timer.c +++ b/sound/core/timer.c
@@ -61,7 +61,7 @@ struct snd_timer_user { unsigned int filter; struct timespec tstamp; /* trigger tstamp */ wait_queue_head_t qchange_sleep; - struct snd_fasync *fasync; + struct fasync_struct *fasync; struct mutex ioctl_lock; }; @@ -1317,7 +1317,7 @@ static void snd_timer_user_interrupt(struct snd_timer_instance *timeri, } __wake: spin_unlock(&tu->qlock); - snd_kill_fasync(tu->fasync, SIGIO, POLL_IN); + kill_fasync(&tu->fasync, SIGIO, POLL_IN); wake_up(&tu->qchange_sleep); } @@ -1354,7 +1354,7 @@ static void snd_timer_user_ccallback(struct snd_timer_instance *timeri, spin_lock_irqsave(&tu->qlock, flags); snd_timer_user_append_to_tqueue(tu, &r1); spin_unlock_irqrestore(&tu->qlock, flags); - snd_kill_fasync(tu->fasync, SIGIO, POLL_IN); + kill_fasync(&tu->fasync, SIGIO, POLL_IN); wake_up(&tu->qchange_sleep); } @@ -1421,7 +1421,7 @@ static void snd_timer_user_tinterrupt(struct snd_timer_instance *timeri, spin_unlock(&tu->qlock); if (append == 0) return; - snd_kill_fasync(tu->fasync, SIGIO, POLL_IN); + kill_fasync(&tu->fasync, SIGIO, POLL_IN); wake_up(&tu->qchange_sleep); } @@ -1487,7 +1487,6 @@ static int snd_timer_user_release(struct inode *inode, struct file *file) if (tu->timeri) snd_timer_close(tu->timeri); mutex_unlock(&tu->ioctl_lock); - snd_fasync_free(tu->fasync); kfree(tu->queue); kfree(tu->tqueue); kfree(tu); @@ -2051,7 +2050,7 @@ static int snd_timer_user_fasync(int fd, struct file * file, int on) struct snd_timer_user *tu; tu = file->private_data; - return snd_fasync_helper(fd, file, on, &tu->fasync); + return fasync_helper(fd, file, on, &tu->fasync); } static ssize_t snd_timer_user_read(struct file *file, char __user *buffer,
diff --git a/sound/drivers/aloop.c b/sound/drivers/aloop.c index 474347a..452b9ea 100644 --- a/sound/drivers/aloop.c +++ b/sound/drivers/aloop.c
@@ -463,18 +463,17 @@ static unsigned int loopback_pos_update(struct loopback_cable *cable) cable->streams[SNDRV_PCM_STREAM_PLAYBACK]; struct loopback_pcm *dpcm_capt = cable->streams[SNDRV_PCM_STREAM_CAPTURE]; - unsigned long delta_play = 0, delta_capt = 0, cur_jiffies; + unsigned long delta_play = 0, delta_capt = 0; unsigned int running, count1, count2; - cur_jiffies = jiffies; running = cable->running ^ cable->pause; if (running & (1 << SNDRV_PCM_STREAM_PLAYBACK)) { - delta_play = cur_jiffies - dpcm_play->last_jiffies; + delta_play = jiffies - dpcm_play->last_jiffies; dpcm_play->last_jiffies += delta_play; } if (running & (1 << SNDRV_PCM_STREAM_CAPTURE)) { - delta_capt = cur_jiffies - dpcm_capt->last_jiffies; + delta_capt = jiffies - dpcm_capt->last_jiffies; dpcm_capt->last_jiffies += delta_capt; }
diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c index 71d0ab1..44776e1 100644 --- a/sound/drivers/mts64.c +++ b/sound/drivers/mts64.c
@@ -816,9 +816,6 @@ static void snd_mts64_interrupt(void *private) u8 status, data; struct snd_rawmidi_substream *substream; - if (!mts) - return; - spin_lock(&mts->lock); ret = mts64_read(mts->pardev->port); data = ret & 0x00ff;
diff --git a/sound/drivers/pcsp/pcsp_lib.c b/sound/drivers/pcsp/pcsp_lib.c index ce5bab7..8f0f05b 100644 --- a/sound/drivers/pcsp/pcsp_lib.c +++ b/sound/drivers/pcsp/pcsp_lib.c
@@ -36,7 +36,7 @@ static void pcsp_call_pcm_elapsed(unsigned long priv) } } -static DECLARE_TASKLET_OLD(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed); +static DECLARE_TASKLET(pcsp_pcm_tasklet, pcsp_call_pcm_elapsed, 0); /* write the port and returns the next expire time in ns; * called at the trigger-start and in hrtimer callback
diff --git a/sound/firewire/tascam/tascam-stream.c b/sound/firewire/tascam/tascam-stream.c index 89918c6..adf69a5 100644 --- a/sound/firewire/tascam/tascam-stream.c +++ b/sound/firewire/tascam/tascam-stream.c
@@ -465,7 +465,7 @@ int snd_tscm_stream_start_duplex(struct snd_tscm *tscm, unsigned int rate) err = amdtp_domain_start(&tscm->domain); if (err < 0) - goto error; + return err; if (!amdtp_stream_wait_callback(&tscm->rx_stream, CALLBACK_TIMEOUT) ||
diff --git a/sound/hda/ext/hdac_ext_stream.c b/sound/hda/ext/hdac_ext_stream.c index 17b34bb..04f4070 100644 --- a/sound/hda/ext/hdac_ext_stream.c +++ b/sound/hda/ext/hdac_ext_stream.c
@@ -475,6 +475,23 @@ int snd_hdac_ext_stream_get_spbmaxfifo(struct hdac_bus *bus, } EXPORT_SYMBOL_GPL(snd_hdac_ext_stream_get_spbmaxfifo); + +/** + * snd_hdac_ext_stop_streams - stop all stream if running + * @bus: HD-audio core bus + */ +void snd_hdac_ext_stop_streams(struct hdac_bus *bus) +{ + struct hdac_stream *stream; + + if (bus->chip_init) { + list_for_each_entry(stream, &bus->stream_list, list) + snd_hdac_stream_stop(stream); + snd_hdac_bus_stop_chip(bus); + } +} +EXPORT_SYMBOL_GPL(snd_hdac_ext_stop_streams); + /** * snd_hdac_ext_stream_drsm_enable - enable DMA resume for a stream * @bus: HD-audio core bus
diff --git a/sound/hda/hdac_stream.c b/sound/hda/hdac_stream.c index 2beb948..b299b8b 100644 --- a/sound/hda/hdac_stream.c +++ b/sound/hda/hdac_stream.c
@@ -143,33 +143,6 @@ void snd_hdac_stream_stop(struct hdac_stream *azx_dev) EXPORT_SYMBOL_GPL(snd_hdac_stream_stop); /** - * snd_hdac_stop_streams - stop all streams - * @bus: HD-audio core bus - */ -void snd_hdac_stop_streams(struct hdac_bus *bus) -{ - struct hdac_stream *stream; - - list_for_each_entry(stream, &bus->stream_list, list) - snd_hdac_stream_stop(stream); -} -EXPORT_SYMBOL_GPL(snd_hdac_stop_streams); - -/** - * snd_hdac_stop_streams_and_chip - stop all streams and chip if running - * @bus: HD-audio core bus - */ -void snd_hdac_stop_streams_and_chip(struct hdac_bus *bus) -{ - - if (bus->chip_init) { - snd_hdac_stop_streams(bus); - snd_hdac_bus_stop_chip(bus); - } -} -EXPORT_SYMBOL_GPL(snd_hdac_stop_streams_and_chip); - -/** * snd_hdac_stream_reset - reset a stream * @azx_dev: HD-audio core stream to reset */
diff --git a/sound/hda/hdac_sysfs.c b/sound/hda/hdac_sysfs.c index bcf302f..e56e833 100644 --- a/sound/hda/hdac_sysfs.c +++ b/sound/hda/hdac_sysfs.c
@@ -346,10 +346,8 @@ static int add_widget_node(struct kobject *parent, hda_nid_t nid, return -ENOMEM; kobject_init(kobj, &widget_ktype); err = kobject_add(kobj, parent, "%02x", nid); - if (err < 0) { - kobject_put(kobj); + if (err < 0) return err; - } err = sysfs_create_group(kobj, group); if (err < 0) { kobject_put(kobj);
diff --git a/sound/i2c/cs8427.c b/sound/i2c/cs8427.c index e8947a0..bac4f00 100644 --- a/sound/i2c/cs8427.c +++ b/sound/i2c/cs8427.c
@@ -553,13 +553,10 @@ int snd_cs8427_iec958_active(struct snd_i2c_device *cs8427, int active) if (snd_BUG_ON(!cs8427)) return -ENXIO; chip = cs8427->private_data; - if (active) { + if (active) memcpy(chip->playback.pcm_status, chip->playback.def_status, 24); - chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE; - } else { - chip->playback.pcm_ctl->vd[0].access |= SNDRV_CTL_ELEM_ACCESS_INACTIVE; - } + chip->playback.pcm_ctl->vd[0].access &= ~SNDRV_CTL_ELEM_ACCESS_INACTIVE; snd_ctl_notify(cs8427->bus->card, SNDRV_CTL_EVENT_MASK_VALUE | SNDRV_CTL_EVENT_MASK_INFO, &chip->playback.pcm_ctl->id);
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index 83bb086..6fb192a 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c
@@ -1945,7 +1945,6 @@ static int snd_ac97_dev_register(struct snd_device *device) snd_ac97_get_short_name(ac97)); if ((err = device_register(&ac97->dev)) < 0) { ac97_err(ac97, "Can't register ac97 bus\n"); - put_device(&ac97->dev); ac97->dev.bus = NULL; return err; }
diff --git a/sound/pci/asihpi/hpi6205.c b/sound/pci/asihpi/hpi6205.c index 4cdaeef..3d6914c 100644 --- a/sound/pci/asihpi/hpi6205.c +++ b/sound/pci/asihpi/hpi6205.c
@@ -430,7 +430,7 @@ void HPI_6205(struct hpi_message *phm, struct hpi_response *phr) pao = hpi_find_adapter(phm->adapter_index); } else { /* subsys messages don't address an adapter */ - phr->error = HPI_ERROR_INVALID_OBJ_INDEX; + _HPI_6205(NULL, phm, phr); return; }
diff --git a/sound/pci/asihpi/hpioctl.c b/sound/pci/asihpi/hpioctl.c index 5cab049..9790f51 100644 --- a/sound/pci/asihpi/hpioctl.c +++ b/sound/pci/asihpi/hpioctl.c
@@ -352,7 +352,7 @@ int asihpi_adapter_probe(struct pci_dev *pci_dev, pci_dev->device, pci_dev->subsystem_vendor, pci_dev->subsystem_device, pci_dev->devfn); - if (pcim_enable_device(pci_dev) < 0) { + if (pci_enable_device(pci_dev) < 0) { dev_err(&pci_dev->dev, "pci_enable_device failed, disabling device\n"); return -EIO;
diff --git a/sound/pci/au88x0/au88x0.h b/sound/pci/au88x0/au88x0.h index 6cbb2bc..0aa7af0 100644 --- a/sound/pci/au88x0/au88x0.h +++ b/sound/pci/au88x0/au88x0.h
@@ -141,7 +141,7 @@ struct snd_vortex { #ifndef CHIP_AU8810 stream_t dma_wt[NR_WT]; wt_voice_t wt_voice[NR_WT]; /* WT register cache. */ - s8 mixwt[(NR_WT / NR_WTPB) * 6]; /* WT mixin objects */ + char mixwt[(NR_WT / NR_WTPB) * 6]; /* WT mixin objects */ #endif /* Global resources */ @@ -235,8 +235,8 @@ static int vortex_alsafmt_aspfmt(snd_pcm_format_t alsafmt, vortex_t *v); static void vortex_connect_default(vortex_t * vortex, int en); static int vortex_adb_allocroute(vortex_t * vortex, int dma, int nr_ch, int dir, int type, int subdev); -static int vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, - int restype); +static char vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, + int restype); #ifndef CHIP_AU8810 static int vortex_wt_allocroute(vortex_t * vortex, int dma, int nr_ch); static void vortex_wt_connect(vortex_t * vortex, int en);
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index 73a7ef8..ce0564c 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c
@@ -1998,7 +1998,7 @@ static int resnum[VORTEX_RESOURCE_LAST] = out: Mean checkout if != 0. Else mean Checkin resource. restype: Indicates type of resource to be checked in or out. */ -static int +static char vortex_adb_checkinout(vortex_t * vortex, int resmap[], int out, int restype) { int i, qty = resnum[restype], resinuse = 0;
diff --git a/sound/pci/emu10k1/emupcm.c b/sound/pci/emu10k1/emupcm.c index 81590de..6530a55 100644 --- a/sound/pci/emu10k1/emupcm.c +++ b/sound/pci/emu10k1/emupcm.c
@@ -123,7 +123,7 @@ static int snd_emu10k1_pcm_channel_alloc(struct snd_emu10k1_pcm * epcm, int voic epcm->voices[0]->epcm = epcm; if (voices > 1) { for (i = 1; i < voices; i++) { - epcm->voices[i] = &epcm->emu->voices[(epcm->voices[0]->number + i) % NUM_G]; + epcm->voices[i] = &epcm->emu->voices[epcm->voices[0]->number + i]; epcm->voices[i]->epcm = epcm; } } @@ -1244,7 +1244,7 @@ static int snd_emu10k1_capture_mic_close(struct snd_pcm_substream *substream) { struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); - emu->capture_mic_interrupt = NULL; + emu->capture_interrupt = NULL; emu->pcm_capture_mic_substream = NULL; return 0; } @@ -1352,7 +1352,7 @@ static int snd_emu10k1_capture_efx_close(struct snd_pcm_substream *substream) { struct snd_emu10k1 *emu = snd_pcm_substream_chip(substream); - emu->capture_efx_interrupt = NULL; + emu->capture_interrupt = NULL; emu->pcm_capture_efx_substream = NULL; return 0; }
diff --git a/sound/pci/hda/hda_beep.c b/sound/pci/hda/hda_beep.c index 5a50b6c..c6e1e03 100644 --- a/sound/pci/hda/hda_beep.c +++ b/sound/pci/hda/hda_beep.c
@@ -118,12 +118,6 @@ static int snd_hda_beep_event(struct input_dev *dev, unsigned int type, return 0; } -static void turn_on_beep(struct hda_beep *beep) -{ - if (beep->keep_power_at_enable) - snd_hda_power_up_pm(beep->codec); -} - static void turn_off_beep(struct hda_beep *beep) { cancel_work_sync(&beep->beep_work); @@ -131,8 +125,6 @@ static void turn_off_beep(struct hda_beep *beep) /* turn off beep */ generate_tone(beep, 0); } - if (beep->keep_power_at_enable) - snd_hda_power_down_pm(beep->codec); } /** @@ -148,9 +140,7 @@ int snd_hda_enable_beep_device(struct hda_codec *codec, int enable) enable = !!enable; if (beep->enabled != enable) { beep->enabled = enable; - if (enable) - turn_on_beep(beep); - else + if (!enable) turn_off_beep(beep); return 1; } @@ -177,8 +167,7 @@ static int beep_dev_disconnect(struct snd_device *device) input_unregister_device(beep->dev); else input_free_device(beep->dev); - if (beep->enabled) - turn_off_beep(beep); + turn_off_beep(beep); return 0; }
diff --git a/sound/pci/hda/hda_beep.h b/sound/pci/hda/hda_beep.h index db76e3d..a25358a 100644 --- a/sound/pci/hda/hda_beep.h +++ b/sound/pci/hda/hda_beep.h
@@ -25,7 +25,6 @@ struct hda_beep { unsigned int enabled:1; unsigned int linear_tone:1; /* linear tone for IDT/STAC codec */ unsigned int playing:1; - unsigned int keep_power_at_enable:1; /* set by driver */ struct work_struct beep_work; /* scheduled task for beep event */ struct mutex mutex; void (*power_hook)(struct hda_beep *beep, bool on);
diff --git a/sound/pci/hda/hda_controller.c b/sound/pci/hda/hda_controller.c index 6dff686..6a159c6 100644 --- a/sound/pci/hda/hda_controller.c +++ b/sound/pci/hda/hda_controller.c
@@ -1093,8 +1093,10 @@ EXPORT_SYMBOL_GPL(azx_init_chip); void azx_stop_all_streams(struct azx *chip) { struct hdac_bus *bus = azx_bus(chip); + struct hdac_stream *s; - snd_hdac_stop_streams(bus); + list_for_each_entry(s, &bus->stream_list, list) + snd_hdac_stream_stop(s); } EXPORT_SYMBOL_GPL(azx_stop_all_streams);
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c index 9b7a345..b8fe0ec 100644 --- a/sound/pci/hda/hda_intel.c +++ b/sound/pci/hda/hda_intel.c
@@ -363,15 +363,10 @@ enum { #define needs_eld_notify_link(chip) false #endif -#define CONTROLLER_IN_GPU(pci) (((pci)->vendor == 0x8086) && \ - (((pci)->device == 0x0a0c) || \ +#define CONTROLLER_IN_GPU(pci) (((pci)->device == 0x0a0c) || \ ((pci)->device == 0x0c0c) || \ ((pci)->device == 0x0d0c) || \ - ((pci)->device == 0x160c) || \ - ((pci)->device == 0x490d) || \ - ((pci)->device == 0x4f90) || \ - ((pci)->device == 0x4f91) || \ - ((pci)->device == 0x4f92))) + ((pci)->device == 0x160c)) #define IS_BXT(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0x5a98) #define IS_CFL(pci) ((pci)->vendor == 0x8086 && (pci)->device == 0xa348) @@ -2506,19 +2501,6 @@ static const struct pci_device_id azx_ids[] = { /* Tigerlake-H */ { PCI_DEVICE(0x8086, 0x43c8), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, - /* DG1 */ - { PCI_DEVICE(0x8086, 0x490d), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, - /* DG2 */ - { PCI_DEVICE(0x8086, 0x4f90), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, - { PCI_DEVICE(0x8086, 0x4f91), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, - { PCI_DEVICE(0x8086, 0x4f92), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, - /* Alderlake-S */ - { PCI_DEVICE(0x8086, 0x7ad0), - .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, /* Elkhart Lake */ { PCI_DEVICE(0x8086, 0x4b55), .driver_data = AZX_DRIVER_SKL | AZX_DCAPS_INTEL_SKYLAKE}, @@ -2546,12 +2528,9 @@ static const struct pci_device_id azx_ids[] = { /* 5 Series/3400 */ { PCI_DEVICE(0x8086, 0x3b56), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, - { PCI_DEVICE(0x8086, 0x3b57), - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_NOPM }, /* Poulsbo */ { PCI_DEVICE(0x8086, 0x811b), - .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE | - AZX_DCAPS_POSFIX_LPIB }, + .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE }, /* Oaktrail */ { PCI_DEVICE(0x8086, 0x080a), .driver_data = AZX_DRIVER_SCH | AZX_DCAPS_INTEL_PCH_BASE },
diff --git a/sound/pci/hda/hda_tegra.c b/sound/pci/hda/hda_tegra.c index e235c3e..2971b34 100644 --- a/sound/pci/hda/hda_tegra.c +++ b/sound/pci/hda/hda_tegra.c
@@ -428,8 +428,7 @@ MODULE_DEVICE_TABLE(of, hda_tegra_match); static int hda_tegra_probe(struct platform_device *pdev) { const unsigned int driver_flags = AZX_DCAPS_CORBRP_SELF_CLEAR | - AZX_DCAPS_PM_RUNTIME | - AZX_DCAPS_4K_BDLE_BOUNDARY; + AZX_DCAPS_PM_RUNTIME; struct snd_card *card; struct azx *chip; struct hda_tegra *hda;
diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c index f958205..9412bdd 100644 --- a/sound/pci/hda/patch_ca0132.c +++ b/sound/pci/hda/patch_ca0132.c
@@ -1182,7 +1182,6 @@ static const struct snd_pci_quirk ca0132_quirks[] = { SND_PCI_QUIRK(0x1458, 0xA026, "Gigabyte G1.Sniper Z97", QUIRK_R3DI), SND_PCI_QUIRK(0x1458, 0xA036, "Gigabyte GA-Z170X-Gaming 7", QUIRK_R3DI), SND_PCI_QUIRK(0x3842, 0x1038, "EVGA X99 Classified", QUIRK_R3DI), - SND_PCI_QUIRK(0x3842, 0x1055, "EVGA Z390 DARK", QUIRK_R3DI), SND_PCI_QUIRK(0x1102, 0x0013, "Recon3D", QUIRK_R3D), SND_PCI_QUIRK(0x1102, 0x0018, "Recon3D", QUIRK_R3D), SND_PCI_QUIRK(0x1102, 0x0051, "Sound Blaster AE-5", QUIRK_AE5), @@ -2047,7 +2046,7 @@ static int dspio_set_uint_param_no_source(struct hda_codec *codec, int mod_id, static int dspio_alloc_dma_chan(struct hda_codec *codec, unsigned int *dma_chan) { int status = 0; - unsigned int size = sizeof(*dma_chan); + unsigned int size = sizeof(dma_chan); codec_dbg(codec, " dspio_alloc_dma_chan() -- begin\n"); status = dspio_scp(codec, MASTERCONTROL, 0x20, @@ -3843,10 +3842,8 @@ static int tuning_ctl_set(struct hda_codec *codec, hda_nid_t nid, for (i = 0; i < TUNING_CTLS_COUNT; i++) if (nid == ca0132_tuning_ctls[i].nid) - goto found; + break; - return -EINVAL; -found: snd_hda_power_up(codec); dspio_set_param(codec, ca0132_tuning_ctls[i].mid, 0x20, ca0132_tuning_ctls[i].req,
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index c10a264..f46204a 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c
@@ -396,7 +396,6 @@ static const struct snd_pci_quirk cs420x_fixup_tbl[] = { /* codec SSID */ SND_PCI_QUIRK(0x106b, 0x0600, "iMac 14,1", CS420X_IMAC27_122), - SND_PCI_QUIRK(0x106b, 0x0900, "iMac 12,1", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x1c00, "MacBookPro 8,1", CS420X_MBP81), SND_PCI_QUIRK(0x106b, 0x2000, "iMac 12,2", CS420X_IMAC27_122), SND_PCI_QUIRK(0x106b, 0x2800, "MacBookPro 10,1", CS420X_MBP101),
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 767872f..d4bfb11 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c
@@ -197,7 +197,6 @@ enum { CXT_PINCFG_LEMOTE_A1205, CXT_PINCFG_COMPAQ_CQ60, CXT_FIXUP_STEREO_DMIC, - CXT_PINCFG_LENOVO_NOTEBOOK, CXT_FIXUP_INC_MIC_BOOST, CXT_FIXUP_HEADPHONE_MIC_PIN, CXT_FIXUP_HEADPHONE_MIC, @@ -738,14 +737,6 @@ static const struct hda_fixup cxt_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = cxt_fixup_stereo_dmic, }, - [CXT_PINCFG_LENOVO_NOTEBOOK] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x1a, 0x05d71030 }, - { } - }, - .chain_id = CXT_FIXUP_STEREO_DMIC, - }, [CXT_FIXUP_INC_MIC_BOOST] = { .type = HDA_FIXUP_FUNC, .v.func = cxt5066_increase_mic_boost, @@ -939,9 +930,6 @@ static const struct snd_pci_quirk cxt5066_fixups[] = { SND_PCI_QUIRK(0x17aa, 0x3905, "Lenovo G50-30", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x390b, "Lenovo G50-80", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x3975, "Lenovo U300s", CXT_FIXUP_STEREO_DMIC), - /* NOTE: we'd need to extend the quirk for 17aa:3977 as the same - * PCI SSID is used on multiple Lenovo models - */ SND_PCI_QUIRK(0x17aa, 0x3977, "Lenovo IdeaPad U310", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x3978, "Lenovo G50-70", CXT_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x17aa, 0x397b, "Lenovo S205", CXT_FIXUP_STEREO_DMIC), @@ -964,7 +952,6 @@ static const struct hda_model_fixup cxt5066_fixup_models[] = { { .id = CXT_FIXUP_HP_DOCK, .name = "hp-dock" }, { .id = CXT_FIXUP_MUTE_LED_GPIO, .name = "mute-led-gpio" }, { .id = CXT_FIXUP_HP_MIC_NO_PRESENCE, .name = "hp-mic-fix" }, - { .id = CXT_PINCFG_LENOVO_NOTEBOOK, .name = "lenovo-20149" }, {} }; @@ -1097,7 +1084,6 @@ static const struct hda_device_id snd_hda_id_conexant[] = { HDA_CODEC_ENTRY(0x14f11f86, "CX8070", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f12008, "CX8200", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f120d0, "CX11970", patch_conexant_auto), - HDA_CODEC_ENTRY(0x14f120d1, "SN6180", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f15045, "CX20549 (Venice)", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f15047, "CX20551 (Waikiki)", patch_conexant_auto), HDA_CODEC_ENTRY(0x14f15051, "CX20561 (Hermosa)", patch_conexant_auto),
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c index 58e9a01..5128a5d 100644 --- a/sound/pci/hda/patch_hdmi.c +++ b/sound/pci/hda/patch_hdmi.c
@@ -1820,8 +1820,6 @@ static int hdmi_add_cvt(struct hda_codec *codec, hda_nid_t cvt_nid) static const struct snd_pci_quirk force_connect_list[] = { SND_PCI_QUIRK(0x103c, 0x870f, "HP", 1), SND_PCI_QUIRK(0x103c, 0x871a, "HP", 1), - SND_PCI_QUIRK(0x103c, 0x8711, "HP", 1), - SND_PCI_QUIRK(0x103c, 0x8715, "HP", 1), SND_PCI_QUIRK(0x1462, 0xec94, "MS-7C94", 1), {} }; @@ -2572,6 +2570,9 @@ static void generic_acomp_pin_eld_notify(void *audio_ptr, int port, int dev_id) */ if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND) return; + /* ditto during suspend/resume process itself */ + if (snd_hdac_is_in_pm(&codec->core)) + return; check_presence_and_report(codec, pin_nid, dev_id); } @@ -2774,6 +2775,9 @@ static void intel_pin_eld_notify(void *audio_ptr, int port, int pipe) */ if (codec->core.dev.power.power_state.event == PM_EVENT_SUSPEND) return; + /* ditto during suspend/resume process itself */ + if (snd_hdac_is_in_pm(&codec->core)) + return; snd_hdac_i915_set_bclk(&codec->bus->core); check_presence_and_report(codec, pin_nid, dev_id); @@ -3699,7 +3703,6 @@ static int patch_tegra_hdmi(struct hda_codec *codec) if (err) return err; - codec->depop_delay = 10; codec->patch_ops.build_pcms = tegra_hdmi_build_pcms; spec = codec->spec; spec->chmap.ops.chmap_cea_alloc_validate_get_type = @@ -4220,10 +4223,7 @@ HDA_CODEC_ENTRY(0x8086280c, "Cannonlake HDMI", patch_i915_glk_hdmi), HDA_CODEC_ENTRY(0x8086280d, "Geminilake HDMI", patch_i915_glk_hdmi), HDA_CODEC_ENTRY(0x8086280f, "Icelake HDMI", patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x80862812, "Tigerlake HDMI", patch_i915_tgl_hdmi), -HDA_CODEC_ENTRY(0x80862814, "DG1 HDMI", patch_i915_tgl_hdmi), -HDA_CODEC_ENTRY(0x80862815, "Alderlake HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x80862816, "Rocketlake HDMI", patch_i915_tgl_hdmi), -HDA_CODEC_ENTRY(0x80862819, "DG2 HDMI", patch_i915_tgl_hdmi), HDA_CODEC_ENTRY(0x8086281a, "Jasperlake HDMI", patch_i915_icl_hdmi), HDA_CODEC_ENTRY(0x80862880, "CedarTrail HDMI", patch_generic_hdmi), HDA_CODEC_ENTRY(0x80862882, "Valleyview2 HDMI", patch_i915_byt_hdmi),
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index b6b1440..145e494 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c
@@ -770,7 +770,7 @@ static int alc_subsystem_id(struct hda_codec *codec, const hda_nid_t *ports) alc_setup_gpio(codec, 0x02); break; case 7: - alc_setup_gpio(codec, 0x04); + alc_setup_gpio(codec, 0x03); break; case 5: default: @@ -2574,7 +2574,6 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { SND_PCI_QUIRK(0x1462, 0xda57, "MSI Z270-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS), SND_PCI_QUIRK_VENDOR(0x1462, "MSI", ALC882_FIXUP_GPIO3), SND_PCI_QUIRK(0x147b, 0x107a, "Abit AW9D-MAX", ALC882_FIXUP_ABIT_AW9D_MAX), - SND_PCI_QUIRK(0x1558, 0x3702, "Clevo X370SN[VW]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x50d3, "Clevo PC50[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x65d1, "Clevo PB51[ER][CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), SND_PCI_QUIRK(0x1558, 0x65d2, "Clevo PB51R[CDF]", ALC1220_FIXUP_CLEVO_PB51ED_PINS), @@ -3504,15 +3503,6 @@ static void alc256_init(struct hda_codec *codec) hda_nid_t hp_pin = alc_get_hp_pin(spec); bool hp_pin_sense; - if (spec->ultra_low_power) { - alc_update_coef_idx(codec, 0x03, 1<<1, 1<<1); - alc_update_coef_idx(codec, 0x08, 3<<2, 3<<2); - alc_update_coef_idx(codec, 0x08, 7<<4, 0); - alc_update_coef_idx(codec, 0x3b, 1<<15, 0); - alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6); - msleep(30); - } - if (!hp_pin) hp_pin = 0x21; @@ -3524,6 +3514,14 @@ static void alc256_init(struct hda_codec *codec) msleep(2); alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */ + if (spec->ultra_low_power) { + alc_update_coef_idx(codec, 0x03, 1<<1, 1<<1); + alc_update_coef_idx(codec, 0x08, 3<<2, 3<<2); + alc_update_coef_idx(codec, 0x08, 7<<4, 0); + alc_update_coef_idx(codec, 0x3b, 1<<15, 0); + alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6); + msleep(30); + } snd_hda_codec_write(codec, hp_pin, 0, AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE); @@ -3605,13 +3603,6 @@ static void alc225_init(struct hda_codec *codec) hda_nid_t hp_pin = alc_get_hp_pin(spec); bool hp1_pin_sense, hp2_pin_sense; - if (spec->ultra_low_power) { - alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2); - alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6); - alc_update_coef_idx(codec, 0x33, 1<<11, 0); - msleep(30); - } - if (!hp_pin) hp_pin = 0x21; msleep(30); @@ -3623,6 +3614,12 @@ static void alc225_init(struct hda_codec *codec) msleep(2); alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */ + if (spec->ultra_low_power) { + alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2); + alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6); + alc_update_coef_idx(codec, 0x33, 1<<11, 0); + msleep(30); + } if (hp1_pin_sense || spec->ultra_low_power) snd_hda_codec_write(codec, hp_pin, 0, @@ -6373,7 +6370,6 @@ enum { ALC269_FIXUP_LIMIT_INT_MIC_BOOST, ALC269VB_FIXUP_ASUS_ZENBOOK, ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A, - ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE, ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED, ALC269VB_FIXUP_ORDISSIMO_EVE2, ALC283_FIXUP_CHROME_BOOK, @@ -6487,8 +6483,6 @@ enum { ALC294_FIXUP_ASUS_GU502_HP, ALC294_FIXUP_ASUS_GU502_PINS, ALC294_FIXUP_ASUS_GU502_VERBS, - ALC294_FIXUP_ASUS_G513_PINS, - ALC285_FIXUP_ASUS_G533Z_PINS, ALC285_FIXUP_HP_GPIO_LED, ALC285_FIXUP_HP_MUTE_LED, ALC236_FIXUP_HP_GPIO_LED, @@ -6907,15 +6901,6 @@ static const struct hda_fixup alc269_fixups[] = { .chained = true, .chain_id = ALC269VB_FIXUP_ASUS_ZENBOOK, }, - [ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x18, 0x01a110f0 }, /* use as headset mic */ - { } - }, - .chained = true, - .chain_id = ALC269_FIXUP_HEADSET_MIC - }, [ALC269_FIXUP_LIMIT_INT_MIC_BOOST_MUTE_LED] = { .type = HDA_FIXUP_FUNC, .v.func = alc269_fixup_limit_int_mic_boost, @@ -7766,26 +7751,6 @@ static const struct hda_fixup alc269_fixups[] = { .type = HDA_FIXUP_FUNC, .v.func = alc294_fixup_gu502_hp, }, - [ALC294_FIXUP_ASUS_G513_PINS] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x19, 0x03a11050 }, /* front HP mic */ - { 0x1a, 0x03a11c30 }, /* rear external mic */ - { 0x21, 0x03211420 }, /* front HP out */ - { } - }, - }, - [ALC285_FIXUP_ASUS_G533Z_PINS] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x14, 0x90170152 }, /* Speaker Surround Playback Switch */ - { 0x19, 0x03a19020 }, /* Mic Boost Volume */ - { 0x1a, 0x03a11c30 }, /* Mic Boost Volume */ - { 0x1e, 0x90170151 }, /* Rear jack, IN OUT EAPD Detect */ - { 0x21, 0x03211420 }, - { } - }, - }, [ALC294_FIXUP_ASUS_COEF_1B] = { .type = HDA_FIXUP_VERBS, .v.verbs = (const struct hda_verb[]) { @@ -8250,15 +8215,13 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x12a0, "ASUS X441UV", ALC233_FIXUP_EAPD_COEF_AND_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x12e0, "ASUS X541SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x12f0, "ASUS X541UV", ALC256_FIXUP_ASUS_MIC), - SND_PCI_QUIRK(0x1043, 0x1313, "Asus K42JZ", ALC269VB_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x13b0, "ASUS Z550SA", ALC256_FIXUP_ASUS_MIC), SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), - SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), - SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS), SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_DUAL_SPK), + SND_PCI_QUIRK(0x1043, 0x1662, "ASUS GV301QH", ALC294_FIXUP_ASUS_DUAL_SPK), SND_PCI_QUIRK(0x1043, 0x1881, "ASUS Zephyrus S/M", ALC294_FIXUP_ASUS_GX502_PINS), SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), SND_PCI_QUIRK(0x1043, 0x18f1, "Asus FX505DT", ALC256_FIXUP_ASUS_HEADSET_MIC), @@ -8273,17 +8236,14 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x1043, 0x1b13, "Asus U41SV", ALC269_FIXUP_INV_DMIC), SND_PCI_QUIRK(0x1043, 0x1bbd, "ASUS Z550MA", ALC255_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1043, 0x1c23, "Asus X55U", ALC269_FIXUP_LIMIT_INT_MIC_BOOST), - SND_PCI_QUIRK(0x1043, 0x1c92, "ASUS ROG Strix G15", ALC285_FIXUP_ASUS_G533Z_PINS), SND_PCI_QUIRK(0x1043, 0x1ccd, "ASUS X555UB", ALC256_FIXUP_ASUS_MIC), - SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1d4e, "ASUS TM420", ALC256_FIXUP_ASUS_HPE), SND_PCI_QUIRK(0x1043, 0x1e11, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA502), SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS), - SND_PCI_QUIRK(0x1043, 0x1e5e, "ASUS ROG Strix G513", ALC294_FIXUP_ASUS_G513_PINS), SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401), - SND_PCI_QUIRK(0x1043, 0x1c52, "ASUS Zephyrus G15 2022", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401), - SND_PCI_QUIRK(0x1043, 0x1f92, "ASUS ROG Flow X16", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x1d42, "ASUS Zephyrus G14 2022", ALC289_FIXUP_ASUS_GA401), + SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401), SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2), SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC), SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC), @@ -8305,7 +8265,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x10ec, 0x10f2, "Intel Reference board", ALC700_FIXUP_INTEL_REFERENCE), SND_PCI_QUIRK(0x10ec, 0x118c, "Medion EE4254 MD62100", ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE), SND_PCI_QUIRK(0x10ec, 0x1230, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), - SND_PCI_QUIRK(0x10ec, 0x124c, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10ec, 0x1252, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10ec, 0x1254, "Intel Reference board", ALC295_FIXUP_CHROME_BOOK), SND_PCI_QUIRK(0x10f7, 0x8338, "Panasonic CF-SZ6", ALC269_FIXUP_HEADSET_MODE), @@ -8455,7 +8414,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x511f, "Thinkpad", ALC298_FIXUP_TPT470_DOCK), SND_PCI_QUIRK(0x17aa, 0x9e54, "LENOVO NB", ALC269_FIXUP_LENOVO_EAPD), SND_PCI_QUIRK(0x19e5, 0x3204, "Huawei MACH-WX9", ALC256_FIXUP_HUAWEI_MACH_WX9_PINS), - SND_PCI_QUIRK(0x19e5, 0x320f, "Huawei WRT-WX9 ", ALC256_FIXUP_ASUS_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1b35, 0x1235, "CZC B20", ALC269_FIXUP_CZC_B20), SND_PCI_QUIRK(0x1b35, 0x1236, "CZC TMI", ALC269_FIXUP_CZC_TMI), SND_PCI_QUIRK(0x1b35, 0x1237, "CZC L101", ALC269_FIXUP_CZC_L101), @@ -9780,17 +9738,6 @@ static void alc897_fixup_lenovo_headset_mic(struct hda_codec *codec, } } -static void alc897_fixup_lenovo_headset_mode(struct hda_codec *codec, - const struct hda_fixup *fix, int action) -{ - struct alc_spec *spec = codec->spec; - - if (action == HDA_FIXUP_ACT_PRE_PROBE) { - spec->parse_flags |= HDA_PINCFG_HEADSET_MIC; - spec->gen.hp_automute_hook = alc897_hp_automute_hook; - } -} - static const struct coef_fw alc668_coefs[] = { WRITE_COEF(0x01, 0xbebe), WRITE_COEF(0x02, 0xaaaa), WRITE_COEF(0x03, 0x0), WRITE_COEF(0x04, 0x0180), WRITE_COEF(0x06, 0x0), WRITE_COEF(0x07, 0x0f80), @@ -9874,8 +9821,6 @@ enum { ALC897_FIXUP_LENOVO_HEADSET_MIC, ALC897_FIXUP_HEADSET_MIC_PIN, ALC897_FIXUP_HP_HSMIC_VERB, - ALC897_FIXUP_LENOVO_HEADSET_MODE, - ALC897_FIXUP_HEADSET_MIC_PIN2, }; static const struct hda_fixup alc662_fixups[] = { @@ -10302,19 +10247,6 @@ static const struct hda_fixup alc662_fixups[] = { { } }, }, - [ALC897_FIXUP_LENOVO_HEADSET_MODE] = { - .type = HDA_FIXUP_FUNC, - .v.func = alc897_fixup_lenovo_headset_mode, - }, - [ALC897_FIXUP_HEADSET_MIC_PIN2] = { - .type = HDA_FIXUP_PINS, - .v.pins = (const struct hda_pintbl[]) { - { 0x1a, 0x01a11140 }, /* use as headset mic, without its own jack detect */ - { } - }, - .chained = true, - .chain_id = ALC897_FIXUP_LENOVO_HEADSET_MODE - }, }; static const struct snd_pci_quirk alc662_fixup_tbl[] = { @@ -10340,7 +10272,6 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x1028, 0x0698, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x1028, 0x069f, "Dell", ALC668_FIXUP_DELL_MIC_NO_PRESENCE), SND_PCI_QUIRK(0x103c, 0x1632, "HP RP5800", ALC662_FIXUP_HP_RP5800), - SND_PCI_QUIRK(0x103c, 0x870c, "HP", ALC897_FIXUP_HP_HSMIC_VERB), SND_PCI_QUIRK(0x103c, 0x8719, "HP", ALC897_FIXUP_HP_HSMIC_VERB), SND_PCI_QUIRK(0x103c, 0x873e, "HP", ALC671_FIXUP_HP_HEADSET_MIC2), SND_PCI_QUIRK(0x103c, 0x877e, "HP 288 Pro G6", ALC671_FIXUP_HP_HEADSET_MIC2), @@ -10368,7 +10299,6 @@ static const struct snd_pci_quirk alc662_fixup_tbl[] = { SND_PCI_QUIRK(0x17aa, 0x32cb, "Lenovo ThinkCentre M70", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32cf, "Lenovo ThinkCentre M950", ALC897_FIXUP_HEADSET_MIC_PIN), SND_PCI_QUIRK(0x17aa, 0x32f7, "Lenovo ThinkCentre M90", ALC897_FIXUP_HEADSET_MIC_PIN), - SND_PCI_QUIRK(0x17aa, 0x3742, "Lenovo TianYi510Pro-14IOB", ALC897_FIXUP_HEADSET_MIC_PIN2), SND_PCI_QUIRK(0x17aa, 0x38af, "Lenovo Ideapad Y550P", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x17aa, 0x3a0d, "Lenovo Ideapad Y550", ALC662_FIXUP_IDEAPAD), SND_PCI_QUIRK(0x1849, 0x5892, "ASRock B150M", ALC892_FIXUP_ASROCK_MOBO),
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 7fa238e..bfd3fe5 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c
@@ -209,7 +209,6 @@ struct sigmatel_spec { /* beep widgets */ hda_nid_t anabeep_nid; - bool beep_power_on; /* SPDIF-out mux */ const char * const *spdif_labels; @@ -1701,7 +1700,6 @@ static const struct snd_pci_quirk stac925x_fixup_tbl[] = { }; static const struct hda_pintbl ref92hd73xx_pin_configs[] = { - // Port A-H { 0x0a, 0x02214030 }, { 0x0b, 0x02a19040 }, { 0x0c, 0x01a19020 }, @@ -1710,12 +1708,9 @@ static const struct hda_pintbl ref92hd73xx_pin_configs[] = { { 0x0f, 0x01014010 }, { 0x10, 0x01014020 }, { 0x11, 0x01014030 }, - // CD in { 0x12, 0x02319040 }, - // Digial Mic ins { 0x13, 0x90a000f0 }, { 0x14, 0x90a000f0 }, - // Digital outs { 0x22, 0x01452050 }, { 0x23, 0x01452050 }, {} @@ -1756,7 +1751,6 @@ static const struct hda_pintbl alienware_m17x_pin_configs[] = { }; static const struct hda_pintbl intel_dg45id_pin_configs[] = { - // Analog outputs { 0x0a, 0x02214230 }, { 0x0b, 0x02A19240 }, { 0x0c, 0x01013214 }, @@ -1764,9 +1758,6 @@ static const struct hda_pintbl intel_dg45id_pin_configs[] = { { 0x0e, 0x01A19250 }, { 0x0f, 0x01011212 }, { 0x10, 0x01016211 }, - // Digital output - { 0x22, 0x01451380 }, - { 0x23, 0x40f000f0 }, {} }; @@ -1957,8 +1948,6 @@ static const struct snd_pci_quirk stac92hd73xx_fixup_tbl[] = { "DFI LanParty", STAC_92HD73XX_REF), SND_PCI_QUIRK(PCI_VENDOR_ID_DFI, 0x3101, "DFI LanParty", STAC_92HD73XX_REF), - SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5001, - "Intel DP45SG", STAC_92HD73XX_INTEL), SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5002, "Intel DG45ID", STAC_92HD73XX_INTEL), SND_PCI_QUIRK(PCI_VENDOR_ID_INTEL, 0x5003, @@ -4312,8 +4301,6 @@ static int stac_parse_auto_config(struct hda_codec *codec) if (codec->beep) { /* IDT/STAC codecs have linear beep tone parameter */ codec->beep->linear_tone = spec->linear_tone_beep; - /* keep power up while beep is enabled */ - codec->beep->keep_power_at_enable = 1; /* if no beep switch is available, make its own one */ caps = query_amp_caps(codec, nid, HDA_OUTPUT); if (!(caps & AC_AMPCAP_MUTE)) {
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 4a74ccf..3edb4e2 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c
@@ -821,9 +821,6 @@ static int add_secret_dac_path(struct hda_codec *codec) return 0; nums = snd_hda_get_connections(codec, spec->gen.mixer_nid, conn, ARRAY_SIZE(conn) - 1); - if (nums < 0) - return nums; - for (i = 0; i < nums; i++) { if (get_wcaps_type(get_wcaps(codec, conn[i])) == AC_WID_AUD_OUT) return 0;
diff --git a/sound/pci/ice1712/aureon.c b/sound/pci/ice1712/aureon.c index 7175261..4556ba7 100644 --- a/sound/pci/ice1712/aureon.c +++ b/sound/pci/ice1712/aureon.c
@@ -1892,7 +1892,6 @@ static int aureon_add_controls(struct snd_ice1712 *ice) unsigned char id; snd_ice1712_save_gpio_status(ice); id = aureon_cs8415_get(ice, CS8415_ID); - snd_ice1712_restore_gpio_status(ice); if (id != 0x41) dev_info(ice->card->dev, "No CS8415 chip. Skipping CS8415 controls.\n"); @@ -1910,6 +1909,7 @@ static int aureon_add_controls(struct snd_ice1712 *ice) kctl->id.device = ice->pcm->device; } } + snd_ice1712_restore_gpio_status(ice); } return 0;
diff --git a/sound/pci/lx6464es/lx_core.c b/sound/pci/lx6464es/lx_core.c index 00975e8..dd3a873 100644 --- a/sound/pci/lx6464es/lx_core.c +++ b/sound/pci/lx6464es/lx_core.c
@@ -493,11 +493,12 @@ int lx_buffer_ask(struct lx6464es *chip, u32 pipe, int is_capture, dev_dbg(chip->card->dev, "CMD_08_ASK_BUFFERS: needed %d, freed %d\n", *r_needed, *r_freed); - for (i = 0; i < MAX_STREAM_BUFFER && i < chip->rmh.stat_len; - ++i) { - dev_dbg(chip->card->dev, " stat[%d]: %x, %x\n", i, - chip->rmh.stat[i], - chip->rmh.stat[i] & MASK_DATA_SIZE); + for (i = 0; i < MAX_STREAM_BUFFER; ++i) { + for (i = 0; i != chip->rmh.stat_len; ++i) + dev_dbg(chip->card->dev, + " stat[%d]: %x, %x\n", i, + chip->rmh.stat[i], + chip->rmh.stat[i] & MASK_DATA_SIZE); } }
diff --git a/sound/soc/codecs/cs42l56.c b/sound/soc/codecs/cs42l56.c index 7324055..8be7d83 100644 --- a/sound/soc/codecs/cs42l56.c +++ b/sound/soc/codecs/cs42l56.c
@@ -1192,12 +1192,18 @@ static int cs42l56_i2c_probe(struct i2c_client *i2c_client, if (pdata) { cs42l56->pdata = *pdata; } else { + pdata = devm_kzalloc(&i2c_client->dev, sizeof(*pdata), + GFP_KERNEL); + if (!pdata) + return -ENOMEM; + if (i2c_client->dev.of_node) { ret = cs42l56_handle_of_data(i2c_client, &cs42l56->pdata); if (ret != 0) return ret; } + cs42l56->pdata = *pdata; } if (cs42l56->pdata.gpio_nreset) {
diff --git a/sound/soc/codecs/da7210.c b/sound/soc/codecs/da7210.c index efc5049..e172913 100644 --- a/sound/soc/codecs/da7210.c +++ b/sound/soc/codecs/da7210.c
@@ -1333,8 +1333,6 @@ static int __init da7210_modinit(void) int ret = 0; #if IS_ENABLED(CONFIG_I2C) ret = i2c_add_driver(&da7210_i2c_driver); - if (ret) - return ret; #endif #if defined(CONFIG_SPI_MASTER) ret = spi_register_driver(&da7210_spi_driver);
diff --git a/sound/soc/codecs/jz4725b.c b/sound/soc/codecs/jz4725b.c index 48c40a4..2567a5d 100644 --- a/sound/soc/codecs/jz4725b.c +++ b/sound/soc/codecs/jz4725b.c
@@ -136,17 +136,14 @@ enum { #define REG_CGR3_GO1L_OFFSET 0 #define REG_CGR3_GO1L_MASK (0x1f << REG_CGR3_GO1L_OFFSET) -#define REG_CGR10_GIL_OFFSET 0 -#define REG_CGR10_GIR_OFFSET 4 - struct jz_icdc { struct regmap *regmap; void __iomem *base; struct clk *clk; }; -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(jz4725b_adc_tlv, 0, 150, 0); -static const SNDRV_CTL_TLVD_DECLARE_DB_SCALE(jz4725b_dac_tlv, -2250, 150, 0); +static const SNDRV_CTL_TLVD_DECLARE_DB_LINEAR(jz4725b_dac_tlv, -2250, 0); +static const SNDRV_CTL_TLVD_DECLARE_DB_LINEAR(jz4725b_line_tlv, -1500, 600); static const struct snd_kcontrol_new jz4725b_codec_controls[] = { SOC_DOUBLE_TLV("Master Playback Volume", @@ -154,11 +151,11 @@ static const struct snd_kcontrol_new jz4725b_codec_controls[] = { REG_CGR1_GODL_OFFSET, REG_CGR1_GODR_OFFSET, 0xf, 1, jz4725b_dac_tlv), - SOC_DOUBLE_TLV("Master Capture Volume", - JZ4725B_CODEC_REG_CGR10, - REG_CGR10_GIL_OFFSET, - REG_CGR10_GIR_OFFSET, - 0xf, 0, jz4725b_adc_tlv), + SOC_DOUBLE_R_TLV("Master Capture Volume", + JZ4725B_CODEC_REG_CGR3, + JZ4725B_CODEC_REG_CGR2, + REG_CGR2_GO1R_OFFSET, + 0x1f, 1, jz4725b_line_tlv), SOC_SINGLE("Master Playback Switch", JZ4725B_CODEC_REG_CR1, REG_CR1_DAC_MUTE_OFFSET, 1, 1), @@ -183,7 +180,7 @@ static SOC_VALUE_ENUM_SINGLE_DECL(jz4725b_codec_adc_src_enum, jz4725b_codec_adc_src_texts, jz4725b_codec_adc_src_values); static const struct snd_kcontrol_new jz4725b_codec_adc_src_ctrl = - SOC_DAPM_ENUM("ADC Source Capture Route", jz4725b_codec_adc_src_enum); + SOC_DAPM_ENUM("Route", jz4725b_codec_adc_src_enum); static const struct snd_kcontrol_new jz4725b_codec_mixer_controls[] = { SOC_DAPM_SINGLE("Line In Bypass", JZ4725B_CODEC_REG_CR1, @@ -228,7 +225,7 @@ static const struct snd_soc_dapm_widget jz4725b_codec_dapm_widgets[] = { SND_SOC_DAPM_ADC("ADC", "Capture", JZ4725B_CODEC_REG_PMR1, REG_PMR1_SB_ADC_OFFSET, 1), - SND_SOC_DAPM_MUX("ADC Source Capture Route", SND_SOC_NOPM, 0, 0, + SND_SOC_DAPM_MUX("ADC Source", SND_SOC_NOPM, 0, 0, &jz4725b_codec_adc_src_ctrl), /* Mixer */ @@ -239,8 +236,7 @@ static const struct snd_soc_dapm_widget jz4725b_codec_dapm_widgets[] = { SND_SOC_DAPM_MIXER("DAC to Mixer", JZ4725B_CODEC_REG_CR1, REG_CR1_DACSEL_OFFSET, 0, NULL, 0), - SND_SOC_DAPM_MIXER("Line In", JZ4725B_CODEC_REG_PMR1, - REG_PMR1_SB_LIN_OFFSET, 1, NULL, 0), + SND_SOC_DAPM_MIXER("Line In", SND_SOC_NOPM, 0, 0, NULL, 0), SND_SOC_DAPM_MIXER("HP Out", JZ4725B_CODEC_REG_CR1, REG_CR1_HP_DIS_OFFSET, 1, NULL, 0), @@ -287,11 +283,11 @@ static const struct snd_soc_dapm_route jz4725b_codec_dapm_routes[] = { {"Mixer", NULL, "DAC to Mixer"}, {"Mixer to ADC", NULL, "Mixer"}, - {"ADC Source Capture Route", "Mixer", "Mixer to ADC"}, - {"ADC Source Capture Route", "Line In", "Line In"}, - {"ADC Source Capture Route", "Mic 1", "Mic 1"}, - {"ADC Source Capture Route", "Mic 2", "Mic 2"}, - {"ADC", NULL, "ADC Source Capture Route"}, + {"ADC Source", "Mixer", "Mixer to ADC"}, + {"ADC Source", "Line In", "Line In"}, + {"ADC Source", "Mic 1", "Mic 1"}, + {"ADC Source", "Mic 2", "Mic 2"}, + {"ADC", NULL, "ADC Source"}, {"Out Stage", NULL, "Mixer"}, {"HP Out", NULL, "Out Stage"},
diff --git a/sound/soc/codecs/msm8916-wcd-digital.c b/sound/soc/codecs/msm8916-wcd-digital.c index 6e5bce4..e4cde21 100644 --- a/sound/soc/codecs/msm8916-wcd-digital.c +++ b/sound/soc/codecs/msm8916-wcd-digital.c
@@ -328,8 +328,8 @@ static const struct snd_kcontrol_new rx1_mix2_inp1_mux = SOC_DAPM_ENUM( static const struct snd_kcontrol_new rx2_mix2_inp1_mux = SOC_DAPM_ENUM( "RX2 MIX2 INP1 Mux", rx2_mix2_inp1_chain_enum); -/* Digital Gain control -84 dB to +40 dB in 1 dB steps */ -static const DECLARE_TLV_DB_SCALE(digital_gain, -8400, 100, -8400); +/* Digital Gain control -38.4 dB to +38.4 dB in 0.3 dB steps */ +static const DECLARE_TLV_DB_SCALE(digital_gain, -3840, 30, 0); /* Cutoff Freq for High Pass Filter at -3dB */ static const char * const hpf_cutoff_text[] = { @@ -510,15 +510,15 @@ static int wcd_iir_filter_info(struct snd_kcontrol *kcontrol, static const struct snd_kcontrol_new msm8916_wcd_digital_snd_controls[] = { SOC_SINGLE_S8_TLV("RX1 Digital Volume", LPASS_CDC_RX1_VOL_CTL_B2_CTL, - -84, 40, digital_gain), + -128, 127, digital_gain), SOC_SINGLE_S8_TLV("RX2 Digital Volume", LPASS_CDC_RX2_VOL_CTL_B2_CTL, - -84, 40, digital_gain), + -128, 127, digital_gain), SOC_SINGLE_S8_TLV("RX3 Digital Volume", LPASS_CDC_RX3_VOL_CTL_B2_CTL, - -84, 40, digital_gain), + -128, 127, digital_gain), SOC_SINGLE_S8_TLV("TX1 Digital Volume", LPASS_CDC_TX1_VOL_CTL_GAIN, - -84, 40, digital_gain), + -128, 127, digital_gain), SOC_SINGLE_S8_TLV("TX2 Digital Volume", LPASS_CDC_TX2_VOL_CTL_GAIN, - -84, 40, digital_gain), + -128, 127, digital_gain), SOC_ENUM("TX1 HPF Cutoff", tx1_hpf_cutoff_enum), SOC_ENUM("TX2 HPF Cutoff", tx2_hpf_cutoff_enum), SOC_SINGLE("TX1 HPF Switch", LPASS_CDC_TX1_MUX_CTL, 3, 1, 0), @@ -553,22 +553,22 @@ static const struct snd_kcontrol_new msm8916_wcd_digital_snd_controls[] = { WCD_IIR_FILTER_CTL("IIR2 Band3", IIR2, BAND3), WCD_IIR_FILTER_CTL("IIR2 Band4", IIR2, BAND4), WCD_IIR_FILTER_CTL("IIR2 Band5", IIR2, BAND5), - SOC_SINGLE_S8_TLV("IIR1 INP1 Volume", LPASS_CDC_IIR1_GAIN_B1_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR1 INP2 Volume", LPASS_CDC_IIR1_GAIN_B2_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR1 INP3 Volume", LPASS_CDC_IIR1_GAIN_B3_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR1 INP4 Volume", LPASS_CDC_IIR1_GAIN_B4_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR2 INP1 Volume", LPASS_CDC_IIR2_GAIN_B1_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR2 INP2 Volume", LPASS_CDC_IIR2_GAIN_B2_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR2 INP3 Volume", LPASS_CDC_IIR2_GAIN_B3_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("IIR2 INP4 Volume", LPASS_CDC_IIR2_GAIN_B4_CTL, - -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR1 INP1 Volume", LPASS_CDC_IIR1_GAIN_B1_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR1 INP2 Volume", LPASS_CDC_IIR1_GAIN_B2_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR1 INP3 Volume", LPASS_CDC_IIR1_GAIN_B3_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR1 INP4 Volume", LPASS_CDC_IIR1_GAIN_B4_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR2 INP1 Volume", LPASS_CDC_IIR2_GAIN_B1_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR2 INP2 Volume", LPASS_CDC_IIR2_GAIN_B2_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR2 INP3 Volume", LPASS_CDC_IIR2_GAIN_B3_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("IIR2 INP4 Volume", LPASS_CDC_IIR2_GAIN_B4_CTL, + 0, -84, 40, digital_gain), };
diff --git a/sound/soc/codecs/nau8824.c b/sound/soc/codecs/nau8824.c index a95fe3f..c8ccfa2 100644 --- a/sound/soc/codecs/nau8824.c +++ b/sound/soc/codecs/nau8824.c
@@ -1072,7 +1072,6 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, struct snd_soc_component *component = dai->component; struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); unsigned int val_len = 0, osr, ctrl_val, bclk_fs, bclk_div; - int err = -EINVAL; nau8824_sema_acquire(nau8824, HZ); @@ -1089,7 +1088,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, osr &= NAU8824_DAC_OVERSAMPLE_MASK; if (nau8824_clock_check(nau8824, substream->stream, nau8824->fs, osr)) - goto error; + return -EINVAL; regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER, NAU8824_CLK_DAC_SRC_MASK, osr_dac_sel[osr].clk_src << NAU8824_CLK_DAC_SRC_SFT); @@ -1099,7 +1098,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, osr &= NAU8824_ADC_SYNC_DOWN_MASK; if (nau8824_clock_check(nau8824, substream->stream, nau8824->fs, osr)) - goto error; + return -EINVAL; regmap_update_bits(nau8824->regmap, NAU8824_REG_CLK_DIVIDER, NAU8824_CLK_ADC_SRC_MASK, osr_adc_sel[osr].clk_src << NAU8824_CLK_ADC_SRC_SFT); @@ -1120,7 +1119,7 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, else if (bclk_fs <= 256) bclk_div = 0; else - goto error; + return -EINVAL; regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_2, NAU8824_I2S_LRC_DIV_MASK | NAU8824_I2S_BLK_DIV_MASK, @@ -1141,17 +1140,15 @@ static int nau8824_hw_params(struct snd_pcm_substream *substream, val_len |= NAU8824_I2S_DL_32; break; default: - goto error; + return -EINVAL; } regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1, NAU8824_I2S_DL_MASK, val_len); - err = 0; - error: nau8824_sema_release(nau8824); - return err; + return 0; } static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) @@ -1160,6 +1157,8 @@ static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) struct nau8824 *nau8824 = snd_soc_component_get_drvdata(component); unsigned int ctrl1_val = 0, ctrl2_val = 0; + nau8824_sema_acquire(nau8824, HZ); + switch (fmt & SND_SOC_DAIFMT_MASTER_MASK) { case SND_SOC_DAIFMT_CBM_CFM: ctrl2_val |= NAU8824_I2S_MS_MASTER; @@ -1201,8 +1200,6 @@ static int nau8824_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) return -EINVAL; } - nau8824_sema_acquire(nau8824, HZ); - regmap_update_bits(nau8824->regmap, NAU8824_REG_PORT0_I2S_PCM_CTRL_1, NAU8824_I2S_DF_MASK | NAU8824_I2S_BP_MASK | NAU8824_I2S_PCMB_EN, ctrl1_val);
diff --git a/sound/soc/codecs/pcm512x.c b/sound/soc/codecs/pcm512x.c index feb590a..4cbef9a 100644 --- a/sound/soc/codecs/pcm512x.c +++ b/sound/soc/codecs/pcm512x.c
@@ -1598,7 +1598,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) if (val > 6) { dev_err(dev, "Invalid pll-in\n"); ret = -EINVAL; - goto err_pm; + goto err_clk; } pcm512x->pll_in = val; } @@ -1607,7 +1607,7 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) if (val > 6) { dev_err(dev, "Invalid pll-out\n"); ret = -EINVAL; - goto err_pm; + goto err_clk; } pcm512x->pll_out = val; } @@ -1616,12 +1616,12 @@ int pcm512x_probe(struct device *dev, struct regmap *regmap) dev_err(dev, "Error: both pll-in and pll-out, or none\n"); ret = -EINVAL; - goto err_pm; + goto err_clk; } if (pcm512x->pll_in && pcm512x->pll_in == pcm512x->pll_out) { dev_err(dev, "Error: pll-in == pll-out\n"); ret = -EINVAL; - goto err_pm; + goto err_clk; } } #endif
diff --git a/sound/soc/codecs/rt298.c b/sound/soc/codecs/rt298.c index cc7eb34..f8c0f97 100644 --- a/sound/soc/codecs/rt298.c +++ b/sound/soc/codecs/rt298.c
@@ -1166,13 +1166,6 @@ static const struct dmi_system_id force_combo_jack_table[] = { DMI_MATCH(DMI_PRODUCT_NAME, "Geminilake") } }, - { - .ident = "Intel Kabylake R RVP", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), - DMI_MATCH(DMI_PRODUCT_NAME, "Kabylake Client platform") - } - }, { } };
diff --git a/sound/soc/codecs/rt5670.c b/sound/soc/codecs/rt5670.c index fefdd8c..f211817 100644 --- a/sound/soc/codecs/rt5670.c +++ b/sound/soc/codecs/rt5670.c
@@ -3185,6 +3185,8 @@ static int rt5670_i2c_probe(struct i2c_client *i2c, if (ret < 0) goto err; + pm_runtime_put(&i2c->dev); + return 0; err: pm_runtime_disable(&i2c->dev);
diff --git a/sound/soc/codecs/sgtl5000.c b/sound/soc/codecs/sgtl5000.c index d2dfc53..76d3c06 100644 --- a/sound/soc/codecs/sgtl5000.c +++ b/sound/soc/codecs/sgtl5000.c
@@ -1788,7 +1788,6 @@ static int sgtl5000_i2c_remove(struct i2c_client *client) { struct sgtl5000_priv *sgtl5000 = i2c_get_clientdata(client); - regmap_write(sgtl5000->regmap, SGTL5000_CHIP_CLK_CTRL, SGTL5000_CHIP_CLK_CTRL_DEFAULT); regmap_write(sgtl5000->regmap, SGTL5000_CHIP_DIG_POWER, SGTL5000_DIG_POWER_DEFAULT); regmap_write(sgtl5000->regmap, SGTL5000_CHIP_ANA_POWER, SGTL5000_ANA_POWER_DEFAULT);
diff --git a/sound/soc/codecs/wcd9335.c b/sound/soc/codecs/wcd9335.c index a952b94..016aff9 100644 --- a/sound/soc/codecs/wcd9335.c +++ b/sound/soc/codecs/wcd9335.c
@@ -1971,8 +1971,8 @@ static int wcd9335_trigger(struct snd_pcm_substream *substream, int cmd, case SNDRV_PCM_TRIGGER_STOP: case SNDRV_PCM_TRIGGER_SUSPEND: case SNDRV_PCM_TRIGGER_PAUSE_PUSH: - slim_stream_disable(dai_data->sruntime); slim_stream_unprepare(dai_data->sruntime); + slim_stream_disable(dai_data->sruntime); break; default: break; @@ -2252,42 +2252,51 @@ static int wcd9335_rx_hph_mode_put(struct snd_kcontrol *kc, static const struct snd_kcontrol_new wcd9335_snd_controls[] = { /* -84dB min - 40dB max */ - SOC_SINGLE_S8_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX0 Mix Digital Volume", WCD9335_CDC_RX0_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX1 Mix Digital Volume", WCD9335_CDC_RX1_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX2 Mix Digital Volume", WCD9335_CDC_RX2_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX3 Mix Digital Volume", WCD9335_CDC_RX3_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX4 Mix Digital Volume", WCD9335_CDC_RX4_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX5 Mix Digital Volume", WCD9335_CDC_RX5_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX6 Mix Digital Volume", WCD9335_CDC_RX6_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX7 Mix Digital Volume", WCD9335_CDC_RX7_RX_VOL_MIX_CTL, - -84, 40, digital_gain), - SOC_SINGLE_S8_TLV("RX8 Mix Digital Volume", WCD9335_CDC_RX8_RX_VOL_MIX_CTL, - -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX0 Digital Volume", WCD9335_CDC_RX0_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX1 Digital Volume", WCD9335_CDC_RX1_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX2 Digital Volume", WCD9335_CDC_RX2_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX3 Digital Volume", WCD9335_CDC_RX3_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX4 Digital Volume", WCD9335_CDC_RX4_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX5 Digital Volume", WCD9335_CDC_RX5_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX6 Digital Volume", WCD9335_CDC_RX6_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX7 Digital Volume", WCD9335_CDC_RX7_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX8 Digital Volume", WCD9335_CDC_RX8_RX_VOL_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX0 Mix Digital Volume", + WCD9335_CDC_RX0_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX1 Mix Digital Volume", + WCD9335_CDC_RX1_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX2 Mix Digital Volume", + WCD9335_CDC_RX2_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX3 Mix Digital Volume", + WCD9335_CDC_RX3_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX4 Mix Digital Volume", + WCD9335_CDC_RX4_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX5 Mix Digital Volume", + WCD9335_CDC_RX5_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX6 Mix Digital Volume", + WCD9335_CDC_RX6_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX7 Mix Digital Volume", + WCD9335_CDC_RX7_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), + SOC_SINGLE_SX_TLV("RX8 Mix Digital Volume", + WCD9335_CDC_RX8_RX_VOL_MIX_CTL, + 0, -84, 40, digital_gain), SOC_ENUM("RX INT0_1 HPF cut off", cf_int0_1_enum), SOC_ENUM("RX INT0_2 HPF cut off", cf_int0_2_enum), SOC_ENUM("RX INT1_1 HPF cut off", cf_int1_1_enum),
diff --git a/sound/soc/codecs/wm8962.c b/sound/soc/codecs/wm8962.c index c384ca3..ebaee46 100644 --- a/sound/soc/codecs/wm8962.c +++ b/sound/soc/codecs/wm8962.c
@@ -1840,49 +1840,6 @@ SOC_SINGLE_TLV("SPKOUTR Mixer DACR Volume", WM8962_SPEAKER_MIXER_5, 4, 1, 0, inmix_tlv), }; -static int tp_event(struct snd_soc_dapm_widget *w, - struct snd_kcontrol *kcontrol, int event) -{ - int ret, reg, val, mask; - struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm); - - ret = pm_runtime_resume_and_get(component->dev); - if (ret < 0) { - dev_err(component->dev, "Failed to resume device: %d\n", ret); - return ret; - } - - reg = WM8962_ADDITIONAL_CONTROL_4; - - if (!strcmp(w->name, "TEMP_HP")) { - mask = WM8962_TEMP_ENA_HP_MASK; - val = WM8962_TEMP_ENA_HP; - } else if (!strcmp(w->name, "TEMP_SPK")) { - mask = WM8962_TEMP_ENA_SPK_MASK; - val = WM8962_TEMP_ENA_SPK; - } else { - pm_runtime_put(component->dev); - return -EINVAL; - } - - switch (event) { - case SND_SOC_DAPM_POST_PMD: - val = 0; - fallthrough; - case SND_SOC_DAPM_POST_PMU: - ret = snd_soc_component_update_bits(component, reg, mask, val); - break; - default: - WARN(1, "Invalid event %d\n", event); - pm_runtime_put(component->dev); - return -EINVAL; - } - - pm_runtime_put(component->dev); - - return 0; -} - static int cp_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { @@ -2175,10 +2132,8 @@ SND_SOC_DAPM_SUPPLY("TOCLK", WM8962_ADDITIONAL_CONTROL_1, 0, 0, NULL, 0), SND_SOC_DAPM_SUPPLY_S("DSP2", 1, WM8962_DSP2_POWER_MANAGEMENT, WM8962_DSP2_ENA_SHIFT, 0, dsp2_event, SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_PRE_PMD), -SND_SOC_DAPM_SUPPLY("TEMP_HP", SND_SOC_NOPM, 0, 0, tp_event, - SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), -SND_SOC_DAPM_SUPPLY("TEMP_SPK", SND_SOC_NOPM, 0, 0, tp_event, - SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD), +SND_SOC_DAPM_SUPPLY("TEMP_HP", WM8962_ADDITIONAL_CONTROL_4, 2, 0, NULL, 0), +SND_SOC_DAPM_SUPPLY("TEMP_SPK", WM8962_ADDITIONAL_CONTROL_4, 1, 0, NULL, 0), SND_SOC_DAPM_MIXER("INPGAL", WM8962_LEFT_INPUT_PGA_CONTROL, 4, 0, inpgal, ARRAY_SIZE(inpgal)), @@ -3795,11 +3750,6 @@ static int wm8962_i2c_probe(struct i2c_client *i2c, if (ret < 0) goto err_pm_runtime; - regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4, - WM8962_TEMP_ENA_HP_MASK, 0); - regmap_update_bits(wm8962->regmap, WM8962_ADDITIONAL_CONTROL_4, - WM8962_TEMP_ENA_SPK_MASK, 0); - regcache_cache_only(wm8962->regmap, true); /* The drivers should power up as needed */
diff --git a/sound/soc/codecs/wm8994.c b/sound/soc/codecs/wm8994.c index 4ae7ec8..6dbab3f 100644 --- a/sound/soc/codecs/wm8994.c +++ b/sound/soc/codecs/wm8994.c
@@ -3711,12 +3711,7 @@ static irqreturn_t wm1811_jackdet_irq(int irq, void *data) } else { dev_dbg(component->dev, "Jack not detected\n"); - /* Release wm8994->accdet_lock to avoid deadlock: - * cancel_delayed_work_sync() takes wm8994->mic_work internal - * lock and wm1811_mic_work takes wm8994->accdet_lock */ - mutex_unlock(&wm8994->accdet_lock); cancel_delayed_work_sync(&wm8994->mic_work); - mutex_lock(&wm8994->accdet_lock); snd_soc_component_update_bits(component, WM8958_MICBIAS2, WM8958_MICB2_DISCH, WM8958_MICB2_DISCH);
diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c index bf3d3f0..6f3b768 100644 --- a/sound/soc/fsl/eukrea-tlv320.c +++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -86,7 +86,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) int ret; int int_port = 0, ext_port; struct device_node *np = pdev->dev.of_node; - struct device_node *ssi_np = NULL, *codec_np = NULL, *tmp_np = NULL; + struct device_node *ssi_np = NULL, *codec_np = NULL; eukrea_tlv320.dev = &pdev->dev; if (np) { @@ -143,7 +143,7 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) } if (machine_is_eukrea_cpuimx27() || - (tmp_np = of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux"))) { + of_find_compatible_node(NULL, NULL, "fsl,imx21-audmux")) { imx_audmux_v1_configure_port(MX27_AUDMUX_HPCR1_SSI0, IMX_AUDMUX_V1_PCR_SYN | IMX_AUDMUX_V1_PCR_TFSDIR | @@ -158,11 +158,10 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) IMX_AUDMUX_V1_PCR_SYN | IMX_AUDMUX_V1_PCR_RXDSEL(MX27_AUDMUX_HPCR1_SSI0) ); - of_node_put(tmp_np); } else if (machine_is_eukrea_cpuimx25sd() || machine_is_eukrea_cpuimx35sd() || machine_is_eukrea_cpuimx51sd() || - (tmp_np = of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux"))) { + of_find_compatible_node(NULL, NULL, "fsl,imx31-audmux")) { if (!np) ext_port = machine_is_eukrea_cpuimx25sd() ? 4 : 3; @@ -179,7 +178,6 @@ static int eukrea_tlv320_probe(struct platform_device *pdev) IMX_AUDMUX_V2_PTCR_SYN, IMX_AUDMUX_V2_PDCR_RXDSEL(int_port) ); - of_node_put(tmp_np); } else { if (np) { /* The eukrea,asoc-tlv320 driver was explicitly
diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.c index db663e7..39ea9bd 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c
@@ -112,11 +112,11 @@ static const struct snd_soc_dapm_route audio_map[] = { static const struct snd_soc_dapm_route audio_map_ac97[] = { /* 1st half -- Normal DAPM routes */ - {"AC97 Playback", NULL, "CPU AC97 Playback"}, - {"CPU AC97 Capture", NULL, "AC97 Capture"}, + {"Playback", NULL, "AC97 Playback"}, + {"AC97 Capture", NULL, "Capture"}, /* 2nd half -- ASRC DAPM routes */ - {"CPU AC97 Playback", NULL, "ASRC-Playback"}, - {"ASRC-Capture", NULL, "CPU AC97 Capture"}, + {"AC97 Playback", NULL, "ASRC-Playback"}, + {"ASRC-Capture", NULL, "AC97 Capture"}, }; /* Add all possible widgets into here without being redundant */
diff --git a/sound/soc/fsl/fsl_micfil.c b/sound/soc/fsl/fsl_micfil.c index b33746d..f7f2d29 100644 --- a/sound/soc/fsl/fsl_micfil.c +++ b/sound/soc/fsl/fsl_micfil.c
@@ -87,21 +87,21 @@ static DECLARE_TLV_DB_SCALE(gain_tlv, 0, 100, 0); static const struct snd_kcontrol_new fsl_micfil_snd_controls[] = { SOC_SINGLE_SX_TLV("CH0 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(0), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(0), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH1 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(1), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(1), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH2 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(2), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(2), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH3 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(3), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(3), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH4 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(4), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(4), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH5 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(5), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(5), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH6 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(6), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(6), 0xF, 0x7, gain_tlv), SOC_SINGLE_SX_TLV("CH7 Volume", REG_MICFIL_OUT_CTRL, - MICFIL_OUTGAIN_CHX_SHIFT(7), 0x8, 0xF, gain_tlv), + MICFIL_OUTGAIN_CHX_SHIFT(7), 0xF, 0x7, gain_tlv), SOC_ENUM_EXT("MICFIL Quality Select", fsl_micfil_quality_enum, snd_soc_get_enum_double, snd_soc_put_enum_double),
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index f844523..0272596 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c
@@ -212,7 +212,6 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai, if (!sai->is_lsb_first) val_cr4 |= FSL_SAI_CR4_MF; - sai->is_dsp_mode = false; /* DAI mode */ switch (fmt & SND_SOC_DAIFMT_FORMAT_MASK) { case SND_SOC_DAIFMT_I2S:
diff --git a/sound/soc/fsl/fsl_ssi.c b/sound/soc/fsl/fsl_ssi.c index 0ab35c3..ed18bc69 100644 --- a/sound/soc/fsl/fsl_ssi.c +++ b/sound/soc/fsl/fsl_ssi.c
@@ -1147,14 +1147,14 @@ static struct snd_soc_dai_driver fsl_ssi_ac97_dai = { .symmetric_channels = 1, .probe = fsl_ssi_dai_probe, .playback = { - .stream_name = "CPU AC97 Playback", + .stream_name = "AC97 Playback", .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_8000_48000, .formats = SNDRV_PCM_FMTBIT_S16 | SNDRV_PCM_FMTBIT_S20, }, .capture = { - .stream_name = "CPU AC97 Capture", + .stream_name = "AC97 Capture", .channels_min = 2, .channels_max = 2, .rates = SNDRV_PCM_RATE_48000,
diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index a96a7cd..1bc4981 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c
@@ -149,10 +149,8 @@ static int asoc_simple_parse_dai(struct device_node *ep, * if he unbinded CPU or Codec. */ ret = snd_soc_get_dai_name(&args, &dlc->dai_name); - if (ret < 0) { - of_node_put(node); + if (ret < 0) return ret; - } dlc->of_node = node; @@ -466,10 +464,8 @@ static int graph_for_each_link(struct asoc_simple_priv *priv, of_node_put(codec_ep); of_node_put(codec_port); - if (ret < 0) { - of_node_put(cpu_ep); + if (ret < 0) return ret; - } codec_port_old = codec_port; }
diff --git a/sound/soc/intel/boards/bytcht_es8316.c b/sound/soc/intel/boards/bytcht_es8316.c index 57d6d0b..ed33217 100644 --- a/sound/soc/intel/boards/bytcht_es8316.c +++ b/sound/soc/intel/boards/bytcht_es8316.c
@@ -446,13 +446,6 @@ static const struct dmi_system_id byt_cht_es8316_quirk_table[] = { | BYT_CHT_ES8316_INTMIC_IN2_MAP | BYT_CHT_ES8316_JD_INVERTED), }, - { /* Nanote UMPC-01 */ - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "RWC CO.,LTD"), - DMI_MATCH(DMI_PRODUCT_NAME, "UMPC-01"), - }, - .driver_data = (void *)BYT_CHT_ES8316_INTMIC_IN1_MAP, - }, { /* Teclast X98 Plus II */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "TECLAST"),
diff --git a/sound/soc/intel/boards/bytcr_rt5640.c b/sound/soc/intel/boards/bytcr_rt5640.c index 6a8edb0..7830d01 100644 --- a/sound/soc/intel/boards/bytcr_rt5640.c +++ b/sound/soc/intel/boards/bytcr_rt5640.c
@@ -429,21 +429,6 @@ static const struct dmi_system_id byt_rt5640_quirk_table[] = { BYT_RT5640_MCLK_EN), }, { - /* Advantech MICA-071 */ - .matches = { - DMI_EXACT_MATCH(DMI_SYS_VENDOR, "Advantech"), - DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MICA-071"), - }, - /* OVCD Th = 1500uA to reliable detect head-phones vs -set */ - .driver_data = (void *)(BYT_RT5640_IN3_MAP | - BYT_RT5640_JD_SRC_JD2_IN4N | - BYT_RT5640_OVCD_TH_1500UA | - BYT_RT5640_OVCD_SF_0P75 | - BYT_RT5640_MONO_SPEAKER | - BYT_RT5640_DIFF_MIC | - BYT_RT5640_MCLK_EN), - }, - { .matches = { DMI_EXACT_MATCH(DMI_SYS_VENDOR, "ARCHOS"), DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "ARCHOS 80 Cesium"),
diff --git a/sound/soc/intel/boards/bytcr_rt5651.c b/sound/soc/intel/boards/bytcr_rt5651.c index 0c1c862..921c09c 100644 --- a/sound/soc/intel/boards/bytcr_rt5651.c +++ b/sound/soc/intel/boards/bytcr_rt5651.c
@@ -919,6 +919,7 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) if (adev) { snprintf(byt_rt5651_codec_name, sizeof(byt_rt5651_codec_name), "i2c-%s", acpi_dev_name(adev)); + put_device(&adev->dev); byt_rt5651_dais[dai_index].codecs->name = byt_rt5651_codec_name; } else { dev_err(&pdev->dev, "Error cannot find '%s' dev\n", mach->id); @@ -927,7 +928,6 @@ static int snd_byt_rt5651_mc_probe(struct platform_device *pdev) codec_dev = bus_find_device_by_name(&i2c_bus_type, NULL, byt_rt5651_codec_name); - acpi_dev_put(adev); if (!codec_dev) return -EPROBE_DEFER;
diff --git a/sound/soc/intel/skylake/skl.c b/sound/soc/intel/skylake/skl.c index 80cff74..2e5fbd2 100644 --- a/sound/soc/intel/skylake/skl.c +++ b/sound/soc/intel/skylake/skl.c
@@ -438,7 +438,7 @@ static int skl_free(struct hdac_bus *bus) skl->init_done = 0; /* to be sure */ - snd_hdac_stop_streams_and_chip(bus); + snd_hdac_ext_stop_streams(bus); if (bus->irq >= 0) free_irq(bus->irq, (void *)bus); @@ -1116,10 +1116,7 @@ static void skl_shutdown(struct pci_dev *pci) if (!skl->init_done) return; - snd_hdac_stop_streams(bus); - snd_hdac_ext_bus_link_power_down_all(bus); - skl_dsp_sleep(skl->dsp); - + snd_hdac_ext_stop_streams(bus); list_for_each_entry(s, &bus->stream_list, list) { stream = stream_to_hdac_ext_stream(s); snd_hdac_ext_stream_decouple(bus, stream, false);
diff --git a/sound/soc/kirkwood/kirkwood-dma.c b/sound/soc/kirkwood/kirkwood-dma.c index 0215d18..d2d5c25 100644 --- a/sound/soc/kirkwood/kirkwood-dma.c +++ b/sound/soc/kirkwood/kirkwood-dma.c
@@ -86,7 +86,7 @@ kirkwood_dma_conf_mbus_windows(void __iomem *base, int win, /* try to find matching cs for current dma address */ for (i = 0; i < dram->num_cs; i++) { - const struct mbus_dram_window *cs = &dram->cs[i]; + const struct mbus_dram_window *cs = dram->cs + i; if ((cs->base & 0xffff0000) < (dma & 0xffff0000)) { writel(cs->base & 0xffff0000, base + KIRKWOOD_AUDIO_WIN_BASE_REG(win));
diff --git a/sound/soc/mediatek/common/mtk-btcvsd.c b/sound/soc/mediatek/common/mtk-btcvsd.c index f6ec693..b66f7de 100644 --- a/sound/soc/mediatek/common/mtk-btcvsd.c +++ b/sound/soc/mediatek/common/mtk-btcvsd.c
@@ -1054,9 +1054,11 @@ static int mtk_pcm_btcvsd_copy(struct snd_pcm_substream *substream, struct mtk_btcvsd_snd *bt = snd_soc_component_get_drvdata(component); if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) - return mtk_btcvsd_snd_write(bt, buf, count); + mtk_btcvsd_snd_write(bt, buf, count); else - return mtk_btcvsd_snd_read(bt, buf, count); + mtk_btcvsd_snd_read(bt, buf, count); + + return 0; } static struct snd_pcm_ops mtk_btcvsd_ops = {
diff --git a/sound/soc/mediatek/mt6797/mt6797-mt6351.c b/sound/soc/mediatek/mt6797/mt6797-mt6351.c index d2f6213..496f32b 100644 --- a/sound/soc/mediatek/mt6797/mt6797-mt6351.c +++ b/sound/soc/mediatek/mt6797/mt6797-mt6351.c
@@ -217,8 +217,7 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) if (!codec_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_platform_node; + return -EINVAL; } for_each_card_prelinks(card, i, dai_link) { if (dai_link->codecs->name) @@ -231,9 +230,6 @@ static int mt6797_mt6351_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret); - of_node_put(codec_node); -put_platform_node: - of_node_put(platform_node); return ret; }
diff --git a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c index f3dbd81..0ee2925 100644 --- a/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c +++ b/sound/soc/mediatek/mt8173/mt8173-afe-pcm.c
@@ -1073,6 +1073,16 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) afe->dev = &pdev->dev; + irq_id = platform_get_irq(pdev, 0); + if (irq_id <= 0) + return irq_id < 0 ? irq_id : -ENXIO; + ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, + 0, "Afe_ISR_Handle", (void *)afe); + if (ret) { + dev_err(afe->dev, "could not request_irq\n"); + return ret; + } + afe->base_addr = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(afe->base_addr)) return PTR_ERR(afe->base_addr); @@ -1148,16 +1158,6 @@ static int mt8173_afe_pcm_dev_probe(struct platform_device *pdev) if (ret) goto err_pm_disable; - irq_id = platform_get_irq(pdev, 0); - if (irq_id <= 0) - return irq_id < 0 ? irq_id : -ENXIO; - ret = devm_request_irq(afe->dev, irq_id, mt8173_afe_irq_handler, - 0, "Afe_ISR_Handle", (void *)afe); - if (ret) { - dev_err(afe->dev, "could not request_irq\n"); - goto err_pm_disable; - } - dev_info(&pdev->dev, "MT8173 AFE driver initialized.\n"); return 0;
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c index a21aefe..6f85423 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c
@@ -200,16 +200,14 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node = of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1); if (!mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto out; + return -EINVAL; } mt8173_rt5650_rt5514_codec_conf[0].of_node = mt8173_rt5650_rt5514_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node; @@ -221,7 +219,6 @@ static int mt8173_rt5650_rt5514_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret); -out: of_node_put(platform_node); return ret; }
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c index 8e1e60a..727ff0f 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c
@@ -256,16 +256,14 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_node; + return -EINVAL; } mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node = of_parse_phandle(pdev->dev.of_node, "mediatek,audio-codec", 1); if (!mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_node; + return -EINVAL; } mt8173_rt5650_rt5676_codec_conf[0].of_node = mt8173_rt5650_rt5676_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node; @@ -278,8 +276,7 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_rt5676_dais[DAI_LINK_HDMI_I2S].codecs->of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_node; + return -EINVAL; } card->dev = &pdev->dev; @@ -289,7 +286,6 @@ static int mt8173_rt5650_rt5676_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret); -put_node: of_node_put(platform_node); return ret; }
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c index cdfc697..21e7d4d 100644 --- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c +++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -266,8 +266,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_platform_node; + return -EINVAL; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].of_node = mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[0].of_node; @@ -280,7 +279,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s codec_capture_dai name fail %d\n", __func__, ret); - goto put_platform_node; + return ret; } mt8173_rt5650_dais[DAI_LINK_CODEC_I2S].codecs[1].dai_name = codec_capture_dai; @@ -302,8 +301,7 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) if (!mt8173_rt5650_dais[DAI_LINK_HDMI_I2S].codecs->of_node) { dev_err(&pdev->dev, "Property 'audio-codec' missing or invalid\n"); - ret = -EINVAL; - goto put_platform_node; + return -EINVAL; } card->dev = &pdev->dev; @@ -312,7 +310,6 @@ static int mt8173_rt5650_dev_probe(struct platform_device *pdev) dev_err(&pdev->dev, "%s snd_soc_register_card fail %d\n", __func__, ret); -put_platform_node: of_node_put(platform_node); return ret; }
diff --git a/sound/soc/pxa/mmp-pcm.c b/sound/soc/pxa/mmp-pcm.c index e9f9642..7096b52 100644 --- a/sound/soc/pxa/mmp-pcm.c +++ b/sound/soc/pxa/mmp-pcm.c
@@ -85,7 +85,7 @@ static bool filter(struct dma_chan *chan, void *param) devname = kasprintf(GFP_KERNEL, "%s.%d", dma_data->dma_res->name, dma_data->ssp_id); - if (devname && (strcmp(dev_name(chan->device->dev), devname) == 0) && + if ((strcmp(dev_name(chan->device->dev), devname) == 0) && (chan->chan_id == dma_data->dma_res->start)) { found = true; }
diff --git a/sound/soc/qcom/qdsp6/q6adm.c b/sound/soc/qcom/qdsp6/q6adm.c index 8e35399..da24251 100644 --- a/sound/soc/qcom/qdsp6/q6adm.c +++ b/sound/soc/qcom/qdsp6/q6adm.c
@@ -217,7 +217,7 @@ static struct q6copp *q6adm_alloc_copp(struct q6adm *adm, int port_idx) idx = find_first_zero_bit(&adm->copp_bitmap[port_idx], MAX_COPPS_PER_PORT); - if (idx >= MAX_COPPS_PER_PORT) + if (idx > MAX_COPPS_PER_PORT) return ERR_PTR(-EBUSY); c = kzalloc(sizeof(*c), GFP_ATOMIC);
diff --git a/sound/soc/rockchip/rockchip_pdm.c b/sound/soc/rockchip/rockchip_pdm.c index 9f6cbaf..1707414 100644 --- a/sound/soc/rockchip/rockchip_pdm.c +++ b/sound/soc/rockchip/rockchip_pdm.c
@@ -368,7 +368,6 @@ static int rockchip_pdm_runtime_resume(struct device *dev) ret = clk_prepare_enable(pdm->hclk); if (ret) { - clk_disable_unprepare(pdm->clk); dev_err(pdm->dev, "hclock enable failed %d\n", ret); return ret; }
diff --git a/sound/soc/rockchip/rockchip_spdif.c b/sound/soc/rockchip/rockchip_spdif.c index b2b4e5b..6635145 100644 --- a/sound/soc/rockchip/rockchip_spdif.c +++ b/sound/soc/rockchip/rockchip_spdif.c
@@ -86,7 +86,6 @@ static int __maybe_unused rk_spdif_runtime_resume(struct device *dev) ret = clk_prepare_enable(spdif->hclk); if (ret) { - clk_disable_unprepare(spdif->mclk); dev_err(spdif->dev, "hclk clock enable failed %d\n", ret); return ret; }
diff --git a/sound/soc/sh/rcar/ctu.c b/sound/soc/sh/rcar/ctu.c index 25a8cfc..7647b3d 100644 --- a/sound/soc/sh/rcar/ctu.c +++ b/sound/soc/sh/rcar/ctu.c
@@ -171,11 +171,7 @@ static int rsnd_ctu_init(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - int ret; - - ret = rsnd_mod_power_on(mod); - if (ret < 0) - return ret; + rsnd_mod_power_on(mod); rsnd_ctu_activation(mod);
diff --git a/sound/soc/sh/rcar/dvc.c b/sound/soc/sh/rcar/dvc.c index 53b2ad0..8d91c0e 100644 --- a/sound/soc/sh/rcar/dvc.c +++ b/sound/soc/sh/rcar/dvc.c
@@ -186,11 +186,7 @@ static int rsnd_dvc_init(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - int ret; - - ret = rsnd_mod_power_on(mod); - if (ret < 0) - return ret; + rsnd_mod_power_on(mod); rsnd_dvc_activation(mod);
diff --git a/sound/soc/sh/rcar/mix.c b/sound/soc/sh/rcar/mix.c index c6fe259..a3e0370 100644 --- a/sound/soc/sh/rcar/mix.c +++ b/sound/soc/sh/rcar/mix.c
@@ -146,11 +146,7 @@ static int rsnd_mix_init(struct rsnd_mod *mod, struct rsnd_dai_stream *io, struct rsnd_priv *priv) { - int ret; - - ret = rsnd_mod_power_on(mod); - if (ret < 0) - return ret; + rsnd_mod_power_on(mod); rsnd_mix_activation(mod);
diff --git a/sound/soc/sh/rcar/src.c b/sound/soc/sh/rcar/src.c index fd52e26..585ffba 100644 --- a/sound/soc/sh/rcar/src.c +++ b/sound/soc/sh/rcar/src.c
@@ -454,14 +454,11 @@ static int rsnd_src_init(struct rsnd_mod *mod, struct rsnd_priv *priv) { struct rsnd_src *src = rsnd_mod_to_src(mod); - int ret; /* reset sync convert_rate */ src->sync.val = 0; - ret = rsnd_mod_power_on(mod); - if (ret < 0) - return ret; + rsnd_mod_power_on(mod); rsnd_src_activation(mod);
diff --git a/sound/soc/sh/rcar/ssi.c b/sound/soc/sh/rcar/ssi.c index f8960ba..09af402 100644 --- a/sound/soc/sh/rcar/ssi.c +++ b/sound/soc/sh/rcar/ssi.c
@@ -518,9 +518,7 @@ static int rsnd_ssi_init(struct rsnd_mod *mod, ssi->usrcnt++; - ret = rsnd_mod_power_on(mod); - if (ret < 0) - return ret; + rsnd_mod_power_on(mod); rsnd_ssi_config_init(mod, io);
diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c index 1e37bb7..da6e40a 100644 --- a/sound/soc/soc-compress.c +++ b/sound/soc/soc-compress.c
@@ -927,7 +927,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) rtd->fe_compr = 1; if (rtd->dai_link->dpcm_playback) be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd; - if (rtd->dai_link->dpcm_capture) + else if (rtd->dai_link->dpcm_capture) be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd; memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops)); } else {
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index f4224f3..7e05a00 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c
@@ -3545,23 +3545,10 @@ EXPORT_SYMBOL_GPL(snd_soc_of_get_dai_link_codecs); static int __init snd_soc_init(void) { - int ret; - snd_soc_debugfs_init(); - ret = snd_soc_util_init(); - if (ret) - goto err_util_init; + snd_soc_util_init(); - ret = platform_driver_register(&soc_driver); - if (ret) - goto err_register; - return 0; - -err_register: - snd_soc_util_exit(); -err_util_init: - snd_soc_debugfs_exit(); - return ret; + return platform_driver_register(&soc_driver); } module_init(snd_soc_init);
diff --git a/sound/soc/soc-ops.c b/sound/soc/soc-ops.c index e01f3bf..453b61b 100644 --- a/sound/soc/soc-ops.c +++ b/sound/soc/soc-ops.c
@@ -445,7 +445,7 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, val = ucontrol->value.integer.value[0]; if (mc->platform_max && val > mc->platform_max) return -EINVAL; - if (val > max) + if (val > max - min) return -EINVAL; if (val < 0) return -EINVAL; @@ -458,15 +458,8 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, return err; if (snd_soc_volsw_is_stereo(mc)) { - val2 = ucontrol->value.integer.value[1]; - - if (mc->platform_max && val2 > mc->platform_max) - return -EINVAL; - if (val2 > max) - return -EINVAL; - val_mask = mask << rshift; - val2 = (val2 + min) & mask; + val2 = (ucontrol->value.integer.value[1] + min) & mask; val2 = val2 << rshift; err = snd_soc_component_update_bits(component, reg2, val_mask,
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c index 2779541..0ff61b3 100644 --- a/sound/soc/soc-pcm.c +++ b/sound/soc/soc-pcm.c
@@ -1254,8 +1254,6 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, return; be_substream = snd_soc_dpcm_get_substream(be, stream); - if (!be_substream) - return; for_each_dpcm_fe(be, stream, dpcm) { if (dpcm->fe == fe)
diff --git a/sound/soc/soc-utils.c b/sound/soc/soc-utils.c index abcc5d9..54dcece 100644 --- a/sound/soc/soc-utils.c +++ b/sound/soc/soc-utils.c
@@ -174,7 +174,7 @@ int __init snd_soc_util_init(void) return ret; } -void snd_soc_util_exit(void) +void __exit snd_soc_util_exit(void) { platform_driver_unregister(&soc_dummy_driver); platform_device_unregister(soc_dummy_dev);
diff --git a/sound/soc/sof/intel/hda-dai.c b/sound/soc/sof/intel/hda-dai.c index c30e450..b3cdd10 100644 --- a/sound/soc/sof/intel/hda-dai.c +++ b/sound/soc/sof/intel/hda-dai.c
@@ -211,10 +211,6 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, int stream_tag; int ret; - link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name); - if (!link) - return -EINVAL; - /* get stored dma data if resuming from system suspend */ link_dev = snd_soc_dai_get_dma_data(dai, substream); if (!link_dev) { @@ -235,6 +231,10 @@ static int hda_link_hw_params(struct snd_pcm_substream *substream, if (ret < 0) return ret; + link = snd_hdac_ext_bus_get_link(bus, codec_dai->component->name); + if (!link) + return -EINVAL; + /* set the stream tag in the codec dai dma params */ if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK) snd_soc_dai_set_tdm_slot(codec_dai, stream_tag, 0, 0, 0);
diff --git a/sound/synth/emux/emux.c b/sound/synth/emux/emux.c index c60ff81..6695530 100644 --- a/sound/synth/emux/emux.c +++ b/sound/synth/emux/emux.c
@@ -125,10 +125,15 @@ EXPORT_SYMBOL(snd_emux_register); */ int snd_emux_free(struct snd_emux *emu) { + unsigned long flags; + if (! emu) return -EINVAL; - del_timer_sync(&emu->tlist); + spin_lock_irqsave(&emu->voice_lock, flags); + if (emu->timer_active) + del_timer(&emu->tlist); + spin_unlock_irqrestore(&emu->voice_lock, flags); snd_emux_proc_free(emu); snd_emux_delete_virmidi(emu);
diff --git a/sound/synth/emux/emux_nrpn.c b/sound/synth/emux/emux_nrpn.c index 641dc02..1ac2267 100644 --- a/sound/synth/emux/emux_nrpn.c +++ b/sound/synth/emux/emux_nrpn.c
@@ -349,9 +349,6 @@ int snd_emux_xg_control(struct snd_emux_port *port, struct snd_midi_channel *chan, int param) { - if (param >= ARRAY_SIZE(chan->control)) - return -EINVAL; - return send_converted_effect(xg_effects, ARRAY_SIZE(xg_effects), port, chan, param, chan->control[param],
diff --git a/sound/usb/bcd2000/bcd2000.c b/sound/usb/bcd2000/bcd2000.c index 97afb37..6e31758 100644 --- a/sound/usb/bcd2000/bcd2000.c +++ b/sound/usb/bcd2000/bcd2000.c
@@ -348,8 +348,7 @@ static int bcd2000_init_midi(struct bcd2000 *bcd2k) static void bcd2000_free_usb_related_resources(struct bcd2000 *bcd2k, struct usb_interface *interface) { - usb_kill_urb(bcd2k->midi_out_urb); - usb_kill_urb(bcd2k->midi_in_urb); + /* usb_kill_urb not necessary, urb is aborted automatically */ usb_free_urb(bcd2k->midi_out_urb); usb_free_urb(bcd2k->midi_in_urb);
diff --git a/sound/usb/endpoint.c b/sound/usb/endpoint.c index ed52fa4..87cc249 100644 --- a/sound/usb/endpoint.c +++ b/sound/usb/endpoint.c
@@ -73,13 +73,12 @@ static inline unsigned get_usb_high_speed_rate(unsigned int rate) */ static void release_urb_ctx(struct snd_urb_ctx *u) { - if (u->urb && u->buffer_size) + if (u->buffer_size) usb_free_coherent(u->ep->chip->dev, u->buffer_size, u->urb->transfer_buffer, u->urb->transfer_dma); usb_free_urb(u->urb); u->urb = NULL; - u->buffer_size = 0; } static const char *usb_error_string(int err) @@ -978,7 +977,6 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) if (!ep->syncbuf) return -ENOMEM; - ep->nurbs = SYNC_URBS; for (i = 0; i < SYNC_URBS; i++) { struct snd_urb_ctx *u = &ep->urb[i]; u->index = i; @@ -998,6 +996,8 @@ static int sync_ep_set_params(struct snd_usb_endpoint *ep) u->urb->complete = snd_complete_urb; } + ep->nurbs = SYNC_URBS; + return 0; out_of_memory:
diff --git a/sound/usb/format.c b/sound/usb/format.c index 11a4454..84b66f7 100644 --- a/sound/usb/format.c +++ b/sound/usb/format.c
@@ -40,12 +40,8 @@ static u64 parse_audio_format_i_type(struct snd_usb_audio *chip, case UAC_VERSION_1: default: { struct uac_format_type_i_discrete_descriptor *fmt = _fmt; - if (format >= 64) { - usb_audio_info(chip, - "%u:%d: invalid format type 0x%llx is detected, processed as PCM\n", - fp->iface, fp->altsetting, format); - format = UAC_FORMAT_TYPE_I_PCM; - } + if (format >= 64) + return 0; /* invalid format */ sample_width = fmt->bBitResolution; sample_bytes = fmt->bSubframeSize; format = 1ULL << format;
diff --git a/sound/usb/line6/driver.c b/sound/usb/line6/driver.c index 22104cb..8ca56ba 100644 --- a/sound/usb/line6/driver.c +++ b/sound/usb/line6/driver.c
@@ -303,8 +303,7 @@ static void line6_data_received(struct urb *urb) for (;;) { done = line6_midibuf_read(mb, line6->buffer_message, - LINE6_MIDI_MESSAGE_MAXLEN, - LINE6_MIDIBUF_READ_RX); + LINE6_MIDI_MESSAGE_MAXLEN); if (done <= 0) break;
diff --git a/sound/usb/line6/midi.c b/sound/usb/line6/midi.c index 0838632..ba0e2b7 100644 --- a/sound/usb/line6/midi.c +++ b/sound/usb/line6/midi.c
@@ -44,8 +44,7 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream) int req, done; for (;;) { - req = min3(line6_midibuf_bytes_free(mb), line6->max_packet_size, - LINE6_FALLBACK_MAXPACKETSIZE); + req = min(line6_midibuf_bytes_free(mb), line6->max_packet_size); done = snd_rawmidi_transmit_peek(substream, chunk, req); if (done == 0) @@ -57,8 +56,7 @@ static void line6_midi_transmit(struct snd_rawmidi_substream *substream) for (;;) { done = line6_midibuf_read(mb, chunk, - LINE6_FALLBACK_MAXPACKETSIZE, - LINE6_MIDIBUF_READ_TX); + LINE6_FALLBACK_MAXPACKETSIZE); if (done == 0) break;
diff --git a/sound/usb/line6/midibuf.c b/sound/usb/line6/midibuf.c index e7f830f..6a70463 100644 --- a/sound/usb/line6/midibuf.c +++ b/sound/usb/line6/midibuf.c
@@ -9,7 +9,6 @@ #include "midibuf.h" - static int midibuf_message_length(unsigned char code) { int message_length; @@ -21,7 +20,12 @@ static int midibuf_message_length(unsigned char code) message_length = length[(code >> 4) - 8]; } else { - static const int length[] = { -1, 2, 2, 2, -1, -1, 1, 1, 1, -1, + /* + Note that according to the MIDI specification 0xf2 is + the "Song Position Pointer", but this is used by Line 6 + to send sysex messages to the host. + */ + static const int length[] = { -1, 2, -1, 2, -1, -1, 1, 1, 1, 1, 1, 1, 1, -1, 1, 1 }; message_length = length[code & 0x0f]; @@ -121,7 +125,7 @@ int line6_midibuf_write(struct midi_buffer *this, unsigned char *data, } int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, - int length, int read_type) + int length) { int bytes_used; int length1, length2; @@ -144,22 +148,9 @@ int line6_midibuf_read(struct midi_buffer *this, unsigned char *data, length1 = this->size - this->pos_read; - command = this->buf[this->pos_read]; - /* - PODxt always has status byte lower nibble set to 0010, - when it means to send 0000, so we correct if here so - that control/program changes come on channel 1 and - sysex message status byte is correct - */ - if (read_type == LINE6_MIDIBUF_READ_RX) { - if (command == 0xb2 || command == 0xc2 || command == 0xf2) { - unsigned char fixed = command & 0xf0; - this->buf[this->pos_read] = fixed; - command = fixed; - } - } - /* check MIDI command length */ + command = this->buf[this->pos_read]; + if (command & 0x80) { midi_length = midibuf_message_length(command); this->command_prev = command;
diff --git a/sound/usb/line6/midibuf.h b/sound/usb/line6/midibuf.h index 542e8d8..124a8f9 100644 --- a/sound/usb/line6/midibuf.h +++ b/sound/usb/line6/midibuf.h
@@ -8,9 +8,6 @@ #ifndef MIDIBUF_H #define MIDIBUF_H -#define LINE6_MIDIBUF_READ_TX 0 -#define LINE6_MIDIBUF_READ_RX 1 - struct midi_buffer { unsigned char *buf; int size; @@ -26,7 +23,7 @@ extern void line6_midibuf_destroy(struct midi_buffer *mb); extern int line6_midibuf_ignore(struct midi_buffer *mb, int length); extern int line6_midibuf_init(struct midi_buffer *mb, int size, int split); extern int line6_midibuf_read(struct midi_buffer *mb, unsigned char *data, - int length, int read_type); + int length); extern void line6_midibuf_reset(struct midi_buffer *mb); extern int line6_midibuf_write(struct midi_buffer *mb, unsigned char *data, int length);
diff --git a/sound/usb/line6/pod.c b/sound/usb/line6/pod.c index e765f98..b667bb8 100644 --- a/sound/usb/line6/pod.c +++ b/sound/usb/line6/pod.c
@@ -159,9 +159,8 @@ static struct line6_pcm_properties pod_pcm_properties = { .bytes_per_channel = 3 /* SNDRV_PCM_FMTBIT_S24_3LE */ }; - static const char pod_version_header[] = { - 0xf0, 0x7e, 0x7f, 0x06, 0x02 + 0xf2, 0x7e, 0x7f, 0x06, 0x02 }; static char *pod_alloc_sysex_buffer(struct usb_line6_pod *pod, int code,
diff --git a/sound/usb/midi.c b/sound/usb/midi.c index f175c53..ce50120 100644 --- a/sound/usb/midi.c +++ b/sound/usb/midi.c
@@ -1149,8 +1149,10 @@ static int snd_usbmidi_output_open(struct snd_rawmidi_substream *substream) port = &umidi->endpoints[i].out->ports[j]; break; } - if (!port) + if (!port) { + snd_BUG(); return -ENXIO; + } substream->runtime->private_data = port; port->state = STATE_UNKNOWN;
diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h index 0665741..c29ccdf 100644 --- a/sound/usb/quirks-table.h +++ b/sound/usb/quirks-table.h
@@ -2148,10 +2148,6 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, { - /* M-Audio Micro */ - USB_DEVICE_VENDOR_SPEC(0x0763, 0x201a), -}, -{ USB_DEVICE_VENDOR_SPEC(0x0763, 0x2030), .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { /* .vendor_name = "M-Audio", */ @@ -3764,64 +3760,6 @@ ALC1220_VB_DESKTOP(0x26ce, 0x0a01), /* Asrock TRX40 Creator */ }, /* - * MacroSilicon MS2100/MS2106 based AV capture cards - * - * These claim 96kHz 1ch in the descriptors, but are actually 48kHz 2ch. - * They also need QUIRK_AUDIO_ALIGN_TRANSFER, which makes one wonder if - * they pretend to be 96kHz mono as a workaround for stereo being broken - * by that... - * - * They also have an issue with initial stream alignment that causes the - * channels to be swapped and out of phase, which is dealt with in quirks.c. - */ -{ - .match_flags = USB_DEVICE_ID_MATCH_DEVICE | - USB_DEVICE_ID_MATCH_INT_CLASS | - USB_DEVICE_ID_MATCH_INT_SUBCLASS, - .idVendor = 0x534d, - .idProduct = 0x0021, - .bInterfaceClass = USB_CLASS_AUDIO, - .bInterfaceSubClass = USB_SUBCLASS_AUDIOCONTROL, - .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) { - .vendor_name = "MacroSilicon", - .product_name = "MS210x", - .ifnum = QUIRK_ANY_INTERFACE, - .type = QUIRK_COMPOSITE, - .data = &(const struct snd_usb_audio_quirk[]) { - { - .ifnum = 2, - .type = QUIRK_AUDIO_ALIGN_TRANSFER, - }, - { - .ifnum = 2, - .type = QUIRK_AUDIO_STANDARD_MIXER, - }, - { - .ifnum = 3, - .type = QUIRK_AUDIO_FIXED_ENDPOINT, - .data = &(const struct audioformat) { - .formats = SNDRV_PCM_FMTBIT_S16_LE, - .channels = 2, - .iface = 3, - .altsetting = 1, - .altset_idx = 1, - .attributes = 0, - .endpoint = 0x82, - .ep_attr = USB_ENDPOINT_XFER_ISOC | - USB_ENDPOINT_SYNC_ASYNC, - .rates = SNDRV_PCM_RATE_CONTINUOUS, - .rate_min = 48000, - .rate_max = 48000, - } - }, - { - .ifnum = -1 - } - } - } -}, - -/* * MacroSilicon MS2109 based HDMI capture cards * * These claim 96kHz 1ch in the descriptors, but are actually 48kHz 2ch.
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 28489aa..7222354 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c
@@ -1440,7 +1440,6 @@ void snd_usb_set_format_quirk(struct snd_usb_substream *subs, case USB_ID(0x041e, 0x3f19): /* E-Mu 0204 USB */ set_format_emu_quirk(subs, fmt); break; - case USB_ID(0x534d, 0x0021): /* MacroSilicon MS2100/MS2106 */ case USB_ID(0x534d, 0x2109): /* MacroSilicon MS2109 */ subs->stream_offset_adj = 2; break; @@ -1676,7 +1675,6 @@ u64 snd_usb_interface_dsd_format_quirks(struct snd_usb_audio *chip, /* XMOS based USB DACs */ switch (chip->usb_id) { case USB_ID(0x1511, 0x0037): /* AURALiC VEGA */ - case USB_ID(0x21ed, 0xd75a): /* Accuphase DAC-60 option card */ case USB_ID(0x2522, 0x0012): /* LH Labs VI DAC Infinity */ case USB_ID(0x2772, 0x0230): /* Pro-Ject Pre Box S2 Digital */ if (fp->altsetting == 2)
diff --git a/sound/usb/stream.c b/sound/usb/stream.c index b62f2b5..0e8198c 100644 --- a/sound/usb/stream.c +++ b/sound/usb/stream.c
@@ -1107,7 +1107,7 @@ static int __snd_usb_parse_audio_interface(struct snd_usb_audio *chip, * Dallas DS4201 workaround: It presents 5 altsettings, but the last * one misses syncpipe, and does not produce any sound. */ - if (chip->usb_id == USB_ID(0x04fa, 0x4201) && num >= 4) + if (chip->usb_id == USB_ID(0x04fa, 0x4201)) num = 4; for (i = 0; i < num; i++) {
diff --git a/tools/arch/parisc/include/uapi/asm/mman.h b/tools/arch/parisc/include/uapi/asm/mman.h index 7d685a1..f9fd132 100644 --- a/tools/arch/parisc/include/uapi/asm/mman.h +++ b/tools/arch/parisc/include/uapi/asm/mman.h
@@ -1,20 +1,20 @@ /* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ #ifndef TOOLS_ARCH_PARISC_UAPI_ASM_MMAN_FIX_H #define TOOLS_ARCH_PARISC_UAPI_ASM_MMAN_FIX_H -#define MADV_DODUMP 17 +#define MADV_DODUMP 70 #define MADV_DOFORK 11 -#define MADV_DONTDUMP 16 +#define MADV_DONTDUMP 69 #define MADV_DONTFORK 10 #define MADV_DONTNEED 4 #define MADV_FREE 8 -#define MADV_HUGEPAGE 14 -#define MADV_MERGEABLE 12 -#define MADV_NOHUGEPAGE 15 +#define MADV_HUGEPAGE 67 +#define MADV_MERGEABLE 65 +#define MADV_NOHUGEPAGE 68 #define MADV_NORMAL 0 #define MADV_RANDOM 1 #define MADV_REMOVE 9 #define MADV_SEQUENTIAL 2 -#define MADV_UNMERGEABLE 13 +#define MADV_UNMERGEABLE 66 #define MADV_WILLNEED 3 #define MAP_ANONYMOUS 0x10 #define MAP_DENYWRITE 0x0800
diff --git a/tools/arch/x86/include/asm/cpufeatures.h b/tools/arch/x86/include/asm/cpufeatures.h index 3efaf33..59f924e 100644 --- a/tools/arch/x86/include/asm/cpufeatures.h +++ b/tools/arch/x86/include/asm/cpufeatures.h
@@ -284,7 +284,7 @@ #define X86_FEATURE_CQM_MBM_LOCAL (11*32+ 3) /* LLC Local MBM monitoring */ #define X86_FEATURE_FENCE_SWAPGS_USER (11*32+ 4) /* "" LFENCE in user entry SWAPGS path */ #define X86_FEATURE_FENCE_SWAPGS_KERNEL (11*32+ 5) /* "" LFENCE in kernel entry SWAPGS path */ -#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+17) /* "" Fill RSB on VM-Exit when EIBRS is enabled */ +#define X86_FEATURE_RSB_VMEXIT_LITE (11*32+ 6) /* "" Fill RSB on VM-Exit when EIBRS is enabled */ /* Intel-defined CPU features, CPUID level 0x00000007:1 (EAX), word 12 */ #define X86_FEATURE_AVX512_BF16 (12*32+ 5) /* AVX512 BFLOAT16 instructions */
diff --git a/tools/arch/x86/include/uapi/asm/vmx.h b/tools/arch/x86/include/uapi/asm/vmx.h index e95b72e..3eb8411 100644 --- a/tools/arch/x86/include/uapi/asm/vmx.h +++ b/tools/arch/x86/include/uapi/asm/vmx.h
@@ -33,7 +33,7 @@ #define EXIT_REASON_TRIPLE_FAULT 2 #define EXIT_REASON_INIT_SIGNAL 3 -#define EXIT_REASON_INTERRUPT_WINDOW 7 +#define EXIT_REASON_PENDING_INTERRUPT 7 #define EXIT_REASON_NMI_WINDOW 8 #define EXIT_REASON_TASK_SWITCH 9 #define EXIT_REASON_CPUID 10 @@ -94,7 +94,7 @@ { EXIT_REASON_EXTERNAL_INTERRUPT, "EXTERNAL_INTERRUPT" }, \ { EXIT_REASON_TRIPLE_FAULT, "TRIPLE_FAULT" }, \ { EXIT_REASON_INIT_SIGNAL, "INIT_SIGNAL" }, \ - { EXIT_REASON_INTERRUPT_WINDOW, "INTERRUPT_WINDOW" }, \ + { EXIT_REASON_PENDING_INTERRUPT, "PENDING_INTERRUPT" }, \ { EXIT_REASON_NMI_WINDOW, "NMI_WINDOW" }, \ { EXIT_REASON_TASK_SWITCH, "TASK_SWITCH" }, \ { EXIT_REASON_CPUID, "CPUID" }, \
diff --git a/tools/bootconfig/include/linux/memblock.h b/tools/bootconfig/include/linux/memblock.h index f2e506f..7862f21 100644 --- a/tools/bootconfig/include/linux/memblock.h +++ b/tools/bootconfig/include/linux/memblock.h
@@ -4,8 +4,9 @@ #include <stdlib.h> +#define __pa(addr) (addr) #define SMP_CACHE_BYTES 0 #define memblock_alloc(size, align) malloc(size) -#define memblock_free_ptr(paddr, size) free(paddr) +#define memblock_free(paddr, size) free(paddr) #endif
diff --git a/tools/bpf/bpftool/btf_dumper.c b/tools/bpf/bpftool/btf_dumper.c index ebb73e4..397e571 100644 --- a/tools/bpf/bpftool/btf_dumper.c +++ b/tools/bpf/bpftool/btf_dumper.c
@@ -251,7 +251,7 @@ static int btf_dumper_int(const struct btf_type *t, __u8 bit_offset, *(char *)data); break; case BTF_INT_BOOL: - jsonw_bool(jw, *(bool *)data); + jsonw_bool(jw, *(int *)data); break; default: /* shouldn't happen */
diff --git a/tools/bpf/bpftool/main.c b/tools/bpf/bpftool/main.c index 35984bd..4b03983 100644 --- a/tools/bpf/bpftool/main.c +++ b/tools/bpf/bpftool/main.c
@@ -364,16 +364,6 @@ int main(int argc, char **argv) setlinebuf(stdout); -#ifdef USE_LIBCAP - /* Libcap < 2.63 hooks before main() to compute the number of - * capabilities of the running kernel, and doing so it calls prctl() - * which may fail and set errno to non-zero. - * Let's reset errno to make sure this does not interfere with the - * batch mode. - */ - errno = 0; -#endif - last_do_help = do_help; pretty_output = false; json_output = false;
diff --git a/tools/build/feature/test-libcrypto.c b/tools/build/feature/test-libcrypto.c index bc34a5b..a98174e 100644 --- a/tools/build/feature/test-libcrypto.c +++ b/tools/build/feature/test-libcrypto.c
@@ -1,23 +1,16 @@ // SPDX-License-Identifier: GPL-2.0 -#include <openssl/evp.h> #include <openssl/sha.h> #include <openssl/md5.h> int main(void) { - EVP_MD_CTX *mdctx; + MD5_CTX context; unsigned char md[MD5_DIGEST_LENGTH + SHA_DIGEST_LENGTH]; unsigned char dat[] = "12345"; - unsigned int digest_len; - mdctx = EVP_MD_CTX_new(); - if (!mdctx) - return 0; - - EVP_DigestInit_ex(mdctx, EVP_md5(), NULL); - EVP_DigestUpdate(mdctx, &dat[0], sizeof(dat)); - EVP_DigestFinal_ex(mdctx, &md[0], &digest_len); - EVP_MD_CTX_free(mdctx); + MD5_Init(&context); + MD5_Update(&context, &dat[0], sizeof(dat)); + MD5_Final(&md[0], &context); SHA1(&dat[0], sizeof(dat), &md[0]);
diff --git a/tools/iio/iio_utils.c b/tools/iio/iio_utils.c index 4836099..7399eb7 100644 --- a/tools/iio/iio_utils.c +++ b/tools/iio/iio_utils.c
@@ -262,7 +262,6 @@ int iioutils_get_param_float(float *output, const char *param_name, if (fscanf(sysfsfp, "%f", output) != 1) ret = errno ? -errno : -ENODATA; - fclose(sysfsfp); break; } error_free_filename: @@ -343,9 +342,9 @@ int build_channel_array(const char *device_dir, } sysfsfp = fopen(filename, "r"); - free(filename); if (!sysfsfp) { ret = -errno; + free(filename); goto error_close_dir; } @@ -355,6 +354,7 @@ int build_channel_array(const char *device_dir, if (fclose(sysfsfp)) perror("build_channel_array(): Failed to close file"); + free(filename); goto error_close_dir; } if (ret == 1) @@ -362,9 +362,11 @@ int build_channel_array(const char *device_dir, if (fclose(sysfsfp)) { ret = -errno; + free(filename); goto error_close_dir; } + free(filename); } *ci_array = malloc(sizeof(**ci_array) * (*counter)); @@ -390,9 +392,9 @@ int build_channel_array(const char *device_dir, } sysfsfp = fopen(filename, "r"); - free(filename); if (!sysfsfp) { ret = -errno; + free(filename); count--; goto error_cleanup_array; } @@ -400,17 +402,20 @@ int build_channel_array(const char *device_dir, errno = 0; if (fscanf(sysfsfp, "%i", ¤t_enabled) != 1) { ret = errno ? -errno : -ENODATA; + free(filename); count--; goto error_cleanup_array; } if (fclose(sysfsfp)) { ret = -errno; + free(filename); count--; goto error_cleanup_array; } if (!current_enabled) { + free(filename); count--; continue; } @@ -421,6 +426,7 @@ int build_channel_array(const char *device_dir, strlen(ent->d_name) - strlen("_en")); if (!current->name) { + free(filename); ret = -ENOMEM; count--; goto error_cleanup_array; @@ -430,6 +436,7 @@ int build_channel_array(const char *device_dir, ret = iioutils_break_up_name(current->name, ¤t->generic_name); if (ret) { + free(filename); free(current->name); count--; goto error_cleanup_array; @@ -440,16 +447,17 @@ int build_channel_array(const char *device_dir, scan_el_dir, current->name); if (ret < 0) { + free(filename); ret = -ENOMEM; goto error_cleanup_array; } sysfsfp = fopen(filename, "r"); - free(filename); if (!sysfsfp) { ret = -errno; - fprintf(stderr, "failed to open %s/%s_index\n", - scan_el_dir, current->name); + fprintf(stderr, "failed to open %s\n", + filename); + free(filename); goto error_cleanup_array; } @@ -459,14 +467,17 @@ int build_channel_array(const char *device_dir, if (fclose(sysfsfp)) perror("build_channel_array(): Failed to close file"); + free(filename); goto error_cleanup_array; } if (fclose(sysfsfp)) { ret = -errno; + free(filename); goto error_cleanup_array; } + free(filename); /* Find the scale */ ret = iioutils_get_param_float(¤t->scale, "scale", @@ -532,10 +543,6 @@ static int calc_digits(int num) { int count = 0; - /* It takes a digit to represent zero */ - if (!num) - return 1; - while (num != 0) { num /= 10; count++;
diff --git a/tools/include/nolibc/nolibc.h b/tools/include/nolibc/nolibc.h index c20d2fe..b8cecb6 100644 --- a/tools/include/nolibc/nolibc.h +++ b/tools/include/nolibc/nolibc.h
@@ -2318,9 +2318,9 @@ static __attribute__((unused)) int memcmp(const void *s1, const void *s2, size_t n) { size_t ofs = 0; - int c1 = 0; + char c1 = 0; - while (ofs < n && !(c1 = ((unsigned char *)s1)[ofs] - ((unsigned char *)s2)[ofs])) { + while (ofs < n && !(c1 = ((char *)s1)[ofs] - ((char *)s2)[ofs])) { ofs++; } return c1;
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index b884981..2a1dbf5 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c
@@ -1884,7 +1884,7 @@ static int bpf_map_find_btf_info(struct bpf_object *obj, struct bpf_map *map) int bpf_map__reuse_fd(struct bpf_map *map, int fd) { struct bpf_map_info info = {}; - __u32 len = sizeof(info), name_len; + __u32 len = sizeof(info); int new_fd, err; char *new_name; @@ -1892,12 +1892,7 @@ int bpf_map__reuse_fd(struct bpf_map *map, int fd) if (err) return err; - name_len = strlen(info.name); - if (name_len == BPF_OBJ_NAME_LEN - 1 && strncmp(map->name, info.name, name_len) == 0) - new_name = strdup(map->name); - else - new_name = strdup(info.name); - + new_name = strdup(info.name); if (!new_name) return -errno;
diff --git a/tools/lib/bpf/nlattr.c b/tools/lib/bpf/nlattr.c index e610bec..1e69c0c 100644 --- a/tools/lib/bpf/nlattr.c +++ b/tools/lib/bpf/nlattr.c
@@ -177,7 +177,7 @@ int libbpf_nla_dump_errormsg(struct nlmsghdr *nlh) hlen += nlmsg_len(&err->msg); attr = (struct nlattr *) ((void *) err + hlen); - alen = (void *)nlh + nlh->nlmsg_len - (void *)attr; + alen = nlh->nlmsg_len - hlen; if (libbpf_nla_parse(tb, NLMSGERR_ATTR_MAX, attr, alen, extack_policy) != 0) {
diff --git a/tools/objtool/check.c b/tools/objtool/check.c index cb5ac7e..d3f6782 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c
@@ -136,7 +136,6 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "panic", "do_exit", "do_task_dead", - "make_task_dead", "__module_put_and_exit", "complete_and_exit", "__reiserfs_panic", @@ -144,7 +143,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, "fortify_panic", "usercopy_abort", "machine_real_restart", - "rewind_stack_and_make_dead", + "rewind_stack_do_exit", "kunit_try_catch_throw", "cpu_bringup_and_idle", }; @@ -164,7 +163,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func, return false; insn = find_insn(file, func->sec, func->offset); - if (!insn || !insn->func) + if (!insn->func) return false; func_for_each_insn_all(file, func, insn) {
diff --git a/tools/perf/bench/bench.h b/tools/perf/bench/bench.h index d9329ae..4aa6de1 100644 --- a/tools/perf/bench/bench.h +++ b/tools/perf/bench/bench.h
@@ -10,13 +10,25 @@ extern struct timeval bench__start, bench__end, bench__runtime; * The madvise transparent hugepage constants were added in glibc * 2.13. For compatibility with older versions of glibc, define these * tokens if they are not already defined. + * + * PA-RISC uses different madvise values from other architectures and + * needs to be special-cased. */ +#ifdef __hppa__ +# ifndef MADV_HUGEPAGE +# define MADV_HUGEPAGE 67 +# endif +# ifndef MADV_NOHUGEPAGE +# define MADV_NOHUGEPAGE 68 +# endif +#else # ifndef MADV_HUGEPAGE # define MADV_HUGEPAGE 14 # endif # ifndef MADV_NOHUGEPAGE # define MADV_NOHUGEPAGE 15 # endif +#endif int bench_numa(int argc, const char **argv); int bench_sched_messaging(int argc, const char **argv);
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 6052eb0..a5201de 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c
@@ -86,34 +86,6 @@ # define F_LINUX_SPECIFIC_BASE 1024 #endif -#define RAW_SYSCALL_ARGS_NUM 6 - -/* - * strtoul: Go from a string to a value, i.e. for msr: MSR_FS_BASE to 0xc0000100 - */ -struct syscall_arg_fmt { - size_t (*scnprintf)(char *bf, size_t size, struct syscall_arg *arg); - bool (*strtoul)(char *bf, size_t size, struct syscall_arg *arg, u64 *val); - unsigned long (*mask_val)(struct syscall_arg *arg, unsigned long val); - void *parm; - const char *name; - bool show_zero; -}; - -struct syscall_fmt { - const char *name; - const char *alias; - struct { - const char *sys_enter, - *sys_exit; - } bpf_prog_name; - struct syscall_arg_fmt arg[RAW_SYSCALL_ARGS_NUM]; - u8 nr_args; - bool errpid; - bool timeout; - bool hexret; -}; - struct trace { struct perf_tool tool; struct syscalltbl *sctbl; @@ -722,7 +694,27 @@ static size_t syscall_arg__scnprintf_getrandom_flags(char *bf, size_t size, #include "trace/beauty/socket_type.c" #include "trace/beauty/waitid_options.c" -static struct syscall_fmt syscall_fmts[] = { +struct syscall_arg_fmt { + size_t (*scnprintf)(char *bf, size_t size, struct syscall_arg *arg); + unsigned long (*mask_val)(struct syscall_arg *arg, unsigned long val); + void *parm; + const char *name; + bool show_zero; +}; + +static struct syscall_fmt { + const char *name; + const char *alias; + struct { + const char *sys_enter, + *sys_exit; + } bpf_prog_name; + struct syscall_arg_fmt arg[6]; + u8 nr_args; + bool errpid; + bool timeout; + bool hexret; +} syscall_fmts[] = { { .name = "access", .arg = { [1] = { .scnprintf = SCA_ACCMODE, /* mode */ }, }, }, { .name = "arch_prctl", @@ -1020,7 +1012,7 @@ struct syscall { */ struct bpf_map_syscall_entry { bool enabled; - u16 string_args_len[RAW_SYSCALL_ARGS_NUM]; + u16 string_args_len[6]; }; /* @@ -1445,7 +1437,7 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args) { int idx; - if (nr_args == RAW_SYSCALL_ARGS_NUM && sc->fmt && sc->fmt->nr_args != 0) + if (nr_args == 6 && sc->fmt && sc->fmt->nr_args != 0) nr_args = sc->fmt->nr_args; sc->arg_fmt = calloc(nr_args, sizeof(*sc->arg_fmt)); @@ -1461,37 +1453,15 @@ static int syscall__alloc_arg_fmts(struct syscall *sc, int nr_args) return 0; } -static struct syscall_arg_fmt syscall_arg_fmts__by_name[] = { -}; - -static int syscall_arg_fmt__cmp(const void *name, const void *fmtp) +static int syscall__set_arg_fmts(struct syscall *sc) { - const struct syscall_arg_fmt *fmt = fmtp; - return strcmp(name, fmt->name); -} + struct tep_format_field *field, *last_field = NULL; + int idx = 0, len; -static struct syscall_arg_fmt * -__syscall_arg_fmt__find_by_name(struct syscall_arg_fmt *fmts, const int nmemb, const char *name) -{ - return bsearch(name, fmts, nmemb, sizeof(struct syscall_arg_fmt), syscall_arg_fmt__cmp); -} - -static struct syscall_arg_fmt *syscall_arg_fmt__find_by_name(const char *name) -{ - const int nmemb = ARRAY_SIZE(syscall_arg_fmts__by_name); - return __syscall_arg_fmt__find_by_name(syscall_arg_fmts__by_name, nmemb, name); -} - -static struct tep_format_field * -syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field *field) -{ - struct tep_format_field *last_field = NULL; - int len; - - for (; field; field = field->next, ++arg) { + for (field = sc->args; field; field = field->next, ++idx) { last_field = field; - if (arg->scnprintf) + if (sc->fmt && sc->fmt->arg[idx].scnprintf) continue; len = strlen(field->name); @@ -1499,13 +1469,13 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field if (strcmp(field->type, "const char *") == 0 && ((len >= 4 && strcmp(field->name + len - 4, "name") == 0) || strstr(field->name, "path") != NULL)) - arg->scnprintf = SCA_FILENAME; + sc->arg_fmt[idx].scnprintf = SCA_FILENAME; else if ((field->flags & TEP_FIELD_IS_POINTER) || strstr(field->name, "addr")) - arg->scnprintf = SCA_PTR; + sc->arg_fmt[idx].scnprintf = SCA_PTR; else if (strcmp(field->type, "pid_t") == 0) - arg->scnprintf = SCA_PID; + sc->arg_fmt[idx].scnprintf = SCA_PID; else if (strcmp(field->type, "umode_t") == 0) - arg->scnprintf = SCA_MODE_T; + sc->arg_fmt[idx].scnprintf = SCA_MODE_T; else if ((strcmp(field->type, "int") == 0 || strcmp(field->type, "unsigned int") == 0 || strcmp(field->type, "long") == 0) && @@ -1517,24 +1487,10 @@ syscall_arg_fmt__init_array(struct syscall_arg_fmt *arg, struct tep_format_field * 23 unsigned int * 7 unsigned long */ - arg->scnprintf = SCA_FD; - } else { - struct syscall_arg_fmt *fmt = syscall_arg_fmt__find_by_name(field->name); - - if (fmt) { - arg->scnprintf = fmt->scnprintf; - arg->strtoul = fmt->strtoul; - } + sc->arg_fmt[idx].scnprintf = SCA_FD; } } - return last_field; -} - -static int syscall__set_arg_fmts(struct syscall *sc) -{ - struct tep_format_field *last_field = syscall_arg_fmt__init_array(sc->arg_fmt, sc->args); - if (last_field) sc->args_size = last_field->offset + last_field->size; @@ -1555,11 +1511,11 @@ static int trace__read_syscall_info(struct trace *trace, int id) sc = trace->syscalls.table + id; if (sc->nonexistent) - return -EEXIST; + return 0; if (name == NULL) { sc->nonexistent = true; - return -EEXIST; + return 0; } sc->name = name; @@ -1573,19 +1529,12 @@ static int trace__read_syscall_info(struct trace *trace, int id) sc->tp_format = trace_event__tp_format("syscalls", tp_name); } - /* - * Fails to read trace point format via sysfs node, so the trace point - * doesn't exist. Set the 'nonexistent' flag as true. - */ - if (IS_ERR(sc->tp_format)) { - sc->nonexistent = true; - return PTR_ERR(sc->tp_format); - } - - if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? - RAW_SYSCALL_ARGS_NUM : sc->tp_format->format.nr_fields)) + if (syscall__alloc_arg_fmts(sc, IS_ERR(sc->tp_format) ? 6 : sc->tp_format->format.nr_fields)) return -ENOMEM; + if (IS_ERR(sc->tp_format)) + return PTR_ERR(sc->tp_format); + sc->args = sc->tp_format->format.fields; /* * We need to check and discard the first variable '__syscall_nr' @@ -1787,7 +1736,6 @@ static size_t syscall__scnprintf_args(struct syscall *sc, char *bf, size_t size, if (arg.mask & bit) continue; - arg.fmt = &sc->arg_fmt[arg.idx]; val = syscall_arg__val(&arg, arg.idx); /* * Some syscall args need some mask, most don't and @@ -1877,8 +1825,11 @@ static struct syscall *trace__syscall_info(struct trace *trace, (err = trace__read_syscall_info(trace, id)) != 0) goto out_cant_read; - if (trace->syscalls.table && trace->syscalls.table[id].nonexistent) + if (trace->syscalls.table[id].name == NULL) { + if (trace->syscalls.table[id].nonexistent) + return NULL; goto out_cant_read; + } return &trace->syscalls.table[id];
diff --git a/tools/perf/perf-completion.sh b/tools/perf/perf-completion.sh index 978249d..fdf75d4 100644 --- a/tools/perf/perf-completion.sh +++ b/tools/perf/perf-completion.sh
@@ -165,12 +165,7 @@ local cur1=${COMP_WORDS[COMP_CWORD]} local raw_evts=$($cmd list --raw-dump) - local arr s tmp result cpu_evts - - # aarch64 doesn't have /sys/bus/event_source/devices/cpu/events - if [[ `uname -m` != aarch64 ]]; then - cpu_evts=$(ls /sys/bus/event_source/devices/cpu/events) - fi + local arr s tmp result if [[ "$cur1" == */* && ${cur1#*/} =~ ^[A-Z] ]]; then OLD_IFS="$IFS" @@ -188,9 +183,9 @@ fi done - evts=${result}" "${cpu_evts} + evts=${result}" "$(ls /sys/bus/event_source/devices/cpu/events) else - evts=${raw_evts}" "${cpu_evts} + evts=${raw_evts}" "$(ls /sys/bus/event_source/devices/cpu/events) fi if [[ "$cur1" == , ]]; then
diff --git a/tools/perf/trace/beauty/beauty.h b/tools/perf/trace/beauty/beauty.h index 4cc4f6b..7e06605 100644 --- a/tools/perf/trace/beauty/beauty.h +++ b/tools/perf/trace/beauty/beauty.h
@@ -78,8 +78,6 @@ struct augmented_arg { u64 value[]; }; -struct syscall_arg_fmt; - /** * @val: value of syscall argument being formatted * @args: All the args, use syscall_args__val(arg, nth) to access one @@ -96,7 +94,6 @@ struct syscall_arg_fmt; struct syscall_arg { unsigned long val; unsigned char *args; - struct syscall_arg_fmt *fmt; struct { struct augmented_arg *args; int size;
diff --git a/tools/perf/util/auxtrace.c b/tools/perf/util/auxtrace.c index df4c575..ae5b974 100644 --- a/tools/perf/util/auxtrace.c +++ b/tools/perf/util/auxtrace.c
@@ -1710,19 +1710,11 @@ struct sym_args { bool near; }; -static bool kern_sym_name_match(const char *kname, const char *name) -{ - size_t n = strlen(name); - - return !strcmp(kname, name) || - (!strncmp(kname, name, n) && kname[n] == '\t'); -} - static bool kern_sym_match(struct sym_args *args, const char *name, char type) { /* A function with the same name, and global or the n'th found or any */ return kallsyms__is_function(type) && - kern_sym_name_match(name, args->name) && + !strcmp(name, args->name) && ((args->global && isupper(type)) || (args->selected && ++(args->cnt) == args->idx) || (!args->global && !args->selected)); @@ -1995,7 +1987,7 @@ static int find_dso_sym(struct dso *dso, const char *sym_name, u64 *start, *size = sym->start - *start; if (idx > 0) { if (*size) - return 0; + return 1; } else if (dso_sym_match(sym, sym_name, &cnt, idx)) { print_duplicate_syms(dso, sym_name); return -EINVAL;
diff --git a/tools/perf/util/data.c b/tools/perf/util/data.c index 4da900b..3c874f5 100644 --- a/tools/perf/util/data.c +++ b/tools/perf/util/data.c
@@ -120,7 +120,6 @@ int perf_data__open_dir(struct perf_data *data) file->size = st.st_size; } - closedir(dir); if (!files) return -EINVAL; @@ -129,7 +128,6 @@ int perf_data__open_dir(struct perf_data *data) return 0; out_err: - closedir(dir); close_dir(files, nr); return ret; }
diff --git a/tools/perf/util/dwarf-aux.c b/tools/perf/util/dwarf-aux.c index f1e2f56..ab34ef2 100644 --- a/tools/perf/util/dwarf-aux.c +++ b/tools/perf/util/dwarf-aux.c
@@ -254,13 +254,26 @@ static int die_get_attr_udata(Dwarf_Die *tp_die, unsigned int attr_name, { Dwarf_Attribute attr; - if (dwarf_attr_integrate(tp_die, attr_name, &attr) == NULL || + if (dwarf_attr(tp_die, attr_name, &attr) == NULL || dwarf_formudata(&attr, result) != 0) return -ENOENT; return 0; } +/* Get attribute and translate it as a sdata */ +static int die_get_attr_sdata(Dwarf_Die *tp_die, unsigned int attr_name, + Dwarf_Sword *result) +{ + Dwarf_Attribute attr; + + if (dwarf_attr(tp_die, attr_name, &attr) == NULL || + dwarf_formsdata(&attr, result) != 0) + return -ENOENT; + + return 0; +} + /** * die_is_signed_type - Check whether a type DIE is signed or not * @tp_die: a DIE of a type @@ -384,9 +397,9 @@ int die_get_data_member_location(Dwarf_Die *mb_die, Dwarf_Word *offs) /* Get the call file index number in CU DIE */ static int die_get_call_fileno(Dwarf_Die *in_die) { - Dwarf_Word idx; + Dwarf_Sword idx; - if (die_get_attr_udata(in_die, DW_AT_call_file, &idx) == 0) + if (die_get_attr_sdata(in_die, DW_AT_call_file, &idx) == 0) return (int)idx; else return -ENOENT; @@ -395,9 +408,9 @@ static int die_get_call_fileno(Dwarf_Die *in_die) /* Get the declared file index number in CU DIE */ static int die_get_decl_fileno(Dwarf_Die *pdie) { - Dwarf_Word idx; + Dwarf_Sword idx; - if (die_get_attr_udata(pdie, DW_AT_decl_file, &idx) == 0) + if (die_get_attr_sdata(pdie, DW_AT_decl_file, &idx) == 0) return (int)idx; else return -ENOENT;
diff --git a/tools/perf/util/genelf.c b/tools/perf/util/genelf.c index 69744fd..f9f18b8 100644 --- a/tools/perf/util/genelf.c +++ b/tools/perf/util/genelf.c
@@ -35,11 +35,7 @@ #define BUILD_ID_URANDOM /* different uuid for each run */ -// FIXME, remove this and fix the deprecation warnings before its removed and -// We'll break for good here... -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" - -#ifdef HAVE_LIBCRYPTO_SUPPORT +#ifdef HAVE_LIBCRYPTO #define BUILD_ID_MD5 #undef BUILD_ID_SHA /* does not seem to work well when linked with Java */ @@ -256,7 +252,6 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym, Elf_Data *d; Elf_Scn *scn; Elf_Ehdr *ehdr; - Elf_Phdr *phdr; Elf_Shdr *shdr; uint64_t eh_frame_base_offset; char *strsym = NULL; @@ -292,19 +287,6 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym, ehdr->e_shstrndx= unwinding ? 4 : 2; /* shdr index for section name */ /* - * setup program header - */ - phdr = elf_newphdr(e, 1); - phdr[0].p_type = PT_LOAD; - phdr[0].p_offset = 0; - phdr[0].p_vaddr = 0; - phdr[0].p_paddr = 0; - phdr[0].p_filesz = csize; - phdr[0].p_memsz = csize; - phdr[0].p_flags = PF_X | PF_R; - phdr[0].p_align = 8; - - /* * setup text section */ scn = elf_newscn(e);
diff --git a/tools/perf/util/genelf.h b/tools/perf/util/genelf.h index ac63894..d413755 100644 --- a/tools/perf/util/genelf.h +++ b/tools/perf/util/genelf.h
@@ -50,10 +50,8 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent #if GEN_ELF_CLASS == ELFCLASS64 #define elf_newehdr elf64_newehdr -#define elf_newphdr elf64_newphdr #define elf_getshdr elf64_getshdr #define Elf_Ehdr Elf64_Ehdr -#define Elf_Phdr Elf64_Phdr #define Elf_Shdr Elf64_Shdr #define Elf_Sym Elf64_Sym #define ELF_ST_TYPE(a) ELF64_ST_TYPE(a) @@ -61,10 +59,8 @@ int jit_add_debug_info(Elf *e, uint64_t code_addr, void *debug, int nr_debug_ent #define ELF_ST_VIS(a) ELF64_ST_VISIBILITY(a) #else #define elf_newehdr elf32_newehdr -#define elf_newphdr elf32_newphdr #define elf_getshdr elf32_getshdr #define Elf_Ehdr Elf32_Ehdr -#define Elf_Phdr Elf32_Phdr #define Elf_Shdr Elf32_Shdr #define Elf_Sym Elf32_Sym #define ELF_ST_TYPE(a) ELF32_ST_TYPE(a)
diff --git a/tools/perf/util/get_current_dir_name.c b/tools/perf/util/get_current_dir_name.c index e68935e..b205d92 100644 --- a/tools/perf/util/get_current_dir_name.c +++ b/tools/perf/util/get_current_dir_name.c
@@ -3,9 +3,8 @@ // #ifndef HAVE_GET_CURRENT_DIR_NAME #include "get_current_dir_name.h" -#include <limits.h> -#include <string.h> #include <unistd.h> +#include <stdlib.h> /* Android's 'bionic' library, for one, doesn't have this */
diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c index b408324..9b7cc5f 100644 --- a/tools/perf/util/intel-pt.c +++ b/tools/perf/util/intel-pt.c
@@ -3038,7 +3038,6 @@ static const char * const intel_pt_info_fmts[] = { [INTEL_PT_SNAPSHOT_MODE] = " Snapshot mode %"PRId64"\n", [INTEL_PT_PER_CPU_MMAPS] = " Per-cpu maps %"PRId64"\n", [INTEL_PT_MTC_BIT] = " MTC bit %#"PRIx64"\n", - [INTEL_PT_MTC_FREQ_BITS] = " MTC freq bits %#"PRIx64"\n", [INTEL_PT_TSC_CTC_N] = " TSC:CTC numerator %"PRIu64"\n", [INTEL_PT_TSC_CTC_D] = " TSC:CTC denominator %"PRIu64"\n", [INTEL_PT_CYC_BIT] = " CYC bit %#"PRIx64"\n", @@ -3053,12 +3052,8 @@ static void intel_pt_print_info(__u64 *arr, int start, int finish) if (!dump_trace) return; - for (i = start; i <= finish; i++) { - const char *fmt = intel_pt_info_fmts[i]; - - if (fmt) - fprintf(stdout, fmt, arr[i]); - } + for (i = start; i <= finish; i++) + fprintf(stdout, intel_pt_info_fmts[i], arr[i]); } static void intel_pt_print_info_str(const char *name, const char *str)
diff --git a/tools/perf/util/llvm-utils.c b/tools/perf/util/llvm-utils.c index b275a1b..e7c7e32 100644 --- a/tools/perf/util/llvm-utils.c +++ b/tools/perf/util/llvm-utils.c
@@ -523,37 +523,14 @@ int llvm__compile_bpf(const char *path, void **p_obj_buf, pr_debug("llvm compiling command template: %s\n", template); - /* - * Below, substitute control characters for values that can cause the - * echo to misbehave, then substitute the values back. - */ err = -ENOMEM; - if (asprintf(&command_echo, "echo -n \a%s\a", template) < 0) + if (asprintf(&command_echo, "echo -n \"%s\"", template) < 0) goto errout; -#define SWAP_CHAR(a, b) do { if (*p == a) *p = b; } while (0) - for (char *p = command_echo; *p; p++) { - SWAP_CHAR('<', '\001'); - SWAP_CHAR('>', '\002'); - SWAP_CHAR('"', '\003'); - SWAP_CHAR('\'', '\004'); - SWAP_CHAR('|', '\005'); - SWAP_CHAR('&', '\006'); - SWAP_CHAR('\a', '"'); - } err = read_from_pipe(command_echo, (void **) &command_out, NULL); if (err) goto errout; - for (char *p = command_out; *p; p++) { - SWAP_CHAR('\001', '<'); - SWAP_CHAR('\002', '>'); - SWAP_CHAR('\003', '"'); - SWAP_CHAR('\004', '\''); - SWAP_CHAR('\005', '|'); - SWAP_CHAR('\006', '&'); - } -#undef SWAP_CHAR pr_debug("llvm compiling command : %s\n", command_out); err = read_from_pipe(template, &obj_buf, &obj_buf_sz);
diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index e18c265..93147cc 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c
@@ -193,7 +193,7 @@ static void new_line_csv(struct perf_stat_config *config, void *ctx) fputc('\n', os->fh); if (os->prefix) - fprintf(os->fh, "%s", os->prefix); + fprintf(os->fh, "%s%s", os->prefix, config->csv_sep); aggr_printout(config, os->evsel, os->id, os->nr); for (i = 0; i < os->nfields; i++) fputs(config->csv_sep, os->fh);
diff --git a/tools/perf/util/symbol-elf.c b/tools/perf/util/symbol-elf.c index 4fef8d6..0b185b1 100644 --- a/tools/perf/util/symbol-elf.c +++ b/tools/perf/util/symbol-elf.c
@@ -1157,31 +1157,18 @@ int dso__load_sym(struct dso *dso, struct map *map, struct symsrc *syms_ss, (!used_opd && syms_ss->adjust_symbols)) { GElf_Phdr phdr; - if (elf_read_program_header(runtime_ss->elf, + if (elf_read_program_header(syms_ss->elf, (u64)sym.st_value, &phdr)) { - pr_debug4("%s: failed to find program header for " + pr_warning("%s: failed to find program header for " "symbol: %s st_value: %#" PRIx64 "\n", __func__, elf_name, (u64)sym.st_value); - pr_debug4("%s: adjusting symbol: st_value: %#" PRIx64 " " - "sh_addr: %#" PRIx64 " sh_offset: %#" PRIx64 "\n", - __func__, (u64)sym.st_value, (u64)shdr.sh_addr, - (u64)shdr.sh_offset); - /* - * Fail to find program header, let's rollback - * to use shdr.sh_addr and shdr.sh_offset to - * calibrate symbol's file address, though this - * is not necessary for normal C ELF file, we - * still need to handle java JIT symbols in this - * case. - */ - sym.st_value -= shdr.sh_addr - shdr.sh_offset; - } else { - pr_debug4("%s: adjusting symbol: st_value: %#" PRIx64 " " - "p_vaddr: %#" PRIx64 " p_offset: %#" PRIx64 "\n", - __func__, (u64)sym.st_value, (u64)phdr.p_vaddr, - (u64)phdr.p_offset); - sym.st_value -= phdr.p_vaddr - phdr.p_offset; + continue; } + pr_debug4("%s: adjusting symbol: st_value: %#" PRIx64 " " + "p_vaddr: %#" PRIx64 " p_offset: %#" PRIx64 "\n", + __func__, (u64)sym.st_value, (u64)phdr.p_vaddr, + (u64)phdr.p_offset); + sym.st_value -= phdr.p_vaddr - phdr.p_offset; } demangled = demangle_sym(dso, kmodule, elf_name); @@ -1912,8 +1899,8 @@ static int kcore_copy__compare_file(const char *from_dir, const char *to_dir, * unusual. One significant peculiarity is that the mapping (start -> pgoff) * is not the same for the kernel map and the modules map. That happens because * the data is copied adjacently whereas the original kcore has gaps. Finally, - * kallsyms file is compared with its copy to check that modules have not been - * loaded or unloaded while the copies were taking place. + * kallsyms and modules files are compared with their copies to check that + * modules have not been loaded or unloaded while the copies were taking place. * * Return: %0 on success, %-1 on failure. */ @@ -1976,6 +1963,9 @@ int kcore_copy(const char *from_dir, const char *to_dir) goto out_extract_close; } + if (kcore_copy__compare_file(from_dir, to_dir, "modules")) + goto out_extract_close; + if (kcore_copy__compare_file(from_dir, to_dir, "kallsyms")) goto out_extract_close;
diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 698b99e..fe587a9 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl
@@ -174,7 +174,6 @@ my $store_successes; my $test_name; my $timeout; -my $run_timeout; my $connect_timeout; my $config_bisect_exec; my $booted_timeout; @@ -334,7 +333,6 @@ "STORE_SUCCESSES" => \$store_successes, "TEST_NAME" => \$test_name, "TIMEOUT" => \$timeout, - "RUN_TIMEOUT" => \$run_timeout, "CONNECT_TIMEOUT" => \$connect_timeout, "CONFIG_BISECT_EXEC" => \$config_bisect_exec, "BOOTED_TIMEOUT" => \$booted_timeout, @@ -1424,8 +1422,7 @@ # Still need to wait for the reboot to finish wait_for_monitor($time, $reboot_success_line); - } - if ($powercycle || $time) { + end_monitor; } } @@ -1768,14 +1765,6 @@ $command =~ s/\$SSH_USER/$ssh_user/g; $command =~ s/\$MACHINE/$machine/g; - if (!defined($timeout)) { - $timeout = $run_timeout; - } - - if (!defined($timeout)) { - $timeout = -1; # tell wait_for_input to wait indefinitely - } - doprint("$command ... "); $start_time = time; @@ -1804,10 +1793,13 @@ while (1) { my $fp = \*CMD; + if (defined($timeout)) { + doprint "timeout = $timeout\n"; + } my $line = wait_for_input($fp, $timeout); if (!defined($line)) { my $now = time; - if ($timeout >= 0 && (($now - $start_time) >= $timeout)) { + if (defined($timeout) && (($now - $start_time) >= $timeout)) { doprint "Hit timeout of $timeout, killing process\n"; $hit_timeout = 1; kill 9, $pid; @@ -1889,7 +1881,7 @@ sub _get_grub_index { - my ($command, $target, $skip, $submenu) = @_; + my ($command, $target, $skip) = @_; return if (defined($grub_number) && defined($last_grub_menu) && $last_grub_menu eq $grub_menu && defined($last_machine) && @@ -1906,16 +1898,11 @@ my $found = 0; - my $submenu_number = 0; - while (<IN>) { if (/$target/) { $grub_number++; $found = 1; last; - } elsif (defined($submenu) && /$submenu/) { - $submenu_number++; - $grub_number = -1; } elsif (/$skip/) { $grub_number++; } @@ -1924,9 +1911,6 @@ dodie "Could not find '$grub_menu' through $command on $machine" if (!$found); - if ($submenu_number > 0) { - $grub_number = "$submenu_number>$grub_number"; - } doprint "$grub_number\n"; $last_grub_menu = $grub_menu; $last_machine = $machine; @@ -1937,7 +1921,6 @@ my $command; my $target; my $skip; - my $submenu; my $grub_menu_qt; if ($reboot_type !~ /^grub/) { @@ -1952,9 +1935,8 @@ $skip = '^\s*title\s'; } elsif ($reboot_type eq "grub2") { $command = "cat $grub_file"; - $target = '^\s*menuentry.*' . $grub_menu_qt; - $skip = '^\s*menuentry'; - $submenu = '^\s*submenu\s'; + $target = '^menuentry.*' . $grub_menu_qt; + $skip = '^menuentry\s|^submenu\s'; } elsif ($reboot_type eq "grub2bls") { $command = $grub_bls_get; $target = '^title=.*' . $grub_menu_qt; @@ -1963,7 +1945,7 @@ return; } - _get_grub_index($command, $target, $skip, $submenu); + _get_grub_index($command, $target, $skip); } sub wait_for_input @@ -1981,11 +1963,6 @@ $time = $timeout; } - if ($time < 0) { - # Negative number means wait indefinitely - undef $time; - } - $rin = ''; vec($rin, fileno($fp), 1) = 1; vec($rin, fileno(\*STDIN), 1) = 1; @@ -2032,7 +2009,7 @@ if ($reboot_type eq "grub") { run_ssh "'(echo \"savedefault --default=$grub_number --once\" | grub --batch)'"; } elsif (($reboot_type eq "grub2") or ($reboot_type eq "grub2bls")) { - run_ssh "$grub_reboot \"'$grub_number'\""; + run_ssh "$grub_reboot $grub_number"; } elsif ($reboot_type eq "syslinux") { run_ssh "$syslinux --once \\\"$syslinux_label\\\" $syslinux_path"; } elsif (defined $reboot_script) { @@ -3749,10 +3726,9 @@ # .config to make sure it is missing the config that # we had before my %configs = %min_configs; - $configs{$config} = "# $config is not set"; + delete $configs{$config}; make_new_config ((values %configs), (values %keep_configs)); make_oldconfig; - delete $configs{$config}; undef %configs; assign_configs \%configs, $output_config; @@ -4241,9 +4217,6 @@ } sub cancel_test { - if ($monitor_cnt) { - end_monitor; - } if ($email_when_canceled) { my $name = get_test_name; send_email("KTEST: Your [$name] test was cancelled",
diff --git a/tools/testing/ktest/sample.conf b/tools/testing/ktest/sample.conf index a7b24fd..c3bc933 100644 --- a/tools/testing/ktest/sample.conf +++ b/tools/testing/ktest/sample.conf
@@ -791,11 +791,6 @@ # is issued instead of a reboot. # CONNECT_TIMEOUT = 25 -# The timeout in seconds for how long to wait for any running command -# to timeout. If not defined, it will let it go indefinitely. -# (default undefined) -#RUN_TIMEOUT = 600 - # In between tests, a reboot of the box may occur, and this # is the time to wait for the console after it stops producing # output. Some machines may not produce a large lag on reboot
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 40ee6f5..612f675 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile
@@ -78,34 +78,26 @@ override MAKEFLAGS = endif -# Append kselftest to KBUILD_OUTPUT and O to avoid cluttering +# Append kselftest to KBUILD_OUTPUT to avoid cluttering # KBUILD_OUTPUT with selftest objects and headers installed # by selftests Makefile or lib.mk. ifdef building_out_of_srctree override LDFLAGS = endif -top_srcdir ?= ../../.. - -ifeq ("$(origin O)", "command line") - KBUILD_OUTPUT := $(O) -endif - -ifneq ($(KBUILD_OUTPUT),) - # Make's built-in functions such as $(abspath ...), $(realpath ...) cannot - # expand a shell special character '~'. We use a somewhat tedious way here. - abs_objtree := $(shell cd $(top_srcdir) && mkdir -p $(KBUILD_OUTPUT) && cd $(KBUILD_OUTPUT) && pwd) - $(if $(abs_objtree),, \ - $(error failed to create output directory "$(KBUILD_OUTPUT)")) - # $(realpath ...) resolves symlinks - abs_objtree := $(realpath $(abs_objtree)) - BUILD := $(abs_objtree)/kselftest +ifneq ($(O),) + BUILD := $(O) else - BUILD := $(CURDIR) - DEFAULT_INSTALL_HDR_PATH := 1 + ifneq ($(KBUILD_OUTPUT),) + BUILD := $(KBUILD_OUTPUT)/kselftest + else + BUILD := $(shell pwd) + DEFAULT_INSTALL_HDR_PATH := 1 + endif endif # Prepare for headers install +top_srcdir ?= ../../.. include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) export KSFT_KHDR_INSTALL_DONE := 1
diff --git a/tools/testing/selftests/bpf/test_align.c b/tools/testing/selftests/bpf/test_align.c index 6cc29b5..4b9a26c 100644 --- a/tools/testing/selftests/bpf/test_align.c +++ b/tools/testing/selftests/bpf/test_align.c
@@ -475,10 +475,10 @@ static struct bpf_align_test tests[] = { */ {7, "R5_w=inv(id=0,smin_value=-9223372036854775806,smax_value=9223372036854775806,umin_value=2,umax_value=18446744073709551614,var_off=(0x2; 0xfffffffffffffffc)"}, /* Checked s>=0 */ - {9, "R5=inv(id=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"}, + {9, "R5=inv(id=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, /* packet pointer + nonnegative (4n+2) */ - {11, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"}, - {13, "R4_w=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"}, + {11, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, + {13, "R4_w=pkt(id=1,off=4,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, /* NET_IP_ALIGN + (4n+2) == (4n), alignment is fine. * We checked the bounds, but it might have been able * to overflow if the packet pointer started in the @@ -486,7 +486,7 @@ static struct bpf_align_test tests[] = { * So we did not get a 'range' on R6, and the access * attempt will fail. */ - {15, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc))"}, + {15, "R6_w=pkt(id=1,off=0,r=0,umin_value=2,umax_value=9223372036854775806,var_off=(0x2; 0x7ffffffffffffffc)"}, } }, { @@ -580,18 +580,18 @@ static struct bpf_align_test tests[] = { /* Adding 14 makes R6 be (4n+2) */ {11, "R6_w=inv(id=0,umin_value=14,umax_value=74,var_off=(0x2; 0x7c))"}, /* Subtracting from packet pointer overflows ubounds */ - {13, "R5_w=pkt(id=1,off=0,r=8,umin_value=18446744073709551542,umax_value=18446744073709551602,var_off=(0xffffffffffffff82; 0x7c))"}, + {13, "R5_w=pkt(id=1,off=0,r=8,umin_value=18446744073709551542,umax_value=18446744073709551602,var_off=(0xffffffffffffff82; 0x7c)"}, /* New unknown value in R7 is (4n), >= 76 */ {15, "R7_w=inv(id=0,umin_value=76,umax_value=1096,var_off=(0x0; 0x7fc))"}, /* Adding it to packet pointer gives nice bounds again */ - {16, "R5_w=pkt(id=2,off=0,r=0,umin_value=2,umax_value=1082,var_off=(0x2; 0x7fc))"}, + {16, "R5_w=pkt(id=2,off=0,r=0,umin_value=2,umax_value=1082,var_off=(0x2; 0xfffffffc)"}, /* At the time the word size load is performed from R5, * its total fixed offset is NET_IP_ALIGN + reg->off (0) * which is 2. Then the variable offset is (4n+2), so * the total offset is 4-byte aligned and meets the * load's requirements. */ - {20, "R5=pkt(id=2,off=0,r=4,umin_value=2,umax_value=1082,var_off=(0x2; 0x7fc))"}, + {20, "R5=pkt(id=2,off=0,r=4,umin_value=2,umax_value=1082,var_off=(0x2; 0xfffffffc)"}, }, }, };
diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftests/bpf/test_btf.c index f641eb2..3d617e8 100644 --- a/tools/testing/selftests/bpf/test_btf.c +++ b/tools/testing/selftests/bpf/test_btf.c
@@ -920,34 +920,6 @@ static struct btf_raw_test raw_tests[] = { .btf_load_err = true, .err_str = "Invalid elem", }, -{ - .descr = "var after datasec, ptr followed by modifier", - .raw_types = { - /* .bss section */ /* [1] */ - BTF_TYPE_ENC(NAME_TBD, BTF_INFO_ENC(BTF_KIND_DATASEC, 0, 2), - sizeof(void*)+4), - BTF_VAR_SECINFO_ENC(4, 0, sizeof(void*)), - BTF_VAR_SECINFO_ENC(6, sizeof(void*), 4), - /* int */ /* [2] */ - BTF_TYPE_INT_ENC(0, BTF_INT_SIGNED, 0, 32, 4), - /* int* */ /* [3] */ - BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_PTR, 0, 0), 2), - BTF_VAR_ENC(NAME_TBD, 3, 0), /* [4] */ - /* const int */ /* [5] */ - BTF_TYPE_ENC(0, BTF_INFO_ENC(BTF_KIND_CONST, 0, 0), 2), - BTF_VAR_ENC(NAME_TBD, 5, 0), /* [6] */ - BTF_END_RAW, - }, - .str_sec = "\0a\0b\0c\0", - .str_sec_size = sizeof("\0a\0b\0c\0"), - .map_type = BPF_MAP_TYPE_ARRAY, - .map_name = ".bss", - .key_size = sizeof(int), - .value_size = sizeof(void*)+4, - .key_type_id = 0, - .value_type_id = 1, - .max_entries = 1, -}, /* Test member exceeds the size of struct. * * struct A { @@ -4836,7 +4808,7 @@ static int do_test_pprint(int test_num) ret = snprintf(pin_path, sizeof(pin_path), "%s/%s", "/sys/fs/bpf", test->map_name); - if (CHECK(ret >= sizeof(pin_path), "pin_path %s/%s is too long", + if (CHECK(ret == sizeof(pin_path), "pin_path %s/%s is too long", "/sys/fs/bpf", test->map_name)) { err = -1; goto done;
diff --git a/tools/testing/selftests/bpf/verifier/search_pruning.c b/tools/testing/selftests/bpf/verifier/search_pruning.c index 7e36078..7e50cb8 100644 --- a/tools/testing/selftests/bpf/verifier/search_pruning.c +++ b/tools/testing/selftests/bpf/verifier/search_pruning.c
@@ -154,39 +154,3 @@ .result_unpriv = ACCEPT, .insn_processed = 15, }, -/* The test performs a conditional 64-bit write to a stack location - * fp[-8], this is followed by an unconditional 8-bit write to fp[-8], - * then data is read from fp[-8]. This sequence is unsafe. - * - * The test would be mistakenly marked as safe w/o dst register parent - * preservation in verifier.c:copy_register_state() function. - * - * Note the usage of BPF_F_TEST_STATE_FREQ to force creation of the - * checkpoint state after conditional 64-bit assignment. - */ -{ - "write tracking and register parent chain bug", - .insns = { - /* r6 = ktime_get_ns() */ - BPF_EMIT_CALL(BPF_FUNC_ktime_get_ns), - BPF_MOV64_REG(BPF_REG_6, BPF_REG_0), - /* r0 = ktime_get_ns() */ - BPF_EMIT_CALL(BPF_FUNC_ktime_get_ns), - /* if r0 > r6 goto +1 */ - BPF_JMP_REG(BPF_JGT, BPF_REG_0, BPF_REG_6, 1), - /* *(u64 *)(r10 - 8) = 0xdeadbeef */ - BPF_ST_MEM(BPF_DW, BPF_REG_FP, -8, 0xdeadbeef), - /* r1 = 42 */ - BPF_MOV64_IMM(BPF_REG_1, 42), - /* *(u8 *)(r10 - 8) = r1 */ - BPF_STX_MEM(BPF_B, BPF_REG_FP, BPF_REG_1, -8), - /* r2 = *(u64 *)(r10 - 8) */ - BPF_LDX_MEM(BPF_DW, BPF_REG_2, BPF_REG_FP, -8), - /* exit(0) */ - BPF_MOV64_IMM(BPF_REG_0, 0), - BPF_EXIT_INSN(), - }, - .flags = BPF_F_TEST_STATE_FREQ, - .errstr = "invalid read from stack off -8+1 size 8", - .result = REJECT, -},
diff --git a/tools/testing/selftests/efivarfs/efivarfs.sh b/tools/testing/selftests/efivarfs/efivarfs.sh index d374878..a90f394 100755 --- a/tools/testing/selftests/efivarfs/efivarfs.sh +++ b/tools/testing/selftests/efivarfs/efivarfs.sh
@@ -87,11 +87,6 @@ { local file=$efivarfs_mount/$FUNCNAME-$test_guid ./create-read $file - if [ $? -ne 0 ]; then - echo "create and read $file failed" - file_cleanup $file - exit 1 - fi file_cleanup $file }
diff --git a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc index 020fbda..ca2ffd7 100644 --- a/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc +++ b/tools/testing/selftests/ftrace/test.d/ftrace/func_event_triggers.tc
@@ -42,18 +42,11 @@ test_event_enabled() { val=$1 - check_times=10 # wait for 10 * SLEEP_TIME at most - while [ $check_times -ne 0 ]; do - e=`cat $EVENT_ENABLE` - if [ "$e" = $val ]; then - return 0 - fi - sleep $SLEEP_TIME - check_times=$((check_times - 1)) - done - - fail "Expected $val but found $e" + e=`cat $EVENT_ENABLE` + if [ "$e" != $val ]; then + fail "Expected $val but found $e" + fi } run_enable_disable() {
diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc index 728c276..ef1e9ba 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_syntax_errors.tc
@@ -24,6 +24,7 @@ check_error 'p:^12345678901234567890123456789012345678901234567890123456789012345/bar vfs_read' # GROUP_TOO_LONG check_error 'p:^foo.1/bar vfs_read' # BAD_GROUP_NAME +check_error 'p:foo/^ vfs_read' # NO_EVENT_NAME check_error 'p:foo/^12345678901234567890123456789012345678901234567890123456789012345 vfs_read' # EVENT_TOO_LONG check_error 'p:foo/^bar.1 vfs_read' # BAD_EVENT_NAME
diff --git a/tools/testing/selftests/futex/functional/Makefile b/tools/testing/selftests/futex/functional/Makefile index 479531f..30996306 100644 --- a/tools/testing/selftests/futex/functional/Makefile +++ b/tools/testing/selftests/futex/functional/Makefile
@@ -3,11 +3,11 @@ CFLAGS := $(CFLAGS) -g -O2 -Wall -D_GNU_SOURCE -pthread $(INCLUDES) LDFLAGS := $(LDFLAGS) -pthread -lrt -LOCAL_HDRS := \ +HEADERS := \ ../include/futextest.h \ ../include/atomic.h \ ../include/logging.h -TEST_GEN_PROGS := \ +TEST_GEN_FILES := \ futex_wait_timeout \ futex_wait_wouldblock \ futex_requeue_pi \ @@ -21,3 +21,5 @@ top_srcdir = ../../../../.. KSFT_KHDR_INSTALL := 1 include ../../lib.mk + +$(TEST_GEN_FILES): $(HEADERS)
diff --git a/tools/testing/selftests/intel_pstate/Makefile b/tools/testing/selftests/intel_pstate/Makefile index 9fc1a40..7340fd6 100644 --- a/tools/testing/selftests/intel_pstate/Makefile +++ b/tools/testing/selftests/intel_pstate/Makefile
@@ -2,10 +2,10 @@ CFLAGS := $(CFLAGS) -Wall -D_GNU_SOURCE LDLIBS := $(LDLIBS) -lm -ARCH ?= $(shell uname -m 2>/dev/null || echo not) -ARCH_PROCESSED := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +uname_M := $(shell uname -m 2>/dev/null || echo not) +ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -ifeq (x86,$(ARCH_PROCESSED)) +ifeq (x86,$(ARCH)) TEST_GEN_FILES := msr aperf endif
diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h index d60f584..aead07c 100644 --- a/tools/testing/selftests/kvm/include/x86_64/processor.h +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
@@ -635,11 +635,6 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits); #define MSR_AMD64_OSVW_STATUS 0xc0010141 #define MSR_AMD64_LS_CFG 0xc0011020 #define MSR_AMD64_DC_CFG 0xc0011022 - -#define MSR_AMD64_DE_CFG 0xc0011029 -#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT 1 -#define MSR_AMD64_DE_CFG_LFENCE_SERIALIZE BIT_ULL(MSR_AMD64_DE_CFG_LFENCE_SERIALIZE_BIT) - #define MSR_AMD64_BU_CFG2 0xc001102a #define MSR_AMD64_IBSFETCHCTL 0xc0011030 #define MSR_AMD64_IBSFETCHLINAD 0xc0011031 @@ -690,6 +685,9 @@ void kvm_get_cpu_address_width(unsigned int *pa_bits, unsigned int *va_bits); #define FAM10H_MMIO_CONF_BASE_MASK 0xfffffffULL #define FAM10H_MMIO_CONF_BASE_SHIFT 20 #define MSR_FAM10H_NODE_ID 0xc001100c +#define MSR_F10H_DECFG 0xc0011029 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT 1 +#define MSR_F10H_DECFG_LFENCE_SERIALIZE BIT_ULL(MSR_F10H_DECFG_LFENCE_SERIALIZE_BIT) /* K8 MSRs */ #define MSR_K8_TOP_MEM1 0xc001001a
diff --git a/tools/testing/selftests/kvm/include/x86_64/vmx.h b/tools/testing/selftests/kvm/include/x86_64/vmx.h index 3d27069..f52e0ba 100644 --- a/tools/testing/selftests/kvm/include/x86_64/vmx.h +++ b/tools/testing/selftests/kvm/include/x86_64/vmx.h
@@ -18,8 +18,8 @@ /* * Definitions of Primary Processor-Based VM-Execution Controls. */ -#define CPU_BASED_INTR_WINDOW_EXITING 0x00000004 -#define CPU_BASED_USE_TSC_OFFSETTING 0x00000008 +#define CPU_BASED_VIRTUAL_INTR_PENDING 0x00000004 +#define CPU_BASED_USE_TSC_OFFSETING 0x00000008 #define CPU_BASED_HLT_EXITING 0x00000080 #define CPU_BASED_INVLPG_EXITING 0x00000200 #define CPU_BASED_MWAIT_EXITING 0x00000400 @@ -30,7 +30,7 @@ #define CPU_BASED_CR8_LOAD_EXITING 0x00080000 #define CPU_BASED_CR8_STORE_EXITING 0x00100000 #define CPU_BASED_TPR_SHADOW 0x00200000 -#define CPU_BASED_NMI_WINDOW_EXITING 0x00400000 +#define CPU_BASED_VIRTUAL_NMI_PENDING 0x00400000 #define CPU_BASED_MOV_DR_EXITING 0x00800000 #define CPU_BASED_UNCOND_IO_EXITING 0x01000000 #define CPU_BASED_USE_IO_BITMAPS 0x02000000 @@ -103,7 +103,7 @@ #define EXIT_REASON_EXCEPTION_NMI 0 #define EXIT_REASON_EXTERNAL_INTERRUPT 1 #define EXIT_REASON_TRIPLE_FAULT 2 -#define EXIT_REASON_INTERRUPT_WINDOW 7 +#define EXIT_REASON_PENDING_INTERRUPT 7 #define EXIT_REASON_NMI_WINDOW 8 #define EXIT_REASON_TASK_SWITCH 9 #define EXIT_REASON_CPUID 10
diff --git a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c index 69e482a..5590fd2 100644 --- a/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c +++ b/tools/testing/selftests/kvm/x86_64/vmx_tsc_adjust_test.c
@@ -98,7 +98,7 @@ static void l1_guest_code(struct vmx_pages *vmx_pages) prepare_vmcs(vmx_pages, l2_guest_code, &l2_guest_stack[L2_GUEST_STACK_SIZE]); control = vmreadz(CPU_BASED_VM_EXEC_CONTROL); - control |= CPU_BASED_USE_MSR_BITMAPS | CPU_BASED_USE_TSC_OFFSETTING; + control |= CPU_BASED_USE_MSR_BITMAPS | CPU_BASED_USE_TSC_OFFSETING; vmwrite(CPU_BASED_VM_EXEC_CONTROL, control); vmwrite(TSC_OFFSET, TSC_OFFSET_VALUE);
diff --git a/tools/testing/selftests/lib.mk b/tools/testing/selftests/lib.mk index 5947944..8794ce3 100644 --- a/tools/testing/selftests/lib.mk +++ b/tools/testing/selftests/lib.mk
@@ -130,11 +130,6 @@ clean: $(CLEAN) -# Enables to extend CFLAGS and LDFLAGS from command line, e.g. -# make USERCFLAGS=-Werror USERLDFLAGS=-static -CFLAGS += $(USERCFLAGS) -LDFLAGS += $(USERLDFLAGS) - # When make O= with kselftest target from main level # the following aren't defined. #
diff --git a/tools/testing/selftests/net/fib_nexthops.sh b/tools/testing/selftests/net/fib_nexthops.sh index 0bdca3a..09830b8 100755 --- a/tools/testing/selftests/net/fib_nexthops.sh +++ b/tools/testing/selftests/net/fib_nexthops.sh
@@ -583,36 +583,6 @@ set +e check_nexthop "dev veth1" "" log_test $? 0 "Nexthops removed on admin down" - - # nexthop route delete warning: route add with nhid and delete - # using device - run_cmd "$IP li set dev veth1 up" - run_cmd "$IP nexthop add id 12 via 172.16.1.3 dev veth1" - out1=`dmesg | grep "WARNING:.*fib_nh_match.*" | wc -l` - run_cmd "$IP route add 172.16.101.1/32 nhid 12" - run_cmd "$IP route delete 172.16.101.1/32 dev veth1" - out2=`dmesg | grep "WARNING:.*fib_nh_match.*" | wc -l` - [ $out1 -eq $out2 ] - rc=$? - log_test $rc 0 "Delete nexthop route warning" - run_cmd "$IP route delete 172.16.101.1/32 nhid 12" - run_cmd "$IP nexthop del id 12" - - run_cmd "$IP nexthop add id 21 via 172.16.1.6 dev veth1" - run_cmd "$IP ro add 172.16.101.0/24 nhid 21" - run_cmd "$IP ro del 172.16.101.0/24 nexthop via 172.16.1.7 dev veth1 nexthop via 172.16.1.8 dev veth1" - log_test $? 2 "Delete multipath route with only nh id based entry" - - run_cmd "$IP nexthop add id 22 via 172.16.1.6 dev veth1" - run_cmd "$IP ro add 172.16.102.0/24 nhid 22" - run_cmd "$IP ro del 172.16.102.0/24 dev veth1" - log_test $? 2 "Delete route when specifying only nexthop device" - - run_cmd "$IP ro del 172.16.102.0/24 via 172.16.1.6" - log_test $? 2 "Delete route when specifying only gateway" - - run_cmd "$IP ro del 172.16.102.0/24" - log_test $? 0 "Delete route when not specifying nexthop attributes" } ipv4_grp_fcnal()
diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh index 24d67fa..6986086 100755 --- a/tools/testing/selftests/net/fib_tests.sh +++ b/tools/testing/selftests/net/fib_tests.sh
@@ -1662,8 +1662,6 @@ ################################################################################ # main -trap cleanup EXIT - while getopts :t:pPhv o do case $o in
diff --git a/tools/testing/selftests/net/forwarding/lib.sh b/tools/testing/selftests/net/forwarding/lib.sh index 4d8845a..f190ad5 100644 --- a/tools/testing/selftests/net/forwarding/lib.sh +++ b/tools/testing/selftests/net/forwarding/lib.sh
@@ -562,14 +562,14 @@ local value=$1; shift SYSCTL_ORIG[$key]=$(sysctl -n $key) - sysctl -qw $key="$value" + sysctl -qw $key=$value } sysctl_restore() { local key=$1; shift - sysctl -qw $key="${SYSCTL_ORIG[$key]}" + sysctl -qw $key=${SYSCTL_ORIG["$key"]} } forwarding_enable()
diff --git a/tools/testing/selftests/net/reuseport_bpf.c b/tools/testing/selftests/net/reuseport_bpf.c index b0cc082..b527710 100644 --- a/tools/testing/selftests/net/reuseport_bpf.c +++ b/tools/testing/selftests/net/reuseport_bpf.c
@@ -330,7 +330,7 @@ static void test_extra_filter(const struct test_params p) if (bind(fd1, addr, sockaddr_size())) error(1, errno, "failed to bind recv socket 1"); - if (!bind(fd2, addr, sockaddr_size()) || errno != EADDRINUSE) + if (!bind(fd2, addr, sockaddr_size()) && errno != EADDRINUSE) error(1, errno, "bind socket 2 should fail with EADDRINUSE"); free(addr);
diff --git a/tools/testing/selftests/net/rtnetlink.sh b/tools/testing/selftests/net/rtnetlink.sh index 911c549..28ea375 100755 --- a/tools/testing/selftests/net/rtnetlink.sh +++ b/tools/testing/selftests/net/rtnetlink.sh
@@ -780,7 +780,7 @@ tmpl proto esp src $srcip dst $dstip spi 9 \ mode transport reqid 42 check_err $? - ip x p add dir in src $dstip/24 dst $srcip/24 \ + ip x p add dir out src $dstip/24 dst $srcip/24 \ tmpl proto esp src $dstip dst $srcip spi 9 \ mode transport reqid 42 check_err $?
diff --git a/tools/testing/selftests/net/udpgso_bench.sh b/tools/testing/selftests/net/udpgso_bench.sh index 640bc43..dc932fd 100755 --- a/tools/testing/selftests/net/udpgso_bench.sh +++ b/tools/testing/selftests/net/udpgso_bench.sh
@@ -7,7 +7,6 @@ readonly YELLOW='\033[0;33m' readonly RED='\033[0;31m' readonly NC='\033[0m' # No Color -readonly TESTPORT=8000 readonly KSFT_PASS=0 readonly KSFT_FAIL=1 @@ -57,26 +56,11 @@ run_one() { local -r args=$@ - local nr_socks=0 - local i=0 - local -r timeout=10 - ./udpgso_bench_rx -p "$TESTPORT" & - ./udpgso_bench_rx -p "$TESTPORT" -t & + ./udpgso_bench_rx & + ./udpgso_bench_rx -t & - # Wait for the above test program to get ready to receive connections. - while [ "$i" -lt "$timeout" ]; do - nr_socks="$(ss -lnHi | grep -c "\*:${TESTPORT}")" - [ "$nr_socks" -eq 2 ] && break - i=$((i + 1)) - sleep 1 - done - if [ "$nr_socks" -ne 2 ]; then - echo "timed out while waiting for udpgso_bench_rx" - exit 1 - fi - - ./udpgso_bench_tx -p "$TESTPORT" ${args} + ./udpgso_bench_tx ${args} } run_in_netns() {
diff --git a/tools/testing/selftests/net/udpgso_bench_rx.c b/tools/testing/selftests/net/udpgso_bench_rx.c index f35a924..6a19342 100644 --- a/tools/testing/selftests/net/udpgso_bench_rx.c +++ b/tools/testing/selftests/net/udpgso_bench_rx.c
@@ -214,10 +214,11 @@ static void do_verify_udp(const char *data, int len) static int recv_msg(int fd, char *buf, int len, int *gso_size) { - char control[CMSG_SPACE(sizeof(int))] = {0}; + char control[CMSG_SPACE(sizeof(uint16_t))] = {0}; struct msghdr msg = {0}; struct iovec iov = {0}; struct cmsghdr *cmsg; + uint16_t *gsosizeptr; int ret; iov.iov_base = buf; @@ -236,7 +237,8 @@ static int recv_msg(int fd, char *buf, int len, int *gso_size) cmsg = CMSG_NXTHDR(&msg, cmsg)) { if (cmsg->cmsg_level == SOL_UDP && cmsg->cmsg_type == UDP_GRO) { - *gso_size = *(int *)CMSG_DATA(cmsg); + gsosizeptr = (uint16_t *) CMSG_DATA(cmsg); + *gso_size = *gsosizeptr; break; } } @@ -248,7 +250,7 @@ static int recv_msg(int fd, char *buf, int len, int *gso_size) static void do_flush_udp(int fd) { static char rbuf[ETH_MAX_MTU]; - int ret, len, gso_size = 0, budget = 256; + int ret, len, gso_size, budget = 256; len = cfg_read_all ? sizeof(rbuf) : 0; while (budget--) { @@ -334,8 +336,6 @@ static void parse_opts(int argc, char **argv) cfg_verify = true; cfg_read_all = true; break; - default: - exit(1); } }
diff --git a/tools/testing/selftests/net/udpgso_bench_tx.c b/tools/testing/selftests/net/udpgso_bench_tx.c index 4773927..f1fdaa2 100644 --- a/tools/testing/selftests/net/udpgso_bench_tx.c +++ b/tools/testing/selftests/net/udpgso_bench_tx.c
@@ -62,7 +62,6 @@ static int cfg_payload_len = (1472 * 42); static int cfg_port = 8000; static int cfg_runtime_ms = -1; static bool cfg_poll; -static int cfg_poll_loop_timeout_ms = 2000; static bool cfg_segment; static bool cfg_sendmmsg; static bool cfg_tcp; @@ -236,17 +235,16 @@ static void flush_errqueue_recv(int fd) } } -static void flush_errqueue(int fd, const bool do_poll, - unsigned long poll_timeout, const bool poll_err) +static void flush_errqueue(int fd, const bool do_poll) { if (do_poll) { struct pollfd fds = {0}; int ret; fds.fd = fd; - ret = poll(&fds, 1, poll_timeout); + ret = poll(&fds, 1, 500); if (ret == 0) { - if ((cfg_verbose) && (poll_err)) + if (cfg_verbose) fprintf(stderr, "poll timeout\n"); } else if (ret < 0) { error(1, errno, "poll"); @@ -256,20 +254,6 @@ static void flush_errqueue(int fd, const bool do_poll, flush_errqueue_recv(fd); } -static void flush_errqueue_retry(int fd, unsigned long num_sends) -{ - unsigned long tnow, tstop; - bool first_try = true; - - tnow = gettimeofday_ms(); - tstop = tnow + cfg_poll_loop_timeout_ms; - do { - flush_errqueue(fd, true, tstop - tnow, first_try); - first_try = false; - tnow = gettimeofday_ms(); - } while ((stat_zcopies != num_sends) && (tnow < tstop)); -} - static int send_tcp(int fd, char *data) { int ret, done = 0, count = 0; @@ -429,8 +413,7 @@ static int send_udp_segment(int fd, char *data) static void usage(const char *filepath) { - error(1, 0, "Usage: %s [-46acmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] " - "[-L secs] [-M messagenr] [-p port] [-s sendsize] [-S gsosize]", + error(1, 0, "Usage: %s [-46acmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] [-M messagenr] [-p port] [-s sendsize] [-S gsosize]", filepath); } @@ -440,7 +423,7 @@ static void parse_opts(int argc, char **argv) int max_len, hdrlen; int c; - while ((c = getopt(argc, argv, "46acC:D:Hl:L:mM:p:s:PS:tTuvz")) != -1) { + while ((c = getopt(argc, argv, "46acC:D:Hl:mM:p:s:PS:tTuvz")) != -1) { switch (c) { case '4': if (cfg_family != PF_UNSPEC) @@ -469,9 +452,6 @@ static void parse_opts(int argc, char **argv) case 'l': cfg_runtime_ms = strtoul(optarg, NULL, 10) * 1000; break; - case 'L': - cfg_poll_loop_timeout_ms = strtoul(optarg, NULL, 10) * 1000; - break; case 'm': cfg_sendmmsg = true; break; @@ -510,8 +490,6 @@ static void parse_opts(int argc, char **argv) case 'z': cfg_zerocopy = true; break; - default: - exit(1); } } @@ -699,7 +677,7 @@ int main(int argc, char **argv) num_sends += send_udp(fd, buf[i]); num_msgs++; if ((cfg_zerocopy && ((num_msgs & 0xF) == 0)) || cfg_tx_tstamp) - flush_errqueue(fd, cfg_poll, 500, true); + flush_errqueue(fd, cfg_poll); if (cfg_msg_nr && num_msgs >= cfg_msg_nr) break; @@ -718,7 +696,7 @@ int main(int argc, char **argv) } while (!interrupted && (cfg_runtime_ms == -1 || tnow < tstop)); if (cfg_zerocopy || cfg_tx_tstamp) - flush_errqueue_retry(fd, num_sends); + flush_errqueue(fd, true); if (close(fd)) error(1, errno, "close");
diff --git a/tools/testing/selftests/netfilter/conntrack_icmp_related.sh b/tools/testing/selftests/netfilter/conntrack_icmp_related.sh index 76645aa..b48e183 100755 --- a/tools/testing/selftests/netfilter/conntrack_icmp_related.sh +++ b/tools/testing/selftests/netfilter/conntrack_icmp_related.sh
@@ -35,8 +35,6 @@ for i in 1 2;do ip netns del nsrouter$i;done } -trap cleanup EXIT - ipv4() { echo -n 192.168.$1.2 } @@ -148,17 +146,11 @@ table inet filter { counter unknown { } counter related { } - counter redir4 { } - counter redir6 { } chain input { type filter hook input priority 0; policy accept; - - icmp type "redirect" ct state "related" counter name "redir4" accept - icmpv6 type "nd-redirect" ct state "related" counter name "redir6" accept - meta l4proto { icmp, icmpv6 } ct state established,untracked accept - meta l4proto { icmp, icmpv6 } ct state "related" counter name "related" accept + meta l4proto { icmp, icmpv6 } ct state "related" counter name "related" accept counter name "unknown" drop } } @@ -287,29 +279,5 @@ echo "ERROR: icmp error RELATED state test has failed" fi -# add 'bad' route, expect icmp REDIRECT to be generated -ip netns exec nsclient1 ip route add 192.168.1.42 via 192.168.1.1 -ip netns exec nsclient1 ip route add dead:1::42 via dead:1::1 - -ip netns exec "nsclient1" ping -q -c 2 192.168.1.42 > /dev/null - -expect="packets 1 bytes 112" -check_counter nsclient1 "redir4" "$expect" -if [ $? -ne 0 ];then - ret=1 -fi - -ip netns exec "nsclient1" ping -c 1 dead:1::42 > /dev/null -expect="packets 1 bytes 192" -check_counter nsclient1 "redir6" "$expect" -if [ $? -ne 0 ];then - ret=1 -fi - -if [ $ret -eq 0 ];then - echo "PASS: icmp redirects had RELATED state" -else - echo "ERROR: icmp redirect RELATED state test has failed" -fi - +cleanup exit $ret
diff --git a/tools/testing/selftests/netfilter/nft_nat.sh b/tools/testing/selftests/netfilter/nft_nat.sh index 67697d8..4e15e81 100755 --- a/tools/testing/selftests/netfilter/nft_nat.sh +++ b/tools/testing/selftests/netfilter/nft_nat.sh
@@ -404,8 +404,6 @@ echo SERVER-$family | ip netns exec "$ns1" timeout 5 socat -u STDIN TCP-LISTEN:2000 & sc_s=$! - sleep 1 - result=$(ip netns exec "$ns0" timeout 1 socat TCP:$daddr:2000 STDOUT) if [ "$result" = "SERVER-inet" ];then
diff --git a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c index e54d7a4..02f6b4e 100644 --- a/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c +++ b/tools/testing/selftests/powerpc/dscr/dscr_sysfs_test.c
@@ -24,7 +24,6 @@ static int check_cpu_dscr_default(char *file, unsigned long val) rc = read(fd, buf, sizeof(buf)); if (rc == -1) { perror("read() failed"); - close(fd); return 1; } close(fd); @@ -66,10 +65,8 @@ static int check_all_cpu_dscr_defaults(unsigned long val) if (access(file, F_OK)) continue; - if (check_cpu_dscr_default(file, val)) { - closedir(sysfs); + if (check_cpu_dscr_default(file, val)) return 1; - } } closedir(sysfs); return 0;
diff --git a/tools/testing/selftests/proc/proc-uptime-002.c b/tools/testing/selftests/proc/proc-uptime-002.c index 7d0aa22..e7ceabe 100644 --- a/tools/testing/selftests/proc/proc-uptime-002.c +++ b/tools/testing/selftests/proc/proc-uptime-002.c
@@ -17,7 +17,6 @@ // while shifting across CPUs. #undef NDEBUG #include <assert.h> -#include <errno.h> #include <unistd.h> #include <sys/syscall.h> #include <stdlib.h> @@ -55,7 +54,7 @@ int main(void) len += sizeof(unsigned long); free(m); m = malloc(len); - } while (sys_sched_getaffinity(0, len, m) == -1 && errno == EINVAL); + } while (sys_sched_getaffinity(0, len, m) == -EINVAL); fd = open("/proc/uptime", O_RDONLY); assert(fd >= 0);
diff --git a/tools/testing/selftests/sigaltstack/current_stack_pointer.h b/tools/testing/selftests/sigaltstack/current_stack_pointer.h deleted file mode 100644 index ea9bdf3..0000000 --- a/tools/testing/selftests/sigaltstack/current_stack_pointer.h +++ /dev/null
@@ -1,23 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ - -#if __alpha__ -register unsigned long sp asm("$30"); -#elif __arm__ || __aarch64__ || __csky__ || __m68k__ || __mips__ || __riscv -register unsigned long sp asm("sp"); -#elif __i386__ -register unsigned long sp asm("esp"); -#elif __loongarch64 -register unsigned long sp asm("$sp"); -#elif __ppc__ -register unsigned long sp asm("r1"); -#elif __s390x__ -register unsigned long sp asm("%15"); -#elif __sh__ -register unsigned long sp asm("r15"); -#elif __x86_64__ -register unsigned long sp asm("rsp"); -#elif __XTENSA__ -register unsigned long sp asm("a1"); -#else -#error "implement current_stack_pointer equivalent" -#endif
diff --git a/tools/testing/selftests/sigaltstack/sas.c b/tools/testing/selftests/sigaltstack/sas.c index 6e60545..ad0f8df 100644 --- a/tools/testing/selftests/sigaltstack/sas.c +++ b/tools/testing/selftests/sigaltstack/sas.c
@@ -19,7 +19,6 @@ #include <errno.h> #include "../kselftest.h" -#include "current_stack_pointer.h" #ifndef SS_AUTODISARM #define SS_AUTODISARM (1U << 31) @@ -41,6 +40,12 @@ void my_usr1(int sig, siginfo_t *si, void *u) stack_t stk; struct stk_data *p; +#if __s390x__ + register unsigned long sp asm("%15"); +#else + register unsigned long sp asm("sp"); +#endif + if (sp < (unsigned long)sstack || sp >= (unsigned long)sstack + SIGSTKSZ) { ksft_exit_fail_msg("SP is not on sigaltstack\n");
diff --git a/tools/testing/selftests/timers/clocksource-switch.c b/tools/testing/selftests/timers/clocksource-switch.c index c18313a..bfc974b 100644 --- a/tools/testing/selftests/timers/clocksource-switch.c +++ b/tools/testing/selftests/timers/clocksource-switch.c
@@ -110,10 +110,10 @@ int run_tests(int secs) sprintf(buf, "./inconsistency-check -t %i", secs); ret = system(buf); - if (WIFEXITED(ret) && WEXITSTATUS(ret)) - return WEXITSTATUS(ret); + if (ret) + return ret; ret = system("./nanosleep"); - return WIFEXITED(ret) ? WEXITSTATUS(ret) : 0; + return ret; }
diff --git a/tools/testing/selftests/timers/valid-adjtimex.c b/tools/testing/selftests/timers/valid-adjtimex.c index 48b9a80..5397de7 100644 --- a/tools/testing/selftests/timers/valid-adjtimex.c +++ b/tools/testing/selftests/timers/valid-adjtimex.c
@@ -40,7 +40,7 @@ #define ADJ_SETOFFSET 0x0100 #include <sys/syscall.h> -int clock_adjtime(clockid_t id, struct timex *tx) +static int clock_adjtime(clockid_t id, struct timex *tx) { return syscall(__NR_clock_adjtime, id, tx); }
diff --git a/tools/thermal/tmon/sysfs.c b/tools/thermal/tmon/sysfs.c index cb1108b..b00b1bf 100644 --- a/tools/thermal/tmon/sysfs.c +++ b/tools/thermal/tmon/sysfs.c
@@ -13,7 +13,6 @@ #include <stdint.h> #include <dirent.h> #include <libintl.h> -#include <limits.h> #include <ctype.h> #include <time.h> #include <syslog.h> @@ -34,9 +33,9 @@ int sysfs_set_ulong(char *path, char *filename, unsigned long val) { FILE *fd; int ret = -1; - char filepath[PATH_MAX + 2]; /* NUL and '/' */ + char filepath[256]; - snprintf(filepath, sizeof(filepath), "%s/%s", path, filename); + snprintf(filepath, 256, "%s/%s", path, filename); fd = fopen(filepath, "w"); if (!fd) { @@ -58,9 +57,9 @@ static int sysfs_get_ulong(char *path, char *filename, unsigned long *p_ulong) { FILE *fd; int ret = -1; - char filepath[PATH_MAX + 2]; /* NUL and '/' */ + char filepath[256]; - snprintf(filepath, sizeof(filepath), "%s/%s", path, filename); + snprintf(filepath, 256, "%s/%s", path, filename); fd = fopen(filepath, "r"); if (!fd) { @@ -77,9 +76,9 @@ static int sysfs_get_string(char *path, char *filename, char *str) { FILE *fd; int ret = -1; - char filepath[PATH_MAX + 2]; /* NUL and '/' */ + char filepath[256]; - snprintf(filepath, sizeof(filepath), "%s/%s", path, filename); + snprintf(filepath, 256, "%s/%s", path, filename); fd = fopen(filepath, "r"); if (!fd) { @@ -200,8 +199,8 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name, { unsigned long trip_instance = 0; char cdev_name_linked[256]; - char cdev_name[PATH_MAX]; - char cdev_trip_name[PATH_MAX]; + char cdev_name[256]; + char cdev_trip_name[256]; int cdev_id; if (nl->d_type == DT_LNK) { @@ -214,8 +213,7 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name, return -EINVAL; } /* find the link to real cooling device record binding */ - snprintf(cdev_name, sizeof(cdev_name) - 2, "%s/%s", - tz_name, nl->d_name); + snprintf(cdev_name, 256, "%s/%s", tz_name, nl->d_name); memset(cdev_name_linked, 0, sizeof(cdev_name_linked)); if (readlink(cdev_name, cdev_name_linked, sizeof(cdev_name_linked) - 1) != -1) { @@ -228,8 +226,8 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name, /* find the trip point in which the cdev is binded to * in this tzone */ - snprintf(cdev_trip_name, sizeof(cdev_trip_name) - 1, - "%s%s", nl->d_name, "_trip_point"); + snprintf(cdev_trip_name, 256, "%s%s", nl->d_name, + "_trip_point"); sysfs_get_ulong(tz_name, cdev_trip_name, &trip_instance); /* validate trip point range, e.g. trip could return -1
diff --git a/tools/thermal/tmon/tmon.h b/tools/thermal/tmon/tmon.h index 44d16d7..c9066ec 100644 --- a/tools/thermal/tmon/tmon.h +++ b/tools/thermal/tmon/tmon.h
@@ -27,9 +27,6 @@ #define NR_LINES_TZDATA 1 #define TMON_LOG_FILE "/var/tmp/tmon.log" -#include <sys/time.h> -#include <pthread.h> - extern unsigned long ticktime; extern double time_elapsed; extern unsigned long target_temp_user;
diff --git a/tools/virtio/linux/bug.h b/tools/virtio/linux/bug.h index 74aef96..b14c2c3 100644 --- a/tools/virtio/linux/bug.h +++ b/tools/virtio/linux/bug.h
@@ -1,9 +1,11 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_BUG_H -#define _LINUX_BUG_H +#ifndef BUG_H +#define BUG_H #define BUG_ON(__BUG_ON_cond) assert(!(__BUG_ON_cond)) +#define BUILD_BUG_ON(x) + #define BUG() abort() -#endif /* _LINUX_BUG_H */ +#endif /* BUG_H */
diff --git a/tools/virtio/linux/build_bug.h b/tools/virtio/linux/build_bug.h deleted file mode 100644 index cdbb75e..0000000 --- a/tools/virtio/linux/build_bug.h +++ /dev/null
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_BUILD_BUG_H -#define _LINUX_BUILD_BUG_H - -#define BUILD_BUG_ON(x) - -#endif /* _LINUX_BUILD_BUG_H */
diff --git a/tools/virtio/linux/cpumask.h b/tools/virtio/linux/cpumask.h deleted file mode 100644 index 307da69..0000000 --- a/tools/virtio/linux/cpumask.h +++ /dev/null
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_CPUMASK_H -#define _LINUX_CPUMASK_H - -#include <linux/kernel.h> - -#endif /* _LINUX_CPUMASK_H */
diff --git a/tools/virtio/linux/gfp.h b/tools/virtio/linux/gfp.h deleted file mode 100644 index 43d146f..0000000 --- a/tools/virtio/linux/gfp.h +++ /dev/null
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __LINUX_GFP_H -#define __LINUX_GFP_H - -#include <linux/topology.h> - -#endif
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h index 3325cdf..6683b4a 100644 --- a/tools/virtio/linux/kernel.h +++ b/tools/virtio/linux/kernel.h
@@ -10,7 +10,6 @@ #include <stdarg.h> #include <linux/compiler.h> -#include <linux/log2.h> #include <linux/types.h> #include <linux/printk.h> #include <linux/bug.h>
diff --git a/tools/virtio/linux/kmsan.h b/tools/virtio/linux/kmsan.h deleted file mode 100644 index 272b5aa..0000000 --- a/tools/virtio/linux/kmsan.h +++ /dev/null
@@ -1,12 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_KMSAN_H -#define _LINUX_KMSAN_H - -#include <linux/gfp.h> - -inline void kmsan_handle_dma(struct page *page, size_t offset, size_t size, - enum dma_data_direction dir) -{ -} - -#endif /* _LINUX_KMSAN_H */
diff --git a/tools/virtio/linux/scatterlist.h b/tools/virtio/linux/scatterlist.h index 74d9e18..369ee30 100644 --- a/tools/virtio/linux/scatterlist.h +++ b/tools/virtio/linux/scatterlist.h
@@ -2,7 +2,6 @@ #ifndef SCATTERLIST_H #define SCATTERLIST_H #include <linux/kernel.h> -#include <linux/bug.h> struct scatterlist { unsigned long page_link;
diff --git a/tools/virtio/linux/topology.h b/tools/virtio/linux/topology.h deleted file mode 100644 index 910794a..0000000 --- a/tools/virtio/linux/topology.h +++ /dev/null
@@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef _LINUX_TOPOLOGY_H -#define _LINUX_TOPOLOGY_H - -#include <linux/cpumask.h> - -#endif /* _LINUX_TOPOLOGY_H */
diff --git a/tools/vm/slabinfo-gnuplot.sh b/tools/vm/slabinfo-gnuplot.sh index 873a892..26e193f 100644 --- a/tools/vm/slabinfo-gnuplot.sh +++ b/tools/vm/slabinfo-gnuplot.sh
@@ -150,7 +150,7 @@ let lines=3 out=`basename "$in"`"-slabs-by-loss" `cat "$in" | grep -A "$lines" 'Slabs sorted by loss' |\ - grep -E -iv '\-\-|Name|Slabs'\ + egrep -iv '\-\-|Name|Slabs'\ | awk '{print $1" "$4+$2*$3" "$4}' > "$out"` if [ $? -eq 0 ]; then do_slabs_plotting "$out" @@ -159,7 +159,7 @@ let lines=3 out=`basename "$in"`"-slabs-by-size" `cat "$in" | grep -A "$lines" 'Slabs sorted by size' |\ - grep -E -iv '\-\-|Name|Slabs'\ + egrep -iv '\-\-|Name|Slabs'\ | awk '{print $1" "$4" "$4-$2*$3}' > "$out"` if [ $? -eq 0 ]; then do_slabs_plotting "$out"
diff --git a/tools/vm/slabinfo.c b/tools/vm/slabinfo.c index dda035c..68092d1 100644 --- a/tools/vm/slabinfo.c +++ b/tools/vm/slabinfo.c
@@ -125,7 +125,7 @@ static void usage(void) "-n|--numa Show NUMA information\n" "-N|--lines=K Show the first K slabs\n" "-o|--ops Show kmem_cache_ops\n" - "-P|--partial Sort by number of partial slabs\n" + "-P|--partial Sort by number of partial slabs\n" "-r|--report Detailed report on single slabs\n" "-s|--shrink Shrink slabs\n" "-S|--Size Sort by size\n" @@ -1045,27 +1045,15 @@ static void sort_slabs(void) for (s2 = s1 + 1; s2 < slabinfo + slabs; s2++) { int result; - if (sort_size) { - if (slab_size(s1) == slab_size(s2)) - result = strcasecmp(s1->name, s2->name); - else - result = slab_size(s1) < slab_size(s2); - } else if (sort_active) { - if (slab_activity(s1) == slab_activity(s2)) - result = strcasecmp(s1->name, s2->name); - else - result = slab_activity(s1) < slab_activity(s2); - } else if (sort_loss) { - if (slab_waste(s1) == slab_waste(s2)) - result = strcasecmp(s1->name, s2->name); - else - result = slab_waste(s1) < slab_waste(s2); - } else if (sort_partial) { - if (s1->partial == s2->partial) - result = strcasecmp(s1->name, s2->name); - else - result = s1->partial < s2->partial; - } else + if (sort_size) + result = slab_size(s1) < slab_size(s2); + else if (sort_active) + result = slab_activity(s1) < slab_activity(s2); + else if (sort_loss) + result = slab_waste(s1) < slab_waste(s2); + else if (sort_partial) + result = s1->partial < s2->partial; + else result = strcasecmp(s1->name, s2->name); if (show_inverted)
diff --git a/virt/kvm/arm/vgic/vgic-its.c b/virt/kvm/arm/vgic/vgic-its.c index e06bb8e..35be0e2 100644 --- a/virt/kvm/arm/vgic/vgic-its.c +++ b/virt/kvm/arm/vgic/vgic-its.c
@@ -2095,7 +2095,7 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, memset(entry, 0, esz); - while (true) { + while (len > 0) { int next_offset; size_t byte_offset; @@ -2108,9 +2108,6 @@ static int scan_its_table(struct vgic_its *its, gpa_t base, int size, u32 esz, return next_offset; byte_offset = next_offset * esz; - if (byte_offset >= len) - break; - id += next_offset; gpa += byte_offset; len -= byte_offset;
diff --git a/virt/kvm/coalesced_mmio.c b/virt/kvm/coalesced_mmio.c index c94e97b..8d60699 100644 --- a/virt/kvm/coalesced_mmio.c +++ b/virt/kvm/coalesced_mmio.c
@@ -191,17 +191,15 @@ int kvm_vm_ioctl_unregister_coalesced_mmio(struct kvm *kvm, r = kvm_io_bus_unregister_dev(kvm, zone->pio ? KVM_PIO_BUS : KVM_MMIO_BUS, &dev->dev); - kvm_iodevice_destructor(&dev->dev); - /* * On failure, unregister destroys all devices on the * bus _except_ the target device, i.e. coalesced_zones - * has been modified. Bail after destroying the target - * device, there's no need to restart the walk as there - * aren't any zones left. + * has been modified. No need to restart the walk as + * there aren't any zones left. */ if (r) break; + kvm_iodevice_destructor(&dev->dev); } }
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index 0008fc4..4b445dd 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c
@@ -2937,7 +2937,7 @@ static long kvm_vcpu_ioctl(struct file *filp, struct kvm_fpu *fpu = NULL; struct kvm_sregs *kvm_sregs = NULL; - if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged) + if (vcpu->kvm->mm != current->mm) return -EIO; if (unlikely(_IOC_TYPE(ioctl) != KVMIO)) @@ -3144,7 +3144,7 @@ static long kvm_vcpu_compat_ioctl(struct file *filp, void __user *argp = compat_ptr(arg); int r; - if (vcpu->kvm->mm != current->mm || vcpu->kvm->vm_bugged) + if (vcpu->kvm->mm != current->mm) return -EIO; switch (ioctl) { @@ -3209,7 +3209,7 @@ static long kvm_device_ioctl(struct file *filp, unsigned int ioctl, { struct kvm_device *dev = filp->private_data; - if (dev->kvm->mm != current->mm || dev->kvm->vm_bugged) + if (dev->kvm->mm != current->mm) return -EIO; switch (ioctl) { @@ -3413,7 +3413,7 @@ static long kvm_vm_ioctl(struct file *filp, void __user *argp = (void __user *)arg; int r; - if (kvm->mm != current->mm || kvm->vm_bugged) + if (kvm->mm != current->mm) return -EIO; switch (ioctl) { case KVM_CREATE_VCPU: @@ -3621,7 +3621,7 @@ static long kvm_vm_compat_ioctl(struct file *filp, struct kvm *kvm = filp->private_data; int r; - if (kvm->mm != current->mm || kvm->vm_bugged) + if (kvm->mm != current->mm) return -EIO; switch (ioctl) { #ifdef CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT