Skip to content

[pull] master from torvalds:master #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 16 commits into from
Jul 29, 2020
Merged

[pull] master from torvalds:master #127

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
92025b9
ARM: dts sunxi: Relax a bit the CMA pool allocation range
mripard Jul 4, 2020
62a8ccf
arm64: dts: allwinner: h6: Fix Cedrus IOMMU usage
mripard Jun 28, 2020
c696afd
ARM: dts: imx6sx-sdb: Fix the phy-mode on fec2
fabioestevam Jul 13, 2020
d36f260
ARM: dts: imx6sx-sabreauto: Fix the phy-mode on fec2
fabioestevam Jul 13, 2020
4a601da
ARM: dts: imx6qdl-icore: Fix OTG_ID pin and sdcard detect
panicking Jul 17, 2020
21a59e0
Merge tag 'sunxi-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/lin…
arndb Jul 22, 2020
7c8c70b
Merge tag 'imx-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/ker…
arndb Jul 22, 2020
09781ba
ARM: dts: armada-38x: fix NETA lockup when repeatedly switching speeds
Jul 21, 2020
b0fef5e
Merge tag 'mvebu-fixes-5.8-1' of git://git.kernel.org/pub/scm/linux/k…
arndb Jul 24, 2020
fe1d899
ARM: dts: keystone-k2g-evm: fix rgmii phy-mode for ksz9031 phy
grygoriyS Jul 24, 2020
214ba35
io: Fix return type of _inb and _inl
stffrdhrn Jul 26, 2020
c7bcbc8
sh/tlb: Fix PGTABLE_LEVELS > 2
Jul 17, 2020
04a8a3d
sh: Fix validation of system call number
Jul 22, 2020
4764e61
Merge tag 'sh-for-5.8-part2' of git://git.libc.org/linux-sh into master
torvalds Jul 28, 2020
fb896c9
Merge tag 'arm-fixes-5.8-3' of git://git.kernel.org/pub/scm/linux/ker…
torvalds Jul 28, 2020
6ba1b00
Merge tag 'asm-generic-fixes-5.8' of git://git.kernel.org/pub/scm/lin…
torvalds Jul 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/media/allwinner,sun4i-a10-video-engine.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ properties:
$ref: /schemas/types.yaml#/definitions/phandle-array
description: Phandle to the device SRAM

iommus:
maxItems: 1

memory-region:
description:
CMA pool to use for buffers allocation instead of the default
Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/armada-38x.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@

comphy: phy@18300 {
compatible = "marvell,armada-380-comphy";
reg = <0x18300 0x100>;
reg-names = "comphy", "conf";
reg = <0x18300 0x100>, <0x18460 4>;
#address-cells = <1>;
#size-cells = <0>;

Expand Down
3 changes: 2 additions & 1 deletion arch/arm/boot/dts/imx6qdl-icore.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,7 @@

pinctrl_usbotg: usbotggrp {
fsl,pins = <
MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
>;
};

Expand All @@ -409,6 +409,7 @@
MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17070
MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17070
MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17070
MX6QDL_PAD_GPIO_1__GPIO1_IO01 0x1b0b0
>;
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6sx-sabreauto.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
&fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-handle = <&ethphy0>;
fsl,magic-packet;
status = "okay";
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/imx6sx-sdb.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@
&fec2 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_enet2>;
phy-mode = "rgmii";
phy-mode = "rgmii-id";
phy-handle = <&ethphy2>;
status = "okay";
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/keystone-k2g-evm.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@

&gbe0 {
phy-handle = <&ethphy0>;
phy-mode = "rgmii-id";
phy-mode = "rgmii-rxid";
status = "okay";
};

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun4i-a10.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
alloc-ranges = <0x40000000 0x10000000>;
reusable;
linux,cma-default;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun5i.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
alloc-ranges = <0x40000000 0x10000000>;
reusable;
linux,cma-default;
};
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/sun7i-a20.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@
default-pool {
compatible = "shared-dma-pool";
size = <0x6000000>;
alloc-ranges = <0x4a000000 0x6000000>;
alloc-ranges = <0x40000000 0x10000000>;
reusable;
linux,cma-default;
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
resets = <&ccu RST_BUS_VE>;
interrupts = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
allwinner,sram = <&ve_sram 1>;
iommus = <&iommu 3>;
};

gpu: gpu@1800000 {
Expand Down
10 changes: 1 addition & 9 deletions arch/sh/include/asm/pgalloc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ extern void pgd_free(struct mm_struct *mm, pgd_t *pgd);
extern void pud_populate(struct mm_struct *mm, pud_t *pudp, pmd_t *pmd);
extern pmd_t *pmd_alloc_one(struct mm_struct *mm, unsigned long address);
extern void pmd_free(struct mm_struct *mm, pmd_t *pmd);
#define __pmd_free_tlb(tlb, pmdp, addr) pmd_free((tlb)->mm, (pmdp))
#endif

static inline void pmd_populate_kernel(struct mm_struct *mm, pmd_t *pmd,
Expand All @@ -33,13 +34,4 @@ do { \
tlb_remove_page((tlb), (pte)); \
} while (0)

#if CONFIG_PGTABLE_LEVELS > 2
#define __pmd_free_tlb(tlb, pmdp, addr) \
do { \
struct page *page = virt_to_page(pmdp); \
pgtable_pmd_page_dtor(page); \
tlb_remove_page((tlb), page); \
} while (0);
#endif

#endif /* __ASM_SH_PGALLOC_H */
6 changes: 3 additions & 3 deletions arch/sh/kernel/entry-common.S
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ syscall_trace_entry:
mov.l @(OFF_R7,r15), r7 ! arg3
mov.l @(OFF_R3,r15), r3 ! syscall_nr
!
mov.l 2f, r10 ! Number of syscalls
mov.l 6f, r10 ! Number of syscalls
cmp/hs r10, r3
bf syscall_call
mov #-ENOSYS, r0
Expand Down Expand Up @@ -353,7 +353,7 @@ ENTRY(system_call)
tst r9, r8
bf syscall_trace_entry
!
mov.l 2f, r8 ! Number of syscalls
mov.l 6f, r8 ! Number of syscalls
cmp/hs r8, r3
bt syscall_badsys
!
Expand Down Expand Up @@ -392,7 +392,7 @@ syscall_exit:
#if !defined(CONFIG_CPU_SH2)
1: .long TRA
#endif
2: .long NR_syscalls
6: .long NR_syscalls
3: .long sys_call_table
7: .long do_syscall_trace_enter
8: .long do_syscall_trace_leave
4 changes: 2 additions & 2 deletions include/asm-generic/io.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ static inline void writesq(volatile void __iomem *addr, const void *buffer,

#if !defined(inb) && !defined(_inb)
#define _inb _inb
static inline u16 _inb(unsigned long addr)
static inline u8 _inb(unsigned long addr)
{
u8 val;

Expand All @@ -482,7 +482,7 @@ static inline u16 _inw(unsigned long addr)

#if !defined(inl) && !defined(_inl)
#define _inl _inl
static inline u16 _inl(unsigned long addr)
static inline u32 _inl(unsigned long addr)
{
u32 val;

Expand Down