OSDN Git Service

ARM: orion: fix orion_ge00_switch_board_info initialization
authorArnd Bergmann <arnd@arndb.de>
Wed, 21 Feb 2018 12:18:49 +0000 (13:18 +0100)
committerArnd Bergmann <arnd@arndb.de>
Thu, 22 Feb 2018 16:48:39 +0000 (17:48 +0100)
commit8337d083507b9827dfb36d545538b7789df834fd
treed2d23262f66ab864221e2980d686c4f542ec8fc8
parente6d210180aec2ff4f318a0b22b8963c3c7e45c03
ARM: orion: fix orion_ge00_switch_board_info initialization

A section type mismatch warning shows up when building with LTO,
since orion_ge00_mvmdio_bus_name was put in __initconst but not marked
const itself:

include/linux/of.h: In function 'spear_setup_of_timer':
arch/arm/mach-spear/time.c:207:34: error: 'timer_of_match' causes a section type conflict with 'orion_ge00_mvmdio_bus_name'
 static const struct of_device_id timer_of_match[] __initconst = {
                                  ^
arch/arm/plat-orion/common.c:475:32: note: 'orion_ge00_mvmdio_bus_name' was declared here
 static __initconst const char *orion_ge00_mvmdio_bus_name = "orion-mii";
                                ^

As pointed out by Andrew Lunn, it should in fact be 'const' but not
'__initconst' because the string is never copied but may be accessed
after the init sections are freed. To fix that, I get rid of the
extra symbol and rewrite the initialization in a simpler way that
assigns both the bus_id and modalias statically.

I spotted another theoretical bug in the same place, where d->netdev[i]
may be an out of bounds access, this can be fixed by moving the device
assignment into the loop.

Cc: stable@vger.kernel.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/plat-orion/common.c