Merge branch 'x86/urgent' into x86/mm to pick up dependencies
This commit is contained in:
commit
745dd37f9d
|
@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants.
|
||||||
The device IDs are arbitrary hex numbers (vendor controlled) and normally used
|
The device IDs are arbitrary hex numbers (vendor controlled) and normally used
|
||||||
only in a single location, the pci_device_id table.
|
only in a single location, the pci_device_id table.
|
||||||
|
|
||||||
Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.
|
Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.
|
||||||
|
There are mirrors of the pci.ids file at http://pciids.sourceforge.net/
|
||||||
|
and https://github.com/pciutils/pciids.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -152,6 +152,11 @@ OCXL_IOCTL_IRQ_SET_FD:
|
||||||
Associate an event fd to an AFU interrupt so that the user process
|
Associate an event fd to an AFU interrupt so that the user process
|
||||||
can be notified when the AFU sends an interrupt.
|
can be notified when the AFU sends an interrupt.
|
||||||
|
|
||||||
|
OCXL_IOCTL_GET_METADATA:
|
||||||
|
|
||||||
|
Obtains configuration information from the card, such at the size of
|
||||||
|
MMIO areas, the AFU version, and the PASID for the current context.
|
||||||
|
|
||||||
|
|
||||||
mmap
|
mmap
|
||||||
----
|
----
|
||||||
|
|
|
@ -11,7 +11,11 @@ Required properties:
|
||||||
interrupts.
|
interrupts.
|
||||||
|
|
||||||
Optional properties:
|
Optional properties:
|
||||||
- clocks: Optional reference to the clock used by the XOR engine.
|
- clocks: Optional reference to the clocks used by the XOR engine.
|
||||||
|
- clock-names: mandatory if there is a second clock, in this case the
|
||||||
|
name must be "core" for the first clock and "reg" for the second
|
||||||
|
one
|
||||||
|
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
|
||||||
|
|
|
@ -38,9 +38,9 @@ Required properties:
|
||||||
|
|
||||||
"catalyst",
|
"catalyst",
|
||||||
"microchip",
|
"microchip",
|
||||||
|
"nxp",
|
||||||
"ramtron",
|
"ramtron",
|
||||||
"renesas",
|
"renesas",
|
||||||
"nxp",
|
|
||||||
"st",
|
"st",
|
||||||
|
|
||||||
Some vendors use different model names for chips which are just
|
Some vendors use different model names for chips which are just
|
||||||
|
|
|
@ -14,6 +14,7 @@ Required properties:
|
||||||
- "renesas,irqc-r8a7794" (R-Car E2)
|
- "renesas,irqc-r8a7794" (R-Car E2)
|
||||||
- "renesas,intc-ex-r8a7795" (R-Car H3)
|
- "renesas,intc-ex-r8a7795" (R-Car H3)
|
||||||
- "renesas,intc-ex-r8a7796" (R-Car M3-W)
|
- "renesas,intc-ex-r8a7796" (R-Car M3-W)
|
||||||
|
- "renesas,intc-ex-r8a77965" (R-Car M3-N)
|
||||||
- "renesas,intc-ex-r8a77970" (R-Car V3M)
|
- "renesas,intc-ex-r8a77970" (R-Car V3M)
|
||||||
- "renesas,intc-ex-r8a77995" (R-Car D3)
|
- "renesas,intc-ex-r8a77995" (R-Car D3)
|
||||||
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
|
- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in
|
||||||
|
|
|
@ -18,6 +18,7 @@ Required properties:
|
||||||
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
|
- "renesas,etheravb-r8a7795" for the R8A7795 SoC.
|
||||||
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
|
- "renesas,etheravb-r8a7796" for the R8A7796 SoC.
|
||||||
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
|
- "renesas,etheravb-r8a77970" for the R8A77970 SoC.
|
||||||
|
- "renesas,etheravb-r8a77980" for the R8A77980 SoC.
|
||||||
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
|
- "renesas,etheravb-r8a77995" for the R8A77995 SoC.
|
||||||
- "renesas,etheravb-rcar-gen3" as a fallback for the above
|
- "renesas,etheravb-rcar-gen3" as a fallback for the above
|
||||||
R-Car Gen3 devices.
|
R-Car Gen3 devices.
|
||||||
|
|
|
@ -60,7 +60,7 @@ Examples
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
|
||||||
button@1 {
|
button@1 {
|
||||||
debounce_interval = <50>;
|
debounce-interval = <50>;
|
||||||
wakeup-source;
|
wakeup-source;
|
||||||
linux,code = <116>;
|
linux,code = <116>;
|
||||||
label = "POWER";
|
label = "POWER";
|
||||||
|
|
|
@ -22,7 +22,32 @@ Optional properties:
|
||||||
- clocks : thermal sensor's clock source.
|
- clocks : thermal sensor's clock source.
|
||||||
|
|
||||||
Example:
|
Example:
|
||||||
|
ocotp: ocotp@21bc000 {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
compatible = "fsl,imx6sx-ocotp", "syscon";
|
||||||
|
reg = <0x021bc000 0x4000>;
|
||||||
|
clocks = <&clks IMX6SX_CLK_OCOTP>;
|
||||||
|
|
||||||
|
tempmon_calib: calib@38 {
|
||||||
|
reg = <0x38 4>;
|
||||||
|
};
|
||||||
|
|
||||||
|
tempmon_temp_grade: temp-grade@20 {
|
||||||
|
reg = <0x20 4>;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
tempmon: tempmon {
|
||||||
|
compatible = "fsl,imx6sx-tempmon", "fsl,imx6q-tempmon";
|
||||||
|
interrupts = <GIC_SPI 49 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
fsl,tempmon = <&anatop>;
|
||||||
|
nvmem-cells = <&tempmon_calib>, <&tempmon_temp_grade>;
|
||||||
|
nvmem-cell-names = "calib", "temp_grade";
|
||||||
|
clocks = <&clks IMX6SX_CLK_PLL3_USB_OTG>;
|
||||||
|
};
|
||||||
|
|
||||||
|
Legacy method (Deprecated):
|
||||||
tempmon {
|
tempmon {
|
||||||
compatible = "fsl,imx6q-tempmon";
|
compatible = "fsl,imx6q-tempmon";
|
||||||
fsl,tempmon = <&anatop>;
|
fsl,tempmon = <&anatop>;
|
||||||
|
|
|
@ -50,9 +50,15 @@ replace typedef dmx_filter_t :c:type:`dmx_filter`
|
||||||
replace typedef dmx_pes_type_t :c:type:`dmx_pes_type`
|
replace typedef dmx_pes_type_t :c:type:`dmx_pes_type`
|
||||||
replace typedef dmx_input_t :c:type:`dmx_input`
|
replace typedef dmx_input_t :c:type:`dmx_input`
|
||||||
|
|
||||||
ignore symbol DMX_OUT_DECODER
|
replace symbol DMX_BUFFER_FLAG_HAD_CRC32_DISCARD :c:type:`dmx_buffer_flags`
|
||||||
ignore symbol DMX_OUT_TAP
|
replace symbol DMX_BUFFER_FLAG_TEI :c:type:`dmx_buffer_flags`
|
||||||
ignore symbol DMX_OUT_TS_TAP
|
replace symbol DMX_BUFFER_PKT_COUNTER_MISMATCH :c:type:`dmx_buffer_flags`
|
||||||
ignore symbol DMX_OUT_TSDEMUX_TAP
|
replace symbol DMX_BUFFER_FLAG_DISCONTINUITY_DETECTED :c:type:`dmx_buffer_flags`
|
||||||
|
replace symbol DMX_BUFFER_FLAG_DISCONTINUITY_INDICATOR :c:type:`dmx_buffer_flags`
|
||||||
|
|
||||||
|
replace symbol DMX_OUT_DECODER :c:type:`dmx_output`
|
||||||
|
replace symbol DMX_OUT_TAP :c:type:`dmx_output`
|
||||||
|
replace symbol DMX_OUT_TS_TAP :c:type:`dmx_output`
|
||||||
|
replace symbol DMX_OUT_TSDEMUX_TAP :c:type:`dmx_output`
|
||||||
|
|
||||||
replace ioctl DMX_DQBUF dmx_qbuf
|
replace ioctl DMX_DQBUF dmx_qbuf
|
||||||
|
|
|
@ -51,9 +51,10 @@ out to disk. Buffers remain locked until dequeued, until the
|
||||||
the device is closed.
|
the device is closed.
|
||||||
|
|
||||||
Applications call the ``DMX_DQBUF`` ioctl to dequeue a filled
|
Applications call the ``DMX_DQBUF`` ioctl to dequeue a filled
|
||||||
(capturing) buffer from the driver's outgoing queue. They just set the ``reserved`` field array to zero. When ``DMX_DQBUF`` is called with a
|
(capturing) buffer from the driver's outgoing queue.
|
||||||
pointer to this structure, the driver fills the remaining fields or
|
They just set the ``index`` field withe the buffer ID to be queued.
|
||||||
returns an error code.
|
When ``DMX_DQBUF`` is called with a pointer to struct :c:type:`dmx_buffer`,
|
||||||
|
the driver fills the remaining fields or returns an error code.
|
||||||
|
|
||||||
By default ``DMX_DQBUF`` blocks when no buffer is in the outgoing
|
By default ``DMX_DQBUF`` blocks when no buffer is in the outgoing
|
||||||
queue. When the ``O_NONBLOCK`` flag was given to the
|
queue. When the ``O_NONBLOCK`` flag was given to the
|
||||||
|
|
|
@ -36,8 +36,7 @@ import glob
|
||||||
|
|
||||||
from docutils import nodes, statemachine
|
from docutils import nodes, statemachine
|
||||||
from docutils.statemachine import ViewList
|
from docutils.statemachine import ViewList
|
||||||
from docutils.parsers.rst import directives
|
from docutils.parsers.rst import directives, Directive
|
||||||
from sphinx.util.compat import Directive
|
|
||||||
from sphinx.ext.autodoc import AutodocReporter
|
from sphinx.ext.autodoc import AutodocReporter
|
||||||
|
|
||||||
__version__ = '1.0'
|
__version__ = '1.0'
|
||||||
|
|
|
@ -123,14 +123,15 @@ memory layout to fit in user mode), check KVM_CAP_MIPS_VZ and use the
|
||||||
flag KVM_VM_MIPS_VZ.
|
flag KVM_VM_MIPS_VZ.
|
||||||
|
|
||||||
|
|
||||||
4.3 KVM_GET_MSR_INDEX_LIST
|
4.3 KVM_GET_MSR_INDEX_LIST, KVM_GET_MSR_FEATURE_INDEX_LIST
|
||||||
|
|
||||||
Capability: basic
|
Capability: basic, KVM_CAP_GET_MSR_FEATURES for KVM_GET_MSR_FEATURE_INDEX_LIST
|
||||||
Architectures: x86
|
Architectures: x86
|
||||||
Type: system
|
Type: system ioctl
|
||||||
Parameters: struct kvm_msr_list (in/out)
|
Parameters: struct kvm_msr_list (in/out)
|
||||||
Returns: 0 on success; -1 on error
|
Returns: 0 on success; -1 on error
|
||||||
Errors:
|
Errors:
|
||||||
|
EFAULT: the msr index list cannot be read from or written to
|
||||||
E2BIG: the msr index list is to be to fit in the array specified by
|
E2BIG: the msr index list is to be to fit in the array specified by
|
||||||
the user.
|
the user.
|
||||||
|
|
||||||
|
@ -139,16 +140,23 @@ struct kvm_msr_list {
|
||||||
__u32 indices[0];
|
__u32 indices[0];
|
||||||
};
|
};
|
||||||
|
|
||||||
This ioctl returns the guest msrs that are supported. The list varies
|
The user fills in the size of the indices array in nmsrs, and in return
|
||||||
by kvm version and host processor, but does not change otherwise. The
|
kvm adjusts nmsrs to reflect the actual number of msrs and fills in the
|
||||||
user fills in the size of the indices array in nmsrs, and in return
|
indices array with their numbers.
|
||||||
kvm adjusts nmsrs to reflect the actual number of msrs and fills in
|
|
||||||
the indices array with their numbers.
|
KVM_GET_MSR_INDEX_LIST returns the guest msrs that are supported. The list
|
||||||
|
varies by kvm version and host processor, but does not change otherwise.
|
||||||
|
|
||||||
Note: if kvm indicates supports MCE (KVM_CAP_MCE), then the MCE bank MSRs are
|
Note: if kvm indicates supports MCE (KVM_CAP_MCE), then the MCE bank MSRs are
|
||||||
not returned in the MSR list, as different vcpus can have a different number
|
not returned in the MSR list, as different vcpus can have a different number
|
||||||
of banks, as set via the KVM_X86_SETUP_MCE ioctl.
|
of banks, as set via the KVM_X86_SETUP_MCE ioctl.
|
||||||
|
|
||||||
|
KVM_GET_MSR_FEATURE_INDEX_LIST returns the list of MSRs that can be passed
|
||||||
|
to the KVM_GET_MSRS system ioctl. This lets userspace probe host capabilities
|
||||||
|
and processor features that are exposed via MSRs (e.g., VMX capabilities).
|
||||||
|
This list also varies by kvm version and host processor, but does not change
|
||||||
|
otherwise.
|
||||||
|
|
||||||
|
|
||||||
4.4 KVM_CHECK_EXTENSION
|
4.4 KVM_CHECK_EXTENSION
|
||||||
|
|
||||||
|
@ -475,14 +483,22 @@ Support for this has been removed. Use KVM_SET_GUEST_DEBUG instead.
|
||||||
|
|
||||||
4.18 KVM_GET_MSRS
|
4.18 KVM_GET_MSRS
|
||||||
|
|
||||||
Capability: basic
|
Capability: basic (vcpu), KVM_CAP_GET_MSR_FEATURES (system)
|
||||||
Architectures: x86
|
Architectures: x86
|
||||||
Type: vcpu ioctl
|
Type: system ioctl, vcpu ioctl
|
||||||
Parameters: struct kvm_msrs (in/out)
|
Parameters: struct kvm_msrs (in/out)
|
||||||
Returns: 0 on success, -1 on error
|
Returns: number of msrs successfully returned;
|
||||||
|
-1 on error
|
||||||
|
|
||||||
|
When used as a system ioctl:
|
||||||
|
Reads the values of MSR-based features that are available for the VM. This
|
||||||
|
is similar to KVM_GET_SUPPORTED_CPUID, but it returns MSR indices and values.
|
||||||
|
The list of msr-based features can be obtained using KVM_GET_MSR_FEATURE_INDEX_LIST
|
||||||
|
in a system ioctl.
|
||||||
|
|
||||||
|
When used as a vcpu ioctl:
|
||||||
Reads model-specific registers from the vcpu. Supported msr indices can
|
Reads model-specific registers from the vcpu. Supported msr indices can
|
||||||
be obtained using KVM_GET_MSR_INDEX_LIST.
|
be obtained using KVM_GET_MSR_INDEX_LIST in a system ioctl.
|
||||||
|
|
||||||
struct kvm_msrs {
|
struct kvm_msrs {
|
||||||
__u32 nmsrs; /* number of msrs in entries */
|
__u32 nmsrs; /* number of msrs in entries */
|
||||||
|
|
|
@ -58,6 +58,10 @@ KVM_FEATURE_PV_TLB_FLUSH || 9 || guest checks this feature bit
|
||||||
|| || before enabling paravirtualized
|
|| || before enabling paravirtualized
|
||||||
|| || tlb flush.
|
|| || tlb flush.
|
||||||
------------------------------------------------------------------------------
|
------------------------------------------------------------------------------
|
||||||
|
KVM_FEATURE_ASYNC_PF_VMEXIT || 10 || paravirtualized async PF VM exit
|
||||||
|
|| || can be enabled by setting bit 2
|
||||||
|
|| || when writing to msr 0x4b564d02
|
||||||
|
------------------------------------------------------------------------------
|
||||||
KVM_FEATURE_CLOCKSOURCE_STABLE_BIT || 24 || host will warn if no guest-side
|
KVM_FEATURE_CLOCKSOURCE_STABLE_BIT || 24 || host will warn if no guest-side
|
||||||
|| || per-cpu warps are expected in
|
|| || per-cpu warps are expected in
|
||||||
|| || kvmclock.
|
|| || kvmclock.
|
||||||
|
|
|
@ -170,7 +170,8 @@ MSR_KVM_ASYNC_PF_EN: 0x4b564d02
|
||||||
when asynchronous page faults are enabled on the vcpu 0 when
|
when asynchronous page faults are enabled on the vcpu 0 when
|
||||||
disabled. Bit 1 is 1 if asynchronous page faults can be injected
|
disabled. Bit 1 is 1 if asynchronous page faults can be injected
|
||||||
when vcpu is in cpl == 0. Bit 2 is 1 if asynchronous page faults
|
when vcpu is in cpl == 0. Bit 2 is 1 if asynchronous page faults
|
||||||
are delivered to L1 as #PF vmexits.
|
are delivered to L1 as #PF vmexits. Bit 2 can be set only if
|
||||||
|
KVM_FEATURE_ASYNC_PF_VMEXIT is present in CPUID.
|
||||||
|
|
||||||
First 4 byte of 64 byte memory location will be written to by
|
First 4 byte of 64 byte memory location will be written to by
|
||||||
the hypervisor at the time of asynchronous page fault (APF)
|
the hypervisor at the time of asynchronous page fault (APF)
|
||||||
|
|
|
@ -671,7 +671,7 @@ occupancy of the real time threads on these cores.
|
||||||
# mkdir p1
|
# mkdir p1
|
||||||
|
|
||||||
Move the cpus 4-7 over to p1
|
Move the cpus 4-7 over to p1
|
||||||
# echo f0 > p0/cpus
|
# echo f0 > p1/cpus
|
||||||
|
|
||||||
View the llc occupancy snapshot
|
View the llc occupancy snapshot
|
||||||
|
|
||||||
|
|
25
MAINTAINERS
25
MAINTAINERS
|
@ -1238,7 +1238,7 @@ F: drivers/clk/at91
|
||||||
|
|
||||||
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
|
ARM/ATMEL AT91RM9200, AT91SAM9 AND SAMA5 SOC SUPPORT
|
||||||
M: Nicolas Ferre <nicolas.ferre@microchip.com>
|
M: Nicolas Ferre <nicolas.ferre@microchip.com>
|
||||||
M: Alexandre Belloni <alexandre.belloni@free-electrons.com>
|
M: Alexandre Belloni <alexandre.belloni@bootlin.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
W: http://www.linux4sam.org
|
W: http://www.linux4sam.org
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
|
||||||
|
@ -1590,7 +1590,7 @@ ARM/Marvell Dove/MV78xx0/Orion SOC support
|
||||||
M: Jason Cooper <jason@lakedaemon.net>
|
M: Jason Cooper <jason@lakedaemon.net>
|
||||||
M: Andrew Lunn <andrew@lunn.ch>
|
M: Andrew Lunn <andrew@lunn.ch>
|
||||||
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||||
M: Gregory Clement <gregory.clement@free-electrons.com>
|
M: Gregory Clement <gregory.clement@bootlin.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
F: Documentation/devicetree/bindings/soc/dove/
|
F: Documentation/devicetree/bindings/soc/dove/
|
||||||
|
@ -1604,7 +1604,7 @@ F: arch/arm/boot/dts/orion5x*
|
||||||
ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
|
ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support
|
||||||
M: Jason Cooper <jason@lakedaemon.net>
|
M: Jason Cooper <jason@lakedaemon.net>
|
||||||
M: Andrew Lunn <andrew@lunn.ch>
|
M: Andrew Lunn <andrew@lunn.ch>
|
||||||
M: Gregory Clement <gregory.clement@free-electrons.com>
|
M: Gregory Clement <gregory.clement@bootlin.com>
|
||||||
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
M: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
|
@ -1999,8 +1999,10 @@ M: Maxime Coquelin <mcoquelin.stm32@gmail.com>
|
||||||
M: Alexandre Torgue <alexandre.torgue@st.com>
|
M: Alexandre Torgue <alexandre.torgue@st.com>
|
||||||
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
|
||||||
S: Maintained
|
S: Maintained
|
||||||
T: git git://git.kernel.org/pub/scm/linux/kernel/git/mcoquelin/stm32.git
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32-next
|
||||||
N: stm32
|
N: stm32
|
||||||
|
F: arch/arm/boot/dts/stm32*
|
||||||
|
F: arch/arm/mach-stm32/
|
||||||
F: drivers/clocksource/armv7m_systick.c
|
F: drivers/clocksource/armv7m_systick.c
|
||||||
|
|
||||||
ARM/TANGO ARCHITECTURE
|
ARM/TANGO ARCHITECTURE
|
||||||
|
@ -7600,8 +7602,10 @@ F: mm/kasan/
|
||||||
F: scripts/Makefile.kasan
|
F: scripts/Makefile.kasan
|
||||||
|
|
||||||
KCONFIG
|
KCONFIG
|
||||||
|
M: Masahiro Yamada <yamada.masahiro@socionext.com>
|
||||||
|
T: git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kconfig
|
||||||
L: linux-kbuild@vger.kernel.org
|
L: linux-kbuild@vger.kernel.org
|
||||||
S: Orphan
|
S: Maintained
|
||||||
F: Documentation/kbuild/kconfig-language.txt
|
F: Documentation/kbuild/kconfig-language.txt
|
||||||
F: scripts/kconfig/
|
F: scripts/kconfig/
|
||||||
|
|
||||||
|
@ -10926,6 +10930,17 @@ L: linux-gpio@vger.kernel.org
|
||||||
S: Supported
|
S: Supported
|
||||||
F: drivers/pinctrl/pinctrl-at91-pio4.*
|
F: drivers/pinctrl/pinctrl-at91-pio4.*
|
||||||
|
|
||||||
|
PIN CONTROLLER - FREESCALE
|
||||||
|
M: Dong Aisheng <aisheng.dong@nxp.com>
|
||||||
|
M: Fabio Estevam <festevam@gmail.com>
|
||||||
|
M: Shawn Guo <shawnguo@kernel.org>
|
||||||
|
M: Stefan Agner <stefan@agner.ch>
|
||||||
|
R: Pengutronix Kernel Team <kernel@pengutronix.de>
|
||||||
|
L: linux-gpio@vger.kernel.org
|
||||||
|
S: Maintained
|
||||||
|
F: drivers/pinctrl/freescale/
|
||||||
|
F: Documentation/devicetree/bindings/pinctrl/fsl,*
|
||||||
|
|
||||||
PIN CONTROLLER - INTEL
|
PIN CONTROLLER - INTEL
|
||||||
M: Mika Westerberg <mika.westerberg@linux.intel.com>
|
M: Mika Westerberg <mika.westerberg@linux.intel.com>
|
||||||
M: Heikki Krogerus <heikki.krogerus@linux.intel.com>
|
M: Heikki Krogerus <heikki.krogerus@linux.intel.com>
|
||||||
|
|
14
Makefile
14
Makefile
|
@ -2,7 +2,7 @@
|
||||||
VERSION = 4
|
VERSION = 4
|
||||||
PATCHLEVEL = 16
|
PATCHLEVEL = 16
|
||||||
SUBLEVEL = 0
|
SUBLEVEL = 0
|
||||||
EXTRAVERSION = -rc3
|
EXTRAVERSION = -rc5
|
||||||
NAME = Fearless Coyote
|
NAME = Fearless Coyote
|
||||||
|
|
||||||
# *DOCUMENTATION*
|
# *DOCUMENTATION*
|
||||||
|
@ -388,7 +388,7 @@ PYTHON = python
|
||||||
CHECK = sparse
|
CHECK = sparse
|
||||||
|
|
||||||
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
||||||
-Wbitwise -Wno-return-void $(CF)
|
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
|
||||||
NOSTDINC_FLAGS =
|
NOSTDINC_FLAGS =
|
||||||
CFLAGS_MODULE =
|
CFLAGS_MODULE =
|
||||||
AFLAGS_MODULE =
|
AFLAGS_MODULE =
|
||||||
|
@ -584,10 +584,9 @@ ifeq ($(KBUILD_EXTMOD),)
|
||||||
# To avoid any implicit rule to kick in, define an empty command
|
# To avoid any implicit rule to kick in, define an empty command
|
||||||
$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
|
$(KCONFIG_CONFIG) include/config/auto.conf.cmd: ;
|
||||||
|
|
||||||
# If .config is newer than include/config/auto.conf, someone tinkered
|
# The actual configuration files used during the build are stored in
|
||||||
# with it and forgot to run make oldconfig.
|
# include/generated/ and include/config/. Update them if .config is newer than
|
||||||
# if auto.conf.cmd is missing then we are probably in a cleaned tree so
|
# include/config/auto.conf (which mirrors .config).
|
||||||
# we execute the config step to be sure to catch updated Kconfig files
|
|
||||||
include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
|
include/config/%.conf: $(KCONFIG_CONFIG) include/config/auto.conf.cmd
|
||||||
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
|
$(Q)$(MAKE) -f $(srctree)/Makefile silentoldconfig
|
||||||
else
|
else
|
||||||
|
@ -862,8 +861,7 @@ KBUILD_AFLAGS += $(ARCH_AFLAGS) $(KAFLAGS)
|
||||||
KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)
|
KBUILD_CFLAGS += $(ARCH_CFLAGS) $(KCFLAGS)
|
||||||
|
|
||||||
# Use --build-id when available.
|
# Use --build-id when available.
|
||||||
LDFLAGS_BUILD_ID := $(patsubst -Wl$(comma)%,%,\
|
LDFLAGS_BUILD_ID := $(call ld-option, --build-id)
|
||||||
$(call cc-ldoption, -Wl$(comma)--build-id,))
|
|
||||||
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
|
KBUILD_LDFLAGS_MODULE += $(LDFLAGS_BUILD_ID)
|
||||||
LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
|
LDFLAGS_vmlinux += $(LDFLAGS_BUILD_ID)
|
||||||
|
|
||||||
|
|
|
@ -484,7 +484,6 @@ config ARC_CURR_IN_REG
|
||||||
|
|
||||||
config ARC_EMUL_UNALIGNED
|
config ARC_EMUL_UNALIGNED
|
||||||
bool "Emulate unaligned memory access (userspace only)"
|
bool "Emulate unaligned memory access (userspace only)"
|
||||||
default N
|
|
||||||
select SYSCTL_ARCH_UNALIGN_NO_WARN
|
select SYSCTL_ARCH_UNALIGN_NO_WARN
|
||||||
select SYSCTL_ARCH_UNALIGN_ALLOW
|
select SYSCTL_ARCH_UNALIGN_ALLOW
|
||||||
depends on ISA_ARCOMPACT
|
depends on ISA_ARCOMPACT
|
||||||
|
|
|
@ -17,6 +17,6 @@
|
||||||
compatible = "snps,axs101", "snps,arc-sdp";
|
compatible = "snps,axs101", "snps,arc-sdp";
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60";
|
bootargs = "earlycon=uart8250,mmio32,0xe0022000,115200n8 console=tty0 console=ttyS3,115200n8 consoleblank=0 video=1280x720@60 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
@ -214,13 +214,13 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
eeprom@0x54{
|
eeprom@0x54{
|
||||||
compatible = "24c01";
|
compatible = "atmel,24c01";
|
||||||
reg = <0x54>;
|
reg = <0x54>;
|
||||||
pagesize = <0x8>;
|
pagesize = <0x8>;
|
||||||
};
|
};
|
||||||
|
|
||||||
eeprom@0x57{
|
eeprom@0x57{
|
||||||
compatible = "24c04";
|
compatible = "atmel,24c04";
|
||||||
reg = <0x57>;
|
reg = <0x57>;
|
||||||
pagesize = <0x8>;
|
pagesize = <0x8>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -22,7 +22,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug";
|
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=ttyS0,115200n8 debug print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
interrupt-parent = <&core_intc>;
|
interrupt-parent = <&core_intc>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
|
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
|
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
interrupt-parent = <&core_intc>;
|
interrupt-parent = <&core_intc>;
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8";
|
bootargs = "earlycon=arc_uart,mmio32,0xc0fc1000,115200n8 console=ttyARC0,115200n8 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
/* this is for console on PGU */
|
/* this is for console on PGU */
|
||||||
/* bootargs = "console=tty0 consoleblank=0"; */
|
/* bootargs = "console=tty0 consoleblank=0"; */
|
||||||
/* this is for console on serial */
|
/* this is for console on serial */
|
||||||
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";
|
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
/* this is for console on PGU */
|
/* this is for console on PGU */
|
||||||
/* bootargs = "console=tty0 consoleblank=0"; */
|
/* bootargs = "console=tty0 consoleblank=0"; */
|
||||||
/* this is for console on serial */
|
/* this is for console on serial */
|
||||||
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24";
|
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblank=0 debug video=640x480-24 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
|
|
||||||
chosen {
|
chosen {
|
||||||
/* this is for console on serial */
|
/* this is for console on serial */
|
||||||
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug video=640x480-24";
|
bootargs = "earlycon=uart8250,mmio32,0xf0000000,115200n8 console=tty0 console=ttyS0,115200n8 consoleblan=0 debug video=640x480-24 print-fatal-signals=1";
|
||||||
};
|
};
|
||||||
|
|
||||||
aliases {
|
aliases {
|
||||||
|
|
|
@ -184,7 +184,7 @@
|
||||||
.macro FAKE_RET_FROM_EXCPN
|
.macro FAKE_RET_FROM_EXCPN
|
||||||
lr r9, [status32]
|
lr r9, [status32]
|
||||||
bic r9, r9, (STATUS_U_MASK|STATUS_DE_MASK|STATUS_AE_MASK)
|
bic r9, r9, (STATUS_U_MASK|STATUS_DE_MASK|STATUS_AE_MASK)
|
||||||
or r9, r9, (STATUS_L_MASK|STATUS_IE_MASK)
|
or r9, r9, STATUS_IE_MASK
|
||||||
kflag r9
|
kflag r9
|
||||||
.endm
|
.endm
|
||||||
|
|
||||||
|
|
|
@ -22,10 +22,79 @@ static DEFINE_RAW_SPINLOCK(mcip_lock);
|
||||||
|
|
||||||
static char smp_cpuinfo_buf[128];
|
static char smp_cpuinfo_buf[128];
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Set mask to halt GFRC if any online core in SMP cluster is halted.
|
||||||
|
* Only works for ARC HS v3.0+, on earlier versions has no effect.
|
||||||
|
*/
|
||||||
|
static void mcip_update_gfrc_halt_mask(int cpu)
|
||||||
|
{
|
||||||
|
struct bcr_generic gfrc;
|
||||||
|
unsigned long flags;
|
||||||
|
u32 gfrc_halt_mask;
|
||||||
|
|
||||||
|
READ_BCR(ARC_REG_GFRC_BUILD, gfrc);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* CMD_GFRC_SET_CORE and CMD_GFRC_READ_CORE commands were added in
|
||||||
|
* GFRC 0x3 version.
|
||||||
|
*/
|
||||||
|
if (gfrc.ver < 0x3)
|
||||||
|
return;
|
||||||
|
|
||||||
|
raw_spin_lock_irqsave(&mcip_lock, flags);
|
||||||
|
|
||||||
|
__mcip_cmd(CMD_GFRC_READ_CORE, 0);
|
||||||
|
gfrc_halt_mask = read_aux_reg(ARC_REG_MCIP_READBACK);
|
||||||
|
gfrc_halt_mask |= BIT(cpu);
|
||||||
|
__mcip_cmd_data(CMD_GFRC_SET_CORE, 0, gfrc_halt_mask);
|
||||||
|
|
||||||
|
raw_spin_unlock_irqrestore(&mcip_lock, flags);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void mcip_update_debug_halt_mask(int cpu)
|
||||||
|
{
|
||||||
|
u32 mcip_mask = 0;
|
||||||
|
unsigned long flags;
|
||||||
|
|
||||||
|
raw_spin_lock_irqsave(&mcip_lock, flags);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* mcip_mask is same for CMD_DEBUG_SET_SELECT and CMD_DEBUG_SET_MASK
|
||||||
|
* commands. So read it once instead of reading both CMD_DEBUG_READ_MASK
|
||||||
|
* and CMD_DEBUG_READ_SELECT.
|
||||||
|
*/
|
||||||
|
__mcip_cmd(CMD_DEBUG_READ_SELECT, 0);
|
||||||
|
mcip_mask = read_aux_reg(ARC_REG_MCIP_READBACK);
|
||||||
|
|
||||||
|
mcip_mask |= BIT(cpu);
|
||||||
|
|
||||||
|
__mcip_cmd_data(CMD_DEBUG_SET_SELECT, 0, mcip_mask);
|
||||||
|
/*
|
||||||
|
* Parameter specified halt cause:
|
||||||
|
* STATUS32[H]/actionpoint/breakpoint/self-halt
|
||||||
|
* We choose all of them (0xF).
|
||||||
|
*/
|
||||||
|
__mcip_cmd_data(CMD_DEBUG_SET_MASK, 0xF, mcip_mask);
|
||||||
|
|
||||||
|
raw_spin_unlock_irqrestore(&mcip_lock, flags);
|
||||||
|
}
|
||||||
|
|
||||||
static void mcip_setup_per_cpu(int cpu)
|
static void mcip_setup_per_cpu(int cpu)
|
||||||
{
|
{
|
||||||
|
struct mcip_bcr mp;
|
||||||
|
|
||||||
|
READ_BCR(ARC_REG_MCIP_BCR, mp);
|
||||||
|
|
||||||
smp_ipi_irq_setup(cpu, IPI_IRQ);
|
smp_ipi_irq_setup(cpu, IPI_IRQ);
|
||||||
smp_ipi_irq_setup(cpu, SOFTIRQ_IRQ);
|
smp_ipi_irq_setup(cpu, SOFTIRQ_IRQ);
|
||||||
|
|
||||||
|
/* Update GFRC halt mask as new CPU came online */
|
||||||
|
if (mp.gfrc)
|
||||||
|
mcip_update_gfrc_halt_mask(cpu);
|
||||||
|
|
||||||
|
/* Update MCIP debug mask as new CPU came online */
|
||||||
|
if (mp.dbg)
|
||||||
|
mcip_update_debug_halt_mask(cpu);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mcip_ipi_send(int cpu)
|
static void mcip_ipi_send(int cpu)
|
||||||
|
@ -101,11 +170,6 @@ static void mcip_probe_n_setup(void)
|
||||||
IS_AVAIL1(mp.gfrc, "GFRC"));
|
IS_AVAIL1(mp.gfrc, "GFRC"));
|
||||||
|
|
||||||
cpuinfo_arc700[0].extn.gfrc = mp.gfrc;
|
cpuinfo_arc700[0].extn.gfrc = mp.gfrc;
|
||||||
|
|
||||||
if (mp.dbg) {
|
|
||||||
__mcip_cmd_data(CMD_DEBUG_SET_SELECT, 0, 0xf);
|
|
||||||
__mcip_cmd_data(CMD_DEBUG_SET_MASK, 0xf, 0xf);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
struct plat_smp_ops plat_smp_ops = {
|
struct plat_smp_ops plat_smp_ops = {
|
||||||
|
|
|
@ -51,7 +51,7 @@ static const struct id_to_str arc_cpu_rel[] = {
|
||||||
{ 0x51, "R2.0" },
|
{ 0x51, "R2.0" },
|
||||||
{ 0x52, "R2.1" },
|
{ 0x52, "R2.1" },
|
||||||
{ 0x53, "R3.0" },
|
{ 0x53, "R3.0" },
|
||||||
{ 0x54, "R4.0" },
|
{ 0x54, "R3.10a" },
|
||||||
#endif
|
#endif
|
||||||
{ 0x00, NULL }
|
{ 0x00, NULL }
|
||||||
};
|
};
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
#include <linux/reboot.h>
|
#include <linux/reboot.h>
|
||||||
#include <linux/irqdomain.h>
|
#include <linux/irqdomain.h>
|
||||||
#include <linux/export.h>
|
#include <linux/export.h>
|
||||||
|
#include <linux/of_fdt.h>
|
||||||
|
|
||||||
#include <asm/processor.h>
|
#include <asm/processor.h>
|
||||||
#include <asm/setup.h>
|
#include <asm/setup.h>
|
||||||
|
@ -47,6 +48,42 @@ void __init smp_prepare_boot_cpu(void)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int __init arc_get_cpu_map(const char *name, struct cpumask *cpumask)
|
||||||
|
{
|
||||||
|
unsigned long dt_root = of_get_flat_dt_root();
|
||||||
|
const char *buf;
|
||||||
|
|
||||||
|
buf = of_get_flat_dt_prop(dt_root, name, NULL);
|
||||||
|
if (!buf)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
if (cpulist_parse(buf, cpumask))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Read from DeviceTree and setup cpu possible mask. If there is no
|
||||||
|
* "possible-cpus" property in DeviceTree pretend all [0..NR_CPUS-1] exist.
|
||||||
|
*/
|
||||||
|
static void __init arc_init_cpu_possible(void)
|
||||||
|
{
|
||||||
|
struct cpumask cpumask;
|
||||||
|
|
||||||
|
if (arc_get_cpu_map("possible-cpus", &cpumask)) {
|
||||||
|
pr_warn("Failed to get possible-cpus from dtb, pretending all %u cpus exist\n",
|
||||||
|
NR_CPUS);
|
||||||
|
|
||||||
|
cpumask_setall(&cpumask);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!cpumask_test_cpu(0, &cpumask))
|
||||||
|
panic("Master cpu (cpu[0]) is missed in cpu possible mask!");
|
||||||
|
|
||||||
|
init_cpu_possible(&cpumask);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Called from setup_arch() before calling setup_processor()
|
* Called from setup_arch() before calling setup_processor()
|
||||||
*
|
*
|
||||||
|
@ -58,10 +95,7 @@ void __init smp_prepare_boot_cpu(void)
|
||||||
*/
|
*/
|
||||||
void __init smp_init_cpus(void)
|
void __init smp_init_cpus(void)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
arc_init_cpu_possible();
|
||||||
|
|
||||||
for (i = 0; i < NR_CPUS; i++)
|
|
||||||
set_cpu_possible(i, true);
|
|
||||||
|
|
||||||
if (plat_smp_ops.init_early_smp)
|
if (plat_smp_ops.init_early_smp)
|
||||||
plat_smp_ops.init_early_smp();
|
plat_smp_ops.init_early_smp();
|
||||||
|
@ -70,16 +104,12 @@ void __init smp_init_cpus(void)
|
||||||
/* called from init ( ) => process 1 */
|
/* called from init ( ) => process 1 */
|
||||||
void __init smp_prepare_cpus(unsigned int max_cpus)
|
void __init smp_prepare_cpus(unsigned int max_cpus)
|
||||||
{
|
{
|
||||||
int i;
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* if platform didn't set the present map already, do it now
|
* if platform didn't set the present map already, do it now
|
||||||
* boot cpu is set to present already by init/main.c
|
* boot cpu is set to present already by init/main.c
|
||||||
*/
|
*/
|
||||||
if (num_present_cpus() <= 1) {
|
if (num_present_cpus() <= 1)
|
||||||
for (i = 0; i < max_cpus; i++)
|
init_cpu_present(cpu_possible_mask);
|
||||||
set_cpu_present(i, true);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void __init smp_cpus_done(unsigned int max_cpus)
|
void __init smp_cpus_done(unsigned int max_cpus)
|
||||||
|
|
|
@ -780,7 +780,10 @@ noinline static void slc_entire_op(const int op)
|
||||||
|
|
||||||
write_aux_reg(r, ctrl);
|
write_aux_reg(r, ctrl);
|
||||||
|
|
||||||
write_aux_reg(ARC_REG_SLC_INVALIDATE, 1);
|
if (op & OP_INV) /* Inv or flush-n-inv use same cmd reg */
|
||||||
|
write_aux_reg(ARC_REG_SLC_INVALIDATE, 0x1);
|
||||||
|
else
|
||||||
|
write_aux_reg(ARC_REG_SLC_FLUSH, 0x1);
|
||||||
|
|
||||||
/* Make sure "busy" bit reports correct stataus, see STAR 9001165532 */
|
/* Make sure "busy" bit reports correct stataus, see STAR 9001165532 */
|
||||||
read_aux_reg(r);
|
read_aux_reg(r);
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
<0x3ff00100 0x100>;
|
<0x3ff00100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
smc@0x3404c000 {
|
smc@3404c000 {
|
||||||
compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
|
compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
|
||||||
reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
|
reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
|
||||||
};
|
};
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
<0x3ff00100 0x100>;
|
<0x3ff00100 0x100>;
|
||||||
};
|
};
|
||||||
|
|
||||||
smc@0x3404e000 {
|
smc@3404e000 {
|
||||||
compatible = "brcm,bcm21664-smc", "brcm,kona-smc";
|
compatible = "brcm,bcm21664-smc", "brcm,kona-smc";
|
||||||
reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */
|
reg = <0x3404e000 0x400>; /* 1 KiB in SRAM */
|
||||||
};
|
};
|
||||||
|
|
|
@ -18,12 +18,12 @@
|
||||||
soc {
|
soc {
|
||||||
ranges = <0x7e000000 0x20000000 0x02000000>;
|
ranges = <0x7e000000 0x20000000 0x02000000>;
|
||||||
dma-ranges = <0x40000000 0x00000000 0x20000000>;
|
dma-ranges = <0x40000000 0x00000000 0x20000000>;
|
||||||
|
};
|
||||||
|
|
||||||
arm-pmu {
|
arm-pmu {
|
||||||
compatible = "arm,arm1176-pmu";
|
compatible = "arm,arm1176-pmu";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
&cpu_thermal {
|
&cpu_thermal {
|
||||||
coefficients = <(-538) 407000>;
|
coefficients = <(-538) 407000>;
|
||||||
|
|
|
@ -9,20 +9,20 @@
|
||||||
<0x40000000 0x40000000 0x00001000>;
|
<0x40000000 0x40000000 0x00001000>;
|
||||||
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
||||||
|
|
||||||
local_intc: local_intc {
|
local_intc: local_intc@40000000 {
|
||||||
compatible = "brcm,bcm2836-l1-intc";
|
compatible = "brcm,bcm2836-l1-intc";
|
||||||
reg = <0x40000000 0x100>;
|
reg = <0x40000000 0x100>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
#interrupt-cells = <2>;
|
#interrupt-cells = <2>;
|
||||||
interrupt-parent = <&local_intc>;
|
interrupt-parent = <&local_intc>;
|
||||||
};
|
};
|
||||||
|
};
|
||||||
|
|
||||||
arm-pmu {
|
arm-pmu {
|
||||||
compatible = "arm,cortex-a7-pmu";
|
compatible = "arm,cortex-a7-pmu";
|
||||||
interrupt-parent = <&local_intc>;
|
interrupt-parent = <&local_intc>;
|
||||||
interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <9 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
timer {
|
timer {
|
||||||
compatible = "arm,armv7-timer";
|
compatible = "arm,armv7-timer";
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<0x40000000 0x40000000 0x00001000>;
|
<0x40000000 0x40000000 0x00001000>;
|
||||||
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
dma-ranges = <0xc0000000 0x00000000 0x3f000000>;
|
||||||
|
|
||||||
local_intc: local_intc {
|
local_intc: local_intc@40000000 {
|
||||||
compatible = "brcm,bcm2836-l1-intc";
|
compatible = "brcm,bcm2836-l1-intc";
|
||||||
reg = <0x40000000 0x100>;
|
reg = <0x40000000 0x100>;
|
||||||
interrupt-controller;
|
interrupt-controller;
|
||||||
|
|
|
@ -465,7 +465,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
aux: aux@0x7e215000 {
|
aux: aux@7e215000 {
|
||||||
compatible = "brcm,bcm2835-aux";
|
compatible = "brcm,bcm2835-aux";
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
reg = <0x7e215000 0x8>;
|
reg = <0x7e215000 0x8>;
|
||||||
|
|
|
@ -49,7 +49,7 @@
|
||||||
|
|
||||||
memory {
|
memory {
|
||||||
device_type = "memory";
|
device_type = "memory";
|
||||||
reg = <0x60000000 0x80000000>;
|
reg = <0x60000000 0x20000000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
gpio-restart {
|
gpio-restart {
|
||||||
|
|
|
@ -269,7 +269,7 @@
|
||||||
|
|
||||||
sata: sata@46000000 {
|
sata: sata@46000000 {
|
||||||
/* The ROM uses this muxmode */
|
/* The ROM uses this muxmode */
|
||||||
cortina,gemini-ata-muxmode = <3>;
|
cortina,gemini-ata-muxmode = <0>;
|
||||||
cortina,gemini-enable-sata-bridge;
|
cortina,gemini-enable-sata-bridge;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
|
@ -42,7 +42,7 @@
|
||||||
|
|
||||||
/dts-v1/;
|
/dts-v1/;
|
||||||
|
|
||||||
#include "imx6q.dtsi"
|
#include "imx6dl.dtsi"
|
||||||
#include "imx6qdl-icore-rqs.dtsi"
|
#include "imx6qdl-icore-rqs.dtsi"
|
||||||
|
|
||||||
/ {
|
/ {
|
||||||
|
|
|
@ -71,6 +71,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c1 {
|
&i2c1 {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&i2c1_pins>;
|
||||||
clock-frequency = <2600000>;
|
clock-frequency = <2600000>;
|
||||||
|
|
||||||
twl: twl@48 {
|
twl: twl@48 {
|
||||||
|
@ -189,7 +191,12 @@
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
i2c1_pins: pinmux_i2c1_pins {
|
||||||
|
pinctrl-single,pins = <
|
||||||
|
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
|
||||||
|
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
|
||||||
|
>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&omap3_pmx_wkup {
|
&omap3_pmx_wkup {
|
||||||
|
|
|
@ -66,6 +66,8 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
&i2c1 {
|
&i2c1 {
|
||||||
|
pinctrl-names = "default";
|
||||||
|
pinctrl-0 = <&i2c1_pins>;
|
||||||
clock-frequency = <2600000>;
|
clock-frequency = <2600000>;
|
||||||
|
|
||||||
twl: twl@48 {
|
twl: twl@48 {
|
||||||
|
@ -136,6 +138,12 @@
|
||||||
OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */
|
OMAP3_CORE1_IOPAD(0x21b8, PIN_INPUT | MUX_MODE0) /* hsusb0_data7.hsusb0_data7 */
|
||||||
>;
|
>;
|
||||||
};
|
};
|
||||||
|
i2c1_pins: pinmux_i2c1_pins {
|
||||||
|
pinctrl-single,pins = <
|
||||||
|
OMAP3_CORE1_IOPAD(0x21ba, PIN_INPUT | MUX_MODE0) /* i2c1_scl.i2c1_scl */
|
||||||
|
OMAP3_CORE1_IOPAD(0x21bc, PIN_INPUT | MUX_MODE0) /* i2c1_sda.i2c1_sda */
|
||||||
|
>;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&uart2 {
|
&uart2 {
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; /* gpio3_83 */
|
gpios = <&gpio3 19 GPIO_ACTIVE_LOW>; /* gpio3_83 */
|
||||||
wakeup-source;
|
wakeup-source;
|
||||||
autorepeat;
|
autorepeat;
|
||||||
debounce_interval = <50>;
|
debounce-interval = <50>;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -280,7 +280,7 @@
|
||||||
max-frequency = <37500000>;
|
max-frequency = <37500000>;
|
||||||
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
||||||
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
resets = <&cru SRST_SDIO>;
|
resets = <&cru SRST_SDIO>;
|
||||||
|
@ -298,7 +298,7 @@
|
||||||
max-frequency = <37500000>;
|
max-frequency = <37500000>;
|
||||||
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
||||||
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
default-sample-phase = <158>;
|
default-sample-phase = <158>;
|
||||||
disable-wp;
|
disable-wp;
|
||||||
dmas = <&pdma 12>;
|
dmas = <&pdma 12>;
|
||||||
|
|
|
@ -621,7 +621,7 @@
|
||||||
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
|
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
|
||||||
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
|
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
|
pinctrl-0 = <&sdmmc_clk &sdmmc_cmd &sdmmc_bus4>;
|
||||||
|
@ -634,7 +634,7 @@
|
||||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
||||||
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
|
pinctrl-0 = <&sdio_clk &sdio_cmd &sdio_bus4>;
|
||||||
|
@ -649,7 +649,7 @@
|
||||||
max-frequency = <37500000>;
|
max-frequency = <37500000>;
|
||||||
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
||||||
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
default-sample-phase = <158>;
|
default-sample-phase = <158>;
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
|
|
|
@ -110,26 +110,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
&cpu0 {
|
|
||||||
cpu0-supply = <&vdd_cpu>;
|
|
||||||
operating-points = <
|
|
||||||
/* KHz uV */
|
|
||||||
1800000 1400000
|
|
||||||
1608000 1350000
|
|
||||||
1512000 1300000
|
|
||||||
1416000 1200000
|
|
||||||
1200000 1100000
|
|
||||||
1008000 1050000
|
|
||||||
816000 1000000
|
|
||||||
696000 950000
|
|
||||||
600000 900000
|
|
||||||
408000 900000
|
|
||||||
312000 900000
|
|
||||||
216000 900000
|
|
||||||
126000 900000
|
|
||||||
>;
|
|
||||||
};
|
|
||||||
|
|
||||||
&emmc {
|
&emmc {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
bus-width = <8>;
|
bus-width = <8>;
|
||||||
|
|
|
@ -56,7 +56,7 @@
|
||||||
clocks = <&topclk ZX296702_A9_PERIPHCLK>;
|
clocks = <&topclk ZX296702_A9_PERIPHCLK>;
|
||||||
};
|
};
|
||||||
|
|
||||||
l2cc: l2-cache-controller@0x00c00000 {
|
l2cc: l2-cache-controller@c00000 {
|
||||||
compatible = "arm,pl310-cache";
|
compatible = "arm,pl310-cache";
|
||||||
reg = <0x00c00000 0x1000>;
|
reg = <0x00c00000 0x1000>;
|
||||||
cache-unified;
|
cache-unified;
|
||||||
|
@ -67,30 +67,30 @@
|
||||||
arm,double-linefill-incr = <0>;
|
arm,double-linefill-incr = <0>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pcu: pcu@0xa0008000 {
|
pcu: pcu@a0008000 {
|
||||||
compatible = "zte,zx296702-pcu";
|
compatible = "zte,zx296702-pcu";
|
||||||
reg = <0xa0008000 0x1000>;
|
reg = <0xa0008000 0x1000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
topclk: topclk@0x09800000 {
|
topclk: topclk@9800000 {
|
||||||
compatible = "zte,zx296702-topcrm-clk";
|
compatible = "zte,zx296702-topcrm-clk";
|
||||||
reg = <0x09800000 0x1000>;
|
reg = <0x09800000 0x1000>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
lsp1clk: lsp1clk@0x09400000 {
|
lsp1clk: lsp1clk@9400000 {
|
||||||
compatible = "zte,zx296702-lsp1crpm-clk";
|
compatible = "zte,zx296702-lsp1crpm-clk";
|
||||||
reg = <0x09400000 0x1000>;
|
reg = <0x09400000 0x1000>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
lsp0clk: lsp0clk@0x0b000000 {
|
lsp0clk: lsp0clk@b000000 {
|
||||||
compatible = "zte,zx296702-lsp0crpm-clk";
|
compatible = "zte,zx296702-lsp0crpm-clk";
|
||||||
reg = <0x0b000000 0x1000>;
|
reg = <0x0b000000 0x1000>;
|
||||||
#clock-cells = <1>;
|
#clock-cells = <1>;
|
||||||
};
|
};
|
||||||
|
|
||||||
uart0: serial@0x09405000 {
|
uart0: serial@9405000 {
|
||||||
compatible = "zte,zx296702-uart";
|
compatible = "zte,zx296702-uart";
|
||||||
reg = <0x09405000 0x1000>;
|
reg = <0x09405000 0x1000>;
|
||||||
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 37 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
uart1: serial@0x09406000 {
|
uart1: serial@9406000 {
|
||||||
compatible = "zte,zx296702-uart";
|
compatible = "zte,zx296702-uart";
|
||||||
reg = <0x09406000 0x1000>;
|
reg = <0x09406000 0x1000>;
|
||||||
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 38 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
|
@ -106,7 +106,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc0: mmc@0x09408000 {
|
mmc0: mmc@9408000 {
|
||||||
compatible = "snps,dw-mshc";
|
compatible = "snps,dw-mshc";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
@ -119,7 +119,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
mmc1: mmc@0x0b003000 {
|
mmc1: mmc@b003000 {
|
||||||
compatible = "snps,dw-mshc";
|
compatible = "snps,dw-mshc";
|
||||||
#address-cells = <1>;
|
#address-cells = <1>;
|
||||||
#size-cells = <0>;
|
#size-cells = <0>;
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
sysctrl: sysctrl@0xa0007000 {
|
sysctrl: sysctrl@a0007000 {
|
||||||
compatible = "zte,sysctrl", "syscon";
|
compatible = "zte,sysctrl", "syscon";
|
||||||
reg = <0xa0007000 0x1000>;
|
reg = <0xa0007000 0x1000>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -319,7 +319,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y
|
||||||
CONFIG_RC_CORE=m
|
CONFIG_RC_CORE=m
|
||||||
CONFIG_MEDIA_CONTROLLER=y
|
CONFIG_MEDIA_CONTROLLER=y
|
||||||
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
CONFIG_VIDEO_V4L2_SUBDEV_API=y
|
||||||
CONFIG_LIRC=m
|
CONFIG_LIRC=y
|
||||||
CONFIG_RC_DEVICES=y
|
CONFIG_RC_DEVICES=y
|
||||||
CONFIG_IR_RX51=m
|
CONFIG_IR_RX51=m
|
||||||
CONFIG_V4L_PLATFORM_DRIVERS=y
|
CONFIG_V4L_PLATFORM_DRIVERS=y
|
||||||
|
|
|
@ -7,6 +7,8 @@ ccflags-y += -fno-stack-protector -DDISABLE_BRANCH_PROFILING
|
||||||
|
|
||||||
KVM=../../../../virt/kvm
|
KVM=../../../../virt/kvm
|
||||||
|
|
||||||
|
CFLAGS_ARMV7VE :=$(call cc-option, -march=armv7ve)
|
||||||
|
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o
|
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v2-sr.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o
|
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/vgic-v3-sr.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
|
obj-$(CONFIG_KVM_ARM_HOST) += $(KVM)/arm/hyp/timer-sr.o
|
||||||
|
@ -15,7 +17,10 @@ obj-$(CONFIG_KVM_ARM_HOST) += tlb.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o
|
obj-$(CONFIG_KVM_ARM_HOST) += cp15-sr.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += vfp.o
|
obj-$(CONFIG_KVM_ARM_HOST) += vfp.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o
|
obj-$(CONFIG_KVM_ARM_HOST) += banked-sr.o
|
||||||
|
CFLAGS_banked-sr.o += $(CFLAGS_ARMV7VE)
|
||||||
|
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += entry.o
|
obj-$(CONFIG_KVM_ARM_HOST) += entry.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
|
obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += switch.o
|
obj-$(CONFIG_KVM_ARM_HOST) += switch.o
|
||||||
|
CFLAGS_switch.o += $(CFLAGS_ARMV7VE)
|
||||||
obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o
|
obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o
|
||||||
|
|
|
@ -20,6 +20,10 @@
|
||||||
|
|
||||||
#include <asm/kvm_hyp.h>
|
#include <asm/kvm_hyp.h>
|
||||||
|
|
||||||
|
/*
|
||||||
|
* gcc before 4.9 doesn't understand -march=armv7ve, so we have to
|
||||||
|
* trick the assembler.
|
||||||
|
*/
|
||||||
__asm__(".arch_extension virt");
|
__asm__(".arch_extension virt");
|
||||||
|
|
||||||
void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)
|
void __hyp_text __banked_save_state(struct kvm_cpu_context *ctxt)
|
||||||
|
|
|
@ -69,7 +69,7 @@ static void clps711x_restart(enum reboot_mode mode, const char *cmd)
|
||||||
soft_restart(0);
|
soft_restart(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const char *clps711x_compat[] __initconst = {
|
static const char *const clps711x_compat[] __initconst = {
|
||||||
"cirrus,ep7209",
|
"cirrus,ep7209",
|
||||||
NULL
|
NULL
|
||||||
};
|
};
|
||||||
|
|
|
@ -368,7 +368,7 @@ static struct spi_eeprom at25640a = {
|
||||||
.flags = EE_ADDR2,
|
.flags = EE_ADDR2,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct spi_board_info dm355_evm_spi_info[] __initconst = {
|
static const struct spi_board_info dm355_evm_spi_info[] __initconst = {
|
||||||
{
|
{
|
||||||
.modalias = "at25",
|
.modalias = "at25",
|
||||||
.platform_data = &at25640a,
|
.platform_data = &at25640a,
|
||||||
|
|
|
@ -217,7 +217,7 @@ static struct spi_eeprom at25640a = {
|
||||||
.flags = EE_ADDR2,
|
.flags = EE_ADDR2,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct spi_board_info dm355_leopard_spi_info[] __initconst = {
|
static const struct spi_board_info dm355_leopard_spi_info[] __initconst = {
|
||||||
{
|
{
|
||||||
.modalias = "at25",
|
.modalias = "at25",
|
||||||
.platform_data = &at25640a,
|
.platform_data = &at25640a,
|
||||||
|
|
|
@ -726,7 +726,7 @@ static struct spi_eeprom at25640 = {
|
||||||
.flags = EE_ADDR2,
|
.flags = EE_ADDR2,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct spi_board_info dm365_evm_spi_info[] __initconst = {
|
static const struct spi_board_info dm365_evm_spi_info[] __initconst = {
|
||||||
{
|
{
|
||||||
.modalias = "at25",
|
.modalias = "at25",
|
||||||
.platform_data = &at25640,
|
.platform_data = &at25640,
|
||||||
|
|
|
@ -41,7 +41,7 @@ config MACH_ARMADA_375
|
||||||
depends on ARCH_MULTI_V7
|
depends on ARCH_MULTI_V7
|
||||||
select ARMADA_370_XP_IRQ
|
select ARMADA_370_XP_IRQ
|
||||||
select ARM_ERRATA_720789
|
select ARM_ERRATA_720789
|
||||||
select ARM_ERRATA_753970
|
select PL310_ERRATA_753970
|
||||||
select ARM_GIC
|
select ARM_GIC
|
||||||
select ARMADA_375_CLK
|
select ARMADA_375_CLK
|
||||||
select HAVE_ARM_SCU
|
select HAVE_ARM_SCU
|
||||||
|
@ -57,7 +57,7 @@ config MACH_ARMADA_38X
|
||||||
bool "Marvell Armada 380/385 boards"
|
bool "Marvell Armada 380/385 boards"
|
||||||
depends on ARCH_MULTI_V7
|
depends on ARCH_MULTI_V7
|
||||||
select ARM_ERRATA_720789
|
select ARM_ERRATA_720789
|
||||||
select ARM_ERRATA_753970
|
select PL310_ERRATA_753970
|
||||||
select ARM_GIC
|
select ARM_GIC
|
||||||
select ARM_GLOBAL_TIMER
|
select ARM_GLOBAL_TIMER
|
||||||
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
|
select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
|
||||||
|
|
|
@ -1011,17 +1011,17 @@ static int clk_debugfs_register_one(struct clk *c)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
c->dent = d;
|
c->dent = d;
|
||||||
|
|
||||||
d = debugfs_create_u8("usecount", S_IRUGO, c->dent, (u8 *)&c->usecount);
|
d = debugfs_create_u8("usecount", S_IRUGO, c->dent, &c->usecount);
|
||||||
if (!d) {
|
if (!d) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
d = debugfs_create_u32("rate", S_IRUGO, c->dent, (u32 *)&c->rate);
|
d = debugfs_create_ulong("rate", S_IRUGO, c->dent, &c->rate);
|
||||||
if (!d) {
|
if (!d) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_out;
|
goto err_out;
|
||||||
}
|
}
|
||||||
d = debugfs_create_x32("flags", S_IRUGO, c->dent, (u32 *)&c->flags);
|
d = debugfs_create_x8("flags", S_IRUGO, c->dent, &c->flags);
|
||||||
if (!d) {
|
if (!d) {
|
||||||
err = -ENOMEM;
|
err = -ENOMEM;
|
||||||
goto err_out;
|
goto err_out;
|
||||||
|
|
|
@ -299,8 +299,6 @@ static void irq_save_context(void)
|
||||||
if (soc_is_dra7xx())
|
if (soc_is_dra7xx())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (!sar_base)
|
|
||||||
sar_base = omap4_get_sar_ram_base();
|
|
||||||
if (wakeupgen_ops && wakeupgen_ops->save_context)
|
if (wakeupgen_ops && wakeupgen_ops->save_context)
|
||||||
wakeupgen_ops->save_context();
|
wakeupgen_ops->save_context();
|
||||||
}
|
}
|
||||||
|
@ -598,6 +596,8 @@ static int __init wakeupgen_init(struct device_node *node,
|
||||||
irq_hotplug_init();
|
irq_hotplug_init();
|
||||||
irq_pm_init();
|
irq_pm_init();
|
||||||
|
|
||||||
|
sar_base = omap4_get_sar_ram_base();
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
|
IRQCHIP_DECLARE(ti_wakeupgen, "ti,omap4-wugen-mpu", wakeupgen_init);
|
||||||
|
|
|
@ -977,6 +977,9 @@ static int _enable_clocks(struct omap_hwmod *oh)
|
||||||
|
|
||||||
pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);
|
pr_debug("omap_hwmod: %s: enabling clocks\n", oh->name);
|
||||||
|
|
||||||
|
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
|
||||||
|
_enable_optional_clocks(oh);
|
||||||
|
|
||||||
if (oh->_clk)
|
if (oh->_clk)
|
||||||
clk_enable(oh->_clk);
|
clk_enable(oh->_clk);
|
||||||
|
|
||||||
|
@ -985,9 +988,6 @@ static int _enable_clocks(struct omap_hwmod *oh)
|
||||||
clk_enable(os->_clk);
|
clk_enable(os->_clk);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (oh->flags & HWMOD_OPT_CLKS_NEEDED)
|
|
||||||
_enable_optional_clocks(oh);
|
|
||||||
|
|
||||||
/* The opt clocks are controlled by the device driver. */
|
/* The opt clocks are controlled by the device driver. */
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -186,7 +186,7 @@ static void omap_pm_end(void)
|
||||||
cpu_idle_poll_ctrl(false);
|
cpu_idle_poll_ctrl(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void omap_pm_finish(void)
|
static void omap_pm_wake(void)
|
||||||
{
|
{
|
||||||
if (soc_is_omap34xx())
|
if (soc_is_omap34xx())
|
||||||
omap_prcm_irq_complete();
|
omap_prcm_irq_complete();
|
||||||
|
@ -196,7 +196,7 @@ static const struct platform_suspend_ops omap_pm_ops = {
|
||||||
.begin = omap_pm_begin,
|
.begin = omap_pm_begin,
|
||||||
.end = omap_pm_end,
|
.end = omap_pm_end,
|
||||||
.enter = omap_pm_enter,
|
.enter = omap_pm_enter,
|
||||||
.finish = omap_pm_finish,
|
.wake = omap_pm_wake,
|
||||||
.valid = suspend_valid_only_mem,
|
.valid = suspend_valid_only_mem,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -156,12 +156,6 @@ static struct clock_event_device clockevent_gpt = {
|
||||||
.tick_resume = omap2_gp_timer_shutdown,
|
.tick_resume = omap2_gp_timer_shutdown,
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct property device_disabled = {
|
|
||||||
.name = "status",
|
|
||||||
.length = sizeof("disabled"),
|
|
||||||
.value = "disabled",
|
|
||||||
};
|
|
||||||
|
|
||||||
static const struct of_device_id omap_timer_match[] __initconst = {
|
static const struct of_device_id omap_timer_match[] __initconst = {
|
||||||
{ .compatible = "ti,omap2420-timer", },
|
{ .compatible = "ti,omap2420-timer", },
|
||||||
{ .compatible = "ti,omap3430-timer", },
|
{ .compatible = "ti,omap3430-timer", },
|
||||||
|
@ -203,8 +197,17 @@ static struct device_node * __init omap_get_timer_dt(const struct of_device_id *
|
||||||
of_get_property(np, "ti,timer-secure", NULL)))
|
of_get_property(np, "ti,timer-secure", NULL)))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
if (!of_device_is_compatible(np, "ti,omap-counter32k"))
|
if (!of_device_is_compatible(np, "ti,omap-counter32k")) {
|
||||||
of_add_property(np, &device_disabled);
|
struct property *prop;
|
||||||
|
|
||||||
|
prop = kzalloc(sizeof(*prop), GFP_KERNEL);
|
||||||
|
if (!prop)
|
||||||
|
return NULL;
|
||||||
|
prop->name = "status";
|
||||||
|
prop->value = "disabled";
|
||||||
|
prop->length = strlen(prop->value);
|
||||||
|
of_add_property(np, prop);
|
||||||
|
}
|
||||||
return np;
|
return np;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -58,7 +58,6 @@ config MACH_KUROBOX_PRO
|
||||||
|
|
||||||
config MACH_DNS323
|
config MACH_DNS323
|
||||||
bool "D-Link DNS-323"
|
bool "D-Link DNS-323"
|
||||||
select GENERIC_NET_UTILS
|
|
||||||
select I2C_BOARDINFO if I2C
|
select I2C_BOARDINFO if I2C
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support the
|
Say 'Y' here if you want your kernel to support the
|
||||||
|
@ -66,7 +65,6 @@ config MACH_DNS323
|
||||||
|
|
||||||
config MACH_TS209
|
config MACH_TS209
|
||||||
bool "QNAP TS-109/TS-209"
|
bool "QNAP TS-109/TS-209"
|
||||||
select GENERIC_NET_UTILS
|
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support the
|
Say 'Y' here if you want your kernel to support the
|
||||||
QNAP TS-109/TS-209 platform.
|
QNAP TS-109/TS-209 platform.
|
||||||
|
@ -101,7 +99,6 @@ config MACH_LINKSTATION_LS_HGL
|
||||||
|
|
||||||
config MACH_TS409
|
config MACH_TS409
|
||||||
bool "QNAP TS-409"
|
bool "QNAP TS-409"
|
||||||
select GENERIC_NET_UTILS
|
|
||||||
help
|
help
|
||||||
Say 'Y' here if you want your kernel to support the
|
Say 'Y' here if you want your kernel to support the
|
||||||
QNAP TS-409 platform.
|
QNAP TS-409 platform.
|
||||||
|
|
|
@ -173,10 +173,42 @@ static struct mv643xx_eth_platform_data dns323_eth_data = {
|
||||||
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/* dns323_parse_hex_*() taken from tsx09-common.c; should a common copy of these
|
||||||
|
* functions be kept somewhere?
|
||||||
|
*/
|
||||||
|
static int __init dns323_parse_hex_nibble(char n)
|
||||||
|
{
|
||||||
|
if (n >= '0' && n <= '9')
|
||||||
|
return n - '0';
|
||||||
|
|
||||||
|
if (n >= 'A' && n <= 'F')
|
||||||
|
return n - 'A' + 10;
|
||||||
|
|
||||||
|
if (n >= 'a' && n <= 'f')
|
||||||
|
return n - 'a' + 10;
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __init dns323_parse_hex_byte(const char *b)
|
||||||
|
{
|
||||||
|
int hi;
|
||||||
|
int lo;
|
||||||
|
|
||||||
|
hi = dns323_parse_hex_nibble(b[0]);
|
||||||
|
lo = dns323_parse_hex_nibble(b[1]);
|
||||||
|
|
||||||
|
if (hi < 0 || lo < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return (hi << 4) | lo;
|
||||||
|
}
|
||||||
|
|
||||||
static int __init dns323_read_mac_addr(void)
|
static int __init dns323_read_mac_addr(void)
|
||||||
{
|
{
|
||||||
u_int8_t addr[6];
|
u_int8_t addr[6];
|
||||||
void __iomem *mac_page;
|
int i;
|
||||||
|
char *mac_page;
|
||||||
|
|
||||||
/* MAC address is stored as a regular ol' string in /dev/mtdblock4
|
/* MAC address is stored as a regular ol' string in /dev/mtdblock4
|
||||||
* (0x007d0000-0x00800000) starting at offset 196480 (0x2ff80).
|
* (0x007d0000-0x00800000) starting at offset 196480 (0x2ff80).
|
||||||
|
@ -185,8 +217,23 @@ static int __init dns323_read_mac_addr(void)
|
||||||
if (!mac_page)
|
if (!mac_page)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
if (!mac_pton((__force const char *) mac_page, addr))
|
/* Sanity check the string we're looking at */
|
||||||
|
for (i = 0; i < 5; i++) {
|
||||||
|
if (*(mac_page + (i * 3) + 2) != ':') {
|
||||||
goto error_fail;
|
goto error_fail;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < 6; i++) {
|
||||||
|
int byte;
|
||||||
|
|
||||||
|
byte = dns323_parse_hex_byte(mac_page + (i * 3));
|
||||||
|
if (byte < 0) {
|
||||||
|
goto error_fail;
|
||||||
|
}
|
||||||
|
|
||||||
|
addr[i] = byte;
|
||||||
|
}
|
||||||
|
|
||||||
iounmap(mac_page);
|
iounmap(mac_page);
|
||||||
printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
|
printk("DNS-323: Found ethernet MAC address: %pM\n", addr);
|
||||||
|
|
|
@ -53,13 +53,54 @@ struct mv643xx_eth_platform_data qnap_tsx09_eth_data = {
|
||||||
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
.phy_addr = MV643XX_ETH_PHY_ADDR(8),
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static int __init qnap_tsx09_parse_hex_nibble(char n)
|
||||||
|
{
|
||||||
|
if (n >= '0' && n <= '9')
|
||||||
|
return n - '0';
|
||||||
|
|
||||||
|
if (n >= 'A' && n <= 'F')
|
||||||
|
return n - 'A' + 10;
|
||||||
|
|
||||||
|
if (n >= 'a' && n <= 'f')
|
||||||
|
return n - 'a' + 10;
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int __init qnap_tsx09_parse_hex_byte(const char *b)
|
||||||
|
{
|
||||||
|
int hi;
|
||||||
|
int lo;
|
||||||
|
|
||||||
|
hi = qnap_tsx09_parse_hex_nibble(b[0]);
|
||||||
|
lo = qnap_tsx09_parse_hex_nibble(b[1]);
|
||||||
|
|
||||||
|
if (hi < 0 || lo < 0)
|
||||||
|
return -1;
|
||||||
|
|
||||||
|
return (hi << 4) | lo;
|
||||||
|
}
|
||||||
|
|
||||||
static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
|
static int __init qnap_tsx09_check_mac_addr(const char *addr_str)
|
||||||
{
|
{
|
||||||
u_int8_t addr[6];
|
u_int8_t addr[6];
|
||||||
|
int i;
|
||||||
|
|
||||||
if (!mac_pton(addr_str, addr))
|
for (i = 0; i < 6; i++) {
|
||||||
|
int byte;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Enforce "xx:xx:xx:xx:xx:xx\n" format.
|
||||||
|
*/
|
||||||
|
if (addr_str[(i * 3) + 2] != ((i < 5) ? ':' : '\n'))
|
||||||
return -1;
|
return -1;
|
||||||
|
|
||||||
|
byte = qnap_tsx09_parse_hex_byte(addr_str + (i * 3));
|
||||||
|
if (byte < 0)
|
||||||
|
return -1;
|
||||||
|
addr[i] = byte;
|
||||||
|
}
|
||||||
|
|
||||||
printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
|
printk(KERN_INFO "tsx09: found ethernet mac address %pM\n", addr);
|
||||||
|
|
||||||
memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
|
memcpy(qnap_tsx09_eth_data.mac_addr, addr, 6);
|
||||||
|
@ -77,12 +118,12 @@ void __init qnap_tsx09_find_mac_addr(u32 mem_base, u32 size)
|
||||||
unsigned long addr;
|
unsigned long addr;
|
||||||
|
|
||||||
for (addr = mem_base; addr < (mem_base + size); addr += 1024) {
|
for (addr = mem_base; addr < (mem_base + size); addr += 1024) {
|
||||||
void __iomem *nor_page;
|
char *nor_page;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
nor_page = ioremap(addr, 1024);
|
nor_page = ioremap(addr, 1024);
|
||||||
if (nor_page != NULL) {
|
if (nor_page != NULL) {
|
||||||
ret = qnap_tsx09_check_mac_addr((__force const char *)nor_page);
|
ret = qnap_tsx09_check_mac_addr(nor_page);
|
||||||
iounmap(nor_page);
|
iounmap(nor_page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -472,28 +472,27 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,
|
||||||
/*****************************************************************************
|
/*****************************************************************************
|
||||||
* Ethernet switch
|
* Ethernet switch
|
||||||
****************************************************************************/
|
****************************************************************************/
|
||||||
static __initconst const char *orion_ge00_mvmdio_bus_name = "orion-mii";
|
static __initdata struct mdio_board_info orion_ge00_switch_board_info = {
|
||||||
static __initdata struct mdio_board_info
|
.bus_id = "orion-mii",
|
||||||
orion_ge00_switch_board_info;
|
.modalias = "mv88e6085",
|
||||||
|
};
|
||||||
|
|
||||||
void __init orion_ge00_switch_init(struct dsa_chip_data *d)
|
void __init orion_ge00_switch_init(struct dsa_chip_data *d)
|
||||||
{
|
{
|
||||||
struct mdio_board_info *bd;
|
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
if (!IS_BUILTIN(CONFIG_PHYLIB))
|
if (!IS_BUILTIN(CONFIG_PHYLIB))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
for (i = 0; i < ARRAY_SIZE(d->port_names); i++)
|
for (i = 0; i < ARRAY_SIZE(d->port_names); i++) {
|
||||||
if (!strcmp(d->port_names[i], "cpu"))
|
if (!strcmp(d->port_names[i], "cpu")) {
|
||||||
break;
|
|
||||||
|
|
||||||
bd = &orion_ge00_switch_board_info;
|
|
||||||
bd->bus_id = orion_ge00_mvmdio_bus_name;
|
|
||||||
bd->mdio_addr = d->sw_addr;
|
|
||||||
d->netdev[i] = &orion_ge00.dev;
|
d->netdev[i] = &orion_ge00.dev;
|
||||||
strcpy(bd->modalias, "mv88e6085");
|
break;
|
||||||
bd->platform_data = d;
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
orion_ge00_switch_board_info.mdio_addr = d->sw_addr;
|
||||||
|
orion_ge00_switch_board_info.platform_data = d;
|
||||||
|
|
||||||
mdiobus_register_board_info(&orion_ge00_switch_board_info, 1);
|
mdiobus_register_board_info(&orion_ge00_switch_board_info, 1);
|
||||||
}
|
}
|
||||||
|
|
|
@ -165,14 +165,14 @@
|
||||||
|
|
||||||
uart_A: serial@24000 {
|
uart_A: serial@24000 {
|
||||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
||||||
reg = <0x0 0x24000 0x0 0x14>;
|
reg = <0x0 0x24000 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
uart_B: serial@23000 {
|
uart_B: serial@23000 {
|
||||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
compatible = "amlogic,meson-gx-uart", "amlogic,meson-uart";
|
||||||
reg = <0x0 0x23000 0x0 0x14>;
|
reg = <0x0 0x23000 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
|
@ -235,14 +235,14 @@
|
||||||
|
|
||||||
uart_A: serial@84c0 {
|
uart_A: serial@84c0 {
|
||||||
compatible = "amlogic,meson-gx-uart";
|
compatible = "amlogic,meson-gx-uart";
|
||||||
reg = <0x0 0x84c0 0x0 0x14>;
|
reg = <0x0 0x84c0 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 26 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
uart_B: serial@84dc {
|
uart_B: serial@84dc {
|
||||||
compatible = "amlogic,meson-gx-uart";
|
compatible = "amlogic,meson-gx-uart";
|
||||||
reg = <0x0 0x84dc 0x0 0x14>;
|
reg = <0x0 0x84dc 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 75 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
@ -287,7 +287,7 @@
|
||||||
|
|
||||||
uart_C: serial@8700 {
|
uart_C: serial@8700 {
|
||||||
compatible = "amlogic,meson-gx-uart";
|
compatible = "amlogic,meson-gx-uart";
|
||||||
reg = <0x0 0x8700 0x0 0x14>;
|
reg = <0x0 0x8700 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 93 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
@ -404,14 +404,14 @@
|
||||||
|
|
||||||
uart_AO: serial@4c0 {
|
uart_AO: serial@4c0 {
|
||||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
|
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
|
||||||
reg = <0x0 0x004c0 0x0 0x14>;
|
reg = <0x0 0x004c0 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 193 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
||||||
uart_AO_B: serial@4e0 {
|
uart_AO_B: serial@4e0 {
|
||||||
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
|
compatible = "amlogic,meson-gx-uart", "amlogic,meson-ao-uart";
|
||||||
reg = <0x0 0x004e0 0x0 0x14>;
|
reg = <0x0 0x004e0 0x0 0x18>;
|
||||||
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
|
interrupts = <GIC_SPI 197 IRQ_TYPE_EDGE_RISING>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
|
@ -631,6 +631,7 @@
|
||||||
|
|
||||||
internal_phy: ethernet-phy@8 {
|
internal_phy: ethernet-phy@8 {
|
||||||
compatible = "ethernet-phy-id0181.4400", "ethernet-phy-ieee802.3-c22";
|
compatible = "ethernet-phy-id0181.4400", "ethernet-phy-ieee802.3-c22";
|
||||||
|
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
reg = <8>;
|
reg = <8>;
|
||||||
max-speed = <100>;
|
max-speed = <100>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
clock-output-names = "clk125mhz";
|
clock-output-names = "clk125mhz";
|
||||||
};
|
};
|
||||||
|
|
||||||
pci {
|
pcie@30000000 {
|
||||||
compatible = "pci-host-ecam-generic";
|
compatible = "pci-host-ecam-generic";
|
||||||
device_type = "pci";
|
device_type = "pci";
|
||||||
#interrupt-cells = <1>;
|
#interrupt-cells = <1>;
|
||||||
|
@ -118,6 +118,7 @@
|
||||||
ranges =
|
ranges =
|
||||||
<0x02000000 0 0x40000000 0 0x40000000 0 0x20000000
|
<0x02000000 0 0x40000000 0 0x40000000 0 0x20000000
|
||||||
0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>;
|
0x43000000 0x40 0x00000000 0x40 0x00000000 0x20 0x00000000>;
|
||||||
|
bus-range = <0 0xff>;
|
||||||
interrupt-map-mask = <0 0 0 7>;
|
interrupt-map-mask = <0 0 0 7>;
|
||||||
interrupt-map =
|
interrupt-map =
|
||||||
/* addr pin ic icaddr icintr */
|
/* addr pin ic icaddr icintr */
|
||||||
|
|
|
@ -51,7 +51,7 @@
|
||||||
#size-cells = <2>;
|
#size-cells = <2>;
|
||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
ramoops@0x21f00000 {
|
ramoops@21f00000 {
|
||||||
compatible = "ramoops";
|
compatible = "ramoops";
|
||||||
reg = <0x0 0x21f00000 0x0 0x00100000>;
|
reg = <0x0 0x21f00000 0x0 0x00100000>;
|
||||||
record-size = <0x00020000>;
|
record-size = <0x00020000>;
|
||||||
|
|
|
@ -341,7 +341,7 @@
|
||||||
reg = <0 0x10005000 0 0x1000>;
|
reg = <0 0x10005000 0 0x1000>;
|
||||||
};
|
};
|
||||||
|
|
||||||
pio: pinctrl@0x10005000 {
|
pio: pinctrl@10005000 {
|
||||||
compatible = "mediatek,mt8173-pinctrl";
|
compatible = "mediatek,mt8173-pinctrl";
|
||||||
reg = <0 0x1000b000 0 0x1000>;
|
reg = <0 0x1000b000 0 0x1000>;
|
||||||
mediatek,pctl-regmap = <&syscfg_pctl_a>;
|
mediatek,pctl-regmap = <&syscfg_pctl_a>;
|
||||||
|
|
|
@ -140,16 +140,16 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
agnoc@0 {
|
agnoc@0 {
|
||||||
qcom,pcie@00600000 {
|
qcom,pcie@600000 {
|
||||||
perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
|
perst-gpio = <&msmgpio 35 GPIO_ACTIVE_LOW>;
|
||||||
};
|
};
|
||||||
|
|
||||||
qcom,pcie@00608000 {
|
qcom,pcie@608000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;
|
perst-gpio = <&msmgpio 130 GPIO_ACTIVE_LOW>;
|
||||||
};
|
};
|
||||||
|
|
||||||
qcom,pcie@00610000 {
|
qcom,pcie@610000 {
|
||||||
status = "okay";
|
status = "okay";
|
||||||
perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
|
perst-gpio = <&msmgpio 114 GPIO_ACTIVE_LOW>;
|
||||||
};
|
};
|
||||||
|
|
|
@ -840,7 +840,7 @@
|
||||||
#size-cells = <1>;
|
#size-cells = <1>;
|
||||||
ranges;
|
ranges;
|
||||||
|
|
||||||
pcie0: qcom,pcie@00600000 {
|
pcie0: qcom,pcie@600000 {
|
||||||
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
power-domains = <&gcc PCIE0_GDSC>;
|
power-domains = <&gcc PCIE0_GDSC>;
|
||||||
|
@ -893,7 +893,7 @@
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
pcie1: qcom,pcie@00608000 {
|
pcie1: qcom,pcie@608000 {
|
||||||
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
||||||
power-domains = <&gcc PCIE1_GDSC>;
|
power-domains = <&gcc PCIE1_GDSC>;
|
||||||
bus-range = <0x00 0xff>;
|
bus-range = <0x00 0xff>;
|
||||||
|
@ -946,7 +946,7 @@
|
||||||
"bus_slave";
|
"bus_slave";
|
||||||
};
|
};
|
||||||
|
|
||||||
pcie2: qcom,pcie@00610000 {
|
pcie2: qcom,pcie@610000 {
|
||||||
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
compatible = "qcom,pcie-msm8996", "snps,dw-pcie";
|
||||||
power-domains = <&gcc PCIE2_GDSC>;
|
power-domains = <&gcc PCIE2_GDSC>;
|
||||||
bus-range = <0x00 0xff>;
|
bus-range = <0x00 0xff>;
|
||||||
|
|
|
@ -132,17 +132,16 @@
|
||||||
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
|
assigned-clocks = <&cru SCLK_MAC2IO>, <&cru SCLK_MAC2IO_EXT>;
|
||||||
assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
|
assigned-clock-parents = <&gmac_clkin>, <&gmac_clkin>;
|
||||||
clock_in_out = "input";
|
clock_in_out = "input";
|
||||||
/* shows instability at 1GBit right now */
|
|
||||||
max-speed = <100>;
|
|
||||||
phy-supply = <&vcc_io>;
|
phy-supply = <&vcc_io>;
|
||||||
phy-mode = "rgmii";
|
phy-mode = "rgmii";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&rgmiim1_pins>;
|
pinctrl-0 = <&rgmiim1_pins>;
|
||||||
|
snps,force_thresh_dma_mode;
|
||||||
snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
snps,reset-gpio = <&gpio1 RK_PC2 GPIO_ACTIVE_LOW>;
|
||||||
snps,reset-active-low;
|
snps,reset-active-low;
|
||||||
snps,reset-delays-us = <0 10000 50000>;
|
snps,reset-delays-us = <0 10000 50000>;
|
||||||
tx_delay = <0x26>;
|
tx_delay = <0x24>;
|
||||||
rx_delay = <0x11>;
|
rx_delay = <0x18>;
|
||||||
status = "okay";
|
status = "okay";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -730,7 +730,7 @@
|
||||||
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
|
clocks = <&cru HCLK_SDMMC>, <&cru SCLK_SDMMC>,
|
||||||
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
|
<&cru SCLK_SDMMC_DRV>, <&cru SCLK_SDMMC_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
@ -741,7 +741,7 @@
|
||||||
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
clocks = <&cru HCLK_SDIO>, <&cru SCLK_SDIO>,
|
||||||
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
<&cru SCLK_SDIO_DRV>, <&cru SCLK_SDIO_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
@ -752,7 +752,7 @@
|
||||||
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 14 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
clocks = <&cru HCLK_EMMC>, <&cru SCLK_EMMC>,
|
||||||
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
<&cru SCLK_EMMC_DRV>, <&cru SCLK_EMMC_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
status = "disabled";
|
status = "disabled";
|
||||||
};
|
};
|
||||||
|
|
|
@ -257,7 +257,7 @@
|
||||||
max-frequency = <150000000>;
|
max-frequency = <150000000>;
|
||||||
clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
|
clocks = <&cru HCLK_SDIO0>, <&cru SCLK_SDIO0>,
|
||||||
<&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
|
<&cru SCLK_SDIO0_DRV>, <&cru SCLK_SDIO0_SAMPLE>;
|
||||||
clock-names = "biu", "ciu", "ciu_drv", "ciu_sample";
|
clock-names = "biu", "ciu", "ciu-drive", "ciu-sample";
|
||||||
fifo-depth = <0x100>;
|
fifo-depth = <0x100>;
|
||||||
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
|
interrupts = <GIC_SPI 33 IRQ_TYPE_LEVEL_HIGH>;
|
||||||
resets = <&cru SRST_SDIO0>;
|
resets = <&cru SRST_SDIO0>;
|
||||||
|
|
|
@ -457,7 +457,7 @@
|
||||||
assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
|
assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
|
||||||
assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
|
assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
|
||||||
assigned-clock-rates = <100000000>;
|
assigned-clock-rates = <100000000>;
|
||||||
ep-gpios = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;
|
ep-gpios = <&gpio2 RK_PA4 GPIO_ACTIVE_HIGH>;
|
||||||
num-lanes = <4>;
|
num-lanes = <4>;
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&pcie_clkreqn_cpm>;
|
pinctrl-0 = <&pcie_clkreqn_cpm>;
|
||||||
|
|
|
@ -1739,8 +1739,8 @@
|
||||||
compatible = "rockchip,rk3399-edp";
|
compatible = "rockchip,rk3399-edp";
|
||||||
reg = <0x0 0xff970000 0x0 0x8000>;
|
reg = <0x0 0xff970000 0x0 0x8000>;
|
||||||
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
|
interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH 0>;
|
||||||
clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>;
|
clocks = <&cru PCLK_EDP>, <&cru PCLK_EDP_CTRL>, <&cru PCLK_VIO_GRF>;
|
||||||
clock-names = "dp", "pclk";
|
clock-names = "dp", "pclk", "grf";
|
||||||
pinctrl-names = "default";
|
pinctrl-names = "default";
|
||||||
pinctrl-0 = <&edp_hpd>;
|
pinctrl-0 = <&edp_hpd>;
|
||||||
power-domains = <&power RK3399_PD_EDP>;
|
power-domains = <&power RK3399_PD_EDP>;
|
||||||
|
|
|
@ -178,7 +178,7 @@ static int enable_smccc_arch_workaround_1(void *data)
|
||||||
case PSCI_CONDUIT_HVC:
|
case PSCI_CONDUIT_HVC:
|
||||||
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
arm_smccc_1_1_hvc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
||||||
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
||||||
if (res.a0)
|
if ((int)res.a0 < 0)
|
||||||
return 0;
|
return 0;
|
||||||
cb = call_hvc_arch_workaround_1;
|
cb = call_hvc_arch_workaround_1;
|
||||||
smccc_start = __smccc_workaround_1_hvc_start;
|
smccc_start = __smccc_workaround_1_hvc_start;
|
||||||
|
@ -188,7 +188,7 @@ static int enable_smccc_arch_workaround_1(void *data)
|
||||||
case PSCI_CONDUIT_SMC:
|
case PSCI_CONDUIT_SMC:
|
||||||
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
arm_smccc_1_1_smc(ARM_SMCCC_ARCH_FEATURES_FUNC_ID,
|
||||||
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
ARM_SMCCC_ARCH_WORKAROUND_1, &res);
|
||||||
if (res.a0)
|
if ((int)res.a0 < 0)
|
||||||
return 0;
|
return 0;
|
||||||
cb = call_smc_arch_workaround_1;
|
cb = call_smc_arch_workaround_1;
|
||||||
smccc_start = __smccc_workaround_1_smc_start;
|
smccc_start = __smccc_workaround_1_smc_start;
|
||||||
|
|
|
@ -108,7 +108,7 @@ static bool pgattr_change_is_safe(u64 old, u64 new)
|
||||||
* The following mapping attributes may be updated in live
|
* The following mapping attributes may be updated in live
|
||||||
* kernel mappings without the need for break-before-make.
|
* kernel mappings without the need for break-before-make.
|
||||||
*/
|
*/
|
||||||
static const pteval_t mask = PTE_PXN | PTE_RDONLY | PTE_WRITE;
|
static const pteval_t mask = PTE_PXN | PTE_RDONLY | PTE_WRITE | PTE_NG;
|
||||||
|
|
||||||
/* creating or taking down mappings is always safe */
|
/* creating or taking down mappings is always safe */
|
||||||
if (old == 0 || new == 0)
|
if (old == 0 || new == 0)
|
||||||
|
@ -118,9 +118,9 @@ static bool pgattr_change_is_safe(u64 old, u64 new)
|
||||||
if ((old | new) & PTE_CONT)
|
if ((old | new) & PTE_CONT)
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
/* Transitioning from Global to Non-Global is safe */
|
/* Transitioning from Non-Global to Global is unsafe */
|
||||||
if (((old ^ new) == PTE_NG) && (new & PTE_NG))
|
if (old & ~new & PTE_NG)
|
||||||
return true;
|
return false;
|
||||||
|
|
||||||
return ((old ^ new) & ~mask) == 0;
|
return ((old ^ new) & ~mask) == 0;
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,38 +66,35 @@ ATOMIC_OPS(add, +)
|
||||||
ATOMIC_OPS(sub, -)
|
ATOMIC_OPS(sub, -)
|
||||||
|
|
||||||
#ifdef __OPTIMIZE__
|
#ifdef __OPTIMIZE__
|
||||||
#define __ia64_atomic_const(i) __builtin_constant_p(i) ? \
|
#define __ia64_atomic_const(i) \
|
||||||
|
static const int __ia64_atomic_p = __builtin_constant_p(i) ? \
|
||||||
((i) == 1 || (i) == 4 || (i) == 8 || (i) == 16 || \
|
((i) == 1 || (i) == 4 || (i) == 8 || (i) == 16 || \
|
||||||
(i) == -1 || (i) == -4 || (i) == -8 || (i) == -16) : 0
|
(i) == -1 || (i) == -4 || (i) == -8 || (i) == -16) : 0;\
|
||||||
|
__ia64_atomic_p
|
||||||
|
#else
|
||||||
|
#define __ia64_atomic_const(i) 0
|
||||||
|
#endif
|
||||||
|
|
||||||
#define atomic_add_return(i,v) \
|
#define atomic_add_return(i,v) \
|
||||||
({ \
|
({ \
|
||||||
int __i = (i); \
|
int __ia64_aar_i = (i); \
|
||||||
static const int __ia64_atomic_p = __ia64_atomic_const(i); \
|
__ia64_atomic_const(i) \
|
||||||
__ia64_atomic_p ? ia64_fetch_and_add(__i, &(v)->counter) : \
|
? ia64_fetch_and_add(__ia64_aar_i, &(v)->counter) \
|
||||||
ia64_atomic_add(__i, v); \
|
: ia64_atomic_add(__ia64_aar_i, v); \
|
||||||
})
|
})
|
||||||
|
|
||||||
#define atomic_sub_return(i,v) \
|
#define atomic_sub_return(i,v) \
|
||||||
({ \
|
({ \
|
||||||
int __i = (i); \
|
int __ia64_asr_i = (i); \
|
||||||
static const int __ia64_atomic_p = __ia64_atomic_const(i); \
|
__ia64_atomic_const(i) \
|
||||||
__ia64_atomic_p ? ia64_fetch_and_add(-__i, &(v)->counter) : \
|
? ia64_fetch_and_add(-__ia64_asr_i, &(v)->counter) \
|
||||||
ia64_atomic_sub(__i, v); \
|
: ia64_atomic_sub(__ia64_asr_i, v); \
|
||||||
})
|
})
|
||||||
#else
|
|
||||||
#define atomic_add_return(i, v) ia64_atomic_add(i, v)
|
|
||||||
#define atomic_sub_return(i, v) ia64_atomic_sub(i, v)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define atomic_fetch_add(i,v) \
|
#define atomic_fetch_add(i,v) \
|
||||||
({ \
|
({ \
|
||||||
int __ia64_aar_i = (i); \
|
int __ia64_aar_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_aar_i == 1) || (__ia64_aar_i == 4) \
|
|
||||||
|| (__ia64_aar_i == 8) || (__ia64_aar_i == 16) \
|
|
||||||
|| (__ia64_aar_i == -1) || (__ia64_aar_i == -4) \
|
|
||||||
|| (__ia64_aar_i == -8) || (__ia64_aar_i == -16))) \
|
|
||||||
? ia64_fetchadd(__ia64_aar_i, &(v)->counter, acq) \
|
? ia64_fetchadd(__ia64_aar_i, &(v)->counter, acq) \
|
||||||
: ia64_atomic_fetch_add(__ia64_aar_i, v); \
|
: ia64_atomic_fetch_add(__ia64_aar_i, v); \
|
||||||
})
|
})
|
||||||
|
@ -105,11 +102,7 @@ ATOMIC_OPS(sub, -)
|
||||||
#define atomic_fetch_sub(i,v) \
|
#define atomic_fetch_sub(i,v) \
|
||||||
({ \
|
({ \
|
||||||
int __ia64_asr_i = (i); \
|
int __ia64_asr_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_asr_i == 1) || (__ia64_asr_i == 4) \
|
|
||||||
|| (__ia64_asr_i == 8) || (__ia64_asr_i == 16) \
|
|
||||||
|| (__ia64_asr_i == -1) || (__ia64_asr_i == -4) \
|
|
||||||
|| (__ia64_asr_i == -8) || (__ia64_asr_i == -16))) \
|
|
||||||
? ia64_fetchadd(-__ia64_asr_i, &(v)->counter, acq) \
|
? ia64_fetchadd(-__ia64_asr_i, &(v)->counter, acq) \
|
||||||
: ia64_atomic_fetch_sub(__ia64_asr_i, v); \
|
: ia64_atomic_fetch_sub(__ia64_asr_i, v); \
|
||||||
})
|
})
|
||||||
|
@ -170,11 +163,7 @@ ATOMIC64_OPS(sub, -)
|
||||||
#define atomic64_add_return(i,v) \
|
#define atomic64_add_return(i,v) \
|
||||||
({ \
|
({ \
|
||||||
long __ia64_aar_i = (i); \
|
long __ia64_aar_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_aar_i == 1) || (__ia64_aar_i == 4) \
|
|
||||||
|| (__ia64_aar_i == 8) || (__ia64_aar_i == 16) \
|
|
||||||
|| (__ia64_aar_i == -1) || (__ia64_aar_i == -4) \
|
|
||||||
|| (__ia64_aar_i == -8) || (__ia64_aar_i == -16))) \
|
|
||||||
? ia64_fetch_and_add(__ia64_aar_i, &(v)->counter) \
|
? ia64_fetch_and_add(__ia64_aar_i, &(v)->counter) \
|
||||||
: ia64_atomic64_add(__ia64_aar_i, v); \
|
: ia64_atomic64_add(__ia64_aar_i, v); \
|
||||||
})
|
})
|
||||||
|
@ -182,11 +171,7 @@ ATOMIC64_OPS(sub, -)
|
||||||
#define atomic64_sub_return(i,v) \
|
#define atomic64_sub_return(i,v) \
|
||||||
({ \
|
({ \
|
||||||
long __ia64_asr_i = (i); \
|
long __ia64_asr_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_asr_i == 1) || (__ia64_asr_i == 4) \
|
|
||||||
|| (__ia64_asr_i == 8) || (__ia64_asr_i == 16) \
|
|
||||||
|| (__ia64_asr_i == -1) || (__ia64_asr_i == -4) \
|
|
||||||
|| (__ia64_asr_i == -8) || (__ia64_asr_i == -16))) \
|
|
||||||
? ia64_fetch_and_add(-__ia64_asr_i, &(v)->counter) \
|
? ia64_fetch_and_add(-__ia64_asr_i, &(v)->counter) \
|
||||||
: ia64_atomic64_sub(__ia64_asr_i, v); \
|
: ia64_atomic64_sub(__ia64_asr_i, v); \
|
||||||
})
|
})
|
||||||
|
@ -194,11 +179,7 @@ ATOMIC64_OPS(sub, -)
|
||||||
#define atomic64_fetch_add(i,v) \
|
#define atomic64_fetch_add(i,v) \
|
||||||
({ \
|
({ \
|
||||||
long __ia64_aar_i = (i); \
|
long __ia64_aar_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_aar_i == 1) || (__ia64_aar_i == 4) \
|
|
||||||
|| (__ia64_aar_i == 8) || (__ia64_aar_i == 16) \
|
|
||||||
|| (__ia64_aar_i == -1) || (__ia64_aar_i == -4) \
|
|
||||||
|| (__ia64_aar_i == -8) || (__ia64_aar_i == -16))) \
|
|
||||||
? ia64_fetchadd(__ia64_aar_i, &(v)->counter, acq) \
|
? ia64_fetchadd(__ia64_aar_i, &(v)->counter, acq) \
|
||||||
: ia64_atomic64_fetch_add(__ia64_aar_i, v); \
|
: ia64_atomic64_fetch_add(__ia64_aar_i, v); \
|
||||||
})
|
})
|
||||||
|
@ -206,11 +187,7 @@ ATOMIC64_OPS(sub, -)
|
||||||
#define atomic64_fetch_sub(i,v) \
|
#define atomic64_fetch_sub(i,v) \
|
||||||
({ \
|
({ \
|
||||||
long __ia64_asr_i = (i); \
|
long __ia64_asr_i = (i); \
|
||||||
(__builtin_constant_p(i) \
|
__ia64_atomic_const(i) \
|
||||||
&& ( (__ia64_asr_i == 1) || (__ia64_asr_i == 4) \
|
|
||||||
|| (__ia64_asr_i == 8) || (__ia64_asr_i == 16) \
|
|
||||||
|| (__ia64_asr_i == -1) || (__ia64_asr_i == -4) \
|
|
||||||
|| (__ia64_asr_i == -8) || (__ia64_asr_i == -16))) \
|
|
||||||
? ia64_fetchadd(-__ia64_asr_i, &(v)->counter, acq) \
|
? ia64_fetchadd(-__ia64_asr_i, &(v)->counter, acq) \
|
||||||
: ia64_atomic64_fetch_sub(__ia64_asr_i, v); \
|
: ia64_atomic64_fetch_sub(__ia64_asr_i, v); \
|
||||||
})
|
})
|
||||||
|
|
|
@ -117,7 +117,7 @@ store_call_start(struct device *dev, struct device_attribute *attr,
|
||||||
|
|
||||||
#ifdef ERR_INJ_DEBUG
|
#ifdef ERR_INJ_DEBUG
|
||||||
printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);
|
printk(KERN_DEBUG "Returns: status=%d,\n", (int)status[cpu]);
|
||||||
printk(KERN_DEBUG "capapbilities=%lx,\n", capabilities[cpu]);
|
printk(KERN_DEBUG "capabilities=%lx,\n", capabilities[cpu]);
|
||||||
printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);
|
printk(KERN_DEBUG "resources=%lx\n", resources[cpu]);
|
||||||
#endif
|
#endif
|
||||||
return size;
|
return size;
|
||||||
|
@ -142,7 +142,7 @@ store_virtual_to_phys(struct device *dev, struct device_attribute *attr,
|
||||||
u64 virt_addr=simple_strtoull(buf, NULL, 16);
|
u64 virt_addr=simple_strtoull(buf, NULL, 16);
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
ret = get_user_pages(virt_addr, 1, FOLL_WRITE, NULL, NULL);
|
ret = get_user_pages_fast(virt_addr, 1, FOLL_WRITE, NULL);
|
||||||
if (ret<=0) {
|
if (ret<=0) {
|
||||||
#ifdef ERR_INJ_DEBUG
|
#ifdef ERR_INJ_DEBUG
|
||||||
printk("Virtual address %lx is not existing.\n",virt_addr);
|
printk("Virtual address %lx is not existing.\n",virt_addr);
|
||||||
|
|
|
@ -16,7 +16,7 @@ import re
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
if len(sys.argv) != 2:
|
if len(sys.argv) != 2:
|
||||||
print "Usage: %s FILE" % sys.argv[0]
|
print("Usage: %s FILE" % sys.argv[0])
|
||||||
sys.exit(2)
|
sys.exit(2)
|
||||||
|
|
||||||
readelf = os.getenv("READELF", "readelf")
|
readelf = os.getenv("READELF", "readelf")
|
||||||
|
@ -29,7 +29,7 @@ def check_func (func, slots, rlen_sum):
|
||||||
global num_errors
|
global num_errors
|
||||||
num_errors += 1
|
num_errors += 1
|
||||||
if not func: func = "[%#x-%#x]" % (start, end)
|
if not func: func = "[%#x-%#x]" % (start, end)
|
||||||
print "ERROR: %s: %lu slots, total region length = %lu" % (func, slots, rlen_sum)
|
print("ERROR: %s: %lu slots, total region length = %lu" % (func, slots, rlen_sum))
|
||||||
return
|
return
|
||||||
|
|
||||||
num_funcs = 0
|
num_funcs = 0
|
||||||
|
@ -43,23 +43,23 @@ for line in os.popen("%s -u %s" % (readelf, sys.argv[1])):
|
||||||
check_func(func, slots, rlen_sum)
|
check_func(func, slots, rlen_sum)
|
||||||
|
|
||||||
func = m.group(1)
|
func = m.group(1)
|
||||||
start = long(m.group(2), 16)
|
start = int(m.group(2), 16)
|
||||||
end = long(m.group(3), 16)
|
end = int(m.group(3), 16)
|
||||||
slots = 3 * (end - start) / 16
|
slots = 3 * (end - start) / 16
|
||||||
rlen_sum = 0L
|
rlen_sum = 0
|
||||||
num_funcs += 1
|
num_funcs += 1
|
||||||
else:
|
else:
|
||||||
m = rlen_pattern.match(line)
|
m = rlen_pattern.match(line)
|
||||||
if m:
|
if m:
|
||||||
rlen_sum += long(m.group(1))
|
rlen_sum += int(m.group(1))
|
||||||
check_func(func, slots, rlen_sum)
|
check_func(func, slots, rlen_sum)
|
||||||
|
|
||||||
if num_errors == 0:
|
if num_errors == 0:
|
||||||
print "No errors detected in %u functions." % num_funcs
|
print("No errors detected in %u functions." % num_funcs)
|
||||||
else:
|
else:
|
||||||
if num_errors > 1:
|
if num_errors > 1:
|
||||||
err="errors"
|
err="errors"
|
||||||
else:
|
else:
|
||||||
err="error"
|
err="error"
|
||||||
print "%u %s detected in %u functions." % (num_errors, err, num_funcs)
|
print("%u %s detected in %u functions." % (num_errors, err, num_funcs))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
|
@ -135,6 +135,8 @@ int __init ath25_find_config(phys_addr_t base, unsigned long size)
|
||||||
}
|
}
|
||||||
|
|
||||||
board_data = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL);
|
board_data = kzalloc(BOARD_CONFIG_BUFSZ, GFP_KERNEL);
|
||||||
|
if (!board_data)
|
||||||
|
goto error;
|
||||||
ath25_board.config = (struct ath25_boarddata *)board_data;
|
ath25_board.config = (struct ath25_boarddata *)board_data;
|
||||||
memcpy_fromio(board_data, bcfg, 0x100);
|
memcpy_fromio(board_data, bcfg, 0x100);
|
||||||
if (broken_boarddata) {
|
if (broken_boarddata) {
|
||||||
|
|
|
@ -2277,6 +2277,8 @@ static int __init octeon_irq_init_cib(struct device_node *ciu_node,
|
||||||
}
|
}
|
||||||
|
|
||||||
host_data = kzalloc(sizeof(*host_data), GFP_KERNEL);
|
host_data = kzalloc(sizeof(*host_data), GFP_KERNEL);
|
||||||
|
if (!host_data)
|
||||||
|
return -ENOMEM;
|
||||||
raw_spin_lock_init(&host_data->lock);
|
raw_spin_lock_init(&host_data->lock);
|
||||||
|
|
||||||
addr = of_get_address(ciu_node, 0, NULL, NULL);
|
addr = of_get_address(ciu_node, 0, NULL, NULL);
|
||||||
|
|
|
@ -168,11 +168,11 @@ static void bmips_prepare_cpus(unsigned int max_cpus)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (request_irq(IPI0_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
|
if (request_irq(IPI0_IRQ, bmips_ipi_interrupt,
|
||||||
"smp_ipi0", NULL))
|
IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi0", NULL))
|
||||||
panic("Can't request IPI0 interrupt");
|
panic("Can't request IPI0 interrupt");
|
||||||
if (request_irq(IPI1_IRQ, bmips_ipi_interrupt, IRQF_PERCPU,
|
if (request_irq(IPI1_IRQ, bmips_ipi_interrupt,
|
||||||
"smp_ipi1", NULL))
|
IRQF_PERCPU | IRQF_NO_SUSPEND, "smp_ipi1", NULL))
|
||||||
panic("Can't request IPI1 interrupt");
|
panic("Can't request IPI1 interrupt");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -7,6 +7,8 @@ choice
|
||||||
config LEMOTE_FULOONG2E
|
config LEMOTE_FULOONG2E
|
||||||
bool "Lemote Fuloong(2e) mini-PC"
|
bool "Lemote Fuloong(2e) mini-PC"
|
||||||
select ARCH_SPARSEMEM_ENABLE
|
select ARCH_SPARSEMEM_ENABLE
|
||||||
|
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||||
|
select ARCH_MIGHT_HAVE_PC_SERIO
|
||||||
select CEVT_R4K
|
select CEVT_R4K
|
||||||
select CSRC_R4K
|
select CSRC_R4K
|
||||||
select SYS_HAS_CPU_LOONGSON2E
|
select SYS_HAS_CPU_LOONGSON2E
|
||||||
|
@ -33,6 +35,8 @@ config LEMOTE_FULOONG2E
|
||||||
config LEMOTE_MACH2F
|
config LEMOTE_MACH2F
|
||||||
bool "Lemote Loongson 2F family machines"
|
bool "Lemote Loongson 2F family machines"
|
||||||
select ARCH_SPARSEMEM_ENABLE
|
select ARCH_SPARSEMEM_ENABLE
|
||||||
|
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||||
|
select ARCH_MIGHT_HAVE_PC_SERIO
|
||||||
select BOARD_SCACHE
|
select BOARD_SCACHE
|
||||||
select BOOT_ELF32
|
select BOOT_ELF32
|
||||||
select CEVT_R4K if ! MIPS_EXTERNAL_TIMER
|
select CEVT_R4K if ! MIPS_EXTERNAL_TIMER
|
||||||
|
@ -62,6 +66,8 @@ config LEMOTE_MACH2F
|
||||||
config LOONGSON_MACH3X
|
config LOONGSON_MACH3X
|
||||||
bool "Generic Loongson 3 family machines"
|
bool "Generic Loongson 3 family machines"
|
||||||
select ARCH_SPARSEMEM_ENABLE
|
select ARCH_SPARSEMEM_ENABLE
|
||||||
|
select ARCH_MIGHT_HAVE_PC_PARPORT
|
||||||
|
select ARCH_MIGHT_HAVE_PC_SERIO
|
||||||
select GENERIC_ISA_DMA_SUPPORT_BROKEN
|
select GENERIC_ISA_DMA_SUPPORT_BROKEN
|
||||||
select BOOT_ELF32
|
select BOOT_ELF32
|
||||||
select BOARD_SCACHE
|
select BOARD_SCACHE
|
||||||
|
|
|
@ -26,6 +26,7 @@ void flush_user_icache_range_asm(unsigned long, unsigned long);
|
||||||
void flush_kernel_icache_range_asm(unsigned long, unsigned long);
|
void flush_kernel_icache_range_asm(unsigned long, unsigned long);
|
||||||
void flush_user_dcache_range_asm(unsigned long, unsigned long);
|
void flush_user_dcache_range_asm(unsigned long, unsigned long);
|
||||||
void flush_kernel_dcache_range_asm(unsigned long, unsigned long);
|
void flush_kernel_dcache_range_asm(unsigned long, unsigned long);
|
||||||
|
void purge_kernel_dcache_range_asm(unsigned long, unsigned long);
|
||||||
void flush_kernel_dcache_page_asm(void *);
|
void flush_kernel_dcache_page_asm(void *);
|
||||||
void flush_kernel_icache_page(void *);
|
void flush_kernel_icache_page(void *);
|
||||||
|
|
||||||
|
|
|
@ -316,6 +316,8 @@ extern int _parisc_requires_coherency;
|
||||||
#define parisc_requires_coherency() (0)
|
#define parisc_requires_coherency() (0)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
extern int running_on_qemu;
|
||||||
|
|
||||||
#endif /* __ASSEMBLY__ */
|
#endif /* __ASSEMBLY__ */
|
||||||
|
|
||||||
#endif /* __ASM_PARISC_PROCESSOR_H */
|
#endif /* __ASM_PARISC_PROCESSOR_H */
|
||||||
|
|
|
@ -465,10 +465,10 @@ EXPORT_SYMBOL(copy_user_page);
|
||||||
int __flush_tlb_range(unsigned long sid, unsigned long start,
|
int __flush_tlb_range(unsigned long sid, unsigned long start,
|
||||||
unsigned long end)
|
unsigned long end)
|
||||||
{
|
{
|
||||||
unsigned long flags, size;
|
unsigned long flags;
|
||||||
|
|
||||||
size = (end - start);
|
if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
|
||||||
if (size >= parisc_tlb_flush_threshold) {
|
end - start >= parisc_tlb_flush_threshold) {
|
||||||
flush_tlb_all();
|
flush_tlb_all();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -539,13 +539,11 @@ void flush_cache_mm(struct mm_struct *mm)
|
||||||
struct vm_area_struct *vma;
|
struct vm_area_struct *vma;
|
||||||
pgd_t *pgd;
|
pgd_t *pgd;
|
||||||
|
|
||||||
/* Flush the TLB to avoid speculation if coherency is required. */
|
|
||||||
if (parisc_requires_coherency())
|
|
||||||
flush_tlb_all();
|
|
||||||
|
|
||||||
/* Flushing the whole cache on each cpu takes forever on
|
/* Flushing the whole cache on each cpu takes forever on
|
||||||
rp3440, etc. So, avoid it if the mm isn't too big. */
|
rp3440, etc. So, avoid it if the mm isn't too big. */
|
||||||
if (mm_total_size(mm) >= parisc_cache_flush_threshold) {
|
if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
|
||||||
|
mm_total_size(mm) >= parisc_cache_flush_threshold) {
|
||||||
|
flush_tlb_all();
|
||||||
flush_cache_all();
|
flush_cache_all();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -553,9 +551,9 @@ void flush_cache_mm(struct mm_struct *mm)
|
||||||
if (mm->context == mfsp(3)) {
|
if (mm->context == mfsp(3)) {
|
||||||
for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
for (vma = mm->mmap; vma; vma = vma->vm_next) {
|
||||||
flush_user_dcache_range_asm(vma->vm_start, vma->vm_end);
|
flush_user_dcache_range_asm(vma->vm_start, vma->vm_end);
|
||||||
if ((vma->vm_flags & VM_EXEC) == 0)
|
if (vma->vm_flags & VM_EXEC)
|
||||||
continue;
|
|
||||||
flush_user_icache_range_asm(vma->vm_start, vma->vm_end);
|
flush_user_icache_range_asm(vma->vm_start, vma->vm_end);
|
||||||
|
flush_tlb_range(vma, vma->vm_start, vma->vm_end);
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -581,14 +579,9 @@ void flush_cache_mm(struct mm_struct *mm)
|
||||||
void flush_cache_range(struct vm_area_struct *vma,
|
void flush_cache_range(struct vm_area_struct *vma,
|
||||||
unsigned long start, unsigned long end)
|
unsigned long start, unsigned long end)
|
||||||
{
|
{
|
||||||
BUG_ON(!vma->vm_mm->context);
|
if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
|
||||||
|
end - start >= parisc_cache_flush_threshold) {
|
||||||
/* Flush the TLB to avoid speculation if coherency is required. */
|
|
||||||
if (parisc_requires_coherency())
|
|
||||||
flush_tlb_range(vma, start, end);
|
flush_tlb_range(vma, start, end);
|
||||||
|
|
||||||
if ((end - start) >= parisc_cache_flush_threshold
|
|
||||||
|| vma->vm_mm->context != mfsp(3)) {
|
|
||||||
flush_cache_all();
|
flush_cache_all();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -596,6 +589,7 @@ void flush_cache_range(struct vm_area_struct *vma,
|
||||||
flush_user_dcache_range_asm(start, end);
|
flush_user_dcache_range_asm(start, end);
|
||||||
if (vma->vm_flags & VM_EXEC)
|
if (vma->vm_flags & VM_EXEC)
|
||||||
flush_user_icache_range_asm(start, end);
|
flush_user_icache_range_asm(start, end);
|
||||||
|
flush_tlb_range(vma, start, end);
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
@ -604,7 +598,6 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
|
||||||
BUG_ON(!vma->vm_mm->context);
|
BUG_ON(!vma->vm_mm->context);
|
||||||
|
|
||||||
if (pfn_valid(pfn)) {
|
if (pfn_valid(pfn)) {
|
||||||
if (parisc_requires_coherency())
|
|
||||||
flush_tlb_page(vma, vmaddr);
|
flush_tlb_page(vma, vmaddr);
|
||||||
__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
|
__flush_cache_page(vma, vmaddr, PFN_PHYS(pfn));
|
||||||
}
|
}
|
||||||
|
@ -613,21 +606,33 @@ flush_cache_page(struct vm_area_struct *vma, unsigned long vmaddr, unsigned long
|
||||||
void flush_kernel_vmap_range(void *vaddr, int size)
|
void flush_kernel_vmap_range(void *vaddr, int size)
|
||||||
{
|
{
|
||||||
unsigned long start = (unsigned long)vaddr;
|
unsigned long start = (unsigned long)vaddr;
|
||||||
|
unsigned long end = start + size;
|
||||||
|
|
||||||
if ((unsigned long)size > parisc_cache_flush_threshold)
|
if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
|
||||||
|
(unsigned long)size >= parisc_cache_flush_threshold) {
|
||||||
|
flush_tlb_kernel_range(start, end);
|
||||||
flush_data_cache();
|
flush_data_cache();
|
||||||
else
|
return;
|
||||||
flush_kernel_dcache_range_asm(start, start + size);
|
}
|
||||||
|
|
||||||
|
flush_kernel_dcache_range_asm(start, end);
|
||||||
|
flush_tlb_kernel_range(start, end);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(flush_kernel_vmap_range);
|
EXPORT_SYMBOL(flush_kernel_vmap_range);
|
||||||
|
|
||||||
void invalidate_kernel_vmap_range(void *vaddr, int size)
|
void invalidate_kernel_vmap_range(void *vaddr, int size)
|
||||||
{
|
{
|
||||||
unsigned long start = (unsigned long)vaddr;
|
unsigned long start = (unsigned long)vaddr;
|
||||||
|
unsigned long end = start + size;
|
||||||
|
|
||||||
if ((unsigned long)size > parisc_cache_flush_threshold)
|
if ((!IS_ENABLED(CONFIG_SMP) || !arch_irqs_disabled()) &&
|
||||||
|
(unsigned long)size >= parisc_cache_flush_threshold) {
|
||||||
|
flush_tlb_kernel_range(start, end);
|
||||||
flush_data_cache();
|
flush_data_cache();
|
||||||
else
|
return;
|
||||||
flush_kernel_dcache_range_asm(start, start + size);
|
}
|
||||||
|
|
||||||
|
purge_kernel_dcache_range_asm(start, end);
|
||||||
|
flush_tlb_kernel_range(start, end);
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(invalidate_kernel_vmap_range);
|
EXPORT_SYMBOL(invalidate_kernel_vmap_range);
|
||||||
|
|
|
@ -138,6 +138,16 @@ $pgt_fill_loop:
|
||||||
std %dp,0x18(%r10)
|
std %dp,0x18(%r10)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_64BIT
|
||||||
|
/* Get PDCE_PROC for monarch CPU. */
|
||||||
|
#define MEM_PDC_LO 0x388
|
||||||
|
#define MEM_PDC_HI 0x35C
|
||||||
|
ldw MEM_PDC_LO(%r0),%r3
|
||||||
|
ldw MEM_PDC_HI(%r0),%r10
|
||||||
|
depd %r10, 31, 32, %r3 /* move to upper word */
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#ifdef CONFIG_SMP
|
#ifdef CONFIG_SMP
|
||||||
/* Set the smp rendezvous address into page zero.
|
/* Set the smp rendezvous address into page zero.
|
||||||
** It would be safer to do this in init_smp_config() but
|
** It would be safer to do this in init_smp_config() but
|
||||||
|
@ -196,12 +206,6 @@ common_stext:
|
||||||
** Someday, palo might not do this for the Monarch either.
|
** Someday, palo might not do this for the Monarch either.
|
||||||
*/
|
*/
|
||||||
2:
|
2:
|
||||||
#define MEM_PDC_LO 0x388
|
|
||||||
#define MEM_PDC_HI 0x35C
|
|
||||||
ldw MEM_PDC_LO(%r0),%r3
|
|
||||||
ldw MEM_PDC_HI(%r0),%r6
|
|
||||||
depd %r6, 31, 32, %r3 /* move to upper word */
|
|
||||||
|
|
||||||
mfctl %cr30,%r6 /* PCX-W2 firmware bug */
|
mfctl %cr30,%r6 /* PCX-W2 firmware bug */
|
||||||
|
|
||||||
ldo PDC_PSW(%r0),%arg0 /* 21 */
|
ldo PDC_PSW(%r0),%arg0 /* 21 */
|
||||||
|
@ -268,6 +272,8 @@ $install_iva:
|
||||||
aligned_rfi:
|
aligned_rfi:
|
||||||
pcxt_ssm_bug
|
pcxt_ssm_bug
|
||||||
|
|
||||||
|
copy %r3, %arg0 /* PDCE_PROC for smp_callin() */
|
||||||
|
|
||||||
rsm PSW_SM_QUIET,%r0 /* off troublesome PSW bits */
|
rsm PSW_SM_QUIET,%r0 /* off troublesome PSW bits */
|
||||||
/* Don't need NOPs, have 8 compliant insn before rfi */
|
/* Don't need NOPs, have 8 compliant insn before rfi */
|
||||||
|
|
||||||
|
|
|
@ -1110,6 +1110,28 @@ ENTRY_CFI(flush_kernel_dcache_range_asm)
|
||||||
.procend
|
.procend
|
||||||
ENDPROC_CFI(flush_kernel_dcache_range_asm)
|
ENDPROC_CFI(flush_kernel_dcache_range_asm)
|
||||||
|
|
||||||
|
ENTRY_CFI(purge_kernel_dcache_range_asm)
|
||||||
|
.proc
|
||||||
|
.callinfo NO_CALLS
|
||||||
|
.entry
|
||||||
|
|
||||||
|
ldil L%dcache_stride, %r1
|
||||||
|
ldw R%dcache_stride(%r1), %r23
|
||||||
|
ldo -1(%r23), %r21
|
||||||
|
ANDCM %r26, %r21, %r26
|
||||||
|
|
||||||
|
1: cmpb,COND(<<),n %r26, %r25,1b
|
||||||
|
pdc,m %r23(%r26)
|
||||||
|
|
||||||
|
sync
|
||||||
|
syncdma
|
||||||
|
bv %r0(%r2)
|
||||||
|
nop
|
||||||
|
.exit
|
||||||
|
|
||||||
|
.procend
|
||||||
|
ENDPROC_CFI(purge_kernel_dcache_range_asm)
|
||||||
|
|
||||||
ENTRY_CFI(flush_user_icache_range_asm)
|
ENTRY_CFI(flush_user_icache_range_asm)
|
||||||
.proc
|
.proc
|
||||||
.callinfo NO_CALLS
|
.callinfo NO_CALLS
|
||||||
|
|
|
@ -292,10 +292,15 @@ smp_cpu_init(int cpunum)
|
||||||
* Slaves start using C here. Indirectly called from smp_slave_stext.
|
* Slaves start using C here. Indirectly called from smp_slave_stext.
|
||||||
* Do what start_kernel() and main() do for boot strap processor (aka monarch)
|
* Do what start_kernel() and main() do for boot strap processor (aka monarch)
|
||||||
*/
|
*/
|
||||||
void __init smp_callin(void)
|
void __init smp_callin(unsigned long pdce_proc)
|
||||||
{
|
{
|
||||||
int slave_id = cpu_now_booting;
|
int slave_id = cpu_now_booting;
|
||||||
|
|
||||||
|
#ifdef CONFIG_64BIT
|
||||||
|
WARN_ON(((unsigned long)(PAGE0->mem_pdc_hi) << 32
|
||||||
|
| PAGE0->mem_pdc) != pdce_proc);
|
||||||
|
#endif
|
||||||
|
|
||||||
smp_cpu_init(slave_id);
|
smp_cpu_init(slave_id);
|
||||||
preempt_disable();
|
preempt_disable();
|
||||||
|
|
||||||
|
|
|
@ -76,10 +76,10 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)
|
||||||
next_tick = cpuinfo->it_value;
|
next_tick = cpuinfo->it_value;
|
||||||
|
|
||||||
/* Calculate how many ticks have elapsed. */
|
/* Calculate how many ticks have elapsed. */
|
||||||
|
now = mfctl(16);
|
||||||
do {
|
do {
|
||||||
++ticks_elapsed;
|
++ticks_elapsed;
|
||||||
next_tick += cpt;
|
next_tick += cpt;
|
||||||
now = mfctl(16);
|
|
||||||
} while (next_tick - now > cpt);
|
} while (next_tick - now > cpt);
|
||||||
|
|
||||||
/* Store (in CR16 cycles) up to when we are accounting right now. */
|
/* Store (in CR16 cycles) up to when we are accounting right now. */
|
||||||
|
@ -103,16 +103,17 @@ irqreturn_t __irq_entry timer_interrupt(int irq, void *dev_id)
|
||||||
* if one or the other wrapped. If "now" is "bigger" we'll end up
|
* if one or the other wrapped. If "now" is "bigger" we'll end up
|
||||||
* with a very large unsigned number.
|
* with a very large unsigned number.
|
||||||
*/
|
*/
|
||||||
while (next_tick - mfctl(16) > cpt)
|
now = mfctl(16);
|
||||||
|
while (next_tick - now > cpt)
|
||||||
next_tick += cpt;
|
next_tick += cpt;
|
||||||
|
|
||||||
/* Program the IT when to deliver the next interrupt.
|
/* Program the IT when to deliver the next interrupt.
|
||||||
* Only bottom 32-bits of next_tick are writable in CR16!
|
* Only bottom 32-bits of next_tick are writable in CR16!
|
||||||
* Timer interrupt will be delivered at least a few hundred cycles
|
* Timer interrupt will be delivered at least a few hundred cycles
|
||||||
* after the IT fires, so if we are too close (<= 500 cycles) to the
|
* after the IT fires, so if we are too close (<= 8000 cycles) to the
|
||||||
* next cycle, simply skip it.
|
* next cycle, simply skip it.
|
||||||
*/
|
*/
|
||||||
if (next_tick - mfctl(16) <= 500)
|
if (next_tick - now <= 8000)
|
||||||
next_tick += cpt;
|
next_tick += cpt;
|
||||||
mtctl(next_tick, 16);
|
mtctl(next_tick, 16);
|
||||||
|
|
||||||
|
@ -248,7 +249,7 @@ static int __init init_cr16_clocksource(void)
|
||||||
* different sockets, so mark them unstable and lower rating on
|
* different sockets, so mark them unstable and lower rating on
|
||||||
* multi-socket SMP systems.
|
* multi-socket SMP systems.
|
||||||
*/
|
*/
|
||||||
if (num_online_cpus() > 1) {
|
if (num_online_cpus() > 1 && !running_on_qemu) {
|
||||||
int cpu;
|
int cpu;
|
||||||
unsigned long cpu0_loc;
|
unsigned long cpu0_loc;
|
||||||
cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;
|
cpu0_loc = per_cpu(cpu_data, 0).cpu_loc;
|
||||||
|
|
|
@ -629,7 +629,12 @@ void __init mem_init(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
mem_init_print_info(NULL);
|
mem_init_print_info(NULL);
|
||||||
#ifdef CONFIG_DEBUG_KERNEL /* double-sanity-check paranoia */
|
|
||||||
|
#if 0
|
||||||
|
/*
|
||||||
|
* Do not expose the virtual kernel memory layout to userspace.
|
||||||
|
* But keep code for debugging purposes.
|
||||||
|
*/
|
||||||
printk("virtual kernel memory layout:\n"
|
printk("virtual kernel memory layout:\n"
|
||||||
" vmalloc : 0x%px - 0x%px (%4ld MB)\n"
|
" vmalloc : 0x%px - 0x%px (%4ld MB)\n"
|
||||||
" memory : 0x%px - 0x%px (%4ld MB)\n"
|
" memory : 0x%px - 0x%px (%4ld MB)\n"
|
||||||
|
|
|
@ -101,7 +101,8 @@ $(addprefix $(obj)/,$(zlib-y)): \
|
||||||
libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
|
libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
|
||||||
libfdtheader := fdt.h libfdt.h libfdt_internal.h
|
libfdtheader := fdt.h libfdt.h libfdt_internal.h
|
||||||
|
|
||||||
$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o): \
|
$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o opal.o \
|
||||||
|
treeboot-akebono.o treeboot-currituck.o treeboot-iss4xx.o): \
|
||||||
$(addprefix $(obj)/,$(libfdtheader))
|
$(addprefix $(obj)/,$(libfdtheader))
|
||||||
|
|
||||||
src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \
|
src-wlib-y := string.S crt0.S stdio.c decompress.c main.c \
|
||||||
|
|
|
@ -874,7 +874,6 @@ struct ibm_arch_vec __cacheline_aligned ibm_architecture_vec = {
|
||||||
.mmu = 0,
|
.mmu = 0,
|
||||||
.hash_ext = 0,
|
.hash_ext = 0,
|
||||||
.radix_ext = 0,
|
.radix_ext = 0,
|
||||||
.byte22 = 0,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
/* option vector 6: IBM PAPR hints */
|
/* option vector 6: IBM PAPR hints */
|
||||||
|
|
|
@ -195,6 +195,12 @@ static void kvmppc_pte_free(pte_t *ptep)
|
||||||
kmem_cache_free(kvm_pte_cache, ptep);
|
kmem_cache_free(kvm_pte_cache, ptep);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* Like pmd_huge() and pmd_large(), but works regardless of config options */
|
||||||
|
static inline int pmd_is_leaf(pmd_t pmd)
|
||||||
|
{
|
||||||
|
return !!(pmd_val(pmd) & _PAGE_PTE);
|
||||||
|
}
|
||||||
|
|
||||||
static int kvmppc_create_pte(struct kvm *kvm, pte_t pte, unsigned long gpa,
|
static int kvmppc_create_pte(struct kvm *kvm, pte_t pte, unsigned long gpa,
|
||||||
unsigned int level, unsigned long mmu_seq)
|
unsigned int level, unsigned long mmu_seq)
|
||||||
{
|
{
|
||||||
|
@ -219,7 +225,7 @@ static int kvmppc_create_pte(struct kvm *kvm, pte_t pte, unsigned long gpa,
|
||||||
else
|
else
|
||||||
new_pmd = pmd_alloc_one(kvm->mm, gpa);
|
new_pmd = pmd_alloc_one(kvm->mm, gpa);
|
||||||
|
|
||||||
if (level == 0 && !(pmd && pmd_present(*pmd)))
|
if (level == 0 && !(pmd && pmd_present(*pmd) && !pmd_is_leaf(*pmd)))
|
||||||
new_ptep = kvmppc_pte_alloc();
|
new_ptep = kvmppc_pte_alloc();
|
||||||
|
|
||||||
/* Check if we might have been invalidated; let the guest retry if so */
|
/* Check if we might have been invalidated; let the guest retry if so */
|
||||||
|
@ -244,12 +250,30 @@ static int kvmppc_create_pte(struct kvm *kvm, pte_t pte, unsigned long gpa,
|
||||||
new_pmd = NULL;
|
new_pmd = NULL;
|
||||||
}
|
}
|
||||||
pmd = pmd_offset(pud, gpa);
|
pmd = pmd_offset(pud, gpa);
|
||||||
if (pmd_large(*pmd)) {
|
if (pmd_is_leaf(*pmd)) {
|
||||||
/* Someone else has instantiated a large page here; retry */
|
unsigned long lgpa = gpa & PMD_MASK;
|
||||||
|
|
||||||
|
/*
|
||||||
|
* If we raced with another CPU which has just put
|
||||||
|
* a 2MB pte in after we saw a pte page, try again.
|
||||||
|
*/
|
||||||
|
if (level == 0 && !new_ptep) {
|
||||||
ret = -EAGAIN;
|
ret = -EAGAIN;
|
||||||
goto out_unlock;
|
goto out_unlock;
|
||||||
}
|
}
|
||||||
if (level == 1 && !pmd_none(*pmd)) {
|
/* Valid 2MB page here already, remove it */
|
||||||
|
old = kvmppc_radix_update_pte(kvm, pmdp_ptep(pmd),
|
||||||
|
~0UL, 0, lgpa, PMD_SHIFT);
|
||||||
|
kvmppc_radix_tlbie_page(kvm, lgpa, PMD_SHIFT);
|
||||||
|
if (old & _PAGE_DIRTY) {
|
||||||
|
unsigned long gfn = lgpa >> PAGE_SHIFT;
|
||||||
|
struct kvm_memory_slot *memslot;
|
||||||
|
memslot = gfn_to_memslot(kvm, gfn);
|
||||||
|
if (memslot && memslot->dirty_bitmap)
|
||||||
|
kvmppc_update_dirty_map(memslot,
|
||||||
|
gfn, PMD_SIZE);
|
||||||
|
}
|
||||||
|
} else if (level == 1 && !pmd_none(*pmd)) {
|
||||||
/*
|
/*
|
||||||
* There's a page table page here, but we wanted
|
* There's a page table page here, but we wanted
|
||||||
* to install a large page. Tell the caller and let
|
* to install a large page. Tell the caller and let
|
||||||
|
@ -412,28 +436,24 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
|
||||||
} else {
|
} else {
|
||||||
page = pages[0];
|
page = pages[0];
|
||||||
pfn = page_to_pfn(page);
|
pfn = page_to_pfn(page);
|
||||||
if (PageHuge(page)) {
|
if (PageCompound(page)) {
|
||||||
page = compound_head(page);
|
pte_size <<= compound_order(compound_head(page));
|
||||||
pte_size <<= compound_order(page);
|
|
||||||
/* See if we can insert a 2MB large-page PTE here */
|
/* See if we can insert a 2MB large-page PTE here */
|
||||||
if (pte_size >= PMD_SIZE &&
|
if (pte_size >= PMD_SIZE &&
|
||||||
(gpa & PMD_MASK & PAGE_MASK) ==
|
(gpa & (PMD_SIZE - PAGE_SIZE)) ==
|
||||||
(hva & PMD_MASK & PAGE_MASK)) {
|
(hva & (PMD_SIZE - PAGE_SIZE))) {
|
||||||
level = 1;
|
level = 1;
|
||||||
pfn &= ~((PMD_SIZE >> PAGE_SHIFT) - 1);
|
pfn &= ~((PMD_SIZE >> PAGE_SHIFT) - 1);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
/* See if we can provide write access */
|
/* See if we can provide write access */
|
||||||
if (writing) {
|
if (writing) {
|
||||||
/*
|
|
||||||
* We assume gup_fast has set dirty on the host PTE.
|
|
||||||
*/
|
|
||||||
pgflags |= _PAGE_WRITE;
|
pgflags |= _PAGE_WRITE;
|
||||||
} else {
|
} else {
|
||||||
local_irq_save(flags);
|
local_irq_save(flags);
|
||||||
ptep = find_current_mm_pte(current->mm->pgd,
|
ptep = find_current_mm_pte(current->mm->pgd,
|
||||||
hva, NULL, NULL);
|
hva, NULL, NULL);
|
||||||
if (ptep && pte_write(*ptep) && pte_dirty(*ptep))
|
if (ptep && pte_write(*ptep))
|
||||||
pgflags |= _PAGE_WRITE;
|
pgflags |= _PAGE_WRITE;
|
||||||
local_irq_restore(flags);
|
local_irq_restore(flags);
|
||||||
}
|
}
|
||||||
|
@ -459,18 +479,15 @@ int kvmppc_book3s_radix_page_fault(struct kvm_run *run, struct kvm_vcpu *vcpu,
|
||||||
pte = pfn_pte(pfn, __pgprot(pgflags));
|
pte = pfn_pte(pfn, __pgprot(pgflags));
|
||||||
ret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);
|
ret = kvmppc_create_pte(kvm, pte, gpa, level, mmu_seq);
|
||||||
}
|
}
|
||||||
if (ret == 0 || ret == -EAGAIN)
|
|
||||||
ret = RESUME_GUEST;
|
|
||||||
|
|
||||||
if (page) {
|
if (page) {
|
||||||
/*
|
if (!ret && (pgflags & _PAGE_WRITE))
|
||||||
* We drop pages[0] here, not page because page might
|
set_page_dirty_lock(page);
|
||||||
* have been set to the head page of a compound, but
|
put_page(page);
|
||||||
* we have to drop the reference on the correct tail
|
|
||||||
* page to match the get inside gup()
|
|
||||||
*/
|
|
||||||
put_page(pages[0]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (ret == 0 || ret == -EAGAIN)
|
||||||
|
ret = RESUME_GUEST;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -644,7 +661,7 @@ void kvmppc_free_radix(struct kvm *kvm)
|
||||||
continue;
|
continue;
|
||||||
pmd = pmd_offset(pud, 0);
|
pmd = pmd_offset(pud, 0);
|
||||||
for (im = 0; im < PTRS_PER_PMD; ++im, ++pmd) {
|
for (im = 0; im < PTRS_PER_PMD; ++im, ++pmd) {
|
||||||
if (pmd_huge(*pmd)) {
|
if (pmd_is_leaf(*pmd)) {
|
||||||
pmd_clear(pmd);
|
pmd_clear(pmd);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2885,7 +2885,7 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)
|
||||||
*/
|
*/
|
||||||
trace_hardirqs_on();
|
trace_hardirqs_on();
|
||||||
|
|
||||||
guest_enter();
|
guest_enter_irqoff();
|
||||||
|
|
||||||
srcu_idx = srcu_read_lock(&vc->kvm->srcu);
|
srcu_idx = srcu_read_lock(&vc->kvm->srcu);
|
||||||
|
|
||||||
|
@ -2893,8 +2893,6 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)
|
||||||
|
|
||||||
srcu_read_unlock(&vc->kvm->srcu, srcu_idx);
|
srcu_read_unlock(&vc->kvm->srcu, srcu_idx);
|
||||||
|
|
||||||
guest_exit();
|
|
||||||
|
|
||||||
trace_hardirqs_off();
|
trace_hardirqs_off();
|
||||||
set_irq_happened(trap);
|
set_irq_happened(trap);
|
||||||
|
|
||||||
|
@ -2937,6 +2935,7 @@ static noinline void kvmppc_run_core(struct kvmppc_vcore *vc)
|
||||||
kvmppc_set_host_core(pcpu);
|
kvmppc_set_host_core(pcpu);
|
||||||
|
|
||||||
local_irq_enable();
|
local_irq_enable();
|
||||||
|
guest_exit();
|
||||||
|
|
||||||
/* Let secondaries go back to the offline loop */
|
/* Let secondaries go back to the offline loop */
|
||||||
for (i = 0; i < controlled_threads; ++i) {
|
for (i = 0; i < controlled_threads; ++i) {
|
||||||
|
@ -3656,15 +3655,17 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
|
||||||
goto up_out;
|
goto up_out;
|
||||||
|
|
||||||
psize = vma_kernel_pagesize(vma);
|
psize = vma_kernel_pagesize(vma);
|
||||||
porder = __ilog2(psize);
|
|
||||||
|
|
||||||
up_read(¤t->mm->mmap_sem);
|
up_read(¤t->mm->mmap_sem);
|
||||||
|
|
||||||
/* We can handle 4k, 64k or 16M pages in the VRMA */
|
/* We can handle 4k, 64k or 16M pages in the VRMA */
|
||||||
err = -EINVAL;
|
if (psize >= 0x1000000)
|
||||||
if (!(psize == 0x1000 || psize == 0x10000 ||
|
psize = 0x1000000;
|
||||||
psize == 0x1000000))
|
else if (psize >= 0x10000)
|
||||||
goto out_srcu;
|
psize = 0x10000;
|
||||||
|
else
|
||||||
|
psize = 0x1000;
|
||||||
|
porder = __ilog2(psize);
|
||||||
|
|
||||||
senc = slb_pgsize_encoding(psize);
|
senc = slb_pgsize_encoding(psize);
|
||||||
kvm->arch.vrma_slb_v = senc | SLB_VSID_B_1T |
|
kvm->arch.vrma_slb_v = senc | SLB_VSID_B_1T |
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue