Commit f06ce441 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'loongarch-fixes-6.10-1' of... 

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

Pull LoongArch fixes from Huacai Chen:
 "Some bootloader interface fixes, a dts fix, and a trivial cleanup"

* tag 'loongarch-fixes-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson:
  LoongArch: Fix GMAC's phy-mode definitions in dts
  LoongArch: Override higher address bits in JUMP_VIRT_ADDR
  LoongArch: Fix entry point in kernel image header
  LoongArch: Add all CPUs enabled by fdt to NUMA node 0
  LoongArch: Fix built-in DTB detection
  LoongArch: Remove CONFIG_ACPI_TABLE_UPGRADE in platform_init()
parents c3f38fa6 eb36e520

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

+2 −2
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ linux,cma { 
&gmac0 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	bus_id = <0x0>;

};



&gmac1 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	bus_id = <0x1>;

};

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

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ linux,cma { 
&gmac0 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&phy0>;

	mdio {

		compatible = "snps,dwmac-mdio";
@@ -58,7 +58,7 @@ phy0: ethernet-phy@0 { 
&gmac1 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&phy1>;

	mdio {

		compatible = "snps,dwmac-mdio";

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

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ phy1: ethernet-phy@1 { 
&gmac2 {

	status = "okay";



	phy-mode = "rgmii";

	phy-mode = "rgmii-id";

	phy-handle = <&phy2>;

	mdio {

		compatible = "snps,dwmac-mdio";

arch/loongarch/include/asm/numa.h

+1 −0
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ extern int early_cpu_to_node(int cpu); 
static inline void early_numa_add_cpu(int cpuid, s16 node)	{ }

static inline void numa_add_cpu(unsigned int cpu)		{ }

static inline void numa_remove_cpu(unsigned int cpu)		{ }

static inline void set_cpuid_to_node(int cpuid, s16 node)	{ }



static inline int early_cpu_to_node(int cpu)

{

arch/loongarch/include/asm/stackframe.h

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
	.macro JUMP_VIRT_ADDR temp1 temp2

	li.d	\temp1, CACHE_BASE

	pcaddi	\temp2, 0

	or	\temp1, \temp1, \temp2

	bstrins.d  \temp1, \temp2, (DMW_PABITS - 1), 0

	jirl	zero, \temp1, 0xc

	.endm