Linux 4.8-rc8 There was a lot of fallout in the imx/amdgpu/i915 drivers, so backmerge it now to avoid troubles. * tag 'v4.8-rc8': (1442 commits) Linux 4.8-rc8 fault_in_multipages_readable() throws set-but-unused error mm: check VMA flags to avoid invalid PROT_NONE NUMA balancing radix tree: fix sibling entry handling in radix_tree_descend() radix tree test suite: Test radix_tree_replace_slot() for multiorder entries fix memory leaks in tracing_buffers_splice_read() tracing: Move mutex to protect against resetting of seq data MIPS: Fix delay slot emulation count in debugfs MIPS: SMP: Fix possibility of deadlock when bringing CPUs online mm: delete unnecessary and unsafe init_tlb_ubc() huge tmpfs: fix Committed_AS leak shmem: fix tmpfs to handle the huge= option properly blk-mq: skip unmapped queues in blk_mq_alloc_request_hctx MIPS: Fix pre-r6 emulation FPU initialisation arm64: kgdb: handle read-only text / modules arm64: Call numa_store_cpu_info() earlier. locking/hung_task: Fix typo in CONFIG_DETECT_HUNG_TASK help text nvme-rdma: only clear queue flags after successful connect i2c: qup: skip qup_i2c_suspend if the device is already runtime suspended perf/core: Limit matching exclusive events to one PMU ...
Unified · Split
| @@ -88,6 +88,7 @@ Kay Sievers <kay.sievers@vrfy.org> · 87 unmodified lines | ||
| 88 | 88 | Kenneth W Chen <kenneth.w.chen@intel.com> |
| 89 | 89 | Konstantin Khlebnikov <koct9i@gmail.com> <k.khlebnikov@samsung.com> |
| 90 | 90 | Koushik <raghavendra.koushik@neterion.com> |
| 91 | +Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski@samsung.com> | |
| 91 | 92 | Krzysztof Kozlowski <krzk@kernel.org> <k.kozlowski.k@gmail.com> |
| 92 | 93 | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| 93 | 94 | Leonid I Ananiev <leonid.i.ananiev@intel.com> |
| @@ -158,6 +159,8 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu> · 64 unmodified lines | ||
| 158 | 159 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com> |
| 159 | 160 | Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com> |
| 160 | 161 | Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com> |
| 162 | +Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com> | |
| 163 | +Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> | |
| 161 | 164 | Takashi YOSHII <takashi.yoshii.zj@renesas.com> |
| 162 | 165 | Yusuke Goda <goda.yusuke@renesas.com> |
| 163 | 166 | Gustavo Padovan <gustavo@las.ic.unicamp.br> |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | # Note: This documents additional properties of any device beyond what |
| 2 | 2 | # is documented in Documentation/sysfs-rules.txt |
| 3 | 3 | |
| 4 | −What: /sys/devices/*/of_path | |
| 4 | +What: /sys/devices/*/of_node | |
| 5 | 5 | Date: February 2015 |
| 6 | 6 | Contact: Device Tree mailing list <devicetree@vger.kernel.org> |
| 7 | 7 | Description: |
| @@ -94,14 +94,11 @@ has a requirements for a minimum number of vectors the driver can pass a · 93 unmodified lines | ||
| 94 | 94 | min_vecs argument set to this limit, and the PCI core will return -ENOSPC |
| 95 | 95 | if it can't meet the minimum number of vectors. |
| 96 | 96 | |
| 97 | −The flags argument should normally be set to 0, but can be used to pass the | |
| 98 | −PCI_IRQ_NOMSI and PCI_IRQ_NOMSIX flag in case a device claims to support | |
| 99 | −MSI or MSI-X, but the support is broken, or to pass PCI_IRQ_NOLEGACY in | |
| 100 | −case the device does not support legacy interrupt lines. | |
| 101 | − | |
| 102 | −By default this function will spread the interrupts around the available | |
| 103 | −CPUs, but this feature can be disabled by passing the PCI_IRQ_NOAFFINITY | |
| 104 | −flag. | |
| 97 | +The flags argument is used to specify which type of interrupt can be used | |
| 98 | +by the device and the driver (PCI_IRQ_LEGACY, PCI_IRQ_MSI, PCI_IRQ_MSIX). | |
| 99 | +A convenient short-hand (PCI_IRQ_ALL_TYPES) is also available to ask for | |
| 100 | +any possible kind of interrupt. If the PCI_IRQ_AFFINITY flag is set, | |
| 101 | +pci_alloc_irq_vectors() will spread the interrupts around the available CPUs. | |
| 105 | 102 | |
| 106 | 103 | To get the Linux IRQ numbers passed to request_irq() and free_irq() and the |
| 107 | 104 | vectors, use the following function: |
| @@ -131,7 +128,7 @@ larger than the number supported by the device it will automatically be · 23 unmodified lines | ||
| 131 | 128 | capped to the supported limit, so there is no need to query the number of |
| 132 | 129 | vectors supported beforehand: |
| 133 | 130 | |
| 134 | − nvec = pci_alloc_irq_vectors(pdev, 1, nvec, 0); | |
| 131 | + nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_ALL_TYPES) | |
| 135 | 132 | if (nvec < 0) |
| 136 | 133 | goto out_err; |
| 137 | 134 | |
| @@ -140,7 +137,7 @@ interrupts it can request a particular number of interrupts by passing that · 2 unmodified lines | ||
| 140 | 137 | number to pci_alloc_irq_vectors() function as both 'min_vecs' and |
| 141 | 138 | 'max_vecs' parameters: |
| 142 | 139 | |
| 143 | − ret = pci_alloc_irq_vectors(pdev, nvec, nvec, 0); | |
| 140 | + ret = pci_alloc_irq_vectors(pdev, nvec, nvec, PCI_IRQ_ALL_TYPES); | |
| 144 | 141 | if (ret < 0) |
| 145 | 142 | goto out_err; |
| 146 | 143 | |
| @@ -148,15 +145,14 @@ The most notorious example of the request type described above is enabling · 1 unmodified line | ||
| 148 | 145 | the single MSI mode for a device. It could be done by passing two 1s as |
| 149 | 146 | 'min_vecs' and 'max_vecs': |
| 150 | 147 | |
| 151 | − ret = pci_alloc_irq_vectors(pdev, 1, 1, 0); | |
| 148 | + ret = pci_alloc_irq_vectors(pdev, 1, 1, PCI_IRQ_ALL_TYPES); | |
| 152 | 149 | if (ret < 0) |
| 153 | 150 | goto out_err; |
| 154 | 151 | |
| 155 | 152 | Some devices might not support using legacy line interrupts, in which case |
| 156 | −the PCI_IRQ_NOLEGACY flag can be used to fail the request if the platform | |
| 157 | −can't provide MSI or MSI-X interrupts: | |
| 153 | +the driver can specify that only MSI or MSI-X is acceptable: | |
| 158 | 154 | |
| 159 | − nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_NOLEGACY); | |
| 155 | + nvec = pci_alloc_irq_vectors(pdev, 1, nvec, PCI_IRQ_MSI | PCI_IRQ_MSIX); | |
| 160 | 156 | if (nvec < 0) |
| 161 | 157 | goto out_err; |
| 162 | 158 | |
| @@ -124,7 +124,6 @@ initialization with a pointer to a structure describing the driver · 123 unmodified lines | ||
| 124 | 124 | |
| 125 | 125 | The ID table is an array of struct pci_device_id entries ending with an |
| 126 | 126 | all-zero entry. Definitions with static const are generally preferred. |
| 127 | −Use of the deprecated macro DEFINE_PCI_DEVICE_TABLE should be avoided. | |
| 128 | 127 | |
| 129 | 128 | Each entry consists of: |
| 130 | 129 | |
| @@ -18,13 +18,17 @@ and config2 fields of the perf_event_attr structure. The "events" · 17 unmodified lines | ||
| 18 | 18 | directory provides configuration templates for all documented |
| 19 | 19 | events, that can be used with perf tool. For example "xp_valid_flit" |
| 20 | 20 | is an equivalent of "type=0x8,event=0x4". Other parameters must be |
| 21 | −explicitly specified. For events originating from device, "node" | |
| 22 | −defines its index. All crosspoint events require "xp" (index), | |
| 23 | −"port" (device port number) and "vc" (virtual channel ID) and | |
| 24 | −"dir" (direction). Watchpoints (special "event" value 0xfe) also | |
| 25 | −require comparator values ("cmp_l" and "cmp_h") and "mask", being | |
| 26 | −index of the comparator mask. | |
| 21 | +explicitly specified. | |
| 27 | 22 | |
| 23 | +For events originating from device, "node" defines its index. | |
| 24 | + | |
| 25 | +Crosspoint PMU events require "xp" (index), "bus" (bus number) | |
| 26 | +and "vc" (virtual channel ID). | |
| 27 | + | |
| 28 | +Crosspoint watchpoint-based events (special "event" value 0xfe) | |
| 29 | +require "xp" and "vc" as as above plus "port" (device port index), | |
| 30 | +"dir" (transmit/receive direction), comparator values ("cmp_l" | |
| 31 | +and "cmp_h") and "mask", being index of the comparator mask. | |
| 28 | 32 | Masks are defined separately from the event description |
| 29 | 33 | (due to limited number of the config values) in the "cmp_mask" |
| 30 | 34 | directory, with first 8 configurable by user and additional |
| @@ -53,6 +53,7 @@ stable kernels. · 52 unmodified lines | ||
| 53 | 53 | | ARM | Cortex-A57 | #832075 | ARM64_ERRATUM_832075 | |
| 54 | 54 | | ARM | Cortex-A57 | #852523 | N/A | |
| 55 | 55 | | ARM | Cortex-A57 | #834220 | ARM64_ERRATUM_834220 | |
| 56 | +| ARM | Cortex-A72 | #853709 | N/A | | |
| 56 | 57 | | ARM | MMU-500 | #841119,#826419 | N/A | |
| 57 | 58 | | | | | | |
| 58 | 59 | | Cavium | ThunderX ITS | #22375, #24313 | CAVIUM_ERRATUM_22375 | |
| @@ -131,7 +131,7 @@ pygments_style = 'sphinx' · 130 unmodified lines | ||
| 131 | 131 | todo_include_todos = False |
| 132 | 132 | |
| 133 | 133 | primary_domain = 'C' |
| 134 | −highlight_language = 'C' | |
| 134 | +highlight_language = 'guess' | |
| 135 | 135 | |
| 136 | 136 | # -- Options for HTML output ---------------------------------------------- |
| 137 | 137 | |
| @@ -103,7 +103,7 @@ Config Main Menu · 102 unmodified lines | ||
| 103 | 103 | Power management options (ACPI, APM) ---> |
| 104 | 104 | CPU Frequency scaling ---> |
| 105 | 105 | [*] CPU Frequency scaling |
| 106 | − <*> CPU frequency translation statistics | |
| 106 | + [*] CPU frequency translation statistics | |
| 107 | 107 | [*] CPU frequency translation statistics details |
| 108 | 108 | |
| 109 | 109 | |
| @@ -16,6 +16,11 @@ Required properties: · 15 unmodified lines | ||
| 16 | 16 | - vref-supply: The regulator supply ADC reference voltage. |
| 17 | 17 | - #io-channel-cells: Should be 1, see ../iio-bindings.txt |
| 18 | 18 | |
| 19 | +Optional properties: | |
| 20 | +- resets: Must contain an entry for each entry in reset-names if need support | |
| 21 | + this option. See ../reset/reset.txt for details. | |
| 22 | +- reset-names: Must include the name "saradc-apb". | |
| 23 | + | |
| 19 | 24 | Example: |
| 20 | 25 | saradc: saradc@2006c000 { |
| 21 | 26 | compatible = "rockchip,saradc"; |
| @@ -23,6 +28,8 @@ Example: · 1 unmodified line | ||
| 23 | 28 | interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>; |
| 24 | 29 | clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; |
| 25 | 30 | clock-names = "saradc", "apb_pclk"; |
| 31 | + resets = <&cru SRST_SARADC>; | |
| 32 | + reset-names = "saradc-apb"; | |
| 26 | 33 | #io-channel-cells = <1>; |
| 27 | 34 | vref-supply = <&vcc18>; |
| 28 | 35 | }; |
| @@ -13,6 +13,7 @@ Required properties: · 12 unmodified lines | ||
| 13 | 13 | - touchscreen-size-y : See touchscreen.txt |
| 14 | 14 | |
| 15 | 15 | Optional properties: |
| 16 | +- firmware-name : File basename (string) for board specific firmware | |
| 16 | 17 | - touchscreen-inverted-x : See touchscreen.txt |
| 17 | 18 | - touchscreen-inverted-y : See touchscreen.txt |
| 18 | 19 | - touchscreen-swapped-x-y : See touchscreen.txt |
| @@ -10,7 +10,7 @@ Required properties: · 9 unmodified lines | ||
| 10 | 10 | subsystem (mmcss) inside the FlashSS (available in STiH407 SoC |
| 11 | 11 | family). |
| 12 | 12 | |
| 13 | −- clock-names: Should be "mmc". | |
| 13 | +- clock-names: Should be "mmc" and "icn". (NB: The latter is not compulsory) | |
| 14 | 14 | See: Documentation/devicetree/bindings/resource-names.txt |
| 15 | 15 | - clocks: Phandle to the clock. |
| 16 | 16 | See: Documentation/devicetree/bindings/clock/clock-bindings.txt |
| @@ -42,9 +42,6 @@ Optional properties: · 41 unmodified lines | ||
| 42 | 42 | - auto-flow-control: one way to enable automatic flow control support. The |
| 43 | 43 | driver is allowed to detect support for the capability even without this |
| 44 | 44 | property. |
| 45 | −- {rts,cts,dtr,dsr,rng,dcd}-gpios: specify a GPIO for RTS/CTS/DTR/DSR/RI/DCD | |
| 46 | − line respectively. It will use specified GPIO instead of the peripheral | |
| 47 | − function pin for the UART feature. If unsure, don't specify this property. | |
| 48 | 45 | |
| 49 | 46 | Note: |
| 50 | 47 | * fsl,ns16550: |
| @@ -66,19 +63,3 @@ Example: · 15 unmodified lines | ||
| 66 | 63 | interrupts = <10>; |
| 67 | 64 | reg-shift = <2>; |
| 68 | 65 | }; |
| 69 | − | |
| 70 | −Example for OMAP UART using GPIO-based modem control signals: | |
| 71 | − | |
| 72 | − uart4: serial@49042000 { | |
| 73 | − compatible = "ti,omap3-uart"; | |
| 74 | − reg = <0x49042000 0x400>; | |
| 75 | − interrupts = <80>; | |
| 76 | − ti,hwmods = "uart4"; | |
| 77 | − clock-frequency = <48000000>; | |
| 78 | − cts-gpios = <&gpio3 5 GPIO_ACTIVE_LOW>; | |
| 79 | − rts-gpios = <&gpio3 6 GPIO_ACTIVE_LOW>; | |
| 80 | − dtr-gpios = <&gpio1 12 GPIO_ACTIVE_LOW>; | |
| 81 | − dsr-gpios = <&gpio1 13 GPIO_ACTIVE_LOW>; | |
| 82 | − dcd-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>; | |
| 83 | − rng-gpios = <&gpio1 15 GPIO_ACTIVE_LOW>; | |
| 84 | − }; | |
| @@ -8,8 +8,6 @@ Required properties: · 7 unmodified lines | ||
| 8 | 8 | - interrupts: Interrupt number for McPDM |
| 9 | 9 | - interrupt-parent: The parent interrupt controller |
| 10 | 10 | - ti,hwmods: Name of the hwmod associated to the McPDM |
| 11 | −- clocks: phandle for the pdmclk provider, likely <&twl6040> | |
| 12 | −- clock-names: Must be "pdmclk" | |
| 13 | 11 | |
| 14 | 12 | Example: |
| 15 | 13 | |
| @@ -21,11 +19,3 @@ mcpdm: mcpdm@40132000 { · 5 unmodified lines | ||
| 21 | 19 | interrupt-parent = <&gic>; |
| 22 | 20 | ti,hwmods = "mcpdm"; |
| 23 | 21 | }; |
| 24 | − | |
| 25 | −In board DTS file the pdmclk needs to be added: | |
| 26 | − | |
| 27 | −&mcpdm { | |
| 28 | − clocks = <&twl6040>; | |
| 29 | − clock-names = "pdmclk"; | |
| 30 | − status = "okay"; | |
| 31 | −}; | |
| @@ -62,7 +62,7 @@ For more examples of cooling devices, refer to the example sections below. · 61 unmodified lines | ||
| 62 | 62 | Required properties: |
| 63 | 63 | - #cooling-cells: Used to provide cooling device specific information |
| 64 | 64 | Type: unsigned while referring to it. Must be at least 2, in order |
| 65 | − Size: one cell to specify minimum and maximum cooling state used | |
| 65 | + Size: one cell to specify minimum and maximum cooling state used | |
| 66 | 66 | in the reference. The first cell is the minimum |
| 67 | 67 | cooling state requested and the second cell is |
| 68 | 68 | the maximum cooling state requested in the reference. |
| @@ -119,7 +119,7 @@ Required properties: · 50 unmodified lines | ||
| 119 | 119 | Optional property: |
| 120 | 120 | - contribution: The cooling contribution to the thermal zone of the |
| 121 | 121 | Type: unsigned referred cooling device at the referred trip point. |
| 122 | − Size: one cell The contribution is a ratio of the sum | |
| 122 | + Size: one cell The contribution is a ratio of the sum | |
| 123 | 123 | of all cooling contributions within a thermal zone. |
| 124 | 124 | |
| 125 | 125 | Note: Using the THERMAL_NO_LIMIT (-1UL) constant in the cooling-device phandle |
| @@ -145,7 +145,7 @@ Required properties: · 19 unmodified lines | ||
| 145 | 145 | Size: one cell |
| 146 | 146 | |
| 147 | 147 | - thermal-sensors: A list of thermal sensor phandles and sensor specifier |
| 148 | − Type: list of used while monitoring the thermal zone. | |
| 148 | + Type: list of used while monitoring the thermal zone. | |
| 149 | 149 | phandles + sensor |
| 150 | 150 | specifier |
| 151 | 151 | |
| @@ -473,7 +473,7 @@ thermal-zones { · 321 unmodified lines | ||
| 473 | 473 | <&adc>; /* pcb north */ |
| 474 | 474 | |
| 475 | 475 | /* hotspot = 100 * bandgap - 120 * adc + 484 */ |
| 476 | − coefficients = <100 -120 484>; | |
| 476 | + coefficients = <100 -120 484>; | |
| 477 | 477 | |
| 478 | 478 | trips { |
| 479 | 479 | ... |
| @@ -502,7 +502,7 @@ from the ADC sensor. The binding would be then: · 22 unmodified lines | ||
| 502 | 502 | thermal-sensors = <&adc>; |
| 503 | 503 | |
| 504 | 504 | /* hotspot = 1 * adc + 6000 */ |
| 505 | − coefficients = <1 6000>; | |
| 505 | + coefficients = <1 6000>; | |
| 506 | 506 | |
| 507 | 507 | (d) - Board thermal |
| 508 | 508 | |
| @@ -183,12 +183,10 @@ The copy_up operation essentially creates a new, identical file and · 182 unmodified lines | ||
| 183 | 183 | moves it over to the old name. The new file may be on a different |
| 184 | 184 | filesystem, so both st_dev and st_ino of the file may change. |
| 185 | 185 | |
| 186 | −Any open files referring to this inode will access the old data and | |
| 187 | −metadata. Similarly any file locks obtained before copy_up will not | |
| 188 | −apply to the copied up file. | |
| 186 | +Any open files referring to this inode will access the old data. | |
| 189 | 187 | |
| 190 | −On a file opened with O_RDONLY fchmod(2), fchown(2), futimesat(2) and | |
| 191 | −fsetxattr(2) will fail with EROFS. | |
| 188 | +Any file locks (and leases) obtained before copy_up will not apply | |
| 189 | +to the copied up file. | |
| 192 | 190 | |
| 193 | 191 | If a file with multiple hard links is copied up, then this will |
| 194 | 192 | "break" the link. Changes will not be propagated to other names |
| @@ -19,5 +19,5 @@ enhancements. It can monitor up to 4 voltages, 16 temperatures and · 18 unmodified lines | ||
| 19 | 19 | implemented in this driver. |
| 20 | 20 | |
| 21 | 21 | Specification of the chip can be found here: |
| 22 | −ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf | |
| 23 | −ftp:///pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf | |
| 22 | +ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/BMC-Teutates_Specification_V1.21.pdf | |
| 23 | +ftp://ftp.ts.fujitsu.com/pub/Mainboard-OEM-Sales/Services/Software&Tools/Linux_SystemMonitoring&Watchdog&GPIO/Fujitsu_mainboards-1-Sensors_HowTo-en-US.pdf | |
| @@ -145,6 +145,11 @@ If you want to add slave support to the bus driver: · 144 unmodified lines | ||
| 145 | 145 | |
| 146 | 146 | * Catch the slave interrupts and send appropriate i2c_slave_events to the backend. |
| 147 | 147 | |
| 148 | +Note that most hardware supports being master _and_ slave on the same bus. So, | |
| 149 | +if you extend a bus driver, please make sure that the driver supports that as | |
| 150 | +well. In almost all cases, slave support does not need to disable the master | |
| 151 | +functionality. | |
| 152 | + | |
| 148 | 153 | Check the i2c-rcar driver as an example. |
| 149 | 154 | |
| 150 | 155 | |
| @@ -366,8 +366,6 @@ Domain`_ references. · 365 unmodified lines | ||
| 366 | 366 | Cross-referencing from reStructuredText |
| 367 | 367 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
| 368 | 368 | |
| 369 | −.. highlight:: none | |
| 370 | − | |
| 371 | 369 | To cross-reference the functions and types defined in the kernel-doc comments |
| 372 | 370 | from reStructuredText documents, please use the `Sphinx C Domain`_ |
| 373 | 371 | references. For example:: |
| @@ -390,8 +388,6 @@ For further details, please refer to the `Sphinx C Domain`_ documentation. · 16 unmodified lines | ||
| 390 | 388 | Function documentation |
| 391 | 389 | ---------------------- |
| 392 | 390 | |
| 393 | −.. highlight:: c | |
| 394 | − | |
| 395 | 391 | The general format of a function and function-like macro kernel-doc comment is:: |
| 396 | 392 | |
| 397 | 393 | /** |
| @@ -572,8 +568,6 @@ DocBook XML [DEPRECATED] · 174 unmodified lines | ||
| 572 | 568 | Converting DocBook to Sphinx |
| 573 | 569 | ---------------------------- |
| 574 | 570 | |
| 575 | −.. highlight:: none | |
| 576 | − | |
| 577 | 571 | Over time, we expect all of the documents under ``Documentation/DocBook`` to be |
| 578 | 572 | converted to Sphinx and reStructuredText. For most DocBook XML documents, a good |
| 579 | 573 | enough solution is to use the simple ``Documentation/sphinx/tmplcvt`` script, |
| @@ -3032,6 +3032,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted. · 3031 unmodified lines | ||
| 3032 | 3032 | PAGE_SIZE is used as alignment. |
| 3033 | 3033 | PCI-PCI bridge can be specified, if resource |
| 3034 | 3034 | windows need to be expanded. |
| 3035 | + To specify the alignment for several | |
| 3036 | + instances of a device, the PCI vendor, | |
| 3037 | + device, subvendor, and subdevice may be | |
| 3038 | + specified, e.g., 4096@pci:8086:9c22:103c:198f | |
| 3035 | 3039 | ecrc= Enable/disable PCIe ECRC (transaction layer |
| 3036 | 3040 | end-to-end CRC checking). |
| 3037 | 3041 | bios: Use BIOS/firmware settings. This is the |
| @@ -144,7 +144,7 @@ logical address types are already defined will return with error ``EBUSY``. · 143 unmodified lines | ||
| 144 | 144 | |
| 145 | 145 | - ``flags`` |
| 146 | 146 | |
| 147 | − - Flags. No flags are defined yet, so set this to 0. | |
| 147 | + - Flags. See :ref:`cec-log-addrs-flags` for a list of available flags. | |
| 148 | 148 | |
| 149 | 149 | - .. row 7 |
| 150 | 150 | |
| @@ -201,6 +201,25 @@ logical address types are already defined will return with error ``EBUSY``. · 50 unmodified lines | ||
| 201 | 201 | give the CEC framework more information about the device type, even |
| 202 | 202 | though the framework won't use it directly in the CEC message. |
| 203 | 203 | |
| 204 | +.. _cec-log-addrs-flags: | |
| 205 | + | |
| 206 | +.. flat-table:: Flags for struct cec_log_addrs | |
| 207 | + :header-rows: 0 | |
| 208 | + :stub-columns: 0 | |
| 209 | + :widths: 3 1 4 | |
| 210 | + | |
| 211 | + | |
| 212 | + - .. _`CEC-LOG-ADDRS-FL-ALLOW-UNREG-FALLBACK`: | |
| 213 | + | |
| 214 | + - ``CEC_LOG_ADDRS_FL_ALLOW_UNREG_FALLBACK`` | |
| 215 | + | |
| 216 | + - 1 | |
| 217 | + | |
| 218 | + - By default if no logical address of the requested type can be claimed, then | |
| 219 | + it will go back to the unconfigured state. If this flag is set, then it will | |
| 220 | + fallback to the Unregistered logical address. Note that if the Unregistered | |
| 221 | + logical address was explicitly requested, then this flag has no effect. | |
| 222 | + | |
| 204 | 223 | .. _cec-versions: |
| 205 | 224 | |
| 206 | 225 | .. flat-table:: CEC Versions |
| @@ -64,7 +64,8 @@ it is guaranteed that the state did change in between the two events. · 63 unmodified lines | ||
| 64 | 64 | |
| 65 | 65 | - ``phys_addr`` |
| 66 | 66 | |
| 67 | − - The current physical address. | |
| 67 | + - The current physical address. This is ``CEC_PHYS_ADDR_INVALID`` if no | |
| 68 | + valid physical address is set. | |
| 68 | 69 | |
| 69 | 70 | - .. row 2 |
| 70 | 71 | |
| @@ -72,7 +73,10 @@ it is guaranteed that the state did change in between the two events. · 1 unmodified line | ||
| 72 | 73 | |
| 73 | 74 | - ``log_addr_mask`` |
| 74 | 75 | |
| 75 | − - The current set of claimed logical addresses. | |
| 76 | + - The current set of claimed logical addresses. This is 0 if no logical | |
| 77 | + addresses are claimed or if ``phys_addr`` is ``CEC_PHYS_ADDR_INVALID``. | |
| 78 | + If bit 15 is set (``1 << CEC_LOG_ADDR_UNREGISTERED``) then this device | |
| 79 | + has the unregistered logical address. In that case all other bits are 0. | |
| 76 | 80 | |
| 77 | 81 | |
| 78 | 82 | |
| @@ -587,26 +587,6 @@ of DSA, would be the its port-based VLAN, used by the associated bridge device. · 586 unmodified lines | ||
| 587 | 587 | TODO |
| 588 | 588 | ==== |
| 589 | 589 | |
| 590 | −The platform device problem | |
| 591 | −--------------------------- | |
| 592 | −DSA is currently implemented as a platform device driver which is far from ideal | |
| 593 | −as was discussed in this thread: | |
| 594 | − | |
| 595 | −http://permalink.gmane.org/gmane.linux.network/329848 | |
| 596 | − | |
| 597 | −This basically prevents the device driver model to be properly used and applied, | |
| 598 | −and support non-MDIO, non-MMIO Ethernet connected switches. | |
| 599 | − | |
| 600 | −Another problem with the platform device driver approach is that it prevents the | |
| 601 | −use of a modular switch drivers build due to a circular dependency, illustrated | |
| 602 | −here: | |
| 603 | − | |
| 604 | −http://comments.gmane.org/gmane.linux.network/345803 | |
| 605 | − | |
| 606 | −Attempts of reworking this has been done here: | |
| 607 | − | |
| 608 | −https://lwn.net/Articles/643149/ | |
| 609 | − | |
| 610 | 590 | Making SWITCHDEV and DSA converge towards an unified codebase |
| 611 | 591 | ------------------------------------------------------------- |
| 612 | 592 | |
| @@ -790,13 +790,12 @@ The kernel interface functions are as follows: · 789 unmodified lines | ||
| 790 | 790 | Data messages can have their contents extracted with the usual bunch of |
| 791 | 791 | socket buffer manipulation functions. A data message can be determined to |
| 792 | 792 | be the last one in a sequence with rxrpc_kernel_is_data_last(). When a |
| 793 | − data message has been used up, rxrpc_kernel_data_delivered() should be | |
| 794 | − called on it.. | |
| 793 | + data message has been used up, rxrpc_kernel_data_consumed() should be | |
| 794 | + called on it. | |
| 795 | 795 | |
| 796 | − Non-data messages should be handled to rxrpc_kernel_free_skb() to dispose | |
| 797 | − of. It is possible to get extra refs on all types of message for later | |
| 798 | − freeing, but this may pin the state of a call until the message is finally | |
| 799 | − freed. | |
| 796 | + Messages should be handled to rxrpc_kernel_free_skb() to dispose of. It | |
| 797 | + is possible to get extra refs on all types of message for later freeing, | |
| 798 | + but this may pin the state of a call until the message is finally freed. | |
| 800 | 799 | |
| 801 | 800 | (*) Accept an incoming call. |
| 802 | 801 | |
| @@ -821,12 +820,14 @@ The kernel interface functions are as follows: · 18 unmodified lines | ||
| 821 | 820 | Other errors may be returned if the call had been aborted (-ECONNABORTED) |
| 822 | 821 | or had timed out (-ETIME). |
| 823 | 822 | |
| 824 | − (*) Record the delivery of a data message and free it. | |
| 823 | + (*) Record the delivery of a data message. | |
| 825 | 824 | |
| 826 | − void rxrpc_kernel_data_delivered(struct sk_buff *skb); | |
| 825 | + void rxrpc_kernel_data_consumed(struct rxrpc_call *call, | |
| 826 | + struct sk_buff *skb); | |
| 827 | 827 | |
| 828 | − This is used to record a data message as having been delivered and to | |
| 829 | − update the ACK state for the call. The socket buffer will be freed. | |
| 828 | + This is used to record a data message as having been consumed and to | |
| 829 | + update the ACK state for the call. The message must still be passed to | |
| 830 | + rxrpc_kernel_free_skb() for disposal by the caller. | |
| 830 | 831 | |
| 831 | 832 | (*) Free a message. |
| 832 | 833 | |
| @@ -164,7 +164,32 @@ load n/2 modules more and try again. · 163 unmodified lines | ||
| 164 | 164 | Again, if you find the offending module(s), it(they) must be unloaded every time |
| 165 | 165 | before hibernation, and please report the problem with it(them). |
| 166 | 166 | |
| 167 | −c) Advanced debugging | |
| 167 | +c) Using the "test_resume" hibernation option | |
| 168 | + | |
| 169 | +/sys/power/disk generally tells the kernel what to do after creating a | |
| 170 | +hibernation image. One of the available options is "test_resume" which | |
| 171 | +causes the just created image to be used for immediate restoration. Namely, | |
| 172 | +after doing: | |
| 173 | + | |
| 174 | +# echo test_resume > /sys/power/disk | |
| 175 | +# echo disk > /sys/power/state | |
| 176 | + | |
| 177 | +a hibernation image will be created and a resume from it will be triggered | |
| 178 | +immediately without involving the platform firmware in any way. | |
| 179 | + | |
| 180 | +That test can be used to check if failures to resume from hibernation are | |
| 181 | +related to bad interactions with the platform firmware. That is, if the above | |
| 182 | +works every time, but resume from actual hibernation does not work or is | |
| 183 | +unreliable, the platform firmware may be responsible for the failures. | |
| 184 | + | |
| 185 | +On architectures and platforms that support using different kernels to restore | |
| 186 | +hibernation images (that is, the kernel used to read the image from storage and | |
| 187 | +load it into memory is different from the one included in the image) or support | |
| 188 | +kernel address space randomization, it also can be used to check if failures | |
| 189 | +to resume may be related to the differences between the restore and image | |
| 190 | +kernels. | |
| 191 | + | |
| 192 | +d) Advanced debugging | |
| 168 | 193 | |
| 169 | 194 | In case that hibernation does not work on your system even in the minimal |
| 170 | 195 | configuration and compiling more drivers as modules is not practical or some |
| @@ -1,75 +1,76 @@ | ||
| 1 | −Power Management Interface | |
| 2 | − | |
| 3 | − | |
| 4 | −The power management subsystem provides a unified sysfs interface to | |
| 5 | −userspace, regardless of what architecture or platform one is | |
| 6 | −running. The interface exists in /sys/power/ directory (assuming sysfs | |
| 7 | −is mounted at /sys). | |
| 8 | − | |
| 9 | −/sys/power/state controls system power state. Reading from this file | |
| 10 | −returns what states are supported, which is hard-coded to 'freeze', | |
| 11 | −'standby' (Power-On Suspend), 'mem' (Suspend-to-RAM), and 'disk' | |
| 12 | −(Suspend-to-Disk). | |
| 13 | − | |
| 14 | −Writing to this file one of those strings causes the system to | |
| 15 | −transition into that state. Please see the file | |
| 16 | −Documentation/power/states.txt for a description of each of those | |
| 17 | −states. | |
| 18 | − | |
| 19 | − | |
| 20 | −/sys/power/disk controls the operating mode of the suspend-to-disk | |
| 21 | −mechanism. Suspend-to-disk can be handled in several ways. We have a | |
| 22 | −few options for putting the system to sleep - using the platform driver | |
| 23 | −(e.g. ACPI or other suspend_ops), powering off the system or rebooting the | |
| 24 | −system (for testing). | |
| 25 | − | |
| 26 | −Additionally, /sys/power/disk can be used to turn on one of the two testing | |
| 27 | −modes of the suspend-to-disk mechanism: 'testproc' or 'test'. If the | |
| 28 | −suspend-to-disk mechanism is in the 'testproc' mode, writing 'disk' to | |
| 29 | −/sys/power/state will cause the kernel to disable nonboot CPUs and freeze | |
| 30 | −tasks, wait for 5 seconds, unfreeze tasks and enable nonboot CPUs. If it is | |
| 31 | −in the 'test' mode, writing 'disk' to /sys/power/state will cause the kernel | |
| 32 | −to disable nonboot CPUs and freeze tasks, shrink memory, suspend devices, wait | |
| 33 | −for 5 seconds, resume devices, unfreeze tasks and enable nonboot CPUs. Then, | |
| 34 | −we are able to look in the log messages and work out, for example, which code | |
| 35 | −is being slow and which device drivers are misbehaving. | |
| 36 | − | |
| 37 | −Reading from this file will display all supported modes and the currently | |
| 38 | −selected one in brackets, for example | |
| 39 | − | |
| 40 | − [shutdown] reboot test testproc | |
| 41 | − | |
| 42 | −Writing to this file will accept one of | |
| 43 | − | |
| 44 | − 'platform' (only if the platform supports it) | |
| 45 | − 'shutdown' | |
| 46 | − 'reboot' | |
| 47 | − 'testproc' | |
| 48 | − 'test' | |
| 49 | − | |
| 50 | −/sys/power/image_size controls the size of the image created by | |
| 51 | −the suspend-to-disk mechanism. It can be written a string | |
| 52 | −representing a non-negative integer that will be used as an upper | |
| 53 | −limit of the image size, in bytes. The suspend-to-disk mechanism will | |
| 54 | −do its best to ensure the image size will not exceed that number. However, | |
| 55 | −if this turns out to be impossible, it will try to suspend anyway using the | |
| 56 | −smallest image possible. In particular, if "0" is written to this file, the | |
| 57 | −suspend image will be as small as possible. | |
| 58 | − | |
| 59 | −Reading from this file will display the current image size limit, which | |
| 60 | −is set to 2/5 of available RAM by default. | |
| 61 | − | |
| 62 | −/sys/power/pm_trace controls the code which saves the last PM event point in | |
| 63 | −the RTC across reboots, so that you can debug a machine that just hangs | |
| 64 | −during suspend (or more commonly, during resume). Namely, the RTC is only | |
| 65 | −used to save the last PM event point if this file contains '1'. Initially it | |
| 66 | −contains '0' which may be changed to '1' by writing a string representing a | |
| 67 | −nonzero integer into it. | |
| 68 | − | |
| 69 | −To use this debugging feature you should attempt to suspend the machine, then | |
| 70 | −reboot it and run | |
| 71 | − | |
| 72 | − dmesg -s 1000000 | grep 'hash matches' | |
| 73 | − | |
| 74 | −CAUTION: Using it will cause your machine's real-time (CMOS) clock to be | |
| 75 | −set to a random invalid time after a resume. | |
| 1 | +Power Management Interface for System Sleep | |
| 2 | + | |
| 3 | +Copyright (c) 2016 Intel Corp., Rafael J. Wysocki <rafael.j.wysocki@intel.com> | |
| 4 | + | |
| 5 | +The power management subsystem provides userspace with a unified sysfs interface | |
| 6 | +for system sleep regardless of the underlying system architecture or platform. | |
| 7 | +The interface is located in the /sys/power/ directory (assuming that sysfs is | |
| 8 | +mounted at /sys). | |
| 9 | + | |
| 10 | +/sys/power/state is the system sleep state control file. | |
| 11 | + | |
| 12 | +Reading from it returns a list of supported sleep states, encoded as: | |
| 13 | + | |
| 14 | +'freeze' (Suspend-to-Idle) | |
| 15 | +'standby' (Power-On Suspend) | |
| 16 | +'mem' (Suspend-to-RAM) | |
| 17 | +'disk' (Suspend-to-Disk) | |
| 18 | + | |
| 19 | +Suspend-to-Idle is always supported. Suspend-to-Disk is always supported | |
| 20 | +too as long the kernel has been configured to support hibernation at all | |
| 21 | +(ie. CONFIG_HIBERNATION is set in the kernel configuration file). Support | |
| 22 | +for Suspend-to-RAM and Power-On Suspend depends on the capabilities of the | |
| 23 | +platform. | |
| 24 | + | |
| 25 | +If one of the strings listed in /sys/power/state is written to it, the system | |
| 26 | +will attempt to transition into the corresponding sleep state. Refer to | |
| 27 | +Documentation/power/states.txt for a description of each of those states. | |
| 28 | + | |
| 29 | +/sys/power/disk controls the operating mode of hibernation (Suspend-to-Disk). | |
| 30 | +Specifically, it tells the kernel what to do after creating a hibernation image. | |
| 31 | + | |
| 32 | +Reading from it returns a list of supported options encoded as: | |
| 33 | + | |
| 34 | +'platform' (put the system into sleep using a platform-provided method) | |
| 35 | +'shutdown' (shut the system down) | |
| 36 | +'reboot' (reboot the system) | |
| 37 | +'suspend' (trigger a Suspend-to-RAM transition) | |
| 38 | +'test_resume' (resume-after-hibernation test mode) | |
| 39 | + | |
| 40 | +The currently selected option is printed in square brackets. | |
| 41 | + | |
| 42 | +The 'platform' option is only available if the platform provides a special | |
| 43 | +mechanism to put the system to sleep after creating a hibernation image (ACPI | |
| 44 | +does that, for example). The 'suspend' option is available if Suspend-to-RAM | |
| 45 | +is supported. Refer to Documentation/power/basic_pm_debugging.txt for the | |
| 46 | +description of the 'test_resume' option. | |
| 47 | + | |
| 48 | +To select an option, write the string representing it to /sys/power/disk. | |
| 49 | + | |
| 50 | +/sys/power/image_size controls the size of hibernation images. | |
| 51 | + | |
| 52 | +It can be written a string representing a non-negative integer that will be | |
| 53 | +used as a best-effort upper limit of the image size, in bytes. The hibernation | |
| 54 | +core will do its best to ensure that the image size will not exceed that number. | |
| 55 | +However, if that turns out to be impossible to achieve, a hibernation image will | |
| 56 | +still be created and its size will be as small as possible. In particular, | |
| 57 | +writing '0' to this file will enforce hibernation images to be as small as | |
| 58 | +possible. | |
| 59 | + | |
| 60 | +Reading from this file returns the current image size limit, which is set to | |
| 61 | +around 2/5 of available RAM by default. | |
| 62 | + | |
| 63 | +/sys/power/pm_trace controls the PM trace mechanism saving the last suspend | |
| 64 | +or resume event point in the RTC across reboots. | |
| 65 | + | |
| 66 | +It helps to debug hard lockups or reboots due to device driver failures that | |
| 67 | +occur during system suspend or resume (which is more common) more effectively. | |
| 68 | + | |
| 69 | +If /sys/power/pm_trace contains '1', the fingerprint of each suspend/resume | |
| 70 | +event point in turn will be stored in the RTC memory (overwriting the actual | |
| 71 | +RTC information), so it will survive a system crash if one occurs right after | |
| 72 | +storing it and it can be used later to identify the driver that caused the crash | |
| 73 | +to happen (see Documentation/power/s2ram.txt for more information). | |
| 74 | + | |
| 75 | +Initially it contains '0' which may be changed to '1' by writing a string | |
| 76 | +representing a nonzero integer into it. | |
| @@ -167,6 +167,8 @@ signal will be rolled back anyway. · 166 unmodified lines | ||
| 167 | 167 | For signals taken in non-TM or suspended mode, we use the |
| 168 | 168 | normal/non-checkpointed stack pointer. |
| 169 | 169 | |
| 170 | +Any transaction initiated inside a sighandler and suspended on return | |
| 171 | +from the sighandler to the kernel will get reclaimed and discarded. | |
| 170 | 172 | |
| 171 | 173 | Failure cause codes used by kernel |
| 172 | 174 | ================================== |
| @@ -80,6 +80,10 @@ functionality of their platform when planning to use this driver: · 79 unmodified lines | ||
| 80 | 80 | |
| 81 | 81 | III. Module parameters |
| 82 | 82 | |
| 83 | +- 'dma_timeout' - DMA transfer completion timeout (in msec, default value 3000). | |
| 84 | + This parameter set a maximum completion wait time for SYNC mode DMA | |
| 85 | + transfer requests and for RIO_WAIT_FOR_ASYNC ioctl requests. | |
| 86 | + | |
| 83 | 87 | - 'dbg_level' - This parameter allows to control amount of debug information |
| 84 | 88 | generated by this device driver. This parameter is formed by set of |
| 85 | 89 | bit masks that correspond to the specific functional blocks. |
| @@ -42,11 +42,12 @@ · 41 unmodified lines | ||
| 42 | 42 | caption a.headerlink { opacity: 0; } |
| 43 | 43 | caption a.headerlink:hover { opacity: 1; } |
| 44 | 44 | |
| 45 | − /* inline literal: drop the borderbox and red color */ | |
| 45 | + /* inline literal: drop the borderbox, padding and red color */ | |
| 46 | 46 | |
| 47 | 47 | code, .rst-content tt, .rst-content code { |
| 48 | 48 | color: inherit; |
| 49 | 49 | border: none; |
| 50 | + padding: unset; | |
| 50 | 51 | background: inherit; |
| 51 | 52 | font-size: 85%; |
| 52 | 53 | } |
| @@ -798,6 +798,7 @@ M: Laura Abbott <labbott@redhat.com> · 797 unmodified lines | ||
| 798 | 798 | M: Sumit Semwal <sumit.semwal@linaro.org> |
| 799 | 799 | L: devel@driverdev.osuosl.org |
| 800 | 800 | S: Supported |
| 801 | +F: Documentation/devicetree/bindings/staging/ion/ | |
| 801 | 802 | F: drivers/staging/android/ion |
| 802 | 803 | F: drivers/staging/android/uapi/ion.h |
| 803 | 804 | F: drivers/staging/android/uapi/ion_test.h |
| @@ -881,6 +882,15 @@ S: Supported · 77 unmodified lines | ||
| 881 | 882 | F: drivers/gpu/drm/arc/ |
| 882 | 883 | F: Documentation/devicetree/bindings/display/snps,arcpgu.txt |
| 883 | 884 | |
| 885 | +ARM ARCHITECTED TIMER DRIVER | |
| 886 | +M: Mark Rutland <mark.rutland@arm.com> | |
| 887 | +M: Marc Zyngier <marc.zyngier@arm.com> | |
| 888 | +L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) | |
| 889 | +S: Maintained | |
| 890 | +F: arch/arm/include/asm/arch_timer.h | |
| 891 | +F: arch/arm64/include/asm/arch_timer.h | |
| 892 | +F: drivers/clocksource/arm_arch_timer.c | |
| 893 | + | |
| 884 | 894 | ARM HDLCD DRM DRIVER |
| 885 | 895 | M: Liviu Dudau <liviu.dudau@arm.com> |
| 886 | 896 | S: Supported |
| @@ -1614,7 +1624,8 @@ N: rockchip · 727 unmodified lines | ||
| 1614 | 1624 | |
| 1615 | 1625 | ARM/SAMSUNG EXYNOS ARM ARCHITECTURES |
| 1616 | 1626 | M: Kukjin Kim <kgene@kernel.org> |
| 1617 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 1627 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 1628 | +R: Javier Martinez Canillas <javier@osg.samsung.com> | |
| 1618 | 1629 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1619 | 1630 | L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) |
| 1620 | 1631 | S: Maintained |
| @@ -1634,7 +1645,6 @@ F: drivers/*/*s3c64xx* · 13 unmodified lines | ||
| 1634 | 1645 | F: drivers/*/*s5pv210* |
| 1635 | 1646 | F: drivers/memory/samsung/* |
| 1636 | 1647 | F: drivers/soc/samsung/* |
| 1637 | −F: drivers/spi/spi-s3c* | |
| 1638 | 1648 | F: Documentation/arm/Samsung/ |
| 1639 | 1649 | F: Documentation/devicetree/bindings/arm/samsung/ |
| 1640 | 1650 | F: Documentation/devicetree/bindings/sram/samsung-sram.txt |
| @@ -1822,6 +1832,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson.git · 181 unmodified lines | ||
| 1822 | 1832 | ARM/UNIPHIER ARCHITECTURE |
| 1823 | 1833 | M: Masahiro Yamada <yamada.masahiro@socionext.com> |
| 1824 | 1834 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 1835 | +T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git | |
| 1825 | 1836 | S: Maintained |
| 1826 | 1837 | F: arch/arm/boot/dts/uniphier* |
| 1827 | 1838 | F: arch/arm/include/asm/hardware/cache-uniphier.h |
| @@ -2475,7 +2486,7 @@ F: include/net/bluetooth/ · 647 unmodified lines | ||
| 2475 | 2486 | BONDING DRIVER |
| 2476 | 2487 | M: Jay Vosburgh <j.vosburgh@gmail.com> |
| 2477 | 2488 | M: Veaceslav Falico <vfalico@gmail.com> |
| 2478 | −M: Andy Gospodarek <gospo@cumulusnetworks.com> | |
| 2489 | +M: Andy Gospodarek <andy@greyhouse.net> | |
| 2479 | 2490 | L: netdev@vger.kernel.org |
| 2480 | 2491 | W: http://sourceforge.net/projects/bonding/ |
| 2481 | 2492 | S: Supported |
| @@ -2490,7 +2501,7 @@ S: Supported · 8 unmodified lines | ||
| 2490 | 2501 | F: kernel/bpf/ |
| 2491 | 2502 | |
| 2492 | 2503 | BROADCOM B44 10/100 ETHERNET DRIVER |
| 2493 | −M: Gary Zambrano <zambrano@broadcom.com> | |
| 2504 | +M: Michael Chan <michael.chan@broadcom.com> | |
| 2494 | 2505 | L: netdev@vger.kernel.org |
| 2495 | 2506 | S: Supported |
| 2496 | 2507 | F: drivers/net/ethernet/broadcom/b44.* |
| @@ -3238,7 +3249,7 @@ F: kernel/cpuset.c · 741 unmodified lines | ||
| 3238 | 3249 | CONTROL GROUP - MEMORY RESOURCE CONTROLLER (MEMCG) |
| 3239 | 3250 | M: Johannes Weiner <hannes@cmpxchg.org> |
| 3240 | 3251 | M: Michal Hocko <mhocko@kernel.org> |
| 3241 | −M: Vladimir Davydov <vdavydov@virtuozzo.com> | |
| 3252 | +M: Vladimir Davydov <vdavydov.dev@gmail.com> | |
| 3242 | 3253 | L: cgroups@vger.kernel.org |
| 3243 | 3254 | L: linux-mm@kvack.org |
| 3244 | 3255 | S: Maintained |
| @@ -3259,7 +3270,7 @@ S: Maintained · 14 unmodified lines | ||
| 3259 | 3270 | F: drivers/net/wan/cosa* |
| 3260 | 3271 | |
| 3261 | 3272 | CPMAC ETHERNET DRIVER |
| 3262 | −M: Florian Fainelli <florian@openwrt.org> | |
| 3273 | +M: Florian Fainelli <f.fainelli@gmail.com> | |
| 3263 | 3274 | L: netdev@vger.kernel.org |
| 3264 | 3275 | S: Maintained |
| 3265 | 3276 | F: drivers/net/ethernet/ti/cpmac.c |
| @@ -4533,6 +4544,12 @@ L: linux-edac@vger.kernel.org · 1267 unmodified lines | ||
| 4533 | 4544 | S: Maintained |
| 4534 | 4545 | F: drivers/edac/sb_edac.c |
| 4535 | 4546 | |
| 4547 | +EDAC-SKYLAKE | |
| 4548 | +M: Tony Luck <tony.luck@intel.com> | |
| 4549 | +L: linux-edac@vger.kernel.org | |
| 4550 | +S: Maintained | |
| 4551 | +F: drivers/edac/skx_edac.c | |
| 4552 | + | |
| 4536 | 4553 | EDAC-XGENE |
| 4537 | 4554 | APPLIED MICRO (APM) X-GENE SOC EDAC |
| 4538 | 4555 | M: Loc Ho <lho@apm.com> |
| @@ -6094,7 +6111,7 @@ S: Supported · 1555 unmodified lines | ||
| 6094 | 6111 | F: drivers/cpufreq/intel_pstate.c |
| 6095 | 6112 | |
| 6096 | 6113 | INTEL FRAMEBUFFER DRIVER (excluding 810 and 815) |
| 6097 | −M: Maik Broemme <mbroemme@plusserver.de> | |
| 6114 | +M: Maik Broemme <mbroemme@libmpq.org> | |
| 6098 | 6115 | L: linux-fbdev@vger.kernel.org |
| 6099 | 6116 | S: Maintained |
| 6100 | 6117 | F: Documentation/fb/intelfb.txt |
| @@ -7457,7 +7474,8 @@ F: Documentation/devicetree/bindings/sound/max9860.txt · 1356 unmodified lines | ||
| 7457 | 7474 | F: sound/soc/codecs/max9860.* |
| 7458 | 7475 | |
| 7459 | 7476 | MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS |
| 7460 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 7477 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 7478 | +M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | |
| 7461 | 7479 | L: linux-pm@vger.kernel.org |
| 7462 | 7480 | S: Supported |
| 7463 | 7481 | F: drivers/power/max14577_charger.c |
| @@ -7473,7 +7491,8 @@ F: include/dt-bindings/*/*max77802.h · 9 unmodified lines | ||
| 7473 | 7491 | |
| 7474 | 7492 | MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS |
| 7475 | 7493 | M: Chanwoo Choi <cw00.choi@samsung.com> |
| 7476 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 7494 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 7495 | +M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | |
| 7477 | 7496 | L: linux-kernel@vger.kernel.org |
| 7478 | 7497 | S: Supported |
| 7479 | 7498 | F: drivers/*/max14577*.c |
| @@ -7663,7 +7682,7 @@ L: linux-rdma@vger.kernel.org · 183 unmodified lines | ||
| 7663 | 7682 | S: Supported |
| 7664 | 7683 | W: https://github.com/SoftRoCE/rxe-dev/wiki/rxe-dev:-Home |
| 7665 | 7684 | Q: http://patchwork.kernel.org/project/linux-rdma/list/ |
| 7666 | −F: drivers/infiniband/hw/rxe/ | |
| 7685 | +F: drivers/infiniband/sw/rxe/ | |
| 7667 | 7686 | F: include/uapi/rdma/rdma_user_rxe.h |
| 7668 | 7687 | |
| 7669 | 7688 | MEMBARRIER SUPPORT |
| @@ -8150,6 +8169,15 @@ S: Maintained · 480 unmodified lines | ||
| 8150 | 8169 | W: https://fedorahosted.org/dropwatch/ |
| 8151 | 8170 | F: net/core/drop_monitor.c |
| 8152 | 8171 | |
| 8172 | +NETWORKING [DSA] | |
| 8173 | +M: Andrew Lunn <andrew@lunn.ch> | |
| 8174 | +M: Vivien Didelot <vivien.didelot@savoirfairelinux.com> | |
| 8175 | +M: Florian Fainelli <f.fainelli@gmail.com> | |
| 8176 | +S: Maintained | |
| 8177 | +F: net/dsa/ | |
| 8178 | +F: include/net/dsa.h | |
| 8179 | +F: drivers/net/dsa/ | |
| 8180 | + | |
| 8153 | 8181 | NETWORKING [GENERAL] |
| 8154 | 8182 | M: "David S. Miller" <davem@davemloft.net> |
| 8155 | 8183 | L: netdev@vger.kernel.org |
| @@ -9239,7 +9267,7 @@ F: drivers/pinctrl/sh-pfc/ · 1083 unmodified lines | ||
| 9239 | 9267 | |
| 9240 | 9268 | PIN CONTROLLER - SAMSUNG |
| 9241 | 9269 | M: Tomasz Figa <tomasz.figa@gmail.com> |
| 9242 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 9270 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 9243 | 9271 | M: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| 9244 | 9272 | L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) |
| 9245 | 9273 | L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) |
| @@ -10172,7 +10200,7 @@ S: Maintained · 926 unmodified lines | ||
| 10172 | 10200 | F: drivers/platform/x86/samsung-laptop.c |
| 10173 | 10201 | |
| 10174 | 10202 | SAMSUNG AUDIO (ASoC) DRIVERS |
| 10175 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 10203 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 10176 | 10204 | M: Sangbeom Kim <sbkim73@samsung.com> |
| 10177 | 10205 | M: Sylwester Nawrocki <s.nawrocki@samsung.com> |
| 10178 | 10206 | L: alsa-devel@alsa-project.org (moderated for non-subscribers) |
| @@ -10187,7 +10215,8 @@ F: drivers/video/fbdev/s3c-fb.c · 8 unmodified lines | ||
| 10187 | 10215 | |
| 10188 | 10216 | SAMSUNG MULTIFUNCTION PMIC DEVICE DRIVERS |
| 10189 | 10217 | M: Sangbeom Kim <sbkim73@samsung.com> |
| 10190 | −M: Krzysztof Kozlowski <k.kozlowski@samsung.com> | |
| 10218 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 10219 | +M: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> | |
| 10191 | 10220 | L: linux-kernel@vger.kernel.org |
| 10192 | 10221 | L: linux-samsung-soc@vger.kernel.org |
| 10193 | 10222 | S: Supported |
| @@ -10246,6 +10275,17 @@ S: Supported · 52 unmodified lines | ||
| 10246 | 10275 | L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) |
| 10247 | 10276 | F: drivers/clk/samsung/ |
| 10248 | 10277 | |
| 10278 | +SAMSUNG SPI DRIVERS | |
| 10279 | +M: Kukjin Kim <kgene@kernel.org> | |
| 10280 | +M: Krzysztof Kozlowski <krzk@kernel.org> | |
| 10281 | +M: Andi Shyti <andi.shyti@samsung.com> | |
| 10282 | +L: linux-spi@vger.kernel.org | |
| 10283 | +L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers) | |
| 10284 | +S: Maintained | |
| 10285 | +F: Documentation/devicetree/bindings/spi/spi-samsung.txt | |
| 10286 | +F: drivers/spi/spi-s3c* | |
| 10287 | +F: include/linux/platform_data/spi-s3c64xx.h | |
| 10288 | + | |
| 10249 | 10289 | SAMSUNG SXGBE DRIVERS |
| 10250 | 10290 | M: Byungho An <bh74.an@samsung.com> |
| 10251 | 10291 | M: Girish K S <ks.giri@samsung.com> |
| @@ -11225,12 +11265,8 @@ S: Odd Fixes · 973 unmodified lines | ||
| 11225 | 11265 | F: drivers/staging/vt665?/ |
| 11226 | 11266 | |
| 11227 | 11267 | STAGING - WILC1000 WIFI DRIVER |
| 11228 | −M: Johnny Kim <johnny.kim@atmel.com> | |
| 11229 | −M: Austin Shin <austin.shin@atmel.com> | |
| 11230 | −M: Chris Park <chris.park@atmel.com> | |
| 11231 | −M: Tony Cho <tony.cho@atmel.com> | |
| 11232 | −M: Glen Lee <glen.lee@atmel.com> | |
| 11233 | −M: Leo Kim <leo.kim@atmel.com> | |
| 11268 | +M: Aditya Shankar <aditya.shankar@microchip.com> | |
| 11269 | +M: Ganesh Krishna <ganesh.krishna@microchip.com> | |
| 11234 | 11270 | L: linux-wireless@vger.kernel.org |
| 11235 | 11271 | S: Supported |
| 11236 | 11272 | F: drivers/staging/wilc1000/ |
| @@ -12550,7 +12586,7 @@ F: include/linux/if_*vlan.h · 1313 unmodified lines | ||
| 12550 | 12586 | F: net/8021q/ |
| 12551 | 12587 | |
| 12552 | 12588 | VLYNQ BUS |
| 12553 | −M: Florian Fainelli <florian@openwrt.org> | |
| 12589 | +M: Florian Fainelli <f.fainelli@gmail.com> | |
| 12554 | 12590 | L: openwrt-devel@lists.openwrt.org (subscribers-only) |
| 12555 | 12591 | S: Maintained |
| 12556 | 12592 | F: drivers/vlynq/vlynq.c |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | VERSION = 4 |
| 2 | 2 | PATCHLEVEL = 8 |
| 3 | 3 | SUBLEVEL = 0 |
| 4 | −EXTRAVERSION = -rc2 | |
| 4 | +EXTRAVERSION = -rc8 | |
| 5 | 5 | NAME = Psychotic Stoned Sheep |
| 6 | 6 | |
| 7 | 7 | # *DOCUMENTATION* |
| @@ -336,17 +336,6 @@ config HAVE_ARCH_SECCOMP_FILTER · 335 unmodified lines | ||
| 336 | 336 | results in the system call being skipped immediately. |
| 337 | 337 | - seccomp syscall wired up |
| 338 | 338 | |
| 339 | − For best performance, an arch should use seccomp_phase1 and | |
| 340 | − seccomp_phase2 directly. It should call seccomp_phase1 for all | |
| 341 | − syscalls if TIF_SECCOMP is set, but seccomp_phase1 does not | |
| 342 | − need to be called from a ptrace-safe context. It must then | |
| 343 | − call seccomp_phase2 if seccomp_phase1 returns anything other | |
| 344 | − than SECCOMP_PHASE1_OK or SECCOMP_PHASE1_SKIP. | |
| 345 | − | |
| 346 | − As an additional optimization, an arch may provide seccomp_data | |
| 347 | − directly to seccomp_phase1; this avoids multiple calls | |
| 348 | − to the syscall_xyz helpers for every syscall. | |
| 349 | − | |
| 350 | 339 | config SECCOMP_FILTER |
| 351 | 340 | def_bool y |
| 352 | 341 | depends on HAVE_ARCH_SECCOMP_FILTER && SECCOMP && NET |
| @@ -371,14 +371,6 @@ __copy_tofrom_user_nocheck(void *to, const void *from, long len) · 370 unmodified lines | ||
| 371 | 371 | return __cu_len; |
| 372 | 372 | } |
| 373 | 373 | |
| 374 | −extern inline long | |
| 375 | −__copy_tofrom_user(void *to, const void *from, long len, const void __user *validate) | |
| 376 | −{ | |
| 377 | − if (__access_ok((unsigned long)validate, len, get_fs())) | |
| 378 | − len = __copy_tofrom_user_nocheck(to, from, len); | |
| 379 | − return len; | |
| 380 | −} | |
| 381 | − | |
| 382 | 374 | #define __copy_to_user(to, from, n) \ |
| 383 | 375 | ({ \ |
| 384 | 376 | __chk_user_ptr(to); \ |
| @@ -393,17 +385,22 @@ __copy_tofrom_user(void *to, const void *from, long len, const void __user *vali · 8 unmodified lines | ||
| 393 | 385 | #define __copy_to_user_inatomic __copy_to_user |
| 394 | 386 | #define __copy_from_user_inatomic __copy_from_user |
| 395 | 387 | |
| 396 | − | |
| 397 | 388 | extern inline long |
| 398 | 389 | copy_to_user(void __user *to, const void *from, long n) |
| 399 | 390 | { |
| 400 | − return __copy_tofrom_user((__force void *)to, from, n, to); | |
| 391 | + if (likely(__access_ok((unsigned long)to, n, get_fs()))) | |
| 392 | + n = __copy_tofrom_user_nocheck((__force void *)to, from, n); | |
| 393 | + return n; | |
| 401 | 394 | } |
| 402 | 395 | |
| 403 | 396 | extern inline long |
| 404 | 397 | copy_from_user(void *to, const void __user *from, long n) |
| 405 | 398 | { |
| 406 | − return __copy_tofrom_user(to, (__force void *)from, n, from); | |
| 399 | + if (likely(__access_ok((unsigned long)from, n, get_fs()))) | |
| 400 | + n = __copy_tofrom_user_nocheck(to, (__force void *)from, n); | |
| 401 | + else | |
| 402 | + memset(to, 0, n); | |
| 403 | + return n; | |
| 407 | 404 | } |
| 408 | 405 | |
| 409 | 406 | extern void __do_clear_user(void); |
| @@ -142,7 +142,7 @@ · 141 unmodified lines | ||
| 142 | 142 | |
| 143 | 143 | #ifdef CONFIG_ARC_CURR_IN_REG |
| 144 | 144 | ; Retrieve orig r25 and save it with rest of callee_regs |
| 145 | − ld.as r12, [r12, PT_user_r25] | |
| 145 | + ld r12, [r12, PT_user_r25] | |
| 146 | 146 | PUSH r12 |
| 147 | 147 | #else |
| 148 | 148 | PUSH r25 |
| @@ -198,7 +198,7 @@ · 49 unmodified lines | ||
| 198 | 198 | |
| 199 | 199 | ; SP is back to start of pt_regs |
| 200 | 200 | #ifdef CONFIG_ARC_CURR_IN_REG |
| 201 | − st.as r12, [sp, PT_user_r25] | |
| 201 | + st r12, [sp, PT_user_r25] | |
| 202 | 202 | #endif |
| 203 | 203 | .endm |
| 204 | 204 | |
| @@ -188,10 +188,10 @@ static inline int arch_irqs_disabled(void) · 187 unmodified lines | ||
| 188 | 188 | .endm |
| 189 | 189 | |
| 190 | 190 | .macro IRQ_ENABLE scratch |
| 191 | + TRACE_ASM_IRQ_ENABLE | |
| 191 | 192 | lr \scratch, [status32] |
| 192 | 193 | or \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK) |
| 193 | 194 | flag \scratch |
| 194 | − TRACE_ASM_IRQ_ENABLE | |
| 195 | 195 | .endm |
| 196 | 196 | |
| 197 | 197 | #endif /* __ASSEMBLY__ */ |
| @@ -280,7 +280,7 @@ static inline void pmd_set(pmd_t *pmdp, pte_t *ptep) · 279 unmodified lines | ||
| 280 | 280 | |
| 281 | 281 | #define pte_page(pte) pfn_to_page(pte_pfn(pte)) |
| 282 | 282 | #define mk_pte(page, prot) pfn_pte(page_to_pfn(page), prot) |
| 283 | −#define pfn_pte(pfn, prot) (__pte(((pte_t)(pfn) << PAGE_SHIFT) | pgprot_val(prot))) | |
| 283 | +#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot)) | |
| 284 | 284 | |
| 285 | 285 | /* Don't use virt_to_pfn for macros below: could cause truncations for PAE40*/ |
| 286 | 286 | #define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT) |
| @@ -83,7 +83,10 @@ · 82 unmodified lines | ||
| 83 | 83 | "2: ;nop\n" \ |
| 84 | 84 | " .section .fixup, \"ax\"\n" \ |
| 85 | 85 | " .align 4\n" \ |
| 86 | − "3: mov %0, %3\n" \ | |
| 86 | + "3: # return -EFAULT\n" \ | |
| 87 | + " mov %0, %3\n" \ | |
| 88 | + " # zero out dst ptr\n" \ | |
| 89 | + " mov %1, 0\n" \ | |
| 87 | 90 | " j 2b\n" \ |
| 88 | 91 | " .previous\n" \ |
| 89 | 92 | " .section __ex_table, \"a\"\n" \ |
| @@ -101,7 +104,11 @@ · 11 unmodified lines | ||
| 101 | 104 | "2: ;nop\n" \ |
| 102 | 105 | " .section .fixup, \"ax\"\n" \ |
| 103 | 106 | " .align 4\n" \ |
| 104 | − "3: mov %0, %3\n" \ | |
| 107 | + "3: # return -EFAULT\n" \ | |
| 108 | + " mov %0, %3\n" \ | |
| 109 | + " # zero out dst ptr\n" \ | |
| 110 | + " mov %1, 0\n" \ | |
| 111 | + " mov %R1, 0\n" \ | |
| 105 | 112 | " j 2b\n" \ |
| 106 | 113 | " .previous\n" \ |
| 107 | 114 | " .section __ex_table, \"a\"\n" \ |
| @@ -13,8 +13,15 @@ · 12 unmodified lines | ||
| 13 | 13 | |
| 14 | 14 | /* Machine specific ELF Hdr flags */ |
| 15 | 15 | #define EF_ARC_OSABI_MSK 0x00000f00 |
| 16 | −#define EF_ARC_OSABI_ORIG 0x00000000 /* MUST be zero for back-compat */ | |
| 17 | −#define EF_ARC_OSABI_CURRENT 0x00000300 /* v3 (no legacy syscalls) */ | |
| 16 | + | |
| 17 | +#define EF_ARC_OSABI_V3 0x00000300 /* v3 (no legacy syscalls) */ | |
| 18 | +#define EF_ARC_OSABI_V4 0x00000400 /* v4 (64bit data any reg align) */ | |
| 19 | + | |
| 20 | +#if __GNUC__ < 6 | |
| 21 | +#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V3 | |
| 22 | +#else | |
| 23 | +#define EF_ARC_OSABI_CURRENT EF_ARC_OSABI_V4 | |
| 24 | +#endif | |
| 18 | 25 | |
| 19 | 26 | typedef unsigned long elf_greg_t; |
| 20 | 27 | typedef unsigned long elf_fpregset_t; |
| @@ -28,6 +28,7 @@ extern void __muldf3(void); · 27 unmodified lines | ||
| 28 | 28 | extern void __divdf3(void); |
| 29 | 29 | extern void __floatunsidf(void); |
| 30 | 30 | extern void __floatunsisf(void); |
| 31 | +extern void __udivdi3(void); | |
| 31 | 32 | |
| 32 | 33 | EXPORT_SYMBOL(__ashldi3); |
| 33 | 34 | EXPORT_SYMBOL(__ashrdi3); |
| @@ -45,6 +46,7 @@ EXPORT_SYMBOL(__muldf3); · 11 unmodified lines | ||
| 45 | 46 | EXPORT_SYMBOL(__divdf3); |
| 46 | 47 | EXPORT_SYMBOL(__floatunsidf); |
| 47 | 48 | EXPORT_SYMBOL(__floatunsisf); |
| 49 | +EXPORT_SYMBOL(__udivdi3); | |
| 48 | 50 | |
| 49 | 51 | /* ARC optimised assembler routines */ |
| 50 | 52 | EXPORT_SYMBOL(memset); |
| @@ -199,7 +199,7 @@ int elf_check_arch(const struct elf32_hdr *x) · 198 unmodified lines | ||
| 199 | 199 | } |
| 200 | 200 | |
| 201 | 201 | eflags = x->e_flags; |
| 202 | − if ((eflags & EF_ARC_OSABI_MSK) < EF_ARC_OSABI_CURRENT) { | |
| 202 | + if ((eflags & EF_ARC_OSABI_MSK) != EF_ARC_OSABI_CURRENT) { | |
| 203 | 203 | pr_err("ABI mismatch - you need newer toolchain\n"); |
| 204 | 204 | force_sigsegv(SIGSEGV, current); |
| 205 | 205 | return 0; |
| @@ -291,8 +291,10 @@ static char *arc_extn_mumbojumbo(int cpu_id, char *buf, int len) · 290 unmodified lines | ||
| 291 | 291 | cpu->dccm.base_addr, TO_KB(cpu->dccm.sz), |
| 292 | 292 | cpu->iccm.base_addr, TO_KB(cpu->iccm.sz)); |
| 293 | 293 | |
| 294 | − n += scnprintf(buf + n, len - n, | |
| 295 | − "OS ABI [v3]\t: no-legacy-syscalls\n"); | |
| 294 | + n += scnprintf(buf + n, len - n, "OS ABI [v%d]\t: %s\n", | |
| 295 | + EF_ARC_OSABI_CURRENT >> 8, | |
| 296 | + EF_ARC_OSABI_CURRENT == EF_ARC_OSABI_V3 ? | |
| 297 | + "no-legacy-syscalls" : "64-bit data any register aligned"); | |
| 296 | 298 | |
| 297 | 299 | return buf; |
| 298 | 300 | } |
| @@ -921,6 +921,15 @@ void arc_cache_init(void) · 920 unmodified lines | ||
| 921 | 921 | |
| 922 | 922 | printk(arc_cache_mumbojumbo(0, str, sizeof(str))); |
| 923 | 923 | |
| 924 | + /* | |
| 925 | + * Only master CPU needs to execute rest of function: | |
| 926 | + * - Assume SMP so all cores will have same cache config so | |
| 927 | + * any geomtry checks will be same for all | |
| 928 | + * - IOC setup / dma callbacks only need to be setup once | |
| 929 | + */ | |
| 930 | + if (cpu) | |
| 931 | + return; | |
| 932 | + | |
| 924 | 933 | if (IS_ENABLED(CONFIG_ARC_HAS_ICACHE)) { |
| 925 | 934 | struct cpuinfo_arc_cache *ic = &cpuinfo_arc700[cpu].icache; |
| 926 | 935 | |
| @@ -61,6 +61,7 @@ void *kmap(struct page *page) · 60 unmodified lines | ||
| 61 | 61 | |
| 62 | 62 | return kmap_high(page); |
| 63 | 63 | } |
| 64 | +EXPORT_SYMBOL(kmap); | |
| 64 | 65 | |
| 65 | 66 | void *kmap_atomic(struct page *page) |
| 66 | 67 | { |
| @@ -226,7 +226,7 @@ · 225 unmodified lines | ||
| 226 | 226 | |
| 227 | 227 | #address-cells = <1>; |
| 228 | 228 | #size-cells = <1>; |
| 229 | − elm_id = <&elm>; | |
| 229 | + ti,elm-id = <&elm>; | |
| 230 | 230 | }; |
| 231 | 231 | }; |
| 232 | 232 | |
| @@ -161,7 +161,7 @@ · 160 unmodified lines | ||
| 161 | 161 | |
| 162 | 162 | #address-cells = <1>; |
| 163 | 163 | #size-cells = <1>; |
| 164 | − elm_id = <&elm>; | |
| 164 | + ti,elm-id = <&elm>; | |
| 165 | 165 | |
| 166 | 166 | /* MTD partition table */ |
| 167 | 167 | partition@0 { |
| @@ -197,7 +197,7 @@ · 196 unmodified lines | ||
| 197 | 197 | gpmc,wr-access-ns = <30>; |
| 198 | 198 | gpmc,wr-data-mux-bus-ns = <0>; |
| 199 | 199 | |
| 200 | − elm_id = <&elm>; | |
| 200 | + ti,elm-id = <&elm>; | |
| 201 | 201 | |
| 202 | 202 | #address-cells = <1>; |
| 203 | 203 | #size-cells = <1>; |
| @@ -390,12 +390,12 @@ · 389 unmodified lines | ||
| 390 | 390 | |
| 391 | 391 | port@0 { |
| 392 | 392 | reg = <0>; |
| 393 | − label = "lan1"; | |
| 393 | + label = "lan5"; | |
| 394 | 394 | }; |
| 395 | 395 | |
| 396 | 396 | port@1 { |
| 397 | 397 | reg = <1>; |
| 398 | − label = "lan2"; | |
| 398 | + label = "lan4"; | |
| 399 | 399 | }; |
| 400 | 400 | |
| 401 | 401 | port@2 { |
| @@ -405,12 +405,12 @@ · 3 unmodified lines | ||
| 405 | 405 | |
| 406 | 406 | port@3 { |
| 407 | 407 | reg = <3>; |
| 408 | − label = "lan4"; | |
| 408 | + label = "lan2"; | |
| 409 | 409 | }; |
| 410 | 410 | |
| 411 | 411 | port@4 { |
| 412 | 412 | reg = <4>; |
| 413 | − label = "lan5"; | |
| 413 | + label = "lan1"; | |
| 414 | 414 | }; |
| 415 | 415 | |
| 416 | 416 | port@5 { |
| @@ -2,6 +2,7 @@ · 1 unmodified line | ||
| 2 | 2 | |
| 3 | 3 | / { |
| 4 | 4 | memory { |
| 5 | + device_type = "memory"; | |
| 5 | 6 | reg = <0 0x10000000>; |
| 6 | 7 | }; |
| 7 | 8 | |
| @@ -2,7 +2,6 @@ · 1 unmodified line | ||
| 2 | 2 | #include <dt-bindings/clock/bcm2835.h> |
| 3 | 3 | #include <dt-bindings/clock/bcm2835-aux.h> |
| 4 | 4 | #include <dt-bindings/gpio/gpio.h> |
| 5 | −#include "skeleton.dtsi" | |
| 6 | 5 | |
| 7 | 6 | /* This include file covers the common peripherals and configuration between |
| 8 | 7 | * bcm2835 and bcm2836 implementations, leaving the CPU configuration to |
| @@ -13,6 +12,8 @@ · 4 unmodified lines | ||
| 13 | 12 | compatible = "brcm,bcm2835"; |
| 14 | 13 | model = "BCM2835"; |
| 15 | 14 | interrupt-parent = <&intc>; |
| 15 | + #address-cells = <1>; | |
| 16 | + #size-cells = <1>; | |
| 16 | 17 | |
| 17 | 18 | chosen { |
| 18 | 19 | bootargs = "earlyprintk console=ttyAMA0"; |
| @@ -447,14 +447,11 @@ · 446 unmodified lines | ||
| 447 | 447 | samsung,dw-mshc-ciu-div = <3>; |
| 448 | 448 | samsung,dw-mshc-sdr-timing = <0 4>; |
| 449 | 449 | samsung,dw-mshc-ddr-timing = <0 2>; |
| 450 | − samsung,dw-mshc-hs400-timing = <0 2>; | |
| 451 | − samsung,read-strobe-delay = <90>; | |
| 452 | 450 | pinctrl-names = "default"; |
| 453 | 451 | pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus1 &sd0_bus4 &sd0_bus8 &sd0_cd>; |
| 454 | 452 | bus-width = <8>; |
| 455 | 453 | cap-mmc-highspeed; |
| 456 | 454 | mmc-hs200-1_8v; |
| 457 | − mmc-hs400-1_8v; | |
| 458 | 455 | vmmc-supply = <&ldo20_reg>; |
| 459 | 456 | vqmmc-supply = <&ldo11_reg>; |
| 460 | 457 | }; |
| @@ -243,7 +243,7 @@ · 242 unmodified lines | ||
| 243 | 243 | clocks = <&clks IMX6QDL_CLK_SPDIF_GCLK>, <&clks IMX6QDL_CLK_OSC>, |
| 244 | 244 | <&clks IMX6QDL_CLK_SPDIF>, <&clks IMX6QDL_CLK_ASRC>, |
| 245 | 245 | <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_ESAI_EXTAL>, |
| 246 | − <&clks IMX6QDL_CLK_IPG>, <&clks IMX6QDL_CLK_MLB>, | |
| 246 | + <&clks IMX6QDL_CLK_IPG>, <&clks IMX6QDL_CLK_DUMMY>, | |
| 247 | 247 | <&clks IMX6QDL_CLK_DUMMY>, <&clks IMX6QDL_CLK_SPBA>; |
| 248 | 248 | clock-names = "core", "rxtx0", |
| 249 | 249 | "rxtx1", "rxtx2", |
| @@ -64,7 +64,7 @@ · 63 unmodified lines | ||
| 64 | 64 | cd-gpios = <&gpio7 11 GPIO_ACTIVE_LOW>; |
| 65 | 65 | no-1-8-v; |
| 66 | 66 | keep-power-in-suspend; |
| 67 | − enable-sdio-wakup; | |
| 67 | + wakeup-source; | |
| 68 | 68 | status = "okay"; |
| 69 | 69 | }; |
| 70 | 70 | |
| @@ -131,7 +131,7 @@ · 130 unmodified lines | ||
| 131 | 131 | ti,y-min = /bits/ 16 <0>; |
| 132 | 132 | ti,y-max = /bits/ 16 <0>; |
| 133 | 133 | ti,pressure-max = /bits/ 16 <0>; |
| 134 | − ti,x-plat-ohms = /bits/ 16 <400>; | |
| 134 | + ti,x-plate-ohms = /bits/ 16 <400>; | |
| 135 | 135 | wakeup-source; |
| 136 | 136 | }; |
| 137 | 137 | }; |
| @@ -113,7 +113,7 @@ · 112 unmodified lines | ||
| 113 | 113 | |
| 114 | 114 | partition@e0000 { |
| 115 | 115 | label = "u-boot environment"; |
| 116 | − reg = <0xe0000 0x100000>; | |
| 116 | + reg = <0xe0000 0x20000>; | |
| 117 | 117 | }; |
| 118 | 118 | |
| 119 | 119 | partition@100000 { |
| @@ -116,6 +116,10 @@ · 115 unmodified lines | ||
| 116 | 116 | }; |
| 117 | 117 | }; |
| 118 | 118 | |
| 119 | +&pciec { | |
| 120 | + status = "okay"; | |
| 121 | +}; | |
| 122 | + | |
| 119 | 123 | &pcie0 { |
| 120 | 124 | status = "okay"; |
| 121 | 125 | }; |
| @@ -35,10 +35,15 @@ · 34 unmodified lines | ||
| 35 | 35 | ranges = <0 0 0x00000000 0x1000000>; /* CS0: 16MB for NAND */ |
| 36 | 36 | |
| 37 | 37 | nand@0,0 { |
| 38 | − linux,mtd-name = "micron,mt29f4g16abbda3w"; | |
| 38 | + compatible = "ti,omap2-nand"; | |
| 39 | 39 | reg = <0 0 4>; /* CS0, offset 0, IO size 4 */ |
| 40 | + interrupt-parent = <&gpmc>; | |
| 41 | + interrupts = <0 IRQ_TYPE_NONE>, /* fifoevent */ | |
| 42 | + <1 IRQ_TYPE_NONE>; /* termcount */ | |
| 43 | + linux,mtd-name = "micron,mt29f4g16abbda3w"; | |
| 40 | 44 | nand-bus-width = <16>; |
| 41 | 45 | ti,nand-ecc-opt = "bch8"; |
| 46 | + rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */ | |
| 42 | 47 | gpmc,sync-clk-ps = <0>; |
| 43 | 48 | gpmc,cs-on-ns = <0>; |
| 44 | 49 | gpmc,cs-rd-off-ns = <44>; |
| @@ -54,10 +59,6 @@ · 9 unmodified lines | ||
| 54 | 59 | gpmc,wr-access-ns = <40>; |
| 55 | 60 | gpmc,wr-data-mux-bus-ns = <0>; |
| 56 | 61 | gpmc,device-width = <2>; |
| 57 | − | |
| 58 | − gpmc,page-burst-access-ns = <5>; | |
| 59 | − gpmc,cycle2cycle-delay-ns = <50>; | |
| 60 | − | |
| 61 | 62 | #address-cells = <1>; |
| 62 | 63 | #size-cells = <1>; |
| 63 | 64 | |
| @@ -46,6 +46,7 @@ · 45 unmodified lines | ||
| 46 | 46 | linux,mtd-name = "micron,mt29f4g16abbda3w"; |
| 47 | 47 | nand-bus-width = <16>; |
| 48 | 48 | ti,nand-ecc-opt = "bch8"; |
| 49 | + rb-gpios = <&gpmc 0 GPIO_ACTIVE_HIGH>; /* gpmc_wait0 */ | |
| 49 | 50 | gpmc,sync-clk-ps = <0>; |
| 50 | 51 | gpmc,cs-on-ns = <0>; |
| 51 | 52 | gpmc,cs-rd-off-ns = <44>; |
| @@ -223,7 +223,9 @@ · 222 unmodified lines | ||
| 223 | 223 | }; |
| 224 | 224 | |
| 225 | 225 | &gpmc { |
| 226 | − ranges = <0 0 0x00000000 0x20000000>; | |
| 226 | + ranges = <0 0 0x30000000 0x1000000>, /* CS0 */ | |
| 227 | + <4 0 0x2b000000 0x1000000>, /* CS4 */ | |
| 228 | + <5 0 0x2c000000 0x1000000>; /* CS5 */ | |
| 227 | 229 | |
| 228 | 230 | nand@0,0 { |
| 229 | 231 | compatible = "ti,omap2-nand"; |
| @@ -55,8 +55,6 @@ · 54 unmodified lines | ||
| 55 | 55 | #include "omap-gpmc-smsc9221.dtsi" |
| 56 | 56 | |
| 57 | 57 | &gpmc { |
| 58 | − ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ | |
| 59 | − | |
| 60 | 58 | ethernet@gpmc { |
| 61 | 59 | reg = <5 0 0xff>; |
| 62 | 60 | interrupt-parent = <&gpio6>; |
| @@ -27,8 +27,6 @@ · 26 unmodified lines | ||
| 27 | 27 | #include "omap-gpmc-smsc9221.dtsi" |
| 28 | 28 | |
| 29 | 29 | &gpmc { |
| 30 | − ranges = <5 0 0x2c000000 0x1000000>; /* CS5 */ | |
| 31 | − | |
| 32 | 30 | ethernet@gpmc { |
| 33 | 31 | reg = <5 0 0xff>; |
| 34 | 32 | interrupt-parent = <&gpio6>; |
| @@ -15,9 +15,6 @@ · 14 unmodified lines | ||
| 15 | 15 | #include "omap-gpmc-smsc9221.dtsi" |
| 16 | 16 | |
| 17 | 17 | &gpmc { |
| 18 | − ranges = <4 0 0x2b000000 0x1000000>, /* CS4 */ | |
| 19 | − <5 0 0x2c000000 0x1000000>; /* CS5 */ | |
| 20 | − | |
| 21 | 18 | smsc1: ethernet@gpmc { |
| 22 | 19 | reg = <5 0 0xff>; |
| 23 | 20 | interrupt-parent = <&gpio6>; |
| @@ -197,6 +197,8 @@ · 196 unmodified lines | ||
| 197 | 197 | clock-names = "saradc", "apb_pclk"; |
| 198 | 198 | interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>; |
| 199 | 199 | #io-channel-cells = <1>; |
| 200 | + resets = <&cru SRST_SARADC>; | |
| 201 | + reset-names = "saradc-apb"; | |
| 200 | 202 | status = "disabled"; |
| 201 | 203 | }; |
| 202 | 204 | |
| @@ -279,6 +279,8 @@ · 278 unmodified lines | ||
| 279 | 279 | #io-channel-cells = <1>; |
| 280 | 280 | clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; |
| 281 | 281 | clock-names = "saradc", "apb_pclk"; |
| 282 | + resets = <&cru SRST_SARADC>; | |
| 283 | + reset-names = "saradc-apb"; | |
| 282 | 284 | status = "disabled"; |
| 283 | 285 | }; |
| 284 | 286 | |
| @@ -399,6 +399,8 @@ · 398 unmodified lines | ||
| 399 | 399 | #io-channel-cells = <1>; |
| 400 | 400 | clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; |
| 401 | 401 | clock-names = "saradc", "apb_pclk"; |
| 402 | + resets = <&cru SRST_SARADC>; | |
| 403 | + reset-names = "saradc-apb"; | |
| 402 | 404 | status = "disabled"; |
| 403 | 405 | }; |
| 404 | 406 | |
| @@ -550,8 +550,9 @@ · 549 unmodified lines | ||
| 550 | 550 | interrupt-names = "mmcirq"; |
| 551 | 551 | pinctrl-names = "default"; |
| 552 | 552 | pinctrl-0 = <&pinctrl_mmc0>; |
| 553 | − clock-names = "mmc"; | |
| 554 | − clocks = <&clk_s_c0_flexgen CLK_MMC_0>; | |
| 553 | + clock-names = "mmc", "icn"; | |
| 554 | + clocks = <&clk_s_c0_flexgen CLK_MMC_0>, | |
| 555 | + <&clk_s_c0_flexgen CLK_RX_ICN_HVA>; | |
| 555 | 556 | bus-width = <8>; |
| 556 | 557 | non-removable; |
| 557 | 558 | }; |
| @@ -565,8 +566,9 @@ · 7 unmodified lines | ||
| 565 | 566 | interrupt-names = "mmcirq"; |
| 566 | 567 | pinctrl-names = "default"; |
| 567 | 568 | pinctrl-0 = <&pinctrl_sd1>; |
| 568 | − clock-names = "mmc"; | |
| 569 | − clocks = <&clk_s_c0_flexgen CLK_MMC_1>; | |
| 569 | + clock-names = "mmc", "icn"; | |
| 570 | + clocks = <&clk_s_c0_flexgen CLK_MMC_1>, | |
| 571 | + <&clk_s_c0_flexgen CLK_RX_ICN_HVA>; | |
| 570 | 572 | resets = <&softreset STIH407_MMC1_SOFTRESET>; |
| 571 | 573 | bus-width = <4>; |
| 572 | 574 | }; |
| @@ -41,7 +41,8 @@ · 40 unmodified lines | ||
| 41 | 41 | compatible = "st,st-ohci-300x"; |
| 42 | 42 | reg = <0x9a03c00 0x100>; |
| 43 | 43 | interrupts = <GIC_SPI 180 IRQ_TYPE_NONE>; |
| 44 | − clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | |
| 44 | + clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, | |
| 45 | + <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | |
| 45 | 46 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, |
| 46 | 47 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; |
| 47 | 48 | reset-names = "power", "softreset"; |
| @@ -57,7 +58,8 @@ · 9 unmodified lines | ||
| 57 | 58 | interrupts = <GIC_SPI 151 IRQ_TYPE_NONE>; |
| 58 | 59 | pinctrl-names = "default"; |
| 59 | 60 | pinctrl-0 = <&pinctrl_usb0>; |
| 60 | − clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | |
| 61 | + clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, | |
| 62 | + <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | |
| 61 | 63 | resets = <&powerdown STIH407_USB2_PORT0_POWERDOWN>, |
| 62 | 64 | <&softreset STIH407_USB2_PORT0_SOFTRESET>; |
| 63 | 65 | reset-names = "power", "softreset"; |
| @@ -71,7 +73,8 @@ · 7 unmodified lines | ||
| 71 | 73 | compatible = "st,st-ohci-300x"; |
| 72 | 74 | reg = <0x9a83c00 0x100>; |
| 73 | 75 | interrupts = <GIC_SPI 181 IRQ_TYPE_NONE>; |
| 74 | − clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | |
| 76 | + clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, | |
| 77 | + <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | |
| 75 | 78 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, |
| 76 | 79 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; |
| 77 | 80 | reset-names = "power", "softreset"; |
| @@ -87,7 +90,8 @@ · 9 unmodified lines | ||
| 87 | 90 | interrupts = <GIC_SPI 153 IRQ_TYPE_NONE>; |
| 88 | 91 | pinctrl-names = "default"; |
| 89 | 92 | pinctrl-0 = <&pinctrl_usb1>; |
| 90 | − clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>; | |
| 93 | + clocks = <&clk_s_c0_flexgen CLK_TX_ICN_DISP_0>, | |
| 94 | + <&clk_s_c0_flexgen CLK_RX_ICN_DISP_0>; | |
| 91 | 95 | resets = <&powerdown STIH407_USB2_PORT1_POWERDOWN>, |
| 92 | 96 | <&softreset STIH407_USB2_PORT1_SOFTRESET>; |
| 93 | 97 | reset-names = "power", "softreset"; |
| @@ -84,7 +84,7 @@ · 83 unmodified lines | ||
| 84 | 84 | trips { |
| 85 | 85 | cpu_alert0: cpu_alert0 { |
| 86 | 86 | /* milliCelsius */ |
| 87 | − temperature = <850000>; | |
| 87 | + temperature = <85000>; | |
| 88 | 88 | hysteresis = <2000>; |
| 89 | 89 | type = "passive"; |
| 90 | 90 | }; |
| @@ -897,7 +897,7 @@ · 896 unmodified lines | ||
| 897 | 897 | palmas: tps65913@58 { |
| 898 | 898 | compatible = "ti,palmas"; |
| 899 | 899 | reg = <0x58>; |
| 900 | − interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>; | |
| 900 | + interrupts = <0 86 IRQ_TYPE_LEVEL_HIGH>; | |
| 901 | 901 | |
| 902 | 902 | #interrupt-cells = <2>; |
| 903 | 903 | interrupt-controller; |
| @@ -802,7 +802,7 @@ · 801 unmodified lines | ||
| 802 | 802 | palmas: pmic@58 { |
| 803 | 803 | compatible = "ti,palmas"; |
| 804 | 804 | reg = <0x58>; |
| 805 | − interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>; | |
| 805 | + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; | |
| 806 | 806 | |
| 807 | 807 | #interrupt-cells = <2>; |
| 808 | 808 | interrupt-controller; |
| @@ -63,7 +63,7 @@ · 62 unmodified lines | ||
| 63 | 63 | palmas: pmic@58 { |
| 64 | 64 | compatible = "ti,palmas"; |
| 65 | 65 | reg = <0x58>; |
| 66 | − interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_LOW>; | |
| 66 | + interrupts = <GIC_SPI 86 IRQ_TYPE_LEVEL_HIGH>; | |
| 67 | 67 | |
| 68 | 68 | #interrupt-cells = <2>; |
| 69 | 69 | interrupt-controller; |
| @@ -1382,7 +1382,7 @@ · 1381 unmodified lines | ||
| 1382 | 1382 | * Pin 41: BR_UART1_TXD |
| 1383 | 1383 | * Pin 44: BR_UART1_RXD |
| 1384 | 1384 | */ |
| 1385 | − serial@0,70006000 { | |
| 1385 | + serial@70006000 { | |
| 1386 | 1386 | compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; |
| 1387 | 1387 | status = "okay"; |
| 1388 | 1388 | }; |
| @@ -1394,7 +1394,7 @@ · 5 unmodified lines | ||
| 1394 | 1394 | * Pin 71: UART2_CTS_L |
| 1395 | 1395 | * Pin 74: UART2_RTS_L |
| 1396 | 1396 | */ |
| 1397 | − serial@0,70006040 { | |
| 1397 | + serial@70006040 { | |
| 1398 | 1398 | compatible = "nvidia,tegra124-hsuart", "nvidia,tegra30-hsuart"; |
| 1399 | 1399 | status = "okay"; |
| 1400 | 1400 | }; |
| @@ -140,7 +140,7 @@ static struct locomo_dev_info locomo_devices[] = { · 139 unmodified lines | ||
| 140 | 140 | |
| 141 | 141 | static void locomo_handler(struct irq_desc *desc) |
| 142 | 142 | { |
| 143 | − struct locomo *lchip = irq_desc_get_chip_data(desc); | |
| 143 | + struct locomo *lchip = irq_desc_get_handler_data(desc); | |
| 144 | 144 | int req, i; |
| 145 | 145 | |
| 146 | 146 | /* Acknowledge the parent IRQ */ |
| @@ -200,8 +200,7 @@ static void locomo_setup_irq(struct locomo *lchip) · 53 unmodified lines | ||
| 200 | 200 | * Install handler for IRQ_LOCOMO_HW. |
| 201 | 201 | */ |
| 202 | 202 | irq_set_irq_type(lchip->irq, IRQ_TYPE_EDGE_FALLING); |
| 203 | − irq_set_chip_data(lchip->irq, lchip); | |
| 204 | − irq_set_chained_handler(lchip->irq, locomo_handler); | |
| 203 | + irq_set_chained_handler_and_data(lchip->irq, locomo_handler, lchip); | |
| 205 | 204 | |
| 206 | 205 | /* Install handlers for IRQ_LOCOMO_* */ |
| 207 | 206 | for ( ; irq <= lchip->irq_base + 3; irq++) { |
| @@ -472,8 +472,8 @@ static int sa1111_setup_irq(struct sa1111 *sachip, unsigned irq_base) · 471 unmodified lines | ||
| 472 | 472 | * specifies that S0ReadyInt and S1ReadyInt should be '1'. |
| 473 | 473 | */ |
| 474 | 474 | sa1111_writel(0, irqbase + SA1111_INTPOL0); |
| 475 | − sa1111_writel(SA1111_IRQMASK_HI(IRQ_S0_READY_NINT) | | |
| 476 | − SA1111_IRQMASK_HI(IRQ_S1_READY_NINT), | |
| 475 | + sa1111_writel(BIT(IRQ_S0_READY_NINT & 31) | | |
| 476 | + BIT(IRQ_S1_READY_NINT & 31), | |
| 477 | 477 | irqbase + SA1111_INTPOL1); |
| 478 | 478 | |
| 479 | 479 | /* clear all IRQs */ |
| @@ -754,7 +754,7 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) · 274 unmodified lines | ||
| 754 | 754 | if (sachip->irq != NO_IRQ) { |
| 755 | 755 | ret = sa1111_setup_irq(sachip, pd->irq_base); |
| 756 | 756 | if (ret) |
| 757 | − goto err_unmap; | |
| 757 | + goto err_clk; | |
| 758 | 758 | } |
| 759 | 759 | |
| 760 | 760 | #ifdef CONFIG_ARCH_SA1100 |
| @@ -799,6 +799,8 @@ static int __sa1111_probe(struct device *me, struct resource *mem, int irq) · 38 unmodified lines | ||
| 799 | 799 | |
| 800 | 800 | return 0; |
| 801 | 801 | |
| 802 | + err_clk: | |
| 803 | + clk_disable(sachip->clk); | |
| 802 | 804 | err_unmap: |
| 803 | 805 | iounmap(sachip->base); |
| 804 | 806 | err_clk_unprep: |
| @@ -869,9 +871,9 @@ struct sa1111_save_data { · 64 unmodified lines | ||
| 869 | 871 | |
| 870 | 872 | #ifdef CONFIG_PM |
| 871 | 873 | |
| 872 | −static int sa1111_suspend(struct platform_device *dev, pm_message_t state) | |
| 874 | +static int sa1111_suspend_noirq(struct device *dev) | |
| 873 | 875 | { |
| 874 | − struct sa1111 *sachip = platform_get_drvdata(dev); | |
| 876 | + struct sa1111 *sachip = dev_get_drvdata(dev); | |
| 875 | 877 | struct sa1111_save_data *save; |
| 876 | 878 | unsigned long flags; |
| 877 | 879 | unsigned int val; |
| @@ -934,9 +936,9 @@ static int sa1111_suspend(struct platform_device *dev, pm_message_t state) · 56 unmodified lines | ||
| 934 | 936 | * restored by their respective drivers, and must be called |
| 935 | 937 | * via LDM after this function. |
| 936 | 938 | */ |
| 937 | −static int sa1111_resume(struct platform_device *dev) | |
| 939 | +static int sa1111_resume_noirq(struct device *dev) | |
| 938 | 940 | { |
| 939 | − struct sa1111 *sachip = platform_get_drvdata(dev); | |
| 941 | + struct sa1111 *sachip = dev_get_drvdata(dev); | |
| 940 | 942 | struct sa1111_save_data *save; |
| 941 | 943 | unsigned long flags, id; |
| 942 | 944 | void __iomem *base; |
| @@ -952,7 +954,7 @@ static int sa1111_resume(struct platform_device *dev) · 9 unmodified lines | ||
| 952 | 954 | id = sa1111_readl(sachip->base + SA1111_SKID); |
| 953 | 955 | if ((id & SKID_ID_MASK) != SKID_SA1111_ID) { |
| 954 | 956 | __sa1111_remove(sachip); |
| 955 | − platform_set_drvdata(dev, NULL); | |
| 957 | + dev_set_drvdata(dev, NULL); | |
| 956 | 958 | kfree(save); |
| 957 | 959 | return 0; |
| 958 | 960 | } |
| @@ -1003,8 +1005,8 @@ static int sa1111_resume(struct platform_device *dev) · 44 unmodified lines | ||
| 1003 | 1005 | } |
| 1004 | 1006 | |
| 1005 | 1007 | #else |
| 1006 | −#define sa1111_suspend NULL | |
| 1007 | −#define sa1111_resume NULL | |
| 1008 | +#define sa1111_suspend_noirq NULL | |
| 1009 | +#define sa1111_resume_noirq NULL | |
| 1008 | 1010 | #endif |
| 1009 | 1011 | |
| 1010 | 1012 | static int sa1111_probe(struct platform_device *pdev) |
| @@ -1017,7 +1019,7 @@ static int sa1111_probe(struct platform_device *pdev) · 6 unmodified lines | ||
| 1017 | 1019 | return -EINVAL; |
| 1018 | 1020 | irq = platform_get_irq(pdev, 0); |
| 1019 | 1021 | if (irq < 0) |
| 1020 | − return -ENXIO; | |
| 1022 | + return irq; | |
| 1021 | 1023 | |
| 1022 | 1024 | return __sa1111_probe(&pdev->dev, mem, irq); |
| 1023 | 1025 | } |
| @@ -1038,6 +1040,11 @@ static int sa1111_remove(struct platform_device *pdev) · 14 unmodified lines | ||
| 1038 | 1040 | return 0; |
| 1039 | 1041 | } |
| 1040 | 1042 | |
| 1043 | +static struct dev_pm_ops sa1111_pm_ops = { | |
| 1044 | + .suspend_noirq = sa1111_suspend_noirq, | |
| 1045 | + .resume_noirq = sa1111_resume_noirq, | |
| 1046 | +}; | |
| 1047 | + | |
| 1041 | 1048 | /* |
| 1042 | 1049 | * Not sure if this should be on the system bus or not yet. |
| 1043 | 1050 | * We really want some way to register a system device at |
| @@ -1050,10 +1057,9 @@ static int sa1111_remove(struct platform_device *pdev) · 6 unmodified lines | ||
| 1050 | 1057 | static struct platform_driver sa1111_device_driver = { |
| 1051 | 1058 | .probe = sa1111_probe, |
| 1052 | 1059 | .remove = sa1111_remove, |
| 1053 | − .suspend = sa1111_suspend, | |
| 1054 | − .resume = sa1111_resume, | |
| 1055 | 1060 | .driver = { |
| 1056 | 1061 | .name = "sa1111", |
| 1062 | + .pm = &sa1111_pm_ops, | |
| 1057 | 1063 | }, |
| 1058 | 1064 | }; |
| 1059 | 1065 | |
| @@ -161,6 +161,7 @@ CONFIG_USB_MON=y · 160 unmodified lines | ||
| 161 | 161 | CONFIG_USB_XHCI_HCD=y |
| 162 | 162 | CONFIG_USB_STORAGE=y |
| 163 | 163 | CONFIG_USB_DWC3=y |
| 164 | +CONFIG_NOP_USB_XCEIV=y | |
| 164 | 165 | CONFIG_KEYSTONE_USB_PHY=y |
| 165 | 166 | CONFIG_NEW_LEDS=y |
| 166 | 167 | CONFIG_LEDS_CLASS=y |
| @@ -781,7 +781,7 @@ CONFIG_MXS_DMA=y · 780 unmodified lines | ||
| 781 | 781 | CONFIG_DMA_BCM2835=y |
| 782 | 782 | CONFIG_DMA_OMAP=y |
| 783 | 783 | CONFIG_QCOM_BAM_DMA=y |
| 784 | −CONFIG_XILINX_VDMA=y | |
| 784 | +CONFIG_XILINX_DMA=y | |
| 785 | 785 | CONFIG_DMA_SUN6I=y |
| 786 | 786 | CONFIG_STAGING=y |
| 787 | 787 | CONFIG_SENSORS_ISL29018=y |
| @@ -284,7 +284,7 @@ static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, · 283 unmodified lines | ||
| 284 | 284 | err = blkcipher_walk_done(desc, &walk, |
| 285 | 285 | walk.nbytes % AES_BLOCK_SIZE); |
| 286 | 286 | } |
| 287 | − if (nbytes) { | |
| 287 | + if (walk.nbytes % AES_BLOCK_SIZE) { | |
| 288 | 288 | u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE; |
| 289 | 289 | u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE; |
| 290 | 290 | u8 __aligned(8) tail[AES_BLOCK_SIZE]; |
| @@ -47,6 +47,7 @@ · 46 unmodified lines | ||
| 47 | 47 | #define PMD_SECT_WB (PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) |
| 48 | 48 | #define PMD_SECT_MINICACHE (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE) |
| 49 | 49 | #define PMD_SECT_WBWA (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) |
| 50 | +#define PMD_SECT_CACHE_MASK (PMD_SECT_TEX(1) | PMD_SECT_CACHEABLE | PMD_SECT_BUFFERABLE) | |
| 50 | 51 | #define PMD_SECT_NONSHARED_DEV (PMD_SECT_TEX(2)) |
| 51 | 52 | |
| 52 | 53 | /* |
| @@ -62,6 +62,7 @@ · 61 unmodified lines | ||
| 62 | 62 | #define PMD_SECT_WT (_AT(pmdval_t, 2) << 2) /* normal inner write-through */ |
| 63 | 63 | #define PMD_SECT_WB (_AT(pmdval_t, 3) << 2) /* normal inner write-back */ |
| 64 | 64 | #define PMD_SECT_WBWA (_AT(pmdval_t, 7) << 2) /* normal inner write-alloc */ |
| 65 | +#define PMD_SECT_CACHE_MASK (_AT(pmdval_t, 7) << 2) | |
| 65 | 66 | |
| 66 | 67 | /* |
| 67 | 68 | * + Level 3 descriptor (PTE) |
| @@ -295,6 +295,7 @@ __und_svc_fault: · 294 unmodified lines | ||
| 295 | 295 | bl __und_fault |
| 296 | 296 | |
| 297 | 297 | __und_svc_finish: |
| 298 | + get_thread_info tsk | |
| 298 | 299 | ldr r5, [sp, #S_PSR] @ Get SVC cpsr |
| 299 | 300 | svc_exit r5 @ return from exception |
| 300 | 301 | UNWIND(.fnend ) |
| @@ -142,6 +142,19 @@ ARM_BE8(orr r7, r7, #(1 << 25)) @ HSCTLR.EE · 141 unmodified lines | ||
| 142 | 142 | and r7, #0x1f @ Preserve HPMN |
| 143 | 143 | mcr p15, 4, r7, c1, c1, 1 @ HDCR |
| 144 | 144 | |
| 145 | + @ Make sure NS-SVC is initialised appropriately | |
| 146 | + mrc p15, 0, r7, c1, c0, 0 @ SCTLR | |
| 147 | + orr r7, #(1 << 5) @ CP15 barriers enabled | |
| 148 | + bic r7, #(3 << 7) @ Clear SED/ITD for v8 (RES0 for v7) | |
| 149 | + bic r7, #(3 << 19) @ WXN and UWXN disabled | |
| 150 | + mcr p15, 0, r7, c1, c0, 0 @ SCTLR | |
| 151 | + | |
| 152 | + mrc p15, 0, r7, c0, c0, 0 @ MIDR | |
| 153 | + mcr p15, 4, r7, c0, c0, 0 @ VPIDR | |
| 154 | + | |
| 155 | + mrc p15, 0, r7, c0, c0, 5 @ MPIDR | |
| 156 | + mcr p15, 4, r7, c0, c0, 5 @ VMPIDR | |
| 157 | + | |
| 145 | 158 | #if !defined(ZIMAGE) && defined(CONFIG_ARM_ARCH_TIMER) |
| 146 | 159 | @ make CNTP_* and CNTPCT accessible from PL1 |
| 147 | 160 | mrc p15, 0, r7, c0, c1, 1 @ ID_PFR1 |
| @@ -158,8 +158,6 @@ void kvm_arch_destroy_vm(struct kvm *kvm) · 157 unmodified lines | ||
| 158 | 158 | { |
| 159 | 159 | int i; |
| 160 | 160 | |
| 161 | − kvm_free_stage2_pgd(kvm); | |
| 162 | − | |
| 163 | 161 | for (i = 0; i < KVM_MAX_VCPUS; ++i) { |
| 164 | 162 | if (kvm->vcpus[i]) { |
| 165 | 163 | kvm_arch_vcpu_free(kvm->vcpus[i]); |
| @@ -1309,7 +1309,7 @@ static int user_mem_abort(struct kvm_vcpu *vcpu, phys_addr_t fault_ipa, · 1308 unmodified lines | ||
| 1309 | 1309 | smp_rmb(); |
| 1310 | 1310 | |
| 1311 | 1311 | pfn = gfn_to_pfn_prot(kvm, gfn, write_fault, &writable); |
| 1312 | − if (is_error_pfn(pfn)) | |
| 1312 | + if (is_error_noslot_pfn(pfn)) | |
| 1313 | 1313 | return -EFAULT; |
| 1314 | 1314 | |
| 1315 | 1315 | if (kvm_is_device_pfn(pfn)) { |
| @@ -1714,7 +1714,8 @@ int kvm_mmu_init(void) · 398 unmodified lines | ||
| 1714 | 1714 | kern_hyp_va(PAGE_OFFSET), kern_hyp_va(~0UL)); |
| 1715 | 1715 | |
| 1716 | 1716 | if (hyp_idmap_start >= kern_hyp_va(PAGE_OFFSET) && |
| 1717 | − hyp_idmap_start < kern_hyp_va(~0UL)) { | |
| 1717 | + hyp_idmap_start < kern_hyp_va(~0UL) && | |
| 1718 | + hyp_idmap_start != (unsigned long)__hyp_idmap_text_start) { | |
| 1718 | 1719 | /* |
| 1719 | 1720 | * The idmap page is intersecting with the VA space, |
| 1720 | 1721 | * it is not safe to continue further. |
| @@ -1893,6 +1894,7 @@ void kvm_arch_memslots_updated(struct kvm *kvm, struct kvm_memslots *slots) · 172 unmodified lines | ||
| 1893 | 1894 | |
| 1894 | 1895 | void kvm_arch_flush_shadow_all(struct kvm *kvm) |
| 1895 | 1896 | { |
| 1897 | + kvm_free_stage2_pgd(kvm); | |
| 1896 | 1898 | } |
| 1897 | 1899 | |
| 1898 | 1900 | void kvm_arch_flush_shadow_memslot(struct kvm *kvm, |
| @@ -255,6 +255,12 @@ static int __init exynos_pmu_irq_init(struct device_node *node, · 254 unmodified lines | ||
| 255 | 255 | return -ENOMEM; |
| 256 | 256 | } |
| 257 | 257 | |
| 258 | + /* | |
| 259 | + * Clear the OF_POPULATED flag set in of_irq_init so that | |
| 260 | + * later the Exynos PMU platform device won't be skipped. | |
| 261 | + */ | |
| 262 | + of_node_clear_flag(node, OF_POPULATED); | |
| 263 | + | |
| 258 | 264 | return 0; |
| 259 | 265 | } |
| 260 | 266 | |
| @@ -271,6 +271,12 @@ static int __init imx_gpc_init(struct device_node *node, · 270 unmodified lines | ||
| 271 | 271 | for (i = 0; i < IMR_NUM; i++) |
| 272 | 272 | writel_relaxed(~0, gpc_base + GPC_IMR1 + i * 4); |
| 273 | 273 | |
| 274 | + /* | |
| 275 | + * Clear the OF_POPULATED flag set in of_irq_init so that | |
| 276 | + * later the GPC power domain driver will not be skipped. | |
| 277 | + */ | |
| 278 | + of_node_clear_flag(node, OF_POPULATED); | |
| 279 | + | |
| 274 | 280 | return 0; |
| 275 | 281 | } |
| 276 | 282 | IRQCHIP_DECLARE(imx_gpc, "fsl,imx6q-gpc", imx_gpc_init); |
| @@ -64,6 +64,7 @@ static void __init imx6ul_init_machine(void) · 63 unmodified lines | ||
| 64 | 64 | if (parent == NULL) |
| 65 | 65 | pr_warn("failed to initialize soc device\n"); |
| 66 | 66 | |
| 67 | + of_platform_default_populate(NULL, NULL, parent); | |
| 67 | 68 | imx6ul_enet_init(); |
| 68 | 69 | imx_anatop_init(); |
| 69 | 70 | imx6ul_pm_init(); |
| @@ -295,7 +295,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) · 294 unmodified lines | ||
| 295 | 295 | val &= ~BM_CLPCR_SBYOS; |
| 296 | 296 | if (cpu_is_imx6sl()) |
| 297 | 297 | val |= BM_CLPCR_BYPASS_PMIC_READY; |
| 298 | − if (cpu_is_imx6sl() || cpu_is_imx6sx()) | |
| 298 | + if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul()) | |
| 299 | 299 | val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; |
| 300 | 300 | else |
| 301 | 301 | val |= BM_CLPCR_BYP_MMDC_CH1_LPM_HS; |
| @@ -310,7 +310,7 @@ int imx6_set_lpm(enum mxc_cpu_pwr_mode mode) · 8 unmodified lines | ||
| 310 | 310 | val |= 0x3 << BP_CLPCR_STBY_COUNT; |
| 311 | 311 | val |= BM_CLPCR_VSTBY; |
| 312 | 312 | val |= BM_CLPCR_SBYOS; |
| 313 | − if (cpu_is_imx6sl()) | |
| 313 | + if (cpu_is_imx6sl() || cpu_is_imx6sx()) | |
| 314 | 314 | val |= BM_CLPCR_BYPASS_PMIC_READY; |
| 315 | 315 | if (cpu_is_imx6sl() || cpu_is_imx6sx() || cpu_is_imx6ul()) |
| 316 | 316 | val |= BM_CLPCR_BYP_MMDC_CH0_LPM_HS; |
| @@ -220,9 +220,6 @@ static int am33xx_cm_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs, · 219 unmodified lines | ||
| 220 | 220 | { |
| 221 | 221 | int i = 0; |
| 222 | 222 | |
| 223 | − if (!clkctrl_offs) | |
| 224 | − return 0; | |
| 225 | − | |
| 226 | 223 | omap_test_timeout(_is_module_ready(inst, clkctrl_offs), |
| 227 | 224 | MAX_MODULE_READY_TIME, i); |
| 228 | 225 | |
| @@ -246,9 +243,6 @@ static int am33xx_cm_wait_module_idle(u8 part, s16 inst, u16 clkctrl_offs, · 17 unmodified lines | ||
| 246 | 243 | { |
| 247 | 244 | int i = 0; |
| 248 | 245 | |
| 249 | − if (!clkctrl_offs) | |
| 250 | − return 0; | |
| 251 | − | |
| 252 | 246 | omap_test_timeout((_clkctrl_idlest(inst, clkctrl_offs) == |
| 253 | 247 | CLKCTRL_IDLEST_DISABLED), |
| 254 | 248 | MAX_MODULE_READY_TIME, i); |
| @@ -278,9 +278,6 @@ static int omap4_cminst_wait_module_ready(u8 part, s16 inst, u16 clkctrl_offs, · 277 unmodified lines | ||
| 278 | 278 | { |
| 279 | 279 | int i = 0; |
| 280 | 280 | |
| 281 | − if (!clkctrl_offs) | |
| 282 | − return 0; | |
| 283 | − | |
| 284 | 281 | omap_test_timeout(_is_module_ready(part, inst, clkctrl_offs), |
| 285 | 282 | MAX_MODULE_READY_TIME, i); |
| 286 | 283 | |
| @@ -304,9 +301,6 @@ static int omap4_cminst_wait_module_idle(u8 part, s16 inst, u16 clkctrl_offs, · 17 unmodified lines | ||
| 304 | 301 | { |
| 305 | 302 | int i = 0; |
| 306 | 303 | |
| 307 | − if (!clkctrl_offs) | |
| 308 | − return 0; | |
| 309 | − | |
| 310 | 304 | omap_test_timeout((_clkctrl_idlest(part, inst, clkctrl_offs) == |
| 311 | 305 | CLKCTRL_IDLEST_DISABLED), |
| 312 | 306 | MAX_MODULE_DISABLE_TIME, i); |
| @@ -1053,6 +1053,10 @@ static int _omap4_wait_target_disable(struct omap_hwmod *oh) · 1052 unmodified lines | ||
| 1053 | 1053 | if (oh->flags & HWMOD_NO_IDLEST) |
| 1054 | 1054 | return 0; |
| 1055 | 1055 | |
| 1056 | + if (!oh->prcm.omap4.clkctrl_offs && | |
| 1057 | + !(oh->prcm.omap4.flags & HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET)) | |
| 1058 | + return 0; | |
| 1059 | + | |
| 1056 | 1060 | return omap_cm_wait_module_idle(oh->clkdm->prcm_partition, |
| 1057 | 1061 | oh->clkdm->cm_inst, |
| 1058 | 1062 | oh->prcm.omap4.clkctrl_offs, 0); |
| @@ -2971,6 +2975,10 @@ static int _omap4_wait_target_ready(struct omap_hwmod *oh) · 1912 unmodified lines | ||
| 2971 | 2975 | if (!_find_mpu_rt_port(oh)) |
| 2972 | 2976 | return 0; |
| 2973 | 2977 | |
| 2978 | + if (!oh->prcm.omap4.clkctrl_offs && | |
| 2979 | + !(oh->prcm.omap4.flags & HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET)) | |
| 2980 | + return 0; | |
| 2981 | + | |
| 2974 | 2982 | /* XXX check module SIDLEMODE, hardreset status */ |
| 2975 | 2983 | |
| 2976 | 2984 | return omap_cm_wait_module_ready(oh->clkdm->prcm_partition, |
| @@ -443,8 +443,12 @@ struct omap_hwmod_omap2_prcm { · 442 unmodified lines | ||
| 443 | 443 | * HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT: Some IP blocks don't have a PRCM |
| 444 | 444 | * module-level context loss register associated with them; this |
| 445 | 445 | * flag bit should be set in those cases |
| 446 | + * HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET: Some IP blocks have a valid CLKCTRL | |
| 447 | + * offset of zero; this flag bit should be set in those cases to | |
| 448 | + * distinguish from hwmods that have no clkctrl offset. | |
| 446 | 449 | */ |
| 447 | 450 | #define HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT (1 << 0) |
| 451 | +#define HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET (1 << 1) | |
| 448 | 452 | |
| 449 | 453 | /** |
| 450 | 454 | * struct omap_hwmod_omap4_prcm - OMAP4-specific PRCM data |
| @@ -29,6 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #define CLKCTRL(oh, clkctrl) ((oh).prcm.omap4.clkctrl_offs = (clkctrl)) |
| 30 | 30 | #define RSTCTRL(oh, rstctrl) ((oh).prcm.omap4.rstctrl_offs = (rstctrl)) |
| 31 | 31 | #define RSTST(oh, rstst) ((oh).prcm.omap4.rstst_offs = (rstst)) |
| 32 | +#define PRCM_FLAGS(oh, flag) ((oh).prcm.omap4.flags = (flag)) | |
| 32 | 33 | |
| 33 | 34 | /* |
| 34 | 35 | * 'l3' class |
| @@ -1296,6 +1297,7 @@ static void omap_hwmod_am33xx_clkctrl(void) · 1261 unmodified lines | ||
| 1296 | 1297 | CLKCTRL(am33xx_i2c1_hwmod, AM33XX_CM_WKUP_I2C0_CLKCTRL_OFFSET); |
| 1297 | 1298 | CLKCTRL(am33xx_wd_timer1_hwmod, AM33XX_CM_WKUP_WDT1_CLKCTRL_OFFSET); |
| 1298 | 1299 | CLKCTRL(am33xx_rtc_hwmod, AM33XX_CM_RTC_RTC_CLKCTRL_OFFSET); |
| 1300 | + PRCM_FLAGS(am33xx_rtc_hwmod, HWMOD_OMAP4_ZERO_CLKCTRL_OFFSET); | |
| 1299 | 1301 | CLKCTRL(am33xx_mmc2_hwmod, AM33XX_CM_PER_MMC2_CLKCTRL_OFFSET); |
| 1300 | 1302 | CLKCTRL(am33xx_gpmc_hwmod, AM33XX_CM_PER_GPMC_CLKCTRL_OFFSET); |
| 1301 | 1303 | CLKCTRL(am33xx_l4_ls_hwmod, AM33XX_CM_PER_L4LS_CLKCTRL_OFFSET); |
| @@ -722,8 +722,20 @@ static struct omap_hwmod omap3xxx_dss_dispc_hwmod = { · 721 unmodified lines | ||
| 722 | 722 | * display serial interface controller |
| 723 | 723 | */ |
| 724 | 724 | |
| 725 | +static struct omap_hwmod_class_sysconfig omap3xxx_dsi_sysc = { | |
| 726 | + .rev_offs = 0x0000, | |
| 727 | + .sysc_offs = 0x0010, | |
| 728 | + .syss_offs = 0x0014, | |
| 729 | + .sysc_flags = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY | | |
| 730 | + SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE | | |
| 731 | + SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS), | |
| 732 | + .idlemodes = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART), | |
| 733 | + .sysc_fields = &omap_hwmod_sysc_type1, | |
| 734 | +}; | |
| 735 | + | |
| 725 | 736 | static struct omap_hwmod_class omap3xxx_dsi_hwmod_class = { |
| 726 | 737 | .name = "dsi", |
| 738 | + .sysc = &omap3xxx_dsi_sysc, | |
| 727 | 739 | }; |
| 728 | 740 | |
| 729 | 741 | static struct omap_hwmod_irq_info omap3xxx_dsi1_irqs[] = { |
| @@ -83,7 +83,8 @@ static struct resource smc91x_resources[] = { · 82 unmodified lines | ||
| 83 | 83 | }; |
| 84 | 84 | |
| 85 | 85 | static struct smc91x_platdata smc91x_platdata = { |
| 86 | − .flags = SMC91X_USE_32BIT | SMC91X_USE_DMA | SMC91X_NOWAIT, | |
| 86 | + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | | |
| 87 | + SMC91X_USE_DMA | SMC91X_NOWAIT, | |
| 87 | 88 | }; |
| 88 | 89 | |
| 89 | 90 | static struct platform_device smc91x_device = { |
| @@ -137,6 +137,18 @@ static struct pxa2xx_udc_mach_info udc_info __initdata = { · 136 unmodified lines | ||
| 137 | 137 | // no D+ pullup; lubbock can't connect/disconnect in software |
| 138 | 138 | }; |
| 139 | 139 | |
| 140 | +static void lubbock_init_pcmcia(void) | |
| 141 | +{ | |
| 142 | + struct clk *clk; | |
| 143 | + | |
| 144 | + /* Add an alias for the SA1111 PCMCIA clock */ | |
| 145 | + clk = clk_get_sys("pxa2xx-pcmcia", NULL); | |
| 146 | + if (!IS_ERR(clk)) { | |
| 147 | + clkdev_create(clk, NULL, "1800"); | |
| 148 | + clk_put(clk); | |
| 149 | + } | |
| 150 | +} | |
| 151 | + | |
| 140 | 152 | static struct resource sa1111_resources[] = { |
| 141 | 153 | [0] = { |
| 142 | 154 | .start = 0x10000000, |
| @@ -467,6 +479,8 @@ static void __init lubbock_init(void) · 324 unmodified lines | ||
| 467 | 479 | pxa_set_btuart_info(NULL); |
| 468 | 480 | pxa_set_stuart_info(NULL); |
| 469 | 481 | |
| 482 | + lubbock_init_pcmcia(); | |
| 483 | + | |
| 470 | 484 | clk_add_alias("SA1111_CLK", NULL, "GPIO11_CLK", NULL); |
| 471 | 485 | pxa_set_udc_info(&udc_info); |
| 472 | 486 | pxa_set_fb_info(NULL, &sharp_lm8v31); |
| @@ -120,7 +120,8 @@ static struct resource smc91x_resources[] = { · 119 unmodified lines | ||
| 120 | 120 | }; |
| 121 | 121 | |
| 122 | 122 | static struct smc91x_platdata xcep_smc91x_info = { |
| 123 | − .flags = SMC91X_USE_32BIT | SMC91X_NOWAIT | SMC91X_USE_DMA, | |
| 123 | + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | | |
| 124 | + SMC91X_NOWAIT | SMC91X_USE_DMA, | |
| 124 | 125 | }; |
| 125 | 126 | |
| 126 | 127 | static struct platform_device smc91x_device = { |
| @@ -93,7 +93,8 @@ static struct smsc911x_platform_config smsc911x_config = { · 92 unmodified lines | ||
| 93 | 93 | }; |
| 94 | 94 | |
| 95 | 95 | static struct smc91x_platdata smc91x_platdata = { |
| 96 | − .flags = SMC91X_USE_32BIT | SMC91X_NOWAIT, | |
| 96 | + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | | |
| 97 | + SMC91X_NOWAIT, | |
| 97 | 98 | }; |
| 98 | 99 | |
| 99 | 100 | static struct platform_device realview_eth_device = { |
| @@ -125,6 +125,8 @@ static unsigned long clk_36864_get_rate(struct clk *clk) · 124 unmodified lines | ||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | static struct clkops clk_36864_ops = { |
| 128 | + .enable = clk_cpu_enable, | |
| 129 | + .disable = clk_cpu_disable, | |
| 128 | 130 | .get_rate = clk_36864_get_rate, |
| 129 | 131 | }; |
| 130 | 132 | |
| @@ -140,9 +142,8 @@ static struct clk_lookup sa11xx_clkregs[] = { · 9 unmodified lines | ||
| 140 | 142 | CLKDEV_INIT(NULL, "OSTIMER0", &clk_36864), |
| 141 | 143 | }; |
| 142 | 144 | |
| 143 | −static int __init sa11xx_clk_init(void) | |
| 145 | +int __init sa11xx_clk_init(void) | |
| 144 | 146 | { |
| 145 | 147 | clkdev_add_table(sa11xx_clkregs, ARRAY_SIZE(sa11xx_clkregs)); |
| 146 | 148 | return 0; |
| 147 | 149 | } |
| 148 | −core_initcall(sa11xx_clk_init); | |
| @@ -34,6 +34,7 @@ · 33 unmodified lines | ||
| 34 | 34 | |
| 35 | 35 | #include <mach/hardware.h> |
| 36 | 36 | #include <mach/irqs.h> |
| 37 | +#include <mach/reset.h> | |
| 37 | 38 | |
| 38 | 39 | #include "generic.h" |
| 39 | 40 | #include <clocksource/pxa.h> |
| @@ -95,6 +96,8 @@ static void sa1100_power_off(void) · 55 unmodified lines | ||
| 95 | 96 | |
| 96 | 97 | void sa11x0_restart(enum reboot_mode mode, const char *cmd) |
| 97 | 98 | { |
| 99 | + clear_reset_status(RESET_STATUS_ALL); | |
| 100 | + | |
| 98 | 101 | if (mode == REBOOT_SOFT) { |
| 99 | 102 | /* Jump into ROM at address 0 */ |
| 100 | 103 | soft_restart(0); |
| @@ -388,6 +391,7 @@ void __init sa1100_init_irq(void) · 287 unmodified lines | ||
| 388 | 391 | sa11x0_init_irq_nodt(IRQ_GPIO0_SC, irq_resource.start); |
| 389 | 392 | |
| 390 | 393 | sa1100_init_gpio(); |
| 394 | + sa11xx_clk_init(); | |
| 391 | 395 | } |
| 392 | 396 | |
| 393 | 397 | /* |
| @@ -44,3 +44,5 @@ int sa11x0_pm_init(void); · 43 unmodified lines | ||
| 44 | 44 | #else |
| 45 | 45 | static inline int sa11x0_pm_init(void) { return 0; } |
| 46 | 46 | #endif |
| 47 | + | |
| 48 | +int sa11xx_clk_init(void); | |
| @@ -45,7 +45,7 @@ static struct resource smc91x_resources[] = { · 44 unmodified lines | ||
| 45 | 45 | }; |
| 46 | 46 | |
| 47 | 47 | static struct smc91x_platdata smc91x_platdata = { |
| 48 | − .flags = SMC91X_USE_16BIT | SMC91X_NOWAIT, | |
| 48 | + .flags = SMC91X_USE_16BIT | SMC91X_USE_8BIT | SMC91X_NOWAIT, | |
| 49 | 49 | }; |
| 50 | 50 | |
| 51 | 51 | static struct platform_device smc91x_device = { |
| @@ -41,39 +41,26 @@ · 40 unmodified lines | ||
| 41 | 41 | |
| 42 | 42 | #define REGULATOR_IRQ_MASK BIT(2) /* IRQ2, active low */ |
| 43 | 43 | |
| 44 | −static void __iomem *irqc; | |
| 45 | − | |
| 46 | −static const u8 da9063_mask_regs[] = { | |
| 47 | − DA9063_REG_IRQ_MASK_A, | |
| 48 | − DA9063_REG_IRQ_MASK_B, | |
| 49 | − DA9063_REG_IRQ_MASK_C, | |
| 50 | − DA9063_REG_IRQ_MASK_D, | |
| 51 | −}; | |
| 52 | − | |
| 53 | −/* DA9210 System Control and Event Registers */ | |
| 44 | +/* start of DA9210 System Control and Event Registers */ | |
| 54 | 45 | #define DA9210_REG_MASK_A 0x54 |
| 55 | −#define DA9210_REG_MASK_B 0x55 | |
| 56 | − | |
| 57 | −static const u8 da9210_mask_regs[] = { | |
| 58 | − DA9210_REG_MASK_A, | |
| 59 | − DA9210_REG_MASK_B, | |
| 60 | −}; | |
| 61 | − | |
| 62 | −static void da9xxx_mask_irqs(struct i2c_client *client, const u8 regs[], | |
| 63 | − unsigned int nregs) | |
| 64 | −{ | |
| 65 | − unsigned int i; | |
| 66 | 46 | |
| 67 | − dev_info(&client->dev, "Masking %s interrupt sources\n", client->name); | |
| 47 | +static void __iomem *irqc; | |
| 68 | 48 | |
| 69 | − for (i = 0; i < nregs; i++) { | |
| 70 | − int error = i2c_smbus_write_byte_data(client, regs[i], ~0); | |
| 71 | − if (error) { | |
| 72 | − dev_err(&client->dev, "i2c error %d\n", error); | |
| 73 | − return; | |
| 74 | − } | |
| 75 | − } | |
| 76 | −} | |
| 49 | +/* first byte sets the memory pointer, following are consecutive reg values */ | |
| 50 | +static u8 da9063_irq_clr[] = { DA9063_REG_IRQ_MASK_A, 0xff, 0xff, 0xff, 0xff }; | |
| 51 | +static u8 da9210_irq_clr[] = { DA9210_REG_MASK_A, 0xff, 0xff }; | |
| 52 | + | |
| 53 | +static struct i2c_msg da9xxx_msgs[2] = { | |
| 54 | + { | |
| 55 | + .addr = 0x58, | |
| 56 | + .len = ARRAY_SIZE(da9063_irq_clr), | |
| 57 | + .buf = da9063_irq_clr, | |
| 58 | + }, { | |
| 59 | + .addr = 0x68, | |
| 60 | + .len = ARRAY_SIZE(da9210_irq_clr), | |
| 61 | + .buf = da9210_irq_clr, | |
| 62 | + }, | |
| 63 | +}; | |
| 77 | 64 | |
| 78 | 65 | static int regulator_quirk_notify(struct notifier_block *nb, |
| 79 | 66 | unsigned long action, void *data) |
| @@ -93,12 +80,15 @@ static int regulator_quirk_notify(struct notifier_block *nb, · 13 unmodified lines | ||
| 93 | 80 | client = to_i2c_client(dev); |
| 94 | 81 | dev_dbg(dev, "Detected %s\n", client->name); |
| 95 | 82 | |
| 96 | − if ((client->addr == 0x58 && !strcmp(client->name, "da9063"))) | |
| 97 | − da9xxx_mask_irqs(client, da9063_mask_regs, | |
| 98 | − ARRAY_SIZE(da9063_mask_regs)); | |
| 99 | − else if (client->addr == 0x68 && !strcmp(client->name, "da9210")) | |
| 100 | − da9xxx_mask_irqs(client, da9210_mask_regs, | |
| 101 | − ARRAY_SIZE(da9210_mask_regs)); | |
| 83 | + if ((client->addr == 0x58 && !strcmp(client->name, "da9063")) || | |
| 84 | + (client->addr == 0x68 && !strcmp(client->name, "da9210"))) { | |
| 85 | + int ret; | |
| 86 | + | |
| 87 | + dev_info(&client->dev, "clearing da9063/da9210 interrupts\n"); | |
| 88 | + ret = i2c_transfer(client->adapter, da9xxx_msgs, ARRAY_SIZE(da9xxx_msgs)); | |
| 89 | + if (ret != ARRAY_SIZE(da9xxx_msgs)) | |
| 90 | + dev_err(&client->dev, "i2c error %d\n", ret); | |
| 91 | + } | |
| 102 | 92 | |
| 103 | 93 | mon = ioread32(irqc + IRQC_MONITOR); |
| 104 | 94 | if (mon & REGULATOR_IRQ_MASK) |
| @@ -137,7 +137,7 @@ void __init init_default_cache_policy(unsigned long pmd) · 136 unmodified lines | ||
| 137 | 137 | |
| 138 | 138 | initial_pmd_value = pmd; |
| 139 | 139 | |
| 140 | − pmd &= PMD_SECT_TEX(1) | PMD_SECT_BUFFERABLE | PMD_SECT_CACHEABLE; | |
| 140 | + pmd &= PMD_SECT_CACHE_MASK; | |
| 141 | 141 | |
| 142 | 142 | for (i = 0; i < ARRAY_SIZE(cache_policies); i++) |
| 143 | 143 | if (cache_policies[i].pmd == pmd) { |
| @@ -728,7 +728,8 @@ static void *__init late_alloc(unsigned long sz) · 584 unmodified lines | ||
| 728 | 728 | { |
| 729 | 729 | void *ptr = (void *)__get_free_pages(PGALLOC_GFP, get_order(sz)); |
| 730 | 730 | |
| 731 | − BUG_ON(!ptr); | |
| 731 | + if (!ptr || !pgtable_page_ctor(virt_to_page(ptr))) | |
| 732 | + BUG(); | |
| 732 | 733 | return ptr; |
| 733 | 734 | } |
| 734 | 735 | |
| @@ -1155,10 +1156,19 @@ void __init sanity_check_meminfo(void) · 420 unmodified lines | ||
| 1155 | 1156 | { |
| 1156 | 1157 | phys_addr_t memblock_limit = 0; |
| 1157 | 1158 | int highmem = 0; |
| 1158 | − phys_addr_t vmalloc_limit = __pa(vmalloc_min - 1) + 1; | |
| 1159 | + u64 vmalloc_limit; | |
| 1159 | 1160 | struct memblock_region *reg; |
| 1160 | 1161 | bool should_use_highmem = false; |
| 1161 | 1162 | |
| 1163 | + /* | |
| 1164 | + * Let's use our own (unoptimized) equivalent of __pa() that is | |
| 1165 | + * not affected by wrap-arounds when sizeof(phys_addr_t) == 4. | |
| 1166 | + * The result is used as the upper bound on physical memory address | |
| 1167 | + * and may itself be outside the valid range for which phys_addr_t | |
| 1168 | + * and therefore __pa() is defined. | |
| 1169 | + */ | |
| 1170 | + vmalloc_limit = (u64)(uintptr_t)vmalloc_min - PAGE_OFFSET + PHYS_OFFSET; | |
| 1171 | + | |
| 1162 | 1172 | for_each_memblock(memory, reg) { |
| 1163 | 1173 | phys_addr_t block_start = reg->base; |
| 1164 | 1174 | phys_addr_t block_end = reg->base + reg->size; |
| @@ -1183,10 +1193,11 @@ void __init sanity_check_meminfo(void) · 18 unmodified lines | ||
| 1183 | 1193 | if (reg->size > size_limit) { |
| 1184 | 1194 | phys_addr_t overlap_size = reg->size - size_limit; |
| 1185 | 1195 | |
| 1186 | − pr_notice("Truncating RAM at %pa-%pa to -%pa", | |
| 1187 | − &block_start, &block_end, &vmalloc_limit); | |
| 1188 | − memblock_remove(vmalloc_limit, overlap_size); | |
| 1196 | + pr_notice("Truncating RAM at %pa-%pa", | |
| 1197 | + &block_start, &block_end); | |
| 1189 | 1198 | block_end = vmalloc_limit; |
| 1199 | + pr_cont(" to -%pa", &block_end); | |
| 1200 | + memblock_remove(vmalloc_limit, overlap_size); | |
| 1190 | 1201 | should_use_highmem = true; |
| 1191 | 1202 | } |
| 1192 | 1203 | } |
| @@ -16,6 +16,7 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <asm/hwcap.h> |
| 17 | 17 | #include <asm/pgtable-hwdef.h> |
| 18 | 18 | #include <asm/pgtable.h> |
| 19 | +#include <asm/memory.h> | |
| 19 | 20 | |
| 20 | 21 | #include "proc-macros.S" |
| 21 | 22 | |
| @@ -50,7 +50,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); · 49 unmodified lines | ||
| 50 | 50 | static struct vcpu_info __percpu *xen_vcpu_info; |
| 51 | 51 | |
| 52 | 52 | /* Linux <-> Xen vCPU id mapping */ |
| 53 | −DEFINE_PER_CPU(int, xen_vcpu_id) = -1; | |
| 53 | +DEFINE_PER_CPU(uint32_t, xen_vcpu_id); | |
| 54 | 54 | EXPORT_PER_CPU_SYMBOL(xen_vcpu_id); |
| 55 | 55 | |
| 56 | 56 | /* These are unused until we support booting "pre-ballooned" */ |
| @@ -170,9 +170,6 @@ static int xen_starting_cpu(unsigned int cpu) · 113 unmodified lines | ||
| 170 | 170 | pr_info("Xen: initializing cpu%d\n", cpu); |
| 171 | 171 | vcpup = per_cpu_ptr(xen_vcpu_info, cpu); |
| 172 | 172 | |
| 173 | − /* Direct vCPU id mapping for ARM guests. */ | |
| 174 | − per_cpu(xen_vcpu_id, cpu) = cpu; | |
| 175 | − | |
| 176 | 173 | info.mfn = virt_to_gfn(vcpup); |
| 177 | 174 | info.offset = xen_offset_in_page(vcpup); |
| 178 | 175 | |
| @@ -330,6 +327,7 @@ static int __init xen_guest_init(void) · 151 unmodified lines | ||
| 330 | 327 | { |
| 331 | 328 | struct xen_add_to_physmap xatp; |
| 332 | 329 | struct shared_info *shared_info_page = NULL; |
| 330 | + int cpu; | |
| 333 | 331 | |
| 334 | 332 | if (!xen_domain()) |
| 335 | 333 | return 0; |
| @@ -380,7 +378,8 @@ static int __init xen_guest_init(void) · 44 unmodified lines | ||
| 380 | 378 | return -ENOMEM; |
| 381 | 379 | |
| 382 | 380 | /* Direct vCPU id mapping for ARM guests. */ |
| 383 | − per_cpu(xen_vcpu_id, 0) = 0; | |
| 381 | + for_each_possible_cpu(cpu) | |
| 382 | + per_cpu(xen_vcpu_id, cpu) = cpu; | |
| 384 | 383 | |
| 385 | 384 | xen_auto_xlat_grant_frames.count = gnttab_max_grant_frames(); |
| 386 | 385 | if (xen_xlate_map_ballooned_pages(&xen_auto_xlat_grant_frames.pfn, |
| @@ -255,10 +255,10 @@ · 254 unmodified lines | ||
| 255 | 255 | /* Local timer */ |
| 256 | 256 | timer { |
| 257 | 257 | compatible = "arm,armv8-timer"; |
| 258 | − interrupts = <1 13 0xf01>, | |
| 259 | − <1 14 0xf01>, | |
| 260 | − <1 11 0xf01>, | |
| 261 | − <1 10 0xf01>; | |
| 258 | + interrupts = <1 13 0xf08>, | |
| 259 | + <1 14 0xf08>, | |
| 260 | + <1 11 0xf08>, | |
| 261 | + <1 10 0xf08>; | |
| 262 | 262 | }; |
| 263 | 263 | |
| 264 | 264 | timer0: timer0@ffc03000 { |
| @@ -102,13 +102,13 @@ · 101 unmodified lines | ||
| 102 | 102 | timer { |
| 103 | 103 | compatible = "arm,armv8-timer"; |
| 104 | 104 | interrupts = <GIC_PPI 13 |
| 105 | − (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>, | |
| 105 | + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, | |
| 106 | 106 | <GIC_PPI 14 |
| 107 | − (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>, | |
| 107 | + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, | |
| 108 | 108 | <GIC_PPI 11 |
| 109 | − (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>, | |
| 109 | + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>, | |
| 110 | 110 | <GIC_PPI 10 |
| 111 | − (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_EDGE_RISING)>; | |
| 111 | + (GIC_CPU_MASK_RAW(0xff) | IRQ_TYPE_LEVEL_LOW)>; | |
| 112 | 112 | }; |
| 113 | 113 | |
| 114 | 114 | xtal: xtal-clk { |
| @@ -110,10 +110,10 @@ · 109 unmodified lines | ||
| 110 | 110 | |
| 111 | 111 | timer { |
| 112 | 112 | compatible = "arm,armv8-timer"; |
| 113 | − interrupts = <1 0 0xff01>, /* Secure Phys IRQ */ | |
| 114 | − <1 13 0xff01>, /* Non-secure Phys IRQ */ | |
| 115 | − <1 14 0xff01>, /* Virt IRQ */ | |
| 116 | − <1 15 0xff01>; /* Hyp IRQ */ | |
| 113 | + interrupts = <1 0 0xff08>, /* Secure Phys IRQ */ | |
| 114 | + <1 13 0xff08>, /* Non-secure Phys IRQ */ | |
| 115 | + <1 14 0xff08>, /* Virt IRQ */ | |
| 116 | + <1 15 0xff08>; /* Hyp IRQ */ | |
| 117 | 117 | clock-frequency = <50000000>; |
| 118 | 118 | }; |
| 119 | 119 | |
| @@ -0,0 +1 @@ | ||
| 1 | +../../../../arm/boot/dts/bcm2835-rpi.dtsi | |
| @@ -1,7 +1,7 @@ | ||
| 1 | 1 | /dts-v1/; |
| 2 | 2 | #include "bcm2837.dtsi" |
| 3 | −#include "../../../../arm/boot/dts/bcm2835-rpi.dtsi" | |
| 4 | −#include "../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi" | |
| 3 | +#include "bcm2835-rpi.dtsi" | |
| 4 | +#include "bcm283x-rpi-smsc9514.dtsi" | |
| 5 | 5 | |
| 6 | 6 | / { |
| 7 | 7 | compatible = "raspberrypi,3-model-b", "brcm,bcm2837"; |
| @@ -1,4 +1,4 @@ | ||
| 1 | −#include "../../../../arm/boot/dts/bcm283x.dtsi" | |
| 1 | +#include "bcm283x.dtsi" | |
| 2 | 2 | |
| 3 | 3 | / { |
| 4 | 4 | compatible = "brcm,bcm2836"; |
| @@ -0,0 +1 @@ | ||
| 1 | +../../../../arm/boot/dts/bcm283x-rpi-smsc9514.dtsi | |
| @@ -0,0 +1 @@ | ||
| 1 | +../../../../arm/boot/dts/bcm283x.dtsi | |
| @@ -88,13 +88,13 @@ · 87 unmodified lines | ||
| 88 | 88 | timer { |
| 89 | 89 | compatible = "arm,armv8-timer"; |
| 90 | 90 | interrupts = <GIC_PPI 13 (GIC_CPU_MASK_RAW(0xff) | |
| 91 | − IRQ_TYPE_EDGE_RISING)>, | |
| 91 | + IRQ_TYPE_LEVEL_LOW)>, | |
| 92 | 92 | <GIC_PPI 14 (GIC_CPU_MASK_RAW(0xff) | |
| 93 | − IRQ_TYPE_EDGE_RISING)>, | |
| 93 | + IRQ_TYPE_LEVEL_LOW)>, | |
| 94 | 94 | <GIC_PPI 11 (GIC_CPU_MASK_RAW(0xff) | |
| 95 | − IRQ_TYPE_EDGE_RISING)>, | |
| 95 | + IRQ_TYPE_LEVEL_LOW)>, | |
| 96 | 96 | <GIC_PPI 10 (GIC_CPU_MASK_RAW(0xff) | |
| 97 | − IRQ_TYPE_EDGE_RISING)>; | |
| 97 | + IRQ_TYPE_LEVEL_LOW)>; | |
| 98 | 98 | }; |
| 99 | 99 | |
| 100 | 100 | pmu { |
| @@ -354,10 +354,10 @@ · 353 unmodified lines | ||
| 354 | 354 | |
| 355 | 355 | timer { |
| 356 | 356 | compatible = "arm,armv8-timer"; |
| 357 | − interrupts = <1 13 0xff01>, | |
| 358 | − <1 14 0xff01>, | |
| 359 | − <1 11 0xff01>, | |
| 360 | − <1 10 0xff01>; | |
| 357 | + interrupts = <1 13 4>, | |
| 358 | + <1 14 4>, | |
| 359 | + <1 11 4>, | |
| 360 | + <1 10 4>; | |
| 361 | 361 | }; |
| 362 | 362 | |
| 363 | 363 | pmu { |
| @@ -473,10 +473,10 @@ · 472 unmodified lines | ||
| 473 | 473 | |
| 474 | 474 | timer { |
| 475 | 475 | compatible = "arm,armv8-timer"; |
| 476 | − interrupts = <1 13 0xff01>, | |
| 477 | − <1 14 0xff01>, | |
| 478 | − <1 11 0xff01>, | |
| 479 | − <1 10 0xff01>; | |
| 476 | + interrupts = <1 13 0xff08>, | |
| 477 | + <1 14 0xff08>, | |
| 478 | + <1 11 0xff08>, | |
| 479 | + <1 10 0xff08>; | |
| 480 | 480 | }; |
| 481 | 481 | |
| 482 | 482 | pmu_system_controller: system-controller@105c0000 { |
| @@ -119,10 +119,10 @@ · 118 unmodified lines | ||
| 119 | 119 | |
| 120 | 120 | timer { |
| 121 | 121 | compatible = "arm,armv8-timer"; |
| 122 | − interrupts = <1 13 0x1>, /* Physical Secure PPI */ | |
| 123 | − <1 14 0x1>, /* Physical Non-Secure PPI */ | |
| 124 | − <1 11 0x1>, /* Virtual PPI */ | |
| 125 | − <1 10 0x1>; /* Hypervisor PPI */ | |
| 122 | + interrupts = <1 13 0xf08>, /* Physical Secure PPI */ | |
| 123 | + <1 14 0xf08>, /* Physical Non-Secure PPI */ | |
| 124 | + <1 11 0xf08>, /* Virtual PPI */ | |
| 125 | + <1 10 0xf08>; /* Hypervisor PPI */ | |
| 126 | 126 | }; |
| 127 | 127 | |
| 128 | 128 | pmu { |
| @@ -191,10 +191,10 @@ · 190 unmodified lines | ||
| 191 | 191 | |
| 192 | 192 | timer { |
| 193 | 193 | compatible = "arm,armv8-timer"; |
| 194 | − interrupts = <1 13 0x8>, /* Physical Secure PPI, active-low */ | |
| 195 | − <1 14 0x8>, /* Physical Non-Secure PPI, active-low */ | |
| 196 | − <1 11 0x8>, /* Virtual PPI, active-low */ | |
| 197 | − <1 10 0x8>; /* Hypervisor PPI, active-low */ | |
| 194 | + interrupts = <1 13 4>, /* Physical Secure PPI, active-low */ | |
| 195 | + <1 14 4>, /* Physical Non-Secure PPI, active-low */ | |
| 196 | + <1 11 4>, /* Virtual PPI, active-low */ | |
| 197 | + <1 10 4>; /* Hypervisor PPI, active-low */ | |
| 198 | 198 | }; |
| 199 | 199 | |
| 200 | 200 | pmu { |
| @@ -122,10 +122,10 @@ · 121 unmodified lines | ||
| 122 | 122 | |
| 123 | 123 | timer { |
| 124 | 124 | compatible = "arm,armv8-timer"; |
| 125 | − interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>, | |
| 126 | − <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>, | |
| 127 | − <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>, | |
| 128 | − <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_EDGE_RISING)>; | |
| 125 | + interrupts = <GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, | |
| 126 | + <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, | |
| 127 | + <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>, | |
| 128 | + <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>; | |
| 129 | 129 | }; |
| 130 | 130 | |
| 131 | 131 | odmi: odmi@300000 { |
| @@ -270,6 +270,8 @@ · 269 unmodified lines | ||
| 270 | 270 | #io-channel-cells = <1>; |
| 271 | 271 | clocks = <&cru SCLK_SARADC>, <&cru PCLK_SARADC>; |
| 272 | 272 | clock-names = "saradc", "apb_pclk"; |
| 273 | + resets = <&cru SRST_SARADC>; | |
| 274 | + reset-names = "saradc-apb"; | |
| 273 | 275 | status = "disabled"; |
| 274 | 276 | }; |
| 275 | 277 | |
| @@ -129,10 +129,10 @@ · 128 unmodified lines | ||
| 129 | 129 | |
| 130 | 130 | timer { |
| 131 | 131 | compatible = "arm,armv8-timer"; |
| 132 | − interrupts = <1 13 0xf01>, | |
| 133 | − <1 14 0xf01>, | |
| 134 | − <1 11 0xf01>, | |
| 135 | − <1 10 0xf01>; | |
| 132 | + interrupts = <1 13 4>, | |
| 133 | + <1 14 4>, | |
| 134 | + <1 11 4>, | |
| 135 | + <1 10 4>; | |
| 136 | 136 | }; |
| 137 | 137 | |
| 138 | 138 | soc { |
| @@ -65,10 +65,10 @@ · 64 unmodified lines | ||
| 65 | 65 | timer { |
| 66 | 66 | compatible = "arm,armv8-timer"; |
| 67 | 67 | interrupt-parent = <&gic>; |
| 68 | − interrupts = <1 13 0xf01>, | |
| 69 | − <1 14 0xf01>, | |
| 70 | − <1 11 0xf01>, | |
| 71 | − <1 10 0xf01>; | |
| 68 | + interrupts = <1 13 0xf08>, | |
| 69 | + <1 14 0xf08>, | |
| 70 | + <1 11 0xf08>, | |
| 71 | + <1 10 0xf08>; | |
| 72 | 72 | }; |
| 73 | 73 | |
| 74 | 74 | amba_apu { |
| @@ -216,7 +216,7 @@ static int ctr_encrypt(struct blkcipher_desc *desc, struct scatterlist *dst, · 215 unmodified lines | ||
| 216 | 216 | err = blkcipher_walk_done(desc, &walk, |
| 217 | 217 | walk.nbytes % AES_BLOCK_SIZE); |
| 218 | 218 | } |
| 219 | − if (nbytes) { | |
| 219 | + if (walk.nbytes % AES_BLOCK_SIZE) { | |
| 220 | 220 | u8 *tdst = walk.dst.virt.addr + blocks * AES_BLOCK_SIZE; |
| 221 | 221 | u8 *tsrc = walk.src.virt.addr + blocks * AES_BLOCK_SIZE; |
| 222 | 222 | u8 __aligned(8) tail[AES_BLOCK_SIZE]; |
| @@ -61,8 +61,6 @@ · 60 unmodified lines | ||
| 61 | 61 | |
| 62 | 62 | #define AARCH64_BREAK_KGDB_DYN_DBG \ |
| 63 | 63 | (AARCH64_BREAK_MON | (KGDB_DYN_DBG_BRK_IMM << 5)) |
| 64 | −#define KGDB_DYN_BRK_INS_BYTE(x) \ | |
| 65 | − ((AARCH64_BREAK_KGDB_DYN_DBG >> (8 * (x))) & 0xff) | |
| 66 | 64 | |
| 67 | 65 | #define CACHE_FLUSH_IS_SAFE 1 |
| 68 | 66 | |
| @@ -199,19 +199,19 @@ static inline unsigned long __percpu_xchg(void *ptr, unsigned long val, · 198 unmodified lines | ||
| 199 | 199 | #define _percpu_read(pcp) \ |
| 200 | 200 | ({ \ |
| 201 | 201 | typeof(pcp) __retval; \ |
| 202 | − preempt_disable(); \ | |
| 202 | + preempt_disable_notrace(); \ | |
| 203 | 203 | __retval = (typeof(pcp))__percpu_read(raw_cpu_ptr(&(pcp)), \ |
| 204 | 204 | sizeof(pcp)); \ |
| 205 | − preempt_enable(); \ | |
| 205 | + preempt_enable_notrace(); \ | |
| 206 | 206 | __retval; \ |
| 207 | 207 | }) |
| 208 | 208 | |
| 209 | 209 | #define _percpu_write(pcp, val) \ |
| 210 | 210 | do { \ |
| 211 | − preempt_disable(); \ | |
| 211 | + preempt_disable_notrace(); \ | |
| 212 | 212 | __percpu_write(raw_cpu_ptr(&(pcp)), (unsigned long)(val), \ |
| 213 | 213 | sizeof(pcp)); \ |
| 214 | − preempt_enable(); \ | |
| 214 | + preempt_enable_notrace(); \ | |
| 215 | 215 | } while(0) \ |
| 216 | 216 | |
| 217 | 217 | #define _pcp_protect(operation, pcp, val) \ |
| @@ -363,4 +363,14 @@ static inline int arch_read_trylock(arch_rwlock_t *rw) · 362 unmodified lines | ||
| 363 | 363 | #define arch_read_relax(lock) cpu_relax() |
| 364 | 364 | #define arch_write_relax(lock) cpu_relax() |
| 365 | 365 | |
| 366 | +/* | |
| 367 | + * Accesses appearing in program order before a spin_lock() operation | |
| 368 | + * can be reordered with accesses inside the critical section, by virtue | |
| 369 | + * of arch_spin_lock being constructed using acquire semantics. | |
| 370 | + * | |
| 371 | + * In cases where this is problematic (e.g. try_to_wake_up), an | |
| 372 | + * smp_mb__before_spinlock() can restore the required ordering. | |
| 373 | + */ | |
| 374 | +#define smp_mb__before_spinlock() smp_mb() | |
| 375 | + | |
| 366 | 376 | #endif /* __ASM_SPINLOCK_H */ |
| @@ -757,6 +757,9 @@ ENTRY(__enable_mmu) · 756 unmodified lines | ||
| 757 | 757 | isb |
| 758 | 758 | bl __create_page_tables // recreate kernel mapping |
| 759 | 759 | |
| 760 | + tlbi vmalle1 // Remove any stale TLB entries | |
| 761 | + dsb nsh | |
| 762 | + | |
| 760 | 763 | msr sctlr_el1, x19 // re-enable the MMU |
| 761 | 764 | isb |
| 762 | 765 | ic iallu // flush instructions fetched |
| @@ -19,10 +19,13 @@ · 18 unmodified lines | ||
| 19 | 19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | +#include <linux/bug.h> | |
| 22 | 23 | #include <linux/irq.h> |
| 23 | 24 | #include <linux/kdebug.h> |
| 24 | 25 | #include <linux/kgdb.h> |
| 25 | 26 | #include <linux/kprobes.h> |
| 27 | +#include <asm/debug-monitors.h> | |
| 28 | +#include <asm/insn.h> | |
| 26 | 29 | #include <asm/traps.h> |
| 27 | 30 | |
| 28 | 31 | struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = { |
| @@ -338,15 +341,24 @@ void kgdb_arch_exit(void) · 309 unmodified lines | ||
| 338 | 341 | unregister_die_notifier(&kgdb_notifier); |
| 339 | 342 | } |
| 340 | 343 | |
| 341 | −/* | |
| 342 | − * ARM instructions are always in LE. | |
| 343 | − * Break instruction is encoded in LE format | |
| 344 | − */ | |
| 345 | −struct kgdb_arch arch_kgdb_ops = { | |
| 346 | − .gdb_bpt_instr = { | |
| 347 | − KGDB_DYN_BRK_INS_BYTE(0), | |
| 348 | − KGDB_DYN_BRK_INS_BYTE(1), | |
| 349 | − KGDB_DYN_BRK_INS_BYTE(2), | |
| 350 | − KGDB_DYN_BRK_INS_BYTE(3), | |
| 351 | − } | |
| 352 | −}; | |
| 344 | +struct kgdb_arch arch_kgdb_ops; | |
| 345 | + | |
| 346 | +int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt) | |
| 347 | +{ | |
| 348 | + int err; | |
| 349 | + | |
| 350 | + BUILD_BUG_ON(AARCH64_INSN_SIZE != BREAK_INSTR_SIZE); | |
| 351 | + | |
| 352 | + err = aarch64_insn_read((void *)bpt->bpt_addr, (u32 *)bpt->saved_instr); | |
| 353 | + if (err) | |
| 354 | + return err; | |
| 355 | + | |
| 356 | + return aarch64_insn_write((void *)bpt->bpt_addr, | |
| 357 | + (u32)AARCH64_BREAK_KGDB_DYN_DBG); | |
| 358 | +} | |
| 359 | + | |
| 360 | +int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt) | |
| 361 | +{ | |
| 362 | + return aarch64_insn_write((void *)bpt->bpt_addr, | |
| 363 | + *(u32 *)bpt->saved_instr); | |
| 364 | +} | |
| @@ -101,12 +101,20 @@ ENTRY(cpu_resume) · 100 unmodified lines | ||
| 101 | 101 | bl el2_setup // if in EL2 drop to EL1 cleanly |
| 102 | 102 | /* enable the MMU early - so we can access sleep_save_stash by va */ |
| 103 | 103 | adr_l lr, __enable_mmu /* __cpu_setup will return here */ |
| 104 | − ldr x27, =_cpu_resume /* __enable_mmu will branch here */ | |
| 104 | + adr_l x27, _resume_switched /* __enable_mmu will branch here */ | |
| 105 | 105 | adrp x25, idmap_pg_dir |
| 106 | 106 | adrp x26, swapper_pg_dir |
| 107 | 107 | b __cpu_setup |
| 108 | 108 | ENDPROC(cpu_resume) |
| 109 | 109 | |
| 110 | + .pushsection ".idmap.text", "ax" | |
| 111 | +_resume_switched: | |
| 112 | + ldr x8, =_cpu_resume | |
| 113 | + br x8 | |
| 114 | +ENDPROC(_resume_switched) | |
| 115 | + .ltorg | |
| 116 | + .popsection | |
| 117 | + | |
| 110 | 118 | ENTRY(_cpu_resume) |
| 111 | 119 | mrs x1, mpidr_el1 |
| 112 | 120 | adrp x8, mpidr_hash |
| @@ -201,12 +201,6 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) · 200 unmodified lines | ||
| 201 | 201 | return ret; |
| 202 | 202 | } |
| 203 | 203 | |
| 204 | −static void smp_store_cpu_info(unsigned int cpuid) | |
| 205 | −{ | |
| 206 | − store_cpu_topology(cpuid); | |
| 207 | − numa_store_cpu_info(cpuid); | |
| 208 | −} | |
| 209 | − | |
| 210 | 204 | /* |
| 211 | 205 | * This is the secondary CPU boot entry. We're using this CPUs |
| 212 | 206 | * idle thread stack, but a set of temporary page tables. |
| @@ -254,7 +248,7 @@ asmlinkage void secondary_start_kernel(void) · 41 unmodified lines | ||
| 254 | 248 | */ |
| 255 | 249 | notify_cpu_starting(cpu); |
| 256 | 250 | |
| 257 | − smp_store_cpu_info(cpu); | |
| 251 | + store_cpu_topology(cpu); | |
| 258 | 252 | |
| 259 | 253 | /* |
| 260 | 254 | * OK, now it's safe to let the boot CPU continue. Wait for |
| @@ -689,10 +683,13 @@ void __init smp_prepare_cpus(unsigned int max_cpus) · 428 unmodified lines | ||
| 689 | 683 | { |
| 690 | 684 | int err; |
| 691 | 685 | unsigned int cpu; |
| 686 | + unsigned int this_cpu; | |
| 692 | 687 | |
| 693 | 688 | init_cpu_topology(); |
| 694 | 689 | |
| 695 | − smp_store_cpu_info(smp_processor_id()); | |
| 690 | + this_cpu = smp_processor_id(); | |
| 691 | + store_cpu_topology(this_cpu); | |
| 692 | + numa_store_cpu_info(this_cpu); | |
| 696 | 693 | |
| 697 | 694 | /* |
| 698 | 695 | * If UP is mandated by "nosmp" (which implies "maxcpus=0"), don't set |
| @@ -719,6 +716,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) · 20 unmodified lines | ||
| 719 | 716 | continue; |
| 720 | 717 | |
| 721 | 718 | set_cpu_present(cpu, true); |
| 719 | + numa_store_cpu_info(cpu); | |
| 722 | 720 | } |
| 723 | 721 | } |
| 724 | 722 | |
| @@ -256,7 +256,7 @@ static int __hyp_text __guest_run(struct kvm_vcpu *vcpu) · 255 unmodified lines | ||
| 256 | 256 | |
| 257 | 257 | /* |
| 258 | 258 | * We must restore the 32-bit state before the sysregs, thanks |
| 259 | − * to Cortex-A57 erratum #852523. | |
| 259 | + * to erratum #852523 (Cortex-A57) or #853709 (Cortex-A72). | |
| 260 | 260 | */ |
| 261 | 261 | __sysreg32_restore_state(vcpu); |
| 262 | 262 | __sysreg_restore_guest_state(guest_ctxt); |
| @@ -823,14 +823,6 @@ static bool access_pmuserenr(struct kvm_vcpu *vcpu, struct sys_reg_params *p, · 822 unmodified lines | ||
| 823 | 823 | * Architected system registers. |
| 824 | 824 | * Important: Must be sorted ascending by Op0, Op1, CRn, CRm, Op2 |
| 825 | 825 | * |
| 826 | − * We could trap ID_DFR0 and tell the guest we don't support performance | |
| 827 | − * monitoring. Unfortunately the patch to make the kernel check ID_DFR0 was | |
| 828 | − * NAKed, so it will read the PMCR anyway. | |
| 829 | − * | |
| 830 | − * Therefore we tell the guest we have 0 counters. Unfortunately, we | |
| 831 | − * must always support PMCCNTR (the cycle counter): we just RAZ/WI for | |
| 832 | − * all PM registers, which doesn't crash the guest kernel at least. | |
| 833 | − * | |
| 834 | 826 | * Debug handling: We do trap most, if not all debug related system |
| 835 | 827 | * registers. The implementation is good enough to ensure that a guest |
| 836 | 828 | * can use these with minimal performance degradation. The drawback is |
| @@ -1360,7 +1352,7 @@ static const struct sys_reg_desc cp15_regs[] = { · 523 unmodified lines | ||
| 1360 | 1352 | { Op1( 0), CRn(10), CRm( 3), Op2( 1), access_vm_reg, NULL, c10_AMAIR1 }, |
| 1361 | 1353 | |
| 1362 | 1354 | /* ICC_SRE */ |
| 1363 | − { Op1( 0), CRn(12), CRm(12), Op2( 5), trap_raz_wi }, | |
| 1355 | + { Op1( 0), CRn(12), CRm(12), Op2( 5), access_gic_sre }, | |
| 1364 | 1356 | |
| 1365 | 1357 | { Op1( 0), CRn(13), CRm( 0), Op2( 1), access_vm_reg, NULL, c13_CID }, |
| 1366 | 1358 | |
| @@ -242,7 +242,7 @@ static void note_page(struct pg_state *st, unsigned long addr, unsigned level, · 241 unmodified lines | ||
| 242 | 242 | |
| 243 | 243 | static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start) |
| 244 | 244 | { |
| 245 | − pte_t *pte = pte_offset_kernel(pmd, 0); | |
| 245 | + pte_t *pte = pte_offset_kernel(pmd, 0UL); | |
| 246 | 246 | unsigned long addr; |
| 247 | 247 | unsigned i; |
| 248 | 248 | |
| @@ -254,7 +254,7 @@ static void walk_pte(struct pg_state *st, pmd_t *pmd, unsigned long start) · 5 unmodified lines | ||
| 254 | 254 | |
| 255 | 255 | static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start) |
| 256 | 256 | { |
| 257 | − pmd_t *pmd = pmd_offset(pud, 0); | |
| 257 | + pmd_t *pmd = pmd_offset(pud, 0UL); | |
| 258 | 258 | unsigned long addr; |
| 259 | 259 | unsigned i; |
| 260 | 260 | |
| @@ -271,7 +271,7 @@ static void walk_pmd(struct pg_state *st, pud_t *pud, unsigned long start) · 10 unmodified lines | ||
| 271 | 271 | |
| 272 | 272 | static void walk_pud(struct pg_state *st, pgd_t *pgd, unsigned long start) |
| 273 | 273 | { |
| 274 | − pud_t *pud = pud_offset(pgd, 0); | |
| 274 | + pud_t *pud = pud_offset(pgd, 0UL); | |
| 275 | 275 | unsigned long addr; |
| 276 | 276 | unsigned i; |
| 277 | 277 | |
| @@ -23,6 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/module.h> |
| 24 | 24 | #include <linux/of.h> |
| 25 | 25 | |
| 26 | +#include <asm/acpi.h> | |
| 27 | + | |
| 26 | 28 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
| 27 | 29 | EXPORT_SYMBOL(node_data); |
| 28 | 30 | nodemask_t numa_nodes_parsed __initdata; |
| @@ -100,7 +100,16 @@ ENTRY(cpu_do_resume) · 99 unmodified lines | ||
| 100 | 100 | |
| 101 | 101 | msr tcr_el1, x8 |
| 102 | 102 | msr vbar_el1, x9 |
| 103 | + | |
| 104 | + /* | |
| 105 | + * __cpu_setup() cleared MDSCR_EL1.MDE and friends, before unmasking | |
| 106 | + * debug exceptions. By restoring MDSCR_EL1 here, we may take a debug | |
| 107 | + * exception. Mask them until local_dbg_restore() in cpu_suspend() | |
| 108 | + * resets them. | |
| 109 | + */ | |
| 110 | + disable_dbg | |
| 103 | 111 | msr mdscr_el1, x10 |
| 112 | + | |
| 104 | 113 | msr sctlr_el1, x12 |
| 105 | 114 | /* |
| 106 | 115 | * Restore oslsr_el1 by writing oslar_el1 |
| @@ -74,7 +74,7 @@ extern __kernel_size_t __copy_user(void *to, const void *from, · 73 unmodified lines | ||
| 74 | 74 | |
| 75 | 75 | extern __kernel_size_t copy_to_user(void __user *to, const void *from, |
| 76 | 76 | __kernel_size_t n); |
| 77 | −extern __kernel_size_t copy_from_user(void *to, const void __user *from, | |
| 77 | +extern __kernel_size_t ___copy_from_user(void *to, const void __user *from, | |
| 78 | 78 | __kernel_size_t n); |
| 79 | 79 | |
| 80 | 80 | static inline __kernel_size_t __copy_to_user(void __user *to, const void *from, |
| @@ -88,6 +88,15 @@ static inline __kernel_size_t __copy_from_user(void *to, · 7 unmodified lines | ||
| 88 | 88 | { |
| 89 | 89 | return __copy_user(to, (const void __force *)from, n); |
| 90 | 90 | } |
| 91 | +static inline __kernel_size_t copy_from_user(void *to, | |
| 92 | + const void __user *from, | |
| 93 | + __kernel_size_t n) | |
| 94 | +{ | |
| 95 | + size_t res = ___copy_from_user(to, from, n); | |
| 96 | + if (unlikely(res)) | |
| 97 | + memset(to + (n - res), 0, res); | |
| 98 | + return res; | |
| 99 | +} | |
| 91 | 100 | |
| 92 | 101 | #define __copy_to_user_inatomic __copy_to_user |
| 93 | 102 | #define __copy_from_user_inatomic __copy_from_user |
| @@ -36,7 +36,7 @@ EXPORT_SYMBOL(copy_page); · 35 unmodified lines | ||
| 36 | 36 | /* |
| 37 | 37 | * Userspace access stuff. |
| 38 | 38 | */ |
| 39 | −EXPORT_SYMBOL(copy_from_user); | |
| 39 | +EXPORT_SYMBOL(___copy_from_user); | |
| 40 | 40 | EXPORT_SYMBOL(copy_to_user); |
| 41 | 41 | EXPORT_SYMBOL(__copy_user); |
| 42 | 42 | EXPORT_SYMBOL(strncpy_from_user); |
| @@ -23,13 +23,13 @@ · 22 unmodified lines | ||
| 23 | 23 | */ |
| 24 | 24 | .text |
| 25 | 25 | .align 1 |
| 26 | − .global copy_from_user | |
| 27 | − .type copy_from_user, @function | |
| 28 | −copy_from_user: | |
| 26 | + .global ___copy_from_user | |
| 27 | + .type ___copy_from_user, @function | |
| 28 | +___copy_from_user: | |
| 29 | 29 | branch_if_kernel r8, __copy_user |
| 30 | 30 | ret_if_privileged r8, r11, r10, r10 |
| 31 | 31 | rjmp __copy_user |
| 32 | − .size copy_from_user, . - copy_from_user | |
| 32 | + .size ___copy_from_user, . - ___copy_from_user | |
| 33 | 33 | |
| 34 | 34 | .global copy_to_user |
| 35 | 35 | .type copy_to_user, @function |
| @@ -171,11 +171,12 @@ static inline int bad_user_access_length(void) · 170 unmodified lines | ||
| 171 | 171 | static inline unsigned long __must_check |
| 172 | 172 | copy_from_user(void *to, const void __user *from, unsigned long n) |
| 173 | 173 | { |
| 174 | − if (access_ok(VERIFY_READ, from, n)) | |
| 174 | + if (likely(access_ok(VERIFY_READ, from, n))) { | |
| 175 | 175 | memcpy(to, (const void __force *)from, n); |
| 176 | − else | |
| 177 | − return n; | |
| 178 | − return 0; | |
| 176 | + return 0; | |
| 177 | + } | |
| 178 | + memset(to, 0, n); | |
| 179 | + return n; | |
| 179 | 180 | } |
| 180 | 181 | |
| 181 | 182 | static inline unsigned long __must_check |
| @@ -146,7 +146,8 @@ static struct platform_device hitachi_fb_device = { · 145 unmodified lines | ||
| 146 | 146 | #include <linux/smc91x.h> |
| 147 | 147 | |
| 148 | 148 | static struct smc91x_platdata smc91x_info = { |
| 149 | − .flags = SMC91X_USE_32BIT | SMC91X_NOWAIT, | |
| 149 | + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | | |
| 150 | + SMC91X_NOWAIT, | |
| 150 | 151 | .leda = RPC_LED_100_10, |
| 151 | 152 | .ledb = RPC_LED_TX_RX, |
| 152 | 153 | }; |
| @@ -134,7 +134,8 @@ static struct platform_device net2272_bfin_device = { · 133 unmodified lines | ||
| 134 | 134 | #include <linux/smc91x.h> |
| 135 | 135 | |
| 136 | 136 | static struct smc91x_platdata smc91x_info = { |
| 137 | − .flags = SMC91X_USE_32BIT | SMC91X_NOWAIT, | |
| 137 | + .flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT | | |
| 138 | + SMC91X_NOWAIT, | |
| 138 | 139 | .leda = RPC_LED_100_10, |
| 139 | 140 | .ledb = RPC_LED_TX_RX, |
| 140 | 141 | }; |
| @@ -194,30 +194,6 @@ extern unsigned long __copy_user(void __user *to, const void *from, unsigned lon · 193 unmodified lines | ||
| 194 | 194 | extern unsigned long __copy_user_zeroing(void *to, const void __user *from, unsigned long n); |
| 195 | 195 | extern unsigned long __do_clear_user(void __user *to, unsigned long n); |
| 196 | 196 | |
| 197 | −static inline unsigned long | |
| 198 | −__generic_copy_to_user(void __user *to, const void *from, unsigned long n) | |
| 199 | −{ | |
| 200 | − if (access_ok(VERIFY_WRITE, to, n)) | |
| 201 | − return __copy_user(to, from, n); | |
| 202 | − return n; | |
| 203 | −} | |
| 204 | − | |
| 205 | −static inline unsigned long | |
| 206 | −__generic_copy_from_user(void *to, const void __user *from, unsigned long n) | |
| 207 | −{ | |
| 208 | − if (access_ok(VERIFY_READ, from, n)) | |
| 209 | − return __copy_user_zeroing(to, from, n); | |
| 210 | − return n; | |
| 211 | −} | |
| 212 | − | |
| 213 | −static inline unsigned long | |
| 214 | −__generic_clear_user(void __user *to, unsigned long n) | |
| 215 | −{ | |
| 216 | − if (access_ok(VERIFY_WRITE, to, n)) | |
| 217 | − return __do_clear_user(to, n); | |
| 218 | − return n; | |
| 219 | −} | |
| 220 | − | |
| 221 | 197 | static inline long |
| 222 | 198 | __strncpy_from_user(char *dst, const char __user *src, long count) |
| 223 | 199 | { |
| @@ -282,7 +258,7 @@ __constant_copy_from_user(void *to, const void __user *from, unsigned long n) · 58 unmodified lines | ||
| 282 | 258 | else if (n == 24) |
| 283 | 259 | __asm_copy_from_user_24(to, from, ret); |
| 284 | 260 | else |
| 285 | − ret = __generic_copy_from_user(to, from, n); | |
| 261 | + ret = __copy_user_zeroing(to, from, n); | |
| 286 | 262 | |
| 287 | 263 | return ret; |
| 288 | 264 | } |
| @@ -333,7 +309,7 @@ __constant_copy_to_user(void __user *to, const void *from, unsigned long n) · 44 unmodified lines | ||
| 333 | 309 | else if (n == 24) |
| 334 | 310 | __asm_copy_to_user_24(to, from, ret); |
| 335 | 311 | else |
| 336 | − ret = __generic_copy_to_user(to, from, n); | |
| 312 | + ret = __copy_user(to, from, n); | |
| 337 | 313 | |
| 338 | 314 | return ret; |
| 339 | 315 | } |
| @@ -366,26 +342,43 @@ __constant_clear_user(void __user *to, unsigned long n) · 26 unmodified lines | ||
| 366 | 342 | else if (n == 24) |
| 367 | 343 | __asm_clear_24(to, ret); |
| 368 | 344 | else |
| 369 | − ret = __generic_clear_user(to, n); | |
| 345 | + ret = __do_clear_user(to, n); | |
| 370 | 346 | |
| 371 | 347 | return ret; |
| 372 | 348 | } |
| 373 | 349 | |
| 374 | 350 | |
| 375 | −#define clear_user(to, n) \ | |
| 376 | − (__builtin_constant_p(n) ? \ | |
| 377 | − __constant_clear_user(to, n) : \ | |
| 378 | − __generic_clear_user(to, n)) | |
| 351 | +static inline size_t clear_user(void __user *to, size_t n) | |
| 352 | +{ | |
| 353 | + if (unlikely(!access_ok(VERIFY_WRITE, to, n))) | |
| 354 | + return n; | |
| 355 | + if (__builtin_constant_p(n)) | |
| 356 | + return __constant_clear_user(to, n); | |
| 357 | + else | |
| 358 | + return __do_clear_user(to, n); | |
| 359 | +} | |
| 379 | 360 | |
| 380 | −#define copy_from_user(to, from, n) \ | |
| 381 | − (__builtin_constant_p(n) ? \ | |
| 382 | − __constant_copy_from_user(to, from, n) : \ | |
| 383 | − __generic_copy_from_user(to, from, n)) | |
| 361 | +static inline size_t copy_from_user(void *to, const void __user *from, size_t n) | |
| 362 | +{ | |
| 363 | + if (unlikely(!access_ok(VERIFY_READ, from, n))) { | |
| 364 | + memset(to, 0, n); | |
| 365 | + return n; | |
| 366 | + } | |
| 367 | + if (__builtin_constant_p(n)) | |
| 368 | + return __constant_copy_from_user(to, from, n); | |
| 369 | + else | |
| 370 | + return __copy_user_zeroing(to, from, n); | |
| 371 | +} | |
| 384 | 372 | |
| 385 | −#define copy_to_user(to, from, n) \ | |
| 386 | − (__builtin_constant_p(n) ? \ | |
| 387 | − __constant_copy_to_user(to, from, n) : \ | |
| 388 | − __generic_copy_to_user(to, from, n)) | |
| 373 | +static inline size_t copy_to_user(void __user *to, const void *from, size_t n) | |
| 374 | +{ | |
| 375 | + if (unlikely(!access_ok(VERIFY_WRITE, to, n))) | |
| 376 | + return n; | |
| 377 | + if (__builtin_constant_p(n)) | |
| 378 | + return __constant_copy_to_user(to, from, n); | |
| 379 | + else | |
| 380 | + return __copy_user(to, from, n); | |
| 381 | +} | |
| 389 | 382 | |
| 390 | 383 | /* We let the __ versions of copy_from/to_user inline, because they're often |
| 391 | 384 | * used in fast paths and have only a small space overhead. |
| @@ -263,19 +263,25 @@ do { \ · 262 unmodified lines | ||
| 263 | 263 | extern long __memset_user(void *dst, unsigned long count); |
| 264 | 264 | extern long __memcpy_user(void *dst, const void *src, unsigned long count); |
| 265 | 265 | |
| 266 | −#define clear_user(dst,count) __memset_user(____force(dst), (count)) | |
| 266 | +#define __clear_user(dst,count) __memset_user(____force(dst), (count)) | |
| 267 | 267 | #define __copy_from_user_inatomic(to, from, n) __memcpy_user((to), ____force(from), (n)) |
| 268 | 268 | #define __copy_to_user_inatomic(to, from, n) __memcpy_user(____force(to), (from), (n)) |
| 269 | 269 | |
| 270 | 270 | #else |
| 271 | 271 | |
| 272 | −#define clear_user(dst,count) (memset(____force(dst), 0, (count)), 0) | |
| 272 | +#define __clear_user(dst,count) (memset(____force(dst), 0, (count)), 0) | |
| 273 | 273 | #define __copy_from_user_inatomic(to, from, n) (memcpy((to), ____force(from), (n)), 0) |
| 274 | 274 | #define __copy_to_user_inatomic(to, from, n) (memcpy(____force(to), (from), (n)), 0) |
| 275 | 275 | |
| 276 | 276 | #endif |
| 277 | 277 | |
| 278 | −#define __clear_user clear_user | |
| 278 | +static inline unsigned long __must_check | |
| 279 | +clear_user(void __user *to, unsigned long n) | |
| 280 | +{ | |
| 281 | + if (likely(__access_ok(to, n))) | |
| 282 | + n = __clear_user(to, n); | |
| 283 | + return n; | |
| 284 | +} | |
| 279 | 285 | |
| 280 | 286 | static inline unsigned long __must_check |
| 281 | 287 | __copy_to_user(void __user *to, const void *from, unsigned long n) |
| @@ -103,7 +103,8 @@ static inline long hexagon_strncpy_from_user(char *dst, const char __user *src, · 102 unmodified lines | ||
| 103 | 103 | { |
| 104 | 104 | long res = __strnlen_user(src, n); |
| 105 | 105 | |
| 106 | − /* return from strnlen can't be zero -- that would be rubbish. */ | |
| 106 | + if (unlikely(!res)) | |
| 107 | + return -EFAULT; | |
| 107 | 108 | |
| 108 | 109 | if (res > n) { |
| 109 | 110 | copy_from_user(dst, src, n); |
| @@ -241,8 +241,7 @@ extern unsigned long __must_check __copy_user (void __user *to, const void __use · 240 unmodified lines | ||
| 241 | 241 | static inline unsigned long |
| 242 | 242 | __copy_to_user (void __user *to, const void *from, unsigned long count) |
| 243 | 243 | { |
| 244 | − if (!__builtin_constant_p(count)) | |
| 245 | − check_object_size(from, count, true); | |
| 244 | + check_object_size(from, count, true); | |
| 246 | 245 | |
| 247 | 246 | return __copy_user(to, (__force void __user *) from, count); |
| 248 | 247 | } |
| @@ -250,8 +249,7 @@ __copy_to_user (void __user *to, const void *from, unsigned long count) · 1 unmodified line | ||
| 250 | 249 | static inline unsigned long |
| 251 | 250 | __copy_from_user (void *to, const void __user *from, unsigned long count) |
| 252 | 251 | { |
| 253 | − if (!__builtin_constant_p(count)) | |
| 254 | − check_object_size(to, count, false); | |
| 252 | + check_object_size(to, count, false); | |
| 255 | 253 | |
| 256 | 254 | return __copy_user((__force void __user *) to, from, count); |
| 257 | 255 | } |
| @@ -265,27 +263,22 @@ __copy_from_user (void *to, const void __user *from, unsigned long count) · 7 unmodified lines | ||
| 265 | 263 | long __cu_len = (n); \ |
| 266 | 264 | \ |
| 267 | 265 | if (__access_ok(__cu_to, __cu_len, get_fs())) { \ |
| 268 | − if (!__builtin_constant_p(n)) \ | |
| 269 | − check_object_size(__cu_from, __cu_len, true); \ | |
| 266 | + check_object_size(__cu_from, __cu_len, true); \ | |
| 270 | 267 | __cu_len = __copy_user(__cu_to, (__force void __user *) __cu_from, __cu_len); \ |
| 271 | 268 | } \ |
| 272 | 269 | __cu_len; \ |
| 273 | 270 | }) |
| 274 | 271 | |
| 275 | −#define copy_from_user(to, from, n) \ | |
| 276 | −({ \ | |
| 277 | − void *__cu_to = (to); \ | |
| 278 | − const void __user *__cu_from = (from); \ | |
| 279 | − long __cu_len = (n); \ | |
| 280 | − \ | |
| 281 | − __chk_user_ptr(__cu_from); \ | |
| 282 | − if (__access_ok(__cu_from, __cu_len, get_fs())) { \ | |
| 283 | − if (!__builtin_constant_p(n)) \ | |
| 284 | − check_object_size(__cu_to, __cu_len, false); \ | |
| 285 | − __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ | |
| 286 | − } \ | |
| 287 | − __cu_len; \ | |
| 288 | −}) | |
| 272 | +static inline unsigned long | |
| 273 | +copy_from_user(void *to, const void __user *from, unsigned long n) | |
| 274 | +{ | |
| 275 | + check_object_size(to, n, false); | |
| 276 | + if (likely(__access_ok(from, n, get_fs()))) | |
| 277 | + n = __copy_user((__force void __user *) to, from, n); | |
| 278 | + else | |
| 279 | + memset(to, 0, n); | |
| 280 | + return n; | |
| 281 | +} | |
| 289 | 282 | |
| 290 | 283 | #define __copy_in_user(to, from, size) __copy_user((to), (from), (size)) |
| 291 | 284 | |
| @@ -219,7 +219,7 @@ extern int fixup_exception(struct pt_regs *regs); · 218 unmodified lines | ||
| 219 | 219 | #define __get_user_nocheck(x, ptr, size) \ |
| 220 | 220 | ({ \ |
| 221 | 221 | long __gu_err = 0; \ |
| 222 | − unsigned long __gu_val; \ | |
| 222 | + unsigned long __gu_val = 0; \ | |
| 223 | 223 | might_fault(); \ |
| 224 | 224 | __get_user_size(__gu_val, (ptr), (size), __gu_err); \ |
| 225 | 225 | (x) = (__force __typeof__(*(ptr)))__gu_val; \ |
| @@ -204,8 +204,9 @@ extern unsigned long __must_check __copy_user_zeroing(void *to, · 203 unmodified lines | ||
| 204 | 204 | static inline unsigned long |
| 205 | 205 | copy_from_user(void *to, const void __user *from, unsigned long n) |
| 206 | 206 | { |
| 207 | − if (access_ok(VERIFY_READ, from, n)) | |
| 207 | + if (likely(access_ok(VERIFY_READ, from, n))) | |
| 208 | 208 | return __copy_user_zeroing(to, from, n); |
| 209 | + memset(to, 0, n); | |
| 209 | 210 | return n; |
| 210 | 211 | } |
| 211 | 212 | |
| @@ -227,7 +227,7 @@ extern long __user_bad(void); · 226 unmodified lines | ||
| 227 | 227 | |
| 228 | 228 | #define __get_user(x, ptr) \ |
| 229 | 229 | ({ \ |
| 230 | − unsigned long __gu_val; \ | |
| 230 | + unsigned long __gu_val = 0; \ | |
| 231 | 231 | /*unsigned long __gu_ptr = (unsigned long)(ptr);*/ \ |
| 232 | 232 | long __gu_err; \ |
| 233 | 233 | switch (sizeof(*(ptr))) { \ |
| @@ -373,10 +373,13 @@ extern long __user_bad(void); · 139 unmodified lines | ||
| 373 | 373 | static inline long copy_from_user(void *to, |
| 374 | 374 | const void __user *from, unsigned long n) |
| 375 | 375 | { |
| 376 | + unsigned long res = n; | |
| 376 | 377 | might_fault(); |
| 377 | − if (access_ok(VERIFY_READ, from, n)) | |
| 378 | − return __copy_from_user(to, from, n); | |
| 379 | − return n; | |
| 378 | + if (likely(access_ok(VERIFY_READ, from, n))) | |
| 379 | + res = __copy_from_user(to, from, n); | |
| 380 | + if (unlikely(res)) | |
| 381 | + memset(to + (n - res), 0, res); | |
| 382 | + return res; | |
| 380 | 383 | } |
| 381 | 384 | |
| 382 | 385 | #define __copy_to_user(to, from, n) \ |
| @@ -65,6 +65,7 @@ config MIPS · 64 unmodified lines | ||
| 65 | 65 | select ARCH_CLOCKSOURCE_DATA |
| 66 | 66 | select HANDLE_DOMAIN_IRQ |
| 67 | 67 | select HAVE_EXIT_THREAD |
| 68 | + select HAVE_REGS_AND_STACK_ACCESS_API | |
| 68 | 69 | |
| 69 | 70 | menu "Machine selection" |
| 70 | 71 | |
| @@ -113,42 +113,6 @@ config SPINLOCK_TEST · 112 unmodified lines | ||
| 113 | 113 | help |
| 114 | 114 | Add several files to the debugfs to test spinlock speed. |
| 115 | 115 | |
| 116 | −if CPU_MIPSR6 | |
| 117 | − | |
| 118 | −choice | |
| 119 | − prompt "Compact branch policy" | |
| 120 | − default MIPS_COMPACT_BRANCHES_OPTIMAL | |
| 121 | − | |
| 122 | −config MIPS_COMPACT_BRANCHES_NEVER | |
| 123 | − bool "Never (force delay slot branches)" | |
| 124 | − help | |
| 125 | − Pass the -mcompact-branches=never flag to the compiler in order to | |
| 126 | − force it to always emit branches with delay slots, and make no use | |
| 127 | − of the compact branch instructions introduced by MIPSr6. This is | |
| 128 | − useful if you suspect there may be an issue with compact branches in | |
| 129 | − either the compiler or the CPU. | |
| 130 | − | |
| 131 | −config MIPS_COMPACT_BRANCHES_OPTIMAL | |
| 132 | − bool "Optimal (use where beneficial)" | |
| 133 | − help | |
| 134 | − Pass the -mcompact-branches=optimal flag to the compiler in order for | |
| 135 | − it to make use of compact branch instructions where it deems them | |
| 136 | − beneficial, and use branches with delay slots elsewhere. This is the | |
| 137 | − default compiler behaviour, and should be used unless you have a | |
| 138 | − reason to choose otherwise. | |
| 139 | − | |
| 140 | −config MIPS_COMPACT_BRANCHES_ALWAYS | |
| 141 | − bool "Always (force compact branches)" | |
| 142 | − help | |
| 143 | − Pass the -mcompact-branches=always flag to the compiler in order to | |
| 144 | − force it to always emit compact branches, making no use of branch | |
| 145 | − instructions with delay slots. This can result in more compact code | |
| 146 | − which may be beneficial in some scenarios. | |
| 147 | − | |
| 148 | −endchoice | |
| 149 | − | |
| 150 | −endif # CPU_MIPSR6 | |
| 151 | − | |
| 152 | 116 | config SCACHE_DEBUGFS |
| 153 | 117 | bool "L2 cache debugfs entries" |
| 154 | 118 | depends on DEBUG_FS |
| @@ -203,10 +203,6 @@ endif · 202 unmodified lines | ||
| 203 | 203 | toolchain-virt := $(call cc-option-yn,$(mips-cflags) -mvirt) |
| 204 | 204 | cflags-$(toolchain-virt) += -DTOOLCHAIN_SUPPORTS_VIRT |
| 205 | 205 | |
| 206 | −cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_NEVER) += -mcompact-branches=never | |
| 207 | −cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_OPTIMAL) += -mcompact-branches=optimal | |
| 208 | −cflags-$(CONFIG_MIPS_COMPACT_BRANCHES_ALWAYS) += -mcompact-branches=always | |
| 209 | − | |
| 210 | 206 | # |
| 211 | 207 | # Firmware support |
| 212 | 208 | # |
| @@ -96,7 +96,7 @@ static struct clk * __init ath79_reg_ffclk(const char *name, · 95 unmodified lines | ||
| 96 | 96 | struct clk *clk; |
| 97 | 97 | |
| 98 | 98 | clk = clk_register_fixed_factor(NULL, name, parent_name, 0, mult, div); |
| 99 | − if (!clk) | |
| 99 | + if (IS_ERR(clk)) | |
| 100 | 100 | panic("failed to allocate %s clock structure", name); |
| 101 | 101 | |
| 102 | 102 | return clk; |
| @@ -1059,7 +1059,7 @@ static int __init octeon_publish_devices(void) · 1058 unmodified lines | ||
| 1059 | 1059 | { |
| 1060 | 1060 | return of_platform_bus_probe(NULL, octeon_ids, NULL); |
| 1061 | 1061 | } |
| 1062 | −device_initcall(octeon_publish_devices); | |
| 1062 | +arch_initcall(octeon_publish_devices); | |
| 1063 | 1063 | |
| 1064 | 1064 | MODULE_AUTHOR("David Daney <ddaney@caviumnetworks.com>"); |
| 1065 | 1065 | MODULE_LICENSE("GPL"); |
| @@ -157,6 +157,7 @@ · 156 unmodified lines | ||
| 157 | 157 | ldc1 $f28, THREAD_FPR28(\thread) |
| 158 | 158 | ldc1 $f30, THREAD_FPR30(\thread) |
| 159 | 159 | ctc1 \tmp, fcr31 |
| 160 | + .set pop | |
| 160 | 161 | .endm |
| 161 | 162 | |
| 162 | 163 | .macro fpu_restore_16odd thread |
| @@ -15,8 +15,8 @@ · 14 unmodified lines | ||
| 15 | 15 | static inline bool __should_swizzle_bits(volatile void *a) |
| 16 | 16 | { |
| 17 | 17 | extern const bool octeon_should_swizzle_table[]; |
| 18 | + u64 did = ((u64)(uintptr_t)a >> 40) & 0xff; | |
| 18 | 19 | |
| 19 | − unsigned long did = ((unsigned long)a >> 40) & 0xff; | |
| 20 | 20 | return octeon_should_swizzle_table[did]; |
| 21 | 21 | } |
| 22 | 22 | |
| @@ -29,7 +29,7 @@ static inline bool __should_swizzle_bits(volatile void *a) · 6 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #define __should_swizzle_bits(a) false |
| 31 | 31 | |
| 32 | −static inline bool __should_swizzle_addr(unsigned long p) | |
| 32 | +static inline bool __should_swizzle_addr(u64 p) | |
| 33 | 33 | { |
| 34 | 34 | /* boot bus? */ |
| 35 | 35 | return ((p >> 40) & 0xff) == 0; |
| @@ -11,11 +11,13 @@ · 10 unmodified lines | ||
| 11 | 11 | #define CP0_EBASE $15, 1 |
| 12 | 12 | |
| 13 | 13 | .macro kernel_entry_setup |
| 14 | +#ifdef CONFIG_SMP | |
| 14 | 15 | mfc0 t0, CP0_EBASE |
| 15 | 16 | andi t0, t0, 0x3ff # CPUNum |
| 16 | 17 | beqz t0, 1f |
| 17 | 18 | # CPUs other than zero goto smp_bootstrap |
| 18 | 19 | j smp_bootstrap |
| 20 | +#endif /* CONFIG_SMP */ | |
| 19 | 21 | |
| 20 | 22 | 1: |
| 21 | 23 | .endm |
| @@ -164,7 +164,7 @@ typedef struct { unsigned long pgprot; } pgprot_t; · 163 unmodified lines | ||
| 164 | 164 | */ |
| 165 | 165 | static inline unsigned long ___pa(unsigned long x) |
| 166 | 166 | { |
| 167 | − if (config_enabled(CONFIG_64BIT)) { | |
| 167 | + if (IS_ENABLED(CONFIG_64BIT)) { | |
| 168 | 168 | /* |
| 169 | 169 | * For MIPS64 the virtual address may either be in one of |
| 170 | 170 | * the compatibility segements ckseg0 or ckseg1, or it may |
| @@ -173,7 +173,7 @@ static inline unsigned long ___pa(unsigned long x) · 2 unmodified lines | ||
| 173 | 173 | return x < CKSEG0 ? XPHYSADDR(x) : CPHYSADDR(x); |
| 174 | 174 | } |
| 175 | 175 | |
| 176 | − if (!config_enabled(CONFIG_EVA)) { | |
| 176 | + if (!IS_ENABLED(CONFIG_EVA)) { | |
| 177 | 177 | /* |
| 178 | 178 | * We're using the standard MIPS32 legacy memory map, ie. |
| 179 | 179 | * the address x is going to be in kseg0 or kseg1. We can |
| @@ -14,6 +14,7 @@ · 13 unmodified lines | ||
| 14 | 14 | #include <linux/kernel.h> |
| 15 | 15 | #include <linux/errno.h> |
| 16 | 16 | #include <linux/thread_info.h> |
| 17 | +#include <linux/string.h> | |
| 17 | 18 | #include <asm/asm-eva.h> |
| 18 | 19 | |
| 19 | 20 | /* |
| @@ -1170,6 +1171,8 @@ extern size_t __copy_in_user_eva(void *__to, const void *__from, size_t __n); · 1150 unmodified lines | ||
| 1170 | 1171 | __cu_len = __invoke_copy_from_user(__cu_to, \ |
| 1171 | 1172 | __cu_from, \ |
| 1172 | 1173 | __cu_len); \ |
| 1174 | + } else { \ | |
| 1175 | + memset(__cu_to, 0, __cu_len); \ | |
| 1173 | 1176 | } \ |
| 1174 | 1177 | } \ |
| 1175 | 1178 | __cu_len; \ |
| @@ -1164,7 +1164,9 @@ fpu_emul: · 1163 unmodified lines | ||
| 1164 | 1164 | regs->regs[31] = r31; |
| 1165 | 1165 | regs->cp0_epc = epc; |
| 1166 | 1166 | if (!used_math()) { /* First time FPU user. */ |
| 1167 | + preempt_disable(); | |
| 1167 | 1168 | err = init_fpu(); |
| 1169 | + preempt_enable(); | |
| 1168 | 1170 | set_used_math(); |
| 1169 | 1171 | } |
| 1170 | 1172 | lose_fpu(1); /* Save FPU state for the emulator. */ |
| @@ -605,14 +605,14 @@ int mips_set_process_fp_mode(struct task_struct *task, unsigned int value) · 604 unmodified lines | ||
| 605 | 605 | return -EOPNOTSUPP; |
| 606 | 606 | |
| 607 | 607 | /* Avoid inadvertently triggering emulation */ |
| 608 | − if ((value & PR_FP_MODE_FR) && cpu_has_fpu && | |
| 609 | − !(current_cpu_data.fpu_id & MIPS_FPIR_F64)) | |
| 608 | + if ((value & PR_FP_MODE_FR) && raw_cpu_has_fpu && | |
| 609 | + !(raw_current_cpu_data.fpu_id & MIPS_FPIR_F64)) | |
| 610 | 610 | return -EOPNOTSUPP; |
| 611 | − if ((value & PR_FP_MODE_FRE) && cpu_has_fpu && !cpu_has_fre) | |
| 611 | + if ((value & PR_FP_MODE_FRE) && raw_cpu_has_fpu && !cpu_has_fre) | |
| 612 | 612 | return -EOPNOTSUPP; |
| 613 | 613 | |
| 614 | 614 | /* FR = 0 not supported in MIPS R6 */ |
| 615 | − if (!(value & PR_FP_MODE_FR) && cpu_has_fpu && cpu_has_mips_r6) | |
| 615 | + if (!(value & PR_FP_MODE_FR) && raw_cpu_has_fpu && cpu_has_mips_r6) | |
| 616 | 616 | return -EOPNOTSUPP; |
| 617 | 617 | |
| 618 | 618 | /* Proceed with the mode switch */ |
| @@ -87,6 +87,13 @@ void __init add_memory_region(phys_addr_t start, phys_addr_t size, long type) · 86 unmodified lines | ||
| 87 | 87 | int x = boot_mem_map.nr_map; |
| 88 | 88 | int i; |
| 89 | 89 | |
| 90 | + /* | |
| 91 | + * If the region reaches the top of the physical address space, adjust | |
| 92 | + * the size slightly so that (start + size) doesn't overflow | |
| 93 | + */ | |
| 94 | + if (start + size - 1 == (phys_addr_t)ULLONG_MAX) | |
| 95 | + --size; | |
| 96 | + | |
| 90 | 97 | /* Sanity check */ |
| 91 | 98 | if (start + size < start) { |
| 92 | 99 | pr_warn("Trying to add an invalid memory region, skipped\n"); |
| @@ -322,6 +322,9 @@ asmlinkage void start_secondary(void) · 321 unmodified lines | ||
| 322 | 322 | cpumask_set_cpu(cpu, &cpu_coherent_mask); |
| 323 | 323 | notify_cpu_starting(cpu); |
| 324 | 324 | |
| 325 | + cpumask_set_cpu(cpu, &cpu_callin_map); | |
| 326 | + synchronise_count_slave(cpu); | |
| 327 | + | |
| 325 | 328 | set_cpu_online(cpu, true); |
| 326 | 329 | |
| 327 | 330 | set_cpu_sibling_map(cpu); |
| @@ -329,10 +332,6 @@ asmlinkage void start_secondary(void) · 1 unmodified line | ||
| 329 | 332 | |
| 330 | 333 | calculate_cpu_foreign_map(); |
| 331 | 334 | |
| 332 | − cpumask_set_cpu(cpu, &cpu_callin_map); | |
| 333 | − | |
| 334 | − synchronise_count_slave(cpu); | |
| 335 | − | |
| 336 | 335 | /* |
| 337 | 336 | * irq will be enabled in ->smp_finish(), enabling it too early |
| 338 | 337 | * is dangerous. |
| @@ -222,7 +222,7 @@ int arch_uprobe_exception_notify(struct notifier_block *self, · 221 unmodified lines | ||
| 222 | 222 | return NOTIFY_DONE; |
| 223 | 223 | |
| 224 | 224 | switch (val) { |
| 225 | − case DIE_BREAK: | |
| 225 | + case DIE_UPROBE: | |
| 226 | 226 | if (uprobe_pre_sstep_notifier(regs)) |
| 227 | 227 | return NOTIFY_STOP; |
| 228 | 228 | break; |
| @@ -39,16 +39,16 @@ static struct vm_special_mapping vdso_vvar_mapping = { · 38 unmodified lines | ||
| 39 | 39 | static void __init init_vdso_image(struct mips_vdso_image *image) |
| 40 | 40 | { |
| 41 | 41 | unsigned long num_pages, i; |
| 42 | + unsigned long data_pfn; | |
| 42 | 43 | |
| 43 | 44 | BUG_ON(!PAGE_ALIGNED(image->data)); |
| 44 | 45 | BUG_ON(!PAGE_ALIGNED(image->size)); |
| 45 | 46 | |
| 46 | 47 | num_pages = image->size / PAGE_SIZE; |
| 47 | 48 | |
| 48 | − for (i = 0; i < num_pages; i++) { | |
| 49 | − image->mapping.pages[i] = | |
| 50 | − virt_to_page(image->data + (i * PAGE_SIZE)); | |
| 51 | − } | |
| 49 | + data_pfn = __phys_to_pfn(__pa_symbol(image->data)); | |
| 50 | + for (i = 0; i < num_pages; i++) | |
| 51 | + image->mapping.pages[i] = pfn_to_page(data_pfn + i); | |
| 52 | 52 | } |
| 53 | 53 | |
| 54 | 54 | static int __init init_vdso(void) |
| @@ -40,7 +40,7 @@ static int kvm_mips_map_page(struct kvm *kvm, gfn_t gfn) · 39 unmodified lines | ||
| 40 | 40 | srcu_idx = srcu_read_lock(&kvm->srcu); |
| 41 | 41 | pfn = gfn_to_pfn(kvm, gfn); |
| 42 | 42 | |
| 43 | − if (is_error_pfn(pfn)) { | |
| 43 | + if (is_error_noslot_pfn(pfn)) { | |
| 44 | 44 | kvm_err("Couldn't get pfn for gfn %#llx!\n", gfn); |
| 45 | 45 | err = -EFAULT; |
| 46 | 46 | goto out; |
| @@ -298,5 +298,6 @@ bool do_dsemulret(struct pt_regs *xcp) · 297 unmodified lines | ||
| 298 | 298 | /* Set EPC to return to post-branch instruction */ |
| 299 | 299 | xcp->cp0_epc = current->thread.bd_emu_cont_pc; |
| 300 | 300 | pr_debug("dsemulret to 0x%08lx\n", xcp->cp0_epc); |
| 301 | + MIPS_FPU_EMU_INC_STATS(ds_emul); | |
| 301 | 302 | return true; |
| 302 | 303 | } |
| @@ -800,7 +800,7 @@ static void r4k_flush_icache_range(unsigned long start, unsigned long end) · 799 unmodified lines | ||
| 800 | 800 | * If address-based cache ops don't require an SMP call, then |
| 801 | 801 | * use them exclusively for small flushes. |
| 802 | 802 | */ |
| 803 | − size = start - end; | |
| 803 | + size = end - start; | |
| 804 | 804 | cache_size = icache_size; |
| 805 | 805 | if (!cpu_has_ic_fills_f_dc) { |
| 806 | 806 | size *= 2; |
| @@ -261,7 +261,6 @@ unsigned __weak platform_maar_init(unsigned num_pairs) · 260 unmodified lines | ||
| 261 | 261 | { |
| 262 | 262 | struct maar_config cfg[BOOT_MEM_MAP_MAX]; |
| 263 | 263 | unsigned i, num_configured, num_cfg = 0; |
| 264 | − phys_addr_t skip; | |
| 265 | 264 | |
| 266 | 265 | for (i = 0; i < boot_mem_map.nr_map; i++) { |
| 267 | 266 | switch (boot_mem_map.map[i].type) { |
| @@ -272,14 +271,14 @@ unsigned __weak platform_maar_init(unsigned num_pairs) · 4 unmodified lines | ||
| 272 | 271 | continue; |
| 273 | 272 | } |
| 274 | 273 | |
| 275 | − skip = 0x10000 - (boot_mem_map.map[i].addr & 0xffff); | |
| 276 | − | |
| 274 | + /* Round lower up */ | |
| 277 | 275 | cfg[num_cfg].lower = boot_mem_map.map[i].addr; |
| 278 | − cfg[num_cfg].lower += skip; | |
| 276 | + cfg[num_cfg].lower = (cfg[num_cfg].lower + 0xffff) & ~0xffff; | |
| 279 | 277 | |
| 280 | − cfg[num_cfg].upper = cfg[num_cfg].lower; | |
| 281 | − cfg[num_cfg].upper += boot_mem_map.map[i].size - 1; | |
| 282 | − cfg[num_cfg].upper -= skip; | |
| 278 | + /* Round upper down */ | |
| 279 | + cfg[num_cfg].upper = boot_mem_map.map[i].addr + | |
| 280 | + boot_mem_map.map[i].size; | |
| 281 | + cfg[num_cfg].upper = (cfg[num_cfg].upper & ~0xffff) - 1; | |
| 283 | 282 | |
| 284 | 283 | cfg[num_cfg].attrs = MIPS_MAAR_S; |
| 285 | 284 | num_cfg++; |
| @@ -166,6 +166,7 @@ struct __large_struct { unsigned long buf[100]; }; · 165 unmodified lines | ||
| 166 | 166 | "2:\n" \ |
| 167 | 167 | " .section .fixup,\"ax\"\n" \ |
| 168 | 168 | "3:\n\t" \ |
| 169 | + " mov 0,%1\n" \ | |
| 169 | 170 | " mov %3,%0\n" \ |
| 170 | 171 | " jmp 2b\n" \ |
| 171 | 172 | " .previous\n" \ |
| @@ -9,7 +9,7 @@ · 8 unmodified lines | ||
| 9 | 9 | * as published by the Free Software Foundation; either version |
| 10 | 10 | * 2 of the Licence, or (at your option) any later version. |
| 11 | 11 | */ |
| 12 | −#include <asm/uaccess.h> | |
| 12 | +#include <linux/uaccess.h> | |
| 13 | 13 | |
| 14 | 14 | unsigned long |
| 15 | 15 | __generic_copy_to_user(void *to, const void *from, unsigned long n) |
| @@ -24,6 +24,8 @@ __generic_copy_from_user(void *to, const void *from, unsigned long n) · 8 unmodified lines | ||
| 24 | 24 | { |
| 25 | 25 | if (access_ok(VERIFY_READ, from, n)) |
| 26 | 26 | __copy_user_zeroing(to, from, n); |
| 27 | + else | |
| 28 | + memset(to, 0, n); | |
| 27 | 29 | return n; |
| 28 | 30 | } |
| 29 | 31 | |
| @@ -102,9 +102,12 @@ extern long __copy_to_user(void __user *to, const void *from, unsigned long n); · 101 unmodified lines | ||
| 102 | 102 | static inline long copy_from_user(void *to, const void __user *from, |
| 103 | 103 | unsigned long n) |
| 104 | 104 | { |
| 105 | − if (!access_ok(VERIFY_READ, from, n)) | |
| 106 | − return n; | |
| 107 | − return __copy_from_user(to, from, n); | |
| 105 | + unsigned long res = n; | |
| 106 | + if (access_ok(VERIFY_READ, from, n)) | |
| 107 | + res = __copy_from_user(to, from, n); | |
| 108 | + if (unlikely(res)) | |
| 109 | + memset(to + (n - res), 0, res); | |
| 110 | + return res; | |
| 108 | 111 | } |
| 109 | 112 | |
| 110 | 113 | static inline long copy_to_user(void __user *to, const void *from, |
| @@ -139,7 +142,7 @@ extern long strnlen_user(const char __user *s, long n); · 28 unmodified lines | ||
| 139 | 142 | |
| 140 | 143 | #define __get_user_unknown(val, size, ptr, err) do { \ |
| 141 | 144 | err = 0; \ |
| 142 | − if (copy_from_user(&(val), ptr, size)) { \ | |
| 145 | + if (__copy_from_user(&(val), ptr, size)) { \ | |
| 143 | 146 | err = -EFAULT; \ |
| 144 | 147 | } \ |
| 145 | 148 | } while (0) |
| @@ -166,7 +169,7 @@ do { \ · 20 unmodified lines | ||
| 166 | 169 | ({ \ |
| 167 | 170 | long __gu_err = -EFAULT; \ |
| 168 | 171 | const __typeof__(*(ptr)) __user *__gu_ptr = (ptr); \ |
| 169 | − unsigned long __gu_val; \ | |
| 172 | + unsigned long __gu_val = 0; \ | |
| 170 | 173 | __get_user_common(__gu_val, sizeof(*(ptr)), __gu_ptr, __gu_err);\ |
| 171 | 174 | (x) = (__force __typeof__(x))__gu_val; \ |
| 172 | 175 | __gu_err; \ |
| @@ -273,28 +273,20 @@ __copy_tofrom_user(void *to, const void *from, unsigned long size); · 272 unmodified lines | ||
| 273 | 273 | static inline unsigned long |
| 274 | 274 | copy_from_user(void *to, const void *from, unsigned long n) |
| 275 | 275 | { |
| 276 | − unsigned long over; | |
| 277 | − | |
| 278 | − if (access_ok(VERIFY_READ, from, n)) | |
| 279 | − return __copy_tofrom_user(to, from, n); | |
| 280 | − if ((unsigned long)from < TASK_SIZE) { | |
| 281 | − over = (unsigned long)from + n - TASK_SIZE; | |
| 282 | − return __copy_tofrom_user(to, from, n - over) + over; | |
| 283 | − } | |
| 284 | − return n; | |
| 276 | + unsigned long res = n; | |
| 277 | + | |
| 278 | + if (likely(access_ok(VERIFY_READ, from, n))) | |
| 279 | + res = __copy_tofrom_user(to, from, n); | |
| 280 | + if (unlikely(res)) | |
| 281 | + memset(to + (n - res), 0, res); | |
| 282 | + return res; | |
| 285 | 283 | } |
| 286 | 284 | |
| 287 | 285 | static inline unsigned long |
| 288 | 286 | copy_to_user(void *to, const void *from, unsigned long n) |
| 289 | 287 | { |
| 290 | − unsigned long over; | |
| 291 | − | |
| 292 | − if (access_ok(VERIFY_WRITE, to, n)) | |
| 293 | − return __copy_tofrom_user(to, from, n); | |
| 294 | − if ((unsigned long)to < TASK_SIZE) { | |
| 295 | − over = (unsigned long)to + n - TASK_SIZE; | |
| 296 | − return __copy_tofrom_user(to, from, n - over) + over; | |
| 297 | − } | |
| 288 | + if (likely(access_ok(VERIFY_WRITE, to, n))) | |
| 289 | + n = __copy_tofrom_user(to, from, n); | |
| 298 | 290 | return n; |
| 299 | 291 | } |
| 300 | 292 | |
| @@ -303,13 +295,8 @@ extern unsigned long __clear_user(void *addr, unsigned long size); · 2 unmodified lines | ||
| 303 | 295 | static inline __must_check unsigned long |
| 304 | 296 | clear_user(void *addr, unsigned long size) |
| 305 | 297 | { |
| 306 | − | |
| 307 | − if (access_ok(VERIFY_WRITE, addr, size)) | |
| 308 | − return __clear_user(addr, size); | |
| 309 | − if ((unsigned long)addr < TASK_SIZE) { | |
| 310 | − unsigned long over = (unsigned long)addr + size - TASK_SIZE; | |
| 311 | − return __clear_user(addr, size - over) + over; | |
| 312 | − } | |
| 298 | + if (likely(access_ok(VERIFY_WRITE, addr, size))) | |
| 299 | + size = __clear_user(addr, size); | |
| 313 | 300 | return size; |
| 314 | 301 | } |
| 315 | 302 | |
| @@ -1,6 +1,5 @@ | ||
| 1 | 1 | config PARISC |
| 2 | 2 | def_bool y |
| 3 | − select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | |
| 4 | 3 | select ARCH_MIGHT_HAVE_PC_PARPORT |
| 5 | 4 | select HAVE_IDE |
| 6 | 5 | select HAVE_OPROFILE |
| @@ -245,7 +245,6 @@ CONFIG_DEBUG_RT_MUTEXES=y · 244 unmodified lines | ||
| 245 | 245 | CONFIG_PROVE_RCU_DELAY=y |
| 246 | 246 | CONFIG_DEBUG_BLOCK_EXT_DEVT=y |
| 247 | 247 | CONFIG_LATENCYTOP=y |
| 248 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 249 | 248 | CONFIG_KEYS=y |
| 250 | 249 | # CONFIG_CRYPTO_HW is not set |
| 251 | 250 | CONFIG_FONTS=y |
| @@ -291,7 +291,6 @@ CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC=y · 290 unmodified lines | ||
| 291 | 291 | CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y |
| 292 | 292 | # CONFIG_SCHED_DEBUG is not set |
| 293 | 293 | CONFIG_TIMER_STATS=y |
| 294 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 295 | 294 | CONFIG_CRYPTO_MANAGER=y |
| 296 | 295 | CONFIG_CRYPTO_ECB=m |
| 297 | 296 | CONFIG_CRYPTO_PCBC=m |
| @@ -10,6 +10,7 @@ · 9 unmodified lines | ||
| 10 | 10 | #include <asm-generic/uaccess-unaligned.h> |
| 11 | 11 | |
| 12 | 12 | #include <linux/bug.h> |
| 13 | +#include <linux/string.h> | |
| 13 | 14 | |
| 14 | 15 | #define VERIFY_READ 0 |
| 15 | 16 | #define VERIFY_WRITE 1 |
| @@ -208,26 +209,30 @@ unsigned long copy_in_user(void __user *dst, const void __user *src, unsigned lo · 192 unmodified lines | ||
| 208 | 209 | #define __copy_to_user_inatomic __copy_to_user |
| 209 | 210 | #define __copy_from_user_inatomic __copy_from_user |
| 210 | 211 | |
| 211 | −extern void copy_from_user_overflow(void) | |
| 212 | −#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS | |
| 213 | − __compiletime_error("copy_from_user() buffer size is not provably correct") | |
| 214 | −#else | |
| 215 | − __compiletime_warning("copy_from_user() buffer size is not provably correct") | |
| 216 | −#endif | |
| 217 | −; | |
| 212 | +extern void __compiletime_error("usercopy buffer size is too small") | |
| 213 | +__bad_copy_user(void); | |
| 214 | + | |
| 215 | +static inline void copy_user_overflow(int size, unsigned long count) | |
| 216 | +{ | |
| 217 | + WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count); | |
| 218 | +} | |
| 218 | 219 | |
| 219 | 220 | static inline unsigned long __must_check copy_from_user(void *to, |
| 220 | 221 | const void __user *from, |
| 221 | 222 | unsigned long n) |
| 222 | 223 | { |
| 223 | 224 | int sz = __compiletime_object_size(to); |
| 224 | − int ret = -EFAULT; | |
| 225 | + unsigned long ret = n; | |
| 225 | 226 | |
| 226 | − if (likely(sz == -1 || !__builtin_constant_p(n) || sz >= n)) | |
| 227 | + if (likely(sz == -1 || sz >= n)) | |
| 227 | 228 | ret = __copy_from_user(to, from, n); |
| 228 | − else | |
| 229 | − copy_from_user_overflow(); | |
| 229 | + else if (!__builtin_constant_p(n)) | |
| 230 | + copy_user_overflow(sz, n); | |
| 231 | + else | |
| 232 | + __bad_copy_user(); | |
| 230 | 233 | |
| 234 | + if (unlikely(ret)) | |
| 235 | + memset(to + (n - ret), 0, ret); | |
| 231 | 236 | return ret; |
| 232 | 237 | } |
| 233 | 238 | |
| @@ -97,10 +97,10 @@ · 96 unmodified lines | ||
| 97 | 97 | #define ENOTCONN 235 /* Transport endpoint is not connected */ |
| 98 | 98 | #define ESHUTDOWN 236 /* Cannot send after transport endpoint shutdown */ |
| 99 | 99 | #define ETOOMANYREFS 237 /* Too many references: cannot splice */ |
| 100 | −#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ | |
| 101 | 100 | #define ETIMEDOUT 238 /* Connection timed out */ |
| 102 | 101 | #define ECONNREFUSED 239 /* Connection refused */ |
| 103 | −#define EREMOTERELEASE 240 /* Remote peer released connection */ | |
| 102 | +#define EREFUSED ECONNREFUSED /* for HP's NFS apparently */ | |
| 103 | +#define EREMOTERELEASE 240 /* Remote peer released connection */ | |
| 104 | 104 | #define EHOSTDOWN 241 /* Host is down */ |
| 105 | 105 | #define EHOSTUNREACH 242 /* No route to host */ |
| 106 | 106 | |
| @@ -51,8 +51,6 @@ EXPORT_SYMBOL(_parisc_requires_coherency); · 50 unmodified lines | ||
| 51 | 51 | |
| 52 | 52 | DEFINE_PER_CPU(struct cpuinfo_parisc, cpu_data); |
| 53 | 53 | |
| 54 | −extern int update_cr16_clocksource(void); /* from time.c */ | |
| 55 | − | |
| 56 | 54 | /* |
| 57 | 55 | ** PARISC CPU driver - claim "device" and initialize CPU data structures. |
| 58 | 56 | ** |
| @@ -228,12 +226,6 @@ static int processor_probe(struct parisc_device *dev) · 169 unmodified lines | ||
| 228 | 226 | } |
| 229 | 227 | #endif |
| 230 | 228 | |
| 231 | − /* If we've registered more than one cpu, | |
| 232 | − * we'll use the jiffies clocksource since cr16 | |
| 233 | − * is not synchronized between CPUs. | |
| 234 | − */ | |
| 235 | − update_cr16_clocksource(); | |
| 236 | − | |
| 237 | 229 | return 0; |
| 238 | 230 | } |
| 239 | 231 | |
| @@ -221,18 +221,6 @@ static struct clocksource clocksource_cr16 = { · 220 unmodified lines | ||
| 221 | 221 | .flags = CLOCK_SOURCE_IS_CONTINUOUS, |
| 222 | 222 | }; |
| 223 | 223 | |
| 224 | −int update_cr16_clocksource(void) | |
| 225 | −{ | |
| 226 | − /* since the cr16 cycle counters are not synchronized across CPUs, | |
| 227 | − we'll check if we should switch to a safe clocksource: */ | |
| 228 | − if (clocksource_cr16.rating != 0 && num_online_cpus() > 1) { | |
| 229 | − clocksource_change_rating(&clocksource_cr16, 0); | |
| 230 | − return 1; | |
| 231 | − } | |
| 232 | − | |
| 233 | − return 0; | |
| 234 | −} | |
| 235 | − | |
| 236 | 224 | void __init start_cpu_itimer(void) |
| 237 | 225 | { |
| 238 | 226 | unsigned int cpu = smp_processor_id(); |
| @@ -15,7 +15,7 @@ static inline bool early_cpu_has_feature(unsigned long feature) · 14 unmodified lines | ||
| 15 | 15 | #ifdef CONFIG_JUMP_LABEL_FEATURE_CHECKS |
| 16 | 16 | #include <linux/jump_label.h> |
| 17 | 17 | |
| 18 | −#define NUM_CPU_FTR_KEYS 64 | |
| 18 | +#define NUM_CPU_FTR_KEYS BITS_PER_LONG | |
| 19 | 19 | |
| 20 | 20 | extern struct static_key_true cpu_feature_keys[NUM_CPU_FTR_KEYS]; |
| 21 | 21 | |
| @@ -3,6 +3,7 @@ · 2 unmodified lines | ||
| 3 | 3 | |
| 4 | 4 | #ifndef __ASSEMBLY__ |
| 5 | 5 | #include <linux/cpumask.h> |
| 6 | +#include <asm/cpu_has_feature.h> | |
| 6 | 7 | |
| 7 | 8 | /* |
| 8 | 9 | * Mapping of threads to cores |
| @@ -21,7 +21,7 @@ · 20 unmodified lines | ||
| 21 | 21 | #ifndef __ASM_PPC64_HMI_H__ |
| 22 | 22 | #define __ASM_PPC64_HMI_H__ |
| 23 | 23 | |
| 24 | −#ifdef CONFIG_PPC_BOOK3S_64 | |
| 24 | +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE | |
| 25 | 25 | |
| 26 | 26 | #define CORE_TB_RESYNC_REQ_BIT 63 |
| 27 | 27 | #define MAX_SUBCORE_PER_CORE 4 |
| @@ -183,11 +183,6 @@ struct paca_struct { · 182 unmodified lines | ||
| 183 | 183 | */ |
| 184 | 184 | u16 in_mce; |
| 185 | 185 | u8 hmi_event_available; /* HMI event is available */ |
| 186 | − /* | |
| 187 | − * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for | |
| 188 | − * more details | |
| 189 | − */ | |
| 190 | − struct sibling_subcore_state *sibling_subcore_state; | |
| 191 | 186 | #endif |
| 192 | 187 | |
| 193 | 188 | /* Stuff for accurate time accounting */ |
| @@ -202,6 +197,13 @@ struct paca_struct { · 8 unmodified lines | ||
| 202 | 197 | struct kvmppc_book3s_shadow_vcpu shadow_vcpu; |
| 203 | 198 | #endif |
| 204 | 199 | struct kvmppc_host_state kvm_hstate; |
| 200 | +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE | |
| 201 | + /* | |
| 202 | + * Bitmap for sibling subcore status. See kvm/book3s_hv_ras.c for | |
| 203 | + * more details | |
| 204 | + */ | |
| 205 | + struct sibling_subcore_state *sibling_subcore_state; | |
| 206 | +#endif | |
| 205 | 207 | #endif |
| 206 | 208 | }; |
| 207 | 209 | |
| @@ -301,6 +301,7 @@ extern void pci_process_bridge_OF_ranges(struct pci_controller *hose, · 300 unmodified lines | ||
| 301 | 301 | /* Allocate & free a PCI host bridge structure */ |
| 302 | 302 | extern struct pci_controller *pcibios_alloc_controller(struct device_node *dev); |
| 303 | 303 | extern void pcibios_free_controller(struct pci_controller *phb); |
| 304 | +extern void pcibios_free_controller_deferred(struct pci_host_bridge *bridge); | |
| 304 | 305 | |
| 305 | 306 | #ifdef CONFIG_PCI |
| 306 | 307 | extern int pcibios_vaddr_is_ioport(void __iomem *address); |
| @@ -308,40 +308,21 @@ extern unsigned long __copy_tofrom_user(void __user *to, · 307 unmodified lines | ||
| 308 | 308 | static inline unsigned long copy_from_user(void *to, |
| 309 | 309 | const void __user *from, unsigned long n) |
| 310 | 310 | { |
| 311 | − unsigned long over; | |
| 312 | − | |
| 313 | − if (access_ok(VERIFY_READ, from, n)) { | |
| 314 | − if (!__builtin_constant_p(n)) | |
| 315 | − check_object_size(to, n, false); | |
| 311 | + if (likely(access_ok(VERIFY_READ, from, n))) { | |
| 312 | + check_object_size(to, n, false); | |
| 316 | 313 | return __copy_tofrom_user((__force void __user *)to, from, n); |
| 317 | 314 | } |
| 318 | − if ((unsigned long)from < TASK_SIZE) { | |
| 319 | − over = (unsigned long)from + n - TASK_SIZE; | |
| 320 | − if (!__builtin_constant_p(n - over)) | |
| 321 | − check_object_size(to, n - over, false); | |
| 322 | − return __copy_tofrom_user((__force void __user *)to, from, | |
| 323 | − n - over) + over; | |
| 324 | − } | |
| 315 | + memset(to, 0, n); | |
| 325 | 316 | return n; |
| 326 | 317 | } |
| 327 | 318 | |
| 328 | 319 | static inline unsigned long copy_to_user(void __user *to, |
| 329 | 320 | const void *from, unsigned long n) |
| 330 | 321 | { |
| 331 | − unsigned long over; | |
| 332 | − | |
| 333 | 322 | if (access_ok(VERIFY_WRITE, to, n)) { |
| 334 | − if (!__builtin_constant_p(n)) | |
| 335 | − check_object_size(from, n, true); | |
| 323 | + check_object_size(from, n, true); | |
| 336 | 324 | return __copy_tofrom_user(to, (__force void __user *)from, n); |
| 337 | 325 | } |
| 338 | − if ((unsigned long)to < TASK_SIZE) { | |
| 339 | − over = (unsigned long)to + n - TASK_SIZE; | |
| 340 | − if (!__builtin_constant_p(n)) | |
| 341 | − check_object_size(from, n - over, true); | |
| 342 | − return __copy_tofrom_user(to, (__force void __user *)from, | |
| 343 | − n - over) + over; | |
| 344 | − } | |
| 345 | 326 | return n; |
| 346 | 327 | } |
| 347 | 328 | |
| @@ -383,8 +364,7 @@ static inline unsigned long __copy_from_user_inatomic(void *to, · 35 unmodified lines | ||
| 383 | 364 | return 0; |
| 384 | 365 | } |
| 385 | 366 | |
| 386 | − if (!__builtin_constant_p(n)) | |
| 387 | − check_object_size(to, n, false); | |
| 367 | + check_object_size(to, n, false); | |
| 388 | 368 | |
| 389 | 369 | return __copy_tofrom_user((__force void __user *)to, from, n); |
| 390 | 370 | } |
| @@ -412,8 +392,8 @@ static inline unsigned long __copy_to_user_inatomic(void __user *to, · 21 unmodified lines | ||
| 412 | 392 | if (ret == 0) |
| 413 | 393 | return 0; |
| 414 | 394 | } |
| 415 | − if (!__builtin_constant_p(n)) | |
| 416 | − check_object_size(from, n, true); | |
| 395 | + | |
| 396 | + check_object_size(from, n, true); | |
| 417 | 397 | |
| 418 | 398 | return __copy_tofrom_user(to, (__force const void __user *)from, n); |
| 419 | 399 | } |
| @@ -439,10 +419,6 @@ static inline unsigned long clear_user(void __user *addr, unsigned long size) · 19 unmodified lines | ||
| 439 | 419 | might_fault(); |
| 440 | 420 | if (likely(access_ok(VERIFY_WRITE, addr, size))) |
| 441 | 421 | return __clear_user(addr, size); |
| 442 | − if ((unsigned long)addr < TASK_SIZE) { | |
| 443 | − unsigned long over = (unsigned long)addr + size - TASK_SIZE; | |
| 444 | − return __clear_user(addr, size - over) + over; | |
| 445 | − } | |
| 446 | 422 | return size; |
| 447 | 423 | } |
| 448 | 424 | |
| @@ -41,7 +41,7 @@ obj-$(CONFIG_VDSO32) += vdso32/ · 40 unmodified lines | ||
| 41 | 41 | obj-$(CONFIG_HAVE_HW_BREAKPOINT) += hw_breakpoint.o |
| 42 | 42 | obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_ppc970.o cpu_setup_pa6t.o |
| 43 | 43 | obj-$(CONFIG_PPC_BOOK3S_64) += cpu_setup_power.o |
| 44 | −obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o hmi.o | |
| 44 | +obj-$(CONFIG_PPC_BOOK3S_64) += mce.o mce_power.o | |
| 45 | 45 | obj-$(CONFIG_PPC_BOOK3E_64) += exceptions-64e.o idle_book3e.o |
| 46 | 46 | obj-$(CONFIG_PPC64) += vdso64/ |
| 47 | 47 | obj-$(CONFIG_ALTIVEC) += vecemu.o |
| @@ -368,13 +368,13 @@ END_FTR_SECTION_IFSET(CPU_FTR_HAS_PPR) · 367 unmodified lines | ||
| 368 | 368 | tabort_syscall: |
| 369 | 369 | /* Firstly we need to enable TM in the kernel */ |
| 370 | 370 | mfmsr r10 |
| 371 | − li r13, 1 | |
| 372 | − rldimi r10, r13, MSR_TM_LG, 63-MSR_TM_LG | |
| 371 | + li r9, 1 | |
| 372 | + rldimi r10, r9, MSR_TM_LG, 63-MSR_TM_LG | |
| 373 | 373 | mtmsrd r10, 0 |
| 374 | 374 | |
| 375 | 375 | /* tabort, this dooms the transaction, nothing else */ |
| 376 | − li r13, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT) | |
| 377 | − TABORT(R13) | |
| 376 | + li r9, (TM_CAUSE_SYSCALL|TM_CAUSE_PERSISTENT) | |
| 377 | + TABORT(R9) | |
| 378 | 378 | |
| 379 | 379 | /* |
| 380 | 380 | * Return directly to userspace. We have corrupted user register state, |
| @@ -382,8 +382,8 @@ tabort_syscall: · 1 unmodified line | ||
| 382 | 382 | * resume after the tbegin of the aborted transaction with the |
| 383 | 383 | * checkpointed register state. |
| 384 | 384 | */ |
| 385 | − li r13, MSR_RI | |
| 386 | − andc r10, r10, r13 | |
| 385 | + li r9, MSR_RI | |
| 386 | + andc r10, r10, r9 | |
| 387 | 387 | mtmsrd r10, 1 |
| 388 | 388 | mtspr SPRN_SRR0, r11 |
| 389 | 389 | mtspr SPRN_SRR1, r12 |
| @@ -485,7 +485,23 @@ machine_check_fwnmi: · 484 unmodified lines | ||
| 485 | 485 | EXCEPTION_PROLOG_0(PACA_EXMC) |
| 486 | 486 | machine_check_pSeries_0: |
| 487 | 487 | EXCEPTION_PROLOG_1(PACA_EXMC, KVMTEST, 0x200) |
| 488 | − EXCEPTION_PROLOG_PSERIES_1(machine_check_common, EXC_STD) | |
| 488 | + /* | |
| 489 | + * The following is essentially EXCEPTION_PROLOG_PSERIES_1 with the | |
| 490 | + * difference that MSR_RI is not enabled, because PACA_EXMC is being | |
| 491 | + * used, so nested machine check corrupts it. machine_check_common | |
| 492 | + * enables MSR_RI. | |
| 493 | + */ | |
| 494 | + ld r12,PACAKBASE(r13) | |
| 495 | + ld r10,PACAKMSR(r13) | |
| 496 | + xori r10,r10,MSR_RI | |
| 497 | + mfspr r11,SPRN_SRR0 | |
| 498 | + LOAD_HANDLER(r12, machine_check_common) | |
| 499 | + mtspr SPRN_SRR0,r12 | |
| 500 | + mfspr r12,SPRN_SRR1 | |
| 501 | + mtspr SPRN_SRR1,r10 | |
| 502 | + rfid | |
| 503 | + b . /* prevent speculative execution */ | |
| 504 | + | |
| 489 | 505 | KVM_HANDLER_SKIP(PACA_EXMC, EXC_STD, 0x200) |
| 490 | 506 | KVM_HANDLER_SKIP(PACA_EXGEN, EXC_STD, 0x300) |
| 491 | 507 | KVM_HANDLER_SKIP(PACA_EXSLB, EXC_STD, 0x380) |
| @@ -969,14 +985,17 @@ ALT_MMU_FTR_SECTION_END_IFCLR(MMU_FTR_TYPE_RADIX) · 477 unmodified lines | ||
| 969 | 985 | machine_check_common: |
| 970 | 986 | |
| 971 | 987 | mfspr r10,SPRN_DAR |
| 972 | − std r10,PACA_EXGEN+EX_DAR(r13) | |
| 988 | + std r10,PACA_EXMC+EX_DAR(r13) | |
| 973 | 989 | mfspr r10,SPRN_DSISR |
| 974 | − stw r10,PACA_EXGEN+EX_DSISR(r13) | |
| 990 | + stw r10,PACA_EXMC+EX_DSISR(r13) | |
| 975 | 991 | EXCEPTION_PROLOG_COMMON(0x200, PACA_EXMC) |
| 976 | 992 | FINISH_NAP |
| 977 | 993 | RECONCILE_IRQ_STATE(r10, r11) |
| 978 | − ld r3,PACA_EXGEN+EX_DAR(r13) | |
| 979 | − lwz r4,PACA_EXGEN+EX_DSISR(r13) | |
| 994 | + ld r3,PACA_EXMC+EX_DAR(r13) | |
| 995 | + lwz r4,PACA_EXMC+EX_DSISR(r13) | |
| 996 | + /* Enable MSR_RI when finished with PACA_EXMC */ | |
| 997 | + li r10,MSR_RI | |
| 998 | + mtmsrd r10,1 | |
| 980 | 999 | std r3,_DAR(r1) |
| 981 | 1000 | std r4,_DSISR(r1) |
| 982 | 1001 | bl save_nvgprs |
| @@ -411,7 +411,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_300) · 410 unmodified lines | ||
| 411 | 411 | * |
| 412 | 412 | * r13 - PACA |
| 413 | 413 | * cr3 - gt if waking up with partial/complete hypervisor state loss |
| 414 | − * cr4 - eq if waking up from complete hypervisor state loss. | |
| 414 | + * cr4 - gt or eq if waking up from complete hypervisor state loss. | |
| 415 | 415 | */ |
| 416 | 416 | _GLOBAL(pnv_wakeup_tb_loss) |
| 417 | 417 | ld r1,PACAR1(r13) |
| @@ -453,7 +453,7 @@ lwarx_loop2: · 35 unmodified lines | ||
| 453 | 453 | * At this stage |
| 454 | 454 | * cr2 - eq if first thread to wakeup in core |
| 455 | 455 | * cr3- gt if waking up with partial/complete hypervisor state loss |
| 456 | − * cr4 - eq if waking up from complete hypervisor state loss. | |
| 456 | + * cr4 - gt or eq if waking up from complete hypervisor state loss. | |
| 457 | 457 | */ |
| 458 | 458 | |
| 459 | 459 | ori r15,r15,PNV_CORE_IDLE_LOCK_BIT |
| @@ -481,7 +481,7 @@ first_thread_in_subcore: · 21 unmodified lines | ||
| 481 | 481 | * If waking up from sleep, subcore state is not lost. Hence |
| 482 | 482 | * skip subcore state restore |
| 483 | 483 | */ |
| 484 | − bne cr4,subcore_state_restored | |
| 484 | + blt cr4,subcore_state_restored | |
| 485 | 485 | |
| 486 | 486 | /* Restore per-subcore state */ |
| 487 | 487 | ld r4,_SDR1(r1) |
| @@ -526,7 +526,7 @@ timebase_resync: · 38 unmodified lines | ||
| 526 | 526 | * If waking up from sleep, per core state is not lost, skip to |
| 527 | 527 | * clear_lock. |
| 528 | 528 | */ |
| 529 | − bne cr4,clear_lock | |
| 529 | + blt cr4,clear_lock | |
| 530 | 530 | |
| 531 | 531 | /* |
| 532 | 532 | * First thread in the core to wake up and its waking up with |
| @@ -557,7 +557,7 @@ common_exit: · 24 unmodified lines | ||
| 557 | 557 | * If waking up from sleep, hypervisor state is not lost. Hence |
| 558 | 558 | * skip hypervisor state restore. |
| 559 | 559 | */ |
| 560 | − bne cr4,hypervisor_state_restored | |
| 560 | + blt cr4,hypervisor_state_restored | |
| 561 | 561 | |
| 562 | 562 | /* Waking up from winkle */ |
| 563 | 563 | |
| @@ -29,7 +29,7 @@ · 28 unmodified lines | ||
| 29 | 29 | #include <linux/kprobes.h> |
| 30 | 30 | #include <linux/ptrace.h> |
| 31 | 31 | #include <linux/preempt.h> |
| 32 | −#include <linux/module.h> | |
| 32 | +#include <linux/extable.h> | |
| 33 | 33 | #include <linux/kdebug.h> |
| 34 | 34 | #include <linux/slab.h> |
| 35 | 35 | #include <asm/code-patching.h> |
| @@ -153,6 +153,42 @@ void pcibios_free_controller(struct pci_controller *phb) · 152 unmodified lines | ||
| 153 | 153 | } |
| 154 | 154 | EXPORT_SYMBOL_GPL(pcibios_free_controller); |
| 155 | 155 | |
| 156 | +/* | |
| 157 | + * This function is used to call pcibios_free_controller() | |
| 158 | + * in a deferred manner: a callback from the PCI subsystem. | |
| 159 | + * | |
| 160 | + * _*DO NOT*_ call pcibios_free_controller() explicitly if | |
| 161 | + * this is used (or it may access an invalid *phb pointer). | |
| 162 | + * | |
| 163 | + * The callback occurs when all references to the root bus | |
| 164 | + * are dropped (e.g., child buses/devices and their users). | |
| 165 | + * | |
| 166 | + * It's called as .release_fn() of 'struct pci_host_bridge' | |
| 167 | + * which is associated with the 'struct pci_controller.bus' | |
| 168 | + * (root bus) - it expects .release_data to hold a pointer | |
| 169 | + * to 'struct pci_controller'. | |
| 170 | + * | |
| 171 | + * In order to use it, register .release_fn()/release_data | |
| 172 | + * like this: | |
| 173 | + * | |
| 174 | + * pci_set_host_bridge_release(bridge, | |
| 175 | + * pcibios_free_controller_deferred | |
| 176 | + * (void *) phb); | |
| 177 | + * | |
| 178 | + * e.g. in the pcibios_root_bridge_prepare() callback from | |
| 179 | + * pci_create_root_bus(). | |
| 180 | + */ | |
| 181 | +void pcibios_free_controller_deferred(struct pci_host_bridge *bridge) | |
| 182 | +{ | |
| 183 | + struct pci_controller *phb = (struct pci_controller *) | |
| 184 | + bridge->release_data; | |
| 185 | + | |
| 186 | + pr_debug("domain %d, dynamic %d\n", phb->global_number, phb->is_dynamic); | |
| 187 | + | |
| 188 | + pcibios_free_controller(phb); | |
| 189 | +} | |
| 190 | +EXPORT_SYMBOL_GPL(pcibios_free_controller_deferred); | |
| 191 | + | |
| 156 | 192 | /* |
| 157 | 193 | * The function is used to return the minimal alignment |
| 158 | 194 | * for memory or I/O windows of the associated P2P bridge. |
| @@ -695,7 +695,7 @@ unsigned char ibm_architecture_vec[] = { · 694 unmodified lines | ||
| 695 | 695 | OV4_MIN_ENT_CAP, /* minimum VP entitled capacity */ |
| 696 | 696 | |
| 697 | 697 | /* option vector 5: PAPR/OF options */ |
| 698 | − VECTOR_LENGTH(18), /* length */ | |
| 698 | + VECTOR_LENGTH(21), /* length */ | |
| 699 | 699 | 0, /* don't ignore, don't halt */ |
| 700 | 700 | OV5_FEAT(OV5_LPAR) | OV5_FEAT(OV5_SPLPAR) | OV5_FEAT(OV5_LARGE_PAGES) | |
| 701 | 701 | OV5_FEAT(OV5_DRCONF_MEMORY) | OV5_FEAT(OV5_DONATE_DEDICATE_CPU) | |
| @@ -726,8 +726,11 @@ unsigned char ibm_architecture_vec[] = { · 24 unmodified lines | ||
| 726 | 726 | 0, |
| 727 | 727 | 0, |
| 728 | 728 | OV5_FEAT(OV5_PFO_HW_RNG) | OV5_FEAT(OV5_PFO_HW_ENCR) | |
| 729 | − OV5_FEAT(OV5_PFO_HW_842), | |
| 730 | − OV5_FEAT(OV5_SUB_PROCESSORS), | |
| 729 | + OV5_FEAT(OV5_PFO_HW_842), /* Byte 17 */ | |
| 730 | + 0, /* Byte 18 */ | |
| 731 | + 0, /* Byte 19 */ | |
| 732 | + 0, /* Byte 20 */ | |
| 733 | + OV5_FEAT(OV5_SUB_PROCESSORS), /* Byte 21 */ | |
| 731 | 734 | |
| 732 | 735 | /* option vector 6: IBM PAPR hints */ |
| 733 | 736 | VECTOR_LENGTH(3), /* length */ |
| @@ -1226,7 +1226,21 @@ long sys_rt_sigreturn(int r3, int r4, int r5, int r6, int r7, int r8, · 1225 unmodified lines | ||
| 1226 | 1226 | (regs->gpr[1] + __SIGNAL_FRAMESIZE + 16); |
| 1227 | 1227 | if (!access_ok(VERIFY_READ, rt_sf, sizeof(*rt_sf))) |
| 1228 | 1228 | goto bad; |
| 1229 | + | |
| 1229 | 1230 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM |
| 1231 | + /* | |
| 1232 | + * If there is a transactional state then throw it away. | |
| 1233 | + * The purpose of a sigreturn is to destroy all traces of the | |
| 1234 | + * signal frame, this includes any transactional state created | |
| 1235 | + * within in. We only check for suspended as we can never be | |
| 1236 | + * active in the kernel, we are active, there is nothing better to | |
| 1237 | + * do than go ahead and Bad Thing later. | |
| 1238 | + * The cause is not important as there will never be a | |
| 1239 | + * recheckpoint so it's not user visible. | |
| 1240 | + */ | |
| 1241 | + if (MSR_TM_SUSPENDED(mfmsr())) | |
| 1242 | + tm_reclaim_current(0); | |
| 1243 | + | |
| 1230 | 1244 | if (__get_user(tmp, &rt_sf->uc.uc_link)) |
| 1231 | 1245 | goto bad; |
| 1232 | 1246 | uc_transact = (struct ucontext __user *)(uintptr_t)tmp; |
| @@ -676,7 +676,21 @@ int sys_rt_sigreturn(unsigned long r3, unsigned long r4, unsigned long r5, · 675 unmodified lines | ||
| 676 | 676 | if (__copy_from_user(&set, &uc->uc_sigmask, sizeof(set))) |
| 677 | 677 | goto badframe; |
| 678 | 678 | set_current_blocked(&set); |
| 679 | + | |
| 679 | 680 | #ifdef CONFIG_PPC_TRANSACTIONAL_MEM |
| 681 | + /* | |
| 682 | + * If there is a transactional state then throw it away. | |
| 683 | + * The purpose of a sigreturn is to destroy all traces of the | |
| 684 | + * signal frame, this includes any transactional state created | |
| 685 | + * within in. We only check for suspended as we can never be | |
| 686 | + * active in the kernel, we are active, there is nothing better to | |
| 687 | + * do than go ahead and Bad Thing later. | |
| 688 | + * The cause is not important as there will never be a | |
| 689 | + * recheckpoint so it's not user visible. | |
| 690 | + */ | |
| 691 | + if (MSR_TM_SUSPENDED(mfmsr())) | |
| 692 | + tm_reclaim_current(0); | |
| 693 | + | |
| 680 | 694 | if (__get_user(msr, &uc->uc_mcontext.gp_regs[PT_MSR])) |
| 681 | 695 | goto badframe; |
| 682 | 696 | if (MSR_TM_ACTIVE(msr)) { |
| @@ -830,7 +830,7 @@ int __cpu_disable(void) · 829 unmodified lines | ||
| 830 | 830 | |
| 831 | 831 | /* Update sibling maps */ |
| 832 | 832 | base = cpu_first_thread_sibling(cpu); |
| 833 | − for (i = 0; i < threads_per_core; i++) { | |
| 833 | + for (i = 0; i < threads_per_core && base + i < nr_cpu_ids; i++) { | |
| 834 | 834 | cpumask_clear_cpu(cpu, cpu_sibling_mask(base + i)); |
| 835 | 835 | cpumask_clear_cpu(base + i, cpu_sibling_mask(cpu)); |
| 836 | 836 | cpumask_clear_cpu(cpu, cpu_core_mask(base + i)); |
| @@ -25,7 +25,8 @@ · 24 unmodified lines | ||
| 25 | 25 | #include <linux/user.h> |
| 26 | 26 | #include <linux/interrupt.h> |
| 27 | 27 | #include <linux/init.h> |
| 28 | −#include <linux/module.h> | |
| 28 | +#include <linux/extable.h> | |
| 29 | +#include <linux/module.h> /* print_modules */ | |
| 29 | 30 | #include <linux/prctl.h> |
| 30 | 31 | #include <linux/delay.h> |
| 31 | 32 | #include <linux/kprobes.h> |
| @@ -78,6 +78,7 @@ kvm-book3s_64-builtin-xics-objs-$(CONFIG_KVM_XICS) := \ · 77 unmodified lines | ||
| 78 | 78 | |
| 79 | 79 | ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE |
| 80 | 80 | kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HANDLER) += \ |
| 81 | + book3s_hv_hmi.o \ | |
| 81 | 82 | book3s_hv_rmhandlers.o \ |
| 82 | 83 | book3s_hv_rm_mmu.o \ |
| 83 | 84 | book3s_hv_ras.o \ |
File renamed without changes.
| @@ -127,18 +127,19 @@ _GLOBAL(csum_partial_copy_generic) · 126 unmodified lines | ||
| 127 | 127 | stw r7,12(r1) |
| 128 | 128 | stw r8,8(r1) |
| 129 | 129 | |
| 130 | − rlwinm r0,r4,3,0x8 | |
| 131 | − rlwnm r6,r6,r0,0,31 /* odd destination address: rotate one byte */ | |
| 132 | − cmplwi cr7,r0,0 /* is destination address even ? */ | |
| 133 | 130 | addic r12,r6,0 |
| 134 | 131 | addi r6,r4,-4 |
| 135 | 132 | neg r0,r4 |
| 136 | 133 | addi r4,r3,-4 |
| 137 | 134 | andi. r0,r0,CACHELINE_MASK /* # bytes to start of cache line */ |
| 135 | + crset 4*cr7+eq | |
| 138 | 136 | beq 58f |
| 139 | 137 | |
| 140 | 138 | cmplw 0,r5,r0 /* is this more than total to do? */ |
| 141 | 139 | blt 63f /* if not much to do */ |
| 140 | + rlwinm r7,r6,3,0x8 | |
| 141 | + rlwnm r12,r12,r7,0,31 /* odd destination address: rotate one byte */ | |
| 142 | + cmplwi cr7,r7,0 /* is destination address even ? */ | |
| 142 | 143 | andi. r8,r0,3 /* get it word-aligned first */ |
| 143 | 144 | mtctr r8 |
| 144 | 145 | beq+ 61f |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/mm.h> |
| 27 | 27 | #include <linux/interrupt.h> |
| 28 | 28 | #include <linux/highmem.h> |
| 29 | −#include <linux/module.h> | |
| 29 | +#include <linux/extable.h> | |
| 30 | 30 | #include <linux/kprobes.h> |
| 31 | 31 | #include <linux/kdebug.h> |
| 32 | 32 | #include <linux/perf_event.h> |
| @@ -113,7 +113,12 @@ BEGIN_FTR_SECTION · 112 unmodified lines | ||
| 113 | 113 | END_MMU_FTR_SECTION_IFCLR(MMU_FTR_1T_SEGMENT) |
| 114 | 114 | b slb_finish_load_1T |
| 115 | 115 | |
| 116 | −0: | |
| 116 | +0: /* | |
| 117 | + * For userspace addresses, make sure this is region 0. | |
| 118 | + */ | |
| 119 | + cmpdi r9, 0 | |
| 120 | + bne 8f | |
| 121 | + | |
| 117 | 122 | /* when using slices, we extract the psize off the slice bitmaps |
| 118 | 123 | * and then we need to get the sllp encoding off the mmu_psize_defs |
| 119 | 124 | * array. |
| @@ -528,7 +528,6 @@ static struct platform_driver mpc512x_lpbfifo_driver = { · 527 unmodified lines | ||
| 528 | 528 | .remove = mpc512x_lpbfifo_remove, |
| 529 | 529 | .driver = { |
| 530 | 530 | .name = DRV_NAME, |
| 531 | − .owner = THIS_MODULE, | |
| 532 | 531 | .of_match_table = mpc512x_lpbfifo_match, |
| 533 | 532 | }, |
| 534 | 533 | }; |
| @@ -222,7 +222,6 @@ static const struct of_device_id mcu_of_match_table[] = { · 221 unmodified lines | ||
| 222 | 222 | static struct i2c_driver mcu_driver = { |
| 223 | 223 | .driver = { |
| 224 | 224 | .name = "mcu-mpc8349emitx", |
| 225 | − .owner = THIS_MODULE, | |
| 226 | 225 | .of_match_table = mcu_of_match_table, |
| 227 | 226 | }, |
| 228 | 227 | .probe = mcu_probe, |
| @@ -26,7 +26,7 @@ · 25 unmodified lines | ||
| 26 | 26 | #include <linux/tty.h> |
| 27 | 27 | #include <linux/serial_core.h> |
| 28 | 28 | #include <linux/of_platform.h> |
| 29 | −#include <linux/module.h> | |
| 29 | +#include <linux/extable.h> | |
| 30 | 30 | |
| 31 | 31 | #include <asm/time.h> |
| 32 | 32 | #include <asm/machdep.h> |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <linux/pci.h> |
| 24 | 24 | #include <linux/kdev_t.h> |
| 25 | 25 | #include <linux/console.h> |
| 26 | −#include <linux/module.h> | |
| 26 | +#include <linux/extable.h> | |
| 27 | 27 | #include <linux/delay.h> |
| 28 | 28 | #include <linux/irq.h> |
| 29 | 29 | #include <linux/seq_file.h> |
| @@ -370,6 +370,7 @@ static irqreturn_t process_dump(int irq, void *data) · 369 unmodified lines | ||
| 370 | 370 | uint32_t dump_id, dump_size, dump_type; |
| 371 | 371 | struct dump_obj *dump; |
| 372 | 372 | char name[22]; |
| 373 | + struct kobject *kobj; | |
| 373 | 374 | |
| 374 | 375 | rc = dump_read_info(&dump_id, &dump_size, &dump_type); |
| 375 | 376 | if (rc != OPAL_SUCCESS) |
| @@ -381,8 +382,12 @@ static irqreturn_t process_dump(int irq, void *data) · 5 unmodified lines | ||
| 381 | 382 | * that gracefully and not create two conflicting |
| 382 | 383 | * entries. |
| 383 | 384 | */ |
| 384 | − if (kset_find_obj(dump_kset, name)) | |
| 385 | + kobj = kset_find_obj(dump_kset, name); | |
| 386 | + if (kobj) { | |
| 387 | + /* Drop reference added by kset_find_obj() */ | |
| 388 | + kobject_put(kobj); | |
| 385 | 389 | return 0; |
| 390 | + } | |
| 386 | 391 | |
| 387 | 392 | dump = create_dump_obj(dump_id, dump_size, dump_type); |
| 388 | 393 | if (!dump) |
| @@ -247,6 +247,7 @@ static irqreturn_t elog_event(int irq, void *data) · 246 unmodified lines | ||
| 247 | 247 | uint64_t elog_type; |
| 248 | 248 | int rc; |
| 249 | 249 | char name[2+16+1]; |
| 250 | + struct kobject *kobj; | |
| 250 | 251 | |
| 251 | 252 | rc = opal_get_elog_size(&id, &size, &type); |
| 252 | 253 | if (rc != OPAL_SUCCESS) { |
| @@ -269,8 +270,12 @@ static irqreturn_t elog_event(int irq, void *data) · 16 unmodified lines | ||
| 269 | 270 | * that gracefully and not create two conflicting |
| 270 | 271 | * entries. |
| 271 | 272 | */ |
| 272 | − if (kset_find_obj(elog_kset, name)) | |
| 273 | + kobj = kset_find_obj(elog_kset, name); | |
| 274 | + if (kobj) { | |
| 275 | + /* Drop reference added by kset_find_obj() */ | |
| 276 | + kobject_put(kobj); | |
| 273 | 277 | return IRQ_HANDLED; |
| 278 | + } | |
| 274 | 279 | |
| 275 | 280 | create_elog_obj(log_id, elog_size, elog_type); |
| 276 | 281 | |
| @@ -124,6 +124,13 @@ static inline bool pnv_pci_is_m64(struct pnv_phb *phb, struct resource *r) · 123 unmodified lines | ||
| 124 | 124 | r->start < (phb->ioda.m64_base + phb->ioda.m64_size)); |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | +static inline bool pnv_pci_is_m64_flags(unsigned long resource_flags) | |
| 128 | +{ | |
| 129 | + unsigned long flags = (IORESOURCE_MEM_64 | IORESOURCE_PREFETCH); | |
| 130 | + | |
| 131 | + return (resource_flags & flags) == flags; | |
| 132 | +} | |
| 133 | + | |
| 127 | 134 | static struct pnv_ioda_pe *pnv_ioda_init_pe(struct pnv_phb *phb, int pe_no) |
| 128 | 135 | { |
| 129 | 136 | phb->ioda.pe_array[pe_no].phb = phb; |
| @@ -149,7 +156,7 @@ static void pnv_ioda_reserve_pe(struct pnv_phb *phb, int pe_no) · 19 unmodified lines | ||
| 149 | 156 | |
| 150 | 157 | static struct pnv_ioda_pe *pnv_ioda_alloc_pe(struct pnv_phb *phb) |
| 151 | 158 | { |
| 152 | − unsigned long pe = phb->ioda.total_pe_num - 1; | |
| 159 | + long pe; | |
| 153 | 160 | |
| 154 | 161 | for (pe = phb->ioda.total_pe_num - 1; pe >= 0; pe--) { |
| 155 | 162 | if (!test_and_set_bit(pe, phb->ioda.pe_alloc)) |
| @@ -162,11 +169,12 @@ static struct pnv_ioda_pe *pnv_ioda_alloc_pe(struct pnv_phb *phb) · 6 unmodified lines | ||
| 162 | 169 | static void pnv_ioda_free_pe(struct pnv_ioda_pe *pe) |
| 163 | 170 | { |
| 164 | 171 | struct pnv_phb *phb = pe->phb; |
| 172 | + unsigned int pe_num = pe->pe_number; | |
| 165 | 173 | |
| 166 | 174 | WARN_ON(pe->pdev); |
| 167 | 175 | |
| 168 | 176 | memset(pe, 0, sizeof(struct pnv_ioda_pe)); |
| 169 | − clear_bit(pe->pe_number, phb->ioda.pe_alloc); | |
| 177 | + clear_bit(pe_num, phb->ioda.pe_alloc); | |
| 170 | 178 | } |
| 171 | 179 | |
| 172 | 180 | /* The default M64 BAR is shared by all PEs */ |
| @@ -2216,7 +2224,7 @@ static long pnv_pci_ioda2_set_window(struct iommu_table_group *table_group, · 2043 unmodified lines | ||
| 2216 | 2224 | |
| 2217 | 2225 | pnv_pci_link_table_and_group(phb->hose->node, num, |
| 2218 | 2226 | tbl, &pe->table_group); |
| 2219 | − pnv_pci_phb3_tce_invalidate_pe(pe); | |
| 2227 | + pnv_pci_ioda2_tce_invalidate_pe(pe); | |
| 2220 | 2228 | |
| 2221 | 2229 | return 0; |
| 2222 | 2230 | } |
| @@ -2354,7 +2362,7 @@ static long pnv_pci_ioda2_unset_window(struct iommu_table_group *table_group, · 131 unmodified lines | ||
| 2354 | 2362 | if (ret) |
| 2355 | 2363 | pe_warn(pe, "Unmapping failed, ret = %ld\n", ret); |
| 2356 | 2364 | else |
| 2357 | − pnv_pci_phb3_tce_invalidate_pe(pe); | |
| 2365 | + pnv_pci_ioda2_tce_invalidate_pe(pe); | |
| 2358 | 2366 | |
| 2359 | 2367 | pnv_pci_unlink_table_and_group(table_group->tables[num], table_group); |
| 2360 | 2368 | |
| @@ -2870,7 +2878,7 @@ static void pnv_pci_ioda_fixup_iov_resources(struct pci_dev *pdev) · 509 unmodified lines | ||
| 2870 | 2878 | res = &pdev->resource[i + PCI_IOV_RESOURCES]; |
| 2871 | 2879 | if (!res->flags || res->parent) |
| 2872 | 2880 | continue; |
| 2873 | − if (!pnv_pci_is_m64(phb, res)) { | |
| 2881 | + if (!pnv_pci_is_m64_flags(res->flags)) { | |
| 2874 | 2882 | dev_warn(&pdev->dev, "Don't support SR-IOV with" |
| 2875 | 2883 | " non M64 VF BAR%d: %pR. \n", |
| 2876 | 2884 | i, res); |
| @@ -3095,7 +3103,7 @@ static resource_size_t pnv_pci_window_alignment(struct pci_bus *bus, · 218 unmodified lines | ||
| 3095 | 3103 | * alignment for any 64-bit resource, PCIe doesn't care and |
| 3096 | 3104 | * bridges only do 64-bit prefetchable anyway. |
| 3097 | 3105 | */ |
| 3098 | − if (phb->ioda.m64_segsize && (type & IORESOURCE_MEM_64)) | |
| 3106 | + if (phb->ioda.m64_segsize && pnv_pci_is_m64_flags(type)) | |
| 3099 | 3107 | return phb->ioda.m64_segsize; |
| 3100 | 3108 | if (type & IORESOURCE_MEM) |
| 3101 | 3109 | return phb->ioda.m32_segsize; |
| @@ -3402,12 +3410,6 @@ static void pnv_ioda_release_pe(struct pnv_ioda_pe *pe) · 300 unmodified lines | ||
| 3402 | 3410 | struct pnv_phb *phb = pe->phb; |
| 3403 | 3411 | struct pnv_ioda_pe *slave, *tmp; |
| 3404 | 3412 | |
| 3405 | − /* Release slave PEs in compound PE */ | |
| 3406 | − if (pe->flags & PNV_IODA_PE_MASTER) { | |
| 3407 | − list_for_each_entry_safe(slave, tmp, &pe->slaves, list) | |
| 3408 | − pnv_ioda_release_pe(slave); | |
| 3409 | − } | |
| 3410 | − | |
| 3411 | 3413 | list_del(&pe->list); |
| 3412 | 3414 | switch (phb->type) { |
| 3413 | 3415 | case PNV_PHB_IODA1: |
| @@ -3422,7 +3424,26 @@ static void pnv_ioda_release_pe(struct pnv_ioda_pe *pe) · 8 unmodified lines | ||
| 3422 | 3424 | |
| 3423 | 3425 | pnv_ioda_release_pe_seg(pe); |
| 3424 | 3426 | pnv_ioda_deconfigure_pe(pe->phb, pe); |
| 3425 | − pnv_ioda_free_pe(pe); | |
| 3427 | + | |
| 3428 | + /* Release slave PEs in the compound PE */ | |
| 3429 | + if (pe->flags & PNV_IODA_PE_MASTER) { | |
| 3430 | + list_for_each_entry_safe(slave, tmp, &pe->slaves, list) { | |
| 3431 | + list_del(&slave->list); | |
| 3432 | + pnv_ioda_free_pe(slave); | |
| 3433 | + } | |
| 3434 | + } | |
| 3435 | + | |
| 3436 | + /* | |
| 3437 | + * The PE for root bus can be removed because of hotplug in EEH | |
| 3438 | + * recovery for fenced PHB error. We need to mark the PE dead so | |
| 3439 | + * that it can be populated again in PCI hot add path. The PE | |
| 3440 | + * shouldn't be destroyed as it's the global reserved resource. | |
| 3441 | + */ | |
| 3442 | + if (phb->ioda.root_pe_populated && | |
| 3443 | + phb->ioda.root_pe_idx == pe->pe_number) | |
| 3444 | + phb->ioda.root_pe_populated = false; | |
| 3445 | + else | |
| 3446 | + pnv_ioda_free_pe(pe); | |
| 3426 | 3447 | } |
| 3427 | 3448 | |
| 3428 | 3449 | static void pnv_pci_release_device(struct pci_dev *pdev) |
| @@ -3438,7 +3459,17 @@ static void pnv_pci_release_device(struct pci_dev *pdev) · 9 unmodified lines | ||
| 3438 | 3459 | if (!pdn || pdn->pe_number == IODA_INVALID_PE) |
| 3439 | 3460 | return; |
| 3440 | 3461 | |
| 3462 | + /* | |
| 3463 | + * PCI hotplug can happen as part of EEH error recovery. The @pdn | |
| 3464 | + * isn't removed and added afterwards in this scenario. We should | |
| 3465 | + * set the PE number in @pdn to an invalid one. Otherwise, the PE's | |
| 3466 | + * device count is decreased on removing devices while failing to | |
| 3467 | + * be increased on adding devices. It leads to unbalanced PE's device | |
| 3468 | + * count and eventually make normal PCI hotplug path broken. | |
| 3469 | + */ | |
| 3441 | 3470 | pe = &phb->ioda.pe_array[pdn->pe_number]; |
| 3471 | + pdn->pe_number = IODA_INVALID_PE; | |
| 3472 | + | |
| 3442 | 3473 | WARN_ON(--pe->device_count < 0); |
| 3443 | 3474 | if (pe->device_count == 0) |
| 3444 | 3475 | pnv_ioda_release_pe(pe); |
| @@ -119,6 +119,10 @@ int pseries_root_bridge_prepare(struct pci_host_bridge *bridge) · 118 unmodified lines | ||
| 119 | 119 | |
| 120 | 120 | bus = bridge->bus; |
| 121 | 121 | |
| 122 | + /* Rely on the pcibios_free_controller_deferred() callback. */ | |
| 123 | + pci_set_host_bridge_release(bridge, pcibios_free_controller_deferred, | |
| 124 | + (void *) pci_bus_to_host(bus)); | |
| 125 | + | |
| 122 | 126 | dn = pcibios_get_phb_of_node(bus); |
| 123 | 127 | if (!dn) |
| 124 | 128 | return 0; |
| @@ -106,8 +106,11 @@ int remove_phb_dynamic(struct pci_controller *phb) · 105 unmodified lines | ||
| 106 | 106 | release_resource(res); |
| 107 | 107 | } |
| 108 | 108 | |
| 109 | − /* Free pci_controller data structure */ | |
| 110 | − pcibios_free_controller(phb); | |
| 109 | + /* | |
| 110 | + * The pci_controller data structure is freed by | |
| 111 | + * the pcibios_free_controller_deferred() callback; | |
| 112 | + * see pseries_root_bridge_prepare(). | |
| 113 | + */ | |
| 111 | 114 | |
| 112 | 115 | return 0; |
| 113 | 116 | } |
| @@ -41,7 +41,6 @@ · 40 unmodified lines | ||
| 41 | 41 | #include <linux/root_dev.h> |
| 42 | 42 | #include <linux/of.h> |
| 43 | 43 | #include <linux/of_pci.h> |
| 44 | −#include <linux/kexec.h> | |
| 45 | 44 | |
| 46 | 45 | #include <asm/mmu.h> |
| 47 | 46 | #include <asm/processor.h> |
| @@ -66,6 +65,7 @@ · 18 unmodified lines | ||
| 66 | 65 | #include <asm/eeh.h> |
| 67 | 66 | #include <asm/reg.h> |
| 68 | 67 | #include <asm/plpar_wrappers.h> |
| 68 | +#include <asm/kexec.h> | |
| 69 | 69 | |
| 70 | 70 | #include "pseries.h" |
| 71 | 71 | |
| @@ -534,7 +534,8 @@ struct cpm1_gpio16_chip { · 533 unmodified lines | ||
| 534 | 534 | |
| 535 | 535 | static void cpm1_gpio16_save_regs(struct of_mm_gpio_chip *mm_gc) |
| 536 | 536 | { |
| 537 | − struct cpm1_gpio16_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc); | |
| 537 | + struct cpm1_gpio16_chip *cpm1_gc = | |
| 538 | + container_of(mm_gc, struct cpm1_gpio16_chip, mm_gc); | |
| 538 | 539 | struct cpm_ioport16 __iomem *iop = mm_gc->regs; |
| 539 | 540 | |
| 540 | 541 | cpm1_gc->cpdata = in_be16(&iop->dat); |
| @@ -649,7 +650,8 @@ struct cpm1_gpio32_chip { · 108 unmodified lines | ||
| 649 | 650 | |
| 650 | 651 | static void cpm1_gpio32_save_regs(struct of_mm_gpio_chip *mm_gc) |
| 651 | 652 | { |
| 652 | − struct cpm1_gpio32_chip *cpm1_gc = gpiochip_get_data(&mm_gc->gc); | |
| 653 | + struct cpm1_gpio32_chip *cpm1_gc = | |
| 654 | + container_of(mm_gc, struct cpm1_gpio32_chip, mm_gc); | |
| 653 | 655 | struct cpm_ioport32b __iomem *iop = mm_gc->regs; |
| 654 | 656 | |
| 655 | 657 | cpm1_gc->cpdata = in_be32(&iop->dat); |
| @@ -94,7 +94,8 @@ struct cpm2_gpio32_chip { · 93 unmodified lines | ||
| 94 | 94 | |
| 95 | 95 | static void cpm2_gpio32_save_regs(struct of_mm_gpio_chip *mm_gc) |
| 96 | 96 | { |
| 97 | − struct cpm2_gpio32_chip *cpm2_gc = gpiochip_get_data(&mm_gc->gc); | |
| 97 | + struct cpm2_gpio32_chip *cpm2_gc = | |
| 98 | + container_of(mm_gc, struct cpm2_gpio32_chip, mm_gc); | |
| 98 | 99 | struct cpm2_ioports __iomem *iop = mm_gc->regs; |
| 99 | 100 | |
| 100 | 101 | cpm2_gc->cpdata = in_be32(&iop->dat); |
| @@ -23,7 +23,7 @@ · 22 unmodified lines | ||
| 23 | 23 | */ |
| 24 | 24 | |
| 25 | 25 | #include <linux/init.h> |
| 26 | −#include <linux/module.h> | |
| 26 | +#include <linux/extable.h> | |
| 27 | 27 | #include <linux/types.h> |
| 28 | 28 | #include <linux/dma-mapping.h> |
| 29 | 29 | #include <linux/interrupt.h> |
| @@ -23,10 +23,10 @@ · 22 unmodified lines | ||
| 23 | 23 | |
| 24 | 24 | static void icp_opal_teardown_cpu(void) |
| 25 | 25 | { |
| 26 | − int cpu = smp_processor_id(); | |
| 26 | + int hw_cpu = hard_smp_processor_id(); | |
| 27 | 27 | |
| 28 | 28 | /* Clear any pending IPI */ |
| 29 | − opal_int_set_mfrr(cpu, 0xff); | |
| 29 | + opal_int_set_mfrr(hw_cpu, 0xff); | |
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | static void icp_opal_flush_ipi(void) |
| @@ -101,14 +101,16 @@ static void icp_opal_eoi(struct irq_data *d) · 68 unmodified lines | ||
| 101 | 101 | |
| 102 | 102 | static void icp_opal_cause_ipi(int cpu, unsigned long data) |
| 103 | 103 | { |
| 104 | − opal_int_set_mfrr(cpu, IPI_PRIORITY); | |
| 104 | + int hw_cpu = get_hard_smp_processor_id(cpu); | |
| 105 | + | |
| 106 | + opal_int_set_mfrr(hw_cpu, IPI_PRIORITY); | |
| 105 | 107 | } |
| 106 | 108 | |
| 107 | 109 | static irqreturn_t icp_opal_ipi_action(int irq, void *dev_id) |
| 108 | 110 | { |
| 109 | − int cpu = smp_processor_id(); | |
| 111 | + int hw_cpu = hard_smp_processor_id(); | |
| 110 | 112 | |
| 111 | − opal_int_set_mfrr(cpu, 0xff); | |
| 113 | + opal_int_set_mfrr(hw_cpu, 0xff); | |
| 112 | 114 | |
| 113 | 115 | return smp_ipi_demux(); |
| 114 | 116 | } |
| @@ -68,7 +68,6 @@ config DEBUG_RODATA · 67 unmodified lines | ||
| 68 | 68 | config S390 |
| 69 | 69 | def_bool y |
| 70 | 70 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 71 | − select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | |
| 72 | 71 | select ARCH_HAS_DEVMEM_IS_ALLOWED |
| 73 | 72 | select ARCH_HAS_ELF_RANDOMIZE |
| 74 | 73 | select ARCH_HAS_GCOV_PROFILE_ALL |
| @@ -21,16 +21,21 @@ ENTRY(startup_continue) · 20 unmodified lines | ||
| 21 | 21 | lg %r15,.Lstack-.LPG1(%r13) |
| 22 | 22 | aghi %r15,-160 |
| 23 | 23 | brasl %r14,decompress_kernel |
| 24 | − # setup registers for memory mover & branch to target | |
| 24 | + # Set up registers for memory mover. We move the decompressed image to | |
| 25 | + # 0x11000, starting at offset 0x11000 in the decompressed image so | |
| 26 | + # that code living at 0x11000 in the image will end up at 0x11000 in | |
| 27 | + # memory. | |
| 25 | 28 | lgr %r4,%r2 |
| 26 | 29 | lg %r2,.Loffset-.LPG1(%r13) |
| 27 | 30 | la %r4,0(%r2,%r4) |
| 28 | 31 | lg %r3,.Lmvsize-.LPG1(%r13) |
| 29 | 32 | lgr %r5,%r3 |
| 30 | − # move the memory mover someplace safe | |
| 33 | + # Move the memory mover someplace safe so it doesn't overwrite itself. | |
| 31 | 34 | la %r1,0x200 |
| 32 | 35 | mvc 0(mover_end-mover,%r1),mover-.LPG1(%r13) |
| 33 | − # decompress image is started at 0x11000 | |
| 36 | + # When the memory mover is done we pass control to | |
| 37 | + # arch/s390/kernel/head64.S:startup_continue which lives at 0x11000 in | |
| 38 | + # the decompressed image. | |
| 34 | 39 | lgr %r6,%r2 |
| 35 | 40 | br %r1 |
| 36 | 41 | mover: |
| @@ -602,7 +602,6 @@ CONFIG_FAIL_FUTEX=y · 601 unmodified lines | ||
| 602 | 602 | CONFIG_FAULT_INJECTION_DEBUG_FS=y |
| 603 | 603 | CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y |
| 604 | 604 | CONFIG_LATENCYTOP=y |
| 605 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 606 | 605 | CONFIG_IRQSOFF_TRACER=y |
| 607 | 606 | CONFIG_PREEMPT_TRACER=y |
| 608 | 607 | CONFIG_SCHED_TRACER=y |
| @@ -678,7 +677,7 @@ CONFIG_CRYPTO_SHA512_S390=m · 69 unmodified lines | ||
| 678 | 677 | CONFIG_CRYPTO_DES_S390=m |
| 679 | 678 | CONFIG_CRYPTO_AES_S390=m |
| 680 | 679 | CONFIG_CRYPTO_GHASH_S390=m |
| 681 | −CONFIG_CRYPTO_CRC32_S390=m | |
| 680 | +CONFIG_CRYPTO_CRC32_S390=y | |
| 682 | 681 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
| 683 | 682 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
| 684 | 683 | CONFIG_X509_CERTIFICATE_PARSER=m |
| @@ -552,7 +552,6 @@ CONFIG_NOTIFIER_ERROR_INJECTION=m · 551 unmodified lines | ||
| 552 | 552 | CONFIG_CPU_NOTIFIER_ERROR_INJECT=m |
| 553 | 553 | CONFIG_PM_NOTIFIER_ERROR_INJECT=m |
| 554 | 554 | CONFIG_LATENCYTOP=y |
| 555 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 556 | 555 | CONFIG_BLK_DEV_IO_TRACE=y |
| 557 | 556 | # CONFIG_KPROBE_EVENT is not set |
| 558 | 557 | CONFIG_TRACE_ENUM_MAP_FILE=y |
| @@ -616,7 +615,7 @@ CONFIG_CRYPTO_SHA512_S390=m · 57 unmodified lines | ||
| 616 | 615 | CONFIG_CRYPTO_DES_S390=m |
| 617 | 616 | CONFIG_CRYPTO_AES_S390=m |
| 618 | 617 | CONFIG_CRYPTO_GHASH_S390=m |
| 619 | −CONFIG_CRYPTO_CRC32_S390=m | |
| 618 | +CONFIG_CRYPTO_CRC32_S390=y | |
| 620 | 619 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
| 621 | 620 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
| 622 | 621 | CONFIG_X509_CERTIFICATE_PARSER=m |
| @@ -549,7 +549,6 @@ CONFIG_TIMER_STATS=y · 548 unmodified lines | ||
| 549 | 549 | CONFIG_RCU_TORTURE_TEST=m |
| 550 | 550 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 |
| 551 | 551 | CONFIG_LATENCYTOP=y |
| 552 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 553 | 552 | CONFIG_SCHED_TRACER=y |
| 554 | 553 | CONFIG_FTRACE_SYSCALLS=y |
| 555 | 554 | CONFIG_STACK_TRACER=y |
| @@ -615,7 +614,7 @@ CONFIG_CRYPTO_SHA512_S390=m · 59 unmodified lines | ||
| 615 | 614 | CONFIG_CRYPTO_DES_S390=m |
| 616 | 615 | CONFIG_CRYPTO_AES_S390=m |
| 617 | 616 | CONFIG_CRYPTO_GHASH_S390=m |
| 618 | −CONFIG_CRYPTO_CRC32_S390=m | |
| 617 | +CONFIG_CRYPTO_CRC32_S390=y | |
| 619 | 618 | CONFIG_ASYMMETRIC_KEY_TYPE=y |
| 620 | 619 | CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=m |
| 621 | 620 | CONFIG_X509_CERTIFICATE_PARSER=m |
| @@ -51,6 +51,9 @@ u32 crc32c_le_vgfm_16(u32 crc, unsigned char const *buf, size_t size); · 50 unmodified lines | ||
| 51 | 51 | struct kernel_fpu vxstate; \ |
| 52 | 52 | unsigned long prealign, aligned, remaining; \ |
| 53 | 53 | \ |
| 54 | + if (datalen < VX_MIN_LEN + VX_ALIGN_MASK) \ | |
| 55 | + return ___crc32_sw(crc, data, datalen); \ | |
| 56 | + \ | |
| 54 | 57 | if ((unsigned long)data & VX_ALIGN_MASK) { \ |
| 55 | 58 | prealign = VX_ALIGNMENT - \ |
| 56 | 59 | ((unsigned long)data & VX_ALIGN_MASK); \ |
| @@ -59,9 +62,6 @@ u32 crc32c_le_vgfm_16(u32 crc, unsigned char const *buf, size_t size); · 2 unmodified lines | ||
| 59 | 62 | data = (void *)((unsigned long)data + prealign); \ |
| 60 | 63 | } \ |
| 61 | 64 | \ |
| 62 | − if (datalen < VX_MIN_LEN) \ | |
| 63 | − return ___crc32_sw(crc, data, datalen); \ | |
| 64 | − \ | |
| 65 | 65 | aligned = datalen & ~VX_ALIGN_MASK; \ |
| 66 | 66 | remaining = datalen & VX_ALIGN_MASK; \ |
| 67 | 67 | \ |
| @@ -172,7 +172,6 @@ CONFIG_DEBUG_NOTIFIERS=y · 171 unmodified lines | ||
| 172 | 172 | CONFIG_RCU_CPU_STALL_TIMEOUT=60 |
| 173 | 173 | CONFIG_RCU_TRACE=y |
| 174 | 174 | CONFIG_LATENCYTOP=y |
| 175 | −CONFIG_DEBUG_STRICT_USER_COPY_CHECKS=y | |
| 176 | 175 | CONFIG_SCHED_TRACER=y |
| 177 | 176 | CONFIG_FTRACE_SYSCALLS=y |
| 178 | 177 | CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP=y |
| @@ -234,7 +233,7 @@ CONFIG_CRYPTO_SHA256_S390=m · 55 unmodified lines | ||
| 234 | 233 | CONFIG_CRYPTO_SHA512_S390=m |
| 235 | 234 | CONFIG_CRYPTO_DES_S390=m |
| 236 | 235 | CONFIG_CRYPTO_AES_S390=m |
| 237 | −CONFIG_CRYPTO_CRC32_S390=m | |
| 236 | +CONFIG_CRYPTO_CRC32_S390=y | |
| 238 | 237 | CONFIG_CRC7=m |
| 239 | 238 | # CONFIG_XZ_DEC_X86 is not set |
| 240 | 239 | # CONFIG_XZ_DEC_POWERPC is not set |
| @@ -266,28 +266,28 @@ int __put_user_bad(void) __attribute__((noreturn)); · 265 unmodified lines | ||
| 266 | 266 | __chk_user_ptr(ptr); \ |
| 267 | 267 | switch (sizeof(*(ptr))) { \ |
| 268 | 268 | case 1: { \ |
| 269 | − unsigned char __x; \ | |
| 269 | + unsigned char __x = 0; \ | |
| 270 | 270 | __gu_err = __get_user_fn(&__x, ptr, \ |
| 271 | 271 | sizeof(*(ptr))); \ |
| 272 | 272 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 273 | 273 | break; \ |
| 274 | 274 | }; \ |
| 275 | 275 | case 2: { \ |
| 276 | − unsigned short __x; \ | |
| 276 | + unsigned short __x = 0; \ | |
| 277 | 277 | __gu_err = __get_user_fn(&__x, ptr, \ |
| 278 | 278 | sizeof(*(ptr))); \ |
| 279 | 279 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 280 | 280 | break; \ |
| 281 | 281 | }; \ |
| 282 | 282 | case 4: { \ |
| 283 | − unsigned int __x; \ | |
| 283 | + unsigned int __x = 0; \ | |
| 284 | 284 | __gu_err = __get_user_fn(&__x, ptr, \ |
| 285 | 285 | sizeof(*(ptr))); \ |
| 286 | 286 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| 287 | 287 | break; \ |
| 288 | 288 | }; \ |
| 289 | 289 | case 8: { \ |
| 290 | − unsigned long long __x; \ | |
| 290 | + unsigned long long __x = 0; \ | |
| 291 | 291 | __gu_err = __get_user_fn(&__x, ptr, \ |
| 292 | 292 | sizeof(*(ptr))); \ |
| 293 | 293 | (x) = *(__force __typeof__(*(ptr)) *) &__x; \ |
| @@ -311,6 +311,14 @@ int __get_user_bad(void) __attribute__((noreturn)); · 17 unmodified lines | ||
| 311 | 311 | #define __put_user_unaligned __put_user |
| 312 | 312 | #define __get_user_unaligned __get_user |
| 313 | 313 | |
| 314 | +extern void __compiletime_error("usercopy buffer size is too small") | |
| 315 | +__bad_copy_user(void); | |
| 316 | + | |
| 317 | +static inline void copy_user_overflow(int size, unsigned long count) | |
| 318 | +{ | |
| 319 | + WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count); | |
| 320 | +} | |
| 321 | + | |
| 314 | 322 | /** |
| 315 | 323 | * copy_to_user: - Copy a block of data into user space. |
| 316 | 324 | * @to: Destination address, in user space. |
| @@ -332,12 +340,6 @@ copy_to_user(void __user *to, const void *from, unsigned long n) · 15 unmodified lines | ||
| 332 | 340 | return __copy_to_user(to, from, n); |
| 333 | 341 | } |
| 334 | 342 | |
| 335 | −void copy_from_user_overflow(void) | |
| 336 | −#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS | |
| 337 | −__compiletime_warning("copy_from_user() buffer size is not provably correct") | |
| 338 | −#endif | |
| 339 | −; | |
| 340 | − | |
| 341 | 343 | /** |
| 342 | 344 | * copy_from_user: - Copy a block of data from user space. |
| 343 | 345 | * @to: Destination address, in kernel space. |
| @@ -362,7 +364,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n) · 18 unmodified lines | ||
| 362 | 364 | |
| 363 | 365 | might_fault(); |
| 364 | 366 | if (unlikely(sz != -1 && sz < n)) { |
| 365 | − copy_from_user_overflow(); | |
| 367 | + if (!__builtin_constant_p(n)) | |
| 368 | + copy_user_overflow(sz, n); | |
| 369 | + else | |
| 370 | + __bad_copy_user(); | |
| 366 | 371 | return n; |
| 367 | 372 | } |
| 368 | 373 | return __copy_from_user(to, from, n); |
| @@ -309,7 +309,9 @@ ENTRY(startup_kdump) · 308 unmodified lines | ||
| 309 | 309 | l %r15,.Lstack-.LPG0(%r13) |
| 310 | 310 | ahi %r15,-STACK_FRAME_OVERHEAD |
| 311 | 311 | brasl %r14,verify_facilities |
| 312 | − /* Continue with startup code in head64.S */ | |
| 312 | +# For uncompressed images, continue in | |
| 313 | +# arch/s390/kernel/head64.S. For compressed images, continue in | |
| 314 | +# arch/s390/boot/compressed/head.S. | |
| 313 | 315 | jg startup_continue |
| 314 | 316 | |
| 315 | 317 | .Lstack: |
| @@ -204,11 +204,9 @@ static void __init conmode_default(void) · 203 unmodified lines | ||
| 204 | 204 | #endif |
| 205 | 205 | } |
| 206 | 206 | } else if (MACHINE_IS_KVM) { |
| 207 | − if (sclp.has_vt220 && | |
| 208 | − config_enabled(CONFIG_SCLP_VT220_CONSOLE)) | |
| 207 | + if (sclp.has_vt220 && IS_ENABLED(CONFIG_SCLP_VT220_CONSOLE)) | |
| 209 | 208 | SET_CONSOLE_VT220; |
| 210 | − else if (sclp.has_linemode && | |
| 211 | − config_enabled(CONFIG_SCLP_CONSOLE)) | |
| 209 | + else if (sclp.has_linemode && IS_ENABLED(CONFIG_SCLP_CONSOLE)) | |
| 212 | 210 | SET_CONSOLE_SCLP; |
| 213 | 211 | else |
| 214 | 212 | SET_CONSOLE_HVC; |
| @@ -2231,9 +2231,10 @@ int kvm_arch_vcpu_ioctl_set_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) · 2230 unmodified lines | ||
| 2231 | 2231 | return -EINVAL; |
| 2232 | 2232 | current->thread.fpu.fpc = fpu->fpc; |
| 2233 | 2233 | if (MACHINE_HAS_VX) |
| 2234 | − convert_fp_to_vx(current->thread.fpu.vxrs, (freg_t *)fpu->fprs); | |
| 2234 | + convert_fp_to_vx((__vector128 *) vcpu->run->s.regs.vrs, | |
| 2235 | + (freg_t *) fpu->fprs); | |
| 2235 | 2236 | else |
| 2236 | − memcpy(current->thread.fpu.fprs, &fpu->fprs, sizeof(fpu->fprs)); | |
| 2237 | + memcpy(vcpu->run->s.regs.fprs, &fpu->fprs, sizeof(fpu->fprs)); | |
| 2237 | 2238 | return 0; |
| 2238 | 2239 | } |
| 2239 | 2240 | |
| @@ -2242,9 +2243,10 @@ int kvm_arch_vcpu_ioctl_get_fpu(struct kvm_vcpu *vcpu, struct kvm_fpu *fpu) · 2 unmodified lines | ||
| 2242 | 2243 | /* make sure we have the latest values */ |
| 2243 | 2244 | save_fpu_regs(); |
| 2244 | 2245 | if (MACHINE_HAS_VX) |
| 2245 | − convert_vx_to_fp((freg_t *)fpu->fprs, current->thread.fpu.vxrs); | |
| 2246 | + convert_vx_to_fp((freg_t *) fpu->fprs, | |
| 2247 | + (__vector128 *) vcpu->run->s.regs.vrs); | |
| 2246 | 2248 | else |
| 2247 | − memcpy(fpu->fprs, current->thread.fpu.fprs, sizeof(fpu->fprs)); | |
| 2249 | + memcpy(fpu->fprs, vcpu->run->s.regs.fprs, sizeof(fpu->fprs)); | |
| 2248 | 2250 | fpu->fpc = current->thread.fpu.fpc; |
| 2249 | 2251 | return 0; |
| 2250 | 2252 | } |
| @@ -584,7 +584,7 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) · 583 unmodified lines | ||
| 584 | 584 | /* Validity 0x0044 will be checked by SIE */ |
| 585 | 585 | if (rc) |
| 586 | 586 | goto unpin; |
| 587 | − scb_s->gvrd = hpa; | |
| 587 | + scb_s->riccbd = hpa; | |
| 588 | 588 | } |
| 589 | 589 | return 0; |
| 590 | 590 | unpin: |
| @@ -237,11 +237,10 @@ char * strrchr(const char * s, int c) · 236 unmodified lines | ||
| 237 | 237 | EXPORT_SYMBOL(strrchr); |
| 238 | 238 | |
| 239 | 239 | static inline int clcle(const char *s1, unsigned long l1, |
| 240 | − const char *s2, unsigned long l2, | |
| 241 | − int *diff) | |
| 240 | + const char *s2, unsigned long l2) | |
| 242 | 241 | { |
| 243 | 242 | register unsigned long r2 asm("2") = (unsigned long) s1; |
| 244 | − register unsigned long r3 asm("3") = (unsigned long) l2; | |
| 243 | + register unsigned long r3 asm("3") = (unsigned long) l1; | |
| 245 | 244 | register unsigned long r4 asm("4") = (unsigned long) s2; |
| 246 | 245 | register unsigned long r5 asm("5") = (unsigned long) l2; |
| 247 | 246 | int cc; |
| @@ -252,7 +251,6 @@ static inline int clcle(const char *s1, unsigned long l1, · 4 unmodified lines | ||
| 252 | 251 | " srl %0,28" |
| 253 | 252 | : "=&d" (cc), "+a" (r2), "+a" (r3), |
| 254 | 253 | "+a" (r4), "+a" (r5) : : "cc"); |
| 255 | − *diff = *(char *)r2 - *(char *)r4; | |
| 256 | 254 | return cc; |
| 257 | 255 | } |
| 258 | 256 | |
| @@ -270,9 +268,9 @@ char * strstr(const char * s1,const char * s2) · 11 unmodified lines | ||
| 270 | 268 | return (char *) s1; |
| 271 | 269 | l1 = __strend(s1) - s1; |
| 272 | 270 | while (l1-- >= l2) { |
| 273 | − int cc, dummy; | |
| 271 | + int cc; | |
| 274 | 272 | |
| 275 | − cc = clcle(s1, l1, s2, l2, &dummy); | |
| 273 | + cc = clcle(s1, l2, s2, l2); | |
| 276 | 274 | if (!cc) |
| 277 | 275 | return (char *) s1; |
| 278 | 276 | s1++; |
| @@ -313,11 +311,11 @@ EXPORT_SYMBOL(memchr); · 34 unmodified lines | ||
| 313 | 311 | */ |
| 314 | 312 | int memcmp(const void *cs, const void *ct, size_t n) |
| 315 | 313 | { |
| 316 | − int ret, diff; | |
| 314 | + int ret; | |
| 317 | 315 | |
| 318 | − ret = clcle(cs, n, ct, n, &diff); | |
| 316 | + ret = clcle(cs, n, ct, n); | |
| 319 | 317 | if (ret) |
| 320 | − ret = diff; | |
| 318 | + ret = ret == 1 ? -1 : 1; | |
| 321 | 319 | return ret; |
| 322 | 320 | } |
| 323 | 321 | EXPORT_SYMBOL(memcmp); |
| @@ -252,6 +252,8 @@ static int change_page_attr(unsigned long addr, unsigned long end, · 251 unmodified lines | ||
| 252 | 252 | int rc = -EINVAL; |
| 253 | 253 | pgd_t *pgdp; |
| 254 | 254 | |
| 255 | + if (addr == end) | |
| 256 | + return 0; | |
| 255 | 257 | if (end >= MODULES_END) |
| 256 | 258 | return -EINVAL; |
| 257 | 259 | mutex_lock(&cpa_mutex); |
| @@ -163,7 +163,7 @@ do { \ · 162 unmodified lines | ||
| 163 | 163 | __get_user_asm(val, "lw", ptr); \ |
| 164 | 164 | break; \ |
| 165 | 165 | case 8: \ |
| 166 | − if ((copy_from_user((void *)&val, ptr, 8)) == 0) \ | |
| 166 | + if (__copy_from_user((void *)&val, ptr, 8) == 0) \ | |
| 167 | 167 | __gu_err = 0; \ |
| 168 | 168 | else \ |
| 169 | 169 | __gu_err = -EFAULT; \ |
| @@ -188,6 +188,8 @@ do { \ · 18 unmodified lines | ||
| 188 | 188 | \ |
| 189 | 189 | if (likely(access_ok(VERIFY_READ, __gu_ptr, size))) \ |
| 190 | 190 | __get_user_common((x), size, __gu_ptr); \ |
| 191 | + else \ | |
| 192 | + (x) = 0; \ | |
| 191 | 193 | \ |
| 192 | 194 | __gu_err; \ |
| 193 | 195 | }) |
| @@ -201,6 +203,7 @@ do { \ · 7 unmodified lines | ||
| 201 | 203 | "2:\n" \ |
| 202 | 204 | ".section .fixup,\"ax\"\n" \ |
| 203 | 205 | "3:li %0, %4\n" \ |
| 206 | + "li %1, 0\n" \ | |
| 204 | 207 | "j 2b\n" \ |
| 205 | 208 | ".previous\n" \ |
| 206 | 209 | ".section __ex_table,\"a\"\n" \ |
| @@ -298,35 +301,34 @@ extern int __copy_tofrom_user(void *to, const void *from, unsigned long len); · 91 unmodified lines | ||
| 298 | 301 | static inline unsigned long |
| 299 | 302 | copy_from_user(void *to, const void *from, unsigned long len) |
| 300 | 303 | { |
| 301 | − unsigned long over; | |
| 304 | + unsigned long res = len; | |
| 302 | 305 | |
| 303 | − if (access_ok(VERIFY_READ, from, len)) | |
| 304 | − return __copy_tofrom_user(to, from, len); | |
| 306 | + if (likely(access_ok(VERIFY_READ, from, len))) | |
| 307 | + res = __copy_tofrom_user(to, from, len); | |
| 305 | 308 | |
| 306 | − if ((unsigned long)from < TASK_SIZE) { | |
| 307 | − over = (unsigned long)from + len - TASK_SIZE; | |
| 308 | − return __copy_tofrom_user(to, from, len - over) + over; | |
| 309 | − } | |
| 310 | − return len; | |
| 309 | + if (unlikely(res)) | |
| 310 | + memset(to + (len - res), 0, res); | |
| 311 | + | |
| 312 | + return res; | |
| 311 | 313 | } |
| 312 | 314 | |
| 313 | 315 | static inline unsigned long |
| 314 | 316 | copy_to_user(void *to, const void *from, unsigned long len) |
| 315 | 317 | { |
| 316 | − unsigned long over; | |
| 317 | − | |
| 318 | − if (access_ok(VERIFY_WRITE, to, len)) | |
| 319 | − return __copy_tofrom_user(to, from, len); | |
| 318 | + if (likely(access_ok(VERIFY_WRITE, to, len))) | |
| 319 | + len = __copy_tofrom_user(to, from, len); | |
| 320 | 320 | |
| 321 | − if ((unsigned long)to < TASK_SIZE) { | |
| 322 | − over = (unsigned long)to + len - TASK_SIZE; | |
| 323 | − return __copy_tofrom_user(to, from, len - over) + over; | |
| 324 | − } | |
| 325 | 321 | return len; |
| 326 | 322 | } |
| 327 | 323 | |
| 328 | −#define __copy_from_user(to, from, len) \ | |
| 329 | − __copy_tofrom_user((to), (from), (len)) | |
| 324 | +static inline unsigned long | |
| 325 | +__copy_from_user(void *to, const void *from, unsigned long len) | |
| 326 | +{ | |
| 327 | + unsigned long left = __copy_tofrom_user(to, from, len); | |
| 328 | + if (unlikely(left)) | |
| 329 | + memset(to + (len - left), 0, left); | |
| 330 | + return left; | |
| 331 | +} | |
| 330 | 332 | |
| 331 | 333 | #define __copy_to_user(to, from, len) \ |
| 332 | 334 | __copy_tofrom_user((to), (from), (len)) |
| @@ -340,17 +342,17 @@ __copy_to_user_inatomic(void *to, const void *from, unsigned long len) · 7 unmodified lines | ||
| 340 | 342 | static inline unsigned long |
| 341 | 343 | __copy_from_user_inatomic(void *to, const void *from, unsigned long len) |
| 342 | 344 | { |
| 343 | − return __copy_from_user(to, from, len); | |
| 345 | + return __copy_tofrom_user(to, from, len); | |
| 344 | 346 | } |
| 345 | 347 | |
| 346 | −#define __copy_in_user(to, from, len) __copy_from_user(to, from, len) | |
| 348 | +#define __copy_in_user(to, from, len) __copy_tofrom_user(to, from, len) | |
| 347 | 349 | |
| 348 | 350 | static inline unsigned long |
| 349 | 351 | copy_in_user(void *to, const void *from, unsigned long len) |
| 350 | 352 | { |
| 351 | 353 | if (access_ok(VERIFY_READ, from, len) && |
| 352 | 354 | access_ok(VERFITY_WRITE, to, len)) |
| 353 | − return copy_from_user(to, from, len); | |
| 355 | + return __copy_tofrom_user(to, from, len); | |
| 354 | 356 | } |
| 355 | 357 | |
| 356 | 358 | /* |
| @@ -60,7 +60,7 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ · 59 unmodified lines | ||
| 60 | 60 | " movco.l %0, @%3 \n" \ |
| 61 | 61 | " bf 1b \n" \ |
| 62 | 62 | " synco \n" \ |
| 63 | − : "=&z" (temp), "=&z" (res) \ | |
| 63 | + : "=&z" (temp), "=&r" (res) \ | |
| 64 | 64 | : "r" (i), "r" (&v->counter) \ |
| 65 | 65 | : "t"); \ |
| 66 | 66 | \ |
| @@ -151,7 +151,10 @@ copy_from_user(void *to, const void __user *from, unsigned long n) · 150 unmodified lines | ||
| 151 | 151 | __kernel_size_t __copy_size = (__kernel_size_t) n; |
| 152 | 152 | |
| 153 | 153 | if (__copy_size && __access_ok(__copy_from, __copy_size)) |
| 154 | − return __copy_user(to, from, __copy_size); | |
| 154 | + __copy_size = __copy_user(to, from, __copy_size); | |
| 155 | + | |
| 156 | + if (unlikely(__copy_size)) | |
| 157 | + memset(to + (n - __copy_size), 0, __copy_size); | |
| 155 | 158 | |
| 156 | 159 | return __copy_size; |
| 157 | 160 | } |
| @@ -24,6 +24,7 @@ · 23 unmodified lines | ||
| 24 | 24 | #define __get_user_size(x,ptr,size,retval) \ |
| 25 | 25 | do { \ |
| 26 | 26 | retval = 0; \ |
| 27 | + x = 0; \ | |
| 27 | 28 | switch (size) { \ |
| 28 | 29 | case 1: \ |
| 29 | 30 | retval = __get_user_asm_b((void *)&x, \ |
| @@ -249,8 +249,7 @@ unsigned long __copy_user(void __user *to, const void __user *from, unsigned lon · 248 unmodified lines | ||
| 249 | 249 | static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) |
| 250 | 250 | { |
| 251 | 251 | if (n && __access_ok((unsigned long) to, n)) { |
| 252 | − if (!__builtin_constant_p(n)) | |
| 253 | − check_object_size(from, n, true); | |
| 252 | + check_object_size(from, n, true); | |
| 254 | 253 | return __copy_user(to, (__force void __user *) from, n); |
| 255 | 254 | } else |
| 256 | 255 | return n; |
| @@ -258,19 +257,19 @@ static inline unsigned long copy_to_user(void __user *to, const void *from, unsi · 1 unmodified line | ||
| 258 | 257 | |
| 259 | 258 | static inline unsigned long __copy_to_user(void __user *to, const void *from, unsigned long n) |
| 260 | 259 | { |
| 261 | − if (!__builtin_constant_p(n)) | |
| 262 | − check_object_size(from, n, true); | |
| 260 | + check_object_size(from, n, true); | |
| 263 | 261 | return __copy_user(to, (__force void __user *) from, n); |
| 264 | 262 | } |
| 265 | 263 | |
| 266 | 264 | static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) |
| 267 | 265 | { |
| 268 | 266 | if (n && __access_ok((unsigned long) from, n)) { |
| 269 | − if (!__builtin_constant_p(n)) | |
| 270 | − check_object_size(to, n, false); | |
| 267 | + check_object_size(to, n, false); | |
| 271 | 268 | return __copy_user((__force void __user *) to, from, n); |
| 272 | − } else | |
| 269 | + } else { | |
| 270 | + memset(to, 0, n); | |
| 273 | 271 | return n; |
| 272 | + } | |
| 274 | 273 | } |
| 275 | 274 | |
| 276 | 275 | static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) |
| @@ -212,8 +212,7 @@ copy_from_user(void *to, const void __user *from, unsigned long size) · 211 unmodified lines | ||
| 212 | 212 | { |
| 213 | 213 | unsigned long ret; |
| 214 | 214 | |
| 215 | − if (!__builtin_constant_p(size)) | |
| 216 | − check_object_size(to, size, false); | |
| 215 | + check_object_size(to, size, false); | |
| 217 | 216 | |
| 218 | 217 | ret = ___copy_from_user(to, from, size); |
| 219 | 218 | if (unlikely(ret)) |
| @@ -233,8 +232,8 @@ copy_to_user(void __user *to, const void *from, unsigned long size) · 13 unmodified lines | ||
| 233 | 232 | { |
| 234 | 233 | unsigned long ret; |
| 235 | 234 | |
| 236 | − if (!__builtin_constant_p(size)) | |
| 237 | − check_object_size(from, size, true); | |
| 235 | + check_object_size(from, size, true); | |
| 236 | + | |
| 238 | 237 | ret = ___copy_to_user(to, from, size); |
| 239 | 238 | if (unlikely(ret)) |
| 240 | 239 | ret = copy_to_user_fixup(to, from, size); |
| @@ -4,7 +4,6 @@ · 3 unmodified lines | ||
| 4 | 4 | config TILE |
| 5 | 5 | def_bool y |
| 6 | 6 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 7 | − select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | |
| 8 | 7 | select ARCH_HAS_DEVMEM_IS_ALLOWED |
| 9 | 8 | select ARCH_HAVE_NMI_SAFE_CMPXCHG |
| 10 | 9 | select ARCH_WANT_FRAME_POINTERS |
| @@ -416,14 +416,13 @@ _copy_from_user(void *to, const void __user *from, unsigned long n) · 415 unmodified lines | ||
| 416 | 416 | return n; |
| 417 | 417 | } |
| 418 | 418 | |
| 419 | −#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS | |
| 420 | −/* | |
| 421 | − * There are still unprovable places in the generic code as of 2.6.34, so this | |
| 422 | − * option is not really compatible with -Werror, which is more useful in | |
| 423 | − * general. | |
| 424 | − */ | |
| 425 | −extern void copy_from_user_overflow(void) | |
| 426 | − __compiletime_warning("copy_from_user() size is not provably correct"); | |
| 419 | +extern void __compiletime_error("usercopy buffer size is too small") | |
| 420 | +__bad_copy_user(void); | |
| 421 | + | |
| 422 | +static inline void copy_user_overflow(int size, unsigned long count) | |
| 423 | +{ | |
| 424 | + WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count); | |
| 425 | +} | |
| 427 | 426 | |
| 428 | 427 | static inline unsigned long __must_check copy_from_user(void *to, |
| 429 | 428 | const void __user *from, |
| @@ -433,14 +432,13 @@ static inline unsigned long __must_check copy_from_user(void *to, · 3 unmodified lines | ||
| 433 | 432 | |
| 434 | 433 | if (likely(sz == -1 || sz >= n)) |
| 435 | 434 | n = _copy_from_user(to, from, n); |
| 435 | + else if (!__builtin_constant_p(n)) | |
| 436 | + copy_user_overflow(sz, n); | |
| 436 | 437 | else |
| 437 | − copy_from_user_overflow(); | |
| 438 | + __bad_copy_user(); | |
| 438 | 439 | |
| 439 | 440 | return n; |
| 440 | 441 | } |
| 441 | −#else | |
| 442 | −#define copy_from_user _copy_from_user | |
| 443 | −#endif | |
| 444 | 442 | |
| 445 | 443 | #ifdef __tilegx__ |
| 446 | 444 | /** |
| @@ -81,7 +81,7 @@ · 80 unmodified lines | ||
| 81 | 81 | .altinstr_replacement : { *(.altinstr_replacement) } |
| 82 | 82 | /* .exit.text is discard at runtime, not link time, to deal with references |
| 83 | 83 | from .altinstructions and .eh_frame */ |
| 84 | − .exit.text : { *(.exit.text) } | |
| 84 | + .exit.text : { EXIT_TEXT } | |
| 85 | 85 | .exit.data : { *(.exit.data) } |
| 86 | 86 | |
| 87 | 87 | .preinit_array : { |
| @@ -21,21 +21,17 @@ void handle_syscall(struct uml_pt_regs *r) · 20 unmodified lines | ||
| 21 | 21 | PT_REGS_SET_SYSCALL_RETURN(regs, -ENOSYS); |
| 22 | 22 | |
| 23 | 23 | if (syscall_trace_enter(regs)) |
| 24 | − return; | |
| 24 | + goto out; | |
| 25 | 25 | |
| 26 | 26 | /* Do the seccomp check after ptrace; failures should be fast. */ |
| 27 | 27 | if (secure_computing(NULL) == -1) |
| 28 | − return; | |
| 28 | + goto out; | |
| 29 | 29 | |
| 30 | − /* Update the syscall number after orig_ax has potentially been updated | |
| 31 | − * with ptrace. | |
| 32 | − */ | |
| 33 | − UPT_SYSCALL_NR(r) = PT_SYSCALL_NR(r->gp); | |
| 34 | 30 | syscall = UPT_SYSCALL_NR(r); |
| 35 | − | |
| 36 | 31 | if (syscall >= 0 && syscall <= __NR_syscall_max) |
| 37 | 32 | PT_REGS_SET_SYSCALL_RETURN(regs, |
| 38 | 33 | EXECUTE_SYSCALL(syscall, regs)); |
| 39 | 34 | |
| 35 | +out: | |
| 40 | 36 | syscall_trace_leave(regs); |
| 41 | 37 | } |
| @@ -24,7 +24,6 @@ config X86 · 23 unmodified lines | ||
| 24 | 24 | select ARCH_DISCARD_MEMBLOCK |
| 25 | 25 | select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI |
| 26 | 26 | select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE |
| 27 | − select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS | |
| 28 | 27 | select ARCH_HAS_DEVMEM_IS_ALLOWED |
| 29 | 28 | select ARCH_HAS_ELF_RANDOMIZE |
| 30 | 29 | select ARCH_HAS_FAST_MULTIPLIER |
| @@ -1004,79 +1004,87 @@ static efi_status_t alloc_e820ext(u32 nr_desc, struct setup_data **e820ext, · 1003 unmodified lines | ||
| 1004 | 1004 | return status; |
| 1005 | 1005 | } |
| 1006 | 1006 | |
| 1007 | −static efi_status_t exit_boot(struct boot_params *boot_params, | |
| 1008 | − void *handle, bool is64) | |
| 1009 | −{ | |
| 1010 | − struct efi_info *efi = &boot_params->efi_info; | |
| 1011 | − unsigned long map_sz, key, desc_size; | |
| 1012 | − efi_memory_desc_t *mem_map; | |
| 1007 | +struct exit_boot_struct { | |
| 1008 | + struct boot_params *boot_params; | |
| 1009 | + struct efi_info *efi; | |
| 1013 | 1010 | struct setup_data *e820ext; |
| 1014 | − const char *signature; | |
| 1015 | 1011 | __u32 e820ext_size; |
| 1016 | − __u32 nr_desc, prev_nr_desc; | |
| 1017 | − efi_status_t status; | |
| 1018 | − __u32 desc_version; | |
| 1019 | − bool called_exit = false; | |
| 1020 | − u8 nr_entries; | |
| 1021 | − int i; | |
| 1022 | − | |
| 1023 | − nr_desc = 0; | |
| 1024 | − e820ext = NULL; | |
| 1025 | − e820ext_size = 0; | |
| 1026 | − | |
| 1027 | −get_map: | |
| 1028 | − status = efi_get_memory_map(sys_table, &mem_map, &map_sz, &desc_size, | |
| 1029 | − &desc_version, &key); | |
| 1030 | − | |
| 1031 | − if (status != EFI_SUCCESS) | |
| 1032 | − return status; | |
| 1033 | − | |
| 1034 | − prev_nr_desc = nr_desc; | |
| 1035 | − nr_desc = map_sz / desc_size; | |
| 1036 | − if (nr_desc > prev_nr_desc && | |
| 1037 | − nr_desc > ARRAY_SIZE(boot_params->e820_map)) { | |
| 1038 | − u32 nr_e820ext = nr_desc - ARRAY_SIZE(boot_params->e820_map); | |
| 1039 | − | |
| 1040 | − status = alloc_e820ext(nr_e820ext, &e820ext, &e820ext_size); | |
| 1041 | − if (status != EFI_SUCCESS) | |
| 1042 | − goto free_mem_map; | |
| 1012 | + bool is64; | |
| 1013 | +}; | |
| 1043 | 1014 | |
| 1044 | − efi_call_early(free_pool, mem_map); | |
| 1045 | − goto get_map; /* Allocated memory, get map again */ | |
| 1015 | +static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, | |
| 1016 | + struct efi_boot_memmap *map, | |
| 1017 | + void *priv) | |
| 1018 | +{ | |
| 1019 | + static bool first = true; | |
| 1020 | + const char *signature; | |
| 1021 | + __u32 nr_desc; | |
| 1022 | + efi_status_t status; | |
| 1023 | + struct exit_boot_struct *p = priv; | |
| 1024 | + | |
| 1025 | + if (first) { | |
| 1026 | + nr_desc = *map->buff_size / *map->desc_size; | |
| 1027 | + if (nr_desc > ARRAY_SIZE(p->boot_params->e820_map)) { | |
| 1028 | + u32 nr_e820ext = nr_desc - | |
| 1029 | + ARRAY_SIZE(p->boot_params->e820_map); | |
| 1030 | + | |
| 1031 | + status = alloc_e820ext(nr_e820ext, &p->e820ext, | |
| 1032 | + &p->e820ext_size); | |
| 1033 | + if (status != EFI_SUCCESS) | |
| 1034 | + return status; | |
| 1035 | + } | |
| 1036 | + first = false; | |
| 1046 | 1037 | } |
| 1047 | 1038 | |
| 1048 | − signature = is64 ? EFI64_LOADER_SIGNATURE : EFI32_LOADER_SIGNATURE; | |
| 1049 | − memcpy(&efi->efi_loader_signature, signature, sizeof(__u32)); | |
| 1039 | + signature = p->is64 ? EFI64_LOADER_SIGNATURE : EFI32_LOADER_SIGNATURE; | |
| 1040 | + memcpy(&p->efi->efi_loader_signature, signature, sizeof(__u32)); | |
| 1050 | 1041 | |
| 1051 | − efi->efi_systab = (unsigned long)sys_table; | |
| 1052 | − efi->efi_memdesc_size = desc_size; | |
| 1053 | − efi->efi_memdesc_version = desc_version; | |
| 1054 | − efi->efi_memmap = (unsigned long)mem_map; | |
| 1055 | − efi->efi_memmap_size = map_sz; | |
| 1042 | + p->efi->efi_systab = (unsigned long)sys_table_arg; | |
| 1043 | + p->efi->efi_memdesc_size = *map->desc_size; | |
| 1044 | + p->efi->efi_memdesc_version = *map->desc_ver; | |
| 1045 | + p->efi->efi_memmap = (unsigned long)*map->map; | |
| 1046 | + p->efi->efi_memmap_size = *map->map_size; | |
| 1056 | 1047 | |
| 1057 | 1048 | #ifdef CONFIG_X86_64 |
| 1058 | − efi->efi_systab_hi = (unsigned long)sys_table >> 32; | |
| 1059 | − efi->efi_memmap_hi = (unsigned long)mem_map >> 32; | |
| 1049 | + p->efi->efi_systab_hi = (unsigned long)sys_table_arg >> 32; | |
| 1050 | + p->efi->efi_memmap_hi = (unsigned long)*map->map >> 32; | |
| 1060 | 1051 | #endif |
| 1061 | 1052 | |
| 1053 | + return EFI_SUCCESS; | |
| 1054 | +} | |
| 1055 | + | |
| 1056 | +static efi_status_t exit_boot(struct boot_params *boot_params, | |
| 1057 | + void *handle, bool is64) | |
| 1058 | +{ | |
| 1059 | + unsigned long map_sz, key, desc_size, buff_size; | |
| 1060 | + efi_memory_desc_t *mem_map; | |
| 1061 | + struct setup_data *e820ext; | |
| 1062 | + __u32 e820ext_size; | |
| 1063 | + efi_status_t status; | |
| 1064 | + __u32 desc_version; | |
| 1065 | + struct efi_boot_memmap map; | |
| 1066 | + struct exit_boot_struct priv; | |
| 1067 | + | |
| 1068 | + map.map = &mem_map; | |
| 1069 | + map.map_size = &map_sz; | |
| 1070 | + map.desc_size = &desc_size; | |
| 1071 | + map.desc_ver = &desc_version; | |
| 1072 | + map.key_ptr = &key; | |
| 1073 | + map.buff_size = &buff_size; | |
| 1074 | + priv.boot_params = boot_params; | |
| 1075 | + priv.efi = &boot_params->efi_info; | |
| 1076 | + priv.e820ext = NULL; | |
| 1077 | + priv.e820ext_size = 0; | |
| 1078 | + priv.is64 = is64; | |
| 1079 | + | |
| 1062 | 1080 | /* Might as well exit boot services now */ |
| 1063 | − status = efi_call_early(exit_boot_services, handle, key); | |
| 1064 | − if (status != EFI_SUCCESS) { | |
| 1065 | − /* | |
| 1066 | − * ExitBootServices() will fail if any of the event | |
| 1067 | − * handlers change the memory map. In which case, we | |
| 1068 | − * must be prepared to retry, but only once so that | |
| 1069 | − * we're guaranteed to exit on repeated failures instead | |
| 1070 | − * of spinning forever. | |
| 1071 | − */ | |
| 1072 | − if (called_exit) | |
| 1073 | − goto free_mem_map; | |
| 1074 | − | |
| 1075 | − called_exit = true; | |
| 1076 | − efi_call_early(free_pool, mem_map); | |
| 1077 | − goto get_map; | |
| 1078 | − } | |
| 1081 | + status = efi_exit_boot_services(sys_table, handle, &map, &priv, | |
| 1082 | + exit_boot_func); | |
| 1083 | + if (status != EFI_SUCCESS) | |
| 1084 | + return status; | |
| 1079 | 1085 | |
| 1086 | + e820ext = priv.e820ext; | |
| 1087 | + e820ext_size = priv.e820ext_size; | |
| 1080 | 1088 | /* Historic? */ |
| 1081 | 1089 | boot_params->alt_mem_k = 32 * 1024; |
| 1082 | 1090 | |
| @@ -1085,10 +1093,6 @@ get_map: · 2 unmodified lines | ||
| 1085 | 1093 | return status; |
| 1086 | 1094 | |
| 1087 | 1095 | return EFI_SUCCESS; |
| 1088 | − | |
| 1089 | −free_mem_map: | |
| 1090 | − efi_call_early(free_pool, mem_map); | |
| 1091 | − return status; | |
| 1092 | 1096 | } |
| 1093 | 1097 | |
| 1094 | 1098 | /* |
| @@ -1 +1,3 @@ | ||
| 1 | 1 | CONFIG_NOHIGHMEM=y |
| 2 | +# CONFIG_HIGHMEM4G is not set | |
| 3 | +# CONFIG_HIGHMEM64G is not set | |
| @@ -485,10 +485,10 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx, · 484 unmodified lines | ||
| 485 | 485 | |
| 486 | 486 | req = cast_mcryptd_ctx_to_req(req_ctx); |
| 487 | 487 | if (irqs_disabled()) |
| 488 | − rctx->complete(&req->base, ret); | |
| 488 | + req_ctx->complete(&req->base, ret); | |
| 489 | 489 | else { |
| 490 | 490 | local_bh_disable(); |
| 491 | − rctx->complete(&req->base, ret); | |
| 491 | + req_ctx->complete(&req->base, ret); | |
| 492 | 492 | local_bh_enable(); |
| 493 | 493 | } |
| 494 | 494 | } |
| @@ -265,13 +265,14 @@ ENTRY(sha256_mb_mgr_get_comp_job_avx2) · 264 unmodified lines | ||
| 265 | 265 | vpinsrd $1, _args_digest+1*32(state, idx, 4), %xmm0, %xmm0 |
| 266 | 266 | vpinsrd $2, _args_digest+2*32(state, idx, 4), %xmm0, %xmm0 |
| 267 | 267 | vpinsrd $3, _args_digest+3*32(state, idx, 4), %xmm0, %xmm0 |
| 268 | − movl _args_digest+4*32(state, idx, 4), tmp2_w | |
| 268 | + vmovd _args_digest(state , idx, 4) , %xmm0 | |
| 269 | 269 | vpinsrd $1, _args_digest+5*32(state, idx, 4), %xmm1, %xmm1 |
| 270 | 270 | vpinsrd $2, _args_digest+6*32(state, idx, 4), %xmm1, %xmm1 |
| 271 | 271 | vpinsrd $3, _args_digest+7*32(state, idx, 4), %xmm1, %xmm1 |
| 272 | 272 | |
| 273 | − vmovdqu %xmm0, _result_digest(job_rax) | |
| 274 | − movl tmp2_w, _result_digest+1*16(job_rax) | |
| 273 | + vmovdqu %xmm0, _result_digest(job_rax) | |
| 274 | + offset = (_result_digest + 1*16) | |
| 275 | + vmovdqu %xmm1, offset(job_rax) | |
| 275 | 276 | |
| 276 | 277 | pop %rbx |
| 277 | 278 | |
| @@ -497,10 +497,10 @@ static int sha_complete_job(struct mcryptd_hash_request_ctx *rctx, · 496 unmodified lines | ||
| 497 | 497 | |
| 498 | 498 | req = cast_mcryptd_ctx_to_req(req_ctx); |
| 499 | 499 | if (irqs_disabled()) |
| 500 | − rctx->complete(&req->base, ret); | |
| 500 | + req_ctx->complete(&req->base, ret); | |
| 501 | 501 | else { |
| 502 | 502 | local_bh_disable(); |
| 503 | − rctx->complete(&req->base, ret); | |
| 503 | + req_ctx->complete(&req->base, ret); | |
| 504 | 504 | local_bh_enable(); |
| 505 | 505 | } |
| 506 | 506 | } |
| @@ -119,8 +119,8 @@ static const u64 amd_perfmon_event_map[PERF_COUNT_HW_MAX] = · 118 unmodified lines | ||
| 119 | 119 | { |
| 120 | 120 | [PERF_COUNT_HW_CPU_CYCLES] = 0x0076, |
| 121 | 121 | [PERF_COUNT_HW_INSTRUCTIONS] = 0x00c0, |
| 122 | − [PERF_COUNT_HW_CACHE_REFERENCES] = 0x0080, | |
| 123 | − [PERF_COUNT_HW_CACHE_MISSES] = 0x0081, | |
| 122 | + [PERF_COUNT_HW_CACHE_REFERENCES] = 0x077d, | |
| 123 | + [PERF_COUNT_HW_CACHE_MISSES] = 0x077e, | |
| 124 | 124 | [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 0x00c2, |
| 125 | 125 | [PERF_COUNT_HW_BRANCH_MISSES] = 0x00c3, |
| 126 | 126 | [PERF_COUNT_HW_STALLED_CYCLES_FRONTEND] = 0x00d0, /* "Decoder empty" event */ |
| @@ -29,6 +29,8 @@ · 28 unmodified lines | ||
| 29 | 29 | |
| 30 | 30 | #define COUNTER_SHIFT 16 |
| 31 | 31 | |
| 32 | +static HLIST_HEAD(uncore_unused_list); | |
| 33 | + | |
| 32 | 34 | struct amd_uncore { |
| 33 | 35 | int id; |
| 34 | 36 | int refcnt; |
| @@ -39,7 +41,7 @@ struct amd_uncore { · 4 unmodified lines | ||
| 39 | 41 | cpumask_t *active_mask; |
| 40 | 42 | struct pmu *pmu; |
| 41 | 43 | struct perf_event *events[MAX_COUNTERS]; |
| 42 | − struct amd_uncore *free_when_cpu_online; | |
| 44 | + struct hlist_node node; | |
| 43 | 45 | }; |
| 44 | 46 | |
| 45 | 47 | static struct amd_uncore * __percpu *amd_uncore_nb; |
| @@ -306,6 +308,7 @@ static int amd_uncore_cpu_up_prepare(unsigned int cpu) · 260 unmodified lines | ||
| 306 | 308 | uncore_nb->msr_base = MSR_F15H_NB_PERF_CTL; |
| 307 | 309 | uncore_nb->active_mask = &amd_nb_active_mask; |
| 308 | 310 | uncore_nb->pmu = &amd_nb_pmu; |
| 311 | + uncore_nb->id = -1; | |
| 309 | 312 | *per_cpu_ptr(amd_uncore_nb, cpu) = uncore_nb; |
| 310 | 313 | } |
| 311 | 314 | |
| @@ -319,6 +322,7 @@ static int amd_uncore_cpu_up_prepare(unsigned int cpu) · 7 unmodified lines | ||
| 319 | 322 | uncore_l2->msr_base = MSR_F16H_L2I_PERF_CTL; |
| 320 | 323 | uncore_l2->active_mask = &amd_l2_active_mask; |
| 321 | 324 | uncore_l2->pmu = &amd_l2_pmu; |
| 325 | + uncore_l2->id = -1; | |
| 322 | 326 | *per_cpu_ptr(amd_uncore_l2, cpu) = uncore_l2; |
| 323 | 327 | } |
| 324 | 328 | |
| @@ -348,7 +352,7 @@ amd_uncore_find_online_sibling(struct amd_uncore *this, · 23 unmodified lines | ||
| 348 | 352 | continue; |
| 349 | 353 | |
| 350 | 354 | if (this->id == that->id) { |
| 351 | − that->free_when_cpu_online = this; | |
| 355 | + hlist_add_head(&this->node, &uncore_unused_list); | |
| 352 | 356 | this = that; |
| 353 | 357 | break; |
| 354 | 358 | } |
| @@ -388,13 +392,23 @@ static int amd_uncore_cpu_starting(unsigned int cpu) · 33 unmodified lines | ||
| 388 | 392 | return 0; |
| 389 | 393 | } |
| 390 | 394 | |
| 395 | +static void uncore_clean_online(void) | |
| 396 | +{ | |
| 397 | + struct amd_uncore *uncore; | |
| 398 | + struct hlist_node *n; | |
| 399 | + | |
| 400 | + hlist_for_each_entry_safe(uncore, n, &uncore_unused_list, node) { | |
| 401 | + hlist_del(&uncore->node); | |
| 402 | + kfree(uncore); | |
| 403 | + } | |
| 404 | +} | |
| 405 | + | |
| 391 | 406 | static void uncore_online(unsigned int cpu, |
| 392 | 407 | struct amd_uncore * __percpu *uncores) |
| 393 | 408 | { |
| 394 | 409 | struct amd_uncore *uncore = *per_cpu_ptr(uncores, cpu); |
| 395 | 410 | |
| 396 | − kfree(uncore->free_when_cpu_online); | |
| 397 | − uncore->free_when_cpu_online = NULL; | |
| 411 | + uncore_clean_online(); | |
| 398 | 412 | |
| 399 | 413 | if (cpu == uncore->cpu) |
| 400 | 414 | cpumask_set_cpu(cpu, uncore->active_mask); |
| @@ -31,7 +31,17 @@ · 30 unmodified lines | ||
| 31 | 31 | struct bts_ctx { |
| 32 | 32 | struct perf_output_handle handle; |
| 33 | 33 | struct debug_store ds_back; |
| 34 | − int started; | |
| 34 | + int state; | |
| 35 | +}; | |
| 36 | + | |
| 37 | +/* BTS context states: */ | |
| 38 | +enum { | |
| 39 | + /* no ongoing AUX transactions */ | |
| 40 | + BTS_STATE_STOPPED = 0, | |
| 41 | + /* AUX transaction is on, BTS tracing is disabled */ | |
| 42 | + BTS_STATE_INACTIVE, | |
| 43 | + /* AUX transaction is on, BTS tracing is running */ | |
| 44 | + BTS_STATE_ACTIVE, | |
| 35 | 45 | }; |
| 36 | 46 | |
| 37 | 47 | static DEFINE_PER_CPU(struct bts_ctx, bts_ctx); |
| @@ -204,6 +214,15 @@ static void bts_update(struct bts_ctx *bts) · 166 unmodified lines | ||
| 204 | 214 | static int |
| 205 | 215 | bts_buffer_reset(struct bts_buffer *buf, struct perf_output_handle *handle); |
| 206 | 216 | |
| 217 | +/* | |
| 218 | + * Ordering PMU callbacks wrt themselves and the PMI is done by means | |
| 219 | + * of bts::state, which: | |
| 220 | + * - is set when bts::handle::event is valid, that is, between | |
| 221 | + * perf_aux_output_begin() and perf_aux_output_end(); | |
| 222 | + * - is zero otherwise; | |
| 223 | + * - is ordered against bts::handle::event with a compiler barrier. | |
| 224 | + */ | |
| 225 | + | |
| 207 | 226 | static void __bts_event_start(struct perf_event *event) |
| 208 | 227 | { |
| 209 | 228 | struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); |
| @@ -221,10 +240,13 @@ static void __bts_event_start(struct perf_event *event) · 11 unmodified lines | ||
| 221 | 240 | |
| 222 | 241 | /* |
| 223 | 242 | * local barrier to make sure that ds configuration made it |
| 224 | − * before we enable BTS | |
| 243 | + * before we enable BTS and bts::state goes ACTIVE | |
| 225 | 244 | */ |
| 226 | 245 | wmb(); |
| 227 | 246 | |
| 247 | + /* INACTIVE/STOPPED -> ACTIVE */ | |
| 248 | + WRITE_ONCE(bts->state, BTS_STATE_ACTIVE); | |
| 249 | + | |
| 228 | 250 | intel_pmu_enable_bts(config); |
| 229 | 251 | |
| 230 | 252 | } |
| @@ -251,9 +273,6 @@ static void bts_event_start(struct perf_event *event, int flags) · 20 unmodified lines | ||
| 251 | 273 | |
| 252 | 274 | __bts_event_start(event); |
| 253 | 275 | |
| 254 | − /* PMI handler: this counter is running and likely generating PMIs */ | |
| 255 | − ACCESS_ONCE(bts->started) = 1; | |
| 256 | − | |
| 257 | 276 | return; |
| 258 | 277 | |
| 259 | 278 | fail_end_stop: |
| @@ -263,30 +282,34 @@ fail_stop: · 3 unmodified lines | ||
| 263 | 282 | event->hw.state = PERF_HES_STOPPED; |
| 264 | 283 | } |
| 265 | 284 | |
| 266 | −static void __bts_event_stop(struct perf_event *event) | |
| 285 | +static void __bts_event_stop(struct perf_event *event, int state) | |
| 267 | 286 | { |
| 287 | + struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); | |
| 288 | + | |
| 289 | + /* ACTIVE -> INACTIVE(PMI)/STOPPED(->stop()) */ | |
| 290 | + WRITE_ONCE(bts->state, state); | |
| 291 | + | |
| 268 | 292 | /* |
| 269 | 293 | * No extra synchronization is mandated by the documentation to have |
| 270 | 294 | * BTS data stores globally visible. |
| 271 | 295 | */ |
| 272 | 296 | intel_pmu_disable_bts(); |
| 273 | − | |
| 274 | − if (event->hw.state & PERF_HES_STOPPED) | |
| 275 | − return; | |
| 276 | − | |
| 277 | − ACCESS_ONCE(event->hw.state) |= PERF_HES_STOPPED; | |
| 278 | 297 | } |
| 279 | 298 | |
| 280 | 299 | static void bts_event_stop(struct perf_event *event, int flags) |
| 281 | 300 | { |
| 282 | 301 | struct cpu_hw_events *cpuc = this_cpu_ptr(&cpu_hw_events); |
| 283 | 302 | struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); |
| 284 | − struct bts_buffer *buf = perf_get_aux(&bts->handle); | |
| 303 | + struct bts_buffer *buf = NULL; | |
| 304 | + int state = READ_ONCE(bts->state); | |
| 285 | 305 | |
| 286 | − /* PMI handler: don't restart this counter */ | |
| 287 | − ACCESS_ONCE(bts->started) = 0; | |
| 306 | + if (state == BTS_STATE_ACTIVE) | |
| 307 | + __bts_event_stop(event, BTS_STATE_STOPPED); | |
| 288 | 308 | |
| 289 | − __bts_event_stop(event); | |
| 309 | + if (state != BTS_STATE_STOPPED) | |
| 310 | + buf = perf_get_aux(&bts->handle); | |
| 311 | + | |
| 312 | + event->hw.state |= PERF_HES_STOPPED; | |
| 290 | 313 | |
| 291 | 314 | if (flags & PERF_EF_UPDATE) { |
| 292 | 315 | bts_update(bts); |
| @@ -296,6 +319,7 @@ static void bts_event_stop(struct perf_event *event, int flags) · 3 unmodified lines | ||
| 296 | 319 | bts->handle.head = |
| 297 | 320 | local_xchg(&buf->data_size, |
| 298 | 321 | buf->nr_pages << PAGE_SHIFT); |
| 322 | + | |
| 299 | 323 | perf_aux_output_end(&bts->handle, local_xchg(&buf->data_size, 0), |
| 300 | 324 | !!local_xchg(&buf->lost, 0)); |
| 301 | 325 | } |
| @@ -310,8 +334,20 @@ static void bts_event_stop(struct perf_event *event, int flags) · 8 unmodified lines | ||
| 310 | 334 | void intel_bts_enable_local(void) |
| 311 | 335 | { |
| 312 | 336 | struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); |
| 337 | + int state = READ_ONCE(bts->state); | |
| 338 | + | |
| 339 | + /* | |
| 340 | + * Here we transition from INACTIVE to ACTIVE; | |
| 341 | + * if we instead are STOPPED from the interrupt handler, | |
| 342 | + * stay that way. Can't be ACTIVE here though. | |
| 343 | + */ | |
| 344 | + if (WARN_ON_ONCE(state == BTS_STATE_ACTIVE)) | |
| 345 | + return; | |
| 346 | + | |
| 347 | + if (state == BTS_STATE_STOPPED) | |
| 348 | + return; | |
| 313 | 349 | |
| 314 | − if (bts->handle.event && bts->started) | |
| 350 | + if (bts->handle.event) | |
| 315 | 351 | __bts_event_start(bts->handle.event); |
| 316 | 352 | } |
| 317 | 353 | |
| @@ -319,8 +355,15 @@ void intel_bts_disable_local(void) · 1 unmodified line | ||
| 319 | 355 | { |
| 320 | 356 | struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); |
| 321 | 357 | |
| 358 | + /* | |
| 359 | + * Here we transition from ACTIVE to INACTIVE; | |
| 360 | + * do nothing for STOPPED or INACTIVE. | |
| 361 | + */ | |
| 362 | + if (READ_ONCE(bts->state) != BTS_STATE_ACTIVE) | |
| 363 | + return; | |
| 364 | + | |
| 322 | 365 | if (bts->handle.event) |
| 323 | − __bts_event_stop(bts->handle.event); | |
| 366 | + __bts_event_stop(bts->handle.event, BTS_STATE_INACTIVE); | |
| 324 | 367 | } |
| 325 | 368 | |
| 326 | 369 | static int |
| @@ -335,8 +378,6 @@ bts_buffer_reset(struct bts_buffer *buf, struct perf_output_handle *handle) · 8 unmodified lines | ||
| 335 | 378 | return 0; |
| 336 | 379 | |
| 337 | 380 | head = handle->head & ((buf->nr_pages << PAGE_SHIFT) - 1); |
| 338 | − if (WARN_ON_ONCE(head != local_read(&buf->head))) | |
| 339 | − return -EINVAL; | |
| 340 | 381 | |
| 341 | 382 | phys = &buf->buf[buf->cur_buf]; |
| 342 | 383 | space = phys->offset + phys->displacement + phys->size - head; |
| @@ -403,22 +444,37 @@ bts_buffer_reset(struct bts_buffer *buf, struct perf_output_handle *handle) · 60 unmodified lines | ||
| 403 | 444 | |
| 404 | 445 | int intel_bts_interrupt(void) |
| 405 | 446 | { |
| 447 | + struct debug_store *ds = this_cpu_ptr(&cpu_hw_events)->ds; | |
| 406 | 448 | struct bts_ctx *bts = this_cpu_ptr(&bts_ctx); |
| 407 | 449 | struct perf_event *event = bts->handle.event; |
| 408 | 450 | struct bts_buffer *buf; |
| 409 | 451 | s64 old_head; |
| 410 | − int err; | |
| 452 | + int err = -ENOSPC, handled = 0; | |
| 411 | 453 | |
| 412 | − if (!event || !bts->started) | |
| 413 | − return 0; | |
| 454 | + /* | |
| 455 | + * The only surefire way of knowing if this NMI is ours is by checking | |
| 456 | + * the write ptr against the PMI threshold. | |
| 457 | + */ | |
| 458 | + if (ds && (ds->bts_index >= ds->bts_interrupt_threshold)) | |
| 459 | + handled = 1; | |
| 460 | + | |
| 461 | + /* | |
| 462 | + * this is wrapped in intel_bts_enable_local/intel_bts_disable_local, | |
| 463 | + * so we can only be INACTIVE or STOPPED | |
| 464 | + */ | |
| 465 | + if (READ_ONCE(bts->state) == BTS_STATE_STOPPED) | |
| 466 | + return handled; | |
| 414 | 467 | |
| 415 | 468 | buf = perf_get_aux(&bts->handle); |
| 469 | + if (!buf) | |
| 470 | + return handled; | |
| 471 | + | |
| 416 | 472 | /* |
| 417 | 473 | * Skip snapshot counters: they don't use the interrupt, but |
| 418 | 474 | * there's no other way of telling, because the pointer will |
| 419 | 475 | * keep moving |
| 420 | 476 | */ |
| 421 | − if (!buf || buf->snapshot) | |
| 477 | + if (buf->snapshot) | |
| 422 | 478 | return 0; |
| 423 | 479 | |
| 424 | 480 | old_head = local_read(&buf->head); |
| @@ -426,18 +482,27 @@ int intel_bts_interrupt(void) · 1 unmodified line | ||
| 426 | 482 | |
| 427 | 483 | /* no new data */ |
| 428 | 484 | if (old_head == local_read(&buf->head)) |
| 429 | − return 0; | |
| 485 | + return handled; | |
| 430 | 486 | |
| 431 | 487 | perf_aux_output_end(&bts->handle, local_xchg(&buf->data_size, 0), |
| 432 | 488 | !!local_xchg(&buf->lost, 0)); |
| 433 | 489 | |
| 434 | 490 | buf = perf_aux_output_begin(&bts->handle, event); |
| 435 | − if (!buf) | |
| 436 | − return 1; | |
| 491 | + if (buf) | |
| 492 | + err = bts_buffer_reset(buf, &bts->handle); | |
| 493 | + | |
| 494 | + if (err) { | |
| 495 | + WRITE_ONCE(bts->state, BTS_STATE_STOPPED); | |
| 437 | 496 | |
| 438 | − err = bts_buffer_reset(buf, &bts->handle); | |
| 439 | − if (err) | |
| 440 | − perf_aux_output_end(&bts->handle, 0, false); | |
| 497 | + if (buf) { | |
| 498 | + /* | |
| 499 | + * BTS_STATE_STOPPED should be visible before | |
| 500 | + * cleared handle::event | |
| 501 | + */ | |
| 502 | + barrier(); | |
| 503 | + perf_aux_output_end(&bts->handle, 0, false); | |
| 504 | + } | |
| 505 | + } | |
| 441 | 506 | |
| 442 | 507 | return 1; |
| 443 | 508 | } |
| @@ -519,7 +584,8 @@ static __init int bts_init(void) · 75 unmodified lines | ||
| 519 | 584 | if (!boot_cpu_has(X86_FEATURE_DTES64) || !x86_pmu.bts) |
| 520 | 585 | return -ENODEV; |
| 521 | 586 | |
| 522 | − bts_pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_ITRACE; | |
| 587 | + bts_pmu.capabilities = PERF_PMU_CAP_AUX_NO_SG | PERF_PMU_CAP_ITRACE | | |
| 588 | + PERF_PMU_CAP_EXCLUSIVE; | |
| 523 | 589 | bts_pmu.task_ctx_nr = perf_sw_context; |
| 524 | 590 | bts_pmu.event_init = bts_event_init; |
| 525 | 591 | bts_pmu.add = bts_event_add; |
| @@ -1730,9 +1730,11 @@ static __initconst const u64 knl_hw_cache_extra_regs · 1729 unmodified lines | ||
| 1730 | 1730 | * disabled state if called consecutively. |
| 1731 | 1731 | * |
| 1732 | 1732 | * During consecutive calls, the same disable value will be written to related |
| 1733 | − * registers, so the PMU state remains unchanged. hw.state in | |
| 1734 | − * intel_bts_disable_local will remain PERF_HES_STOPPED too in consecutive | |
| 1735 | − * calls. | |
| 1733 | + * registers, so the PMU state remains unchanged. | |
| 1734 | + * | |
| 1735 | + * intel_bts events don't coexist with intel PMU's BTS events because of | |
| 1736 | + * x86_add_exclusive(x86_lbr_exclusive_lbr); there's no need to keep them | |
| 1737 | + * disabled around intel PMU's event batching etc, only inside the PMI handler. | |
| 1736 | 1738 | */ |
| 1737 | 1739 | static void __intel_pmu_disable_all(void) |
| 1738 | 1740 | { |
| @@ -1742,8 +1744,6 @@ static void __intel_pmu_disable_all(void) · 3 unmodified lines | ||
| 1742 | 1744 | |
| 1743 | 1745 | if (test_bit(INTEL_PMC_IDX_FIXED_BTS, cpuc->active_mask)) |
| 1744 | 1746 | intel_pmu_disable_bts(); |
| 1745 | − else | |
| 1746 | − intel_bts_disable_local(); | |
| 1747 | 1747 | |
| 1748 | 1748 | intel_pmu_pebs_disable_all(); |
| 1749 | 1749 | } |
| @@ -1771,8 +1771,7 @@ static void __intel_pmu_enable_all(int added, bool pmi) · 21 unmodified lines | ||
| 1771 | 1771 | return; |
| 1772 | 1772 | |
| 1773 | 1773 | intel_pmu_enable_bts(event->hw.config); |
| 1774 | − } else | |
| 1775 | − intel_bts_enable_local(); | |
| 1774 | + } | |
| 1776 | 1775 | } |
| 1777 | 1776 | |
| 1778 | 1777 | static void intel_pmu_enable_all(int added) |
| @@ -2073,6 +2072,7 @@ static int intel_pmu_handle_irq(struct pt_regs *regs) · 294 unmodified lines | ||
| 2073 | 2072 | */ |
| 2074 | 2073 | if (!x86_pmu.late_ack) |
| 2075 | 2074 | apic_write(APIC_LVTPC, APIC_DM_NMI); |
| 2075 | + intel_bts_disable_local(); | |
| 2076 | 2076 | __intel_pmu_disable_all(); |
| 2077 | 2077 | handled = intel_pmu_drain_bts_buffer(); |
| 2078 | 2078 | handled += intel_bts_interrupt(); |
| @@ -2172,6 +2172,7 @@ done: · 93 unmodified lines | ||
| 2172 | 2172 | /* Only restore PMU state when it's active. See x86_pmu_disable(). */ |
| 2173 | 2173 | if (cpuc->enabled) |
| 2174 | 2174 | __intel_pmu_enable_all(0, true); |
| 2175 | + intel_bts_enable_local(); | |
| 2175 | 2176 | |
| 2176 | 2177 | /* |
| 2177 | 2178 | * Only unmask the NMI after the overflow counters |
| @@ -458,6 +458,11 @@ static void __intel_cqm_event_count(void *info); · 457 unmodified lines | ||
| 458 | 458 | static void init_mbm_sample(u32 rmid, u32 evt_type); |
| 459 | 459 | static void __intel_mbm_event_count(void *info); |
| 460 | 460 | |
| 461 | +static bool is_cqm_event(int e) | |
| 462 | +{ | |
| 463 | + return (e == QOS_L3_OCCUP_EVENT_ID); | |
| 464 | +} | |
| 465 | + | |
| 461 | 466 | static bool is_mbm_event(int e) |
| 462 | 467 | { |
| 463 | 468 | return (e >= QOS_MBM_TOTAL_EVENT_ID && e <= QOS_MBM_LOCAL_EVENT_ID); |
| @@ -1366,6 +1371,10 @@ static int intel_cqm_event_init(struct perf_event *event) · 902 unmodified lines | ||
| 1366 | 1371 | (event->attr.config > QOS_MBM_LOCAL_EVENT_ID)) |
| 1367 | 1372 | return -EINVAL; |
| 1368 | 1373 | |
| 1374 | + if ((is_cqm_event(event->attr.config) && !cqm_enabled) || | |
| 1375 | + (is_mbm_event(event->attr.config) && !mbm_enabled)) | |
| 1376 | + return -EINVAL; | |
| 1377 | + | |
| 1369 | 1378 | /* unsupported modes and filters */ |
| 1370 | 1379 | if (event->attr.exclude_user || |
| 1371 | 1380 | event->attr.exclude_kernel || |
| @@ -1274,18 +1274,18 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs) · 1273 unmodified lines | ||
| 1274 | 1274 | struct pebs_record_nhm *p = at; |
| 1275 | 1275 | u64 pebs_status; |
| 1276 | 1276 | |
| 1277 | − /* PEBS v3 has accurate status bits */ | |
| 1277 | + pebs_status = p->status & cpuc->pebs_enabled; | |
| 1278 | + pebs_status &= (1ULL << x86_pmu.max_pebs_events) - 1; | |
| 1279 | + | |
| 1280 | + /* PEBS v3 has more accurate status bits */ | |
| 1278 | 1281 | if (x86_pmu.intel_cap.pebs_format >= 3) { |
| 1279 | − for_each_set_bit(bit, (unsigned long *)&p->status, | |
| 1280 | − MAX_PEBS_EVENTS) | |
| 1282 | + for_each_set_bit(bit, (unsigned long *)&pebs_status, | |
| 1283 | + x86_pmu.max_pebs_events) | |
| 1281 | 1284 | counts[bit]++; |
| 1282 | 1285 | |
| 1283 | 1286 | continue; |
| 1284 | 1287 | } |
| 1285 | 1288 | |
| 1286 | − pebs_status = p->status & cpuc->pebs_enabled; | |
| 1287 | − pebs_status &= (1ULL << x86_pmu.max_pebs_events) - 1; | |
| 1288 | − | |
| 1289 | 1289 | /* |
| 1290 | 1290 | * On some CPUs the PEBS status can be zero when PEBS is |
| 1291 | 1291 | * racing with clearing of GLOBAL_STATUS. |
| @@ -1333,8 +1333,11 @@ static void intel_pmu_drain_pebs_nhm(struct pt_regs *iregs) · 41 unmodified lines | ||
| 1333 | 1333 | continue; |
| 1334 | 1334 | |
| 1335 | 1335 | event = cpuc->events[bit]; |
| 1336 | − WARN_ON_ONCE(!event); | |
| 1337 | − WARN_ON_ONCE(!event->attr.precise_ip); | |
| 1336 | + if (WARN_ON_ONCE(!event)) | |
| 1337 | + continue; | |
| 1338 | + | |
| 1339 | + if (WARN_ON_ONCE(!event->attr.precise_ip)) | |
| 1340 | + continue; | |
| 1338 | 1341 | |
| 1339 | 1342 | /* log dropped samples number */ |
| 1340 | 1343 | if (error[bit]) |
| @@ -1074,6 +1074,11 @@ static void pt_addr_filters_fini(struct perf_event *event) · 1073 unmodified lines | ||
| 1074 | 1074 | event->hw.addr_filters = NULL; |
| 1075 | 1075 | } |
| 1076 | 1076 | |
| 1077 | +static inline bool valid_kernel_ip(unsigned long ip) | |
| 1078 | +{ | |
| 1079 | + return virt_addr_valid(ip) && kernel_ip(ip); | |
| 1080 | +} | |
| 1081 | + | |
| 1077 | 1082 | static int pt_event_addr_filters_validate(struct list_head *filters) |
| 1078 | 1083 | { |
| 1079 | 1084 | struct perf_addr_filter *filter; |
| @@ -1081,11 +1086,16 @@ static int pt_event_addr_filters_validate(struct list_head *filters) · 1 unmodified line | ||
| 1081 | 1086 | |
| 1082 | 1087 | list_for_each_entry(filter, filters, entry) { |
| 1083 | 1088 | /* PT doesn't support single address triggers */ |
| 1084 | − if (!filter->range) | |
| 1089 | + if (!filter->range || !filter->size) | |
| 1085 | 1090 | return -EOPNOTSUPP; |
| 1086 | 1091 | |
| 1087 | − if (!filter->inode && !kernel_ip(filter->offset)) | |
| 1088 | − return -EINVAL; | |
| 1092 | + if (!filter->inode) { | |
| 1093 | + if (!valid_kernel_ip(filter->offset)) | |
| 1094 | + return -EINVAL; | |
| 1095 | + | |
| 1096 | + if (!valid_kernel_ip(filter->offset + filter->size)) | |
| 1097 | + return -EINVAL; | |
| 1098 | + } | |
| 1089 | 1099 | |
| 1090 | 1100 | if (++range > pt_cap_get(PT_CAP_num_address_ranges)) |
| 1091 | 1101 | return -EOPNOTSUPP; |
| @@ -1111,7 +1121,7 @@ static void pt_event_addr_filters_sync(struct perf_event *event) · 19 unmodified lines | ||
| 1111 | 1121 | } else { |
| 1112 | 1122 | /* apply the offset */ |
| 1113 | 1123 | msr_a = filter->offset + offs[range]; |
| 1114 | − msr_b = filter->size + msr_a; | |
| 1124 | + msr_b = filter->size + msr_a - 1; | |
| 1115 | 1125 | } |
| 1116 | 1126 | |
| 1117 | 1127 | filters->filter[range].msr_a = msr_a; |
| @@ -433,7 +433,11 @@ do { \ · 432 unmodified lines | ||
| 433 | 433 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ |
| 434 | 434 | asm volatile("1: mov"itype" %1,%"rtype"0\n" \ |
| 435 | 435 | "2:\n" \ |
| 436 | − _ASM_EXTABLE_EX(1b, 2b) \ | |
| 436 | + ".section .fixup,\"ax\"\n" \ | |
| 437 | + "3:xor"itype" %"rtype"0,%"rtype"0\n" \ | |
| 438 | + " jmp 2b\n" \ | |
| 439 | + ".previous\n" \ | |
| 440 | + _ASM_EXTABLE_EX(1b, 3b) \ | |
| 437 | 441 | : ltype(x) : "m" (__m(addr))) |
| 438 | 442 | |
| 439 | 443 | #define __put_user_nocheck(x, ptr, size) \ |
| @@ -697,44 +701,15 @@ unsigned long __must_check _copy_from_user(void *to, const void __user *from, · 257 unmodified lines | ||
| 697 | 701 | unsigned long __must_check _copy_to_user(void __user *to, const void *from, |
| 698 | 702 | unsigned n); |
| 699 | 703 | |
| 700 | −#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS | |
| 701 | −# define copy_user_diag __compiletime_error | |
| 702 | −#else | |
| 703 | −# define copy_user_diag __compiletime_warning | |
| 704 | −#endif | |
| 705 | − | |
| 706 | −extern void copy_user_diag("copy_from_user() buffer size is too small") | |
| 707 | −copy_from_user_overflow(void); | |
| 708 | −extern void copy_user_diag("copy_to_user() buffer size is too small") | |
| 709 | −copy_to_user_overflow(void) __asm__("copy_from_user_overflow"); | |
| 710 | − | |
| 711 | −#undef copy_user_diag | |
| 712 | − | |
| 713 | −#ifdef CONFIG_DEBUG_STRICT_USER_COPY_CHECKS | |
| 714 | − | |
| 715 | −extern void | |
| 716 | −__compiletime_warning("copy_from_user() buffer size is not provably correct") | |
| 717 | −__copy_from_user_overflow(void) __asm__("copy_from_user_overflow"); | |
| 718 | −#define __copy_from_user_overflow(size, count) __copy_from_user_overflow() | |
| 719 | − | |
| 720 | −extern void | |
| 721 | −__compiletime_warning("copy_to_user() buffer size is not provably correct") | |
| 722 | −__copy_to_user_overflow(void) __asm__("copy_from_user_overflow"); | |
| 723 | −#define __copy_to_user_overflow(size, count) __copy_to_user_overflow() | |
| 704 | +extern void __compiletime_error("usercopy buffer size is too small") | |
| 705 | +__bad_copy_user(void); | |
| 724 | 706 | |
| 725 | −#else | |
| 726 | − | |
| 727 | −static inline void | |
| 728 | −__copy_from_user_overflow(int size, unsigned long count) | |
| 707 | +static inline void copy_user_overflow(int size, unsigned long count) | |
| 729 | 708 | { |
| 730 | 709 | WARN(1, "Buffer overflow detected (%d < %lu)!\n", size, count); |
| 731 | 710 | } |
| 732 | 711 | |
| 733 | −#define __copy_to_user_overflow __copy_from_user_overflow | |
| 734 | − | |
| 735 | −#endif | |
| 736 | − | |
| 737 | −static inline unsigned long __must_check | |
| 712 | +static __always_inline unsigned long __must_check | |
| 738 | 713 | copy_from_user(void *to, const void __user *from, unsigned long n) |
| 739 | 714 | { |
| 740 | 715 | int sz = __compiletime_object_size(to); |
| @@ -743,36 +718,18 @@ copy_from_user(void *to, const void __user *from, unsigned long n) · 2 unmodified lines | ||
| 743 | 718 | |
| 744 | 719 | kasan_check_write(to, n); |
| 745 | 720 | |
| 746 | − /* | |
| 747 | − * While we would like to have the compiler do the checking for us | |
| 748 | − * even in the non-constant size case, any false positives there are | |
| 749 | − * a problem (especially when DEBUG_STRICT_USER_COPY_CHECKS, but even | |
| 750 | − * without - the [hopefully] dangerous looking nature of the warning | |
| 751 | − * would make people go look at the respecitive call sites over and | |
| 752 | − * over again just to find that there's no problem). | |
| 753 | − * | |
| 754 | − * And there are cases where it's just not realistic for the compiler | |
| 755 | − * to prove the count to be in range. For example when multiple call | |
| 756 | − * sites of a helper function - perhaps in different source files - | |
| 757 | − * all doing proper range checking, yet the helper function not doing | |
| 758 | − * so again. | |
| 759 | − * | |
| 760 | − * Therefore limit the compile time checking to the constant size | |
| 761 | − * case, and do only runtime checking for non-constant sizes. | |
| 762 | − */ | |
| 763 | − | |
| 764 | 721 | if (likely(sz < 0 || sz >= n)) { |
| 765 | 722 | check_object_size(to, n, false); |
| 766 | 723 | n = _copy_from_user(to, from, n); |
| 767 | − } else if (__builtin_constant_p(n)) | |
| 768 | − copy_from_user_overflow(); | |
| 724 | + } else if (!__builtin_constant_p(n)) | |
| 725 | + copy_user_overflow(sz, n); | |
| 769 | 726 | else |
| 770 | − __copy_from_user_overflow(sz, n); | |
| 727 | + __bad_copy_user(); | |
| 771 | 728 | |
| 772 | 729 | return n; |
| 773 | 730 | } |
| 774 | 731 | |
| 775 | −static inline unsigned long __must_check | |
| 732 | +static __always_inline unsigned long __must_check | |
| 776 | 733 | copy_to_user(void __user *to, const void *from, unsigned long n) |
| 777 | 734 | { |
| 778 | 735 | int sz = __compiletime_object_size(from); |
| @@ -781,21 +738,17 @@ copy_to_user(void __user *to, const void *from, unsigned long n) · 2 unmodified lines | ||
| 781 | 738 | |
| 782 | 739 | might_fault(); |
| 783 | 740 | |
| 784 | − /* See the comment in copy_from_user() above. */ | |
| 785 | 741 | if (likely(sz < 0 || sz >= n)) { |
| 786 | 742 | check_object_size(from, n, true); |
| 787 | 743 | n = _copy_to_user(to, from, n); |
| 788 | − } else if (__builtin_constant_p(n)) | |
| 789 | − copy_to_user_overflow(); | |
| 744 | + } else if (!__builtin_constant_p(n)) | |
| 745 | + copy_user_overflow(sz, n); | |
| 790 | 746 | else |
| 791 | − __copy_to_user_overflow(sz, n); | |
| 747 | + __bad_copy_user(); | |
| 792 | 748 | |
| 793 | 749 | return n; |
| 794 | 750 | } |
| 795 | 751 | |
| 796 | −#undef __copy_from_user_overflow | |
| 797 | −#undef __copy_to_user_overflow | |
| 798 | − | |
| 799 | 752 | /* |
| 800 | 753 | * We rely on the nested NMI work to allow atomic faults from the NMI path; the |
| 801 | 754 | * nested NMI paths are careful to preserve CR2. |
| @@ -1623,6 +1623,9 @@ void __init enable_IR_x2apic(void) · 1622 unmodified lines | ||
| 1623 | 1623 | unsigned long flags; |
| 1624 | 1624 | int ret, ir_stat; |
| 1625 | 1625 | |
| 1626 | + if (skip_ioapic_setup) | |
| 1627 | + return; | |
| 1628 | + | |
| 1626 | 1629 | ir_stat = irq_remapping_prepare(); |
| 1627 | 1630 | if (ir_stat < 0 && !x2apic_supported()) |
| 1628 | 1631 | return; |
| @@ -2090,7 +2093,6 @@ int generic_processor_info(int apicid, int version) · 461 unmodified lines | ||
| 2090 | 2093 | return -EINVAL; |
| 2091 | 2094 | } |
| 2092 | 2095 | |
| 2093 | − num_processors++; | |
| 2094 | 2096 | if (apicid == boot_cpu_physical_apicid) { |
| 2095 | 2097 | /* |
| 2096 | 2098 | * x86_bios_cpu_apicid is required to have processors listed |
| @@ -2113,10 +2115,13 @@ int generic_processor_info(int apicid, int version) · 16 unmodified lines | ||
| 2113 | 2115 | |
| 2114 | 2116 | pr_warning("APIC: Package limit reached. Processor %d/0x%x ignored.\n", |
| 2115 | 2117 | thiscpu, apicid); |
| 2118 | + | |
| 2116 | 2119 | disabled_cpus++; |
| 2117 | 2120 | return -ENOSPC; |
| 2118 | 2121 | } |
| 2119 | 2122 | |
| 2123 | + num_processors++; | |
| 2124 | + | |
| 2120 | 2125 | /* |
| 2121 | 2126 | * Validate version |
| 2122 | 2127 | */ |
| @@ -669,6 +669,17 @@ static void init_amd_gh(struct cpuinfo_x86 *c) · 668 unmodified lines | ||
| 669 | 669 | set_cpu_bug(c, X86_BUG_AMD_TLB_MMATCH); |
| 670 | 670 | } |
| 671 | 671 | |
| 672 | +#define MSR_AMD64_DE_CFG 0xC0011029 | |
| 673 | + | |
| 674 | +static void init_amd_ln(struct cpuinfo_x86 *c) | |
| 675 | +{ | |
| 676 | + /* | |
| 677 | + * Apply erratum 665 fix unconditionally so machines without a BIOS | |
| 678 | + * fix work. | |
| 679 | + */ | |
| 680 | + msr_set_bit(MSR_AMD64_DE_CFG, 31); | |
| 681 | +} | |
| 682 | + | |
| 672 | 683 | static void init_amd_bd(struct cpuinfo_x86 *c) |
| 673 | 684 | { |
| 674 | 685 | u64 value; |
| @@ -726,6 +737,7 @@ static void init_amd(struct cpuinfo_x86 *c) · 51 unmodified lines | ||
| 726 | 737 | case 6: init_amd_k7(c); break; |
| 727 | 738 | case 0xf: init_amd_k8(c); break; |
| 728 | 739 | case 0x10: init_amd_gh(c); break; |
| 740 | + case 0x12: init_amd_ln(c); break; | |
| 729 | 741 | case 0x15: init_amd_bd(c); break; |
| 730 | 742 | } |
| 731 | 743 | |
| @@ -54,6 +54,7 @@ static LIST_HEAD(pcache); · 53 unmodified lines | ||
| 54 | 54 | */ |
| 55 | 55 | static u8 *container; |
| 56 | 56 | static size_t container_size; |
| 57 | +static bool ucode_builtin; | |
| 57 | 58 | |
| 58 | 59 | static u32 ucode_new_rev; |
| 59 | 60 | static u8 amd_ucode_patch[PATCH_MAX_SIZE]; |
| @@ -281,18 +282,22 @@ static bool __init load_builtin_amd_microcode(struct cpio_data *cp, · 221 unmodified lines | ||
| 281 | 282 | void __init load_ucode_amd_bsp(unsigned int family) |
| 282 | 283 | { |
| 283 | 284 | struct cpio_data cp; |
| 285 | + bool *builtin; | |
| 284 | 286 | void **data; |
| 285 | 287 | size_t *size; |
| 286 | 288 | |
| 287 | 289 | #ifdef CONFIG_X86_32 |
| 288 | 290 | data = (void **)__pa_nodebug(&ucode_cpio.data); |
| 289 | 291 | size = (size_t *)__pa_nodebug(&ucode_cpio.size); |
| 292 | + builtin = (bool *)__pa_nodebug(&ucode_builtin); | |
| 290 | 293 | #else |
| 291 | 294 | data = &ucode_cpio.data; |
| 292 | 295 | size = &ucode_cpio.size; |
| 296 | + builtin = &ucode_builtin; | |
| 293 | 297 | #endif |
| 294 | 298 | |
| 295 | − if (!load_builtin_amd_microcode(&cp, family)) | |
| 299 | + *builtin = load_builtin_amd_microcode(&cp, family); | |
| 300 | + if (!*builtin) | |
| 296 | 301 | cp = find_ucode_in_initrd(); |
| 297 | 302 | |
| 298 | 303 | if (!(cp.data && cp.size)) |
| @@ -355,6 +360,7 @@ void load_ucode_amd_ap(void) · 56 unmodified lines | ||
| 355 | 360 | unsigned int cpu = smp_processor_id(); |
| 356 | 361 | struct equiv_cpu_entry *eq; |
| 357 | 362 | struct microcode_amd *mc; |
| 363 | + u8 *cont = container; | |
| 358 | 364 | u32 rev, eax; |
| 359 | 365 | u16 eq_id; |
| 360 | 366 | |
| @@ -371,8 +377,12 @@ void load_ucode_amd_ap(void) · 10 unmodified lines | ||
| 371 | 377 | if (check_current_patch_level(&rev, false)) |
| 372 | 378 | return; |
| 373 | 379 | |
| 380 | + /* Add CONFIG_RANDOMIZE_MEMORY offset. */ | |
| 381 | + if (!ucode_builtin) | |
| 382 | + cont += PAGE_OFFSET - __PAGE_OFFSET_BASE; | |
| 383 | + | |
| 374 | 384 | eax = cpuid_eax(0x00000001); |
| 375 | − eq = (struct equiv_cpu_entry *)(container + CONTAINER_HDR_SZ); | |
| 385 | + eq = (struct equiv_cpu_entry *)(cont + CONTAINER_HDR_SZ); | |
| 376 | 386 | |
| 377 | 387 | eq_id = find_equiv_id(eq, eax); |
| 378 | 388 | if (!eq_id) |
| @@ -434,6 +444,10 @@ int __init save_microcode_in_initrd_amd(void) · 55 unmodified lines | ||
| 434 | 444 | else |
| 435 | 445 | container = cont_va; |
| 436 | 446 | |
| 447 | + /* Add CONFIG_RANDOMIZE_MEMORY offset. */ | |
| 448 | + if (!ucode_builtin) | |
| 449 | + container += PAGE_OFFSET - __PAGE_OFFSET_BASE; | |
| 450 | + | |
| 437 | 451 | eax = cpuid_eax(0x00000001); |
| 438 | 452 | eax = ((eax >> 8) & 0xf) + ((eax >> 20) & 0xff); |
| 439 | 453 | |
| @@ -289,6 +289,7 @@ void __init kvmclock_init(void) · 288 unmodified lines | ||
| 289 | 289 | put_cpu(); |
| 290 | 290 | |
| 291 | 291 | x86_platform.calibrate_tsc = kvm_get_tsc_khz; |
| 292 | + x86_platform.calibrate_cpu = kvm_get_tsc_khz; | |
| 292 | 293 | x86_platform.get_wallclock = kvm_get_wallclock; |
| 293 | 294 | x86_platform.set_wallclock = kvm_set_wallclock; |
| 294 | 295 | #ifdef CONFIG_X86_LOCAL_APIC |
| @@ -56,12 +56,12 @@ asm (".pushsection .entry.text, \"ax\"\n" · 55 unmodified lines | ||
| 56 | 56 | ".popsection"); |
| 57 | 57 | |
| 58 | 58 | /* identity function, which can be inlined */ |
| 59 | −u32 _paravirt_ident_32(u32 x) | |
| 59 | +u32 notrace _paravirt_ident_32(u32 x) | |
| 60 | 60 | { |
| 61 | 61 | return x; |
| 62 | 62 | } |
| 63 | 63 | |
| 64 | −u64 _paravirt_ident_64(u64 x) | |
| 64 | +u64 notrace _paravirt_ident_64(u64 x) | |
| 65 | 65 | { |
| 66 | 66 | return x; |
| 67 | 67 | } |
| @@ -100,10 +100,11 @@ EXPORT_PER_CPU_SYMBOL(cpu_info); · 99 unmodified lines | ||
| 100 | 100 | /* Logical package management. We might want to allocate that dynamically */ |
| 101 | 101 | static int *physical_to_logical_pkg __read_mostly; |
| 102 | 102 | static unsigned long *physical_package_map __read_mostly;; |
| 103 | −static unsigned long *logical_package_map __read_mostly; | |
| 104 | 103 | static unsigned int max_physical_pkg_id __read_mostly; |
| 105 | 104 | unsigned int __max_logical_packages __read_mostly; |
| 106 | 105 | EXPORT_SYMBOL(__max_logical_packages); |
| 106 | +static unsigned int logical_packages __read_mostly; | |
| 107 | +static bool logical_packages_frozen __read_mostly; | |
| 107 | 108 | |
| 108 | 109 | /* Maximum number of SMT threads on any online core */ |
| 109 | 110 | int __max_smt_threads __read_mostly; |
| @@ -277,14 +278,14 @@ int topology_update_package_map(unsigned int apicid, unsigned int cpu) · 167 unmodified lines | ||
| 277 | 278 | if (test_and_set_bit(pkg, physical_package_map)) |
| 278 | 279 | goto found; |
| 279 | 280 | |
| 280 | − new = find_first_zero_bit(logical_package_map, __max_logical_packages); | |
| 281 | − if (new >= __max_logical_packages) { | |
| 281 | + if (logical_packages_frozen) { | |
| 282 | 282 | physical_to_logical_pkg[pkg] = -1; |
| 283 | − pr_warn("APIC(%x) Package %u exceeds logical package map\n", | |
| 283 | + pr_warn("APIC(%x) Package %u exceeds logical package max\n", | |
| 284 | 284 | apicid, pkg); |
| 285 | 285 | return -ENOSPC; |
| 286 | 286 | } |
| 287 | − set_bit(new, logical_package_map); | |
| 287 | + | |
| 288 | + new = logical_packages++; | |
| 288 | 289 | pr_info("APIC(%x) Converting physical %u to logical package %u\n", |
| 289 | 290 | apicid, pkg, new); |
| 290 | 291 | physical_to_logical_pkg[pkg] = new; |
| @@ -341,6 +342,7 @@ static void __init smp_init_package_map(void) · 50 unmodified lines | ||
| 341 | 342 | } |
| 342 | 343 | |
| 343 | 344 | __max_logical_packages = DIV_ROUND_UP(total_cpus, ncpus); |
| 345 | + logical_packages = 0; | |
| 344 | 346 | |
| 345 | 347 | /* |
| 346 | 348 | * Possibly larger than what we need as the number of apic ids per |
| @@ -352,10 +354,6 @@ static void __init smp_init_package_map(void) · 5 unmodified lines | ||
| 352 | 354 | memset(physical_to_logical_pkg, 0xff, size); |
| 353 | 355 | size = BITS_TO_LONGS(max_physical_pkg_id) * sizeof(unsigned long); |
| 354 | 356 | physical_package_map = kzalloc(size, GFP_KERNEL); |
| 355 | − size = BITS_TO_LONGS(__max_logical_packages) * sizeof(unsigned long); | |
| 356 | − logical_package_map = kzalloc(size, GFP_KERNEL); | |
| 357 | − | |
| 358 | − pr_info("Max logical packages: %u\n", __max_logical_packages); | |
| 359 | 357 | |
| 360 | 358 | for_each_present_cpu(cpu) { |
| 361 | 359 | unsigned int apicid = apic->cpu_present_to_apicid(cpu); |
| @@ -369,6 +367,15 @@ static void __init smp_init_package_map(void) · 7 unmodified lines | ||
| 369 | 367 | set_cpu_possible(cpu, false); |
| 370 | 368 | set_cpu_present(cpu, false); |
| 371 | 369 | } |
| 370 | + | |
| 371 | + if (logical_packages > __max_logical_packages) { | |
| 372 | + pr_warn("Detected more packages (%u), then computed by BIOS data (%u).\n", | |
| 373 | + logical_packages, __max_logical_packages); | |
| 374 | + logical_packages_frozen = true; | |
| 375 | + __max_logical_packages = logical_packages; | |
| 376 | + } | |
| 377 | + | |
| 378 | + pr_info("Max logical packages: %u\n", __max_logical_packages); | |
| 372 | 379 | } |
| 373 | 380 | |
| 374 | 381 | void __init smp_store_boot_cpu_info(void) |
| @@ -109,6 +109,7 @@ static void __rtc_irq_eoi_tracking_restore_one(struct kvm_vcpu *vcpu) · 108 unmodified lines | ||
| 109 | 109 | { |
| 110 | 110 | bool new_val, old_val; |
| 111 | 111 | struct kvm_ioapic *ioapic = vcpu->kvm->arch.vioapic; |
| 112 | + struct dest_map *dest_map = &ioapic->rtc_status.dest_map; | |
| 112 | 113 | union kvm_ioapic_redirect_entry *e; |
| 113 | 114 | |
| 114 | 115 | e = &ioapic->redirtbl[RTC_GSI]; |
| @@ -117,16 +118,17 @@ static void __rtc_irq_eoi_tracking_restore_one(struct kvm_vcpu *vcpu) · 2 unmodified lines | ||
| 117 | 118 | return; |
| 118 | 119 | |
| 119 | 120 | new_val = kvm_apic_pending_eoi(vcpu, e->fields.vector); |
| 120 | − old_val = test_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map); | |
| 121 | + old_val = test_bit(vcpu->vcpu_id, dest_map->map); | |
| 121 | 122 | |
| 122 | 123 | if (new_val == old_val) |
| 123 | 124 | return; |
| 124 | 125 | |
| 125 | 126 | if (new_val) { |
| 126 | − __set_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map); | |
| 127 | + __set_bit(vcpu->vcpu_id, dest_map->map); | |
| 128 | + dest_map->vectors[vcpu->vcpu_id] = e->fields.vector; | |
| 127 | 129 | ioapic->rtc_status.pending_eoi++; |
| 128 | 130 | } else { |
| 129 | − __clear_bit(vcpu->vcpu_id, ioapic->rtc_status.dest_map.map); | |
| 131 | + __clear_bit(vcpu->vcpu_id, dest_map->map); | |
| 130 | 132 | ioapic->rtc_status.pending_eoi--; |
| 131 | 133 | rtc_status_pending_eoi_check_valid(ioapic); |
| 132 | 134 | } |
| @@ -23,8 +23,8 @@ · 22 unmodified lines | ||
| 23 | 23 | static struct kvm_event_hw_type_mapping amd_event_mapping[] = { |
| 24 | 24 | [0] = { 0x76, 0x00, PERF_COUNT_HW_CPU_CYCLES }, |
| 25 | 25 | [1] = { 0xc0, 0x00, PERF_COUNT_HW_INSTRUCTIONS }, |
| 26 | − [2] = { 0x80, 0x00, PERF_COUNT_HW_CACHE_REFERENCES }, | |
| 27 | − [3] = { 0x81, 0x00, PERF_COUNT_HW_CACHE_MISSES }, | |
| 26 | + [2] = { 0x7d, 0x07, PERF_COUNT_HW_CACHE_REFERENCES }, | |
| 27 | + [3] = { 0x7e, 0x07, PERF_COUNT_HW_CACHE_MISSES }, | |
| 28 | 28 | [4] = { 0xc2, 0x00, PERF_COUNT_HW_BRANCH_INSTRUCTIONS }, |
| 29 | 29 | [5] = { 0xc3, 0x00, PERF_COUNT_HW_BRANCH_MISSES }, |
| 30 | 30 | [6] = { 0xd0, 0x00, PERF_COUNT_HW_STALLED_CYCLES_FRONTEND }, |
| @@ -422,6 +422,7 @@ struct nested_vmx { · 421 unmodified lines | ||
| 422 | 422 | struct list_head vmcs02_pool; |
| 423 | 423 | int vmcs02_num; |
| 424 | 424 | u64 vmcs01_tsc_offset; |
| 425 | + bool change_vmcs01_virtual_x2apic_mode; | |
| 425 | 426 | /* L2 must run next, and mustn't decide to exit to L1. */ |
| 426 | 427 | bool nested_run_pending; |
| 427 | 428 | /* |
| @@ -435,6 +436,8 @@ struct nested_vmx { · 7 unmodified lines | ||
| 435 | 436 | bool pi_pending; |
| 436 | 437 | u16 posted_intr_nv; |
| 437 | 438 | |
| 439 | + unsigned long *msr_bitmap; | |
| 440 | + | |
| 438 | 441 | struct hrtimer preemption_timer; |
| 439 | 442 | bool preemption_timer_expired; |
| 440 | 443 | |
| @@ -924,7 +927,6 @@ static unsigned long *vmx_msr_bitmap_legacy; · 483 unmodified lines | ||
| 924 | 927 | static unsigned long *vmx_msr_bitmap_longmode; |
| 925 | 928 | static unsigned long *vmx_msr_bitmap_legacy_x2apic; |
| 926 | 929 | static unsigned long *vmx_msr_bitmap_longmode_x2apic; |
| 927 | −static unsigned long *vmx_msr_bitmap_nested; | |
| 928 | 930 | static unsigned long *vmx_vmread_bitmap; |
| 929 | 931 | static unsigned long *vmx_vmwrite_bitmap; |
| 930 | 932 | |
| @@ -2198,6 +2200,12 @@ static void vmx_vcpu_pi_load(struct kvm_vcpu *vcpu, int cpu) · 1267 unmodified lines | ||
| 2198 | 2200 | new.control) != old.control); |
| 2199 | 2201 | } |
| 2200 | 2202 | |
| 2203 | +static void decache_tsc_multiplier(struct vcpu_vmx *vmx) | |
| 2204 | +{ | |
| 2205 | + vmx->current_tsc_ratio = vmx->vcpu.arch.tsc_scaling_ratio; | |
| 2206 | + vmcs_write64(TSC_MULTIPLIER, vmx->current_tsc_ratio); | |
| 2207 | +} | |
| 2208 | + | |
| 2201 | 2209 | /* |
| 2202 | 2210 | * Switches to specified vcpu, until a matching vcpu_put(), but assumes |
| 2203 | 2211 | * vcpu mutex is already taken. |
| @@ -2256,10 +2264,8 @@ static void vmx_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · 52 unmodified lines | ||
| 2256 | 2264 | |
| 2257 | 2265 | /* Setup TSC multiplier */ |
| 2258 | 2266 | if (kvm_has_tsc_control && |
| 2259 | − vmx->current_tsc_ratio != vcpu->arch.tsc_scaling_ratio) { | |
| 2260 | − vmx->current_tsc_ratio = vcpu->arch.tsc_scaling_ratio; | |
| 2261 | − vmcs_write64(TSC_MULTIPLIER, vmx->current_tsc_ratio); | |
| 2262 | − } | |
| 2267 | + vmx->current_tsc_ratio != vcpu->arch.tsc_scaling_ratio) | |
| 2268 | + decache_tsc_multiplier(vmx); | |
| 2263 | 2269 | |
| 2264 | 2270 | vmx_vcpu_pi_load(vcpu, cpu); |
| 2265 | 2271 | vmx->host_pkru = read_pkru(); |
| @@ -2508,7 +2514,7 @@ static void vmx_set_msr_bitmap(struct kvm_vcpu *vcpu) · 242 unmodified lines | ||
| 2508 | 2514 | unsigned long *msr_bitmap; |
| 2509 | 2515 | |
| 2510 | 2516 | if (is_guest_mode(vcpu)) |
| 2511 | − msr_bitmap = vmx_msr_bitmap_nested; | |
| 2517 | + msr_bitmap = to_vmx(vcpu)->nested.msr_bitmap; | |
| 2512 | 2518 | else if (cpu_has_secondary_exec_ctrls() && |
| 2513 | 2519 | (vmcs_read32(SECONDARY_VM_EXEC_CONTROL) & |
| 2514 | 2520 | SECONDARY_EXEC_VIRTUALIZE_X2APIC_MODE)) { |
| @@ -6363,13 +6369,6 @@ static __init int hardware_setup(void) · 3848 unmodified lines | ||
| 6363 | 6369 | if (!vmx_msr_bitmap_longmode_x2apic) |
| 6364 | 6370 | goto out4; |
| 6365 | 6371 | |
| 6366 | − if (nested) { | |
| 6367 | − vmx_msr_bitmap_nested = | |
| 6368 | − (unsigned long *)__get_free_page(GFP_KERNEL); | |
| 6369 | − if (!vmx_msr_bitmap_nested) | |
| 6370 | − goto out5; | |
| 6371 | − } | |
| 6372 | − | |
| 6373 | 6372 | vmx_vmread_bitmap = (unsigned long *)__get_free_page(GFP_KERNEL); |
| 6374 | 6373 | if (!vmx_vmread_bitmap) |
| 6375 | 6374 | goto out6; |
| @@ -6392,8 +6391,6 @@ static __init int hardware_setup(void) · 16 unmodified lines | ||
| 6392 | 6391 | |
| 6393 | 6392 | memset(vmx_msr_bitmap_legacy, 0xff, PAGE_SIZE); |
| 6394 | 6393 | memset(vmx_msr_bitmap_longmode, 0xff, PAGE_SIZE); |
| 6395 | − if (nested) | |
| 6396 | − memset(vmx_msr_bitmap_nested, 0xff, PAGE_SIZE); | |
| 6397 | 6394 | |
| 6398 | 6395 | if (setup_vmcs_config(&vmcs_config) < 0) { |
| 6399 | 6396 | r = -EIO; |
| @@ -6529,9 +6526,6 @@ out8: · 129 unmodified lines | ||
| 6529 | 6526 | out7: |
| 6530 | 6527 | free_page((unsigned long)vmx_vmread_bitmap); |
| 6531 | 6528 | out6: |
| 6532 | − if (nested) | |
| 6533 | − free_page((unsigned long)vmx_msr_bitmap_nested); | |
| 6534 | −out5: | |
| 6535 | 6529 | free_page((unsigned long)vmx_msr_bitmap_longmode_x2apic); |
| 6536 | 6530 | out4: |
| 6537 | 6531 | free_page((unsigned long)vmx_msr_bitmap_longmode); |
| @@ -6557,8 +6551,6 @@ static __exit void hardware_unsetup(void) · 19 unmodified lines | ||
| 6557 | 6551 | free_page((unsigned long)vmx_io_bitmap_a); |
| 6558 | 6552 | free_page((unsigned long)vmx_vmwrite_bitmap); |
| 6559 | 6553 | free_page((unsigned long)vmx_vmread_bitmap); |
| 6560 | − if (nested) | |
| 6561 | − free_page((unsigned long)vmx_msr_bitmap_nested); | |
| 6562 | 6554 | |
| 6563 | 6555 | free_kvm_area(); |
| 6564 | 6556 | } |
| @@ -6995,16 +6987,21 @@ static int handle_vmon(struct kvm_vcpu *vcpu) · 430 unmodified lines | ||
| 6995 | 6987 | return 1; |
| 6996 | 6988 | } |
| 6997 | 6989 | |
| 6990 | + if (cpu_has_vmx_msr_bitmap()) { | |
| 6991 | + vmx->nested.msr_bitmap = | |
| 6992 | + (unsigned long *)__get_free_page(GFP_KERNEL); | |
| 6993 | + if (!vmx->nested.msr_bitmap) | |
| 6994 | + goto out_msr_bitmap; | |
| 6995 | + } | |
| 6996 | + | |
| 6998 | 6997 | vmx->nested.cached_vmcs12 = kmalloc(VMCS12_SIZE, GFP_KERNEL); |
| 6999 | 6998 | if (!vmx->nested.cached_vmcs12) |
| 7000 | − return -ENOMEM; | |
| 6999 | + goto out_cached_vmcs12; | |
| 7001 | 7000 | |
| 7002 | 7001 | if (enable_shadow_vmcs) { |
| 7003 | 7002 | shadow_vmcs = alloc_vmcs(); |
| 7004 | − if (!shadow_vmcs) { | |
| 7005 | − kfree(vmx->nested.cached_vmcs12); | |
| 7006 | − return -ENOMEM; | |
| 7007 | − } | |
| 7003 | + if (!shadow_vmcs) | |
| 7004 | + goto out_shadow_vmcs; | |
| 7008 | 7005 | /* mark vmcs as shadow */ |
| 7009 | 7006 | shadow_vmcs->revision_id |= (1u << 31); |
| 7010 | 7007 | /* init shadow vmcs */ |
| @@ -7024,6 +7021,15 @@ static int handle_vmon(struct kvm_vcpu *vcpu) · 13 unmodified lines | ||
| 7024 | 7021 | skip_emulated_instruction(vcpu); |
| 7025 | 7022 | nested_vmx_succeed(vcpu); |
| 7026 | 7023 | return 1; |
| 7024 | + | |
| 7025 | +out_shadow_vmcs: | |
| 7026 | + kfree(vmx->nested.cached_vmcs12); | |
| 7027 | + | |
| 7028 | +out_cached_vmcs12: | |
| 7029 | + free_page((unsigned long)vmx->nested.msr_bitmap); | |
| 7030 | + | |
| 7031 | +out_msr_bitmap: | |
| 7032 | + return -ENOMEM; | |
| 7027 | 7033 | } |
| 7028 | 7034 | |
| 7029 | 7035 | /* |
| @@ -7098,6 +7104,10 @@ static void free_nested(struct vcpu_vmx *vmx) · 68 unmodified lines | ||
| 7098 | 7104 | vmx->nested.vmxon = false; |
| 7099 | 7105 | free_vpid(vmx->nested.vpid02); |
| 7100 | 7106 | nested_release_vmcs12(vmx); |
| 7107 | + if (vmx->nested.msr_bitmap) { | |
| 7108 | + free_page((unsigned long)vmx->nested.msr_bitmap); | |
| 7109 | + vmx->nested.msr_bitmap = NULL; | |
| 7110 | + } | |
| 7101 | 7111 | if (enable_shadow_vmcs) |
| 7102 | 7112 | free_vmcs(vmx->nested.current_shadow_vmcs); |
| 7103 | 7113 | kfree(vmx->nested.cached_vmcs12); |
| @@ -8419,6 +8429,12 @@ static void vmx_set_virtual_x2apic_mode(struct kvm_vcpu *vcpu, bool set) · 1315 unmodified lines | ||
| 8419 | 8429 | { |
| 8420 | 8430 | u32 sec_exec_control; |
| 8421 | 8431 | |
| 8432 | + /* Postpone execution until vmcs01 is the current VMCS. */ | |
| 8433 | + if (is_guest_mode(vcpu)) { | |
| 8434 | + to_vmx(vcpu)->nested.change_vmcs01_virtual_x2apic_mode = true; | |
| 8435 | + return; | |
| 8436 | + } | |
| 8437 | + | |
| 8422 | 8438 | /* |
| 8423 | 8439 | * There is not point to enable virtualize x2apic without enable |
| 8424 | 8440 | * apicv |
| @@ -9472,8 +9488,10 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu, · 1047 unmodified lines | ||
| 9472 | 9488 | { |
| 9473 | 9489 | int msr; |
| 9474 | 9490 | struct page *page; |
| 9475 | − unsigned long *msr_bitmap; | |
| 9491 | + unsigned long *msr_bitmap_l1; | |
| 9492 | + unsigned long *msr_bitmap_l0 = to_vmx(vcpu)->nested.msr_bitmap; | |
| 9476 | 9493 | |
| 9494 | + /* This shortcut is ok because we support only x2APIC MSRs so far. */ | |
| 9477 | 9495 | if (!nested_cpu_has_virt_x2apic_mode(vmcs12)) |
| 9478 | 9496 | return false; |
| 9479 | 9497 | |
| @@ -9482,63 +9500,37 @@ static inline bool nested_vmx_merge_msr_bitmap(struct kvm_vcpu *vcpu, · 2 unmodified lines | ||
| 9482 | 9500 | WARN_ON(1); |
| 9483 | 9501 | return false; |
| 9484 | 9502 | } |
| 9485 | − msr_bitmap = (unsigned long *)kmap(page); | |
| 9486 | − if (!msr_bitmap) { | |
| 9503 | + msr_bitmap_l1 = (unsigned long *)kmap(page); | |
| 9504 | + if (!msr_bitmap_l1) { | |
| 9487 | 9505 | nested_release_page_clean(page); |
| 9488 | 9506 | WARN_ON(1); |
| 9489 | 9507 | return false; |
| 9490 | 9508 | } |
| 9491 | 9509 | |
| 9510 | + memset(msr_bitmap_l0, 0xff, PAGE_SIZE); | |
| 9511 | + | |
| 9492 | 9512 | if (nested_cpu_has_virt_x2apic_mode(vmcs12)) { |
| 9493 | 9513 | if (nested_cpu_has_apic_reg_virt(vmcs12)) |
| 9494 | 9514 | for (msr = 0x800; msr <= 0x8ff; msr++) |
| 9495 | 9515 | nested_vmx_disable_intercept_for_msr( |
| 9496 | − msr_bitmap, | |
| 9497 | − vmx_msr_bitmap_nested, | |
| 9516 | + msr_bitmap_l1, msr_bitmap_l0, | |
| 9498 | 9517 | msr, MSR_TYPE_R); |
| 9499 | − /* TPR is allowed */ | |
| 9500 | − nested_vmx_disable_intercept_for_msr(msr_bitmap, | |
| 9501 | − vmx_msr_bitmap_nested, | |
| 9518 | + | |
| 9519 | + nested_vmx_disable_intercept_for_msr( | |
| 9520 | + msr_bitmap_l1, msr_bitmap_l0, | |
| 9502 | 9521 | APIC_BASE_MSR + (APIC_TASKPRI >> 4), |
| 9503 | 9522 | MSR_TYPE_R | MSR_TYPE_W); |
| 9523 | + | |
| 9504 | 9524 | if (nested_cpu_has_vid(vmcs12)) { |
| 9505 | − /* EOI and self-IPI are allowed */ | |
| 9506 | 9525 | nested_vmx_disable_intercept_for_msr( |
| 9507 | − msr_bitmap, | |
| 9508 | − vmx_msr_bitmap_nested, | |
| 9526 | + msr_bitmap_l1, msr_bitmap_l0, | |
| 9509 | 9527 | APIC_BASE_MSR + (APIC_EOI >> 4), |
| 9510 | 9528 | MSR_TYPE_W); |
| 9511 | 9529 | nested_vmx_disable_intercept_for_msr( |
| 9512 | − msr_bitmap, | |
| 9513 | − vmx_msr_bitmap_nested, | |
| 9530 | + msr_bitmap_l1, msr_bitmap_l0, | |
| 9514 | 9531 | APIC_BASE_MSR + (APIC_SELF_IPI >> 4), |
| 9515 | 9532 | MSR_TYPE_W); |
| 9516 | 9533 | } |
| 9517 | − } else { | |
| 9518 | − /* | |
| 9519 | − * Enable reading intercept of all the x2apic | |
| 9520 | − * MSRs. We should not rely on vmcs12 to do any | |
| 9521 | − * optimizations here, it may have been modified | |
| 9522 | − * by L1. | |
| 9523 | − */ | |
| 9524 | − for (msr = 0x800; msr <= 0x8ff; msr++) | |
| 9525 | − __vmx_enable_intercept_for_msr( | |
| 9526 | − vmx_msr_bitmap_nested, | |
| 9527 | − msr, | |
| 9528 | − MSR_TYPE_R); | |
| 9529 | − | |
| 9530 | − __vmx_enable_intercept_for_msr( | |
| 9531 | − vmx_msr_bitmap_nested, | |
| 9532 | − APIC_BASE_MSR + (APIC_TASKPRI >> 4), | |
| 9533 | − MSR_TYPE_W); | |
| 9534 | − __vmx_enable_intercept_for_msr( | |
| 9535 | − vmx_msr_bitmap_nested, | |
| 9536 | − APIC_BASE_MSR + (APIC_EOI >> 4), | |
| 9537 | − MSR_TYPE_W); | |
| 9538 | − __vmx_enable_intercept_for_msr( | |
| 9539 | − vmx_msr_bitmap_nested, | |
| 9540 | − APIC_BASE_MSR + (APIC_SELF_IPI >> 4), | |
| 9541 | − MSR_TYPE_W); | |
| 9542 | 9534 | } |
| 9543 | 9535 | kunmap(page); |
| 9544 | 9536 | nested_release_page_clean(page); |
| @@ -9957,10 +9949,10 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · 412 unmodified lines | ||
| 9957 | 9949 | } |
| 9958 | 9950 | |
| 9959 | 9951 | if (cpu_has_vmx_msr_bitmap() && |
| 9960 | − exec_control & CPU_BASED_USE_MSR_BITMAPS) { | |
| 9961 | − nested_vmx_merge_msr_bitmap(vcpu, vmcs12); | |
| 9962 | − /* MSR_BITMAP will be set by following vmx_set_efer. */ | |
| 9963 | − } else | |
| 9952 | + exec_control & CPU_BASED_USE_MSR_BITMAPS && | |
| 9953 | + nested_vmx_merge_msr_bitmap(vcpu, vmcs12)) | |
| 9954 | + ; /* MSR_BITMAP will be set by following vmx_set_efer. */ | |
| 9955 | + else | |
| 9964 | 9956 | exec_control &= ~CPU_BASED_USE_MSR_BITMAPS; |
| 9965 | 9957 | |
| 9966 | 9958 | /* |
| @@ -10011,6 +10003,8 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12) · 44 unmodified lines | ||
| 10011 | 10003 | vmx->nested.vmcs01_tsc_offset + vmcs12->tsc_offset); |
| 10012 | 10004 | else |
| 10013 | 10005 | vmcs_write64(TSC_OFFSET, vmx->nested.vmcs01_tsc_offset); |
| 10006 | + if (kvm_has_tsc_control) | |
| 10007 | + decache_tsc_multiplier(vmx); | |
| 10014 | 10008 | |
| 10015 | 10009 | if (enable_vpid) { |
| 10016 | 10010 | /* |
| @@ -10767,6 +10761,14 @@ static void nested_vmx_vmexit(struct kvm_vcpu *vcpu, u32 exit_reason, · 750 unmodified lines | ||
| 10767 | 10761 | else |
| 10768 | 10762 | vmcs_set_bits(PIN_BASED_VM_EXEC_CONTROL, |
| 10769 | 10763 | PIN_BASED_VMX_PREEMPTION_TIMER); |
| 10764 | + if (kvm_has_tsc_control) | |
| 10765 | + decache_tsc_multiplier(vmx); | |
| 10766 | + | |
| 10767 | + if (vmx->nested.change_vmcs01_virtual_x2apic_mode) { | |
| 10768 | + vmx->nested.change_vmcs01_virtual_x2apic_mode = false; | |
| 10769 | + vmx_set_virtual_x2apic_mode(vcpu, | |
| 10770 | + vcpu->arch.apic_base & X2APIC_ENABLE); | |
| 10771 | + } | |
| 10770 | 10772 | |
| 10771 | 10773 | /* This is needed for same reason as it was needed in prepare_vmcs02 */ |
| 10772 | 10774 | vmx->host_rsp = 0; |
| @@ -2743,16 +2743,16 @@ void kvm_arch_vcpu_load(struct kvm_vcpu *vcpu, int cpu) · 2742 unmodified lines | ||
| 2743 | 2743 | if (tsc_delta < 0) |
| 2744 | 2744 | mark_tsc_unstable("KVM discovered backwards TSC"); |
| 2745 | 2745 | |
| 2746 | − if (kvm_lapic_hv_timer_in_use(vcpu) && | |
| 2747 | − kvm_x86_ops->set_hv_timer(vcpu, | |
| 2748 | − kvm_get_lapic_tscdeadline_msr(vcpu))) | |
| 2749 | − kvm_lapic_switch_to_sw_timer(vcpu); | |
| 2750 | 2746 | if (check_tsc_unstable()) { |
| 2751 | 2747 | u64 offset = kvm_compute_tsc_offset(vcpu, |
| 2752 | 2748 | vcpu->arch.last_guest_tsc); |
| 2753 | 2749 | kvm_x86_ops->write_tsc_offset(vcpu, offset); |
| 2754 | 2750 | vcpu->arch.tsc_catchup = 1; |
| 2755 | 2751 | } |
| 2752 | + if (kvm_lapic_hv_timer_in_use(vcpu) && | |
| 2753 | + kvm_x86_ops->set_hv_timer(vcpu, | |
| 2754 | + kvm_get_lapic_tscdeadline_msr(vcpu))) | |
| 2755 | + kvm_lapic_switch_to_sw_timer(vcpu); | |
| 2756 | 2756 | /* |
| 2757 | 2757 | * On a host with synchronized TSC, there is no need to update |
| 2758 | 2758 | * kvmclock on vcpu->cpu migration |
| @@ -77,7 +77,7 @@ static inline unsigned long get_padding(struct kaslr_memory_region *region) · 76 unmodified lines | ||
| 77 | 77 | */ |
| 78 | 78 | static inline bool kaslr_memory_enabled(void) |
| 79 | 79 | { |
| 80 | − return kaslr_enabled() && !config_enabled(CONFIG_KASAN); | |
| 80 | + return kaslr_enabled() && !IS_ENABLED(CONFIG_KASAN); | |
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | /* Initialize base and padding for each memory region randomized with KASLR */ |
| @@ -917,11 +917,11 @@ static void populate_pte(struct cpa_data *cpa, · 916 unmodified lines | ||
| 917 | 917 | } |
| 918 | 918 | } |
| 919 | 919 | |
| 920 | −static int populate_pmd(struct cpa_data *cpa, | |
| 921 | − unsigned long start, unsigned long end, | |
| 922 | − unsigned num_pages, pud_t *pud, pgprot_t pgprot) | |
| 920 | +static long populate_pmd(struct cpa_data *cpa, | |
| 921 | + unsigned long start, unsigned long end, | |
| 922 | + unsigned num_pages, pud_t *pud, pgprot_t pgprot) | |
| 923 | 923 | { |
| 924 | − unsigned int cur_pages = 0; | |
| 924 | + long cur_pages = 0; | |
| 925 | 925 | pmd_t *pmd; |
| 926 | 926 | pgprot_t pmd_pgprot; |
| 927 | 927 | |
| @@ -991,12 +991,12 @@ static int populate_pmd(struct cpa_data *cpa, · 63 unmodified lines | ||
| 991 | 991 | return num_pages; |
| 992 | 992 | } |
| 993 | 993 | |
| 994 | −static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd, | |
| 995 | − pgprot_t pgprot) | |
| 994 | +static long populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd, | |
| 995 | + pgprot_t pgprot) | |
| 996 | 996 | { |
| 997 | 997 | pud_t *pud; |
| 998 | 998 | unsigned long end; |
| 999 | − int cur_pages = 0; | |
| 999 | + long cur_pages = 0; | |
| 1000 | 1000 | pgprot_t pud_pgprot; |
| 1001 | 1001 | |
| 1002 | 1002 | end = start + (cpa->numpages << PAGE_SHIFT); |
| @@ -1052,7 +1052,7 @@ static int populate_pud(struct cpa_data *cpa, unsigned long start, pgd_t *pgd, · 49 unmodified lines | ||
| 1052 | 1052 | |
| 1053 | 1053 | /* Map trailing leftover */ |
| 1054 | 1054 | if (start < end) { |
| 1055 | − int tmp; | |
| 1055 | + long tmp; | |
| 1056 | 1056 | |
| 1057 | 1057 | pud = pud_offset(pgd, start); |
| 1058 | 1058 | if (pud_none(*pud)) |
| @@ -1078,7 +1078,7 @@ static int populate_pgd(struct cpa_data *cpa, unsigned long addr) · 19 unmodified lines | ||
| 1078 | 1078 | pgprot_t pgprot = __pgprot(_KERNPG_TABLE); |
| 1079 | 1079 | pud_t *pud = NULL; /* shut up gcc */ |
| 1080 | 1080 | pgd_t *pgd_entry; |
| 1081 | − int ret; | |
| 1081 | + long ret; | |
| 1082 | 1082 | |
| 1083 | 1083 | pgd_entry = cpa->pgd + pgd_index(addr); |
| 1084 | 1084 | |
| @@ -1327,7 +1327,8 @@ static int cpa_process_alias(struct cpa_data *cpa) · 242 unmodified lines | ||
| 1327 | 1327 | |
| 1328 | 1328 | static int __change_page_attr_set_clr(struct cpa_data *cpa, int checkalias) |
| 1329 | 1329 | { |
| 1330 | − int ret, numpages = cpa->numpages; | |
| 1330 | + unsigned long numpages = cpa->numpages; | |
| 1331 | + int ret; | |
| 1331 | 1332 | |
| 1332 | 1333 | while (numpages) { |
| 1333 | 1334 | /* |
| @@ -927,9 +927,10 @@ int track_pfn_copy(struct vm_area_struct *vma) · 926 unmodified lines | ||
| 927 | 927 | } |
| 928 | 928 | |
| 929 | 929 | /* |
| 930 | − * prot is passed in as a parameter for the new mapping. If the vma has a | |
| 931 | − * linear pfn mapping for the entire range reserve the entire vma range with | |
| 932 | − * single reserve_pfn_range call. | |
| 930 | + * prot is passed in as a parameter for the new mapping. If the vma has | |
| 931 | + * a linear pfn mapping for the entire range, or no vma is provided, | |
| 932 | + * reserve the entire pfn + size range with single reserve_pfn_range | |
| 933 | + * call. | |
| 933 | 934 | */ |
| 934 | 935 | int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, |
| 935 | 936 | unsigned long pfn, unsigned long addr, unsigned long size) |
| @@ -938,11 +939,12 @@ int track_pfn_remap(struct vm_area_struct *vma, pgprot_t *prot, · 2 unmodified lines | ||
| 938 | 939 | enum page_cache_mode pcm; |
| 939 | 940 | |
| 940 | 941 | /* reserve the whole chunk starting from paddr */ |
| 941 | − if (addr == vma->vm_start && size == (vma->vm_end - vma->vm_start)) { | |
| 942 | + if (!vma || (addr == vma->vm_start | |
| 943 | + && size == (vma->vm_end - vma->vm_start))) { | |
| 942 | 944 | int ret; |
| 943 | 945 | |
| 944 | 946 | ret = reserve_pfn_range(paddr, size, prot, 0); |
| 945 | − if (!ret) | |
| 947 | + if (ret == 0 && vma) | |
| 946 | 948 | vma->vm_flags |= VM_PAT; |
| 947 | 949 | return ret; |
| 948 | 950 | } |
| @@ -997,7 +999,7 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, · 48 unmodified lines | ||
| 997 | 999 | resource_size_t paddr; |
| 998 | 1000 | unsigned long prot; |
| 999 | 1001 | |
| 1000 | − if (!(vma->vm_flags & VM_PAT)) | |
| 1002 | + if (vma && !(vma->vm_flags & VM_PAT)) | |
| 1001 | 1003 | return; |
| 1002 | 1004 | |
| 1003 | 1005 | /* free the chunk starting from pfn or the whole chunk */ |
| @@ -1011,7 +1013,8 @@ void untrack_pfn(struct vm_area_struct *vma, unsigned long pfn, · 7 unmodified lines | ||
| 1011 | 1013 | size = vma->vm_end - vma->vm_start; |
| 1012 | 1014 | } |
| 1013 | 1015 | free_pfn_range(paddr, size); |
| 1014 | − vma->vm_flags &= ~VM_PAT; | |
| 1016 | + if (vma) | |
| 1017 | + vma->vm_flags &= ~VM_PAT; | |
| 1015 | 1018 | } |
| 1016 | 1019 | |
| 1017 | 1020 | /* |
| @@ -553,15 +553,21 @@ static void twinhead_reserve_killing_zone(struct pci_dev *dev) · 552 unmodified lines | ||
| 553 | 553 | DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x27B9, twinhead_reserve_killing_zone); |
| 554 | 554 | |
| 555 | 555 | /* |
| 556 | − * Broadwell EP Home Agent BARs erroneously return non-zero values when read. | |
| 556 | + * Device [8086:2fc0] | |
| 557 | + * Erratum HSE43 | |
| 558 | + * CONFIG_TDP_NOMINAL CSR Implemented at Incorrect Offset | |
| 559 | + * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v3-spec-update.html | |
| 557 | 560 | * |
| 558 | − * See http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html | |
| 559 | − * entry BDF2. | |
| 561 | + * Devices [8086:6f60,6fa0,6fc0] | |
| 562 | + * Erratum BDF2 | |
| 563 | + * PCI BARs in the Home Agent Will Return Non-Zero Values During Enumeration | |
| 564 | + * http://www.intel.com/content/www/us/en/processors/xeon/xeon-e5-v4-spec-update.html | |
| 560 | 565 | */ |
| 561 | −static void pci_bdwep_bar(struct pci_dev *dev) | |
| 566 | +static void pci_invalid_bar(struct pci_dev *dev) | |
| 562 | 567 | { |
| 563 | 568 | dev->non_compliant_bars = 1; |
| 564 | 569 | } |
| 565 | −DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_bdwep_bar); | |
| 566 | −DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_bdwep_bar); | |
| 567 | −DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_bdwep_bar); | |
| 570 | +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x2fc0, pci_invalid_bar); | |
| 571 | +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6f60, pci_invalid_bar); | |
| 572 | +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fa0, pci_invalid_bar); | |
| 573 | +DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, 0x6fc0, pci_invalid_bar); | |
| @@ -41,6 +41,7 @@ static DEFINE_RAW_SPINLOCK(list_lock); · 40 unmodified lines | ||
| 41 | 41 | * @node: list item for parent traversal. |
| 42 | 42 | * @rcu: RCU callback item for freeing. |
| 43 | 43 | * @irq: back pointer to parent. |
| 44 | + * @enabled: true if driver enabled IRQ | |
| 44 | 45 | * @virq: the virtual IRQ value provided to the requesting driver. |
| 45 | 46 | * |
| 46 | 47 | * Every MSI/MSI-X IRQ requested for a device in a VMD domain will be mapped to |
| @@ -50,6 +51,7 @@ struct vmd_irq { · 3 unmodified lines | ||
| 50 | 51 | struct list_head node; |
| 51 | 52 | struct rcu_head rcu; |
| 52 | 53 | struct vmd_irq_list *irq; |
| 54 | + bool enabled; | |
| 53 | 55 | unsigned int virq; |
| 54 | 56 | }; |
| 55 | 57 | |
| @@ -122,7 +124,9 @@ static void vmd_irq_enable(struct irq_data *data) · 66 unmodified lines | ||
| 122 | 124 | unsigned long flags; |
| 123 | 125 | |
| 124 | 126 | raw_spin_lock_irqsave(&list_lock, flags); |
| 127 | + WARN_ON(vmdirq->enabled); | |
| 125 | 128 | list_add_tail_rcu(&vmdirq->node, &vmdirq->irq->irq_list); |
| 129 | + vmdirq->enabled = true; | |
| 126 | 130 | raw_spin_unlock_irqrestore(&list_lock, flags); |
| 127 | 131 | |
| 128 | 132 | data->chip->irq_unmask(data); |
| @@ -136,8 +140,10 @@ static void vmd_irq_disable(struct irq_data *data) · 7 unmodified lines | ||
| 136 | 140 | data->chip->irq_mask(data); |
| 137 | 141 | |
| 138 | 142 | raw_spin_lock_irqsave(&list_lock, flags); |
| 139 | − list_del_rcu(&vmdirq->node); | |
| 140 | − INIT_LIST_HEAD_RCU(&vmdirq->node); | |
| 143 | + if (vmdirq->enabled) { | |
| 144 | + list_del_rcu(&vmdirq->node); | |
| 145 | + vmdirq->enabled = false; | |
| 146 | + } | |
| 141 | 147 | raw_spin_unlock_irqrestore(&list_lock, flags); |
| 142 | 148 | } |
| 143 | 149 | |
| @@ -245,7 +245,7 @@ int __init efi_setup_page_tables(unsigned long pa_memmap, unsigned num_pages) · 244 unmodified lines | ||
| 245 | 245 | * text and allocate a new stack because we can't rely on the |
| 246 | 246 | * stack pointer being < 4GB. |
| 247 | 247 | */ |
| 248 | − if (!IS_ENABLED(CONFIG_EFI_MIXED)) | |
| 248 | + if (!IS_ENABLED(CONFIG_EFI_MIXED) || efi_is_native()) | |
| 249 | 249 | return 0; |
| 250 | 250 | |
| 251 | 251 | /* |
| @@ -113,7 +113,7 @@ static int set_up_temporary_mappings(void) · 112 unmodified lines | ||
| 113 | 113 | return result; |
| 114 | 114 | } |
| 115 | 115 | |
| 116 | − temp_level4_pgt = (unsigned long)pgd - __PAGE_OFFSET; | |
| 116 | + temp_level4_pgt = __pa(pgd); | |
| 117 | 117 | return 0; |
| 118 | 118 | } |
| 119 | 119 | |
| @@ -84,7 +84,10 @@ int putreg(struct task_struct *child, int regno, unsigned long value) · 83 unmodified lines | ||
| 84 | 84 | case EAX: |
| 85 | 85 | case EIP: |
| 86 | 86 | case UESP: |
| 87 | + break; | |
| 87 | 88 | case ORIG_EAX: |
| 89 | + /* Update the syscall number. */ | |
| 90 | + UPT_SYSCALL_NR(&child->thread.regs.regs) = value; | |
| 88 | 91 | break; |
| 89 | 92 | case FS: |
| 90 | 93 | if (value && (value & 3) != 3) |
| @@ -78,7 +78,11 @@ int putreg(struct task_struct *child, int regno, unsigned long value) · 77 unmodified lines | ||
| 78 | 78 | case RSI: |
| 79 | 79 | case RDI: |
| 80 | 80 | case RBP: |
| 81 | + break; | |
| 82 | + | |
| 81 | 83 | case ORIG_RAX: |
| 84 | + /* Update the syscall number. */ | |
| 85 | + UPT_SYSCALL_NR(&child->thread.regs.regs) = value; | |
| 82 | 86 | break; |
| 83 | 87 | |
| 84 | 88 | case FS: |
| @@ -118,7 +118,7 @@ DEFINE_PER_CPU(struct vcpu_info *, xen_vcpu); · 117 unmodified lines | ||
| 118 | 118 | DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info); |
| 119 | 119 | |
| 120 | 120 | /* Linux <-> Xen vCPU id mapping */ |
| 121 | −DEFINE_PER_CPU(int, xen_vcpu_id) = -1; | |
| 121 | +DEFINE_PER_CPU(uint32_t, xen_vcpu_id); | |
| 122 | 122 | EXPORT_PER_CPU_SYMBOL(xen_vcpu_id); |
| 123 | 123 | |
| 124 | 124 | enum xen_domain_type xen_domain_type = XEN_NATIVE; |
| @@ -667,18 +667,19 @@ struct bio *bio_clone_bioset(struct bio *bio_src, gfp_t gfp_mask, · 666 unmodified lines | ||
| 667 | 667 | bio->bi_iter.bi_sector = bio_src->bi_iter.bi_sector; |
| 668 | 668 | bio->bi_iter.bi_size = bio_src->bi_iter.bi_size; |
| 669 | 669 | |
| 670 | − if (bio_op(bio) == REQ_OP_DISCARD) | |
| 671 | − goto integrity_clone; | |
| 672 | − | |
| 673 | − if (bio_op(bio) == REQ_OP_WRITE_SAME) { | |
| 670 | + switch (bio_op(bio)) { | |
| 671 | + case REQ_OP_DISCARD: | |
| 672 | + case REQ_OP_SECURE_ERASE: | |
| 673 | + break; | |
| 674 | + case REQ_OP_WRITE_SAME: | |
| 674 | 675 | bio->bi_io_vec[bio->bi_vcnt++] = bio_src->bi_io_vec[0]; |
| 675 | − goto integrity_clone; | |
| 676 | + break; | |
| 677 | + default: | |
| 678 | + bio_for_each_segment(bv, bio_src, iter) | |
| 679 | + bio->bi_io_vec[bio->bi_vcnt++] = bv; | |
| 680 | + break; | |
| 676 | 681 | } |
| 677 | 682 | |
| 678 | − bio_for_each_segment(bv, bio_src, iter) | |
| 679 | − bio->bi_io_vec[bio->bi_vcnt++] = bv; | |
| 680 | − | |
| 681 | −integrity_clone: | |
| 682 | 683 | if (bio_integrity(bio_src)) { |
| 683 | 684 | int ret; |
| 684 | 685 | |
| @@ -1788,7 +1789,7 @@ struct bio *bio_split(struct bio *bio, int sectors, · 1103 unmodified lines | ||
| 1788 | 1789 | * Discards need a mutable bio_vec to accommodate the payload |
| 1789 | 1790 | * required by the DSM TRIM and UNMAP commands. |
| 1790 | 1791 | */ |
| 1791 | − if (bio_op(bio) == REQ_OP_DISCARD) | |
| 1792 | + if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE) | |
| 1792 | 1793 | split = bio_clone_bioset(bio, gfp, bs); |
| 1793 | 1794 | else |
| 1794 | 1795 | split = bio_clone_fast(bio, gfp, bs); |
| @@ -515,7 +515,9 @@ EXPORT_SYMBOL_GPL(blk_queue_bypass_end); · 514 unmodified lines | ||
| 515 | 515 | |
| 516 | 516 | void blk_set_queue_dying(struct request_queue *q) |
| 517 | 517 | { |
| 518 | − queue_flag_set_unlocked(QUEUE_FLAG_DYING, q); | |
| 518 | + spin_lock_irq(q->queue_lock); | |
| 519 | + queue_flag_set(QUEUE_FLAG_DYING, q); | |
| 520 | + spin_unlock_irq(q->queue_lock); | |
| 519 | 521 | |
| 520 | 522 | if (q->mq_ops) |
| 521 | 523 | blk_mq_wake_waiters(q); |
| @@ -94,8 +94,30 @@ static struct bio *blk_bio_segment_split(struct request_queue *q, · 93 unmodified lines | ||
| 94 | 94 | bool do_split = true; |
| 95 | 95 | struct bio *new = NULL; |
| 96 | 96 | const unsigned max_sectors = get_max_io_size(q, bio); |
| 97 | + unsigned bvecs = 0; | |
| 97 | 98 | |
| 98 | 99 | bio_for_each_segment(bv, bio, iter) { |
| 100 | + /* | |
| 101 | + * With arbitrary bio size, the incoming bio may be very | |
| 102 | + * big. We have to split the bio into small bios so that | |
| 103 | + * each holds at most BIO_MAX_PAGES bvecs because | |
| 104 | + * bio_clone() can fail to allocate big bvecs. | |
| 105 | + * | |
| 106 | + * It should have been better to apply the limit per | |
| 107 | + * request queue in which bio_clone() is involved, | |
| 108 | + * instead of globally. The biggest blocker is the | |
| 109 | + * bio_clone() in bio bounce. | |
| 110 | + * | |
| 111 | + * If bio is splitted by this reason, we should have | |
| 112 | + * allowed to continue bios merging, but don't do | |
| 113 | + * that now for making the change simple. | |
| 114 | + * | |
| 115 | + * TODO: deal with bio bounce's bio_clone() gracefully | |
| 116 | + * and convert the global limit into per-queue limit. | |
| 117 | + */ | |
| 118 | + if (bvecs++ >= BIO_MAX_PAGES) | |
| 119 | + goto split; | |
| 120 | + | |
| 99 | 121 | /* |
| 100 | 122 | * If the queue doesn't support SG gaps and adding this |
| 101 | 123 | * offset would create a gap, disallow it. |
| @@ -172,12 +194,18 @@ void blk_queue_split(struct request_queue *q, struct bio **bio, · 70 unmodified lines | ||
| 172 | 194 | struct bio *split, *res; |
| 173 | 195 | unsigned nsegs; |
| 174 | 196 | |
| 175 | − if (bio_op(*bio) == REQ_OP_DISCARD) | |
| 197 | + switch (bio_op(*bio)) { | |
| 198 | + case REQ_OP_DISCARD: | |
| 199 | + case REQ_OP_SECURE_ERASE: | |
| 176 | 200 | split = blk_bio_discard_split(q, *bio, bs, &nsegs); |
| 177 | − else if (bio_op(*bio) == REQ_OP_WRITE_SAME) | |
| 201 | + break; | |
| 202 | + case REQ_OP_WRITE_SAME: | |
| 178 | 203 | split = blk_bio_write_same_split(q, *bio, bs, &nsegs); |
| 179 | − else | |
| 204 | + break; | |
| 205 | + default: | |
| 180 | 206 | split = blk_bio_segment_split(q, *bio, q->bio_split, &nsegs); |
| 207 | + break; | |
| 208 | + } | |
| 181 | 209 | |
| 182 | 210 | /* physical segments can be figured out during splitting */ |
| 183 | 211 | res = split ? split : *bio; |
| @@ -213,7 +241,7 @@ static unsigned int __blk_recalc_rq_segments(struct request_queue *q, · 29 unmodified lines | ||
| 213 | 241 | * This should probably be returning 0, but blk_add_request_payload() |
| 214 | 242 | * (Christoph!!!!) |
| 215 | 243 | */ |
| 216 | − if (bio_op(bio) == REQ_OP_DISCARD) | |
| 244 | + if (bio_op(bio) == REQ_OP_DISCARD || bio_op(bio) == REQ_OP_SECURE_ERASE) | |
| 217 | 245 | return 1; |
| 218 | 246 | |
| 219 | 247 | if (bio_op(bio) == REQ_OP_WRITE_SAME) |
| @@ -385,7 +413,9 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, · 165 unmodified lines | ||
| 385 | 413 | nsegs = 0; |
| 386 | 414 | cluster = blk_queue_cluster(q); |
| 387 | 415 | |
| 388 | − if (bio_op(bio) == REQ_OP_DISCARD) { | |
| 416 | + switch (bio_op(bio)) { | |
| 417 | + case REQ_OP_DISCARD: | |
| 418 | + case REQ_OP_SECURE_ERASE: | |
| 389 | 419 | /* |
| 390 | 420 | * This is a hack - drivers should be neither modifying the |
| 391 | 421 | * biovec, nor relying on bi_vcnt - but because of |
| @@ -393,19 +423,16 @@ static int __blk_bios_map_sg(struct request_queue *q, struct bio *bio, · 1 unmodified line | ||
| 393 | 423 | * a payload we need to set up here (thank you Christoph) and |
| 394 | 424 | * bi_vcnt is really the only way of telling if we need to. |
| 395 | 425 | */ |
| 396 | − | |
| 397 | − if (bio->bi_vcnt) | |
| 398 | − goto single_segment; | |
| 399 | − | |
| 400 | − return 0; | |
| 401 | − } | |
| 402 | − | |
| 403 | − if (bio_op(bio) == REQ_OP_WRITE_SAME) { | |
| 404 | −single_segment: | |
| 426 | + if (!bio->bi_vcnt) | |
| 427 | + return 0; | |
| 428 | + /* Fall through */ | |
| 429 | + case REQ_OP_WRITE_SAME: | |
| 405 | 430 | *sg = sglist; |
| 406 | 431 | bvec = bio_iovec(bio); |
| 407 | 432 | sg_set_page(*sg, bvec.bv_page, bvec.bv_len, bvec.bv_offset); |
| 408 | 433 | return 1; |
| 434 | + default: | |
| 435 | + break; | |
| 409 | 436 | } |
| 410 | 437 | |
| 411 | 438 | for_each_bio(bio) |
| @@ -296,17 +296,29 @@ struct request *blk_mq_alloc_request_hctx(struct request_queue *q, int rw, · 295 unmodified lines | ||
| 296 | 296 | if (ret) |
| 297 | 297 | return ERR_PTR(ret); |
| 298 | 298 | |
| 299 | + /* | |
| 300 | + * Check if the hardware context is actually mapped to anything. | |
| 301 | + * If not tell the caller that it should skip this queue. | |
| 302 | + */ | |
| 299 | 303 | hctx = q->queue_hw_ctx[hctx_idx]; |
| 304 | + if (!blk_mq_hw_queue_mapped(hctx)) { | |
| 305 | + ret = -EXDEV; | |
| 306 | + goto out_queue_exit; | |
| 307 | + } | |
| 300 | 308 | ctx = __blk_mq_get_ctx(q, cpumask_first(hctx->cpumask)); |
| 301 | 309 | |
| 302 | 310 | blk_mq_set_alloc_data(&alloc_data, q, flags, ctx, hctx); |
| 303 | 311 | rq = __blk_mq_alloc_request(&alloc_data, rw, 0); |
| 304 | 312 | if (!rq) { |
| 305 | − blk_queue_exit(q); | |
| 306 | − return ERR_PTR(-EWOULDBLOCK); | |
| 313 | + ret = -EWOULDBLOCK; | |
| 314 | + goto out_queue_exit; | |
| 307 | 315 | } |
| 308 | 316 | |
| 309 | 317 | return rq; |
| 318 | + | |
| 319 | +out_queue_exit: | |
| 320 | + blk_queue_exit(q); | |
| 321 | + return ERR_PTR(ret); | |
| 310 | 322 | } |
| 311 | 323 | EXPORT_SYMBOL_GPL(blk_mq_alloc_request_hctx); |
| 312 | 324 | |
| @@ -793,11 +805,12 @@ static void __blk_mq_run_hw_queue(struct blk_mq_hw_ctx *hctx) · 480 unmodified lines | ||
| 793 | 805 | struct list_head *dptr; |
| 794 | 806 | int queued; |
| 795 | 807 | |
| 796 | − WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx->cpumask)); | |
| 797 | − | |
| 798 | 808 | if (unlikely(test_bit(BLK_MQ_S_STOPPED, &hctx->state))) |
| 799 | 809 | return; |
| 800 | 810 | |
| 811 | + WARN_ON(!cpumask_test_cpu(raw_smp_processor_id(), hctx->cpumask) && | |
| 812 | + cpu_online(hctx->next_cpu)); | |
| 813 | + | |
| 801 | 814 | hctx->run++; |
| 802 | 815 | |
| 803 | 816 | /* |
| @@ -1036,10 +1049,11 @@ void blk_mq_delay_queue(struct blk_mq_hw_ctx *hctx, unsigned long msecs) · 232 unmodified lines | ||
| 1036 | 1049 | EXPORT_SYMBOL(blk_mq_delay_queue); |
| 1037 | 1050 | |
| 1038 | 1051 | static inline void __blk_mq_insert_req_list(struct blk_mq_hw_ctx *hctx, |
| 1039 | − struct blk_mq_ctx *ctx, | |
| 1040 | 1052 | struct request *rq, |
| 1041 | 1053 | bool at_head) |
| 1042 | 1054 | { |
| 1055 | + struct blk_mq_ctx *ctx = rq->mq_ctx; | |
| 1056 | + | |
| 1043 | 1057 | trace_block_rq_insert(hctx->queue, rq); |
| 1044 | 1058 | |
| 1045 | 1059 | if (at_head) |
| @@ -1053,20 +1067,16 @@ static void __blk_mq_insert_request(struct blk_mq_hw_ctx *hctx, · 7 unmodified lines | ||
| 1053 | 1067 | { |
| 1054 | 1068 | struct blk_mq_ctx *ctx = rq->mq_ctx; |
| 1055 | 1069 | |
| 1056 | − __blk_mq_insert_req_list(hctx, ctx, rq, at_head); | |
| 1070 | + __blk_mq_insert_req_list(hctx, rq, at_head); | |
| 1057 | 1071 | blk_mq_hctx_mark_pending(hctx, ctx); |
| 1058 | 1072 | } |
| 1059 | 1073 | |
| 1060 | 1074 | void blk_mq_insert_request(struct request *rq, bool at_head, bool run_queue, |
| 1061 | − bool async) | |
| 1075 | + bool async) | |
| 1062 | 1076 | { |
| 1077 | + struct blk_mq_ctx *ctx = rq->mq_ctx; | |
| 1063 | 1078 | struct request_queue *q = rq->q; |
| 1064 | 1079 | struct blk_mq_hw_ctx *hctx; |
| 1065 | − struct blk_mq_ctx *ctx = rq->mq_ctx, *current_ctx; | |
| 1066 | − | |
| 1067 | − current_ctx = blk_mq_get_ctx(q); | |
| 1068 | − if (!cpu_online(ctx->cpu)) | |
| 1069 | − rq->mq_ctx = ctx = current_ctx; | |
| 1070 | 1080 | |
| 1071 | 1081 | hctx = q->mq_ops->map_queue(q, ctx->cpu); |
| 1072 | 1082 | |
| @@ -1076,8 +1086,6 @@ void blk_mq_insert_request(struct request *rq, bool at_head, bool run_queue, · 3 unmodified lines | ||
| 1076 | 1086 | |
| 1077 | 1087 | if (run_queue) |
| 1078 | 1088 | blk_mq_run_hw_queue(hctx, async); |
| 1079 | − | |
| 1080 | − blk_mq_put_ctx(current_ctx); | |
| 1081 | 1089 | } |
| 1082 | 1090 | |
| 1083 | 1091 | static void blk_mq_insert_requests(struct request_queue *q, |
| @@ -1088,14 +1096,9 @@ static void blk_mq_insert_requests(struct request_queue *q, · 4 unmodified lines | ||
| 1088 | 1096 | |
| 1089 | 1097 | { |
| 1090 | 1098 | struct blk_mq_hw_ctx *hctx; |
| 1091 | − struct blk_mq_ctx *current_ctx; | |
| 1092 | 1099 | |
| 1093 | 1100 | trace_block_unplug(q, depth, !from_schedule); |
| 1094 | 1101 | |
| 1095 | − current_ctx = blk_mq_get_ctx(q); | |
| 1096 | − | |
| 1097 | − if (!cpu_online(ctx->cpu)) | |
| 1098 | − ctx = current_ctx; | |
| 1099 | 1102 | hctx = q->mq_ops->map_queue(q, ctx->cpu); |
| 1100 | 1103 | |
| 1101 | 1104 | /* |
| @@ -1107,15 +1110,14 @@ static void blk_mq_insert_requests(struct request_queue *q, · 5 unmodified lines | ||
| 1107 | 1110 | struct request *rq; |
| 1108 | 1111 | |
| 1109 | 1112 | rq = list_first_entry(list, struct request, queuelist); |
| 1113 | + BUG_ON(rq->mq_ctx != ctx); | |
| 1110 | 1114 | list_del_init(&rq->queuelist); |
| 1111 | − rq->mq_ctx = ctx; | |
| 1112 | − __blk_mq_insert_req_list(hctx, ctx, rq, false); | |
| 1115 | + __blk_mq_insert_req_list(hctx, rq, false); | |
| 1113 | 1116 | } |
| 1114 | 1117 | blk_mq_hctx_mark_pending(hctx, ctx); |
| 1115 | 1118 | spin_unlock(&ctx->lock); |
| 1116 | 1119 | |
| 1117 | 1120 | blk_mq_run_hw_queue(hctx, from_schedule); |
| 1118 | − blk_mq_put_ctx(current_ctx); | |
| 1119 | 1121 | } |
| 1120 | 1122 | |
| 1121 | 1123 | static int plug_ctx_cmp(void *priv, struct list_head *a, struct list_head *b) |
| @@ -1630,16 +1632,17 @@ static int blk_mq_alloc_bitmap(struct blk_mq_ctxmap *bitmap, int node) · 508 unmodified lines | ||
| 1630 | 1632 | return 0; |
| 1631 | 1633 | } |
| 1632 | 1634 | |
| 1635 | +/* | |
| 1636 | + * 'cpu' is going away. splice any existing rq_list entries from this | |
| 1637 | + * software queue to the hw queue dispatch list, and ensure that it | |
| 1638 | + * gets run. | |
| 1639 | + */ | |
| 1633 | 1640 | static int blk_mq_hctx_cpu_offline(struct blk_mq_hw_ctx *hctx, int cpu) |
| 1634 | 1641 | { |
| 1635 | − struct request_queue *q = hctx->queue; | |
| 1636 | 1642 | struct blk_mq_ctx *ctx; |
| 1637 | 1643 | LIST_HEAD(tmp); |
| 1638 | 1644 | |
| 1639 | − /* | |
| 1640 | − * Move ctx entries to new CPU, if this one is going away. | |
| 1641 | − */ | |
| 1642 | − ctx = __blk_mq_get_ctx(q, cpu); | |
| 1645 | + ctx = __blk_mq_get_ctx(hctx->queue, cpu); | |
| 1643 | 1646 | |
| 1644 | 1647 | spin_lock(&ctx->lock); |
| 1645 | 1648 | if (!list_empty(&ctx->rq_list)) { |
| @@ -1651,24 +1654,11 @@ static int blk_mq_hctx_cpu_offline(struct blk_mq_hw_ctx *hctx, int cpu) · 5 unmodified lines | ||
| 1651 | 1654 | if (list_empty(&tmp)) |
| 1652 | 1655 | return NOTIFY_OK; |
| 1653 | 1656 | |
| 1654 | − ctx = blk_mq_get_ctx(q); | |
| 1655 | − spin_lock(&ctx->lock); | |
| 1656 | − | |
| 1657 | − while (!list_empty(&tmp)) { | |
| 1658 | − struct request *rq; | |
| 1659 | − | |
| 1660 | − rq = list_first_entry(&tmp, struct request, queuelist); | |
| 1661 | − rq->mq_ctx = ctx; | |
| 1662 | − list_move_tail(&rq->queuelist, &ctx->rq_list); | |
| 1663 | − } | |
| 1664 | − | |
| 1665 | − hctx = q->mq_ops->map_queue(q, ctx->cpu); | |
| 1666 | − blk_mq_hctx_mark_pending(hctx, ctx); | |
| 1667 | − | |
| 1668 | − spin_unlock(&ctx->lock); | |
| 1657 | + spin_lock(&hctx->lock); | |
| 1658 | + list_splice_tail_init(&tmp, &hctx->dispatch); | |
| 1659 | + spin_unlock(&hctx->lock); | |
| 1669 | 1660 | |
| 1670 | 1661 | blk_mq_run_hw_queue(hctx, true); |
| 1671 | − blk_mq_put_ctx(ctx); | |
| 1672 | 1662 | return NOTIFY_OK; |
| 1673 | 1663 | } |
| 1674 | 1664 | |
| @@ -780,9 +780,11 @@ static bool tg_may_dispatch(struct throtl_grp *tg, struct bio *bio, · 779 unmodified lines | ||
| 780 | 780 | /* |
| 781 | 781 | * If previous slice expired, start a new one otherwise renew/extend |
| 782 | 782 | * existing slice to make sure it is at least throtl_slice interval |
| 783 | − * long since now. | |
| 783 | + * long since now. New slice is started only for empty throttle group. | |
| 784 | + * If there is queued bio, that means there should be an active | |
| 785 | + * slice and it should be extended instead. | |
| 784 | 786 | */ |
| 785 | − if (throtl_slice_used(tg, rw)) | |
| 787 | + if (throtl_slice_used(tg, rw) && !(tg->service_queue.nr_queued[rw])) | |
| 786 | 788 | throtl_start_new_slice(tg, rw); |
| 787 | 789 | else { |
| 788 | 790 | if (time_before(tg->slice_end[rw], jiffies + throtl_slice)) |
| @@ -366,7 +366,7 @@ void elv_dispatch_sort(struct request_queue *q, struct request *rq) · 365 unmodified lines | ||
| 366 | 366 | list_for_each_prev(entry, &q->queue_head) { |
| 367 | 367 | struct request *pos = list_entry_rq(entry); |
| 368 | 368 | |
| 369 | − if ((req_op(rq) == REQ_OP_DISCARD) != (req_op(pos) == REQ_OP_DISCARD)) | |
| 369 | + if (req_op(rq) != req_op(pos)) | |
| 370 | 370 | break; |
| 371 | 371 | if (rq_data_dir(rq) != rq_data_dir(pos)) |
| 372 | 372 | break; |
| @@ -439,7 +439,7 @@ config CRYPTO_CRC32C_INTEL · 438 unmodified lines | ||
| 439 | 439 | |
| 440 | 440 | config CRYPT_CRC32C_VPMSUM |
| 441 | 441 | tristate "CRC32c CRC algorithm (powerpc64)" |
| 442 | − depends on PPC64 | |
| 442 | + depends on PPC64 && ALTIVEC | |
| 443 | 443 | select CRYPTO_HASH |
| 444 | 444 | select CRC32 |
| 445 | 445 | help |
| @@ -233,6 +233,8 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, · 232 unmodified lines | ||
| 233 | 233 | return blkcipher_walk_done(desc, walk, -EINVAL); |
| 234 | 234 | } |
| 235 | 235 | |
| 236 | + bsize = min(walk->walk_blocksize, n); | |
| 237 | + | |
| 236 | 238 | walk->flags &= ~(BLKCIPHER_WALK_SLOW | BLKCIPHER_WALK_COPY | |
| 237 | 239 | BLKCIPHER_WALK_DIFF); |
| 238 | 240 | if (!scatterwalk_aligned(&walk->in, walk->alignmask) || |
| @@ -245,7 +247,6 @@ static int blkcipher_walk_next(struct blkcipher_desc *desc, · 6 unmodified lines | ||
| 245 | 247 | } |
| 246 | 248 | } |
| 247 | 249 | |
| 248 | − bsize = min(walk->walk_blocksize, n); | |
| 249 | 250 | n = scatterwalk_clamp(&walk->in, n); |
| 250 | 251 | n = scatterwalk_clamp(&walk->out, n); |
| 251 | 252 | |
| @@ -631,9 +631,14 @@ static int cryptd_hash_export(struct ahash_request *req, void *out) · 630 unmodified lines | ||
| 631 | 631 | |
| 632 | 632 | static int cryptd_hash_import(struct ahash_request *req, const void *in) |
| 633 | 633 | { |
| 634 | − struct cryptd_hash_request_ctx *rctx = ahash_request_ctx(req); | |
| 634 | + struct crypto_ahash *tfm = crypto_ahash_reqtfm(req); | |
| 635 | + struct cryptd_hash_ctx *ctx = crypto_ahash_ctx(tfm); | |
| 636 | + struct shash_desc *desc = cryptd_shash_desc(req); | |
| 637 | + | |
| 638 | + desc->tfm = ctx->child; | |
| 639 | + desc->flags = req->base.flags; | |
| 635 | 640 | |
| 636 | − return crypto_shash_import(&rctx->desc, in); | |
| 641 | + return crypto_shash_import(desc, in); | |
| 637 | 642 | } |
| 638 | 643 | |
| 639 | 644 | static int cryptd_create_hash(struct crypto_template *tmpl, struct rtattr **tb, |
| @@ -733,13 +738,14 @@ static void cryptd_aead_crypt(struct aead_request *req, · 93 unmodified lines | ||
| 733 | 738 | rctx = aead_request_ctx(req); |
| 734 | 739 | compl = rctx->complete; |
| 735 | 740 | |
| 741 | + tfm = crypto_aead_reqtfm(req); | |
| 742 | + | |
| 736 | 743 | if (unlikely(err == -EINPROGRESS)) |
| 737 | 744 | goto out; |
| 738 | 745 | aead_request_set_tfm(req, child); |
| 739 | 746 | err = crypt( req ); |
| 740 | 747 | |
| 741 | 748 | out: |
| 742 | − tfm = crypto_aead_reqtfm(req); | |
| 743 | 749 | ctx = crypto_aead_ctx(tfm); |
| 744 | 750 | refcnt = atomic_read(&ctx->refcnt); |
| 745 | 751 | |
| @@ -1,8 +1,8 @@ | ||
| 1 | 1 | /* |
| 2 | 2 | * echainiv: Encrypted Chain IV Generator |
| 3 | 3 | * |
| 4 | − * This generator generates an IV based on a sequence number by xoring it | |
| 5 | − * with a salt and then encrypting it with the same key as used to encrypt | |
| 4 | + * This generator generates an IV based on a sequence number by multiplying | |
| 5 | + * it with a salt and then encrypting it with the same key as used to encrypt | |
| 6 | 6 | * the plain text. This algorithm requires that the block size be equal |
| 7 | 7 | * to the IV size. It is mainly useful for CBC. |
| 8 | 8 | * |
| @@ -24,81 +24,17 @@ · 15 unmodified lines | ||
| 24 | 24 | #include <linux/err.h> |
| 25 | 25 | #include <linux/init.h> |
| 26 | 26 | #include <linux/kernel.h> |
| 27 | −#include <linux/mm.h> | |
| 28 | 27 | #include <linux/module.h> |
| 29 | −#include <linux/percpu.h> | |
| 30 | −#include <linux/spinlock.h> | |
| 28 | +#include <linux/slab.h> | |
| 31 | 29 | #include <linux/string.h> |
| 32 | 30 | |
| 33 | −#define MAX_IV_SIZE 16 | |
| 34 | − | |
| 35 | −static DEFINE_PER_CPU(u32 [MAX_IV_SIZE / sizeof(u32)], echainiv_iv); | |
| 36 | − | |
| 37 | −/* We don't care if we get preempted and read/write IVs from the next CPU. */ | |
| 38 | −static void echainiv_read_iv(u8 *dst, unsigned size) | |
| 39 | −{ | |
| 40 | − u32 *a = (u32 *)dst; | |
| 41 | − u32 __percpu *b = echainiv_iv; | |
| 42 | − | |
| 43 | − for (; size >= 4; size -= 4) { | |
| 44 | − *a++ = this_cpu_read(*b); | |
| 45 | − b++; | |
| 46 | − } | |
| 47 | −} | |
| 48 | − | |
| 49 | −static void echainiv_write_iv(const u8 *src, unsigned size) | |
| 50 | −{ | |
| 51 | − const u32 *a = (const u32 *)src; | |
| 52 | − u32 __percpu *b = echainiv_iv; | |
| 53 | − | |
| 54 | − for (; size >= 4; size -= 4) { | |
| 55 | − this_cpu_write(*b, *a); | |
| 56 | − a++; | |
| 57 | − b++; | |
| 58 | − } | |
| 59 | −} | |
| 60 | − | |
| 61 | −static void echainiv_encrypt_complete2(struct aead_request *req, int err) | |
| 62 | −{ | |
| 63 | − struct aead_request *subreq = aead_request_ctx(req); | |
| 64 | − struct crypto_aead *geniv; | |
| 65 | − unsigned int ivsize; | |
| 66 | − | |
| 67 | − if (err == -EINPROGRESS) | |
| 68 | − return; | |
| 69 | − | |
| 70 | − if (err) | |
| 71 | − goto out; | |
| 72 | − | |
| 73 | − geniv = crypto_aead_reqtfm(req); | |
| 74 | − ivsize = crypto_aead_ivsize(geniv); | |
| 75 | − | |
| 76 | − echainiv_write_iv(subreq->iv, ivsize); | |
| 77 | − | |
| 78 | − if (req->iv != subreq->iv) | |
| 79 | − memcpy(req->iv, subreq->iv, ivsize); | |
| 80 | − | |
| 81 | −out: | |
| 82 | − if (req->iv != subreq->iv) | |
| 83 | − kzfree(subreq->iv); | |
| 84 | −} | |
| 85 | − | |
| 86 | −static void echainiv_encrypt_complete(struct crypto_async_request *base, | |
| 87 | − int err) | |
| 88 | −{ | |
| 89 | − struct aead_request *req = base->data; | |
| 90 | − | |
| 91 | − echainiv_encrypt_complete2(req, err); | |
| 92 | − aead_request_complete(req, err); | |
| 93 | −} | |
| 94 | − | |
| 95 | 31 | static int echainiv_encrypt(struct aead_request *req) |
| 96 | 32 | { |
| 97 | 33 | struct crypto_aead *geniv = crypto_aead_reqtfm(req); |
| 98 | 34 | struct aead_geniv_ctx *ctx = crypto_aead_ctx(geniv); |
| 99 | 35 | struct aead_request *subreq = aead_request_ctx(req); |
| 100 | − crypto_completion_t compl; | |
| 101 | − void *data; | |
| 36 | + __be64 nseqno; | |
| 37 | + u64 seqno; | |
| 102 | 38 | u8 *info; |
| 103 | 39 | unsigned int ivsize = crypto_aead_ivsize(geniv); |
| 104 | 40 | int err; |
| @@ -108,8 +44,6 @@ static int echainiv_encrypt(struct aead_request *req) · 3 unmodified lines | ||
| 108 | 44 | |
| 109 | 45 | aead_request_set_tfm(subreq, ctx->child); |
| 110 | 46 | |
| 111 | − compl = echainiv_encrypt_complete; | |
| 112 | − data = req; | |
| 113 | 47 | info = req->iv; |
| 114 | 48 | |
| 115 | 49 | if (req->src != req->dst) { |
| @@ -127,29 +61,30 @@ static int echainiv_encrypt(struct aead_request *req) · 11 unmodified lines | ||
| 127 | 61 | return err; |
| 128 | 62 | } |
| 129 | 63 | |
| 130 | − if (unlikely(!IS_ALIGNED((unsigned long)info, | |
| 131 | − crypto_aead_alignmask(geniv) + 1))) { | |
| 132 | − info = kmalloc(ivsize, req->base.flags & | |
| 133 | − CRYPTO_TFM_REQ_MAY_SLEEP ? GFP_KERNEL: | |
| 134 | − GFP_ATOMIC); | |
| 135 | − if (!info) | |
| 136 | − return -ENOMEM; | |
| 137 | − | |
| 138 | − memcpy(info, req->iv, ivsize); | |
| 139 | − } | |
| 140 | − | |
| 141 | − aead_request_set_callback(subreq, req->base.flags, compl, data); | |
| 64 | + aead_request_set_callback(subreq, req->base.flags, | |
| 65 | + req->base.complete, req->base.data); | |
| 142 | 66 | aead_request_set_crypt(subreq, req->dst, req->dst, |
| 143 | 67 | req->cryptlen, info); |
| 144 | 68 | aead_request_set_ad(subreq, req->assoclen); |
| 145 | 69 | |
| 146 | − crypto_xor(info, ctx->salt, ivsize); | |
| 70 | + memcpy(&nseqno, info + ivsize - 8, 8); | |
| 71 | + seqno = be64_to_cpu(nseqno); | |
| 72 | + memset(info, 0, ivsize); | |
| 73 | + | |
| 147 | 74 | scatterwalk_map_and_copy(info, req->dst, req->assoclen, ivsize, 1); |
| 148 | − echainiv_read_iv(info, ivsize); | |
| 149 | 75 | |
| 150 | − err = crypto_aead_encrypt(subreq); | |
| 151 | − echainiv_encrypt_complete2(req, err); | |
| 152 | − return err; | |
| 76 | + do { | |
| 77 | + u64 a; | |
| 78 | + | |
| 79 | + memcpy(&a, ctx->salt + ivsize - 8, 8); | |
| 80 | + | |
| 81 | + a |= 1; | |
| 82 | + a *= seqno; | |
| 83 | + | |
| 84 | + memcpy(info + ivsize - 8, &a, 8); | |
| 85 | + } while ((ivsize -= 8)); | |
| 86 | + | |
| 87 | + return crypto_aead_encrypt(subreq); | |
| 153 | 88 | } |
| 154 | 89 | |
| 155 | 90 | static int echainiv_decrypt(struct aead_request *req) |
| @@ -196,8 +131,7 @@ static int echainiv_aead_create(struct crypto_template *tmpl, · 40 unmodified lines | ||
| 196 | 131 | alg = crypto_spawn_aead_alg(spawn); |
| 197 | 132 | |
| 198 | 133 | err = -EINVAL; |
| 199 | − if (inst->alg.ivsize & (sizeof(u32) - 1) || | |
| 200 | − inst->alg.ivsize > MAX_IV_SIZE) | |
| 134 | + if (inst->alg.ivsize & (sizeof(u64) - 1) || !inst->alg.ivsize) | |
| 201 | 135 | goto free_inst; |
| 202 | 136 | |
| 203 | 137 | inst->alg.encrypt = echainiv_encrypt; |
| @@ -206,7 +140,6 @@ static int echainiv_aead_create(struct crypto_template *tmpl, · 2 unmodified lines | ||
| 206 | 140 | inst->alg.init = aead_init_geniv; |
| 207 | 141 | inst->alg.exit = aead_exit_geniv; |
| 208 | 142 | |
| 209 | − inst->alg.base.cra_alignmask |= __alignof__(u32) - 1; | |
| 210 | 143 | inst->alg.base.cra_ctxsize = sizeof(struct aead_geniv_ctx); |
| 211 | 144 | inst->alg.base.cra_ctxsize += inst->alg.ivsize; |
| 212 | 145 | |
| @@ -298,41 +298,48 @@ static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err) · 297 unmodified lines | ||
| 298 | 298 | struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req); |
| 299 | 299 | struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm); |
| 300 | 300 | struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req); |
| 301 | + unsigned int dst_len; | |
| 301 | 302 | unsigned int pos; |
| 302 | − | |
| 303 | − if (err == -EOVERFLOW) | |
| 304 | − /* Decrypted value had no leading 0 byte */ | |
| 305 | − err = -EINVAL; | |
| 303 | + u8 *out_buf; | |
| 306 | 304 | |
| 307 | 305 | if (err) |
| 308 | 306 | goto done; |
| 309 | 307 | |
| 310 | − if (req_ctx->child_req.dst_len != ctx->key_size - 1) { | |
| 311 | − err = -EINVAL; | |
| 308 | + err = -EINVAL; | |
| 309 | + dst_len = req_ctx->child_req.dst_len; | |
| 310 | + if (dst_len < ctx->key_size - 1) | |
| 312 | 311 | goto done; |
| 312 | + | |
| 313 | + out_buf = req_ctx->out_buf; | |
| 314 | + if (dst_len == ctx->key_size) { | |
| 315 | + if (out_buf[0] != 0x00) | |
| 316 | + /* Decrypted value had no leading 0 byte */ | |
| 317 | + goto done; | |
| 318 | + | |
| 319 | + dst_len--; | |
| 320 | + out_buf++; | |
| 313 | 321 | } |
| 314 | 322 | |
| 315 | − if (req_ctx->out_buf[0] != 0x02) { | |
| 316 | − err = -EINVAL; | |
| 323 | + if (out_buf[0] != 0x02) | |
| 317 | 324 | goto done; |
| 318 | − } | |
| 319 | − for (pos = 1; pos < req_ctx->child_req.dst_len; pos++) | |
| 320 | − if (req_ctx->out_buf[pos] == 0x00) | |
| 325 | + | |
| 326 | + for (pos = 1; pos < dst_len; pos++) | |
| 327 | + if (out_buf[pos] == 0x00) | |
| 321 | 328 | break; |
| 322 | − if (pos < 9 || pos == req_ctx->child_req.dst_len) { | |
| 323 | − err = -EINVAL; | |
| 329 | + if (pos < 9 || pos == dst_len) | |
| 324 | 330 | goto done; |
| 325 | − } | |
| 326 | 331 | pos++; |
| 327 | 332 | |
| 328 | − if (req->dst_len < req_ctx->child_req.dst_len - pos) | |
| 333 | + err = 0; | |
| 334 | + | |
| 335 | + if (req->dst_len < dst_len - pos) | |
| 329 | 336 | err = -EOVERFLOW; |
| 330 | − req->dst_len = req_ctx->child_req.dst_len - pos; | |
| 337 | + req->dst_len = dst_len - pos; | |
| 331 | 338 | |
| 332 | 339 | if (!err) |
| 333 | 340 | sg_copy_from_buffer(req->dst, |
| 334 | 341 | sg_nents_for_len(req->dst, req->dst_len), |
| 335 | − req_ctx->out_buf + pos, req->dst_len); | |
| 342 | + out_buf + pos, req->dst_len); | |
| 336 | 343 | |
| 337 | 344 | done: |
| 338 | 345 | kzfree(req_ctx->out_buf); |
| @@ -24,14 +24,14 @@ · 23 unmodified lines | ||
| 24 | 24 | #define ROTL64(x, y) (((x) << (y)) | ((x) >> (64 - (y)))) |
| 25 | 25 | |
| 26 | 26 | static const u64 keccakf_rndc[24] = { |
| 27 | − 0x0000000000000001, 0x0000000000008082, 0x800000000000808a, | |
| 28 | − 0x8000000080008000, 0x000000000000808b, 0x0000000080000001, | |
| 29 | − 0x8000000080008081, 0x8000000000008009, 0x000000000000008a, | |
| 30 | − 0x0000000000000088, 0x0000000080008009, 0x000000008000000a, | |
| 31 | − 0x000000008000808b, 0x800000000000008b, 0x8000000000008089, | |
| 32 | − 0x8000000000008003, 0x8000000000008002, 0x8000000000000080, | |
| 33 | − 0x000000000000800a, 0x800000008000000a, 0x8000000080008081, | |
| 34 | − 0x8000000000008080, 0x0000000080000001, 0x8000000080008008 | |
| 27 | + 0x0000000000000001ULL, 0x0000000000008082ULL, 0x800000000000808aULL, | |
| 28 | + 0x8000000080008000ULL, 0x000000000000808bULL, 0x0000000080000001ULL, | |
| 29 | + 0x8000000080008081ULL, 0x8000000000008009ULL, 0x000000000000008aULL, | |
| 30 | + 0x0000000000000088ULL, 0x0000000080008009ULL, 0x000000008000000aULL, | |
| 31 | + 0x000000008000808bULL, 0x800000000000008bULL, 0x8000000000008089ULL, | |
| 32 | + 0x8000000000008003ULL, 0x8000000000008002ULL, 0x8000000000000080ULL, | |
| 33 | + 0x000000000000800aULL, 0x800000008000000aULL, 0x8000000080008081ULL, | |
| 34 | + 0x8000000000008080ULL, 0x0000000080000001ULL, 0x8000000080008008ULL | |
| 35 | 35 | }; |
| 36 | 36 | |
| 37 | 37 | static const int keccakf_rotc[24] = { |
| @@ -42,7 +42,7 @@ static int nfit_handle_mce(struct notifier_block *nb, unsigned long val, · 41 unmodified lines | ||
| 42 | 42 | list_for_each_entry(nfit_spa, &acpi_desc->spas, list) { |
| 43 | 43 | struct acpi_nfit_system_address *spa = nfit_spa->spa; |
| 44 | 44 | |
| 45 | − if (nfit_spa_type(spa) == NFIT_SPA_PM) | |
| 45 | + if (nfit_spa_type(spa) != NFIT_SPA_PM) | |
| 46 | 46 | continue; |
| 47 | 47 | /* find the spa that covers the mce addr */ |
| 48 | 48 | if (spa->address > mce->addr) |
| @@ -2054,7 +2054,7 @@ int __init acpi_scan_init(void) · 2053 unmodified lines | ||
| 2054 | 2054 | |
| 2055 | 2055 | static struct acpi_probe_entry *ape; |
| 2056 | 2056 | static int acpi_probe_count; |
| 2057 | −static DEFINE_SPINLOCK(acpi_probe_lock); | |
| 2057 | +static DEFINE_MUTEX(acpi_probe_mutex); | |
| 2058 | 2058 | |
| 2059 | 2059 | static int __init acpi_match_madt(struct acpi_subtable_header *header, |
| 2060 | 2060 | const unsigned long end) |
| @@ -2073,7 +2073,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) · 12 unmodified lines | ||
| 2073 | 2073 | if (acpi_disabled) |
| 2074 | 2074 | return 0; |
| 2075 | 2075 | |
| 2076 | − spin_lock(&acpi_probe_lock); | |
| 2076 | + mutex_lock(&acpi_probe_mutex); | |
| 2077 | 2077 | for (ape = ap_head; nr; ape++, nr--) { |
| 2078 | 2078 | if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) { |
| 2079 | 2079 | acpi_probe_count = 0; |
| @@ -2086,7 +2086,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) · 6 unmodified lines | ||
| 2086 | 2086 | count++; |
| 2087 | 2087 | } |
| 2088 | 2088 | } |
| 2089 | − spin_unlock(&acpi_probe_lock); | |
| 2089 | + mutex_unlock(&acpi_probe_mutex); | |
| 2090 | 2090 | |
| 2091 | 2091 | return count; |
| 2092 | 2092 | } |
| @@ -2524,7 +2524,7 @@ static int ahci_host_activate_multi_irqs(struct ata_host *host, · 2523 unmodified lines | ||
| 2524 | 2524 | |
| 2525 | 2525 | /* Do not receive interrupts sent by dummy ports */ |
| 2526 | 2526 | if (!pp) { |
| 2527 | − disable_irq(irq + i); | |
| 2527 | + disable_irq(irq); | |
| 2528 | 2528 | continue; |
| 2529 | 2529 | } |
| 2530 | 2530 | |
| @@ -144,7 +144,7 @@ static int ninja32_init_one(struct pci_dev *dev, const struct pci_device_id *id) · 143 unmodified lines | ||
| 144 | 144 | ap->ioaddr.altstatus_addr = base + 0x1E; |
| 145 | 145 | ap->ioaddr.bmdma_addr = base; |
| 146 | 146 | ata_sff_std_ports(&ap->ioaddr); |
| 147 | − ap->pflags = ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE; | |
| 147 | + ap->pflags |= ATA_PFLAG_PIO32 | ATA_PFLAG_PIO32CHANGE; | |
| 148 | 148 | |
| 149 | 149 | ninja32_program(base); |
| 150 | 150 | /* FIXME: Should we disable them at remove ? */ |
| @@ -301,7 +301,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 300 unmodified lines | ||
| 301 | 301 | int (*callback)(struct device *); |
| 302 | 302 | int retval; |
| 303 | 303 | |
| 304 | − trace_rpm_idle(dev, rpmflags); | |
| 304 | + trace_rpm_idle_rcuidle(dev, rpmflags); | |
| 305 | 305 | retval = rpm_check_suspend_allowed(dev); |
| 306 | 306 | if (retval < 0) |
| 307 | 307 | ; /* Conditions are wrong. */ |
| @@ -337,7 +337,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 29 unmodified lines | ||
| 337 | 337 | dev->power.request_pending = true; |
| 338 | 338 | queue_work(pm_wq, &dev->power.work); |
| 339 | 339 | } |
| 340 | − trace_rpm_return_int(dev, _THIS_IP_, 0); | |
| 340 | + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, 0); | |
| 341 | 341 | return 0; |
| 342 | 342 | } |
| 343 | 343 | |
| @@ -352,7 +352,7 @@ static int rpm_idle(struct device *dev, int rpmflags) · 8 unmodified lines | ||
| 352 | 352 | wake_up_all(&dev->power.wait_queue); |
| 353 | 353 | |
| 354 | 354 | out: |
| 355 | − trace_rpm_return_int(dev, _THIS_IP_, retval); | |
| 355 | + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); | |
| 356 | 356 | return retval ? retval : rpm_suspend(dev, rpmflags | RPM_AUTO); |
| 357 | 357 | } |
| 358 | 358 | |
| @@ -419,7 +419,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) · 60 unmodified lines | ||
| 419 | 419 | struct device *parent = NULL; |
| 420 | 420 | int retval; |
| 421 | 421 | |
| 422 | − trace_rpm_suspend(dev, rpmflags); | |
| 422 | + trace_rpm_suspend_rcuidle(dev, rpmflags); | |
| 423 | 423 | |
| 424 | 424 | repeat: |
| 425 | 425 | retval = rpm_check_suspend_allowed(dev); |
| @@ -549,7 +549,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) · 123 unmodified lines | ||
| 549 | 549 | } |
| 550 | 550 | |
| 551 | 551 | out: |
| 552 | − trace_rpm_return_int(dev, _THIS_IP_, retval); | |
| 552 | + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); | |
| 553 | 553 | |
| 554 | 554 | return retval; |
| 555 | 555 | |
| @@ -601,7 +601,7 @@ static int rpm_resume(struct device *dev, int rpmflags) · 45 unmodified lines | ||
| 601 | 601 | struct device *parent = NULL; |
| 602 | 602 | int retval = 0; |
| 603 | 603 | |
| 604 | − trace_rpm_resume(dev, rpmflags); | |
| 604 | + trace_rpm_resume_rcuidle(dev, rpmflags); | |
| 605 | 605 | |
| 606 | 606 | repeat: |
| 607 | 607 | if (dev->power.runtime_error) |
| @@ -764,7 +764,7 @@ static int rpm_resume(struct device *dev, int rpmflags) · 156 unmodified lines | ||
| 764 | 764 | spin_lock_irq(&dev->power.lock); |
| 765 | 765 | } |
| 766 | 766 | |
| 767 | − trace_rpm_return_int(dev, _THIS_IP_, retval); | |
| 767 | + trace_rpm_return_int_rcuidle(dev, _THIS_IP_, retval); | |
| 768 | 768 | |
| 769 | 769 | return retval; |
| 770 | 770 | } |
| @@ -404,6 +404,7 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg, · 403 unmodified lines | ||
| 404 | 404 | unsigned int new_base_reg, new_top_reg; |
| 405 | 405 | unsigned int min, max; |
| 406 | 406 | unsigned int max_dist; |
| 407 | + unsigned int dist, best_dist = UINT_MAX; | |
| 407 | 408 | |
| 408 | 409 | max_dist = map->reg_stride * sizeof(*rbnode_tmp) / |
| 409 | 410 | map->cache_word_size; |
| @@ -423,24 +424,41 @@ static int regcache_rbtree_write(struct regmap *map, unsigned int reg, · 13 unmodified lines | ||
| 423 | 424 | &base_reg, &top_reg); |
| 424 | 425 | |
| 425 | 426 | if (base_reg <= max && top_reg >= min) { |
| 426 | − new_base_reg = min(reg, base_reg); | |
| 427 | − new_top_reg = max(reg, top_reg); | |
| 428 | − } else { | |
| 429 | − if (max < base_reg) | |
| 430 | − node = node->rb_left; | |
| 427 | + if (reg < base_reg) | |
| 428 | + dist = base_reg - reg; | |
| 429 | + else if (reg > top_reg) | |
| 430 | + dist = reg - top_reg; | |
| 431 | 431 | else |
| 432 | − node = node->rb_right; | |
| 433 | − | |
| 434 | − continue; | |
| 432 | + dist = 0; | |
| 433 | + if (dist < best_dist) { | |
| 434 | + rbnode = rbnode_tmp; | |
| 435 | + best_dist = dist; | |
| 436 | + new_base_reg = min(reg, base_reg); | |
| 437 | + new_top_reg = max(reg, top_reg); | |
| 438 | + } | |
| 435 | 439 | } |
| 436 | 440 | |
| 437 | − ret = regcache_rbtree_insert_to_block(map, rbnode_tmp, | |
| 441 | + /* | |
| 442 | + * Keep looking, we want to choose the closest block, | |
| 443 | + * otherwise we might end up creating overlapping | |
| 444 | + * blocks, which breaks the rbtree. | |
| 445 | + */ | |
| 446 | + if (reg < base_reg) | |
| 447 | + node = node->rb_left; | |
| 448 | + else if (reg > top_reg) | |
| 449 | + node = node->rb_right; | |
| 450 | + else | |
| 451 | + break; | |
| 452 | + } | |
| 453 | + | |
| 454 | + if (rbnode) { | |
| 455 | + ret = regcache_rbtree_insert_to_block(map, rbnode, | |
| 438 | 456 | new_base_reg, |
| 439 | 457 | new_top_reg, reg, |
| 440 | 458 | value); |
| 441 | 459 | if (ret) |
| 442 | 460 | return ret; |
| 443 | − rbtree_ctx->cached_rbnode = rbnode_tmp; | |
| 461 | + rbtree_ctx->cached_rbnode = rbnode; | |
| 444 | 462 | return 0; |
| 445 | 463 | } |
| 446 | 464 | |
| @@ -38,10 +38,11 @@ static int regcache_hw_init(struct regmap *map) · 37 unmodified lines | ||
| 38 | 38 | |
| 39 | 39 | /* calculate the size of reg_defaults */ |
| 40 | 40 | for (count = 0, i = 0; i < map->num_reg_defaults_raw; i++) |
| 41 | − if (!regmap_volatile(map, i * map->reg_stride)) | |
| 41 | + if (regmap_readable(map, i * map->reg_stride) && | |
| 42 | + !regmap_volatile(map, i * map->reg_stride)) | |
| 42 | 43 | count++; |
| 43 | 44 | |
| 44 | − /* all registers are volatile, so just bypass */ | |
| 45 | + /* all registers are unreadable or volatile, so just bypass */ | |
| 45 | 46 | if (!count) { |
| 46 | 47 | map->cache_bypass = true; |
| 47 | 48 | return 0; |
| @@ -1474,6 +1474,12 @@ int _regmap_raw_write(struct regmap *map, unsigned int reg, · 1473 unmodified lines | ||
| 1474 | 1474 | ret = map->bus->write(map->bus_context, buf, len); |
| 1475 | 1475 | |
| 1476 | 1476 | kfree(buf); |
| 1477 | + } else if (ret != 0 && !map->cache_bypass && map->format.parse_val) { | |
| 1478 | + /* regcache_drop_region() takes lock that we already have, | |
| 1479 | + * thus call map->cache_ops->drop() directly | |
| 1480 | + */ | |
| 1481 | + if (map->cache_ops && map->cache_ops->drop) | |
| 1482 | + map->cache_ops->drop(map, reg, reg + 1); | |
| 1477 | 1483 | } |
| 1478 | 1484 | |
| 1479 | 1485 | trace_regmap_hw_write_done(map, reg, val_len / map->format.val_bytes); |
| @@ -3706,22 +3706,21 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) · 3705 unmodified lines | ||
| 3706 | 3706 | if (UFDCS->rawcmd == 1) |
| 3707 | 3707 | UFDCS->rawcmd = 2; |
| 3708 | 3708 | |
| 3709 | − if (mode & (FMODE_READ|FMODE_WRITE)) { | |
| 3710 | − UDRS->last_checked = 0; | |
| 3711 | − clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); | |
| 3712 | − check_disk_change(bdev); | |
| 3713 | − if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags)) | |
| 3714 | − goto out; | |
| 3715 | − if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags)) | |
| 3709 | + if (!(mode & FMODE_NDELAY)) { | |
| 3710 | + if (mode & (FMODE_READ|FMODE_WRITE)) { | |
| 3711 | + UDRS->last_checked = 0; | |
| 3712 | + clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags); | |
| 3713 | + check_disk_change(bdev); | |
| 3714 | + if (test_bit(FD_DISK_CHANGED_BIT, &UDRS->flags)) | |
| 3715 | + goto out; | |
| 3716 | + if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags)) | |
| 3717 | + goto out; | |
| 3718 | + } | |
| 3719 | + res = -EROFS; | |
| 3720 | + if ((mode & FMODE_WRITE) && | |
| 3721 | + !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags)) | |
| 3716 | 3722 | goto out; |
| 3717 | 3723 | } |
| 3718 | − | |
| 3719 | − res = -EROFS; | |
| 3720 | − | |
| 3721 | − if ((mode & FMODE_WRITE) && | |
| 3722 | − !test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags)) | |
| 3723 | − goto out; | |
| 3724 | − | |
| 3725 | 3724 | mutex_unlock(&open_lock); |
| 3726 | 3725 | mutex_unlock(&floppy_mutex); |
| 3727 | 3726 | return 0; |
| @@ -189,6 +189,8 @@ struct blkfront_info · 188 unmodified lines | ||
| 189 | 189 | struct mutex mutex; |
| 190 | 190 | struct xenbus_device *xbdev; |
| 191 | 191 | struct gendisk *gd; |
| 192 | + u16 sector_size; | |
| 193 | + unsigned int physical_sector_size; | |
| 192 | 194 | int vdevice; |
| 193 | 195 | blkif_vdev_t handle; |
| 194 | 196 | enum blkif_state connected; |
| @@ -910,9 +912,45 @@ static struct blk_mq_ops blkfront_mq_ops = { · 715 unmodified lines | ||
| 910 | 912 | .map_queue = blk_mq_map_queue, |
| 911 | 913 | }; |
| 912 | 914 | |
| 915 | +static void blkif_set_queue_limits(struct blkfront_info *info) | |
| 916 | +{ | |
| 917 | + struct request_queue *rq = info->rq; | |
| 918 | + struct gendisk *gd = info->gd; | |
| 919 | + unsigned int segments = info->max_indirect_segments ? : | |
| 920 | + BLKIF_MAX_SEGMENTS_PER_REQUEST; | |
| 921 | + | |
| 922 | + queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq); | |
| 923 | + | |
| 924 | + if (info->feature_discard) { | |
| 925 | + queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rq); | |
| 926 | + blk_queue_max_discard_sectors(rq, get_capacity(gd)); | |
| 927 | + rq->limits.discard_granularity = info->discard_granularity; | |
| 928 | + rq->limits.discard_alignment = info->discard_alignment; | |
| 929 | + if (info->feature_secdiscard) | |
| 930 | + queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, rq); | |
| 931 | + } | |
| 932 | + | |
| 933 | + /* Hard sector size and max sectors impersonate the equiv. hardware. */ | |
| 934 | + blk_queue_logical_block_size(rq, info->sector_size); | |
| 935 | + blk_queue_physical_block_size(rq, info->physical_sector_size); | |
| 936 | + blk_queue_max_hw_sectors(rq, (segments * XEN_PAGE_SIZE) / 512); | |
| 937 | + | |
| 938 | + /* Each segment in a request is up to an aligned page in size. */ | |
| 939 | + blk_queue_segment_boundary(rq, PAGE_SIZE - 1); | |
| 940 | + blk_queue_max_segment_size(rq, PAGE_SIZE); | |
| 941 | + | |
| 942 | + /* Ensure a merged request will fit in a single I/O ring slot. */ | |
| 943 | + blk_queue_max_segments(rq, segments / GRANTS_PER_PSEG); | |
| 944 | + | |
| 945 | + /* Make sure buffer addresses are sector-aligned. */ | |
| 946 | + blk_queue_dma_alignment(rq, 511); | |
| 947 | + | |
| 948 | + /* Make sure we don't use bounce buffers. */ | |
| 949 | + blk_queue_bounce_limit(rq, BLK_BOUNCE_ANY); | |
| 950 | +} | |
| 951 | + | |
| 913 | 952 | static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size, |
| 914 | − unsigned int physical_sector_size, | |
| 915 | − unsigned int segments) | |
| 953 | + unsigned int physical_sector_size) | |
| 916 | 954 | { |
| 917 | 955 | struct request_queue *rq; |
| 918 | 956 | struct blkfront_info *info = gd->private_data; |
| @@ -944,36 +982,11 @@ static int xlvbd_init_blk_queue(struct gendisk *gd, u16 sector_size, · 25 unmodified lines | ||
| 944 | 982 | } |
| 945 | 983 | |
| 946 | 984 | rq->queuedata = info; |
| 947 | − queue_flag_set_unlocked(QUEUE_FLAG_VIRT, rq); | |
| 948 | − | |
| 949 | − if (info->feature_discard) { | |
| 950 | − queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, rq); | |
| 951 | − blk_queue_max_discard_sectors(rq, get_capacity(gd)); | |
| 952 | − rq->limits.discard_granularity = info->discard_granularity; | |
| 953 | − rq->limits.discard_alignment = info->discard_alignment; | |
| 954 | − if (info->feature_secdiscard) | |
| 955 | − queue_flag_set_unlocked(QUEUE_FLAG_SECERASE, rq); | |
| 956 | − } | |
| 957 | − | |
| 958 | − /* Hard sector size and max sectors impersonate the equiv. hardware. */ | |
| 959 | − blk_queue_logical_block_size(rq, sector_size); | |
| 960 | − blk_queue_physical_block_size(rq, physical_sector_size); | |
| 961 | − blk_queue_max_hw_sectors(rq, (segments * XEN_PAGE_SIZE) / 512); | |
| 962 | − | |
| 963 | − /* Each segment in a request is up to an aligned page in size. */ | |
| 964 | − blk_queue_segment_boundary(rq, PAGE_SIZE - 1); | |
| 965 | − blk_queue_max_segment_size(rq, PAGE_SIZE); | |
| 966 | − | |
| 967 | − /* Ensure a merged request will fit in a single I/O ring slot. */ | |
| 968 | − blk_queue_max_segments(rq, segments / GRANTS_PER_PSEG); | |
| 969 | − | |
| 970 | − /* Make sure buffer addresses are sector-aligned. */ | |
| 971 | − blk_queue_dma_alignment(rq, 511); | |
| 972 | − | |
| 973 | − /* Make sure we don't use bounce buffers. */ | |
| 974 | − blk_queue_bounce_limit(rq, BLK_BOUNCE_ANY); | |
| 975 | − | |
| 976 | − gd->queue = rq; | |
| 985 | + info->rq = gd->queue = rq; | |
| 986 | + info->gd = gd; | |
| 987 | + info->sector_size = sector_size; | |
| 988 | + info->physical_sector_size = physical_sector_size; | |
| 989 | + blkif_set_queue_limits(info); | |
| 977 | 990 | |
| 978 | 991 | return 0; |
| 979 | 992 | } |
| @@ -1136,16 +1149,11 @@ static int xlvbd_alloc_gendisk(blkif_sector_t capacity, · 156 unmodified lines | ||
| 1136 | 1149 | gd->private_data = info; |
| 1137 | 1150 | set_capacity(gd, capacity); |
| 1138 | 1151 | |
| 1139 | − if (xlvbd_init_blk_queue(gd, sector_size, physical_sector_size, | |
| 1140 | − info->max_indirect_segments ? : | |
| 1141 | − BLKIF_MAX_SEGMENTS_PER_REQUEST)) { | |
| 1152 | + if (xlvbd_init_blk_queue(gd, sector_size, physical_sector_size)) { | |
| 1142 | 1153 | del_gendisk(gd); |
| 1143 | 1154 | goto release; |
| 1144 | 1155 | } |
| 1145 | 1156 | |
| 1146 | − info->rq = gd->queue; | |
| 1147 | − info->gd = gd; | |
| 1148 | − | |
| 1149 | 1157 | xlvbd_flush(info); |
| 1150 | 1158 | |
| 1151 | 1159 | if (vdisk_info & VDISK_READONLY) |
| @@ -1315,7 +1323,7 @@ free_shadow: · 163 unmodified lines | ||
| 1315 | 1323 | rinfo->ring_ref[i] = GRANT_INVALID_REF; |
| 1316 | 1324 | } |
| 1317 | 1325 | } |
| 1318 | − free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * PAGE_SIZE)); | |
| 1326 | + free_pages((unsigned long)rinfo->ring.sring, get_order(info->nr_ring_pages * XEN_PAGE_SIZE)); | |
| 1319 | 1327 | rinfo->ring.sring = NULL; |
| 1320 | 1328 | |
| 1321 | 1329 | if (rinfo->irq) |
| @@ -2007,8 +2015,10 @@ static int blkif_recover(struct blkfront_info *info) · 685 unmodified lines | ||
| 2007 | 2015 | struct split_bio *split_bio; |
| 2008 | 2016 | |
| 2009 | 2017 | blkfront_gather_backend_features(info); |
| 2018 | + /* Reset limits changed by blk_mq_update_nr_hw_queues(). */ | |
| 2019 | + blkif_set_queue_limits(info); | |
| 2010 | 2020 | segs = info->max_indirect_segments ? : BLKIF_MAX_SEGMENTS_PER_REQUEST; |
| 2011 | − blk_queue_max_segments(info->rq, segs); | |
| 2021 | + blk_queue_max_segments(info->rq, segs / GRANTS_PER_PSEG); | |
| 2012 | 2022 | |
| 2013 | 2023 | for (r_index = 0; r_index < info->nr_rings; r_index++) { |
| 2014 | 2024 | struct blkfront_ring_info *rinfo = &info->rinfo[r_index]; |
| @@ -2432,7 +2442,7 @@ static void blkfront_connect(struct blkfront_info *info) · 417 unmodified lines | ||
| 2432 | 2442 | if (err) { |
| 2433 | 2443 | xenbus_dev_fatal(info->xbdev, err, "xlvbd_add at %s", |
| 2434 | 2444 | info->xbdev->otherend); |
| 2435 | − return; | |
| 2445 | + goto fail; | |
| 2436 | 2446 | } |
| 2437 | 2447 | |
| 2438 | 2448 | xenbus_switch_state(info->xbdev, XenbusStateConnected); |
| @@ -2445,6 +2455,11 @@ static void blkfront_connect(struct blkfront_info *info) · 6 unmodified lines | ||
| 2445 | 2455 | device_add_disk(&info->xbdev->dev, info->gd); |
| 2446 | 2456 | |
| 2447 | 2457 | info->is_ready = 1; |
| 2458 | + return; | |
| 2459 | + | |
| 2460 | +fail: | |
| 2461 | + blkif_free(info, 0); | |
| 2462 | + return; | |
| 2448 | 2463 | } |
| 2449 | 2464 | |
| 2450 | 2465 | /** |
| @@ -551,7 +551,7 @@ static struct attribute *cci5xx_pmu_event_attrs[] = { · 550 unmodified lines | ||
| 551 | 551 | CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_wrq, 0xB), |
| 552 | 552 | CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_snoop_cd_hs, 0xC), |
| 553 | 553 | CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_rq_stall_addr_hazard, 0xD), |
| 554 | − CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_snopp_rq_stall_tt_full, 0xE), | |
| 554 | + CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_snoop_rq_stall_tt_full, 0xE), | |
| 555 | 555 | CCI5xx_GLOBAL_EVENT_EXT_ATTR_ENTRY(cci_snoop_rq_tzmp1_prot, 0xF), |
| 556 | 556 | NULL |
| 557 | 557 | }; |
| @@ -187,6 +187,7 @@ struct arm_ccn { · 186 unmodified lines | ||
| 187 | 187 | struct arm_ccn_component *xp; |
| 188 | 188 | |
| 189 | 189 | struct arm_ccn_dt dt; |
| 190 | + int mn_id; | |
| 190 | 191 | }; |
| 191 | 192 | |
| 192 | 193 | static DEFINE_MUTEX(arm_ccn_mutex); |
| @@ -212,6 +213,7 @@ static int arm_ccn_node_to_xp_port(int node) · 19 unmodified lines | ||
| 212 | 213 | #define CCN_CONFIG_TYPE(_config) (((_config) >> 8) & 0xff) |
| 213 | 214 | #define CCN_CONFIG_EVENT(_config) (((_config) >> 16) & 0xff) |
| 214 | 215 | #define CCN_CONFIG_PORT(_config) (((_config) >> 24) & 0x3) |
| 216 | +#define CCN_CONFIG_BUS(_config) (((_config) >> 24) & 0x3) | |
| 215 | 217 | #define CCN_CONFIG_VC(_config) (((_config) >> 26) & 0x7) |
| 216 | 218 | #define CCN_CONFIG_DIR(_config) (((_config) >> 29) & 0x1) |
| 217 | 219 | #define CCN_CONFIG_MASK(_config) (((_config) >> 30) & 0xf) |
| @@ -241,6 +243,7 @@ static CCN_FORMAT_ATTR(xp, "config:0-7"); · 23 unmodified lines | ||
| 241 | 243 | static CCN_FORMAT_ATTR(type, "config:8-15"); |
| 242 | 244 | static CCN_FORMAT_ATTR(event, "config:16-23"); |
| 243 | 245 | static CCN_FORMAT_ATTR(port, "config:24-25"); |
| 246 | +static CCN_FORMAT_ATTR(bus, "config:24-25"); | |
| 244 | 247 | static CCN_FORMAT_ATTR(vc, "config:26-28"); |
| 245 | 248 | static CCN_FORMAT_ATTR(dir, "config:29-29"); |
| 246 | 249 | static CCN_FORMAT_ATTR(mask, "config:30-33"); |
| @@ -253,6 +256,7 @@ static struct attribute *arm_ccn_pmu_format_attrs[] = { · 6 unmodified lines | ||
| 253 | 256 | &arm_ccn_pmu_format_attr_type.attr.attr, |
| 254 | 257 | &arm_ccn_pmu_format_attr_event.attr.attr, |
| 255 | 258 | &arm_ccn_pmu_format_attr_port.attr.attr, |
| 259 | + &arm_ccn_pmu_format_attr_bus.attr.attr, | |
| 256 | 260 | &arm_ccn_pmu_format_attr_vc.attr.attr, |
| 257 | 261 | &arm_ccn_pmu_format_attr_dir.attr.attr, |
| 258 | 262 | &arm_ccn_pmu_format_attr_mask.attr.attr, |
| @@ -328,6 +332,7 @@ struct arm_ccn_pmu_event { · 69 unmodified lines | ||
| 328 | 332 | static ssize_t arm_ccn_pmu_event_show(struct device *dev, |
| 329 | 333 | struct device_attribute *attr, char *buf) |
| 330 | 334 | { |
| 335 | + struct arm_ccn *ccn = pmu_to_arm_ccn(dev_get_drvdata(dev)); | |
| 331 | 336 | struct arm_ccn_pmu_event *event = container_of(attr, |
| 332 | 337 | struct arm_ccn_pmu_event, attr); |
| 333 | 338 | ssize_t res; |
| @@ -349,10 +354,17 @@ static ssize_t arm_ccn_pmu_event_show(struct device *dev, · 15 unmodified lines | ||
| 349 | 354 | break; |
| 350 | 355 | case CCN_TYPE_XP: |
| 351 | 356 | res += snprintf(buf + res, PAGE_SIZE - res, |
| 352 | − ",xp=?,port=?,vc=?,dir=?"); | |
| 357 | + ",xp=?,vc=?"); | |
| 353 | 358 | if (event->event == CCN_EVENT_WATCHPOINT) |
| 354 | 359 | res += snprintf(buf + res, PAGE_SIZE - res, |
| 355 | − ",cmp_l=?,cmp_h=?,mask=?"); | |
| 360 | + ",port=?,dir=?,cmp_l=?,cmp_h=?,mask=?"); | |
| 361 | + else | |
| 362 | + res += snprintf(buf + res, PAGE_SIZE - res, | |
| 363 | + ",bus=?"); | |
| 364 | + | |
| 365 | + break; | |
| 366 | + case CCN_TYPE_MN: | |
| 367 | + res += snprintf(buf + res, PAGE_SIZE - res, ",node=%d", ccn->mn_id); | |
| 356 | 368 | break; |
| 357 | 369 | default: |
| 358 | 370 | res += snprintf(buf + res, PAGE_SIZE - res, ",node=?"); |
| @@ -383,9 +395,9 @@ static umode_t arm_ccn_pmu_events_is_visible(struct kobject *kobj, · 24 unmodified lines | ||
| 383 | 395 | } |
| 384 | 396 | |
| 385 | 397 | static struct arm_ccn_pmu_event arm_ccn_pmu_events[] = { |
| 386 | − CCN_EVENT_MN(eobarrier, "dir=0,vc=0,cmp_h=0x1c00", CCN_IDX_MASK_OPCODE), | |
| 387 | − CCN_EVENT_MN(ecbarrier, "dir=0,vc=0,cmp_h=0x1e00", CCN_IDX_MASK_OPCODE), | |
| 388 | − CCN_EVENT_MN(dvmop, "dir=0,vc=0,cmp_h=0x2800", CCN_IDX_MASK_OPCODE), | |
| 398 | + CCN_EVENT_MN(eobarrier, "dir=1,vc=0,cmp_h=0x1c00", CCN_IDX_MASK_OPCODE), | |
| 399 | + CCN_EVENT_MN(ecbarrier, "dir=1,vc=0,cmp_h=0x1e00", CCN_IDX_MASK_OPCODE), | |
| 400 | + CCN_EVENT_MN(dvmop, "dir=1,vc=0,cmp_h=0x2800", CCN_IDX_MASK_OPCODE), | |
| 389 | 401 | CCN_EVENT_HNI(txdatflits, "dir=1,vc=3", CCN_IDX_MASK_ANY), |
| 390 | 402 | CCN_EVENT_HNI(rxdatflits, "dir=0,vc=3", CCN_IDX_MASK_ANY), |
| 391 | 403 | CCN_EVENT_HNI(txreqflits, "dir=1,vc=0", CCN_IDX_MASK_ANY), |
| @@ -733,9 +745,10 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) · 341 unmodified lines | ||
| 733 | 745 | |
| 734 | 746 | if (has_branch_stack(event) || event->attr.exclude_user || |
| 735 | 747 | event->attr.exclude_kernel || event->attr.exclude_hv || |
| 736 | − event->attr.exclude_idle) { | |
| 748 | + event->attr.exclude_idle || event->attr.exclude_host || | |
| 749 | + event->attr.exclude_guest) { | |
| 737 | 750 | dev_warn(ccn->dev, "Can't exclude execution levels!\n"); |
| 738 | − return -EOPNOTSUPP; | |
| 751 | + return -EINVAL; | |
| 739 | 752 | } |
| 740 | 753 | |
| 741 | 754 | if (event->cpu < 0) { |
| @@ -759,6 +772,12 @@ static int arm_ccn_pmu_event_init(struct perf_event *event) · 17 unmodified lines | ||
| 759 | 772 | |
| 760 | 773 | /* Validate node/xp vs topology */ |
| 761 | 774 | switch (type) { |
| 775 | + case CCN_TYPE_MN: | |
| 776 | + if (node_xp != ccn->mn_id) { | |
| 777 | + dev_warn(ccn->dev, "Invalid MN ID %d!\n", node_xp); | |
| 778 | + return -EINVAL; | |
| 779 | + } | |
| 780 | + break; | |
| 762 | 781 | case CCN_TYPE_XP: |
| 763 | 782 | if (node_xp >= ccn->num_xps) { |
| 764 | 783 | dev_warn(ccn->dev, "Invalid XP ID %d!\n", node_xp); |
| @@ -886,6 +905,10 @@ static void arm_ccn_pmu_xp_dt_config(struct perf_event *event, int enable) · 121 unmodified lines | ||
| 886 | 905 | struct arm_ccn_component *xp; |
| 887 | 906 | u32 val, dt_cfg; |
| 888 | 907 | |
| 908 | + /* Nothing to do for cycle counter */ | |
| 909 | + if (hw->idx == CCN_IDX_PMU_CYCLE_COUNTER) | |
| 910 | + return; | |
| 911 | + | |
| 889 | 912 | if (CCN_CONFIG_TYPE(event->attr.config) == CCN_TYPE_XP) |
| 890 | 913 | xp = &ccn->xp[CCN_CONFIG_XP(event->attr.config)]; |
| 891 | 914 | else |
| @@ -917,38 +940,17 @@ static void arm_ccn_pmu_event_start(struct perf_event *event, int flags) · 25 unmodified lines | ||
| 917 | 940 | arm_ccn_pmu_read_counter(ccn, hw->idx)); |
| 918 | 941 | hw->state = 0; |
| 919 | 942 | |
| 920 | − /* | |
| 921 | − * Pin the timer, so that the overflows are handled by the chosen | |
| 922 | − * event->cpu (this is the same one as presented in "cpumask" | |
| 923 | − * attribute). | |
| 924 | − */ | |
| 925 | − if (!ccn->irq) | |
| 926 | − hrtimer_start(&ccn->dt.hrtimer, arm_ccn_pmu_timer_period(), | |
| 927 | − HRTIMER_MODE_REL_PINNED); | |
| 928 | − | |
| 929 | 943 | /* Set the DT bus input, engaging the counter */ |
| 930 | 944 | arm_ccn_pmu_xp_dt_config(event, 1); |
| 931 | 945 | } |
| 932 | 946 | |
| 933 | 947 | static void arm_ccn_pmu_event_stop(struct perf_event *event, int flags) |
| 934 | 948 | { |
| 935 | − struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu); | |
| 936 | 949 | struct hw_perf_event *hw = &event->hw; |
| 937 | − u64 timeout; | |
| 938 | 950 | |
| 939 | 951 | /* Disable counting, setting the DT bus to pass-through mode */ |
| 940 | 952 | arm_ccn_pmu_xp_dt_config(event, 0); |
| 941 | 953 | |
| 942 | − if (!ccn->irq) | |
| 943 | − hrtimer_cancel(&ccn->dt.hrtimer); | |
| 944 | − | |
| 945 | − /* Let the DT bus drain */ | |
| 946 | − timeout = arm_ccn_pmu_read_counter(ccn, CCN_IDX_PMU_CYCLE_COUNTER) + | |
| 947 | − ccn->num_xps; | |
| 948 | − while (arm_ccn_pmu_read_counter(ccn, CCN_IDX_PMU_CYCLE_COUNTER) < | |
| 949 | − timeout) | |
| 950 | − cpu_relax(); | |
| 951 | − | |
| 952 | 954 | if (flags & PERF_EF_UPDATE) |
| 953 | 955 | arm_ccn_pmu_event_update(event); |
| 954 | 956 | |
| @@ -988,7 +990,7 @@ static void arm_ccn_pmu_xp_watchpoint_config(struct perf_event *event) · 33 unmodified lines | ||
| 988 | 990 | |
| 989 | 991 | /* Comparison values */ |
| 990 | 992 | writel(cmp_l & 0xffffffff, source->base + CCN_XP_DT_CMP_VAL_L(wp)); |
| 991 | − writel((cmp_l >> 32) & 0xefffffff, | |
| 993 | + writel((cmp_l >> 32) & 0x7fffffff, | |
| 992 | 994 | source->base + CCN_XP_DT_CMP_VAL_L(wp) + 4); |
| 993 | 995 | writel(cmp_h & 0xffffffff, source->base + CCN_XP_DT_CMP_VAL_H(wp)); |
| 994 | 996 | writel((cmp_h >> 32) & 0x0fffffff, |
| @@ -996,7 +998,7 @@ static void arm_ccn_pmu_xp_watchpoint_config(struct perf_event *event) · 1 unmodified line | ||
| 996 | 998 | |
| 997 | 999 | /* Mask */ |
| 998 | 1000 | writel(mask_l & 0xffffffff, source->base + CCN_XP_DT_CMP_MASK_L(wp)); |
| 999 | − writel((mask_l >> 32) & 0xefffffff, | |
| 1001 | + writel((mask_l >> 32) & 0x7fffffff, | |
| 1000 | 1002 | source->base + CCN_XP_DT_CMP_MASK_L(wp) + 4); |
| 1001 | 1003 | writel(mask_h & 0xffffffff, source->base + CCN_XP_DT_CMP_MASK_H(wp)); |
| 1002 | 1004 | writel((mask_h >> 32) & 0x0fffffff, |
| @@ -1014,7 +1016,7 @@ static void arm_ccn_pmu_xp_event_config(struct perf_event *event) · 11 unmodified lines | ||
| 1014 | 1016 | hw->event_base = CCN_XP_DT_CONFIG__DT_CFG__XP_PMU_EVENT(hw->config_base); |
| 1015 | 1017 | |
| 1016 | 1018 | id = (CCN_CONFIG_VC(event->attr.config) << 4) | |
| 1017 | − (CCN_CONFIG_PORT(event->attr.config) << 3) | | |
| 1019 | + (CCN_CONFIG_BUS(event->attr.config) << 3) | | |
| 1018 | 1020 | (CCN_CONFIG_EVENT(event->attr.config) << 0); |
| 1019 | 1021 | |
| 1020 | 1022 | val = readl(source->base + CCN_XP_PMU_EVENT_SEL); |
| @@ -1099,15 +1101,31 @@ static void arm_ccn_pmu_event_config(struct perf_event *event) · 78 unmodified lines | ||
| 1099 | 1101 | spin_unlock(&ccn->dt.config_lock); |
| 1100 | 1102 | } |
| 1101 | 1103 | |
| 1104 | +static int arm_ccn_pmu_active_counters(struct arm_ccn *ccn) | |
| 1105 | +{ | |
| 1106 | + return bitmap_weight(ccn->dt.pmu_counters_mask, | |
| 1107 | + CCN_NUM_PMU_EVENT_COUNTERS + 1); | |
| 1108 | +} | |
| 1109 | + | |
| 1102 | 1110 | static int arm_ccn_pmu_event_add(struct perf_event *event, int flags) |
| 1103 | 1111 | { |
| 1104 | 1112 | int err; |
| 1105 | 1113 | struct hw_perf_event *hw = &event->hw; |
| 1114 | + struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu); | |
| 1106 | 1115 | |
| 1107 | 1116 | err = arm_ccn_pmu_event_alloc(event); |
| 1108 | 1117 | if (err) |
| 1109 | 1118 | return err; |
| 1110 | 1119 | |
| 1120 | + /* | |
| 1121 | + * Pin the timer, so that the overflows are handled by the chosen | |
| 1122 | + * event->cpu (this is the same one as presented in "cpumask" | |
| 1123 | + * attribute). | |
| 1124 | + */ | |
| 1125 | + if (!ccn->irq && arm_ccn_pmu_active_counters(ccn) == 1) | |
| 1126 | + hrtimer_start(&ccn->dt.hrtimer, arm_ccn_pmu_timer_period(), | |
| 1127 | + HRTIMER_MODE_REL_PINNED); | |
| 1128 | + | |
| 1111 | 1129 | arm_ccn_pmu_event_config(event); |
| 1112 | 1130 | |
| 1113 | 1131 | hw->state = PERF_HES_STOPPED; |
| @@ -1120,9 +1138,14 @@ static int arm_ccn_pmu_event_add(struct perf_event *event, int flags) · 6 unmodified lines | ||
| 1120 | 1138 | |
| 1121 | 1139 | static void arm_ccn_pmu_event_del(struct perf_event *event, int flags) |
| 1122 | 1140 | { |
| 1141 | + struct arm_ccn *ccn = pmu_to_arm_ccn(event->pmu); | |
| 1142 | + | |
| 1123 | 1143 | arm_ccn_pmu_event_stop(event, PERF_EF_UPDATE); |
| 1124 | 1144 | |
| 1125 | 1145 | arm_ccn_pmu_event_release(event); |
| 1146 | + | |
| 1147 | + if (!ccn->irq && arm_ccn_pmu_active_counters(ccn) == 0) | |
| 1148 | + hrtimer_cancel(&ccn->dt.hrtimer); | |
| 1126 | 1149 | } |
| 1127 | 1150 | |
| 1128 | 1151 | static void arm_ccn_pmu_event_read(struct perf_event *event) |
| @@ -1130,6 +1153,24 @@ static void arm_ccn_pmu_event_read(struct perf_event *event) · 1 unmodified line | ||
| 1130 | 1153 | arm_ccn_pmu_event_update(event); |
| 1131 | 1154 | } |
| 1132 | 1155 | |
| 1156 | +static void arm_ccn_pmu_enable(struct pmu *pmu) | |
| 1157 | +{ | |
| 1158 | + struct arm_ccn *ccn = pmu_to_arm_ccn(pmu); | |
| 1159 | + | |
| 1160 | + u32 val = readl(ccn->dt.base + CCN_DT_PMCR); | |
| 1161 | + val |= CCN_DT_PMCR__PMU_EN; | |
| 1162 | + writel(val, ccn->dt.base + CCN_DT_PMCR); | |
| 1163 | +} | |
| 1164 | + | |
| 1165 | +static void arm_ccn_pmu_disable(struct pmu *pmu) | |
| 1166 | +{ | |
| 1167 | + struct arm_ccn *ccn = pmu_to_arm_ccn(pmu); | |
| 1168 | + | |
| 1169 | + u32 val = readl(ccn->dt.base + CCN_DT_PMCR); | |
| 1170 | + val &= ~CCN_DT_PMCR__PMU_EN; | |
| 1171 | + writel(val, ccn->dt.base + CCN_DT_PMCR); | |
| 1172 | +} | |
| 1173 | + | |
| 1133 | 1174 | static irqreturn_t arm_ccn_pmu_overflow_handler(struct arm_ccn_dt *dt) |
| 1134 | 1175 | { |
| 1135 | 1176 | u32 pmovsr = readl(dt->base + CCN_DT_PMOVSR); |
| @@ -1252,6 +1293,8 @@ static int arm_ccn_pmu_init(struct arm_ccn *ccn) · 116 unmodified lines | ||
| 1252 | 1293 | .start = arm_ccn_pmu_event_start, |
| 1253 | 1294 | .stop = arm_ccn_pmu_event_stop, |
| 1254 | 1295 | .read = arm_ccn_pmu_event_read, |
| 1296 | + .pmu_enable = arm_ccn_pmu_enable, | |
| 1297 | + .pmu_disable = arm_ccn_pmu_disable, | |
| 1255 | 1298 | }; |
| 1256 | 1299 | |
| 1257 | 1300 | /* No overflow interrupt? Have to use a timer instead. */ |
| @@ -1361,6 +1404,8 @@ static int arm_ccn_init_nodes(struct arm_ccn *ccn, int region, · 103 unmodified lines | ||
| 1361 | 1404 | |
| 1362 | 1405 | switch (type) { |
| 1363 | 1406 | case CCN_TYPE_MN: |
| 1407 | + ccn->mn_id = id; | |
| 1408 | + return 0; | |
| 1364 | 1409 | case CCN_TYPE_DT: |
| 1365 | 1410 | return 0; |
| 1366 | 1411 | case CCN_TYPE_XP: |
| @@ -1471,8 +1516,9 @@ static int arm_ccn_probe(struct platform_device *pdev) · 104 unmodified lines | ||
| 1471 | 1516 | /* Can set 'disable' bits, so can acknowledge interrupts */ |
| 1472 | 1517 | writel(CCN_MN_ERRINT_STATUS__PMU_EVENTS__ENABLE, |
| 1473 | 1518 | ccn->base + CCN_MN_ERRINT_STATUS); |
| 1474 | − err = devm_request_irq(ccn->dev, irq, arm_ccn_irq_handler, 0, | |
| 1475 | − dev_name(ccn->dev), ccn); | |
| 1519 | + err = devm_request_irq(ccn->dev, irq, arm_ccn_irq_handler, | |
| 1520 | + IRQF_NOBALANCING | IRQF_NO_THREAD, | |
| 1521 | + dev_name(ccn->dev), ccn); | |
| 1476 | 1522 | if (err) |
| 1477 | 1523 | return err; |
| 1478 | 1524 | |
| @@ -178,6 +178,7 @@ static int vexpress_config_populate(struct device_node *node) · 177 unmodified lines | ||
| 178 | 178 | |
| 179 | 179 | parent = class_find_device(vexpress_config_class, NULL, bridge, |
| 180 | 180 | vexpress_config_node_match); |
| 181 | + of_node_put(bridge); | |
| 181 | 182 | if (WARN_ON(!parent)) |
| 182 | 183 | return -ENODEV; |
| 183 | 184 | |
| @@ -244,7 +244,7 @@ config HW_RANDOM_TX4939 · 243 unmodified lines | ||
| 244 | 244 | |
| 245 | 245 | config HW_RANDOM_MXC_RNGA |
| 246 | 246 | tristate "Freescale i.MX RNGA Random Number Generator" |
| 247 | − depends on ARCH_HAS_RNGA | |
| 247 | + depends on SOC_IMX31 | |
| 248 | 248 | default HW_RANDOM |
| 249 | 249 | ---help--- |
| 250 | 250 | This driver provides kernel-side support for the Random Number |
| @@ -957,7 +957,7 @@ int tpm2_auto_startup(struct tpm_chip *chip) · 956 unmodified lines | ||
| 957 | 957 | goto out; |
| 958 | 958 | |
| 959 | 959 | rc = tpm2_do_selftest(chip); |
| 960 | − if (rc != TPM2_RC_INITIALIZE) { | |
| 960 | + if (rc != 0 && rc != TPM2_RC_INITIALIZE) { | |
| 961 | 961 | dev_err(&chip->dev, "TPM self test failed\n"); |
| 962 | 962 | goto out; |
| 963 | 963 | } |
| @@ -974,7 +974,6 @@ int tpm2_auto_startup(struct tpm_chip *chip) · 10 unmodified lines | ||
| 974 | 974 | } |
| 975 | 975 | } |
| 976 | 976 | |
| 977 | − return rc; | |
| 978 | 977 | out: |
| 979 | 978 | if (rc > 0) |
| 980 | 979 | rc = -ENODEV; |
| @@ -165,6 +165,12 @@ struct ports_device { · 164 unmodified lines | ||
| 165 | 165 | */ |
| 166 | 166 | struct virtqueue *c_ivq, *c_ovq; |
| 167 | 167 | |
| 168 | + /* | |
| 169 | + * A control packet buffer for guest->host requests, protected | |
| 170 | + * by c_ovq_lock. | |
| 171 | + */ | |
| 172 | + struct virtio_console_control cpkt; | |
| 173 | + | |
| 168 | 174 | /* Array of per-port IO virtqueues */ |
| 169 | 175 | struct virtqueue **in_vqs, **out_vqs; |
| 170 | 176 | |
| @@ -560,28 +566,29 @@ static ssize_t __send_control_msg(struct ports_device *portdev, u32 port_id, · 389 unmodified lines | ||
| 560 | 566 | unsigned int event, unsigned int value) |
| 561 | 567 | { |
| 562 | 568 | struct scatterlist sg[1]; |
| 563 | − struct virtio_console_control cpkt; | |
| 564 | 569 | struct virtqueue *vq; |
| 565 | 570 | unsigned int len; |
| 566 | 571 | |
| 567 | 572 | if (!use_multiport(portdev)) |
| 568 | 573 | return 0; |
| 569 | 574 | |
| 570 | − cpkt.id = cpu_to_virtio32(portdev->vdev, port_id); | |
| 571 | − cpkt.event = cpu_to_virtio16(portdev->vdev, event); | |
| 572 | − cpkt.value = cpu_to_virtio16(portdev->vdev, value); | |
| 573 | − | |
| 574 | 575 | vq = portdev->c_ovq; |
| 575 | 576 | |
| 576 | − sg_init_one(sg, &cpkt, sizeof(cpkt)); | |
| 577 | − | |
| 578 | 577 | spin_lock(&portdev->c_ovq_lock); |
| 579 | − if (virtqueue_add_outbuf(vq, sg, 1, &cpkt, GFP_ATOMIC) == 0) { | |
| 578 | + | |
| 579 | + portdev->cpkt.id = cpu_to_virtio32(portdev->vdev, port_id); | |
| 580 | + portdev->cpkt.event = cpu_to_virtio16(portdev->vdev, event); | |
| 581 | + portdev->cpkt.value = cpu_to_virtio16(portdev->vdev, value); | |
| 582 | + | |
| 583 | + sg_init_one(sg, &portdev->cpkt, sizeof(struct virtio_console_control)); | |
| 584 | + | |
| 585 | + if (virtqueue_add_outbuf(vq, sg, 1, &portdev->cpkt, GFP_ATOMIC) == 0) { | |
| 580 | 586 | virtqueue_kick(vq); |
| 581 | 587 | while (!virtqueue_get_buf(vq, &len) |
| 582 | 588 | && !virtqueue_is_broken(vq)) |
| 583 | 589 | cpu_relax(); |
| 584 | 590 | } |
| 591 | + | |
| 585 | 592 | spin_unlock(&portdev->c_ovq_lock); |
| 586 | 593 | return 0; |
| 587 | 594 | } |
| @@ -69,6 +69,7 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = { · 68 unmodified lines | ||
| 69 | 69 | DEF_FIXED(".s1", CLK_S1, CLK_PLL1_DIV2, 3, 1), |
| 70 | 70 | DEF_FIXED(".s2", CLK_S2, CLK_PLL1_DIV2, 4, 1), |
| 71 | 71 | DEF_FIXED(".s3", CLK_S3, CLK_PLL1_DIV2, 6, 1), |
| 72 | + DEF_FIXED(".sdsrc", CLK_SDSRC, CLK_PLL1_DIV2, 2, 1), | |
| 72 | 73 | |
| 73 | 74 | /* Core Clock Outputs */ |
| 74 | 75 | DEF_FIXED("ztr", R8A7795_CLK_ZTR, CLK_PLL1_DIV2, 6, 1), |
| @@ -87,10 +88,10 @@ static const struct cpg_core_clk r8a7795_core_clks[] __initconst = { · 12 unmodified lines | ||
| 87 | 88 | DEF_FIXED("s3d2", R8A7795_CLK_S3D2, CLK_S3, 2, 1), |
| 88 | 89 | DEF_FIXED("s3d4", R8A7795_CLK_S3D4, CLK_S3, 4, 1), |
| 89 | 90 | |
| 90 | − DEF_GEN3_SD("sd0", R8A7795_CLK_SD0, CLK_PLL1_DIV2, 0x0074), | |
| 91 | − DEF_GEN3_SD("sd1", R8A7795_CLK_SD1, CLK_PLL1_DIV2, 0x0078), | |
| 92 | − DEF_GEN3_SD("sd2", R8A7795_CLK_SD2, CLK_PLL1_DIV2, 0x0268), | |
| 93 | − DEF_GEN3_SD("sd3", R8A7795_CLK_SD3, CLK_PLL1_DIV2, 0x026c), | |
| 91 | + DEF_GEN3_SD("sd0", R8A7795_CLK_SD0, CLK_SDSRC, 0x0074), | |
| 92 | + DEF_GEN3_SD("sd1", R8A7795_CLK_SD1, CLK_SDSRC, 0x0078), | |
| 93 | + DEF_GEN3_SD("sd2", R8A7795_CLK_SD2, CLK_SDSRC, 0x0268), | |
| 94 | + DEF_GEN3_SD("sd3", R8A7795_CLK_SD3, CLK_SDSRC, 0x026c), | |
| 94 | 95 | |
| 95 | 96 | DEF_FIXED("cl", R8A7795_CLK_CL, CLK_PLL1_DIV2, 48, 1), |
| 96 | 97 | DEF_FIXED("cp", R8A7795_CLK_CP, CLK_EXTAL, 2, 1), |
| @@ -833,9 +833,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { · 832 unmodified lines | ||
| 833 | 833 | |
| 834 | 834 | /* perihp */ |
| 835 | 835 | GATE(0, "cpll_aclk_perihp_src", "cpll", CLK_IGNORE_UNUSED, |
| 836 | − RK3399_CLKGATE_CON(5), 0, GFLAGS), | |
| 837 | − GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, | |
| 838 | 836 | RK3399_CLKGATE_CON(5), 1, GFLAGS), |
| 837 | + GATE(0, "gpll_aclk_perihp_src", "gpll", CLK_IGNORE_UNUSED, | |
| 838 | + RK3399_CLKGATE_CON(5), 0, GFLAGS), | |
| 839 | 839 | COMPOSITE(ACLK_PERIHP, "aclk_perihp", mux_aclk_perihp_p, CLK_IGNORE_UNUSED, |
| 840 | 840 | RK3399_CLKSEL_CON(14), 7, 1, MFLAGS, 0, 5, DFLAGS, |
| 841 | 841 | RK3399_CLKGATE_CON(5), 2, GFLAGS), |
| @@ -923,9 +923,9 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { · 81 unmodified lines | ||
| 923 | 923 | RK3399_CLKGATE_CON(6), 14, GFLAGS), |
| 924 | 924 | |
| 925 | 925 | GATE(0, "cpll_aclk_emmc_src", "cpll", CLK_IGNORE_UNUSED, |
| 926 | − RK3399_CLKGATE_CON(6), 12, GFLAGS), | |
| 927 | − GATE(0, "gpll_aclk_emmc_src", "gpll", CLK_IGNORE_UNUSED, | |
| 928 | 926 | RK3399_CLKGATE_CON(6), 13, GFLAGS), |
| 927 | + GATE(0, "gpll_aclk_emmc_src", "gpll", CLK_IGNORE_UNUSED, | |
| 928 | + RK3399_CLKGATE_CON(6), 12, GFLAGS), | |
| 929 | 929 | COMPOSITE_NOGATE(ACLK_EMMC, "aclk_emmc", mux_aclk_emmc_p, CLK_IGNORE_UNUSED, |
| 930 | 930 | RK3399_CLKSEL_CON(21), 7, 1, MFLAGS, 0, 5, DFLAGS), |
| 931 | 931 | GATE(ACLK_EMMC_CORE, "aclk_emmccore", "aclk_emmc", CLK_IGNORE_UNUSED, |
| @@ -1071,7 +1071,7 @@ static struct rockchip_clk_branch rk3399_clk_branches[] __initdata = { · 139 unmodified lines | ||
| 1071 | 1071 | /* vio */ |
| 1072 | 1072 | COMPOSITE(ACLK_VIO, "aclk_vio", mux_pll_src_cpll_gpll_ppll_p, CLK_IGNORE_UNUSED, |
| 1073 | 1073 | RK3399_CLKSEL_CON(42), 6, 2, MFLAGS, 0, 5, DFLAGS, |
| 1074 | − RK3399_CLKGATE_CON(11), 10, GFLAGS), | |
| 1074 | + RK3399_CLKGATE_CON(11), 0, GFLAGS), | |
| 1075 | 1075 | COMPOSITE_NOMUX(PCLK_VIO, "pclk_vio", "aclk_vio", 0, |
| 1076 | 1076 | RK3399_CLKSEL_CON(43), 0, 5, DFLAGS, |
| 1077 | 1077 | RK3399_CLKGATE_CON(11), 1, GFLAGS), |
| @@ -1484,6 +1484,7 @@ static const char *const rk3399_cru_critical_clocks[] __initconst = { · 406 unmodified lines | ||
| 1484 | 1484 | "hclk_perilp1", |
| 1485 | 1485 | "hclk_perilp1_noc", |
| 1486 | 1486 | "aclk_dmac0_perilp", |
| 1487 | + "aclk_emmc_noc", | |
| 1487 | 1488 | "gpll_hclk_perilp1_src", |
| 1488 | 1489 | "gpll_aclk_perilp0_src", |
| 1489 | 1490 | "gpll_aclk_perihp_src", |
| @@ -783,14 +783,14 @@ static struct ccu_reset_map sun8i_h3_ccu_resets[] = { · 782 unmodified lines | ||
| 783 | 783 | [RST_BUS_I2S1] = { 0x2d0, BIT(13) }, |
| 784 | 784 | [RST_BUS_I2S2] = { 0x2d0, BIT(14) }, |
| 785 | 785 | |
| 786 | − [RST_BUS_I2C0] = { 0x2d4, BIT(0) }, | |
| 787 | − [RST_BUS_I2C1] = { 0x2d4, BIT(1) }, | |
| 788 | − [RST_BUS_I2C2] = { 0x2d4, BIT(2) }, | |
| 789 | − [RST_BUS_UART0] = { 0x2d4, BIT(16) }, | |
| 790 | − [RST_BUS_UART1] = { 0x2d4, BIT(17) }, | |
| 791 | − [RST_BUS_UART2] = { 0x2d4, BIT(18) }, | |
| 792 | − [RST_BUS_UART3] = { 0x2d4, BIT(19) }, | |
| 793 | − [RST_BUS_SCR] = { 0x2d4, BIT(20) }, | |
| 786 | + [RST_BUS_I2C0] = { 0x2d8, BIT(0) }, | |
| 787 | + [RST_BUS_I2C1] = { 0x2d8, BIT(1) }, | |
| 788 | + [RST_BUS_I2C2] = { 0x2d8, BIT(2) }, | |
| 789 | + [RST_BUS_UART0] = { 0x2d8, BIT(16) }, | |
| 790 | + [RST_BUS_UART1] = { 0x2d8, BIT(17) }, | |
| 791 | + [RST_BUS_UART2] = { 0x2d8, BIT(18) }, | |
| 792 | + [RST_BUS_UART3] = { 0x2d8, BIT(19) }, | |
| 793 | + [RST_BUS_SCR] = { 0x2d8, BIT(20) }, | |
| 794 | 794 | }; |
| 795 | 795 | |
| 796 | 796 | static const struct sunxi_ccu_desc sun8i_h3_ccu_desc = { |
| @@ -31,7 +31,7 @@ void ccu_helper_wait_for_lock(struct ccu_common *common, u32 lock) · 30 unmodified lines | ||
| 31 | 31 | return; |
| 32 | 32 | |
| 33 | 33 | WARN_ON(readl_relaxed_poll_timeout(common->base + common->reg, reg, |
| 34 | − !(reg & lock), 100, 70000)); | |
| 34 | + reg & lock, 100, 70000)); | |
| 35 | 35 | } |
| 36 | 36 | |
| 37 | 37 | int sunxi_ccu_probe(struct device_node *node, void __iomem *reg, |
| @@ -14,9 +14,9 @@ · 13 unmodified lines | ||
| 14 | 14 | #include "ccu_gate.h" |
| 15 | 15 | #include "ccu_nk.h" |
| 16 | 16 | |
| 17 | −void ccu_nk_find_best(unsigned long parent, unsigned long rate, | |
| 18 | − unsigned int max_n, unsigned int max_k, | |
| 19 | − unsigned int *n, unsigned int *k) | |
| 17 | +static void ccu_nk_find_best(unsigned long parent, unsigned long rate, | |
| 18 | + unsigned int max_n, unsigned int max_k, | |
| 19 | + unsigned int *n, unsigned int *k) | |
| 20 | 20 | { |
| 21 | 21 | unsigned long best_rate = 0; |
| 22 | 22 | unsigned int best_k = 0, best_n = 0; |
| @@ -73,7 +73,7 @@ static void __init sun4i_pll2_setup(struct device_node *node, · 72 unmodified lines | ||
| 73 | 73 | SUN4I_PLL2_PRE_DIV_WIDTH, |
| 74 | 74 | CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO, |
| 75 | 75 | &sun4i_a10_pll2_lock); |
| 76 | − if (!prediv_clk) { | |
| 76 | + if (IS_ERR(prediv_clk)) { | |
| 77 | 77 | pr_err("Couldn't register the prediv clock\n"); |
| 78 | 78 | goto err_free_array; |
| 79 | 79 | } |
| @@ -106,7 +106,7 @@ static void __init sun4i_pll2_setup(struct device_node *node, · 26 unmodified lines | ||
| 106 | 106 | &mult->hw, &clk_multiplier_ops, |
| 107 | 107 | &gate->hw, &clk_gate_ops, |
| 108 | 108 | CLK_SET_RATE_PARENT); |
| 109 | − if (!base_clk) { | |
| 109 | + if (IS_ERR(base_clk)) { | |
| 110 | 110 | pr_err("Couldn't register the base multiplier clock\n"); |
| 111 | 111 | goto err_free_multiplier; |
| 112 | 112 | } |
| @@ -48,7 +48,7 @@ static void __init sun8i_a23_mbus_setup(struct device_node *node) · 47 unmodified lines | ||
| 48 | 48 | return; |
| 49 | 49 | |
| 50 | 50 | reg = of_io_request_and_map(node, 0, of_node_full_name(node)); |
| 51 | − if (!reg) { | |
| 51 | + if (IS_ERR(reg)) { | |
| 52 | 52 | pr_err("Could not get registers for sun8i-mbus-clk\n"); |
| 53 | 53 | goto err_free_parents; |
| 54 | 54 | } |
| @@ -428,7 +428,7 @@ static struct tegra_clk_pll_params pll_d_params = { · 427 unmodified lines | ||
| 428 | 428 | .div_nmp = &pllp_nmp, |
| 429 | 429 | .freq_table = pll_d_freq_table, |
| 430 | 430 | .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | |
| 431 | − TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, | |
| 431 | + TEGRA_PLL_HAS_LOCK_ENABLE, | |
| 432 | 432 | }; |
| 433 | 433 | |
| 434 | 434 | static struct tegra_clk_pll_params pll_d2_params = { |
| @@ -446,7 +446,7 @@ static struct tegra_clk_pll_params pll_d2_params = { · 11 unmodified lines | ||
| 446 | 446 | .div_nmp = &pllp_nmp, |
| 447 | 447 | .freq_table = pll_d_freq_table, |
| 448 | 448 | .flags = TEGRA_PLL_HAS_CPCON | TEGRA_PLL_SET_LFCON | |
| 449 | − TEGRA_PLL_USE_LOCK | TEGRA_PLL_HAS_LOCK_ENABLE, | |
| 449 | + TEGRA_PLL_HAS_LOCK_ENABLE, | |
| 450 | 450 | }; |
| 451 | 451 | |
| 452 | 452 | static const struct pdiv_map pllu_p[] = { |
| @@ -66,10 +66,10 @@ static void kona_timer_disable_and_clear(void __iomem *base) · 65 unmodified lines | ||
| 66 | 66 | |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | −static void | |
| 69 | +static int | |
| 70 | 70 | kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw) |
| 71 | 71 | { |
| 72 | − int loop_limit = 4; | |
| 72 | + int loop_limit = 3; | |
| 73 | 73 | |
| 74 | 74 | /* |
| 75 | 75 | * Read 64-bit free running counter |
| @@ -83,18 +83,19 @@ kona_timer_get_counter(void __iomem *timer_base, uint32_t *msw, uint32_t *lsw) · 7 unmodified lines | ||
| 83 | 83 | * if new hi-word is equal to previously read hi-word then stop. |
| 84 | 84 | */ |
| 85 | 85 | |
| 86 | − while (--loop_limit) { | |
| 86 | + do { | |
| 87 | 87 | *msw = readl(timer_base + KONA_GPTIMER_STCHI_OFFSET); |
| 88 | 88 | *lsw = readl(timer_base + KONA_GPTIMER_STCLO_OFFSET); |
| 89 | 89 | if (*msw == readl(timer_base + KONA_GPTIMER_STCHI_OFFSET)) |
| 90 | 90 | break; |
| 91 | − } | |
| 91 | + } while (--loop_limit); | |
| 92 | 92 | if (!loop_limit) { |
| 93 | 93 | pr_err("bcm_kona_timer: getting counter failed.\n"); |
| 94 | 94 | pr_err(" Timer will be impacted\n"); |
| 95 | + return -ETIMEDOUT; | |
| 95 | 96 | } |
| 96 | 97 | |
| 97 | − return; | |
| 98 | + return 0; | |
| 98 | 99 | } |
| 99 | 100 | |
| 100 | 101 | static int kona_timer_set_next_event(unsigned long clc, |
| @@ -112,8 +113,11 @@ static int kona_timer_set_next_event(unsigned long clc, · 11 unmodified lines | ||
| 112 | 113 | |
| 113 | 114 | uint32_t lsw, msw; |
| 114 | 115 | uint32_t reg; |
| 116 | + int ret; | |
| 115 | 117 | |
| 116 | − kona_timer_get_counter(timers.tmr_regs, &msw, &lsw); | |
| 118 | + ret = kona_timer_get_counter(timers.tmr_regs, &msw, &lsw); | |
| 119 | + if (ret) | |
| 120 | + return ret; | |
| 117 | 121 | |
| 118 | 122 | /* Load the "next" event tick value */ |
| 119 | 123 | writel(lsw + clc, timers.tmr_regs + KONA_GPTIMER_STCM0_OFFSET); |
| @@ -164,7 +164,7 @@ void __init gic_clocksource_init(unsigned int frequency) · 163 unmodified lines | ||
| 164 | 164 | gic_start_count(); |
| 165 | 165 | } |
| 166 | 166 | |
| 167 | −static void __init gic_clocksource_of_init(struct device_node *node) | |
| 167 | +static int __init gic_clocksource_of_init(struct device_node *node) | |
| 168 | 168 | { |
| 169 | 169 | struct clk *clk; |
| 170 | 170 | int ret; |
| @@ -21,6 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/of_irq.h> |
| 22 | 22 | #include <linux/sched_clock.h> |
| 23 | 23 | |
| 24 | +#include <clocksource/pxa.h> | |
| 25 | + | |
| 24 | 26 | #include <asm/div64.h> |
| 25 | 27 | |
| 26 | 28 | #define OSMR0 0x00 /* OS Timer 0 Match Register */ |
| @@ -123,12 +123,16 @@ static struct clock_event_device sun4i_clockevent = { · 122 unmodified lines | ||
| 123 | 123 | .set_next_event = sun4i_clkevt_next_event, |
| 124 | 124 | }; |
| 125 | 125 | |
| 126 | +static void sun4i_timer_clear_interrupt(void) | |
| 127 | +{ | |
| 128 | + writel(TIMER_IRQ_EN(0), timer_base + TIMER_IRQ_ST_REG); | |
| 129 | +} | |
| 126 | 130 | |
| 127 | 131 | static irqreturn_t sun4i_timer_interrupt(int irq, void *dev_id) |
| 128 | 132 | { |
| 129 | 133 | struct clock_event_device *evt = (struct clock_event_device *)dev_id; |
| 130 | 134 | |
| 131 | − writel(0x1, timer_base + TIMER_IRQ_ST_REG); | |
| 135 | + sun4i_timer_clear_interrupt(); | |
| 132 | 136 | evt->event_handler(evt); |
| 133 | 137 | |
| 134 | 138 | return IRQ_HANDLED; |
| @@ -208,6 +212,9 @@ static int __init sun4i_timer_init(struct device_node *node) · 73 unmodified lines | ||
| 208 | 212 | /* Make sure timer is stopped before playing with interrupts */ |
| 209 | 213 | sun4i_clkevt_time_stop(0); |
| 210 | 214 | |
| 215 | + /* clear timer0 interrupt */ | |
| 216 | + sun4i_timer_clear_interrupt(); | |
| 217 | + | |
| 211 | 218 | sun4i_clockevent.cpumask = cpu_possible_mask; |
| 212 | 219 | sun4i_clockevent.irq = irq; |
| 213 | 220 | |
| @@ -338,7 +338,6 @@ static int __init armada_xp_timer_init(struct device_node *np) · 337 unmodified lines | ||
| 338 | 338 | struct clk *clk = of_clk_get_by_name(np, "fixed"); |
| 339 | 339 | int ret; |
| 340 | 340 | |
| 341 | − clk = of_clk_get(np, 0); | |
| 342 | 341 | if (IS_ERR(clk)) { |
| 343 | 342 | pr_err("Failed to get clock"); |
| 344 | 343 | return PTR_ERR(clk); |
| @@ -202,10 +202,10 @@ static int __init pistachio_clksrc_of_init(struct device_node *node) · 201 unmodified lines | ||
| 202 | 202 | rate = clk_get_rate(fast_clk); |
| 203 | 203 | |
| 204 | 204 | /* Disable irq's for clocksource usage */ |
| 205 | − gpt_writel(&pcs_gpt.base, 0, TIMER_IRQ_MASK, 0); | |
| 206 | − gpt_writel(&pcs_gpt.base, 0, TIMER_IRQ_MASK, 1); | |
| 207 | − gpt_writel(&pcs_gpt.base, 0, TIMER_IRQ_MASK, 2); | |
| 208 | − gpt_writel(&pcs_gpt.base, 0, TIMER_IRQ_MASK, 3); | |
| 205 | + gpt_writel(pcs_gpt.base, 0, TIMER_IRQ_MASK, 0); | |
| 206 | + gpt_writel(pcs_gpt.base, 0, TIMER_IRQ_MASK, 1); | |
| 207 | + gpt_writel(pcs_gpt.base, 0, TIMER_IRQ_MASK, 2); | |
| 208 | + gpt_writel(pcs_gpt.base, 0, TIMER_IRQ_MASK, 3); | |
| 209 | 209 | |
| 210 | 210 | /* Enable timer block */ |
| 211 | 211 | writel(TIMER_ME_GLOBAL, pcs_gpt.base); |
| @@ -240,6 +240,7 @@ static int __init at91sam926x_pit_common_init(struct pit_data *data) · 239 unmodified lines | ||
| 240 | 240 | static int __init at91sam926x_pit_dt_init(struct device_node *node) |
| 241 | 241 | { |
| 242 | 242 | struct pit_data *data; |
| 243 | + int ret; | |
| 243 | 244 | |
| 244 | 245 | data = kzalloc(sizeof(*data), GFP_KERNEL); |
| 245 | 246 | if (!data) |
| @@ -261,6 +262,12 @@ static int __init at91sam926x_pit_dt_init(struct device_node *node) · 15 unmodified lines | ||
| 261 | 262 | return PTR_ERR(data->mck); |
| 262 | 263 | } |
| 263 | 264 | |
| 265 | + ret = clk_prepare_enable(data->mck); | |
| 266 | + if (ret) { | |
| 267 | + pr_err("Unable to enable mck\n"); | |
| 268 | + return ret; | |
| 269 | + } | |
| 270 | + | |
| 264 | 271 | /* Get the interrupts property */ |
| 265 | 272 | data->irq = irq_of_parse_and_map(node, 0); |
| 266 | 273 | if (!data->irq) { |
| @@ -74,6 +74,8 @@ static const struct of_device_id machines[] __initconst = { · 73 unmodified lines | ||
| 74 | 74 | { .compatible = "ti,omap5", }, |
| 75 | 75 | |
| 76 | 76 | { .compatible = "xlnx,zynq-7000", }, |
| 77 | + | |
| 78 | + { } | |
| 77 | 79 | }; |
| 78 | 80 | |
| 79 | 81 | static int __init cpufreq_dt_platdev_init(void) |
| @@ -441,6 +441,9 @@ static int aead_set_sh_desc(struct crypto_aead *aead) · 440 unmodified lines | ||
| 441 | 441 | OP_ALG_AAI_CTR_MOD128); |
| 442 | 442 | const bool is_rfc3686 = alg->caam.rfc3686; |
| 443 | 443 | |
| 444 | + if (!ctx->authsize) | |
| 445 | + return 0; | |
| 446 | + | |
| 444 | 447 | /* NULL encryption / decryption */ |
| 445 | 448 | if (!ctx->enckeylen) |
| 446 | 449 | return aead_null_set_sh_desc(aead); |
| @@ -553,7 +556,10 @@ skip_enc: · 106 unmodified lines | ||
| 553 | 556 | |
| 554 | 557 | /* Read and write assoclen bytes */ |
| 555 | 558 | append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ); |
| 556 | − append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); | |
| 559 | + if (alg->caam.geniv) | |
| 560 | + append_math_add_imm_u32(desc, VARSEQOUTLEN, REG3, IMM, ivsize); | |
| 561 | + else | |
| 562 | + append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); | |
| 557 | 563 | |
| 558 | 564 | /* Skip assoc data */ |
| 559 | 565 | append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF); |
| @@ -562,6 +568,14 @@ skip_enc: · 2 unmodified lines | ||
| 562 | 568 | append_seq_fifo_load(desc, 0, FIFOLD_CLASS_CLASS2 | FIFOLD_TYPE_MSG | |
| 563 | 569 | KEY_VLF); |
| 564 | 570 | |
| 571 | + if (alg->caam.geniv) { | |
| 572 | + append_seq_load(desc, ivsize, LDST_CLASS_1_CCB | | |
| 573 | + LDST_SRCDST_BYTE_CONTEXT | | |
| 574 | + (ctx1_iv_off << LDST_OFFSET_SHIFT)); | |
| 575 | + append_move(desc, MOVE_SRC_CLASS1CTX | MOVE_DEST_CLASS2INFIFO | | |
| 576 | + (ctx1_iv_off << MOVE_OFFSET_SHIFT) | ivsize); | |
| 577 | + } | |
| 578 | + | |
| 565 | 579 | /* Load Counter into CONTEXT1 reg */ |
| 566 | 580 | if (is_rfc3686) |
| 567 | 581 | append_load_imm_u32(desc, be32_to_cpu(1), LDST_IMM | |
| @@ -614,7 +628,7 @@ skip_enc: · 46 unmodified lines | ||
| 614 | 628 | keys_fit_inline = true; |
| 615 | 629 | |
| 616 | 630 | /* aead_givencrypt shared descriptor */ |
| 617 | − desc = ctx->sh_desc_givenc; | |
| 631 | + desc = ctx->sh_desc_enc; | |
| 618 | 632 | |
| 619 | 633 | /* Note: Context registers are saved. */ |
| 620 | 634 | init_sh_desc_key_aead(desc, ctx, keys_fit_inline, is_rfc3686); |
| @@ -645,13 +659,13 @@ copy_iv: · 24 unmodified lines | ||
| 645 | 659 | append_operation(desc, ctx->class2_alg_type | |
| 646 | 660 | OP_ALG_AS_INITFINAL | OP_ALG_ENCRYPT); |
| 647 | 661 | |
| 648 | − /* ivsize + cryptlen = seqoutlen - authsize */ | |
| 649 | − append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize); | |
| 650 | − | |
| 651 | 662 | /* Read and write assoclen bytes */ |
| 652 | 663 | append_math_add(desc, VARSEQINLEN, ZERO, REG3, CAAM_CMD_SZ); |
| 653 | 664 | append_math_add(desc, VARSEQOUTLEN, ZERO, REG3, CAAM_CMD_SZ); |
| 654 | 665 | |
| 666 | + /* ivsize + cryptlen = seqoutlen - authsize */ | |
| 667 | + append_math_sub_imm_u32(desc, REG3, SEQOUTLEN, IMM, ctx->authsize); | |
| 668 | + | |
| 655 | 669 | /* Skip assoc data */ |
| 656 | 670 | append_seq_fifo_store(desc, 0, FIFOST_TYPE_SKIP | FIFOLDST_VLF); |
| 657 | 671 | |
| @@ -697,7 +711,7 @@ copy_iv: · 39 unmodified lines | ||
| 697 | 711 | ctx->sh_desc_enc_dma = dma_map_single(jrdev, desc, |
| 698 | 712 | desc_bytes(desc), |
| 699 | 713 | DMA_TO_DEVICE); |
| 700 | − if (dma_mapping_error(jrdev, ctx->sh_desc_givenc_dma)) { | |
| 714 | + if (dma_mapping_error(jrdev, ctx->sh_desc_enc_dma)) { | |
| 701 | 715 | dev_err(jrdev, "unable to map shared descriptor\n"); |
| 702 | 716 | return -ENOMEM; |
| 703 | 717 | } |
| @@ -2147,7 +2161,7 @@ static void init_authenc_job(struct aead_request *req, · 1443 unmodified lines | ||
| 2147 | 2161 | |
| 2148 | 2162 | init_aead_job(req, edesc, all_contig, encrypt); |
| 2149 | 2163 | |
| 2150 | − if (ivsize && (is_rfc3686 || !(alg->caam.geniv && encrypt))) | |
| 2164 | + if (ivsize && ((is_rfc3686 && encrypt) || !alg->caam.geniv)) | |
| 2151 | 2165 | append_load_as_imm(desc, req->iv, ivsize, |
| 2152 | 2166 | LDST_CLASS_1_CCB | |
| 2153 | 2167 | LDST_SRCDST_BYTE_CONTEXT | |
| @@ -2534,20 +2548,6 @@ static int aead_decrypt(struct aead_request *req) · 380 unmodified lines | ||
| 2534 | 2548 | return ret; |
| 2535 | 2549 | } |
| 2536 | 2550 | |
| 2537 | −static int aead_givdecrypt(struct aead_request *req) | |
| 2538 | −{ | |
| 2539 | − struct crypto_aead *aead = crypto_aead_reqtfm(req); | |
| 2540 | − unsigned int ivsize = crypto_aead_ivsize(aead); | |
| 2541 | − | |
| 2542 | − if (req->cryptlen < ivsize) | |
| 2543 | − return -EINVAL; | |
| 2544 | − | |
| 2545 | − req->cryptlen -= ivsize; | |
| 2546 | − req->assoclen += ivsize; | |
| 2547 | − | |
| 2548 | − return aead_decrypt(req); | |
| 2549 | −} | |
| 2550 | − | |
| 2551 | 2551 | /* |
| 2552 | 2552 | * allocate and map the ablkcipher extended descriptor for ablkcipher |
| 2553 | 2553 | */ |
| @@ -3207,7 +3207,7 @@ static struct caam_aead_alg driver_aeads[] = { · 653 unmodified lines | ||
| 3207 | 3207 | .setkey = aead_setkey, |
| 3208 | 3208 | .setauthsize = aead_setauthsize, |
| 3209 | 3209 | .encrypt = aead_encrypt, |
| 3210 | − .decrypt = aead_givdecrypt, | |
| 3210 | + .decrypt = aead_decrypt, | |
| 3211 | 3211 | .ivsize = AES_BLOCK_SIZE, |
| 3212 | 3212 | .maxauthsize = MD5_DIGEST_SIZE, |
| 3213 | 3213 | }, |
| @@ -3253,7 +3253,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3253 | 3253 | .setkey = aead_setkey, |
| 3254 | 3254 | .setauthsize = aead_setauthsize, |
| 3255 | 3255 | .encrypt = aead_encrypt, |
| 3256 | − .decrypt = aead_givdecrypt, | |
| 3256 | + .decrypt = aead_decrypt, | |
| 3257 | 3257 | .ivsize = AES_BLOCK_SIZE, |
| 3258 | 3258 | .maxauthsize = SHA1_DIGEST_SIZE, |
| 3259 | 3259 | }, |
| @@ -3299,7 +3299,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3299 | 3299 | .setkey = aead_setkey, |
| 3300 | 3300 | .setauthsize = aead_setauthsize, |
| 3301 | 3301 | .encrypt = aead_encrypt, |
| 3302 | − .decrypt = aead_givdecrypt, | |
| 3302 | + .decrypt = aead_decrypt, | |
| 3303 | 3303 | .ivsize = AES_BLOCK_SIZE, |
| 3304 | 3304 | .maxauthsize = SHA224_DIGEST_SIZE, |
| 3305 | 3305 | }, |
| @@ -3345,7 +3345,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3345 | 3345 | .setkey = aead_setkey, |
| 3346 | 3346 | .setauthsize = aead_setauthsize, |
| 3347 | 3347 | .encrypt = aead_encrypt, |
| 3348 | − .decrypt = aead_givdecrypt, | |
| 3348 | + .decrypt = aead_decrypt, | |
| 3349 | 3349 | .ivsize = AES_BLOCK_SIZE, |
| 3350 | 3350 | .maxauthsize = SHA256_DIGEST_SIZE, |
| 3351 | 3351 | }, |
| @@ -3391,7 +3391,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3391 | 3391 | .setkey = aead_setkey, |
| 3392 | 3392 | .setauthsize = aead_setauthsize, |
| 3393 | 3393 | .encrypt = aead_encrypt, |
| 3394 | − .decrypt = aead_givdecrypt, | |
| 3394 | + .decrypt = aead_decrypt, | |
| 3395 | 3395 | .ivsize = AES_BLOCK_SIZE, |
| 3396 | 3396 | .maxauthsize = SHA384_DIGEST_SIZE, |
| 3397 | 3397 | }, |
| @@ -3437,7 +3437,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3437 | 3437 | .setkey = aead_setkey, |
| 3438 | 3438 | .setauthsize = aead_setauthsize, |
| 3439 | 3439 | .encrypt = aead_encrypt, |
| 3440 | − .decrypt = aead_givdecrypt, | |
| 3440 | + .decrypt = aead_decrypt, | |
| 3441 | 3441 | .ivsize = AES_BLOCK_SIZE, |
| 3442 | 3442 | .maxauthsize = SHA512_DIGEST_SIZE, |
| 3443 | 3443 | }, |
| @@ -3483,7 +3483,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3483 | 3483 | .setkey = aead_setkey, |
| 3484 | 3484 | .setauthsize = aead_setauthsize, |
| 3485 | 3485 | .encrypt = aead_encrypt, |
| 3486 | − .decrypt = aead_givdecrypt, | |
| 3486 | + .decrypt = aead_decrypt, | |
| 3487 | 3487 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3488 | 3488 | .maxauthsize = MD5_DIGEST_SIZE, |
| 3489 | 3489 | }, |
| @@ -3531,7 +3531,7 @@ static struct caam_aead_alg driver_aeads[] = { · 41 unmodified lines | ||
| 3531 | 3531 | .setkey = aead_setkey, |
| 3532 | 3532 | .setauthsize = aead_setauthsize, |
| 3533 | 3533 | .encrypt = aead_encrypt, |
| 3534 | − .decrypt = aead_givdecrypt, | |
| 3534 | + .decrypt = aead_decrypt, | |
| 3535 | 3535 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3536 | 3536 | .maxauthsize = SHA1_DIGEST_SIZE, |
| 3537 | 3537 | }, |
| @@ -3579,7 +3579,7 @@ static struct caam_aead_alg driver_aeads[] = { · 41 unmodified lines | ||
| 3579 | 3579 | .setkey = aead_setkey, |
| 3580 | 3580 | .setauthsize = aead_setauthsize, |
| 3581 | 3581 | .encrypt = aead_encrypt, |
| 3582 | − .decrypt = aead_givdecrypt, | |
| 3582 | + .decrypt = aead_decrypt, | |
| 3583 | 3583 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3584 | 3584 | .maxauthsize = SHA224_DIGEST_SIZE, |
| 3585 | 3585 | }, |
| @@ -3627,7 +3627,7 @@ static struct caam_aead_alg driver_aeads[] = { · 41 unmodified lines | ||
| 3627 | 3627 | .setkey = aead_setkey, |
| 3628 | 3628 | .setauthsize = aead_setauthsize, |
| 3629 | 3629 | .encrypt = aead_encrypt, |
| 3630 | − .decrypt = aead_givdecrypt, | |
| 3630 | + .decrypt = aead_decrypt, | |
| 3631 | 3631 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3632 | 3632 | .maxauthsize = SHA256_DIGEST_SIZE, |
| 3633 | 3633 | }, |
| @@ -3675,7 +3675,7 @@ static struct caam_aead_alg driver_aeads[] = { · 41 unmodified lines | ||
| 3675 | 3675 | .setkey = aead_setkey, |
| 3676 | 3676 | .setauthsize = aead_setauthsize, |
| 3677 | 3677 | .encrypt = aead_encrypt, |
| 3678 | − .decrypt = aead_givdecrypt, | |
| 3678 | + .decrypt = aead_decrypt, | |
| 3679 | 3679 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3680 | 3680 | .maxauthsize = SHA384_DIGEST_SIZE, |
| 3681 | 3681 | }, |
| @@ -3723,7 +3723,7 @@ static struct caam_aead_alg driver_aeads[] = { · 41 unmodified lines | ||
| 3723 | 3723 | .setkey = aead_setkey, |
| 3724 | 3724 | .setauthsize = aead_setauthsize, |
| 3725 | 3725 | .encrypt = aead_encrypt, |
| 3726 | − .decrypt = aead_givdecrypt, | |
| 3726 | + .decrypt = aead_decrypt, | |
| 3727 | 3727 | .ivsize = DES3_EDE_BLOCK_SIZE, |
| 3728 | 3728 | .maxauthsize = SHA512_DIGEST_SIZE, |
| 3729 | 3729 | }, |
| @@ -3769,7 +3769,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3769 | 3769 | .setkey = aead_setkey, |
| 3770 | 3770 | .setauthsize = aead_setauthsize, |
| 3771 | 3771 | .encrypt = aead_encrypt, |
| 3772 | − .decrypt = aead_givdecrypt, | |
| 3772 | + .decrypt = aead_decrypt, | |
| 3773 | 3773 | .ivsize = DES_BLOCK_SIZE, |
| 3774 | 3774 | .maxauthsize = MD5_DIGEST_SIZE, |
| 3775 | 3775 | }, |
| @@ -3815,7 +3815,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3815 | 3815 | .setkey = aead_setkey, |
| 3816 | 3816 | .setauthsize = aead_setauthsize, |
| 3817 | 3817 | .encrypt = aead_encrypt, |
| 3818 | − .decrypt = aead_givdecrypt, | |
| 3818 | + .decrypt = aead_decrypt, | |
| 3819 | 3819 | .ivsize = DES_BLOCK_SIZE, |
| 3820 | 3820 | .maxauthsize = SHA1_DIGEST_SIZE, |
| 3821 | 3821 | }, |
| @@ -3861,7 +3861,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3861 | 3861 | .setkey = aead_setkey, |
| 3862 | 3862 | .setauthsize = aead_setauthsize, |
| 3863 | 3863 | .encrypt = aead_encrypt, |
| 3864 | − .decrypt = aead_givdecrypt, | |
| 3864 | + .decrypt = aead_decrypt, | |
| 3865 | 3865 | .ivsize = DES_BLOCK_SIZE, |
| 3866 | 3866 | .maxauthsize = SHA224_DIGEST_SIZE, |
| 3867 | 3867 | }, |
| @@ -3907,7 +3907,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3907 | 3907 | .setkey = aead_setkey, |
| 3908 | 3908 | .setauthsize = aead_setauthsize, |
| 3909 | 3909 | .encrypt = aead_encrypt, |
| 3910 | − .decrypt = aead_givdecrypt, | |
| 3910 | + .decrypt = aead_decrypt, | |
| 3911 | 3911 | .ivsize = DES_BLOCK_SIZE, |
| 3912 | 3912 | .maxauthsize = SHA256_DIGEST_SIZE, |
| 3913 | 3913 | }, |
| @@ -3953,7 +3953,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3953 | 3953 | .setkey = aead_setkey, |
| 3954 | 3954 | .setauthsize = aead_setauthsize, |
| 3955 | 3955 | .encrypt = aead_encrypt, |
| 3956 | − .decrypt = aead_givdecrypt, | |
| 3956 | + .decrypt = aead_decrypt, | |
| 3957 | 3957 | .ivsize = DES_BLOCK_SIZE, |
| 3958 | 3958 | .maxauthsize = SHA384_DIGEST_SIZE, |
| 3959 | 3959 | }, |
| @@ -3999,7 +3999,7 @@ static struct caam_aead_alg driver_aeads[] = { · 39 unmodified lines | ||
| 3999 | 3999 | .setkey = aead_setkey, |
| 4000 | 4000 | .setauthsize = aead_setauthsize, |
| 4001 | 4001 | .encrypt = aead_encrypt, |
| 4002 | − .decrypt = aead_givdecrypt, | |
| 4002 | + .decrypt = aead_decrypt, | |
| 4003 | 4003 | .ivsize = DES_BLOCK_SIZE, |
| 4004 | 4004 | .maxauthsize = SHA512_DIGEST_SIZE, |
| 4005 | 4005 | }, |
| @@ -4048,7 +4048,7 @@ static struct caam_aead_alg driver_aeads[] = { · 42 unmodified lines | ||
| 4048 | 4048 | .setkey = aead_setkey, |
| 4049 | 4049 | .setauthsize = aead_setauthsize, |
| 4050 | 4050 | .encrypt = aead_encrypt, |
| 4051 | − .decrypt = aead_givdecrypt, | |
| 4051 | + .decrypt = aead_decrypt, | |
| 4052 | 4052 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4053 | 4053 | .maxauthsize = MD5_DIGEST_SIZE, |
| 4054 | 4054 | }, |
| @@ -4099,7 +4099,7 @@ static struct caam_aead_alg driver_aeads[] = { · 44 unmodified lines | ||
| 4099 | 4099 | .setkey = aead_setkey, |
| 4100 | 4100 | .setauthsize = aead_setauthsize, |
| 4101 | 4101 | .encrypt = aead_encrypt, |
| 4102 | − .decrypt = aead_givdecrypt, | |
| 4102 | + .decrypt = aead_decrypt, | |
| 4103 | 4103 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4104 | 4104 | .maxauthsize = SHA1_DIGEST_SIZE, |
| 4105 | 4105 | }, |
| @@ -4150,7 +4150,7 @@ static struct caam_aead_alg driver_aeads[] = { · 44 unmodified lines | ||
| 4150 | 4150 | .setkey = aead_setkey, |
| 4151 | 4151 | .setauthsize = aead_setauthsize, |
| 4152 | 4152 | .encrypt = aead_encrypt, |
| 4153 | − .decrypt = aead_givdecrypt, | |
| 4153 | + .decrypt = aead_decrypt, | |
| 4154 | 4154 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4155 | 4155 | .maxauthsize = SHA224_DIGEST_SIZE, |
| 4156 | 4156 | }, |
| @@ -4201,7 +4201,7 @@ static struct caam_aead_alg driver_aeads[] = { · 44 unmodified lines | ||
| 4201 | 4201 | .setkey = aead_setkey, |
| 4202 | 4202 | .setauthsize = aead_setauthsize, |
| 4203 | 4203 | .encrypt = aead_encrypt, |
| 4204 | − .decrypt = aead_givdecrypt, | |
| 4204 | + .decrypt = aead_decrypt, | |
| 4205 | 4205 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4206 | 4206 | .maxauthsize = SHA256_DIGEST_SIZE, |
| 4207 | 4207 | }, |
| @@ -4252,7 +4252,7 @@ static struct caam_aead_alg driver_aeads[] = { · 44 unmodified lines | ||
| 4252 | 4252 | .setkey = aead_setkey, |
| 4253 | 4253 | .setauthsize = aead_setauthsize, |
| 4254 | 4254 | .encrypt = aead_encrypt, |
| 4255 | − .decrypt = aead_givdecrypt, | |
| 4255 | + .decrypt = aead_decrypt, | |
| 4256 | 4256 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4257 | 4257 | .maxauthsize = SHA384_DIGEST_SIZE, |
| 4258 | 4258 | }, |
| @@ -4303,7 +4303,7 @@ static struct caam_aead_alg driver_aeads[] = { · 44 unmodified lines | ||
| 4303 | 4303 | .setkey = aead_setkey, |
| 4304 | 4304 | .setauthsize = aead_setauthsize, |
| 4305 | 4305 | .encrypt = aead_encrypt, |
| 4306 | − .decrypt = aead_givdecrypt, | |
| 4306 | + .decrypt = aead_decrypt, | |
| 4307 | 4307 | .ivsize = CTR_RFC3686_IV_SIZE, |
| 4308 | 4308 | .maxauthsize = SHA512_DIGEST_SIZE, |
| 4309 | 4309 | }, |
| @@ -1898,6 +1898,7 @@ caam_hash_alloc(struct caam_hash_template *template, · 1897 unmodified lines | ||
| 1898 | 1898 | template->name); |
| 1899 | 1899 | snprintf(alg->cra_driver_name, CRYPTO_MAX_ALG_NAME, "%s", |
| 1900 | 1900 | template->driver_name); |
| 1901 | + t_alg->ahash_alg.setkey = NULL; | |
| 1901 | 1902 | } |
| 1902 | 1903 | alg->cra_module = THIS_MODULE; |
| 1903 | 1904 | alg->cra_init = caam_hash_cra_init; |
| @@ -1260,8 +1260,8 @@ static struct crypto_alg qat_algs[] = { { · 1259 unmodified lines | ||
| 1260 | 1260 | .setkey = qat_alg_ablkcipher_xts_setkey, |
| 1261 | 1261 | .decrypt = qat_alg_ablkcipher_decrypt, |
| 1262 | 1262 | .encrypt = qat_alg_ablkcipher_encrypt, |
| 1263 | − .min_keysize = AES_MIN_KEY_SIZE, | |
| 1264 | − .max_keysize = AES_MAX_KEY_SIZE, | |
| 1263 | + .min_keysize = 2 * AES_MIN_KEY_SIZE, | |
| 1264 | + .max_keysize = 2 * AES_MAX_KEY_SIZE, | |
| 1265 | 1265 | .ivsize = AES_BLOCK_SIZE, |
| 1266 | 1266 | }, |
| 1267 | 1267 | }, |
| @@ -129,8 +129,8 @@ static int p8_aes_xts_crypt(struct blkcipher_desc *desc, · 128 unmodified lines | ||
| 129 | 129 | |
| 130 | 130 | blkcipher_walk_init(&walk, dst, src, nbytes); |
| 131 | 131 | |
| 132 | − iv = (u8 *)walk.iv; | |
| 133 | 132 | ret = blkcipher_walk_virt(desc, &walk); |
| 133 | + iv = walk.iv; | |
| 134 | 134 | memset(tweak, 0, AES_BLOCK_SIZE); |
| 135 | 135 | aes_p8_encrypt(iv, tweak, &ctx->tweak_key); |
| 136 | 136 | |
| @@ -459,7 +459,7 @@ static int __dax_dev_pmd_fault(struct dax_dev *dax_dev, · 458 unmodified lines | ||
| 459 | 459 | } |
| 460 | 460 | |
| 461 | 461 | pgoff = linear_page_index(vma, pmd_addr); |
| 462 | − phys = pgoff_to_phys(dax_dev, pgoff, PAGE_SIZE); | |
| 462 | + phys = pgoff_to_phys(dax_dev, pgoff, PMD_SIZE); | |
| 463 | 463 | if (phys == -1) { |
| 464 | 464 | dev_dbg(dev, "%s: phys_to_pgoff(%#lx) failed\n", __func__, |
| 465 | 465 | pgoff); |
| @@ -116,6 +116,9 @@ static int dax_pmem_probe(struct device *dev) · 115 unmodified lines | ||
| 116 | 116 | if (rc) |
| 117 | 117 | return rc; |
| 118 | 118 | |
| 119 | + /* adjust the dax_region resource to the start of data */ | |
| 120 | + res.start += le64_to_cpu(pfn_sb->dataoff); | |
| 121 | + | |
| 119 | 122 | nd_region = to_nd_region(dev->parent); |
| 120 | 123 | dax_region = alloc_dax_region(dev, nd_region->id, &res, |
| 121 | 124 | le32_to_cpu(pfn_sb->align), addr, PFN_DEV|PFN_MAP); |
| @@ -2067,7 +2067,7 @@ err_dma_unregister: · 2066 unmodified lines | ||
| 2067 | 2067 | err_clk_disable: |
| 2068 | 2068 | clk_disable_unprepare(atxdmac->clk); |
| 2069 | 2069 | err_free_irq: |
| 2070 | − free_irq(atxdmac->irq, atxdmac->dma.dev); | |
| 2070 | + free_irq(atxdmac->irq, atxdmac); | |
| 2071 | 2071 | return ret; |
| 2072 | 2072 | } |
| 2073 | 2073 | |
| @@ -2081,7 +2081,7 @@ static int at_xdmac_remove(struct platform_device *pdev) · 7 unmodified lines | ||
| 2081 | 2081 | dma_async_device_unregister(&atxdmac->dma); |
| 2082 | 2082 | clk_disable_unprepare(atxdmac->clk); |
| 2083 | 2083 | |
| 2084 | − free_irq(atxdmac->irq, atxdmac->dma.dev); | |
| 2084 | + free_irq(atxdmac->irq, atxdmac); | |
| 2085 | 2085 | |
| 2086 | 2086 | for (i = 0; i < atxdmac->dma.chancnt; i++) { |
| 2087 | 2087 | struct at_xdmac_chan *atchan = &atxdmac->chan[i]; |
| @@ -836,6 +836,7 @@ static int fsl_re_probe(struct platform_device *ofdev) · 835 unmodified lines | ||
| 836 | 836 | rc = of_property_read_u32(np, "reg", &off); |
| 837 | 837 | if (rc) { |
| 838 | 838 | dev_err(dev, "Reg property not found in JQ node\n"); |
| 839 | + of_node_put(np); | |
| 839 | 840 | return -ENODEV; |
| 840 | 841 | } |
| 841 | 842 | /* Find out the Job Rings present under each JQ */ |
| @@ -861,7 +861,6 @@ static int mdc_dma_probe(struct platform_device *pdev) · 860 unmodified lines | ||
| 861 | 861 | { |
| 862 | 862 | struct mdc_dma *mdma; |
| 863 | 863 | struct resource *res; |
| 864 | − const struct of_device_id *match; | |
| 865 | 864 | unsigned int i; |
| 866 | 865 | u32 val; |
| 867 | 866 | int ret; |
| @@ -871,8 +870,7 @@ static int mdc_dma_probe(struct platform_device *pdev) · 3 unmodified lines | ||
| 871 | 870 | return -ENOMEM; |
| 872 | 871 | platform_set_drvdata(pdev, mdma); |
| 873 | 872 | |
| 874 | − match = of_match_device(mdc_dma_of_match, &pdev->dev); | |
| 875 | − mdma->soc = match->data; | |
| 873 | + mdma->soc = of_device_get_match_data(&pdev->dev); | |
| 876 | 874 | |
| 877 | 875 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
| 878 | 876 | mdma->regs = devm_ioremap_resource(&pdev->dev, res); |
| @@ -638,7 +638,7 @@ static bool pxad_try_hotchain(struct virt_dma_chan *vc, · 637 unmodified lines | ||
| 638 | 638 | vd_last_issued = list_entry(vc->desc_issued.prev, |
| 639 | 639 | struct virt_dma_desc, node); |
| 640 | 640 | pxad_desc_chain(vd_last_issued, vd); |
| 641 | − if (is_chan_running(chan) || is_desc_completed(vd_last_issued)) | |
| 641 | + if (is_chan_running(chan) || is_desc_completed(vd)) | |
| 642 | 642 | return true; |
| 643 | 643 | } |
| 644 | 644 | |
| @@ -671,6 +671,7 @@ static irqreturn_t pxad_chan_handler(int irq, void *dev_id) · 26 unmodified lines | ||
| 671 | 671 | struct virt_dma_desc *vd, *tmp; |
| 672 | 672 | unsigned int dcsr; |
| 673 | 673 | unsigned long flags; |
| 674 | + bool vd_completed; | |
| 674 | 675 | dma_cookie_t last_started = 0; |
| 675 | 676 | |
| 676 | 677 | BUG_ON(!chan); |
| @@ -681,15 +682,17 @@ static irqreturn_t pxad_chan_handler(int irq, void *dev_id) · 4 unmodified lines | ||
| 681 | 682 | |
| 682 | 683 | spin_lock_irqsave(&chan->vc.lock, flags); |
| 683 | 684 | list_for_each_entry_safe(vd, tmp, &chan->vc.desc_issued, node) { |
| 685 | + vd_completed = is_desc_completed(vd); | |
| 684 | 686 | dev_dbg(&chan->vc.chan.dev->device, |
| 685 | − "%s(): checking txd %p[%x]: completed=%d\n", | |
| 686 | − __func__, vd, vd->tx.cookie, is_desc_completed(vd)); | |
| 687 | + "%s(): checking txd %p[%x]: completed=%d dcsr=0x%x\n", | |
| 688 | + __func__, vd, vd->tx.cookie, vd_completed, | |
| 689 | + dcsr); | |
| 687 | 690 | last_started = vd->tx.cookie; |
| 688 | 691 | if (to_pxad_sw_desc(vd)->cyclic) { |
| 689 | 692 | vchan_cyclic_callback(vd); |
| 690 | 693 | break; |
| 691 | 694 | } |
| 692 | − if (is_desc_completed(vd)) { | |
| 695 | + if (vd_completed) { | |
| 693 | 696 | list_del(&vd->node); |
| 694 | 697 | vchan_cookie_complete(vd); |
| 695 | 698 | } else { |
| @@ -600,27 +600,30 @@ static irqreturn_t usb_dmac_isr_channel(int irq, void *dev) · 599 unmodified lines | ||
| 600 | 600 | { |
| 601 | 601 | struct usb_dmac_chan *chan = dev; |
| 602 | 602 | irqreturn_t ret = IRQ_NONE; |
| 603 | − u32 mask = USB_DMACHCR_TE; | |
| 604 | − u32 check_bits = USB_DMACHCR_TE | USB_DMACHCR_SP; | |
| 603 | + u32 mask = 0; | |
| 605 | 604 | u32 chcr; |
| 605 | + bool xfer_end = false; | |
| 606 | 606 | |
| 607 | 607 | spin_lock(&chan->vc.lock); |
| 608 | 608 | |
| 609 | 609 | chcr = usb_dmac_chan_read(chan, USB_DMACHCR); |
| 610 | − if (chcr & check_bits) | |
| 611 | − mask |= USB_DMACHCR_DE | check_bits; | |
| 610 | + if (chcr & (USB_DMACHCR_TE | USB_DMACHCR_SP)) { | |
| 611 | + mask |= USB_DMACHCR_DE | USB_DMACHCR_TE | USB_DMACHCR_SP; | |
| 612 | + if (chcr & USB_DMACHCR_DE) | |
| 613 | + xfer_end = true; | |
| 614 | + ret |= IRQ_HANDLED; | |
| 615 | + } | |
| 612 | 616 | if (chcr & USB_DMACHCR_NULL) { |
| 613 | 617 | /* An interruption of TE will happen after we set FTE */ |
| 614 | 618 | mask |= USB_DMACHCR_NULL; |
| 615 | 619 | chcr |= USB_DMACHCR_FTE; |
| 616 | 620 | ret |= IRQ_HANDLED; |
| 617 | 621 | } |
| 618 | − usb_dmac_chan_write(chan, USB_DMACHCR, chcr & ~mask); | |
| 622 | + if (mask) | |
| 623 | + usb_dmac_chan_write(chan, USB_DMACHCR, chcr & ~mask); | |
| 619 | 624 | |
| 620 | − if (chcr & check_bits) { | |
| 625 | + if (xfer_end) | |
| 621 | 626 | usb_dmac_isr_transfer_end(chan); |
| 622 | − ret |= IRQ_HANDLED; | |
| 623 | − } | |
| 624 | 627 | |
| 625 | 628 | spin_unlock(&chan->vc.lock); |
| 626 | 629 | |
| @@ -251,6 +251,14 @@ config EDAC_SBRIDGE · 250 unmodified lines | ||
| 251 | 251 | Support for error detection and correction the Intel |
| 252 | 252 | Sandy Bridge, Ivy Bridge and Haswell Integrated Memory Controllers. |
| 253 | 253 | |
| 254 | +config EDAC_SKX | |
| 255 | + tristate "Intel Skylake server Integrated MC" | |
| 256 | + depends on EDAC_MM_EDAC && PCI && X86_64 && X86_MCE_INTEL | |
| 257 | + depends on PCI_MMCONFIG | |
| 258 | + help | |
| 259 | + Support for error detection and correction the Intel | |
| 260 | + Skylake server Integrated Memory Controllers. | |
| 261 | + | |
| 254 | 262 | config EDAC_MPC85XX |
| 255 | 263 | tristate "Freescale MPC83xx / MPC85xx" |
| 256 | 264 | depends on EDAC_MM_EDAC && FSL_SOC |
| @@ -31,6 +31,7 @@ obj-$(CONFIG_EDAC_I5400) += i5400_edac.o · 30 unmodified lines | ||
| 31 | 31 | obj-$(CONFIG_EDAC_I7300) += i7300_edac.o |
| 32 | 32 | obj-$(CONFIG_EDAC_I7CORE) += i7core_edac.o |
| 33 | 33 | obj-$(CONFIG_EDAC_SBRIDGE) += sb_edac.o |
| 34 | +obj-$(CONFIG_EDAC_SKX) += skx_edac.o | |
| 34 | 35 | obj-$(CONFIG_EDAC_E7XXX) += e7xxx_edac.o |
| 35 | 36 | obj-$(CONFIG_EDAC_E752X) += e752x_edac.o |
| 36 | 37 | obj-$(CONFIG_EDAC_I82443BXGX) += i82443bxgx_edac.o |
| @@ -552,9 +552,9 @@ static const struct pci_id_table pci_dev_descr_haswell_table[] = { · 551 unmodified lines | ||
| 552 | 552 | /* Knight's Landing Support */ |
| 553 | 553 | /* |
| 554 | 554 | * KNL's memory channels are swizzled between memory controllers. |
| 555 | − * MC0 is mapped to CH3,5,6 and MC1 is mapped to CH0,1,2 | |
| 555 | + * MC0 is mapped to CH3,4,5 and MC1 is mapped to CH0,1,2 | |
| 556 | 556 | */ |
| 557 | −#define knl_channel_remap(channel) ((channel + 3) % 6) | |
| 557 | +#define knl_channel_remap(mc, chan) ((mc) ? (chan) : (chan) + 3) | |
| 558 | 558 | |
| 559 | 559 | /* Memory controller, TAD tables, error injection - 2-8-0, 2-9-0 (2 of these) */ |
| 560 | 560 | #define PCI_DEVICE_ID_INTEL_KNL_IMC_MC 0x7840 |
| @@ -1286,7 +1286,7 @@ static u32 knl_get_mc_route(int entry, u32 reg) · 725 unmodified lines | ||
| 1286 | 1286 | mc = GET_BITFIELD(reg, entry*3, (entry*3)+2); |
| 1287 | 1287 | chan = GET_BITFIELD(reg, (entry*2) + 18, (entry*2) + 18 + 1); |
| 1288 | 1288 | |
| 1289 | − return knl_channel_remap(mc*3 + chan); | |
| 1289 | + return knl_channel_remap(mc, chan); | |
| 1290 | 1290 | } |
| 1291 | 1291 | |
| 1292 | 1292 | /* |
| @@ -2997,8 +2997,15 @@ static void sbridge_mce_output_error(struct mem_ctl_info *mci, · 1704 unmodified lines | ||
| 2997 | 2997 | } else { |
| 2998 | 2998 | char A = *("A"); |
| 2999 | 2999 | |
| 3000 | − channel = knl_channel_remap(channel); | |
| 3000 | + /* | |
| 3001 | + * Reported channel is in range 0-2, so we can't map it | |
| 3002 | + * back to mc. To figure out mc we check machine check | |
| 3003 | + * bank register that reported this error. | |
| 3004 | + * bank15 means mc0 and bank16 means mc1. | |
| 3005 | + */ | |
| 3006 | + channel = knl_channel_remap(m->bank == 16, channel); | |
| 3001 | 3007 | channel_mask = 1 << channel; |
| 3008 | + | |
| 3002 | 3009 | snprintf(msg, sizeof(msg), |
| 3003 | 3010 | "%s%s err_code:%04x:%04x channel:%d (DIMM_%c)", |
| 3004 | 3011 | overflow ? " OVERFLOW" : "", |
| @@ -0,0 +1,1121 @@ | ||
| 1 | +/* | |
| 2 | + * EDAC driver for Intel(R) Xeon(R) Skylake processors | |
| 3 | + * Copyright (c) 2016, Intel Corporation. | |
| 4 | + * | |
| 5 | + * This program is free software; you can redistribute it and/or modify it | |
| 6 | + * under the terms and conditions of the GNU General Public License, | |
| 7 | + * version 2, as published by the Free Software Foundation. | |
| 8 | + * | |
| 9 | + * This program is distributed in the hope it will be useful, but WITHOUT | |
| 10 | + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 11 | + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | |
| 12 | + * more details. | |
| 13 | + */ | |
| 14 | + | |
| 15 | +#include <linux/module.h> | |
| 16 | +#include <linux/init.h> | |
| 17 | +#include <linux/pci.h> | |
| 18 | +#include <linux/pci_ids.h> | |
| 19 | +#include <linux/slab.h> | |
| 20 | +#include <linux/delay.h> | |
| 21 | +#include <linux/edac.h> | |
| 22 | +#include <linux/mmzone.h> | |
| 23 | +#include <linux/smp.h> | |
| 24 | +#include <linux/bitmap.h> | |
| 25 | +#include <linux/math64.h> | |
| 26 | +#include <linux/mod_devicetable.h> | |
| 27 | +#include <asm/cpu_device_id.h> | |
| 28 | +#include <asm/processor.h> | |
| 29 | +#include <asm/mce.h> | |
| 30 | + | |
| 31 | +#include "edac_core.h" | |
| 32 | + | |
| 33 | +#define SKX_REVISION " Ver: 1.0 " | |
| 34 | + | |
| 35 | +/* | |
| 36 | + * Debug macros | |
| 37 | + */ | |
| 38 | +#define skx_printk(level, fmt, arg...) \ | |
| 39 | + edac_printk(level, "skx", fmt, ##arg) | |
| 40 | + | |
| 41 | +#define skx_mc_printk(mci, level, fmt, arg...) \ | |
| 42 | + edac_mc_chipset_printk(mci, level, "skx", fmt, ##arg) | |
| 43 | + | |
| 44 | +/* | |
| 45 | + * Get a bit field at register value <v>, from bit <lo> to bit <hi> | |
| 46 | + */ | |
| 47 | +#define GET_BITFIELD(v, lo, hi) \ | |
| 48 | + (((v) & GENMASK_ULL((hi), (lo))) >> (lo)) | |
| 49 | + | |
| 50 | +static LIST_HEAD(skx_edac_list); | |
| 51 | + | |
| 52 | +static u64 skx_tolm, skx_tohm; | |
| 53 | + | |
| 54 | +#define NUM_IMC 2 /* memory controllers per socket */ | |
| 55 | +#define NUM_CHANNELS 3 /* channels per memory controller */ | |
| 56 | +#define NUM_DIMMS 2 /* Max DIMMS per channel */ | |
| 57 | + | |
| 58 | +#define MASK26 0x3FFFFFF /* Mask for 2^26 */ | |
| 59 | +#define MASK29 0x1FFFFFFF /* Mask for 2^29 */ | |
| 60 | + | |
| 61 | +/* | |
| 62 | + * Each cpu socket contains some pci devices that provide global | |
| 63 | + * information, and also some that are local to each of the two | |
| 64 | + * memory controllers on the die. | |
| 65 | + */ | |
| 66 | +struct skx_dev { | |
| 67 | + struct list_head list; | |
| 68 | + u8 bus[4]; | |
| 69 | + struct pci_dev *sad_all; | |
| 70 | + struct pci_dev *util_all; | |
| 71 | + u32 mcroute; | |
| 72 | + struct skx_imc { | |
| 73 | + struct mem_ctl_info *mci; | |
| 74 | + u8 mc; /* system wide mc# */ | |
| 75 | + u8 lmc; /* socket relative mc# */ | |
| 76 | + u8 src_id, node_id; | |
| 77 | + struct skx_channel { | |
| 78 | + struct pci_dev *cdev; | |
| 79 | + struct skx_dimm { | |
| 80 | + u8 close_pg; | |
| 81 | + u8 bank_xor_enable; | |
| 82 | + u8 fine_grain_bank; | |
| 83 | + u8 rowbits; | |
| 84 | + u8 colbits; | |
| 85 | + } dimms[NUM_DIMMS]; | |
| 86 | + } chan[NUM_CHANNELS]; | |
| 87 | + } imc[NUM_IMC]; | |
| 88 | +}; | |
| 89 | +static int skx_num_sockets; | |
| 90 | + | |
| 91 | +struct skx_pvt { | |
| 92 | + struct skx_imc *imc; | |
| 93 | +}; | |
| 94 | + | |
| 95 | +struct decoded_addr { | |
| 96 | + struct skx_dev *dev; | |
| 97 | + u64 addr; | |
| 98 | + int socket; | |
| 99 | + int imc; | |
| 100 | + int channel; | |
| 101 | + u64 chan_addr; | |
| 102 | + int sktways; | |
| 103 | + int chanways; | |
| 104 | + int dimm; | |
| 105 | + int rank; | |
| 106 | + int channel_rank; | |
| 107 | + u64 rank_address; | |
| 108 | + int row; | |
| 109 | + int column; | |
| 110 | + int bank_address; | |
| 111 | + int bank_group; | |
| 112 | +}; | |
| 113 | + | |
| 114 | +static struct skx_dev *get_skx_dev(u8 bus, u8 idx) | |
| 115 | +{ | |
| 116 | + struct skx_dev *d; | |
| 117 | + | |
| 118 | + list_for_each_entry(d, &skx_edac_list, list) { | |
| 119 | + if (d->bus[idx] == bus) | |
| 120 | + return d; | |
| 121 | + } | |
| 122 | + | |
| 123 | + return NULL; | |
| 124 | +} | |
| 125 | + | |
| 126 | +enum munittype { | |
| 127 | + CHAN0, CHAN1, CHAN2, SAD_ALL, UTIL_ALL, SAD | |
| 128 | +}; | |
| 129 | + | |
| 130 | +struct munit { | |
| 131 | + u16 did; | |
| 132 | + u16 devfn[NUM_IMC]; | |
| 133 | + u8 busidx; | |
| 134 | + u8 per_socket; | |
| 135 | + enum munittype mtype; | |
| 136 | +}; | |
| 137 | + | |
| 138 | +/* | |
| 139 | + * List of PCI device ids that we need together with some device | |
| 140 | + * number and function numbers to tell which memory controller the | |
| 141 | + * device belongs to. | |
| 142 | + */ | |
| 143 | +static const struct munit skx_all_munits[] = { | |
| 144 | + { 0x2054, { }, 1, 1, SAD_ALL }, | |
| 145 | + { 0x2055, { }, 1, 1, UTIL_ALL }, | |
| 146 | + { 0x2040, { PCI_DEVFN(10, 0), PCI_DEVFN(12, 0) }, 2, 2, CHAN0 }, | |
| 147 | + { 0x2044, { PCI_DEVFN(10, 4), PCI_DEVFN(12, 4) }, 2, 2, CHAN1 }, | |
| 148 | + { 0x2048, { PCI_DEVFN(11, 0), PCI_DEVFN(13, 0) }, 2, 2, CHAN2 }, | |
| 149 | + { 0x208e, { }, 1, 0, SAD }, | |
| 150 | + { } | |
| 151 | +}; | |
| 152 | + | |
| 153 | +/* | |
| 154 | + * We use the per-socket device 0x2016 to count how many sockets are present, | |
| 155 | + * and to detemine which PCI buses are associated with each socket. Allocate | |
| 156 | + * and build the full list of all the skx_dev structures that we need here. | |
| 157 | + */ | |
| 158 | +static int get_all_bus_mappings(void) | |
| 159 | +{ | |
| 160 | + struct pci_dev *pdev, *prev; | |
| 161 | + struct skx_dev *d; | |
| 162 | + u32 reg; | |
| 163 | + int ndev = 0; | |
| 164 | + | |
| 165 | + prev = NULL; | |
| 166 | + for (;;) { | |
| 167 | + pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x2016, prev); | |
| 168 | + if (!pdev) | |
| 169 | + break; | |
| 170 | + ndev++; | |
| 171 | + d = kzalloc(sizeof(*d), GFP_KERNEL); | |
| 172 | + if (!d) { | |
| 173 | + pci_dev_put(pdev); | |
| 174 | + return -ENOMEM; | |
| 175 | + } | |
| 176 | + pci_read_config_dword(pdev, 0xCC, ®); | |
| 177 | + d->bus[0] = GET_BITFIELD(reg, 0, 7); | |
| 178 | + d->bus[1] = GET_BITFIELD(reg, 8, 15); | |
| 179 | + d->bus[2] = GET_BITFIELD(reg, 16, 23); | |
| 180 | + d->bus[3] = GET_BITFIELD(reg, 24, 31); | |
| 181 | + edac_dbg(2, "busses: %x, %x, %x, %x\n", | |
| 182 | + d->bus[0], d->bus[1], d->bus[2], d->bus[3]); | |
| 183 | + list_add_tail(&d->list, &skx_edac_list); | |
| 184 | + skx_num_sockets++; | |
| 185 | + prev = pdev; | |
| 186 | + } | |
| 187 | + | |
| 188 | + return ndev; | |
| 189 | +} | |
| 190 | + | |
| 191 | +static int get_all_munits(const struct munit *m) | |
| 192 | +{ | |
| 193 | + struct pci_dev *pdev, *prev; | |
| 194 | + struct skx_dev *d; | |
| 195 | + u32 reg; | |
| 196 | + int i = 0, ndev = 0; | |
| 197 | + | |
| 198 | + prev = NULL; | |
| 199 | + for (;;) { | |
| 200 | + pdev = pci_get_device(PCI_VENDOR_ID_INTEL, m->did, prev); | |
| 201 | + if (!pdev) | |
| 202 | + break; | |
| 203 | + ndev++; | |
| 204 | + if (m->per_socket == NUM_IMC) { | |
| 205 | + for (i = 0; i < NUM_IMC; i++) | |
| 206 | + if (m->devfn[i] == pdev->devfn) | |
| 207 | + break; | |
| 208 | + if (i == NUM_IMC) | |
| 209 | + goto fail; | |
| 210 | + } | |
| 211 | + d = get_skx_dev(pdev->bus->number, m->busidx); | |
| 212 | + if (!d) | |
| 213 | + goto fail; | |
| 214 | + | |
| 215 | + /* Be sure that the device is enabled */ | |
| 216 | + if (unlikely(pci_enable_device(pdev) < 0)) { | |
| 217 | + skx_printk(KERN_ERR, | |
| 218 | + "Couldn't enable %04x:%04x\n", PCI_VENDOR_ID_INTEL, m->did); | |
| 219 | + goto fail; | |
| 220 | + } | |
| 221 | + | |
| 222 | + switch (m->mtype) { | |
| 223 | + case CHAN0: case CHAN1: case CHAN2: | |
| 224 | + pci_dev_get(pdev); | |
| 225 | + d->imc[i].chan[m->mtype].cdev = pdev; | |
| 226 | + break; | |
| 227 | + case SAD_ALL: | |
| 228 | + pci_dev_get(pdev); | |
| 229 | + d->sad_all = pdev; | |
| 230 | + break; | |
| 231 | + case UTIL_ALL: | |
| 232 | + pci_dev_get(pdev); | |
| 233 | + d->util_all = pdev; | |
| 234 | + break; | |
| 235 | + case SAD: | |
| 236 | + /* | |
| 237 | + * one of these devices per core, including cores | |
| 238 | + * that don't exist on this SKU. Ignore any that | |
| 239 | + * read a route table of zero, make sure all the | |
| 240 | + * non-zero values match. | |
| 241 | + */ | |
| 242 | + pci_read_config_dword(pdev, 0xB4, ®); | |
| 243 | + if (reg != 0) { | |
| 244 | + if (d->mcroute == 0) | |
| 245 | + d->mcroute = reg; | |
| 246 | + else if (d->mcroute != reg) { | |
| 247 | + skx_printk(KERN_ERR, | |
| 248 | + "mcroute mismatch\n"); | |
| 249 | + goto fail; | |
| 250 | + } | |
| 251 | + } | |
| 252 | + ndev--; | |
| 253 | + break; | |
| 254 | + } | |
| 255 | + | |
| 256 | + prev = pdev; | |
| 257 | + } | |
| 258 | + | |
| 259 | + return ndev; | |
| 260 | +fail: | |
| 261 | + pci_dev_put(pdev); | |
| 262 | + return -ENODEV; | |
| 263 | +} | |
| 264 | + | |
| 265 | +const struct x86_cpu_id skx_cpuids[] = { | |
| 266 | + { X86_VENDOR_INTEL, 6, 0x55, 0, 0 }, /* Skylake */ | |
| 267 | + { } | |
| 268 | +}; | |
| 269 | +MODULE_DEVICE_TABLE(x86cpu, skx_cpuids); | |
| 270 | + | |
| 271 | +static u8 get_src_id(struct skx_dev *d) | |
| 272 | +{ | |
| 273 | + u32 reg; | |
| 274 | + | |
| 275 | + pci_read_config_dword(d->util_all, 0xF0, ®); | |
| 276 | + | |
| 277 | + return GET_BITFIELD(reg, 12, 14); | |
| 278 | +} | |
| 279 | + | |
| 280 | +static u8 skx_get_node_id(struct skx_dev *d) | |
| 281 | +{ | |
| 282 | + u32 reg; | |
| 283 | + | |
| 284 | + pci_read_config_dword(d->util_all, 0xF4, ®); | |
| 285 | + | |
| 286 | + return GET_BITFIELD(reg, 0, 2); | |
| 287 | +} | |
| 288 | + | |
| 289 | +static int get_dimm_attr(u32 reg, int lobit, int hibit, int add, int minval, | |
| 290 | + int maxval, char *name) | |
| 291 | +{ | |
| 292 | + u32 val = GET_BITFIELD(reg, lobit, hibit); | |
| 293 | + | |
| 294 | + if (val < minval || val > maxval) { | |
| 295 | + edac_dbg(2, "bad %s = %d (raw=%x)\n", name, val, reg); | |
| 296 | + return -EINVAL; | |
| 297 | + } | |
| 298 | + return val + add; | |
| 299 | +} | |
| 300 | + | |
| 301 | +#define IS_DIMM_PRESENT(mtr) GET_BITFIELD((mtr), 15, 15) | |
| 302 | + | |
| 303 | +#define numrank(reg) get_dimm_attr((reg), 12, 13, 0, 1, 2, "ranks") | |
| 304 | +#define numrow(reg) get_dimm_attr((reg), 2, 4, 12, 1, 6, "rows") | |
| 305 | +#define numcol(reg) get_dimm_attr((reg), 0, 1, 10, 0, 2, "cols") | |
| 306 | + | |
| 307 | +static int get_width(u32 mtr) | |
| 308 | +{ | |
| 309 | + switch (GET_BITFIELD(mtr, 8, 9)) { | |
| 310 | + case 0: | |
| 311 | + return DEV_X4; | |
| 312 | + case 1: | |
| 313 | + return DEV_X8; | |
| 314 | + case 2: | |
| 315 | + return DEV_X16; | |
| 316 | + } | |
| 317 | + return DEV_UNKNOWN; | |
| 318 | +} | |
| 319 | + | |
| 320 | +static int skx_get_hi_lo(void) | |
| 321 | +{ | |
| 322 | + struct pci_dev *pdev; | |
| 323 | + u32 reg; | |
| 324 | + | |
| 325 | + pdev = pci_get_device(PCI_VENDOR_ID_INTEL, 0x2034, NULL); | |
| 326 | + if (!pdev) { | |
| 327 | + edac_dbg(0, "Can't get tolm/tohm\n"); | |
| 328 | + return -ENODEV; | |
| 329 | + } | |
| 330 | + | |
| 331 | + pci_read_config_dword(pdev, 0xD0, ®); | |
| 332 | + skx_tolm = reg; | |
| 333 | + pci_read_config_dword(pdev, 0xD4, ®); | |
| 334 | + skx_tohm = reg; | |
| 335 | + pci_read_config_dword(pdev, 0xD8, ®); | |
| 336 | + skx_tohm |= (u64)reg << 32; | |
| 337 | + | |
| 338 | + pci_dev_put(pdev); | |
| 339 | + edac_dbg(2, "tolm=%llx tohm=%llx\n", skx_tolm, skx_tohm); | |
| 340 | + | |
| 341 | + return 0; | |
| 342 | +} | |
| 343 | + | |
| 344 | +static int get_dimm_info(u32 mtr, u32 amap, struct dimm_info *dimm, | |
| 345 | + struct skx_imc *imc, int chan, int dimmno) | |
| 346 | +{ | |
| 347 | + int banks = 16, ranks, rows, cols, npages; | |
| 348 | + u64 size; | |
| 349 | + | |
| 350 | + if (!IS_DIMM_PRESENT(mtr)) | |
| 351 | + return 0; | |
| 352 | + ranks = numrank(mtr); | |
| 353 | + rows = numrow(mtr); | |
| 354 | + cols = numcol(mtr); | |
| 355 | + | |
| 356 | + /* | |
| 357 | + * Compute size in 8-byte (2^3) words, then shift to MiB (2^20) | |
| 358 | + */ | |
| 359 | + size = ((1ull << (rows + cols + ranks)) * banks) >> (20 - 3); | |
| 360 | + npages = MiB_TO_PAGES(size); | |
| 361 | + | |
| 362 | + edac_dbg(0, "mc#%d: channel %d, dimm %d, %lld Mb (%d pages) bank: %d, rank: %d, row: %#x, col: %#x\n", | |
| 363 | + imc->mc, chan, dimmno, size, npages, | |
| 364 | + banks, ranks, rows, cols); | |
| 365 | + | |
| 366 | + imc->chan[chan].dimms[dimmno].close_pg = GET_BITFIELD(mtr, 0, 0); | |
| 367 | + imc->chan[chan].dimms[dimmno].bank_xor_enable = GET_BITFIELD(mtr, 9, 9); | |
| 368 | + imc->chan[chan].dimms[dimmno].fine_grain_bank = GET_BITFIELD(amap, 0, 0); | |
| 369 | + imc->chan[chan].dimms[dimmno].rowbits = rows; | |
| 370 | + imc->chan[chan].dimms[dimmno].colbits = cols; | |
| 371 | + | |
| 372 | + dimm->nr_pages = npages; | |
| 373 | + dimm->grain = 32; | |
| 374 | + dimm->dtype = get_width(mtr); | |
| 375 | + dimm->mtype = MEM_DDR4; | |
| 376 | + dimm->edac_mode = EDAC_SECDED; /* likely better than this */ | |
| 377 | + snprintf(dimm->label, sizeof(dimm->label), "CPU_SrcID#%u_MC#%u_Chan#%u_DIMM#%u", | |
| 378 | + imc->src_id, imc->lmc, chan, dimmno); | |
| 379 | + | |
| 380 | + return 1; | |
| 381 | +} | |
| 382 | + | |
| 383 | +#define SKX_GET_MTMTR(dev, reg) \ | |
| 384 | + pci_read_config_dword((dev), 0x87c, ®) | |
| 385 | + | |
| 386 | +static bool skx_check_ecc(struct pci_dev *pdev) | |
| 387 | +{ | |
| 388 | + u32 mtmtr; | |
| 389 | + | |
| 390 | + SKX_GET_MTMTR(pdev, mtmtr); | |
| 391 | + | |
| 392 | + return !!GET_BITFIELD(mtmtr, 2, 2); | |
| 393 | +} | |
| 394 | + | |
| 395 | +static int skx_get_dimm_config(struct mem_ctl_info *mci) | |
| 396 | +{ | |
| 397 | + struct skx_pvt *pvt = mci->pvt_info; | |
| 398 | + struct skx_imc *imc = pvt->imc; | |
| 399 | + struct dimm_info *dimm; | |
| 400 | + int i, j; | |
| 401 | + u32 mtr, amap; | |
| 402 | + int ndimms; | |
| 403 | + | |
| 404 | + for (i = 0; i < NUM_CHANNELS; i++) { | |
| 405 | + ndimms = 0; | |
| 406 | + pci_read_config_dword(imc->chan[i].cdev, 0x8C, &amap); | |
| 407 | + for (j = 0; j < NUM_DIMMS; j++) { | |
| 408 | + dimm = EDAC_DIMM_PTR(mci->layers, mci->dimms, | |
| 409 | + mci->n_layers, i, j, 0); | |
| 410 | + pci_read_config_dword(imc->chan[i].cdev, | |
| 411 | + 0x80 + 4*j, &mtr); | |
| 412 | + ndimms += get_dimm_info(mtr, amap, dimm, imc, i, j); | |
| 413 | + } | |
| 414 | + if (ndimms && !skx_check_ecc(imc->chan[0].cdev)) { | |
| 415 | + skx_printk(KERN_ERR, "ECC is disabled on imc %d\n", imc->mc); | |
| 416 | + return -ENODEV; | |
| 417 | + } | |
| 418 | + } | |
| 419 | + | |
| 420 | + return 0; | |
| 421 | +} | |
| 422 | + | |
| 423 | +static void skx_unregister_mci(struct skx_imc *imc) | |
| 424 | +{ | |
| 425 | + struct mem_ctl_info *mci = imc->mci; | |
| 426 | + | |
| 427 | + if (!mci) | |
| 428 | + return; | |
| 429 | + | |
| 430 | + edac_dbg(0, "MC%d: mci = %p\n", imc->mc, mci); | |
| 431 | + | |
| 432 | + /* Remove MC sysfs nodes */ | |
| 433 | + edac_mc_del_mc(mci->pdev); | |
| 434 | + | |
| 435 | + edac_dbg(1, "%s: free mci struct\n", mci->ctl_name); | |
| 436 | + kfree(mci->ctl_name); | |
| 437 | + edac_mc_free(mci); | |
| 438 | +} | |
| 439 | + | |
| 440 | +static int skx_register_mci(struct skx_imc *imc) | |
| 441 | +{ | |
| 442 | + struct mem_ctl_info *mci; | |
| 443 | + struct edac_mc_layer layers[2]; | |
| 444 | + struct pci_dev *pdev = imc->chan[0].cdev; | |
| 445 | + struct skx_pvt *pvt; | |
| 446 | + int rc; | |
| 447 | + | |
| 448 | + /* allocate a new MC control structure */ | |
| 449 | + layers[0].type = EDAC_MC_LAYER_CHANNEL; | |
| 450 | + layers[0].size = NUM_CHANNELS; | |
| 451 | + layers[0].is_virt_csrow = false; | |
| 452 | + layers[1].type = EDAC_MC_LAYER_SLOT; | |
| 453 | + layers[1].size = NUM_DIMMS; | |
| 454 | + layers[1].is_virt_csrow = true; | |
| 455 | + mci = edac_mc_alloc(imc->mc, ARRAY_SIZE(layers), layers, | |
| 456 | + sizeof(struct skx_pvt)); | |
| 457 | + | |
| 458 | + if (unlikely(!mci)) | |
| 459 | + return -ENOMEM; | |
| 460 | + | |
| 461 | + edac_dbg(0, "MC#%d: mci = %p\n", imc->mc, mci); | |
| 462 | + | |
| 463 | + /* Associate skx_dev and mci for future usage */ | |
| 464 | + imc->mci = mci; | |
| 465 | + pvt = mci->pvt_info; | |
| 466 | + pvt->imc = imc; | |
| 467 | + | |
| 468 | + mci->ctl_name = kasprintf(GFP_KERNEL, "Skylake Socket#%d IMC#%d", | |
| 469 | + imc->node_id, imc->lmc); | |
| 470 | + mci->mtype_cap = MEM_FLAG_DDR4; | |
| 471 | + mci->edac_ctl_cap = EDAC_FLAG_NONE; | |
| 472 | + mci->edac_cap = EDAC_FLAG_NONE; | |
| 473 | + mci->mod_name = "skx_edac.c"; | |
| 474 | + mci->dev_name = pci_name(imc->chan[0].cdev); | |
| 475 | + mci->mod_ver = SKX_REVISION; | |
| 476 | + mci->ctl_page_to_phys = NULL; | |
| 477 | + | |
| 478 | + rc = skx_get_dimm_config(mci); | |
| 479 | + if (rc < 0) | |
| 480 | + goto fail; | |
| 481 | + | |
| 482 | + /* record ptr to the generic device */ | |
| 483 | + mci->pdev = &pdev->dev; | |
| 484 | + | |
| 485 | + /* add this new MC control structure to EDAC's list of MCs */ | |
| 486 | + if (unlikely(edac_mc_add_mc(mci))) { | |
| 487 | + edac_dbg(0, "MC: failed edac_mc_add_mc()\n"); | |
| 488 | + rc = -EINVAL; | |
| 489 | + goto fail; | |
| 490 | + } | |
| 491 | + | |
| 492 | + return 0; | |
| 493 | + | |
| 494 | +fail: | |
| 495 | + kfree(mci->ctl_name); | |
| 496 | + edac_mc_free(mci); | |
| 497 | + imc->mci = NULL; | |
| 498 | + return rc; | |
| 499 | +} | |
| 500 | + | |
| 501 | +#define SKX_MAX_SAD 24 | |
| 502 | + | |
| 503 | +#define SKX_GET_SAD(d, i, reg) \ | |
| 504 | + pci_read_config_dword((d)->sad_all, 0x60 + 8 * (i), ®) | |
| 505 | +#define SKX_GET_ILV(d, i, reg) \ | |
| 506 | + pci_read_config_dword((d)->sad_all, 0x64 + 8 * (i), ®) | |
| 507 | + | |
| 508 | +#define SKX_SAD_MOD3MODE(sad) GET_BITFIELD((sad), 30, 31) | |
| 509 | +#define SKX_SAD_MOD3(sad) GET_BITFIELD((sad), 27, 27) | |
| 510 | +#define SKX_SAD_LIMIT(sad) (((u64)GET_BITFIELD((sad), 7, 26) << 26) | MASK26) | |
| 511 | +#define SKX_SAD_MOD3ASMOD2(sad) GET_BITFIELD((sad), 5, 6) | |
| 512 | +#define SKX_SAD_ATTR(sad) GET_BITFIELD((sad), 3, 4) | |
| 513 | +#define SKX_SAD_INTERLEAVE(sad) GET_BITFIELD((sad), 1, 2) | |
| 514 | +#define SKX_SAD_ENABLE(sad) GET_BITFIELD((sad), 0, 0) | |
| 515 | + | |
| 516 | +#define SKX_ILV_REMOTE(tgt) (((tgt) & 8) == 0) | |
| 517 | +#define SKX_ILV_TARGET(tgt) ((tgt) & 7) | |
| 518 | + | |
| 519 | +static bool skx_sad_decode(struct decoded_addr *res) | |
| 520 | +{ | |
| 521 | + struct skx_dev *d = list_first_entry(&skx_edac_list, typeof(*d), list); | |
| 522 | + u64 addr = res->addr; | |
| 523 | + int i, idx, tgt, lchan, shift; | |
| 524 | + u32 sad, ilv; | |
| 525 | + u64 limit, prev_limit; | |
| 526 | + int remote = 0; | |
| 527 | + | |
| 528 | + /* Simple sanity check for I/O space or out of range */ | |
| 529 | + if (addr >= skx_tohm || (addr >= skx_tolm && addr < BIT_ULL(32))) { | |
| 530 | + edac_dbg(0, "Address %llx out of range\n", addr); | |
| 531 | + return false; | |
| 532 | + } | |
| 533 | + | |
| 534 | +restart: | |
| 535 | + prev_limit = 0; | |
| 536 | + for (i = 0; i < SKX_MAX_SAD; i++) { | |
| 537 | + SKX_GET_SAD(d, i, sad); | |
| 538 | + limit = SKX_SAD_LIMIT(sad); | |
| 539 | + if (SKX_SAD_ENABLE(sad)) { | |
| 540 | + if (addr >= prev_limit && addr <= limit) | |
| 541 | + goto sad_found; | |
| 542 | + } | |
| 543 | + prev_limit = limit + 1; | |
| 544 | + } | |
| 545 | + edac_dbg(0, "No SAD entry for %llx\n", addr); | |
| 546 | + return false; | |
| 547 | + | |
| 548 | +sad_found: | |
| 549 | + SKX_GET_ILV(d, i, ilv); | |
| 550 | + | |
| 551 | + switch (SKX_SAD_INTERLEAVE(sad)) { | |
| 552 | + case 0: | |
| 553 | + idx = GET_BITFIELD(addr, 6, 8); | |
| 554 | + break; | |
| 555 | + case 1: | |
| 556 | + idx = GET_BITFIELD(addr, 8, 10); | |
| 557 | + break; | |
| 558 | + case 2: | |
| 559 | + idx = GET_BITFIELD(addr, 12, 14); | |
| 560 | + break; | |
| 561 | + case 3: | |
| 562 | + idx = GET_BITFIELD(addr, 30, 32); | |
| 563 | + break; | |
| 564 | + } | |
| 565 | + | |
| 566 | + tgt = GET_BITFIELD(ilv, 4 * idx, 4 * idx + 3); | |
| 567 | + | |
| 568 | + /* If point to another node, find it and start over */ | |
| 569 | + if (SKX_ILV_REMOTE(tgt)) { | |
| 570 | + if (remote) { | |
| 571 | + edac_dbg(0, "Double remote!\n"); | |
| 572 | + return false; | |
| 573 | + } | |
| 574 | + remote = 1; | |
| 575 | + list_for_each_entry(d, &skx_edac_list, list) { | |
| 576 | + if (d->imc[0].src_id == SKX_ILV_TARGET(tgt)) | |
| 577 | + goto restart; | |
| 578 | + } | |
| 579 | + edac_dbg(0, "Can't find node %d\n", SKX_ILV_TARGET(tgt)); | |
| 580 | + return false; | |
| 581 | + } | |
| 582 | + | |
| 583 | + if (SKX_SAD_MOD3(sad) == 0) | |
| 584 | + lchan = SKX_ILV_TARGET(tgt); | |
| 585 | + else { | |
| 586 | + switch (SKX_SAD_MOD3MODE(sad)) { | |
| 587 | + case 0: | |
| 588 | + shift = 6; | |
| 589 | + break; | |
| 590 | + case 1: | |
| 591 | + shift = 8; | |
| 592 | + break; | |
| 593 | + case 2: | |
| 594 | + shift = 12; | |
| 595 | + break; | |
| 596 | + default: | |
| 597 | + edac_dbg(0, "illegal mod3mode\n"); | |
| 598 | + return false; | |
| 599 | + } | |
| 600 | + switch (SKX_SAD_MOD3ASMOD2(sad)) { | |
| 601 | + case 0: | |
| 602 | + lchan = (addr >> shift) % 3; | |
| 603 | + break; | |
| 604 | + case 1: | |
| 605 | + lchan = (addr >> shift) % 2; | |
| 606 | + break; | |
| 607 | + case 2: | |
| 608 | + lchan = (addr >> shift) % 2; | |
| 609 | + lchan = (lchan << 1) | ~lchan; | |
| 610 | + break; | |
| 611 | + case 3: | |
| 612 | + lchan = ((addr >> shift) % 2) << 1; | |
| 613 | + break; | |
| 614 | + } | |
| 615 | + lchan = (lchan << 1) | (SKX_ILV_TARGET(tgt) & 1); | |
| 616 | + } | |
| 617 | + | |
| 618 | + res->dev = d; | |
| 619 | + res->socket = d->imc[0].src_id; | |
| 620 | + res->imc = GET_BITFIELD(d->mcroute, lchan * 3, lchan * 3 + 2); | |
| 621 | + res->channel = GET_BITFIELD(d->mcroute, lchan * 2 + 18, lchan * 2 + 19); | |
| 622 | + | |
| 623 | + edac_dbg(2, "%llx: socket=%d imc=%d channel=%d\n", | |
| 624 | + res->addr, res->socket, res->imc, res->channel); | |
| 625 | + return true; | |
| 626 | +} | |
| 627 | + | |
| 628 | +#define SKX_MAX_TAD 8 | |
| 629 | + | |
| 630 | +#define SKX_GET_TADBASE(d, mc, i, reg) \ | |
| 631 | + pci_read_config_dword((d)->imc[mc].chan[0].cdev, 0x850 + 4 * (i), ®) | |
| 632 | +#define SKX_GET_TADWAYNESS(d, mc, i, reg) \ | |
| 633 | + pci_read_config_dword((d)->imc[mc].chan[0].cdev, 0x880 + 4 * (i), ®) | |
| 634 | +#define SKX_GET_TADCHNILVOFFSET(d, mc, ch, i, reg) \ | |
| 635 | + pci_read_config_dword((d)->imc[mc].chan[ch].cdev, 0x90 + 4 * (i), ®) | |
| 636 | + | |
| 637 | +#define SKX_TAD_BASE(b) ((u64)GET_BITFIELD((b), 12, 31) << 26) | |
| 638 | +#define SKX_TAD_SKT_GRAN(b) GET_BITFIELD((b), 4, 5) | |
| 639 | +#define SKX_TAD_CHN_GRAN(b) GET_BITFIELD((b), 6, 7) | |
| 640 | +#define SKX_TAD_LIMIT(b) (((u64)GET_BITFIELD((b), 12, 31) << 26) | MASK26) | |
| 641 | +#define SKX_TAD_OFFSET(b) ((u64)GET_BITFIELD((b), 4, 23) << 26) | |
| 642 | +#define SKX_TAD_SKTWAYS(b) (1 << GET_BITFIELD((b), 10, 11)) | |
| 643 | +#define SKX_TAD_CHNWAYS(b) (GET_BITFIELD((b), 8, 9) + 1) | |
| 644 | + | |
| 645 | +/* which bit used for both socket and channel interleave */ | |
| 646 | +static int skx_granularity[] = { 6, 8, 12, 30 }; | |
| 647 | + | |
| 648 | +static u64 skx_do_interleave(u64 addr, int shift, int ways, u64 lowbits) | |
| 649 | +{ | |
| 650 | + addr >>= shift; | |
| 651 | + addr /= ways; | |
| 652 | + addr <<= shift; | |
| 653 | + | |
| 654 | + return addr | (lowbits & ((1ull << shift) - 1)); | |
| 655 | +} | |
| 656 | + | |
| 657 | +static bool skx_tad_decode(struct decoded_addr *res) | |
| 658 | +{ | |
| 659 | + int i; | |
| 660 | + u32 base, wayness, chnilvoffset; | |
| 661 | + int skt_interleave_bit, chn_interleave_bit; | |
| 662 | + u64 channel_addr; | |
| 663 | + | |
| 664 | + for (i = 0; i < SKX_MAX_TAD; i++) { | |
| 665 | + SKX_GET_TADBASE(res->dev, res->imc, i, base); | |
| 666 | + SKX_GET_TADWAYNESS(res->dev, res->imc, i, wayness); | |
| 667 | + if (SKX_TAD_BASE(base) <= res->addr && res->addr <= SKX_TAD_LIMIT(wayness)) | |
| 668 | + goto tad_found; | |
| 669 | + } | |
| 670 | + edac_dbg(0, "No TAD entry for %llx\n", res->addr); | |
| 671 | + return false; | |
| 672 | + | |
| 673 | +tad_found: | |
| 674 | + res->sktways = SKX_TAD_SKTWAYS(wayness); | |
| 675 | + res->chanways = SKX_TAD_CHNWAYS(wayness); | |
| 676 | + skt_interleave_bit = skx_granularity[SKX_TAD_SKT_GRAN(base)]; | |
| 677 | + chn_interleave_bit = skx_granularity[SKX_TAD_CHN_GRAN(base)]; | |
| 678 | + | |
| 679 | + SKX_GET_TADCHNILVOFFSET(res->dev, res->imc, res->channel, i, chnilvoffset); | |
| 680 | + channel_addr = res->addr - SKX_TAD_OFFSET(chnilvoffset); | |
| 681 | + | |
| 682 | + if (res->chanways == 3 && skt_interleave_bit > chn_interleave_bit) { | |
| 683 | + /* Must handle channel first, then socket */ | |
| 684 | + channel_addr = skx_do_interleave(channel_addr, chn_interleave_bit, | |
| 685 | + res->chanways, channel_addr); | |
| 686 | + channel_addr = skx_do_interleave(channel_addr, skt_interleave_bit, | |
| 687 | + res->sktways, channel_addr); | |
| 688 | + } else { | |
| 689 | + /* Handle socket then channel. Preserve low bits from original address */ | |
| 690 | + channel_addr = skx_do_interleave(channel_addr, skt_interleave_bit, | |
| 691 | + res->sktways, res->addr); | |
| 692 | + channel_addr = skx_do_interleave(channel_addr, chn_interleave_bit, | |
| 693 | + res->chanways, res->addr); | |
| 694 | + } | |
| 695 | + | |
| 696 | + res->chan_addr = channel_addr; | |
| 697 | + | |
| 698 | + edac_dbg(2, "%llx: chan_addr=%llx sktways=%d chanways=%d\n", | |
| 699 | + res->addr, res->chan_addr, res->sktways, res->chanways); | |
| 700 | + return true; | |
| 701 | +} | |
| 702 | + | |
| 703 | +#define SKX_MAX_RIR 4 | |
| 704 | + | |
| 705 | +#define SKX_GET_RIRWAYNESS(d, mc, ch, i, reg) \ | |
| 706 | + pci_read_config_dword((d)->imc[mc].chan[ch].cdev, \ | |
| 707 | + 0x108 + 4 * (i), ®) | |
| 708 | +#define SKX_GET_RIRILV(d, mc, ch, idx, i, reg) \ | |
| 709 | + pci_read_config_dword((d)->imc[mc].chan[ch].cdev, \ | |
| 710 | + 0x120 + 16 * idx + 4 * (i), ®) | |
| 711 | + | |
| 712 | +#define SKX_RIR_VALID(b) GET_BITFIELD((b), 31, 31) | |
| 713 | +#define SKX_RIR_LIMIT(b) (((u64)GET_BITFIELD((b), 1, 11) << 29) | MASK29) | |
| 714 | +#define SKX_RIR_WAYS(b) (1 << GET_BITFIELD((b), 28, 29)) | |
| 715 | +#define SKX_RIR_CHAN_RANK(b) GET_BITFIELD((b), 16, 19) | |
| 716 | +#define SKX_RIR_OFFSET(b) ((u64)(GET_BITFIELD((b), 2, 15) << 26)) | |
| 717 | + | |
| 718 | +static bool skx_rir_decode(struct decoded_addr *res) | |
| 719 | +{ | |
| 720 | + int i, idx, chan_rank; | |
| 721 | + int shift; | |
| 722 | + u32 rirway, rirlv; | |
| 723 | + u64 rank_addr, prev_limit = 0, limit; | |
| 724 | + | |
| 725 | + if (res->dev->imc[res->imc].chan[res->channel].dimms[0].close_pg) | |
| 726 | + shift = 6; | |
| 727 | + else | |
| 728 | + shift = 13; | |
| 729 | + | |
| 730 | + for (i = 0; i < SKX_MAX_RIR; i++) { | |
| 731 | + SKX_GET_RIRWAYNESS(res->dev, res->imc, res->channel, i, rirway); | |
| 732 | + limit = SKX_RIR_LIMIT(rirway); | |
| 733 | + if (SKX_RIR_VALID(rirway)) { | |
| 734 | + if (prev_limit <= res->chan_addr && | |
| 735 | + res->chan_addr <= limit) | |
| 736 | + goto rir_found; | |
| 737 | + } | |
| 738 | + prev_limit = limit; | |
| 739 | + } | |
| 740 | + edac_dbg(0, "No RIR entry for %llx\n", res->addr); | |
| 741 | + return false; | |
| 742 | + | |
| 743 | +rir_found: | |
| 744 | + rank_addr = res->chan_addr >> shift; | |
| 745 | + rank_addr /= SKX_RIR_WAYS(rirway); | |
| 746 | + rank_addr <<= shift; | |
| 747 | + rank_addr |= res->chan_addr & GENMASK_ULL(shift - 1, 0); | |
| 748 | + | |
| 749 | + res->rank_address = rank_addr; | |
| 750 | + idx = (res->chan_addr >> shift) % SKX_RIR_WAYS(rirway); | |
| 751 | + | |
| 752 | + SKX_GET_RIRILV(res->dev, res->imc, res->channel, idx, i, rirlv); | |
| 753 | + res->rank_address = rank_addr - SKX_RIR_OFFSET(rirlv); | |
| 754 | + chan_rank = SKX_RIR_CHAN_RANK(rirlv); | |
| 755 | + res->channel_rank = chan_rank; | |
| 756 | + res->dimm = chan_rank / 4; | |
| 757 | + res->rank = chan_rank % 4; | |
| 758 | + | |
| 759 | + edac_dbg(2, "%llx: dimm=%d rank=%d chan_rank=%d rank_addr=%llx\n", | |
| 760 | + res->addr, res->dimm, res->rank, | |
| 761 | + res->channel_rank, res->rank_address); | |
| 762 | + return true; | |
| 763 | +} | |
| 764 | + | |
| 765 | +static u8 skx_close_row[] = { | |
| 766 | + 15, 16, 17, 18, 20, 21, 22, 28, 10, 11, 12, 13, 29, 30, 31, 32, 33 | |
| 767 | +}; | |
| 768 | +static u8 skx_close_column[] = { | |
| 769 | + 3, 4, 5, 14, 19, 23, 24, 25, 26, 27 | |
| 770 | +}; | |
| 771 | +static u8 skx_open_row[] = { | |
| 772 | + 14, 15, 16, 20, 28, 21, 22, 23, 24, 25, 26, 27, 29, 30, 31, 32, 33 | |
| 773 | +}; | |
| 774 | +static u8 skx_open_column[] = { | |
| 775 | + 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 | |
| 776 | +}; | |
| 777 | +static u8 skx_open_fine_column[] = { | |
| 778 | + 3, 4, 5, 7, 8, 9, 10, 11, 12, 13 | |
| 779 | +}; | |
| 780 | + | |
| 781 | +static int skx_bits(u64 addr, int nbits, u8 *bits) | |
| 782 | +{ | |
| 783 | + int i, res = 0; | |
| 784 | + | |
| 785 | + for (i = 0; i < nbits; i++) | |
| 786 | + res |= ((addr >> bits[i]) & 1) << i; | |
| 787 | + return res; | |
| 788 | +} | |
| 789 | + | |
| 790 | +static int skx_bank_bits(u64 addr, int b0, int b1, int do_xor, int x0, int x1) | |
| 791 | +{ | |
| 792 | + int ret = GET_BITFIELD(addr, b0, b0) | (GET_BITFIELD(addr, b1, b1) << 1); | |
| 793 | + | |
| 794 | + if (do_xor) | |
| 795 | + ret ^= GET_BITFIELD(addr, x0, x0) | (GET_BITFIELD(addr, x1, x1) << 1); | |
| 796 | + | |
| 797 | + return ret; | |
| 798 | +} | |
| 799 | + | |
| 800 | +static bool skx_mad_decode(struct decoded_addr *r) | |
| 801 | +{ | |
| 802 | + struct skx_dimm *dimm = &r->dev->imc[r->imc].chan[r->channel].dimms[r->dimm]; | |
| 803 | + int bg0 = dimm->fine_grain_bank ? 6 : 13; | |
| 804 | + | |
| 805 | + if (dimm->close_pg) { | |
| 806 | + r->row = skx_bits(r->rank_address, dimm->rowbits, skx_close_row); | |
| 807 | + r->column = skx_bits(r->rank_address, dimm->colbits, skx_close_column); | |
| 808 | + r->column |= 0x400; /* C10 is autoprecharge, always set */ | |
| 809 | + r->bank_address = skx_bank_bits(r->rank_address, 8, 9, dimm->bank_xor_enable, 22, 28); | |
| 810 | + r->bank_group = skx_bank_bits(r->rank_address, 6, 7, dimm->bank_xor_enable, 20, 21); | |
| 811 | + } else { | |
| 812 | + r->row = skx_bits(r->rank_address, dimm->rowbits, skx_open_row); | |
| 813 | + if (dimm->fine_grain_bank) | |
| 814 | + r->column = skx_bits(r->rank_address, dimm->colbits, skx_open_fine_column); | |
| 815 | + else | |
| 816 | + r->column = skx_bits(r->rank_address, dimm->colbits, skx_open_column); | |
| 817 | + r->bank_address = skx_bank_bits(r->rank_address, 18, 19, dimm->bank_xor_enable, 22, 23); | |
| 818 | + r->bank_group = skx_bank_bits(r->rank_address, bg0, 17, dimm->bank_xor_enable, 20, 21); | |
| 819 | + } | |
| 820 | + r->row &= (1u << dimm->rowbits) - 1; | |
| 821 | + | |
| 822 | + edac_dbg(2, "%llx: row=%x col=%x bank_addr=%d bank_group=%d\n", | |
| 823 | + r->addr, r->row, r->column, r->bank_address, | |
| 824 | + r->bank_group); | |
| 825 | + return true; | |
| 826 | +} | |
| 827 | + | |
| 828 | +static bool skx_decode(struct decoded_addr *res) | |
| 829 | +{ | |
| 830 | + | |
| 831 | + return skx_sad_decode(res) && skx_tad_decode(res) && | |
| 832 | + skx_rir_decode(res) && skx_mad_decode(res); | |
| 833 | +} | |
| 834 | + | |
| 835 | +#ifdef CONFIG_EDAC_DEBUG | |
| 836 | +/* | |
| 837 | + * Debug feature. Make /sys/kernel/debug/skx_edac_test/addr. | |
| 838 | + * Write an address to this file to exercise the address decode | |
| 839 | + * logic in this driver. | |
| 840 | + */ | |
| 841 | +static struct dentry *skx_test; | |
| 842 | +static u64 skx_fake_addr; | |
| 843 | + | |
| 844 | +static int debugfs_u64_set(void *data, u64 val) | |
| 845 | +{ | |
| 846 | + struct decoded_addr res; | |
| 847 | + | |
| 848 | + res.addr = val; | |
| 849 | + skx_decode(&res); | |
| 850 | + | |
| 851 | + return 0; | |
| 852 | +} | |
| 853 | + | |
| 854 | +DEFINE_SIMPLE_ATTRIBUTE(fops_u64_wo, NULL, debugfs_u64_set, "%llu\n"); | |
| 855 | + | |
| 856 | +static struct dentry *mydebugfs_create(const char *name, umode_t mode, | |
| 857 | + struct dentry *parent, u64 *value) | |
| 858 | +{ | |
| 859 | + return debugfs_create_file(name, mode, parent, value, &fops_u64_wo); | |
| 860 | +} | |
| 861 | + | |
| 862 | +static void setup_skx_debug(void) | |
| 863 | +{ | |
| 864 | + skx_test = debugfs_create_dir("skx_edac_test", NULL); | |
| 865 | + mydebugfs_create("addr", S_IWUSR, skx_test, &skx_fake_addr); | |
| 866 | +} | |
| 867 | + | |
| 868 | +static void teardown_skx_debug(void) | |
| 869 | +{ | |
| 870 | + debugfs_remove_recursive(skx_test); | |
| 871 | +} | |
| 872 | +#else | |
| 873 | +static void setup_skx_debug(void) | |
| 874 | +{ | |
| 875 | +} | |
| 876 | + | |
| 877 | +static void teardown_skx_debug(void) | |
| 878 | +{ | |
| 879 | +} | |
| 880 | +#endif /*CONFIG_EDAC_DEBUG*/ | |
| 881 | + | |
| 882 | +static void skx_mce_output_error(struct mem_ctl_info *mci, | |
| 883 | + const struct mce *m, | |
| 884 | + struct decoded_addr *res) | |
| 885 | +{ | |
| 886 | + enum hw_event_mc_err_type tp_event; | |
| 887 | + char *type, *optype, msg[256]; | |
| 888 | + bool ripv = GET_BITFIELD(m->mcgstatus, 0, 0); | |
| 889 | + bool overflow = GET_BITFIELD(m->status, 62, 62); | |
| 890 | + bool uncorrected_error = GET_BITFIELD(m->status, 61, 61); | |
| 891 | + bool recoverable; | |
| 892 | + u32 core_err_cnt = GET_BITFIELD(m->status, 38, 52); | |
| 893 | + u32 mscod = GET_BITFIELD(m->status, 16, 31); | |
| 894 | + u32 errcode = GET_BITFIELD(m->status, 0, 15); | |
| 895 | + u32 optypenum = GET_BITFIELD(m->status, 4, 6); | |
| 896 | + | |
| 897 | + recoverable = GET_BITFIELD(m->status, 56, 56); | |
| 898 | + | |
| 899 | + if (uncorrected_error) { | |
| 900 | + if (ripv) { | |
| 901 | + type = "FATAL"; | |
| 902 | + tp_event = HW_EVENT_ERR_FATAL; | |
| 903 | + } else { | |
| 904 | + type = "NON_FATAL"; | |
| 905 | + tp_event = HW_EVENT_ERR_UNCORRECTED; | |
| 906 | + } | |
| 907 | + } else { | |
| 908 | + type = "CORRECTED"; | |
| 909 | + tp_event = HW_EVENT_ERR_CORRECTED; | |
| 910 | + } | |
| 911 | + | |
| 912 | + /* | |
| 913 | + * According with Table 15-9 of the Intel Architecture spec vol 3A, | |
| 914 | + * memory errors should fit in this mask: | |
| 915 | + * 000f 0000 1mmm cccc (binary) | |
| 916 | + * where: | |
| 917 | + * f = Correction Report Filtering Bit. If 1, subsequent errors | |
| 918 | + * won't be shown | |
| 919 | + * mmm = error type | |
| 920 | + * cccc = channel | |
| 921 | + * If the mask doesn't match, report an error to the parsing logic | |
| 922 | + */ | |
| 923 | + if (!((errcode & 0xef80) == 0x80)) { | |
| 924 | + optype = "Can't parse: it is not a mem"; | |
| 925 | + } else { | |
| 926 | + switch (optypenum) { | |
| 927 | + case 0: | |
| 928 | + optype = "generic undef request error"; | |
| 929 | + break; | |
| 930 | + case 1: | |
| 931 | + optype = "memory read error"; | |
| 932 | + break; | |
| 933 | + case 2: | |
| 934 | + optype = "memory write error"; | |
| 935 | + break; | |
| 936 | + case 3: | |
| 937 | + optype = "addr/cmd error"; | |
| 938 | + break; | |
| 939 | + case 4: | |
| 940 | + optype = "memory scrubbing error"; | |
| 941 | + break; | |
| 942 | + default: | |
| 943 | + optype = "reserved"; | |
| 944 | + break; | |
| 945 | + } | |
| 946 | + } | |
| 947 | + | |
| 948 | + snprintf(msg, sizeof(msg), | |
| 949 | + "%s%s err_code:%04x:%04x socket:%d imc:%d rank:%d bg:%d ba:%d row:%x col:%x", | |
| 950 | + overflow ? " OVERFLOW" : "", | |
| 951 | + (uncorrected_error && recoverable) ? " recoverable" : "", | |
| 952 | + mscod, errcode, | |
| 953 | + res->socket, res->imc, res->rank, | |
| 954 | + res->bank_group, res->bank_address, res->row, res->column); | |
| 955 | + | |
| 956 | + edac_dbg(0, "%s\n", msg); | |
| 957 | + | |
| 958 | + /* Call the helper to output message */ | |
| 959 | + edac_mc_handle_error(tp_event, mci, core_err_cnt, | |
| 960 | + m->addr >> PAGE_SHIFT, m->addr & ~PAGE_MASK, 0, | |
| 961 | + res->channel, res->dimm, -1, | |
| 962 | + optype, msg); | |
| 963 | +} | |
| 964 | + | |
| 965 | +static int skx_mce_check_error(struct notifier_block *nb, unsigned long val, | |
| 966 | + void *data) | |
| 967 | +{ | |
| 968 | + struct mce *mce = (struct mce *)data; | |
| 969 | + struct decoded_addr res; | |
| 970 | + struct mem_ctl_info *mci; | |
| 971 | + char *type; | |
| 972 | + | |
| 973 | + if (get_edac_report_status() == EDAC_REPORTING_DISABLED) | |
| 974 | + return NOTIFY_DONE; | |
| 975 | + | |
| 976 | + /* ignore unless this is memory related with an address */ | |
| 977 | + if ((mce->status & 0xefff) >> 7 != 1 || !(mce->status & MCI_STATUS_ADDRV)) | |
| 978 | + return NOTIFY_DONE; | |
| 979 | + | |
| 980 | + res.addr = mce->addr; | |
| 981 | + if (!skx_decode(&res)) | |
| 982 | + return NOTIFY_DONE; | |
| 983 | + mci = res.dev->imc[res.imc].mci; | |
| 984 | + | |
| 985 | + if (mce->mcgstatus & MCG_STATUS_MCIP) | |
| 986 | + type = "Exception"; | |
| 987 | + else | |
| 988 | + type = "Event"; | |
| 989 | + | |
| 990 | + skx_mc_printk(mci, KERN_DEBUG, "HANDLING MCE MEMORY ERROR\n"); | |
| 991 | + | |
| 992 | + skx_mc_printk(mci, KERN_DEBUG, "CPU %d: Machine Check %s: %Lx " | |
| 993 | + "Bank %d: %016Lx\n", mce->extcpu, type, | |
| 994 | + mce->mcgstatus, mce->bank, mce->status); | |
| 995 | + skx_mc_printk(mci, KERN_DEBUG, "TSC %llx ", mce->tsc); | |
| 996 | + skx_mc_printk(mci, KERN_DEBUG, "ADDR %llx ", mce->addr); | |
| 997 | + skx_mc_printk(mci, KERN_DEBUG, "MISC %llx ", mce->misc); | |
| 998 | + | |
| 999 | + skx_mc_printk(mci, KERN_DEBUG, "PROCESSOR %u:%x TIME %llu SOCKET " | |
| 1000 | + "%u APIC %x\n", mce->cpuvendor, mce->cpuid, | |
| 1001 | + mce->time, mce->socketid, mce->apicid); | |
| 1002 | + | |
| 1003 | + skx_mce_output_error(mci, mce, &res); | |
| 1004 | + | |
| 1005 | + return NOTIFY_DONE; | |
| 1006 | +} | |
| 1007 | + | |
| 1008 | +static struct notifier_block skx_mce_dec = { | |
| 1009 | + .notifier_call = skx_mce_check_error, | |
| 1010 | +}; | |
| 1011 | + | |
| 1012 | +static void skx_remove(void) | |
| 1013 | +{ | |
| 1014 | + int i, j; | |
| 1015 | + struct skx_dev *d, *tmp; | |
| 1016 | + | |
| 1017 | + edac_dbg(0, "\n"); | |
| 1018 | + | |
| 1019 | + list_for_each_entry_safe(d, tmp, &skx_edac_list, list) { | |
| 1020 | + list_del(&d->list); | |
| 1021 | + for (i = 0; i < NUM_IMC; i++) { | |
| 1022 | + skx_unregister_mci(&d->imc[i]); | |
| 1023 | + for (j = 0; j < NUM_CHANNELS; j++) | |
| 1024 | + pci_dev_put(d->imc[i].chan[j].cdev); | |
| 1025 | + } | |
| 1026 | + pci_dev_put(d->util_all); | |
| 1027 | + pci_dev_put(d->sad_all); | |
| 1028 | + | |
| 1029 | + kfree(d); | |
| 1030 | + } | |
| 1031 | +} | |
| 1032 | + | |
| 1033 | +/* | |
| 1034 | + * skx_init: | |
| 1035 | + * make sure we are running on the correct cpu model | |
| 1036 | + * search for all the devices we need | |
| 1037 | + * check which DIMMs are present. | |
| 1038 | + */ | |
| 1039 | +int __init skx_init(void) | |
| 1040 | +{ | |
| 1041 | + const struct x86_cpu_id *id; | |
| 1042 | + const struct munit *m; | |
| 1043 | + int rc = 0, i; | |
| 1044 | + u8 mc = 0, src_id, node_id; | |
| 1045 | + struct skx_dev *d; | |
| 1046 | + | |
| 1047 | + edac_dbg(2, "\n"); | |
| 1048 | + | |
| 1049 | + id = x86_match_cpu(skx_cpuids); | |
| 1050 | + if (!id) | |
| 1051 | + return -ENODEV; | |
| 1052 | + | |
| 1053 | + rc = skx_get_hi_lo(); | |
| 1054 | + if (rc) | |
| 1055 | + return rc; | |
| 1056 | + | |
| 1057 | + rc = get_all_bus_mappings(); | |
| 1058 | + if (rc < 0) | |
| 1059 | + goto fail; | |
| 1060 | + if (rc == 0) { | |
| 1061 | + edac_dbg(2, "No memory controllers found\n"); | |
| 1062 | + return -ENODEV; | |
| 1063 | + } | |
| 1064 | + | |
| 1065 | + for (m = skx_all_munits; m->did; m++) { | |
| 1066 | + rc = get_all_munits(m); | |
| 1067 | + if (rc < 0) | |
| 1068 | + goto fail; | |
| 1069 | + if (rc != m->per_socket * skx_num_sockets) { | |
| 1070 | + edac_dbg(2, "Expected %d, got %d of %x\n", | |
| 1071 | + m->per_socket * skx_num_sockets, rc, m->did); | |
| 1072 | + rc = -ENODEV; | |
| 1073 | + goto fail; | |
| 1074 | + } | |
| 1075 | + } | |
| 1076 | + | |
| 1077 | + list_for_each_entry(d, &skx_edac_list, list) { | |
| 1078 | + src_id = get_src_id(d); | |
| 1079 | + node_id = skx_get_node_id(d); | |
| 1080 | + edac_dbg(2, "src_id=%d node_id=%d\n", src_id, node_id); | |
| 1081 | + for (i = 0; i < NUM_IMC; i++) { | |
| 1082 | + d->imc[i].mc = mc++; | |
| 1083 | + d->imc[i].lmc = i; | |
| 1084 | + d->imc[i].src_id = src_id; | |
| 1085 | + d->imc[i].node_id = node_id; | |
| 1086 | + rc = skx_register_mci(&d->imc[i]); | |
| 1087 | + if (rc < 0) | |
| 1088 | + goto fail; | |
| 1089 | + } | |
| 1090 | + } | |
| 1091 | + | |
| 1092 | + /* Ensure that the OPSTATE is set correctly for POLL or NMI */ | |
| 1093 | + opstate_init(); | |
| 1094 | + | |
| 1095 | + setup_skx_debug(); | |
| 1096 | + | |
| 1097 | + mce_register_decode_chain(&skx_mce_dec); | |
| 1098 | + | |
| 1099 | + return 0; | |
| 1100 | +fail: | |
| 1101 | + skx_remove(); | |
| 1102 | + return rc; | |
| 1103 | +} | |
| 1104 | + | |
| 1105 | +static void __exit skx_exit(void) | |
| 1106 | +{ | |
| 1107 | + edac_dbg(2, "\n"); | |
| 1108 | + mce_unregister_decode_chain(&skx_mce_dec); | |
| 1109 | + skx_remove(); | |
| 1110 | + teardown_skx_debug(); | |
| 1111 | +} | |
| 1112 | + | |
| 1113 | +module_init(skx_init); | |
| 1114 | +module_exit(skx_exit); | |
| 1115 | + | |
| 1116 | +module_param(edac_op_state, int, 0444); | |
| 1117 | +MODULE_PARM_DESC(edac_op_state, "EDAC Error Reporting state: 0=Poll,1=NMI"); | |
| 1118 | + | |
| 1119 | +MODULE_LICENSE("GPL v2"); | |
| 1120 | +MODULE_AUTHOR("Tony Luck"); | |
| 1121 | +MODULE_DESCRIPTION("MC Driver for Intel Skylake server processors"); | |
| @@ -709,9 +709,10 @@ static int scpi_probe(struct platform_device *pdev) · 708 unmodified lines | ||
| 709 | 709 | struct mbox_client *cl = &pchan->cl; |
| 710 | 710 | struct device_node *shmem = of_parse_phandle(np, "shmem", idx); |
| 711 | 711 | |
| 712 | − if (of_address_to_resource(shmem, 0, &res)) { | |
| 712 | + ret = of_address_to_resource(shmem, 0, &res); | |
| 713 | + of_node_put(shmem); | |
| 714 | + if (ret) { | |
| 713 | 715 | dev_err(dev, "failed to get SCPI payload mem resource\n"); |
| 714 | − ret = -EINVAL; | |
| 715 | 716 | goto err; |
| 716 | 717 | } |
| 717 | 718 | |
| @@ -229,14 +229,14 @@ static int __init dmi_id_init(void) · 228 unmodified lines | ||
| 229 | 229 | |
| 230 | 230 | ret = device_register(dmi_dev); |
| 231 | 231 | if (ret) |
| 232 | − goto fail_free_dmi_dev; | |
| 232 | + goto fail_put_dmi_dev; | |
| 233 | 233 | |
| 234 | 234 | return 0; |
| 235 | 235 | |
| 236 | −fail_free_dmi_dev: | |
| 237 | − kfree(dmi_dev); | |
| 238 | −fail_class_unregister: | |
| 236 | +fail_put_dmi_dev: | |
| 237 | + put_device(dmi_dev); | |
| 239 | 238 | |
| 239 | +fail_class_unregister: | |
| 240 | 240 | class_unregister(&dmi_class); |
| 241 | 241 | |
| 242 | 242 | return ret; |
| @@ -657,9 +657,12 @@ static int __init fdt_find_uefi_params(unsigned long node, const char *uname, · 656 unmodified lines | ||
| 657 | 657 | } |
| 658 | 658 | |
| 659 | 659 | if (subnode) { |
| 660 | − node = of_get_flat_dt_subnode_by_name(node, subnode); | |
| 661 | − if (node < 0) | |
| 660 | + int err = of_get_flat_dt_subnode_by_name(node, subnode); | |
| 661 | + | |
| 662 | + if (err < 0) | |
| 662 | 663 | return 0; |
| 664 | + | |
| 665 | + node = err; | |
| 663 | 666 | } |
| 664 | 667 | |
| 665 | 668 | return __find_uefi_params(node, info, dt_params[i].params); |
| @@ -41,6 +41,8 @@ static unsigned long __chunk_size = EFI_READ_CHUNK_SIZE; · 40 unmodified lines | ||
| 41 | 41 | #define EFI_ALLOC_ALIGN EFI_PAGE_SIZE |
| 42 | 42 | #endif |
| 43 | 43 | |
| 44 | +#define EFI_MMAP_NR_SLACK_SLOTS 8 | |
| 45 | + | |
| 44 | 46 | struct file_info { |
| 45 | 47 | efi_file_handle_t *handle; |
| 46 | 48 | u64 size; |
| @@ -63,49 +65,62 @@ void efi_printk(efi_system_table_t *sys_table_arg, char *str) · 16 unmodified lines | ||
| 63 | 65 | } |
| 64 | 66 | } |
| 65 | 67 | |
| 68 | +static inline bool mmap_has_headroom(unsigned long buff_size, | |
| 69 | + unsigned long map_size, | |
| 70 | + unsigned long desc_size) | |
| 71 | +{ | |
| 72 | + unsigned long slack = buff_size - map_size; | |
| 73 | + | |
| 74 | + return slack / desc_size >= EFI_MMAP_NR_SLACK_SLOTS; | |
| 75 | +} | |
| 76 | + | |
| 66 | 77 | efi_status_t efi_get_memory_map(efi_system_table_t *sys_table_arg, |
| 67 | − efi_memory_desc_t **map, | |
| 68 | − unsigned long *map_size, | |
| 69 | − unsigned long *desc_size, | |
| 70 | − u32 *desc_ver, | |
| 71 | − unsigned long *key_ptr) | |
| 78 | + struct efi_boot_memmap *map) | |
| 72 | 79 | { |
| 73 | 80 | efi_memory_desc_t *m = NULL; |
| 74 | 81 | efi_status_t status; |
| 75 | 82 | unsigned long key; |
| 76 | 83 | u32 desc_version; |
| 77 | 84 | |
| 78 | − *map_size = sizeof(*m) * 32; | |
| 85 | + *map->desc_size = sizeof(*m); | |
| 86 | + *map->map_size = *map->desc_size * 32; | |
| 87 | + *map->buff_size = *map->map_size; | |
| 79 | 88 | again: |
| 80 | − /* | |
| 81 | − * Add an additional efi_memory_desc_t because we're doing an | |
| 82 | − * allocation which may be in a new descriptor region. | |
| 83 | − */ | |
| 84 | − *map_size += sizeof(*m); | |
| 85 | 89 | status = efi_call_early(allocate_pool, EFI_LOADER_DATA, |
| 86 | − *map_size, (void **)&m); | |
| 90 | + *map->map_size, (void **)&m); | |
| 87 | 91 | if (status != EFI_SUCCESS) |
| 88 | 92 | goto fail; |
| 89 | 93 | |
| 90 | − *desc_size = 0; | |
| 94 | + *map->desc_size = 0; | |
| 91 | 95 | key = 0; |
| 92 | − status = efi_call_early(get_memory_map, map_size, m, | |
| 93 | − &key, desc_size, &desc_version); | |
| 94 | − if (status == EFI_BUFFER_TOO_SMALL) { | |
| 96 | + status = efi_call_early(get_memory_map, map->map_size, m, | |
| 97 | + &key, map->desc_size, &desc_version); | |
| 98 | + if (status == EFI_BUFFER_TOO_SMALL || | |
| 99 | + !mmap_has_headroom(*map->buff_size, *map->map_size, | |
| 100 | + *map->desc_size)) { | |
| 95 | 101 | efi_call_early(free_pool, m); |
| 102 | + /* | |
| 103 | + * Make sure there is some entries of headroom so that the | |
| 104 | + * buffer can be reused for a new map after allocations are | |
| 105 | + * no longer permitted. Its unlikely that the map will grow to | |
| 106 | + * exceed this headroom once we are ready to trigger | |
| 107 | + * ExitBootServices() | |
| 108 | + */ | |
| 109 | + *map->map_size += *map->desc_size * EFI_MMAP_NR_SLACK_SLOTS; | |
| 110 | + *map->buff_size = *map->map_size; | |
| 96 | 111 | goto again; |
| 97 | 112 | } |
| 98 | 113 | |
| 99 | 114 | if (status != EFI_SUCCESS) |
| 100 | 115 | efi_call_early(free_pool, m); |
| 101 | 116 | |
| 102 | − if (key_ptr && status == EFI_SUCCESS) | |
| 103 | − *key_ptr = key; | |
| 104 | − if (desc_ver && status == EFI_SUCCESS) | |
| 105 | − *desc_ver = desc_version; | |
| 117 | + if (map->key_ptr && status == EFI_SUCCESS) | |
| 118 | + *map->key_ptr = key; | |
| 119 | + if (map->desc_ver && status == EFI_SUCCESS) | |
| 120 | + *map->desc_ver = desc_version; | |
| 106 | 121 | |
| 107 | 122 | fail: |
| 108 | − *map = m; | |
| 123 | + *map->map = m; | |
| 109 | 124 | return status; |
| 110 | 125 | } |
| 111 | 126 | |
| @@ -113,13 +128,20 @@ fail: · 1 unmodified line | ||
| 113 | 128 | unsigned long get_dram_base(efi_system_table_t *sys_table_arg) |
| 114 | 129 | { |
| 115 | 130 | efi_status_t status; |
| 116 | − unsigned long map_size; | |
| 131 | + unsigned long map_size, buff_size; | |
| 117 | 132 | unsigned long membase = EFI_ERROR; |
| 118 | 133 | struct efi_memory_map map; |
| 119 | 134 | efi_memory_desc_t *md; |
| 135 | + struct efi_boot_memmap boot_map; | |
| 120 | 136 | |
| 121 | − status = efi_get_memory_map(sys_table_arg, (efi_memory_desc_t **)&map.map, | |
| 122 | − &map_size, &map.desc_size, NULL, NULL); | |
| 137 | + boot_map.map = (efi_memory_desc_t **)&map.map; | |
| 138 | + boot_map.map_size = &map_size; | |
| 139 | + boot_map.desc_size = &map.desc_size; | |
| 140 | + boot_map.desc_ver = NULL; | |
| 141 | + boot_map.key_ptr = NULL; | |
| 142 | + boot_map.buff_size = &buff_size; | |
| 143 | + | |
| 144 | + status = efi_get_memory_map(sys_table_arg, &boot_map); | |
| 123 | 145 | if (status != EFI_SUCCESS) |
| 124 | 146 | return membase; |
| 125 | 147 | |
| @@ -144,15 +166,22 @@ efi_status_t efi_high_alloc(efi_system_table_t *sys_table_arg, · 18 unmodified lines | ||
| 144 | 166 | unsigned long size, unsigned long align, |
| 145 | 167 | unsigned long *addr, unsigned long max) |
| 146 | 168 | { |
| 147 | − unsigned long map_size, desc_size; | |
| 169 | + unsigned long map_size, desc_size, buff_size; | |
| 148 | 170 | efi_memory_desc_t *map; |
| 149 | 171 | efi_status_t status; |
| 150 | 172 | unsigned long nr_pages; |
| 151 | 173 | u64 max_addr = 0; |
| 152 | 174 | int i; |
| 175 | + struct efi_boot_memmap boot_map; | |
| 176 | + | |
| 177 | + boot_map.map = ↦ | |
| 178 | + boot_map.map_size = &map_size; | |
| 179 | + boot_map.desc_size = &desc_size; | |
| 180 | + boot_map.desc_ver = NULL; | |
| 181 | + boot_map.key_ptr = NULL; | |
| 182 | + boot_map.buff_size = &buff_size; | |
| 153 | 183 | |
| 154 | − status = efi_get_memory_map(sys_table_arg, &map, &map_size, &desc_size, | |
| 155 | − NULL, NULL); | |
| 184 | + status = efi_get_memory_map(sys_table_arg, &boot_map); | |
| 156 | 185 | if (status != EFI_SUCCESS) |
| 157 | 186 | goto fail; |
| 158 | 187 | |
| @@ -230,14 +259,21 @@ efi_status_t efi_low_alloc(efi_system_table_t *sys_table_arg, · 71 unmodified lines | ||
| 230 | 259 | unsigned long size, unsigned long align, |
| 231 | 260 | unsigned long *addr) |
| 232 | 261 | { |
| 233 | − unsigned long map_size, desc_size; | |
| 262 | + unsigned long map_size, desc_size, buff_size; | |
| 234 | 263 | efi_memory_desc_t *map; |
| 235 | 264 | efi_status_t status; |
| 236 | 265 | unsigned long nr_pages; |
| 237 | 266 | int i; |
| 267 | + struct efi_boot_memmap boot_map; | |
| 238 | 268 | |
| 239 | − status = efi_get_memory_map(sys_table_arg, &map, &map_size, &desc_size, | |
| 240 | − NULL, NULL); | |
| 269 | + boot_map.map = ↦ | |
| 270 | + boot_map.map_size = &map_size; | |
| 271 | + boot_map.desc_size = &desc_size; | |
| 272 | + boot_map.desc_ver = NULL; | |
| 273 | + boot_map.key_ptr = NULL; | |
| 274 | + boot_map.buff_size = &buff_size; | |
| 275 | + | |
| 276 | + status = efi_get_memory_map(sys_table_arg, &boot_map); | |
| 241 | 277 | if (status != EFI_SUCCESS) |
| 242 | 278 | goto fail; |
| 243 | 279 | |
| @@ -704,3 +740,76 @@ char *efi_convert_cmdline(efi_system_table_t *sys_table_arg, · 460 unmodified lines | ||
| 704 | 740 | *cmd_line_len = options_bytes; |
| 705 | 741 | return (char *)cmdline_addr; |
| 706 | 742 | } |
| 743 | + | |
| 744 | +/* | |
| 745 | + * Handle calling ExitBootServices according to the requirements set out by the | |
| 746 | + * spec. Obtains the current memory map, and returns that info after calling | |
| 747 | + * ExitBootServices. The client must specify a function to perform any | |
| 748 | + * processing of the memory map data prior to ExitBootServices. A client | |
| 749 | + * specific structure may be passed to the function via priv. The client | |
| 750 | + * function may be called multiple times. | |
| 751 | + */ | |
| 752 | +efi_status_t efi_exit_boot_services(efi_system_table_t *sys_table_arg, | |
| 753 | + void *handle, | |
| 754 | + struct efi_boot_memmap *map, | |
| 755 | + void *priv, | |
| 756 | + efi_exit_boot_map_processing priv_func) | |
| 757 | +{ | |
| 758 | + efi_status_t status; | |
| 759 | + | |
| 760 | + status = efi_get_memory_map(sys_table_arg, map); | |
| 761 | + | |
| 762 | + if (status != EFI_SUCCESS) | |
| 763 | + goto fail; | |
| 764 | + | |
| 765 | + status = priv_func(sys_table_arg, map, priv); | |
| 766 | + if (status != EFI_SUCCESS) | |
| 767 | + goto free_map; | |
| 768 | + | |
| 769 | + status = efi_call_early(exit_boot_services, handle, *map->key_ptr); | |
| 770 | + | |
| 771 | + if (status == EFI_INVALID_PARAMETER) { | |
| 772 | + /* | |
| 773 | + * The memory map changed between efi_get_memory_map() and | |
| 774 | + * exit_boot_services(). Per the UEFI Spec v2.6, Section 6.4: | |
| 775 | + * EFI_BOOT_SERVICES.ExitBootServices we need to get the | |
| 776 | + * updated map, and try again. The spec implies one retry | |
| 777 | + * should be sufficent, which is confirmed against the EDK2 | |
| 778 | + * implementation. Per the spec, we can only invoke | |
| 779 | + * get_memory_map() and exit_boot_services() - we cannot alloc | |
| 780 | + * so efi_get_memory_map() cannot be used, and we must reuse | |
| 781 | + * the buffer. For all practical purposes, the headroom in the | |
| 782 | + * buffer should account for any changes in the map so the call | |
| 783 | + * to get_memory_map() is expected to succeed here. | |
| 784 | + */ | |
| 785 | + *map->map_size = *map->buff_size; | |
| 786 | + status = efi_call_early(get_memory_map, | |
| 787 | + map->map_size, | |
| 788 | + *map->map, | |
| 789 | + map->key_ptr, | |
| 790 | + map->desc_size, | |
| 791 | + map->desc_ver); | |
| 792 | + | |
| 793 | + /* exit_boot_services() was called, thus cannot free */ | |
| 794 | + if (status != EFI_SUCCESS) | |
| 795 | + goto fail; | |
| 796 | + | |
| 797 | + status = priv_func(sys_table_arg, map, priv); | |
| 798 | + /* exit_boot_services() was called, thus cannot free */ | |
| 799 | + if (status != EFI_SUCCESS) | |
| 800 | + goto fail; | |
| 801 | + | |
| 802 | + status = efi_call_early(exit_boot_services, handle, *map->key_ptr); | |
| 803 | + } | |
| 804 | + | |
| 805 | + /* exit_boot_services() was called, thus cannot free */ | |
| 806 | + if (status != EFI_SUCCESS) | |
| 807 | + goto fail; | |
| 808 | + | |
| 809 | + return EFI_SUCCESS; | |
| 810 | + | |
| 811 | +free_map: | |
| 812 | + efi_call_early(free_pool, *map->map); | |
| 813 | +fail: | |
| 814 | + return status; | |
| 815 | +} | |
| @@ -152,6 +152,27 @@ fdt_set_fail: · 151 unmodified lines | ||
| 152 | 152 | #define EFI_FDT_ALIGN EFI_PAGE_SIZE |
| 153 | 153 | #endif |
| 154 | 154 | |
| 155 | +struct exit_boot_struct { | |
| 156 | + efi_memory_desc_t *runtime_map; | |
| 157 | + int *runtime_entry_count; | |
| 158 | +}; | |
| 159 | + | |
| 160 | +static efi_status_t exit_boot_func(efi_system_table_t *sys_table_arg, | |
| 161 | + struct efi_boot_memmap *map, | |
| 162 | + void *priv) | |
| 163 | +{ | |
| 164 | + struct exit_boot_struct *p = priv; | |
| 165 | + /* | |
| 166 | + * Update the memory map with virtual addresses. The function will also | |
| 167 | + * populate @runtime_map with copies of just the EFI_MEMORY_RUNTIME | |
| 168 | + * entries so that we can pass it straight to SetVirtualAddressMap() | |
| 169 | + */ | |
| 170 | + efi_get_virtmap(*map->map, *map->map_size, *map->desc_size, | |
| 171 | + p->runtime_map, p->runtime_entry_count); | |
| 172 | + | |
| 173 | + return EFI_SUCCESS; | |
| 174 | +} | |
| 175 | + | |
| 155 | 176 | /* |
| 156 | 177 | * Allocate memory for a new FDT, then add EFI, commandline, and |
| 157 | 178 | * initrd related fields to the FDT. This routine increases the |
| @@ -175,13 +196,22 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, · 17 unmodified lines | ||
| 175 | 196 | unsigned long fdt_addr, |
| 176 | 197 | unsigned long fdt_size) |
| 177 | 198 | { |
| 178 | − unsigned long map_size, desc_size; | |
| 199 | + unsigned long map_size, desc_size, buff_size; | |
| 179 | 200 | u32 desc_ver; |
| 180 | 201 | unsigned long mmap_key; |
| 181 | 202 | efi_memory_desc_t *memory_map, *runtime_map; |
| 182 | 203 | unsigned long new_fdt_size; |
| 183 | 204 | efi_status_t status; |
| 184 | 205 | int runtime_entry_count = 0; |
| 206 | + struct efi_boot_memmap map; | |
| 207 | + struct exit_boot_struct priv; | |
| 208 | + | |
| 209 | + map.map = &runtime_map; | |
| 210 | + map.map_size = &map_size; | |
| 211 | + map.desc_size = &desc_size; | |
| 212 | + map.desc_ver = &desc_ver; | |
| 213 | + map.key_ptr = &mmap_key; | |
| 214 | + map.buff_size = &buff_size; | |
| 185 | 215 | |
| 186 | 216 | /* |
| 187 | 217 | * Get a copy of the current memory map that we will use to prepare |
| @@ -189,8 +219,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, · 1 unmodified line | ||
| 189 | 219 | * subsequent allocations adding entries, since they could not affect |
| 190 | 220 | * the number of EFI_MEMORY_RUNTIME regions. |
| 191 | 221 | */ |
| 192 | − status = efi_get_memory_map(sys_table, &runtime_map, &map_size, | |
| 193 | − &desc_size, &desc_ver, &mmap_key); | |
| 222 | + status = efi_get_memory_map(sys_table, &map); | |
| 194 | 223 | if (status != EFI_SUCCESS) { |
| 195 | 224 | pr_efi_err(sys_table, "Unable to retrieve UEFI memory map.\n"); |
| 196 | 225 | return status; |
| @@ -199,6 +228,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, · 2 unmodified lines | ||
| 199 | 228 | pr_efi(sys_table, |
| 200 | 229 | "Exiting boot services and installing virtual address map...\n"); |
| 201 | 230 | |
| 231 | + map.map = &memory_map; | |
| 202 | 232 | /* |
| 203 | 233 | * Estimate size of new FDT, and allocate memory for it. We |
| 204 | 234 | * will allocate a bigger buffer if this ends up being too |
| @@ -218,8 +248,7 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, · 13 unmodified lines | ||
| 218 | 248 | * we can get the memory map key needed for |
| 219 | 249 | * exit_boot_services(). |
| 220 | 250 | */ |
| 221 | − status = efi_get_memory_map(sys_table, &memory_map, &map_size, | |
| 222 | − &desc_size, &desc_ver, &mmap_key); | |
| 251 | + status = efi_get_memory_map(sys_table, &map); | |
| 223 | 252 | if (status != EFI_SUCCESS) |
| 224 | 253 | goto fail_free_new_fdt; |
| 225 | 254 | |
| @@ -250,16 +279,11 @@ efi_status_t allocate_new_fdt_and_exit_boot(efi_system_table_t *sys_table, · 24 unmodified lines | ||
| 250 | 279 | } |
| 251 | 280 | } |
| 252 | 281 | |
| 253 | − /* | |
| 254 | − * Update the memory map with virtual addresses. The function will also | |
| 255 | − * populate @runtime_map with copies of just the EFI_MEMORY_RUNTIME | |
| 256 | − * entries so that we can pass it straight into SetVirtualAddressMap() | |
| 257 | − */ | |
| 258 | − efi_get_virtmap(memory_map, map_size, desc_size, runtime_map, | |
| 259 | − &runtime_entry_count); | |
| 260 | − | |
| 261 | − /* Now we are ready to exit_boot_services.*/ | |
| 262 | − status = sys_table->boottime->exit_boot_services(handle, mmap_key); | |
| 282 | + sys_table->boottime->free_pool(memory_map); | |
| 283 | + priv.runtime_map = runtime_map; | |
| 284 | + priv.runtime_entry_count = &runtime_entry_count; | |
| 285 | + status = efi_exit_boot_services(sys_table, handle, &map, &priv, | |
| 286 | + exit_boot_func); | |
| 263 | 287 | |
| 264 | 288 | if (status == EFI_SUCCESS) { |
| 265 | 289 | efi_set_virtual_address_map_t *svam; |
| @@ -73,12 +73,20 @@ efi_status_t efi_random_alloc(efi_system_table_t *sys_table_arg, · 72 unmodified lines | ||
| 73 | 73 | unsigned long random_seed) |
| 74 | 74 | { |
| 75 | 75 | unsigned long map_size, desc_size, total_slots = 0, target_slot; |
| 76 | + unsigned long buff_size; | |
| 76 | 77 | efi_status_t status; |
| 77 | 78 | efi_memory_desc_t *memory_map; |
| 78 | 79 | int map_offset; |
| 80 | + struct efi_boot_memmap map; | |
| 79 | 81 | |
| 80 | − status = efi_get_memory_map(sys_table_arg, &memory_map, &map_size, | |
| 81 | − &desc_size, NULL, NULL); | |
| 82 | + map.map = &memory_map; | |
| 83 | + map.map_size = &map_size; | |
| 84 | + map.desc_size = &desc_size; | |
| 85 | + map.desc_ver = NULL; | |
| 86 | + map.key_ptr = NULL; | |
| 87 | + map.buff_size = &buff_size; | |
| 88 | + | |
| 89 | + status = efi_get_memory_map(sys_table_arg, &map); | |
| 82 | 90 | if (status != EFI_SUCCESS) |
| 83 | 91 | return status; |
| 84 | 92 | |
| @@ -50,6 +50,7 @@ config GPIO_DEVRES · 49 unmodified lines | ||
| 50 | 50 | config OF_GPIO |
| 51 | 51 | def_bool y |
| 52 | 52 | depends on OF |
| 53 | + depends on HAS_IOMEM | |
| 53 | 54 | |
| 54 | 55 | config GPIO_ACPI |
| 55 | 56 | def_bool y |
| @@ -188,7 +189,7 @@ config GPIO_EP93XX · 132 unmodified lines | ||
| 188 | 189 | config GPIO_ETRAXFS |
| 189 | 190 | bool "Axis ETRAX FS General I/O" |
| 190 | 191 | depends on CRIS || COMPILE_TEST |
| 191 | − depends on OF | |
| 192 | + depends on OF_GPIO | |
| 192 | 193 | select GPIO_GENERIC |
| 193 | 194 | select GPIOLIB_IRQCHIP |
| 194 | 195 | help |
| @@ -214,7 +215,7 @@ config GPIO_GENERIC_PLATFORM · 19 unmodified lines | ||
| 214 | 215 | |
| 215 | 216 | config GPIO_GRGPIO |
| 216 | 217 | tristate "Aeroflex Gaisler GRGPIO support" |
| 217 | − depends on OF | |
| 218 | + depends on OF_GPIO | |
| 218 | 219 | select GPIO_GENERIC |
| 219 | 220 | select IRQ_DOMAIN |
| 220 | 221 | help |
| @@ -312,7 +313,7 @@ config GPIO_MPC8XXX · 91 unmodified lines | ||
| 312 | 313 | config GPIO_MVEBU |
| 313 | 314 | def_bool y |
| 314 | 315 | depends on PLAT_ORION |
| 315 | − depends on OF | |
| 316 | + depends on OF_GPIO | |
| 316 | 317 | select GENERIC_IRQ_CHIP |
| 317 | 318 | |
| 318 | 319 | config GPIO_MXC |
| @@ -405,7 +406,7 @@ config GPIO_TEGRA · 86 unmodified lines | ||
| 405 | 406 | bool "NVIDIA Tegra GPIO support" |
| 406 | 407 | default ARCH_TEGRA |
| 407 | 408 | depends on ARCH_TEGRA || COMPILE_TEST |
| 408 | − depends on OF | |
| 409 | + depends on OF_GPIO | |
| 409 | 410 | help |
| 410 | 411 | Say yes here to support GPIO pins on NVIDIA Tegra SoCs. |
| 411 | 412 | |
| @@ -1099,7 +1100,7 @@ menu "SPI GPIO expanders" · 687 unmodified lines | ||
| 1099 | 1100 | |
| 1100 | 1101 | config GPIO_74X164 |
| 1101 | 1102 | tristate "74x164 serial-in/parallel-out 8-bits shift register" |
| 1102 | − depends on OF | |
| 1103 | + depends on OF_GPIO | |
| 1103 | 1104 | help |
| 1104 | 1105 | Driver for 74x164 compatible serial-in/parallel-out 8-outputs |
| 1105 | 1106 | shift registers. This driver can be used to provide access |
| @@ -1130,6 +1131,7 @@ menu "SPI or I2C GPIO expanders" · 24 unmodified lines | ||
| 1130 | 1131 | |
| 1131 | 1132 | config GPIO_MCP23S08 |
| 1132 | 1133 | tristate "Microchip MCP23xxx I/O expander" |
| 1134 | + depends on OF_GPIO | |
| 1133 | 1135 | select GPIOLIB_IRQCHIP |
| 1134 | 1136 | help |
| 1135 | 1137 | SPI/I2C driver for Microchip MCP23S08/MCP23S17/MCP23008/MCP23017 |
| @@ -192,6 +192,10 @@ int __max730x_probe(struct max7301 *ts) · 191 unmodified lines | ||
| 192 | 192 | ts->chip.parent = dev; |
| 193 | 193 | ts->chip.owner = THIS_MODULE; |
| 194 | 194 | |
| 195 | + ret = gpiochip_add_data(&ts->chip, ts); | |
| 196 | + if (ret) | |
| 197 | + goto exit_destroy; | |
| 198 | + | |
| 195 | 199 | /* |
| 196 | 200 | * initialize pullups according to platform data and cache the |
| 197 | 201 | * register values for later use. |
| @@ -213,10 +217,6 @@ int __max730x_probe(struct max7301 *ts) · 15 unmodified lines | ||
| 213 | 217 | } |
| 214 | 218 | } |
| 215 | 219 | |
| 216 | − ret = gpiochip_add_data(&ts->chip, ts); | |
| 217 | − if (ret) | |
| 218 | − goto exit_destroy; | |
| 219 | − | |
| 220 | 220 | return ret; |
| 221 | 221 | |
| 222 | 222 | exit_destroy: |
| @@ -564,7 +564,7 @@ static int mcp23s08_probe_one(struct mcp23s08 *mcp, struct device *dev, · 563 unmodified lines | ||
| 564 | 564 | mcp->chip.direction_output = mcp23s08_direction_output; |
| 565 | 565 | mcp->chip.set = mcp23s08_set; |
| 566 | 566 | mcp->chip.dbg_show = mcp23s08_dbg_show; |
| 567 | −#ifdef CONFIG_OF | |
| 567 | +#ifdef CONFIG_OF_GPIO | |
| 568 | 568 | mcp->chip.of_gpio_n_cells = 2; |
| 569 | 569 | mcp->chip.of_node = dev->of_node; |
| 570 | 570 | #endif |
| @@ -155,7 +155,7 @@ static int sa1100_gpio_irqdomain_map(struct irq_domain *d, · 154 unmodified lines | ||
| 155 | 155 | { |
| 156 | 156 | irq_set_chip_and_handler(irq, &sa1100_gpio_irq_chip, |
| 157 | 157 | handle_edge_irq); |
| 158 | − irq_set_noprobe(irq); | |
| 158 | + irq_set_probe(irq); | |
| 159 | 159 | |
| 160 | 160 | return 0; |
| 161 | 161 | } |
| @@ -16,7 +16,6 @@ · 15 unmodified lines | ||
| 16 | 16 | #include <linux/errno.h> |
| 17 | 17 | #include <linux/module.h> |
| 18 | 18 | #include <linux/io.h> |
| 19 | −#include <linux/io-mapping.h> | |
| 20 | 19 | #include <linux/gpio/consumer.h> |
| 21 | 20 | #include <linux/of.h> |
| 22 | 21 | #include <linux/of_address.h> |
| @@ -407,7 +407,6 @@ unsigned amdgpu_fence_count_emitted(struct amdgpu_ring *ring); · 406 unmodified lines | ||
| 407 | 407 | /* |
| 408 | 408 | * BO. |
| 409 | 409 | */ |
| 410 | − | |
| 411 | 410 | struct amdgpu_bo_list_entry { |
| 412 | 411 | struct amdgpu_bo *robj; |
| 413 | 412 | struct ttm_validate_buffer tv; |
| @@ -620,9 +619,9 @@ int amdgpu_gart_table_vram_pin(struct amdgpu_device *adev); · 206 unmodified lines | ||
| 620 | 619 | void amdgpu_gart_table_vram_unpin(struct amdgpu_device *adev); |
| 621 | 620 | int amdgpu_gart_init(struct amdgpu_device *adev); |
| 622 | 621 | void amdgpu_gart_fini(struct amdgpu_device *adev); |
| 623 | −void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, | |
| 622 | +void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, | |
| 624 | 623 | int pages); |
| 625 | −int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, | |
| 624 | +int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, | |
| 626 | 625 | int pages, struct page **pagelist, |
| 627 | 626 | dma_addr_t *dma_addr, uint32_t flags); |
| 628 | 627 | int amdgpu_ttm_recover_gart(struct amdgpu_device *adev); |
| @@ -348,6 +348,19 @@ bool amdgpu_atombios_get_connector_info_from_object_table(struct amdgpu_device * · 347 unmodified lines | ||
| 348 | 348 | (le16_to_cpu(path->usConnObjectId) & |
| 349 | 349 | OBJECT_TYPE_MASK) >> OBJECT_TYPE_SHIFT; |
| 350 | 350 | |
| 351 | + /* Skip TV/CV support */ | |
| 352 | + if ((le16_to_cpu(path->usDeviceTag) == | |
| 353 | + ATOM_DEVICE_TV1_SUPPORT) || | |
| 354 | + (le16_to_cpu(path->usDeviceTag) == | |
| 355 | + ATOM_DEVICE_CV_SUPPORT)) | |
| 356 | + continue; | |
| 357 | + | |
| 358 | + if (con_obj_id >= ARRAY_SIZE(object_connector_convert)) { | |
| 359 | + DRM_ERROR("invalid con_obj_id %d for device tag 0x%04x\n", | |
| 360 | + con_obj_id, le16_to_cpu(path->usDeviceTag)); | |
| 361 | + continue; | |
| 362 | + } | |
| 363 | + | |
| 351 | 364 | connector_type = |
| 352 | 365 | object_connector_convert[con_obj_id]; |
| 353 | 366 | connector_object_id = con_obj_id; |
| @@ -205,16 +205,7 @@ static int amdgpu_atpx_validate(struct amdgpu_atpx *atpx) · 204 unmodified lines | ||
| 205 | 205 | atpx->is_hybrid = false; |
| 206 | 206 | if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) { |
| 207 | 207 | printk("ATPX Hybrid Graphics\n"); |
| 208 | −#if 1 | |
| 209 | − /* This is a temporary hack until the D3 cold support | |
| 210 | − * makes it upstream. The ATPX power_control method seems | |
| 211 | − * to still work on even if the system should be using | |
| 212 | − * the new standardized hybrid D3 cold ACPI interface. | |
| 213 | − */ | |
| 214 | − atpx->functions.power_cntl = true; | |
| 215 | −#else | |
| 216 | 208 | atpx->functions.power_cntl = false; |
| 217 | −#endif | |
| 218 | 209 | atpx->is_hybrid = true; |
| 219 | 210 | } |
| 220 | 211 | |
| @@ -221,7 +221,7 @@ void amdgpu_gart_table_vram_free(struct amdgpu_device *adev) · 220 unmodified lines | ||
| 221 | 221 | * Unbinds the requested pages from the gart page table and |
| 222 | 222 | * replaces them with the dummy page (all asics). |
| 223 | 223 | */ |
| 224 | −void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, | |
| 224 | +void amdgpu_gart_unbind(struct amdgpu_device *adev, uint64_t offset, | |
| 225 | 225 | int pages) |
| 226 | 226 | { |
| 227 | 227 | unsigned t; |
| @@ -268,7 +268,7 @@ void amdgpu_gart_unbind(struct amdgpu_device *adev, unsigned offset, · 40 unmodified lines | ||
| 268 | 268 | * (all asics). |
| 269 | 269 | * Returns 0 for success, -EINVAL for failure. |
| 270 | 270 | */ |
| 271 | −int amdgpu_gart_bind(struct amdgpu_device *adev, unsigned offset, | |
| 271 | +int amdgpu_gart_bind(struct amdgpu_device *adev, uint64_t offset, | |
| 272 | 272 | int pages, struct page **pagelist, dma_addr_t *dma_addr, |
| 273 | 273 | uint32_t flags) |
| 274 | 274 | { |
| @@ -295,7 +295,7 @@ void amdgpu_ib_pool_fini(struct amdgpu_device *adev) · 294 unmodified lines | ||
| 295 | 295 | int amdgpu_ib_ring_tests(struct amdgpu_device *adev) |
| 296 | 296 | { |
| 297 | 297 | unsigned i; |
| 298 | − int r; | |
| 298 | + int r, ret = 0; | |
| 299 | 299 | |
| 300 | 300 | for (i = 0; i < AMDGPU_MAX_RINGS; ++i) { |
| 301 | 301 | struct amdgpu_ring *ring = adev->rings[i]; |
| @@ -316,10 +316,11 @@ int amdgpu_ib_ring_tests(struct amdgpu_device *adev) · 14 unmodified lines | ||
| 316 | 316 | } else { |
| 317 | 317 | /* still not good, but we can live with it */ |
| 318 | 318 | DRM_ERROR("amdgpu: failed testing IB on ring %d (%d).\n", i, r); |
| 319 | + ret = r; | |
| 319 | 320 | } |
| 320 | 321 | } |
| 321 | 322 | } |
| 322 | − return 0; | |
| 323 | + return ret; | |
| 323 | 324 | } |
| 324 | 325 | |
| 325 | 326 | /* |
| @@ -273,8 +273,8 @@ static int amdgpu_move_blit(struct ttm_buffer_object *bo, · 272 unmodified lines | ||
| 273 | 273 | |
| 274 | 274 | adev = amdgpu_get_adev(bo->bdev); |
| 275 | 275 | ring = adev->mman.buffer_funcs_ring; |
| 276 | − old_start = old_mem->start << PAGE_SHIFT; | |
| 277 | − new_start = new_mem->start << PAGE_SHIFT; | |
| 276 | + old_start = (u64)old_mem->start << PAGE_SHIFT; | |
| 277 | + new_start = (u64)new_mem->start << PAGE_SHIFT; | |
| 278 | 278 | |
| 279 | 279 | switch (old_mem->mem_type) { |
| 280 | 280 | case TTM_PL_TT: |
| @@ -1154,7 +1154,8 @@ int amdgpu_uvd_ring_test_ib(struct amdgpu_ring *ring, long timeout) · 1153 unmodified lines | ||
| 1154 | 1154 | r = 0; |
| 1155 | 1155 | } |
| 1156 | 1156 | |
| 1157 | −error: | |
| 1158 | 1157 | fence_put(fence); |
| 1158 | + | |
| 1159 | +error: | |
| 1159 | 1160 | return r; |
| 1160 | 1161 | } |
| @@ -1593,7 +1593,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm) · 1592 unmodified lines | ||
| 1593 | 1593 | r = amd_sched_entity_init(&ring->sched, &vm->entity, |
| 1594 | 1594 | rq, amdgpu_sched_jobs); |
| 1595 | 1595 | if (r) |
| 1596 | − return r; | |
| 1596 | + goto err; | |
| 1597 | 1597 | |
| 1598 | 1598 | vm->page_directory_fence = NULL; |
| 1599 | 1599 | |
| @@ -1624,6 +1624,9 @@ error_free_page_directory: · 24 unmodified lines | ||
| 1624 | 1624 | error_free_sched_entity: |
| 1625 | 1625 | amd_sched_entity_fini(&ring->sched, &vm->entity); |
| 1626 | 1626 | |
| 1627 | +err: | |
| 1628 | + drm_free_large(vm->page_tables); | |
| 1629 | + | |
| 1627 | 1630 | return r; |
| 1628 | 1631 | } |
| 1629 | 1632 | |
| @@ -52,6 +52,7 @@ static void cik_sdma_set_ring_funcs(struct amdgpu_device *adev); · 51 unmodified lines | ||
| 52 | 52 | static void cik_sdma_set_irq_funcs(struct amdgpu_device *adev); |
| 53 | 53 | static void cik_sdma_set_buffer_funcs(struct amdgpu_device *adev); |
| 54 | 54 | static void cik_sdma_set_vm_pte_funcs(struct amdgpu_device *adev); |
| 55 | +static int cik_sdma_soft_reset(void *handle); | |
| 55 | 56 | |
| 56 | 57 | MODULE_FIRMWARE("radeon/bonaire_sdma.bin"); |
| 57 | 58 | MODULE_FIRMWARE("radeon/bonaire_sdma1.bin"); |
| @@ -1014,6 +1015,8 @@ static int cik_sdma_resume(void *handle) · 956 unmodified lines | ||
| 1014 | 1015 | { |
| 1015 | 1016 | struct amdgpu_device *adev = (struct amdgpu_device *)handle; |
| 1016 | 1017 | |
| 1018 | + cik_sdma_soft_reset(handle); | |
| 1019 | + | |
| 1017 | 1020 | return cik_sdma_hw_init(adev); |
| 1018 | 1021 | } |
| 1019 | 1022 | |
| @@ -2927,8 +2927,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) · 2926 unmodified lines | ||
| 2927 | 2927 | u64 wb_gpu_addr; |
| 2928 | 2928 | u32 *buf; |
| 2929 | 2929 | struct bonaire_mqd *mqd; |
| 2930 | − | |
| 2931 | − gfx_v7_0_cp_compute_enable(adev, true); | |
| 2930 | + struct amdgpu_ring *ring; | |
| 2932 | 2931 | |
| 2933 | 2932 | /* fix up chicken bits */ |
| 2934 | 2933 | tmp = RREG32(mmCP_CPF_DEBUG); |
| @@ -2963,7 +2962,7 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) · 28 unmodified lines | ||
| 2963 | 2962 | |
| 2964 | 2963 | /* init the queues. Just two for now. */ |
| 2965 | 2964 | for (i = 0; i < adev->gfx.num_compute_rings; i++) { |
| 2966 | − struct amdgpu_ring *ring = &adev->gfx.compute_ring[i]; | |
| 2965 | + ring = &adev->gfx.compute_ring[i]; | |
| 2967 | 2966 | |
| 2968 | 2967 | if (ring->mqd_obj == NULL) { |
| 2969 | 2968 | r = amdgpu_bo_create(adev, |
| @@ -3142,6 +3141,13 @@ static int gfx_v7_0_cp_compute_resume(struct amdgpu_device *adev) · 172 unmodified lines | ||
| 3142 | 3141 | amdgpu_bo_unreserve(ring->mqd_obj); |
| 3143 | 3142 | |
| 3144 | 3143 | ring->ready = true; |
| 3144 | + } | |
| 3145 | + | |
| 3146 | + gfx_v7_0_cp_compute_enable(adev, true); | |
| 3147 | + | |
| 3148 | + for (i = 0; i < adev->gfx.num_compute_rings; i++) { | |
| 3149 | + ring = &adev->gfx.compute_ring[i]; | |
| 3150 | + | |
| 3145 | 3151 | r = amdgpu_ring_test_ring(ring); |
| 3146 | 3152 | if (r) |
| 3147 | 3153 | ring->ready = false; |
| @@ -710,7 +710,7 @@ static int sdma_v2_4_ring_test_ib(struct amdgpu_ring *ring, long timeout) · 709 unmodified lines | ||
| 710 | 710 | DRM_ERROR("amdgpu: IB test timed out\n"); |
| 711 | 711 | r = -ETIMEDOUT; |
| 712 | 712 | goto err1; |
| 713 | − } else if (r) { | |
| 713 | + } else if (r < 0) { | |
| 714 | 714 | DRM_ERROR("amdgpu: fence wait failed (%ld).\n", r); |
| 715 | 715 | goto err1; |
| 716 | 716 | } |
| @@ -186,7 +186,7 @@ u32 __iomem *kfd_get_kernel_doorbell(struct kfd_dev *kfd, · 185 unmodified lines | ||
| 186 | 186 | sizeof(u32)) + inx; |
| 187 | 187 | |
| 188 | 188 | pr_debug("kfd: get kernel queue doorbell\n" |
| 189 | − " doorbell offset == 0x%08d\n" | |
| 189 | + " doorbell offset == 0x%08X\n" | |
| 190 | 190 | " kernel address == 0x%08lX\n", |
| 191 | 191 | *doorbell_off, (uintptr_t)(kfd->doorbell_kernel_ptr + inx)); |
| 192 | 192 | |
| @@ -405,7 +405,7 @@ void amd_sched_job_recovery(struct amd_gpu_scheduler *sched) · 404 unmodified lines | ||
| 405 | 405 | spin_lock(&sched->job_list_lock); |
| 406 | 406 | s_job = list_first_entry_or_null(&sched->ring_mirror_list, |
| 407 | 407 | struct amd_sched_job, node); |
| 408 | − if (s_job) | |
| 408 | + if (s_job && sched->timeout != MAX_SCHEDULE_TIMEOUT) | |
| 409 | 409 | schedule_delayed_work(&s_job->work_tdr, sched->timeout); |
| 410 | 410 | |
| 411 | 411 | list_for_each_entry_safe(s_job, tmp, &sched->ring_mirror_list, node) { |
| @@ -387,7 +387,7 @@ void atmel_hlcdc_crtc_irq(struct drm_crtc *c) · 386 unmodified lines | ||
| 387 | 387 | atmel_hlcdc_crtc_finish_page_flip(drm_crtc_to_atmel_hlcdc_crtc(c)); |
| 388 | 388 | } |
| 389 | 389 | |
| 390 | −void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) | |
| 390 | +static void atmel_hlcdc_crtc_reset(struct drm_crtc *crtc) | |
| 391 | 391 | { |
| 392 | 392 | struct atmel_hlcdc_crtc_state *state; |
| 393 | 393 | |
| @@ -320,19 +320,19 @@ atmel_hlcdc_plane_update_pos_and_size(struct atmel_hlcdc_plane *plane, · 319 unmodified lines | ||
| 320 | 320 | u32 *coeff_tab = heo_upscaling_ycoef; |
| 321 | 321 | u32 max_memsize; |
| 322 | 322 | |
| 323 | − if (state->crtc_w < state->src_w) | |
| 323 | + if (state->crtc_h < state->src_h) | |
| 324 | 324 | coeff_tab = heo_downscaling_ycoef; |
| 325 | 325 | for (i = 0; i < ARRAY_SIZE(heo_upscaling_ycoef); i++) |
| 326 | 326 | atmel_hlcdc_layer_update_cfg(&plane->layer, |
| 327 | 327 | 33 + i, |
| 328 | 328 | 0xffffffff, |
| 329 | 329 | coeff_tab[i]); |
| 330 | − factor = ((8 * 256 * state->src_w) - (256 * 4)) / | |
| 331 | − state->crtc_w; | |
| 330 | + factor = ((8 * 256 * state->src_h) - (256 * 4)) / | |
| 331 | + state->crtc_h; | |
| 332 | 332 | factor++; |
| 333 | − max_memsize = ((factor * state->crtc_w) + (256 * 4)) / | |
| 333 | + max_memsize = ((factor * state->crtc_h) + (256 * 4)) / | |
| 334 | 334 | 2048; |
| 335 | − if (max_memsize > state->src_w) | |
| 335 | + if (max_memsize > state->src_h) | |
| 336 | 336 | factor--; |
| 337 | 337 | factor_reg |= (factor << 16) | 0x80000000; |
| 338 | 338 | } |
| @@ -475,7 +475,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, · 474 unmodified lines | ||
| 475 | 475 | val, |
| 476 | 476 | -1, |
| 477 | 477 | &replaced); |
| 478 | − state->color_mgmt_changed = replaced; | |
| 478 | + state->color_mgmt_changed |= replaced; | |
| 479 | 479 | return ret; |
| 480 | 480 | } else if (property == config->ctm_property) { |
| 481 | 481 | ret = drm_atomic_replace_property_blob_from_id(crtc, |
| @@ -483,7 +483,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, · 1 unmodified line | ||
| 483 | 483 | val, |
| 484 | 484 | sizeof(struct drm_color_ctm), |
| 485 | 485 | &replaced); |
| 486 | − state->color_mgmt_changed = replaced; | |
| 486 | + state->color_mgmt_changed |= replaced; | |
| 487 | 487 | return ret; |
| 488 | 488 | } else if (property == config->gamma_lut_property) { |
| 489 | 489 | ret = drm_atomic_replace_property_blob_from_id(crtc, |
| @@ -491,7 +491,7 @@ int drm_atomic_crtc_set_property(struct drm_crtc *crtc, · 1 unmodified line | ||
| 491 | 491 | val, |
| 492 | 492 | -1, |
| 493 | 493 | &replaced); |
| 494 | − state->color_mgmt_changed = replaced; | |
| 494 | + state->color_mgmt_changed |= replaced; | |
| 495 | 495 | return ret; |
| 496 | 496 | } else if (crtc->funcs->atomic_set_property) |
| 497 | 497 | return crtc->funcs->atomic_set_property(crtc, state, property, val); |
| @@ -466,7 +466,7 @@ static bool drm_fb_helper_is_bound(struct drm_fb_helper *fb_helper) · 465 unmodified lines | ||
| 466 | 466 | |
| 467 | 467 | /* Sometimes user space wants everything disabled, so don't steal the |
| 468 | 468 | * display if there's a master. */ |
| 469 | − if (lockless_dereference(dev->master)) | |
| 469 | + if (READ_ONCE(dev->master)) | |
| 470 | 470 | return false; |
| 471 | 471 | |
| 472 | 472 | drm_for_each_crtc(crtc, dev) { |
| @@ -55,11 +55,11 @@ static int check_fb_gem_memory_type(struct drm_device *drm_dev, · 54 unmodified lines | ||
| 55 | 55 | flags = exynos_gem->flags; |
| 56 | 56 | |
| 57 | 57 | /* |
| 58 | − * without iommu support, not support physically non-continuous memory | |
| 59 | − * for framebuffer. | |
| 58 | + * Physically non-contiguous memory type for framebuffer is not | |
| 59 | + * supported without IOMMU. | |
| 60 | 60 | */ |
| 61 | 61 | if (IS_NONCONTIG_BUFFER(flags)) { |
| 62 | − DRM_ERROR("cannot use this gem memory type for fb.\n"); | |
| 62 | + DRM_ERROR("Non-contiguous GEM memory is not supported.\n"); | |
| 63 | 63 | return -EINVAL; |
| 64 | 64 | } |
| 65 | 65 | |
| @@ -1753,32 +1753,6 @@ static int fimc_clk_ctrl(struct fimc_context *ctx, bool enable) · 1752 unmodified lines | ||
| 1753 | 1753 | return 0; |
| 1754 | 1754 | } |
| 1755 | 1755 | |
| 1756 | −#ifdef CONFIG_PM_SLEEP | |
| 1757 | −static int fimc_suspend(struct device *dev) | |
| 1758 | −{ | |
| 1759 | − struct fimc_context *ctx = get_fimc_context(dev); | |
| 1760 | − | |
| 1761 | − DRM_DEBUG_KMS("id[%d]\n", ctx->id); | |
| 1762 | − | |
| 1763 | − if (pm_runtime_suspended(dev)) | |
| 1764 | − return 0; | |
| 1765 | − | |
| 1766 | − return fimc_clk_ctrl(ctx, false); | |
| 1767 | −} | |
| 1768 | − | |
| 1769 | −static int fimc_resume(struct device *dev) | |
| 1770 | −{ | |
| 1771 | − struct fimc_context *ctx = get_fimc_context(dev); | |
| 1772 | − | |
| 1773 | − DRM_DEBUG_KMS("id[%d]\n", ctx->id); | |
| 1774 | − | |
| 1775 | − if (!pm_runtime_suspended(dev)) | |
| 1776 | − return fimc_clk_ctrl(ctx, true); | |
| 1777 | − | |
| 1778 | − return 0; | |
| 1779 | −} | |
| 1780 | −#endif | |
| 1781 | − | |
| 1782 | 1756 | static int fimc_runtime_suspend(struct device *dev) |
| 1783 | 1757 | { |
| 1784 | 1758 | struct fimc_context *ctx = get_fimc_context(dev); |
| @@ -1799,7 +1773,8 @@ static int fimc_runtime_resume(struct device *dev) · 14 unmodified lines | ||
| 1799 | 1773 | #endif |
| 1800 | 1774 | |
| 1801 | 1775 | static const struct dev_pm_ops fimc_pm_ops = { |
| 1802 | − SET_SYSTEM_SLEEP_PM_OPS(fimc_suspend, fimc_resume) | |
| 1776 | + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, | |
| 1777 | + pm_runtime_force_resume) | |
| 1803 | 1778 | SET_RUNTIME_PM_OPS(fimc_runtime_suspend, fimc_runtime_resume, NULL) |
| 1804 | 1779 | }; |
| 1805 | 1780 | |
| @@ -1475,8 +1475,8 @@ static int g2d_remove(struct platform_device *pdev) · 1474 unmodified lines | ||
| 1475 | 1475 | return 0; |
| 1476 | 1476 | } |
| 1477 | 1477 | |
| 1478 | −#ifdef CONFIG_PM_SLEEP | |
| 1479 | −static int g2d_suspend(struct device *dev) | |
| 1478 | +#ifdef CONFIG_PM | |
| 1479 | +static int g2d_runtime_suspend(struct device *dev) | |
| 1480 | 1480 | { |
| 1481 | 1481 | struct g2d_data *g2d = dev_get_drvdata(dev); |
| 1482 | 1482 | |
| @@ -1490,25 +1490,6 @@ static int g2d_suspend(struct device *dev) · 7 unmodified lines | ||
| 1490 | 1490 | |
| 1491 | 1491 | flush_work(&g2d->runqueue_work); |
| 1492 | 1492 | |
| 1493 | − return 0; | |
| 1494 | −} | |
| 1495 | − | |
| 1496 | −static int g2d_resume(struct device *dev) | |
| 1497 | −{ | |
| 1498 | − struct g2d_data *g2d = dev_get_drvdata(dev); | |
| 1499 | − | |
| 1500 | − g2d->suspended = false; | |
| 1501 | − g2d_exec_runqueue(g2d); | |
| 1502 | − | |
| 1503 | − return 0; | |
| 1504 | −} | |
| 1505 | −#endif | |
| 1506 | − | |
| 1507 | −#ifdef CONFIG_PM | |
| 1508 | −static int g2d_runtime_suspend(struct device *dev) | |
| 1509 | −{ | |
| 1510 | − struct g2d_data *g2d = dev_get_drvdata(dev); | |
| 1511 | − | |
| 1512 | 1493 | clk_disable_unprepare(g2d->gate_clk); |
| 1513 | 1494 | |
| 1514 | 1495 | return 0; |
| @@ -1523,12 +1504,16 @@ static int g2d_runtime_resume(struct device *dev) · 8 unmodified lines | ||
| 1523 | 1504 | if (ret < 0) |
| 1524 | 1505 | dev_warn(dev, "failed to enable clock.\n"); |
| 1525 | 1506 | |
| 1507 | + g2d->suspended = false; | |
| 1508 | + g2d_exec_runqueue(g2d); | |
| 1509 | + | |
| 1526 | 1510 | return ret; |
| 1527 | 1511 | } |
| 1528 | 1512 | #endif |
| 1529 | 1513 | |
| 1530 | 1514 | static const struct dev_pm_ops g2d_pm_ops = { |
| 1531 | − SET_SYSTEM_SLEEP_PM_OPS(g2d_suspend, g2d_resume) | |
| 1515 | + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, | |
| 1516 | + pm_runtime_force_resume) | |
| 1532 | 1517 | SET_RUNTIME_PM_OPS(g2d_runtime_suspend, g2d_runtime_resume, NULL) |
| 1533 | 1518 | }; |
| 1534 | 1519 | |
| @@ -1760,34 +1760,7 @@ static int gsc_remove(struct platform_device *pdev) · 1759 unmodified lines | ||
| 1760 | 1760 | return 0; |
| 1761 | 1761 | } |
| 1762 | 1762 | |
| 1763 | −#ifdef CONFIG_PM_SLEEP | |
| 1764 | −static int gsc_suspend(struct device *dev) | |
| 1765 | −{ | |
| 1766 | − struct gsc_context *ctx = get_gsc_context(dev); | |
| 1767 | − | |
| 1768 | − DRM_DEBUG_KMS("id[%d]\n", ctx->id); | |
| 1769 | − | |
| 1770 | − if (pm_runtime_suspended(dev)) | |
| 1771 | − return 0; | |
| 1772 | − | |
| 1773 | − return gsc_clk_ctrl(ctx, false); | |
| 1774 | −} | |
| 1775 | − | |
| 1776 | −static int gsc_resume(struct device *dev) | |
| 1777 | −{ | |
| 1778 | − struct gsc_context *ctx = get_gsc_context(dev); | |
| 1779 | − | |
| 1780 | − DRM_DEBUG_KMS("id[%d]\n", ctx->id); | |
| 1781 | − | |
| 1782 | − if (!pm_runtime_suspended(dev)) | |
| 1783 | − return gsc_clk_ctrl(ctx, true); | |
| 1784 | − | |
| 1785 | − return 0; | |
| 1786 | −} | |
| 1787 | −#endif | |
| 1788 | − | |
| 1789 | −#ifdef CONFIG_PM | |
| 1790 | −static int gsc_runtime_suspend(struct device *dev) | |
| 1763 | +static int __maybe_unused gsc_runtime_suspend(struct device *dev) | |
| 1791 | 1764 | { |
| 1792 | 1765 | struct gsc_context *ctx = get_gsc_context(dev); |
| 1793 | 1766 | |
| @@ -1796,7 +1769,7 @@ static int gsc_runtime_suspend(struct device *dev) · 2 unmodified lines | ||
| 1796 | 1769 | return gsc_clk_ctrl(ctx, false); |
| 1797 | 1770 | } |
| 1798 | 1771 | |
| 1799 | −static int gsc_runtime_resume(struct device *dev) | |
| 1772 | +static int __maybe_unused gsc_runtime_resume(struct device *dev) | |
| 1800 | 1773 | { |
| 1801 | 1774 | struct gsc_context *ctx = get_gsc_context(dev); |
| 1802 | 1775 | |
| @@ -1804,10 +1777,10 @@ static int gsc_runtime_resume(struct device *dev) · 1 unmodified line | ||
| 1804 | 1777 | |
| 1805 | 1778 | return gsc_clk_ctrl(ctx, true); |
| 1806 | 1779 | } |
| 1807 | −#endif | |
| 1808 | 1780 | |
| 1809 | 1781 | static const struct dev_pm_ops gsc_pm_ops = { |
| 1810 | − SET_SYSTEM_SLEEP_PM_OPS(gsc_suspend, gsc_resume) | |
| 1782 | + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, | |
| 1783 | + pm_runtime_force_resume) | |
| 1811 | 1784 | SET_RUNTIME_PM_OPS(gsc_runtime_suspend, gsc_runtime_resume, NULL) |
| 1812 | 1785 | }; |
| 1813 | 1786 | |
| @@ -794,29 +794,6 @@ static int rotator_clk_crtl(struct rot_context *rot, bool enable) · 793 unmodified lines | ||
| 794 | 794 | return 0; |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | − | |
| 798 | −#ifdef CONFIG_PM_SLEEP | |
| 799 | −static int rotator_suspend(struct device *dev) | |
| 800 | −{ | |
| 801 | − struct rot_context *rot = dev_get_drvdata(dev); | |
| 802 | − | |
| 803 | − if (pm_runtime_suspended(dev)) | |
| 804 | − return 0; | |
| 805 | − | |
| 806 | − return rotator_clk_crtl(rot, false); | |
| 807 | −} | |
| 808 | − | |
| 809 | −static int rotator_resume(struct device *dev) | |
| 810 | −{ | |
| 811 | − struct rot_context *rot = dev_get_drvdata(dev); | |
| 812 | − | |
| 813 | − if (!pm_runtime_suspended(dev)) | |
| 814 | − return rotator_clk_crtl(rot, true); | |
| 815 | − | |
| 816 | − return 0; | |
| 817 | −} | |
| 818 | −#endif | |
| 819 | − | |
| 820 | 797 | static int rotator_runtime_suspend(struct device *dev) |
| 821 | 798 | { |
| 822 | 799 | struct rot_context *rot = dev_get_drvdata(dev); |
| @@ -833,7 +810,8 @@ static int rotator_runtime_resume(struct device *dev) · 10 unmodified lines | ||
| 833 | 810 | #endif |
| 834 | 811 | |
| 835 | 812 | static const struct dev_pm_ops rotator_pm_ops = { |
| 836 | − SET_SYSTEM_SLEEP_PM_OPS(rotator_suspend, rotator_resume) | |
| 813 | + SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend, | |
| 814 | + pm_runtime_force_resume) | |
| 837 | 815 | SET_RUNTIME_PM_OPS(rotator_runtime_suspend, rotator_runtime_resume, |
| 838 | 816 | NULL) |
| 839 | 817 | }; |
| @@ -2616,6 +2616,8 @@ static void i915_gem_reset_engine(struct intel_engine_cs *engine) · 2615 unmodified lines | ||
| 2616 | 2616 | list_for_each_entry_continue(request, &engine->request_list, link) |
| 2617 | 2617 | if (request->ctx == incomplete_ctx) |
| 2618 | 2618 | reset_request(request); |
| 2619 | + | |
| 2620 | + engine->i915->gt.active_engines &= ~intel_engine_flag(engine); | |
| 2619 | 2621 | } |
| 2620 | 2622 | |
| 2621 | 2623 | void i915_gem_reset(struct drm_i915_private *dev_priv) |
| @@ -2626,6 +2628,7 @@ void i915_gem_reset(struct drm_i915_private *dev_priv) · 4 unmodified lines | ||
| 2626 | 2628 | |
| 2627 | 2629 | for_each_engine(engine, dev_priv) |
| 2628 | 2630 | i915_gem_reset_engine(engine); |
| 2631 | + mod_delayed_work(dev_priv->wq, &dev_priv->gt.idle_work, 0); | |
| 2629 | 2632 | |
| 2630 | 2633 | i915_gem_restore_fences(&dev_priv->drm); |
| 2631 | 2634 | } |
| @@ -3601,6 +3601,8 @@ void intel_finish_reset(struct drm_i915_private *dev_priv) · 3600 unmodified lines | ||
| 3601 | 3601 | |
| 3602 | 3602 | dev_priv->modeset_restore_state = NULL; |
| 3603 | 3603 | |
| 3604 | + dev_priv->modeset_restore_state = NULL; | |
| 3605 | + | |
| 3604 | 3606 | /* reset doesn't touch the display */ |
| 3605 | 3607 | if (!gpu_reset_clobbers_display(dev_priv)) { |
| 3606 | 3608 | if (!state) { |
| @@ -79,6 +79,8 @@ static void ipu_crtc_atomic_disable(struct drm_crtc *crtc, · 78 unmodified lines | ||
| 79 | 79 | |
| 80 | 80 | /* always disable planes on the CRTC */ |
| 81 | 81 | drm_atomic_helper_disable_planes_on_crtc(old_crtc_state, true); |
| 82 | + | |
| 83 | + drm_crtc_vblank_off(crtc); | |
| 82 | 84 | } |
| 83 | 85 | |
| 84 | 86 | static void imx_drm_crtc_reset(struct drm_crtc *crtc) |
| @@ -183,6 +185,8 @@ static int ipu_crtc_atomic_check(struct drm_crtc *crtc, · 98 unmodified lines | ||
| 183 | 185 | static void ipu_crtc_atomic_begin(struct drm_crtc *crtc, |
| 184 | 186 | struct drm_crtc_state *old_crtc_state) |
| 185 | 187 | { |
| 188 | + drm_crtc_vblank_on(crtc); | |
| 189 | + | |
| 186 | 190 | spin_lock_irq(&crtc->dev->event_lock); |
| 187 | 191 | if (crtc->state->event) { |
| 188 | 192 | WARN_ON(drm_crtc_vblank_get(crtc)); |
| @@ -2,6 +2,9 @@ config DRM_MEDIATEK · 1 unmodified line | ||
| 2 | 2 | tristate "DRM Support for Mediatek SoCs" |
| 3 | 3 | depends on DRM |
| 4 | 4 | depends on ARCH_MEDIATEK || (ARM && COMPILE_TEST) |
| 5 | + depends on COMMON_CLK | |
| 6 | + depends on HAVE_ARM_SMCCC | |
| 7 | + depends on OF | |
| 5 | 8 | select DRM_GEM_CMA_HELPER |
| 6 | 9 | select DRM_KMS_HELPER |
| 7 | 10 | select DRM_MIPI_DSI |
| @@ -157,6 +157,12 @@ struct msm_drm_private { · 156 unmodified lines | ||
| 157 | 157 | struct shrinker shrinker; |
| 158 | 158 | |
| 159 | 159 | struct msm_vblank_ctrl vblank_ctrl; |
| 160 | + | |
| 161 | + /* task holding struct_mutex.. currently only used in submit path | |
| 162 | + * to detect and reject faults from copy_from_user() for submit | |
| 163 | + * ioctl. | |
| 164 | + */ | |
| 165 | + struct task_struct *struct_mutex_task; | |
| 160 | 166 | }; |
| 161 | 167 | |
| 162 | 168 | struct msm_format { |
| @@ -196,11 +196,20 @@ int msm_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf) · 195 unmodified lines | ||
| 196 | 196 | { |
| 197 | 197 | struct drm_gem_object *obj = vma->vm_private_data; |
| 198 | 198 | struct drm_device *dev = obj->dev; |
| 199 | + struct msm_drm_private *priv = dev->dev_private; | |
| 199 | 200 | struct page **pages; |
| 200 | 201 | unsigned long pfn; |
| 201 | 202 | pgoff_t pgoff; |
| 202 | 203 | int ret; |
| 203 | 204 | |
| 205 | + /* This should only happen if userspace tries to pass a mmap'd | |
| 206 | + * but unfaulted gem bo vaddr into submit ioctl, triggering | |
| 207 | + * a page fault while struct_mutex is already held. This is | |
| 208 | + * not a valid use-case so just bail. | |
| 209 | + */ | |
| 210 | + if (priv->struct_mutex_task == current) | |
| 211 | + return VM_FAULT_SIGBUS; | |
| 212 | + | |
| 204 | 213 | /* Make sure we don't parallel update on a fault, nor move or remove |
| 205 | 214 | * something from beneath our feet |
| 206 | 215 | */ |
| @@ -66,6 +66,14 @@ void msm_gem_submit_free(struct msm_gem_submit *submit) · 65 unmodified lines | ||
| 66 | 66 | kfree(submit); |
| 67 | 67 | } |
| 68 | 68 | |
| 69 | +static inline unsigned long __must_check | |
| 70 | +copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) | |
| 71 | +{ | |
| 72 | + if (access_ok(VERIFY_READ, from, n)) | |
| 73 | + return __copy_from_user_inatomic(to, from, n); | |
| 74 | + return -EFAULT; | |
| 75 | +} | |
| 76 | + | |
| 69 | 77 | static int submit_lookup_objects(struct msm_gem_submit *submit, |
| 70 | 78 | struct drm_msm_gem_submit *args, struct drm_file *file) |
| 71 | 79 | { |
| @@ -73,6 +81,7 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, · 1 unmodified line | ||
| 73 | 81 | int ret = 0; |
| 74 | 82 | |
| 75 | 83 | spin_lock(&file->table_lock); |
| 84 | + pagefault_disable(); | |
| 76 | 85 | |
| 77 | 86 | for (i = 0; i < args->nr_bos; i++) { |
| 78 | 87 | struct drm_msm_gem_submit_bo submit_bo; |
| @@ -86,10 +95,15 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, · 7 unmodified lines | ||
| 86 | 95 | */ |
| 87 | 96 | submit->bos[i].flags = 0; |
| 88 | 97 | |
| 89 | − ret = copy_from_user(&submit_bo, userptr, sizeof(submit_bo)); | |
| 90 | − if (ret) { | |
| 91 | − ret = -EFAULT; | |
| 92 | − goto out_unlock; | |
| 98 | + ret = copy_from_user_inatomic(&submit_bo, userptr, sizeof(submit_bo)); | |
| 99 | + if (unlikely(ret)) { | |
| 100 | + pagefault_enable(); | |
| 101 | + spin_unlock(&file->table_lock); | |
| 102 | + ret = copy_from_user(&submit_bo, userptr, sizeof(submit_bo)); | |
| 103 | + if (ret) | |
| 104 | + goto out; | |
| 105 | + spin_lock(&file->table_lock); | |
| 106 | + pagefault_disable(); | |
| 93 | 107 | } |
| 94 | 108 | |
| 95 | 109 | if (submit_bo.flags & ~MSM_SUBMIT_BO_FLAGS) { |
| @@ -129,9 +143,12 @@ static int submit_lookup_objects(struct msm_gem_submit *submit, · 33 unmodified lines | ||
| 129 | 143 | } |
| 130 | 144 | |
| 131 | 145 | out_unlock: |
| 132 | − submit->nr_bos = i; | |
| 146 | + pagefault_enable(); | |
| 133 | 147 | spin_unlock(&file->table_lock); |
| 134 | 148 | |
| 149 | +out: | |
| 150 | + submit->nr_bos = i; | |
| 151 | + | |
| 135 | 152 | return ret; |
| 136 | 153 | } |
| 137 | 154 | |
| @@ -392,6 +409,7 @@ int msm_ioctl_gem_submit(struct drm_device *dev, void *data, · 254 unmodified lines | ||
| 392 | 409 | goto out_unlock; |
| 393 | 410 | } |
| 394 | 411 | } |
| 412 | + priv->struct_mutex_task = current; | |
| 395 | 413 | |
| 396 | 414 | submit = submit_create(dev, gpu, args->nr_bos, args->nr_cmds); |
| 397 | 415 | if (!submit) { |
| @@ -531,6 +549,7 @@ out: · 133 unmodified lines | ||
| 531 | 549 | out_unlock: |
| 532 | 550 | if (ret && (out_fence_fd >= 0)) |
| 533 | 551 | put_unused_fd(out_fence_fd); |
| 552 | + priv->struct_mutex_task = NULL; | |
| 534 | 553 | mutex_unlock(&dev->struct_mutex); |
| 535 | 554 | return ret; |
| 536 | 555 | } |
| @@ -225,6 +225,17 @@ static bool nouveau_pr3_present(struct pci_dev *pdev) · 224 unmodified lines | ||
| 225 | 225 | if (!parent_pdev) |
| 226 | 226 | return false; |
| 227 | 227 | |
| 228 | + if (!parent_pdev->bridge_d3) { | |
| 229 | + /* | |
| 230 | + * Parent PCI bridge is currently not power managed. | |
| 231 | + * Since userspace can change these afterwards to be on | |
| 232 | + * the safe side we stick with _DSM and prevent usage of | |
| 233 | + * _PR3 from the bridge. | |
| 234 | + */ | |
| 235 | + pci_d3cold_disable(pdev); | |
| 236 | + return false; | |
| 237 | + } | |
| 238 | + | |
| 228 | 239 | parent_adev = ACPI_COMPANION(&parent_pdev->dev); |
| 229 | 240 | if (!parent_adev) |
| 230 | 241 | return false; |
| @@ -627,7 +627,9 @@ static u32 atombios_adjust_pll(struct drm_crtc *crtc, · 626 unmodified lines | ||
| 627 | 627 | if (radeon_crtc->ss.refdiv) { |
| 628 | 628 | radeon_crtc->pll_flags |= RADEON_PLL_USE_REF_DIV; |
| 629 | 629 | radeon_crtc->pll_reference_div = radeon_crtc->ss.refdiv; |
| 630 | − if (rdev->family >= CHIP_RV770) | |
| 630 | + if (ASIC_IS_AVIVO(rdev) && | |
| 631 | + rdev->family != CHIP_RS780 && | |
| 632 | + rdev->family != CHIP_RS880) | |
| 631 | 633 | radeon_crtc->pll_flags |= RADEON_PLL_USE_FRAC_FB_DIV; |
| 632 | 634 | } |
| 633 | 635 | } |
| @@ -203,16 +203,7 @@ static int radeon_atpx_validate(struct radeon_atpx *atpx) · 202 unmodified lines | ||
| 203 | 203 | atpx->is_hybrid = false; |
| 204 | 204 | if (valid_bits & ATPX_MS_HYBRID_GFX_SUPPORTED) { |
| 205 | 205 | printk("ATPX Hybrid Graphics\n"); |
| 206 | −#if 1 | |
| 207 | − /* This is a temporary hack until the D3 cold support | |
| 208 | − * makes it upstream. The ATPX power_control method seems | |
| 209 | − * to still work on even if the system should be using | |
| 210 | − * the new standardized hybrid D3 cold ACPI interface. | |
| 211 | − */ | |
| 212 | − atpx->functions.power_cntl = true; | |
| 213 | −#else | |
| 214 | 206 | atpx->functions.power_cntl = false; |
| 215 | −#endif | |
| 216 | 207 | atpx->is_hybrid = true; |
| 217 | 208 | } |
| 218 | 209 | |
| @@ -264,8 +264,8 @@ static int radeon_move_blit(struct ttm_buffer_object *bo, · 263 unmodified lines | ||
| 264 | 264 | |
| 265 | 265 | rdev = radeon_get_rdev(bo->bdev); |
| 266 | 266 | ridx = radeon_copy_ring_index(rdev); |
| 267 | − old_start = old_mem->start << PAGE_SHIFT; | |
| 268 | − new_start = new_mem->start << PAGE_SHIFT; | |
| 267 | + old_start = (u64)old_mem->start << PAGE_SHIFT; | |
| 268 | + new_start = (u64)new_mem->start << PAGE_SHIFT; | |
| 269 | 269 | |
| 270 | 270 | switch (old_mem->mem_type) { |
| 271 | 271 | case TTM_PL_VRAM: |
| @@ -840,6 +840,21 @@ static const struct drm_encoder_funcs tegra_dsi_encoder_funcs = { · 839 unmodified lines | ||
| 840 | 840 | .destroy = tegra_output_encoder_destroy, |
| 841 | 841 | }; |
| 842 | 842 | |
| 843 | +static void tegra_dsi_unprepare(struct tegra_dsi *dsi) | |
| 844 | +{ | |
| 845 | + int err; | |
| 846 | + | |
| 847 | + if (dsi->slave) | |
| 848 | + tegra_dsi_unprepare(dsi->slave); | |
| 849 | + | |
| 850 | + err = tegra_mipi_disable(dsi->mipi); | |
| 851 | + if (err < 0) | |
| 852 | + dev_err(dsi->dev, "failed to disable MIPI calibration: %d\n", | |
| 853 | + err); | |
| 854 | + | |
| 855 | + pm_runtime_put(dsi->dev); | |
| 856 | +} | |
| 857 | + | |
| 843 | 858 | static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) |
| 844 | 859 | { |
| 845 | 860 | struct tegra_output *output = encoder_to_output(encoder); |
| @@ -876,7 +891,26 @@ static void tegra_dsi_encoder_disable(struct drm_encoder *encoder) · 30 unmodified lines | ||
| 876 | 891 | |
| 877 | 892 | tegra_dsi_disable(dsi); |
| 878 | 893 | |
| 879 | − pm_runtime_put(dsi->dev); | |
| 894 | + tegra_dsi_unprepare(dsi); | |
| 895 | +} | |
| 896 | + | |
| 897 | +static void tegra_dsi_prepare(struct tegra_dsi *dsi) | |
| 898 | +{ | |
| 899 | + int err; | |
| 900 | + | |
| 901 | + pm_runtime_get_sync(dsi->dev); | |
| 902 | + | |
| 903 | + err = tegra_mipi_enable(dsi->mipi); | |
| 904 | + if (err < 0) | |
| 905 | + dev_err(dsi->dev, "failed to enable MIPI calibration: %d\n", | |
| 906 | + err); | |
| 907 | + | |
| 908 | + err = tegra_dsi_pad_calibrate(dsi); | |
| 909 | + if (err < 0) | |
| 910 | + dev_err(dsi->dev, "MIPI calibration failed: %d\n", err); | |
| 911 | + | |
| 912 | + if (dsi->slave) | |
| 913 | + tegra_dsi_prepare(dsi->slave); | |
| 880 | 914 | } |
| 881 | 915 | |
| 882 | 916 | static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) |
| @@ -887,13 +921,8 @@ static void tegra_dsi_encoder_enable(struct drm_encoder *encoder) · 4 unmodified lines | ||
| 887 | 921 | struct tegra_dsi *dsi = to_dsi(output); |
| 888 | 922 | struct tegra_dsi_state *state; |
| 889 | 923 | u32 value; |
| 890 | − int err; | |
| 891 | − | |
| 892 | − pm_runtime_get_sync(dsi->dev); | |
| 893 | 924 | |
| 894 | − err = tegra_dsi_pad_calibrate(dsi); | |
| 895 | − if (err < 0) | |
| 896 | − dev_err(dsi->dev, "MIPI calibration failed: %d\n", err); | |
| 925 | + tegra_dsi_prepare(dsi); | |
| 897 | 926 | |
| 898 | 927 | state = tegra_dsi_get_state(dsi); |
| 899 | 928 | |
| @@ -144,7 +144,7 @@ static struct list_head *vc4_get_cache_list_for_size(struct drm_device *dev, · 143 unmodified lines | ||
| 144 | 144 | return &vc4->bo_cache.size_list[page_index]; |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | −void vc4_bo_cache_purge(struct drm_device *dev) | |
| 147 | +static void vc4_bo_cache_purge(struct drm_device *dev) | |
| 148 | 148 | { |
| 149 | 149 | struct vc4_dev *vc4 = to_vc4_dev(dev); |
| 150 | 150 | |
| @@ -58,21 +58,21 @@ static int vc4_get_param_ioctl(struct drm_device *dev, void *data, · 57 unmodified lines | ||
| 58 | 58 | switch (args->param) { |
| 59 | 59 | case DRM_VC4_PARAM_V3D_IDENT0: |
| 60 | 60 | ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev); |
| 61 | − if (ret) | |
| 61 | + if (ret < 0) | |
| 62 | 62 | return ret; |
| 63 | 63 | args->value = V3D_READ(V3D_IDENT0); |
| 64 | 64 | pm_runtime_put(&vc4->v3d->pdev->dev); |
| 65 | 65 | break; |
| 66 | 66 | case DRM_VC4_PARAM_V3D_IDENT1: |
| 67 | 67 | ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev); |
| 68 | − if (ret) | |
| 68 | + if (ret < 0) | |
| 69 | 69 | return ret; |
| 70 | 70 | args->value = V3D_READ(V3D_IDENT1); |
| 71 | 71 | pm_runtime_put(&vc4->v3d->pdev->dev); |
| 72 | 72 | break; |
| 73 | 73 | case DRM_VC4_PARAM_V3D_IDENT2: |
| 74 | 74 | ret = pm_runtime_get_sync(&vc4->v3d->pdev->dev); |
| 75 | − if (ret) | |
| 75 | + if (ret < 0) | |
| 76 | 76 | return ret; |
| 77 | 77 | args->value = V3D_READ(V3D_IDENT2); |
| 78 | 78 | pm_runtime_put(&vc4->v3d->pdev->dev); |
| @@ -321,6 +321,15 @@ vc4_first_render_job(struct vc4_dev *vc4) · 320 unmodified lines | ||
| 321 | 321 | struct vc4_exec_info, head); |
| 322 | 322 | } |
| 323 | 323 | |
| 324 | +static inline struct vc4_exec_info * | |
| 325 | +vc4_last_render_job(struct vc4_dev *vc4) | |
| 326 | +{ | |
| 327 | + if (list_empty(&vc4->render_job_list)) | |
| 328 | + return NULL; | |
| 329 | + return list_last_entry(&vc4->render_job_list, | |
| 330 | + struct vc4_exec_info, head); | |
| 331 | +} | |
| 332 | + | |
| 324 | 333 | /** |
| 325 | 334 | * struct vc4_texture_sample_info - saves the offsets into the UBO for texture |
| 326 | 335 | * setup parameters. |
| @@ -530,8 +530,8 @@ vc4_cl_lookup_bos(struct drm_device *dev, · 529 unmodified lines | ||
| 530 | 530 | return -EINVAL; |
| 531 | 531 | } |
| 532 | 532 | |
| 533 | − exec->bo = kcalloc(exec->bo_count, sizeof(struct drm_gem_cma_object *), | |
| 534 | − GFP_KERNEL); | |
| 533 | + exec->bo = drm_calloc_large(exec->bo_count, | |
| 534 | + sizeof(struct drm_gem_cma_object *)); | |
| 535 | 535 | if (!exec->bo) { |
| 536 | 536 | DRM_ERROR("Failed to allocate validated BO pointers\n"); |
| 537 | 537 | return -ENOMEM; |
| @@ -568,8 +568,8 @@ vc4_cl_lookup_bos(struct drm_device *dev, · 30 unmodified lines | ||
| 568 | 568 | spin_unlock(&file_priv->table_lock); |
| 569 | 569 | |
| 570 | 570 | fail: |
| 571 | − kfree(handles); | |
| 572 | − return 0; | |
| 571 | + drm_free_large(handles); | |
| 572 | + return ret; | |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | static int |
| @@ -604,7 +604,7 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec) · 28 unmodified lines | ||
| 604 | 604 | * read the contents back for validation, and I think the |
| 605 | 605 | * bo->vaddr is uncached access. |
| 606 | 606 | */ |
| 607 | − temp = kmalloc(temp_size, GFP_KERNEL); | |
| 607 | + temp = drm_malloc_ab(temp_size, 1); | |
| 608 | 608 | if (!temp) { |
| 609 | 609 | DRM_ERROR("Failed to allocate storage for copying " |
| 610 | 610 | "in bin/render CLs.\n"); |
| @@ -671,7 +671,7 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec) · 60 unmodified lines | ||
| 671 | 671 | ret = vc4_validate_shader_recs(dev, exec); |
| 672 | 672 | |
| 673 | 673 | fail: |
| 674 | − kfree(temp); | |
| 674 | + drm_free_large(temp); | |
| 675 | 675 | return ret; |
| 676 | 676 | } |
| 677 | 677 | |
| @@ -684,7 +684,7 @@ vc4_complete_exec(struct drm_device *dev, struct vc4_exec_info *exec) · 6 unmodified lines | ||
| 684 | 684 | if (exec->bo) { |
| 685 | 685 | for (i = 0; i < exec->bo_count; i++) |
| 686 | 686 | drm_gem_object_unreference_unlocked(&exec->bo[i]->base); |
| 687 | − kfree(exec->bo); | |
| 687 | + drm_free_large(exec->bo); | |
| 688 | 688 | } |
| 689 | 689 | |
| 690 | 690 | while (!list_empty(&exec->unref_list)) { |
| @@ -938,8 +938,8 @@ vc4_gem_destroy(struct drm_device *dev) · 247 unmodified lines | ||
| 938 | 938 | vc4->overflow_mem = NULL; |
| 939 | 939 | } |
| 940 | 940 | |
| 941 | − vc4_bo_cache_destroy(dev); | |
| 942 | − | |
| 943 | 941 | if (vc4->hang_state) |
| 944 | 942 | vc4_free_hang_state(dev, vc4->hang_state); |
| 943 | + | |
| 944 | + vc4_bo_cache_destroy(dev); | |
| 945 | 945 | } |
| @@ -83,8 +83,10 @@ vc4_overflow_mem_work(struct work_struct *work) · 82 unmodified lines | ||
| 83 | 83 | |
| 84 | 84 | spin_lock_irqsave(&vc4->job_lock, irqflags); |
| 85 | 85 | current_exec = vc4_first_bin_job(vc4); |
| 86 | + if (!current_exec) | |
| 87 | + current_exec = vc4_last_render_job(vc4); | |
| 86 | 88 | if (current_exec) { |
| 87 | − vc4->overflow_mem->seqno = vc4->finished_seqno + 1; | |
| 89 | + vc4->overflow_mem->seqno = current_exec->seqno; | |
| 88 | 90 | list_add_tail(&vc4->overflow_mem->unref_head, |
| 89 | 91 | ¤t_exec->unref_list); |
| 90 | 92 | vc4->overflow_mem = NULL; |
| @@ -309,8 +309,14 @@ validate_uniform_address_write(struct vc4_validated_shader_info *validated_shade · 308 unmodified lines | ||
| 309 | 309 | * of uniforms on each side. However, this scheme is easy to |
| 310 | 310 | * validate so it's all we allow for now. |
| 311 | 311 | */ |
| 312 | − | |
| 313 | − if (QPU_GET_FIELD(inst, QPU_SIG) != QPU_SIG_NONE) { | |
| 312 | + switch (QPU_GET_FIELD(inst, QPU_SIG)) { | |
| 313 | + case QPU_SIG_NONE: | |
| 314 | + case QPU_SIG_SCOREBOARD_UNLOCK: | |
| 315 | + case QPU_SIG_COLOR_LOAD: | |
| 316 | + case QPU_SIG_LOAD_TMU0: | |
| 317 | + case QPU_SIG_LOAD_TMU1: | |
| 318 | + break; | |
| 319 | + default: | |
| 314 | 320 | DRM_ERROR("uniforms address change must be " |
| 315 | 321 | "normal math\n"); |
| 316 | 322 | return false; |
| @@ -242,20 +242,6 @@ struct tegra_mipi_device *tegra_mipi_request(struct device *device) · 241 unmodified lines | ||
| 242 | 242 | dev->pads = args.args[0]; |
| 243 | 243 | dev->device = device; |
| 244 | 244 | |
| 245 | − mutex_lock(&dev->mipi->lock); | |
| 246 | − | |
| 247 | − if (dev->mipi->usage_count++ == 0) { | |
| 248 | − err = tegra_mipi_power_up(dev->mipi); | |
| 249 | − if (err < 0) { | |
| 250 | − dev_err(dev->mipi->dev, | |
| 251 | − "failed to power up MIPI bricks: %d\n", | |
| 252 | − err); | |
| 253 | − return ERR_PTR(err); | |
| 254 | − } | |
| 255 | − } | |
| 256 | − | |
| 257 | − mutex_unlock(&dev->mipi->lock); | |
| 258 | − | |
| 259 | 245 | return dev; |
| 260 | 246 | |
| 261 | 247 | put: |
| @@ -270,29 +256,42 @@ EXPORT_SYMBOL(tegra_mipi_request); · 8 unmodified lines | ||
| 270 | 256 | |
| 271 | 257 | void tegra_mipi_free(struct tegra_mipi_device *device) |
| 272 | 258 | { |
| 273 | − int err; | |
| 259 | + platform_device_put(device->pdev); | |
| 260 | + kfree(device); | |
| 261 | +} | |
| 262 | +EXPORT_SYMBOL(tegra_mipi_free); | |
| 274 | 263 | |
| 275 | − mutex_lock(&device->mipi->lock); | |
| 264 | +int tegra_mipi_enable(struct tegra_mipi_device *dev) | |
| 265 | +{ | |
| 266 | + int err = 0; | |
| 276 | 267 | |
| 277 | − if (--device->mipi->usage_count == 0) { | |
| 278 | − err = tegra_mipi_power_down(device->mipi); | |
| 279 | − if (err < 0) { | |
| 280 | − /* | |
| 281 | − * Not much that can be done here, so an error message | |
| 282 | − * will have to do. | |
| 283 | − */ | |
| 284 | − dev_err(device->mipi->dev, | |
| 285 | − "failed to power down MIPI bricks: %d\n", | |
| 286 | − err); | |
| 287 | − } | |
| 288 | − } | |
| 268 | + mutex_lock(&dev->mipi->lock); | |
| 289 | 269 | |
| 290 | − mutex_unlock(&device->mipi->lock); | |
| 270 | + if (dev->mipi->usage_count++ == 0) | |
| 271 | + err = tegra_mipi_power_up(dev->mipi); | |
| 272 | + | |
| 273 | + mutex_unlock(&dev->mipi->lock); | |
| 274 | + | |
| 275 | + return err; | |
| 291 | 276 | |
| 292 | − platform_device_put(device->pdev); | |
| 293 | − kfree(device); | |
| 294 | 277 | } |
| 295 | −EXPORT_SYMBOL(tegra_mipi_free); | |
| 278 | +EXPORT_SYMBOL(tegra_mipi_enable); | |
| 279 | + | |
| 280 | +int tegra_mipi_disable(struct tegra_mipi_device *dev) | |
| 281 | +{ | |
| 282 | + int err = 0; | |
| 283 | + | |
| 284 | + mutex_lock(&dev->mipi->lock); | |
| 285 | + | |
| 286 | + if (--dev->mipi->usage_count == 0) | |
| 287 | + err = tegra_mipi_power_down(dev->mipi); | |
| 288 | + | |
| 289 | + mutex_unlock(&dev->mipi->lock); | |
| 290 | + | |
| 291 | + return err; | |
| 292 | + | |
| 293 | +} | |
| 294 | +EXPORT_SYMBOL(tegra_mipi_disable); | |
| 296 | 295 | |
| 297 | 296 | static int tegra_mipi_wait(struct tegra_mipi *mipi) |
| 298 | 297 | { |
| @@ -491,7 +491,7 @@ struct it87_sio_data { · 490 unmodified lines | ||
| 491 | 491 | struct it87_data { |
| 492 | 492 | const struct attribute_group *groups[7]; |
| 493 | 493 | enum chips type; |
| 494 | − u16 features; | |
| 494 | + u32 features; | |
| 495 | 495 | u8 peci_mask; |
| 496 | 496 | u8 old_peci_mask; |
| 497 | 497 | |
| @@ -2015,6 +2015,7 @@ static struct attribute *it87_attributes_in[] = { · 1517 unmodified lines | ||
| 2015 | 2015 | &sensor_dev_attr_in10_input.dev_attr.attr, /* 41 */ |
| 2016 | 2016 | &sensor_dev_attr_in11_input.dev_attr.attr, /* 41 */ |
| 2017 | 2017 | &sensor_dev_attr_in12_input.dev_attr.attr, /* 41 */ |
| 2018 | + NULL | |
| 2018 | 2019 | }; |
| 2019 | 2020 | |
| 2020 | 2021 | static const struct attribute_group it87_group_in = { |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | #define AT91_I2C_TIMEOUT msecs_to_jiffies(100) /* transfer timeout */ |
| 39 | 39 | #define AT91_I2C_DMA_THRESHOLD 8 /* enable DMA if transfer size is bigger than this threshold */ |
| 40 | 40 | #define AUTOSUSPEND_TIMEOUT 2000 |
| 41 | +#define AT91_I2C_MAX_ALT_CMD_DATA_SIZE 256 | |
| 41 | 42 | |
| 42 | 43 | /* AT91 TWI register definitions */ |
| 43 | 44 | #define AT91_TWI_CR 0x0000 /* Control Register */ |
| @@ -141,6 +142,7 @@ struct at91_twi_dev { · 97 unmodified lines | ||
| 141 | 142 | unsigned twi_cwgr_reg; |
| 142 | 143 | struct at91_twi_pdata *pdata; |
| 143 | 144 | bool use_dma; |
| 145 | + bool use_alt_cmd; | |
| 144 | 146 | bool recv_len_abort; |
| 145 | 147 | u32 fifo_size; |
| 146 | 148 | struct at91_twi_dma dma; |
| @@ -269,7 +271,7 @@ static void at91_twi_write_next_byte(struct at91_twi_dev *dev) · 122 unmodified lines | ||
| 269 | 271 | |
| 270 | 272 | /* send stop when last byte has been written */ |
| 271 | 273 | if (--dev->buf_len == 0) |
| 272 | − if (!dev->pdata->has_alt_cmd) | |
| 274 | + if (!dev->use_alt_cmd) | |
| 273 | 275 | at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_STOP); |
| 274 | 276 | |
| 275 | 277 | dev_dbg(dev->dev, "wrote 0x%x, to go %d\n", *dev->buf, dev->buf_len); |
| @@ -292,7 +294,7 @@ static void at91_twi_write_data_dma_callback(void *data) · 16 unmodified lines | ||
| 292 | 294 | * we just have to enable TXCOMP one. |
| 293 | 295 | */ |
| 294 | 296 | at91_twi_write(dev, AT91_TWI_IER, AT91_TWI_TXCOMP); |
| 295 | − if (!dev->pdata->has_alt_cmd) | |
| 297 | + if (!dev->use_alt_cmd) | |
| 296 | 298 | at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_STOP); |
| 297 | 299 | } |
| 298 | 300 | |
| @@ -410,7 +412,7 @@ static void at91_twi_read_next_byte(struct at91_twi_dev *dev) · 111 unmodified lines | ||
| 410 | 412 | } |
| 411 | 413 | |
| 412 | 414 | /* send stop if second but last byte has been read */ |
| 413 | − if (!dev->pdata->has_alt_cmd && dev->buf_len == 1) | |
| 415 | + if (!dev->use_alt_cmd && dev->buf_len == 1) | |
| 414 | 416 | at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_STOP); |
| 415 | 417 | |
| 416 | 418 | dev_dbg(dev->dev, "read 0x%x, to go %d\n", *dev->buf, dev->buf_len); |
| @@ -426,7 +428,7 @@ static void at91_twi_read_data_dma_callback(void *data) · 9 unmodified lines | ||
| 426 | 428 | dma_unmap_single(dev->dev, sg_dma_address(&dev->dma.sg[0]), |
| 427 | 429 | dev->buf_len, DMA_FROM_DEVICE); |
| 428 | 430 | |
| 429 | − if (!dev->pdata->has_alt_cmd) { | |
| 431 | + if (!dev->use_alt_cmd) { | |
| 430 | 432 | /* The last two bytes have to be read without using dma */ |
| 431 | 433 | dev->buf += dev->buf_len - 2; |
| 432 | 434 | dev->buf_len = 2; |
| @@ -443,7 +445,7 @@ static void at91_twi_read_data_dma(struct at91_twi_dev *dev) · 10 unmodified lines | ||
| 443 | 445 | struct dma_chan *chan_rx = dma->chan_rx; |
| 444 | 446 | size_t buf_len; |
| 445 | 447 | |
| 446 | − buf_len = (dev->pdata->has_alt_cmd) ? dev->buf_len : dev->buf_len - 2; | |
| 448 | + buf_len = (dev->use_alt_cmd) ? dev->buf_len : dev->buf_len - 2; | |
| 447 | 449 | dma->direction = DMA_FROM_DEVICE; |
| 448 | 450 | |
| 449 | 451 | /* Keep in mind that we won't use dma to read the last two bytes */ |
| @@ -651,7 +653,7 @@ static int at91_do_twi_transfer(struct at91_twi_dev *dev) · 201 unmodified lines | ||
| 651 | 653 | unsigned start_flags = AT91_TWI_START; |
| 652 | 654 | |
| 653 | 655 | /* if only one byte is to be read, immediately stop transfer */ |
| 654 | − if (!has_alt_cmd && dev->buf_len <= 1 && | |
| 656 | + if (!dev->use_alt_cmd && dev->buf_len <= 1 && | |
| 655 | 657 | !(dev->msg->flags & I2C_M_RECV_LEN)) |
| 656 | 658 | start_flags |= AT91_TWI_STOP; |
| 657 | 659 | at91_twi_write(dev, AT91_TWI_CR, start_flags); |
| @@ -745,7 +747,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) · 87 unmodified lines | ||
| 745 | 747 | int ret; |
| 746 | 748 | unsigned int_addr_flag = 0; |
| 747 | 749 | struct i2c_msg *m_start = msg; |
| 748 | − bool is_read, use_alt_cmd = false; | |
| 750 | + bool is_read; | |
| 749 | 751 | |
| 750 | 752 | dev_dbg(&adap->dev, "at91_xfer: processing %d messages:\n", num); |
| 751 | 753 | |
| @@ -768,14 +770,16 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) · 16 unmodified lines | ||
| 768 | 770 | at91_twi_write(dev, AT91_TWI_IADR, internal_address); |
| 769 | 771 | } |
| 770 | 772 | |
| 773 | + dev->use_alt_cmd = false; | |
| 771 | 774 | is_read = (m_start->flags & I2C_M_RD); |
| 772 | 775 | if (dev->pdata->has_alt_cmd) { |
| 773 | − if (m_start->len > 0) { | |
| 776 | + if (m_start->len > 0 && | |
| 777 | + m_start->len < AT91_I2C_MAX_ALT_CMD_DATA_SIZE) { | |
| 774 | 778 | at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_ACMEN); |
| 775 | 779 | at91_twi_write(dev, AT91_TWI_ACR, |
| 776 | 780 | AT91_TWI_ACR_DATAL(m_start->len) | |
| 777 | 781 | ((is_read) ? AT91_TWI_ACR_DIR : 0)); |
| 778 | − use_alt_cmd = true; | |
| 782 | + dev->use_alt_cmd = true; | |
| 779 | 783 | } else { |
| 780 | 784 | at91_twi_write(dev, AT91_TWI_CR, AT91_TWI_ACMDIS); |
| 781 | 785 | } |
| @@ -784,7 +788,7 @@ static int at91_twi_xfer(struct i2c_adapter *adap, struct i2c_msg *msg, int num) · 2 unmodified lines | ||
| 784 | 788 | at91_twi_write(dev, AT91_TWI_MMR, |
| 785 | 789 | (m_start->addr << 16) | |
| 786 | 790 | int_addr_flag | |
| 787 | − ((!use_alt_cmd && is_read) ? AT91_TWI_MREAD : 0)); | |
| 791 | + ((!dev->use_alt_cmd && is_read) ? AT91_TWI_MREAD : 0)); | |
| 788 | 792 | |
| 789 | 793 | dev->buf_len = m_start->len; |
| 790 | 794 | dev->buf = m_start->buf; |
| @@ -158,7 +158,7 @@ static irqreturn_t bcm_iproc_i2c_isr(int irq, void *data) · 157 unmodified lines | ||
| 158 | 158 | |
| 159 | 159 | if (status & BIT(IS_M_START_BUSY_SHIFT)) { |
| 160 | 160 | iproc_i2c->xfer_is_done = 1; |
| 161 | − complete_all(&iproc_i2c->done); | |
| 161 | + complete(&iproc_i2c->done); | |
| 162 | 162 | } |
| 163 | 163 | |
| 164 | 164 | writel(status, iproc_i2c->base + IS_OFFSET); |
| @@ -229,7 +229,7 @@ static irqreturn_t bcm_kona_i2c_isr(int irq, void *devid) · 228 unmodified lines | ||
| 229 | 229 | dev->base + TXFCR_OFFSET); |
| 230 | 230 | |
| 231 | 231 | writel(status & ~ISR_RESERVED_MASK, dev->base + ISR_OFFSET); |
| 232 | − complete_all(&dev->done); | |
| 232 | + complete(&dev->done); | |
| 233 | 233 | |
| 234 | 234 | return IRQ_HANDLED; |
| 235 | 235 | } |
| @@ -643,7 +643,7 @@ static int bcm_kona_i2c_xfer(struct i2c_adapter *adapter, · 407 unmodified lines | ||
| 643 | 643 | if (rc < 0) { |
| 644 | 644 | dev_err(dev->device, |
| 645 | 645 | "restart cmd failed rc = %d\n", rc); |
| 646 | − goto xfer_send_stop; | |
| 646 | + goto xfer_send_stop; | |
| 647 | 647 | } |
| 648 | 648 | } |
| 649 | 649 | |
| @@ -228,7 +228,7 @@ static irqreturn_t brcmstb_i2c_isr(int irq, void *devid) · 227 unmodified lines | ||
| 228 | 228 | return IRQ_NONE; |
| 229 | 229 | |
| 230 | 230 | brcmstb_i2c_enable_disable_irq(dev, INT_DISABLE); |
| 231 | − complete_all(&dev->done); | |
| 231 | + complete(&dev->done); | |
| 232 | 232 | |
| 233 | 233 | dev_dbg(dev->device, "isr handled"); |
| 234 | 234 | return IRQ_HANDLED; |
| @@ -767,7 +767,7 @@ static int cdns_i2c_setclk(unsigned long clk_in, struct cdns_i2c *id) · 766 unmodified lines | ||
| 767 | 767 | * depending on the scaling direction. |
| 768 | 768 | * |
| 769 | 769 | * Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK |
| 770 | − * to acknowedge the change, NOTIFY_DONE if the notification is | |
| 770 | + * to acknowledge the change, NOTIFY_DONE if the notification is | |
| 771 | 771 | * considered irrelevant. |
| 772 | 772 | */ |
| 773 | 773 | static int cdns_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long |
| @@ -215,7 +215,7 @@ static int ec_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg i2c_msgs[], · 214 unmodified lines | ||
| 215 | 215 | msg->outsize = request_len; |
| 216 | 216 | msg->insize = response_len; |
| 217 | 217 | |
| 218 | − result = cros_ec_cmd_xfer(bus->ec, msg); | |
| 218 | + result = cros_ec_cmd_xfer_status(bus->ec, msg); | |
| 219 | 219 | if (result < 0) { |
| 220 | 220 | dev_err(dev, "Error transferring EC i2c message %d\n", result); |
| 221 | 221 | goto exit; |
| @@ -367,13 +367,17 @@ int i2c_dw_init(struct dw_i2c_dev *dev) · 366 unmodified lines | ||
| 367 | 367 | dev_dbg(dev->dev, "Fast-mode HCNT:LCNT = %d:%d\n", hcnt, lcnt); |
| 368 | 368 | |
| 369 | 369 | /* Configure SDA Hold Time if required */ |
| 370 | − if (dev->sda_hold_time) { | |
| 371 | − reg = dw_readl(dev, DW_IC_COMP_VERSION); | |
| 372 | − if (reg >= DW_IC_SDA_HOLD_MIN_VERS) | |
| 370 | + reg = dw_readl(dev, DW_IC_COMP_VERSION); | |
| 371 | + if (reg >= DW_IC_SDA_HOLD_MIN_VERS) { | |
| 372 | + if (dev->sda_hold_time) { | |
| 373 | 373 | dw_writel(dev, dev->sda_hold_time, DW_IC_SDA_HOLD); |
| 374 | − else | |
| 375 | − dev_warn(dev->dev, | |
| 376 | − "Hardware too old to adjust SDA hold time."); | |
| 374 | + } else { | |
| 375 | + /* Keep previous hold time setting if no one set it */ | |
| 376 | + dev->sda_hold_time = dw_readl(dev, DW_IC_SDA_HOLD); | |
| 377 | + } | |
| 378 | + } else { | |
| 379 | + dev_warn(dev->dev, | |
| 380 | + "Hardware too old to adjust SDA hold time.\n"); | |
| 377 | 381 | } |
| 378 | 382 | |
| 379 | 383 | /* Configure Tx/Rx FIFO threshold levels */ |
| @@ -773,13 +773,6 @@ static int pch_i2c_probe(struct pci_dev *pdev, · 772 unmodified lines | ||
| 773 | 773 | /* Set the number of I2C channel instance */ |
| 774 | 774 | adap_info->ch_num = id->driver_data; |
| 775 | 775 | |
| 776 | − ret = request_irq(pdev->irq, pch_i2c_handler, IRQF_SHARED, | |
| 777 | − KBUILD_MODNAME, adap_info); | |
| 778 | − if (ret) { | |
| 779 | − pch_pci_err(pdev, "request_irq FAILED\n"); | |
| 780 | − goto err_request_irq; | |
| 781 | − } | |
| 782 | − | |
| 783 | 776 | for (i = 0; i < adap_info->ch_num; i++) { |
| 784 | 777 | pch_adap = &adap_info->pch_data[i].pch_adapter; |
| 785 | 778 | adap_info->pch_i2c_suspended = false; |
| @@ -797,6 +790,17 @@ static int pch_i2c_probe(struct pci_dev *pdev, · 11 unmodified lines | ||
| 797 | 790 | |
| 798 | 791 | pch_adap->dev.of_node = pdev->dev.of_node; |
| 799 | 792 | pch_adap->dev.parent = &pdev->dev; |
| 793 | + } | |
| 794 | + | |
| 795 | + ret = request_irq(pdev->irq, pch_i2c_handler, IRQF_SHARED, | |
| 796 | + KBUILD_MODNAME, adap_info); | |
| 797 | + if (ret) { | |
| 798 | + pch_pci_err(pdev, "request_irq FAILED\n"); | |
| 799 | + goto err_request_irq; | |
| 800 | + } | |
| 801 | + | |
| 802 | + for (i = 0; i < adap_info->ch_num; i++) { | |
| 803 | + pch_adap = &adap_info->pch_data[i].pch_adapter; | |
| 800 | 804 | |
| 801 | 805 | pch_i2c_init(&adap_info->pch_data[i]); |
| 802 | 806 | |
| @@ -211,7 +211,7 @@ static void meson_i2c_stop(struct meson_i2c *i2c) · 210 unmodified lines | ||
| 211 | 211 | meson_i2c_add_token(i2c, TOKEN_STOP); |
| 212 | 212 | } else { |
| 213 | 213 | i2c->state = STATE_IDLE; |
| 214 | − complete_all(&i2c->done); | |
| 214 | + complete(&i2c->done); | |
| 215 | 215 | } |
| 216 | 216 | } |
| 217 | 217 | |
| @@ -238,7 +238,7 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) · 20 unmodified lines | ||
| 238 | 238 | dev_dbg(i2c->dev, "error bit set\n"); |
| 239 | 239 | i2c->error = -ENXIO; |
| 240 | 240 | i2c->state = STATE_IDLE; |
| 241 | − complete_all(&i2c->done); | |
| 241 | + complete(&i2c->done); | |
| 242 | 242 | goto out; |
| 243 | 243 | } |
| 244 | 244 | |
| @@ -269,7 +269,7 @@ static irqreturn_t meson_i2c_irq(int irqno, void *dev_id) · 24 unmodified lines | ||
| 269 | 269 | break; |
| 270 | 270 | case STATE_STOP: |
| 271 | 271 | i2c->state = STATE_IDLE; |
| 272 | − complete_all(&i2c->done); | |
| 272 | + complete(&i2c->done); | |
| 273 | 273 | break; |
| 274 | 274 | case STATE_IDLE: |
| 275 | 275 | break; |
| @@ -379,6 +379,7 @@ static int ocores_i2c_of_probe(struct platform_device *pdev, · 378 unmodified lines | ||
| 379 | 379 | if (!clock_frequency_present) { |
| 380 | 380 | dev_err(&pdev->dev, |
| 381 | 381 | "Missing required parameter 'opencores,ip-clock-frequency'\n"); |
| 382 | + clk_disable_unprepare(i2c->clk); | |
| 382 | 383 | return -ENODEV; |
| 383 | 384 | } |
| 384 | 385 | i2c->ip_clock_khz = clock_frequency / 1000; |
| @@ -467,20 +468,21 @@ static int ocores_i2c_probe(struct platform_device *pdev) · 82 unmodified lines | ||
| 467 | 468 | default: |
| 468 | 469 | dev_err(&pdev->dev, "Unsupported I/O width (%d)\n", |
| 469 | 470 | i2c->reg_io_width); |
| 470 | − return -EINVAL; | |
| 471 | + ret = -EINVAL; | |
| 472 | + goto err_clk; | |
| 471 | 473 | } |
| 472 | 474 | } |
| 473 | 475 | |
| 474 | 476 | ret = ocores_init(&pdev->dev, i2c); |
| 475 | 477 | if (ret) |
| 476 | − return ret; | |
| 478 | + goto err_clk; | |
| 477 | 479 | |
| 478 | 480 | init_waitqueue_head(&i2c->wait); |
| 479 | 481 | ret = devm_request_irq(&pdev->dev, irq, ocores_isr, 0, |
| 480 | 482 | pdev->name, i2c); |
| 481 | 483 | if (ret) { |
| 482 | 484 | dev_err(&pdev->dev, "Cannot claim IRQ\n"); |
| 483 | − return ret; | |
| 485 | + goto err_clk; | |
| 484 | 486 | } |
| 485 | 487 | |
| 486 | 488 | /* hook up driver to tree */ |
| @@ -494,7 +496,7 @@ static int ocores_i2c_probe(struct platform_device *pdev) · 7 unmodified lines | ||
| 494 | 496 | ret = i2c_add_adapter(&i2c->adap); |
| 495 | 497 | if (ret) { |
| 496 | 498 | dev_err(&pdev->dev, "Failed to add adapter\n"); |
| 497 | − return ret; | |
| 499 | + goto err_clk; | |
| 498 | 500 | } |
| 499 | 501 | |
| 500 | 502 | /* add in known devices to the bus */ |
| @@ -504,6 +506,10 @@ static int ocores_i2c_probe(struct platform_device *pdev) · 3 unmodified lines | ||
| 504 | 506 | } |
| 505 | 507 | |
| 506 | 508 | return 0; |
| 509 | + | |
| 510 | +err_clk: | |
| 511 | + clk_disable_unprepare(i2c->clk); | |
| 512 | + return ret; | |
| 507 | 513 | } |
| 508 | 514 | |
| 509 | 515 | static int ocores_i2c_remove(struct platform_device *pdev) |
| @@ -1599,7 +1599,8 @@ static int qup_i2c_pm_resume_runtime(struct device *device) · 1598 unmodified lines | ||
| 1599 | 1599 | #ifdef CONFIG_PM_SLEEP |
| 1600 | 1600 | static int qup_i2c_suspend(struct device *device) |
| 1601 | 1601 | { |
| 1602 | − qup_i2c_pm_suspend_runtime(device); | |
| 1602 | + if (!pm_runtime_suspended(device)) | |
| 1603 | + return qup_i2c_pm_suspend_runtime(device); | |
| 1603 | 1604 | return 0; |
| 1604 | 1605 | } |
| 1605 | 1606 | |
| @@ -378,7 +378,7 @@ static void rcar_i2c_dma(struct rcar_i2c_priv *priv) · 377 unmodified lines | ||
| 378 | 378 | } |
| 379 | 379 | |
| 380 | 380 | dma_addr = dma_map_single(chan->device->dev, buf, len, dir); |
| 381 | − if (dma_mapping_error(dev, dma_addr)) { | |
| 381 | + if (dma_mapping_error(chan->device->dev, dma_addr)) { | |
| 382 | 382 | dev_dbg(dev, "dma map failed, using PIO\n"); |
| 383 | 383 | return; |
| 384 | 384 | } |
| @@ -918,7 +918,7 @@ static void rk3x_i2c_adapt_div(struct rk3x_i2c *i2c, unsigned long clk_rate) · 917 unmodified lines | ||
| 918 | 918 | * Code adapted from i2c-cadence.c. |
| 919 | 919 | * |
| 920 | 920 | * Return: NOTIFY_STOP if the rate change should be aborted, NOTIFY_OK |
| 921 | − * to acknowedge the change, NOTIFY_DONE if the notification is | |
| 921 | + * to acknowledge the change, NOTIFY_DONE if the notification is | |
| 922 | 922 | * considered irrelevant. |
| 923 | 923 | */ |
| 924 | 924 | static int rk3x_i2c_clk_notifier_cb(struct notifier_block *nb, unsigned long |
| @@ -1111,6 +1111,15 @@ static int rk3x_i2c_xfer(struct i2c_adapter *adap, · 186 unmodified lines | ||
| 1111 | 1111 | return ret < 0 ? ret : num; |
| 1112 | 1112 | } |
| 1113 | 1113 | |
| 1114 | +static __maybe_unused int rk3x_i2c_resume(struct device *dev) | |
| 1115 | +{ | |
| 1116 | + struct rk3x_i2c *i2c = dev_get_drvdata(dev); | |
| 1117 | + | |
| 1118 | + rk3x_i2c_adapt_div(i2c, clk_get_rate(i2c->clk)); | |
| 1119 | + | |
| 1120 | + return 0; | |
| 1121 | +} | |
| 1122 | + | |
| 1114 | 1123 | static u32 rk3x_i2c_func(struct i2c_adapter *adap) |
| 1115 | 1124 | { |
| 1116 | 1125 | return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL | I2C_FUNC_PROTOCOL_MANGLING; |
| @@ -1334,12 +1343,15 @@ static int rk3x_i2c_remove(struct platform_device *pdev) · 217 unmodified lines | ||
| 1334 | 1343 | return 0; |
| 1335 | 1344 | } |
| 1336 | 1345 | |
| 1346 | +static SIMPLE_DEV_PM_OPS(rk3x_i2c_pm_ops, NULL, rk3x_i2c_resume); | |
| 1347 | + | |
| 1337 | 1348 | static struct platform_driver rk3x_i2c_driver = { |
| 1338 | 1349 | .probe = rk3x_i2c_probe, |
| 1339 | 1350 | .remove = rk3x_i2c_remove, |
| 1340 | 1351 | .driver = { |
| 1341 | 1352 | .name = "rk3x-i2c", |
| 1342 | 1353 | .of_match_table = rk3x_i2c_match, |
| 1354 | + .pm = &rk3x_i2c_pm_ops, | |
| 1343 | 1355 | }, |
| 1344 | 1356 | }; |
| 1345 | 1357 | |
| @@ -610,7 +610,7 @@ static void sh_mobile_i2c_xfer_dma(struct sh_mobile_i2c_data *pd) · 609 unmodified lines | ||
| 610 | 610 | return; |
| 611 | 611 | |
| 612 | 612 | dma_addr = dma_map_single(chan->device->dev, pd->msg->buf, pd->msg->len, dir); |
| 613 | − if (dma_mapping_error(pd->dev, dma_addr)) { | |
| 613 | + if (dma_mapping_error(chan->device->dev, dma_addr)) { | |
| 614 | 614 | dev_dbg(pd->dev, "dma map failed, using PIO\n"); |
| 615 | 615 | return; |
| 616 | 616 | } |
| @@ -37,8 +37,6 @@ struct i2c_demux_pinctrl_priv { · 36 unmodified lines | ||
| 37 | 37 | struct i2c_demux_pinctrl_chan chan[]; |
| 38 | 38 | }; |
| 39 | 39 | |
| 40 | −static struct property status_okay = { .name = "status", .length = 3, .value = "ok" }; | |
| 41 | − | |
| 42 | 40 | static int i2c_demux_master_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], int num) |
| 43 | 41 | { |
| 44 | 42 | struct i2c_demux_pinctrl_priv *priv = adap->algo_data; |
| @@ -68,7 +66,7 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne · 23 unmodified lines | ||
| 68 | 66 | adap = of_find_i2c_adapter_by_node(priv->chan[new_chan].parent_np); |
| 69 | 67 | if (!adap) { |
| 70 | 68 | ret = -ENODEV; |
| 71 | − goto err; | |
| 69 | + goto err_with_revert; | |
| 72 | 70 | } |
| 73 | 71 | |
| 74 | 72 | p = devm_pinctrl_get_select(adap->dev.parent, priv->bus_name); |
| @@ -103,8 +101,11 @@ static int i2c_demux_activate_master(struct i2c_demux_pinctrl_priv *priv, u32 ne · 28 unmodified lines | ||
| 103 | 101 | |
| 104 | 102 | err_with_put: |
| 105 | 103 | i2c_put_adapter(adap); |
| 104 | + err_with_revert: | |
| 105 | + of_changeset_revert(&priv->chan[new_chan].chgset); | |
| 106 | 106 | err: |
| 107 | 107 | dev_err(priv->dev, "failed to setup demux-adapter %d (%d)\n", new_chan, ret); |
| 108 | + priv->cur_chan = -EINVAL; | |
| 108 | 109 | return ret; |
| 109 | 110 | } |
| 110 | 111 | |
| @@ -190,6 +191,7 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) · 79 unmodified lines | ||
| 190 | 191 | { |
| 191 | 192 | struct device_node *np = pdev->dev.of_node; |
| 192 | 193 | struct i2c_demux_pinctrl_priv *priv; |
| 194 | + struct property *props; | |
| 193 | 195 | int num_chan, i, j, err; |
| 194 | 196 | |
| 195 | 197 | num_chan = of_count_phandle_with_args(np, "i2c-parent", NULL); |
| @@ -200,7 +202,10 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) · 4 unmodified lines | ||
| 200 | 202 | |
| 201 | 203 | priv = devm_kzalloc(&pdev->dev, sizeof(*priv) |
| 202 | 204 | + num_chan * sizeof(struct i2c_demux_pinctrl_chan), GFP_KERNEL); |
| 203 | − if (!priv) | |
| 205 | + | |
| 206 | + props = devm_kcalloc(&pdev->dev, num_chan, sizeof(*props), GFP_KERNEL); | |
| 207 | + | |
| 208 | + if (!priv || !props) | |
| 204 | 209 | return -ENOMEM; |
| 205 | 210 | |
| 206 | 211 | err = of_property_read_string(np, "i2c-bus-name", &priv->bus_name); |
| @@ -218,8 +223,12 @@ static int i2c_demux_pinctrl_probe(struct platform_device *pdev) · 11 unmodified lines | ||
| 218 | 223 | } |
| 219 | 224 | priv->chan[i].parent_np = adap_np; |
| 220 | 225 | |
| 226 | + props[i].name = devm_kstrdup(&pdev->dev, "status", GFP_KERNEL); | |
| 227 | + props[i].value = devm_kstrdup(&pdev->dev, "ok", GFP_KERNEL); | |
| 228 | + props[i].length = 3; | |
| 229 | + | |
| 221 | 230 | of_changeset_init(&priv->chan[i].chgset); |
| 222 | − of_changeset_update_property(&priv->chan[i].chgset, adap_np, &status_okay); | |
| 231 | + of_changeset_update_property(&priv->chan[i].chgset, adap_np, &props[i]); | |
| 223 | 232 | } |
| 224 | 233 | |
| 225 | 234 | priv->num_chan = num_chan; |
| @@ -164,7 +164,7 @@ static int pca954x_select_chan(struct i2c_mux_core *muxc, u32 chan) · 163 unmodified lines | ||
| 164 | 164 | /* Only select the channel if its different from the last channel */ |
| 165 | 165 | if (data->last_chan != regval) { |
| 166 | 166 | ret = pca954x_reg_write(muxc->parent, client, regval); |
| 167 | − data->last_chan = regval; | |
| 167 | + data->last_chan = ret ? 0 : regval; | |
| 168 | 168 | } |
| 169 | 169 | |
| 170 | 170 | return ret; |
| @@ -20,6 +20,8 @@ config BMA180 · 19 unmodified lines | ||
| 20 | 20 | config BMA220 |
| 21 | 21 | tristate "Bosch BMA220 3-Axis Accelerometer Driver" |
| 22 | 22 | depends on SPI |
| 23 | + select IIO_BUFFER | |
| 24 | + select IIO_TRIGGERED_BUFFER | |
| 23 | 25 | help |
| 24 | 26 | Say yes here to add support for the Bosch BMA220 triaxial |
| 25 | 27 | acceleration sensor. |
| @@ -234,7 +236,8 @@ config STK8312 · 208 unmodified lines | ||
| 234 | 236 | config STK8BA50 |
| 235 | 237 | tristate "Sensortek STK8BA50 3-Axis Accelerometer Driver" |
| 236 | 238 | depends on I2C |
| 237 | − depends on IIO_TRIGGER | |
| 239 | + select IIO_BUFFER | |
| 240 | + select IIO_TRIGGERED_BUFFER | |
| 238 | 241 | help |
| 239 | 242 | Say yes here to get support for the Sensortek STK8BA50 3-axis |
| 240 | 243 | accelerometer. |
| @@ -253,7 +253,7 @@ static int bma220_probe(struct spi_device *spi) · 252 unmodified lines | ||
| 253 | 253 | if (ret < 0) |
| 254 | 254 | return ret; |
| 255 | 255 | |
| 256 | − ret = iio_triggered_buffer_setup(indio_dev, NULL, | |
| 256 | + ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time, | |
| 257 | 257 | bma220_trigger_handler, NULL); |
| 258 | 258 | if (ret < 0) { |
| 259 | 259 | dev_err(&spi->dev, "iio triggered buffer setup failed\n"); |
| @@ -67,6 +67,9 @@ · 66 unmodified lines | ||
| 67 | 67 | #define BMC150_ACCEL_REG_PMU_BW 0x10 |
| 68 | 68 | #define BMC150_ACCEL_DEF_BW 125 |
| 69 | 69 | |
| 70 | +#define BMC150_ACCEL_REG_RESET 0x14 | |
| 71 | +#define BMC150_ACCEL_RESET_VAL 0xB6 | |
| 72 | + | |
| 70 | 73 | #define BMC150_ACCEL_REG_INT_MAP_0 0x19 |
| 71 | 74 | #define BMC150_ACCEL_INT_MAP_0_BIT_SLOPE BIT(2) |
| 72 | 75 | |
| @@ -1497,6 +1500,14 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data) · 1424 unmodified lines | ||
| 1497 | 1500 | int ret, i; |
| 1498 | 1501 | unsigned int val; |
| 1499 | 1502 | |
| 1503 | + /* | |
| 1504 | + * Reset chip to get it in a known good state. A delay of 1.8ms after | |
| 1505 | + * reset is required according to the data sheets of supported chips. | |
| 1506 | + */ | |
| 1507 | + regmap_write(data->regmap, BMC150_ACCEL_REG_RESET, | |
| 1508 | + BMC150_ACCEL_RESET_VAL); | |
| 1509 | + usleep_range(1800, 2500); | |
| 1510 | + | |
| 1500 | 1511 | ret = regmap_read(data->regmap, BMC150_ACCEL_REG_CHIP_ID, &val); |
| 1501 | 1512 | if (ret < 0) { |
| 1502 | 1513 | dev_err(dev, "Error: Reading chip id\n"); |
| @@ -160,11 +160,13 @@ static int kxsd9_read_raw(struct iio_dev *indio_dev, · 159 unmodified lines | ||
| 160 | 160 | if (ret < 0) |
| 161 | 161 | goto error_ret; |
| 162 | 162 | *val = ret; |
| 163 | + ret = IIO_VAL_INT; | |
| 163 | 164 | break; |
| 164 | 165 | case IIO_CHAN_INFO_SCALE: |
| 165 | 166 | ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C)); |
| 166 | 167 | if (ret < 0) |
| 167 | 168 | goto error_ret; |
| 169 | + *val = 0; | |
| 168 | 170 | *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK]; |
| 169 | 171 | ret = IIO_VAL_INT_PLUS_MICRO; |
| 170 | 172 | break; |
| @@ -389,6 +389,7 @@ config QCOM_SPMI_VADC · 388 unmodified lines | ||
| 389 | 389 | config ROCKCHIP_SARADC |
| 390 | 390 | tristate "Rockchip SARADC driver" |
| 391 | 391 | depends on ARCH_ROCKCHIP || (ARM && COMPILE_TEST) |
| 392 | + depends on RESET_CONTROLLER | |
| 392 | 393 | help |
| 393 | 394 | Say yes here to build support for the SARADC found in SoCs from |
| 394 | 395 | Rockchip. |
| @@ -527,6 +527,7 @@ static struct attribute_group ad799x_event_attrs_group = { · 526 unmodified lines | ||
| 527 | 527 | static const struct iio_info ad7991_info = { |
| 528 | 528 | .read_raw = &ad799x_read_raw, |
| 529 | 529 | .driver_module = THIS_MODULE, |
| 530 | + .update_scan_mode = ad799x_update_scan_mode, | |
| 530 | 531 | }; |
| 531 | 532 | |
| 532 | 533 | static const struct iio_info ad7993_4_7_8_noirq_info = { |
| @@ -381,8 +381,8 @@ static irqreturn_t at91_adc_rl_interrupt(int irq, void *private) · 380 unmodified lines | ||
| 381 | 381 | st->ts_bufferedmeasure = false; |
| 382 | 382 | input_report_key(st->ts_input, BTN_TOUCH, 0); |
| 383 | 383 | input_sync(st->ts_input); |
| 384 | − } else if (status & AT91_ADC_EOC(3)) { | |
| 385 | − /* Conversion finished */ | |
| 384 | + } else if (status & AT91_ADC_EOC(3) && st->ts_input) { | |
| 385 | + /* Conversion finished and we've a touchscreen */ | |
| 386 | 386 | if (st->ts_bufferedmeasure) { |
| 387 | 387 | /* |
| 388 | 388 | * Last measurement is always discarded, since it can |
| @@ -21,6 +21,8 @@ · 20 unmodified lines | ||
| 21 | 21 | #include <linux/of_device.h> |
| 22 | 22 | #include <linux/clk.h> |
| 23 | 23 | #include <linux/completion.h> |
| 24 | +#include <linux/delay.h> | |
| 25 | +#include <linux/reset.h> | |
| 24 | 26 | #include <linux/regulator/consumer.h> |
| 25 | 27 | #include <linux/iio/iio.h> |
| 26 | 28 | |
| @@ -53,6 +55,7 @@ struct rockchip_saradc { · 26 unmodified lines | ||
| 53 | 55 | struct clk *clk; |
| 54 | 56 | struct completion completion; |
| 55 | 57 | struct regulator *vref; |
| 58 | + struct reset_control *reset; | |
| 56 | 59 | const struct rockchip_saradc_data *data; |
| 57 | 60 | u16 last_val; |
| 58 | 61 | }; |
| @@ -190,6 +193,16 @@ static const struct of_device_id rockchip_saradc_match[] = { · 131 unmodified lines | ||
| 190 | 193 | }; |
| 191 | 194 | MODULE_DEVICE_TABLE(of, rockchip_saradc_match); |
| 192 | 195 | |
| 196 | +/** | |
| 197 | + * Reset SARADC Controller. | |
| 198 | + */ | |
| 199 | +static void rockchip_saradc_reset_controller(struct reset_control *reset) | |
| 200 | +{ | |
| 201 | + reset_control_assert(reset); | |
| 202 | + usleep_range(10, 20); | |
| 203 | + reset_control_deassert(reset); | |
| 204 | +} | |
| 205 | + | |
| 193 | 206 | static int rockchip_saradc_probe(struct platform_device *pdev) |
| 194 | 207 | { |
| 195 | 208 | struct rockchip_saradc *info = NULL; |
| @@ -218,6 +231,20 @@ static int rockchip_saradc_probe(struct platform_device *pdev) · 22 unmodified lines | ||
| 218 | 231 | if (IS_ERR(info->regs)) |
| 219 | 232 | return PTR_ERR(info->regs); |
| 220 | 233 | |
| 234 | + /* | |
| 235 | + * The reset should be an optional property, as it should work | |
| 236 | + * with old devicetrees as well | |
| 237 | + */ | |
| 238 | + info->reset = devm_reset_control_get(&pdev->dev, "saradc-apb"); | |
| 239 | + if (IS_ERR(info->reset)) { | |
| 240 | + ret = PTR_ERR(info->reset); | |
| 241 | + if (ret != -ENOENT) | |
| 242 | + return ret; | |
| 243 | + | |
| 244 | + dev_dbg(&pdev->dev, "no reset control found\n"); | |
| 245 | + info->reset = NULL; | |
| 246 | + } | |
| 247 | + | |
| 221 | 248 | init_completion(&info->completion); |
| 222 | 249 | |
| 223 | 250 | irq = platform_get_irq(pdev, 0); |
| @@ -252,6 +279,9 @@ static int rockchip_saradc_probe(struct platform_device *pdev) · 28 unmodified lines | ||
| 252 | 279 | return PTR_ERR(info->vref); |
| 253 | 280 | } |
| 254 | 281 | |
| 282 | + if (info->reset) | |
| 283 | + rockchip_saradc_reset_controller(info->reset); | |
| 284 | + | |
| 255 | 285 | /* |
| 256 | 286 | * Use a default value for the converter clock. |
| 257 | 287 | * This may become user-configurable in the future. |
| @@ -489,7 +489,8 @@ static struct iio_info ads1115_info = { · 488 unmodified lines | ||
| 489 | 489 | #ifdef CONFIG_OF |
| 490 | 490 | static int ads1015_get_channels_config_of(struct i2c_client *client) |
| 491 | 491 | { |
| 492 | − struct ads1015_data *data = i2c_get_clientdata(client); | |
| 492 | + struct iio_dev *indio_dev = i2c_get_clientdata(client); | |
| 493 | + struct ads1015_data *data = iio_priv(indio_dev); | |
| 493 | 494 | struct device_node *node; |
| 494 | 495 | |
| 495 | 496 | if (!client->dev.of_node || |
| @@ -32,6 +32,7 @@ · 31 unmodified lines | ||
| 32 | 32 | |
| 33 | 33 | struct tiadc_device { |
| 34 | 34 | struct ti_tscadc_dev *mfd_tscadc; |
| 35 | + struct mutex fifo1_lock; /* to protect fifo access */ | |
| 35 | 36 | int channels; |
| 36 | 37 | u8 channel_line[8]; |
| 37 | 38 | u8 channel_step[8]; |
| @@ -359,6 +360,7 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, · 321 unmodified lines | ||
| 359 | 360 | int *val, int *val2, long mask) |
| 360 | 361 | { |
| 361 | 362 | struct tiadc_device *adc_dev = iio_priv(indio_dev); |
| 363 | + int ret = IIO_VAL_INT; | |
| 362 | 364 | int i, map_val; |
| 363 | 365 | unsigned int fifo1count, read, stepid; |
| 364 | 366 | bool found = false; |
| @@ -372,13 +374,14 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, · 7 unmodified lines | ||
| 372 | 374 | if (!step_en) |
| 373 | 375 | return -EINVAL; |
| 374 | 376 | |
| 377 | + mutex_lock(&adc_dev->fifo1_lock); | |
| 375 | 378 | fifo1count = tiadc_readl(adc_dev, REG_FIFO1CNT); |
| 376 | 379 | while (fifo1count--) |
| 377 | 380 | tiadc_readl(adc_dev, REG_FIFO1); |
| 378 | 381 | |
| 379 | 382 | am335x_tsc_se_set_once(adc_dev->mfd_tscadc, step_en); |
| 380 | 383 | |
| 381 | − timeout = jiffies + usecs_to_jiffies | |
| 384 | + timeout = jiffies + msecs_to_jiffies | |
| 382 | 385 | (IDLE_TIMEOUT * adc_dev->channels); |
| 383 | 386 | /* Wait for Fifo threshold interrupt */ |
| 384 | 387 | while (1) { |
| @@ -388,7 +391,8 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, · 3 unmodified lines | ||
| 388 | 391 | |
| 389 | 392 | if (time_after(jiffies, timeout)) { |
| 390 | 393 | am335x_tsc_se_adc_done(adc_dev->mfd_tscadc); |
| 391 | − return -EAGAIN; | |
| 394 | + ret = -EAGAIN; | |
| 395 | + goto err_unlock; | |
| 392 | 396 | } |
| 393 | 397 | } |
| 394 | 398 | map_val = adc_dev->channel_step[chan->scan_index]; |
| @@ -414,8 +418,11 @@ static int tiadc_read_raw(struct iio_dev *indio_dev, · 19 unmodified lines | ||
| 414 | 418 | am335x_tsc_se_adc_done(adc_dev->mfd_tscadc); |
| 415 | 419 | |
| 416 | 420 | if (found == false) |
| 417 | − return -EBUSY; | |
| 418 | − return IIO_VAL_INT; | |
| 421 | + ret = -EBUSY; | |
| 422 | + | |
| 423 | +err_unlock: | |
| 424 | + mutex_unlock(&adc_dev->fifo1_lock); | |
| 425 | + return ret; | |
| 419 | 426 | } |
| 420 | 427 | |
| 421 | 428 | static const struct iio_info tiadc_info = { |
| @@ -483,6 +490,7 @@ static int tiadc_probe(struct platform_device *pdev) · 61 unmodified lines | ||
| 483 | 490 | |
| 484 | 491 | tiadc_step_config(indio_dev); |
| 485 | 492 | tiadc_writel(adc_dev, REG_FIFO1THR, FIFO1_THRESHOLD); |
| 493 | + mutex_init(&adc_dev->fifo1_lock); | |
| 486 | 494 | |
| 487 | 495 | err = tiadc_channel_init(indio_dev, adc_dev->channels); |
| 488 | 496 | if (err < 0) |
| @@ -434,7 +434,7 @@ static int atlas_read_raw(struct iio_dev *indio_dev, · 433 unmodified lines | ||
| 434 | 434 | break; |
| 435 | 435 | case IIO_ELECTRICALCONDUCTIVITY: |
| 436 | 436 | *val = 1; /* 0.00001 */ |
| 437 | − *val = 100000; | |
| 437 | + *val2 = 100000; | |
| 438 | 438 | break; |
| 439 | 439 | case IIO_CONCENTRATION: |
| 440 | 440 | *val = 0; /* 0.000000001 */ |
| @@ -56,8 +56,8 @@ static struct { · 55 unmodified lines | ||
| 56 | 56 | {HID_USAGE_SENSOR_ALS, 0, 1, 0}, |
| 57 | 57 | {HID_USAGE_SENSOR_ALS, HID_USAGE_SENSOR_UNITS_LUX, 1, 0}, |
| 58 | 58 | |
| 59 | − {HID_USAGE_SENSOR_PRESSURE, 0, 100000, 0}, | |
| 60 | − {HID_USAGE_SENSOR_PRESSURE, HID_USAGE_SENSOR_UNITS_PASCAL, 1, 0}, | |
| 59 | + {HID_USAGE_SENSOR_PRESSURE, 0, 100, 0}, | |
| 60 | + {HID_USAGE_SENSOR_PRESSURE, HID_USAGE_SENSOR_UNITS_PASCAL, 0, 1000}, | |
| 61 | 61 | }; |
| 62 | 62 | |
| 63 | 63 | static int pow_10(unsigned power) |
| @@ -65,6 +65,16 @@ struct stx104_gpio { · 64 unmodified lines | ||
| 65 | 65 | unsigned int out_state; |
| 66 | 66 | }; |
| 67 | 67 | |
| 68 | +/** | |
| 69 | + * struct stx104_dev - STX104 device private data structure | |
| 70 | + * @indio_dev: IIO device | |
| 71 | + * @chip: instance of the gpio_chip | |
| 72 | + */ | |
| 73 | +struct stx104_dev { | |
| 74 | + struct iio_dev *indio_dev; | |
| 75 | + struct gpio_chip *chip; | |
| 76 | +}; | |
| 77 | + | |
| 68 | 78 | static int stx104_read_raw(struct iio_dev *indio_dev, |
| 69 | 79 | struct iio_chan_spec const *chan, int *val, int *val2, long mask) |
| 70 | 80 | { |
| @@ -107,6 +117,7 @@ static const struct iio_chan_spec stx104_channels[STX104_NUM_CHAN] = { · 36 unmodified lines | ||
| 107 | 117 | static int stx104_gpio_get_direction(struct gpio_chip *chip, |
| 108 | 118 | unsigned int offset) |
| 109 | 119 | { |
| 120 | + /* GPIO 0-3 are input only, while the rest are output only */ | |
| 110 | 121 | if (offset < 4) |
| 111 | 122 | return 1; |
| 112 | 123 | |
| @@ -169,6 +180,7 @@ static int stx104_probe(struct device *dev, unsigned int id) · 56 unmodified lines | ||
| 169 | 180 | struct iio_dev *indio_dev; |
| 170 | 181 | struct stx104_iio *priv; |
| 171 | 182 | struct stx104_gpio *stx104gpio; |
| 183 | + struct stx104_dev *stx104dev; | |
| 172 | 184 | int err; |
| 173 | 185 | |
| 174 | 186 | indio_dev = devm_iio_device_alloc(dev, sizeof(*priv)); |
| @@ -179,6 +191,10 @@ static int stx104_probe(struct device *dev, unsigned int id) · 4 unmodified lines | ||
| 179 | 191 | if (!stx104gpio) |
| 180 | 192 | return -ENOMEM; |
| 181 | 193 | |
| 194 | + stx104dev = devm_kzalloc(dev, sizeof(*stx104dev), GFP_KERNEL); | |
| 195 | + if (!stx104dev) | |
| 196 | + return -ENOMEM; | |
| 197 | + | |
| 182 | 198 | if (!devm_request_region(dev, base[id], STX104_EXTENT, |
| 183 | 199 | dev_name(dev))) { |
| 184 | 200 | dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n", |
| @@ -199,12 +215,6 @@ static int stx104_probe(struct device *dev, unsigned int id) · 14 unmodified lines | ||
| 199 | 215 | outw(0, base[id] + 4); |
| 200 | 216 | outw(0, base[id] + 6); |
| 201 | 217 | |
| 202 | − err = devm_iio_device_register(dev, indio_dev); | |
| 203 | − if (err) { | |
| 204 | − dev_err(dev, "IIO device registering failed (%d)\n", err); | |
| 205 | − return err; | |
| 206 | − } | |
| 207 | − | |
| 208 | 218 | stx104gpio->chip.label = dev_name(dev); |
| 209 | 219 | stx104gpio->chip.parent = dev; |
| 210 | 220 | stx104gpio->chip.owner = THIS_MODULE; |
| @@ -220,7 +230,9 @@ static int stx104_probe(struct device *dev, unsigned int id) · 9 unmodified lines | ||
| 220 | 230 | |
| 221 | 231 | spin_lock_init(&stx104gpio->lock); |
| 222 | 232 | |
| 223 | − dev_set_drvdata(dev, stx104gpio); | |
| 233 | + stx104dev->indio_dev = indio_dev; | |
| 234 | + stx104dev->chip = &stx104gpio->chip; | |
| 235 | + dev_set_drvdata(dev, stx104dev); | |
| 224 | 236 | |
| 225 | 237 | err = gpiochip_add_data(&stx104gpio->chip, stx104gpio); |
| 226 | 238 | if (err) { |
| @@ -228,14 +240,22 @@ static int stx104_probe(struct device *dev, unsigned int id) · 1 unmodified line | ||
| 228 | 240 | return err; |
| 229 | 241 | } |
| 230 | 242 | |
| 243 | + err = iio_device_register(indio_dev); | |
| 244 | + if (err) { | |
| 245 | + dev_err(dev, "IIO device registering failed (%d)\n", err); | |
| 246 | + gpiochip_remove(&stx104gpio->chip); | |
| 247 | + return err; | |
| 248 | + } | |
| 249 | + | |
| 231 | 250 | return 0; |
| 232 | 251 | } |
| 233 | 252 | |
| 234 | 253 | static int stx104_remove(struct device *dev, unsigned int id) |
| 235 | 254 | { |
| 236 | − struct stx104_gpio *const stx104gpio = dev_get_drvdata(dev); | |
| 255 | + struct stx104_dev *const stx104dev = dev_get_drvdata(dev); | |
| 237 | 256 | |
| 238 | − gpiochip_remove(&stx104gpio->chip); | |
| 257 | + iio_device_unregister(stx104dev->indio_dev); | |
| 258 | + gpiochip_remove(stx104dev->chip); | |
| 239 | 259 | |
| 240 | 260 | return 0; |
| 241 | 261 | } |
| @@ -6,6 +6,8 @@ menu "Humidity sensors" · 5 unmodified lines | ||
| 6 | 6 | config AM2315 |
| 7 | 7 | tristate "Aosong AM2315 relative humidity and temperature sensor" |
| 8 | 8 | depends on I2C |
| 9 | + select IIO_BUFFER | |
| 10 | + select IIO_TRIGGERED_BUFFER | |
| 9 | 11 | help |
| 10 | 12 | If you say yes here you get support for the Aosong AM2315 |
| 11 | 13 | relative humidity and ambient temperature sensor. |
| @@ -244,7 +244,7 @@ static int am2315_probe(struct i2c_client *client, · 243 unmodified lines | ||
| 244 | 244 | indio_dev->channels = am2315_channels; |
| 245 | 245 | indio_dev->num_channels = ARRAY_SIZE(am2315_channels); |
| 246 | 246 | |
| 247 | − ret = iio_triggered_buffer_setup(indio_dev, NULL, | |
| 247 | + ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time, | |
| 248 | 248 | am2315_trigger_handler, NULL); |
| 249 | 249 | if (ret < 0) { |
| 250 | 250 | dev_err(&client->dev, "iio triggered buffer setup failed\n"); |
| @@ -142,7 +142,7 @@ static int hdc100x_get_measurement(struct hdc100x_data *data, · 141 unmodified lines | ||
| 142 | 142 | struct i2c_client *client = data->client; |
| 143 | 143 | int delay = data->adc_int_us[chan->address]; |
| 144 | 144 | int ret; |
| 145 | − int val; | |
| 145 | + __be16 val; | |
| 146 | 146 | |
| 147 | 147 | /* start measurement */ |
| 148 | 148 | ret = i2c_smbus_write_byte(client, chan->address); |
| @@ -154,26 +154,13 @@ static int hdc100x_get_measurement(struct hdc100x_data *data, · 5 unmodified lines | ||
| 154 | 154 | /* wait for integration time to pass */ |
| 155 | 155 | usleep_range(delay, delay + 1000); |
| 156 | 156 | |
| 157 | − /* | |
| 158 | − * i2c_smbus_read_word_data cannot() be used here due to the command | |
| 159 | − * value not being understood and causes NAKs preventing any reading | |
| 160 | − * from being accessed. | |
| 161 | − */ | |
| 162 | − ret = i2c_smbus_read_byte(client); | |
| 157 | + /* read measurement */ | |
| 158 | + ret = i2c_master_recv(data->client, (char *)&val, sizeof(val)); | |
| 163 | 159 | if (ret < 0) { |
| 164 | − dev_err(&client->dev, "cannot read high byte measurement"); | |
| 160 | + dev_err(&client->dev, "cannot read sensor data\n"); | |
| 165 | 161 | return ret; |
| 166 | 162 | } |
| 167 | − val = ret << 8; | |
| 168 | − | |
| 169 | − ret = i2c_smbus_read_byte(client); | |
| 170 | − if (ret < 0) { | |
| 171 | − dev_err(&client->dev, "cannot read low byte measurement"); | |
| 172 | − return ret; | |
| 173 | − } | |
| 174 | − val |= ret; | |
| 175 | − | |
| 176 | − return val; | |
| 163 | + return be16_to_cpu(val); | |
| 177 | 164 | } |
| 178 | 165 | |
| 179 | 166 | static int hdc100x_get_heater_status(struct hdc100x_data *data) |
| @@ -272,8 +259,8 @@ static int hdc100x_probe(struct i2c_client *client, · 92 unmodified lines | ||
| 272 | 259 | struct iio_dev *indio_dev; |
| 273 | 260 | struct hdc100x_data *data; |
| 274 | 261 | |
| 275 | − if (!i2c_check_functionality(client->adapter, | |
| 276 | − I2C_FUNC_SMBUS_WORD_DATA | I2C_FUNC_SMBUS_BYTE)) | |
| 262 | + if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA | | |
| 263 | + I2C_FUNC_SMBUS_BYTE | I2C_FUNC_I2C)) | |
| 277 | 264 | return -EOPNOTSUPP; |
| 278 | 265 | |
| 279 | 266 | indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data)); |
| @@ -107,9 +107,10 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, · 106 unmodified lines | ||
| 107 | 107 | { |
| 108 | 108 | struct iio_dev *indio_dev = filp->private_data; |
| 109 | 109 | struct iio_buffer *rb = indio_dev->buffer; |
| 110 | + DEFINE_WAIT_FUNC(wait, woken_wake_function); | |
| 110 | 111 | size_t datum_size; |
| 111 | 112 | size_t to_wait; |
| 112 | − int ret; | |
| 113 | + int ret = 0; | |
| 113 | 114 | |
| 114 | 115 | if (!indio_dev->info) |
| 115 | 116 | return -ENODEV; |
| @@ -131,19 +132,29 @@ ssize_t iio_buffer_read_first_n_outer(struct file *filp, char __user *buf, · 15 unmodified lines | ||
| 131 | 132 | else |
| 132 | 133 | to_wait = min_t(size_t, n / datum_size, rb->watermark); |
| 133 | 134 | |
| 135 | + add_wait_queue(&rb->pollq, &wait); | |
| 134 | 136 | do { |
| 135 | − ret = wait_event_interruptible(rb->pollq, | |
| 136 | − iio_buffer_ready(indio_dev, rb, to_wait, n / datum_size)); | |
| 137 | − if (ret) | |
| 138 | − return ret; | |
| 137 | + if (!indio_dev->info) { | |
| 138 | + ret = -ENODEV; | |
| 139 | + break; | |
| 140 | + } | |
| 139 | 141 | |
| 140 | − if (!indio_dev->info) | |
| 141 | − return -ENODEV; | |
| 142 | + if (!iio_buffer_ready(indio_dev, rb, to_wait, n / datum_size)) { | |
| 143 | + if (signal_pending(current)) { | |
| 144 | + ret = -ERESTARTSYS; | |
| 145 | + break; | |
| 146 | + } | |
| 147 | + | |
| 148 | + wait_woken(&wait, TASK_INTERRUPTIBLE, | |
| 149 | + MAX_SCHEDULE_TIMEOUT); | |
| 150 | + continue; | |
| 151 | + } | |
| 142 | 152 | |
| 143 | 153 | ret = rb->access->read_first_n(rb, n, buf); |
| 144 | 154 | if (ret == 0 && (filp->f_flags & O_NONBLOCK)) |
| 145 | 155 | ret = -EAGAIN; |
| 146 | − } while (ret == 0); | |
| 156 | + } while (ret == 0); | |
| 157 | + remove_wait_queue(&rb->pollq, &wait); | |
| 147 | 158 | |
| 148 | 159 | return ret; |
| 149 | 160 | } |
| @@ -613,9 +613,8 @@ ssize_t iio_format_value(char *buf, unsigned int type, int size, int *vals) · 612 unmodified lines | ||
| 613 | 613 | return sprintf(buf, "%d.%09u\n", vals[0], vals[1]); |
| 614 | 614 | case IIO_VAL_FRACTIONAL: |
| 615 | 615 | tmp = div_s64((s64)vals[0] * 1000000000LL, vals[1]); |
| 616 | − vals[1] = do_div(tmp, 1000000000LL); | |
| 617 | − vals[0] = tmp; | |
| 618 | − return sprintf(buf, "%d.%09u\n", vals[0], vals[1]); | |
| 616 | + vals[0] = (int)div_s64_rem(tmp, 1000000000, &vals[1]); | |
| 617 | + return sprintf(buf, "%d.%09u\n", vals[0], abs(vals[1])); | |
| 619 | 618 | case IIO_VAL_FRACTIONAL_LOG2: |
| 620 | 619 | tmp = (s64)vals[0] * 1000000000LL >> vals[1]; |
| 621 | 620 | vals[1] = do_div(tmp, 1000000000LL); |
| @@ -76,7 +76,6 @@ config BH1750 · 75 unmodified lines | ||
| 76 | 76 | config BH1780 |
| 77 | 77 | tristate "ROHM BH1780 ambient light sensor" |
| 78 | 78 | depends on I2C |
| 79 | − depends on !SENSORS_BH1780 | |
| 80 | 79 | help |
| 81 | 80 | Say Y here to build support for the ROHM BH1780GLI ambient |
| 82 | 81 | light sensor. |
| @@ -238,6 +237,8 @@ config MAX44000 · 155 unmodified lines | ||
| 238 | 237 | tristate "MAX44000 Ambient and Infrared Proximity Sensor" |
| 239 | 238 | depends on I2C |
| 240 | 239 | select REGMAP_I2C |
| 240 | + select IIO_BUFFER | |
| 241 | + select IIO_TRIGGERED_BUFFER | |
| 241 | 242 | help |
| 242 | 243 | Say Y here if you want to build support for Maxim Integrated's |
| 243 | 244 | MAX44000 ambient and infrared proximity sensor device. |
| @@ -970,7 +970,7 @@ int bmp280_common_probe(struct device *dev, · 969 unmodified lines | ||
| 970 | 970 | data->vdda = devm_regulator_get(dev, "vdda"); |
| 971 | 971 | if (IS_ERR(data->vdda)) { |
| 972 | 972 | dev_err(dev, "failed to get VDDA regulator\n"); |
| 973 | − ret = PTR_ERR(data->vddd); | |
| 973 | + ret = PTR_ERR(data->vdda); | |
| 974 | 974 | goto out_disable_vddd; |
| 975 | 975 | } |
| 976 | 976 | ret = regulator_enable(data->vdda); |
| @@ -1079,7 +1079,8 @@ EXPORT_SYMBOL(bmp280_common_remove); · 102 unmodified lines | ||
| 1079 | 1079 | #ifdef CONFIG_PM |
| 1080 | 1080 | static int bmp280_runtime_suspend(struct device *dev) |
| 1081 | 1081 | { |
| 1082 | − struct bmp280_data *data = dev_get_drvdata(dev); | |
| 1082 | + struct iio_dev *indio_dev = dev_get_drvdata(dev); | |
| 1083 | + struct bmp280_data *data = iio_priv(indio_dev); | |
| 1083 | 1084 | int ret; |
| 1084 | 1085 | |
| 1085 | 1086 | ret = regulator_disable(data->vdda); |
| @@ -1090,7 +1091,8 @@ static int bmp280_runtime_suspend(struct device *dev) · 4 unmodified lines | ||
| 1090 | 1091 | |
| 1091 | 1092 | static int bmp280_runtime_resume(struct device *dev) |
| 1092 | 1093 | { |
| 1093 | − struct bmp280_data *data = dev_get_drvdata(dev); | |
| 1094 | + struct iio_dev *indio_dev = dev_get_drvdata(dev); | |
| 1095 | + struct bmp280_data *data = iio_priv(indio_dev); | |
| 1094 | 1096 | int ret; |
| 1095 | 1097 | |
| 1096 | 1098 | ret = regulator_enable(data->vddd); |
| @@ -397,7 +397,7 @@ static int as3935_probe(struct spi_device *spi) · 396 unmodified lines | ||
| 397 | 397 | return ret; |
| 398 | 398 | } |
| 399 | 399 | |
| 400 | − ret = iio_triggered_buffer_setup(indio_dev, NULL, | |
| 400 | + ret = iio_triggered_buffer_setup(indio_dev, iio_pollfunc_store_time, | |
| 401 | 401 | &as3935_trigger_handler, NULL); |
| 402 | 402 | |
| 403 | 403 | if (ret) { |
| @@ -2462,18 +2462,24 @@ static int cma_resolve_iboe_route(struct rdma_id_private *id_priv) · 2461 unmodified lines | ||
| 2462 | 2462 | |
| 2463 | 2463 | if (addr->dev_addr.bound_dev_if) { |
| 2464 | 2464 | ndev = dev_get_by_index(&init_net, addr->dev_addr.bound_dev_if); |
| 2465 | − if (!ndev) | |
| 2466 | − return -ENODEV; | |
| 2465 | + if (!ndev) { | |
| 2466 | + ret = -ENODEV; | |
| 2467 | + goto err2; | |
| 2468 | + } | |
| 2467 | 2469 | |
| 2468 | 2470 | if (ndev->flags & IFF_LOOPBACK) { |
| 2469 | 2471 | dev_put(ndev); |
| 2470 | − if (!id_priv->id.device->get_netdev) | |
| 2471 | − return -EOPNOTSUPP; | |
| 2472 | + if (!id_priv->id.device->get_netdev) { | |
| 2473 | + ret = -EOPNOTSUPP; | |
| 2474 | + goto err2; | |
| 2475 | + } | |
| 2472 | 2476 | |
| 2473 | 2477 | ndev = id_priv->id.device->get_netdev(id_priv->id.device, |
| 2474 | 2478 | id_priv->id.port_num); |
| 2475 | − if (!ndev) | |
| 2476 | − return -ENODEV; | |
| 2479 | + if (!ndev) { | |
| 2480 | + ret = -ENODEV; | |
| 2481 | + goto err2; | |
| 2482 | + } | |
| 2477 | 2483 | } |
| 2478 | 2484 | |
| 2479 | 2485 | route->path_rec->net = &init_net; |
| @@ -106,7 +106,6 @@ struct mcast_group { · 105 unmodified lines | ||
| 106 | 106 | atomic_t refcount; |
| 107 | 107 | enum mcast_group_state state; |
| 108 | 108 | struct ib_sa_query *query; |
| 109 | − int query_id; | |
| 110 | 109 | u16 pkey_index; |
| 111 | 110 | u8 leave_state; |
| 112 | 111 | int retries; |
| @@ -340,11 +339,7 @@ static int send_join(struct mcast_group *group, struct mcast_member *member) · 227 unmodified lines | ||
| 340 | 339 | member->multicast.comp_mask, |
| 341 | 340 | 3000, GFP_KERNEL, join_handler, group, |
| 342 | 341 | &group->query); |
| 343 | − if (ret >= 0) { | |
| 344 | − group->query_id = ret; | |
| 345 | − ret = 0; | |
| 346 | − } | |
| 347 | − return ret; | |
| 342 | + return (ret > 0) ? 0 : ret; | |
| 348 | 343 | } |
| 349 | 344 | |
| 350 | 345 | static int send_leave(struct mcast_group *group, u8 leave_state) |
| @@ -364,11 +359,7 @@ static int send_leave(struct mcast_group *group, u8 leave_state) · 13 unmodified lines | ||
| 364 | 359 | IB_SA_MCMEMBER_REC_JOIN_STATE, |
| 365 | 360 | 3000, GFP_KERNEL, leave_handler, |
| 366 | 361 | group, &group->query); |
| 367 | − if (ret >= 0) { | |
| 368 | − group->query_id = ret; | |
| 369 | − ret = 0; | |
| 370 | − } | |
| 371 | − return ret; | |
| 362 | + return (ret > 0) ? 0 : ret; | |
| 372 | 363 | } |
| 373 | 364 | |
| 374 | 365 | static void join_group(struct mcast_group *group, struct mcast_member *member, |
| @@ -333,6 +333,8 @@ static void remove_ep_tid(struct c4iw_ep *ep) · 332 unmodified lines | ||
| 333 | 333 | |
| 334 | 334 | spin_lock_irqsave(&ep->com.dev->lock, flags); |
| 335 | 335 | _remove_handle(ep->com.dev, &ep->com.dev->hwtid_idr, ep->hwtid, 0); |
| 336 | + if (idr_is_empty(&ep->com.dev->hwtid_idr)) | |
| 337 | + wake_up(&ep->com.dev->wait); | |
| 336 | 338 | spin_unlock_irqrestore(&ep->com.dev->lock, flags); |
| 337 | 339 | } |
| 338 | 340 | |
| @@ -1827,8 +1829,12 @@ static int process_mpa_request(struct c4iw_ep *ep, struct sk_buff *skb) · 1488 unmodified lines | ||
| 1827 | 1829 | (ep->mpa_pkt + sizeof(*mpa)); |
| 1828 | 1830 | ep->ird = ntohs(mpa_v2_params->ird) & |
| 1829 | 1831 | MPA_V2_IRD_ORD_MASK; |
| 1832 | + ep->ird = min_t(u32, ep->ird, | |
| 1833 | + cur_max_read_depth(ep->com.dev)); | |
| 1830 | 1834 | ep->ord = ntohs(mpa_v2_params->ord) & |
| 1831 | 1835 | MPA_V2_IRD_ORD_MASK; |
| 1836 | + ep->ord = min_t(u32, ep->ord, | |
| 1837 | + cur_max_read_depth(ep->com.dev)); | |
| 1832 | 1838 | PDBG("%s initiator ird %u ord %u\n", __func__, ep->ird, |
| 1833 | 1839 | ep->ord); |
| 1834 | 1840 | if (ntohs(mpa_v2_params->ird) & MPA_V2_PEER2PEER_MODEL) |
| @@ -2113,8 +2119,10 @@ static int import_ep(struct c4iw_ep *ep, int iptype, __u8 *peer_ip, · 278 unmodified lines | ||
| 2113 | 2119 | } |
| 2114 | 2120 | ep->l2t = cxgb4_l2t_get(cdev->rdev.lldi.l2t, |
| 2115 | 2121 | n, pdev, rt_tos2priority(tos)); |
| 2116 | − if (!ep->l2t) | |
| 2122 | + if (!ep->l2t) { | |
| 2123 | + dev_put(pdev); | |
| 2117 | 2124 | goto out; |
| 2125 | + } | |
| 2118 | 2126 | ep->mtu = pdev->mtu; |
| 2119 | 2127 | ep->tx_chan = cxgb4_port_chan(pdev); |
| 2120 | 2128 | ep->smac_idx = cxgb4_tp_smt_idx(adapter_type, |
| @@ -3136,7 +3144,7 @@ int c4iw_accept_cr(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) · 1015 unmodified lines | ||
| 3136 | 3144 | if (ep->mpa_attr.version == 2 && ep->mpa_attr.enhanced_rdma_conn) { |
| 3137 | 3145 | if (conn_param->ord > ep->ird) { |
| 3138 | 3146 | if (RELAXED_IRD_NEGOTIATION) { |
| 3139 | − ep->ord = ep->ird; | |
| 3147 | + conn_param->ord = ep->ird; | |
| 3140 | 3148 | } else { |
| 3141 | 3149 | ep->ird = conn_param->ird; |
| 3142 | 3150 | ep->ord = conn_param->ord; |
| @@ -1016,15 +1016,15 @@ int c4iw_resize_cq(struct ib_cq *cq, int cqe, struct ib_udata *udata) · 1015 unmodified lines | ||
| 1016 | 1016 | int c4iw_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) |
| 1017 | 1017 | { |
| 1018 | 1018 | struct c4iw_cq *chp; |
| 1019 | − int ret; | |
| 1019 | + int ret = 0; | |
| 1020 | 1020 | unsigned long flag; |
| 1021 | 1021 | |
| 1022 | 1022 | chp = to_c4iw_cq(ibcq); |
| 1023 | 1023 | spin_lock_irqsave(&chp->lock, flag); |
| 1024 | − ret = t4_arm_cq(&chp->cq, | |
| 1025 | − (flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED); | |
| 1024 | + t4_arm_cq(&chp->cq, | |
| 1025 | + (flags & IB_CQ_SOLICITED_MASK) == IB_CQ_SOLICITED); | |
| 1026 | + if (flags & IB_CQ_REPORT_MISSED_EVENTS) | |
| 1027 | + ret = t4_cq_notempty(&chp->cq); | |
| 1026 | 1028 | spin_unlock_irqrestore(&chp->lock, flag); |
| 1027 | − if (ret && !(flags & IB_CQ_REPORT_MISSED_EVENTS)) | |
| 1028 | − ret = 0; | |
| 1029 | 1029 | return ret; |
| 1030 | 1030 | } |
| @@ -872,9 +872,13 @@ static void c4iw_rdev_close(struct c4iw_rdev *rdev) · 871 unmodified lines | ||
| 872 | 872 | static void c4iw_dealloc(struct uld_ctx *ctx) |
| 873 | 873 | { |
| 874 | 874 | c4iw_rdev_close(&ctx->dev->rdev); |
| 875 | + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->cqidr)); | |
| 875 | 876 | idr_destroy(&ctx->dev->cqidr); |
| 877 | + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->qpidr)); | |
| 876 | 878 | idr_destroy(&ctx->dev->qpidr); |
| 879 | + WARN_ON_ONCE(!idr_is_empty(&ctx->dev->mmidr)); | |
| 877 | 880 | idr_destroy(&ctx->dev->mmidr); |
| 881 | + wait_event(ctx->dev->wait, idr_is_empty(&ctx->dev->hwtid_idr)); | |
| 878 | 882 | idr_destroy(&ctx->dev->hwtid_idr); |
| 879 | 883 | idr_destroy(&ctx->dev->stid_idr); |
| 880 | 884 | idr_destroy(&ctx->dev->atid_idr); |
| @@ -992,6 +996,7 @@ static struct c4iw_dev *c4iw_alloc(const struct cxgb4_lld_info *infop) · 111 unmodified lines | ||
| 992 | 996 | mutex_init(&devp->rdev.stats.lock); |
| 993 | 997 | mutex_init(&devp->db_mutex); |
| 994 | 998 | INIT_LIST_HEAD(&devp->db_fc_list); |
| 999 | + init_waitqueue_head(&devp->wait); | |
| 995 | 1000 | devp->avail_ird = devp->rdev.lldi.max_ird_adapter; |
| 996 | 1001 | |
| 997 | 1002 | if (c4iw_debugfs_root) { |
| @@ -263,6 +263,7 @@ struct c4iw_dev { · 262 unmodified lines | ||
| 263 | 263 | struct idr stid_idr; |
| 264 | 264 | struct list_head db_fc_list; |
| 265 | 265 | u32 avail_ird; |
| 266 | + wait_queue_head_t wait; | |
| 266 | 267 | }; |
| 267 | 268 | |
| 268 | 269 | static inline struct c4iw_dev *to_c4iw_dev(struct ib_device *ibdev) |
| @@ -683,7 +683,7 @@ static int build_inv_stag(union t4_wr *wqe, struct ib_send_wr *wr, · 682 unmodified lines | ||
| 683 | 683 | return 0; |
| 684 | 684 | } |
| 685 | 685 | |
| 686 | −void _free_qp(struct kref *kref) | |
| 686 | +static void _free_qp(struct kref *kref) | |
| 687 | 687 | { |
| 688 | 688 | struct c4iw_qp *qhp; |
| 689 | 689 | |
| @@ -634,6 +634,11 @@ static inline int t4_valid_cqe(struct t4_cq *cq, struct t4_cqe *cqe) · 633 unmodified lines | ||
| 634 | 634 | return (CQE_GENBIT(cqe) == cq->gen); |
| 635 | 635 | } |
| 636 | 636 | |
| 637 | +static inline int t4_cq_notempty(struct t4_cq *cq) | |
| 638 | +{ | |
| 639 | + return cq->sw_in_use || t4_valid_cqe(cq, &cq->queue[cq->cidx]); | |
| 640 | +} | |
| 641 | + | |
| 637 | 642 | static inline int t4_next_hw_cqe(struct t4_cq *cq, struct t4_cqe **cqe) |
| 638 | 643 | { |
| 639 | 644 | int ret; |
| @@ -47,7 +47,6 @@ · 46 unmodified lines | ||
| 47 | 47 | #include <linux/topology.h> |
| 48 | 48 | #include <linux/cpumask.h> |
| 49 | 49 | #include <linux/module.h> |
| 50 | −#include <linux/cpumask.h> | |
| 51 | 50 | |
| 52 | 51 | #include "hfi.h" |
| 53 | 52 | #include "affinity.h" |
| @@ -682,7 +681,7 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, · 628 unmodified lines | ||
| 682 | 681 | size_t count) |
| 683 | 682 | { |
| 684 | 683 | struct hfi1_affinity_node *entry; |
| 685 | − struct cpumask mask; | |
| 684 | + cpumask_var_t mask; | |
| 686 | 685 | int ret, i; |
| 687 | 686 | |
| 688 | 687 | spin_lock(&node_affinity.lock); |
| @@ -692,19 +691,24 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, · 3 unmodified lines | ||
| 692 | 691 | if (!entry) |
| 693 | 692 | return -EINVAL; |
| 694 | 693 | |
| 695 | − ret = cpulist_parse(buf, &mask); | |
| 694 | + ret = zalloc_cpumask_var(&mask, GFP_KERNEL); | |
| 695 | + if (!ret) | |
| 696 | + return -ENOMEM; | |
| 697 | + | |
| 698 | + ret = cpulist_parse(buf, mask); | |
| 696 | 699 | if (ret) |
| 697 | − return ret; | |
| 700 | + goto out; | |
| 698 | 701 | |
| 699 | − if (!cpumask_subset(&mask, cpu_online_mask) || cpumask_empty(&mask)) { | |
| 702 | + if (!cpumask_subset(mask, cpu_online_mask) || cpumask_empty(mask)) { | |
| 700 | 703 | dd_dev_warn(dd, "Invalid CPU mask\n"); |
| 701 | − return -EINVAL; | |
| 704 | + ret = -EINVAL; | |
| 705 | + goto out; | |
| 702 | 706 | } |
| 703 | 707 | |
| 704 | 708 | mutex_lock(&sdma_affinity_mutex); |
| 705 | 709 | /* reset the SDMA interrupt affinity details */ |
| 706 | 710 | init_cpu_mask_set(&entry->def_intr); |
| 707 | − cpumask_copy(&entry->def_intr.mask, &mask); | |
| 711 | + cpumask_copy(&entry->def_intr.mask, mask); | |
| 708 | 712 | /* |
| 709 | 713 | * Reassign the affinity for each SDMA interrupt. |
| 710 | 714 | */ |
| @@ -720,8 +724,9 @@ int hfi1_set_sdma_affinity(struct hfi1_devdata *dd, const char *buf, · 9 unmodified lines | ||
| 720 | 724 | if (ret) |
| 721 | 725 | break; |
| 722 | 726 | } |
| 723 | − | |
| 724 | 727 | mutex_unlock(&sdma_affinity_mutex); |
| 728 | +out: | |
| 729 | + free_cpumask_var(mask); | |
| 725 | 730 | return ret ? ret : strnlen(buf, PAGE_SIZE); |
| 726 | 731 | } |
| 727 | 732 | |
| @@ -9490,6 +9490,78 @@ static void init_lcb(struct hfi1_devdata *dd) · 9489 unmodified lines | ||
| 9490 | 9490 | write_csr(dd, DC_LCB_CFG_TX_FIFOS_RESET, 0x00); |
| 9491 | 9491 | } |
| 9492 | 9492 | |
| 9493 | +/* | |
| 9494 | + * Perform a test read on the QSFP. Return 0 on success, -ERRNO | |
| 9495 | + * on error. | |
| 9496 | + */ | |
| 9497 | +static int test_qsfp_read(struct hfi1_pportdata *ppd) | |
| 9498 | +{ | |
| 9499 | + int ret; | |
| 9500 | + u8 status; | |
| 9501 | + | |
| 9502 | + /* report success if not a QSFP */ | |
| 9503 | + if (ppd->port_type != PORT_TYPE_QSFP) | |
| 9504 | + return 0; | |
| 9505 | + | |
| 9506 | + /* read byte 2, the status byte */ | |
| 9507 | + ret = one_qsfp_read(ppd, ppd->dd->hfi1_id, 2, &status, 1); | |
| 9508 | + if (ret < 0) | |
| 9509 | + return ret; | |
| 9510 | + if (ret != 1) | |
| 9511 | + return -EIO; | |
| 9512 | + | |
| 9513 | + return 0; /* success */ | |
| 9514 | +} | |
| 9515 | + | |
| 9516 | +/* | |
| 9517 | + * Values for QSFP retry. | |
| 9518 | + * | |
| 9519 | + * Give up after 10s (20 x 500ms). The overall timeout was empirically | |
| 9520 | + * arrived at from experience on a large cluster. | |
| 9521 | + */ | |
| 9522 | +#define MAX_QSFP_RETRIES 20 | |
| 9523 | +#define QSFP_RETRY_WAIT 500 /* msec */ | |
| 9524 | + | |
| 9525 | +/* | |
| 9526 | + * Try a QSFP read. If it fails, schedule a retry for later. | |
| 9527 | + * Called on first link activation after driver load. | |
| 9528 | + */ | |
| 9529 | +static void try_start_link(struct hfi1_pportdata *ppd) | |
| 9530 | +{ | |
| 9531 | + if (test_qsfp_read(ppd)) { | |
| 9532 | + /* read failed */ | |
| 9533 | + if (ppd->qsfp_retry_count >= MAX_QSFP_RETRIES) { | |
| 9534 | + dd_dev_err(ppd->dd, "QSFP not responding, giving up\n"); | |
| 9535 | + return; | |
| 9536 | + } | |
| 9537 | + dd_dev_info(ppd->dd, | |
| 9538 | + "QSFP not responding, waiting and retrying %d\n", | |
| 9539 | + (int)ppd->qsfp_retry_count); | |
| 9540 | + ppd->qsfp_retry_count++; | |
| 9541 | + queue_delayed_work(ppd->hfi1_wq, &ppd->start_link_work, | |
| 9542 | + msecs_to_jiffies(QSFP_RETRY_WAIT)); | |
| 9543 | + return; | |
| 9544 | + } | |
| 9545 | + ppd->qsfp_retry_count = 0; | |
| 9546 | + | |
| 9547 | + /* | |
| 9548 | + * Tune the SerDes to a ballpark setting for optimal signal and bit | |
| 9549 | + * error rate. Needs to be done before starting the link. | |
| 9550 | + */ | |
| 9551 | + tune_serdes(ppd); | |
| 9552 | + start_link(ppd); | |
| 9553 | +} | |
| 9554 | + | |
| 9555 | +/* | |
| 9556 | + * Workqueue function to start the link after a delay. | |
| 9557 | + */ | |
| 9558 | +void handle_start_link(struct work_struct *work) | |
| 9559 | +{ | |
| 9560 | + struct hfi1_pportdata *ppd = container_of(work, struct hfi1_pportdata, | |
| 9561 | + start_link_work.work); | |
| 9562 | + try_start_link(ppd); | |
| 9563 | +} | |
| 9564 | + | |
| 9493 | 9565 | int bringup_serdes(struct hfi1_pportdata *ppd) |
| 9494 | 9566 | { |
| 9495 | 9567 | struct hfi1_devdata *dd = ppd->dd; |
| @@ -9525,14 +9597,8 @@ int bringup_serdes(struct hfi1_pportdata *ppd) · 29 unmodified lines | ||
| 9525 | 9597 | set_qsfp_int_n(ppd, 1); |
| 9526 | 9598 | } |
| 9527 | 9599 | |
| 9528 | − /* | |
| 9529 | − * Tune the SerDes to a ballpark setting for | |
| 9530 | − * optimal signal and bit error rate | |
| 9531 | − * Needs to be done before starting the link | |
| 9532 | − */ | |
| 9533 | − tune_serdes(ppd); | |
| 9534 | − | |
| 9535 | − return start_link(ppd); | |
| 9600 | + try_start_link(ppd); | |
| 9601 | + return 0; | |
| 9536 | 9602 | } |
| 9537 | 9603 | |
| 9538 | 9604 | void hfi1_quiet_serdes(struct hfi1_pportdata *ppd) |
| @@ -9549,6 +9615,10 @@ void hfi1_quiet_serdes(struct hfi1_pportdata *ppd) · 10 unmodified lines | ||
| 9549 | 9615 | ppd->driver_link_ready = 0; |
| 9550 | 9616 | ppd->link_enabled = 0; |
| 9551 | 9617 | |
| 9618 | + ppd->qsfp_retry_count = MAX_QSFP_RETRIES; /* prevent more retries */ | |
| 9619 | + flush_delayed_work(&ppd->start_link_work); | |
| 9620 | + cancel_delayed_work_sync(&ppd->start_link_work); | |
| 9621 | + | |
| 9552 | 9622 | ppd->offline_disabled_reason = |
| 9553 | 9623 | HFI1_ODR_MASK(OPA_LINKDOWN_REASON_SMA_DISABLED); |
| 9554 | 9624 | set_link_down_reason(ppd, OPA_LINKDOWN_REASON_SMA_DISABLED, 0, |
| @@ -12865,7 +12935,7 @@ fail: · 3310 unmodified lines | ||
| 12865 | 12935 | */ |
| 12866 | 12936 | static int set_up_context_variables(struct hfi1_devdata *dd) |
| 12867 | 12937 | { |
| 12868 | − int num_kernel_contexts; | |
| 12938 | + unsigned long num_kernel_contexts; | |
| 12869 | 12939 | int total_contexts; |
| 12870 | 12940 | int ret; |
| 12871 | 12941 | unsigned ngroups; |
| @@ -12894,9 +12964,9 @@ static int set_up_context_variables(struct hfi1_devdata *dd) · 22 unmodified lines | ||
| 12894 | 12964 | */ |
| 12895 | 12965 | if (num_kernel_contexts > (dd->chip_send_contexts - num_vls - 1)) { |
| 12896 | 12966 | dd_dev_err(dd, |
| 12897 | − "Reducing # kernel rcv contexts to: %d, from %d\n", | |
| 12967 | + "Reducing # kernel rcv contexts to: %d, from %lu\n", | |
| 12898 | 12968 | (int)(dd->chip_send_contexts - num_vls - 1), |
| 12899 | − (int)num_kernel_contexts); | |
| 12969 | + num_kernel_contexts); | |
| 12900 | 12970 | num_kernel_contexts = dd->chip_send_contexts - num_vls - 1; |
| 12901 | 12971 | } |
| 12902 | 12972 | /* |
| @@ -706,6 +706,7 @@ void handle_link_up(struct work_struct *work); · 705 unmodified lines | ||
| 706 | 706 | void handle_link_down(struct work_struct *work); |
| 707 | 707 | void handle_link_downgrade(struct work_struct *work); |
| 708 | 708 | void handle_link_bounce(struct work_struct *work); |
| 709 | +void handle_start_link(struct work_struct *work); | |
| 709 | 710 | void handle_sma_message(struct work_struct *work); |
| 710 | 711 | void reset_qsfp(struct hfi1_pportdata *ppd); |
| 711 | 712 | void qsfp_event(struct work_struct *work); |
| @@ -59,6 +59,40 @@ · 58 unmodified lines | ||
| 59 | 59 | |
| 60 | 60 | static struct dentry *hfi1_dbg_root; |
| 61 | 61 | |
| 62 | +/* wrappers to enforce srcu in seq file */ | |
| 63 | +static ssize_t hfi1_seq_read( | |
| 64 | + struct file *file, | |
| 65 | + char __user *buf, | |
| 66 | + size_t size, | |
| 67 | + loff_t *ppos) | |
| 68 | +{ | |
| 69 | + struct dentry *d = file->f_path.dentry; | |
| 70 | + int srcu_idx; | |
| 71 | + ssize_t r; | |
| 72 | + | |
| 73 | + r = debugfs_use_file_start(d, &srcu_idx); | |
| 74 | + if (likely(!r)) | |
| 75 | + r = seq_read(file, buf, size, ppos); | |
| 76 | + debugfs_use_file_finish(srcu_idx); | |
| 77 | + return r; | |
| 78 | +} | |
| 79 | + | |
| 80 | +static loff_t hfi1_seq_lseek( | |
| 81 | + struct file *file, | |
| 82 | + loff_t offset, | |
| 83 | + int whence) | |
| 84 | +{ | |
| 85 | + struct dentry *d = file->f_path.dentry; | |
| 86 | + int srcu_idx; | |
| 87 | + loff_t r; | |
| 88 | + | |
| 89 | + r = debugfs_use_file_start(d, &srcu_idx); | |
| 90 | + if (likely(!r)) | |
| 91 | + r = seq_lseek(file, offset, whence); | |
| 92 | + debugfs_use_file_finish(srcu_idx); | |
| 93 | + return r; | |
| 94 | +} | |
| 95 | + | |
| 62 | 96 | #define private2dd(file) (file_inode(file)->i_private) |
| 63 | 97 | #define private2ppd(file) (file_inode(file)->i_private) |
| 64 | 98 | |
| @@ -87,8 +121,8 @@ static int _##name##_open(struct inode *inode, struct file *s) \ · 22 unmodified lines | ||
| 87 | 121 | static const struct file_operations _##name##_file_ops = { \ |
| 88 | 122 | .owner = THIS_MODULE, \ |
| 89 | 123 | .open = _##name##_open, \ |
| 90 | − .read = seq_read, \ | |
| 91 | − .llseek = seq_lseek, \ | |
| 124 | + .read = hfi1_seq_read, \ | |
| 125 | + .llseek = hfi1_seq_lseek, \ | |
| 92 | 126 | .release = seq_release \ |
| 93 | 127 | } |
| 94 | 128 | |
| @@ -105,11 +139,9 @@ do { \ · 10 unmodified lines | ||
| 105 | 139 | DEBUGFS_FILE_CREATE(#name, parent, data, &_##name##_file_ops, S_IRUGO) |
| 106 | 140 | |
| 107 | 141 | static void *_opcode_stats_seq_start(struct seq_file *s, loff_t *pos) |
| 108 | −__acquires(RCU) | |
| 109 | 142 | { |
| 110 | 143 | struct hfi1_opcode_stats_perctx *opstats; |
| 111 | 144 | |
| 112 | − rcu_read_lock(); | |
| 113 | 145 | if (*pos >= ARRAY_SIZE(opstats->stats)) |
| 114 | 146 | return NULL; |
| 115 | 147 | return pos; |
| @@ -126,9 +158,7 @@ static void *_opcode_stats_seq_next(struct seq_file *s, void *v, loff_t *pos) · 10 unmodified lines | ||
| 126 | 158 | } |
| 127 | 159 | |
| 128 | 160 | static void _opcode_stats_seq_stop(struct seq_file *s, void *v) |
| 129 | −__releases(RCU) | |
| 130 | 161 | { |
| 131 | − rcu_read_unlock(); | |
| 132 | 162 | } |
| 133 | 163 | |
| 134 | 164 | static int _opcode_stats_seq_show(struct seq_file *s, void *v) |
| @@ -223,28 +253,32 @@ DEBUGFS_SEQ_FILE_OPEN(ctx_stats) · 88 unmodified lines | ||
| 223 | 253 | DEBUGFS_FILE_OPS(ctx_stats); |
| 224 | 254 | |
| 225 | 255 | static void *_qp_stats_seq_start(struct seq_file *s, loff_t *pos) |
| 226 | −__acquires(RCU) | |
| 256 | + __acquires(RCU) | |
| 227 | 257 | { |
| 228 | 258 | struct qp_iter *iter; |
| 229 | 259 | loff_t n = *pos; |
| 230 | 260 | |
| 231 | − rcu_read_lock(); | |
| 232 | 261 | iter = qp_iter_init(s->private); |
| 262 | + | |
| 263 | + /* stop calls rcu_read_unlock */ | |
| 264 | + rcu_read_lock(); | |
| 265 | + | |
| 233 | 266 | if (!iter) |
| 234 | 267 | return NULL; |
| 235 | 268 | |
| 236 | − while (n--) { | |
| 269 | + do { | |
| 237 | 270 | if (qp_iter_next(iter)) { |
| 238 | 271 | kfree(iter); |
| 239 | 272 | return NULL; |
| 240 | 273 | } |
| 241 | − } | |
| 274 | + } while (n--); | |
| 242 | 275 | |
| 243 | 276 | return iter; |
| 244 | 277 | } |
| 245 | 278 | |
| 246 | 279 | static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr, |
| 247 | 280 | loff_t *pos) |
| 281 | + __must_hold(RCU) | |
| 248 | 282 | { |
| 249 | 283 | struct qp_iter *iter = iter_ptr; |
| 250 | 284 | |
| @@ -259,7 +293,7 @@ static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr, · 8 unmodified lines | ||
| 259 | 293 | } |
| 260 | 294 | |
| 261 | 295 | static void _qp_stats_seq_stop(struct seq_file *s, void *iter_ptr) |
| 262 | −__releases(RCU) | |
| 296 | + __releases(RCU) | |
| 263 | 297 | { |
| 264 | 298 | rcu_read_unlock(); |
| 265 | 299 | } |
| @@ -281,12 +315,10 @@ DEBUGFS_SEQ_FILE_OPEN(qp_stats) · 15 unmodified lines | ||
| 281 | 315 | DEBUGFS_FILE_OPS(qp_stats); |
| 282 | 316 | |
| 283 | 317 | static void *_sdes_seq_start(struct seq_file *s, loff_t *pos) |
| 284 | −__acquires(RCU) | |
| 285 | 318 | { |
| 286 | 319 | struct hfi1_ibdev *ibd; |
| 287 | 320 | struct hfi1_devdata *dd; |
| 288 | 321 | |
| 289 | − rcu_read_lock(); | |
| 290 | 322 | ibd = (struct hfi1_ibdev *)s->private; |
| 291 | 323 | dd = dd_from_dev(ibd); |
| 292 | 324 | if (!dd->per_sdma || *pos >= dd->num_sdma) |
| @@ -306,9 +338,7 @@ static void *_sdes_seq_next(struct seq_file *s, void *v, loff_t *pos) · 13 unmodified lines | ||
| 306 | 338 | } |
| 307 | 339 | |
| 308 | 340 | static void _sdes_seq_stop(struct seq_file *s, void *v) |
| 309 | −__releases(RCU) | |
| 310 | 341 | { |
| 311 | − rcu_read_unlock(); | |
| 312 | 342 | } |
| 313 | 343 | |
| 314 | 344 | static int _sdes_seq_show(struct seq_file *s, void *v) |
| @@ -335,11 +365,9 @@ static ssize_t dev_counters_read(struct file *file, char __user *buf, · 20 unmodified lines | ||
| 335 | 365 | struct hfi1_devdata *dd; |
| 336 | 366 | ssize_t rval; |
| 337 | 367 | |
| 338 | − rcu_read_lock(); | |
| 339 | 368 | dd = private2dd(file); |
| 340 | 369 | avail = hfi1_read_cntrs(dd, NULL, &counters); |
| 341 | 370 | rval = simple_read_from_buffer(buf, count, ppos, counters, avail); |
| 342 | − rcu_read_unlock(); | |
| 343 | 371 | return rval; |
| 344 | 372 | } |
| 345 | 373 | |
| @@ -352,11 +380,9 @@ static ssize_t dev_names_read(struct file *file, char __user *buf, · 6 unmodified lines | ||
| 352 | 380 | struct hfi1_devdata *dd; |
| 353 | 381 | ssize_t rval; |
| 354 | 382 | |
| 355 | − rcu_read_lock(); | |
| 356 | 383 | dd = private2dd(file); |
| 357 | 384 | avail = hfi1_read_cntrs(dd, &names, NULL); |
| 358 | 385 | rval = simple_read_from_buffer(buf, count, ppos, names, avail); |
| 359 | − rcu_read_unlock(); | |
| 360 | 386 | return rval; |
| 361 | 387 | } |
| 362 | 388 | |
| @@ -379,11 +405,9 @@ static ssize_t portnames_read(struct file *file, char __user *buf, · 16 unmodified lines | ||
| 379 | 405 | struct hfi1_devdata *dd; |
| 380 | 406 | ssize_t rval; |
| 381 | 407 | |
| 382 | − rcu_read_lock(); | |
| 383 | 408 | dd = private2dd(file); |
| 384 | 409 | avail = hfi1_read_portcntrs(dd->pport, &names, NULL); |
| 385 | 410 | rval = simple_read_from_buffer(buf, count, ppos, names, avail); |
| 386 | − rcu_read_unlock(); | |
| 387 | 411 | return rval; |
| 388 | 412 | } |
| 389 | 413 | |
| @@ -396,11 +420,9 @@ static ssize_t portcntrs_debugfs_read(struct file *file, char __user *buf, · 6 unmodified lines | ||
| 396 | 420 | struct hfi1_pportdata *ppd; |
| 397 | 421 | ssize_t rval; |
| 398 | 422 | |
| 399 | − rcu_read_lock(); | |
| 400 | 423 | ppd = private2ppd(file); |
| 401 | 424 | avail = hfi1_read_portcntrs(ppd, NULL, &counters); |
| 402 | 425 | rval = simple_read_from_buffer(buf, count, ppos, counters, avail); |
| 403 | − rcu_read_unlock(); | |
| 404 | 426 | return rval; |
| 405 | 427 | } |
| 406 | 428 | |
| @@ -430,16 +452,13 @@ static ssize_t asic_flags_read(struct file *file, char __user *buf, · 23 unmodified lines | ||
| 430 | 452 | int used; |
| 431 | 453 | int i; |
| 432 | 454 | |
| 433 | − rcu_read_lock(); | |
| 434 | 455 | ppd = private2ppd(file); |
| 435 | 456 | dd = ppd->dd; |
| 436 | 457 | size = PAGE_SIZE; |
| 437 | 458 | used = 0; |
| 438 | 459 | tmp = kmalloc(size, GFP_KERNEL); |
| 439 | − if (!tmp) { | |
| 440 | − rcu_read_unlock(); | |
| 460 | + if (!tmp) | |
| 441 | 461 | return -ENOMEM; |
| 442 | − } | |
| 443 | 462 | |
| 444 | 463 | scratch0 = read_csr(dd, ASIC_CFG_SCRATCH); |
| 445 | 464 | used += scnprintf(tmp + used, size - used, |
| @@ -466,7 +485,6 @@ static ssize_t asic_flags_read(struct file *file, char __user *buf, · 20 unmodified lines | ||
| 466 | 485 | used += scnprintf(tmp + used, size - used, "Write bits to clear\n"); |
| 467 | 486 | |
| 468 | 487 | ret = simple_read_from_buffer(buf, count, ppos, tmp, used); |
| 469 | − rcu_read_unlock(); | |
| 470 | 488 | kfree(tmp); |
| 471 | 489 | return ret; |
| 472 | 490 | } |
| @@ -482,15 +500,12 @@ static ssize_t asic_flags_write(struct file *file, const char __user *buf, · 9 unmodified lines | ||
| 482 | 500 | u64 scratch0; |
| 483 | 501 | u64 clear; |
| 484 | 502 | |
| 485 | − rcu_read_lock(); | |
| 486 | 503 | ppd = private2ppd(file); |
| 487 | 504 | dd = ppd->dd; |
| 488 | 505 | |
| 489 | 506 | buff = kmalloc(count + 1, GFP_KERNEL); |
| 490 | − if (!buff) { | |
| 491 | − ret = -ENOMEM; | |
| 492 | − goto do_return; | |
| 493 | − } | |
| 507 | + if (!buff) | |
| 508 | + return -ENOMEM; | |
| 494 | 509 | |
| 495 | 510 | ret = copy_from_user(buff, buf, count); |
| 496 | 511 | if (ret > 0) { |
| @@ -523,8 +538,6 @@ static ssize_t asic_flags_write(struct file *file, const char __user *buf, · 26 unmodified lines | ||
| 523 | 538 | |
| 524 | 539 | do_free: |
| 525 | 540 | kfree(buff); |
| 526 | − do_return: | |
| 527 | − rcu_read_unlock(); | |
| 528 | 541 | return ret; |
| 529 | 542 | } |
| 530 | 543 | |
| @@ -538,18 +551,14 @@ static ssize_t qsfp_debugfs_dump(struct file *file, char __user *buf, · 7 unmodified lines | ||
| 538 | 551 | char *tmp; |
| 539 | 552 | int ret; |
| 540 | 553 | |
| 541 | − rcu_read_lock(); | |
| 542 | 554 | ppd = private2ppd(file); |
| 543 | 555 | tmp = kmalloc(PAGE_SIZE, GFP_KERNEL); |
| 544 | − if (!tmp) { | |
| 545 | − rcu_read_unlock(); | |
| 556 | + if (!tmp) | |
| 546 | 557 | return -ENOMEM; |
| 547 | − } | |
| 548 | 558 | |
| 549 | 559 | ret = qsfp_dump(ppd, tmp, PAGE_SIZE); |
| 550 | 560 | if (ret > 0) |
| 551 | 561 | ret = simple_read_from_buffer(buf, count, ppos, tmp, ret); |
| 552 | − rcu_read_unlock(); | |
| 553 | 562 | kfree(tmp); |
| 554 | 563 | return ret; |
| 555 | 564 | } |
| @@ -565,7 +574,6 @@ static ssize_t __i2c_debugfs_write(struct file *file, const char __user *buf, · 9 unmodified lines | ||
| 565 | 574 | int offset; |
| 566 | 575 | int total_written; |
| 567 | 576 | |
| 568 | − rcu_read_lock(); | |
| 569 | 577 | ppd = private2ppd(file); |
| 570 | 578 | |
| 571 | 579 | /* byte offset format: [offsetSize][i2cAddr][offsetHigh][offsetLow] */ |
| @@ -573,16 +581,12 @@ static ssize_t __i2c_debugfs_write(struct file *file, const char __user *buf, · 1 unmodified line | ||
| 573 | 581 | offset = *ppos & 0xffff; |
| 574 | 582 | |
| 575 | 583 | /* explicitly reject invalid address 0 to catch cp and cat */ |
| 576 | − if (i2c_addr == 0) { | |
| 577 | − ret = -EINVAL; | |
| 578 | − goto _return; | |
| 579 | − } | |
| 584 | + if (i2c_addr == 0) | |
| 585 | + return -EINVAL; | |
| 580 | 586 | |
| 581 | 587 | buff = kmalloc(count, GFP_KERNEL); |
| 582 | − if (!buff) { | |
| 583 | − ret = -ENOMEM; | |
| 584 | − goto _return; | |
| 585 | − } | |
| 588 | + if (!buff) | |
| 589 | + return -ENOMEM; | |
| 586 | 590 | |
| 587 | 591 | ret = copy_from_user(buff, buf, count); |
| 588 | 592 | if (ret > 0) { |
| @@ -602,8 +606,6 @@ static ssize_t __i2c_debugfs_write(struct file *file, const char __user *buf, · 13 unmodified lines | ||
| 602 | 606 | |
| 603 | 607 | _free: |
| 604 | 608 | kfree(buff); |
| 605 | − _return: | |
| 606 | − rcu_read_unlock(); | |
| 607 | 609 | return ret; |
| 608 | 610 | } |
| 609 | 611 | |
| @@ -632,7 +634,6 @@ static ssize_t __i2c_debugfs_read(struct file *file, char __user *buf, · 22 unmodified lines | ||
| 632 | 634 | int offset; |
| 633 | 635 | int total_read; |
| 634 | 636 | |
| 635 | − rcu_read_lock(); | |
| 636 | 637 | ppd = private2ppd(file); |
| 637 | 638 | |
| 638 | 639 | /* byte offset format: [offsetSize][i2cAddr][offsetHigh][offsetLow] */ |
| @@ -640,16 +641,12 @@ static ssize_t __i2c_debugfs_read(struct file *file, char __user *buf, · 1 unmodified line | ||
| 640 | 641 | offset = *ppos & 0xffff; |
| 641 | 642 | |
| 642 | 643 | /* explicitly reject invalid address 0 to catch cp and cat */ |
| 643 | − if (i2c_addr == 0) { | |
| 644 | − ret = -EINVAL; | |
| 645 | − goto _return; | |
| 646 | − } | |
| 644 | + if (i2c_addr == 0) | |
| 645 | + return -EINVAL; | |
| 647 | 646 | |
| 648 | 647 | buff = kmalloc(count, GFP_KERNEL); |
| 649 | − if (!buff) { | |
| 650 | − ret = -ENOMEM; | |
| 651 | − goto _return; | |
| 652 | − } | |
| 648 | + if (!buff) | |
| 649 | + return -ENOMEM; | |
| 653 | 650 | |
| 654 | 651 | total_read = i2c_read(ppd, target, i2c_addr, offset, buff, count); |
| 655 | 652 | if (total_read < 0) { |
| @@ -669,8 +666,6 @@ static ssize_t __i2c_debugfs_read(struct file *file, char __user *buf, · 13 unmodified lines | ||
| 669 | 666 | |
| 670 | 667 | _free: |
| 671 | 668 | kfree(buff); |
| 672 | − _return: | |
| 673 | − rcu_read_unlock(); | |
| 674 | 669 | return ret; |
| 675 | 670 | } |
| 676 | 671 | |
| @@ -697,26 +692,20 @@ static ssize_t __qsfp_debugfs_write(struct file *file, const char __user *buf, · 20 unmodified lines | ||
| 697 | 692 | int ret; |
| 698 | 693 | int total_written; |
| 699 | 694 | |
| 700 | − rcu_read_lock(); | |
| 701 | − if (*ppos + count > QSFP_PAGESIZE * 4) { /* base page + page00-page03 */ | |
| 702 | − ret = -EINVAL; | |
| 703 | − goto _return; | |
| 704 | − } | |
| 695 | + if (*ppos + count > QSFP_PAGESIZE * 4) /* base page + page00-page03 */ | |
| 696 | + return -EINVAL; | |
| 705 | 697 | |
| 706 | 698 | ppd = private2ppd(file); |
| 707 | 699 | |
| 708 | 700 | buff = kmalloc(count, GFP_KERNEL); |
| 709 | − if (!buff) { | |
| 710 | − ret = -ENOMEM; | |
| 711 | − goto _return; | |
| 712 | − } | |
| 701 | + if (!buff) | |
| 702 | + return -ENOMEM; | |
| 713 | 703 | |
| 714 | 704 | ret = copy_from_user(buff, buf, count); |
| 715 | 705 | if (ret > 0) { |
| 716 | 706 | ret = -EFAULT; |
| 717 | 707 | goto _free; |
| 718 | 708 | } |
| 719 | − | |
| 720 | 709 | total_written = qsfp_write(ppd, target, *ppos, buff, count); |
| 721 | 710 | if (total_written < 0) { |
| 722 | 711 | ret = total_written; |
| @@ -729,8 +718,6 @@ static ssize_t __qsfp_debugfs_write(struct file *file, const char __user *buf, · 6 unmodified lines | ||
| 729 | 718 | |
| 730 | 719 | _free: |
| 731 | 720 | kfree(buff); |
| 732 | − _return: | |
| 733 | − rcu_read_unlock(); | |
| 734 | 721 | return ret; |
| 735 | 722 | } |
| 736 | 723 | |
| @@ -757,7 +744,6 @@ static ssize_t __qsfp_debugfs_read(struct file *file, char __user *buf, · 20 unmodified lines | ||
| 757 | 744 | int ret; |
| 758 | 745 | int total_read; |
| 759 | 746 | |
| 760 | − rcu_read_lock(); | |
| 761 | 747 | if (*ppos + count > QSFP_PAGESIZE * 4) { /* base page + page00-page03 */ |
| 762 | 748 | ret = -EINVAL; |
| 763 | 749 | goto _return; |
| @@ -790,7 +776,6 @@ static ssize_t __qsfp_debugfs_read(struct file *file, char __user *buf, · 26 unmodified lines | ||
| 790 | 776 | _free: |
| 791 | 777 | kfree(buff); |
| 792 | 778 | _return: |
| 793 | − rcu_read_unlock(); | |
| 794 | 779 | return ret; |
| 795 | 780 | } |
| 796 | 781 | |
| @@ -1006,7 +991,6 @@ void hfi1_dbg_ibdev_exit(struct hfi1_ibdev *ibd) · 209 unmodified lines | ||
| 1006 | 991 | debugfs_remove_recursive(ibd->hfi1_ibdev_dbg); |
| 1007 | 992 | out: |
| 1008 | 993 | ibd->hfi1_ibdev_dbg = NULL; |
| 1009 | − synchronize_rcu(); | |
| 1010 | 994 | } |
| 1011 | 995 | |
| 1012 | 996 | /* |
| @@ -1031,9 +1015,7 @@ static const char * const hfi1_statnames[] = { · 18 unmodified lines | ||
| 1031 | 1015 | }; |
| 1032 | 1016 | |
| 1033 | 1017 | static void *_driver_stats_names_seq_start(struct seq_file *s, loff_t *pos) |
| 1034 | −__acquires(RCU) | |
| 1035 | 1018 | { |
| 1036 | − rcu_read_lock(); | |
| 1037 | 1019 | if (*pos >= ARRAY_SIZE(hfi1_statnames)) |
| 1038 | 1020 | return NULL; |
| 1039 | 1021 | return pos; |
| @@ -1051,9 +1033,7 @@ static void *_driver_stats_names_seq_next( · 11 unmodified lines | ||
| 1051 | 1033 | } |
| 1052 | 1034 | |
| 1053 | 1035 | static void _driver_stats_names_seq_stop(struct seq_file *s, void *v) |
| 1054 | −__releases(RCU) | |
| 1055 | 1036 | { |
| 1056 | − rcu_read_unlock(); | |
| 1057 | 1037 | } |
| 1058 | 1038 | |
| 1059 | 1039 | static int _driver_stats_names_seq_show(struct seq_file *s, void *v) |
| @@ -1069,9 +1049,7 @@ DEBUGFS_SEQ_FILE_OPEN(driver_stats_names) · 9 unmodified lines | ||
| 1069 | 1049 | DEBUGFS_FILE_OPS(driver_stats_names); |
| 1070 | 1050 | |
| 1071 | 1051 | static void *_driver_stats_seq_start(struct seq_file *s, loff_t *pos) |
| 1072 | −__acquires(RCU) | |
| 1073 | 1052 | { |
| 1074 | − rcu_read_lock(); | |
| 1075 | 1053 | if (*pos >= ARRAY_SIZE(hfi1_statnames)) |
| 1076 | 1054 | return NULL; |
| 1077 | 1055 | return pos; |
| @@ -1086,9 +1064,7 @@ static void *_driver_stats_seq_next(struct seq_file *s, void *v, loff_t *pos) · 8 unmodified lines | ||
| 1086 | 1064 | } |
| 1087 | 1065 | |
| 1088 | 1066 | static void _driver_stats_seq_stop(struct seq_file *s, void *v) |
| 1089 | −__releases(RCU) | |
| 1090 | 1067 | { |
| 1091 | − rcu_read_unlock(); | |
| 1092 | 1068 | } |
| 1093 | 1069 | |
| 1094 | 1070 | static u64 hfi1_sps_ints(void) |
| @@ -888,14 +888,15 @@ void set_all_slowpath(struct hfi1_devdata *dd) · 887 unmodified lines | ||
| 888 | 888 | } |
| 889 | 889 | |
| 890 | 890 | static inline int set_armed_to_active(struct hfi1_ctxtdata *rcd, |
| 891 | − struct hfi1_packet packet, | |
| 891 | + struct hfi1_packet *packet, | |
| 892 | 892 | struct hfi1_devdata *dd) |
| 893 | 893 | { |
| 894 | 894 | struct work_struct *lsaw = &rcd->ppd->linkstate_active_work; |
| 895 | − struct hfi1_message_header *hdr = hfi1_get_msgheader(packet.rcd->dd, | |
| 896 | − packet.rhf_addr); | |
| 895 | + struct hfi1_message_header *hdr = hfi1_get_msgheader(packet->rcd->dd, | |
| 896 | + packet->rhf_addr); | |
| 897 | + u8 etype = rhf_rcv_type(packet->rhf); | |
| 897 | 898 | |
| 898 | − if (hdr2sc(hdr, packet.rhf) != 0xf) { | |
| 899 | + if (etype == RHF_RCV_TYPE_IB && hdr2sc(hdr, packet->rhf) != 0xf) { | |
| 899 | 900 | int hwstate = read_logical_state(dd); |
| 900 | 901 | |
| 901 | 902 | if (hwstate != LSTATE_ACTIVE) { |
| @@ -979,7 +980,7 @@ int handle_receive_interrupt(struct hfi1_ctxtdata *rcd, int thread) · 77 unmodified lines | ||
| 979 | 980 | /* Auto activate link on non-SC15 packet receive */ |
| 980 | 981 | if (unlikely(rcd->ppd->host_link_state == |
| 981 | 982 | HLS_UP_ARMED) && |
| 982 | − set_armed_to_active(rcd, packet, dd)) | |
| 983 | + set_armed_to_active(rcd, &packet, dd)) | |
| 983 | 984 | goto bail; |
| 984 | 985 | last = process_rcv_packet(&packet, thread); |
| 985 | 986 | } |
| @@ -183,6 +183,7 @@ static int hfi1_file_open(struct inode *inode, struct file *fp) · 182 unmodified lines | ||
| 183 | 183 | if (fd) { |
| 184 | 184 | fd->rec_cpu_num = -1; /* no cpu affinity by default */ |
| 185 | 185 | fd->mm = current->mm; |
| 186 | + atomic_inc(&fd->mm->mm_count); | |
| 186 | 187 | } |
| 187 | 188 | |
| 188 | 189 | fp->private_data = fd; |
| @@ -222,7 +223,7 @@ static long hfi1_file_ioctl(struct file *fp, unsigned int cmd, · 33 unmodified lines | ||
| 222 | 223 | ret = assign_ctxt(fp, &uinfo); |
| 223 | 224 | if (ret < 0) |
| 224 | 225 | return ret; |
| 225 | − setup_ctxt(fp); | |
| 226 | + ret = setup_ctxt(fp); | |
| 226 | 227 | if (ret) |
| 227 | 228 | return ret; |
| 228 | 229 | ret = user_init(fp); |
| @@ -779,6 +780,7 @@ static int hfi1_file_close(struct inode *inode, struct file *fp) · 550 unmodified lines | ||
| 779 | 780 | mutex_unlock(&hfi1_mutex); |
| 780 | 781 | hfi1_free_ctxtdata(dd, uctxt); |
| 781 | 782 | done: |
| 783 | + mmdrop(fdata->mm); | |
| 782 | 784 | kobject_put(&dd->kobj); |
| 783 | 785 | kfree(fdata); |
| 784 | 786 | return 0; |
| @@ -605,6 +605,7 @@ struct hfi1_pportdata { · 604 unmodified lines | ||
| 605 | 605 | struct work_struct freeze_work; |
| 606 | 606 | struct work_struct link_downgrade_work; |
| 607 | 607 | struct work_struct link_bounce_work; |
| 608 | + struct delayed_work start_link_work; | |
| 608 | 609 | /* host link state variables */ |
| 609 | 610 | struct mutex hls_lock; |
| 610 | 611 | u32 host_link_state; |
| @@ -659,6 +660,7 @@ struct hfi1_pportdata { · 48 unmodified lines | ||
| 659 | 660 | u8 linkinit_reason; |
| 660 | 661 | u8 local_tx_rate; /* rate given to 8051 firmware */ |
| 661 | 662 | u8 last_pstate; /* info only */ |
| 663 | + u8 qsfp_retry_count; | |
| 662 | 664 | |
| 663 | 665 | /* placeholders for IB MAD packet settings */ |
| 664 | 666 | u8 overrun_threshold; |
| @@ -1272,9 +1274,26 @@ static inline int hdr2sc(struct hfi1_message_header *hdr, u64 rhf) · 607 unmodified lines | ||
| 1272 | 1274 | ((!!(rhf_dc_info(rhf))) << 4); |
| 1273 | 1275 | } |
| 1274 | 1276 | |
| 1277 | +#define HFI1_JKEY_WIDTH 16 | |
| 1278 | +#define HFI1_JKEY_MASK (BIT(16) - 1) | |
| 1279 | +#define HFI1_ADMIN_JKEY_RANGE 32 | |
| 1280 | + | |
| 1281 | +/* | |
| 1282 | + * J_KEYs are split and allocated in the following groups: | |
| 1283 | + * 0 - 31 - users with administrator privileges | |
| 1284 | + * 32 - 63 - kernel protocols using KDETH packets | |
| 1285 | + * 64 - 65535 - all other users using KDETH packets | |
| 1286 | + */ | |
| 1275 | 1287 | static inline u16 generate_jkey(kuid_t uid) |
| 1276 | 1288 | { |
| 1277 | − return from_kuid(current_user_ns(), uid) & 0xffff; | |
| 1289 | + u16 jkey = from_kuid(current_user_ns(), uid) & HFI1_JKEY_MASK; | |
| 1290 | + | |
| 1291 | + if (capable(CAP_SYS_ADMIN)) | |
| 1292 | + jkey &= HFI1_ADMIN_JKEY_RANGE - 1; | |
| 1293 | + else if (jkey < 64) | |
| 1294 | + jkey |= BIT(HFI1_JKEY_WIDTH - 1); | |
| 1295 | + | |
| 1296 | + return jkey; | |
| 1278 | 1297 | } |
| 1279 | 1298 | |
| 1280 | 1299 | /* |
| @@ -1656,7 +1675,6 @@ struct cc_state *get_cc_state_protected(struct hfi1_pportdata *ppd) · 375 unmodified lines | ||
| 1656 | 1675 | struct hfi1_devdata *hfi1_init_dd(struct pci_dev *, |
| 1657 | 1676 | const struct pci_device_id *); |
| 1658 | 1677 | void hfi1_free_devdata(struct hfi1_devdata *); |
| 1659 | −void cc_state_reclaim(struct rcu_head *rcu); | |
| 1660 | 1678 | struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev, size_t extra); |
| 1661 | 1679 | |
| 1662 | 1680 | /* LED beaconing functions */ |
| @@ -1788,7 +1806,7 @@ extern unsigned int hfi1_max_mtu; · 125 unmodified lines | ||
| 1788 | 1806 | extern unsigned int hfi1_cu; |
| 1789 | 1807 | extern unsigned int user_credit_return_threshold; |
| 1790 | 1808 | extern int num_user_contexts; |
| 1791 | −extern unsigned n_krcvqs; | |
| 1809 | +extern unsigned long n_krcvqs; | |
| 1792 | 1810 | extern uint krcvqs[]; |
| 1793 | 1811 | extern int krcvqsset; |
| 1794 | 1812 | extern uint kdeth_qp; |
| @@ -94,7 +94,7 @@ module_param_array(krcvqs, uint, &krcvqsset, S_IRUGO); · 93 unmodified lines | ||
| 94 | 94 | MODULE_PARM_DESC(krcvqs, "Array of the number of non-control kernel receive queues by VL"); |
| 95 | 95 | |
| 96 | 96 | /* computed based on above array */ |
| 97 | −unsigned n_krcvqs; | |
| 97 | +unsigned long n_krcvqs; | |
| 98 | 98 | |
| 99 | 99 | static unsigned hfi1_rcvarr_split = 25; |
| 100 | 100 | module_param_named(rcvarr_split, hfi1_rcvarr_split, uint, S_IRUGO); |
| @@ -500,6 +500,7 @@ void hfi1_init_pportdata(struct pci_dev *pdev, struct hfi1_pportdata *ppd, · 399 unmodified lines | ||
| 500 | 500 | INIT_WORK(&ppd->link_downgrade_work, handle_link_downgrade); |
| 501 | 501 | INIT_WORK(&ppd->sma_message_work, handle_sma_message); |
| 502 | 502 | INIT_WORK(&ppd->link_bounce_work, handle_link_bounce); |
| 503 | + INIT_DELAYED_WORK(&ppd->start_link_work, handle_start_link); | |
| 503 | 504 | INIT_WORK(&ppd->linkstate_active_work, receive_interrupt_work); |
| 504 | 505 | INIT_WORK(&ppd->qsfp_info.qsfp_work, qsfp_event); |
| 505 | 506 | |
| @@ -1333,7 +1334,7 @@ static void cleanup_device_data(struct hfi1_devdata *dd) · 827 unmodified lines | ||
| 1333 | 1334 | spin_unlock(&ppd->cc_state_lock); |
| 1334 | 1335 | |
| 1335 | 1336 | if (cc_state) |
| 1336 | − call_rcu(&cc_state->rcu, cc_state_reclaim); | |
| 1337 | + kfree_rcu(cc_state, rcu); | |
| 1337 | 1338 | } |
| 1338 | 1339 | |
| 1339 | 1340 | free_credit_return(dd); |
| @@ -1819,6 +1819,11 @@ static int __subn_get_opa_cable_info(struct opa_smp *smp, u32 am, u8 *data, · 1818 unmodified lines | ||
| 1819 | 1819 | u32 len = OPA_AM_CI_LEN(am) + 1; |
| 1820 | 1820 | int ret; |
| 1821 | 1821 | |
| 1822 | + if (dd->pport->port_type != PORT_TYPE_QSFP) { | |
| 1823 | + smp->status |= IB_SMP_INVALID_FIELD; | |
| 1824 | + return reply((struct ib_mad_hdr *)smp); | |
| 1825 | + } | |
| 1826 | + | |
| 1822 | 1827 | #define __CI_PAGE_SIZE BIT(7) /* 128 bytes */ |
| 1823 | 1828 | #define __CI_PAGE_MASK ~(__CI_PAGE_SIZE - 1) |
| 1824 | 1829 | #define __CI_PAGE_NUM(a) ((a) & __CI_PAGE_MASK) |
| @@ -2599,7 +2604,7 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, · 774 unmodified lines | ||
| 2599 | 2604 | u8 lq, num_vls; |
| 2600 | 2605 | u8 res_lli, res_ler; |
| 2601 | 2606 | u64 port_mask; |
| 2602 | − unsigned long port_num; | |
| 2607 | + u8 port_num; | |
| 2603 | 2608 | unsigned long vl; |
| 2604 | 2609 | u32 vl_select_mask; |
| 2605 | 2610 | int vfi; |
| @@ -2633,9 +2638,9 @@ static int pma_get_opa_datacounters(struct opa_pma_mad *pmp, · 27 unmodified lines | ||
| 2633 | 2638 | */ |
| 2634 | 2639 | port_mask = be64_to_cpu(req->port_select_mask[3]); |
| 2635 | 2640 | port_num = find_first_bit((unsigned long *)&port_mask, |
| 2636 | − sizeof(port_mask)); | |
| 2641 | + sizeof(port_mask) * 8); | |
| 2637 | 2642 | |
| 2638 | − if ((u8)port_num != port) { | |
| 2643 | + if (port_num != port) { | |
| 2639 | 2644 | pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; |
| 2640 | 2645 | return reply((struct ib_mad_hdr *)pmp); |
| 2641 | 2646 | } |
| @@ -2837,7 +2842,7 @@ static int pma_get_opa_porterrors(struct opa_pma_mad *pmp, · 195 unmodified lines | ||
| 2837 | 2842 | */ |
| 2838 | 2843 | port_mask = be64_to_cpu(req->port_select_mask[3]); |
| 2839 | 2844 | port_num = find_first_bit((unsigned long *)&port_mask, |
| 2840 | − sizeof(port_mask)); | |
| 2845 | + sizeof(port_mask) * 8); | |
| 2841 | 2846 | |
| 2842 | 2847 | if (port_num != port) { |
| 2843 | 2848 | pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; |
| @@ -3010,7 +3015,7 @@ static int pma_get_opa_errorinfo(struct opa_pma_mad *pmp, · 166 unmodified lines | ||
| 3010 | 3015 | */ |
| 3011 | 3016 | port_mask = be64_to_cpu(req->port_select_mask[3]); |
| 3012 | 3017 | port_num = find_first_bit((unsigned long *)&port_mask, |
| 3013 | − sizeof(port_mask)); | |
| 3018 | + sizeof(port_mask) * 8); | |
| 3014 | 3019 | |
| 3015 | 3020 | if (port_num != port) { |
| 3016 | 3021 | pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; |
| @@ -3247,7 +3252,7 @@ static int pma_set_opa_errorinfo(struct opa_pma_mad *pmp, · 230 unmodified lines | ||
| 3247 | 3252 | */ |
| 3248 | 3253 | port_mask = be64_to_cpu(req->port_select_mask[3]); |
| 3249 | 3254 | port_num = find_first_bit((unsigned long *)&port_mask, |
| 3250 | − sizeof(port_mask)); | |
| 3255 | + sizeof(port_mask) * 8); | |
| 3251 | 3256 | |
| 3252 | 3257 | if (port_num != port) { |
| 3253 | 3258 | pmp->mad_hdr.status |= IB_SMP_INVALID_FIELD; |
| @@ -3398,7 +3403,7 @@ static void apply_cc_state(struct hfi1_pportdata *ppd) · 144 unmodified lines | ||
| 3398 | 3403 | |
| 3399 | 3404 | spin_unlock(&ppd->cc_state_lock); |
| 3400 | 3405 | |
| 3401 | − call_rcu(&old_cc_state->rcu, cc_state_reclaim); | |
| 3406 | + kfree_rcu(old_cc_state, rcu); | |
| 3402 | 3407 | } |
| 3403 | 3408 | |
| 3404 | 3409 | static int __subn_set_opa_cong_setting(struct opa_smp *smp, u32 am, u8 *data, |
| @@ -3553,13 +3558,6 @@ static int __subn_get_opa_cc_table(struct opa_smp *smp, u32 am, u8 *data, · 148 unmodified lines | ||
| 3553 | 3558 | return reply((struct ib_mad_hdr *)smp); |
| 3554 | 3559 | } |
| 3555 | 3560 | |
| 3556 | −void cc_state_reclaim(struct rcu_head *rcu) | |
| 3557 | −{ | |
| 3558 | − struct cc_state *cc_state = container_of(rcu, struct cc_state, rcu); | |
| 3559 | − | |
| 3560 | − kfree(cc_state); | |
| 3561 | −} | |
| 3562 | − | |
| 3563 | 3561 | static int __subn_set_opa_cc_table(struct opa_smp *smp, u32 am, u8 *data, |
| 3564 | 3562 | struct ib_device *ibdev, u8 port, |
| 3565 | 3563 | u32 *resp_len) |
| @@ -771,6 +771,9 @@ void seg_pio_copy_mid(struct pio_buf *pbuf, const void *from, size_t nbytes) · 770 unmodified lines | ||
| 771 | 771 | read_extra_bytes(pbuf, from, to_fill); |
| 772 | 772 | from += to_fill; |
| 773 | 773 | nbytes -= to_fill; |
| 774 | + /* may not be enough valid bytes left to align */ | |
| 775 | + if (extra > nbytes) | |
| 776 | + extra = nbytes; | |
| 774 | 777 | |
| 775 | 778 | /* ...now write carry */ |
| 776 | 779 | dest = pbuf->start + (pbuf->qw_written * sizeof(u64)); |
| @@ -798,6 +801,15 @@ void seg_pio_copy_mid(struct pio_buf *pbuf, const void *from, size_t nbytes) · 21 unmodified lines | ||
| 798 | 801 | read_low_bytes(pbuf, from, extra); |
| 799 | 802 | from += extra; |
| 800 | 803 | nbytes -= extra; |
| 804 | + /* | |
| 805 | + * If no bytes are left, return early - we are done. | |
| 806 | + * NOTE: This short-circuit is *required* because | |
| 807 | + * "extra" may have been reduced in size and "from" | |
| 808 | + * is not aligned, as required when leaving this | |
| 809 | + * if block. | |
| 810 | + */ | |
| 811 | + if (nbytes == 0) | |
| 812 | + return; | |
| 801 | 813 | } |
| 802 | 814 | |
| 803 | 815 | /* at this point, from is QW aligned */ |
| @@ -656,10 +656,6 @@ struct qp_iter *qp_iter_init(struct hfi1_ibdev *dev) · 655 unmodified lines | ||
| 656 | 656 | |
| 657 | 657 | iter->dev = dev; |
| 658 | 658 | iter->specials = dev->rdi.ibdev.phys_port_cnt * 2; |
| 659 | − if (qp_iter_next(iter)) { | |
| 660 | − kfree(iter); | |
| 661 | − return NULL; | |
| 662 | − } | |
| 663 | 659 | |
| 664 | 660 | return iter; |
| 665 | 661 | } |
| @@ -706,8 +706,8 @@ int get_cable_info(struct hfi1_devdata *dd, u32 port_num, u32 addr, u32 len, · 705 unmodified lines | ||
| 706 | 706 | u8 *data) |
| 707 | 707 | { |
| 708 | 708 | struct hfi1_pportdata *ppd; |
| 709 | − u32 excess_len = 0; | |
| 710 | − int ret = 0; | |
| 709 | + u32 excess_len = len; | |
| 710 | + int ret = 0, offset = 0; | |
| 711 | 711 | |
| 712 | 712 | if (port_num > dd->num_pports || port_num < 1) { |
| 713 | 713 | dd_dev_info(dd, "%s: Invalid port number %d\n", |
| @@ -740,6 +740,34 @@ int get_cable_info(struct hfi1_devdata *dd, u32 port_num, u32 addr, u32 len, · 26 unmodified lines | ||
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | memcpy(data, &ppd->qsfp_info.cache[addr], len); |
| 743 | + | |
| 744 | + if (addr <= QSFP_MONITOR_VAL_END && | |
| 745 | + (addr + len) >= QSFP_MONITOR_VAL_START) { | |
| 746 | + /* Overlap with the dynamic channel monitor range */ | |
| 747 | + if (addr < QSFP_MONITOR_VAL_START) { | |
| 748 | + if (addr + len <= QSFP_MONITOR_VAL_END) | |
| 749 | + len = addr + len - QSFP_MONITOR_VAL_START; | |
| 750 | + else | |
| 751 | + len = QSFP_MONITOR_RANGE; | |
| 752 | + offset = QSFP_MONITOR_VAL_START - addr; | |
| 753 | + addr = QSFP_MONITOR_VAL_START; | |
| 754 | + } else if (addr == QSFP_MONITOR_VAL_START) { | |
| 755 | + offset = 0; | |
| 756 | + if (addr + len > QSFP_MONITOR_VAL_END) | |
| 757 | + len = QSFP_MONITOR_RANGE; | |
| 758 | + } else { | |
| 759 | + offset = 0; | |
| 760 | + if (addr + len > QSFP_MONITOR_VAL_END) | |
| 761 | + len = QSFP_MONITOR_VAL_END - addr + 1; | |
| 762 | + } | |
| 763 | + /* Refresh the values of the dynamic monitors from the cable */ | |
| 764 | + ret = one_qsfp_read(ppd, dd->hfi1_id, addr, data + offset, len); | |
| 765 | + if (ret != len) { | |
| 766 | + ret = -EAGAIN; | |
| 767 | + goto set_zeroes; | |
| 768 | + } | |
| 769 | + } | |
| 770 | + | |
| 743 | 771 | return 0; |
| 744 | 772 | |
| 745 | 773 | set_zeroes: |
| @@ -74,6 +74,9 @@ · 73 unmodified lines | ||
| 74 | 74 | /* Defined fields that Intel requires of qualified cables */ |
| 75 | 75 | /* Byte 0 is Identifier, not checked */ |
| 76 | 76 | /* Byte 1 is reserved "status MSB" */ |
| 77 | +#define QSFP_MONITOR_VAL_START 22 | |
| 78 | +#define QSFP_MONITOR_VAL_END 81 | |
| 79 | +#define QSFP_MONITOR_RANGE (QSFP_MONITOR_VAL_END - QSFP_MONITOR_VAL_START + 1) | |
| 77 | 80 | #define QSFP_TX_CTRL_BYTE_OFFS 86 |
| 78 | 81 | #define QSFP_PWR_CTRL_BYTE_OFFS 93 |
| 79 | 82 | #define QSFP_CDR_CTRL_BYTE_OFFS 98 |
| @@ -114,6 +114,8 @@ MODULE_PARM_DESC(sdma_comp_size, "Size of User SDMA completion ring. Default: 12 · 113 unmodified lines | ||
| 114 | 114 | #define KDETH_HCRC_LOWER_SHIFT 24 |
| 115 | 115 | #define KDETH_HCRC_LOWER_MASK 0xff |
| 116 | 116 | |
| 117 | +#define AHG_KDETH_INTR_SHIFT 12 | |
| 118 | + | |
| 117 | 119 | #define PBC2LRH(x) ((((x) & 0xfff) << 2) - 4) |
| 118 | 120 | #define LRH2PBC(x) ((((x) >> 2) + 1) & 0xfff) |
| 119 | 121 | |
| @@ -1480,7 +1482,8 @@ static int set_txreq_header_ahg(struct user_sdma_request *req, · 1360 unmodified lines | ||
| 1480 | 1482 | /* Clear KDETH.SH on last packet */ |
| 1481 | 1483 | if (unlikely(tx->flags & TXREQ_FLAGS_REQ_LAST_PKT)) { |
| 1482 | 1484 | val |= cpu_to_le16(KDETH_GET(hdr->kdeth.ver_tid_offset, |
| 1483 | − INTR) >> 16); | |
| 1485 | + INTR) << | |
| 1486 | + AHG_KDETH_INTR_SHIFT); | |
| 1484 | 1487 | val &= cpu_to_le16(~(1U << 13)); |
| 1485 | 1488 | AHG_HEADER_SET(req->ahg, diff, 7, 16, 14, val); |
| 1486 | 1489 | } else { |
| @@ -232,7 +232,7 @@ struct i40iw_device { · 231 unmodified lines | ||
| 232 | 232 | struct i40e_client *client; |
| 233 | 233 | struct i40iw_hw hw; |
| 234 | 234 | struct i40iw_cm_core cm_core; |
| 235 | − unsigned long *mem_resources; | |
| 235 | + u8 *mem_resources; | |
| 236 | 236 | unsigned long *allocated_qps; |
| 237 | 237 | unsigned long *allocated_cqs; |
| 238 | 238 | unsigned long *allocated_mrs; |
| @@ -435,8 +435,8 @@ static inline int i40iw_alloc_resource(struct i40iw_device *iwdev, · 196 unmodified lines | ||
| 435 | 435 | *next = resource_num + 1; |
| 436 | 436 | if (*next == max_resources) |
| 437 | 437 | *next = 0; |
| 438 | − spin_unlock_irqrestore(&iwdev->resource_lock, flags); | |
| 439 | 438 | *req_resource_num = resource_num; |
| 439 | + spin_unlock_irqrestore(&iwdev->resource_lock, flags); | |
| 440 | 440 | |
| 441 | 441 | return 0; |
| 442 | 442 | } |
| @@ -535,8 +535,8 @@ static struct i40iw_puda_buf *i40iw_form_cm_frame(struct i40iw_cm_node *cm_node, · 534 unmodified lines | ||
| 535 | 535 | buf += hdr_len; |
| 536 | 536 | } |
| 537 | 537 | |
| 538 | − if (pd_len) | |
| 539 | − memcpy(buf, pdata->addr, pd_len); | |
| 538 | + if (pdata && pdata->addr) | |
| 539 | + memcpy(buf, pdata->addr, pdata->size); | |
| 540 | 540 | |
| 541 | 541 | atomic_set(&sqbuf->refcount, 1); |
| 542 | 542 | |
| @@ -3346,26 +3346,6 @@ int i40iw_cm_disconn(struct i40iw_qp *iwqp) · 2803 unmodified lines | ||
| 3346 | 3346 | return 0; |
| 3347 | 3347 | } |
| 3348 | 3348 | |
| 3349 | −/** | |
| 3350 | − * i40iw_loopback_nop - Send a nop | |
| 3351 | − * @qp: associated hw qp | |
| 3352 | − */ | |
| 3353 | −static void i40iw_loopback_nop(struct i40iw_sc_qp *qp) | |
| 3354 | −{ | |
| 3355 | − u64 *wqe; | |
| 3356 | − u64 header; | |
| 3357 | − | |
| 3358 | − wqe = qp->qp_uk.sq_base->elem; | |
| 3359 | − set_64bit_val(wqe, 0, 0); | |
| 3360 | − set_64bit_val(wqe, 8, 0); | |
| 3361 | − set_64bit_val(wqe, 16, 0); | |
| 3362 | − | |
| 3363 | − header = LS_64(I40IWQP_OP_NOP, I40IWQPSQ_OPCODE) | | |
| 3364 | − LS_64(0, I40IWQPSQ_SIGCOMPL) | | |
| 3365 | − LS_64(qp->qp_uk.swqe_polarity, I40IWQPSQ_VALID); | |
| 3366 | − set_64bit_val(wqe, 24, header); | |
| 3367 | −} | |
| 3368 | − | |
| 3369 | 3349 | /** |
| 3370 | 3350 | * i40iw_qp_disconnect - free qp and close cm |
| 3371 | 3351 | * @iwqp: associate qp for the connection |
| @@ -3638,7 +3618,7 @@ int i40iw_accept(struct iw_cm_id *cm_id, struct iw_cm_conn_param *conn_param) · 266 unmodified lines | ||
| 3638 | 3618 | } else { |
| 3639 | 3619 | if (iwqp->page) |
| 3640 | 3620 | iwqp->sc_qp.qp_uk.sq_base = kmap(iwqp->page); |
| 3641 | − i40iw_loopback_nop(&iwqp->sc_qp); | |
| 3621 | + dev->iw_priv_qp_ops->qp_send_lsmm(&iwqp->sc_qp, NULL, 0, 0); | |
| 3642 | 3622 | } |
| 3643 | 3623 | |
| 3644 | 3624 | if (iwqp->page) |
| @@ -265,6 +265,7 @@ void i40iw_next_iw_state(struct i40iw_qp *iwqp, · 264 unmodified lines | ||
| 265 | 265 | info.dont_send_fin = false; |
| 266 | 266 | if (iwqp->sc_qp.term_flags && (state == I40IW_QP_STATE_ERROR)) |
| 267 | 267 | info.reset_tcp_conn = true; |
| 268 | + iwqp->hw_iwarp_state = state; | |
| 268 | 269 | i40iw_hw_modify_qp(iwqp->iwdev, iwqp, &info, 0); |
| 269 | 270 | } |
| 270 | 271 | |
| @@ -100,7 +100,7 @@ static struct notifier_block i40iw_net_notifier = { · 99 unmodified lines | ||
| 100 | 100 | .notifier_call = i40iw_net_event |
| 101 | 101 | }; |
| 102 | 102 | |
| 103 | −static int i40iw_notifiers_registered; | |
| 103 | +static atomic_t i40iw_notifiers_registered; | |
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * i40iw_find_i40e_handler - find a handler given a client info |
| @@ -1342,12 +1342,11 @@ exit: · 1235 unmodified lines | ||
| 1342 | 1342 | */ |
| 1343 | 1343 | static void i40iw_register_notifiers(void) |
| 1344 | 1344 | { |
| 1345 | − if (!i40iw_notifiers_registered) { | |
| 1345 | + if (atomic_inc_return(&i40iw_notifiers_registered) == 1) { | |
| 1346 | 1346 | register_inetaddr_notifier(&i40iw_inetaddr_notifier); |
| 1347 | 1347 | register_inet6addr_notifier(&i40iw_inetaddr6_notifier); |
| 1348 | 1348 | register_netevent_notifier(&i40iw_net_notifier); |
| 1349 | 1349 | } |
| 1350 | − i40iw_notifiers_registered++; | |
| 1351 | 1350 | } |
| 1352 | 1351 | |
| 1353 | 1352 | /** |
| @@ -1429,8 +1428,7 @@ static void i40iw_deinit_device(struct i40iw_device *iwdev, bool reset, bool del · 75 unmodified lines | ||
| 1429 | 1428 | i40iw_del_macip_entry(iwdev, (u8)iwdev->mac_ip_table_idx); |
| 1430 | 1429 | /* fallthrough */ |
| 1431 | 1430 | case INET_NOTIFIER: |
| 1432 | − if (i40iw_notifiers_registered > 0) { | |
| 1433 | − i40iw_notifiers_registered--; | |
| 1431 | + if (!atomic_dec_return(&i40iw_notifiers_registered)) { | |
| 1434 | 1432 | unregister_netevent_notifier(&i40iw_net_notifier); |
| 1435 | 1433 | unregister_inetaddr_notifier(&i40iw_inetaddr_notifier); |
| 1436 | 1434 | unregister_inet6addr_notifier(&i40iw_inetaddr6_notifier); |
| @@ -1558,6 +1556,10 @@ static int i40iw_open(struct i40e_info *ldev, struct i40e_client *client) · 121 unmodified lines | ||
| 1558 | 1556 | enum i40iw_status_code status; |
| 1559 | 1557 | struct i40iw_handler *hdl; |
| 1560 | 1558 | |
| 1559 | + hdl = i40iw_find_netdev(ldev->netdev); | |
| 1560 | + if (hdl) | |
| 1561 | + return 0; | |
| 1562 | + | |
| 1561 | 1563 | hdl = kzalloc(sizeof(*hdl), GFP_KERNEL); |
| 1562 | 1564 | if (!hdl) |
| 1563 | 1565 | return -ENOMEM; |
| @@ -673,8 +673,11 @@ enum i40iw_status_code i40iw_free_virt_mem(struct i40iw_hw *hw, · 672 unmodified lines | ||
| 673 | 673 | { |
| 674 | 674 | if (!mem) |
| 675 | 675 | return I40IW_ERR_PARAM; |
| 676 | + /* | |
| 677 | + * mem->va points to the parent of mem, so both mem and mem->va | |
| 678 | + * can not be touched once mem->va is freed | |
| 679 | + */ | |
| 676 | 680 | kfree(mem->va); |
| 677 | − mem->va = NULL; | |
| 678 | 681 | return 0; |
| 679 | 682 | } |
| 680 | 683 | |
| @@ -794,7 +794,6 @@ static struct ib_qp *i40iw_create_qp(struct ib_pd *ibpd, · 793 unmodified lines | ||
| 794 | 794 | return &iwqp->ibqp; |
| 795 | 795 | error: |
| 796 | 796 | i40iw_free_qp_resources(iwdev, iwqp, qp_num); |
| 797 | − kfree(mem); | |
| 798 | 797 | return ERR_PTR(err_code); |
| 799 | 798 | } |
| 800 | 799 | |
| @@ -1926,8 +1925,7 @@ static int i40iw_dereg_mr(struct ib_mr *ib_mr) · 1125 unmodified lines | ||
| 1926 | 1925 | } |
| 1927 | 1926 | if (iwpbl->pbl_allocated) |
| 1928 | 1927 | i40iw_free_pble(iwdev->pble_rsrc, palloc); |
| 1929 | − kfree(iwpbl->iwmr); | |
| 1930 | − iwpbl->iwmr = NULL; | |
| 1928 | + kfree(iwmr); | |
| 1931 | 1929 | return 0; |
| 1932 | 1930 | } |
| 1933 | 1931 | |
| @@ -576,8 +576,8 @@ static int mlx4_ib_ipoib_csum_ok(__be16 status, __be16 checksum) · 575 unmodified lines | ||
| 576 | 576 | checksum == cpu_to_be16(0xffff); |
| 577 | 577 | } |
| 578 | 578 | |
| 579 | −static int use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc, | |
| 580 | − unsigned tail, struct mlx4_cqe *cqe, int is_eth) | |
| 579 | +static void use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct ib_wc *wc, | |
| 580 | + unsigned tail, struct mlx4_cqe *cqe, int is_eth) | |
| 581 | 581 | { |
| 582 | 582 | struct mlx4_ib_proxy_sqp_hdr *hdr; |
| 583 | 583 | |
| @@ -600,8 +600,6 @@ static int use_tunnel_data(struct mlx4_ib_qp *qp, struct mlx4_ib_cq *cq, struct · 16 unmodified lines | ||
| 600 | 600 | wc->slid = be16_to_cpu(hdr->tun.slid_mac_47_32); |
| 601 | 601 | wc->sl = (u8) (be16_to_cpu(hdr->tun.sl_vid) >> 12); |
| 602 | 602 | } |
| 603 | − | |
| 604 | − return 0; | |
| 605 | 603 | } |
| 606 | 604 | |
| 607 | 605 | static void mlx4_ib_qp_sw_comp(struct mlx4_ib_qp *qp, int num_entries, |
| @@ -689,12 +687,6 @@ repoll: · 81 unmodified lines | ||
| 689 | 687 | is_error = (cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) == |
| 690 | 688 | MLX4_CQE_OPCODE_ERROR; |
| 691 | 689 | |
| 692 | − if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) == MLX4_OPCODE_NOP && | |
| 693 | − is_send)) { | |
| 694 | − pr_warn("Completion for NOP opcode detected!\n"); | |
| 695 | − return -EINVAL; | |
| 696 | − } | |
| 697 | − | |
| 698 | 690 | /* Resize CQ in progress */ |
| 699 | 691 | if (unlikely((cqe->owner_sr_opcode & MLX4_CQE_OPCODE_MASK) == MLX4_CQE_OPCODE_RESIZE)) { |
| 700 | 692 | if (cq->resize_buf) { |
| @@ -720,12 +712,6 @@ repoll: · 19 unmodified lines | ||
| 720 | 712 | */ |
| 721 | 713 | mqp = __mlx4_qp_lookup(to_mdev(cq->ibcq.device)->dev, |
| 722 | 714 | be32_to_cpu(cqe->vlan_my_qpn)); |
| 723 | − if (unlikely(!mqp)) { | |
| 724 | − pr_warn("CQ %06x with entry for unknown QPN %06x\n", | |
| 725 | − cq->mcq.cqn, be32_to_cpu(cqe->vlan_my_qpn) & MLX4_CQE_QPN_MASK); | |
| 726 | − return -EINVAL; | |
| 727 | − } | |
| 728 | − | |
| 729 | 715 | *cur_qp = to_mibqp(mqp); |
| 730 | 716 | } |
| 731 | 717 | |
| @@ -738,11 +724,6 @@ repoll: · 6 unmodified lines | ||
| 738 | 724 | /* SRQ is also in the radix tree */ |
| 739 | 725 | msrq = mlx4_srq_lookup(to_mdev(cq->ibcq.device)->dev, |
| 740 | 726 | srq_num); |
| 741 | − if (unlikely(!msrq)) { | |
| 742 | − pr_warn("CQ %06x with entry for unknown SRQN %06x\n", | |
| 743 | − cq->mcq.cqn, srq_num); | |
| 744 | − return -EINVAL; | |
| 745 | − } | |
| 746 | 727 | } |
| 747 | 728 | |
| 748 | 729 | if (is_send) { |
| @@ -852,9 +833,11 @@ repoll: · 103 unmodified lines | ||
| 852 | 833 | if (mlx4_is_mfunc(to_mdev(cq->ibcq.device)->dev)) { |
| 853 | 834 | if ((*cur_qp)->mlx4_ib_qp_type & |
| 854 | 835 | (MLX4_IB_QPT_PROXY_SMI_OWNER | |
| 855 | − MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI)) | |
| 856 | − return use_tunnel_data(*cur_qp, cq, wc, tail, | |
| 857 | − cqe, is_eth); | |
| 836 | + MLX4_IB_QPT_PROXY_SMI | MLX4_IB_QPT_PROXY_GSI)) { | |
| 837 | + use_tunnel_data(*cur_qp, cq, wc, tail, cqe, | |
| 838 | + is_eth); | |
| 839 | + return 0; | |
| 840 | + } | |
| 858 | 841 | } |
| 859 | 842 | |
| 860 | 843 | wc->slid = be16_to_cpu(cqe->rlid); |
| @@ -891,7 +874,6 @@ int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 30 unmodified lines | ||
| 891 | 874 | struct mlx4_ib_qp *cur_qp = NULL; |
| 892 | 875 | unsigned long flags; |
| 893 | 876 | int npolled; |
| 894 | − int err = 0; | |
| 895 | 877 | struct mlx4_ib_dev *mdev = to_mdev(cq->ibcq.device); |
| 896 | 878 | |
| 897 | 879 | spin_lock_irqsave(&cq->lock, flags); |
| @@ -901,8 +883,7 @@ int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 3 unmodified lines | ||
| 901 | 883 | } |
| 902 | 884 | |
| 903 | 885 | for (npolled = 0; npolled < num_entries; ++npolled) { |
| 904 | − err = mlx4_ib_poll_one(cq, &cur_qp, wc + npolled); | |
| 905 | − if (err) | |
| 886 | + if (mlx4_ib_poll_one(cq, &cur_qp, wc + npolled)) | |
| 906 | 887 | break; |
| 907 | 888 | } |
| 908 | 889 | |
| @@ -911,10 +892,7 @@ int mlx4_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 2 unmodified lines | ||
| 911 | 892 | out: |
| 912 | 893 | spin_unlock_irqrestore(&cq->lock, flags); |
| 913 | 894 | |
| 914 | − if (err == 0 || err == -EAGAIN) | |
| 915 | − return npolled; | |
| 916 | − else | |
| 917 | − return err; | |
| 895 | + return npolled; | |
| 918 | 896 | } |
| 919 | 897 | |
| 920 | 898 | int mlx4_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) |
| @@ -1128,6 +1128,27 @@ void handle_port_mgmt_change_event(struct work_struct *work) · 1127 unmodified lines | ||
| 1128 | 1128 | |
| 1129 | 1129 | /* Generate GUID changed event */ |
| 1130 | 1130 | if (changed_attr & MLX4_EQ_PORT_INFO_GID_PFX_CHANGE_MASK) { |
| 1131 | + if (mlx4_is_master(dev->dev)) { | |
| 1132 | + union ib_gid gid; | |
| 1133 | + int err = 0; | |
| 1134 | + | |
| 1135 | + if (!eqe->event.port_mgmt_change.params.port_info.gid_prefix) | |
| 1136 | + err = __mlx4_ib_query_gid(&dev->ib_dev, port, 0, &gid, 1); | |
| 1137 | + else | |
| 1138 | + gid.global.subnet_prefix = | |
| 1139 | + eqe->event.port_mgmt_change.params.port_info.gid_prefix; | |
| 1140 | + if (err) { | |
| 1141 | + pr_warn("Could not change QP1 subnet prefix for port %d: query_gid error (%d)\n", | |
| 1142 | + port, err); | |
| 1143 | + } else { | |
| 1144 | + pr_debug("Changing QP1 subnet prefix for port %d. old=0x%llx. new=0x%llx\n", | |
| 1145 | + port, | |
| 1146 | + (u64)atomic64_read(&dev->sriov.demux[port - 1].subnet_prefix), | |
| 1147 | + be64_to_cpu(gid.global.subnet_prefix)); | |
| 1148 | + atomic64_set(&dev->sriov.demux[port - 1].subnet_prefix, | |
| 1149 | + be64_to_cpu(gid.global.subnet_prefix)); | |
| 1150 | + } | |
| 1151 | + } | |
| 1131 | 1152 | mlx4_ib_dispatch_event(dev, port, IB_EVENT_GID_CHANGE); |
| 1132 | 1153 | /*if master, notify all slaves*/ |
| 1133 | 1154 | if (mlx4_is_master(dev->dev)) |
| @@ -2202,6 +2223,8 @@ int mlx4_ib_init_sriov(struct mlx4_ib_dev *dev) · 1068 unmodified lines | ||
| 2202 | 2223 | if (err) |
| 2203 | 2224 | goto demux_err; |
| 2204 | 2225 | dev->sriov.demux[i].guid_cache[0] = gid.global.interface_id; |
| 2226 | + atomic64_set(&dev->sriov.demux[i].subnet_prefix, | |
| 2227 | + be64_to_cpu(gid.global.subnet_prefix)); | |
| 2205 | 2228 | err = alloc_pv_object(dev, mlx4_master_func_num(dev->dev), i + 1, |
| 2206 | 2229 | &dev->sriov.sqps[i]); |
| 2207 | 2230 | if (err) |
| @@ -2202,6 +2202,9 @@ static int mlx4_ib_alloc_diag_counters(struct mlx4_ib_dev *ibdev) · 2201 unmodified lines | ||
| 2202 | 2202 | bool per_port = !!(ibdev->dev->caps.flags2 & |
| 2203 | 2203 | MLX4_DEV_CAP_FLAG2_DIAG_PER_PORT); |
| 2204 | 2204 | |
| 2205 | + if (mlx4_is_slave(ibdev->dev)) | |
| 2206 | + return 0; | |
| 2207 | + | |
| 2205 | 2208 | for (i = 0; i < MLX4_DIAG_COUNTERS_TYPES; i++) { |
| 2206 | 2209 | /* i == 1 means we are building port counters */ |
| 2207 | 2210 | if (i && !per_port) |
| @@ -489,7 +489,7 @@ static u8 get_leave_state(struct mcast_group *group) · 488 unmodified lines | ||
| 489 | 489 | if (!group->members[i]) |
| 490 | 490 | leave_state |= (1 << i); |
| 491 | 491 | |
| 492 | − return leave_state & (group->rec.scope_join_state & 7); | |
| 492 | + return leave_state & (group->rec.scope_join_state & 0xf); | |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | 495 | static int join_group(struct mcast_group *group, int slave, u8 join_mask) |
| @@ -564,8 +564,8 @@ static void mlx4_ib_mcg_timeout_handler(struct work_struct *work) · 68 unmodified lines | ||
| 564 | 564 | } else |
| 565 | 565 | mcg_warn_group(group, "DRIVER BUG\n"); |
| 566 | 566 | } else if (group->state == MCAST_LEAVE_SENT) { |
| 567 | − if (group->rec.scope_join_state & 7) | |
| 568 | − group->rec.scope_join_state &= 0xf8; | |
| 567 | + if (group->rec.scope_join_state & 0xf) | |
| 568 | + group->rec.scope_join_state &= 0xf0; | |
| 569 | 569 | group->state = MCAST_IDLE; |
| 570 | 570 | mutex_unlock(&group->lock); |
| 571 | 571 | if (release_group(group, 1)) |
| @@ -605,7 +605,7 @@ static int handle_leave_req(struct mcast_group *group, u8 leave_mask, · 33 unmodified lines | ||
| 605 | 605 | static int handle_join_req(struct mcast_group *group, u8 join_mask, |
| 606 | 606 | struct mcast_req *req) |
| 607 | 607 | { |
| 608 | − u8 group_join_state = group->rec.scope_join_state & 7; | |
| 608 | + u8 group_join_state = group->rec.scope_join_state & 0xf; | |
| 609 | 609 | int ref = 0; |
| 610 | 610 | u16 status; |
| 611 | 611 | struct ib_sa_mcmember_data *sa_data = (struct ib_sa_mcmember_data *)req->sa_mad.data; |
| @@ -690,8 +690,8 @@ static void mlx4_ib_mcg_work_handler(struct work_struct *work) · 78 unmodified lines | ||
| 690 | 690 | u8 cur_join_state; |
| 691 | 691 | |
| 692 | 692 | resp_join_state = ((struct ib_sa_mcmember_data *) |
| 693 | − group->response_sa_mad.data)->scope_join_state & 7; | |
| 694 | − cur_join_state = group->rec.scope_join_state & 7; | |
| 693 | + group->response_sa_mad.data)->scope_join_state & 0xf; | |
| 694 | + cur_join_state = group->rec.scope_join_state & 0xf; | |
| 695 | 695 | |
| 696 | 696 | if (method == IB_MGMT_METHOD_GET_RESP) { |
| 697 | 697 | /* successfull join */ |
| @@ -710,7 +710,7 @@ process_requests: · 12 unmodified lines | ||
| 710 | 710 | req = list_first_entry(&group->pending_list, struct mcast_req, |
| 711 | 711 | group_list); |
| 712 | 712 | sa_data = (struct ib_sa_mcmember_data *)req->sa_mad.data; |
| 713 | − req_join_state = sa_data->scope_join_state & 0x7; | |
| 713 | + req_join_state = sa_data->scope_join_state & 0xf; | |
| 714 | 714 | |
| 715 | 715 | /* For a leave request, we will immediately answer the VF, and |
| 716 | 716 | * update our internal counters. The actual leave will be sent |
| @@ -448,7 +448,7 @@ struct mlx4_ib_demux_ctx { · 447 unmodified lines | ||
| 448 | 448 | struct workqueue_struct *wq; |
| 449 | 449 | struct workqueue_struct *ud_wq; |
| 450 | 450 | spinlock_t ud_lock; |
| 451 | − __be64 subnet_prefix; | |
| 451 | + atomic64_t subnet_prefix; | |
| 452 | 452 | __be64 guid_cache[128]; |
| 453 | 453 | struct mlx4_ib_dev *dev; |
| 454 | 454 | /* the following lock protects both mcg_table and mcg_mgid0_list */ |
| @@ -2493,24 +2493,27 @@ static int build_mlx_header(struct mlx4_ib_sqp *sqp, struct ib_ud_wr *wr, · 2492 unmodified lines | ||
| 2493 | 2493 | sqp->ud_header.grh.flow_label = |
| 2494 | 2494 | ah->av.ib.sl_tclass_flowlabel & cpu_to_be32(0xfffff); |
| 2495 | 2495 | sqp->ud_header.grh.hop_limit = ah->av.ib.hop_limit; |
| 2496 | − if (is_eth) | |
| 2496 | + if (is_eth) { | |
| 2497 | 2497 | memcpy(sqp->ud_header.grh.source_gid.raw, sgid.raw, 16); |
| 2498 | − else { | |
| 2499 | − if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) { | |
| 2500 | − /* When multi-function is enabled, the ib_core gid | |
| 2501 | − * indexes don't necessarily match the hw ones, so | |
| 2502 | − * we must use our own cache */ | |
| 2503 | − sqp->ud_header.grh.source_gid.global.subnet_prefix = | |
| 2504 | − to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1]. | |
| 2505 | − subnet_prefix; | |
| 2506 | − sqp->ud_header.grh.source_gid.global.interface_id = | |
| 2507 | − to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1]. | |
| 2508 | − guid_cache[ah->av.ib.gid_index]; | |
| 2509 | − } else | |
| 2510 | − ib_get_cached_gid(ib_dev, | |
| 2511 | − be32_to_cpu(ah->av.ib.port_pd) >> 24, | |
| 2512 | − ah->av.ib.gid_index, | |
| 2513 | − &sqp->ud_header.grh.source_gid, NULL); | |
| 2498 | + } else { | |
| 2499 | + if (mlx4_is_mfunc(to_mdev(ib_dev)->dev)) { | |
| 2500 | + /* When multi-function is enabled, the ib_core gid | |
| 2501 | + * indexes don't necessarily match the hw ones, so | |
| 2502 | + * we must use our own cache | |
| 2503 | + */ | |
| 2504 | + sqp->ud_header.grh.source_gid.global.subnet_prefix = | |
| 2505 | + cpu_to_be64(atomic64_read(&(to_mdev(ib_dev)->sriov. | |
| 2506 | + demux[sqp->qp.port - 1]. | |
| 2507 | + subnet_prefix))); | |
| 2508 | + sqp->ud_header.grh.source_gid.global.interface_id = | |
| 2509 | + to_mdev(ib_dev)->sriov.demux[sqp->qp.port - 1]. | |
| 2510 | + guid_cache[ah->av.ib.gid_index]; | |
| 2511 | + } else { | |
| 2512 | + ib_get_cached_gid(ib_dev, | |
| 2513 | + be32_to_cpu(ah->av.ib.port_pd) >> 24, | |
| 2514 | + ah->av.ib.gid_index, | |
| 2515 | + &sqp->ud_header.grh.source_gid, NULL); | |
| 2516 | + } | |
| 2514 | 2517 | } |
| 2515 | 2518 | memcpy(sqp->ud_header.grh.destination_gid.raw, |
| 2516 | 2519 | ah->av.ib.dgid, 16); |
| @@ -553,12 +553,6 @@ repoll: · 552 unmodified lines | ||
| 553 | 553 | * from the table. |
| 554 | 554 | */ |
| 555 | 555 | mqp = __mlx5_qp_lookup(dev->mdev, qpn); |
| 556 | − if (unlikely(!mqp)) { | |
| 557 | − mlx5_ib_warn(dev, "CQE@CQ %06x for unknown QPN %6x\n", | |
| 558 | − cq->mcq.cqn, qpn); | |
| 559 | − return -EINVAL; | |
| 560 | − } | |
| 561 | − | |
| 562 | 556 | *cur_qp = to_mibqp(mqp); |
| 563 | 557 | } |
| 564 | 558 | |
| @@ -619,13 +613,6 @@ repoll: · 54 unmodified lines | ||
| 619 | 613 | read_lock(&dev->mdev->priv.mkey_table.lock); |
| 620 | 614 | mmkey = __mlx5_mr_lookup(dev->mdev, |
| 621 | 615 | mlx5_base_mkey(be32_to_cpu(sig_err_cqe->mkey))); |
| 622 | − if (unlikely(!mmkey)) { | |
| 623 | − read_unlock(&dev->mdev->priv.mkey_table.lock); | |
| 624 | − mlx5_ib_warn(dev, "CQE@CQ %06x for unknown MR %6x\n", | |
| 625 | − cq->mcq.cqn, be32_to_cpu(sig_err_cqe->mkey)); | |
| 626 | − return -EINVAL; | |
| 627 | − } | |
| 628 | − | |
| 629 | 616 | mr = to_mibmr(mmkey); |
| 630 | 617 | get_sig_err_item(sig_err_cqe, &mr->sig->err_item); |
| 631 | 618 | mr->sig->sig_err_exists = true; |
| @@ -676,7 +663,6 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 44 unmodified lines | ||
| 676 | 663 | unsigned long flags; |
| 677 | 664 | int soft_polled = 0; |
| 678 | 665 | int npolled; |
| 679 | − int err = 0; | |
| 680 | 666 | |
| 681 | 667 | spin_lock_irqsave(&cq->lock, flags); |
| 682 | 668 | if (mdev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) { |
| @@ -688,8 +674,7 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 5 unmodified lines | ||
| 688 | 674 | soft_polled = poll_soft_wc(cq, num_entries, wc); |
| 689 | 675 | |
| 690 | 676 | for (npolled = 0; npolled < num_entries - soft_polled; npolled++) { |
| 691 | − err = mlx5_poll_one(cq, &cur_qp, wc + soft_polled + npolled); | |
| 692 | − if (err) | |
| 677 | + if (mlx5_poll_one(cq, &cur_qp, wc + soft_polled + npolled)) | |
| 693 | 678 | break; |
| 694 | 679 | } |
| 695 | 680 | |
| @@ -698,10 +683,7 @@ int mlx5_ib_poll_cq(struct ib_cq *ibcq, int num_entries, struct ib_wc *wc) · 2 unmodified lines | ||
| 698 | 683 | out: |
| 699 | 684 | spin_unlock_irqrestore(&cq->lock, flags); |
| 700 | 685 | |
| 701 | − if (err == 0 || err == -EAGAIN) | |
| 702 | − return soft_polled + npolled; | |
| 703 | − else | |
| 704 | − return err; | |
| 686 | + return soft_polled + npolled; | |
| 705 | 687 | } |
| 706 | 688 | |
| 707 | 689 | int mlx5_ib_arm_cq(struct ib_cq *ibcq, enum ib_cq_notify_flags flags) |
| @@ -37,7 +37,6 @@ · 36 unmodified lines | ||
| 37 | 37 | #include <linux/pci.h> |
| 38 | 38 | #include <linux/dma-mapping.h> |
| 39 | 39 | #include <linux/slab.h> |
| 40 | −#include <linux/io-mapping.h> | |
| 41 | 40 | #if defined(CONFIG_X86) |
| 42 | 41 | #include <asm/pat.h> |
| 43 | 42 | #endif |
| @@ -289,7 +288,9 @@ __be16 mlx5_get_roce_udp_sport(struct mlx5_ib_dev *dev, u8 port_num, · 245 unmodified lines | ||
| 289 | 288 | |
| 290 | 289 | static int mlx5_use_mad_ifc(struct mlx5_ib_dev *dev) |
| 291 | 290 | { |
| 292 | − return !MLX5_CAP_GEN(dev->mdev, ib_virt); | |
| 291 | + if (MLX5_CAP_GEN(dev->mdev, port_type) == MLX5_CAP_PORT_TYPE_IB) | |
| 292 | + return !MLX5_CAP_GEN(dev->mdev, ib_virt); | |
| 293 | + return 0; | |
| 293 | 294 | } |
| 294 | 295 | |
| 295 | 296 | enum { |
| @@ -1429,6 +1430,13 @@ static int parse_flow_attr(u32 *match_c, u32 *match_v, · 1133 unmodified lines | ||
| 1429 | 1430 | dmac_47_16), |
| 1430 | 1431 | ib_spec->eth.val.dst_mac); |
| 1431 | 1432 | |
| 1433 | + ether_addr_copy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, outer_headers_c, | |
| 1434 | + smac_47_16), | |
| 1435 | + ib_spec->eth.mask.src_mac); | |
| 1436 | + ether_addr_copy(MLX5_ADDR_OF(fte_match_set_lyr_2_4, outer_headers_v, | |
| 1437 | + smac_47_16), | |
| 1438 | + ib_spec->eth.val.src_mac); | |
| 1439 | + | |
| 1432 | 1440 | if (ib_spec->eth.mask.vlan_tag) { |
| 1433 | 1441 | MLX5_SET(fte_match_set_lyr_2_4, outer_headers_c, |
| 1434 | 1442 | vlan_tag, 1); |
| @@ -1850,6 +1858,7 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, · 415 unmodified lines | ||
| 1850 | 1858 | int domain) |
| 1851 | 1859 | { |
| 1852 | 1860 | struct mlx5_ib_dev *dev = to_mdev(qp->device); |
| 1861 | + struct mlx5_ib_qp *mqp = to_mqp(qp); | |
| 1853 | 1862 | struct mlx5_ib_flow_handler *handler = NULL; |
| 1854 | 1863 | struct mlx5_flow_destination *dst = NULL; |
| 1855 | 1864 | struct mlx5_ib_flow_prio *ft_prio; |
| @@ -1876,7 +1885,10 @@ static struct ib_flow *mlx5_ib_create_flow(struct ib_qp *qp, · 20 unmodified lines | ||
| 1876 | 1885 | } |
| 1877 | 1886 | |
| 1878 | 1887 | dst->type = MLX5_FLOW_DESTINATION_TYPE_TIR; |
| 1879 | − dst->tir_num = to_mqp(qp)->raw_packet_qp.rq.tirn; | |
| 1888 | + if (mqp->flags & MLX5_IB_QP_RSS) | |
| 1889 | + dst->tir_num = mqp->rss_qp.tirn; | |
| 1890 | + else | |
| 1891 | + dst->tir_num = mqp->raw_packet_qp.rq.tirn; | |
| 1880 | 1892 | |
| 1881 | 1893 | if (flow_attr->type == IB_FLOW_ATTR_NORMAL) { |
| 1882 | 1894 | if (flow_attr->flags & IB_FLOW_ATTR_FLAGS_DONT_TRAP) { |
| @@ -71,7 +71,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, · 70 unmodified lines | ||
| 71 | 71 | |
| 72 | 72 | addr = addr >> page_shift; |
| 73 | 73 | tmp = (unsigned long)addr; |
| 74 | − m = find_first_bit(&tmp, sizeof(tmp)); | |
| 74 | + m = find_first_bit(&tmp, BITS_PER_LONG); | |
| 75 | 75 | skip = 1 << m; |
| 76 | 76 | mask = skip - 1; |
| 77 | 77 | i = 0; |
| @@ -81,7 +81,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, · 3 unmodified lines | ||
| 81 | 81 | for (k = 0; k < len; k++) { |
| 82 | 82 | if (!(i & mask)) { |
| 83 | 83 | tmp = (unsigned long)pfn; |
| 84 | − m = min_t(unsigned long, m, find_first_bit(&tmp, sizeof(tmp))); | |
| 84 | + m = min_t(unsigned long, m, find_first_bit(&tmp, BITS_PER_LONG)); | |
| 85 | 85 | skip = 1 << m; |
| 86 | 86 | mask = skip - 1; |
| 87 | 87 | base = pfn; |
| @@ -89,7 +89,7 @@ void mlx5_ib_cont_pages(struct ib_umem *umem, u64 addr, int *count, int *shift, · 1 unmodified line | ||
| 89 | 89 | } else { |
| 90 | 90 | if (base + p != pfn) { |
| 91 | 91 | tmp = (unsigned long)p; |
| 92 | − m = find_first_bit(&tmp, sizeof(tmp)); | |
| 92 | + m = find_first_bit(&tmp, BITS_PER_LONG); | |
| 93 | 93 | skip = 1 << m; |
| 94 | 94 | mask = skip - 1; |
| 95 | 95 | base = pfn; |
| @@ -402,6 +402,7 @@ enum mlx5_ib_qp_flags { · 401 unmodified lines | ||
| 402 | 402 | /* QP uses 1 as its source QP number */ |
| 403 | 403 | MLX5_IB_QP_SQPN_QP1 = 1 << 6, |
| 404 | 404 | MLX5_IB_QP_CAP_SCATTER_FCS = 1 << 7, |
| 405 | + MLX5_IB_QP_RSS = 1 << 8, | |
| 405 | 406 | }; |
| 406 | 407 | |
| 407 | 408 | struct mlx5_umr_wr { |
| @@ -1449,6 +1449,7 @@ create_tir: · 1448 unmodified lines | ||
| 1449 | 1449 | kvfree(in); |
| 1450 | 1450 | /* qpn is reserved for that QP */ |
| 1451 | 1451 | qp->trans_qp.base.mqp.qpn = 0; |
| 1452 | + qp->flags |= MLX5_IB_QP_RSS; | |
| 1452 | 1453 | return 0; |
| 1453 | 1454 | |
| 1454 | 1455 | err: |
| @@ -3658,12 +3659,8 @@ static int begin_wqe(struct mlx5_ib_qp *qp, void **seg, · 2203 unmodified lines | ||
| 3658 | 3659 | struct ib_send_wr *wr, unsigned *idx, |
| 3659 | 3660 | int *size, int nreq) |
| 3660 | 3661 | { |
| 3661 | − int err = 0; | |
| 3662 | − | |
| 3663 | − if (unlikely(mlx5_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq))) { | |
| 3664 | − err = -ENOMEM; | |
| 3665 | − return err; | |
| 3666 | − } | |
| 3662 | + if (unlikely(mlx5_wq_overflow(&qp->sq, nreq, qp->ibqp.send_cq))) | |
| 3663 | + return -ENOMEM; | |
| 3667 | 3664 | |
| 3668 | 3665 | *idx = qp->sq.cur_post & (qp->sq.wqe_cnt - 1); |
| 3669 | 3666 | *seg = mlx5_get_send_wqe(qp, *idx); |
| @@ -3679,7 +3676,7 @@ static int begin_wqe(struct mlx5_ib_qp *qp, void **seg, · 9 unmodified lines | ||
| 3679 | 3676 | *seg += sizeof(**ctrl); |
| 3680 | 3677 | *size = sizeof(**ctrl) / 16; |
| 3681 | 3678 | |
| 3682 | − return err; | |
| 3679 | + return 0; | |
| 3683 | 3680 | } |
| 3684 | 3681 | |
| 3685 | 3682 | static void finish_wqe(struct mlx5_ib_qp *qp, |
| @@ -3758,7 +3755,7 @@ int mlx5_ib_post_send(struct ib_qp *ibqp, struct ib_send_wr *wr, · 72 unmodified lines | ||
| 3758 | 3755 | num_sge = wr->num_sge; |
| 3759 | 3756 | if (unlikely(num_sge > qp->sq.max_gs)) { |
| 3760 | 3757 | mlx5_ib_warn(dev, "\n"); |
| 3761 | − err = -ENOMEM; | |
| 3758 | + err = -EINVAL; | |
| 3762 | 3759 | *bad_wr = wr; |
| 3763 | 3760 | goto out; |
| 3764 | 3761 | } |
| @@ -1156,18 +1156,18 @@ static void ocrdma_get_attr(struct ocrdma_dev *dev, · 1155 unmodified lines | ||
| 1156 | 1156 | attr->max_srq = |
| 1157 | 1157 | (rsp->max_srq_rpir_qps & OCRDMA_MBX_QUERY_CFG_MAX_SRQ_MASK) >> |
| 1158 | 1158 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_OFFSET; |
| 1159 | − attr->max_send_sge = ((rsp->max_write_send_sge & | |
| 1159 | + attr->max_send_sge = ((rsp->max_recv_send_sge & | |
| 1160 | 1160 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >> |
| 1161 | 1161 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT); |
| 1162 | − attr->max_recv_sge = (rsp->max_write_send_sge & | |
| 1163 | − OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK) >> | |
| 1164 | − OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT; | |
| 1162 | + attr->max_recv_sge = (rsp->max_recv_send_sge & | |
| 1163 | + OCRDMA_MBX_QUERY_CFG_MAX_RECV_SGE_MASK) >> | |
| 1164 | + OCRDMA_MBX_QUERY_CFG_MAX_RECV_SGE_SHIFT; | |
| 1165 | 1165 | attr->max_srq_sge = (rsp->max_srq_rqe_sge & |
| 1166 | 1166 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK) >> |
| 1167 | 1167 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET; |
| 1168 | − attr->max_rdma_sge = (rsp->max_write_send_sge & | |
| 1169 | − OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK) >> | |
| 1170 | − OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT; | |
| 1168 | + attr->max_rdma_sge = (rsp->max_wr_rd_sge & | |
| 1169 | + OCRDMA_MBX_QUERY_CFG_MAX_RD_SGE_MASK) >> | |
| 1170 | + OCRDMA_MBX_QUERY_CFG_MAX_RD_SGE_SHIFT; | |
| 1171 | 1171 | attr->max_ord_per_qp = (rsp->max_ird_ord_per_qp & |
| 1172 | 1172 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK) >> |
| 1173 | 1173 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT; |
| @@ -554,9 +554,9 @@ enum { · 553 unmodified lines | ||
| 554 | 554 | OCRDMA_MBX_QUERY_CFG_L3_TYPE_MASK = 0x18, |
| 555 | 555 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_SHIFT = 0, |
| 556 | 556 | OCRDMA_MBX_QUERY_CFG_MAX_SEND_SGE_MASK = 0xFFFF, |
| 557 | − OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT = 16, | |
| 558 | − OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_MASK = 0xFFFF << | |
| 559 | − OCRDMA_MBX_QUERY_CFG_MAX_WRITE_SGE_SHIFT, | |
| 557 | + OCRDMA_MBX_QUERY_CFG_MAX_RECV_SGE_SHIFT = 16, | |
| 558 | + OCRDMA_MBX_QUERY_CFG_MAX_RECV_SGE_MASK = 0xFFFF << | |
| 559 | + OCRDMA_MBX_QUERY_CFG_MAX_RECV_SGE_SHIFT, | |
| 560 | 560 | |
| 561 | 561 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_SHIFT = 0, |
| 562 | 562 | OCRDMA_MBX_QUERY_CFG_MAX_ORD_PER_QP_MASK = 0xFFFF, |
| @@ -612,6 +612,8 @@ enum { · 49 unmodified lines | ||
| 612 | 612 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET = 0, |
| 613 | 613 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_MASK = 0xFFFF << |
| 614 | 614 | OCRDMA_MBX_QUERY_CFG_MAX_SRQ_SGE_OFFSET, |
| 615 | + OCRDMA_MBX_QUERY_CFG_MAX_RD_SGE_SHIFT = 0, | |
| 616 | + OCRDMA_MBX_QUERY_CFG_MAX_RD_SGE_MASK = 0xFFFF, | |
| 615 | 617 | }; |
| 616 | 618 | |
| 617 | 619 | struct ocrdma_mbx_query_config { |
| @@ -619,7 +621,7 @@ struct ocrdma_mbx_query_config { · 1 unmodified line | ||
| 619 | 621 | struct ocrdma_mbx_rsp rsp; |
| 620 | 622 | u32 qp_srq_cq_ird_ord; |
| 621 | 623 | u32 max_pd_ca_ack_delay; |
| 622 | − u32 max_write_send_sge; | |
| 624 | + u32 max_recv_send_sge; | |
| 623 | 625 | u32 max_ird_ord_per_qp; |
| 624 | 626 | u32 max_shared_ird_ord; |
| 625 | 627 | u32 max_mr; |
| @@ -639,6 +641,8 @@ struct ocrdma_mbx_query_config { · 13 unmodified lines | ||
| 639 | 641 | u32 max_wqes_rqes_per_q; |
| 640 | 642 | u32 max_cq_cqes_per_cq; |
| 641 | 643 | u32 max_srq_rqe_sge; |
| 644 | + u32 max_wr_rd_sge; | |
| 645 | + u32 ird_pgsz_num_pages; | |
| 642 | 646 | }; |
| 643 | 647 | |
| 644 | 648 | struct ocrdma_fw_ver_rsp { |
| @@ -125,8 +125,8 @@ int ocrdma_query_device(struct ib_device *ibdev, struct ib_device_attr *attr, · 124 unmodified lines | ||
| 125 | 125 | IB_DEVICE_SYS_IMAGE_GUID | |
| 126 | 126 | IB_DEVICE_LOCAL_DMA_LKEY | |
| 127 | 127 | IB_DEVICE_MEM_MGT_EXTENSIONS; |
| 128 | − attr->max_sge = dev->attr.max_send_sge; | |
| 129 | − attr->max_sge_rd = attr->max_sge; | |
| 128 | + attr->max_sge = min(dev->attr.max_send_sge, dev->attr.max_recv_sge); | |
| 129 | + attr->max_sge_rd = dev->attr.max_rdma_sge; | |
| 130 | 130 | attr->max_cq = dev->attr.max_cq; |
| 131 | 131 | attr->max_cqe = dev->attr.max_cqe; |
| 132 | 132 | attr->max_mr = dev->attr.max_mr; |
| @@ -189,27 +189,32 @@ static int _ctx_stats_seq_show(struct seq_file *s, void *v) · 188 unmodified lines | ||
| 189 | 189 | DEBUGFS_FILE(ctx_stats) |
| 190 | 190 | |
| 191 | 191 | static void *_qp_stats_seq_start(struct seq_file *s, loff_t *pos) |
| 192 | + __acquires(RCU) | |
| 192 | 193 | { |
| 193 | 194 | struct qib_qp_iter *iter; |
| 194 | 195 | loff_t n = *pos; |
| 195 | 196 | |
| 196 | − rcu_read_lock(); | |
| 197 | 197 | iter = qib_qp_iter_init(s->private); |
| 198 | + | |
| 199 | + /* stop calls rcu_read_unlock */ | |
| 200 | + rcu_read_lock(); | |
| 201 | + | |
| 198 | 202 | if (!iter) |
| 199 | 203 | return NULL; |
| 200 | 204 | |
| 201 | − while (n--) { | |
| 205 | + do { | |
| 202 | 206 | if (qib_qp_iter_next(iter)) { |
| 203 | 207 | kfree(iter); |
| 204 | 208 | return NULL; |
| 205 | 209 | } |
| 206 | − } | |
| 210 | + } while (n--); | |
| 207 | 211 | |
| 208 | 212 | return iter; |
| 209 | 213 | } |
| 210 | 214 | |
| 211 | 215 | static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr, |
| 212 | 216 | loff_t *pos) |
| 217 | + __must_hold(RCU) | |
| 213 | 218 | { |
| 214 | 219 | struct qib_qp_iter *iter = iter_ptr; |
| 215 | 220 | |
| @@ -224,6 +229,7 @@ static void *_qp_stats_seq_next(struct seq_file *s, void *iter_ptr, · 8 unmodified lines | ||
| 224 | 229 | } |
| 225 | 230 | |
| 226 | 231 | static void _qp_stats_seq_stop(struct seq_file *s, void *iter_ptr) |
| 232 | + __releases(RCU) | |
| 227 | 233 | { |
| 228 | 234 | rcu_read_unlock(); |
| 229 | 235 | } |
| @@ -328,26 +328,12 @@ static ssize_t flash_write(struct file *file, const char __user *buf, · 327 unmodified lines | ||
| 328 | 328 | |
| 329 | 329 | pos = *ppos; |
| 330 | 330 | |
| 331 | − if (pos != 0) { | |
| 332 | − ret = -EINVAL; | |
| 333 | − goto bail; | |
| 334 | − } | |
| 335 | − | |
| 336 | − if (count != sizeof(struct qib_flash)) { | |
| 337 | − ret = -EINVAL; | |
| 338 | − goto bail; | |
| 339 | − } | |
| 340 | − | |
| 341 | − tmp = kmalloc(count, GFP_KERNEL); | |
| 342 | − if (!tmp) { | |
| 343 | − ret = -ENOMEM; | |
| 344 | − goto bail; | |
| 345 | − } | |
| 331 | + if (pos != 0 || count != sizeof(struct qib_flash)) | |
| 332 | + return -EINVAL; | |
| 346 | 333 | |
| 347 | − if (copy_from_user(tmp, buf, count)) { | |
| 348 | − ret = -EFAULT; | |
| 349 | − goto bail_tmp; | |
| 350 | − } | |
| 334 | + tmp = memdup_user(buf, count); | |
| 335 | + if (IS_ERR(tmp)) | |
| 336 | + return PTR_ERR(tmp); | |
| 351 | 337 | |
| 352 | 338 | dd = private2dd(file); |
| 353 | 339 | if (qib_eeprom_write(dd, pos, tmp, count)) { |
| @@ -361,8 +347,6 @@ static ssize_t flash_write(struct file *file, const char __user *buf, · 7 unmodified lines | ||
| 361 | 347 | |
| 362 | 348 | bail_tmp: |
| 363 | 349 | kfree(tmp); |
| 364 | − | |
| 365 | −bail: | |
| 366 | 350 | return ret; |
| 367 | 351 | } |
| 368 | 352 | |
| @@ -573,10 +573,6 @@ struct qib_qp_iter *qib_qp_iter_init(struct qib_ibdev *dev) · 572 unmodified lines | ||
| 573 | 573 | return NULL; |
| 574 | 574 | |
| 575 | 575 | iter->dev = dev; |
| 576 | − if (qib_qp_iter_next(iter)) { | |
| 577 | − kfree(iter); | |
| 578 | − return NULL; | |
| 579 | − } | |
| 580 | 576 | |
| 581 | 577 | return iter; |
| 582 | 578 | } |
| @@ -664,7 +664,8 @@ static int __init usnic_ib_init(void) · 663 unmodified lines | ||
| 664 | 664 | return err; |
| 665 | 665 | } |
| 666 | 666 | |
| 667 | − if (pci_register_driver(&usnic_ib_pci_driver)) { | |
| 667 | + err = pci_register_driver(&usnic_ib_pci_driver); | |
| 668 | + if (err) { | |
| 668 | 669 | usnic_err("Unable to register with PCI\n"); |
| 669 | 670 | goto out_umem_fini; |
| 670 | 671 | } |
| @@ -294,7 +294,7 @@ static void __rvt_free_mr(struct rvt_mr *mr) · 293 unmodified lines | ||
| 294 | 294 | { |
| 295 | 295 | rvt_deinit_mregion(&mr->mr); |
| 296 | 296 | rvt_free_lkey(&mr->mr); |
| 297 | − vfree(mr); | |
| 297 | + kfree(mr); | |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | 300 | /** |
| @@ -873,7 +873,8 @@ bail_qpn: · 872 unmodified lines | ||
| 873 | 873 | free_qpn(&rdi->qp_dev->qpn_table, qp->ibqp.qp_num); |
| 874 | 874 | |
| 875 | 875 | bail_rq_wq: |
| 876 | − vfree(qp->r_rq.wq); | |
| 876 | + if (!qp->ip) | |
| 877 | + vfree(qp->r_rq.wq); | |
| 877 | 878 | |
| 878 | 879 | bail_driver_priv: |
| 879 | 880 | rdi->driver_f.qp_priv_free(rdi, qp); |
| @@ -362,15 +362,34 @@ static int __init rxe_module_init(void) · 361 unmodified lines | ||
| 362 | 362 | return err; |
| 363 | 363 | } |
| 364 | 364 | |
| 365 | − err = rxe_net_init(); | |
| 365 | + err = rxe_net_ipv4_init(); | |
| 366 | 366 | if (err) { |
| 367 | − pr_err("rxe: unable to init\n"); | |
| 367 | + pr_err("rxe: unable to init ipv4 tunnel\n"); | |
| 368 | 368 | rxe_cache_exit(); |
| 369 | − return err; | |
| 369 | + goto exit; | |
| 370 | + } | |
| 371 | + | |
| 372 | + err = rxe_net_ipv6_init(); | |
| 373 | + if (err) { | |
| 374 | + pr_err("rxe: unable to init ipv6 tunnel\n"); | |
| 375 | + rxe_cache_exit(); | |
| 376 | + goto exit; | |
| 370 | 377 | } |
| 378 | + | |
| 379 | + err = register_netdevice_notifier(&rxe_net_notifier); | |
| 380 | + if (err) { | |
| 381 | + pr_err("rxe: Failed to rigister netdev notifier\n"); | |
| 382 | + goto exit; | |
| 383 | + } | |
| 384 | + | |
| 371 | 385 | pr_info("rxe: loaded\n"); |
| 372 | 386 | |
| 373 | 387 | return 0; |
| 388 | + | |
| 389 | +exit: | |
| 390 | + rxe_release_udp_tunnel(recv_sockets.sk4); | |
| 391 | + rxe_release_udp_tunnel(recv_sockets.sk6); | |
| 392 | + return err; | |
| 374 | 393 | } |
| 375 | 394 | |
| 376 | 395 | static void __exit rxe_module_exit(void) |
| @@ -689,7 +689,14 @@ int rxe_completer(void *arg) · 688 unmodified lines | ||
| 689 | 689 | qp->req.need_retry = 1; |
| 690 | 690 | rxe_run_task(&qp->req.task, 1); |
| 691 | 691 | } |
| 692 | + | |
| 693 | + if (pkt) { | |
| 694 | + rxe_drop_ref(pkt->qp); | |
| 695 | + kfree_skb(skb); | |
| 696 | + } | |
| 697 | + | |
| 692 | 698 | goto exit; |
| 699 | + | |
| 693 | 700 | } else { |
| 694 | 701 | wqe->status = IB_WC_RETRY_EXC_ERR; |
| 695 | 702 | state = COMPST_ERROR; |
| @@ -716,6 +723,12 @@ int rxe_completer(void *arg) · 20 unmodified lines | ||
| 716 | 723 | case COMPST_ERROR: |
| 717 | 724 | do_complete(qp, wqe); |
| 718 | 725 | rxe_qp_error(qp); |
| 726 | + | |
| 727 | + if (pkt) { | |
| 728 | + rxe_drop_ref(pkt->qp); | |
| 729 | + kfree_skb(skb); | |
| 730 | + } | |
| 731 | + | |
| 719 | 732 | goto exit; |
| 720 | 733 | } |
| 721 | 734 | } |
| @@ -275,9 +275,10 @@ static struct socket *rxe_setup_udp_tunnel(struct net *net, __be16 port, · 274 unmodified lines | ||
| 275 | 275 | return sock; |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | −static void rxe_release_udp_tunnel(struct socket *sk) | |
| 278 | +void rxe_release_udp_tunnel(struct socket *sk) | |
| 279 | 279 | { |
| 280 | − udp_tunnel_sock_release(sk); | |
| 280 | + if (sk) | |
| 281 | + udp_tunnel_sock_release(sk); | |
| 281 | 282 | } |
| 282 | 283 | |
| 283 | 284 | static void prepare_udp_hdr(struct sk_buff *skb, __be16 src_port, |
| @@ -658,51 +659,45 @@ out: · 374 unmodified lines | ||
| 658 | 659 | return NOTIFY_OK; |
| 659 | 660 | } |
| 660 | 661 | |
| 661 | −static struct notifier_block rxe_net_notifier = { | |
| 662 | +struct notifier_block rxe_net_notifier = { | |
| 662 | 663 | .notifier_call = rxe_notify, |
| 663 | 664 | }; |
| 664 | 665 | |
| 665 | −int rxe_net_init(void) | |
| 666 | +int rxe_net_ipv4_init(void) | |
| 666 | 667 | { |
| 667 | − int err; | |
| 668 | − | |
| 669 | 668 | spin_lock_init(&dev_list_lock); |
| 670 | 669 | |
| 671 | − recv_sockets.sk6 = rxe_setup_udp_tunnel(&init_net, | |
| 672 | − htons(ROCE_V2_UDP_DPORT), true); | |
| 673 | − if (IS_ERR(recv_sockets.sk6)) { | |
| 674 | − recv_sockets.sk6 = NULL; | |
| 675 | − pr_err("rxe: Failed to create IPv6 UDP tunnel\n"); | |
| 676 | − return -1; | |
| 677 | − } | |
| 678 | − | |
| 679 | 670 | recv_sockets.sk4 = rxe_setup_udp_tunnel(&init_net, |
| 680 | − htons(ROCE_V2_UDP_DPORT), false); | |
| 671 | + htons(ROCE_V2_UDP_DPORT), false); | |
| 681 | 672 | if (IS_ERR(recv_sockets.sk4)) { |
| 682 | − rxe_release_udp_tunnel(recv_sockets.sk6); | |
| 683 | 673 | recv_sockets.sk4 = NULL; |
| 684 | − recv_sockets.sk6 = NULL; | |
| 685 | 674 | pr_err("rxe: Failed to create IPv4 UDP tunnel\n"); |
| 686 | 675 | return -1; |
| 687 | 676 | } |
| 688 | 677 | |
| 689 | − err = register_netdevice_notifier(&rxe_net_notifier); | |
| 690 | − if (err) { | |
| 691 | − rxe_release_udp_tunnel(recv_sockets.sk6); | |
| 692 | − rxe_release_udp_tunnel(recv_sockets.sk4); | |
| 693 | − pr_err("rxe: Failed to rigister netdev notifier\n"); | |
| 694 | − } | |
| 695 | − | |
| 696 | − return err; | |
| 678 | + return 0; | |
| 697 | 679 | } |
| 698 | 680 | |
| 699 | −void rxe_net_exit(void) | |
| 681 | +int rxe_net_ipv6_init(void) | |
| 700 | 682 | { |
| 701 | − if (recv_sockets.sk6) | |
| 702 | − rxe_release_udp_tunnel(recv_sockets.sk6); | |
| 683 | +#if IS_ENABLED(CONFIG_IPV6) | |
| 703 | 684 | |
| 704 | − if (recv_sockets.sk4) | |
| 705 | − rxe_release_udp_tunnel(recv_sockets.sk4); | |
| 685 | + spin_lock_init(&dev_list_lock); | |
| 706 | 686 | |
| 687 | + recv_sockets.sk6 = rxe_setup_udp_tunnel(&init_net, | |
| 688 | + htons(ROCE_V2_UDP_DPORT), true); | |
| 689 | + if (IS_ERR(recv_sockets.sk6)) { | |
| 690 | + recv_sockets.sk6 = NULL; | |
| 691 | + pr_err("rxe: Failed to create IPv6 UDP tunnel\n"); | |
| 692 | + return -1; | |
| 693 | + } | |
| 694 | +#endif | |
| 695 | + return 0; | |
| 696 | +} | |
| 697 | + | |
| 698 | +void rxe_net_exit(void) | |
| 699 | +{ | |
| 700 | + rxe_release_udp_tunnel(recv_sockets.sk6); | |
| 701 | + rxe_release_udp_tunnel(recv_sockets.sk4); | |
| 707 | 702 | unregister_netdevice_notifier(&rxe_net_notifier); |
| 708 | 703 | } |
| @@ -44,10 +44,13 @@ struct rxe_recv_sockets { · 43 unmodified lines | ||
| 44 | 44 | }; |
| 45 | 45 | |
| 46 | 46 | extern struct rxe_recv_sockets recv_sockets; |
| 47 | +extern struct notifier_block rxe_net_notifier; | |
| 48 | +void rxe_release_udp_tunnel(struct socket *sk); | |
| 47 | 49 | |
| 48 | 50 | struct rxe_dev *rxe_net_add(struct net_device *ndev); |
| 49 | 51 | |
| 50 | −int rxe_net_init(void); | |
| 52 | +int rxe_net_ipv4_init(void); | |
| 53 | +int rxe_net_ipv6_init(void); | |
| 51 | 54 | void rxe_net_exit(void); |
| 52 | 55 | |
| 53 | 56 | #endif /* RXE_NET_H */ |
| @@ -312,7 +312,7 @@ static void rxe_rcv_mcast_pkt(struct rxe_dev *rxe, struct sk_buff *skb) · 311 unmodified lines | ||
| 312 | 312 | * make a copy of the skb to post to the next qp |
| 313 | 313 | */ |
| 314 | 314 | skb_copy = (mce->qp_list.next != &mcg->qp_list) ? |
| 315 | − skb_clone(skb, GFP_KERNEL) : NULL; | |
| 315 | + skb_clone(skb, GFP_ATOMIC) : NULL; | |
| 316 | 316 | |
| 317 | 317 | pkt->qp = qp; |
| 318 | 318 | rxe_add_ref(qp); |
| @@ -511,24 +511,21 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe, · 510 unmodified lines | ||
| 511 | 511 | } |
| 512 | 512 | |
| 513 | 513 | static void update_wqe_state(struct rxe_qp *qp, |
| 514 | − struct rxe_send_wqe *wqe, | |
| 515 | − struct rxe_pkt_info *pkt, | |
| 516 | − enum wqe_state *prev_state) | |
| 514 | + struct rxe_send_wqe *wqe, | |
| 515 | + struct rxe_pkt_info *pkt) | |
| 517 | 516 | { |
| 518 | − enum wqe_state prev_state_ = wqe->state; | |
| 519 | − | |
| 520 | 517 | if (pkt->mask & RXE_END_MASK) { |
| 521 | 518 | if (qp_type(qp) == IB_QPT_RC) |
| 522 | 519 | wqe->state = wqe_state_pending; |
| 523 | 520 | } else { |
| 524 | 521 | wqe->state = wqe_state_processing; |
| 525 | 522 | } |
| 526 | − | |
| 527 | − *prev_state = prev_state_; | |
| 528 | 523 | } |
| 529 | 524 | |
| 530 | −static void update_state(struct rxe_qp *qp, struct rxe_send_wqe *wqe, | |
| 531 | − struct rxe_pkt_info *pkt, int payload) | |
| 525 | +static void update_wqe_psn(struct rxe_qp *qp, | |
| 526 | + struct rxe_send_wqe *wqe, | |
| 527 | + struct rxe_pkt_info *pkt, | |
| 528 | + int payload) | |
| 532 | 529 | { |
| 533 | 530 | /* number of packets left to send including current one */ |
| 534 | 531 | int num_pkt = (wqe->dma.resid + payload + qp->mtu - 1) / qp->mtu; |
| @@ -546,9 +543,34 @@ static void update_state(struct rxe_qp *qp, struct rxe_send_wqe *wqe, · 11 unmodified lines | ||
| 546 | 543 | qp->req.psn = (wqe->first_psn + num_pkt) & BTH_PSN_MASK; |
| 547 | 544 | else |
| 548 | 545 | qp->req.psn = (qp->req.psn + 1) & BTH_PSN_MASK; |
| 546 | +} | |
| 549 | 547 | |
| 550 | − qp->req.opcode = pkt->opcode; | |
| 548 | +static void save_state(struct rxe_send_wqe *wqe, | |
| 549 | + struct rxe_qp *qp, | |
| 550 | + struct rxe_send_wqe *rollback_wqe, | |
| 551 | + struct rxe_qp *rollback_qp) | |
| 552 | +{ | |
| 553 | + rollback_wqe->state = wqe->state; | |
| 554 | + rollback_wqe->first_psn = wqe->first_psn; | |
| 555 | + rollback_wqe->last_psn = wqe->last_psn; | |
| 556 | + rollback_qp->req.psn = qp->req.psn; | |
| 557 | +} | |
| 551 | 558 | |
| 559 | +static void rollback_state(struct rxe_send_wqe *wqe, | |
| 560 | + struct rxe_qp *qp, | |
| 561 | + struct rxe_send_wqe *rollback_wqe, | |
| 562 | + struct rxe_qp *rollback_qp) | |
| 563 | +{ | |
| 564 | + wqe->state = rollback_wqe->state; | |
| 565 | + wqe->first_psn = rollback_wqe->first_psn; | |
| 566 | + wqe->last_psn = rollback_wqe->last_psn; | |
| 567 | + qp->req.psn = rollback_qp->req.psn; | |
| 568 | +} | |
| 569 | + | |
| 570 | +static void update_state(struct rxe_qp *qp, struct rxe_send_wqe *wqe, | |
| 571 | + struct rxe_pkt_info *pkt, int payload) | |
| 572 | +{ | |
| 573 | + qp->req.opcode = pkt->opcode; | |
| 552 | 574 | |
| 553 | 575 | if (pkt->mask & RXE_END_MASK) |
| 554 | 576 | qp->req.wqe_index = next_index(qp->sq.queue, qp->req.wqe_index); |
| @@ -571,7 +593,8 @@ int rxe_requester(void *arg) · 16 unmodified lines | ||
| 571 | 593 | int mtu; |
| 572 | 594 | int opcode; |
| 573 | 595 | int ret; |
| 574 | − enum wqe_state prev_state; | |
| 596 | + struct rxe_qp rollback_qp; | |
| 597 | + struct rxe_send_wqe rollback_wqe; | |
| 575 | 598 | |
| 576 | 599 | next_wqe: |
| 577 | 600 | if (unlikely(!qp->valid || qp->req.state == QP_STATE_ERROR)) |
| @@ -688,13 +711,21 @@ next_wqe: · 110 unmodified lines | ||
| 688 | 711 | goto err; |
| 689 | 712 | } |
| 690 | 713 | |
| 691 | − update_wqe_state(qp, wqe, &pkt, &prev_state); | |
| 714 | + /* | |
| 715 | + * To prevent a race on wqe access between requester and completer, | |
| 716 | + * wqe members state and psn need to be set before calling | |
| 717 | + * rxe_xmit_packet(). | |
| 718 | + * Otherwise, completer might initiate an unjustified retry flow. | |
| 719 | + */ | |
| 720 | + save_state(wqe, qp, &rollback_wqe, &rollback_qp); | |
| 721 | + update_wqe_state(qp, wqe, &pkt); | |
| 722 | + update_wqe_psn(qp, wqe, &pkt, payload); | |
| 692 | 723 | ret = rxe_xmit_packet(to_rdev(qp->ibqp.device), qp, &pkt, skb); |
| 693 | 724 | if (ret) { |
| 694 | 725 | qp->need_req_skb = 1; |
| 695 | 726 | kfree_skb(skb); |
| 696 | 727 | |
| 697 | − wqe->state = prev_state; | |
| 728 | + rollback_state(wqe, qp, &rollback_wqe, &rollback_qp); | |
| 698 | 729 | |
| 699 | 730 | if (ret == -EAGAIN) { |
| 700 | 731 | rxe_run_task(&qp->req.task, 1); |
| @@ -972,11 +972,13 @@ static int send_atomic_ack(struct rxe_qp *qp, struct rxe_pkt_info *pkt, · 971 unmodified lines | ||
| 972 | 972 | free_rd_atomic_resource(qp, res); |
| 973 | 973 | rxe_advance_resp_resource(qp); |
| 974 | 974 | |
| 975 | + memcpy(SKB_TO_PKT(skb), &ack_pkt, sizeof(skb->cb)); | |
| 976 | + | |
| 975 | 977 | res->type = RXE_ATOMIC_MASK; |
| 976 | 978 | res->atomic.skb = skb; |
| 977 | − res->first_psn = qp->resp.psn; | |
| 978 | − res->last_psn = qp->resp.psn; | |
| 979 | − res->cur_psn = qp->resp.psn; | |
| 979 | + res->first_psn = ack_pkt.psn; | |
| 980 | + res->last_psn = ack_pkt.psn; | |
| 981 | + res->cur_psn = ack_pkt.psn; | |
| 980 | 982 | |
| 981 | 983 | rc = rxe_xmit_packet(rxe, qp, &ack_pkt, skb_copy); |
| 982 | 984 | if (rc) { |
| @@ -1116,8 +1118,7 @@ static enum resp_states duplicate_request(struct rxe_qp *qp, · 133 unmodified lines | ||
| 1116 | 1118 | rc = RESPST_CLEANUP; |
| 1117 | 1119 | goto out; |
| 1118 | 1120 | } |
| 1119 | − bth_set_psn(SKB_TO_PKT(skb_copy), | |
| 1120 | − qp->resp.psn - 1); | |
| 1121 | + | |
| 1121 | 1122 | /* Resend the result. */ |
| 1122 | 1123 | rc = rxe_xmit_packet(to_rdev(qp->ibqp.device), qp, |
| 1123 | 1124 | pkt, skb_copy); |
| @@ -478,6 +478,7 @@ void ipoib_send(struct net_device *dev, struct sk_buff *skb, · 477 unmodified lines | ||
| 478 | 478 | struct ipoib_ah *address, u32 qpn); |
| 479 | 479 | void ipoib_reap_ah(struct work_struct *work); |
| 480 | 480 | |
| 481 | +struct ipoib_path *__path_find(struct net_device *dev, void *gid); | |
| 481 | 482 | void ipoib_mark_paths_invalid(struct net_device *dev); |
| 482 | 483 | void ipoib_flush_paths(struct net_device *dev); |
| 483 | 484 | int ipoib_check_sm_sendonly_fullmember_support(struct ipoib_dev_priv *priv); |
| @@ -1318,6 +1318,8 @@ void ipoib_cm_destroy_tx(struct ipoib_cm_tx *tx) · 1317 unmodified lines | ||
| 1318 | 1318 | } |
| 1319 | 1319 | } |
| 1320 | 1320 | |
| 1321 | +#define QPN_AND_OPTIONS_OFFSET 4 | |
| 1322 | + | |
| 1321 | 1323 | static void ipoib_cm_tx_start(struct work_struct *work) |
| 1322 | 1324 | { |
| 1323 | 1325 | struct ipoib_dev_priv *priv = container_of(work, struct ipoib_dev_priv, |
| @@ -1326,6 +1328,7 @@ static void ipoib_cm_tx_start(struct work_struct *work) · 2 unmodified lines | ||
| 1326 | 1328 | struct ipoib_neigh *neigh; |
| 1327 | 1329 | struct ipoib_cm_tx *p; |
| 1328 | 1330 | unsigned long flags; |
| 1331 | + struct ipoib_path *path; | |
| 1329 | 1332 | int ret; |
| 1330 | 1333 | |
| 1331 | 1334 | struct ib_sa_path_rec pathrec; |
| @@ -1338,7 +1341,19 @@ static void ipoib_cm_tx_start(struct work_struct *work) · 6 unmodified lines | ||
| 1338 | 1341 | p = list_entry(priv->cm.start_list.next, typeof(*p), list); |
| 1339 | 1342 | list_del_init(&p->list); |
| 1340 | 1343 | neigh = p->neigh; |
| 1344 | + | |
| 1341 | 1345 | qpn = IPOIB_QPN(neigh->daddr); |
| 1346 | + /* | |
| 1347 | + * As long as the search is with these 2 locks, | |
| 1348 | + * path existence indicates its validity. | |
| 1349 | + */ | |
| 1350 | + path = __path_find(dev, neigh->daddr + QPN_AND_OPTIONS_OFFSET); | |
| 1351 | + if (!path) { | |
| 1352 | + pr_info("%s ignore not valid path %pI6\n", | |
| 1353 | + __func__, | |
| 1354 | + neigh->daddr + QPN_AND_OPTIONS_OFFSET); | |
| 1355 | + goto free_neigh; | |
| 1356 | + } | |
| 1342 | 1357 | memcpy(&pathrec, &p->path->pathrec, sizeof pathrec); |
| 1343 | 1358 | |
| 1344 | 1359 | spin_unlock_irqrestore(&priv->lock, flags); |
| @@ -1350,6 +1365,7 @@ static void ipoib_cm_tx_start(struct work_struct *work) · 5 unmodified lines | ||
| 1350 | 1365 | spin_lock_irqsave(&priv->lock, flags); |
| 1351 | 1366 | |
| 1352 | 1367 | if (ret) { |
| 1368 | +free_neigh: | |
| 1353 | 1369 | neigh = p->neigh; |
| 1354 | 1370 | if (neigh) { |
| 1355 | 1371 | neigh->cm = NULL; |
| @@ -1161,8 +1161,17 @@ static void __ipoib_ib_dev_flush(struct ipoib_dev_priv *priv, · 1160 unmodified lines | ||
| 1161 | 1161 | } |
| 1162 | 1162 | |
| 1163 | 1163 | if (level == IPOIB_FLUSH_LIGHT) { |
| 1164 | + int oper_up; | |
| 1164 | 1165 | ipoib_mark_paths_invalid(dev); |
| 1166 | + /* Set IPoIB operation as down to prevent races between: | |
| 1167 | + * the flush flow which leaves MCG and on the fly joins | |
| 1168 | + * which can happen during that time. mcast restart task | |
| 1169 | + * should deal with join requests we missed. | |
| 1170 | + */ | |
| 1171 | + oper_up = test_and_clear_bit(IPOIB_FLAG_OPER_UP, &priv->flags); | |
| 1165 | 1172 | ipoib_mcast_dev_flush(dev); |
| 1173 | + if (oper_up) | |
| 1174 | + set_bit(IPOIB_FLAG_OPER_UP, &priv->flags); | |
| 1166 | 1175 | ipoib_flush_ah(dev); |
| 1167 | 1176 | } |
| 1168 | 1177 | |
| @@ -485,7 +485,7 @@ int ipoib_set_mode(struct net_device *dev, const char *buf) · 484 unmodified lines | ||
| 485 | 485 | return -EINVAL; |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | −static struct ipoib_path *__path_find(struct net_device *dev, void *gid) | |
| 488 | +struct ipoib_path *__path_find(struct net_device *dev, void *gid) | |
| 489 | 489 | { |
| 490 | 490 | struct ipoib_dev_priv *priv = netdev_priv(dev); |
| 491 | 491 | struct rb_node *n = priv->path_tree.rb_node; |
| @@ -403,6 +403,7 @@ isert_init_conn(struct isert_conn *isert_conn) · 402 unmodified lines | ||
| 403 | 403 | INIT_LIST_HEAD(&isert_conn->node); |
| 404 | 404 | init_completion(&isert_conn->login_comp); |
| 405 | 405 | init_completion(&isert_conn->login_req_comp); |
| 406 | + init_waitqueue_head(&isert_conn->rem_wait); | |
| 406 | 407 | kref_init(&isert_conn->kref); |
| 407 | 408 | mutex_init(&isert_conn->mutex); |
| 408 | 409 | INIT_WORK(&isert_conn->release_work, isert_release_work); |
| @@ -448,7 +449,7 @@ isert_alloc_login_buf(struct isert_conn *isert_conn, · 39 unmodified lines | ||
| 448 | 449 | |
| 449 | 450 | isert_conn->login_rsp_buf = kzalloc(ISER_RX_PAYLOAD_SIZE, GFP_KERNEL); |
| 450 | 451 | if (!isert_conn->login_rsp_buf) { |
| 451 | − isert_err("Unable to allocate isert_conn->login_rspbuf\n"); | |
| 452 | + ret = -ENOMEM; | |
| 452 | 453 | goto out_unmap_login_req_buf; |
| 453 | 454 | } |
| 454 | 455 | |
| @@ -578,7 +579,8 @@ isert_connect_release(struct isert_conn *isert_conn) · 123 unmodified lines | ||
| 578 | 579 | BUG_ON(!device); |
| 579 | 580 | |
| 580 | 581 | isert_free_rx_descriptors(isert_conn); |
| 581 | − if (isert_conn->cm_id) | |
| 582 | + if (isert_conn->cm_id && | |
| 583 | + !isert_conn->dev_removed) | |
| 582 | 584 | rdma_destroy_id(isert_conn->cm_id); |
| 583 | 585 | |
| 584 | 586 | if (isert_conn->qp) { |
| @@ -593,7 +595,10 @@ isert_connect_release(struct isert_conn *isert_conn) · 8 unmodified lines | ||
| 593 | 595 | |
| 594 | 596 | isert_device_put(device); |
| 595 | 597 | |
| 596 | − kfree(isert_conn); | |
| 598 | + if (isert_conn->dev_removed) | |
| 599 | + wake_up_interruptible(&isert_conn->rem_wait); | |
| 600 | + else | |
| 601 | + kfree(isert_conn); | |
| 597 | 602 | } |
| 598 | 603 | |
| 599 | 604 | static void |
| @@ -753,6 +758,7 @@ static int · 153 unmodified lines | ||
| 753 | 758 | isert_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) |
| 754 | 759 | { |
| 755 | 760 | struct isert_np *isert_np = cma_id->context; |
| 761 | + struct isert_conn *isert_conn; | |
| 756 | 762 | int ret = 0; |
| 757 | 763 | |
| 758 | 764 | isert_info("%s (%d): status %d id %p np %p\n", |
| @@ -773,10 +779,21 @@ isert_cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event) · 14 unmodified lines | ||
| 773 | 779 | break; |
| 774 | 780 | case RDMA_CM_EVENT_ADDR_CHANGE: /* FALLTHRU */ |
| 775 | 781 | case RDMA_CM_EVENT_DISCONNECTED: /* FALLTHRU */ |
| 776 | − case RDMA_CM_EVENT_DEVICE_REMOVAL: /* FALLTHRU */ | |
| 777 | 782 | case RDMA_CM_EVENT_TIMEWAIT_EXIT: /* FALLTHRU */ |
| 778 | 783 | ret = isert_disconnected_handler(cma_id, event->event); |
| 779 | 784 | break; |
| 785 | + case RDMA_CM_EVENT_DEVICE_REMOVAL: | |
| 786 | + isert_conn = cma_id->qp->qp_context; | |
| 787 | + isert_conn->dev_removed = true; | |
| 788 | + isert_disconnected_handler(cma_id, event->event); | |
| 789 | + wait_event_interruptible(isert_conn->rem_wait, | |
| 790 | + isert_conn->state == ISER_CONN_DOWN); | |
| 791 | + kfree(isert_conn); | |
| 792 | + /* | |
| 793 | + * return non-zero from the callback to destroy | |
| 794 | + * the rdma cm id | |
| 795 | + */ | |
| 796 | + return 1; | |
| 780 | 797 | case RDMA_CM_EVENT_REJECTED: /* FALLTHRU */ |
| 781 | 798 | case RDMA_CM_EVENT_UNREACHABLE: /* FALLTHRU */ |
| 782 | 799 | case RDMA_CM_EVENT_CONNECT_ERROR: |
| @@ -158,6 +158,8 @@ struct isert_conn { · 157 unmodified lines | ||
| 158 | 158 | struct work_struct release_work; |
| 159 | 159 | bool logout_posted; |
| 160 | 160 | bool snd_w_inv; |
| 161 | + wait_queue_head_t rem_wait; | |
| 162 | + bool dev_removed; | |
| 161 | 163 | }; |
| 162 | 164 | |
| 163 | 165 | #define ISERT_MAX_CQ 64 |
| @@ -522,6 +522,11 @@ static int srpt_refresh_port(struct srpt_port *sport) · 521 unmodified lines | ||
| 522 | 522 | if (ret) |
| 523 | 523 | goto err_query_port; |
| 524 | 524 | |
| 525 | + snprintf(sport->port_guid, sizeof(sport->port_guid), | |
| 526 | + "0x%016llx%016llx", | |
| 527 | + be64_to_cpu(sport->gid.global.subnet_prefix), | |
| 528 | + be64_to_cpu(sport->gid.global.interface_id)); | |
| 529 | + | |
| 525 | 530 | if (!sport->mad_agent) { |
| 526 | 531 | memset(®_req, 0, sizeof(reg_req)); |
| 527 | 532 | reg_req.mgmt_class = IB_MGMT_CLASS_DEVICE_MGMT; |
| @@ -2548,10 +2553,6 @@ static void srpt_add_one(struct ib_device *device) · 2020 unmodified lines | ||
| 2548 | 2553 | sdev->device->name, i); |
| 2549 | 2554 | goto err_ring; |
| 2550 | 2555 | } |
| 2551 | − snprintf(sport->port_guid, sizeof(sport->port_guid), | |
| 2552 | − "0x%016llx%016llx", | |
| 2553 | − be64_to_cpu(sport->gid.global.subnet_prefix), | |
| 2554 | − be64_to_cpu(sport->gid.global.interface_id)); | |
| 2555 | 2556 | } |
| 2556 | 2557 | |
| 2557 | 2558 | spin_lock(&srpt_dev_lock); |
| @@ -376,7 +376,7 @@ static int tegra_kbc_start(struct tegra_kbc *kbc) · 375 unmodified lines | ||
| 376 | 376 | /* Reset the KBC controller to clear all previous status.*/ |
| 377 | 377 | reset_control_assert(kbc->rst); |
| 378 | 378 | udelay(100); |
| 379 | − reset_control_assert(kbc->rst); | |
| 379 | + reset_control_deassert(kbc->rst); | |
| 380 | 380 | udelay(100); |
| 381 | 381 | |
| 382 | 382 | tegra_kbc_config_pins(kbc); |
| @@ -553,7 +553,6 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, · 552 unmodified lines | ||
| 553 | 553 | goto free_struct_buff; |
| 554 | 554 | |
| 555 | 555 | reg = find_first_bit(rdesc->presense_map, RMI_REG_DESC_PRESENSE_BITS); |
| 556 | − map_offset = 0; | |
| 557 | 556 | for (i = 0; i < rdesc->num_registers; i++) { |
| 558 | 557 | struct rmi_register_desc_item *item = &rdesc->registers[i]; |
| 559 | 558 | int reg_size = struct_buf[offset]; |
| @@ -576,6 +575,8 @@ int rmi_read_register_desc(struct rmi_device *d, u16 addr, · 16 unmodified lines | ||
| 576 | 575 | item->reg = reg; |
| 577 | 576 | item->reg_size = reg_size; |
| 578 | 577 | |
| 578 | + map_offset = 0; | |
| 579 | + | |
| 579 | 580 | do { |
| 580 | 581 | for (b = 0; b < 7; b++) { |
| 581 | 582 | if (struct_buf[offset] & (0x1 << b)) |
| @@ -1305,6 +1305,7 @@ static int __init i8042_create_aux_port(int idx) · 1304 unmodified lines | ||
| 1305 | 1305 | serio->write = i8042_aux_write; |
| 1306 | 1306 | serio->start = i8042_start; |
| 1307 | 1307 | serio->stop = i8042_stop; |
| 1308 | + serio->ps2_cmd_mutex = &i8042_mutex; | |
| 1308 | 1309 | serio->port_data = port; |
| 1309 | 1310 | serio->dev.parent = &i8042_platform_device->dev; |
| 1310 | 1311 | if (idx < 0) { |
| @@ -1473,7 +1473,6 @@ static int ads7846_remove(struct spi_device *spi) · 1472 unmodified lines | ||
| 1473 | 1473 | |
| 1474 | 1474 | ads784x_hwmon_unregister(spi, ts); |
| 1475 | 1475 | |
| 1476 | − regulator_disable(ts->reg); | |
| 1477 | 1476 | regulator_put(ts->reg); |
| 1478 | 1477 | |
| 1479 | 1478 | if (!ts->get_pendown_state) { |
| @@ -390,9 +390,10 @@ static void silead_ts_read_props(struct i2c_client *client) · 389 unmodified lines | ||
| 390 | 390 | data->max_fingers = 5; /* Most devices handle up-to 5 fingers */ |
| 391 | 391 | } |
| 392 | 392 | |
| 393 | − error = device_property_read_string(dev, "touchscreen-fw-name", &str); | |
| 393 | + error = device_property_read_string(dev, "firmware-name", &str); | |
| 394 | 394 | if (!error) |
| 395 | − snprintf(data->fw_name, sizeof(data->fw_name), "%s", str); | |
| 395 | + snprintf(data->fw_name, sizeof(data->fw_name), | |
| 396 | + "silead/%s", str); | |
| 396 | 397 | else |
| 397 | 398 | dev_dbg(dev, "Firmware file name read error. Using default."); |
| 398 | 399 | } |
| @@ -410,14 +411,14 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data, · 11 unmodified lines | ||
| 410 | 411 | if (!acpi_id) |
| 411 | 412 | return -ENODEV; |
| 412 | 413 | |
| 413 | − snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", | |
| 414 | − acpi_id->id); | |
| 414 | + snprintf(data->fw_name, sizeof(data->fw_name), | |
| 415 | + "silead/%s.fw", acpi_id->id); | |
| 415 | 416 | |
| 416 | 417 | for (i = 0; i < strlen(data->fw_name); i++) |
| 417 | 418 | data->fw_name[i] = tolower(data->fw_name[i]); |
| 418 | 419 | } else { |
| 419 | − snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", | |
| 420 | − id->name); | |
| 420 | + snprintf(data->fw_name, sizeof(data->fw_name), | |
| 421 | + "silead/%s.fw", id->name); | |
| 421 | 422 | } |
| 422 | 423 | |
| 423 | 424 | return 0; |
| @@ -426,7 +427,8 @@ static int silead_ts_set_default_fw_name(struct silead_ts_data *data, · 2 unmodified lines | ||
| 426 | 427 | static int silead_ts_set_default_fw_name(struct silead_ts_data *data, |
| 427 | 428 | const struct i2c_device_id *id) |
| 428 | 429 | { |
| 429 | − snprintf(data->fw_name, sizeof(data->fw_name), "%s.fw", id->name); | |
| 430 | + snprintf(data->fw_name, sizeof(data->fw_name), | |
| 431 | + "silead/%s.fw", id->name); | |
| 430 | 432 | return 0; |
| 431 | 433 | } |
| 432 | 434 | #endif |
| @@ -464,7 +466,7 @@ static int silead_ts_probe(struct i2c_client *client, · 31 unmodified lines | ||
| 464 | 466 | return -ENODEV; |
| 465 | 467 | |
| 466 | 468 | /* Power GPIO pin */ |
| 467 | − data->gpio_power = gpiod_get_optional(dev, "power", GPIOD_OUT_LOW); | |
| 469 | + data->gpio_power = devm_gpiod_get_optional(dev, "power", GPIOD_OUT_LOW); | |
| 468 | 470 | if (IS_ERR(data->gpio_power)) { |
| 469 | 471 | if (PTR_ERR(data->gpio_power) != -EPROBE_DEFER) |
| 470 | 472 | dev_err(dev, "Shutdown GPIO request failed\n"); |
| @@ -879,7 +879,7 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) · 878 unmodified lines | ||
| 879 | 879 | * We may have concurrent producers, so we need to be careful |
| 880 | 880 | * not to touch any of the shadow cmdq state. |
| 881 | 881 | */ |
| 882 | − queue_read(cmd, Q_ENT(q, idx), q->ent_dwords); | |
| 882 | + queue_read(cmd, Q_ENT(q, cons), q->ent_dwords); | |
| 883 | 883 | dev_err(smmu->dev, "skipping command in error state:\n"); |
| 884 | 884 | for (i = 0; i < ARRAY_SIZE(cmd); ++i) |
| 885 | 885 | dev_err(smmu->dev, "\t0x%016llx\n", (unsigned long long)cmd[i]); |
| @@ -890,7 +890,7 @@ static void arm_smmu_cmdq_skip_err(struct arm_smmu_device *smmu) · 4 unmodified lines | ||
| 890 | 890 | return; |
| 891 | 891 | } |
| 892 | 892 | |
| 893 | − queue_write(cmd, Q_ENT(q, idx), q->ent_dwords); | |
| 893 | + queue_write(Q_ENT(q, cons), cmd, q->ent_dwords); | |
| 894 | 894 | } |
| 895 | 895 | |
| 896 | 896 | static void arm_smmu_cmdq_issue_cmd(struct arm_smmu_device *smmu, |
| @@ -1034,6 +1034,9 @@ static void arm_smmu_write_strtab_ent(struct arm_smmu_device *smmu, u32 sid, · 137 unmodified lines | ||
| 1034 | 1034 | case STRTAB_STE_0_CFG_S2_TRANS: |
| 1035 | 1035 | ste_live = true; |
| 1036 | 1036 | break; |
| 1037 | + case STRTAB_STE_0_CFG_ABORT: | |
| 1038 | + if (disable_bypass) | |
| 1039 | + break; | |
| 1037 | 1040 | default: |
| 1038 | 1041 | BUG(); /* STE corruption */ |
| 1039 | 1042 | } |
| @@ -686,8 +686,7 @@ static struct iommu_gather_ops arm_smmu_gather_ops = { · 685 unmodified lines | ||
| 686 | 686 | |
| 687 | 687 | static irqreturn_t arm_smmu_context_fault(int irq, void *dev) |
| 688 | 688 | { |
| 689 | − int flags, ret; | |
| 690 | − u32 fsr, fsynr, resume; | |
| 689 | + u32 fsr, fsynr; | |
| 691 | 690 | unsigned long iova; |
| 692 | 691 | struct iommu_domain *domain = dev; |
| 693 | 692 | struct arm_smmu_domain *smmu_domain = to_smmu_domain(domain); |
| @@ -701,34 +700,15 @@ static irqreturn_t arm_smmu_context_fault(int irq, void *dev) · 7 unmodified lines | ||
| 701 | 700 | if (!(fsr & FSR_FAULT)) |
| 702 | 701 | return IRQ_NONE; |
| 703 | 702 | |
| 704 | − if (fsr & FSR_IGN) | |
| 705 | − dev_err_ratelimited(smmu->dev, | |
| 706 | − "Unexpected context fault (fsr 0x%x)\n", | |
| 707 | − fsr); | |
| 708 | − | |
| 709 | 703 | fsynr = readl_relaxed(cb_base + ARM_SMMU_CB_FSYNR0); |
| 710 | − flags = fsynr & FSYNR0_WNR ? IOMMU_FAULT_WRITE : IOMMU_FAULT_READ; | |
| 711 | − | |
| 712 | 704 | iova = readq_relaxed(cb_base + ARM_SMMU_CB_FAR); |
| 713 | − if (!report_iommu_fault(domain, smmu->dev, iova, flags)) { | |
| 714 | − ret = IRQ_HANDLED; | |
| 715 | − resume = RESUME_RETRY; | |
| 716 | − } else { | |
| 717 | − dev_err_ratelimited(smmu->dev, | |
| 718 | − "Unhandled context fault: iova=0x%08lx, fsynr=0x%x, cb=%d\n", | |
| 719 | − iova, fsynr, cfg->cbndx); | |
| 720 | − ret = IRQ_NONE; | |
| 721 | − resume = RESUME_TERMINATE; | |
| 722 | − } | |
| 723 | − | |
| 724 | − /* Clear the faulting FSR */ | |
| 725 | − writel(fsr, cb_base + ARM_SMMU_CB_FSR); | |
| 726 | 705 | |
| 727 | − /* Retry or terminate any stalled transactions */ | |
| 728 | − if (fsr & FSR_SS) | |
| 729 | − writel_relaxed(resume, cb_base + ARM_SMMU_CB_RESUME); | |
| 706 | + dev_err_ratelimited(smmu->dev, | |
| 707 | + "Unhandled context fault: fsr=0x%x, iova=0x%08lx, fsynr=0x%x, cb=%d\n", | |
| 708 | + fsr, iova, fsynr, cfg->cbndx); | |
| 730 | 709 | |
| 731 | − return ret; | |
| 710 | + writel(fsr, cb_base + ARM_SMMU_CB_FSR); | |
| 711 | + return IRQ_HANDLED; | |
| 732 | 712 | } |
| 733 | 713 | |
| 734 | 714 | static irqreturn_t arm_smmu_global_fault(int irq, void *dev) |
| @@ -837,7 +817,7 @@ static void arm_smmu_init_context_bank(struct arm_smmu_domain *smmu_domain, · 102 unmodified lines | ||
| 837 | 817 | } |
| 838 | 818 | |
| 839 | 819 | /* SCTLR */ |
| 840 | − reg = SCTLR_CFCFG | SCTLR_CFIE | SCTLR_CFRE | SCTLR_M | SCTLR_EAE_SBOP; | |
| 820 | + reg = SCTLR_CFIE | SCTLR_CFRE | SCTLR_M | SCTLR_EAE_SBOP; | |
| 841 | 821 | if (stage1) |
| 842 | 822 | reg |= SCTLR_S1_ASIDPNE; |
| 843 | 823 | #ifdef __BIG_ENDIAN |
| @@ -68,7 +68,8 @@ void iommu_put_dma_cookie(struct iommu_domain *domain) · 67 unmodified lines | ||
| 68 | 68 | if (!iovad) |
| 69 | 69 | return; |
| 70 | 70 | |
| 71 | − put_iova_domain(iovad); | |
| 71 | + if (iovad->granule) | |
| 72 | + put_iova_domain(iovad); | |
| 72 | 73 | kfree(iovad); |
| 73 | 74 | domain->iova_cookie = NULL; |
| 74 | 75 | } |
| @@ -151,12 +152,15 @@ int dma_direction_to_prot(enum dma_data_direction dir, bool coherent) · 76 unmodified lines | ||
| 151 | 152 | } |
| 152 | 153 | } |
| 153 | 154 | |
| 154 | −static struct iova *__alloc_iova(struct iova_domain *iovad, size_t size, | |
| 155 | +static struct iova *__alloc_iova(struct iommu_domain *domain, size_t size, | |
| 155 | 156 | dma_addr_t dma_limit) |
| 156 | 157 | { |
| 158 | + struct iova_domain *iovad = domain->iova_cookie; | |
| 157 | 159 | unsigned long shift = iova_shift(iovad); |
| 158 | 160 | unsigned long length = iova_align(iovad, size) >> shift; |
| 159 | 161 | |
| 162 | + if (domain->geometry.force_aperture) | |
| 163 | + dma_limit = min(dma_limit, domain->geometry.aperture_end); | |
| 160 | 164 | /* |
| 161 | 165 | * Enforce size-alignment to be safe - there could perhaps be an |
| 162 | 166 | * attribute to control this per-device, or at least per-domain... |
| @@ -314,7 +318,7 @@ struct page **iommu_dma_alloc(struct device *dev, size_t size, gfp_t gfp, · 151 unmodified lines | ||
| 314 | 318 | if (!pages) |
| 315 | 319 | return NULL; |
| 316 | 320 | |
| 317 | − iova = __alloc_iova(iovad, size, dev->coherent_dma_mask); | |
| 321 | + iova = __alloc_iova(domain, size, dev->coherent_dma_mask); | |
| 318 | 322 | if (!iova) |
| 319 | 323 | goto out_free_pages; |
| 320 | 324 | |
| @@ -386,7 +390,7 @@ dma_addr_t iommu_dma_map_page(struct device *dev, struct page *page, · 65 unmodified lines | ||
| 386 | 390 | phys_addr_t phys = page_to_phys(page) + offset; |
| 387 | 391 | size_t iova_off = iova_offset(iovad, phys); |
| 388 | 392 | size_t len = iova_align(iovad, size + iova_off); |
| 389 | − struct iova *iova = __alloc_iova(iovad, len, dma_get_mask(dev)); | |
| 393 | + struct iova *iova = __alloc_iova(domain, len, dma_get_mask(dev)); | |
| 390 | 394 | |
| 391 | 395 | if (!iova) |
| 392 | 396 | return DMA_ERROR_CODE; |
| @@ -538,7 +542,7 @@ int iommu_dma_map_sg(struct device *dev, struct scatterlist *sg, · 145 unmodified lines | ||
| 538 | 542 | prev = s; |
| 539 | 543 | } |
| 540 | 544 | |
| 541 | − iova = __alloc_iova(iovad, iova_len, dma_get_mask(dev)); | |
| 545 | + iova = __alloc_iova(domain, iova_len, dma_get_mask(dev)); | |
| 542 | 546 | if (!iova) |
| 543 | 547 | goto out_restore_sg; |
| 544 | 548 | |
| @@ -286,12 +286,14 @@ static int arm_v7s_pte_to_prot(arm_v7s_iopte pte, int lvl) · 285 unmodified lines | ||
| 286 | 286 | int prot = IOMMU_READ; |
| 287 | 287 | arm_v7s_iopte attr = pte >> ARM_V7S_ATTR_SHIFT(lvl); |
| 288 | 288 | |
| 289 | − if (attr & ARM_V7S_PTE_AP_RDONLY) | |
| 289 | + if (!(attr & ARM_V7S_PTE_AP_RDONLY)) | |
| 290 | 290 | prot |= IOMMU_WRITE; |
| 291 | 291 | if ((attr & (ARM_V7S_TEX_MASK << ARM_V7S_TEX_SHIFT)) == 0) |
| 292 | 292 | prot |= IOMMU_MMIO; |
| 293 | 293 | else if (pte & ARM_V7S_ATTR_C) |
| 294 | 294 | prot |= IOMMU_CACHE; |
| 295 | + if (pte & ARM_V7S_ATTR_XN(lvl)) | |
| 296 | + prot |= IOMMU_NOEXEC; | |
| 295 | 297 | |
| 296 | 298 | return prot; |
| 297 | 299 | } |
| @@ -55,19 +55,19 @@ struct mtk_iommu_data { · 54 unmodified lines | ||
| 55 | 55 | bool enable_4GB; |
| 56 | 56 | }; |
| 57 | 57 | |
| 58 | −static int compare_of(struct device *dev, void *data) | |
| 58 | +static inline int compare_of(struct device *dev, void *data) | |
| 59 | 59 | { |
| 60 | 60 | return dev->of_node == data; |
| 61 | 61 | } |
| 62 | 62 | |
| 63 | −static int mtk_iommu_bind(struct device *dev) | |
| 63 | +static inline int mtk_iommu_bind(struct device *dev) | |
| 64 | 64 | { |
| 65 | 65 | struct mtk_iommu_data *data = dev_get_drvdata(dev); |
| 66 | 66 | |
| 67 | 67 | return component_bind_all(dev, &data->smi_imu); |
| 68 | 68 | } |
| 69 | 69 | |
| 70 | −static void mtk_iommu_unbind(struct device *dev) | |
| 70 | +static inline void mtk_iommu_unbind(struct device *dev) | |
| 71 | 71 | { |
| 72 | 72 | struct mtk_iommu_data *data = dev_get_drvdata(dev); |
| 73 | 73 | |
| @@ -176,6 +176,7 @@ static int aic_irq_domain_xlate(struct irq_domain *d, · 175 unmodified lines | ||
| 176 | 176 | { |
| 177 | 177 | struct irq_domain_chip_generic *dgc = d->gc; |
| 178 | 178 | struct irq_chip_generic *gc; |
| 179 | + unsigned long flags; | |
| 179 | 180 | unsigned smr; |
| 180 | 181 | int idx; |
| 181 | 182 | int ret; |
| @@ -194,11 +195,11 @@ static int aic_irq_domain_xlate(struct irq_domain *d, · 12 unmodified lines | ||
| 194 | 195 | |
| 195 | 196 | gc = dgc->gc[idx]; |
| 196 | 197 | |
| 197 | − irq_gc_lock(gc); | |
| 198 | + irq_gc_lock_irqsave(gc, flags); | |
| 198 | 199 | smr = irq_reg_readl(gc, AT91_AIC_SMR(*out_hwirq)); |
| 199 | 200 | aic_common_set_priority(intspec[2], &smr); |
| 200 | 201 | irq_reg_writel(gc, smr, AT91_AIC_SMR(*out_hwirq)); |
| 201 | − irq_gc_unlock(gc); | |
| 202 | + irq_gc_unlock_irqrestore(gc, flags); | |
| 202 | 203 | |
| 203 | 204 | return ret; |
| 204 | 205 | } |
| @@ -258,6 +258,7 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, · 257 unmodified lines | ||
| 258 | 258 | unsigned int *out_type) |
| 259 | 259 | { |
| 260 | 260 | struct irq_chip_generic *bgc = irq_get_domain_generic_chip(d, 0); |
| 261 | + unsigned long flags; | |
| 261 | 262 | unsigned smr; |
| 262 | 263 | int ret; |
| 263 | 264 | |
| @@ -269,12 +270,12 @@ static int aic5_irq_domain_xlate(struct irq_domain *d, · 5 unmodified lines | ||
| 269 | 270 | if (ret) |
| 270 | 271 | return ret; |
| 271 | 272 | |
| 272 | − irq_gc_lock(bgc); | |
| 273 | + irq_gc_lock_irqsave(bgc, flags); | |
| 273 | 274 | irq_reg_writel(bgc, *out_hwirq, AT91_AIC5_SSR); |
| 274 | 275 | smr = irq_reg_readl(bgc, AT91_AIC5_SMR); |
| 275 | 276 | aic_common_set_priority(intspec[2], &smr); |
| 276 | 277 | irq_reg_writel(bgc, smr, AT91_AIC5_SMR); |
| 277 | − irq_gc_unlock(bgc); | |
| 278 | + irq_gc_unlock_irqrestore(bgc, flags); | |
| 278 | 279 | |
| 279 | 280 | return ret; |
| 280 | 281 | } |
| @@ -1545,7 +1545,12 @@ static int its_force_quiescent(void __iomem *base) · 1544 unmodified lines | ||
| 1545 | 1545 | u32 val; |
| 1546 | 1546 | |
| 1547 | 1547 | val = readl_relaxed(base + GITS_CTLR); |
| 1548 | − if (val & GITS_CTLR_QUIESCENT) | |
| 1548 | + /* | |
| 1549 | + * GIC architecture specification requires the ITS to be both | |
| 1550 | + * disabled and quiescent for writes to GITS_BASER<n> or | |
| 1551 | + * GITS_CBASER to not have UNPREDICTABLE results. | |
| 1552 | + */ | |
| 1553 | + if ((val & GITS_CTLR_QUIESCENT) && !(val & GITS_CTLR_ENABLE)) | |
| 1549 | 1554 | return 0; |
| 1550 | 1555 | |
| 1551 | 1556 | /* Disable the generation of all interrupts to this ITS */ |
| @@ -548,7 +548,7 @@ static int gic_starting_cpu(unsigned int cpu) · 547 unmodified lines | ||
| 548 | 548 | static u16 gic_compute_target_list(int *base_cpu, const struct cpumask *mask, |
| 549 | 549 | unsigned long cluster_id) |
| 550 | 550 | { |
| 551 | − int cpu = *base_cpu; | |
| 551 | + int next_cpu, cpu = *base_cpu; | |
| 552 | 552 | unsigned long mpidr = cpu_logical_map(cpu); |
| 553 | 553 | u16 tlist = 0; |
| 554 | 554 | |
| @@ -562,9 +562,10 @@ static u16 gic_compute_target_list(int *base_cpu, const struct cpumask *mask, · 7 unmodified lines | ||
| 562 | 562 | |
| 563 | 563 | tlist |= 1 << (mpidr & 0xf); |
| 564 | 564 | |
| 565 | − cpu = cpumask_next(cpu, mask); | |
| 566 | − if (cpu >= nr_cpu_ids) | |
| 565 | + next_cpu = cpumask_next(cpu, mask); | |
| 566 | + if (next_cpu >= nr_cpu_ids) | |
| 567 | 567 | goto out; |
| 568 | + cpu = next_cpu; | |
| 568 | 569 | |
| 569 | 570 | mpidr = cpu_logical_map(cpu); |
| 570 | 571 | |
| @@ -667,13 +668,20 @@ static int gic_set_affinity(struct irq_data *d, const struct cpumask *mask_val, · 96 unmodified lines | ||
| 667 | 668 | #endif |
| 668 | 669 | |
| 669 | 670 | #ifdef CONFIG_CPU_PM |
| 671 | +/* Check whether it's single security state view */ | |
| 672 | +static bool gic_dist_security_disabled(void) | |
| 673 | +{ | |
| 674 | + return readl_relaxed(gic_data.dist_base + GICD_CTLR) & GICD_CTLR_DS; | |
| 675 | +} | |
| 676 | + | |
| 670 | 677 | static int gic_cpu_pm_notifier(struct notifier_block *self, |
| 671 | 678 | unsigned long cmd, void *v) |
| 672 | 679 | { |
| 673 | 680 | if (cmd == CPU_PM_EXIT) { |
| 674 | − gic_enable_redist(true); | |
| 681 | + if (gic_dist_security_disabled()) | |
| 682 | + gic_enable_redist(true); | |
| 675 | 683 | gic_cpu_sys_reg_init(); |
| 676 | − } else if (cmd == CPU_PM_ENTER) { | |
| 684 | + } else if (cmd == CPU_PM_ENTER && gic_dist_security_disabled()) { | |
| 677 | 685 | gic_write_grpen1(0); |
| 678 | 686 | gic_enable_redist(false); |
| 679 | 687 | } |
| @@ -769,6 +769,13 @@ static void gic_raise_softirq(const struct cpumask *mask, unsigned int irq) · 768 unmodified lines | ||
| 769 | 769 | int cpu; |
| 770 | 770 | unsigned long flags, map = 0; |
| 771 | 771 | |
| 772 | + if (unlikely(nr_cpu_ids == 1)) { | |
| 773 | + /* Only one CPU? let's do a self-IPI... */ | |
| 774 | + writel_relaxed(2 << 24 | irq, | |
| 775 | + gic_data_dist_base(&gic_data[0]) + GIC_DIST_SOFTINT); | |
| 776 | + return; | |
| 777 | + } | |
| 778 | + | |
| 772 | 779 | raw_spin_lock_irqsave(&irq_controller_lock, flags); |
| 773 | 780 | |
| 774 | 781 | /* Convert our logical CPU mask into a physical one. */ |
| @@ -638,27 +638,6 @@ static int gic_local_irq_domain_map(struct irq_domain *d, unsigned int virq, · 637 unmodified lines | ||
| 638 | 638 | if (!gic_local_irq_is_routable(intr)) |
| 639 | 639 | return -EPERM; |
| 640 | 640 | |
| 641 | − /* | |
| 642 | − * HACK: These are all really percpu interrupts, but the rest | |
| 643 | − * of the MIPS kernel code does not use the percpu IRQ API for | |
| 644 | − * the CP0 timer and performance counter interrupts. | |
| 645 | − */ | |
| 646 | − switch (intr) { | |
| 647 | − case GIC_LOCAL_INT_TIMER: | |
| 648 | − case GIC_LOCAL_INT_PERFCTR: | |
| 649 | − case GIC_LOCAL_INT_FDC: | |
| 650 | − irq_set_chip_and_handler(virq, | |
| 651 | − &gic_all_vpes_local_irq_controller, | |
| 652 | − handle_percpu_irq); | |
| 653 | − break; | |
| 654 | − default: | |
| 655 | − irq_set_chip_and_handler(virq, | |
| 656 | − &gic_local_irq_controller, | |
| 657 | − handle_percpu_devid_irq); | |
| 658 | − irq_set_percpu_devid(virq); | |
| 659 | − break; | |
| 660 | − } | |
| 661 | − | |
| 662 | 641 | spin_lock_irqsave(&gic_lock, flags); |
| 663 | 642 | for (i = 0; i < gic_vpes; i++) { |
| 664 | 643 | u32 val = GIC_MAP_TO_PIN_MSK | gic_cpu_pin; |
| @@ -713,9 +692,6 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq, · 48 unmodified lines | ||
| 713 | 692 | unsigned long flags; |
| 714 | 693 | int i; |
| 715 | 694 | |
| 716 | − irq_set_chip_and_handler(virq, &gic_level_irq_controller, | |
| 717 | − handle_level_irq); | |
| 718 | − | |
| 719 | 695 | spin_lock_irqsave(&gic_lock, flags); |
| 720 | 696 | gic_map_to_pin(intr, gic_cpu_pin); |
| 721 | 697 | gic_map_to_vpe(intr, mips_cm_vp_id(vpe)); |
| @@ -727,12 +703,42 @@ static int gic_shared_irq_domain_map(struct irq_domain *d, unsigned int virq, · 5 unmodified lines | ||
| 727 | 703 | return 0; |
| 728 | 704 | } |
| 729 | 705 | |
| 730 | −static int gic_irq_domain_map(struct irq_domain *d, unsigned int virq, | |
| 731 | − irq_hw_number_t hw) | |
| 706 | +static int gic_setup_dev_chip(struct irq_domain *d, unsigned int virq, | |
| 707 | + unsigned int hwirq) | |
| 732 | 708 | { |
| 733 | − if (GIC_HWIRQ_TO_LOCAL(hw) < GIC_NUM_LOCAL_INTRS) | |
| 734 | − return gic_local_irq_domain_map(d, virq, hw); | |
| 735 | − return gic_shared_irq_domain_map(d, virq, hw, 0); | |
| 709 | + struct irq_chip *chip; | |
| 710 | + int err; | |
| 711 | + | |
| 712 | + if (hwirq >= GIC_SHARED_HWIRQ_BASE) { | |
| 713 | + err = irq_domain_set_hwirq_and_chip(d, virq, hwirq, | |
| 714 | + &gic_level_irq_controller, | |
| 715 | + NULL); | |
| 716 | + } else { | |
| 717 | + switch (GIC_HWIRQ_TO_LOCAL(hwirq)) { | |
| 718 | + case GIC_LOCAL_INT_TIMER: | |
| 719 | + case GIC_LOCAL_INT_PERFCTR: | |
| 720 | + case GIC_LOCAL_INT_FDC: | |
| 721 | + /* | |
| 722 | + * HACK: These are all really percpu interrupts, but | |
| 723 | + * the rest of the MIPS kernel code does not use the | |
| 724 | + * percpu IRQ API for them. | |
| 725 | + */ | |
| 726 | + chip = &gic_all_vpes_local_irq_controller; | |
| 727 | + irq_set_handler(virq, handle_percpu_irq); | |
| 728 | + break; | |
| 729 | + | |
| 730 | + default: | |
| 731 | + chip = &gic_local_irq_controller; | |
| 732 | + irq_set_handler(virq, handle_percpu_devid_irq); | |
| 733 | + irq_set_percpu_devid(virq); | |
| 734 | + break; | |
| 735 | + } | |
| 736 | + | |
| 737 | + err = irq_domain_set_hwirq_and_chip(d, virq, hwirq, | |
| 738 | + chip, NULL); | |
| 739 | + } | |
| 740 | + | |
| 741 | + return err; | |
| 736 | 742 | } |
| 737 | 743 | |
| 738 | 744 | static int gic_irq_domain_alloc(struct irq_domain *d, unsigned int virq, |
| @@ -743,15 +749,12 @@ static int gic_irq_domain_alloc(struct irq_domain *d, unsigned int virq, · 4 unmodified lines | ||
| 743 | 749 | int cpu, ret, i; |
| 744 | 750 | |
| 745 | 751 | if (spec->type == GIC_DEVICE) { |
| 746 | − /* verify that it doesn't conflict with an IPI irq */ | |
| 747 | − if (test_bit(spec->hwirq, ipi_resrv)) | |
| 752 | + /* verify that shared irqs don't conflict with an IPI irq */ | |
| 753 | + if ((spec->hwirq >= GIC_SHARED_HWIRQ_BASE) && | |
| 754 | + test_bit(GIC_HWIRQ_TO_SHARED(spec->hwirq), ipi_resrv)) | |
| 748 | 755 | return -EBUSY; |
| 749 | 756 | |
| 750 | − hwirq = GIC_SHARED_TO_HWIRQ(spec->hwirq); | |
| 751 | − | |
| 752 | − return irq_domain_set_hwirq_and_chip(d, virq, hwirq, | |
| 753 | − &gic_level_irq_controller, | |
| 754 | − NULL); | |
| 757 | + return gic_setup_dev_chip(d, virq, spec->hwirq); | |
| 755 | 758 | } else { |
| 756 | 759 | base_hwirq = find_first_bit(ipi_resrv, gic_shared_intrs); |
| 757 | 760 | if (base_hwirq == gic_shared_intrs) { |
| @@ -771,11 +774,13 @@ static int gic_irq_domain_alloc(struct irq_domain *d, unsigned int virq, · 13 unmodified lines | ||
| 771 | 774 | hwirq = GIC_SHARED_TO_HWIRQ(base_hwirq + i); |
| 772 | 775 | |
| 773 | 776 | ret = irq_domain_set_hwirq_and_chip(d, virq + i, hwirq, |
| 774 | − &gic_edge_irq_controller, | |
| 777 | + &gic_level_irq_controller, | |
| 775 | 778 | NULL); |
| 776 | 779 | if (ret) |
| 777 | 780 | goto error; |
| 778 | 781 | |
| 782 | + irq_set_handler(virq + i, handle_level_irq); | |
| 783 | + | |
| 779 | 784 | ret = gic_shared_irq_domain_map(d, virq + i, hwirq, cpu); |
| 780 | 785 | if (ret) |
| 781 | 786 | goto error; |
| @@ -818,7 +823,6 @@ int gic_irq_domain_match(struct irq_domain *d, struct device_node *node, · 36 unmodified lines | ||
| 818 | 823 | } |
| 819 | 824 | |
| 820 | 825 | static const struct irq_domain_ops gic_irq_domain_ops = { |
| 821 | − .map = gic_irq_domain_map, | |
| 822 | 826 | .alloc = gic_irq_domain_alloc, |
| 823 | 827 | .free = gic_irq_domain_free, |
| 824 | 828 | .match = gic_irq_domain_match, |
| @@ -849,29 +853,20 @@ static int gic_dev_domain_alloc(struct irq_domain *d, unsigned int virq, · 24 unmodified lines | ||
| 849 | 853 | struct irq_fwspec *fwspec = arg; |
| 850 | 854 | struct gic_irq_spec spec = { |
| 851 | 855 | .type = GIC_DEVICE, |
| 852 | − .hwirq = fwspec->param[1], | |
| 853 | 856 | }; |
| 854 | 857 | int i, ret; |
| 855 | − bool is_shared = fwspec->param[0] == GIC_SHARED; | |
| 856 | 858 | |
| 857 | − if (is_shared) { | |
| 858 | − ret = irq_domain_alloc_irqs_parent(d, virq, nr_irqs, &spec); | |
| 859 | − if (ret) | |
| 860 | − return ret; | |
| 861 | − } | |
| 862 | − | |
| 863 | − for (i = 0; i < nr_irqs; i++) { | |
| 864 | − irq_hw_number_t hwirq; | |
| 859 | + if (fwspec->param[0] == GIC_SHARED) | |
| 860 | + spec.hwirq = GIC_SHARED_TO_HWIRQ(fwspec->param[1]); | |
| 861 | + else | |
| 862 | + spec.hwirq = GIC_LOCAL_TO_HWIRQ(fwspec->param[1]); | |
| 865 | 863 | |
| 866 | − if (is_shared) | |
| 867 | − hwirq = GIC_SHARED_TO_HWIRQ(spec.hwirq + i); | |
| 868 | − else | |
| 869 | − hwirq = GIC_LOCAL_TO_HWIRQ(spec.hwirq + i); | |
| 864 | + ret = irq_domain_alloc_irqs_parent(d, virq, nr_irqs, &spec); | |
| 865 | + if (ret) | |
| 866 | + return ret; | |
| 870 | 867 | |
| 871 | − ret = irq_domain_set_hwirq_and_chip(d, virq + i, | |
| 872 | − hwirq, | |
| 873 | − &gic_level_irq_controller, | |
| 874 | − NULL); | |
| 868 | + for (i = 0; i < nr_irqs; i++) { | |
| 869 | + ret = gic_setup_dev_chip(d, virq + i, spec.hwirq + i); | |
| 875 | 870 | if (ret) |
| 876 | 871 | goto error; |
| 877 | 872 | } |
| @@ -890,10 +885,20 @@ void gic_dev_domain_free(struct irq_domain *d, unsigned int virq, · 12 unmodified lines | ||
| 890 | 885 | return; |
| 891 | 886 | } |
| 892 | 887 | |
| 888 | +static void gic_dev_domain_activate(struct irq_domain *domain, | |
| 889 | + struct irq_data *d) | |
| 890 | +{ | |
| 891 | + if (GIC_HWIRQ_TO_LOCAL(d->hwirq) < GIC_NUM_LOCAL_INTRS) | |
| 892 | + gic_local_irq_domain_map(domain, d->irq, d->hwirq); | |
| 893 | + else | |
| 894 | + gic_shared_irq_domain_map(domain, d->irq, d->hwirq, 0); | |
| 895 | +} | |
| 896 | + | |
| 893 | 897 | static struct irq_domain_ops gic_dev_domain_ops = { |
| 894 | 898 | .xlate = gic_dev_domain_xlate, |
| 895 | 899 | .alloc = gic_dev_domain_alloc, |
| 896 | 900 | .free = gic_dev_domain_free, |
| 901 | + .activate = gic_dev_domain_activate, | |
| 897 | 902 | }; |
| 898 | 903 | |
| 899 | 904 | static int gic_ipi_domain_xlate(struct irq_domain *d, struct device_node *ctrlr, |
| @@ -73,7 +73,6 @@ MODULE_DEVICE_TABLE(i2c, ams_id); · 72 unmodified lines | ||
| 73 | 73 | static struct i2c_driver ams_i2c_driver = { |
| 74 | 74 | .driver = { |
| 75 | 75 | .name = "ams", |
| 76 | − .owner = THIS_MODULE, | |
| 77 | 76 | }, |
| 78 | 77 | .probe = ams_i2c_probe, |
| 79 | 78 | .remove = ams_i2c_remove, |
| @@ -668,7 +668,6 @@ static struct platform_driver wf_pm112_driver = { · 667 unmodified lines | ||
| 668 | 668 | .remove = wf_pm112_remove, |
| 669 | 669 | .driver = { |
| 670 | 670 | .name = "windfarm", |
| 671 | − .owner = THIS_MODULE, | |
| 672 | 671 | }, |
| 673 | 672 | }; |
| 674 | 673 | |
| @@ -789,7 +789,6 @@ static struct platform_driver wf_pm72_driver = { · 788 unmodified lines | ||
| 789 | 789 | .remove = wf_pm72_remove, |
| 790 | 790 | .driver = { |
| 791 | 791 | .name = "windfarm", |
| 792 | − .owner = THIS_MODULE, | |
| 793 | 792 | }, |
| 794 | 793 | }; |
| 795 | 794 | |
| @@ -682,7 +682,6 @@ static struct platform_driver wf_rm31_driver = { · 681 unmodified lines | ||
| 682 | 682 | .remove = wf_rm31_remove, |
| 683 | 683 | .driver = { |
| 684 | 684 | .name = "windfarm", |
| 685 | − .owner = THIS_MODULE, | |
| 686 | 685 | }, |
| 687 | 686 | }; |
| 688 | 687 | |
| @@ -127,6 +127,7 @@ config XGENE_SLIMPRO_MBOX · 126 unmodified lines | ||
| 127 | 127 | config BCM_PDC_MBOX |
| 128 | 128 | tristate "Broadcom PDC Mailbox" |
| 129 | 129 | depends on ARM64 || COMPILE_TEST |
| 130 | + depends on HAS_DMA | |
| 130 | 131 | default ARCH_BCM_IPROC |
| 131 | 132 | help |
| 132 | 133 | Mailbox implementation for the Broadcom PDC ring manager, |
| @@ -469,7 +469,7 @@ static const struct file_operations pdc_debugfs_stats = { · 468 unmodified lines | ||
| 469 | 469 | * this directory for a SPU. |
| 470 | 470 | * @pdcs: PDC state structure |
| 471 | 471 | */ |
| 472 | −void pdc_setup_debugfs(struct pdc_state *pdcs) | |
| 472 | +static void pdc_setup_debugfs(struct pdc_state *pdcs) | |
| 473 | 473 | { |
| 474 | 474 | char spu_stats_name[16]; |
| 475 | 475 | |
| @@ -485,7 +485,7 @@ void pdc_setup_debugfs(struct pdc_state *pdcs) · 9 unmodified lines | ||
| 485 | 485 | &pdc_debugfs_stats); |
| 486 | 486 | } |
| 487 | 487 | |
| 488 | −void pdc_free_debugfs(void) | |
| 488 | +static void pdc_free_debugfs(void) | |
| 489 | 489 | { |
| 490 | 490 | if (debugfs_dir && simple_empty(debugfs_dir)) { |
| 491 | 491 | debugfs_remove_recursive(debugfs_dir); |
| @@ -1191,10 +1191,11 @@ static void pdc_shutdown(struct mbox_chan *chan) · 699 unmodified lines | ||
| 1191 | 1191 | { |
| 1192 | 1192 | struct pdc_state *pdcs = chan->con_priv; |
| 1193 | 1193 | |
| 1194 | − if (pdcs) | |
| 1195 | − dev_dbg(&pdcs->pdev->dev, | |
| 1196 | − "Shutdown mailbox channel for PDC %u", pdcs->pdc_idx); | |
| 1194 | + if (!pdcs) | |
| 1195 | + return; | |
| 1197 | 1196 | |
| 1197 | + dev_dbg(&pdcs->pdev->dev, | |
| 1198 | + "Shutdown mailbox channel for PDC %u", pdcs->pdc_idx); | |
| 1198 | 1199 | pdc_ring_free(pdcs); |
| 1199 | 1200 | } |
| 1200 | 1201 | |
| @@ -760,7 +760,8 @@ static int bcache_device_init(struct bcache_device *d, unsigned block_size, · 759 unmodified lines | ||
| 760 | 760 | if (!d->nr_stripes || |
| 761 | 761 | d->nr_stripes > INT_MAX || |
| 762 | 762 | d->nr_stripes > SIZE_MAX / sizeof(atomic_t)) { |
| 763 | − pr_err("nr_stripes too large"); | |
| 763 | + pr_err("nr_stripes too large or invalid: %u (start sector beyond end of disk?)", | |
| 764 | + (unsigned)d->nr_stripes); | |
| 764 | 765 | return -ENOMEM; |
| 765 | 766 | } |
| 766 | 767 | |
| @@ -1820,7 +1821,7 @@ static int cache_alloc(struct cache *ca) · 1053 unmodified lines | ||
| 1820 | 1821 | free = roundup_pow_of_two(ca->sb.nbuckets) >> 10; |
| 1821 | 1822 | |
| 1822 | 1823 | if (!init_fifo(&ca->free[RESERVE_BTREE], 8, GFP_KERNEL) || |
| 1823 | − !init_fifo(&ca->free[RESERVE_PRIO], prio_buckets(ca), GFP_KERNEL) || | |
| 1824 | + !init_fifo_exact(&ca->free[RESERVE_PRIO], prio_buckets(ca), GFP_KERNEL) || | |
| 1824 | 1825 | !init_fifo(&ca->free[RESERVE_MOVINGGC], free, GFP_KERNEL) || |
| 1825 | 1826 | !init_fifo(&ca->free[RESERVE_NONE], free, GFP_KERNEL) || |
| 1826 | 1827 | !init_fifo(&ca->free_inc, free << 2, GFP_KERNEL) || |
| @@ -1844,7 +1845,7 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, · 17 unmodified lines | ||
| 1844 | 1845 | struct block_device *bdev, struct cache *ca) |
| 1845 | 1846 | { |
| 1846 | 1847 | char name[BDEVNAME_SIZE]; |
| 1847 | − const char *err = NULL; | |
| 1848 | + const char *err = NULL; /* must be set for any error case */ | |
| 1848 | 1849 | int ret = 0; |
| 1849 | 1850 | |
| 1850 | 1851 | memcpy(&ca->sb, sb, sizeof(struct cache_sb)); |
| @@ -1861,8 +1862,13 @@ static int register_cache(struct cache_sb *sb, struct page *sb_page, · 10 unmodified lines | ||
| 1861 | 1862 | ca->discard = CACHE_DISCARD(&ca->sb); |
| 1862 | 1863 | |
| 1863 | 1864 | ret = cache_alloc(ca); |
| 1864 | − if (ret != 0) | |
| 1865 | + if (ret != 0) { | |
| 1866 | + if (ret == -ENOMEM) | |
| 1867 | + err = "cache_alloc(): -ENOMEM"; | |
| 1868 | + else | |
| 1869 | + err = "cache_alloc(): unknown error"; | |
| 1865 | 1870 | goto err; |
| 1871 | + } | |
| 1866 | 1872 | |
| 1867 | 1873 | if (kobject_add(&ca->kobj, &part_to_dev(bdev->bd_part)->kobj, "bcache")) { |
| 1868 | 1874 | err = "error calling kobject_add"; |
| @@ -2183,19 +2183,29 @@ location_show(struct mddev *mddev, char *page) · 2182 unmodified lines | ||
| 2183 | 2183 | static ssize_t |
| 2184 | 2184 | location_store(struct mddev *mddev, const char *buf, size_t len) |
| 2185 | 2185 | { |
| 2186 | + int rv; | |
| 2186 | 2187 | |
| 2188 | + rv = mddev_lock(mddev); | |
| 2189 | + if (rv) | |
| 2190 | + return rv; | |
| 2187 | 2191 | if (mddev->pers) { |
| 2188 | − if (!mddev->pers->quiesce) | |
| 2189 | − return -EBUSY; | |
| 2190 | − if (mddev->recovery || mddev->sync_thread) | |
| 2191 | − return -EBUSY; | |
| 2192 | + if (!mddev->pers->quiesce) { | |
| 2193 | + rv = -EBUSY; | |
| 2194 | + goto out; | |
| 2195 | + } | |
| 2196 | + if (mddev->recovery || mddev->sync_thread) { | |
| 2197 | + rv = -EBUSY; | |
| 2198 | + goto out; | |
| 2199 | + } | |
| 2192 | 2200 | } |
| 2193 | 2201 | |
| 2194 | 2202 | if (mddev->bitmap || mddev->bitmap_info.file || |
| 2195 | 2203 | mddev->bitmap_info.offset) { |
| 2196 | 2204 | /* bitmap already configured. Only option is to clear it */ |
| 2197 | − if (strncmp(buf, "none", 4) != 0) | |
| 2198 | − return -EBUSY; | |
| 2205 | + if (strncmp(buf, "none", 4) != 0) { | |
| 2206 | + rv = -EBUSY; | |
| 2207 | + goto out; | |
| 2208 | + } | |
| 2199 | 2209 | if (mddev->pers) { |
| 2200 | 2210 | mddev->pers->quiesce(mddev, 1); |
| 2201 | 2211 | bitmap_destroy(mddev); |
| @@ -2214,21 +2224,25 @@ location_store(struct mddev *mddev, const char *buf, size_t len) · 12 unmodified lines | ||
| 2214 | 2224 | /* nothing to be done */; |
| 2215 | 2225 | else if (strncmp(buf, "file:", 5) == 0) { |
| 2216 | 2226 | /* Not supported yet */ |
| 2217 | − return -EINVAL; | |
| 2227 | + rv = -EINVAL; | |
| 2228 | + goto out; | |
| 2218 | 2229 | } else { |
| 2219 | − int rv; | |
| 2220 | 2230 | if (buf[0] == '+') |
| 2221 | 2231 | rv = kstrtoll(buf+1, 10, &offset); |
| 2222 | 2232 | else |
| 2223 | 2233 | rv = kstrtoll(buf, 10, &offset); |
| 2224 | 2234 | if (rv) |
| 2225 | − return rv; | |
| 2226 | − if (offset == 0) | |
| 2227 | − return -EINVAL; | |
| 2235 | + goto out; | |
| 2236 | + if (offset == 0) { | |
| 2237 | + rv = -EINVAL; | |
| 2238 | + goto out; | |
| 2239 | + } | |
| 2228 | 2240 | if (mddev->bitmap_info.external == 0 && |
| 2229 | 2241 | mddev->major_version == 0 && |
| 2230 | − offset != mddev->bitmap_info.default_offset) | |
| 2231 | − return -EINVAL; | |
| 2242 | + offset != mddev->bitmap_info.default_offset) { | |
| 2243 | + rv = -EINVAL; | |
| 2244 | + goto out; | |
| 2245 | + } | |
| 2232 | 2246 | mddev->bitmap_info.offset = offset; |
| 2233 | 2247 | if (mddev->pers) { |
| 2234 | 2248 | struct bitmap *bitmap; |
| @@ -2245,7 +2259,7 @@ location_store(struct mddev *mddev, const char *buf, size_t len) · 10 unmodified lines | ||
| 2245 | 2259 | mddev->pers->quiesce(mddev, 0); |
| 2246 | 2260 | if (rv) { |
| 2247 | 2261 | bitmap_destroy(mddev); |
| 2248 | − return rv; | |
| 2262 | + goto out; | |
| 2249 | 2263 | } |
| 2250 | 2264 | } |
| 2251 | 2265 | } |
| @@ -2257,6 +2271,11 @@ location_store(struct mddev *mddev, const char *buf, size_t len) · 5 unmodified lines | ||
| 2257 | 2271 | set_bit(MD_CHANGE_DEVS, &mddev->flags); |
| 2258 | 2272 | md_wakeup_thread(mddev->thread); |
| 2259 | 2273 | } |
| 2274 | + rv = 0; | |
| 2275 | +out: | |
| 2276 | + mddev_unlock(mddev); | |
| 2277 | + if (rv) | |
| 2278 | + return rv; | |
| 2260 | 2279 | return len; |
| 2261 | 2280 | } |
| 2262 | 2281 | |
| @@ -1879,7 +1879,7 @@ static int __init dm_bufio_init(void) · 1878 unmodified lines | ||
| 1879 | 1879 | __cache_size_refresh(); |
| 1880 | 1880 | mutex_unlock(&dm_bufio_clients_lock); |
| 1881 | 1881 | |
| 1882 | − dm_bufio_wq = create_singlethread_workqueue("dm_bufio_cache"); | |
| 1882 | + dm_bufio_wq = alloc_workqueue("dm_bufio_cache", WQ_MEM_RECLAIM, 0); | |
| 1883 | 1883 | if (!dm_bufio_wq) |
| 1884 | 1884 | return -ENOMEM; |
| 1885 | 1885 | |
| @@ -181,7 +181,7 @@ struct crypt_config { · 180 unmodified lines | ||
| 181 | 181 | u8 key[0]; |
| 182 | 182 | }; |
| 183 | 183 | |
| 184 | −#define MIN_IOS 16 | |
| 184 | +#define MIN_IOS 64 | |
| 185 | 185 | |
| 186 | 186 | static void clone_init(struct dm_crypt_io *, struct bio *); |
| 187 | 187 | static void kcryptd_queue_crypt(struct dm_crypt_io *io); |
| @@ -1453,7 +1453,7 @@ static int crypt_alloc_tfms(struct crypt_config *cc, char *ciphermode) · 1265 unmodified lines | ||
| 1453 | 1453 | unsigned i; |
| 1454 | 1454 | int err; |
| 1455 | 1455 | |
| 1456 | − cc->tfms = kmalloc(cc->tfms_count * sizeof(struct crypto_skcipher *), | |
| 1456 | + cc->tfms = kzalloc(cc->tfms_count * sizeof(struct crypto_skcipher *), | |
| 1457 | 1457 | GFP_KERNEL); |
| 1458 | 1458 | if (!cc->tfms) |
| 1459 | 1459 | return -ENOMEM; |
| @@ -1924,6 +1924,13 @@ static int crypt_map(struct dm_target *ti, struct bio *bio) · 464 unmodified lines | ||
| 1924 | 1924 | return DM_MAPIO_REMAPPED; |
| 1925 | 1925 | } |
| 1926 | 1926 | |
| 1927 | + /* | |
| 1928 | + * Check if bio is too large, split as needed. | |
| 1929 | + */ | |
| 1930 | + if (unlikely(bio->bi_iter.bi_size > (BIO_MAX_PAGES << PAGE_SHIFT)) && | |
| 1931 | + bio_data_dir(bio) == WRITE) | |
| 1932 | + dm_accept_partial_bio(bio, ((BIO_MAX_PAGES << PAGE_SHIFT) >> SECTOR_SHIFT)); | |
| 1933 | + | |
| 1927 | 1934 | io = dm_per_bio_data(bio, cc->per_bio_data_size); |
| 1928 | 1935 | crypt_io_init(io, cc, bio, dm_target_offset(ti, bio->bi_iter.bi_sector)); |
| 1929 | 1936 | io->ctx.req = (struct skcipher_request *)(io + 1); |
| @@ -289,15 +289,13 @@ static int flakey_map(struct dm_target *ti, struct bio *bio) · 288 unmodified lines | ||
| 289 | 289 | pb->bio_submitted = true; |
| 290 | 290 | |
| 291 | 291 | /* |
| 292 | − * Map reads as normal only if corrupt_bio_byte set. | |
| 292 | + * Error reads if neither corrupt_bio_byte or drop_writes are set. | |
| 293 | + * Otherwise, flakey_end_io() will decide if the reads should be modified. | |
| 293 | 294 | */ |
| 294 | 295 | if (bio_data_dir(bio) == READ) { |
| 295 | − /* If flags were specified, only corrupt those that match. */ | |
| 296 | − if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == READ) && | |
| 297 | − all_corrupt_bio_flags_match(bio, fc)) | |
| 298 | − goto map_bio; | |
| 299 | − else | |
| 296 | + if (!fc->corrupt_bio_byte && !test_bit(DROP_WRITES, &fc->flags)) | |
| 300 | 297 | return -EIO; |
| 298 | + goto map_bio; | |
| 301 | 299 | } |
| 302 | 300 | |
| 303 | 301 | /* |
| @@ -334,14 +332,21 @@ static int flakey_end_io(struct dm_target *ti, struct bio *bio, int error) · 30 unmodified lines | ||
| 334 | 332 | struct flakey_c *fc = ti->private; |
| 335 | 333 | struct per_bio_data *pb = dm_per_bio_data(bio, sizeof(struct per_bio_data)); |
| 336 | 334 | |
| 337 | − /* | |
| 338 | − * Corrupt successful READs while in down state. | |
| 339 | − */ | |
| 340 | 335 | if (!error && pb->bio_submitted && (bio_data_dir(bio) == READ)) { |
| 341 | − if (fc->corrupt_bio_byte) | |
| 336 | + if (fc->corrupt_bio_byte && (fc->corrupt_bio_rw == READ) && | |
| 337 | + all_corrupt_bio_flags_match(bio, fc)) { | |
| 338 | + /* | |
| 339 | + * Corrupt successful matching READs while in down state. | |
| 340 | + */ | |
| 342 | 341 | corrupt_bio_data(bio, fc); |
| 343 | − else | |
| 342 | + | |
| 343 | + } else if (!test_bit(DROP_WRITES, &fc->flags)) { | |
| 344 | + /* | |
| 345 | + * Error read during the down_interval if drop_writes | |
| 346 | + * wasn't configured. | |
| 347 | + */ | |
| 344 | 348 | return -EIO; |
| 349 | + } | |
| 345 | 350 | } |
| 346 | 351 | |
| 347 | 352 | return error; |
| @@ -259,12 +259,12 @@ static int log_one_block(struct log_writes_c *lc, · 258 unmodified lines | ||
| 259 | 259 | goto out; |
| 260 | 260 | sector++; |
| 261 | 261 | |
| 262 | − bio = bio_alloc(GFP_KERNEL, block->vec_cnt); | |
| 262 | + atomic_inc(&lc->io_blocks); | |
| 263 | + bio = bio_alloc(GFP_KERNEL, min(block->vec_cnt, BIO_MAX_PAGES)); | |
| 263 | 264 | if (!bio) { |
| 264 | 265 | DMERR("Couldn't alloc log bio"); |
| 265 | 266 | goto error; |
| 266 | 267 | } |
| 267 | − atomic_inc(&lc->io_blocks); | |
| 268 | 268 | bio->bi_iter.bi_size = 0; |
| 269 | 269 | bio->bi_iter.bi_sector = sector; |
| 270 | 270 | bio->bi_bdev = lc->logdev->bdev; |
| @@ -282,7 +282,7 @@ static int log_one_block(struct log_writes_c *lc, · 11 unmodified lines | ||
| 282 | 282 | if (ret != block->vecs[i].bv_len) { |
| 283 | 283 | atomic_inc(&lc->io_blocks); |
| 284 | 284 | submit_bio(bio); |
| 285 | − bio = bio_alloc(GFP_KERNEL, block->vec_cnt - i); | |
| 285 | + bio = bio_alloc(GFP_KERNEL, min(block->vec_cnt - i, BIO_MAX_PAGES)); | |
| 286 | 286 | if (!bio) { |
| 287 | 287 | DMERR("Couldn't alloc log bio"); |
| 288 | 288 | goto error; |
| @@ -459,9 +459,9 @@ static int log_writes_ctr(struct dm_target *ti, unsigned int argc, char **argv) · 170 unmodified lines | ||
| 459 | 459 | goto bad; |
| 460 | 460 | } |
| 461 | 461 | |
| 462 | − ret = -EINVAL; | |
| 463 | 462 | lc->log_kthread = kthread_run(log_writes_kthread, lc, "log-write"); |
| 464 | − if (!lc->log_kthread) { | |
| 463 | + if (IS_ERR(lc->log_kthread)) { | |
| 464 | + ret = PTR_ERR(lc->log_kthread); | |
| 465 | 465 | ti->error = "Couldn't alloc kthread"; |
| 466 | 466 | dm_put_device(ti, lc->dev); |
| 467 | 467 | dm_put_device(ti, lc->logdev); |
| @@ -291,9 +291,10 @@ static void header_from_disk(struct log_header_core *core, struct log_header_dis · 290 unmodified lines | ||
| 291 | 291 | core->nr_regions = le64_to_cpu(disk->nr_regions); |
| 292 | 292 | } |
| 293 | 293 | |
| 294 | −static int rw_header(struct log_c *lc, int rw) | |
| 294 | +static int rw_header(struct log_c *lc, int op) | |
| 295 | 295 | { |
| 296 | − lc->io_req.bi_op = rw; | |
| 296 | + lc->io_req.bi_op = op; | |
| 297 | + lc->io_req.bi_op_flags = 0; | |
| 297 | 298 | |
| 298 | 299 | return dm_io(&lc->io_req, 1, &lc->header_location, NULL); |
| 299 | 300 | } |
| @@ -316,7 +317,7 @@ static int read_header(struct log_c *log) · 16 unmodified lines | ||
| 316 | 317 | { |
| 317 | 318 | int r; |
| 318 | 319 | |
| 319 | − r = rw_header(log, READ); | |
| 320 | + r = rw_header(log, REQ_OP_READ); | |
| 320 | 321 | if (r) |
| 321 | 322 | return r; |
| 322 | 323 | |
| @@ -630,7 +631,7 @@ static int disk_resume(struct dm_dirty_log *log) · 307 unmodified lines | ||
| 630 | 631 | header_to_disk(&lc->header, lc->disk_header); |
| 631 | 632 | |
| 632 | 633 | /* write the new header */ |
| 633 | − r = rw_header(lc, WRITE); | |
| 634 | + r = rw_header(lc, REQ_OP_WRITE); | |
| 634 | 635 | if (!r) { |
| 635 | 636 | r = flush_header(lc); |
| 636 | 637 | if (r) |
| @@ -698,7 +699,7 @@ static int disk_flush(struct dm_dirty_log *log) · 61 unmodified lines | ||
| 698 | 699 | log_clear_bit(lc, lc->clean_bits, i); |
| 699 | 700 | } |
| 700 | 701 | |
| 701 | − r = rw_header(lc, WRITE); | |
| 702 | + r = rw_header(lc, REQ_OP_WRITE); | |
| 702 | 703 | if (r) |
| 703 | 704 | fail_log_device(lc); |
| 704 | 705 | else { |
| @@ -191,7 +191,6 @@ struct raid_dev { · 190 unmodified lines | ||
| 191 | 191 | #define RT_FLAG_RS_BITMAP_LOADED 2 |
| 192 | 192 | #define RT_FLAG_UPDATE_SBS 3 |
| 193 | 193 | #define RT_FLAG_RESHAPE_RS 4 |
| 194 | −#define RT_FLAG_KEEP_RS_FROZEN 5 | |
| 195 | 194 | |
| 196 | 195 | /* Array elements of 64 bit needed for rebuild/failed disk bits */ |
| 197 | 196 | #define DISKS_ARRAY_ELEMS ((MAX_RAID_DEVICES + (sizeof(uint64_t) * 8 - 1)) / sizeof(uint64_t) / 8) |
| @@ -861,6 +860,9 @@ static int validate_region_size(struct raid_set *rs, unsigned long region_size) · 663 unmodified lines | ||
| 861 | 860 | { |
| 862 | 861 | unsigned long min_region_size = rs->ti->len / (1 << 21); |
| 863 | 862 | |
| 863 | + if (rs_is_raid0(rs)) | |
| 864 | + return 0; | |
| 865 | + | |
| 864 | 866 | if (!region_size) { |
| 865 | 867 | /* |
| 866 | 868 | * Choose a reasonable default. All figures in sectors. |
| @@ -930,6 +932,8 @@ static int validate_raid_redundancy(struct raid_set *rs) · 63 unmodified lines | ||
| 930 | 932 | rebuild_cnt++; |
| 931 | 933 | |
| 932 | 934 | switch (rs->raid_type->level) { |
| 935 | + case 0: | |
| 936 | + break; | |
| 933 | 937 | case 1: |
| 934 | 938 | if (rebuild_cnt >= rs->md.raid_disks) |
| 935 | 939 | goto too_many; |
| @@ -2335,6 +2339,13 @@ static int analyse_superblocks(struct dm_target *ti, struct raid_set *rs) · 1399 unmodified lines | ||
| 2335 | 2339 | case 0: |
| 2336 | 2340 | break; |
| 2337 | 2341 | default: |
| 2342 | + /* | |
| 2343 | + * We have to keep any raid0 data/metadata device pairs or | |
| 2344 | + * the MD raid0 personality will fail to start the array. | |
| 2345 | + */ | |
| 2346 | + if (rs_is_raid0(rs)) | |
| 2347 | + continue; | |
| 2348 | + | |
| 2338 | 2349 | dev = container_of(rdev, struct raid_dev, rdev); |
| 2339 | 2350 | if (dev->meta_dev) |
| 2340 | 2351 | dm_put_device(ti, dev->meta_dev); |
| @@ -2579,7 +2590,6 @@ static int rs_prepare_reshape(struct raid_set *rs) · 238 unmodified lines | ||
| 2579 | 2590 | } else { |
| 2580 | 2591 | /* Process raid1 without delta_disks */ |
| 2581 | 2592 | mddev->raid_disks = rs->raid_disks; |
| 2582 | − set_bit(RT_FLAG_KEEP_RS_FROZEN, &rs->runtime_flags); | |
| 2583 | 2593 | reshape = false; |
| 2584 | 2594 | } |
| 2585 | 2595 | } else { |
| @@ -2590,7 +2600,6 @@ static int rs_prepare_reshape(struct raid_set *rs) · 4 unmodified lines | ||
| 2590 | 2600 | if (reshape) { |
| 2591 | 2601 | set_bit(RT_FLAG_RESHAPE_RS, &rs->runtime_flags); |
| 2592 | 2602 | set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); |
| 2593 | − set_bit(RT_FLAG_KEEP_RS_FROZEN, &rs->runtime_flags); | |
| 2594 | 2603 | } else if (mddev->raid_disks < rs->raid_disks) |
| 2595 | 2604 | /* Create new superblocks and bitmaps, if any new disks */ |
| 2596 | 2605 | set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); |
| @@ -2902,7 +2911,6 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv) · 305 unmodified lines | ||
| 2902 | 2911 | goto bad; |
| 2903 | 2912 | |
| 2904 | 2913 | set_bit(RT_FLAG_UPDATE_SBS, &rs->runtime_flags); |
| 2905 | − set_bit(RT_FLAG_KEEP_RS_FROZEN, &rs->runtime_flags); | |
| 2906 | 2914 | /* Takeover ain't recovery, so disable recovery */ |
| 2907 | 2915 | rs_setup_recovery(rs, MaxSector); |
| 2908 | 2916 | rs_set_new(rs); |
| @@ -3386,21 +3394,28 @@ static void raid_postsuspend(struct dm_target *ti) · 477 unmodified lines | ||
| 3386 | 3394 | { |
| 3387 | 3395 | struct raid_set *rs = ti->private; |
| 3388 | 3396 | |
| 3389 | − if (test_and_clear_bit(RT_FLAG_RS_RESUMED, &rs->runtime_flags)) { | |
| 3390 | − if (!rs->md.suspended) | |
| 3391 | − mddev_suspend(&rs->md); | |
| 3392 | − rs->md.ro = 1; | |
| 3393 | − } | |
| 3397 | + if (!rs->md.suspended) | |
| 3398 | + mddev_suspend(&rs->md); | |
| 3399 | + | |
| 3400 | + rs->md.ro = 1; | |
| 3394 | 3401 | } |
| 3395 | 3402 | |
| 3396 | 3403 | static void attempt_restore_of_faulty_devices(struct raid_set *rs) |
| 3397 | 3404 | { |
| 3398 | 3405 | int i; |
| 3399 | − uint64_t failed_devices, cleared_failed_devices = 0; | |
| 3406 | + uint64_t cleared_failed_devices[DISKS_ARRAY_ELEMS]; | |
| 3400 | 3407 | unsigned long flags; |
| 3408 | + bool cleared = false; | |
| 3401 | 3409 | struct dm_raid_superblock *sb; |
| 3410 | + struct mddev *mddev = &rs->md; | |
| 3402 | 3411 | struct md_rdev *r; |
| 3403 | 3412 | |
| 3413 | + /* RAID personalities have to provide hot add/remove methods or we need to bail out. */ | |
| 3414 | + if (!mddev->pers || !mddev->pers->hot_add_disk || !mddev->pers->hot_remove_disk) | |
| 3415 | + return; | |
| 3416 | + | |
| 3417 | + memset(cleared_failed_devices, 0, sizeof(cleared_failed_devices)); | |
| 3418 | + | |
| 3404 | 3419 | for (i = 0; i < rs->md.raid_disks; i++) { |
| 3405 | 3420 | r = &rs->dev[i].rdev; |
| 3406 | 3421 | if (test_bit(Faulty, &r->flags) && r->sb_page && |
| @@ -3420,7 +3435,7 @@ static void attempt_restore_of_faulty_devices(struct raid_set *rs) · 13 unmodified lines | ||
| 3420 | 3435 | * ourselves. |
| 3421 | 3436 | */ |
| 3422 | 3437 | if ((r->raid_disk >= 0) && |
| 3423 | − (r->mddev->pers->hot_remove_disk(r->mddev, r) != 0)) | |
| 3438 | + (mddev->pers->hot_remove_disk(mddev, r) != 0)) | |
| 3424 | 3439 | /* Failed to revive this device, try next */ |
| 3425 | 3440 | continue; |
| 3426 | 3441 | |
| @@ -3430,22 +3445,30 @@ static void attempt_restore_of_faulty_devices(struct raid_set *rs) · 3 unmodified lines | ||
| 3430 | 3445 | clear_bit(Faulty, &r->flags); |
| 3431 | 3446 | clear_bit(WriteErrorSeen, &r->flags); |
| 3432 | 3447 | clear_bit(In_sync, &r->flags); |
| 3433 | − if (r->mddev->pers->hot_add_disk(r->mddev, r)) { | |
| 3448 | + if (mddev->pers->hot_add_disk(mddev, r)) { | |
| 3434 | 3449 | r->raid_disk = -1; |
| 3435 | 3450 | r->saved_raid_disk = -1; |
| 3436 | 3451 | r->flags = flags; |
| 3437 | 3452 | } else { |
| 3438 | 3453 | r->recovery_offset = 0; |
| 3439 | − cleared_failed_devices |= 1 << i; | |
| 3454 | + set_bit(i, (void *) cleared_failed_devices); | |
| 3455 | + cleared = true; | |
| 3440 | 3456 | } |
| 3441 | 3457 | } |
| 3442 | 3458 | } |
| 3443 | − if (cleared_failed_devices) { | |
| 3459 | + | |
| 3460 | + /* If any failed devices could be cleared, update all sbs failed_devices bits */ | |
| 3461 | + if (cleared) { | |
| 3462 | + uint64_t failed_devices[DISKS_ARRAY_ELEMS]; | |
| 3463 | + | |
| 3444 | 3464 | rdev_for_each(r, &rs->md) { |
| 3445 | 3465 | sb = page_address(r->sb_page); |
| 3446 | − failed_devices = le64_to_cpu(sb->failed_devices); | |
| 3447 | − failed_devices &= ~cleared_failed_devices; | |
| 3448 | − sb->failed_devices = cpu_to_le64(failed_devices); | |
| 3466 | + sb_retrieve_failed_devices(sb, failed_devices); | |
| 3467 | + | |
| 3468 | + for (i = 0; i < DISKS_ARRAY_ELEMS; i++) | |
| 3469 | + failed_devices[i] &= ~cleared_failed_devices[i]; | |
| 3470 | + | |
| 3471 | + sb_update_failed_devices(sb, failed_devices); | |
| 3449 | 3472 | } |
| 3450 | 3473 | } |
| 3451 | 3474 | } |
| @@ -3610,26 +3633,15 @@ static void raid_resume(struct dm_target *ti) · 158 unmodified lines | ||
| 3610 | 3633 | * devices are reachable again. |
| 3611 | 3634 | */ |
| 3612 | 3635 | attempt_restore_of_faulty_devices(rs); |
| 3613 | − } else { | |
| 3614 | − mddev->ro = 0; | |
| 3615 | − mddev->in_sync = 0; | |
| 3636 | + } | |
| 3616 | 3637 | |
| 3617 | − /* | |
| 3618 | − * When passing in flags to the ctr, we expect userspace | |
| 3619 | − * to reset them because they made it to the superblocks | |
| 3620 | − * and reload the mapping anyway. | |
| 3621 | − * | |
| 3622 | − * -> only unfreeze recovery in case of a table reload or | |
| 3623 | − * we'll have a bogus recovery/reshape position | |
| 3624 | − * retrieved from the superblock by the ctr because | |
| 3625 | − * the ongoing recovery/reshape will change it after read. | |
| 3626 | − */ | |
| 3627 | − if (!test_bit(RT_FLAG_KEEP_RS_FROZEN, &rs->runtime_flags)) | |
| 3628 | − clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); | |
| 3638 | + mddev->ro = 0; | |
| 3639 | + mddev->in_sync = 0; | |
| 3629 | 3640 | |
| 3630 | − if (mddev->suspended) | |
| 3631 | − mddev_resume(mddev); | |
| 3632 | − } | |
| 3641 | + clear_bit(MD_RECOVERY_FROZEN, &mddev->recovery); | |
| 3642 | + | |
| 3643 | + if (mddev->suspended) | |
| 3644 | + mddev_resume(mddev); | |
| 3633 | 3645 | } |
| 3634 | 3646 | |
| 3635 | 3647 | static struct target_type raid_target = { |
| @@ -210,14 +210,17 @@ static struct dm_path *rr_select_path(struct path_selector *ps, size_t nr_bytes) · 209 unmodified lines | ||
| 210 | 210 | struct path_info *pi = NULL; |
| 211 | 211 | struct dm_path *current_path = NULL; |
| 212 | 212 | |
| 213 | + local_irq_save(flags); | |
| 213 | 214 | current_path = *this_cpu_ptr(s->current_path); |
| 214 | 215 | if (current_path) { |
| 215 | 216 | percpu_counter_dec(&s->repeat_count); |
| 216 | − if (percpu_counter_read_positive(&s->repeat_count) > 0) | |
| 217 | + if (percpu_counter_read_positive(&s->repeat_count) > 0) { | |
| 218 | + local_irq_restore(flags); | |
| 217 | 219 | return current_path; |
| 220 | + } | |
| 218 | 221 | } |
| 219 | 222 | |
| 220 | − spin_lock_irqsave(&s->lock, flags); | |
| 223 | + spin_lock(&s->lock); | |
| 221 | 224 | if (!list_empty(&s->valid_paths)) { |
| 222 | 225 | pi = list_entry(s->valid_paths.next, struct path_info, list); |
| 223 | 226 | list_move_tail(&pi->list, &s->valid_paths); |
| @@ -834,8 +834,10 @@ static int join(struct mddev *mddev, int nodes) · 833 unmodified lines | ||
| 834 | 834 | goto err; |
| 835 | 835 | } |
| 836 | 836 | cinfo->ack_lockres = lockres_init(mddev, "ack", ack_bast, 0); |
| 837 | − if (!cinfo->ack_lockres) | |
| 837 | + if (!cinfo->ack_lockres) { | |
| 838 | + ret = -ENOMEM; | |
| 838 | 839 | goto err; |
| 840 | + } | |
| 839 | 841 | /* get sync CR lock on ACK. */ |
| 840 | 842 | if (dlm_lock_sync(cinfo->ack_lockres, DLM_LOCK_CR)) |
| 841 | 843 | pr_err("md-cluster: failed to get a sync CR lock on ACK!(%d)\n", |
| @@ -849,8 +851,10 @@ static int join(struct mddev *mddev, int nodes) · 7 unmodified lines | ||
| 849 | 851 | pr_info("md-cluster: Joined cluster %s slot %d\n", str, cinfo->slot_number); |
| 850 | 852 | snprintf(str, 64, "bitmap%04d", cinfo->slot_number - 1); |
| 851 | 853 | cinfo->bitmap_lockres = lockres_init(mddev, str, NULL, 1); |
| 852 | − if (!cinfo->bitmap_lockres) | |
| 854 | + if (!cinfo->bitmap_lockres) { | |
| 855 | + ret = -ENOMEM; | |
| 853 | 856 | goto err; |
| 857 | + } | |
| 854 | 858 | if (dlm_lock_sync(cinfo->bitmap_lockres, DLM_LOCK_PW)) { |
| 855 | 859 | pr_err("Failed to get bitmap lock\n"); |
| 856 | 860 | ret = -EINVAL; |
| @@ -858,8 +862,10 @@ static int join(struct mddev *mddev, int nodes) · 1 unmodified line | ||
| 858 | 862 | } |
| 859 | 863 | |
| 860 | 864 | cinfo->resync_lockres = lockres_init(mddev, "resync", NULL, 0); |
| 861 | − if (!cinfo->resync_lockres) | |
| 865 | + if (!cinfo->resync_lockres) { | |
| 866 | + ret = -ENOMEM; | |
| 862 | 867 | goto err; |
| 868 | + } | |
| 863 | 869 | |
| 864 | 870 | return 0; |
| 865 | 871 | err: |
| @@ -1604,11 +1604,8 @@ static int super_1_validate(struct mddev *mddev, struct md_rdev *rdev) · 1603 unmodified lines | ||
| 1604 | 1604 | mddev->new_chunk_sectors = mddev->chunk_sectors; |
| 1605 | 1605 | } |
| 1606 | 1606 | |
| 1607 | − if (le32_to_cpu(sb->feature_map) & MD_FEATURE_JOURNAL) { | |
| 1607 | + if (le32_to_cpu(sb->feature_map) & MD_FEATURE_JOURNAL) | |
| 1608 | 1608 | set_bit(MD_HAS_JOURNAL, &mddev->flags); |
| 1609 | − if (mddev->recovery_cp == MaxSector) | |
| 1610 | − set_bit(MD_JOURNAL_CLEAN, &mddev->flags); | |
| 1611 | − } | |
| 1612 | 1609 | } else if (mddev->pers == NULL) { |
| 1613 | 1610 | /* Insist of good event counter while assembling, except for |
| 1614 | 1611 | * spares (which don't need an event count) */ |
| @@ -5851,6 +5848,9 @@ static int get_array_info(struct mddev *mddev, void __user *arg) · 4236 unmodified lines | ||
| 5851 | 5848 | working++; |
| 5852 | 5849 | if (test_bit(In_sync, &rdev->flags)) |
| 5853 | 5850 | insync++; |
| 5851 | + else if (test_bit(Journal, &rdev->flags)) | |
| 5852 | + /* TODO: add journal count to md_u.h */ | |
| 5853 | + ; | |
| 5854 | 5854 | else |
| 5855 | 5855 | spare++; |
| 5856 | 5856 | } |
| @@ -7610,16 +7610,12 @@ EXPORT_SYMBOL(unregister_md_cluster_operations); · 1753 unmodified lines | ||
| 7610 | 7610 | |
| 7611 | 7611 | int md_setup_cluster(struct mddev *mddev, int nodes) |
| 7612 | 7612 | { |
| 7613 | − int err; | |
| 7614 | − | |
| 7615 | − err = request_module("md-cluster"); | |
| 7616 | − if (err) { | |
| 7617 | − pr_err("md-cluster module not found.\n"); | |
| 7618 | − return -ENOENT; | |
| 7619 | − } | |
| 7620 | − | |
| 7613 | + if (!md_cluster_ops) | |
| 7614 | + request_module("md-cluster"); | |
| 7621 | 7615 | spin_lock(&pers_lock); |
| 7616 | + /* ensure module won't be unloaded */ | |
| 7622 | 7617 | if (!md_cluster_ops || !try_module_get(md_cluster_mod)) { |
| 7618 | + pr_err("can't find md-cluster module or get it's reference.\n"); | |
| 7623 | 7619 | spin_unlock(&pers_lock); |
| 7624 | 7620 | return -ENOENT; |
| 7625 | 7621 | } |
| @@ -7862,6 +7858,7 @@ void md_do_sync(struct md_thread *thread) · 236 unmodified lines | ||
| 7862 | 7858 | */ |
| 7863 | 7859 | |
| 7864 | 7860 | do { |
| 7861 | + int mddev2_minor = -1; | |
| 7865 | 7862 | mddev->curr_resync = 2; |
| 7866 | 7863 | |
| 7867 | 7864 | try_again: |
| @@ -7891,10 +7888,14 @@ void md_do_sync(struct md_thread *thread) · 23 unmodified lines | ||
| 7891 | 7888 | prepare_to_wait(&resync_wait, &wq, TASK_INTERRUPTIBLE); |
| 7892 | 7889 | if (!test_bit(MD_RECOVERY_INTR, &mddev->recovery) && |
| 7893 | 7890 | mddev2->curr_resync >= mddev->curr_resync) { |
| 7894 | − printk(KERN_INFO "md: delaying %s of %s" | |
| 7895 | − " until %s has finished (they" | |
| 7896 | − " share one or more physical units)\n", | |
| 7897 | − desc, mdname(mddev), mdname(mddev2)); | |
| 7891 | + if (mddev2_minor != mddev2->md_minor) { | |
| 7892 | + mddev2_minor = mddev2->md_minor; | |
| 7893 | + printk(KERN_INFO "md: delaying %s of %s" | |
| 7894 | + " until %s has finished (they" | |
| 7895 | + " share one or more physical units)\n", | |
| 7896 | + desc, mdname(mddev), | |
| 7897 | + mdname(mddev2)); | |
| 7898 | + } | |
| 7898 | 7899 | mddev_put(mddev2); |
| 7899 | 7900 | if (signal_pending(current)) |
| 7900 | 7901 | flush_signals(current); |
| @@ -8275,16 +8276,13 @@ no_add: · 374 unmodified lines | ||
| 8275 | 8276 | static void md_start_sync(struct work_struct *ws) |
| 8276 | 8277 | { |
| 8277 | 8278 | struct mddev *mddev = container_of(ws, struct mddev, del_work); |
| 8278 | − int ret = 0; | |
| 8279 | 8279 | |
| 8280 | 8280 | mddev->sync_thread = md_register_thread(md_do_sync, |
| 8281 | 8281 | mddev, |
| 8282 | 8282 | "resync"); |
| 8283 | 8283 | if (!mddev->sync_thread) { |
| 8284 | − if (!(mddev_is_clustered(mddev) && ret == -EAGAIN)) | |
| 8285 | − printk(KERN_ERR "%s: could not start resync" | |
| 8286 | − " thread...\n", | |
| 8287 | − mdname(mddev)); | |
| 8284 | + printk(KERN_ERR "%s: could not start resync thread...\n", | |
| 8285 | + mdname(mddev)); | |
| 8288 | 8286 | /* leave the spares where they are, it shouldn't hurt */ |
| 8289 | 8287 | clear_bit(MD_RECOVERY_SYNC, &mddev->recovery); |
| 8290 | 8288 | clear_bit(MD_RECOVERY_RESHAPE, &mddev->recovery); |
| @@ -1064,6 +1064,8 @@ static void __make_request(struct mddev *mddev, struct bio *bio) · 1063 unmodified lines | ||
| 1064 | 1064 | int max_sectors; |
| 1065 | 1065 | int sectors; |
| 1066 | 1066 | |
| 1067 | + md_write_start(mddev, bio); | |
| 1068 | + | |
| 1067 | 1069 | /* |
| 1068 | 1070 | * Register the new request and wait if the reconstruction |
| 1069 | 1071 | * thread has put up a bar for new requests. |
| @@ -1445,8 +1447,6 @@ static void raid10_make_request(struct mddev *mddev, struct bio *bio) · 375 unmodified lines | ||
| 1445 | 1447 | return; |
| 1446 | 1448 | } |
| 1447 | 1449 | |
| 1448 | − md_write_start(mddev, bio); | |
| 1449 | − | |
| 1450 | 1450 | do { |
| 1451 | 1451 | |
| 1452 | 1452 | /* |
| @@ -2465,20 +2465,21 @@ static int narrow_write_error(struct r10bio *r10_bio, int i) · 1012 unmodified lines | ||
| 2465 | 2465 | |
| 2466 | 2466 | while (sect_to_write) { |
| 2467 | 2467 | struct bio *wbio; |
| 2468 | + sector_t wsector; | |
| 2468 | 2469 | if (sectors > sect_to_write) |
| 2469 | 2470 | sectors = sect_to_write; |
| 2470 | 2471 | /* Write at 'sector' for 'sectors' */ |
| 2471 | 2472 | wbio = bio_clone_mddev(bio, GFP_NOIO, mddev); |
| 2472 | 2473 | bio_trim(wbio, sector - bio->bi_iter.bi_sector, sectors); |
| 2473 | − wbio->bi_iter.bi_sector = (r10_bio->devs[i].addr+ | |
| 2474 | − choose_data_offset(r10_bio, rdev) + | |
| 2475 | − (sector - r10_bio->sector)); | |
| 2474 | + wsector = r10_bio->devs[i].addr + (sector - r10_bio->sector); | |
| 2475 | + wbio->bi_iter.bi_sector = wsector + | |
| 2476 | + choose_data_offset(r10_bio, rdev); | |
| 2476 | 2477 | wbio->bi_bdev = rdev->bdev; |
| 2477 | 2478 | bio_set_op_attrs(wbio, REQ_OP_WRITE, 0); |
| 2478 | 2479 | |
| 2479 | 2480 | if (submit_bio_wait(wbio) < 0) |
| 2480 | 2481 | /* Failure! */ |
| 2481 | − ok = rdev_set_badblocks(rdev, sector, | |
| 2482 | + ok = rdev_set_badblocks(rdev, wsector, | |
| 2482 | 2483 | sectors, 0) |
| 2483 | 2484 | && ok; |
| 2484 | 2485 | |
| @@ -96,7 +96,6 @@ struct r5l_log { · 95 unmodified lines | ||
| 96 | 96 | spinlock_t no_space_stripes_lock; |
| 97 | 97 | |
| 98 | 98 | bool need_cache_flush; |
| 99 | − bool in_teardown; | |
| 100 | 99 | }; |
| 101 | 100 | |
| 102 | 101 | /* |
| @@ -704,31 +703,22 @@ static void r5l_write_super_and_discard_space(struct r5l_log *log, · 601 unmodified lines | ||
| 704 | 703 | |
| 705 | 704 | mddev = log->rdev->mddev; |
| 706 | 705 | /* |
| 707 | − * This is to avoid a deadlock. r5l_quiesce holds reconfig_mutex and | |
| 708 | − * wait for this thread to finish. This thread waits for | |
| 709 | − * MD_CHANGE_PENDING clear, which is supposed to be done in | |
| 710 | − * md_check_recovery(). md_check_recovery() tries to get | |
| 711 | − * reconfig_mutex. Since r5l_quiesce already holds the mutex, | |
| 712 | − * md_check_recovery() fails, so the PENDING never get cleared. The | |
| 713 | − * in_teardown check workaround this issue. | |
| 706 | + * Discard could zero data, so before discard we must make sure | |
| 707 | + * superblock is updated to new log tail. Updating superblock (either | |
| 708 | + * directly call md_update_sb() or depend on md thread) must hold | |
| 709 | + * reconfig mutex. On the other hand, raid5_quiesce is called with | |
| 710 | + * reconfig_mutex hold. The first step of raid5_quiesce() is waitting | |
| 711 | + * for all IO finish, hence waitting for reclaim thread, while reclaim | |
| 712 | + * thread is calling this function and waitting for reconfig mutex. So | |
| 713 | + * there is a deadlock. We workaround this issue with a trylock. | |
| 714 | + * FIXME: we could miss discard if we can't take reconfig mutex | |
| 714 | 715 | */ |
| 715 | − if (!log->in_teardown) { | |
| 716 | − set_mask_bits(&mddev->flags, 0, | |
| 717 | − BIT(MD_CHANGE_DEVS) | BIT(MD_CHANGE_PENDING)); | |
| 718 | − md_wakeup_thread(mddev->thread); | |
| 719 | − wait_event(mddev->sb_wait, | |
| 720 | − !test_bit(MD_CHANGE_PENDING, &mddev->flags) || | |
| 721 | − log->in_teardown); | |
| 722 | − /* | |
| 723 | − * r5l_quiesce could run after in_teardown check and hold | |
| 724 | − * mutex first. Superblock might get updated twice. | |
| 725 | − */ | |
| 726 | − if (log->in_teardown) | |
| 727 | − md_update_sb(mddev, 1); | |
| 728 | − } else { | |
| 729 | − WARN_ON(!mddev_is_locked(mddev)); | |
| 730 | − md_update_sb(mddev, 1); | |
| 731 | − } | |
| 716 | + set_mask_bits(&mddev->flags, 0, | |
| 717 | + BIT(MD_CHANGE_DEVS) | BIT(MD_CHANGE_PENDING)); | |
| 718 | + if (!mddev_trylock(mddev)) | |
| 719 | + return; | |
| 720 | + md_update_sb(mddev, 1); | |
| 721 | + mddev_unlock(mddev); | |
| 732 | 722 | |
| 733 | 723 | /* discard IO error really doesn't matter, ignore it */ |
| 734 | 724 | if (log->last_checkpoint < end) { |
| @@ -827,7 +817,6 @@ void r5l_quiesce(struct r5l_log *log, int state) · 92 unmodified lines | ||
| 827 | 817 | if (!log || state == 2) |
| 828 | 818 | return; |
| 829 | 819 | if (state == 0) { |
| 830 | − log->in_teardown = 0; | |
| 831 | 820 | /* |
| 832 | 821 | * This is a special case for hotadd. In suspend, the array has |
| 833 | 822 | * no journal. In resume, journal is initialized as well as the |
| @@ -838,11 +827,6 @@ void r5l_quiesce(struct r5l_log *log, int state) · 4 unmodified lines | ||
| 838 | 827 | log->reclaim_thread = md_register_thread(r5l_reclaim_thread, |
| 839 | 828 | log->rdev->mddev, "reclaim"); |
| 840 | 829 | } else if (state == 1) { |
| 841 | − /* | |
| 842 | − * at this point all stripes are finished, so io_unit is at | |
| 843 | − * least in STRIPE_END state | |
| 844 | − */ | |
| 845 | − log->in_teardown = 1; | |
| 846 | 830 | /* make sure r5l_write_super_and_discard_space exits */ |
| 847 | 831 | mddev = log->rdev->mddev; |
| 848 | 832 | wake_up(&mddev->sb_wait); |
| @@ -659,6 +659,7 @@ raid5_get_active_stripe(struct r5conf *conf, sector_t sector, · 658 unmodified lines | ||
| 659 | 659 | { |
| 660 | 660 | struct stripe_head *sh; |
| 661 | 661 | int hash = stripe_hash_locks_hash(sector); |
| 662 | + int inc_empty_inactive_list_flag; | |
| 662 | 663 | |
| 663 | 664 | pr_debug("get_stripe, sector %llu\n", (unsigned long long)sector); |
| 664 | 665 | |
| @@ -703,7 +704,12 @@ raid5_get_active_stripe(struct r5conf *conf, sector_t sector, · 38 unmodified lines | ||
| 703 | 704 | atomic_inc(&conf->active_stripes); |
| 704 | 705 | BUG_ON(list_empty(&sh->lru) && |
| 705 | 706 | !test_bit(STRIPE_EXPANDING, &sh->state)); |
| 707 | + inc_empty_inactive_list_flag = 0; | |
| 708 | + if (!list_empty(conf->inactive_list + hash)) | |
| 709 | + inc_empty_inactive_list_flag = 1; | |
| 706 | 710 | list_del_init(&sh->lru); |
| 711 | + if (list_empty(conf->inactive_list + hash) && inc_empty_inactive_list_flag) | |
| 712 | + atomic_inc(&conf->empty_inactive_list_nr); | |
| 707 | 713 | if (sh->group) { |
| 708 | 714 | sh->group->stripes_cnt--; |
| 709 | 715 | sh->group = NULL; |
| @@ -762,6 +768,7 @@ static void stripe_add_to_batch_list(struct r5conf *conf, struct stripe_head *sh · 52 unmodified lines | ||
| 762 | 768 | sector_t head_sector, tmp_sec; |
| 763 | 769 | int hash; |
| 764 | 770 | int dd_idx; |
| 771 | + int inc_empty_inactive_list_flag; | |
| 765 | 772 | |
| 766 | 773 | /* Don't cross chunks, so stripe pd_idx/qd_idx is the same */ |
| 767 | 774 | tmp_sec = sh->sector; |
| @@ -779,7 +786,12 @@ static void stripe_add_to_batch_list(struct r5conf *conf, struct stripe_head *sh · 11 unmodified lines | ||
| 779 | 786 | atomic_inc(&conf->active_stripes); |
| 780 | 787 | BUG_ON(list_empty(&head->lru) && |
| 781 | 788 | !test_bit(STRIPE_EXPANDING, &head->state)); |
| 789 | + inc_empty_inactive_list_flag = 0; | |
| 790 | + if (!list_empty(conf->inactive_list + hash)) | |
| 791 | + inc_empty_inactive_list_flag = 1; | |
| 782 | 792 | list_del_init(&head->lru); |
| 793 | + if (list_empty(conf->inactive_list + hash) && inc_empty_inactive_list_flag) | |
| 794 | + atomic_inc(&conf->empty_inactive_list_nr); | |
| 783 | 795 | if (head->group) { |
| 784 | 796 | head->group->stripes_cnt--; |
| 785 | 797 | head->group = NULL; |
| @@ -993,7 +1005,6 @@ again: · 207 unmodified lines | ||
| 993 | 1005 | |
| 994 | 1006 | set_bit(STRIPE_IO_STARTED, &sh->state); |
| 995 | 1007 | |
| 996 | − bio_reset(bi); | |
| 997 | 1008 | bi->bi_bdev = rdev->bdev; |
| 998 | 1009 | bio_set_op_attrs(bi, op, op_flags); |
| 999 | 1010 | bi->bi_end_io = op_is_write(op) |
| @@ -1045,7 +1056,6 @@ again: · 45 unmodified lines | ||
| 1045 | 1056 | |
| 1046 | 1057 | set_bit(STRIPE_IO_STARTED, &sh->state); |
| 1047 | 1058 | |
| 1048 | − bio_reset(rbi); | |
| 1049 | 1059 | rbi->bi_bdev = rrdev->bdev; |
| 1050 | 1060 | bio_set_op_attrs(rbi, op, op_flags); |
| 1051 | 1061 | BUG_ON(!op_is_write(op)); |
| @@ -1978,9 +1988,11 @@ static void raid_run_ops(struct stripe_head *sh, unsigned long ops_request) · 926 unmodified lines | ||
| 1978 | 1988 | put_cpu(); |
| 1979 | 1989 | } |
| 1980 | 1990 | |
| 1981 | −static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) | |
| 1991 | +static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp, | |
| 1992 | + int disks) | |
| 1982 | 1993 | { |
| 1983 | 1994 | struct stripe_head *sh; |
| 1995 | + int i; | |
| 1984 | 1996 | |
| 1985 | 1997 | sh = kmem_cache_zalloc(sc, gfp); |
| 1986 | 1998 | if (sh) { |
| @@ -1989,6 +2001,17 @@ static struct stripe_head *alloc_stripe(struct kmem_cache *sc, gfp_t gfp) · 2 unmodified lines | ||
| 1989 | 2001 | INIT_LIST_HEAD(&sh->batch_list); |
| 1990 | 2002 | INIT_LIST_HEAD(&sh->lru); |
| 1991 | 2003 | atomic_set(&sh->count, 1); |
| 2004 | + for (i = 0; i < disks; i++) { | |
| 2005 | + struct r5dev *dev = &sh->dev[i]; | |
| 2006 | + | |
| 2007 | + bio_init(&dev->req); | |
| 2008 | + dev->req.bi_io_vec = &dev->vec; | |
| 2009 | + dev->req.bi_max_vecs = 1; | |
| 2010 | + | |
| 2011 | + bio_init(&dev->rreq); | |
| 2012 | + dev->rreq.bi_io_vec = &dev->rvec; | |
| 2013 | + dev->rreq.bi_max_vecs = 1; | |
| 2014 | + } | |
| 1992 | 2015 | } |
| 1993 | 2016 | return sh; |
| 1994 | 2017 | } |
| @@ -1996,7 +2019,7 @@ static int grow_one_stripe(struct r5conf *conf, gfp_t gfp) · 1 unmodified line | ||
| 1996 | 2019 | { |
| 1997 | 2020 | struct stripe_head *sh; |
| 1998 | 2021 | |
| 1999 | − sh = alloc_stripe(conf->slab_cache, gfp); | |
| 2022 | + sh = alloc_stripe(conf->slab_cache, gfp, conf->pool_size); | |
| 2000 | 2023 | if (!sh) |
| 2001 | 2024 | return 0; |
| 2002 | 2025 | |
| @@ -2167,7 +2190,7 @@ static int resize_stripes(struct r5conf *conf, int newsize) · 164 unmodified lines | ||
| 2167 | 2190 | mutex_lock(&conf->cache_size_mutex); |
| 2168 | 2191 | |
| 2169 | 2192 | for (i = conf->max_nr_stripes; i; i--) { |
| 2170 | − nsh = alloc_stripe(sc, GFP_KERNEL); | |
| 2193 | + nsh = alloc_stripe(sc, GFP_KERNEL, newsize); | |
| 2171 | 2194 | if (!nsh) |
| 2172 | 2195 | break; |
| 2173 | 2196 | |
| @@ -2299,6 +2322,7 @@ static void raid5_end_read_request(struct bio * bi) · 125 unmodified lines | ||
| 2299 | 2322 | (unsigned long long)sh->sector, i, atomic_read(&sh->count), |
| 2300 | 2323 | bi->bi_error); |
| 2301 | 2324 | if (i == disks) { |
| 2325 | + bio_reset(bi); | |
| 2302 | 2326 | BUG(); |
| 2303 | 2327 | return; |
| 2304 | 2328 | } |
| @@ -2399,6 +2423,7 @@ static void raid5_end_read_request(struct bio * bi) · 94 unmodified lines | ||
| 2399 | 2423 | } |
| 2400 | 2424 | } |
| 2401 | 2425 | rdev_dec_pending(rdev, conf->mddev); |
| 2426 | + bio_reset(bi); | |
| 2402 | 2427 | clear_bit(R5_LOCKED, &sh->dev[i].flags); |
| 2403 | 2428 | set_bit(STRIPE_HANDLE, &sh->state); |
| 2404 | 2429 | raid5_release_stripe(sh); |
| @@ -2436,6 +2461,7 @@ static void raid5_end_write_request(struct bio *bi) · 31 unmodified lines | ||
| 2436 | 2461 | (unsigned long long)sh->sector, i, atomic_read(&sh->count), |
| 2437 | 2462 | bi->bi_error); |
| 2438 | 2463 | if (i == disks) { |
| 2464 | + bio_reset(bi); | |
| 2439 | 2465 | BUG(); |
| 2440 | 2466 | return; |
| 2441 | 2467 | } |
| @@ -2472,6 +2498,7 @@ static void raid5_end_write_request(struct bio *bi) · 30 unmodified lines | ||
| 2472 | 2498 | if (sh->batch_head && bi->bi_error && !replacement) |
| 2473 | 2499 | set_bit(STRIPE_BATCH_ERR, &sh->batch_head->state); |
| 2474 | 2500 | |
| 2501 | + bio_reset(bi); | |
| 2475 | 2502 | if (!test_and_clear_bit(R5_DOUBLE_LOCKED, &sh->dev[i].flags)) |
| 2476 | 2503 | clear_bit(R5_LOCKED, &sh->dev[i].flags); |
| 2477 | 2504 | set_bit(STRIPE_HANDLE, &sh->state); |
| @@ -2485,16 +2512,6 @@ static void raid5_build_block(struct stripe_head *sh, int i, int previous) · 7 unmodified lines | ||
| 2485 | 2512 | { |
| 2486 | 2513 | struct r5dev *dev = &sh->dev[i]; |
| 2487 | 2514 | |
| 2488 | − bio_init(&dev->req); | |
| 2489 | − dev->req.bi_io_vec = &dev->vec; | |
| 2490 | − dev->req.bi_max_vecs = 1; | |
| 2491 | − dev->req.bi_private = sh; | |
| 2492 | − | |
| 2493 | − bio_init(&dev->rreq); | |
| 2494 | − dev->rreq.bi_io_vec = &dev->rvec; | |
| 2495 | − dev->rreq.bi_max_vecs = 1; | |
| 2496 | − dev->rreq.bi_private = sh; | |
| 2497 | − | |
| 2498 | 2515 | dev->flags = 0; |
| 2499 | 2516 | dev->sector = raid5_compute_blocknr(sh, i, previous); |
| 2500 | 2517 | } |
| @@ -4628,7 +4645,9 @@ finish: · 2127 unmodified lines | ||
| 4628 | 4645 | } |
| 4629 | 4646 | |
| 4630 | 4647 | if (!bio_list_empty(&s.return_bi)) { |
| 4631 | − if (test_bit(MD_CHANGE_PENDING, &conf->mddev->flags)) { | |
| 4648 | + if (test_bit(MD_CHANGE_PENDING, &conf->mddev->flags) && | |
| 4649 | + (s.failed <= conf->max_degraded || | |
| 4650 | + conf->mddev->external == 0)) { | |
| 4632 | 4651 | spin_lock_irq(&conf->device_lock); |
| 4633 | 4652 | bio_list_merge(&conf->return_bi, &s.return_bi); |
| 4634 | 4653 | spin_unlock_irq(&conf->device_lock); |
| @@ -6620,6 +6639,16 @@ static struct r5conf *setup_conf(struct mddev *mddev) · 1985 unmodified lines | ||
| 6620 | 6639 | } |
| 6621 | 6640 | |
| 6622 | 6641 | conf->min_nr_stripes = NR_STRIPES; |
| 6642 | + if (mddev->reshape_position != MaxSector) { | |
| 6643 | + int stripes = max_t(int, | |
| 6644 | + ((mddev->chunk_sectors << 9) / STRIPE_SIZE) * 4, | |
| 6645 | + ((mddev->new_chunk_sectors << 9) / STRIPE_SIZE) * 4); | |
| 6646 | + conf->min_nr_stripes = max(NR_STRIPES, stripes); | |
| 6647 | + if (conf->min_nr_stripes != NR_STRIPES) | |
| 6648 | + printk(KERN_INFO | |
| 6649 | + "md/raid:%s: force stripe size %d for reshape\n", | |
| 6650 | + mdname(mddev), conf->min_nr_stripes); | |
| 6651 | + } | |
| 6623 | 6652 | memory = conf->min_nr_stripes * (sizeof(struct stripe_head) + |
| 6624 | 6653 | max_disks * ((sizeof(struct bio) + PAGE_SIZE))) / 1024; |
| 6625 | 6654 | atomic_set(&conf->empty_inactive_list_nr, NR_STRIPE_HASH_LOCKS); |
| @@ -6826,11 +6855,14 @@ static int raid5_run(struct mddev *mddev) · 200 unmodified lines | ||
| 6826 | 6855 | if (IS_ERR(conf)) |
| 6827 | 6856 | return PTR_ERR(conf); |
| 6828 | 6857 | |
| 6829 | − if (test_bit(MD_HAS_JOURNAL, &mddev->flags) && !journal_dev) { | |
| 6830 | − printk(KERN_ERR "md/raid:%s: journal disk is missing, force array readonly\n", | |
| 6831 | − mdname(mddev)); | |
| 6832 | − mddev->ro = 1; | |
| 6833 | − set_disk_ro(mddev->gendisk, 1); | |
| 6858 | + if (test_bit(MD_HAS_JOURNAL, &mddev->flags)) { | |
| 6859 | + if (!journal_dev) { | |
| 6860 | + pr_err("md/raid:%s: journal disk is missing, force array readonly\n", | |
| 6861 | + mdname(mddev)); | |
| 6862 | + mddev->ro = 1; | |
| 6863 | + set_disk_ro(mddev->gendisk, 1); | |
| 6864 | + } else if (mddev->recovery_cp == MaxSector) | |
| 6865 | + set_bit(MD_JOURNAL_CLEAN, &mddev->flags); | |
| 6834 | 6866 | } |
| 6835 | 6867 | |
| 6836 | 6868 | conf->min_offset_diff = min_offset_diff; |
| @@ -70,7 +70,10 @@ static unsigned int cec_get_edid_spa_location(const u8 *edid, unsigned int size) · 69 unmodified lines | ||
| 70 | 70 | u8 tag = edid[i] >> 5; |
| 71 | 71 | u8 len = edid[i] & 0x1f; |
| 72 | 72 | |
| 73 | − if (tag == 3 && len >= 5 && i + len <= end) | |
| 73 | + if (tag == 3 && len >= 5 && i + len <= end && | |
| 74 | + edid[i + 1] == 0x03 && | |
| 75 | + edid[i + 2] == 0x0c && | |
| 76 | + edid[i + 3] == 0x00) | |
| 74 | 77 | return i + 4; |
| 75 | 78 | i += len + 1; |
| 76 | 79 | } while (i < end); |
| @@ -1552,6 +1552,7 @@ int cx23885_417_register(struct cx23885_dev *dev) · 1551 unmodified lines | ||
| 1552 | 1552 | q->mem_ops = &vb2_dma_sg_memops; |
| 1553 | 1553 | q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; |
| 1554 | 1554 | q->lock = &dev->lock; |
| 1555 | + q->dev = &dev->pci->dev; | |
| 1555 | 1556 | |
| 1556 | 1557 | err = vb2_queue_init(q); |
| 1557 | 1558 | if (err < 0) |
| @@ -1238,6 +1238,7 @@ static int dvb_init(struct saa7134_dev *dev) · 1237 unmodified lines | ||
| 1238 | 1238 | q->buf_struct_size = sizeof(struct saa7134_buf); |
| 1239 | 1239 | q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; |
| 1240 | 1240 | q->lock = &dev->lock; |
| 1241 | + q->dev = &dev->pci->dev; | |
| 1241 | 1242 | ret = vb2_queue_init(q); |
| 1242 | 1243 | if (ret) { |
| 1243 | 1244 | vb2_dvb_dealloc_frontends(&dev->frontends); |
| @@ -295,6 +295,7 @@ static int empress_init(struct saa7134_dev *dev) · 294 unmodified lines | ||
| 295 | 295 | q->buf_struct_size = sizeof(struct saa7134_buf); |
| 296 | 296 | q->timestamp_flags = V4L2_BUF_FLAG_TIMESTAMP_MONOTONIC; |
| 297 | 297 | q->lock = &dev->lock; |
| 298 | + q->dev = &dev->pci->dev; | |
| 298 | 299 | err = vb2_queue_init(q); |
| 299 | 300 | if (err) |
| 300 | 301 | return err; |
| @@ -169,7 +169,7 @@ config VIDEO_MEDIATEK_VPU · 168 unmodified lines | ||
| 169 | 169 | config VIDEO_MEDIATEK_VCODEC |
| 170 | 170 | tristate "Mediatek Video Codec driver" |
| 171 | 171 | depends on MTK_IOMMU || COMPILE_TEST |
| 172 | − depends on VIDEO_DEV && VIDEO_V4L2 | |
| 172 | + depends on VIDEO_DEV && VIDEO_V4L2 && HAS_DMA | |
| 173 | 173 | depends on ARCH_MEDIATEK || COMPILE_TEST |
| 174 | 174 | select VIDEOBUF2_DMA_CONTIG |
| 175 | 175 | select V4L2_MEM2MEM_DEV |
| @@ -23,7 +23,6 @@ · 22 unmodified lines | ||
| 23 | 23 | #include <media/v4l2-ioctl.h> |
| 24 | 24 | #include <media/videobuf2-core.h> |
| 25 | 25 | |
| 26 | −#include "mtk_vcodec_util.h" | |
| 27 | 26 | |
| 28 | 27 | #define MTK_VCODEC_DRV_NAME "mtk_vcodec_drv" |
| 29 | 28 | #define MTK_VCODEC_ENC_NAME "mtk-vcodec-enc" |
| @@ -487,7 +487,6 @@ static int vidioc_venc_s_fmt_out(struct file *file, void *priv, · 486 unmodified lines | ||
| 487 | 487 | struct mtk_q_data *q_data; |
| 488 | 488 | int ret, i; |
| 489 | 489 | struct mtk_video_fmt *fmt; |
| 490 | − unsigned int pitch_w_div16; | |
| 491 | 490 | struct v4l2_pix_format_mplane *pix_fmt_mp = &f->fmt.pix_mp; |
| 492 | 491 | |
| 493 | 492 | vq = v4l2_m2m_get_vq(ctx->m2m_ctx, f->type); |
| @@ -530,15 +529,6 @@ static int vidioc_venc_s_fmt_out(struct file *file, void *priv, · 36 unmodified lines | ||
| 530 | 529 | q_data->coded_width = f->fmt.pix_mp.width; |
| 531 | 530 | q_data->coded_height = f->fmt.pix_mp.height; |
| 532 | 531 | |
| 533 | − pitch_w_div16 = DIV_ROUND_UP(q_data->visible_width, 16); | |
| 534 | − if (pitch_w_div16 % 8 != 0) { | |
| 535 | − /* Adjust returned width/height, so application could correctly | |
| 536 | − * allocate hw required memory | |
| 537 | − */ | |
| 538 | − q_data->visible_height += 32; | |
| 539 | − vidioc_try_fmt(f, q_data->fmt); | |
| 540 | − } | |
| 541 | − | |
| 542 | 532 | q_data->field = f->fmt.pix_mp.field; |
| 543 | 533 | ctx->colorspace = f->fmt.pix_mp.colorspace; |
| 544 | 534 | ctx->ycbcr_enc = f->fmt.pix_mp.ycbcr_enc; |
| @@ -878,7 +868,8 @@ static int mtk_venc_encode_header(void *priv) · 333 unmodified lines | ||
| 878 | 868 | { |
| 879 | 869 | struct mtk_vcodec_ctx *ctx = priv; |
| 880 | 870 | int ret; |
| 881 | − struct vb2_buffer *dst_buf; | |
| 871 | + struct vb2_buffer *src_buf, *dst_buf; | |
| 872 | + struct vb2_v4l2_buffer *dst_vb2_v4l2, *src_vb2_v4l2; | |
| 882 | 873 | struct mtk_vcodec_mem bs_buf; |
| 883 | 874 | struct venc_done_result enc_result; |
| 884 | 875 | |
| @@ -911,6 +902,15 @@ static int mtk_venc_encode_header(void *priv) · 26 unmodified lines | ||
| 911 | 902 | mtk_v4l2_err("venc_if_encode failed=%d", ret); |
| 912 | 903 | return -EINVAL; |
| 913 | 904 | } |
| 905 | + src_buf = v4l2_m2m_next_src_buf(ctx->m2m_ctx); | |
| 906 | + if (src_buf) { | |
| 907 | + src_vb2_v4l2 = to_vb2_v4l2_buffer(src_buf); | |
| 908 | + dst_vb2_v4l2 = to_vb2_v4l2_buffer(dst_buf); | |
| 909 | + dst_buf->timestamp = src_buf->timestamp; | |
| 910 | + dst_vb2_v4l2->timecode = src_vb2_v4l2->timecode; | |
| 911 | + } else { | |
| 912 | + mtk_v4l2_err("No timestamp for the header buffer."); | |
| 913 | + } | |
| 914 | 914 | |
| 915 | 915 | ctx->state = MTK_STATE_HEADER; |
| 916 | 916 | dst_buf->planes[0].bytesused = enc_result.bs_size; |
| @@ -1003,7 +1003,7 @@ static void mtk_venc_worker(struct work_struct *work) · 86 unmodified lines | ||
| 1003 | 1003 | struct mtk_vcodec_mem bs_buf; |
| 1004 | 1004 | struct venc_done_result enc_result; |
| 1005 | 1005 | int ret, i; |
| 1006 | − struct vb2_v4l2_buffer *vb2_v4l2; | |
| 1006 | + struct vb2_v4l2_buffer *dst_vb2_v4l2, *src_vb2_v4l2; | |
| 1007 | 1007 | |
| 1008 | 1008 | /* check dst_buf, dst_buf may be removed in device_run |
| 1009 | 1009 | * to stored encdoe header so we need check dst_buf and |
| @@ -1043,9 +1043,14 @@ static void mtk_venc_worker(struct work_struct *work) · 33 unmodified lines | ||
| 1043 | 1043 | ret = venc_if_encode(ctx, VENC_START_OPT_ENCODE_FRAME, |
| 1044 | 1044 | &frm_buf, &bs_buf, &enc_result); |
| 1045 | 1045 | |
| 1046 | − vb2_v4l2 = container_of(dst_buf, struct vb2_v4l2_buffer, vb2_buf); | |
| 1046 | + src_vb2_v4l2 = to_vb2_v4l2_buffer(src_buf); | |
| 1047 | + dst_vb2_v4l2 = to_vb2_v4l2_buffer(dst_buf); | |
| 1048 | + | |
| 1049 | + dst_buf->timestamp = src_buf->timestamp; | |
| 1050 | + dst_vb2_v4l2->timecode = src_vb2_v4l2->timecode; | |
| 1051 | + | |
| 1047 | 1052 | if (enc_result.is_key_frm) |
| 1048 | − vb2_v4l2->flags |= V4L2_BUF_FLAG_KEYFRAME; | |
| 1053 | + dst_vb2_v4l2->flags |= V4L2_BUF_FLAG_KEYFRAME; | |
| 1049 | 1054 | |
| 1050 | 1055 | if (ret) { |
| 1051 | 1056 | v4l2_m2m_buf_done(to_vb2_v4l2_buffer(src_buf), |
| @@ -1217,7 +1222,7 @@ int mtk_vcodec_enc_ctrls_setup(struct mtk_vcodec_ctx *ctx) · 165 unmodified lines | ||
| 1217 | 1222 | 0, V4L2_MPEG_VIDEO_HEADER_MODE_SEPARATE); |
| 1218 | 1223 | v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_H264_PROFILE, |
| 1219 | 1224 | V4L2_MPEG_VIDEO_H264_PROFILE_HIGH, |
| 1220 | − 0, V4L2_MPEG_VIDEO_H264_PROFILE_MAIN); | |
| 1225 | + 0, V4L2_MPEG_VIDEO_H264_PROFILE_HIGH); | |
| 1221 | 1226 | v4l2_ctrl_new_std_menu(handler, ops, V4L2_CID_MPEG_VIDEO_H264_LEVEL, |
| 1222 | 1227 | V4L2_MPEG_VIDEO_H264_LEVEL_4_2, |
| 1223 | 1228 | 0, V4L2_MPEG_VIDEO_H264_LEVEL_4_0); |
| @@ -1288,5 +1293,10 @@ int mtk_venc_lock(struct mtk_vcodec_ctx *ctx) · 64 unmodified lines | ||
| 1288 | 1293 | |
| 1289 | 1294 | void mtk_vcodec_enc_release(struct mtk_vcodec_ctx *ctx) |
| 1290 | 1295 | { |
| 1291 | − venc_if_deinit(ctx); | |
| 1296 | + int ret = venc_if_deinit(ctx); | |
| 1297 | + | |
| 1298 | + if (ret) | |
| 1299 | + mtk_v4l2_err("venc_if_deinit failed=%d", ret); | |
| 1300 | + | |
| 1301 | + ctx->state = MTK_STATE_FREE; | |
| 1292 | 1302 | } |
| @@ -218,11 +218,15 @@ static int fops_vcodec_release(struct file *file) · 217 unmodified lines | ||
| 218 | 218 | mtk_v4l2_debug(1, "[%d] encoder", ctx->id); |
| 219 | 219 | mutex_lock(&dev->dev_mutex); |
| 220 | 220 | |
| 221 | + /* | |
| 222 | + * Call v4l2_m2m_ctx_release to make sure the worker thread is not | |
| 223 | + * running after venc_if_deinit. | |
| 224 | + */ | |
| 225 | + v4l2_m2m_ctx_release(ctx->m2m_ctx); | |
| 221 | 226 | mtk_vcodec_enc_release(ctx); |
| 222 | 227 | v4l2_fh_del(&ctx->fh); |
| 223 | 228 | v4l2_fh_exit(&ctx->fh); |
| 224 | 229 | v4l2_ctrl_handler_free(&ctx->ctrl_hdl); |
| 225 | − v4l2_m2m_ctx_release(ctx->m2m_ctx); | |
| 226 | 230 | |
| 227 | 231 | list_del_init(&ctx->list); |
| 228 | 232 | dev->num_instances--; |
| @@ -16,7 +16,6 @@ · 15 unmodified lines | ||
| 16 | 16 | #define _MTK_VCODEC_INTR_H_ |
| 17 | 17 | |
| 18 | 18 | #define MTK_INST_IRQ_RECEIVED 0x1 |
| 19 | −#define MTK_INST_WORK_THREAD_ABORT_DONE 0x2 | |
| 20 | 19 | |
| 21 | 20 | struct mtk_vcodec_ctx; |
| 22 | 21 | |
| @@ -61,6 +61,8 @@ enum venc_h264_bs_mode { · 60 unmodified lines | ||
| 61 | 61 | |
| 62 | 62 | /* |
| 63 | 63 | * struct venc_h264_vpu_config - Structure for h264 encoder configuration |
| 64 | + * AP-W/R : AP is writer/reader on this item | |
| 65 | + * VPU-W/R: VPU is write/reader on this item | |
| 64 | 66 | * @input_fourcc: input fourcc |
| 65 | 67 | * @bitrate: target bitrate (in bps) |
| 66 | 68 | * @pic_w: picture width. Picture size is visible stream resolution, in pixels, |
| @@ -94,13 +96,13 @@ struct venc_h264_vpu_config { · 27 unmodified lines | ||
| 94 | 96 | |
| 95 | 97 | /* |
| 96 | 98 | * struct venc_h264_vpu_buf - Structure for buffer information |
| 97 | − * @align: buffer alignment (in bytes) | |
| 99 | + * AP-W/R : AP is writer/reader on this item | |
| 100 | + * VPU-W/R: VPU is write/reader on this item | |
| 98 | 101 | * @iova: IO virtual address |
| 99 | 102 | * @vpua: VPU side memory addr which is used by RC_CODE |
| 100 | 103 | * @size: buffer size (in bytes) |
| 101 | 104 | */ |
| 102 | 105 | struct venc_h264_vpu_buf { |
| 103 | − u32 align; | |
| 104 | 106 | u32 iova; |
| 105 | 107 | u32 vpua; |
| 106 | 108 | u32 size; |
| @@ -108,6 +110,8 @@ struct venc_h264_vpu_buf { · 1 unmodified line | ||
| 108 | 110 | |
| 109 | 111 | /* |
| 110 | 112 | * struct venc_h264_vsi - Structure for VPU driver control and info share |
| 113 | + * AP-W/R : AP is writer/reader on this item | |
| 114 | + * VPU-W/R: VPU is write/reader on this item | |
| 111 | 115 | * This structure is allocated in VPU side and shared to AP side. |
| 112 | 116 | * @config: h264 encoder configuration |
| 113 | 117 | * @work_bufs: working buffer information in VPU side |
| @@ -150,12 +154,6 @@ struct venc_h264_inst { · 36 unmodified lines | ||
| 150 | 154 | struct mtk_vcodec_ctx *ctx; |
| 151 | 155 | }; |
| 152 | 156 | |
| 153 | −static inline void h264_write_reg(struct venc_h264_inst *inst, u32 addr, | |
| 154 | − u32 val) | |
| 155 | −{ | |
| 156 | − writel(val, inst->hw_base + addr); | |
| 157 | −} | |
| 158 | − | |
| 159 | 157 | static inline u32 h264_read_reg(struct venc_h264_inst *inst, u32 addr) |
| 160 | 158 | { |
| 161 | 159 | return readl(inst->hw_base + addr); |
| @@ -214,6 +212,8 @@ static unsigned int h264_get_level(struct venc_h264_inst *inst, · 52 unmodified lines | ||
| 214 | 212 | return 40; |
| 215 | 213 | case V4L2_MPEG_VIDEO_H264_LEVEL_4_1: |
| 216 | 214 | return 41; |
| 215 | + case V4L2_MPEG_VIDEO_H264_LEVEL_4_2: | |
| 216 | + return 42; | |
| 217 | 217 | default: |
| 218 | 218 | mtk_vcodec_debug(inst, "unsupported level %d", level); |
| 219 | 219 | return 31; |
| @@ -56,6 +56,8 @@ enum venc_vp8_vpu_work_buf { · 55 unmodified lines | ||
| 56 | 56 | |
| 57 | 57 | /* |
| 58 | 58 | * struct venc_vp8_vpu_config - Structure for vp8 encoder configuration |
| 59 | + * AP-W/R : AP is writer/reader on this item | |
| 60 | + * VPU-W/R: VPU is write/reader on this item | |
| 59 | 61 | * @input_fourcc: input fourcc |
| 60 | 62 | * @bitrate: target bitrate (in bps) |
| 61 | 63 | * @pic_w: picture width. Picture size is visible stream resolution, in pixels, |
| @@ -83,14 +85,14 @@ struct venc_vp8_vpu_config { · 21 unmodified lines | ||
| 83 | 85 | }; |
| 84 | 86 | |
| 85 | 87 | /* |
| 86 | − * struct venc_vp8_vpu_buf -Structure for buffer information | |
| 87 | − * @align: buffer alignment (in bytes) | |
| 88 | + * struct venc_vp8_vpu_buf - Structure for buffer information | |
| 89 | + * AP-W/R : AP is writer/reader on this item | |
| 90 | + * VPU-W/R: VPU is write/reader on this item | |
| 88 | 91 | * @iova: IO virtual address |
| 89 | 92 | * @vpua: VPU side memory addr which is used by RC_CODE |
| 90 | 93 | * @size: buffer size (in bytes) |
| 91 | 94 | */ |
| 92 | 95 | struct venc_vp8_vpu_buf { |
| 93 | − u32 align; | |
| 94 | 96 | u32 iova; |
| 95 | 97 | u32 vpua; |
| 96 | 98 | u32 size; |
| @@ -98,6 +100,8 @@ struct venc_vp8_vpu_buf { · 1 unmodified line | ||
| 98 | 100 | |
| 99 | 101 | /* |
| 100 | 102 | * struct venc_vp8_vsi - Structure for VPU driver control and info share |
| 103 | + * AP-W/R : AP is writer/reader on this item | |
| 104 | + * VPU-W/R: VPU is write/reader on this item | |
| 101 | 105 | * This structure is allocated in VPU side and shared to AP side. |
| 102 | 106 | * @config: vp8 encoder configuration |
| 103 | 107 | * @work_bufs: working buffer information in VPU side |
| @@ -138,12 +142,6 @@ struct venc_vp8_inst { · 34 unmodified lines | ||
| 138 | 142 | struct mtk_vcodec_ctx *ctx; |
| 139 | 143 | }; |
| 140 | 144 | |
| 141 | −static inline void vp8_enc_write_reg(struct venc_vp8_inst *inst, u32 addr, | |
| 142 | − u32 val) | |
| 143 | −{ | |
| 144 | − writel(val, inst->hw_base + addr); | |
| 145 | −} | |
| 146 | − | |
| 147 | 145 | static inline u32 vp8_enc_read_reg(struct venc_vp8_inst *inst, u32 addr) |
| 148 | 146 | { |
| 149 | 147 | return readl(inst->hw_base + addr); |
| @@ -99,10 +99,16 @@ EXPORT_SYMBOL_GPL(rcar_fcp_put); · 98 unmodified lines | ||
| 99 | 99 | */ |
| 100 | 100 | int rcar_fcp_enable(struct rcar_fcp_device *fcp) |
| 101 | 101 | { |
| 102 | + int error; | |
| 103 | + | |
| 102 | 104 | if (!fcp) |
| 103 | 105 | return 0; |
| 104 | 106 | |
| 105 | − return pm_runtime_get_sync(fcp->dev); | |
| 107 | + error = pm_runtime_get_sync(fcp->dev); | |
| 108 | + if (error < 0) | |
| 109 | + return error; | |
| 110 | + | |
| 111 | + return 0; | |
| 106 | 112 | } |
| 107 | 113 | EXPORT_SYMBOL_GPL(rcar_fcp_enable); |
| 108 | 114 | |
| @@ -2185,7 +2185,7 @@ static int gpmc_probe_dt(struct platform_device *pdev) · 2184 unmodified lines | ||
| 2185 | 2185 | return 0; |
| 2186 | 2186 | } |
| 2187 | 2187 | |
| 2188 | −static int gpmc_probe_dt_children(struct platform_device *pdev) | |
| 2188 | +static void gpmc_probe_dt_children(struct platform_device *pdev) | |
| 2189 | 2189 | { |
| 2190 | 2190 | int ret; |
| 2191 | 2191 | struct device_node *child; |
| @@ -2200,11 +2200,11 @@ static int gpmc_probe_dt_children(struct platform_device *pdev) · 8 unmodified lines | ||
| 2200 | 2200 | else |
| 2201 | 2201 | ret = gpmc_probe_generic_child(pdev, child); |
| 2202 | 2202 | |
| 2203 | − if (ret) | |
| 2204 | − return ret; | |
| 2203 | + if (ret) { | |
| 2204 | + dev_err(&pdev->dev, "failed to probe DT child '%s': %d\n", | |
| 2205 | + child->name, ret); | |
| 2206 | + } | |
| 2205 | 2207 | } |
| 2206 | − | |
| 2207 | − return 0; | |
| 2208 | 2208 | } |
| 2209 | 2209 | #else |
| 2210 | 2210 | static int gpmc_probe_dt(struct platform_device *pdev) |
| @@ -2212,9 +2212,8 @@ static int gpmc_probe_dt(struct platform_device *pdev) · 1 unmodified line | ||
| 2212 | 2212 | return 0; |
| 2213 | 2213 | } |
| 2214 | 2214 | |
| 2215 | −static int gpmc_probe_dt_children(struct platform_device *pdev) | |
| 2215 | +static void gpmc_probe_dt_children(struct platform_device *pdev) | |
| 2216 | 2216 | { |
| 2217 | − return 0; | |
| 2218 | 2217 | } |
| 2219 | 2218 | #endif /* CONFIG_OF */ |
| 2220 | 2219 | |
| @@ -2369,16 +2368,10 @@ static int gpmc_probe(struct platform_device *pdev) · 148 unmodified lines | ||
| 2369 | 2368 | goto setup_irq_failed; |
| 2370 | 2369 | } |
| 2371 | 2370 | |
| 2372 | − rc = gpmc_probe_dt_children(pdev); | |
| 2373 | − if (rc < 0) { | |
| 2374 | − dev_err(gpmc->dev, "failed to probe DT children\n"); | |
| 2375 | − goto dt_children_failed; | |
| 2376 | − } | |
| 2371 | + gpmc_probe_dt_children(pdev); | |
| 2377 | 2372 | |
| 2378 | 2373 | return 0; |
| 2379 | 2374 | |
| 2380 | −dt_children_failed: | |
| 2381 | − gpmc_free_irq(gpmc); | |
| 2382 | 2375 | setup_irq_failed: |
| 2383 | 2376 | gpmc_gpio_exit(gpmc); |
| 2384 | 2377 | gpio_init_failed: |
| @@ -345,16 +345,6 @@ config SENSORS_TSL2550 · 344 unmodified lines | ||
| 345 | 345 | This driver can also be built as a module. If so, the module |
| 346 | 346 | will be called tsl2550. |
| 347 | 347 | |
| 348 | −config SENSORS_BH1780 | |
| 349 | − tristate "ROHM BH1780GLI ambient light sensor" | |
| 350 | − depends on I2C && SYSFS | |
| 351 | − help | |
| 352 | − If you say yes here you get support for the ROHM BH1780GLI | |
| 353 | − ambient light sensor. | |
| 354 | − | |
| 355 | − This driver can also be built as a module. If so, the module | |
| 356 | − will be called bh1780gli. | |
| 357 | − | |
| 358 | 348 | config SENSORS_BH1770 |
| 359 | 349 | tristate "BH1770GLC / SFH7770 combined ALS - Proximity sensor" |
| 360 | 350 | depends on I2C |
| @@ -19,7 +19,6 @@ obj-$(CONFIG_TIFM_CORE) += tifm_core.o · 18 unmodified lines | ||
| 19 | 19 | obj-$(CONFIG_TIFM_7XX1) += tifm_7xx1.o |
| 20 | 20 | obj-$(CONFIG_PHANTOM) += phantom.o |
| 21 | 21 | obj-$(CONFIG_QCOM_COINCELL) += qcom-coincell.o |
| 22 | −obj-$(CONFIG_SENSORS_BH1780) += bh1780gli.o | |
| 23 | 22 | obj-$(CONFIG_SENSORS_BH1770) += bh1770glc.o |
| 24 | 23 | obj-$(CONFIG_SENSORS_APDS990X) += apds990x.o |
| 25 | 24 | obj-$(CONFIG_SGI_IOC4) += ioc4.o |
| @@ -1,259 +0,0 @@ | ||
| 1 | −/* | |
| 2 | − * bh1780gli.c | |
| 3 | − * ROHM Ambient Light Sensor Driver | |
| 4 | − * | |
| 5 | − * Copyright (C) 2010 Texas Instruments | |
| 6 | − * Author: Hemanth V <hemanthv@ti.com> | |
| 7 | − * | |
| 8 | − * This program is free software; you can redistribute it and/or modify it | |
| 9 | − * under the terms of the GNU General Public License version 2 as published by | |
| 10 | − * the Free Software Foundation. | |
| 11 | − * | |
| 12 | − * This program is distributed in the hope that it will be useful, but WITHOUT | |
| 13 | − * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
| 14 | − * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | |
| 15 | − * more details. | |
| 16 | − * | |
| 17 | − * You should have received a copy of the GNU General Public License along with | |
| 18 | − * this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 | − */ | |
| 20 | −#include <linux/i2c.h> | |
| 21 | −#include <linux/slab.h> | |
| 22 | −#include <linux/mutex.h> | |
| 23 | −#include <linux/platform_device.h> | |
| 24 | −#include <linux/delay.h> | |
| 25 | −#include <linux/module.h> | |
| 26 | −#include <linux/of.h> | |
| 27 | − | |
| 28 | −#define BH1780_REG_CONTROL 0x80 | |
| 29 | −#define BH1780_REG_PARTID 0x8A | |
| 30 | −#define BH1780_REG_MANFID 0x8B | |
| 31 | −#define BH1780_REG_DLOW 0x8C | |
| 32 | −#define BH1780_REG_DHIGH 0x8D | |
| 33 | − | |
| 34 | −#define BH1780_REVMASK (0xf) | |
| 35 | −#define BH1780_POWMASK (0x3) | |
| 36 | −#define BH1780_POFF (0x0) | |
| 37 | −#define BH1780_PON (0x3) | |
| 38 | − | |
| 39 | −/* power on settling time in ms */ | |
| 40 | −#define BH1780_PON_DELAY 2 | |
| 41 | − | |
| 42 | −struct bh1780_data { | |
| 43 | − struct i2c_client *client; | |
| 44 | − int power_state; | |
| 45 | − /* lock for sysfs operations */ | |
| 46 | − struct mutex lock; | |
| 47 | −}; | |
| 48 | − | |
| 49 | −static int bh1780_write(struct bh1780_data *ddata, u8 reg, u8 val, char *msg) | |
| 50 | −{ | |
| 51 | − int ret = i2c_smbus_write_byte_data(ddata->client, reg, val); | |
| 52 | − if (ret < 0) | |
| 53 | − dev_err(&ddata->client->dev, | |
| 54 | − "i2c_smbus_write_byte_data failed error %d Register (%s)\n", | |
| 55 | − ret, msg); | |
| 56 | − return ret; | |
| 57 | −} | |
| 58 | − | |
| 59 | −static int bh1780_read(struct bh1780_data *ddata, u8 reg, char *msg) | |
| 60 | −{ | |
| 61 | − int ret = i2c_smbus_read_byte_data(ddata->client, reg); | |
| 62 | − if (ret < 0) | |
| 63 | − dev_err(&ddata->client->dev, | |
| 64 | − "i2c_smbus_read_byte_data failed error %d Register (%s)\n", | |
| 65 | − ret, msg); | |
| 66 | − return ret; | |
| 67 | −} | |
| 68 | − | |
| 69 | −static ssize_t bh1780_show_lux(struct device *dev, | |
| 70 | − struct device_attribute *attr, char *buf) | |
| 71 | −{ | |
| 72 | − struct platform_device *pdev = to_platform_device(dev); | |
| 73 | − struct bh1780_data *ddata = platform_get_drvdata(pdev); | |
| 74 | − int lsb, msb; | |
| 75 | − | |
| 76 | − lsb = bh1780_read(ddata, BH1780_REG_DLOW, "DLOW"); | |
| 77 | − if (lsb < 0) | |
| 78 | − return lsb; | |
| 79 | − | |
| 80 | − msb = bh1780_read(ddata, BH1780_REG_DHIGH, "DHIGH"); | |
| 81 | − if (msb < 0) | |
| 82 | − return msb; | |
| 83 | − | |
| 84 | − return sprintf(buf, "%d\n", (msb << 8) | lsb); | |
| 85 | −} | |
| 86 | − | |
| 87 | −static ssize_t bh1780_show_power_state(struct device *dev, | |
| 88 | − struct device_attribute *attr, | |
| 89 | − char *buf) | |
| 90 | −{ | |
| 91 | − struct platform_device *pdev = to_platform_device(dev); | |
| 92 | − struct bh1780_data *ddata = platform_get_drvdata(pdev); | |
| 93 | − int state; | |
| 94 | − | |
| 95 | − state = bh1780_read(ddata, BH1780_REG_CONTROL, "CONTROL"); | |
| 96 | − if (state < 0) | |
| 97 | − return state; | |
| 98 | − | |
| 99 | − return sprintf(buf, "%d\n", state & BH1780_POWMASK); | |
| 100 | −} | |
| 101 | − | |
| 102 | −static ssize_t bh1780_store_power_state(struct device *dev, | |
| 103 | − struct device_attribute *attr, | |
| 104 | − const char *buf, size_t count) | |
| 105 | −{ | |
| 106 | − struct platform_device *pdev = to_platform_device(dev); | |
| 107 | − struct bh1780_data *ddata = platform_get_drvdata(pdev); | |
| 108 | − unsigned long val; | |
| 109 | − int error; | |
| 110 | − | |
| 111 | − error = kstrtoul(buf, 0, &val); | |
| 112 | − if (error) | |
| 113 | − return error; | |
| 114 | − | |
| 115 | − if (val < BH1780_POFF || val > BH1780_PON) | |
| 116 | − return -EINVAL; | |
| 117 | − | |
| 118 | − mutex_lock(&ddata->lock); | |
| 119 | − | |
| 120 | − error = bh1780_write(ddata, BH1780_REG_CONTROL, val, "CONTROL"); | |
| 121 | − if (error < 0) { | |
| 122 | − mutex_unlock(&ddata->lock); | |
| 123 | − return error; | |
| 124 | − } | |
| 125 | − | |
| 126 | − msleep(BH1780_PON_DELAY); | |
| 127 | − ddata->power_state = val; | |
| 128 | − mutex_unlock(&ddata->lock); | |
| 129 | − | |
| 130 | − return count; | |
| 131 | −} | |
| 132 | − | |
| 133 | −static DEVICE_ATTR(lux, S_IRUGO, bh1780_show_lux, NULL); | |
| 134 | − | |
| 135 | −static DEVICE_ATTR(power_state, S_IWUSR | S_IRUGO, | |
| 136 | − bh1780_show_power_state, bh1780_store_power_state); | |
| 137 | − | |
| 138 | −static struct attribute *bh1780_attributes[] = { | |
| 139 | − &dev_attr_power_state.attr, | |
| 140 | − &dev_attr_lux.attr, | |
| 141 | − NULL | |
| 142 | −}; | |
| 143 | − | |
| 144 | −static const struct attribute_group bh1780_attr_group = { | |
| 145 | − .attrs = bh1780_attributes, | |
| 146 | −}; | |
| 147 | − | |
| 148 | −static int bh1780_probe(struct i2c_client *client, | |
| 149 | − const struct i2c_device_id *id) | |
| 150 | −{ | |
| 151 | − int ret; | |
| 152 | − struct bh1780_data *ddata; | |
| 153 | − struct i2c_adapter *adapter = to_i2c_adapter(client->dev.parent); | |
| 154 | − | |
| 155 | − if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE)) | |
| 156 | − return -EIO; | |
| 157 | − | |
| 158 | − ddata = devm_kzalloc(&client->dev, sizeof(struct bh1780_data), | |
| 159 | − GFP_KERNEL); | |
| 160 | − if (ddata == NULL) | |
| 161 | − return -ENOMEM; | |
| 162 | − | |
| 163 | − ddata->client = client; | |
| 164 | − i2c_set_clientdata(client, ddata); | |
| 165 | − | |
| 166 | − ret = bh1780_read(ddata, BH1780_REG_PARTID, "PART ID"); | |
| 167 | − if (ret < 0) | |
| 168 | − return ret; | |
| 169 | − | |
| 170 | − dev_info(&client->dev, "Ambient Light Sensor, Rev : %d\n", | |
| 171 | − (ret & BH1780_REVMASK)); | |
| 172 | − | |
| 173 | − mutex_init(&ddata->lock); | |
| 174 | − | |
| 175 | − return sysfs_create_group(&client->dev.kobj, &bh1780_attr_group); | |
| 176 | −} | |
| 177 | − | |
| 178 | −static int bh1780_remove(struct i2c_client *client) | |
| 179 | −{ | |
| 180 | − sysfs_remove_group(&client->dev.kobj, &bh1780_attr_group); | |
| 181 | − | |
| 182 | − return 0; | |
| 183 | −} | |
| 184 | − | |
| 185 | −#ifdef CONFIG_PM_SLEEP | |
| 186 | −static int bh1780_suspend(struct device *dev) | |
| 187 | −{ | |
| 188 | − struct bh1780_data *ddata; | |
| 189 | − int state, ret; | |
| 190 | − struct i2c_client *client = to_i2c_client(dev); | |
| 191 | − | |
| 192 | − ddata = i2c_get_clientdata(client); | |
| 193 | − state = bh1780_read(ddata, BH1780_REG_CONTROL, "CONTROL"); | |
| 194 | − if (state < 0) | |
| 195 | − return state; | |
| 196 | − | |
| 197 | − ddata->power_state = state & BH1780_POWMASK; | |
| 198 | − | |
| 199 | − ret = bh1780_write(ddata, BH1780_REG_CONTROL, BH1780_POFF, | |
| 200 | − "CONTROL"); | |
| 201 | − | |
| 202 | − if (ret < 0) | |
| 203 | − return ret; | |
| 204 | − | |
| 205 | − return 0; | |
| 206 | −} | |
| 207 | − | |
| 208 | −static int bh1780_resume(struct device *dev) | |
| 209 | −{ | |
| 210 | − struct bh1780_data *ddata; | |
| 211 | − int state, ret; | |
| 212 | − struct i2c_client *client = to_i2c_client(dev); | |
| 213 | − | |
| 214 | − ddata = i2c_get_clientdata(client); | |
| 215 | − state = ddata->power_state; | |
| 216 | − ret = bh1780_write(ddata, BH1780_REG_CONTROL, state, | |
| 217 | − "CONTROL"); | |
| 218 | − | |
| 219 | − if (ret < 0) | |
| 220 | − return ret; | |
| 221 | − | |
| 222 | − return 0; | |
| 223 | −} | |
| 224 | −#endif /* CONFIG_PM_SLEEP */ | |
| 225 | − | |
| 226 | −static SIMPLE_DEV_PM_OPS(bh1780_pm, bh1780_suspend, bh1780_resume); | |
| 227 | − | |
| 228 | −static const struct i2c_device_id bh1780_id[] = { | |
| 229 | − { "bh1780", 0 }, | |
| 230 | − { }, | |
| 231 | −}; | |
| 232 | − | |
| 233 | −MODULE_DEVICE_TABLE(i2c, bh1780_id); | |
| 234 | − | |
| 235 | −#ifdef CONFIG_OF | |
| 236 | −static const struct of_device_id of_bh1780_match[] = { | |
| 237 | − { .compatible = "rohm,bh1780gli", }, | |
| 238 | − {}, | |
| 239 | −}; | |
| 240 | − | |
| 241 | −MODULE_DEVICE_TABLE(of, of_bh1780_match); | |
| 242 | −#endif | |
| 243 | − | |
| 244 | −static struct i2c_driver bh1780_driver = { | |
| 245 | − .probe = bh1780_probe, | |
| 246 | − .remove = bh1780_remove, | |
| 247 | − .id_table = bh1780_id, | |
| 248 | − .driver = { | |
| 249 | − .name = "bh1780", | |
| 250 | − .pm = &bh1780_pm, | |
| 251 | − .of_match_table = of_match_ptr(of_bh1780_match), | |
| 252 | − }, | |
| 253 | −}; | |
| 254 | − | |
| 255 | −module_i2c_driver(bh1780_driver); | |
| 256 | − | |
| 257 | −MODULE_DESCRIPTION("BH1780GLI Ambient Light Sensor Driver"); | |
| 258 | −MODULE_LICENSE("GPL"); | |
| 259 | −MODULE_AUTHOR("Hemanth V <hemanthv@ti.com>"); | |
| @@ -230,6 +230,11 @@ int cxl_pci_vphb_add(struct cxl_afu *afu) · 229 unmodified lines | ||
| 230 | 230 | if (phb->bus == NULL) |
| 231 | 231 | return -ENXIO; |
| 232 | 232 | |
| 233 | + /* Set release hook on root bus */ | |
| 234 | + pci_set_host_bridge_release(to_pci_host_bridge(phb->bus->bridge), | |
| 235 | + pcibios_free_controller_deferred, | |
| 236 | + (void *) phb); | |
| 237 | + | |
| 233 | 238 | /* Claim resources. This might need some rework as well depending |
| 234 | 239 | * whether we are doing probe-only or not, like assigning unassigned |
| 235 | 240 | * resources etc... |
| @@ -256,7 +261,10 @@ void cxl_pci_vphb_remove(struct cxl_afu *afu) · 20 unmodified lines | ||
| 256 | 261 | afu->phb = NULL; |
| 257 | 262 | |
| 258 | 263 | pci_remove_root_bus(phb->bus); |
| 259 | − pcibios_free_controller(phb); | |
| 264 | + /* | |
| 265 | + * We don't free phb here - that's handled by | |
| 266 | + * pcibios_free_controller_deferred() | |
| 267 | + */ | |
| 260 | 268 | } |
| 261 | 269 | |
| 262 | 270 | static bool _cxl_pci_is_vphb_device(struct pci_controller *phb) |
| @@ -4,7 +4,7 @@ · 3 unmodified lines | ||
| 4 | 4 | */ |
| 5 | 5 | #include "lkdtm.h" |
| 6 | 6 | |
| 7 | −void lkdtm_rodata_do_nothing(void) | |
| 7 | +void notrace lkdtm_rodata_do_nothing(void) | |
| 8 | 8 | { |
| 9 | 9 | /* Does nothing. We just want an architecture agnostic "return". */ |
| 10 | 10 | } |
| @@ -9,7 +9,15 @@ · 8 unmodified lines | ||
| 9 | 9 | #include <linux/uaccess.h> |
| 10 | 10 | #include <asm/cacheflush.h> |
| 11 | 11 | |
| 12 | −static size_t cache_size = 1024; | |
| 12 | +/* | |
| 13 | + * Many of the tests here end up using const sizes, but those would | |
| 14 | + * normally be ignored by hardened usercopy, so force the compiler | |
| 15 | + * into choosing the non-const path to make sure we trigger the | |
| 16 | + * hardened usercopy checks by added "unconst" to all the const copies, | |
| 17 | + * and making sure "cache_size" isn't optimized into a const. | |
| 18 | + */ | |
| 19 | +static volatile size_t unconst = 0; | |
| 20 | +static volatile size_t cache_size = 1024; | |
| 13 | 21 | static struct kmem_cache *bad_cache; |
| 14 | 22 | |
| 15 | 23 | static const unsigned char test_text[] = "This is a test.\n"; |
| @@ -67,14 +75,14 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame) · 51 unmodified lines | ||
| 67 | 75 | if (to_user) { |
| 68 | 76 | pr_info("attempting good copy_to_user of local stack\n"); |
| 69 | 77 | if (copy_to_user((void __user *)user_addr, good_stack, |
| 70 | − sizeof(good_stack))) { | |
| 78 | + unconst + sizeof(good_stack))) { | |
| 71 | 79 | pr_warn("copy_to_user failed unexpectedly?!\n"); |
| 72 | 80 | goto free_user; |
| 73 | 81 | } |
| 74 | 82 | |
| 75 | 83 | pr_info("attempting bad copy_to_user of distant stack\n"); |
| 76 | 84 | if (copy_to_user((void __user *)user_addr, bad_stack, |
| 77 | − sizeof(good_stack))) { | |
| 85 | + unconst + sizeof(good_stack))) { | |
| 78 | 86 | pr_warn("copy_to_user failed, but lacked Oops\n"); |
| 79 | 87 | goto free_user; |
| 80 | 88 | } |
| @@ -88,14 +96,14 @@ static noinline void do_usercopy_stack(bool to_user, bool bad_frame) · 7 unmodified lines | ||
| 88 | 96 | |
| 89 | 97 | pr_info("attempting good copy_from_user of local stack\n"); |
| 90 | 98 | if (copy_from_user(good_stack, (void __user *)user_addr, |
| 91 | − sizeof(good_stack))) { | |
| 99 | + unconst + sizeof(good_stack))) { | |
| 92 | 100 | pr_warn("copy_from_user failed unexpectedly?!\n"); |
| 93 | 101 | goto free_user; |
| 94 | 102 | } |
| 95 | 103 | |
| 96 | 104 | pr_info("attempting bad copy_from_user of distant stack\n"); |
| 97 | 105 | if (copy_from_user(bad_stack, (void __user *)user_addr, |
| 98 | − sizeof(good_stack))) { | |
| 106 | + unconst + sizeof(good_stack))) { | |
| 99 | 107 | pr_warn("copy_from_user failed, but lacked Oops\n"); |
| 100 | 108 | goto free_user; |
| 101 | 109 | } |
| @@ -109,7 +117,7 @@ static void do_usercopy_heap_size(bool to_user) · 7 unmodified lines | ||
| 109 | 117 | { |
| 110 | 118 | unsigned long user_addr; |
| 111 | 119 | unsigned char *one, *two; |
| 112 | − const size_t size = 1024; | |
| 120 | + size_t size = unconst + 1024; | |
| 113 | 121 | |
| 114 | 122 | one = kmalloc(size, GFP_KERNEL); |
| 115 | 123 | two = kmalloc(size, GFP_KERNEL); |
| @@ -285,13 +293,14 @@ void lkdtm_USERCOPY_KERNEL(void) · 169 unmodified lines | ||
| 285 | 293 | |
| 286 | 294 | pr_info("attempting good copy_to_user from kernel rodata\n"); |
| 287 | 295 | if (copy_to_user((void __user *)user_addr, test_text, |
| 288 | − sizeof(test_text))) { | |
| 296 | + unconst + sizeof(test_text))) { | |
| 289 | 297 | pr_warn("copy_to_user failed unexpectedly?!\n"); |
| 290 | 298 | goto free_user; |
| 291 | 299 | } |
| 292 | 300 | |
| 293 | 301 | pr_info("attempting bad copy_to_user from kernel text\n"); |
| 294 | − if (copy_to_user((void __user *)user_addr, vm_mmap, PAGE_SIZE)) { | |
| 302 | + if (copy_to_user((void __user *)user_addr, vm_mmap, | |
| 303 | + unconst + PAGE_SIZE)) { | |
| 295 | 304 | pr_warn("copy_to_user failed, but lacked Oops\n"); |
| 296 | 305 | goto free_user; |
| 297 | 306 | } |
| @@ -1263,8 +1263,14 @@ static bool mei_me_fw_type_nm(struct pci_dev *pdev) · 1262 unmodified lines | ||
| 1263 | 1263 | static bool mei_me_fw_type_sps(struct pci_dev *pdev) |
| 1264 | 1264 | { |
| 1265 | 1265 | u32 reg; |
| 1266 | − /* Read ME FW Status check for SPS Firmware */ | |
| 1267 | − pci_read_config_dword(pdev, PCI_CFG_HFS_1, ®); | |
| 1266 | + unsigned int devfn; | |
| 1267 | + | |
| 1268 | + /* | |
| 1269 | + * Read ME FW Status register to check for SPS Firmware | |
| 1270 | + * The SPS FW is only signaled in pci function 0 | |
| 1271 | + */ | |
| 1272 | + devfn = PCI_DEVFN(PCI_SLOT(pdev->devfn), 0); | |
| 1273 | + pci_bus_read_config_dword(pdev->bus, devfn, PCI_CFG_HFS_1, ®); | |
| 1268 | 1274 | trace_mei_pci_cfg_read(&pdev->dev, "PCI_CFG_HFS_1", PCI_CFG_HFS_1, reg); |
| 1269 | 1275 | /* if bits [19:16] = 15, running SPS Firmware */ |
| 1270 | 1276 | return (reg & 0xf0000) == 0xf0000; |
| @@ -85,8 +85,8 @@ static const struct pci_device_id mei_me_pci_tbl[] = { · 84 unmodified lines | ||
| 85 | 85 | |
| 86 | 86 | {MEI_PCI_DEVICE(MEI_DEV_ID_SPT, mei_me_pch8_cfg)}, |
| 87 | 87 | {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_2, mei_me_pch8_cfg)}, |
| 88 | − {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_cfg)}, | |
| 89 | − {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_cfg)}, | |
| 88 | + {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H, mei_me_pch8_sps_cfg)}, | |
| 89 | + {MEI_PCI_DEVICE(MEI_DEV_ID_SPT_H_2, mei_me_pch8_sps_cfg)}, | |
| 90 | 90 | |
| 91 | 91 | {MEI_PCI_DEVICE(MEI_DEV_ID_BXT_M, mei_me_pch8_cfg)}, |
| 92 | 92 | {MEI_PCI_DEVICE(MEI_DEV_ID_APL_I, mei_me_pch8_cfg)}, |
| @@ -1726,6 +1726,7 @@ static u8 mmc_blk_prep_packed_list(struct mmc_queue *mq, struct request *req) · 1725 unmodified lines | ||
| 1726 | 1726 | break; |
| 1727 | 1727 | |
| 1728 | 1728 | if (req_op(next) == REQ_OP_DISCARD || |
| 1729 | + req_op(next) == REQ_OP_SECURE_ERASE || | |
| 1729 | 1730 | req_op(next) == REQ_OP_FLUSH) |
| 1730 | 1731 | break; |
| 1731 | 1732 | |
| @@ -2150,6 +2151,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · 418 unmodified lines | ||
| 2150 | 2151 | struct mmc_card *card = md->queue.card; |
| 2151 | 2152 | struct mmc_host *host = card->host; |
| 2152 | 2153 | unsigned long flags; |
| 2154 | + bool req_is_special = mmc_req_is_special(req); | |
| 2153 | 2155 | |
| 2154 | 2156 | if (req && !mq->mqrq_prev->req) |
| 2155 | 2157 | /* claim host only for the first request */ |
| @@ -2190,8 +2192,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) · 34 unmodified lines | ||
| 2190 | 2192 | } |
| 2191 | 2193 | |
| 2192 | 2194 | out: |
| 2193 | − if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) || | |
| 2194 | − mmc_req_is_special(req)) | |
| 2195 | + if ((!req && !(mq->flags & MMC_QUEUE_NEW_REQUEST)) || req_is_special) | |
| 2195 | 2196 | /* |
| 2196 | 2197 | * Release host when there are no more requests |
| 2197 | 2198 | * and after special request(discard, flush) is done. |
| @@ -33,7 +33,8 @@ static int mmc_prep_request(struct request_queue *q, struct request *req) · 32 unmodified lines | ||
| 33 | 33 | /* |
| 34 | 34 | * We only like normal block requests and discards. |
| 35 | 35 | */ |
| 36 | − if (req->cmd_type != REQ_TYPE_FS && req_op(req) != REQ_OP_DISCARD) { | |
| 36 | + if (req->cmd_type != REQ_TYPE_FS && req_op(req) != REQ_OP_DISCARD && | |
| 37 | + req_op(req) != REQ_OP_SECURE_ERASE) { | |
| 37 | 38 | blk_dump_rq_flags(req, "MMC bad request"); |
| 38 | 39 | return BLKPREP_KILL; |
| 39 | 40 | } |
| @@ -64,6 +65,8 @@ static int mmc_queue_thread(void *d) · 24 unmodified lines | ||
| 64 | 65 | spin_unlock_irq(q->queue_lock); |
| 65 | 66 | |
| 66 | 67 | if (req || mq->mqrq_prev->req) { |
| 68 | + bool req_is_special = mmc_req_is_special(req); | |
| 69 | + | |
| 67 | 70 | set_current_state(TASK_RUNNING); |
| 68 | 71 | mq->issue_fn(mq, req); |
| 69 | 72 | cond_resched(); |
| @@ -79,7 +82,7 @@ static int mmc_queue_thread(void *d) · 9 unmodified lines | ||
| 79 | 82 | * has been finished. Do not assign it to previous |
| 80 | 83 | * request. |
| 81 | 84 | */ |
| 82 | − if (mmc_req_is_special(req)) | |
| 85 | + if (req_is_special) | |
| 83 | 86 | mq->mqrq_cur->req = NULL; |
| 84 | 87 | |
| 85 | 88 | mq->mqrq_prev->brq.mrq.data = NULL; |
| @@ -4,7 +4,9 @@ · 3 unmodified lines | ||
| 4 | 4 | static inline bool mmc_req_is_special(struct request *req) |
| 5 | 5 | { |
| 6 | 6 | return req && |
| 7 | − (req_op(req) == REQ_OP_FLUSH || req_op(req) == REQ_OP_DISCARD); | |
| 7 | + (req_op(req) == REQ_OP_FLUSH || | |
| 8 | + req_op(req) == REQ_OP_DISCARD || | |
| 9 | + req_op(req) == REQ_OP_SECURE_ERASE); | |
| 8 | 10 | } |
| 9 | 11 | |
| 10 | 12 | struct request; |
| @@ -1112,11 +1112,12 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · 1111 unmodified lines | ||
| 1112 | 1112 | |
| 1113 | 1113 | div = (host->bus_hz != clock) ? DIV_ROUND_UP(div, 2) : 0; |
| 1114 | 1114 | |
| 1115 | − dev_info(&slot->mmc->class_dev, | |
| 1116 | − "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n", | |
| 1117 | − slot->id, host->bus_hz, clock, | |
| 1118 | − div ? ((host->bus_hz / div) >> 1) : | |
| 1119 | − host->bus_hz, div); | |
| 1115 | + if (clock != slot->__clk_old || force_clkinit) | |
| 1116 | + dev_info(&slot->mmc->class_dev, | |
| 1117 | + "Bus speed (slot %d) = %dHz (slot req %dHz, actual %dHZ div = %d)\n", | |
| 1118 | + slot->id, host->bus_hz, clock, | |
| 1119 | + div ? ((host->bus_hz / div) >> 1) : | |
| 1120 | + host->bus_hz, div); | |
| 1120 | 1121 | |
| 1121 | 1122 | /* disable clock */ |
| 1122 | 1123 | mci_writel(host, CLKENA, 0); |
| @@ -1139,6 +1140,9 @@ static void dw_mci_setup_bus(struct dw_mci_slot *slot, bool force_clkinit) · 16 unmodified lines | ||
| 1139 | 1140 | |
| 1140 | 1141 | /* inform CIU */ |
| 1141 | 1142 | mci_send_cmd(slot, sdmmc_cmd_bits, 0); |
| 1143 | + | |
| 1144 | + /* keep the last clock value that was requested from core */ | |
| 1145 | + slot->__clk_old = clock; | |
| 1142 | 1146 | } |
| 1143 | 1147 | |
| 1144 | 1148 | host->current_speed = clock; |
| @@ -249,6 +249,8 @@ extern int dw_mci_resume(struct dw_mci *host); · 248 unmodified lines | ||
| 249 | 249 | * @queue_node: List node for placing this node in the @queue list of |
| 250 | 250 | * &struct dw_mci. |
| 251 | 251 | * @clock: Clock rate configured by set_ios(). Protected by host->lock. |
| 252 | + * @__clk_old: The last clock value that was requested from core. | |
| 253 | + * Keeping track of this helps us to avoid spamming the console. | |
| 252 | 254 | * @flags: Random state bits associated with the slot. |
| 253 | 255 | * @id: Number of this slot. |
| 254 | 256 | * @sdio_id: Number of this slot in the SDIO interrupt registers. |
| @@ -263,6 +265,7 @@ struct dw_mci_slot { · 8 unmodified lines | ||
| 263 | 265 | struct list_head queue_node; |
| 264 | 266 | |
| 265 | 267 | unsigned int clock; |
| 268 | + unsigned int __clk_old; | |
| 266 | 269 | |
| 267 | 270 | unsigned long flags; |
| 268 | 271 | #define DW_MMC_CARD_PRESENT 0 |
| @@ -1016,14 +1016,16 @@ mmc_omap_prepare_data(struct mmc_omap_host *host, struct mmc_request *req) · 1015 unmodified lines | ||
| 1016 | 1016 | |
| 1017 | 1017 | /* Only reconfigure if we have a different burst size */ |
| 1018 | 1018 | if (*bp != burst) { |
| 1019 | − struct dma_slave_config cfg; | |
| 1020 | − | |
| 1021 | − cfg.src_addr = host->phys_base + OMAP_MMC_REG(host, DATA); | |
| 1022 | − cfg.dst_addr = host->phys_base + OMAP_MMC_REG(host, DATA); | |
| 1023 | − cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; | |
| 1024 | − cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES; | |
| 1025 | − cfg.src_maxburst = burst; | |
| 1026 | − cfg.dst_maxburst = burst; | |
| 1019 | + struct dma_slave_config cfg = { | |
| 1020 | + .src_addr = host->phys_base + | |
| 1021 | + OMAP_MMC_REG(host, DATA), | |
| 1022 | + .dst_addr = host->phys_base + | |
| 1023 | + OMAP_MMC_REG(host, DATA), | |
| 1024 | + .src_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES, | |
| 1025 | + .dst_addr_width = DMA_SLAVE_BUSWIDTH_2_BYTES, | |
| 1026 | + .src_maxburst = burst, | |
| 1027 | + .dst_maxburst = burst, | |
| 1028 | + }; | |
| 1027 | 1029 | |
| 1028 | 1030 | if (dmaengine_slave_config(c, &cfg)) |
| 1029 | 1031 | goto use_pio; |
| @@ -1409,11 +1409,18 @@ static int omap_hsmmc_pre_dma_transfer(struct omap_hsmmc_host *host, · 1408 unmodified lines | ||
| 1409 | 1409 | static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host, |
| 1410 | 1410 | struct mmc_request *req) |
| 1411 | 1411 | { |
| 1412 | − struct dma_slave_config cfg; | |
| 1413 | 1412 | struct dma_async_tx_descriptor *tx; |
| 1414 | 1413 | int ret = 0, i; |
| 1415 | 1414 | struct mmc_data *data = req->data; |
| 1416 | 1415 | struct dma_chan *chan; |
| 1416 | + struct dma_slave_config cfg = { | |
| 1417 | + .src_addr = host->mapbase + OMAP_HSMMC_DATA, | |
| 1418 | + .dst_addr = host->mapbase + OMAP_HSMMC_DATA, | |
| 1419 | + .src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, | |
| 1420 | + .dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES, | |
| 1421 | + .src_maxburst = data->blksz / 4, | |
| 1422 | + .dst_maxburst = data->blksz / 4, | |
| 1423 | + }; | |
| 1417 | 1424 | |
| 1418 | 1425 | /* Sanity check: all the SG entries must be aligned by block size. */ |
| 1419 | 1426 | for (i = 0; i < data->sg_len; i++) { |
| @@ -1433,13 +1440,6 @@ static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host, · 13 unmodified lines | ||
| 1433 | 1440 | |
| 1434 | 1441 | chan = omap_hsmmc_get_dma_chan(host, data); |
| 1435 | 1442 | |
| 1436 | − cfg.src_addr = host->mapbase + OMAP_HSMMC_DATA; | |
| 1437 | − cfg.dst_addr = host->mapbase + OMAP_HSMMC_DATA; | |
| 1438 | − cfg.src_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | |
| 1439 | − cfg.dst_addr_width = DMA_SLAVE_BUSWIDTH_4_BYTES; | |
| 1440 | − cfg.src_maxburst = data->blksz / 4; | |
| 1441 | − cfg.dst_maxburst = data->blksz / 4; | |
| 1442 | − | |
| 1443 | 1443 | ret = dmaengine_slave_config(chan, &cfg); |
| 1444 | 1444 | if (ret) |
| 1445 | 1445 | return ret; |
| @@ -28,6 +28,7 @@ · 27 unmodified lines | ||
| 28 | 28 | |
| 29 | 29 | struct st_mmc_platform_data { |
| 30 | 30 | struct reset_control *rstc; |
| 31 | + struct clk *icnclk; | |
| 31 | 32 | void __iomem *top_ioaddr; |
| 32 | 33 | }; |
| 33 | 34 | |
| @@ -353,7 +354,7 @@ static int sdhci_st_probe(struct platform_device *pdev) · 319 unmodified lines | ||
| 353 | 354 | struct sdhci_host *host; |
| 354 | 355 | struct st_mmc_platform_data *pdata; |
| 355 | 356 | struct sdhci_pltfm_host *pltfm_host; |
| 356 | − struct clk *clk; | |
| 357 | + struct clk *clk, *icnclk; | |
| 357 | 358 | int ret = 0; |
| 358 | 359 | u16 host_version; |
| 359 | 360 | struct resource *res; |
| @@ -365,6 +366,11 @@ static int sdhci_st_probe(struct platform_device *pdev) · 5 unmodified lines | ||
| 365 | 366 | return PTR_ERR(clk); |
| 366 | 367 | } |
| 367 | 368 | |
| 369 | + /* ICN clock isn't compulsory, but use it if it's provided. */ | |
| 370 | + icnclk = devm_clk_get(&pdev->dev, "icn"); | |
| 371 | + if (IS_ERR(icnclk)) | |
| 372 | + icnclk = NULL; | |
| 373 | + | |
| 368 | 374 | rstc = devm_reset_control_get(&pdev->dev, NULL); |
| 369 | 375 | if (IS_ERR(rstc)) |
| 370 | 376 | rstc = NULL; |
| @@ -389,6 +395,7 @@ static int sdhci_st_probe(struct platform_device *pdev) · 18 unmodified lines | ||
| 389 | 395 | } |
| 390 | 396 | |
| 391 | 397 | clk_prepare_enable(clk); |
| 398 | + clk_prepare_enable(icnclk); | |
| 392 | 399 | |
| 393 | 400 | /* Configure the FlashSS Top registers for setting eMMC TX/RX delay */ |
| 394 | 401 | res = platform_get_resource_byname(pdev, IORESOURCE_MEM, |
| @@ -400,6 +407,7 @@ static int sdhci_st_probe(struct platform_device *pdev) · 5 unmodified lines | ||
| 400 | 407 | } |
| 401 | 408 | |
| 402 | 409 | pltfm_host->clk = clk; |
| 410 | + pdata->icnclk = icnclk; | |
| 403 | 411 | |
| 404 | 412 | /* Configure the Arasan HC inside the flashSS */ |
| 405 | 413 | st_mmcss_cconfig(np, host); |
| @@ -422,6 +430,7 @@ static int sdhci_st_probe(struct platform_device *pdev) · 16 unmodified lines | ||
| 422 | 430 | return 0; |
| 423 | 431 | |
| 424 | 432 | err_out: |
| 433 | + clk_disable_unprepare(icnclk); | |
| 425 | 434 | clk_disable_unprepare(clk); |
| 426 | 435 | err_of: |
| 427 | 436 | sdhci_pltfm_free(pdev); |
| @@ -442,6 +451,8 @@ static int sdhci_st_remove(struct platform_device *pdev) · 14 unmodified lines | ||
| 442 | 451 | |
| 443 | 452 | ret = sdhci_pltfm_unregister(pdev); |
| 444 | 453 | |
| 454 | + clk_disable_unprepare(pdata->icnclk); | |
| 455 | + | |
| 445 | 456 | if (rstc) |
| 446 | 457 | reset_control_assert(rstc); |
| 447 | 458 | |
| @@ -462,6 +473,7 @@ static int sdhci_st_suspend(struct device *dev) · 14 unmodified lines | ||
| 462 | 473 | if (pdata->rstc) |
| 463 | 474 | reset_control_assert(pdata->rstc); |
| 464 | 475 | |
| 476 | + clk_disable_unprepare(pdata->icnclk); | |
| 465 | 477 | clk_disable_unprepare(pltfm_host->clk); |
| 466 | 478 | out: |
| 467 | 479 | return ret; |
| @@ -475,6 +487,7 @@ static int sdhci_st_resume(struct device *dev) · 7 unmodified lines | ||
| 475 | 487 | struct device_node *np = dev->of_node; |
| 476 | 488 | |
| 477 | 489 | clk_prepare_enable(pltfm_host->clk); |
| 490 | + clk_prepare_enable(pdata->icnclk); | |
| 478 | 491 | |
| 479 | 492 | if (pdata->rstc) |
| 480 | 493 | reset_control_deassert(pdata->rstc); |
| @@ -366,7 +366,8 @@ int mtk_ecc_encode(struct mtk_ecc *ecc, struct mtk_ecc_config *config, · 365 unmodified lines | ||
| 366 | 366 | u8 *data, u32 bytes) |
| 367 | 367 | { |
| 368 | 368 | dma_addr_t addr; |
| 369 | − u32 *p, len, i; | |
| 369 | + u8 *p; | |
| 370 | + u32 len, i, val; | |
| 370 | 371 | int ret = 0; |
| 371 | 372 | |
| 372 | 373 | addr = dma_map_single(ecc->dev, data, bytes, DMA_TO_DEVICE); |
| @@ -392,11 +393,14 @@ int mtk_ecc_encode(struct mtk_ecc *ecc, struct mtk_ecc_config *config, · 19 unmodified lines | ||
| 392 | 393 | |
| 393 | 394 | /* Program ECC bytes to OOB: per sector oob = FDM + ECC + SPARE */ |
| 394 | 395 | len = (config->strength * ECC_PARITY_BITS + 7) >> 3; |
| 395 | − p = (u32 *)(data + bytes); | |
| 396 | + p = data + bytes; | |
| 396 | 397 | |
| 397 | 398 | /* write the parity bytes generated by the ECC back to the OOB region */ |
| 398 | − for (i = 0; i < len; i++) | |
| 399 | − p[i] = readl(ecc->regs + ECC_ENCPAR(i)); | |
| 399 | + for (i = 0; i < len; i++) { | |
| 400 | + if ((i % 4) == 0) | |
| 401 | + val = readl(ecc->regs + ECC_ENCPAR(i / 4)); | |
| 402 | + p[i] = (val >> ((i % 4) * 8)) & 0xff; | |
| 403 | + } | |
| 400 | 404 | timeout: |
| 401 | 405 | |
| 402 | 406 | dma_unmap_single(ecc->dev, addr, bytes, DMA_TO_DEVICE); |
| @@ -93,6 +93,9 @@ · 92 unmodified lines | ||
| 93 | 93 | #define NFI_FSM_MASK (0xf << 16) |
| 94 | 94 | #define NFI_ADDRCNTR (0x70) |
| 95 | 95 | #define CNTR_MASK GENMASK(16, 12) |
| 96 | +#define ADDRCNTR_SEC_SHIFT (12) | |
| 97 | +#define ADDRCNTR_SEC(val) \ | |
| 98 | + (((val) & CNTR_MASK) >> ADDRCNTR_SEC_SHIFT) | |
| 96 | 99 | #define NFI_STRADDR (0x80) |
| 97 | 100 | #define NFI_BYTELEN (0x84) |
| 98 | 101 | #define NFI_CSEL (0x90) |
| @@ -699,7 +702,7 @@ static int mtk_nfc_do_write_page(struct mtd_info *mtd, struct nand_chip *chip, · 600 unmodified lines | ||
| 699 | 702 | } |
| 700 | 703 | |
| 701 | 704 | ret = readl_poll_timeout_atomic(nfc->regs + NFI_ADDRCNTR, reg, |
| 702 | − (reg & CNTR_MASK) >= chip->ecc.steps, | |
| 705 | + ADDRCNTR_SEC(reg) >= chip->ecc.steps, | |
| 703 | 706 | 10, MTK_TIMEOUT); |
| 704 | 707 | if (ret) |
| 705 | 708 | dev_err(dev, "hwecc write timeout\n"); |
| @@ -902,7 +905,7 @@ static int mtk_nfc_read_subpage(struct mtd_info *mtd, struct nand_chip *chip, · 196 unmodified lines | ||
| 902 | 905 | dev_warn(nfc->dev, "read ahb/dma done timeout\n"); |
| 903 | 906 | |
| 904 | 907 | rc = readl_poll_timeout_atomic(nfc->regs + NFI_BYTELEN, reg, |
| 905 | − (reg & CNTR_MASK) >= sectors, 10, | |
| 908 | + ADDRCNTR_SEC(reg) >= sectors, 10, | |
| 906 | 909 | MTK_TIMEOUT); |
| 907 | 910 | if (rc < 0) { |
| 908 | 911 | dev_err(nfc->dev, "subpage done timeout\n"); |
| @@ -943,7 +943,7 @@ static int mxc_v2_ooblayout_free(struct mtd_info *mtd, int section, · 942 unmodified lines | ||
| 943 | 943 | struct nand_chip *nand_chip = mtd_to_nand(mtd); |
| 944 | 944 | int stepsize = nand_chip->ecc.bytes == 9 ? 16 : 26; |
| 945 | 945 | |
| 946 | − if (section > nand_chip->ecc.steps) | |
| 946 | + if (section >= nand_chip->ecc.steps) | |
| 947 | 947 | return -ERANGE; |
| 948 | 948 | |
| 949 | 949 | if (!section) { |
| @@ -152,7 +152,7 @@ module_param(lacp_rate, charp, 0); · 151 unmodified lines | ||
| 152 | 152 | MODULE_PARM_DESC(lacp_rate, "LACPDU tx rate to request from 802.3ad partner; " |
| 153 | 153 | "0 for slow, 1 for fast"); |
| 154 | 154 | module_param(ad_select, charp, 0); |
| 155 | −MODULE_PARM_DESC(ad_select, "803.ad aggregation selection logic; " | |
| 155 | +MODULE_PARM_DESC(ad_select, "802.3ad aggregation selection logic; " | |
| 156 | 156 | "0 for stable (default), 1 for bandwidth, " |
| 157 | 157 | "2 for count"); |
| 158 | 158 | module_param(min_links, int, 0); |
| @@ -1341,9 +1341,10 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev) · 1182 unmodified lines | ||
| 1341 | 1341 | slave_dev->name); |
| 1342 | 1342 | } |
| 1343 | 1343 | |
| 1344 | − /* already enslaved */ | |
| 1345 | − if (slave_dev->flags & IFF_SLAVE) { | |
| 1346 | − netdev_dbg(bond_dev, "Error: Device was already enslaved\n"); | |
| 1344 | + /* already in-use? */ | |
| 1345 | + if (netdev_is_rx_handler_busy(slave_dev)) { | |
| 1346 | + netdev_err(bond_dev, | |
| 1347 | + "Error: Device is in use and cannot be enslaved\n"); | |
| 1347 | 1348 | return -EBUSY; |
| 1348 | 1349 | } |
| 1349 | 1350 | |
| @@ -1268,11 +1268,10 @@ static int __maybe_unused flexcan_suspend(struct device *device) · 1267 unmodified lines | ||
| 1268 | 1268 | struct flexcan_priv *priv = netdev_priv(dev); |
| 1269 | 1269 | int err; |
| 1270 | 1270 | |
| 1271 | − err = flexcan_chip_disable(priv); | |
| 1272 | − if (err) | |
| 1273 | − return err; | |
| 1274 | − | |
| 1275 | 1271 | if (netif_running(dev)) { |
| 1272 | + err = flexcan_chip_disable(priv); | |
| 1273 | + if (err) | |
| 1274 | + return err; | |
| 1276 | 1275 | netif_stop_queue(dev); |
| 1277 | 1276 | netif_device_detach(dev); |
| 1278 | 1277 | } |
| @@ -1285,13 +1284,17 @@ static int __maybe_unused flexcan_resume(struct device *device) · 6 unmodified lines | ||
| 1285 | 1284 | { |
| 1286 | 1285 | struct net_device *dev = dev_get_drvdata(device); |
| 1287 | 1286 | struct flexcan_priv *priv = netdev_priv(dev); |
| 1287 | + int err; | |
| 1288 | 1288 | |
| 1289 | 1289 | priv->can.state = CAN_STATE_ERROR_ACTIVE; |
| 1290 | 1290 | if (netif_running(dev)) { |
| 1291 | 1291 | netif_device_attach(dev); |
| 1292 | 1292 | netif_start_queue(dev); |
| 1293 | + err = flexcan_chip_enable(priv); | |
| 1294 | + if (err) | |
| 1295 | + return err; | |
| 1293 | 1296 | } |
| 1294 | − return flexcan_chip_enable(priv); | |
| 1297 | + return 0; | |
| 1295 | 1298 | } |
| 1296 | 1299 | |
| 1297 | 1300 | static SIMPLE_DEV_PM_OPS(flexcan_pm_ops, flexcan_suspend, flexcan_resume); |
| @@ -81,6 +81,10 @@ · 80 unmodified lines | ||
| 81 | 81 | #define IFI_CANFD_TIME_SET_TIMEA_4_12_6_6 BIT(15) |
| 82 | 82 | |
| 83 | 83 | #define IFI_CANFD_TDELAY 0x1c |
| 84 | +#define IFI_CANFD_TDELAY_DEFAULT 0xb | |
| 85 | +#define IFI_CANFD_TDELAY_MASK 0x3fff | |
| 86 | +#define IFI_CANFD_TDELAY_ABS BIT(14) | |
| 87 | +#define IFI_CANFD_TDELAY_EN BIT(15) | |
| 84 | 88 | |
| 85 | 89 | #define IFI_CANFD_ERROR 0x20 |
| 86 | 90 | #define IFI_CANFD_ERROR_TX_OFFSET 0 |
| @@ -641,7 +645,7 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) · 554 unmodified lines | ||
| 641 | 645 | struct ifi_canfd_priv *priv = netdev_priv(ndev); |
| 642 | 646 | const struct can_bittiming *bt = &priv->can.bittiming; |
| 643 | 647 | const struct can_bittiming *dbt = &priv->can.data_bittiming; |
| 644 | − u16 brp, sjw, tseg1, tseg2; | |
| 648 | + u16 brp, sjw, tseg1, tseg2, tdc; | |
| 645 | 649 | |
| 646 | 650 | /* Configure bit timing */ |
| 647 | 651 | brp = bt->brp - 2; |
| @@ -664,6 +668,11 @@ static void ifi_canfd_set_bittiming(struct net_device *ndev) · 16 unmodified lines | ||
| 664 | 668 | (brp << IFI_CANFD_TIME_PRESCALE_OFF) | |
| 665 | 669 | (sjw << IFI_CANFD_TIME_SJW_OFF_7_9_8_8), |
| 666 | 670 | priv->base + IFI_CANFD_FTIME); |
| 671 | + | |
| 672 | + /* Configure transmitter delay */ | |
| 673 | + tdc = (dbt->brp * (dbt->phase_seg1 + 1)) & IFI_CANFD_TDELAY_MASK; | |
| 674 | + writel(IFI_CANFD_TDELAY_EN | IFI_CANFD_TDELAY_ABS | tdc, | |
| 675 | + priv->base + IFI_CANFD_TDELAY); | |
| 667 | 676 | } |
| 668 | 677 | |
| 669 | 678 | static void ifi_canfd_set_filter(struct net_device *ndev, const u32 id, |
| @@ -258,7 +258,7 @@ · 257 unmodified lines | ||
| 258 | 258 | * BCM5325 and BCM5365 share most definitions below |
| 259 | 259 | */ |
| 260 | 260 | #define B53_ARLTBL_MAC_VID_ENTRY(n) (0x10 * (n)) |
| 261 | −#define ARLTBL_MAC_MASK 0xffffffffffff | |
| 261 | +#define ARLTBL_MAC_MASK 0xffffffffffffULL | |
| 262 | 262 | #define ARLTBL_VID_S 48 |
| 263 | 263 | #define ARLTBL_VID_MASK_25 0xff |
| 264 | 264 | #define ARLTBL_VID_MASK 0xfff |
| @@ -205,8 +205,8 @@ static inline void name##_writeq(struct bcm_sf2_priv *priv, u64 val, \ · 204 unmodified lines | ||
| 205 | 205 | static inline void intrl2_##which##_mask_clear(struct bcm_sf2_priv *priv, \ |
| 206 | 206 | u32 mask) \ |
| 207 | 207 | { \ |
| 208 | − intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \ | |
| 209 | 208 | priv->irq##which##_mask &= ~(mask); \ |
| 209 | + intrl2_##which##_writel(priv, mask, INTRL2_CPU_MASK_CLEAR); \ | |
| 210 | 210 | } \ |
| 211 | 211 | static inline void intrl2_##which##_mask_set(struct bcm_sf2_priv *priv, \ |
| 212 | 212 | u32 mask) \ |
| @@ -2656,15 +2656,19 @@ static int mv88e6xxx_setup_port(struct mv88e6xxx_chip *chip, int port) · 2655 unmodified lines | ||
| 2656 | 2656 | return ret; |
| 2657 | 2657 | } |
| 2658 | 2658 | |
| 2659 | + /* Rate Control: disable ingress rate limiting. */ | |
| 2659 | 2660 | if (mv88e6xxx_6352_family(chip) || mv88e6xxx_6351_family(chip) || |
| 2660 | 2661 | mv88e6xxx_6165_family(chip) || mv88e6xxx_6097_family(chip) || |
| 2661 | − mv88e6xxx_6185_family(chip) || mv88e6xxx_6095_family(chip) || | |
| 2662 | 2662 | mv88e6xxx_6320_family(chip)) { |
| 2663 | − /* Rate Control: disable ingress rate limiting. */ | |
| 2664 | 2663 | ret = _mv88e6xxx_reg_write(chip, REG_PORT(port), |
| 2665 | 2664 | PORT_RATE_CONTROL, 0x0001); |
| 2666 | 2665 | if (ret) |
| 2667 | 2666 | return ret; |
| 2667 | + } else if (mv88e6xxx_6185_family(chip) || mv88e6xxx_6095_family(chip)) { | |
| 2668 | + ret = _mv88e6xxx_reg_write(chip, REG_PORT(port), | |
| 2669 | + PORT_RATE_CONTROL, 0x0000); | |
| 2670 | + if (ret) | |
| 2671 | + return ret; | |
| 2668 | 2672 | } |
| 2669 | 2673 | |
| 2670 | 2674 | /* Port Control 1: disable trunking, disable sending |
| @@ -3187,6 +3191,7 @@ static int mv88e6xxx_set_addr(struct dsa_switch *ds, u8 *addr) · 516 unmodified lines | ||
| 3187 | 3191 | return err; |
| 3188 | 3192 | } |
| 3189 | 3193 | |
| 3194 | +#ifdef CONFIG_NET_DSA_HWMON | |
| 3190 | 3195 | static int mv88e6xxx_mdio_page_read(struct dsa_switch *ds, int port, int page, |
| 3191 | 3196 | int reg) |
| 3192 | 3197 | { |
| @@ -3212,6 +3217,7 @@ static int mv88e6xxx_mdio_page_write(struct dsa_switch *ds, int port, int page, · 19 unmodified lines | ||
| 3212 | 3217 | |
| 3213 | 3218 | return ret; |
| 3214 | 3219 | } |
| 3220 | +#endif | |
| 3215 | 3221 | |
| 3216 | 3222 | static int mv88e6xxx_port_to_mdio_addr(struct mv88e6xxx_chip *chip, int port) |
| 3217 | 3223 | { |
| @@ -793,6 +793,8 @@ int xgene_enet_phy_connect(struct net_device *ndev) · 792 unmodified lines | ||
| 793 | 793 | netdev_err(ndev, "Could not connect to PHY\n"); |
| 794 | 794 | return -ENODEV; |
| 795 | 795 | } |
| 796 | +#else | |
| 797 | + return -ENODEV; | |
| 796 | 798 | #endif |
| 797 | 799 | } |
| 798 | 800 | |
| @@ -771,8 +771,10 @@ int arc_emac_probe(struct net_device *ndev, int interface) · 770 unmodified lines | ||
| 771 | 771 | priv->dev = dev; |
| 772 | 772 | |
| 773 | 773 | priv->regs = devm_ioremap_resource(dev, &res_regs); |
| 774 | − if (IS_ERR(priv->regs)) | |
| 775 | − return PTR_ERR(priv->regs); | |
| 774 | + if (IS_ERR(priv->regs)) { | |
| 775 | + err = PTR_ERR(priv->regs); | |
| 776 | + goto out_put_node; | |
| 777 | + } | |
| 776 | 778 | |
| 777 | 779 | dev_dbg(dev, "Registers base address is 0x%p\n", priv->regs); |
| 778 | 780 | |
| @@ -1545,6 +1545,8 @@ static const struct pci_device_id alx_pci_tbl[] = { · 1544 unmodified lines | ||
| 1545 | 1545 | .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, |
| 1546 | 1546 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2400), |
| 1547 | 1547 | .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, |
| 1548 | + { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_E2500), | |
| 1549 | + .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, | |
| 1548 | 1550 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8162), |
| 1549 | 1551 | .driver_data = ALX_DEV_QUIRK_MSI_INTX_DISABLE_BUG }, |
| 1550 | 1552 | { PCI_VDEVICE(ATTANSIC, ALX_DEV_ID_AR8171) }, |
| @@ -38,6 +38,7 @@ · 37 unmodified lines | ||
| 38 | 38 | #define ALX_DEV_ID_AR8161 0x1091 |
| 39 | 39 | #define ALX_DEV_ID_E2200 0xe091 |
| 40 | 40 | #define ALX_DEV_ID_E2400 0xe0a1 |
| 41 | +#define ALX_DEV_ID_E2500 0xe0b1 | |
| 41 | 42 | #define ALX_DEV_ID_AR8162 0x1090 |
| 42 | 43 | #define ALX_DEV_ID_AR8171 0x10A1 |
| 43 | 44 | #define ALX_DEV_ID_AR8172 0x10A0 |
| @@ -159,7 +159,7 @@ static int bgmac_probe(struct bcma_device *core) · 158 unmodified lines | ||
| 159 | 159 | |
| 160 | 160 | if (!bgmac_is_bcm4707_family(core)) { |
| 161 | 161 | mii_bus = bcma_mdio_mii_register(core, bgmac->phyaddr); |
| 162 | − if (!IS_ERR(mii_bus)) { | |
| 162 | + if (IS_ERR(mii_bus)) { | |
| 163 | 163 | err = PTR_ERR(mii_bus); |
| 164 | 164 | goto err; |
| 165 | 165 | } |
| @@ -6356,10 +6356,6 @@ bnx2_open(struct net_device *dev) · 6355 unmodified lines | ||
| 6356 | 6356 | struct bnx2 *bp = netdev_priv(dev); |
| 6357 | 6357 | int rc; |
| 6358 | 6358 | |
| 6359 | − rc = bnx2_request_firmware(bp); | |
| 6360 | − if (rc < 0) | |
| 6361 | − goto out; | |
| 6362 | − | |
| 6363 | 6359 | netif_carrier_off(dev); |
| 6364 | 6360 | |
| 6365 | 6361 | bnx2_disable_int(bp); |
| @@ -6428,7 +6424,6 @@ open_err: · 62 unmodified lines | ||
| 6428 | 6424 | bnx2_free_irq(bp); |
| 6429 | 6425 | bnx2_free_mem(bp); |
| 6430 | 6426 | bnx2_del_napi(bp); |
| 6431 | − bnx2_release_firmware(bp); | |
| 6432 | 6427 | goto out; |
| 6433 | 6428 | } |
| 6434 | 6429 | |
| @@ -8575,6 +8570,12 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) · 2140 unmodified lines | ||
| 8575 | 8570 | |
| 8576 | 8571 | pci_set_drvdata(pdev, dev); |
| 8577 | 8572 | |
| 8573 | + rc = bnx2_request_firmware(bp); | |
| 8574 | + if (rc < 0) | |
| 8575 | + goto error; | |
| 8576 | + | |
| 8577 | + | |
| 8578 | + bnx2_reset_chip(bp, BNX2_DRV_MSG_CODE_RESET); | |
| 8578 | 8579 | memcpy(dev->dev_addr, bp->mac_addr, ETH_ALEN); |
| 8579 | 8580 | |
| 8580 | 8581 | dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_SG | |
| @@ -8607,6 +8608,7 @@ bnx2_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) · 26 unmodified lines | ||
| 8607 | 8608 | return 0; |
| 8608 | 8609 | |
| 8609 | 8610 | error: |
| 8611 | + bnx2_release_firmware(bp); | |
| 8610 | 8612 | pci_iounmap(pdev, bp->regview); |
| 8611 | 8613 | pci_release_regions(pdev); |
| 8612 | 8614 | pci_disable_device(pdev); |
| @@ -772,6 +772,11 @@ void bnx2x_fw_dump_lvl(struct bnx2x *bp, const char *lvl) · 771 unmodified lines | ||
| 772 | 772 | (bp->common.bc_ver & 0xff00) >> 8, |
| 773 | 773 | (bp->common.bc_ver & 0xff)); |
| 774 | 774 | |
| 775 | + if (pci_channel_offline(bp->pdev)) { | |
| 776 | + BNX2X_ERR("Cannot dump MCP info while in PCI error\n"); | |
| 777 | + return; | |
| 778 | + } | |
| 779 | + | |
| 775 | 780 | val = REG_RD(bp, MCP_REG_MCPR_CPU_PROGRAM_COUNTER); |
| 776 | 781 | if (val == REG_RD(bp, MCP_REG_MCPR_CPU_PROGRAM_COUNTER)) |
| 777 | 782 | BNX2X_ERR("%s" "MCP PC at 0x%x\n", lvl, val); |
| @@ -9415,10 +9420,16 @@ unload_error: · 8637 unmodified lines | ||
| 9415 | 9420 | /* Release IRQs */ |
| 9416 | 9421 | bnx2x_free_irq(bp); |
| 9417 | 9422 | |
| 9418 | − /* Reset the chip */ | |
| 9419 | − rc = bnx2x_reset_hw(bp, reset_code); | |
| 9420 | − if (rc) | |
| 9421 | − BNX2X_ERR("HW_RESET failed\n"); | |
| 9423 | + /* Reset the chip, unless PCI function is offline. If we reach this | |
| 9424 | + * point following a PCI error handling, it means device is really | |
| 9425 | + * in a bad state and we're about to remove it, so reset the chip | |
| 9426 | + * is not a good idea. | |
| 9427 | + */ | |
| 9428 | + if (!pci_channel_offline(bp->pdev)) { | |
| 9429 | + rc = bnx2x_reset_hw(bp, reset_code); | |
| 9430 | + if (rc) | |
| 9431 | + BNX2X_ERR("HW_RESET failed\n"); | |
| 9432 | + } | |
| 9422 | 9433 | |
| 9423 | 9434 | /* Report UNLOAD_DONE to MCP */ |
| 9424 | 9435 | bnx2x_send_unload_done(bp, keep_link); |
| @@ -353,8 +353,8 @@ static netdev_tx_t bnxt_start_xmit(struct sk_buff *skb, struct net_device *dev) · 352 unmodified lines | ||
| 353 | 353 | push_len = (length + sizeof(*tx_push) + 7) / 8; |
| 354 | 354 | if (push_len > 16) { |
| 355 | 355 | __iowrite64_copy(txr->tx_doorbell, tx_push_buf, 16); |
| 356 | − __iowrite64_copy(txr->tx_doorbell + 4, tx_push_buf + 1, | |
| 357 | − push_len - 16); | |
| 356 | + __iowrite32_copy(txr->tx_doorbell + 4, tx_push_buf + 1, | |
| 357 | + (push_len - 16) << 1); | |
| 358 | 358 | } else { |
| 359 | 359 | __iowrite64_copy(txr->tx_doorbell, tx_push_buf, |
| 360 | 360 | push_len); |
| @@ -12552,10 +12552,6 @@ static int tg3_get_rxnfc(struct net_device *dev, struct ethtool_rxnfc *info, · 12551 unmodified lines | ||
| 12552 | 12552 | info->data = TG3_RSS_MAX_NUM_QS; |
| 12553 | 12553 | } |
| 12554 | 12554 | |
| 12555 | − /* The first interrupt vector only | |
| 12556 | − * handles link interrupts. | |
| 12557 | − */ | |
| 12558 | − info->data -= 1; | |
| 12559 | 12555 | return 0; |
| 12560 | 12556 | |
| 12561 | 12557 | default: |
| @@ -14014,7 +14010,9 @@ static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) · 1452 unmodified lines | ||
| 14014 | 14010 | } |
| 14015 | 14011 | |
| 14016 | 14012 | if ((ec->rx_coalesce_usecs > MAX_RXCOL_TICKS) || |
| 14013 | + (!ec->rx_coalesce_usecs) || | |
| 14017 | 14014 | (ec->tx_coalesce_usecs > MAX_TXCOL_TICKS) || |
| 14015 | + (!ec->tx_coalesce_usecs) || | |
| 14018 | 14016 | (ec->rx_max_coalesced_frames > MAX_RXMAX_FRAMES) || |
| 14019 | 14017 | (ec->tx_max_coalesced_frames > MAX_TXMAX_FRAMES) || |
| 14020 | 14018 | (ec->rx_coalesce_usecs_irq > max_rxcoal_tick_int) || |
| @@ -14025,16 +14023,6 @@ static int tg3_set_coalesce(struct net_device *dev, struct ethtool_coalesce *ec) · 4 unmodified lines | ||
| 14025 | 14023 | (ec->stats_block_coalesce_usecs < min_stat_coal_ticks)) |
| 14026 | 14024 | return -EINVAL; |
| 14027 | 14025 | |
| 14028 | − /* No rx interrupts will be generated if both are zero */ | |
| 14029 | − if ((ec->rx_coalesce_usecs == 0) && | |
| 14030 | − (ec->rx_max_coalesced_frames == 0)) | |
| 14031 | − return -EINVAL; | |
| 14032 | − | |
| 14033 | − /* No tx interrupts will be generated if both are zero */ | |
| 14034 | − if ((ec->tx_coalesce_usecs == 0) && | |
| 14035 | − (ec->tx_max_coalesced_frames == 0)) | |
| 14036 | − return -EINVAL; | |
| 14037 | − | |
| 14038 | 14026 | /* Only copy relevant parameters, ignore all others. */ |
| 14039 | 14027 | tp->coal.rx_coalesce_usecs = ec->rx_coalesce_usecs; |
| 14040 | 14028 | tp->coal.tx_coalesce_usecs = ec->tx_coalesce_usecs; |
| @@ -31,15 +31,10 @@ · 30 unmodified lines | ||
| 31 | 31 | #define BNAD_NUM_TXF_COUNTERS 12 |
| 32 | 32 | #define BNAD_NUM_RXF_COUNTERS 10 |
| 33 | 33 | #define BNAD_NUM_CQ_COUNTERS (3 + 5) |
| 34 | −#define BNAD_NUM_RXQ_COUNTERS 6 | |
| 34 | +#define BNAD_NUM_RXQ_COUNTERS 7 | |
| 35 | 35 | #define BNAD_NUM_TXQ_COUNTERS 5 |
| 36 | 36 | |
| 37 | −#define BNAD_ETHTOOL_STATS_NUM \ | |
| 38 | − (sizeof(struct rtnl_link_stats64) / sizeof(u64) + \ | |
| 39 | − sizeof(struct bnad_drv_stats) / sizeof(u64) + \ | |
| 40 | − offsetof(struct bfi_enet_stats, rxf_stats[0]) / sizeof(u64)) | |
| 41 | − | |
| 42 | −static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { | |
| 37 | +static const char *bnad_net_stats_strings[] = { | |
| 43 | 38 | "rx_packets", |
| 44 | 39 | "tx_packets", |
| 45 | 40 | "rx_bytes", |
| @@ -50,22 +45,10 @@ static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { · 4 unmodified lines | ||
| 50 | 45 | "tx_dropped", |
| 51 | 46 | "multicast", |
| 52 | 47 | "collisions", |
| 53 | − | |
| 54 | 48 | "rx_length_errors", |
| 55 | − "rx_over_errors", | |
| 56 | 49 | "rx_crc_errors", |
| 57 | 50 | "rx_frame_errors", |
| 58 | − "rx_fifo_errors", | |
| 59 | − "rx_missed_errors", | |
| 60 | − | |
| 61 | − "tx_aborted_errors", | |
| 62 | − "tx_carrier_errors", | |
| 63 | 51 | "tx_fifo_errors", |
| 64 | − "tx_heartbeat_errors", | |
| 65 | − "tx_window_errors", | |
| 66 | − | |
| 67 | − "rx_compressed", | |
| 68 | − "tx_compressed", | |
| 69 | 52 | |
| 70 | 53 | "netif_queue_stop", |
| 71 | 54 | "netif_queue_wakeup", |
| @@ -254,6 +237,8 @@ static const char *bnad_net_stats_strings[BNAD_ETHTOOL_STATS_NUM] = { · 182 unmodified lines | ||
| 254 | 237 | "fc_tx_fid_parity_errors", |
| 255 | 238 | }; |
| 256 | 239 | |
| 240 | +#define BNAD_ETHTOOL_STATS_NUM ARRAY_SIZE(bnad_net_stats_strings) | |
| 241 | + | |
| 257 | 242 | static int |
| 258 | 243 | bnad_get_settings(struct net_device *netdev, struct ethtool_cmd *cmd) |
| 259 | 244 | { |
| @@ -658,6 +643,8 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string) · 398 unmodified lines | ||
| 658 | 643 | string += ETH_GSTRING_LEN; |
| 659 | 644 | sprintf(string, "rxq%d_allocbuf_failed", q_num); |
| 660 | 645 | string += ETH_GSTRING_LEN; |
| 646 | + sprintf(string, "rxq%d_mapbuf_failed", q_num); | |
| 647 | + string += ETH_GSTRING_LEN; | |
| 661 | 648 | sprintf(string, "rxq%d_producer_index", q_num); |
| 662 | 649 | string += ETH_GSTRING_LEN; |
| 663 | 650 | sprintf(string, "rxq%d_consumer_index", q_num); |
| @@ -678,6 +665,9 @@ bnad_get_strings(struct net_device *netdev, u32 stringset, u8 *string) · 14 unmodified lines | ||
| 678 | 665 | sprintf(string, "rxq%d_allocbuf_failed", |
| 679 | 666 | q_num); |
| 680 | 667 | string += ETH_GSTRING_LEN; |
| 668 | + sprintf(string, "rxq%d_mapbuf_failed", | |
| 669 | + q_num); | |
| 670 | + string += ETH_GSTRING_LEN; | |
| 681 | 671 | sprintf(string, "rxq%d_producer_index", |
| 682 | 672 | q_num); |
| 683 | 673 | string += ETH_GSTRING_LEN; |
| @@ -854,9 +844,9 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, · 170 unmodified lines | ||
| 854 | 844 | u64 *buf) |
| 855 | 845 | { |
| 856 | 846 | struct bnad *bnad = netdev_priv(netdev); |
| 857 | − int i, j, bi; | |
| 847 | + int i, j, bi = 0; | |
| 858 | 848 | unsigned long flags; |
| 859 | − struct rtnl_link_stats64 *net_stats64; | |
| 849 | + struct rtnl_link_stats64 net_stats64; | |
| 860 | 850 | u64 *stats64; |
| 861 | 851 | u32 bmap; |
| 862 | 852 | |
| @@ -871,14 +861,25 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats, · 8 unmodified lines | ||
| 871 | 861 | * under the same lock |
| 872 | 862 | */ |
| 873 | 863 | spin_lock_irqsave(&bnad->bna_lock, flags); |
| 874 | − bi = 0; | |
| 875 | − memset(buf, 0, stats->n_stats * sizeof(u64)); | |
| 876 | − | |
| 877 | − net_stats64 = (struct rtnl_link_stats64 *)buf; | |
| 878 | − bnad_netdev_qstats_fill(bnad, net_stats64); | |
| 879 | − bnad_netdev_hwstats_fill(bnad, net_stats64); | |
| 880 | 864 | |
| 881 | − bi = sizeof(*net_stats64) / sizeof(u64); | |
| 865 | + memset(&net_stats64, 0, sizeof(net_stats64)); | |
| 866 | + bnad_netdev_qstats_fill(bnad, &net_stats64); | |
| 867 | + bnad_netdev_hwstats_fill(bnad, &net_stats64); | |
| 868 | + | |
| 869 | + buf[bi++] = net_stats64.rx_packets; | |
| 870 | + buf[bi++] = net_stats64.tx_packets; | |
| 871 | + buf[bi++] = net_stats64.rx_bytes; | |
| 872 | + buf[bi++] = net_stats64.tx_bytes; | |
| 873 | + buf[bi++] = net_stats64.rx_errors; | |
| 874 | + buf[bi++] = net_stats64.tx_errors; | |
| 875 | + buf[bi++] = net_stats64.rx_dropped; | |
| 876 | + buf[bi++] = net_stats64.tx_dropped; | |
| 877 | + buf[bi++] = net_stats64.multicast; | |
| 878 | + buf[bi++] = net_stats64.collisions; | |
| 879 | + buf[bi++] = net_stats64.rx_length_errors; | |
| 880 | + buf[bi++] = net_stats64.rx_crc_errors; | |
| 881 | + buf[bi++] = net_stats64.rx_frame_errors; | |
| 882 | + buf[bi++] = net_stats64.tx_fifo_errors; | |
| 882 | 883 | |
| 883 | 884 | /* Get netif_queue_stopped from stack */ |
| 884 | 885 | bnad->stats.drv_stats.netif_queue_stopped = netif_queue_stopped(netdev); |
| @@ -1323,6 +1323,24 @@ dma_error: · 1322 unmodified lines | ||
| 1323 | 1323 | return 0; |
| 1324 | 1324 | } |
| 1325 | 1325 | |
| 1326 | +static inline int macb_clear_csum(struct sk_buff *skb) | |
| 1327 | +{ | |
| 1328 | + /* no change for packets without checksum offloading */ | |
| 1329 | + if (skb->ip_summed != CHECKSUM_PARTIAL) | |
| 1330 | + return 0; | |
| 1331 | + | |
| 1332 | + /* make sure we can modify the header */ | |
| 1333 | + if (unlikely(skb_cow_head(skb, 0))) | |
| 1334 | + return -1; | |
| 1335 | + | |
| 1336 | + /* initialize checksum field | |
| 1337 | + * This is required - at least for Zynq, which otherwise calculates | |
| 1338 | + * wrong UDP header checksums for UDP packets with UDP data len <=2 | |
| 1339 | + */ | |
| 1340 | + *(__sum16 *)(skb_checksum_start(skb) + skb->csum_offset) = 0; | |
| 1341 | + return 0; | |
| 1342 | +} | |
| 1343 | + | |
| 1326 | 1344 | static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) |
| 1327 | 1345 | { |
| 1328 | 1346 | u16 queue_index = skb_get_queue_mapping(skb); |
| @@ -1362,6 +1380,11 @@ static int macb_start_xmit(struct sk_buff *skb, struct net_device *dev) · 33 unmodified lines | ||
| 1362 | 1380 | return NETDEV_TX_BUSY; |
| 1363 | 1381 | } |
| 1364 | 1382 | |
| 1383 | + if (macb_clear_csum(skb)) { | |
| 1384 | + dev_kfree_skb_any(skb); | |
| 1385 | + return NETDEV_TX_OK; | |
| 1386 | + } | |
| 1387 | + | |
| 1365 | 1388 | /* Map socket buffer for DMA transfer */ |
| 1366 | 1389 | if (!macb_tx_map(bp, queue, skb)) { |
| 1367 | 1390 | dev_kfree_skb_any(skb); |
| @@ -403,11 +403,11 @@ · 402 unmodified lines | ||
| 403 | 403 | #define MACB_CAPS_USRIO_DEFAULT_IS_MII_GMII 0x00000004 |
| 404 | 404 | #define MACB_CAPS_NO_GIGABIT_HALF 0x00000008 |
| 405 | 405 | #define MACB_CAPS_USRIO_DISABLED 0x00000010 |
| 406 | +#define MACB_CAPS_JUMBO 0x00000020 | |
| 406 | 407 | #define MACB_CAPS_FIFO_MODE 0x10000000 |
| 407 | 408 | #define MACB_CAPS_GIGABIT_MODE_AVAILABLE 0x20000000 |
| 408 | 409 | #define MACB_CAPS_SG_DISABLED 0x40000000 |
| 409 | 410 | #define MACB_CAPS_MACB_IS_GEM 0x80000000 |
| 410 | −#define MACB_CAPS_JUMBO 0x00000010 | |
| 411 | 411 | |
| 412 | 412 | /* Bit manipulation macros */ |
| 413 | 413 | #define MACB_BIT(name) \ |
| @@ -279,6 +279,7 @@ struct nicvf { · 278 unmodified lines | ||
| 279 | 279 | u8 sqs_id; |
| 280 | 280 | bool sqs_mode; |
| 281 | 281 | bool hw_tso; |
| 282 | + bool t88; | |
| 282 | 283 | |
| 283 | 284 | /* Receive buffer alloc */ |
| 284 | 285 | u32 rb_page_offset; |
| @@ -251,9 +251,14 @@ static void nic_set_tx_pkt_pad(struct nicpf *nic, int size) · 250 unmodified lines | ||
| 251 | 251 | int lmac; |
| 252 | 252 | u64 lmac_cfg; |
| 253 | 253 | |
| 254 | − /* Max value that can be set is 60 */ | |
| 255 | − if (size > 60) | |
| 256 | − size = 60; | |
| 254 | + /* There is a issue in HW where-in while sending GSO sized | |
| 255 | + * pkts as part of TSO, if pkt len falls below this size | |
| 256 | + * NIC will zero PAD packet and also updates IP total length. | |
| 257 | + * Hence set this value to lessthan min pkt size of MAC+IP+TCP | |
| 258 | + * headers, BGX will do the padding to transmit 64 byte pkt. | |
| 259 | + */ | |
| 260 | + if (size > 52) | |
| 261 | + size = 52; | |
| 257 | 262 | |
| 258 | 263 | for (lmac = 0; lmac < (MAX_BGX_PER_CN88XX * MAX_LMAC_PER_BGX); lmac++) { |
| 259 | 264 | lmac_cfg = nic_reg_read(nic, NIC_PF_LMAC_0_7_CFG | (lmac << 3)); |
| @@ -170,7 +170,6 @@ · 169 unmodified lines | ||
| 170 | 170 | #define NIC_QSET_SQ_0_7_DOOR (0x010838) |
| 171 | 171 | #define NIC_QSET_SQ_0_7_STATUS (0x010840) |
| 172 | 172 | #define NIC_QSET_SQ_0_7_DEBUG (0x010848) |
| 173 | −#define NIC_QSET_SQ_0_7_CNM_CHG (0x010860) | |
| 174 | 173 | #define NIC_QSET_SQ_0_7_STAT_0_1 (0x010900) |
| 175 | 174 | |
| 176 | 175 | #define NIC_QSET_RBDR_0_1_CFG (0x010C00) |
| @@ -382,7 +382,10 @@ static void nicvf_get_regs(struct net_device *dev, · 381 unmodified lines | ||
| 382 | 382 | p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_DOOR, q); |
| 383 | 383 | p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_STATUS, q); |
| 384 | 384 | p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_DEBUG, q); |
| 385 | − p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_CNM_CHG, q); | |
| 385 | + /* Padding, was NIC_QSET_SQ_0_7_CNM_CHG, which | |
| 386 | + * produces bus errors when read | |
| 387 | + */ | |
| 388 | + p[i++] = 0; | |
| 386 | 389 | p[i++] = nicvf_queue_reg_read(nic, NIC_QSET_SQ_0_7_STAT_0_1, q); |
| 387 | 390 | reg_offset = NIC_QSET_SQ_0_7_STAT_0_1 | (1 << 3); |
| 388 | 391 | p[i++] = nicvf_queue_reg_read(nic, reg_offset, q); |
| @@ -513,6 +513,7 @@ static void nicvf_snd_pkt_handler(struct net_device *netdev, · 512 unmodified lines | ||
| 513 | 513 | struct nicvf *nic = netdev_priv(netdev); |
| 514 | 514 | struct snd_queue *sq; |
| 515 | 515 | struct sq_hdr_subdesc *hdr; |
| 516 | + struct sq_hdr_subdesc *tso_sqe; | |
| 516 | 517 | |
| 517 | 518 | sq = &nic->qs->sq[cqe_tx->sq_idx]; |
| 518 | 519 | |
| @@ -527,17 +528,21 @@ static void nicvf_snd_pkt_handler(struct net_device *netdev, · 8 unmodified lines | ||
| 527 | 528 | |
| 528 | 529 | nicvf_check_cqe_tx_errs(nic, cq, cqe_tx); |
| 529 | 530 | skb = (struct sk_buff *)sq->skbuff[cqe_tx->sqe_ptr]; |
| 530 | − /* For TSO offloaded packets only one SQE will have a valid SKB */ | |
| 531 | 531 | if (skb) { |
| 532 | + /* Check for dummy descriptor used for HW TSO offload on 88xx */ | |
| 533 | + if (hdr->dont_send) { | |
| 534 | + /* Get actual TSO descriptors and free them */ | |
| 535 | + tso_sqe = | |
| 536 | + (struct sq_hdr_subdesc *)GET_SQ_DESC(sq, hdr->rsvd2); | |
| 537 | + nicvf_put_sq_desc(sq, tso_sqe->subdesc_cnt + 1); | |
| 538 | + } | |
| 532 | 539 | nicvf_put_sq_desc(sq, hdr->subdesc_cnt + 1); |
| 533 | 540 | prefetch(skb); |
| 534 | 541 | dev_consume_skb_any(skb); |
| 535 | 542 | sq->skbuff[cqe_tx->sqe_ptr] = (u64)NULL; |
| 536 | 543 | } else { |
| 537 | − /* In case of HW TSO, HW sends a CQE for each segment of a TSO | |
| 538 | − * packet instead of a single CQE for the whole TSO packet | |
| 539 | − * transmitted. Each of this CQE points to the same SQE, so | |
| 540 | − * avoid freeing same SQE multiple times. | |
| 544 | + /* In case of SW TSO on 88xx, only last segment will have | |
| 545 | + * a SKB attached, so just free SQEs here. | |
| 541 | 546 | */ |
| 542 | 547 | if (!nic->hw_tso) |
| 543 | 548 | nicvf_put_sq_desc(sq, hdr->subdesc_cnt + 1); |
| @@ -1502,6 +1507,7 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 958 unmodified lines | ||
| 1502 | 1507 | struct net_device *netdev; |
| 1503 | 1508 | struct nicvf *nic; |
| 1504 | 1509 | int err, qcount; |
| 1510 | + u16 sdevid; | |
| 1505 | 1511 | |
| 1506 | 1512 | err = pci_enable_device(pdev); |
| 1507 | 1513 | if (err) { |
| @@ -1575,6 +1581,10 @@ static int nicvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 67 unmodified lines | ||
| 1575 | 1581 | if (!pass1_silicon(nic->pdev)) |
| 1576 | 1582 | nic->hw_tso = true; |
| 1577 | 1583 | |
| 1584 | + pci_read_config_word(nic->pdev, PCI_SUBSYSTEM_ID, &sdevid); | |
| 1585 | + if (sdevid == 0xA134) | |
| 1586 | + nic->t88 = true; | |
| 1587 | + | |
| 1578 | 1588 | /* Check if this VF is in QS only mode */ |
| 1579 | 1589 | if (nic->sqs_mode) |
| 1580 | 1590 | return 0; |
| @@ -938,6 +938,8 @@ static int nicvf_tso_count_subdescs(struct sk_buff *skb) · 937 unmodified lines | ||
| 938 | 938 | return num_edescs + sh->gso_segs; |
| 939 | 939 | } |
| 940 | 940 | |
| 941 | +#define POST_CQE_DESC_COUNT 2 | |
| 942 | + | |
| 941 | 943 | /* Get the number of SQ descriptors needed to xmit this skb */ |
| 942 | 944 | static int nicvf_sq_subdesc_required(struct nicvf *nic, struct sk_buff *skb) |
| 943 | 945 | { |
| @@ -948,6 +950,10 @@ static int nicvf_sq_subdesc_required(struct nicvf *nic, struct sk_buff *skb) · 4 unmodified lines | ||
| 948 | 950 | return subdesc_cnt; |
| 949 | 951 | } |
| 950 | 952 | |
| 953 | + /* Dummy descriptors to get TSO pkt completion notification */ | |
| 954 | + if (nic->t88 && nic->hw_tso && skb_shinfo(skb)->gso_size) | |
| 955 | + subdesc_cnt += POST_CQE_DESC_COUNT; | |
| 956 | + | |
| 951 | 957 | if (skb_shinfo(skb)->nr_frags) |
| 952 | 958 | subdesc_cnt += skb_shinfo(skb)->nr_frags; |
| 953 | 959 | |
| @@ -965,14 +971,21 @@ nicvf_sq_add_hdr_subdesc(struct nicvf *nic, struct snd_queue *sq, int qentry, · 11 unmodified lines | ||
| 965 | 971 | struct sq_hdr_subdesc *hdr; |
| 966 | 972 | |
| 967 | 973 | hdr = (struct sq_hdr_subdesc *)GET_SQ_DESC(sq, qentry); |
| 968 | − sq->skbuff[qentry] = (u64)skb; | |
| 969 | − | |
| 970 | 974 | memset(hdr, 0, SND_QUEUE_DESC_SIZE); |
| 971 | 975 | hdr->subdesc_type = SQ_DESC_TYPE_HEADER; |
| 972 | − /* Enable notification via CQE after processing SQE */ | |
| 973 | − hdr->post_cqe = 1; | |
| 974 | − /* No of subdescriptors following this */ | |
| 975 | − hdr->subdesc_cnt = subdesc_cnt; | |
| 976 | + | |
| 977 | + if (nic->t88 && nic->hw_tso && skb_shinfo(skb)->gso_size) { | |
| 978 | + /* post_cqe = 0, to avoid HW posting a CQE for every TSO | |
| 979 | + * segment transmitted on 88xx. | |
| 980 | + */ | |
| 981 | + hdr->subdesc_cnt = subdesc_cnt - POST_CQE_DESC_COUNT; | |
| 982 | + } else { | |
| 983 | + sq->skbuff[qentry] = (u64)skb; | |
| 984 | + /* Enable notification via CQE after processing SQE */ | |
| 985 | + hdr->post_cqe = 1; | |
| 986 | + /* No of subdescriptors following this */ | |
| 987 | + hdr->subdesc_cnt = subdesc_cnt; | |
| 988 | + } | |
| 976 | 989 | hdr->tot_len = len; |
| 977 | 990 | |
| 978 | 991 | /* Offload checksum calculation to HW */ |
| @@ -1023,6 +1036,37 @@ static inline void nicvf_sq_add_gather_subdesc(struct snd_queue *sq, int qentry, · 44 unmodified lines | ||
| 1023 | 1036 | gather->addr = data; |
| 1024 | 1037 | } |
| 1025 | 1038 | |
| 1039 | +/* Add HDR + IMMEDIATE subdescriptors right after descriptors of a TSO | |
| 1040 | + * packet so that a CQE is posted as a notifation for transmission of | |
| 1041 | + * TSO packet. | |
| 1042 | + */ | |
| 1043 | +static inline void nicvf_sq_add_cqe_subdesc(struct snd_queue *sq, int qentry, | |
| 1044 | + int tso_sqe, struct sk_buff *skb) | |
| 1045 | +{ | |
| 1046 | + struct sq_imm_subdesc *imm; | |
| 1047 | + struct sq_hdr_subdesc *hdr; | |
| 1048 | + | |
| 1049 | + sq->skbuff[qentry] = (u64)skb; | |
| 1050 | + | |
| 1051 | + hdr = (struct sq_hdr_subdesc *)GET_SQ_DESC(sq, qentry); | |
| 1052 | + memset(hdr, 0, SND_QUEUE_DESC_SIZE); | |
| 1053 | + hdr->subdesc_type = SQ_DESC_TYPE_HEADER; | |
| 1054 | + /* Enable notification via CQE after processing SQE */ | |
| 1055 | + hdr->post_cqe = 1; | |
| 1056 | + /* There is no packet to transmit here */ | |
| 1057 | + hdr->dont_send = 1; | |
| 1058 | + hdr->subdesc_cnt = POST_CQE_DESC_COUNT - 1; | |
| 1059 | + hdr->tot_len = 1; | |
| 1060 | + /* Actual TSO header SQE index, needed for cleanup */ | |
| 1061 | + hdr->rsvd2 = tso_sqe; | |
| 1062 | + | |
| 1063 | + qentry = nicvf_get_nxt_sqentry(sq, qentry); | |
| 1064 | + imm = (struct sq_imm_subdesc *)GET_SQ_DESC(sq, qentry); | |
| 1065 | + memset(imm, 0, SND_QUEUE_DESC_SIZE); | |
| 1066 | + imm->subdesc_type = SQ_DESC_TYPE_IMMEDIATE; | |
| 1067 | + imm->len = 1; | |
| 1068 | +} | |
| 1069 | + | |
| 1026 | 1070 | /* Segment a TSO packet into 'gso_size' segments and append |
| 1027 | 1071 | * them to SQ for transfer |
| 1028 | 1072 | */ |
| @@ -1096,7 +1140,7 @@ static int nicvf_sq_append_tso(struct nicvf *nic, struct snd_queue *sq, · 67 unmodified lines | ||
| 1096 | 1140 | int nicvf_sq_append_skb(struct nicvf *nic, struct sk_buff *skb) |
| 1097 | 1141 | { |
| 1098 | 1142 | int i, size; |
| 1099 | − int subdesc_cnt; | |
| 1143 | + int subdesc_cnt, tso_sqe = 0; | |
| 1100 | 1144 | int sq_num, qentry; |
| 1101 | 1145 | struct queue_set *qs; |
| 1102 | 1146 | struct snd_queue *sq; |
| @@ -1131,6 +1175,7 @@ int nicvf_sq_append_skb(struct nicvf *nic, struct sk_buff *skb) · 28 unmodified lines | ||
| 1131 | 1175 | /* Add SQ header subdesc */ |
| 1132 | 1176 | nicvf_sq_add_hdr_subdesc(nic, sq, qentry, subdesc_cnt - 1, |
| 1133 | 1177 | skb, skb->len); |
| 1178 | + tso_sqe = qentry; | |
| 1134 | 1179 | |
| 1135 | 1180 | /* Add SQ gather subdescs */ |
| 1136 | 1181 | qentry = nicvf_get_nxt_sqentry(sq, qentry); |
| @@ -1154,6 +1199,11 @@ int nicvf_sq_append_skb(struct nicvf *nic, struct sk_buff *skb) · 17 unmodified lines | ||
| 1154 | 1199 | } |
| 1155 | 1200 | |
| 1156 | 1201 | doorbell: |
| 1202 | + if (nic->t88 && skb_shinfo(skb)->gso_size) { | |
| 1203 | + qentry = nicvf_get_nxt_sqentry(sq, qentry); | |
| 1204 | + nicvf_sq_add_cqe_subdesc(sq, qentry, tso_sqe, skb); | |
| 1205 | + } | |
| 1206 | + | |
| 1157 | 1207 | /* make sure all memory stores are done before ringing doorbell */ |
| 1158 | 1208 | smp_wmb(); |
| 1159 | 1209 | |
| @@ -419,8 +419,8 @@ struct link_config { · 418 unmodified lines | ||
| 419 | 419 | unsigned short supported; /* link capabilities */ |
| 420 | 420 | unsigned short advertising; /* advertised capabilities */ |
| 421 | 421 | unsigned short lp_advertising; /* peer advertised capabilities */ |
| 422 | − unsigned short requested_speed; /* speed user has requested */ | |
| 423 | − unsigned short speed; /* actual link speed */ | |
| 422 | + unsigned int requested_speed; /* speed user has requested */ | |
| 423 | + unsigned int speed; /* actual link speed */ | |
| 424 | 424 | unsigned char requested_fc; /* flow control user has requested */ |
| 425 | 425 | unsigned char fc; /* actual link flow control */ |
| 426 | 426 | unsigned char autoneg; /* autonegotiating? */ |
| @@ -4305,10 +4305,17 @@ static const struct pci_error_handlers cxgb4_eeh = { · 4304 unmodified lines | ||
| 4305 | 4305 | .resume = eeh_resume, |
| 4306 | 4306 | }; |
| 4307 | 4307 | |
| 4308 | +/* Return true if the Link Configuration supports "High Speeds" (those greater | |
| 4309 | + * than 1Gb/s). | |
| 4310 | + */ | |
| 4308 | 4311 | static inline bool is_x_10g_port(const struct link_config *lc) |
| 4309 | 4312 | { |
| 4310 | − return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0 || | |
| 4311 | − (lc->supported & FW_PORT_CAP_SPEED_40G) != 0; | |
| 4313 | + unsigned int speeds, high_speeds; | |
| 4314 | + | |
| 4315 | + speeds = FW_PORT_CAP_SPEED_V(FW_PORT_CAP_SPEED_G(lc->supported)); | |
| 4316 | + high_speeds = speeds & ~(FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G); | |
| 4317 | + | |
| 4318 | + return high_speeds != 0; | |
| 4312 | 4319 | } |
| 4313 | 4320 | |
| 4314 | 4321 | static inline void init_rspq(struct adapter *adap, struct sge_rspq *q, |
| @@ -4335,6 +4342,11 @@ static void cfg_queues(struct adapter *adap) · 20 unmodified lines | ||
| 4335 | 4342 | #endif |
| 4336 | 4343 | int ciq_size; |
| 4337 | 4344 | |
| 4345 | + /* Reduce memory usage in kdump environment, disable all offload. | |
| 4346 | + */ | |
| 4347 | + if (is_kdump_kernel()) | |
| 4348 | + adap->params.offload = 0; | |
| 4349 | + | |
| 4338 | 4350 | for_each_port(adap, i) |
| 4339 | 4351 | n10g += is_x_10g_port(&adap2pinfo(adap, i)->link_cfg); |
| 4340 | 4352 | #ifdef CONFIG_CHELSIO_T4_DCB |
| @@ -4365,11 +4377,6 @@ static void cfg_queues(struct adapter *adap) · 24 unmodified lines | ||
| 4365 | 4377 | if (q10g > netif_get_num_default_rss_queues()) |
| 4366 | 4378 | q10g = netif_get_num_default_rss_queues(); |
| 4367 | 4379 | |
| 4368 | − /* Reduce memory usage in kdump environment, disable all offload. | |
| 4369 | − */ | |
| 4370 | − if (is_kdump_kernel()) | |
| 4371 | − adap->params.offload = 0; | |
| 4372 | − | |
| 4373 | 4380 | for_each_port(adap, i) { |
| 4374 | 4381 | struct port_info *pi = adap2pinfo(adap, i); |
| 4375 | 4382 | |
| @@ -4756,8 +4763,12 @@ static void print_port_info(const struct net_device *dev) · 380 unmodified lines | ||
| 4756 | 4763 | bufp += sprintf(bufp, "1000/"); |
| 4757 | 4764 | if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_10G) |
| 4758 | 4765 | bufp += sprintf(bufp, "10G/"); |
| 4766 | + if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_25G) | |
| 4767 | + bufp += sprintf(bufp, "25G/"); | |
| 4759 | 4768 | if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_40G) |
| 4760 | 4769 | bufp += sprintf(bufp, "40G/"); |
| 4770 | + if (pi->link_cfg.supported & FW_PORT_CAP_SPEED_100G) | |
| 4771 | + bufp += sprintf(bufp, "100G/"); | |
| 4761 | 4772 | if (bufp != buf) |
| 4762 | 4773 | --bufp; |
| 4763 | 4774 | sprintf(bufp, "BASE-%s", t4_get_port_type_description(pi->port_type)); |
| @@ -3627,7 +3627,8 @@ void t4_ulprx_read_la(struct adapter *adap, u32 *la_buf) · 3626 unmodified lines | ||
| 3627 | 3627 | } |
| 3628 | 3628 | |
| 3629 | 3629 | #define ADVERT_MASK (FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G |\ |
| 3630 | − FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_40G | \ | |
| 3630 | + FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_25G | \ | |
| 3631 | + FW_PORT_CAP_SPEED_40G | FW_PORT_CAP_SPEED_100G | \ | |
| 3631 | 3632 | FW_PORT_CAP_ANEG) |
| 3632 | 3633 | |
| 3633 | 3634 | /** |
| @@ -7196,8 +7197,12 @@ void t4_handle_get_port_info(struct port_info *pi, const __be64 *rpl) · 3562 unmodified lines | ||
| 7196 | 7197 | speed = 1000; |
| 7197 | 7198 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_10G)) |
| 7198 | 7199 | speed = 10000; |
| 7200 | + else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_25G)) | |
| 7201 | + speed = 25000; | |
| 7199 | 7202 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_40G)) |
| 7200 | 7203 | speed = 40000; |
| 7204 | + else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_100G)) | |
| 7205 | + speed = 100000; | |
| 7201 | 7206 | |
| 7202 | 7207 | lc = &pi->link_cfg; |
| 7203 | 7208 | |
| @@ -2265,6 +2265,12 @@ enum fw_port_cap { · 2264 unmodified lines | ||
| 2265 | 2265 | FW_PORT_CAP_802_3_ASM_DIR = 0x8000, |
| 2266 | 2266 | }; |
| 2267 | 2267 | |
| 2268 | +#define FW_PORT_CAP_SPEED_S 0 | |
| 2269 | +#define FW_PORT_CAP_SPEED_M 0x3f | |
| 2270 | +#define FW_PORT_CAP_SPEED_V(x) ((x) << FW_PORT_CAP_SPEED_S) | |
| 2271 | +#define FW_PORT_CAP_SPEED_G(x) \ | |
| 2272 | + (((x) >> FW_PORT_CAP_SPEED_S) & FW_PORT_CAP_SPEED_M) | |
| 2273 | + | |
| 2268 | 2274 | enum fw_port_mdi { |
| 2269 | 2275 | FW_PORT_CAP_MDI_UNCHANGED, |
| 2270 | 2276 | FW_PORT_CAP_MDI_AUTO, |
| @@ -108,8 +108,8 @@ struct link_config { · 107 unmodified lines | ||
| 108 | 108 | unsigned int supported; /* link capabilities */ |
| 109 | 109 | unsigned int advertising; /* advertised capabilities */ |
| 110 | 110 | unsigned short lp_advertising; /* peer advertised capabilities */ |
| 111 | − unsigned short requested_speed; /* speed user has requested */ | |
| 112 | − unsigned short speed; /* actual link speed */ | |
| 111 | + unsigned int requested_speed; /* speed user has requested */ | |
| 112 | + unsigned int speed; /* actual link speed */ | |
| 113 | 113 | unsigned char requested_fc; /* flow control user has requested */ |
| 114 | 114 | unsigned char fc; /* actual link flow control */ |
| 115 | 115 | unsigned char autoneg; /* autonegotiating? */ |
| @@ -271,10 +271,17 @@ static inline bool is_10g_port(const struct link_config *lc) · 155 unmodified lines | ||
| 271 | 271 | return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0; |
| 272 | 272 | } |
| 273 | 273 | |
| 274 | +/* Return true if the Link Configuration supports "High Speeds" (those greater | |
| 275 | + * than 1Gb/s). | |
| 276 | + */ | |
| 274 | 277 | static inline bool is_x_10g_port(const struct link_config *lc) |
| 275 | 278 | { |
| 276 | − return (lc->supported & FW_PORT_CAP_SPEED_10G) != 0 || | |
| 277 | − (lc->supported & FW_PORT_CAP_SPEED_40G) != 0; | |
| 279 | + unsigned int speeds, high_speeds; | |
| 280 | + | |
| 281 | + speeds = FW_PORT_CAP_SPEED_V(FW_PORT_CAP_SPEED_G(lc->supported)); | |
| 282 | + high_speeds = speeds & ~(FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G); | |
| 283 | + | |
| 284 | + return high_speeds != 0; | |
| 278 | 285 | } |
| 279 | 286 | |
| 280 | 287 | static inline unsigned int core_ticks_per_usec(const struct adapter *adapter) |
| @@ -314,8 +314,9 @@ int t4vf_wr_mbox_core(struct adapter *adapter, const void *cmd, int size, · 313 unmodified lines | ||
| 314 | 314 | } |
| 315 | 315 | |
| 316 | 316 | #define ADVERT_MASK (FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G |\ |
| 317 | − FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_40G | \ | |
| 318 | − FW_PORT_CAP_SPEED_100G | FW_PORT_CAP_ANEG) | |
| 317 | + FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_25G | \ | |
| 318 | + FW_PORT_CAP_SPEED_40G | FW_PORT_CAP_SPEED_100G | \ | |
| 319 | + FW_PORT_CAP_ANEG) | |
| 319 | 320 | |
| 320 | 321 | /** |
| 321 | 322 | * init_link_config - initialize a link's SW state |
| @@ -1712,8 +1713,12 @@ int t4vf_handle_fw_rpl(struct adapter *adapter, const __be64 *rpl) · 1390 unmodified lines | ||
| 1712 | 1713 | speed = 1000; |
| 1713 | 1714 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_10G)) |
| 1714 | 1715 | speed = 10000; |
| 1716 | + else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_25G)) | |
| 1717 | + speed = 25000; | |
| 1715 | 1718 | else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_40G)) |
| 1716 | 1719 | speed = 40000; |
| 1720 | + else if (stat & FW_PORT_CMD_LSPEED_V(FW_PORT_CAP_SPEED_100G)) | |
| 1721 | + speed = 100000; | |
| 1717 | 1722 | |
| 1718 | 1723 | /* |
| 1719 | 1724 | * Scan all of our "ports" (Virtual Interfaces) looking for |
| @@ -1299,6 +1299,7 @@ static int · 1298 unmodified lines | ||
| 1299 | 1299 | dm9000_open(struct net_device *dev) |
| 1300 | 1300 | { |
| 1301 | 1301 | struct board_info *db = netdev_priv(dev); |
| 1302 | + unsigned int irq_flags = irq_get_trigger_type(dev->irq); | |
| 1302 | 1303 | |
| 1303 | 1304 | if (netif_msg_ifup(db)) |
| 1304 | 1305 | dev_dbg(db->dev, "enabling %s\n", dev->name); |
| @@ -1306,9 +1307,11 @@ dm9000_open(struct net_device *dev) · 1 unmodified line | ||
| 1306 | 1307 | /* If there is no IRQ type specified, tell the user that this is a |
| 1307 | 1308 | * problem |
| 1308 | 1309 | */ |
| 1309 | − if (irq_get_trigger_type(dev->irq) == IRQF_TRIGGER_NONE) | |
| 1310 | + if (irq_flags == IRQF_TRIGGER_NONE) | |
| 1310 | 1311 | dev_warn(db->dev, "WARNING: no IRQ resource flags set.\n"); |
| 1311 | 1312 | |
| 1313 | + irq_flags |= IRQF_SHARED; | |
| 1314 | + | |
| 1312 | 1315 | /* GPIO0 on pre-activate PHY, Reg 1F is not set by reset */ |
| 1313 | 1316 | iow(db, DM9000_GPR, 0); /* REG_1F bit0 activate phyxcer */ |
| 1314 | 1317 | mdelay(1); /* delay needs by DM9000B */ |
| @@ -1316,8 +1319,7 @@ dm9000_open(struct net_device *dev) · 1 unmodified line | ||
| 1316 | 1319 | /* Initialize DM9000 board */ |
| 1317 | 1320 | dm9000_init_dm9000(dev); |
| 1318 | 1321 | |
| 1319 | − if (request_irq(dev->irq, dm9000_interrupt, IRQF_SHARED, | |
| 1320 | − dev->name, dev)) | |
| 1322 | + if (request_irq(dev->irq, dm9000_interrupt, irq_flags, dev->name, dev)) | |
| 1321 | 1323 | return -EAGAIN; |
| 1322 | 1324 | /* Now that we have an interrupt handler hooked up we can unmask |
| 1323 | 1325 | * our interrupts |
| @@ -2922,17 +2922,25 @@ static bool gfar_add_rx_frag(struct gfar_rx_buff *rxb, u32 lstatus, · 2921 unmodified lines | ||
| 2922 | 2922 | { |
| 2923 | 2923 | unsigned int size = lstatus & BD_LENGTH_MASK; |
| 2924 | 2924 | struct page *page = rxb->page; |
| 2925 | + bool last = !!(lstatus & BD_LFLAG(RXBD_LAST)); | |
| 2925 | 2926 | |
| 2926 | 2927 | /* Remove the FCS from the packet length */ |
| 2927 | − if (likely(lstatus & BD_LFLAG(RXBD_LAST))) | |
| 2928 | + if (last) | |
| 2928 | 2929 | size -= ETH_FCS_LEN; |
| 2929 | 2930 | |
| 2930 | − if (likely(first)) | |
| 2931 | + if (likely(first)) { | |
| 2931 | 2932 | skb_put(skb, size); |
| 2932 | − else | |
| 2933 | − skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, | |
| 2934 | − rxb->page_offset + RXBUF_ALIGNMENT, | |
| 2935 | − size, GFAR_RXB_TRUESIZE); | |
| 2933 | + } else { | |
| 2934 | + /* the last fragments' length contains the full frame length */ | |
| 2935 | + if (last) | |
| 2936 | + size -= skb->len; | |
| 2937 | + | |
| 2938 | + /* in case the last fragment consisted only of the FCS */ | |
| 2939 | + if (size > 0) | |
| 2940 | + skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, | |
| 2941 | + rxb->page_offset + RXBUF_ALIGNMENT, | |
| 2942 | + size, GFAR_RXB_TRUESIZE); | |
| 2943 | + } | |
| 2936 | 2944 | |
| 2937 | 2945 | /* try reuse page */ |
| 2938 | 2946 | if (unlikely(page_count(page) != 1)) |
| @@ -100,7 +100,8 @@ extern const char gfar_driver_version[]; · 99 unmodified lines | ||
| 100 | 100 | #define DEFAULT_RX_LFC_THR 16 |
| 101 | 101 | #define DEFAULT_LFC_PTVVAL 4 |
| 102 | 102 | |
| 103 | −#define GFAR_RXB_SIZE 1536 | |
| 103 | +/* prevent fragmenation by HW in DSA environments */ | |
| 104 | +#define GFAR_RXB_SIZE roundup(1536 + 8, 64) | |
| 104 | 105 | #define GFAR_SKBFRAG_SIZE (RXBUF_ALIGNMENT + GFAR_RXB_SIZE \ |
| 105 | 106 | + SKB_DATA_ALIGN(sizeof(struct skb_shared_info))) |
| 106 | 107 | #define GFAR_RXB_TRUESIZE 2048 |
| @@ -17,7 +17,7 @@ static const struct mac_stats_string g_gmac_stats_string[] = { · 16 unmodified lines | ||
| 17 | 17 | {"gmac_rx_octets_total_ok", MAC_STATS_FIELD_OFF(rx_good_bytes)}, |
| 18 | 18 | {"gmac_rx_octets_bad", MAC_STATS_FIELD_OFF(rx_bad_bytes)}, |
| 19 | 19 | {"gmac_rx_uc_pkts", MAC_STATS_FIELD_OFF(rx_uc_pkts)}, |
| 20 | − {"gamc_rx_mc_pkts", MAC_STATS_FIELD_OFF(rx_mc_pkts)}, | |
| 20 | + {"gmac_rx_mc_pkts", MAC_STATS_FIELD_OFF(rx_mc_pkts)}, | |
| 21 | 21 | {"gmac_rx_bc_pkts", MAC_STATS_FIELD_OFF(rx_bc_pkts)}, |
| 22 | 22 | {"gmac_rx_pkts_64octets", MAC_STATS_FIELD_OFF(rx_64bytes)}, |
| 23 | 23 | {"gmac_rx_pkts_65to127", MAC_STATS_FIELD_OFF(rx_65to127)}, |
| @@ -328,9 +328,10 @@ static void hns_ppe_init_hw(struct hns_ppe_cb *ppe_cb) · 327 unmodified lines | ||
| 328 | 328 | static void hns_ppe_uninit_hw(struct hns_ppe_cb *ppe_cb) |
| 329 | 329 | { |
| 330 | 330 | u32 port; |
| 331 | − struct dsaf_device *dsaf_dev = ppe_cb->ppe_common_cb->dsaf_dev; | |
| 332 | 331 | |
| 333 | 332 | if (ppe_cb->ppe_common_cb) { |
| 333 | + struct dsaf_device *dsaf_dev = ppe_cb->ppe_common_cb->dsaf_dev; | |
| 334 | + | |
| 334 | 335 | port = ppe_cb->index; |
| 335 | 336 | dsaf_dev->misc_op->ppe_srst(dsaf_dev, port, 0); |
| 336 | 337 | } |
| @@ -977,7 +977,37 @@ static void emac_set_multicast_list(struct net_device *ndev) · 976 unmodified lines | ||
| 977 | 977 | dev->mcast_pending = 1; |
| 978 | 978 | return; |
| 979 | 979 | } |
| 980 | + | |
| 981 | + mutex_lock(&dev->link_lock); | |
| 980 | 982 | __emac_set_multicast_list(dev); |
| 983 | + mutex_unlock(&dev->link_lock); | |
| 984 | +} | |
| 985 | + | |
| 986 | +static int emac_set_mac_address(struct net_device *ndev, void *sa) | |
| 987 | +{ | |
| 988 | + struct emac_instance *dev = netdev_priv(ndev); | |
| 989 | + struct sockaddr *addr = sa; | |
| 990 | + struct emac_regs __iomem *p = dev->emacp; | |
| 991 | + | |
| 992 | + if (!is_valid_ether_addr(addr->sa_data)) | |
| 993 | + return -EADDRNOTAVAIL; | |
| 994 | + | |
| 995 | + mutex_lock(&dev->link_lock); | |
| 996 | + | |
| 997 | + memcpy(ndev->dev_addr, addr->sa_data, ndev->addr_len); | |
| 998 | + | |
| 999 | + emac_rx_disable(dev); | |
| 1000 | + emac_tx_disable(dev); | |
| 1001 | + out_be32(&p->iahr, (ndev->dev_addr[0] << 8) | ndev->dev_addr[1]); | |
| 1002 | + out_be32(&p->ialr, (ndev->dev_addr[2] << 24) | | |
| 1003 | + (ndev->dev_addr[3] << 16) | (ndev->dev_addr[4] << 8) | | |
| 1004 | + ndev->dev_addr[5]); | |
| 1005 | + emac_tx_enable(dev); | |
| 1006 | + emac_rx_enable(dev); | |
| 1007 | + | |
| 1008 | + mutex_unlock(&dev->link_lock); | |
| 1009 | + | |
| 1010 | + return 0; | |
| 981 | 1011 | } |
| 982 | 1012 | |
| 983 | 1013 | static int emac_resize_rx_ring(struct emac_instance *dev, int new_mtu) |
| @@ -2686,7 +2716,7 @@ static const struct net_device_ops emac_netdev_ops = { · 1702 unmodified lines | ||
| 2686 | 2716 | .ndo_do_ioctl = emac_ioctl, |
| 2687 | 2717 | .ndo_tx_timeout = emac_tx_timeout, |
| 2688 | 2718 | .ndo_validate_addr = eth_validate_addr, |
| 2689 | − .ndo_set_mac_address = eth_mac_addr, | |
| 2719 | + .ndo_set_mac_address = emac_set_mac_address, | |
| 2690 | 2720 | .ndo_start_xmit = emac_start_xmit, |
| 2691 | 2721 | .ndo_change_mtu = eth_change_mtu, |
| 2692 | 2722 | }; |
| @@ -2699,7 +2729,7 @@ static const struct net_device_ops emac_gige_netdev_ops = { · 6 unmodified lines | ||
| 2699 | 2729 | .ndo_do_ioctl = emac_ioctl, |
| 2700 | 2730 | .ndo_tx_timeout = emac_tx_timeout, |
| 2701 | 2731 | .ndo_validate_addr = eth_validate_addr, |
| 2702 | − .ndo_set_mac_address = eth_mac_addr, | |
| 2732 | + .ndo_set_mac_address = emac_set_mac_address, | |
| 2703 | 2733 | .ndo_start_xmit = emac_start_xmit_sg, |
| 2704 | 2734 | .ndo_change_mtu = emac_change_mtu, |
| 2705 | 2735 | }; |
| @@ -2032,7 +2032,8 @@ const struct e1000_info e1000_82574_info = { · 2031 unmodified lines | ||
| 2032 | 2032 | | FLAG2_DISABLE_ASPM_L0S |
| 2033 | 2033 | | FLAG2_DISABLE_ASPM_L1 |
| 2034 | 2034 | | FLAG2_NO_DISABLE_RX |
| 2035 | − | FLAG2_DMA_BURST, | |
| 2035 | + | FLAG2_DMA_BURST | |
| 2036 | + | FLAG2_CHECK_SYSTIM_OVERFLOW, | |
| 2036 | 2037 | .pba = 32, |
| 2037 | 2038 | .max_hw_frame_size = DEFAULT_JUMBO, |
| 2038 | 2039 | .get_variants = e1000_get_variants_82571, |
| @@ -2053,7 +2054,8 @@ const struct e1000_info e1000_82583_info = { · 14 unmodified lines | ||
| 2053 | 2054 | | FLAG_HAS_CTRLEXT_ON_LOAD, |
| 2054 | 2055 | .flags2 = FLAG2_DISABLE_ASPM_L0S |
| 2055 | 2056 | | FLAG2_DISABLE_ASPM_L1 |
| 2056 | − | FLAG2_NO_DISABLE_RX, | |
| 2057 | + | FLAG2_NO_DISABLE_RX | |
| 2058 | + | FLAG2_CHECK_SYSTIM_OVERFLOW, | |
| 2057 | 2059 | .pba = 32, |
| 2058 | 2060 | .max_hw_frame_size = DEFAULT_JUMBO, |
| 2059 | 2061 | .get_variants = e1000_get_variants_82571, |
| @@ -452,6 +452,7 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca); · 451 unmodified lines | ||
| 452 | 452 | #define FLAG2_PCIM2PCI_ARBITER_WA BIT(11) |
| 453 | 453 | #define FLAG2_DFLT_CRC_STRIPPING BIT(12) |
| 454 | 454 | #define FLAG2_CHECK_RX_HWTSTAMP BIT(13) |
| 455 | +#define FLAG2_CHECK_SYSTIM_OVERFLOW BIT(14) | |
| 455 | 456 | |
| 456 | 457 | #define E1000_RX_DESC_PS(R, i) \ |
| 457 | 458 | (&(((union e1000_rx_desc_packet_split *)((R).desc))[i])) |
| @@ -5885,7 +5885,8 @@ const struct e1000_info e1000_pch_lpt_info = { · 5884 unmodified lines | ||
| 5885 | 5885 | | FLAG_HAS_JUMBO_FRAMES |
| 5886 | 5886 | | FLAG_APME_IN_WUC, |
| 5887 | 5887 | .flags2 = FLAG2_HAS_PHY_STATS |
| 5888 | − | FLAG2_HAS_EEE, | |
| 5888 | + | FLAG2_HAS_EEE | |
| 5889 | + | FLAG2_CHECK_SYSTIM_OVERFLOW, | |
| 5889 | 5890 | .pba = 26, |
| 5890 | 5891 | .max_hw_frame_size = 9022, |
| 5891 | 5892 | .get_variants = e1000_get_variants_ich8lan, |
| @@ -4302,6 +4302,42 @@ void e1000e_reinit_locked(struct e1000_adapter *adapter) · 4301 unmodified lines | ||
| 4302 | 4302 | clear_bit(__E1000_RESETTING, &adapter->state); |
| 4303 | 4303 | } |
| 4304 | 4304 | |
| 4305 | +/** | |
| 4306 | + * e1000e_sanitize_systim - sanitize raw cycle counter reads | |
| 4307 | + * @hw: pointer to the HW structure | |
| 4308 | + * @systim: cycle_t value read, sanitized and returned | |
| 4309 | + * | |
| 4310 | + * Errata for 82574/82583 possible bad bits read from SYSTIMH/L: | |
| 4311 | + * check to see that the time is incrementing at a reasonable | |
| 4312 | + * rate and is a multiple of incvalue. | |
| 4313 | + **/ | |
| 4314 | +static cycle_t e1000e_sanitize_systim(struct e1000_hw *hw, cycle_t systim) | |
| 4315 | +{ | |
| 4316 | + u64 time_delta, rem, temp; | |
| 4317 | + cycle_t systim_next; | |
| 4318 | + u32 incvalue; | |
| 4319 | + int i; | |
| 4320 | + | |
| 4321 | + incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK; | |
| 4322 | + for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) { | |
| 4323 | + /* latch SYSTIMH on read of SYSTIML */ | |
| 4324 | + systim_next = (cycle_t)er32(SYSTIML); | |
| 4325 | + systim_next |= (cycle_t)er32(SYSTIMH) << 32; | |
| 4326 | + | |
| 4327 | + time_delta = systim_next - systim; | |
| 4328 | + temp = time_delta; | |
| 4329 | + /* VMWare users have seen incvalue of zero, don't div / 0 */ | |
| 4330 | + rem = incvalue ? do_div(temp, incvalue) : (time_delta != 0); | |
| 4331 | + | |
| 4332 | + systim = systim_next; | |
| 4333 | + | |
| 4334 | + if ((time_delta < E1000_82574_SYSTIM_EPSILON) && (rem == 0)) | |
| 4335 | + break; | |
| 4336 | + } | |
| 4337 | + | |
| 4338 | + return systim; | |
| 4339 | +} | |
| 4340 | + | |
| 4305 | 4341 | /** |
| 4306 | 4342 | * e1000e_cyclecounter_read - read raw cycle counter (used by time counter) |
| 4307 | 4343 | * @cc: cyclecounter structure |
| @@ -4312,7 +4348,7 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc) · 4 unmodified lines | ||
| 4312 | 4348 | cc); |
| 4313 | 4349 | struct e1000_hw *hw = &adapter->hw; |
| 4314 | 4350 | u32 systimel, systimeh; |
| 4315 | − cycle_t systim, systim_next; | |
| 4351 | + cycle_t systim; | |
| 4316 | 4352 | /* SYSTIMH latching upon SYSTIML read does not work well. |
| 4317 | 4353 | * This means that if SYSTIML overflows after we read it but before |
| 4318 | 4354 | * we read SYSTIMH, the value of SYSTIMH has been incremented and we |
| @@ -4335,33 +4371,9 @@ static cycle_t e1000e_cyclecounter_read(const struct cyclecounter *cc) · 16 unmodified lines | ||
| 4335 | 4371 | systim = (cycle_t)systimel; |
| 4336 | 4372 | systim |= (cycle_t)systimeh << 32; |
| 4337 | 4373 | |
| 4338 | − if ((hw->mac.type == e1000_82574) || (hw->mac.type == e1000_82583)) { | |
| 4339 | − u64 time_delta, rem, temp; | |
| 4340 | − u32 incvalue; | |
| 4341 | − int i; | |
| 4342 | − | |
| 4343 | − /* errata for 82574/82583 possible bad bits read from SYSTIMH/L | |
| 4344 | − * check to see that the time is incrementing at a reasonable | |
| 4345 | − * rate and is a multiple of incvalue | |
| 4346 | − */ | |
| 4347 | − incvalue = er32(TIMINCA) & E1000_TIMINCA_INCVALUE_MASK; | |
| 4348 | − for (i = 0; i < E1000_MAX_82574_SYSTIM_REREADS; i++) { | |
| 4349 | − /* latch SYSTIMH on read of SYSTIML */ | |
| 4350 | − systim_next = (cycle_t)er32(SYSTIML); | |
| 4351 | − systim_next |= (cycle_t)er32(SYSTIMH) << 32; | |
| 4352 | − | |
| 4353 | − time_delta = systim_next - systim; | |
| 4354 | − temp = time_delta; | |
| 4355 | − /* VMWare users have seen incvalue of zero, don't div / 0 */ | |
| 4356 | − rem = incvalue ? do_div(temp, incvalue) : (time_delta != 0); | |
| 4357 | − | |
| 4358 | − systim = systim_next; | |
| 4374 | + if (adapter->flags2 & FLAG2_CHECK_SYSTIM_OVERFLOW) | |
| 4375 | + systim = e1000e_sanitize_systim(hw, systim); | |
| 4359 | 4376 | |
| 4360 | − if ((time_delta < E1000_82574_SYSTIM_EPSILON) && | |
| 4361 | − (rem == 0)) | |
| 4362 | − break; | |
| 4363 | − } | |
| 4364 | − } | |
| 4365 | 4377 | return systim; |
| 4366 | 4378 | } |
| 4367 | 4379 | |
| @@ -199,6 +199,7 @@ void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi) · 198 unmodified lines | ||
| 199 | 199 | void i40e_notify_client_of_netdev_open(struct i40e_vsi *vsi) |
| 200 | 200 | { |
| 201 | 201 | struct i40e_client_instance *cdev; |
| 202 | + int ret = 0; | |
| 202 | 203 | |
| 203 | 204 | if (!vsi) |
| 204 | 205 | return; |
| @@ -211,7 +212,14 @@ void i40e_notify_client_of_netdev_open(struct i40e_vsi *vsi) · 6 unmodified lines | ||
| 211 | 212 | "Cannot locate client instance open routine\n"); |
| 212 | 213 | continue; |
| 213 | 214 | } |
| 214 | − cdev->client->ops->open(&cdev->lan_info, cdev->client); | |
| 215 | + if (!(test_bit(__I40E_CLIENT_INSTANCE_OPENED, | |
| 216 | + &cdev->state))) { | |
| 217 | + ret = cdev->client->ops->open(&cdev->lan_info, | |
| 218 | + cdev->client); | |
| 219 | + if (!ret) | |
| 220 | + set_bit(__I40E_CLIENT_INSTANCE_OPENED, | |
| 221 | + &cdev->state); | |
| 222 | + } | |
| 215 | 223 | } |
| 216 | 224 | } |
| 217 | 225 | mutex_unlock(&i40e_client_instance_mutex); |
| @@ -407,12 +415,14 @@ struct i40e_vsi *i40e_vsi_lookup(struct i40e_pf *pf, · 189 unmodified lines | ||
| 407 | 415 | * i40e_client_add_instance - add a client instance struct to the instance list |
| 408 | 416 | * @pf: pointer to the board struct |
| 409 | 417 | * @client: pointer to a client struct in the client list. |
| 418 | + * @existing: if there was already an existing instance | |
| 410 | 419 | * |
| 411 | − * Returns cdev ptr on success, NULL on failure | |
| 420 | + * Returns cdev ptr on success or if already exists, NULL on failure | |
| 412 | 421 | **/ |
| 413 | 422 | static |
| 414 | 423 | struct i40e_client_instance *i40e_client_add_instance(struct i40e_pf *pf, |
| 415 | − struct i40e_client *client) | |
| 424 | + struct i40e_client *client, | |
| 425 | + bool *existing) | |
| 416 | 426 | { |
| 417 | 427 | struct i40e_client_instance *cdev; |
| 418 | 428 | struct netdev_hw_addr *mac = NULL; |
| @@ -421,7 +431,7 @@ struct i40e_client_instance *i40e_client_add_instance(struct i40e_pf *pf, · 2 unmodified lines | ||
| 421 | 431 | mutex_lock(&i40e_client_instance_mutex); |
| 422 | 432 | list_for_each_entry(cdev, &i40e_client_instances, list) { |
| 423 | 433 | if ((cdev->lan_info.pf == pf) && (cdev->client == client)) { |
| 424 | − cdev = NULL; | |
| 434 | + *existing = true; | |
| 425 | 435 | goto out; |
| 426 | 436 | } |
| 427 | 437 | } |
| @@ -505,6 +515,7 @@ void i40e_client_subtask(struct i40e_pf *pf) · 77 unmodified lines | ||
| 505 | 515 | { |
| 506 | 516 | struct i40e_client_instance *cdev; |
| 507 | 517 | struct i40e_client *client; |
| 518 | + bool existing = false; | |
| 508 | 519 | int ret = 0; |
| 509 | 520 | |
| 510 | 521 | if (!(pf->flags & I40E_FLAG_SERVICE_CLIENT_REQUESTED)) |
| @@ -528,18 +539,25 @@ void i40e_client_subtask(struct i40e_pf *pf) · 17 unmodified lines | ||
| 528 | 539 | /* check if L2 VSI is up, if not we are not ready */ |
| 529 | 540 | if (test_bit(__I40E_DOWN, &pf->vsi[pf->lan_vsi]->state)) |
| 530 | 541 | continue; |
| 542 | + } else { | |
| 543 | + dev_warn(&pf->pdev->dev, "This client %s is being instanciated at probe\n", | |
| 544 | + client->name); | |
| 531 | 545 | } |
| 532 | 546 | |
| 533 | 547 | /* Add the client instance to the instance list */ |
| 534 | − cdev = i40e_client_add_instance(pf, client); | |
| 548 | + cdev = i40e_client_add_instance(pf, client, &existing); | |
| 535 | 549 | if (!cdev) |
| 536 | 550 | continue; |
| 537 | 551 | |
| 538 | − /* Also up the ref_cnt of no. of instances of this client */ | |
| 539 | − atomic_inc(&client->ref_cnt); | |
| 540 | − dev_info(&pf->pdev->dev, "Added instance of Client %s to PF%d bus=0x%02x func=0x%02x\n", | |
| 541 | − client->name, pf->hw.pf_id, | |
| 542 | − pf->hw.bus.device, pf->hw.bus.func); | |
| 552 | + if (!existing) { | |
| 553 | + /* Also up the ref_cnt for no. of instances of this | |
| 554 | + * client. | |
| 555 | + */ | |
| 556 | + atomic_inc(&client->ref_cnt); | |
| 557 | + dev_info(&pf->pdev->dev, "Added instance of Client %s to PF%d bus=0x%02x func=0x%02x\n", | |
| 558 | + client->name, pf->hw.pf_id, | |
| 559 | + pf->hw.bus.device, pf->hw.bus.func); | |
| 560 | + } | |
| 543 | 561 | |
| 544 | 562 | /* Send an Open request to the client */ |
| 545 | 563 | atomic_inc(&cdev->ref_cnt); |
| @@ -588,7 +606,8 @@ int i40e_lan_add_device(struct i40e_pf *pf) · 42 unmodified lines | ||
| 588 | 606 | pf->hw.pf_id, pf->hw.bus.device, pf->hw.bus.func); |
| 589 | 607 | |
| 590 | 608 | /* Since in some cases register may have happened before a device gets |
| 591 | − * added, we can schedule a subtask to go initiate the clients. | |
| 609 | + * added, we can schedule a subtask to go initiate the clients if | |
| 610 | + * they can be launched at probe time. | |
| 592 | 611 | */ |
| 593 | 612 | pf->flags |= I40E_FLAG_SERVICE_CLIENT_REQUESTED; |
| 594 | 613 | i40e_service_event_schedule(pf); |
| @@ -4554,23 +4554,38 @@ static u8 i40e_get_iscsi_tc_map(struct i40e_pf *pf) · 4553 unmodified lines | ||
| 4554 | 4554 | **/ |
| 4555 | 4555 | static u8 i40e_dcb_get_num_tc(struct i40e_dcbx_config *dcbcfg) |
| 4556 | 4556 | { |
| 4557 | + int i, tc_unused = 0; | |
| 4557 | 4558 | u8 num_tc = 0; |
| 4558 | − int i; | |
| 4559 | + u8 ret = 0; | |
| 4559 | 4560 | |
| 4560 | 4561 | /* Scan the ETS Config Priority Table to find |
| 4561 | 4562 | * traffic class enabled for a given priority |
| 4562 | − * and use the traffic class index to get the | |
| 4563 | − * number of traffic classes enabled | |
| 4563 | + * and create a bitmask of enabled TCs | |
| 4564 | 4564 | */ |
| 4565 | − for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) { | |
| 4566 | − if (dcbcfg->etscfg.prioritytable[i] > num_tc) | |
| 4567 | − num_tc = dcbcfg->etscfg.prioritytable[i]; | |
| 4568 | − } | |
| 4565 | + for (i = 0; i < I40E_MAX_USER_PRIORITY; i++) | |
| 4566 | + num_tc |= BIT(dcbcfg->etscfg.prioritytable[i]); | |
| 4569 | 4567 | |
| 4570 | − /* Traffic class index starts from zero so | |
| 4571 | − * increment to return the actual count | |
| 4568 | + /* Now scan the bitmask to check for | |
| 4569 | + * contiguous TCs starting with TC0 | |
| 4572 | 4570 | */ |
| 4573 | − return num_tc + 1; | |
| 4571 | + for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) { | |
| 4572 | + if (num_tc & BIT(i)) { | |
| 4573 | + if (!tc_unused) { | |
| 4574 | + ret++; | |
| 4575 | + } else { | |
| 4576 | + pr_err("Non-contiguous TC - Disabling DCB\n"); | |
| 4577 | + return 1; | |
| 4578 | + } | |
| 4579 | + } else { | |
| 4580 | + tc_unused = 1; | |
| 4581 | + } | |
| 4582 | + } | |
| 4583 | + | |
| 4584 | + /* There is always at least TC0 */ | |
| 4585 | + if (!ret) | |
| 4586 | + ret = 1; | |
| 4587 | + | |
| 4588 | + return ret; | |
| 4574 | 4589 | } |
| 4575 | 4590 | |
| 4576 | 4591 | /** |
| @@ -5098,9 +5113,13 @@ static int i40e_init_pf_dcb(struct i40e_pf *pf) · 521 unmodified lines | ||
| 5098 | 5113 | DCB_CAP_DCBX_VER_IEEE; |
| 5099 | 5114 | |
| 5100 | 5115 | pf->flags |= I40E_FLAG_DCB_CAPABLE; |
| 5101 | − /* Enable DCB tagging only when more than one TC */ | |
| 5116 | + /* Enable DCB tagging only when more than one TC | |
| 5117 | + * or explicitly disable if only one TC | |
| 5118 | + */ | |
| 5102 | 5119 | if (i40e_dcb_get_num_tc(&hw->local_dcbx_config) > 1) |
| 5103 | 5120 | pf->flags |= I40E_FLAG_DCB_ENABLED; |
| 5121 | + else | |
| 5122 | + pf->flags &= ~I40E_FLAG_DCB_ENABLED; | |
| 5104 | 5123 | dev_dbg(&pf->pdev->dev, |
| 5105 | 5124 | "DCBX offload is supported for this PF.\n"); |
| 5106 | 5125 | } |
| @@ -5416,7 +5435,6 @@ int i40e_open(struct net_device *netdev) · 309 unmodified lines | ||
| 5416 | 5435 | wr32(&pf->hw, I40E_GLLAN_TSOMSK_L, be32_to_cpu(TCP_FLAG_CWR) >> 16); |
| 5417 | 5436 | |
| 5418 | 5437 | udp_tunnel_get_rx_info(netdev); |
| 5419 | − i40e_notify_client_of_netdev_open(vsi); | |
| 5420 | 5438 | |
| 5421 | 5439 | return 0; |
| 5422 | 5440 | } |
| @@ -5702,7 +5720,7 @@ static int i40e_handle_lldp_event(struct i40e_pf *pf, · 279 unmodified lines | ||
| 5702 | 5720 | u8 type; |
| 5703 | 5721 | |
| 5704 | 5722 | /* Not DCB capable or capability disabled */ |
| 5705 | − if (!(pf->flags & I40E_FLAG_DCB_CAPABLE)) | |
| 5723 | + if (!(pf->flags & I40E_FLAG_DCB_ENABLED)) | |
| 5706 | 5724 | return ret; |
| 5707 | 5725 | |
| 5708 | 5726 | /* Ignore if event is not for Nearest Bridge */ |
| @@ -7882,6 +7900,7 @@ static int i40e_init_interrupt_scheme(struct i40e_pf *pf) · 2173 unmodified lines | ||
| 7882 | 7900 | #endif |
| 7883 | 7901 | I40E_FLAG_RSS_ENABLED | |
| 7884 | 7902 | I40E_FLAG_DCB_CAPABLE | |
| 7903 | + I40E_FLAG_DCB_ENABLED | | |
| 7885 | 7904 | I40E_FLAG_SRIOV_ENABLED | |
| 7886 | 7905 | I40E_FLAG_FD_SB_ENABLED | |
| 7887 | 7906 | I40E_FLAG_FD_ATR_ENABLED | |
| @@ -10488,6 +10507,7 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) · 2600 unmodified lines | ||
| 10488 | 10507 | I40E_FLAG_FD_SB_ENABLED | |
| 10489 | 10508 | I40E_FLAG_FD_ATR_ENABLED | |
| 10490 | 10509 | I40E_FLAG_DCB_CAPABLE | |
| 10510 | + I40E_FLAG_DCB_ENABLED | | |
| 10491 | 10511 | I40E_FLAG_SRIOV_ENABLED | |
| 10492 | 10512 | I40E_FLAG_VMDQ_ENABLED); |
| 10493 | 10513 | } else if (!(pf->flags & (I40E_FLAG_RSS_ENABLED | |
| @@ -10511,7 +10531,8 @@ static void i40e_determine_queue_usage(struct i40e_pf *pf) · 17 unmodified lines | ||
| 10511 | 10531 | /* Not enough queues for all TCs */ |
| 10512 | 10532 | if ((pf->flags & I40E_FLAG_DCB_CAPABLE) && |
| 10513 | 10533 | (queues_left < I40E_MAX_TRAFFIC_CLASS)) { |
| 10514 | − pf->flags &= ~I40E_FLAG_DCB_CAPABLE; | |
| 10534 | + pf->flags &= ~(I40E_FLAG_DCB_CAPABLE | | |
| 10535 | + I40E_FLAG_DCB_ENABLED); | |
| 10515 | 10536 | dev_info(&pf->pdev->dev, "not enough queues for DCB. DCB is disabled.\n"); |
| 10516 | 10537 | } |
| 10517 | 10538 | pf->num_lan_qps = max_t(int, pf->rss_size_max, |
| @@ -10908,7 +10929,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · 390 unmodified lines | ||
| 10908 | 10929 | err = i40e_init_pf_dcb(pf); |
| 10909 | 10930 | if (err) { |
| 10910 | 10931 | dev_info(&pdev->dev, "DCB init failed %d, disabled\n", err); |
| 10911 | − pf->flags &= ~I40E_FLAG_DCB_CAPABLE; | |
| 10932 | + pf->flags &= ~(I40E_FLAG_DCB_CAPABLE & I40E_FLAG_DCB_ENABLED); | |
| 10912 | 10933 | /* Continue without DCB enabled */ |
| 10913 | 10934 | } |
| 10914 | 10935 | #endif /* CONFIG_I40E_DCB */ |
| @@ -744,7 +744,8 @@ static void igb_ptp_tx_hwtstamp(struct igb_adapter *adapter) · 743 unmodified lines | ||
| 744 | 744 | } |
| 745 | 745 | } |
| 746 | 746 | |
| 747 | − shhwtstamps.hwtstamp = ktime_sub_ns(shhwtstamps.hwtstamp, adjust); | |
| 747 | + shhwtstamps.hwtstamp = | |
| 748 | + ktime_add_ns(shhwtstamps.hwtstamp, adjust); | |
| 748 | 749 | |
| 749 | 750 | skb_tstamp_tx(adapter->ptp_tx_skb, &shhwtstamps); |
| 750 | 751 | dev_kfree_skb_any(adapter->ptp_tx_skb); |
| @@ -767,13 +768,32 @@ void igb_ptp_rx_pktstamp(struct igb_q_vector *q_vector, · 16 unmodified lines | ||
| 767 | 768 | struct sk_buff *skb) |
| 768 | 769 | { |
| 769 | 770 | __le64 *regval = (__le64 *)va; |
| 771 | + struct igb_adapter *adapter = q_vector->adapter; | |
| 772 | + int adjust = 0; | |
| 770 | 773 | |
| 771 | 774 | /* The timestamp is recorded in little endian format. |
| 772 | 775 | * DWORD: 0 1 2 3 |
| 773 | 776 | * Field: Reserved Reserved SYSTIML SYSTIMH |
| 774 | 777 | */ |
| 775 | − igb_ptp_systim_to_hwtstamp(q_vector->adapter, skb_hwtstamps(skb), | |
| 778 | + igb_ptp_systim_to_hwtstamp(adapter, skb_hwtstamps(skb), | |
| 776 | 779 | le64_to_cpu(regval[1])); |
| 780 | + | |
| 781 | + /* adjust timestamp for the RX latency based on link speed */ | |
| 782 | + if (adapter->hw.mac.type == e1000_i210) { | |
| 783 | + switch (adapter->link_speed) { | |
| 784 | + case SPEED_10: | |
| 785 | + adjust = IGB_I210_RX_LATENCY_10; | |
| 786 | + break; | |
| 787 | + case SPEED_100: | |
| 788 | + adjust = IGB_I210_RX_LATENCY_100; | |
| 789 | + break; | |
| 790 | + case SPEED_1000: | |
| 791 | + adjust = IGB_I210_RX_LATENCY_1000; | |
| 792 | + break; | |
| 793 | + } | |
| 794 | + } | |
| 795 | + skb_hwtstamps(skb)->hwtstamp = | |
| 796 | + ktime_sub_ns(skb_hwtstamps(skb)->hwtstamp, adjust); | |
| 777 | 797 | } |
| 778 | 798 | |
| 779 | 799 | /** |
| @@ -825,7 +845,7 @@ void igb_ptp_rx_rgtstamp(struct igb_q_vector *q_vector, · 45 unmodified lines | ||
| 825 | 845 | } |
| 826 | 846 | } |
| 827 | 847 | skb_hwtstamps(skb)->hwtstamp = |
| 828 | − ktime_add_ns(skb_hwtstamps(skb)->hwtstamp, adjust); | |
| 848 | + ktime_sub_ns(skb_hwtstamps(skb)->hwtstamp, adjust); | |
| 829 | 849 | |
| 830 | 850 | /* Update the last_rx_timestamp timer in order to enable watchdog check |
| 831 | 851 | * for error case of latched timestamp on a dropped packet. |
| @@ -2958,8 +2958,10 @@ s32 ixgbe_clear_vmdq_generic(struct ixgbe_hw *hw, u32 rar, u32 vmdq) · 2957 unmodified lines | ||
| 2958 | 2958 | } |
| 2959 | 2959 | |
| 2960 | 2960 | /* was that the last pool using this rar? */ |
| 2961 | − if (mpsar_lo == 0 && mpsar_hi == 0 && rar != 0) | |
| 2961 | + if (mpsar_lo == 0 && mpsar_hi == 0 && | |
| 2962 | + rar != 0 && rar != hw->mac.san_mac_rar_index) | |
| 2962 | 2963 | hw->mac.ops.clear_rar(hw, rar); |
| 2964 | + | |
| 2963 | 2965 | return 0; |
| 2964 | 2966 | } |
| 2965 | 2967 | |
| @@ -4100,6 +4100,8 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) · 4099 unmodified lines | ||
| 4100 | 4100 | struct ixgbe_hw *hw = &adapter->hw; |
| 4101 | 4101 | u32 vlnctrl, i; |
| 4102 | 4102 | |
| 4103 | + vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | |
| 4104 | + | |
| 4103 | 4105 | switch (hw->mac.type) { |
| 4104 | 4106 | case ixgbe_mac_82599EB: |
| 4105 | 4107 | case ixgbe_mac_X540: |
| @@ -4112,8 +4114,7 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) · 6 unmodified lines | ||
| 4112 | 4114 | /* fall through */ |
| 4113 | 4115 | case ixgbe_mac_82598EB: |
| 4114 | 4116 | /* legacy case, we can just disable VLAN filtering */ |
| 4115 | − vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | |
| 4116 | − vlnctrl &= ~(IXGBE_VLNCTRL_VFE | IXGBE_VLNCTRL_CFIEN); | |
| 4117 | + vlnctrl &= ~IXGBE_VLNCTRL_VFE; | |
| 4117 | 4118 | IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); |
| 4118 | 4119 | return; |
| 4119 | 4120 | } |
| @@ -4125,6 +4126,10 @@ static void ixgbe_vlan_promisc_enable(struct ixgbe_adapter *adapter) · 5 unmodified lines | ||
| 4125 | 4126 | /* Set flag so we don't redo unnecessary work */ |
| 4126 | 4127 | adapter->flags2 |= IXGBE_FLAG2_VLAN_PROMISC; |
| 4127 | 4128 | |
| 4129 | + /* For VMDq and SR-IOV we must leave VLAN filtering enabled */ | |
| 4130 | + vlnctrl |= IXGBE_VLNCTRL_VFE; | |
| 4131 | + IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); | |
| 4132 | + | |
| 4128 | 4133 | /* Add PF to all active pools */ |
| 4129 | 4134 | for (i = IXGBE_VLVF_ENTRIES; --i;) { |
| 4130 | 4135 | u32 reg_offset = IXGBE_VLVFB(i * 2 + VMDQ_P(0) / 32); |
| @@ -4191,6 +4196,11 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter) · 60 unmodified lines | ||
| 4191 | 4196 | struct ixgbe_hw *hw = &adapter->hw; |
| 4192 | 4197 | u32 vlnctrl, i; |
| 4193 | 4198 | |
| 4199 | + /* Set VLAN filtering to enabled */ | |
| 4200 | + vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | |
| 4201 | + vlnctrl |= IXGBE_VLNCTRL_VFE; | |
| 4202 | + IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); | |
| 4203 | + | |
| 4194 | 4204 | switch (hw->mac.type) { |
| 4195 | 4205 | case ixgbe_mac_82599EB: |
| 4196 | 4206 | case ixgbe_mac_X540: |
| @@ -4202,10 +4212,6 @@ static void ixgbe_vlan_promisc_disable(struct ixgbe_adapter *adapter) · 5 unmodified lines | ||
| 4202 | 4212 | break; |
| 4203 | 4213 | /* fall through */ |
| 4204 | 4214 | case ixgbe_mac_82598EB: |
| 4205 | − vlnctrl = IXGBE_READ_REG(hw, IXGBE_VLNCTRL); | |
| 4206 | − vlnctrl &= ~IXGBE_VLNCTRL_CFIEN; | |
| 4207 | − vlnctrl |= IXGBE_VLNCTRL_VFE; | |
| 4208 | − IXGBE_WRITE_REG(hw, IXGBE_VLNCTRL, vlnctrl); | |
| 4209 | 4215 | return; |
| 4210 | 4216 | } |
| 4211 | 4217 | |
| @@ -8390,12 +8396,14 @@ static int parse_tc_actions(struct ixgbe_adapter *adapter, · 4178 unmodified lines | ||
| 8390 | 8396 | struct tcf_exts *exts, u64 *action, u8 *queue) |
| 8391 | 8397 | { |
| 8392 | 8398 | const struct tc_action *a; |
| 8399 | + LIST_HEAD(actions); | |
| 8393 | 8400 | int err; |
| 8394 | 8401 | |
| 8395 | 8402 | if (tc_no_actions(exts)) |
| 8396 | 8403 | return -EINVAL; |
| 8397 | 8404 | |
| 8398 | − tc_for_each_action(a, exts) { | |
| 8405 | + tcf_exts_to_list(exts, &actions); | |
| 8406 | + list_for_each_entry(a, &actions, list) { | |
| 8399 | 8407 | |
| 8400 | 8408 | /* Drop action */ |
| 8401 | 8409 | if (is_tcf_gact_shot(a)) { |
| @@ -9517,6 +9525,7 @@ skip_sriov: · 1115 unmodified lines | ||
| 9517 | 9525 | |
| 9518 | 9526 | /* copy netdev features into list of user selectable features */ |
| 9519 | 9527 | netdev->hw_features |= netdev->features | |
| 9528 | + NETIF_F_HW_VLAN_CTAG_FILTER | | |
| 9520 | 9529 | NETIF_F_HW_VLAN_CTAG_RX | |
| 9521 | 9530 | NETIF_F_HW_VLAN_CTAG_TX | |
| 9522 | 9531 | NETIF_F_RXALL | |
| @@ -50,6 +50,10 @@ static const struct mtk_ethtool_stats { · 49 unmodified lines | ||
| 50 | 50 | MTK_ETHTOOL_STAT(rx_flow_control_packets), |
| 51 | 51 | }; |
| 52 | 52 | |
| 53 | +static const char * const mtk_clks_source_name[] = { | |
| 54 | + "ethif", "esw", "gp1", "gp2" | |
| 55 | +}; | |
| 56 | + | |
| 53 | 57 | void mtk_w32(struct mtk_eth *eth, u32 val, unsigned reg) |
| 54 | 58 | { |
| 55 | 59 | __raw_writel(val, eth->base + reg); |
| @@ -245,12 +249,16 @@ static int mtk_phy_connect(struct mtk_mac *mac) · 189 unmodified lines | ||
| 245 | 249 | case PHY_INTERFACE_MODE_MII: |
| 246 | 250 | ge_mode = 1; |
| 247 | 251 | break; |
| 248 | − case PHY_INTERFACE_MODE_RMII: | |
| 252 | + case PHY_INTERFACE_MODE_REVMII: | |
| 249 | 253 | ge_mode = 2; |
| 250 | 254 | break; |
| 255 | + case PHY_INTERFACE_MODE_RMII: | |
| 256 | + if (!mac->id) | |
| 257 | + goto err_phy; | |
| 258 | + ge_mode = 3; | |
| 259 | + break; | |
| 251 | 260 | default: |
| 252 | − dev_err(eth->dev, "invalid phy_mode\n"); | |
| 253 | − return -1; | |
| 261 | + goto err_phy; | |
| 254 | 262 | } |
| 255 | 263 | |
| 256 | 264 | /* put the gmac into the right mode */ |
| @@ -263,19 +271,31 @@ static int mtk_phy_connect(struct mtk_mac *mac) · 6 unmodified lines | ||
| 263 | 271 | mac->phy_dev->autoneg = AUTONEG_ENABLE; |
| 264 | 272 | mac->phy_dev->speed = 0; |
| 265 | 273 | mac->phy_dev->duplex = 0; |
| 274 | + | |
| 275 | + if (of_phy_is_fixed_link(mac->of_node)) | |
| 276 | + mac->phy_dev->supported |= | |
| 277 | + SUPPORTED_Pause | SUPPORTED_Asym_Pause; | |
| 278 | + | |
| 266 | 279 | mac->phy_dev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause | |
| 267 | 280 | SUPPORTED_Asym_Pause; |
| 268 | 281 | mac->phy_dev->advertising = mac->phy_dev->supported | |
| 269 | 282 | ADVERTISED_Autoneg; |
| 270 | 283 | phy_start_aneg(mac->phy_dev); |
| 271 | 284 | |
| 285 | + of_node_put(np); | |
| 286 | + | |
| 272 | 287 | return 0; |
| 288 | + | |
| 289 | +err_phy: | |
| 290 | + of_node_put(np); | |
| 291 | + dev_err(eth->dev, "invalid phy_mode\n"); | |
| 292 | + return -EINVAL; | |
| 273 | 293 | } |
| 274 | 294 | |
| 275 | 295 | static int mtk_mdio_init(struct mtk_eth *eth) |
| 276 | 296 | { |
| 277 | 297 | struct device_node *mii_np; |
| 278 | − int err; | |
| 298 | + int ret; | |
| 279 | 299 | |
| 280 | 300 | mii_np = of_get_child_by_name(eth->dev->of_node, "mdio-bus"); |
| 281 | 301 | if (!mii_np) { |
| @@ -284,13 +304,13 @@ static int mtk_mdio_init(struct mtk_eth *eth) · 2 unmodified lines | ||
| 284 | 304 | } |
| 285 | 305 | |
| 286 | 306 | if (!of_device_is_available(mii_np)) { |
| 287 | − err = 0; | |
| 307 | + ret = -ENODEV; | |
| 288 | 308 | goto err_put_node; |
| 289 | 309 | } |
| 290 | 310 | |
| 291 | − eth->mii_bus = mdiobus_alloc(); | |
| 311 | + eth->mii_bus = devm_mdiobus_alloc(eth->dev); | |
| 292 | 312 | if (!eth->mii_bus) { |
| 293 | − err = -ENOMEM; | |
| 313 | + ret = -ENOMEM; | |
| 294 | 314 | goto err_put_node; |
| 295 | 315 | } |
| 296 | 316 | |
| @@ -301,19 +321,11 @@ static int mtk_mdio_init(struct mtk_eth *eth) · 4 unmodified lines | ||
| 301 | 321 | eth->mii_bus->parent = eth->dev; |
| 302 | 322 | |
| 303 | 323 | snprintf(eth->mii_bus->id, MII_BUS_ID_SIZE, "%s", mii_np->name); |
| 304 | − err = of_mdiobus_register(eth->mii_bus, mii_np); | |
| 305 | − if (err) | |
| 306 | − goto err_free_bus; | |
| 307 | − | |
| 308 | − return 0; | |
| 309 | − | |
| 310 | −err_free_bus: | |
| 311 | − mdiobus_free(eth->mii_bus); | |
| 324 | + ret = of_mdiobus_register(eth->mii_bus, mii_np); | |
| 312 | 325 | |
| 313 | 326 | err_put_node: |
| 314 | 327 | of_node_put(mii_np); |
| 315 | − eth->mii_bus = NULL; | |
| 316 | − return err; | |
| 328 | + return ret; | |
| 317 | 329 | } |
| 318 | 330 | |
| 319 | 331 | static void mtk_mdio_cleanup(struct mtk_eth *eth) |
| @@ -322,8 +334,6 @@ static void mtk_mdio_cleanup(struct mtk_eth *eth) · 2 unmodified lines | ||
| 322 | 334 | return; |
| 323 | 335 | |
| 324 | 336 | mdiobus_unregister(eth->mii_bus); |
| 325 | − of_node_put(eth->mii_bus->dev.of_node); | |
| 326 | − mdiobus_free(eth->mii_bus); | |
| 327 | 337 | } |
| 328 | 338 | |
| 329 | 339 | static inline void mtk_irq_disable(struct mtk_eth *eth, u32 mask) |
| @@ -542,15 +552,15 @@ static inline struct mtk_tx_buf *mtk_desc_to_tx_buf(struct mtk_tx_ring *ring, · 212 unmodified lines | ||
| 542 | 552 | return &ring->buf[idx]; |
| 543 | 553 | } |
| 544 | 554 | |
| 545 | −static void mtk_tx_unmap(struct device *dev, struct mtk_tx_buf *tx_buf) | |
| 555 | +static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf) | |
| 546 | 556 | { |
| 547 | 557 | if (tx_buf->flags & MTK_TX_FLAGS_SINGLE0) { |
| 548 | − dma_unmap_single(dev, | |
| 558 | + dma_unmap_single(eth->dev, | |
| 549 | 559 | dma_unmap_addr(tx_buf, dma_addr0), |
| 550 | 560 | dma_unmap_len(tx_buf, dma_len0), |
| 551 | 561 | DMA_TO_DEVICE); |
| 552 | 562 | } else if (tx_buf->flags & MTK_TX_FLAGS_PAGE0) { |
| 553 | − dma_unmap_page(dev, | |
| 563 | + dma_unmap_page(eth->dev, | |
| 554 | 564 | dma_unmap_addr(tx_buf, dma_addr0), |
| 555 | 565 | dma_unmap_len(tx_buf, dma_len0), |
| 556 | 566 | DMA_TO_DEVICE); |
| @@ -572,14 +582,15 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, · 15 unmodified lines | ||
| 572 | 582 | dma_addr_t mapped_addr; |
| 573 | 583 | unsigned int nr_frags; |
| 574 | 584 | int i, n_desc = 1; |
| 575 | − u32 txd4 = 0; | |
| 585 | + u32 txd4 = 0, fport; | |
| 576 | 586 | |
| 577 | 587 | itxd = ring->next_free; |
| 578 | 588 | if (itxd == ring->last_free) |
| 579 | 589 | return -ENOMEM; |
| 580 | 590 | |
| 581 | 591 | /* set the forward port */ |
| 582 | − txd4 |= (mac->id + 1) << TX_DMA_FPORT_SHIFT; | |
| 592 | + fport = (mac->id + 1) << TX_DMA_FPORT_SHIFT; | |
| 593 | + txd4 |= fport; | |
| 583 | 594 | |
| 584 | 595 | tx_buf = mtk_desc_to_tx_buf(ring, itxd); |
| 585 | 596 | memset(tx_buf, 0, sizeof(*tx_buf)); |
| @@ -595,9 +606,9 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, · 9 unmodified lines | ||
| 595 | 606 | if (skb_vlan_tag_present(skb)) |
| 596 | 607 | txd4 |= TX_DMA_INS_VLAN | skb_vlan_tag_get(skb); |
| 597 | 608 | |
| 598 | − mapped_addr = dma_map_single(&dev->dev, skb->data, | |
| 609 | + mapped_addr = dma_map_single(eth->dev, skb->data, | |
| 599 | 610 | skb_headlen(skb), DMA_TO_DEVICE); |
| 600 | − if (unlikely(dma_mapping_error(&dev->dev, mapped_addr))) | |
| 611 | + if (unlikely(dma_mapping_error(eth->dev, mapped_addr))) | |
| 601 | 612 | return -ENOMEM; |
| 602 | 613 | |
| 603 | 614 | WRITE_ONCE(itxd->txd1, mapped_addr); |
| @@ -623,10 +634,10 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, · 19 unmodified lines | ||
| 623 | 634 | |
| 624 | 635 | n_desc++; |
| 625 | 636 | frag_map_size = min(frag_size, MTK_TX_DMA_BUF_LEN); |
| 626 | − mapped_addr = skb_frag_dma_map(&dev->dev, frag, offset, | |
| 637 | + mapped_addr = skb_frag_dma_map(eth->dev, frag, offset, | |
| 627 | 638 | frag_map_size, |
| 628 | 639 | DMA_TO_DEVICE); |
| 629 | − if (unlikely(dma_mapping_error(&dev->dev, mapped_addr))) | |
| 640 | + if (unlikely(dma_mapping_error(eth->dev, mapped_addr))) | |
| 630 | 641 | goto err_dma; |
| 631 | 642 | |
| 632 | 643 | if (i == nr_frags - 1 && |
| @@ -637,7 +648,7 @@ static int mtk_tx_map(struct sk_buff *skb, struct net_device *dev, · 4 unmodified lines | ||
| 637 | 648 | WRITE_ONCE(txd->txd3, (TX_DMA_SWC | |
| 638 | 649 | TX_DMA_PLEN0(frag_map_size) | |
| 639 | 650 | last_frag * TX_DMA_LS0)); |
| 640 | − WRITE_ONCE(txd->txd4, 0); | |
| 651 | + WRITE_ONCE(txd->txd4, fport); | |
| 641 | 652 | |
| 642 | 653 | tx_buf->skb = (struct sk_buff *)MTK_DMA_DUMMY_DESC; |
| 643 | 654 | tx_buf = mtk_desc_to_tx_buf(ring, txd); |
| @@ -679,7 +690,7 @@ err_dma: · 35 unmodified lines | ||
| 679 | 690 | tx_buf = mtk_desc_to_tx_buf(ring, itxd); |
| 680 | 691 | |
| 681 | 692 | /* unmap dma */ |
| 682 | − mtk_tx_unmap(&dev->dev, tx_buf); | |
| 693 | + mtk_tx_unmap(eth, tx_buf); | |
| 683 | 694 | |
| 684 | 695 | itxd->txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU; |
| 685 | 696 | itxd = mtk_qdma_phys_to_virt(ring, itxd->txd2); |
| @@ -836,11 +847,11 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, · 150 unmodified lines | ||
| 836 | 847 | netdev->stats.rx_dropped++; |
| 837 | 848 | goto release_desc; |
| 838 | 849 | } |
| 839 | − dma_addr = dma_map_single(ð->netdev[mac]->dev, | |
| 850 | + dma_addr = dma_map_single(eth->dev, | |
| 840 | 851 | new_data + NET_SKB_PAD, |
| 841 | 852 | ring->buf_size, |
| 842 | 853 | DMA_FROM_DEVICE); |
| 843 | − if (unlikely(dma_mapping_error(&netdev->dev, dma_addr))) { | |
| 854 | + if (unlikely(dma_mapping_error(eth->dev, dma_addr))) { | |
| 844 | 855 | skb_free_frag(new_data); |
| 845 | 856 | netdev->stats.rx_dropped++; |
| 846 | 857 | goto release_desc; |
| @@ -849,13 +860,13 @@ static int mtk_poll_rx(struct napi_struct *napi, int budget, · 2 unmodified lines | ||
| 849 | 860 | /* receive data */ |
| 850 | 861 | skb = build_skb(data, ring->frag_size); |
| 851 | 862 | if (unlikely(!skb)) { |
| 852 | − put_page(virt_to_head_page(new_data)); | |
| 863 | + skb_free_frag(new_data); | |
| 853 | 864 | netdev->stats.rx_dropped++; |
| 854 | 865 | goto release_desc; |
| 855 | 866 | } |
| 856 | 867 | skb_reserve(skb, NET_SKB_PAD + NET_IP_ALIGN); |
| 857 | 868 | |
| 858 | − dma_unmap_single(&netdev->dev, trxd.rxd1, | |
| 869 | + dma_unmap_single(eth->dev, trxd.rxd1, | |
| 859 | 870 | ring->buf_size, DMA_FROM_DEVICE); |
| 860 | 871 | pktlen = RX_DMA_GET_PLEN0(trxd.rxd2); |
| 861 | 872 | skb->dev = netdev; |
| @@ -937,7 +948,7 @@ static int mtk_poll_tx(struct mtk_eth *eth, int budget) · 75 unmodified lines | ||
| 937 | 948 | done[mac]++; |
| 938 | 949 | budget--; |
| 939 | 950 | } |
| 940 | − mtk_tx_unmap(eth->dev, tx_buf); | |
| 951 | + mtk_tx_unmap(eth, tx_buf); | |
| 941 | 952 | |
| 942 | 953 | ring->last_free = desc; |
| 943 | 954 | atomic_inc(&ring->free_count); |
| @@ -1092,7 +1103,7 @@ static void mtk_tx_clean(struct mtk_eth *eth) · 148 unmodified lines | ||
| 1092 | 1103 | |
| 1093 | 1104 | if (ring->buf) { |
| 1094 | 1105 | for (i = 0; i < MTK_DMA_SIZE; i++) |
| 1095 | − mtk_tx_unmap(eth->dev, &ring->buf[i]); | |
| 1106 | + mtk_tx_unmap(eth, &ring->buf[i]); | |
| 1096 | 1107 | kfree(ring->buf); |
| 1097 | 1108 | ring->buf = NULL; |
| 1098 | 1109 | } |
| @@ -1490,10 +1501,7 @@ static void mtk_uninit(struct net_device *dev) · 391 unmodified lines | ||
| 1490 | 1501 | struct mtk_eth *eth = mac->hw; |
| 1491 | 1502 | |
| 1492 | 1503 | phy_disconnect(mac->phy_dev); |
| 1493 | − mtk_mdio_cleanup(eth); | |
| 1494 | 1504 | mtk_irq_disable(eth, ~0); |
| 1495 | − free_irq(eth->irq[1], dev); | |
| 1496 | − free_irq(eth->irq[2], dev); | |
| 1497 | 1505 | } |
| 1498 | 1506 | |
| 1499 | 1507 | static int mtk_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) |
| @@ -1751,6 +1759,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np) · 251 unmodified lines | ||
| 1751 | 1759 | goto free_netdev; |
| 1752 | 1760 | } |
| 1753 | 1761 | spin_lock_init(&mac->hw_stats->stats_lock); |
| 1762 | + u64_stats_init(&mac->hw_stats->syncp); | |
| 1754 | 1763 | mac->hw_stats->reg_offset = id * MTK_STAT_OFFSET; |
| 1755 | 1764 | |
| 1756 | 1765 | SET_NETDEV_DEV(eth->netdev[id], eth->dev); |
| @@ -1796,6 +1805,7 @@ static int mtk_probe(struct platform_device *pdev) · 39 unmodified lines | ||
| 1796 | 1805 | if (!eth) |
| 1797 | 1806 | return -ENOMEM; |
| 1798 | 1807 | |
| 1808 | + eth->dev = &pdev->dev; | |
| 1799 | 1809 | eth->base = devm_ioremap_resource(&pdev->dev, res); |
| 1800 | 1810 | if (IS_ERR(eth->base)) |
| 1801 | 1811 | return PTR_ERR(eth->base); |
| @@ -1830,21 +1840,21 @@ static int mtk_probe(struct platform_device *pdev) · 28 unmodified lines | ||
| 1830 | 1840 | return -ENXIO; |
| 1831 | 1841 | } |
| 1832 | 1842 | } |
| 1843 | + for (i = 0; i < ARRAY_SIZE(eth->clks); i++) { | |
| 1844 | + eth->clks[i] = devm_clk_get(eth->dev, | |
| 1845 | + mtk_clks_source_name[i]); | |
| 1846 | + if (IS_ERR(eth->clks[i])) { | |
| 1847 | + if (PTR_ERR(eth->clks[i]) == -EPROBE_DEFER) | |
| 1848 | + return -EPROBE_DEFER; | |
| 1849 | + return -ENODEV; | |
| 1850 | + } | |
| 1851 | + } | |
| 1833 | 1852 | |
| 1834 | − eth->clk_ethif = devm_clk_get(&pdev->dev, "ethif"); | |
| 1835 | − eth->clk_esw = devm_clk_get(&pdev->dev, "esw"); | |
| 1836 | − eth->clk_gp1 = devm_clk_get(&pdev->dev, "gp1"); | |
| 1837 | − eth->clk_gp2 = devm_clk_get(&pdev->dev, "gp2"); | |
| 1838 | − if (IS_ERR(eth->clk_esw) || IS_ERR(eth->clk_gp1) || | |
| 1839 | − IS_ERR(eth->clk_gp2) || IS_ERR(eth->clk_ethif)) | |
| 1840 | − return -ENODEV; | |
| 1841 | − | |
| 1842 | − clk_prepare_enable(eth->clk_ethif); | |
| 1843 | − clk_prepare_enable(eth->clk_esw); | |
| 1844 | − clk_prepare_enable(eth->clk_gp1); | |
| 1845 | − clk_prepare_enable(eth->clk_gp2); | |
| 1853 | + clk_prepare_enable(eth->clks[MTK_CLK_ETHIF]); | |
| 1854 | + clk_prepare_enable(eth->clks[MTK_CLK_ESW]); | |
| 1855 | + clk_prepare_enable(eth->clks[MTK_CLK_GP1]); | |
| 1856 | + clk_prepare_enable(eth->clks[MTK_CLK_GP2]); | |
| 1846 | 1857 | |
| 1847 | − eth->dev = &pdev->dev; | |
| 1848 | 1858 | eth->msg_enable = netif_msg_init(mtk_msg_level, MTK_DEFAULT_MSG_ENABLE); |
| 1849 | 1859 | INIT_WORK(ð->pending_work, mtk_pending_work); |
| 1850 | 1860 | |
| @@ -1886,15 +1896,24 @@ err_free_dev: · 35 unmodified lines | ||
| 1886 | 1896 | static int mtk_remove(struct platform_device *pdev) |
| 1887 | 1897 | { |
| 1888 | 1898 | struct mtk_eth *eth = platform_get_drvdata(pdev); |
| 1899 | + int i; | |
| 1889 | 1900 | |
| 1890 | − clk_disable_unprepare(eth->clk_ethif); | |
| 1891 | − clk_disable_unprepare(eth->clk_esw); | |
| 1892 | − clk_disable_unprepare(eth->clk_gp1); | |
| 1893 | − clk_disable_unprepare(eth->clk_gp2); | |
| 1901 | + /* stop all devices to make sure that dma is properly shut down */ | |
| 1902 | + for (i = 0; i < MTK_MAC_COUNT; i++) { | |
| 1903 | + if (!eth->netdev[i]) | |
| 1904 | + continue; | |
| 1905 | + mtk_stop(eth->netdev[i]); | |
| 1906 | + } | |
| 1907 | + | |
| 1908 | + clk_disable_unprepare(eth->clks[MTK_CLK_ETHIF]); | |
| 1909 | + clk_disable_unprepare(eth->clks[MTK_CLK_ESW]); | |
| 1910 | + clk_disable_unprepare(eth->clks[MTK_CLK_GP1]); | |
| 1911 | + clk_disable_unprepare(eth->clks[MTK_CLK_GP2]); | |
| 1894 | 1912 | |
| 1895 | 1913 | netif_napi_del(ð->tx_napi); |
| 1896 | 1914 | netif_napi_del(ð->rx_napi); |
| 1897 | 1915 | mtk_cleanup(eth); |
| 1916 | + mtk_mdio_cleanup(eth); | |
| 1898 | 1917 | platform_set_drvdata(pdev, NULL); |
| 1899 | 1918 | |
| 1900 | 1919 | return 0; |
| @@ -1904,6 +1923,7 @@ const struct of_device_id of_mtk_match[] = { · 3 unmodified lines | ||
| 1904 | 1923 | { .compatible = "mediatek,mt7623-eth" }, |
| 1905 | 1924 | {}, |
| 1906 | 1925 | }; |
| 1926 | +MODULE_DEVICE_TABLE(of, of_mtk_match); | |
| 1907 | 1927 | |
| 1908 | 1928 | static struct platform_driver mtk_driver = { |
| 1909 | 1929 | .probe = mtk_probe, |
| @@ -290,6 +290,17 @@ enum mtk_tx_flags { · 289 unmodified lines | ||
| 290 | 290 | MTK_TX_FLAGS_PAGE0 = 0x02, |
| 291 | 291 | }; |
| 292 | 292 | |
| 293 | +/* This enum allows us to identify how the clock is defined on the array of the | |
| 294 | + * clock in the order | |
| 295 | + */ | |
| 296 | +enum mtk_clks_map { | |
| 297 | + MTK_CLK_ETHIF, | |
| 298 | + MTK_CLK_ESW, | |
| 299 | + MTK_CLK_GP1, | |
| 300 | + MTK_CLK_GP2, | |
| 301 | + MTK_CLK_MAX | |
| 302 | +}; | |
| 303 | + | |
| 293 | 304 | /* struct mtk_tx_buf - This struct holds the pointers to the memory pointed at |
| 294 | 305 | * by the TX descriptor s |
| 295 | 306 | * @skb: The SKB pointer of the packet being sent |
| @@ -370,10 +381,7 @@ struct mtk_rx_ring { · 74 unmodified lines | ||
| 370 | 381 | * @scratch_ring: Newer SoCs need memory for a second HW managed TX ring |
| 371 | 382 | * @phy_scratch_ring: physical address of scratch_ring |
| 372 | 383 | * @scratch_head: The scratch memory that scratch_ring points to. |
| 373 | − * @clk_ethif: The ethif clock | |
| 374 | − * @clk_esw: The switch clock | |
| 375 | − * @clk_gp1: The gmac1 clock | |
| 376 | − * @clk_gp2: The gmac2 clock | |
| 384 | + * @clks: clock array for all clocks required | |
| 377 | 385 | * @mii_bus: If there is a bus we need to create an instance for it |
| 378 | 386 | * @pending_work: The workqueue used to reset the dma ring |
| 379 | 387 | */ |
| @@ -400,10 +408,8 @@ struct mtk_eth { · 20 unmodified lines | ||
| 400 | 408 | struct mtk_tx_dma *scratch_ring; |
| 401 | 409 | dma_addr_t phy_scratch_ring; |
| 402 | 410 | void *scratch_head; |
| 403 | − struct clk *clk_ethif; | |
| 404 | − struct clk *clk_esw; | |
| 405 | − struct clk *clk_gp1; | |
| 406 | − struct clk *clk_gp2; | |
| 411 | + struct clk *clks[MTK_CLK_MAX]; | |
| 412 | + | |
| 407 | 413 | struct mii_bus *mii_bus; |
| 408 | 414 | struct work_struct pending_work; |
| 409 | 415 | }; |
| @@ -94,7 +94,7 @@ static u8 mlx4_en_dcbnl_getcap(struct net_device *dev, int capid, u8 *cap) · 93 unmodified lines | ||
| 94 | 94 | *cap = true; |
| 95 | 95 | break; |
| 96 | 96 | case DCB_CAP_ATTR_DCBX: |
| 97 | − *cap = priv->cee_params.dcbx_cap; | |
| 97 | + *cap = priv->dcbx_cap; | |
| 98 | 98 | break; |
| 99 | 99 | case DCB_CAP_ATTR_PFC_TCS: |
| 100 | 100 | *cap = 1 << mlx4_max_tc(priv->mdev->dev); |
| @@ -111,14 +111,14 @@ static u8 mlx4_en_dcbnl_getpfcstate(struct net_device *netdev) · 10 unmodified lines | ||
| 111 | 111 | { |
| 112 | 112 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 113 | 113 | |
| 114 | − return priv->cee_params.dcb_cfg.pfc_state; | |
| 114 | + return priv->cee_config.pfc_state; | |
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | static void mlx4_en_dcbnl_setpfcstate(struct net_device *netdev, u8 state) |
| 118 | 118 | { |
| 119 | 119 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 120 | 120 | |
| 121 | − priv->cee_params.dcb_cfg.pfc_state = state; | |
| 121 | + priv->cee_config.pfc_state = state; | |
| 122 | 122 | } |
| 123 | 123 | |
| 124 | 124 | static void mlx4_en_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority, |
| @@ -126,7 +126,7 @@ static void mlx4_en_dcbnl_get_pfc_cfg(struct net_device *netdev, int priority, · 1 unmodified line | ||
| 126 | 126 | { |
| 127 | 127 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 128 | 128 | |
| 129 | − *setting = priv->cee_params.dcb_cfg.tc_config[priority].dcb_pfc; | |
| 129 | + *setting = priv->cee_config.dcb_pfc[priority]; | |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | static void mlx4_en_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority, |
| @@ -134,8 +134,8 @@ static void mlx4_en_dcbnl_set_pfc_cfg(struct net_device *netdev, int priority, · 1 unmodified line | ||
| 134 | 134 | { |
| 135 | 135 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 136 | 136 | |
| 137 | − priv->cee_params.dcb_cfg.tc_config[priority].dcb_pfc = setting; | |
| 138 | − priv->cee_params.dcb_cfg.pfc_state = true; | |
| 137 | + priv->cee_config.dcb_pfc[priority] = setting; | |
| 138 | + priv->cee_config.pfc_state = true; | |
| 139 | 139 | } |
| 140 | 140 | |
| 141 | 141 | static int mlx4_en_dcbnl_getnumtcs(struct net_device *netdev, int tcid, u8 *num) |
| @@ -157,13 +157,11 @@ static u8 mlx4_en_dcbnl_set_all(struct net_device *netdev) · 15 unmodified lines | ||
| 157 | 157 | { |
| 158 | 158 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 159 | 159 | struct mlx4_en_dev *mdev = priv->mdev; |
| 160 | − struct mlx4_en_cee_config *dcb_cfg = &priv->cee_params.dcb_cfg; | |
| 161 | − int err = 0; | |
| 162 | 160 | |
| 163 | − if (!(priv->cee_params.dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 164 | − return -EINVAL; | |
| 161 | + if (!(priv->dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 162 | + return 1; | |
| 165 | 163 | |
| 166 | − if (dcb_cfg->pfc_state) { | |
| 164 | + if (priv->cee_config.pfc_state) { | |
| 167 | 165 | int tc; |
| 168 | 166 | |
| 169 | 167 | priv->prof->rx_pause = 0; |
| @@ -171,7 +169,7 @@ static u8 mlx4_en_dcbnl_set_all(struct net_device *netdev) · 1 unmodified line | ||
| 171 | 169 | for (tc = 0; tc < CEE_DCBX_MAX_PRIO; tc++) { |
| 172 | 170 | u8 tc_mask = 1 << tc; |
| 173 | 171 | |
| 174 | − switch (dcb_cfg->tc_config[tc].dcb_pfc) { | |
| 172 | + switch (priv->cee_config.dcb_pfc[tc]) { | |
| 175 | 173 | case pfc_disabled: |
| 176 | 174 | priv->prof->tx_ppp &= ~tc_mask; |
| 177 | 175 | priv->prof->rx_ppp &= ~tc_mask; |
| @@ -199,15 +197,17 @@ static u8 mlx4_en_dcbnl_set_all(struct net_device *netdev) · 21 unmodified lines | ||
| 199 | 197 | en_dbg(DRV, priv, "Set pfc off\n"); |
| 200 | 198 | } |
| 201 | 199 | |
| 202 | − err = mlx4_SET_PORT_general(mdev->dev, priv->port, | |
| 203 | − priv->rx_skb_size + ETH_FCS_LEN, | |
| 204 | − priv->prof->tx_pause, | |
| 205 | − priv->prof->tx_ppp, | |
| 206 | − priv->prof->rx_pause, | |
| 207 | − priv->prof->rx_ppp); | |
| 208 | − if (err) | |
| 200 | + if (mlx4_SET_PORT_general(mdev->dev, priv->port, | |
| 201 | + priv->rx_skb_size + ETH_FCS_LEN, | |
| 202 | + priv->prof->tx_pause, | |
| 203 | + priv->prof->tx_ppp, | |
| 204 | + priv->prof->rx_pause, | |
| 205 | + priv->prof->rx_ppp)) { | |
| 209 | 206 | en_err(priv, "Failed setting pause params\n"); |
| 210 | − return err; | |
| 207 | + return 1; | |
| 208 | + } | |
| 209 | + | |
| 210 | + return 0; | |
| 211 | 211 | } |
| 212 | 212 | |
| 213 | 213 | static u8 mlx4_en_dcbnl_get_state(struct net_device *dev) |
| @@ -225,7 +225,7 @@ static u8 mlx4_en_dcbnl_set_state(struct net_device *dev, u8 state) · 11 unmodified lines | ||
| 225 | 225 | struct mlx4_en_priv *priv = netdev_priv(dev); |
| 226 | 226 | int num_tcs = 0; |
| 227 | 227 | |
| 228 | − if (!(priv->cee_params.dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 228 | + if (!(priv->dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 229 | 229 | return 1; |
| 230 | 230 | |
| 231 | 231 | if (!!(state) == !!(priv->flags & MLX4_EN_FLAG_DCB_ENABLED)) |
| @@ -238,7 +238,10 @@ static u8 mlx4_en_dcbnl_set_state(struct net_device *dev, u8 state) · 6 unmodified lines | ||
| 238 | 238 | priv->flags &= ~MLX4_EN_FLAG_DCB_ENABLED; |
| 239 | 239 | } |
| 240 | 240 | |
| 241 | − return mlx4_en_setup_tc(dev, num_tcs); | |
| 241 | + if (mlx4_en_setup_tc(dev, num_tcs)) | |
| 242 | + return 1; | |
| 243 | + | |
| 244 | + return 0; | |
| 242 | 245 | } |
| 243 | 246 | |
| 244 | 247 | /* On success returns a non-zero 802.1p user priority bitmap |
| @@ -252,7 +255,7 @@ static int mlx4_en_dcbnl_getapp(struct net_device *netdev, u8 idtype, u16 id) · 7 unmodified lines | ||
| 252 | 255 | .selector = idtype, |
| 253 | 256 | .protocol = id, |
| 254 | 257 | }; |
| 255 | − if (!(priv->cee_params.dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 258 | + if (!(priv->dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 256 | 259 | return 0; |
| 257 | 260 | |
| 258 | 261 | return dcb_getapp(netdev, &app); |
| @@ -264,7 +267,7 @@ static int mlx4_en_dcbnl_setapp(struct net_device *netdev, u8 idtype, · 5 unmodified lines | ||
| 264 | 267 | struct mlx4_en_priv *priv = netdev_priv(netdev); |
| 265 | 268 | struct dcb_app app; |
| 266 | 269 | |
| 267 | − if (!(priv->cee_params.dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 270 | + if (!(priv->dcbx_cap & DCB_CAP_DCBX_VER_CEE)) | |
| 268 | 271 | return -EINVAL; |
| 269 | 272 | |
| 270 | 273 | memset(&app, 0, sizeof(struct dcb_app)); |
| @@ -433,7 +436,7 @@ static u8 mlx4_en_dcbnl_getdcbx(struct net_device *dev) · 162 unmodified lines | ||
| 433 | 436 | { |
| 434 | 437 | struct mlx4_en_priv *priv = netdev_priv(dev); |
| 435 | 438 | |
| 436 | − return priv->cee_params.dcbx_cap; | |
| 439 | + return priv->dcbx_cap; | |
| 437 | 440 | } |
| 438 | 441 | |
| 439 | 442 | static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode) |
| @@ -442,7 +445,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode) · 2 unmodified lines | ||
| 442 | 445 | struct ieee_ets ets = {0}; |
| 443 | 446 | struct ieee_pfc pfc = {0}; |
| 444 | 447 | |
| 445 | − if (mode == priv->cee_params.dcbx_cap) | |
| 448 | + if (mode == priv->dcbx_cap) | |
| 446 | 449 | return 0; |
| 447 | 450 | |
| 448 | 451 | if ((mode & DCB_CAP_DCBX_LLD_MANAGED) || |
| @@ -451,7 +454,7 @@ static u8 mlx4_en_dcbnl_setdcbx(struct net_device *dev, u8 mode) · 2 unmodified lines | ||
| 451 | 454 | !(mode & DCB_CAP_DCBX_HOST)) |
| 452 | 455 | goto err; |
| 453 | 456 | |
| 454 | − priv->cee_params.dcbx_cap = mode; | |
| 457 | + priv->dcbx_cap = mode; | |
| 455 | 458 | |
| 456 | 459 | ets.ets_cap = IEEE_8021QAZ_MAX_TCS; |
| 457 | 460 | pfc.pfc_cap = IEEE_8021QAZ_MAX_TCS; |
| @@ -71,10 +71,11 @@ int mlx4_en_setup_tc(struct net_device *dev, u8 up) · 70 unmodified lines | ||
| 71 | 71 | #ifdef CONFIG_MLX4_EN_DCB |
| 72 | 72 | if (!mlx4_is_slave(priv->mdev->dev)) { |
| 73 | 73 | if (up) { |
| 74 | − priv->flags |= MLX4_EN_FLAG_DCB_ENABLED; | |
| 74 | + if (priv->dcbx_cap) | |
| 75 | + priv->flags |= MLX4_EN_FLAG_DCB_ENABLED; | |
| 75 | 76 | } else { |
| 76 | 77 | priv->flags &= ~MLX4_EN_FLAG_DCB_ENABLED; |
| 77 | − priv->cee_params.dcb_cfg.pfc_state = false; | |
| 78 | + priv->cee_config.pfc_state = false; | |
| 78 | 79 | } |
| 79 | 80 | } |
| 80 | 81 | #endif /* CONFIG_MLX4_EN_DCB */ |
| @@ -3048,9 +3049,6 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, · 2967 unmodified lines | ||
| 3048 | 3049 | struct mlx4_en_priv *priv; |
| 3049 | 3050 | int i; |
| 3050 | 3051 | int err; |
| 3051 | −#ifdef CONFIG_MLX4_EN_DCB | |
| 3052 | − struct tc_configuration *tc; | |
| 3053 | −#endif | |
| 3054 | 3052 | |
| 3055 | 3053 | dev = alloc_etherdev_mqs(sizeof(struct mlx4_en_priv), |
| 3056 | 3054 | MAX_TX_RINGS, MAX_RX_RINGS); |
| @@ -3117,16 +3115,13 @@ int mlx4_en_init_netdev(struct mlx4_en_dev *mdev, int port, · 60 unmodified lines | ||
| 3117 | 3115 | priv->msg_enable = MLX4_EN_MSG_LEVEL; |
| 3118 | 3116 | #ifdef CONFIG_MLX4_EN_DCB |
| 3119 | 3117 | if (!mlx4_is_slave(priv->mdev->dev)) { |
| 3120 | − priv->cee_params.dcbx_cap = DCB_CAP_DCBX_VER_CEE | | |
| 3121 | − DCB_CAP_DCBX_HOST | | |
| 3122 | − DCB_CAP_DCBX_VER_IEEE; | |
| 3118 | + priv->dcbx_cap = DCB_CAP_DCBX_VER_CEE | DCB_CAP_DCBX_HOST | | |
| 3119 | + DCB_CAP_DCBX_VER_IEEE; | |
| 3123 | 3120 | priv->flags |= MLX4_EN_DCB_ENABLED; |
| 3124 | − priv->cee_params.dcb_cfg.pfc_state = false; | |
| 3121 | + priv->cee_config.pfc_state = false; | |
| 3125 | 3122 | |
| 3126 | − for (i = 0; i < MLX4_EN_NUM_UP; i++) { | |
| 3127 | − tc = &priv->cee_params.dcb_cfg.tc_config[i]; | |
| 3128 | − tc->dcb_pfc = pfc_disabled; | |
| 3129 | − } | |
| 3123 | + for (i = 0; i < MLX4_EN_NUM_UP; i++) | |
| 3124 | + priv->cee_config.dcb_pfc[i] = pfc_disabled; | |
| 3130 | 3125 | |
| 3131 | 3126 | if (mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAG2_ETS_CFG) { |
| 3132 | 3127 | dev->dcbnl_ops = &mlx4_en_dcbnl_ops; |
| @@ -818,7 +818,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) · 817 unmodified lines | ||
| 818 | 818 | real_size = get_real_size(skb, shinfo, dev, &lso_header_size, |
| 819 | 819 | &inline_ok, &fragptr); |
| 820 | 820 | if (unlikely(!real_size)) |
| 821 | − goto tx_drop; | |
| 821 | + goto tx_drop_count; | |
| 822 | 822 | |
| 823 | 823 | /* Align descriptor to TXBB size */ |
| 824 | 824 | desc_size = ALIGN(real_size, TXBB_SIZE); |
| @@ -826,7 +826,7 @@ netdev_tx_t mlx4_en_xmit(struct sk_buff *skb, struct net_device *dev) · 1 unmodified line | ||
| 826 | 826 | if (unlikely(nr_txbb > MAX_DESC_TXBBS)) { |
| 827 | 827 | if (netif_msg_tx_err(priv)) |
| 828 | 828 | en_warn(priv, "Oversized header or SG list\n"); |
| 829 | − goto tx_drop; | |
| 829 | + goto tx_drop_count; | |
| 830 | 830 | } |
| 831 | 831 | |
| 832 | 832 | bf_ok = ring->bf_enabled; |
| @@ -1071,9 +1071,10 @@ tx_drop_unmap: · 238 unmodified lines | ||
| 1071 | 1071 | PCI_DMA_TODEVICE); |
| 1072 | 1072 | } |
| 1073 | 1073 | |
| 1074 | +tx_drop_count: | |
| 1075 | + ring->tx_dropped++; | |
| 1074 | 1076 | tx_drop: |
| 1075 | 1077 | dev_kfree_skb_any(skb); |
| 1076 | − ring->tx_dropped++; | |
| 1077 | 1078 | return NETDEV_TX_OK; |
| 1078 | 1079 | } |
| 1079 | 1080 | |
| @@ -1106,7 +1107,7 @@ netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_alloc *frame, · 26 unmodified lines | ||
| 1106 | 1107 | goto tx_drop; |
| 1107 | 1108 | |
| 1108 | 1109 | if (mlx4_en_is_tx_ring_full(ring)) |
| 1109 | − goto tx_drop; | |
| 1110 | + goto tx_drop_count; | |
| 1110 | 1111 | |
| 1111 | 1112 | /* fetch ring->cons far ahead before needing it to avoid stall */ |
| 1112 | 1113 | ring_cons = READ_ONCE(ring->cons); |
| @@ -1176,7 +1177,8 @@ netdev_tx_t mlx4_en_xmit_frame(struct mlx4_en_rx_alloc *frame, · 63 unmodified lines | ||
| 1176 | 1177 | |
| 1177 | 1178 | return NETDEV_TX_OK; |
| 1178 | 1179 | |
| 1179 | −tx_drop: | |
| 1180 | +tx_drop_count: | |
| 1180 | 1181 | ring->tx_dropped++; |
| 1182 | +tx_drop: | |
| 1181 | 1183 | return NETDEV_TX_BUSY; |
| 1182 | 1184 | } |
| @@ -1305,8 +1305,8 @@ int mlx4_init_eq_table(struct mlx4_dev *dev) · 1304 unmodified lines | ||
| 1305 | 1305 | return 0; |
| 1306 | 1306 | |
| 1307 | 1307 | err_out_unmap: |
| 1308 | − while (i >= 0) | |
| 1309 | − mlx4_free_eq(dev, &priv->eq_table.eq[i--]); | |
| 1308 | + while (i > 0) | |
| 1309 | + mlx4_free_eq(dev, &priv->eq_table.eq[--i]); | |
| 1310 | 1310 | #ifdef CONFIG_RFS_ACCEL |
| 1311 | 1311 | for (i = 1; i <= dev->caps.num_ports; i++) { |
| 1312 | 1312 | if (mlx4_priv(dev)->port[i].rmap) { |
| @@ -2970,6 +2970,7 @@ static int mlx4_init_port_info(struct mlx4_dev *dev, int port) · 2969 unmodified lines | ||
| 2970 | 2970 | mlx4_err(dev, "Failed to create mtu file for port %d\n", port); |
| 2971 | 2971 | device_remove_file(&info->dev->persist->pdev->dev, |
| 2972 | 2972 | &info->port_attr); |
| 2973 | + devlink_port_unregister(&info->devlink_port); | |
| 2973 | 2974 | info->port = -1; |
| 2974 | 2975 | } |
| 2975 | 2976 | |
| @@ -2984,6 +2985,8 @@ static void mlx4_cleanup_port_info(struct mlx4_port_info *info) · 8 unmodified lines | ||
| 2984 | 2985 | device_remove_file(&info->dev->persist->pdev->dev, &info->port_attr); |
| 2985 | 2986 | device_remove_file(&info->dev->persist->pdev->dev, |
| 2986 | 2987 | &info->port_mtu_attr); |
| 2988 | + devlink_port_unregister(&info->devlink_port); | |
| 2989 | + | |
| 2987 | 2990 | #ifdef CONFIG_RFS_ACCEL |
| 2988 | 2991 | free_irq_cpu_rmap(info->rmap); |
| 2989 | 2992 | info->rmap = NULL; |
| @@ -482,20 +482,10 @@ enum dcb_pfc_type { · 481 unmodified lines | ||
| 482 | 482 | pfc_enabled_rx |
| 483 | 483 | }; |
| 484 | 484 | |
| 485 | −struct tc_configuration { | |
| 486 | − enum dcb_pfc_type dcb_pfc; | |
| 487 | −}; | |
| 488 | − | |
| 489 | 485 | struct mlx4_en_cee_config { |
| 490 | 486 | bool pfc_state; |
| 491 | − struct tc_configuration tc_config[MLX4_EN_NUM_UP]; | |
| 487 | + enum dcb_pfc_type dcb_pfc[MLX4_EN_NUM_UP]; | |
| 492 | 488 | }; |
| 493 | − | |
| 494 | −struct mlx4_en_cee_params { | |
| 495 | − u8 dcbx_cap; | |
| 496 | − struct mlx4_en_cee_config dcb_cfg; | |
| 497 | −}; | |
| 498 | − | |
| 499 | 489 | #endif |
| 500 | 490 | |
| 501 | 491 | struct ethtool_flow_id { |
| @@ -624,7 +614,8 @@ struct mlx4_en_priv { · 122 unmodified lines | ||
| 624 | 614 | struct ieee_ets ets; |
| 625 | 615 | u16 maxrate[IEEE_8021QAZ_MAX_TCS]; |
| 626 | 616 | enum dcbnl_cndd_states cndd_state[IEEE_8021QAZ_MAX_TCS]; |
| 627 | − struct mlx4_en_cee_params cee_params; | |
| 617 | + struct mlx4_en_cee_config cee_config; | |
| 618 | + u8 dcbx_cap; | |
| 628 | 619 | #endif |
| 629 | 620 | #ifdef CONFIG_RFS_ACCEL |
| 630 | 621 | spinlock_t filters_lock; |
| @@ -52,7 +52,7 @@ · 51 unmodified lines | ||
| 52 | 52 | |
| 53 | 53 | #define MLX4_FLAG_V_IGNORE_FCS_MASK 0x2 |
| 54 | 54 | #define MLX4_IGNORE_FCS_MASK 0x1 |
| 55 | −#define MLNX4_TX_MAX_NUMBER 8 | |
| 55 | +#define MLX4_TC_MAX_NUMBER 8 | |
| 56 | 56 | |
| 57 | 57 | void mlx4_init_mac_table(struct mlx4_dev *dev, struct mlx4_mac_table *table) |
| 58 | 58 | { |
| @@ -2022,7 +2022,7 @@ int mlx4_max_tc(struct mlx4_dev *dev) · 1963 unmodified lines | ||
| 2022 | 2022 | u8 num_tc = dev->caps.max_tc_eth; |
| 2023 | 2023 | |
| 2024 | 2024 | if (!num_tc) |
| 2025 | − num_tc = MLNX4_TX_MAX_NUMBER; | |
| 2025 | + num_tc = MLX4_TC_MAX_NUMBER; | |
| 2026 | 2026 | |
| 2027 | 2027 | return num_tc; |
| 2028 | 2028 | } |
| @@ -143,13 +143,14 @@ static struct mlx5_cmd_layout *get_inst(struct mlx5_cmd *cmd, int idx) · 142 unmodified lines | ||
| 143 | 143 | return cmd->cmd_buf + (idx << cmd->log_stride); |
| 144 | 144 | } |
| 145 | 145 | |
| 146 | −static u8 xor8_buf(void *buf, int len) | |
| 146 | +static u8 xor8_buf(void *buf, size_t offset, int len) | |
| 147 | 147 | { |
| 148 | 148 | u8 *ptr = buf; |
| 149 | 149 | u8 sum = 0; |
| 150 | 150 | int i; |
| 151 | + int end = len + offset; | |
| 151 | 152 | |
| 152 | − for (i = 0; i < len; i++) | |
| 153 | + for (i = offset; i < end; i++) | |
| 153 | 154 | sum ^= ptr[i]; |
| 154 | 155 | |
| 155 | 156 | return sum; |
| @@ -157,41 +158,49 @@ static u8 xor8_buf(void *buf, int len) · 1 unmodified line | ||
| 157 | 158 | |
| 158 | 159 | static int verify_block_sig(struct mlx5_cmd_prot_block *block) |
| 159 | 160 | { |
| 160 | − if (xor8_buf(block->rsvd0, sizeof(*block) - sizeof(block->data) - 1) != 0xff) | |
| 161 | + size_t rsvd0_off = offsetof(struct mlx5_cmd_prot_block, rsvd0); | |
| 162 | + int xor_len = sizeof(*block) - sizeof(block->data) - 1; | |
| 163 | + | |
| 164 | + if (xor8_buf(block, rsvd0_off, xor_len) != 0xff) | |
| 161 | 165 | return -EINVAL; |
| 162 | 166 | |
| 163 | − if (xor8_buf(block, sizeof(*block)) != 0xff) | |
| 167 | + if (xor8_buf(block, 0, sizeof(*block)) != 0xff) | |
| 164 | 168 | return -EINVAL; |
| 165 | 169 | |
| 166 | 170 | return 0; |
| 167 | 171 | } |
| 168 | 172 | |
| 169 | −static void calc_block_sig(struct mlx5_cmd_prot_block *block, u8 token, | |
| 170 | − int csum) | |
| 173 | +static void calc_block_sig(struct mlx5_cmd_prot_block *block) | |
| 171 | 174 | { |
| 172 | − block->token = token; | |
| 173 | − if (csum) { | |
| 174 | − block->ctrl_sig = ~xor8_buf(block->rsvd0, sizeof(*block) - | |
| 175 | − sizeof(block->data) - 2); | |
| 176 | − block->sig = ~xor8_buf(block, sizeof(*block) - 1); | |
| 177 | − } | |
| 175 | + int ctrl_xor_len = sizeof(*block) - sizeof(block->data) - 2; | |
| 176 | + size_t rsvd0_off = offsetof(struct mlx5_cmd_prot_block, rsvd0); | |
| 177 | + | |
| 178 | + block->ctrl_sig = ~xor8_buf(block, rsvd0_off, ctrl_xor_len); | |
| 179 | + block->sig = ~xor8_buf(block, 0, sizeof(*block) - 1); | |
| 178 | 180 | } |
| 179 | 181 | |
| 180 | −static void calc_chain_sig(struct mlx5_cmd_msg *msg, u8 token, int csum) | |
| 182 | +static void calc_chain_sig(struct mlx5_cmd_msg *msg) | |
| 181 | 183 | { |
| 182 | 184 | struct mlx5_cmd_mailbox *next = msg->next; |
| 183 | − | |
| 184 | − while (next) { | |
| 185 | − calc_block_sig(next->buf, token, csum); | |
| 185 | + int size = msg->len; | |
| 186 | + int blen = size - min_t(int, sizeof(msg->first.data), size); | |
| 187 | + int n = (blen + MLX5_CMD_DATA_BLOCK_SIZE - 1) | |
| 188 | + / MLX5_CMD_DATA_BLOCK_SIZE; | |
| 189 | + int i = 0; | |
| 190 | + | |
| 191 | + for (i = 0; i < n && next; i++) { | |
| 192 | + calc_block_sig(next->buf); | |
| 186 | 193 | next = next->next; |
| 187 | 194 | } |
| 188 | 195 | } |
| 189 | 196 | |
| 190 | 197 | static void set_signature(struct mlx5_cmd_work_ent *ent, int csum) |
| 191 | 198 | { |
| 192 | − ent->lay->sig = ~xor8_buf(ent->lay, sizeof(*ent->lay)); | |
| 193 | − calc_chain_sig(ent->in, ent->token, csum); | |
| 194 | − calc_chain_sig(ent->out, ent->token, csum); | |
| 199 | + ent->lay->sig = ~xor8_buf(ent->lay, 0, sizeof(*ent->lay)); | |
| 200 | + if (csum) { | |
| 201 | + calc_chain_sig(ent->in); | |
| 202 | + calc_chain_sig(ent->out); | |
| 203 | + } | |
| 195 | 204 | } |
| 196 | 205 | |
| 197 | 206 | static void poll_timeout(struct mlx5_cmd_work_ent *ent) |
| @@ -222,12 +231,17 @@ static int verify_signature(struct mlx5_cmd_work_ent *ent) · 24 unmodified lines | ||
| 222 | 231 | struct mlx5_cmd_mailbox *next = ent->out->next; |
| 223 | 232 | int err; |
| 224 | 233 | u8 sig; |
| 234 | + int size = ent->out->len; | |
| 235 | + int blen = size - min_t(int, sizeof(ent->out->first.data), size); | |
| 236 | + int n = (blen + MLX5_CMD_DATA_BLOCK_SIZE - 1) | |
| 237 | + / MLX5_CMD_DATA_BLOCK_SIZE; | |
| 238 | + int i = 0; | |
| 225 | 239 | |
| 226 | − sig = xor8_buf(ent->lay, sizeof(*ent->lay)); | |
| 240 | + sig = xor8_buf(ent->lay, 0, sizeof(*ent->lay)); | |
| 227 | 241 | if (sig != 0xff) |
| 228 | 242 | return -EINVAL; |
| 229 | 243 | |
| 230 | − while (next) { | |
| 244 | + for (i = 0; i < n && next; i++) { | |
| 231 | 245 | err = verify_block_sig(next->buf); |
| 232 | 246 | if (err) |
| 233 | 247 | return err; |
| @@ -656,7 +670,6 @@ static void cmd_work_handler(struct work_struct *work) · 422 unmodified lines | ||
| 656 | 670 | spin_unlock_irqrestore(&cmd->alloc_lock, flags); |
| 657 | 671 | } |
| 658 | 672 | |
| 659 | − ent->token = alloc_token(cmd); | |
| 660 | 673 | cmd->ent_arr[ent->idx] = ent; |
| 661 | 674 | lay = get_inst(cmd, ent->idx); |
| 662 | 675 | ent->lay = lay; |
| @@ -766,7 +779,8 @@ static u8 *get_status_ptr(struct mlx5_outbox_hdr *out) · 103 unmodified lines | ||
| 766 | 779 | static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, |
| 767 | 780 | struct mlx5_cmd_msg *out, void *uout, int uout_size, |
| 768 | 781 | mlx5_cmd_cbk_t callback, |
| 769 | − void *context, int page_queue, u8 *status) | |
| 782 | + void *context, int page_queue, u8 *status, | |
| 783 | + u8 token) | |
| 770 | 784 | { |
| 771 | 785 | struct mlx5_cmd *cmd = &dev->cmd; |
| 772 | 786 | struct mlx5_cmd_work_ent *ent; |
| @@ -783,6 +797,8 @@ static int mlx5_cmd_invoke(struct mlx5_core_dev *dev, struct mlx5_cmd_msg *in, · 10 unmodified lines | ||
| 783 | 797 | if (IS_ERR(ent)) |
| 784 | 798 | return PTR_ERR(ent); |
| 785 | 799 | |
| 800 | + ent->token = token; | |
| 801 | + | |
| 786 | 802 | if (!callback) |
| 787 | 803 | init_completion(&ent->done); |
| 788 | 804 | |
| @@ -854,7 +870,8 @@ static const struct file_operations fops = { · 65 unmodified lines | ||
| 854 | 870 | .write = dbg_write, |
| 855 | 871 | }; |
| 856 | 872 | |
| 857 | −static int mlx5_copy_to_msg(struct mlx5_cmd_msg *to, void *from, int size) | |
| 873 | +static int mlx5_copy_to_msg(struct mlx5_cmd_msg *to, void *from, int size, | |
| 874 | + u8 token) | |
| 858 | 875 | { |
| 859 | 876 | struct mlx5_cmd_prot_block *block; |
| 860 | 877 | struct mlx5_cmd_mailbox *next; |
| @@ -880,6 +897,7 @@ static int mlx5_copy_to_msg(struct mlx5_cmd_msg *to, void *from, int size) · 19 unmodified lines | ||
| 880 | 897 | memcpy(block->data, from, copy); |
| 881 | 898 | from += copy; |
| 882 | 899 | size -= copy; |
| 900 | + block->token = token; | |
| 883 | 901 | next = next->next; |
| 884 | 902 | } |
| 885 | 903 | |
| @@ -949,7 +967,8 @@ static void free_cmd_box(struct mlx5_core_dev *dev, · 63 unmodified lines | ||
| 949 | 967 | } |
| 950 | 968 | |
| 951 | 969 | static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev, |
| 952 | − gfp_t flags, int size) | |
| 970 | + gfp_t flags, int size, | |
| 971 | + u8 token) | |
| 953 | 972 | { |
| 954 | 973 | struct mlx5_cmd_mailbox *tmp, *head = NULL; |
| 955 | 974 | struct mlx5_cmd_prot_block *block; |
| @@ -978,6 +997,7 @@ static struct mlx5_cmd_msg *mlx5_alloc_cmd_msg(struct mlx5_core_dev *dev, · 22 unmodified lines | ||
| 978 | 997 | tmp->next = head; |
| 979 | 998 | block->next = cpu_to_be64(tmp->next ? tmp->next->dma : 0); |
| 980 | 999 | block->block_num = cpu_to_be32(n - i - 1); |
| 1000 | + block->token = token; | |
| 981 | 1001 | head = tmp; |
| 982 | 1002 | } |
| 983 | 1003 | msg->next = head; |
| @@ -1352,7 +1372,7 @@ static struct mlx5_cmd_msg *alloc_msg(struct mlx5_core_dev *dev, int in_size, · 368 unmodified lines | ||
| 1352 | 1372 | } |
| 1353 | 1373 | |
| 1354 | 1374 | if (IS_ERR(msg)) |
| 1355 | − msg = mlx5_alloc_cmd_msg(dev, gfp, in_size); | |
| 1375 | + msg = mlx5_alloc_cmd_msg(dev, gfp, in_size, 0); | |
| 1356 | 1376 | |
| 1357 | 1377 | return msg; |
| 1358 | 1378 | } |
| @@ -1377,6 +1397,7 @@ static int cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out, · 18 unmodified lines | ||
| 1377 | 1397 | int err; |
| 1378 | 1398 | u8 status = 0; |
| 1379 | 1399 | u32 drv_synd; |
| 1400 | + u8 token; | |
| 1380 | 1401 | |
| 1381 | 1402 | if (pci_channel_offline(dev->pdev) || |
| 1382 | 1403 | dev->state == MLX5_DEVICE_STATE_INTERNAL_ERROR) { |
| @@ -1395,20 +1416,22 @@ static int cmd_exec(struct mlx5_core_dev *dev, void *in, int in_size, void *out, · 12 unmodified lines | ||
| 1395 | 1416 | return err; |
| 1396 | 1417 | } |
| 1397 | 1418 | |
| 1398 | − err = mlx5_copy_to_msg(inb, in, in_size); | |
| 1419 | + token = alloc_token(&dev->cmd); | |
| 1420 | + | |
| 1421 | + err = mlx5_copy_to_msg(inb, in, in_size, token); | |
| 1399 | 1422 | if (err) { |
| 1400 | 1423 | mlx5_core_warn(dev, "err %d\n", err); |
| 1401 | 1424 | goto out_in; |
| 1402 | 1425 | } |
| 1403 | 1426 | |
| 1404 | − outb = mlx5_alloc_cmd_msg(dev, gfp, out_size); | |
| 1427 | + outb = mlx5_alloc_cmd_msg(dev, gfp, out_size, token); | |
| 1405 | 1428 | if (IS_ERR(outb)) { |
| 1406 | 1429 | err = PTR_ERR(outb); |
| 1407 | 1430 | goto out_in; |
| 1408 | 1431 | } |
| 1409 | 1432 | |
| 1410 | 1433 | err = mlx5_cmd_invoke(dev, inb, outb, out, out_size, callback, context, |
| 1411 | − pages_queue, &status); | |
| 1434 | + pages_queue, &status, token); | |
| 1412 | 1435 | if (err) |
| 1413 | 1436 | goto out_out; |
| 1414 | 1437 | |
| @@ -1476,7 +1499,7 @@ static int create_msg_cache(struct mlx5_core_dev *dev) · 61 unmodified lines | ||
| 1476 | 1499 | INIT_LIST_HEAD(&cmd->cache.med.head); |
| 1477 | 1500 | |
| 1478 | 1501 | for (i = 0; i < NUM_LONG_LISTS; i++) { |
| 1479 | − msg = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, LONG_LIST_SIZE); | |
| 1502 | + msg = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, LONG_LIST_SIZE, 0); | |
| 1480 | 1503 | if (IS_ERR(msg)) { |
| 1481 | 1504 | err = PTR_ERR(msg); |
| 1482 | 1505 | goto ex_err; |
| @@ -1486,7 +1509,7 @@ static int create_msg_cache(struct mlx5_core_dev *dev) · 3 unmodified lines | ||
| 1486 | 1509 | } |
| 1487 | 1510 | |
| 1488 | 1511 | for (i = 0; i < NUM_MED_LISTS; i++) { |
| 1489 | − msg = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, MED_LIST_SIZE); | |
| 1512 | + msg = mlx5_alloc_cmd_msg(dev, GFP_KERNEL, MED_LIST_SIZE, 0); | |
3 more lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 187 lines aren’t shown here.
This diff is large: its 266 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 133 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 97 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 60 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 105 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 88 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 385 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 327 lines aren’t shown here.
This diff is large: its 170 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 38 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 59 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 474 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 155 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 106 lines aren’t shown here.
This diff is large: its 333 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 141 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 216 lines aren’t shown here.
This diff is large: its 131 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 380 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 203 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 102 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 67 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 381 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 66 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 6 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 147 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 67 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 343 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 97 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 36 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 102 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 65 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 97 lines aren’t shown here.
This diff is large: its 47 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 153 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 156 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 132 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 170 lines aren’t shown here.
This diff is large: its 435 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 149 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 104 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 114 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 474 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 72 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 119 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 187 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 59 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 101 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 125 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 55 lines aren’t shown here.
This diff is large: its 181 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 64 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 253 lines aren’t shown here.
This diff is large: its 67 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 111 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 44 lines aren’t shown here.
This diff is large: its 126 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 112 lines aren’t shown here.
This diff is large: its 210 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 74 lines aren’t shown here.
This diff is large: its 184 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 94 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 53 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 154 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 80 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 69 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 186 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 244 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 81 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 37 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 75 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 91 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 45 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 63 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 121 lines aren’t shown here.
This diff is large: its 40 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 90 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 116 lines aren’t shown here.
This diff is large: its 132 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 49 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 29 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 122 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 51 lines aren’t shown here.
This diff is large: its 247 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 88 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 52 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 135 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 91 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 135 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 19 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 68 lines aren’t shown here.
This diff is large: its 124 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 28 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 42 lines aren’t shown here.
This diff is large: its 41 lines aren’t shown here.
This diff is large: its 138 lines aren’t shown here.
This diff is large: its 39 lines aren’t shown here.
This diff is large: its 56 lines aren’t shown here.
This diff is large: its 77 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 93 lines aren’t shown here.
This diff is large: its 106 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 70 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 62 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 118 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 295 lines aren’t shown here.
This diff is large: its 35 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 57 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 16 lines aren’t shown here.
This diff is large: its 178 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 26 lines aren’t shown here.
This diff is large: its 46 lines aren’t shown here.
This diff is large: its 30 lines aren’t shown here.
This diff is large: its 90 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 145 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 22 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 71 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 11 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 145 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 17 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 123 lines aren’t shown here.
This diff is large: its 79 lines aren’t shown here.
This diff is large: its 24 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 25 lines aren’t shown here.
This diff is large: its 31 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 12 lines aren’t shown here.
This diff is large: its 48 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 18 lines aren’t shown here.
This diff is large: its 13 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 27 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 34 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 116 lines aren’t shown here.
This diff is large: its 54 lines aren’t shown here.
This diff is large: its 5 lines aren’t shown here.
This diff is large: its 73 lines aren’t shown here.
This diff is large: its 10 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 9 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 33 lines aren’t shown here.
This diff is large: its 21 lines aren’t shown here.
This diff is large: its 43 lines aren’t shown here.
This diff is large: its 7 lines aren’t shown here.
This diff is large: its 14 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.
This diff is large: its 8 lines aren’t shown here.
This diff is large: its 32 lines aren’t shown here.
This diff is large: its 279 lines aren’t shown here.
This diff is large: its 50 lines aren’t shown here.
This diff is large: its 15 lines aren’t shown here.
This diff is large: its 23 lines aren’t shown here.
This diff is large: its 20 lines aren’t shown here.