Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ecc6cd73 authored by David Gibson's avatar David Gibson Committed by Josh Boyer
Browse files

[POWERPC] Start removing linux,network-index in favour of aliases 



This patch alters the bootwrapper for a number of machines (roubhly
all 4xx based cuboot or treeboot platforms) to use aliases instead of
the linux,network-index hack to work out which MAC address to attach
to which ethernet device node.

The now obsolete linux,network-index properties are removed from the
corresponding device trees.  This won't break backwards compatiblity,
because in cases where this fixup code is relevant, the device tree is
part of the kernel image.

The references to linux,network-index are removed from
booting-without-of.txt.  Not only is it now deprecated, but as a hack
applicable only when the device tree blob and fixup code were in the
same image, this property never belonged in booting-without-of.txt
which describes the interface between the kernel and firmware or
bootloaders which produce a device tree.  By the time the device tree
reaches the kernel, all the MAC addresses must be fully filled in.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 54f53f2b

Documentation/powerpc/booting-without-of.txt

+0 −16
Original line number Diff line number Diff line
@@ -1269,10 +1269,6 @@ platforms are moved over to use the flattened-device-tree model. 


  Recommended properties:



    - linux,network-index : This is the intended "index" of this

      network device.  This is used by the bootwrapper to interpret

      MAC addresses passed by the firmware when no information other

      than indices is available to associate an address with a device.

    - phy-connection-type : a string naming the controller/PHY interface type,

      i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id", "sgmii",

      "tbi", or "rtbi".  This property is only really needed if the connection
@@ -1667,10 +1663,6 @@ platforms are moved over to use the flattened-device-tree model. 
   - phy-handle : The phandle for the PHY connected to this controller.



   Recommended properties:

   - linux,network-index : This is the intended "index" of this

     network device.  This is used by the bootwrapper to interpret

     MAC addresses passed by the firmware when no information other

     than indices is available to associate an address with a device.

   - phy-connection-type : a string naming the controller/PHY interface type,

     i.e., "mii" (default), "rmii", "gmii", "rgmii", "rgmii-id" (Internal

     Delay), "rgmii-txid" (delay on TX only), "rgmii-rxid" (delay on RX only),
@@ -1995,7 +1987,6 @@ platforms are moved over to use the flattened-device-tree model. 
		interrupts = <20 8>;

		interrupt-parent = <&PIC>;

		phy-handle = <&PHY0>;

		linux,network-index = <0>;

		fsl,cpm-command = <12000300>;

	};
@@ -2217,12 +2208,6 @@ platforms are moved over to use the flattened-device-tree model. 
			  EMAC, that is the content of the current (bogus) "phy-port"

			  property.



    Recommended properties:

    - linux,network-index : This is the intended "index" of this

      network device.  This is used by the bootwrapper to interpret

      MAC addresses passed by the firmware when no information other

      than indices is available to associate an address with a device.



    Optional properties:

    - phy-address       : 1 cell, optional, MDIO address of the PHY. If absent,

			  a search is performed.
@@ -2246,7 +2231,6 @@ platforms are moved over to use the flattened-device-tree model. 
    Example:



	EMAC0: ethernet@40000800 {

		linux,network-index = <0>;

		device_type = "network";

		compatible = "ibm,emac-440gp", "ibm,emac";

		interrupt-parent = <&UIC1>;

arch/powerpc/boot/bamboo.c

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ static void bamboo_fixups(void) 
	ibm440ep_fixup_clocks(sysclk, 11059200, 25000000);

	ibm4xx_sdram_fixup_memsize();

	ibm4xx_quiesce_eth((u32 *)0xef600e00, (u32 *)0xef600f00);

	dt_fixup_mac_addresses(bamboo_mac0, bamboo_mac1);

	dt_fixup_mac_address_by_alias("ethernet0", bamboo_mac0);

	dt_fixup_mac_address_by_alias("ethernet1", bamboo_mac1);

}



void bamboo_init(void *mac0, void *mac1)

arch/powerpc/boot/cuboot-rainier.c

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ static void rainier_fixups(void) 
	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);

	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");

	ibm4xx_denali_fixup_memsize();

	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);

	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);

	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);

}



void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

arch/powerpc/boot/cuboot-sequoia.c

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ static void sequoia_fixups(void) 
	ibm440ep_fixup_clocks(sysclk, 11059200, 50000000);

	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");

	ibm4xx_denali_fixup_memsize();

	dt_fixup_mac_addresses(&bd.bi_enetaddr, &bd.bi_enet1addr);

	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);

	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);

}



void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,

arch/powerpc/boot/cuboot-taishan.c

+2 −1
Original line number Diff line number Diff line
@@ -40,7 +40,8 @@ static void taishan_fixups(void) 


	ibm4xx_sdram_fixup_memsize();



	dt_fixup_mac_addresses(bd.bi_enetaddr, bd.bi_enet1addr);

	dt_fixup_mac_address_by_alias("ethernet0", bd.bi_enetaddr);

	dt_fixup_mac_address_by_alias("ethernet1", bd.bi_enet1addr);



	ibm4xx_fixup_ebc_ranges("/plb/opb/ebc");

}