Merge tag 'arc-5.2-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc (788a0249) · Commits · 戴 / test

arch/arc/boot/dts/hsdk.dts

+41 −4

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@
		*/
		/dts-v1/;

		#include <dt-bindings/net/ti-dp83867.h>
		#include <dt-bindings/reset/snps,hsdk-reset.h>

		/ {
		@@ -167,6 +166,24 @@
		#clock-cells = <0>;
		};

		gpu_core_clk: gpu-core-clk {
		compatible = "fixed-clock";
		clock-frequency = <400000000>;
		#clock-cells = <0>;
		};

		gpu_dma_clk: gpu-dma-clk {
		compatible = "fixed-clock";
		clock-frequency = <400000000>;
		#clock-cells = <0>;
		};

		gpu_cfg_clk: gpu-cfg-clk {
		compatible = "fixed-clock";
		clock-frequency = <200000000>;
		#clock-cells = <0>;
		};

		dmac_core_clk: dmac-core-clk {
		compatible = "fixed-clock";
		clock-frequency = <400000000>;
		@@ -187,6 +204,7 @@
		interrupt-names = "macirq";
		phy-mode = "rgmii";
		snps,pbl = <32>;
		snps,multicast-filter-bins = <256>;
		clocks = <&gmacclk>;
		clock-names = "stmmaceth";
		phy-handle = <&phy0>;
		@@ -195,15 +213,15 @@
		mac-address = [00 00 00 00 00 00]; /* Filled in by U-Boot */
		dma-coherent;

		tx-fifo-depth = <4096>;
		rx-fifo-depth = <4096>;

		mdio {
		#address-cells = <1>;
		#size-cells = <0>;
		compatible = "snps,dwmac-mdio";
		phy0: ethernet-phy@0 {
		reg = <0>;
		ti,rx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
		ti,tx-internal-delay = <DP83867_RGMIIDCTL_2_00_NS>;
		ti,fifo-depth = <DP83867_PHYCR_FIFO_DEPTH_4_B_NIB>;
		};
		};
		};
		@@ -237,6 +255,14 @@
		dma-coherent;
		};

		creg_gpio: gpio@14b0 {
		compatible = "snps,creg-gpio-hsdk";
		reg = <0x14b0 0x4>;
		gpio-controller;
		#gpio-cells = <2>;
		ngpios = <2>;
		};

		gpio: gpio@3000 {
		compatible = "snps,dw-apb-gpio";
		reg = <0x3000 0x20>;
		@@ -252,6 +278,17 @@
		};
		};

		gpu_3d: gpu@90000 {
		compatible = "vivante,gc";
		reg = <0x90000 0x4000>;
		clocks = <&gpu_dma_clk>,
		<&gpu_cfg_clk>,
		<&gpu_core_clk>,
		<&gpu_core_clk>;
		clock-names = "bus", "reg", "core", "shader";
		interrupts = <28>;
		};

		dmac: dmac@80000 {
		compatible = "snps,axi-dma-1.01a";
		reg = <0x80000 0x400>;

arch/arc/configs/hsdk_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -49,10 +49,12 @@ CONFIG_SERIAL_OF_PLATFORM=y
		CONFIG_GPIOLIB=y
		CONFIG_GPIO_SYSFS=y
		CONFIG_GPIO_DWAPB=y
		CONFIG_GPIO_SNPS_CREG=y
		# CONFIG_HWMON is not set
		CONFIG_DRM=y
		# CONFIG_DRM_FBDEV_EMULATION is not set
		CONFIG_DRM_UDL=y
		CONFIG_DRM_ETNAVIV=y
		CONFIG_FB=y
		CONFIG_FRAMEBUFFER_CONSOLE=y
		CONFIG_USB_EHCI_HCD=y
		@@ -64,7 +66,6 @@ CONFIG_MMC=y
		CONFIG_MMC_SDHCI=y
		CONFIG_MMC_SDHCI_PLTFM=y
		CONFIG_MMC_DW=y
		# CONFIG_IOMMU_SUPPORT is not set
		CONFIG_EXT3_FS=y
		CONFIG_VFAT_FS=y
		CONFIG_TMPFS=y

arch/arc/include/asm/cmpxchg.h

+10 −4

Original line number	Diff line number	Diff line
		@@ -92,8 +92,11 @@ __cmpxchg(volatile void *ptr, unsigned long expected, unsigned long new)

		#endif /* CONFIG_ARC_HAS_LLSC */

		#define cmpxchg(ptr, o, n) ((typeof(*(ptr)))__cmpxchg((ptr), \
		(unsigned long)(o), (unsigned long)(n)))
		#define cmpxchg(ptr, o, n) ({ \
		(typeof(*(ptr)))__cmpxchg((ptr), \
		(unsigned long)(o), \
		(unsigned long)(n)); \
		})

		/*
		* atomic_cmpxchg is same as cmpxchg
		@@ -198,8 +201,11 @@ static inline unsigned long __xchg(unsigned long val, volatile void *ptr,
		return __xchg_bad_pointer();
		}

		#define xchg(ptr, with) ((typeof(*(ptr)))__xchg((unsigned long)(with), (ptr), \
		sizeof(*(ptr))))
		#define xchg(ptr, with) ({ \
		(typeof(*(ptr)))__xchg((unsigned long)(with), \
		(ptr), \
		sizeof(*(ptr))); \
		})

		#endif /* CONFIG_ARC_PLAT_EZNPS */

arch/arc/mm/fault.c

+3 −6

Original line number	Diff line number	Diff line
		@@ -66,7 +66,7 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)
		struct vm_area_struct *vma = NULL;
		struct task_struct *tsk = current;
		struct mm_struct *mm = tsk->mm;
		int si_code = 0;
		int si_code = SEGV_MAPERR;
		int ret;
		vm_fault_t fault;
		int write = regs->ecr_cause & ECR_C_PROTV_STORE; /* ST/EX */
		@@ -81,16 +81,14 @@ void do_page_fault(unsigned long address, struct pt_regs *regs)
		* only copy the information from the master page table,
		* nothing more.
		*/
		if (address >= VMALLOC_START) {
		if (address >= VMALLOC_START && !user_mode(regs)) {
		ret = handle_kernel_vaddr_fault(address);
		if (unlikely(ret))
		goto bad_area_nosemaphore;
		goto no_context;
		else
		return;
		}

		si_code = SEGV_MAPERR;

		/*
		* If we're in an interrupt or have no user
		* context, we must not take the fault..
		@@ -198,7 +196,6 @@ good_area:
		bad_area:
		up_read(&mm->mmap_sem);

		bad_area_nosemaphore:
		/* User mode accesses just cause a SIGSEGV */
		if (user_mode(regs)) {
		tsk->thread.fault_address = address;

arch/arc/mm/tlb.c

+8 −5

Original line number	Diff line number	Diff line
		@@ -911,9 +911,11 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,
		struct pt_regs *regs)
		{
		struct cpuinfo_arc_mmu *mmu = &cpuinfo_arc700[smp_processor_id()].mmu;
		unsigned int pd0[mmu->ways];
		unsigned long flags;
		int set;
		int set, n_ways = mmu->ways;

		n_ways = min(n_ways, 4);
		BUG_ON(mmu->ways > 4);

		local_irq_save(flags);

		@@ -921,9 +923,10 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,
		for (set = 0; set < mmu->sets; set++) {

		int is_valid, way;
		unsigned int pd0[4];

		/* read out all the ways of current set */
		for (way = 0, is_valid = 0; way < mmu->ways; way++) {
		for (way = 0, is_valid = 0; way < n_ways; way++) {
		write_aux_reg(ARC_REG_TLBINDEX,
		SET_WAY_TO_IDX(mmu, set, way));
		write_aux_reg(ARC_REG_TLBCOMMAND, TLBRead);
		@@ -937,14 +940,14 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,
		continue;

		/* Scan the set for duplicate ways: needs a nested loop */
		for (way = 0; way < mmu->ways - 1; way++) {
		for (way = 0; way < n_ways - 1; way++) {

		int n;

		if (!pd0[way])
		continue;

		for (n = way + 1; n < mmu->ways; n++) {
		for (n = way + 1; n < n_ways; n++) {
		if (pd0[way] != pd0[n])
		continue;

Admin message