[U-Boot] [PATCH] net: phy: Add support for all targets which requires MANUAL_RELOC

[U-Boot] [PATCH] net: phy: Add support for all targets which requires MANUAL_RELOC

[Michal Simek]

Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA
relocation (mostly only GOT) where functions aray are not
updated. This patch is fixing function pointers passed to phy_register
function.
This patch was tested on Microblaze architecture.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 drivers/net/phy/phy.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index f5221a3833fe..c8d08e8f4f1c 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -21,6 +21,8 @@
 #include <linux/err.h>
 #include <linux/compiler.h>
 
+DECLARE_GLOBAL_DATA_PTR;
+
 /* Generic PHY support and helper functions */
 
 /**
@@ -494,6 +496,20 @@ int phy_register(struct phy_driver *drv)
 	INIT_LIST_HEAD(&drv->list);
 	list_add_tail(&drv->list, &phy_drivers);
 
+#ifdef CONFIG_NEEDS_MANUAL_RELOC
+	if (drv->probe)
+		drv->probe += gd->reloc_off;
+	if (drv->config)
+		drv->config += gd->reloc_off;
+	if (drv->startup)
+		drv->startup += gd->reloc_off;
+	if (drv->shutdown)
+		drv->shutdown += gd->reloc_off;
+	if (drv->readext)
+		drv->readext += gd->reloc_off;
+	if (drv->writeext)
+		drv->writeext += gd->reloc_off;
+#endif
 	return 0;
 }
 
-- 
2.3.5

[U-Boot] [PATCH] net: phy: Add support for all targets which requires MANUAL_RELOC

[Joe Hershberger]

Hi Michal,

On Wed, May 13, 2015 at 6:40 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA
> relocation (mostly only GOT) where functions aray are not
> updated. This patch is fixing function pointers passed to phy_register
> function.
> This patch was tested on Microblaze architecture.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---

Acked-by: Joe Hershberger <joe.hershberger@ni.com>

I'll pick this up in a bit.

-Joe

[U-Boot] [PATCH] net: phy: Add support for all targets which requires MANUAL_RELOC

[Joe Hershberger]

Hi Michal,

On Wed, May 13, 2015 at 6:40 AM, Michal Simek <michal.simek@xilinx.com> wrote:
> Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA
> relocation (mostly only GOT) where functions aray are not
> updated. This patch is fixing function pointers passed to phy_register
> function.
> This patch was tested on Microblaze architecture.
>
> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
> ---

Applied to u-boot-net/next, thanks!
-Joe

[U-Boot] [PATCH] net: phy: Add support for all targets which requires MANUAL_RELOC

[Michal Simek]

On 05/13/2015 09:32 PM, Joe Hershberger wrote:
> Hi Michal,
> 
> On Wed, May 13, 2015 at 6:40 AM, Michal Simek <michal.simek@xilinx.com> wrote:
>> Targets with CONFIG_NEEDS_MANUAL_RELOC do not use REL/RELA
>> relocation (mostly only GOT) where functions aray are not
>> updated. This patch is fixing function pointers passed to phy_register
>> function.
>> This patch was tested on Microblaze architecture.
>>
>> Signed-off-by: Michal Simek <michal.simek@xilinx.com>
>> ---
> 
> Applied to u-boot-net/next, thanks!

Thanks. Hopefully this will go to 2015.07 because it is bug fix. :-)

Thanks,
Michal