Commit 83affacd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-6.17' of... 

Merge tag 'loongarch-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson

Pull LoongArch updates from Huacai Chen:

 - Complete KSave registers definition

 - Support the mem=<size> kernel parameter

 - Support BPF dynamic modification & trampoline

 - Add MMC/SDIO controller nodes in dts

 - Some bug fixes and other small changes

* tag 'loongarch-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: vDSO: Remove -nostdlib complier flag
  LoongArch: dts: Add eMMC/SDIO controller support to Loongson-2K2000
  LoongArch: dts: Add SDIO controller support to Loongson-2K1000
  LoongArch: dts: Add SDIO controller support to Loongson-2K0500
  LoongArch: BPF: Set bpf_jit_bypass_spec_v1/v4()
  LoongArch: BPF: Fix the tailcall hierarchy
  LoongArch: BPF: Fix jump offset calculation in tailcall
  LoongArch: BPF: Add struct ops support for trampoline
  LoongArch: BPF: Add basic bpf trampoline support
  LoongArch: BPF: Add dynamic code modification support
  LoongArch: BPF: Rename and refactor validate_code()
  LoongArch: Add larch_insn_gen_{beq,bne} helpers
  LoongArch: Don't use %pK through printk() in unwinder
  LoongArch: Avoid in-place string operation on FDT content
  LoongArch: Support mem=<size> kernel parameter
  LoongArch: Make relocate_new_kernel_size be a .quad value
  LoongArch: Complete KSave registers definition
parents 6e64f458 d35ec48f

arch/loongarch/boot/dts/loongson-2k0500-ref.dts

+9 −0
Original line number Diff line number Diff line
@@ -41,6 +41,15 @@ linux,cma { 
	};

};



&apbdma3 {

	status = "okay";

};



&mmc0 {

	status = "okay";

	bus-width = <4>;

};



&gmac0 {

	status = "okay";

arch/loongarch/boot/dts/loongson-2k0500.dtsi

+26 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ dma-controller@1fe10c10 { 
			status = "disabled";

		};



		dma-controller@1fe10c20 {

		apbdma2: dma-controller@1fe10c20 {

			compatible = "loongson,ls2k0500-apbdma", "loongson,ls2k1000-apbdma";

			reg = <0 0x1fe10c20 0 0x8>;

			interrupt-parent = <&eiointc>;
@@ -114,7 +114,7 @@ dma-controller@1fe10c20 { 
			status = "disabled";

		};



		dma-controller@1fe10c30 {

		apbdma3: dma-controller@1fe10c30 {

			compatible = "loongson,ls2k0500-apbdma", "loongson,ls2k1000-apbdma";

			reg = <0 0x1fe10c30 0 0x8>;

			interrupt-parent = <&eiointc>;
@@ -437,6 +437,30 @@ i2c@1ff4a800 { 
			status = "disabled";

		};



		mmc0: mmc@1ff64000 {

			compatible = "loongson,ls2k0500-mmc";

			reg = <0 0x1ff64000 0 0x2000>,

			      <0 0x1fe10100 0 0x4>;

			interrupt-parent = <&eiointc>;

			interrupts = <57>;

			dmas = <&apbdma3 0>;

			dma-names = "rx-tx";

			clocks = <&clk LOONGSON2_APB_CLK>;

			status = "disabled";

		};



		mmc@1ff66000 {

			compatible = "loongson,ls2k0500-mmc";

			reg = <0 0x1ff66000 0 0x2000>,

			      <0 0x1fe10100 0 0x4>;

			interrupt-parent = <&eiointc>;

			interrupts = <58>;

			dmas = <&apbdma2 0>;

			dma-names = "rx-tx";

			clocks = <&clk LOONGSON2_APB_CLK>;

			status = "disabled";

		};



		pmc: power-management@1ff6c000 {

			compatible = "loongson,ls2k0500-pmc", "syscon";

			reg = <0x0 0x1ff6c000 0x0 0x58>;

arch/loongarch/boot/dts/loongson-2k1000-ref.dts

+13 −0
Original line number Diff line number Diff line
@@ -48,6 +48,19 @@ fan0: pwm-fan { 
	};

};



&apbdma1 {

	status = "okay";

};



&mmc {

	status = "okay";



	pinctrl-0 = <&sdio_pins_default>;

	pinctrl-names = "default";

	bus-width = <4>;

	cd-gpios = <&gpio0 22 GPIO_ACTIVE_LOW>;

};



&gmac0 {

	status = "okay";

arch/loongarch/boot/dts/loongson-2k1000.dtsi

+18 −6
Original line number Diff line number Diff line
@@ -187,14 +187,14 @@ gpio0: gpio@1fe00500 { 
				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <0 IRQ_TYPE_NONE>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_NONE>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,

				     <26 IRQ_TYPE_LEVEL_HIGH>,
@@ -209,13 +209,13 @@ gpio0: gpio@1fe00500 { 
				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <>,

				     <0 IRQ_TYPE_NONE>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <>,

				     <>,

				     <0 IRQ_TYPE_NONE>,

				     <0 IRQ_TYPE_NONE>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,

				     <27 IRQ_TYPE_LEVEL_HIGH>,
@@ -256,7 +256,7 @@ dma-controller@1fe00c00 { 
			status = "disabled";

		};



		dma-controller@1fe00c10 {

		apbdma1: dma-controller@1fe00c10 {

			compatible = "loongson,ls2k1000-apbdma";

			reg = <0x0 0x1fe00c10 0x0 0x8>;

			interrupt-parent = <&liointc1>;
@@ -405,6 +405,18 @@ i2s: i2s@1fe2d000 { 
			status = "disabled";

		};



		mmc: mmc@1fe2c000 {

			compatible = "loongson,ls2k1000-mmc";

			reg = <0 0x1fe2c000 0 0x68>,

			      <0 0x1fe00438 0 0x8>;

			interrupt-parent = <&liointc0>;

			interrupts = <31 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk LOONGSON2_APB_CLK>;

			dmas = <&apbdma1 0>;

			dma-names = "rx-tx";

			status = "disabled";

		};



		spi0: spi@1fff0220 {

			compatible = "loongson,ls2k1000-spi";

			reg = <0x0 0x1fff0220 0x0 0x10>;

arch/loongarch/boot/dts/loongson-2k2000-ref.dts

+10 −0
Original line number Diff line number Diff line
@@ -39,6 +39,16 @@ linux,cma { 
	};

};



&emmc {

	status = "okay";



	bus-width = <8>;

	cap-mmc-highspeed;

	mmc-hs200-1_8v;

	no-sd;

	no-sdio;

};



&sata {

	status = "okay";

};