summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTian Fang <tfang@fb.com>2015-12-14 22:08:40 -0800
committerTian Fang <tfang@fb.com>2015-12-15 09:49:21 -0800
commite65a7944211c70f6b5cfb6cedd73cc31105319de (patch)
tree067082251bc52bc6c09ca87feaa1352d0468a5ac
parent8a67fbdd0e251bb34d55992b0771edba1837d589 (diff)
downloadast2050-yocto-openbmc-e65a7944211c70f6b5cfb6cedd73cc31105319de.zip
ast2050-yocto-openbmc-e65a7944211c70f6b5cfb6cedd73cc31105319de.tar.gz
Sync to internal OpenBMC repo f926614
-rw-r--r--README.md4
-rw-r--r--common/recipes-connectivity/openssh/openssh_%.bbappend (renamed from common/recipes-connectivity/openssh/openssh_6.5%.bbappend)0
-rw-r--r--common/recipes-core/consoled/files/consoled.c8
-rw-r--r--common/recipes-core/fan-ctrl/fan-ctrl/fand.cpp390
-rw-r--r--common/recipes-core/fan-ctrl/fan-ctrl/watchdog.cpp4
-rw-r--r--common/recipes-core/fruid/files/fruid-util.c176
-rw-r--r--common/recipes-core/healthd/files/Makefile26
-rw-r--r--common/recipes-core/healthd/files/healthd.c77
-rw-r--r--common/recipes-core/healthd/files/setup-healthd.sh34
-rw-r--r--common/recipes-core/healthd/healthd_0.1.bb42
-rw-r--r--common/recipes-core/i2c-tools/i2c-tools_3.1.1.bb38
-rw-r--r--common/recipes-core/init-ifupdown/files/dhcpv6_down (renamed from meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_down)0
-rw-r--r--common/recipes-core/init-ifupdown/files/dhcpv6_up (renamed from meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_up)0
-rw-r--r--common/recipes-core/init-ifupdown/init-ifupdown_%.bbappend16
-rw-r--r--common/recipes-core/ipmbd/files/ipmbd.c136
-rw-r--r--common/recipes-core/ipmid/files/ipmid.c270
-rw-r--r--common/recipes-core/ipmid/files/sdr.c18
-rw-r--r--common/recipes-core/ipmid/files/sel.c306
-rw-r--r--common/recipes-core/ipmid/files/sel.h18
-rw-r--r--common/recipes-core/log-util/files/lib_pal.py31
-rw-r--r--common/recipes-core/log-util/files/log-util.py94
-rw-r--r--common/recipes-core/log-util/log-util_0.1.bb57
-rw-r--r--common/recipes-core/power-util/files/power-util.c118
-rw-r--r--common/recipes-core/python/python_2.7.9.bbappend21
-rw-r--r--common/recipes-core/sensor-mon/files/sensord.c903
-rw-r--r--common/recipes-core/sensor-mon/sensor-mon_0.1.bb4
-rw-r--r--common/recipes-core/sensor-util/files/Makefile2
-rw-r--r--common/recipes-core/sensor-util/files/sensor-util.c137
-rw-r--r--common/recipes-core/sensor-util/sensor-util_0.1.bb2
-rw-r--r--common/recipes-lib/fruid/files/fruid.c34
-rw-r--r--common/recipes-lib/ipmb/files/ipmb.c27
-rw-r--r--common/recipes-lib/ipmb/files/ipmb.h5
-rw-r--r--common/recipes-lib/ipmi/files/ipmi.c23
-rw-r--r--common/recipes-lib/ipmi/files/ipmi.h14
-rw-r--r--common/recipes-lib/sdr/files/Makefile2
-rw-r--r--common/recipes-lib/sdr/files/sdr.c383
-rw-r--r--common/recipes-lib/sdr/files/sdr.h38
-rw-r--r--common/recipes-lib/sdr/libsdr_0.1.bb2
-rw-r--r--common/recipes-rest/cherryPy/cherryPy_3.8.0.bb14
-rw-r--r--common/recipes-rest/rest-api/files/node_server.py7
-rw-r--r--common/recipes-rest/rest-api/files/pal.py8
-rw-r--r--common/recipes-utils/openbmc-gpio/files/openbmc_gpio_setup.py76
-rw-r--r--common/recipes-utils/openbmc-gpio/files/openbmc_gpio_table.py34
-rw-r--r--common/recipes-utils/openbmc-gpio/files/setup.py5
-rw-r--r--common/recipes-utils/openbmc-gpio/files/setup_board.py23
-rw-r--r--common/recipes-utils/openbmc-gpio/openbmc-gpio_0.1.bb13
-rw-r--r--common/recipes-utils/spatula/files/setup-spatula.sh2
-rw-r--r--common/recipes-utils/spatula/files/spatula_wrapper.py87
-rw-r--r--meta-aspeed/conf/distro/include/tclibc-eglibc.inc40
-rw-r--r--meta-aspeed/conf/machine/include/ast1250.inc4
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/files/patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch13
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend13
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb38
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot.inc78
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend6
-rw-r--r--meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07.bb23
-rw-r--r--meta-aspeed/recipes-core/eglibc/cross-localedef-native_2.19.bb49
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch56
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch912
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch36
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch169
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch176
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch143
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch17
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch20
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch21
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch38
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf0
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch22
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch38
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch18
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch100
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/generate-supported.mk11
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch1516
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/grok_gold.patch34
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch20
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch56
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch26
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch17
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch184
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch365
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch47
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch108
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch41
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-collateral.inc12
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-common.inc9
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-initial.inc78
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-initial_2.19.bb11
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-ld.inc56
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-locale.inc96
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-locale_2.19.bb1
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-mtrace.inc13
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-mtrace_2.19.bb1
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-options.inc162
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-package.inc155
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-scripts.inc16
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-scripts_2.19.bb1
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc-testing.inc79
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc.inc84
-rw-r--r--meta-aspeed/recipes-core/eglibc/eglibc_2.19.bb147
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch331
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/README8
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch454
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch113
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch24
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch37
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2bin0 -> 21491 bytes
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch471
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch36
-rw-r--r--meta-aspeed/recipes-core/eglibc/ldconfig-native_2.12.1.bb32
-rw-r--r--meta-aspeed/recipes-core/eglibc/site_config/funcs474
-rw-r--r--meta-aspeed/recipes-core/eglibc/site_config/headers156
-rw-r--r--meta-aspeed/recipes-core/eglibc/site_config/types21
-rw-r--r--meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0033-Linux-snapshot-of-OpenBMC-f926614.patch978
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed.inc24
-rw-r--r--meta-aspeed/recipes-kernel/linux/linux-aspeed_2.6.28.9.bb31
-rw-r--r--meta-aspeed/recipes-utils/openbmc-gpio/files/ast2400_gpio_table.py1022
-rw-r--r--meta-aspeed/recipes-utils/openbmc-gpio/files/ast_gpio_parser.py204
-rw-r--r--meta-aspeed/recipes-utils/openbmc-gpio/files/data/ast2400-gpio.csv225
-rw-r--r--meta-aspeed/recipes-utils/openbmc-gpio/files/soc_gpio.py42
-rw-r--r--meta-aspeed/recipes-utils/openbmc-gpio/openbmc-gpio_%.bbappend23
-rw-r--r--meta-aspeed/recipes-utils/soc-utils/files/COPYING340
-rw-r--r--meta-aspeed/recipes-utils/soc-utils/files/soc-utils.sh20
-rw-r--r--meta-aspeed/recipes-utils/soc-utils/openbmc-utils_%.bbappend26
-rw-r--r--meta-facebook/meta-wedge/conf/bblayers.conf.sample1
-rw-r--r--meta-facebook/meta-wedge/conf/local.conf.sample5
-rw-r--r--meta-facebook/meta-wedge/conf/machine/wedge.conf4
-rw-r--r--meta-facebook/meta-wedge/recipes-core/busybox/busybox/syslog.conf5
-rw-r--r--meta-facebook/meta-wedge/recipes-core/busybox/busybox_%.bbappend3
-rw-r--r--meta-facebook/meta-wedge/recipes-core/images/wedge-image.inc2
-rw-r--r--meta-facebook/meta-wedge/recipes-core/init-ifupdown/init-ifupdown_%.bbappend16
-rw-r--r--meta-facebook/meta-wedge/recipes-kernel/linux/files/defconfig1480
-rw-r--r--meta-facebook/meta-wedge/recipes-kernel/linux/linux-aspeed_2.6%.bbappend5
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/bitbang_0.1.bb22
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/Makefile13
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/bitbang.c236
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/bitbang.h66
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/gpio.c107
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/gpio.h42
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/mdio_bb.c336
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/bitbang/files/src/spi_bb.c317
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl/Makefile10
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl/README5
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl/fand.cpp851
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl/watchdog.cpp201
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl/watchdog.h60
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fan-ctrl/fan-ctrl_0.1.bb59
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fbutils/fbutils_0.1.bb86
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fbutils/files/ast-functions222
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fbutils/files/at93c46.py260
-rwxr-xr-xmeta-facebook/meta-wedge/recipes-wedge/fbutils/files/at93c46_util.py178
-rwxr-xr-xmeta-facebook/meta-wedge/recipes-wedge/fbutils/files/fcswitcher.sh83
-rwxr-xr-xmeta-facebook/meta-wedge/recipes-wedge/fbutils/files/setup_rov.sh15
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/fbutils/files/src/include/log.h59
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/lm_sensors/files/wedge.conf6
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon/Makefile2
-rwxr-xr-xmeta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon/psu-update-delta.py60
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon/rackmon-config.py175
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon/rackmond.py26
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon/setup-rackmond.sh2
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rackmon/rackmon_0.1.bb2
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/bmc_command.py112
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/rest.py155
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/rest_fruid.py10
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/rest_psu_update.py81
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/rest_sensors.py15
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/files/setup-rest-api.sh53
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/rest-api/rest-api_0.1.bb4
-rwxr-xr-xmeta-facebook/meta-wedge/recipes-wedge/usb-console/files/usbmon.sh9
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/wedge-eeprom/files/lib/wedge_eeprom.c40
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/wedge-eeprom/files/lib/wedge_eeprom.h14
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/wedge-eeprom/files/utils/weutil.c9
-rw-r--r--meta-facebook/meta-wedge/recipes-wedge/wedge-eeprom/wedge-eeprom_0.1.bb2
-rw-r--r--meta-facebook/meta-wedge100/conf/bblayers.conf.sample23
-rw-r--r--meta-facebook/meta-wedge100/conf/conf-notes.txt2
-rw-r--r--meta-facebook/meta-wedge100/conf/layer.conf10
-rw-r--r--meta-facebook/meta-wedge100/conf/local.conf.sample145
-rw-r--r--meta-facebook/meta-wedge100/conf/machine/wedge100.conf18
-rwxr-xr-xmeta-facebook/meta-wedge100/recipes-core/fan-ctrl/fan-ctrl/get_fan_speed.sh59
-rwxr-xr-xmeta-facebook/meta-wedge100/recipes-core/fan-ctrl/fan-ctrl/set_fan_speed.sh46
-rw-r--r--[-rwxr-xr-x]meta-facebook/meta-wedge100/recipes-core/fan-ctrl/fan-ctrl/setup-fan.sh (renamed from meta-facebook/meta-wedge/recipes-wedge/fbutils/files/watch-fc.sh)27
-rw-r--r--meta-facebook/meta-wedge100/recipes-core/fan-ctrl/fan-ctrl_0.1.bbappend46
-rw-r--r--meta-facebook/meta-wedge100/recipes-core/images/wedge100-image.bb82
-rw-r--r--meta-facebook/meta-wedge100/recipes-core/sysvinit/sysvinit-inittab_%.bbappend5
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/com-e-mod/files/COPYING340
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/com-e-mod/files/Makefile31
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/com-e-mod/files/com_e_driver.c365
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/com-e-mod/kernel-module-com-e-driver_0.1.bb40
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/cpld-mod/files/COPYING340
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/cpld-mod/files/Makefile31
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/cpld-mod/files/fancpld.c396
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/cpld-mod/files/syscpld.c281
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/cpld-mod/kernel-module-cpld_0.1.bb42
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/i2c-dev-sysfs-mod/files/COPYING340
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/i2c-dev-sysfs-mod/files/Makefile31
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.c349
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/i2c-dev-sysfs-mod/files/i2c_dev_sysfs.h84
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/i2c-dev-sysfs-mod/kernel-module-i2c-dev-sysfs_0.1.bb42
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/linux/files/defconfig1462
-rw-r--r--meta-facebook/meta-wedge100/recipes-kernel/linux/linux-aspeed_2.6%.bbappend8
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/lm_sensors/files/wedge100.conf78
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/lm_sensors/lmsensors_%.bbappend10
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/oob-nic/oob-nic_%.bbappend5
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/board_gpio_rev_table.py33
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/board_gpio_table_v1.py107
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/board_gpio_table_v2.py118
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/data/wedge100-BMC-GPIO-DVT.csv104
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/data/wedge100-BMC-GPIO-EVT.csv83
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/openbmc_gpio_setup.py75
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/setup_board.py22
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/files/wedge100_gpio_parse.py102
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-gpio/openbmc-gpio_%.bbappend36
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/COPYING340
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/board-utils.sh81
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/disable_watchdog.sh6
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/power-on.sh51
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/wedge_power.sh187
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/files/wedge_us_mac.sh38
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/openbmc-utils/openbmc-utils_%.bbappend64
-rw-r--r--meta-facebook/meta-wedge100/recipes-utils/wedge-eeprom/libwedge-eeprom_0.1.bbappend18
-rw-r--r--meta-facebook/meta-yosemite/conf/bblayers.conf.sample1
-rw-r--r--meta-facebook/meta-yosemite/conf/local.conf.sample5
-rw-r--r--meta-facebook/meta-yosemite/conf/machine/yosemite.conf2
-rw-r--r--meta-facebook/meta-yosemite/recipes-core/busybox/busybox/syslog.conf5
-rw-r--r--meta-facebook/meta-yosemite/recipes-core/busybox/busybox_%.bbappend3
-rw-r--r--meta-facebook/meta-yosemite/recipes-core/images/yosemite-image.inc9
-rw-r--r--meta-facebook/meta-yosemite/recipes-kernel/linux/files/defconfig1480
-rw-r--r--meta-facebook/meta-yosemite/recipes-kernel/linux/linux-aspeed_2.6%.bbappend5
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/bic-cached_0.1.bb2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/bic-cached/files/bic-cached.c6
-rwxr-xr-xmeta-facebook/meta-yosemite/recipes-yosemite/fan-ctrl/fan-ctrl/set_fan_speed.sh4
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fan-ctrl/fan-ctrl_0.1.bbappend2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.c349
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/bic/bic.h25
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/Makefile2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.c904
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/pal/pal.h53
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/Makefile4
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.c97
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_common/yosemite_common.h3
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_fruid/yosemite_fruid.c35
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_fruid/yosemite_fruid.h1
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_gpio/yosemite_gpio.c8
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_sensor/Makefile2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_sensor/yosemite_sensor.c609
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/files/yosemite_sensor/yosemite_sensor.h58
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fblibs/libyosemite-sensor_0.1.bb2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/fbutils_0.1.bb4
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/bic-util/bic-util.c17
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/fpc-util/Makefile10
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/fpc-util/fpc-util.c85
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/fw-util/Makefile10
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/fw-util/fw-util.c161
-rwxr-xr-xmeta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/setup-gpio.sh102
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/files/yosemite-sensors/yosemite-sensors.c12
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/fpc-util_0.1.bb21
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/fbutils/fw-util_0.1.bb21
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/Makefile2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/files/front-paneld.c327
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/front-paneld/front-paneld_0.1.bb2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/gpiod.c81
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/gpiod/files/setup-gpiod.sh25
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/gpiod/gpiod_0.1.bb2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmbd/ipmbd_0.1.bbappend3
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmid/files/bic.c10
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmid/files/fruid.c27
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmid/files/lan.c127
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmid/files/sensor.c14
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/ipmid/ipmid_0.2.bbappend5
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/me-util/files/Makefile10
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/me-util/files/me-util.c119
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/me-util/me-util_0.1.bb38
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/rest-api/rest-api_0.2.bbappend2
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/sensor-mon/files/setup-sensord.sh24
-rw-r--r--meta-facebook/meta-yosemite/recipes-yosemite/sensor-mon/sensor-mon_0.1.bbappend7
275 files changed, 25629 insertions, 5241 deletions
diff --git a/README.md b/README.md
index 9740139..eade352 100644
--- a/README.md
+++ b/README.md
@@ -26,13 +26,13 @@ BMC SoC layer and board specific layer are grouped together based on the vendor/
* Step 1 - Clone Yocto repository.
```
-$ git clone -b daisy https://git.yoctoproject.org/git/poky
+$ git clone -b fido https://git.yoctoproject.org/git/poky
```
* Step 2 - Clone Openembedded and OpenBMC repositories, in the new created `poky` directory,
```
$ cd poky
-$ git clone -b daisy https://github.com/openembedded/meta-openembedded.git
+$ git clone -b fido https://github.com/openembedded/meta-openembedded.git
$ git clone git@github.com:facebook/openbmc.git meta-openbmc
```
diff --git a/common/recipes-connectivity/openssh/openssh_6.5%.bbappend b/common/recipes-connectivity/openssh/openssh_%.bbappend
index 60b164b..60b164b 100644
--- a/common/recipes-connectivity/openssh/openssh_6.5%.bbappend
+++ b/common/recipes-connectivity/openssh/openssh_%.bbappend
diff --git a/common/recipes-core/consoled/files/consoled.c b/common/recipes-core/consoled/files/consoled.c
index 9f17e31..b15011e 100644
--- a/common/recipes-core/consoled/files/consoled.c
+++ b/common/recipes-core/consoled/files/consoled.c
@@ -49,7 +49,7 @@ write_data(int file, char *buf, int len, char *fname) {
len -= wlen;
tbuf = tbuf + wlen;
} else {
- syslog(LOG_ALERT, "write_data: write() failed to file %s | errno: %d",
+ syslog(LOG_WARNING, "write_data: write() failed to file %s | errno: %d",
fname, errno);
return;
}
@@ -124,7 +124,7 @@ run_console(char* fru_name, int term) {
(O_RDONLY | O_NOCTTY | O_NONBLOCK);
if ((tty = open(devtty, flags)) < 0) {
- syslog(LOG_ALERT, "Cannot open the file %s", devtty);
+ syslog(LOG_WARNING, "Cannot open the file %s", devtty);
exit(-1);
}
fcntl(tty, F_SETFL, O_RDWR);
@@ -144,7 +144,7 @@ run_console(char* fru_name, int term) {
sprintf(old_bfname, "/tmp/consoled_%s_log-old", fru_name);
sprintf(bfname, "/tmp/consoled_%s_log", fru_name);
if ((buf_fd = open(bfname, O_RDWR | O_APPEND | O_CREAT, 0666)) < 0) {
- syslog(LOG_ALERT, "Cannot open the file %s", bfname);
+ syslog(LOG_WARNING, "Cannot open the file %s", bfname);
exit(-1);
}
@@ -213,7 +213,7 @@ run_console(char* fru_name, int term) {
remove(old_bfname);
rename(bfname, old_bfname);
if ((buf_fd = open(bfname, O_RDWR | O_APPEND | O_CREAT, 0666)) < 0) {
- syslog(LOG_ALERT, "Cannot open the file %s", bfname);
+ syslog(LOG_WARNING, "Cannot open the file %s", bfname);
exit(-1);
}
nline = 0;
diff --git a/common/recipes-core/fan-ctrl/fan-ctrl/fand.cpp b/common/recipes-core/fan-ctrl/fan-ctrl/fand.cpp
index 49c6f6b..ccfbdb1 100644
--- a/common/recipes-core/fan-ctrl/fan-ctrl/fand.cpp
+++ b/common/recipes-core/fan-ctrl/fan-ctrl/fand.cpp
@@ -40,11 +40,14 @@
/* Yeah, the file ends in .cpp, but it's a C program. Deal. */
-#if !defined(CONFIG_YOSEMITE) && !defined(CONFIG_WEDGE)
+/* XXX: Both CONFIG_WEDGE and CONFIG_WEDGE100 are defined for Wedge100 */
+
+#if !defined(CONFIG_YOSEMITE) && !defined(CONFIG_WEDGE) && \
+ !defined(CONFIG_WEDGE100)
#error "No hardware platform defined!"
#endif
#if defined(CONFIG_YOSEMITE) && defined(CONFIG_WEDGE)
-#error "Both hardware platform defined!"
+#error "Two hardware platforms defined!"
#endif
#include <stdio.h>
@@ -54,12 +57,12 @@
#include <errno.h>
#include <signal.h>
#include <syslog.h>
-#ifdef CONFIG_YOSEMITE
+#if defined(CONFIG_YOSEMITE)
#include <openbmc/ipmi.h>
#include <facebook/bic.h>
#include <facebook/yosemite_sensor.h>
#endif
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) && !defined(CONFIG_WEDGE100)
#include <facebook/wedge_eeprom.h>
#endif
@@ -67,23 +70,15 @@
/* Sensor definitions */
-#ifdef CONFIG_WEDGE
-#define INTERNAL_TEMPS(x) ((x) * 1000) // stored a C * 1000
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
+#define INTERNAL_TEMPS(x) ((x) * 1000) // stored as C * 1000
#define EXTERNAL_TEMPS(x) ((x) / 1000)
-#elif CONFIG_YOSEMITE
+#elif defined(CONFIG_YOSEMITE)
#define INTERNAL_TEMPS(x) (x)
#define EXTERNAL_TEMPS(x) (x)
#define TOTAL_1S_SERVERS 4
#endif
-#define I2C_BUS_3_DIR "/sys/class/i2c-adapter/i2c-3/"
-#define I2C_BUS_4_DIR "/sys/class/i2c-adapter/i2c-4/"
-
-#define INTAKE_TEMP_DEVICE I2C_BUS_3_DIR "3-0048"
-#define T2_TEMP_DEVICE I2C_BUS_3_DIR "3-0049"
-#define EXHAUST_TEMP_DEVICE I2C_BUS_3_DIR "3-004a"
-#define USERVER_TEMP_DEVICE I2C_BUS_4_DIR "4-0040"
-
/*
* The sensor for the uServer CPU is not on the CPU itself, so it reads
* a little low. We are special casing this, but we should obviously
@@ -91,10 +86,10 @@
* the entire configuration. JSON file?
*/
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
#define USERVER_TEMP_FUDGE INTERNAL_TEMPS(10)
#else
-#define USERVER_TEMP_FUDGE INTERNAL_TEMPS(1)
+#define USERVER_TEMP_FUDGE INTERNAL_TEMPS(0)
#endif
#define BAD_TEMP INTERNAL_TEMPS(-60)
@@ -104,25 +99,47 @@
#define FAN_SHUTDOWN_THRESHOLD 20 /* How long fans can be failed before */
/* we just shut down the whole thing. */
+#if defined(CONFIG_WEDGE100)
+#define PWM_DIR "/sys/bus/i2c/drivers/fancpld/8-0033/"
-#define PWM_DIR "/sys/devices/platform/ast_pwm_tacho.0"
+#define PWM_UNIT_MAX 31
-#define PWM_UNIT_MAX 96
+#define LM75_DIR "/sys/bus/i2c/drivers/lm75/"
+#define PANTHER_PLUS_DIR "/sys/bus/i2c/drivers/panther_plus/"
-#define LARGEST_DEVICE_NAME 120
+#define INTAKE_TEMP_DEVICE LM75_DIR "3-0048"
+#define CHIP_TEMP_DEVICE LM75_DIR "3-004b"
+#define EXHAUST_TEMP_DEVICE LM75_DIR "3-0048"
+#define USERVER_TEMP_DEVICE PANTHER_PLUS_DIR "4-0040"
-#define GPIO_USERVER_POWER_DIRECTION "/sys/class/gpio/gpio25/direction"
-#define GPIO_USERVER_POWER "/sys/class/gpio/gpio25/value"
-#define GPIO_T2_POWER_DIRECTION "/tmp/gpionames/T2_POWER_UP/direction"
-#define GPIO_T2_POWER "/tmp/gpionames/T2_POWER_UP/value"
+#define FAN_READ_RPM_FORMAT "fan%d_input"
+
+#define FAN0_LED PWM_DIR "fantray1_led_ctrl"
+#define FAN1_LED PWM_DIR "fantray2_led_ctrl"
+#define FAN2_LED PWM_DIR "fantray3_led_ctrl"
+#define FAN3_LED PWM_DIR "fantray4_led_ctrl"
+#define FAN4_LED PWM_DIR "fantray5_led_ctrl"
+
+#define FAN_LED_BLUE "0x1"
+#define FAN_LED_RED "0x2"
+
+#define MAIN_POWER "/sys/bus/i2c/drivers/syscpld/12-0031/pwr_main_n"
+#define USERVER_POWER "/sys/bus/i2c/drivers/syscpld/12-0031/pwr_usrv_en"
+
+#elif defined(CONFIG_WEDGE)
+#define I2C_BUS_3_DIR "/sys/class/i2c-adapter/i2c-3/"
+#define I2C_BUS_4_DIR "/sys/class/i2c-adapter/i2c-4/"
+
+#define INTAKE_TEMP_DEVICE I2C_BUS_3_DIR "3-0048"
+#define CHIP_TEMP_DEVICE I2C_BUS_3_DIR "3-0049"
+#define EXHAUST_TEMP_DEVICE I2C_BUS_3_DIR "3-004a"
+#define USERVER_TEMP_DEVICE I2C_BUS_4_DIR "4-0040"
-#define GPIO_FAN0_LED "/sys/class/gpio/gpio53/value"
-#define GPIO_FAN1_LED "/sys/class/gpio/gpio54/value"
-#define GPIO_FAN2_LED "/sys/class/gpio/gpio55/value"
-#define GPIO_FAN3_LED "/sys/class/gpio/gpio72/value"
-const char *fan_led[] = {GPIO_FAN0_LED, GPIO_FAN1_LED,
- GPIO_FAN2_LED, GPIO_FAN3_LED};
+#define FAN0_LED "/sys/class/gpio/gpio53/value"
+#define FAN1_LED "/sys/class/gpio/gpio54/value"
+#define FAN2_LED "/sys/class/gpio/gpio55/value"
+#define FAN3_LED "/sys/class/gpio/gpio72/value"
#define FAN_LED_RED "0"
#define FAN_LED_BLUE "1"
@@ -142,13 +159,45 @@ const char *fan_led[] = {GPIO_FAN0_LED, GPIO_FAN1_LED,
#define REV_ID_NEW_BOARD_ID 3
#define GPIO_BOARD_ID_START_NEW 166
+#elif defined(CONFIG_YOSEMITE)
+#define FAN_LED_RED "0"
+#define FAN_LED_BLUE "1"
+#endif
+
+#if (defined(CONFIG_YOSEMITE) || defined(CONFIG_WEDGE)) && \
+ !defined(CONFIG_WEDGE100)
+#define PWM_DIR "/sys/devices/platform/ast_pwm_tacho.0"
+
+#define PWM_UNIT_MAX 96
+#define FAN_READ_RPM_FORMAT "tacho%d_rpm"
+
+#define GPIO_USERVER_POWER_DIRECTION "/sys/class/gpio/gpio25/direction"
+#define GPIO_USERVER_POWER "/sys/class/gpio/gpio25/value"
+#define GPIO_T2_POWER_DIRECTION "/tmp/gpionames/T2_POWER_UP/direction"
+#define GPIO_T2_POWER "/tmp/gpionames/T2_POWER_UP/value"
+#endif
+
+#define LARGEST_DEVICE_NAME 120
+
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
+const char *fan_led[] = {FAN0_LED, FAN1_LED, FAN2_LED, FAN3_LED,
+#if defined(CONFIG_WEDGE100)
+ FAN4_LED,
+#endif
+};
+#endif
+
#define REPORT_TEMP 720 /* Report temp every so many cycles */
/* Sensor limits and tuning parameters */
#define INTAKE_LIMIT INTERNAL_TEMPS(60)
-#define T2_LIMIT INTERNAL_TEMPS(80)
+#define SWITCH_LIMIT INTERNAL_TEMPS(80)
+#if defined(CONFIG_YOSEMITE)
+#define USERVER_LIMIT INTERNAL_TEMPS(110)
+#else
#define USERVER_LIMIT INTERNAL_TEMPS(90)
+#endif
#define TEMP_TOP INTERNAL_TEMPS(70)
#define TEMP_BOTTOM INTERNAL_TEMPS(40)
@@ -165,7 +214,11 @@ const char *fan_led[] = {GPIO_FAN0_LED, GPIO_FAN1_LED,
#define WEDGE_FAN_LOW 35
#define WEDGE_FAN_MEDIUM 50
#define WEDGE_FAN_HIGH 70
+#if defined(CONFIG_WEDGE100)
+#define WEDGE_FAN_MAX 100
+#else
#define WEDGE_FAN_MAX 99
+#endif
#define SIXPACK_FAN_LOW 35
#define SIXPACK_FAN_MEDIUM 55
@@ -177,19 +230,28 @@ const char *fan_led[] = {GPIO_FAN0_LED, GPIO_FAN1_LED,
* RPM measuring and PWM setting, naturally. Doh.
*/
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE100)
+int fan_to_rpm_map[] = {1, 3, 5, 7, 9};
+int fan_to_pwm_map[] = {1, 2, 3, 4, 5};
+#define FANS 5
+// Tacho offset between front and rear fans:
+#define REAR_FAN_OFFSET 1
+#define BACK_TO_BACK_FANS
+
+#elif defined(CONFIG_WEDGE)
int fan_to_rpm_map[] = {3, 2, 0, 1};
int fan_to_pwm_map[] = {7, 6, 0, 1};
#define FANS 4
// Tacho offset between front and rear fans:
#define REAR_FAN_OFFSET 4
#define BACK_TO_BACK_FANS
-#else
+#elif defined(CONFIG_YOSEMITE)
int fan_to_rpm_map[] = {0, 1};
int fan_to_pwm_map[] = {0, 1};
#define FANS 2
// Tacho offset between front and rear fans:
#define REAR_FAN_OFFSET 1
+
#endif
@@ -205,11 +267,49 @@ int fan_to_pwm_map[] = {0, 1};
*/
struct rpm_to_pct_map {
- ushort pct;
- ushort rpm;
+ uint pct;
+ uint rpm;
};
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE100)
+struct rpm_to_pct_map rpm_front_map[] = {{20, 4200},
+ {25, 5550},
+ {30, 6180},
+ {35, 7440},
+ {40, 8100},
+ {45, 9300},
+ {50, 10410},
+ {55, 10920},
+ {60, 11910},
+ {65, 12360},
+ {70, 13260},
+ {75, 14010},
+ {80, 14340},
+ {85, 15090},
+ {90, 15420},
+ {95, 15960},
+ {100, 16200}};
+#define FRONT_MAP_SIZE (sizeof(rpm_front_map) / sizeof(struct rpm_to_pct_map))
+
+struct rpm_to_pct_map rpm_rear_map[] = {{20, 2130},
+ {25, 3180},
+ {30, 3690},
+ {35, 4620},
+ {40, 5130},
+ {45, 6120},
+ {50, 7050},
+ {55, 7560},
+ {60, 8580},
+ {65, 9180},
+ {70, 10230},
+ {75, 11280},
+ {80, 11820},
+ {85, 12870},
+ {90, 13350},
+ {95, 14370},
+ {100, 14850}};
+#define REAR_MAP_SIZE (sizeof(rpm_rear_map) / sizeof(struct rpm_to_pct_map))
+#elif defined(CONFIG_WEDGE)
struct rpm_to_pct_map rpm_front_map[] = {{30, 6150},
{35, 7208},
{40, 8195},
@@ -243,22 +343,21 @@ struct rpm_to_pct_map rpm_rear_map[] = {{30, 3911},
{95, 15516},
{100, 15897}};
#define REAR_MAP_SIZE (sizeof(rpm_rear_map) / sizeof(struct rpm_to_pct_map))
-#else
-struct rpm_to_pct_map rpm_map[] = {{30, 3413},
- {35, 3859},
- {40, 4305},
- {45, 4686},
- {50, 5032},
- {55, 5432},
- {60, 5991},
- {65, 6460},
- {70, 6927},
- {75, 7379},
- {80, 7733},
- {85, 8156},
- {90, 8599},
- {95, 9049},
- {100, 9265}};
+#elif defined(CONFIG_YOSEMITE)
+
+/* XXX: Note that 0% is far from 0 RPM. */
+struct rpm_to_pct_map rpm_map[] = {{0, 989},
+ {10, 1654},
+ {20, 2650},
+ {30, 3434},
+ {40, 4318},
+ {50, 5202},
+ {60, 5969},
+ {70, 6869},
+ {80, 7604},
+ {90, 8525},
+ {100, 9325}};
+
struct rpm_to_pct_map *rpm_front_map = rpm_map;
struct rpm_to_pct_map *rpm_rear_map = rpm_map;
#define MAP_SIZE (sizeof(rpm_map) / sizeof(struct rpm_to_pct_map))
@@ -267,6 +366,50 @@ struct rpm_to_pct_map *rpm_rear_map = rpm_map;
#endif
+/*
+ * Mappings from temperatures recorded from sensors to fan speeds;
+ * note that in some cases, we want to be able to look at offsets
+ * from the CPU temperature margin rather than an absolute temperature,
+ * so we use ints.
+ */
+
+struct temp_to_pct_map {
+ int temp;
+ unsigned speed;
+};
+
+#if defined(CONFIG_YOSEMITE)
+struct temp_to_pct_map intake_map[] = {{25, 15},
+ {27, 16},
+ {29, 17},
+ {31, 18},
+ {33, 19},
+ {35, 20},
+ {37, 21},
+ {39, 22},
+ {41, 23},
+ {43, 24},
+ {45, 25}};
+#define INTAKE_MAP_SIZE (sizeof(intake_map) / sizeof(struct temp_to_pct_map))
+
+struct temp_to_pct_map cpu_map[] = {{-28, 10},
+ {-26, 20},
+ {-24, 25},
+ {-22, 30},
+ {-20, 35},
+ {-18, 40},
+ {-16, 45},
+ {-14, 50},
+ {-12, 55},
+ {-10, 60},
+ {-8, 65},
+ {-6, 70},
+ {-4, 80},
+ {-2, 100}};
+#define CPU_MAP_SIZE (sizeof(cpu_map) / sizeof(struct temp_to_pct_map))
+#endif
+
+
#define FAN_FAILURE_OFFSET 30
int fan_low = WEDGE_FAN_LOW;
@@ -355,7 +498,7 @@ int write_device(const char *device, const char *value) {
}
}
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
int read_temp(const char *device, int *value) {
char full_name[LARGEST_DEVICE_NAME + 1];
@@ -365,7 +508,9 @@ int read_temp(const char *device, int *value) {
full_name, LARGEST_DEVICE_NAME, "%s/temp1_input", device);
return read_device(full_name, value);
}
+#endif
+#if defined(CONFIG_WEDGE) && !defined(CONFIG_WEDGE100)
int read_gpio_value(const int id, const char *device, int *value) {
char full_name[LARGEST_DEVICE_NAME];
@@ -448,7 +593,7 @@ int read_fan_value(const int fan, const char *device, int *value) {
char full_name[LARGEST_DEVICE_NAME];
snprintf(device_name, LARGEST_DEVICE_NAME, device, fan);
- snprintf(full_name, LARGEST_DEVICE_NAME, "%s/%s", PWM_DIR, device_name);
+ snprintf(full_name, LARGEST_DEVICE_NAME, "%s/%s", PWM_DIR,device_name);
return read_device(full_name, value);
}
@@ -512,11 +657,11 @@ int fan_speed_okay(const int fan, const int speed, const int slop) {
real_fan = fan_to_rpm_map[fan];
front_fan = 0;
- read_fan_value(real_fan, "tacho%d_rpm", &front_fan);
+ read_fan_value(real_fan, FAN_READ_RPM_FORMAT, &front_fan);
front_pct = fan_rpm_to_pct(rpm_front_map, FRONT_MAP_SIZE, front_fan);
#ifdef BACK_TO_BACK_FANS
rear_fan = 0;
- read_fan_value(real_fan + REAR_FAN_OFFSET, "tacho%d_rpm", &rear_fan);
+ read_fan_value(real_fan + REAR_FAN_OFFSET, FAN_READ_RPM_FORMAT, &rear_fan);
rear_pct = fan_rpm_to_pct(rpm_rear_map, REAR_MAP_SIZE, rear_fan);
#endif
@@ -539,7 +684,7 @@ int fan_speed_okay(const int fan, const int speed, const int slop) {
#endif
if (!okay || verbose) {
- syslog(!okay ? LOG_ALERT : LOG_INFO,
+ syslog(!okay ? LOG_WARNING : LOG_INFO,
#ifdef BACK_TO_BACK_FANS
"fan %d rear %d (%d%%), front %d (%d%%), expected %d",
#else
@@ -570,11 +715,19 @@ int write_fan_speed(const int fan, const int value) {
int real_fan = fan_to_pwm_map[fan];
if (value == 0) {
+#if defined(CONFIG_WEDGE100)
+ return write_fan_value(real_fan, "fantray%d_pwm", 0);
+#else
return write_fan_value(real_fan, "pwm%d_en", 0);
+#endif
} else {
int unit = value * PWM_UNIT_MAX / 100;
int status;
+#if defined(CONFIG_WEDGE100)
+ // Note that PWM for Wedge100 is in 32nds of a cycle
+ return write_fan_value(real_fan, "fantray%d_pwm", unit);
+#else
if (unit == PWM_UNIT_MAX)
unit = 0;
@@ -584,14 +737,25 @@ int write_fan_speed(const int fan, const int value) {
(status = write_fan_value(real_fan, "pwm%d_en", 1)) != 0) {
return status;
}
+#endif
+ }
+}
+
+#if defined(CONFIG_YOSEMITE)
+int temp_to_fan_speed(int temp, struct temp_to_pct_map *map, int map_size) {
+ int i = map_size - 1;
+
+ while (i > 0 && temp < map[i].temp) {
+ --i;
}
+ return map[i].speed;
}
+#endif
/* Set up fan LEDs */
-int write_fan_led(const int fan, const char *color)
-{
-#ifdef CONFIG_WEDGE
+int write_fan_led(const int fan, const char *color) {
+#if defined(CONFIG_WEDGE100) || defined(CONFIG_WEDGE)
return write_device(fan_led[fan], color);
#else
return 0;
@@ -605,9 +769,14 @@ int server_shutdown(const char *why) {
}
syslog(LOG_EMERG, "Shutting down: %s", why);
+#if defined(CONFIG_WEDGE100)
+ write_device(USERVER_POWER, "0");
+ sleep(5);
+ write_device(MAIN_POWER, "0");
+#endif
+#if defined(CONFIG_WEDGE) && !defined(CONFIG_WEDGE100)
write_device(GPIO_USERVER_POWER_DIRECTION, "out");
write_device(GPIO_USERVER_POWER, "0");
-#ifdef CONFIG_WEDGE
/*
* Putting T2 in reset generates a non-maskable interrupt to uS,
* the kernel running on uS might panic depending on its version.
@@ -627,7 +796,6 @@ int server_shutdown(const char *why) {
system("rmmod adm1275");
system("i2cset -y 12 0x10 0x01 00");
}
-
#else
// TODO(7088822): try throttling, then shutting down server.
syslog(LOG_EMERG, "Need to implement actual shutdown!\n");
@@ -654,7 +822,7 @@ void fand_interrupt(int sig)
write_fan_speed(fan + fan_offset, fan_max);
}
- syslog(LOG_ALERT, "Shutting down fand on signal %s", strsignal(sig));
+ syslog(LOG_WARNING, "Shutting down fand on signal %s", strsignal(sig));
if (sig == SIGUSR1) {
stop_watchdog();
}
@@ -664,10 +832,10 @@ void fand_interrupt(int sig)
int main(int argc, char **argv) {
/* Sensor values */
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE)
int intake_temp;
int exhaust_temp;
- int t2_temp;
+ int switch_temp;
int userver_temp;
#else
float intake_temp;
@@ -702,7 +870,7 @@ int main(int argc, char **argv) {
openlog("fand", LOG_CONS, LOG_DAEMON);
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) && !defined(CONFIG_WEDGE100)
if (is_two_fan_board(false)) {
/* Alternate, two fan configuration */
total_fans = 2;
@@ -779,11 +947,25 @@ int main(int argc, char **argv) {
write_fan_led(fan + fan_offset, FAN_LED_BLUE);
}
-#ifdef CONFIG_YOSEMITE
+#if defined(CONFIG_YOSEMITE)
/* Ensure that we can read from sensors before proceeding. */
- while (yosemite_sensor_read(1, BIC_SENSOR_SOC_TEMP, &userver_temp))
- syslog(LOG_DEBUG, "Failed reading of SOC_TEMP.");
+ int found = 0;
+ userver_temp = 100;
+ while (!found) {
+ for (int node = 1; node <= TOTAL_1S_SERVERS && !found; node++) {
+ if (!yosemite_sensor_read(node, BIC_SENSOR_SOC_THERM_MARGIN,
+ &userver_temp) &&
+ userver_temp < 0) {
+ syslog(LOG_DEBUG, "SOC_THERM_MARGIN first valid read of %f.",
+ userver_temp);
+ found = 1;
+ }
+ sleep(5);
+ }
+ // XXX: Will it ever be a problem that we don't exit this until
+ // we see a valid value?
+ }
#endif
/* Start watchdog in manual mode */
@@ -801,10 +983,10 @@ int main(int argc, char **argv) {
/* Read sensors */
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
read_temp(INTAKE_TEMP_DEVICE, &intake_temp);
read_temp(EXHAUST_TEMP_DEVICE, &exhaust_temp);
- read_temp(T2_TEMP_DEVICE, &t2_temp);
+ read_temp(CHIP_TEMP_DEVICE, &switch_temp);
read_temp(USERVER_TEMP_DEVICE, &userver_temp);
/*
@@ -813,13 +995,13 @@ int main(int argc, char **argv) {
*/
if ((intake_temp == BAD_TEMP || exhaust_temp == BAD_TEMP ||
- t2_temp == BAD_TEMP)) {
+ switch_temp == BAD_TEMP)) {
bad_reads++;
}
#else
- userver_temp = BAD_TEMP;
- if (yosemite_sensor_read(1, SP_SENSOR_INLET_TEMP, &intake_temp) ||
- yosemite_sensor_read(1, SP_SENSOR_OUTLET_TEMP, &exhaust_temp))
+ intake_temp = exhaust_temp = userver_temp = BAD_TEMP;
+ if (yosemite_sensor_read(FRU_SPB, SP_SENSOR_INLET_TEMP, &intake_temp) ||
+ yosemite_sensor_read(FRU_SPB, SP_SENSOR_OUTLET_TEMP, &exhaust_temp))
bad_reads++;
/*
@@ -829,11 +1011,15 @@ int main(int argc, char **argv) {
*/
for (int node = 1; node <= TOTAL_1S_SERVERS; node++) {
float new_temp;
- if (!yosemite_sensor_read(node, BIC_SENSOR_SOC_TEMP, &new_temp)) {
+ if (!yosemite_sensor_read(node, BIC_SENSOR_SOC_THERM_MARGIN,
+ &new_temp)) {
if (userver_temp < new_temp) {
userver_temp = new_temp;
}
}
+
+ // Since the yosemite_sensor_read() times out after 8secs, keep WDT from expiring
+ kick_watchdog();
}
#endif
@@ -843,7 +1029,7 @@ int main(int argc, char **argv) {
if (log_count++ % report_temp == 0) {
syslog(LOG_DEBUG,
-#ifdef CONFIG_WEDGE
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
"Temp intake %d, t2 %d, "
" userver %d, exhaust %d, "
"fan speed %d, speed changes %d",
@@ -852,8 +1038,8 @@ int main(int argc, char **argv) {
"fan speed %d, speed changes %d",
#endif
intake_temp,
-#ifdef CONFIG_WEDGE
- t2_temp,
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
+ switch_temp,
#endif
userver_temp,
exhaust_temp,
@@ -867,8 +1053,8 @@ int main(int argc, char **argv) {
server_shutdown("Intake temp limit reached");
}
-#ifdef CONFIG_WEDGE
- if (t2_temp > T2_LIMIT) {
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
+ if (switch_temp > SWITCH_LIMIT) {
server_shutdown("T2 temp limit reached");
}
#endif
@@ -885,20 +1071,28 @@ int main(int argc, char **argv) {
* as well.
*/
-#ifdef CONFIG_WEDGE
- if (t2_temp > userver_temp + USERVER_TEMP_FUDGE) {
- max_temp = t2_temp;
+#if defined(CONFIG_YOSEMITE)
+ /* Use tables to lookup the new fan speed for Yosemite. */
+
+ int intake_speed = temp_to_fan_speed(intake_temp, intake_map,
+ INTAKE_MAP_SIZE);
+ int cpu_speed = temp_to_fan_speed(userver_temp, cpu_map, CPU_MAP_SIZE);
+
+ if (fan_speed == fan_max && fan_failure != 0) {
+ /* Don't change a thing */
+ } else if (intake_speed > cpu_speed) {
+ fan_speed = intake_speed;
} else {
- max_temp = userver_temp + USERVER_TEMP_FUDGE;
+ fan_speed = cpu_speed;
}
#else
- /* Yosemite could have no servers turned on, so ignore that case. */
- if (userver_temp + USERVER_TEMP_FUDGE > exhaust_temp) {
- max_temp = userver_temp + USERVER_TEMP_FUDGE;
+ /* Other systems use a simpler built-in table to determine fan speed. */
+
+ if (switch_temp > userver_temp + USERVER_TEMP_FUDGE) {
+ max_temp = switch_temp;
} else {
- max_temp = exhaust_temp;
+ max_temp = userver_temp + USERVER_TEMP_FUDGE;
}
-#endif
/*
* If recovering from a fan problem, spin down fans gradually in case
@@ -924,6 +1118,7 @@ int main(int argc, char **argv) {
fan_speed = fan_medium;
}
}
+#endif
/*
* Update fans only if there are no failed ones. If any fans failed
@@ -962,7 +1157,7 @@ int main(int argc, char **argv) {
if (fan_speed_okay(fan + fan_offset, fan_speed, FAN_FAILURE_OFFSET)) {
if (fan_bad[fan] > FAN_FAILURE_THRESHOLD) {
write_fan_led(fan + fan_offset, FAN_LED_BLUE);
- syslog(LOG_NOTICE,
+ syslog(LOG_CRIT,
"Fan %d has recovered",
fan);
}
@@ -982,7 +1177,7 @@ int main(int argc, char **argv) {
if (fan_failure > 0) {
if (prev_fans_bad != fan_failure) {
- syslog(LOG_ALERT, "%d fans failed", fan_failure);
+ syslog(LOG_CRIT, "%d fans failed", fan_failure);
}
/*
@@ -999,6 +1194,15 @@ int main(int argc, char **argv) {
write_fan_speed(fan + fan_offset, fan_speed);
}
+#if defined(CONFIG_WEDGE) || defined(CONFIG_WEDGE100)
+ /*
+ * On Wedge, we want to shut down everything if none of the fans
+ * are visible, since there isn't automatic protection to shut
+ * off the server or switch chip. On other platforms, the CPUs
+ * generating the heat will automatically turn off, so this is
+ * unnecessary.
+ */
+
if (fan_failure == total_fans) {
int count = 0;
for (fan = 0; fan < total_fans; fan++) {
@@ -1009,7 +1213,7 @@ int main(int argc, char **argv) {
server_shutdown("all fans are bad for more than 12 cycles");
}
}
-
+#endif
/*
* Fans can be hot swapped and replaced; in which case the fan daemon
diff --git a/common/recipes-core/fan-ctrl/fan-ctrl/watchdog.cpp b/common/recipes-core/fan-ctrl/fan-ctrl/watchdog.cpp
index ebb390a..f6e5a45 100644
--- a/common/recipes-core/fan-ctrl/fan-ctrl/watchdog.cpp
+++ b/common/recipes-core/fan-ctrl/fan-ctrl/watchdog.cpp
@@ -100,7 +100,7 @@ int start_watchdog(const int auto_mode) {
while ((status = write(watchdog_dev, WATCHDOG_START_KEY, 1)) == 0
&& errno == EINTR);
pthread_mutex_unlock(&watchdog_lock);
- syslog(LOG_ALERT, "system watchdog already started.\n");
+ syslog(LOG_WARNING, "system watchdog already started.\n");
return 0;
}
@@ -128,7 +128,7 @@ fail:
}
pthread_mutex_unlock(&watchdog_lock);
- syslog(LOG_ALERT, "system watchdog failed to start!\n");
+ syslog(LOG_WARNING, "system watchdog failed to start!\n");
return 0;
}
diff --git a/common/recipes-core/fruid/files/fruid-util.c b/common/recipes-core/fruid/files/fruid-util.c
index 3c8d2e1..d0e19b8 100644
--- a/common/recipes-core/fruid/files/fruid-util.c
+++ b/common/recipes-core/fruid/files/fruid-util.c
@@ -18,11 +18,37 @@
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <syslog.h>
+#include <string.h>
#include <openbmc/fruid.h>
#include <openbmc/pal.h>
+#define EEPROM_READ 0x1
+#define EEPROM_WRITE 0x2
+#define FRUID_SIZE 256
+
+/* To copy the bin files */
+static int
+copy_file(int out, int in, int bs) {
+
+ ssize_t bytes_rd, bytes_wr;
+ uint64_t tmp[FRUID_SIZE];
+
+ while ((bytes_rd = read(in, tmp, FRUID_SIZE)) > 0) {
+ bytes_wr = write(out, tmp, bytes_rd);
+ if (bytes_wr != bytes_rd) {
+ return errno;
+ }
+ }
+ return 0;
+}
+
/* Print the FRUID in detail */
-void print_fruid_info(fruid_info_t *fruid, const char *name)
+static void
+print_fruid_info(fruid_info_t *fruid, const char *name)
{
/* Print format */
printf("%-27s: %s", "\nFRU Information",
@@ -78,18 +104,27 @@ void get_fruid_info(uint8_t fru, char *path, char* name) {
static int
print_usage() {
- printf("Usage: fruid-util [ %s ]\n", pal_fru_list);
+ printf("Usage: fruid-util [ %s ]\n"
+ "Usage: fruid-util [%s] [--dump | --write ] <file>\n",
+ pal_fru_list, pal_fru_list);
}
/* Utility to just print the FRUID */
int main(int argc, char * argv[]) {
int ret;
+ int rw = 0;
+ int fd_tmpbin;
+ int fd_newbin;
+ int fd_eeprom;
uint8_t fru;
+ char *file_path = NULL;
char path[64] = {0};
+ char eeprom_path[64] = {0};
char name[64] = {0};
+ char command[128] = {0};
- if (argc != 2) {
+ if (argc != 2 && argc != 4) {
print_usage();
exit(-1);
}
@@ -100,8 +135,119 @@ int main(int argc, char * argv[]) {
return ret;
}
- if (fru == 0) {
+ if (fru == 0 && argc > 2) {
+ print_usage();
+ exit(-1);
+ }
+
+ if (argc > 2) {
+ if (!strcmp(argv[2], "--dump")) {
+ rw = EEPROM_READ;
+ file_path = argv[3];
+ } else if (!strcmp(argv[2], "--write")) {
+ rw = EEPROM_WRITE;
+ file_path = argv[3];
+ }
+ }
+
+ // Check if the new eeprom binary file exits.
+ // TODO: Add file size check before adding to the eeprom
+ if (rw == EEPROM_WRITE && (access(file_path, F_OK) == -1)) {
+ print_usage();
+ exit(-1);
+ }
+
+ if (fru != 0) {
+ ret = pal_get_fruid_path(fru, path);
+ if (ret < 0) {
+ return ret;
+ }
+
+ errno = 0;
+
+ /* FRUID BINARY DUMP */
+ if (rw == EEPROM_READ) {
+ fd_tmpbin = open(path, O_RDONLY);
+ if (fd_tmpbin == -1) {
+ syslog(LOG_ERR, "Unable to open the %s file: %s", path, strerror(errno));
+ return errno;
+ }
+
+ fd_newbin = open(file_path, O_WRONLY | O_CREAT, 0644);
+ if (fd_newbin == -1) {
+ syslog(LOG_ERR, "Unable to create %s file: %s", file_path, strerror(errno));
+ return errno;
+ }
+
+ ret = copy_file(fd_newbin, fd_tmpbin, FRUID_SIZE);
+ if (ret < 0) {
+ syslog(LOG_ERR, "copy: write to %s file failed: %s",
+ file_path, strerror(errno));
+ return ret;
+ }
+
+ close(fd_newbin);
+ close(fd_tmpbin);
+
+ } else if (rw == EEPROM_WRITE) {
+
+ /* FRUID BINARY WRITE */
+
+ fd_tmpbin = open(path, O_WRONLY);
+ if (fd_tmpbin == -1) {
+ syslog(LOG_ERR, "Unable to open the %s file: %s", path, strerror(errno));
+ return errno;
+ }
+
+ fd_newbin = open(file_path, O_RDONLY);
+ if (fd_newbin == -1) {
+ syslog(LOG_ERR, "Unable to open the %s file: %s", file_path, strerror(errno));
+ return errno;
+ }
+
+ ret = pal_get_fruid_eeprom_path(fru, eeprom_path);
+ if (ret < 0) {
+ //Can not handle in common, so call pal libray for update
+ pal_fruid_write(fru, file_path);
+ } else {
+ if (access(eeprom_path, F_OK) == -1) {
+ syslog(LOG_ERR, "cannot access the eeprom file : %s for fru %d",
+ eeprom_path, fru);
+ close(fd_newbin);
+ close(fd_tmpbin);
+ return -1;
+ }
+ sprintf(command, "dd if=%s of=%s bs=%d count=1", file_path, eeprom_path, FRUID_SIZE);
+ system(command);
+ }
+
+ ret = copy_file(fd_tmpbin, fd_newbin, FRUID_SIZE);
+ if (ret < 0) {
+ syslog(LOG_ERR, "copy: write to %s file failed: %s",
+ path, strerror(errno));
+ return ret;
+ }
+
+ close(fd_newbin);
+ close(fd_tmpbin);
+
+ } else {
+ /* FRUID PRINT ONE FRU */
+
+ ret = pal_get_fruid_name(fru, name);
+ if (ret < 0) {
+ return ret;
+ }
+
+ get_fruid_info(fru, path, name);
+ }
+
+ } else if (fru == 0) {
+
+ /* FRUID PRINT ALL FRUs */
+
fru = 1;
+
while (fru <= MAX_NUM_FRUS) {
ret = pal_get_fruid_path(fru, path);
if (ret < 0) {
@@ -113,32 +259,10 @@ int main(int argc, char * argv[]) {
return ret;
}
- if (fru == FRU_NIC) {
- printf("fruid-util does not support nic\n");
- exit(-1);
- }
-
get_fruid_info(fru, path, name);
fru++;
}
- } else {
- ret = pal_get_fruid_path(fru, path);
- if (ret < 0) {
- return ret;
- }
-
- ret = pal_get_fruid_name(fru, name);
- if (ret < 0) {
- return ret;
- }
-
- if (fru == FRU_NIC) {
- printf("fruid-util does not support nic\n");
- exit(-1);
- }
-
- get_fruid_info(fru, path, name);
}
return 0;
diff --git a/common/recipes-core/healthd/files/Makefile b/common/recipes-core/healthd/files/Makefile
new file mode 100644
index 0000000..13c0f66
--- /dev/null
+++ b/common/recipes-core/healthd/files/Makefile
@@ -0,0 +1,26 @@
+# Copyright 2015-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+all: healthd
+
+healthd: healthd.c
+ $(CC) $(CFLAGS) -pthread -lm -std=c99 -o $@ $^ $(LDFLAGS)
+
+.PHONY: clean
+
+clean:
+ rm -rf *.o healthd
diff --git a/common/recipes-core/healthd/files/healthd.c b/common/recipes-core/healthd/files/healthd.c
new file mode 100644
index 0000000..f02a363
--- /dev/null
+++ b/common/recipes-core/healthd/files/healthd.c
@@ -0,0 +1,77 @@
+/*
+ * healthd
+ *
+ * Copyright 2015-present Facebook. All Rights Reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <syslog.h>
+#include <errno.h>
+#include <unistd.h>
+#include <stdint.h>
+#include <string.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/file.h>
+#include <openbmc/pal.h>
+
+static void
+initilize_all_kv() {
+ pal_set_def_key_value();
+}
+
+static void
+check_all_daemon_health() {
+ while(1) {
+
+ /*
+ * TODO: Check if all the daemons are running fine
+ * TODO: Move the HB led control to this daemon
+ * TODO: Move the watchdog timer to this daemon
+ */
+ sleep(10);
+ }
+}
+
+int
+main(int argc, void **argv) {
+ int dev, rc, pid_file;
+
+ if (argc > 1) {
+ exit(1);
+ }
+
+ pid_file = open("/var/run/healthd.pid", O_CREAT | O_RDWR, 0666);
+ rc = flock(pid_file, LOCK_EX | LOCK_NB);
+ if(rc) {
+ if(EWOULDBLOCK == errno) {
+ printf("Another healthd instance is running...\n");
+ exit(-1);
+ }
+ } else {
+
+ daemon(0,1);
+ openlog("healthd", LOG_CONS, LOG_DAEMON);
+ syslog(LOG_INFO, "healthd: daemon started");
+ }
+
+ initilize_all_kv();
+ check_all_daemon_health();
+ return 0;
+}
+
diff --git a/common/recipes-core/healthd/files/setup-healthd.sh b/common/recipes-core/healthd/files/setup-healthd.sh
new file mode 100644
index 0000000..b64be65
--- /dev/null
+++ b/common/recipes-core/healthd/files/setup-healthd.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+#
+# Copyright 2015-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+
+### BEGIN INIT INFO
+# Provides: setup-healthd
+# Required-Start:
+# Required-Stop:
+# Default-Start: S
+# Default-Stop:
+# Short-Description: Setup sensor monitoring
+### END INIT INFO
+
+echo -n "Setup healthd for BMC "
+
+/usr/local/bin/healthd
+
+echo "done."
diff --git a/common/recipes-core/healthd/healthd_0.1.bb b/common/recipes-core/healthd/healthd_0.1.bb
new file mode 100644
index 0000000..0c4b2e9
--- /dev/null
+++ b/common/recipes-core/healthd/healthd_0.1.bb
@@ -0,0 +1,42 @@
+# Copyright 2015-present Facebook. All Rights Reserved.
+SUMMARY = "Health Monitoring Daemon"
+DESCRIPTION = "Daemon for BMC Health monitoring"
+SECTION = "base"
+PR = "r1"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://healthd.c;beginline=4;endline=16;md5=b395943ba8a0717a83e62ca123a8d238"
+
+SRC_URI = "file://Makefile \
+ file://healthd.c \
+ file://setup-healthd.sh \
+ "
+S = "${WORKDIR}"
+
+LDFLAGS =+ " -lpal "
+
+DEPENDS =+ " libpal "
+
+binfiles = "healthd"
+
+pkgdir = "healthd"
+
+do_install() {
+ dst="${D}/usr/local/fbpackages/${pkgdir}"
+ bin="${D}/usr/local/bin"
+ install -d $dst
+ install -d $bin
+ install -m 755 healthd ${dst}/healthd
+ ln -snf ../fbpackages/${pkgdir}/healthd ${bin}/healthd
+
+ install -d ${D}${sysconfdir}/init.d
+ install -d ${D}${sysconfdir}/rcS.d
+ install -m 755 setup-healthd.sh ${D}${sysconfdir}/init.d/setup-healthd.sh
+ update-rc.d -r ${D} setup-healthd.sh start 91 5 .
+}
+
+FBPACKAGEDIR = "${prefix}/local/fbpackages"
+
+FILES_${PN} = "${FBPACKAGEDIR}/healthd ${prefix}/local/bin ${sysconfdir} "
+
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
diff --git a/common/recipes-core/i2c-tools/i2c-tools_3.1.1.bb b/common/recipes-core/i2c-tools/i2c-tools_3.1.1.bb
deleted file mode 100644
index 6743e3f..0000000
--- a/common/recipes-core/i2c-tools/i2c-tools_3.1.1.bb
+++ /dev/null
@@ -1,38 +0,0 @@
-DESCRIPTION = "i2c tools"
-SECTION = "base"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRCREV = "6235"
-SRC_URI = "svn://lm-sensors.org/svn/i2c-tools/branches/;protocol=http;module=i2c-tools-3.1 \
- "
-
-S = "${WORKDIR}/i2c-tools-3.1"
-
-i2ctools = "i2cdetect \
- i2cdump \
- i2cget \
- i2cset \
- "
-
-eepromtools = "eepromer \
- eeprom \
- eeprog \
- "
-
-do_compile() {
- make -C eepromer
- make
-}
-
-do_install() {
- mkdir -p ${D}/${bindir}
- for f in ${i2ctools}; do
- install -m 755 tools/$f ${D}/${bindir}/$f
- done
- for f in ${eepromtools}; do
- install -m 755 eepromer/$f ${D}/${bindir}/$f
- done
-}
-
-FILES_${PN} = "${bindir}"
diff --git a/meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_down b/common/recipes-core/init-ifupdown/files/dhcpv6_down
index a44deb4..a44deb4 100644
--- a/meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_down
+++ b/common/recipes-core/init-ifupdown/files/dhcpv6_down
diff --git a/meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_up b/common/recipes-core/init-ifupdown/files/dhcpv6_up
index 6469b9f..6469b9f 100644
--- a/meta-facebook/meta-wedge/recipes-core/init-ifupdown/files/dhcpv6_up
+++ b/common/recipes-core/init-ifupdown/files/dhcpv6_up
diff --git a/common/recipes-core/init-ifupdown/init-ifupdown_%.bbappend b/common/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
index 7d74521..e715c27 100644
--- a/common/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
+++ b/common/recipes-core/init-ifupdown/init-ifupdown_%.bbappend
@@ -1,2 +1,18 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI += "file://dhcpv6_up \
+ file://dhcpv6_down \
+ "
+
+do_install_append() {
+ # rules to request dhcpv6
+ install -d ${D}/${sysconfdir}/network/if-up.d
+ install -m 755 ${WORKDIR}/dhcpv6_up ${D}${sysconfdir}/network/if-up.d/dhcpv6_up
+ install -d ${D}/${sysconfdir}/network/if-down.d
+ install -m 755 ${WORKDIR}/dhcpv6_down ${D}${sysconfdir}/network/if-down.d/dhcpv6_down
+}
+
+FILES_${PN} += "${sysconfdir}/network/if-up.d/dhcpv6_up \
+ ${sysconfdir}/network/if-down.d/dhcpv6_down \
+ "
diff --git a/common/recipes-core/ipmbd/files/ipmbd.c b/common/recipes-core/ipmbd/files/ipmbd.c
index 5ea5af3..ae40ec7 100644
--- a/common/recipes-core/ipmbd/files/ipmbd.c
+++ b/common/recipes-core/ipmbd/files/ipmbd.c
@@ -73,7 +73,7 @@
#define MQ_IPMB_REQ "/mq_ipmb_req"
#define MQ_IPMB_RES "/mq_ipmb_res"
#define MQ_MAX_MSG_SIZE MAX_BYTES
-#define MQ_MAX_NUM_MSGS 10
+#define MQ_MAX_NUM_MSGS 20
#define SEQ_NUM_MAX 64
@@ -108,6 +108,8 @@ pthread_mutex_t m_seq;
pthread_mutex_t m_i2c;
+static int g_bus_id = 0; // store the i2c bus ID for debug print
+
#ifdef CONFIG_YOSEMITE
// Returns the payload ID from IPMB bus routing
// Slot#1: bus#3, Slot#2: bus#1, Slot#3: bus#7, Slot#4: bus#5
@@ -129,7 +131,7 @@ get_payload_id(uint8_t bus_id) {
payload_id = 3;
break;
default:
- syslog(LOG_ALERT, "get_payload_id: Wrong bus ID\n");
+ syslog(LOG_WARNING, "get_payload_id: Wrong bus ID\n");
break;
}
@@ -138,9 +140,9 @@ get_payload_id(uint8_t bus_id) {
#endif
// Returns an unused seq# from all possible seq#
-static uint8_t
+static int8_t
seq_get_new(void) {
- uint8_t ret = -1;
+ int8_t ret = -1;
uint8_t index;
pthread_mutex_lock(&m_seq);
@@ -183,13 +185,13 @@ i2c_open(uint8_t bus_num) {
snprintf(fn, sizeof(fn), "/dev/i2c-%d", bus_num);
fd = open(fn, O_RDWR);
if (fd == -1) {
- syslog(LOG_ALERT, "Failed to open i2c device %s", fn);
+ syslog(LOG_WARNING, "Failed to open i2c device %s", fn);
return -1;
}
rc = ioctl(fd, I2C_SLAVE, BRIDGE_SLAVE_ADDR);
if (rc < 0) {
- syslog(LOG_ALERT, "Failed to open slave @ address 0x%x", BRIDGE_SLAVE_ADDR);
+ syslog(LOG_WARNING, "Failed to open slave @ address 0x%x", BRIDGE_SLAVE_ADDR);
close(fd);
return -1;
}
@@ -227,7 +229,7 @@ i2c_write(int fd, uint8_t *buf, uint8_t len) {
}
if (rc < 0) {
- syslog(LOG_ALERT, "Failed to do raw io");
+ syslog(LOG_WARNING, "Failed to do raw io");
pthread_mutex_unlock(&m_i2c);
return -1;
}
@@ -249,7 +251,7 @@ i2c_slave_open(uint8_t bus_num) {
snprintf(fn, sizeof(fn), "/dev/i2c-%d", bus_num);
fd = open(fn, O_RDWR);
if (fd == -1) {
- syslog(LOG_ALERT, "Failed to open i2c device %s", fn);
+ syslog(LOG_WARNING, "Failed to open i2c device %s", fn);
return -1;
}
@@ -266,7 +268,7 @@ i2c_slave_open(uint8_t bus_num) {
rc = ioctl(fd, I2C_SLAVE_RDWR, &data);
if (rc < 0) {
- syslog(LOG_ALERT, "Failed to open slave @ address 0x%x", BMC_SLAVE_ADDR);
+ syslog(LOG_WARNING, "Failed to open slave @ address 0x%x", BMC_SLAVE_ADDR);
close(fd);
}
@@ -341,22 +343,22 @@ ipmb_req_handler(void *bus_num) {
// Open the i2c bus for sending response
fd = i2c_open(*bnum);
if (fd < 0) {
- syslog(LOG_ALERT, "i2c_open failure\n");
+ syslog(LOG_WARNING, "i2c_open failure\n");
close(mq);
return NULL;
}
// Loop to process incoming requests
while (1) {
- if ((rlen = mq_receive(mq, rxbuf, MQ_MAX_MSG_SIZE, NULL)) < 0) {
+ if ((rlen = mq_receive(mq, rxbuf, MQ_MAX_MSG_SIZE, NULL)) <= 0) {
sleep(1);
continue;
}
#ifdef DEBUG
- syslog(LOG_ALERT, "Received Request of %d bytes\n", rlen);
+ syslog(LOG_WARNING, "Received Request of %d bytes\n", rlen);
for (i = 0; i < rlen; i++) {
- syslog(LOG_ALERT, "0x%X", rxbuf[i]);
+ syslog(LOG_WARNING, "0x%X", rxbuf[i]);
}
#endif
@@ -407,9 +409,9 @@ ipmb_req_handler(void *bus_num) {
p_ipmb_res->data[tlen-IPMI_RESP_HDR_SIZE];
#ifdef DEBUG
- syslog(LOG_ALERT, "Sending Response of %d bytes\n", tlen+IPMB_HDR_SIZE-1);
+ syslog(LOG_WARNING, "Sending Response of %d bytes\n", tlen+IPMB_HDR_SIZE-1);
for (i = 1; i < tlen+IPMB_HDR_SIZE; i++) {
- syslog(LOG_ALERT, "0x%X:", txbuf[i]);
+ syslog(LOG_WARNING, "0x%X:", txbuf[i]);
}
#endif
@@ -428,45 +430,65 @@ ipmb_res_handler(void *bus_num) {
ipmb_res_t *p_res;
uint8_t index;
char mq_ipmb_res[64] = {0};
+ uint8_t hack = 0;
sprintf(mq_ipmb_res, "%s_%d", MQ_IPMB_RES, *bnum);
// Open the message queue
mq = mq_open(mq_ipmb_res, O_RDONLY);
if (mq == (mqd_t) -1) {
- syslog(LOG_ALERT, "mq_open fails\n");
+ syslog(LOG_WARNING, "mq_open fails\n");
return NULL;
}
// Loop to wait for incomng response messages
while (1) {
- if ((len = mq_receive(mq, buf, MQ_MAX_MSG_SIZE, NULL)) < 0) {
+ if ((len = mq_receive(mq, buf, MQ_MAX_MSG_SIZE, NULL)) <= 0) {
sleep(1);
continue;
}
p_res = (ipmb_res_t *) buf;
+
// Check the seq# of response
index = p_res->seq_lun >> LUN_OFFSET;
+ // TODO: observed the IPMB packets with missing slave address at first byte;
+ // detect and correct them for now, but need fix in i2c driver
+ hack = 0;
+ if ((p_res->res_slave_addr != (BRIDGE_SLAVE_ADDR << 1)) ||
+ (p_res->res_slave_addr == p_res->hdr_cksum)) {
+ index = p_res->res_slave_addr >> LUN_OFFSET;
+ hack = 1;
+ }
// Check if the response is being waited for
pthread_mutex_lock(&m_seq);
if (g_seq.seq[index].in_use) {
// Copy the response to the requester's buffer
- memcpy(g_seq.seq[index].p_buf, buf, len);
- g_seq.seq[index].len = len;
+ if (hack) {
+ // TODO: hack to correct the packet with missing slave address for now
+ *(g_seq.seq[index].p_buf) = (BMC_SLAVE_ADDR << 1);
+ memcpy(g_seq.seq[index].p_buf+1, buf, len);
+ g_seq.seq[index].len = len+1;
+ } else {
+ memcpy(g_seq.seq[index].p_buf, buf, len);
+ g_seq.seq[index].len = len;
+ }
// Wake up the worker thread to receive the response
sem_post(&g_seq.seq[index].s_seq);
+ } else {
+ // Either the IPMB packet is corrupted or arrived late after client exits
+ syslog(LOG_WARNING, "bus: %d, WRONG packet received with seq#%d\n", g_bus_id, index);
}
pthread_mutex_unlock(&m_seq);
#ifdef DEBUG
- syslog(LOG_ALERT, "Received Response of %d bytes\n", len);
+ syslog(LOG_WARNING, "Received Response of %d bytes\n", len);
int i;
for (i = 0; i < len; i++) {
- syslog(LOG_ALERT, "0x%X:", buf[i]);
+ syslog(LOG_WARNING, "0x%X:", buf[i]);
}
#endif
}
@@ -494,7 +516,7 @@ ipmb_rx_handler(void *bus_num) {
// Open the i2c bus as a slave
fd = i2c_slave_open(*bnum);
if (fd < 0) {
- syslog(LOG_ALERT, "i2c_slave_open fails\n");
+ syslog(LOG_WARNING, "i2c_slave_open fails\n");
goto cleanup;
}
@@ -504,13 +526,13 @@ ipmb_rx_handler(void *bus_num) {
// Open the message queues for post processing
mq_req = mq_open(mq_ipmb_req, O_WRONLY);
if (mq_req == (mqd_t) -1) {
- syslog(LOG_ALERT, "mq_open req fails\n");
+ syslog(LOG_WARNING, "mq_open req fails\n");
goto cleanup;
}
mq_res = mq_open(mq_ipmb_res, O_WRONLY);
if (mq_res == (mqd_t) -1) {
- syslog(LOG_ALERT, "mq_open res fails\n");
+ syslog(LOG_WARNING, "mq_open res fails\n");
goto cleanup;
}
@@ -532,9 +554,9 @@ ipmb_rx_handler(void *bus_num) {
tmq = mq_req;
}
// Post message to approriate Queue for further processing
- if (mq_send(tmq, buf, len, 0)) {
- syslog(LOG_ALERT, "mq_send failed\n");
- sleep(1);
+ if (mq_timedsend(tmq, buf, len, 0, &req)) {
+ //syslog(LOG_WARNING, "mq_send failed for queue %d\n", tmq);
+ nanosleep(&req, &rem);
continue;
}
}
@@ -563,7 +585,7 @@ ipmb_handle (int fd, unsigned char *request, unsigned char req_len,
ipmb_req_t *req = (ipmb_req_t *) request;
ipmb_res_t *res = (ipmb_res_t *) response;
- uint8_t index;
+ int8_t index;
struct timespec ts;
// Allocate right sequence Number
@@ -598,12 +620,12 @@ ipmb_handle (int fd, unsigned char *request, unsigned char req_len,
// Wait on semaphore for that sequence Number
clock_gettime(CLOCK_REALTIME, &ts);
- ts.tv_sec += TIMEOUT_IPMI;
+ ts.tv_sec += TIMEOUT_IPMB;
int ret;
ret = sem_timedwait(&g_seq.seq[index].s_seq, &ts);
if (ret == -1) {
- syslog(LOG_ALERT, "No response for sequence number: %d\n", index);
+ syslog(LOG_DEBUG, "No response for sequence number: %d\n", index);
*res_len = 0;
}
@@ -628,17 +650,26 @@ void
unsigned char req_buf[MAX_IPMI_MSG_SIZE];
unsigned char res_buf[MAX_IPMI_MSG_SIZE];
unsigned char res_len = 0;
+ struct timeval tv;
+
+ // setup timeout for receving on socket
+ tv.tv_sec = TIMEOUT_IPMB;
+ tv.tv_usec = 0;
+
+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,sizeof(struct timeval));
n = recv(sock, req_buf, sizeof(req_buf), 0);
if (n <= 0) {
- syslog(LOG_ALERT, "ipmbd: recv() failed with %d\n", n);
+ syslog(LOG_WARNING, "ipmbd: recv() failed with %d\n", n);
goto conn_cleanup;
}
ipmb_handle(fd, req_buf, n, res_buf, &res_len);
if (send(sock, res_buf, res_len, MSG_NOSIGNAL) < 0) {
- syslog(LOG_ALERT, "ipmbd: send() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "ipmbd: send() failed\n");
+#endif
}
conn_cleanup:
@@ -659,11 +690,12 @@ ipmb_lib_handler(void *bus_num) {
int fd;
uint8_t *bnum = (uint8_t*) bus_num;
char sock_path[20] = {0};
+ int rc = 0;
// Open the i2c bus for sending request
fd = i2c_open(*bnum);
if (fd < 0) {
- syslog(LOG_ALERT, "i2c_open failure\n");
+ syslog(LOG_WARNING, "i2c_open failure\n");
return NULL;
}
@@ -680,7 +712,7 @@ ipmb_lib_handler(void *bus_num) {
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) == -1)
{
- syslog(LOG_ALERT, "ipmbd: socket() failed\n");
+ syslog(LOG_WARNING, "ipmbd: socket() failed\n");
exit (1);
}
@@ -692,22 +724,25 @@ ipmb_lib_handler(void *bus_num) {
len = strlen (local.sun_path) + sizeof (local.sun_family);
if (bind (s, (struct sockaddr *) &local, len) == -1)
{
- syslog(LOG_ALERT, "ipmbd: bind() failed\n");
+ syslog(LOG_WARNING, "ipmbd: bind() failed\n");
exit (1);
}
if (listen (s, 5) == -1)
{
- syslog(LOG_ALERT, "ipmbd: listen() failed\n");
+ syslog(LOG_WARNING, "ipmbd: listen() failed\n");
exit (1);
}
while(1) {
int n;
t = sizeof (remote);
+ // TODO: Seen accept() call failure and need further debug
if ((s2 = accept (s, (struct sockaddr *) &remote, &t)) < 0) {
- syslog(LOG_ALERT, "ipmbd: accept() failed\n");
- break;
+ rc = errno;
+ syslog(LOG_WARNING, "ipmbd: accept() failed with ret: %x, errno: %x\n", s2, rc);
+ sleep(5);
+ continue;
}
// Creating a worker thread to handle the request
@@ -718,7 +753,7 @@ ipmb_lib_handler(void *bus_num) {
sfd->fd = fd;
sfd->sock = s2;
if (pthread_create(&tid, NULL, conn_handler, (void*) sfd) < 0) {
- syslog(LOG_ALERT, "ipmbd: pthread_create failed\n");
+ syslog(LOG_WARNING, "ipmbd: pthread_create failed\n");
close(s2);
continue;
}
@@ -743,17 +778,20 @@ main(int argc, char * const argv[]) {
struct mq_attr attr;
char mq_ipmb_req[64] = {0};
char mq_ipmb_res[64] = {0};
+ int rc = 0;
daemon(1, 0);
openlog("ipmbd", LOG_CONS, LOG_DAEMON);
if (argc != 2) {
- syslog(LOG_ALERT, "ipmbd: Usage: ipmbd <bus#>");
+ syslog(LOG_WARNING, "ipmbd: Usage: ipmbd <bus#>");
exit(1);
}
ipmb_bus_num = atoi(argv[1]);
-syslog(LOG_ALERT, "ipmbd: bus#:%d\n", ipmb_bus_num);
+ g_bus_id = ipmb_bus_num;
+
+ syslog(LOG_WARNING, "ipmbd: bus#:%d\n", ipmb_bus_num);
pthread_mutex_init(&m_i2c, NULL);
@@ -769,44 +807,44 @@ syslog(LOG_ALERT, "ipmbd: bus#:%d\n", ipmb_bus_num);
// Remove the MQ if exists
mq_unlink(mq_ipmb_req);
- errno = 0;
mqd_req = mq_open(mq_ipmb_req, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &attr);
if (mqd_req == (mqd_t) -1) {
- syslog(LOG_ALERT, "ipmbd: mq_open request failed errno:%d\n", errno);
+ rc = errno;
+ syslog(LOG_WARNING, "ipmbd: mq_open request failed errno:%d\n", rc);
goto cleanup;
}
// Remove the MQ if exists
mq_unlink(mq_ipmb_res);
- errno = 0;
mqd_res = mq_open(mq_ipmb_res, O_RDONLY | O_CREAT, S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH, &attr);
if (mqd_res == (mqd_t) -1) {
- syslog(LOG_ALERT, "ipmbd: mq_open response failed errno: %d\n", errno);
+ rc = errno;
+ syslog(LOG_WARNING, "ipmbd: mq_open response failed errno: %d\n", rc);
goto cleanup;
}
// Create thread to handle IPMB Requests
if (pthread_create(&tid_req_handler, NULL, ipmb_req_handler, (void*) &ipmb_bus_num) < 0) {
- syslog(LOG_ALERT, "ipmbd: pthread_create failed\n");
+ syslog(LOG_WARNING, "ipmbd: pthread_create failed\n");
goto cleanup;
}
// Create thread to handle IPMB Responses
if (pthread_create(&tid_res_handler, NULL, ipmb_res_handler, (void*) &ipmb_bus_num) < 0) {
- syslog(LOG_ALERT, "ipmbd: pthread_create failed\n");
+ syslog(LOG_WARNING, "ipmbd: pthread_create failed\n");
goto cleanup;
}
// Create thread to retrieve ipmb traffic from i2c bus as slave
if (pthread_create(&tid_ipmb_rx, NULL, ipmb_rx_handler, (void*) &ipmb_bus_num) < 0) {
- syslog(LOG_ALERT, "ipmbd: pthread_create failed\n");
+ syslog(LOG_WARNING, "ipmbd: pthread_create failed\n");
goto cleanup;
}
// Create thread to receive ipmb library requests from apps
if (pthread_create(&tid_lib_handler, NULL, ipmb_lib_handler, (void*) &ipmb_bus_num) < 0) {
- syslog(LOG_ALERT, "ipmbd: pthread_create failed\n");
+ syslog(LOG_WARNING, "ipmbd: pthread_create failed\n");
goto cleanup;
}
diff --git a/common/recipes-core/ipmid/files/ipmid.c b/common/recipes-core/ipmid/files/ipmid.c
index c79d3e2..0930cc2 100644
--- a/common/recipes-core/ipmid/files/ipmid.c
+++ b/common/recipes-core/ipmid/files/ipmid.c
@@ -35,6 +35,11 @@
#include <sys/un.h>
#include <openbmc/ipmi.h>
+#define SIZE_IANA_ID 3
+#define SIZE_SYS_GUID 16
+
+extern void plat_lan_init(lan_config_t *lan);
+
// TODO: Once data storage is finalized, the following structure needs
// to be retrieved/updated from persistant backend storage
static lan_config_t g_lan_config = { 0 };
@@ -245,6 +250,27 @@ app_get_device_guid (unsigned char *response, unsigned char *res_len)
*res_len = data - &res->data[0];
}
+// Get Device System GUID (IPMI/Section 22.14)
+static void
+app_get_device_sys_guid (unsigned char *request, unsigned char *response,
+ unsigned char *res_len)
+{
+ int ret;
+
+ ipmi_mn_req_t *req = (ipmi_mn_req_t *) request;
+ ipmi_res_t *res = (ipmi_res_t *) response;
+
+ // Get the 16 bytes of System GUID from PAL library
+ ret = pal_get_sys_guid(req->payload_id, res->data);
+ if (ret) {
+ res->cc = CC_UNSPECIFIED_ERROR;
+ *res_len = 0x00;
+ } else {
+ res->cc = CC_SUCCESS;
+ *res_len = SIZE_SYS_GUID;
+ }
+}
+
// Get BMC Global Enables (IPMI/Section 22.2)
static void
app_get_global_enables (unsigned char *response, unsigned char *res_len)
@@ -255,7 +281,7 @@ app_get_global_enables (unsigned char *response, unsigned char *res_len)
res->cc = CC_SUCCESS;
- *data++ = 0x09; // Global Enable
+ *data++ = 0x0D; // Global Enable
*res_len = data - &res->data[0];
}
@@ -279,6 +305,7 @@ app_set_sys_info_params (unsigned char *request, unsigned char *response,
break;
case SYS_INFO_PARAM_SYSFW_VER:
memcpy(g_sys_info_params.sysfw_ver, &req->data[1], SIZE_SYSFW_VER);
+ pal_set_sysfw_ver(req->payload_id, g_sys_info_params.sysfw_ver);
break;
case SYS_INFO_PARAM_SYS_NAME:
memcpy(g_sys_info_params.sys_name, &req->data[1], SIZE_SYS_NAME);
@@ -327,6 +354,7 @@ app_get_sys_info_params (unsigned char *request, unsigned char *response,
*data++ = g_sys_info_params.set_in_prog;
break;
case SYS_INFO_PARAM_SYSFW_VER:
+ pal_get_sysfw_ver(req->payload_id, g_sys_info_params.sysfw_ver);
memcpy(data, g_sys_info_params.sysfw_ver, SIZE_SYSFW_VER);
data += SIZE_SYSFW_VER;
break;
@@ -385,12 +413,11 @@ ipmi_handle_app (unsigned char *request, unsigned char req_len,
app_get_selftest_results (response, res_len);
break;
case CMD_APP_GET_DEVICE_GUID:
- case CMD_APP_GET_SYSTEM_GUID:
- // Get Device GUID and Get System GUID returns same data
- // from IPMI stack. FYI, Get System GUID will have to be
- // sent with in an IPMI session that includes session info
app_get_device_guid (response, res_len);
break;
+ case CMD_APP_GET_SYSTEM_GUID:
+ app_get_device_sys_guid (request, response, res_len);
+ break;
case CMD_APP_GET_GLOBAL_ENABLES:
app_get_global_enables (response, res_len);
break;
@@ -558,8 +585,10 @@ storage_get_sdr (unsigned char *request, unsigned char *response,
}
static void
-storage_get_sel_info (unsigned char *response, unsigned char *res_len)
+storage_get_sel_info (unsigned char *request, unsigned char *response,
+ unsigned char *res_len)
{
+ ipmi_mn_req_t *req = (ipmi_mn_req_t *) request;
ipmi_res_t *res = (ipmi_res_t *) response;
unsigned char *data = &res->data[0];
int num_entries; // number of log entries
@@ -568,10 +597,10 @@ storage_get_sel_info (unsigned char *response, unsigned char *res_len)
time_stamp_t ts_recent_erase; // Recent Erasure Timestamp
// Use platform APIs to get SEL information
- num_entries = sel_num_entries ();
- free_space = sel_free_space ();
- sel_ts_recent_add (&ts_recent_add);
- sel_ts_recent_erase (&ts_recent_erase);
+ num_entries = sel_num_entries (req->payload_id);
+ free_space = sel_free_space (req->payload_id);
+ sel_ts_recent_add (req->payload_id, &ts_recent_add);
+ sel_ts_recent_erase (req->payload_id, &ts_recent_erase);
res->cc = CC_SUCCESS;
@@ -595,14 +624,16 @@ storage_get_sel_info (unsigned char *response, unsigned char *res_len)
}
static void
-storage_rsv_sel (unsigned char *response, unsigned char *res_len)
+storage_rsv_sel (unsigned char * request, unsigned char *response,
+ unsigned char *res_len)
{
+ ipmi_mn_req_t *req = (ipmi_mn_req_t *) request;
ipmi_res_t *res = (ipmi_res_t *) response;
unsigned char *data = &res->data[0];
int rsv_id; // SEL reservation ID
// Use platform APIs to get a SEL reservation ID
- rsv_id = sel_rsv_id ();
+ rsv_id = sel_rsv_id (req->payload_id);
if (rsv_id < 0)
{
res->cc = CC_SEL_ERASE_PROG;
@@ -634,7 +665,7 @@ storage_get_sel (unsigned char *request, unsigned char *response,
read_rec_id = (req->data[3] >> 8) | req->data[2];
// Use platform API to read the record Id and get next ID
- ret = sel_get_entry (read_rec_id, &entry, &next_rec_id);
+ ret = sel_get_entry (req->payload_id, read_rec_id, &entry, &next_rec_id);
if (ret)
{
res->cc = CC_UNSPECIFIED_ERROR;
@@ -670,7 +701,7 @@ storage_add_sel (unsigned char *request, unsigned char *response,
memcpy(entry.msg, req->data, SIZE_SEL_REC);
// Use platform APIs to add the new SEL entry
- ret = sel_add_entry (&entry, &record_id);
+ ret = sel_add_entry (req->payload_id, &entry, &record_id);
if (ret)
{
res->cc = CC_UNSPECIFIED_ERROR;
@@ -711,11 +742,11 @@ storage_clr_sel (unsigned char *request, unsigned char *response,
// Use platform APIs to clear or get status
if (req->data[5] == IPMI_SEL_INIT_ERASE)
{
- ret = sel_erase (rsv_id);
+ ret = sel_erase (req->payload_id, rsv_id);
}
else if (req->data[5] == IPMI_SEL_ERASE_STAT)
{
- ret = sel_erase_status (rsv_id, &status);
+ ret = sel_erase_status (req->payload_id, rsv_id, &status);
}
else
{
@@ -739,6 +770,37 @@ storage_clr_sel (unsigned char *request, unsigned char *response,
}
static void
+storage_get_sel_time (unsigned char *response, unsigned char *res_len)
+{
+ ipmi_res_t *res = (ipmi_res_t *) response;
+
+ res->cc = CC_SUCCESS;
+
+ time_stamp_fill(res->data);
+
+ *res_len = SIZE_TIME_STAMP;
+
+ return;
+}
+
+static void
+storage_get_sel_utc (unsigned char *response, unsigned char *res_len)
+{
+ ipmi_res_t *res = (ipmi_res_t *) response;
+ unsigned char *data = &res->data[0];
+
+ res->cc = CC_SUCCESS;
+
+ // TODO: For now, the SEL time stamp is based on UTC time,
+ // so return 0x0000 as offset. Might need to change once
+ // supporting zones in SEL time stamps
+ *data++ = 0x00;
+ *data++ = 0x00;
+
+ *res_len = data - &res->data[0];
+}
+
+static void
ipmi_handle_storage (unsigned char *request, unsigned char req_len,
unsigned char *response, unsigned char *res_len)
{
@@ -759,10 +821,10 @@ ipmi_handle_storage (unsigned char *request, unsigned char req_len,
storage_get_fruid_data (request, response, res_len);
break;
case CMD_STORAGE_GET_SEL_INFO:
- storage_get_sel_info (response, res_len);
+ storage_get_sel_info (request, response, res_len);
break;
case CMD_STORAGE_RSV_SEL:
- storage_rsv_sel (response, res_len);
+ storage_rsv_sel (request, response, res_len);
break;
case CMD_STORAGE_ADD_SEL:
storage_add_sel (request, response, res_len);
@@ -773,6 +835,12 @@ ipmi_handle_storage (unsigned char *request, unsigned char req_len,
case CMD_STORAGE_CLR_SEL:
storage_clr_sel (request, response, res_len);
break;
+ case CMD_STORAGE_GET_SEL_TIME:
+ storage_get_sel_time (response, res_len);
+ break;
+ case CMD_STORAGE_GET_SEL_UTC:
+ storage_get_sel_utc (response, res_len);
+ break;
case CMD_STORAGE_GET_SDR_INFO:
storage_get_sdr_info (response, res_len);
break;
@@ -871,6 +939,9 @@ transport_set_lan_config (unsigned char *request, unsigned char *response,
case LAN_PARAM_DEST_ADDR:
memcpy(g_lan_config.dest_addr, &req->data[2], SIZE_DEST_ADDR);
break;
+ case LAN_PARAM_IP6_ADDR:
+ memcpy(g_lan_config.ip6_addr, &req->data[2], SIZE_IP6_ADDR);
+ break;
default:
res->cc = CC_INVALID_PARAM;
break;
@@ -905,6 +976,7 @@ transport_get_lan_config (unsigned char *request, unsigned char *response,
data += SIZE_AUTH_ENABLES;
break;
case LAN_PARAM_IP_ADDR:
+ plat_lan_init(&g_lan_config);
memcpy(data, g_lan_config.ip_addr, SIZE_IP_ADDR);
data += SIZE_IP_ADDR;
break;
@@ -968,6 +1040,11 @@ transport_get_lan_config (unsigned char *request, unsigned char *response,
memcpy(data, g_lan_config.dest_addr, SIZE_DEST_ADDR);
data += SIZE_DEST_ADDR;
break;
+ case LAN_PARAM_IP6_ADDR:
+ plat_lan_init(&g_lan_config);
+ memcpy(data, g_lan_config.ip6_addr, SIZE_IP6_ADDR);
+ data += SIZE_IP6_ADDR;
+ break;
default:
res->cc = CC_INVALID_PARAM;
break;
@@ -1070,6 +1147,42 @@ oem_set_post_end (unsigned char *request, unsigned char *response,
}
static void
+oem_get_slot_info(unsigned char *request, unsigned char *response,
+ unsigned char *res_len)
+{
+ ipmi_mn_req_t *req = (ipmi_mn_req_t *) request;
+ ipmi_res_t *res = (ipmi_res_t *) response;
+
+ int ret;
+ uint8_t pres = 0x00;
+ uint8_t sinfo = 0x00;
+
+ // Slot info:
+ // Bit[7]: Not Present/Present (from pal)
+ // Bit[6]: Platform type (TODO from pal)
+ // Bit[5-0] : Slot# (payload_id indicates)
+ ret = pal_is_server_prsnt(req->payload_id, &pres);
+ if (ret) {
+ res->cc = CC_UNSPECIFIED_ERROR;
+ *res_len = 0x00;
+ return;
+ }
+
+ // Populate the presence bit[7]
+ if (pres) {
+ sinfo = 0x80;
+ }
+
+ // Populate the slot number
+ sinfo |= req->payload_id;
+
+ // Prepare response buffer
+ res->cc = CC_SUCCESS;
+ res->data[0] = sinfo;
+ *res_len = 0x01;
+}
+
+static void
ipmi_handle_oem (unsigned char *request, unsigned char req_len,
unsigned char *response, unsigned char *res_len)
{
@@ -1093,6 +1206,9 @@ ipmi_handle_oem (unsigned char *request, unsigned char req_len,
case CMD_OEM_SET_POST_END:
oem_set_post_end (request, response, res_len);
break;
+ case CMD_OEM_GET_SLOT_INFO:
+ oem_get_slot_info (request, response, res_len);
+ break;
default:
res->cc = CC_INVALID_CMD;
break;
@@ -1114,21 +1230,22 @@ oem_1s_handle_ipmb_kcs(unsigned char *request, unsigned char req_len,
// Add the payload id from the bridged command
req_buf[0] = req->payload_id;
- // Remove OEM IPMI Header + 1 byte for BIC interface
+ // Remove OEM IPMI Header (including 1 byte for interface type, 3 bytes for IANA ID)
// The offset moves by one due to the payload ID
- memcpy(&req_buf[1], &request[BIC_INTF_HDR_SIZE + 1], req_len - BIC_INTF_HDR_SIZE);
+ memcpy(&req_buf[1], &request[BIC_INTF_HDR_SIZE], req_len - BIC_INTF_HDR_SIZE + 1);
// Send the bridged KCS command along with the payload ID
// The offset moves by one due to the payload ID
ipmi_handle(req_buf, req_len - BIC_INTF_HDR_SIZE + 1, res_buf, res_len);
- // Copy the response back
- memcpy(&res->data[1], res_buf, *res_len);
+ // Copy the response back (1 byte interface type, 3 bytes for IANA ID)
+ memcpy(&res->data[4], res_buf, *res_len);
// Add the OEM command's response
res->cc = CC_SUCCESS;
- res->data[0] = req->data[0]; // Bridge-IC interface
- *res_len += 1;
+ memcpy(res->data, &req->data, SIZE_IANA_ID); // IANA ID
+ res->data[3] = req->data[3]; // Bridge-IC interface
+ *res_len += 4; // Interface type + IANA ID
}
static void
@@ -1139,32 +1256,38 @@ oem_1s_handle_ipmb_req(unsigned char *request, unsigned char req_len,
ipmi_res_t *res = (ipmi_res_t *) response;
// handle based on Bridge-IC interface
- switch(req->data[0]) {
+ switch(req->data[3]) {
case BIC_INTF_ME:
// TODO: Need to call ME command handler
+#ifdef DEBUG
syslog(LOG_INFO, "oem_1s_handle_ipmb_req: Command received from ME for "
"payload#%d\n", req->payload_id);
- res->data[0] = BIC_INTF_ME;
+#endif
+ memcpy(res->data, req->data, 4); //IANA ID + Interface type
res->cc = CC_SUCCESS;
- *res_len = 1;
+ *res_len = 4;
break;
case BIC_INTF_SOL:
// TODO: Need to call Optional SoL message handler
+#ifdef DEBUG
syslog(LOG_INFO, "oem_1s_handle_ipmb_req: Command received from SOL for "
"payload#%d\n", req->payload_id);
- res->data[0] = BIC_INTF_SOL;
+#endif
+ memcpy(res->data, req->data, 4); //IANA ID + Interface type
res->cc = CC_SUCCESS;
- *res_len = 1;
+ *res_len = 4;
break;
case BIC_INTF_KCS:
+ case BIC_INTF_KCS_SMM:
oem_1s_handle_ipmb_kcs(request, req_len, response, res_len);
break;
default:
// TODO: Need to add additonal interface handler, if supported
- syslog(LOG_ALERT, "oem_1s_handle_ipmb_req: Command received on intf#%d "
- "for payload#%d", req->data[0], req->payload_id);
+ syslog(LOG_WARNING, "oem_1s_handle_ipmb_req: Command received on intf#%d "
+ "for payload#%d", req->data[3], req->payload_id);
+ memcpy(res->data, req->data, 4); //IANA ID + Interface type
res->cc = CC_INVALID_PARAM;
- *res_len = 0;
+ *res_len = 4;
break;
}
}
@@ -1187,62 +1310,70 @@ ipmi_handle_oem_1s(unsigned char *request, unsigned char req_len,
break;
case CMD_OEM_1S_INTR:
syslog(LOG_INFO, "ipmi_handle_oem_1s: 1S server interrupt#%d received "
- "for payload#%d\n", req->data[0], req->payload_id);
+ "for payload#%d\n", req->data[3], req->payload_id);
res->cc = CC_SUCCESS;
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
case CMD_OEM_1S_POST_BUF:
- for (i = 1; i <= req->data[0]; i++) {
+ // Skip the first 3 bytes of IANA ID and one byte of length field
+ for (i = SIZE_IANA_ID+1; i <= req->data[3]; i++) {
pal_post_handle(req->payload_id, req->data[i]);
}
res->cc = CC_SUCCESS;
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
case CMD_OEM_1S_PLAT_DISC:
syslog(LOG_INFO, "ipmi_handle_oem_1s: Platform Discovery received for "
"payload#%d\n", req->payload_id);
res->cc = CC_SUCCESS;
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
case CMD_OEM_1S_BIC_RESET:
syslog(LOG_INFO, "ipmi_handle_oem_1s: BIC Reset received "
"for payload#%d\n", req->payload_id);
- if (req->data[0] == 0x0) {
- syslog(LOG_ALERT, "Cold Reset by Firmware Update\n");
+ if (req->data[3] == 0x0) {
+ syslog(LOG_WARNING, "Cold Reset by Firmware Update\n");
res->cc = CC_SUCCESS;
- } else if (req->data[1] == 0x01) {
- syslog(LOG_ALERT, "WDT Reset\n");
+ } else if (req->data[3] == 0x01) {
+ syslog(LOG_WARNING, "WDT Reset\n");
res->cc = CC_SUCCESS;
} else {
- syslog(LOG_ALERT, "Error\n");
+ syslog(LOG_WARNING, "Error\n");
res->cc = CC_INVALID_PARAM;
}
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
case CMD_OEM_1S_BIC_UPDATE_MODE:
+#ifdef DEBUG
syslog(LOG_INFO, "ipmi_handle_oem_1s: BIC Update Mode received "
"for payload#%d\n", req->payload_id);
-
- if (req->data[0] == 0x0) {
+#endif
+ if (req->data[3] == 0x0) {
syslog(LOG_INFO, "Normal Mode\n");
res->cc = CC_SUCCESS;
- } else if (req->data[1] == 0x0F) {
+ } else if (req->data[3] == 0x0F) {
syslog(LOG_INFO, "Update Mode\n");
res->cc = CC_SUCCESS;
} else {
- syslog(LOG_ALERT, "Error\n");
+ syslog(LOG_WARNING, "Error\n");
res->cc = CC_INVALID_PARAM;
}
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
default:
res->cc = CC_INVALID_CMD;
- *res_len = 0;
+ memcpy(res->data, req->data, SIZE_IANA_ID); //IANA ID
+ *res_len = 3;
break;
}
pthread_mutex_unlock(&m_oem_1s);
@@ -1306,26 +1437,37 @@ ipmi_handle (unsigned char *request, unsigned char req_len,
void
*conn_handler(void *socket_desc) {
- int sock = *(int*)socket_desc;
+ int *p_sock = (int*)socket_desc;
+ int sock = *p_sock;
int n;
unsigned char req_buf[MAX_IPMI_MSG_SIZE];
unsigned char res_buf[MAX_IPMI_MSG_SIZE];
unsigned char res_len = 0;
+ struct timeval tv;
+ int rc = 0;
+
+ // setup timeout for receving on socket
+ tv.tv_sec = TIMEOUT_IPMI;
+ tv.tv_usec = 0;
+
+ setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,sizeof(struct timeval));
n = recv (sock, req_buf, sizeof(req_buf), 0);
+ rc = errno;
if (n <= 0) {
- syslog(LOG_ALERT, "ipmid: recv() failed with %d\n", n);
+ syslog(LOG_WARNING, "ipmid: recv() failed with %d, errno: %d\n", n, rc);
goto conn_cleanup;
}
ipmi_handle(req_buf, n, res_buf, &res_len);
if (send (sock, res_buf, res_len, 0) < 0) {
- syslog(LOG_ALERT, "ipmid: send() failed\n");
+ syslog(LOG_WARNING, "ipmid: send() failed\n");
}
conn_cleanup:
close(sock);
+ free(p_sock);
pthread_exit(NULL);
return 0;
@@ -1338,13 +1480,16 @@ main (void)
int s, s2, t, len;
struct sockaddr_un local, remote;
pthread_t tid;
+ int *p_s2;
+ int rc = 0;
- daemon(1, 0);
+ daemon(1, 1);
openlog("ipmid", LOG_CONS, LOG_DAEMON);
plat_fruid_init();
plat_sensor_init();
+ plat_lan_init(&g_lan_config);
sdr_init();
sel_init();
@@ -1358,7 +1503,7 @@ main (void)
if ((s = socket (AF_UNIX, SOCK_STREAM, 0)) == -1)
{
- syslog(LOG_ALERT, "ipmid: socket() failed\n");
+ syslog(LOG_WARNING, "ipmid: socket() failed\n");
exit (1);
}
@@ -1368,30 +1513,35 @@ main (void)
len = strlen (local.sun_path) + sizeof (local.sun_family);
if (bind (s, (struct sockaddr *) &local, len) == -1)
{
- syslog(LOG_ALERT, "ipmid: bind() failed\n");
+ syslog(LOG_WARNING, "ipmid: bind() failed\n");
exit (1);
}
if (listen (s, 5) == -1)
{
- syslog(LOG_ALERT, "ipmid: listen() failed\n");
+ syslog(LOG_WARNING, "ipmid: listen() failed\n");
exit (1);
}
while(1) {
int n;
t = sizeof (remote);
+ // TODO: seen accept() call fails and need further debug
if ((s2 = accept (s, (struct sockaddr *) &remote, &t)) < 0) {
- syslog(LOG_ALERT, "ipmid: accept() failed\n");
- break;
+ rc = errno;
+ syslog(LOG_WARNING, "ipmid: accept() failed with ret: %x, errno: %x\n", s2, rc);
+ sleep(5);
+ continue;
}
// Creating a worker thread to handle the request
// TODO: Need to monitor the server performance with higher load and
// see if we need to create pre-defined number of workers and schedule
// the requests among them.
- if (pthread_create(&tid, NULL, conn_handler, (void*) &s2) < 0) {
- syslog(LOG_ALERT, "ipmid: pthread_create failed\n");
+ p_s2 = malloc(sizeof(int));
+ *p_s2 = s2;
+ if (pthread_create(&tid, NULL, conn_handler, (void*) p_s2) < 0) {
+ syslog(LOG_WARNING, "ipmid: pthread_create failed\n");
close(s2);
continue;
}
diff --git a/common/recipes-core/ipmid/files/sdr.c b/common/recipes-core/ipmid/files/sdr.c
index 91a4df5..78d74c3 100644
--- a/common/recipes-core/ipmid/files/sdr.c
+++ b/common/recipes-core/ipmid/files/sdr.c
@@ -88,7 +88,7 @@ static int
sdr_add_entry(sdr_rec_t *rec, int *rec_id) {
// If SDR is full, return error
if (sdr_num_entries() == SDR_RECORDS_MAX) {
- syslog(LOG_ALERT, "sdr_add_entry: SDR full\n");
+ syslog(LOG_WARNING, "sdr_add_entry: SDR full\n");
return -1;
}
@@ -137,7 +137,7 @@ sdr_add_mgmt_rec(sensor_mgmt_t *p_rec) {
// Add this record to SDR repo
if (sdr_add_entry(&sdr, &rec_id)) {
- syslog(LOG_ALERT, "sdr_add_mgmt_rec: sdr_add_entry failed\n");
+ syslog(LOG_WARNING, "sdr_add_mgmt_rec: sdr_add_entry failed\n");
return -1;
}
@@ -176,7 +176,7 @@ sdr_add_disc_rec(sensor_disc_t *p_rec) {
// Add this record to SDR repo
if (sdr_add_entry(&sdr, &rec_id)) {
- syslog(LOG_ALERT, "sdr_add_disc_rec: sdr_add_entry failed\n");
+ syslog(LOG_WARNING, "sdr_add_disc_rec: sdr_add_entry failed\n");
return -1;
}
@@ -237,7 +237,7 @@ sdr_add_thresh_rec(sensor_thresh_t *p_rec) {
// Add this record to SDR repo
if (sdr_add_entry(&sdr, &rec_id)) {
- syslog(LOG_ALERT, "sdr_add_thresh_rec: sdr_add_entry failed\n");
+ syslog(LOG_WARNING, "sdr_add_thresh_rec: sdr_add_entry failed\n");
return -1;
}
@@ -263,7 +263,7 @@ sdr_add_oem_rec(sensor_oem_t *p_rec) {
// Add this record to SDR repo
if (sdr_add_entry(&sdr, &rec_id)) {
- syslog(LOG_ALERT, "sdr_add_oem_rec: sdr_add_entry failed\n");
+ syslog(LOG_WARNING, "sdr_add_oem_rec: sdr_add_entry failed\n");
return -1;
}
@@ -323,7 +323,7 @@ sdr_get_entry(int rsv_id, int read_rec_id, sdr_rec_t *rec,
// Make sure the rsv_id matches
if (rsv_id != g_rsv_id) {
- syslog(LOG_ALERT, "sdr_get_entry: Reservation ID mismatch\n");
+ syslog(LOG_WARNING, "sdr_get_entry: Reservation ID mismatch\n");
return -1;
}
@@ -338,19 +338,19 @@ sdr_get_entry(int rsv_id, int read_rec_id, sdr_rec_t *rec,
// If the SDR repo is empty return error
if (sdr_num_entries() == 0) {
- syslog(LOG_ALERT, "sdr_get_entry: No entries\n");
+ syslog(LOG_WARNING, "sdr_get_entry: No entries\n");
return -1;
}
// Check for boundary conditions
if ((index < SDR_INDEX_MIN) || (index > SDR_INDEX_MAX)) {
- syslog(LOG_ALERT, "sdr_get_entry: Invalid Record ID %d\n", read_rec_id);
+ syslog(LOG_WARNING, "sdr_get_entry: Invalid Record ID %d\n", read_rec_id);
return -1;
}
// Check to make sure the given id is valid
if (index < g_sdr_hdr.begin || index >= g_sdr_hdr.end) {
- syslog(LOG_ALERT, "sdr_get_entry: Wrong Record ID %d\n", read_rec_id);
+ syslog(LOG_WARNING, "sdr_get_entry: Wrong Record ID %d\n", read_rec_id);
return -1;
}
diff --git a/common/recipes-core/ipmid/files/sel.c b/common/recipes-core/ipmid/files/sel.c
index d598bb1..1b45b42 100644
--- a/common/recipes-core/ipmid/files/sel.c
+++ b/common/recipes-core/ipmid/files/sel.c
@@ -31,9 +31,19 @@
#include <errno.h>
#include <syslog.h>
#include <string.h>
+#include <stdint.h>
+#include <sys/types.h>
+
+
+#if defined(CONFIG_YOSEMITE)
+#define MAX_NODES 4
+#else
+#define MAX_NODES 1
+#endif
// SEL File.
-#define SEL_LOG_FILE "/mnt/data/sel.bin"
+#define SEL_LOG_FILE "/mnt/data/sel%d.bin"
+#define SIZE_PATH_MAX 32
// SEL Header magic number
#define SEL_HDR_MAGIC 0xFBFBFBFB
@@ -75,24 +85,27 @@ typedef struct {
} sel_hdr_t;
// Keep track of last Reservation ID
-static int g_rsv_id = 0x01;
+static int g_rsv_id[MAX_NODES+1];
// Cached version of SEL Header and data
-static sel_hdr_t g_sel_hdr;
-static sel_msg_t g_sel_data[SEL_ELEMS_MAX];
+static sel_hdr_t g_sel_hdr[MAX_NODES+1];
+static sel_msg_t g_sel_data[MAX_NODES+1][SEL_ELEMS_MAX];
// Local helper functions to interact with file system
static int
-file_get_sel_hdr(void) {
+file_get_sel_hdr(int node) {
FILE *fp;
+ char fpath[SIZE_PATH_MAX] = {0};
+
+ sprintf(fpath, SEL_LOG_FILE, node);
- fp = fopen(SEL_LOG_FILE, "r");
+ fp = fopen(fpath, "r");
if (fp == NULL) {
return -1;
}
- if (fread(&g_sel_hdr, sizeof(sel_hdr_t), 1, fp) <= 0) {
- syslog(LOG_ALERT, "file_get_sel_hdr: fread\n");
+ if (fread(&g_sel_hdr[node], sizeof(sel_hdr_t), 1, fp) <= 0) {
+ syslog(LOG_WARNING, "file_get_sel_hdr: fread\n");
fclose (fp);
return -1;
}
@@ -102,25 +115,28 @@ file_get_sel_hdr(void) {
}
static int
-file_get_sel_data(void) {
+file_get_sel_data(int node) {
FILE *fp;
int i, j;
+ char fpath[SIZE_PATH_MAX] = {0};
- fp = fopen(SEL_LOG_FILE, "r");
+ sprintf(fpath, SEL_LOG_FILE, node);
+
+ fp = fopen(fpath, "r");
if (fp == NULL) {
- syslog(LOG_ALERT, "file_get_sel_data: fopen\n");
+ syslog(LOG_WARNING, "file_get_sel_data: fopen\n");
return -1;
}
if (fseek(fp, SEL_DATA_OFFSET, SEEK_SET)) {
- syslog(LOG_ALERT, "file_get_sel_data: fseek\n");
+ syslog(LOG_WARNING, "file_get_sel_data: fseek\n");
fclose(fp);
return -1;
}
unsigned char buf[SEL_ELEMS_MAX * 16];
if (fread(buf, 1, SEL_ELEMS_MAX * sizeof(sel_msg_t), fp) <= 0) {
- syslog(LOG_ALERT, "file_get_sel_data: fread\n");
+ syslog(LOG_WARNING, "file_get_sel_data: fread\n");
fclose(fp);
return -1;
}
@@ -129,7 +145,7 @@ file_get_sel_data(void) {
for (i = 0; i < SEL_ELEMS_MAX; i++) {
for (j = 0; j < sizeof(sel_msg_t);j++) {
- g_sel_data[i].msg[j] = buf[i*16 + j];
+ g_sel_data[node][i].msg[j] = buf[i*16 + j];
}
}
@@ -137,17 +153,20 @@ file_get_sel_data(void) {
}
static int
-file_store_sel_hdr(void) {
+file_store_sel_hdr(int node) {
FILE *fp;
+ char fpath[SIZE_PATH_MAX] = {0};
+
+ sprintf(fpath, SEL_LOG_FILE, node);
- fp = fopen(SEL_LOG_FILE, "r+");
+ fp = fopen(fpath, "r+");
if (fp == NULL) {
- syslog(LOG_ALERT, "file_store_sel_hdr: fopen\n");
+ syslog(LOG_WARNING, "file_store_sel_hdr: fopen\n");
return -1;
}
- if (fwrite(&g_sel_hdr, sizeof(sel_hdr_t), 1, fp) <= 0) {
- syslog(LOG_ALERT, "file_store_sel_hdr: fwrite\n");
+ if (fwrite(&g_sel_hdr[node], sizeof(sel_hdr_t), 1, fp) <= 0) {
+ syslog(LOG_WARNING, "file_store_sel_hdr: fwrite\n");
fclose(fp);
return -1;
}
@@ -158,13 +177,16 @@ file_store_sel_hdr(void) {
}
static int
-file_store_sel_data(int recId, sel_msg_t *data) {
+file_store_sel_data(int node, int recId, sel_msg_t *data) {
FILE *fp;
int index;
+ char fpath[SIZE_PATH_MAX] = {0};
- fp = fopen(SEL_LOG_FILE, "r+");
+ sprintf(fpath, SEL_LOG_FILE, node);
+
+ fp = fopen(fpath, "r+");
if (fp == NULL) {
- syslog(LOG_ALERT, "file_store_sel_data: fopen\n");
+ syslog(LOG_WARNING, "file_store_sel_data: fopen\n");
return -1;
}
@@ -172,13 +194,13 @@ file_store_sel_data(int recId, sel_msg_t *data) {
index = (recId-1) * sizeof(sel_msg_t);
if (fseek(fp, SEL_DATA_OFFSET+index, SEEK_SET)) {
- syslog(LOG_ALERT, "file_store_sel_data: fseek\n");
+ syslog(LOG_WARNING, "file_store_sel_data: fseek\n");
fclose(fp);
return -1;
}
if (fwrite(data->msg, sizeof(sel_msg_t), 1, fp) <= 0) {
- syslog(LOG_ALERT, "file_store_sel_data: fwrite\n");
+ syslog(LOG_WARNING, "file_store_sel_data: fwrite\n");
fclose(fp);
return -1;
}
@@ -188,37 +210,103 @@ file_store_sel_data(int recId, sel_msg_t *data) {
return 0;
}
+static void
+dump_sel_syslog(int fru, sel_msg_t *data) {
+ int i = 0;
+ char temp_str[8] = {0};
+ char str[128] = {0};
+
+ for (i = 0; i < 15; i++) {
+ sprintf(temp_str, "%02X:", data->msg[i]);
+ strcat(str, temp_str);
+ }
+ sprintf(temp_str, "%02X", data->msg[15]);
+ strcat(str, temp_str);
+
+ syslog(LOG_CRIT, "SEL Entry, FRU: %d, Content: %s\n", fru, str);
+}
+
+static void
+parse_sel(uint8_t fru, sel_msg_t *data) {
+ int i = 0;
+ uint32_t timestamp;
+ char *sel = data->msg;
+ uint8_t sensor_type;
+ uint8_t sensor_num;
+ uint8_t event_dir;
+ uint8_t type_num;
+ uint8_t event_data[3];
+ char sensor_name[32];
+ char error_log[64];
+ char error_type[64];
+ char status[16];
+ int ret;
+
+ //memcpy(timestamp, (uint8_t *) &sel[3], 4);
+ timestamp = 0;
+ timestamp |= sel[3];
+ timestamp |= sel[4] << 8;
+ timestamp |= sel[5] << 16;
+ timestamp |= sel[6] << 24;
+
+ sensor_type = (uint8_t) sel[10];
+ sensor_num = (uint8_t) sel[11];
+ event_dir = ((uint8_t) sel[12] & (1 << 7)) >> 7; /* Bit 7 of sel[12] */
+ type_num = (uint8_t) sel[12]; /* Bits 6:0 */
+ memcpy(event_data, (uint8_t *) &sel[13], 3);
+
+ sprintf(status, event_dir ? "DEASSERT" : "ASSERT");
+
+ if (type_num == 0x1) {
+ sprintf(error_type, "Threshold");
+ } else if (type_num >= 0x2 || type_num <= 0xC || type_num == 0x6F) {
+ sprintf(error_type, "Discrete");
+ } else if (type_num >= 0x70 || type_num <= 0x7F) {
+ sprintf(error_type, "OEM");
+ } else {
+ sprintf(error_type, "Unknown");
+ }
+
+ ret = pal_get_event_sensor_name(fru, sensor_num, sensor_name);
+ ret = pal_parse_sel(fru, sensor_num, event_data, error_log);
+ ret = pal_sel_handler(fru, sensor_num);
+
+ syslog(LOG_CRIT, "SEL Entry, %s: FRU: %d, Sensor: 0x%X, Name: %s,"
+ " Timestamp: %u, Event Type: %s, Event Data: %s",
+ status, fru, sensor_num, sensor_name, timestamp, error_type, error_log);
+}
+
// Platform specific SEL API entry points
// Retrieve time stamp for recent add operation
void
-sel_ts_recent_add(time_stamp_t *ts) {
- memcpy(ts->ts, g_sel_hdr.ts_add.ts, 0x04);
+sel_ts_recent_add(int node, time_stamp_t *ts) {
+ memcpy(ts->ts, g_sel_hdr[node].ts_add.ts, 0x04);
}
// Retrieve time stamp for recent erase operation
void
-sel_ts_recent_erase(time_stamp_t *ts) {
- memcpy(ts->ts, g_sel_hdr.ts_erase.ts, 0x04);
+sel_ts_recent_erase(int node, time_stamp_t *ts) {
+ memcpy(ts->ts, g_sel_hdr[node].ts_erase.ts, 0x04);
}
// Retrieve total number of entries in SEL log
int
-sel_num_entries(void) {
- if (g_sel_hdr.begin <= g_sel_hdr.end) {
- return (g_sel_hdr.end - g_sel_hdr.begin);
+sel_num_entries(int node) {
+ if (g_sel_hdr[node].begin <= g_sel_hdr[node].end) {
+ return (g_sel_hdr[node].end - g_sel_hdr[node].begin);
} else {
- return (g_sel_hdr.end + (SEL_INDEX_MAX - g_sel_hdr.begin + 1));
+ return (g_sel_hdr[node].end + (SEL_INDEX_MAX - g_sel_hdr[node].begin + 1));
}
}
// Retrieve total free space available in SEL log
int
-sel_free_space(void) {
+sel_free_space(int node) {
int total_space;
int used_space;
total_space = SEL_RECORDS_MAX * sizeof(sel_msg_t);
- used_space = sel_num_entries() * sizeof(sel_msg_t);
+ used_space = sel_num_entries(node) * sizeof(sel_msg_t);
return (total_space - used_space);
}
@@ -226,28 +314,28 @@ sel_free_space(void) {
// Reserve an ID that will be used in later operations
// IPMI/Section 31.4
int
-sel_rsv_id() {
+sel_rsv_id(int node) {
// Increment the current reservation ID and return
- if (g_rsv_id++ == SEL_RSVID_MAX) {
- g_rsv_id = SEL_RSVID_MIN;
+ if (g_rsv_id[node]++ == SEL_RSVID_MAX) {
+ g_rsv_id[node] = SEL_RSVID_MIN;
}
- return g_rsv_id;
+ return g_rsv_id[node];
}
// Get the SEL entry for a given record ID
// IPMI/Section 31.5
int
-sel_get_entry(int read_rec_id, sel_msg_t *msg, int *next_rec_id) {
+sel_get_entry(int node, int read_rec_id, sel_msg_t *msg, int *next_rec_id) {
int index;
// Find the index in to array based on given index
if (read_rec_id == SEL_RECID_FIRST) {
- index = g_sel_hdr.begin;
+ index = g_sel_hdr[node].begin;
} else if (read_rec_id == SEL_RECID_LAST) {
- if (g_sel_hdr.end) {
- index = g_sel_hdr.end - 1;
+ if (g_sel_hdr[node].end) {
+ index = g_sel_hdr[node].end - 1;
} else {
index = SEL_INDEX_MAX;
}
@@ -256,34 +344,34 @@ sel_get_entry(int read_rec_id, sel_msg_t *msg, int *next_rec_id) {
}
// If the log is empty return error
- if (sel_num_entries() == 0) {
- syslog(LOG_ALERT, "sel_get_entry: No entries\n");
+ if (sel_num_entries(node) == 0) {
+ syslog(LOG_WARNING, "sel_get_entry: No entries\n");
return -1;
}
// Check for boundary conditions
if ((index < SEL_INDEX_MIN) || (index > SEL_INDEX_MAX)) {
- syslog(LOG_ALERT, "sel_get_entry: Invalid Record ID %d\n", read_rec_id);
+ syslog(LOG_WARNING, "sel_get_entry: Invalid Record ID %d\n", read_rec_id);
return -1;
}
// If begin < end, check to make sure the given id falls between
- if (g_sel_hdr.begin < g_sel_hdr.end) {
- if (index < g_sel_hdr.begin || index >= g_sel_hdr.end) {
- syslog(LOG_ALERT, "sel_get_entry: Wrong Record ID %d\n", read_rec_id);
+ if (g_sel_hdr[node].begin < g_sel_hdr[node].end) {
+ if (index < g_sel_hdr[node].begin || index >= g_sel_hdr[node].end) {
+ syslog(LOG_WARNING, "sel_get_entry: Wrong Record ID %d\n", read_rec_id);
return -1;
}
}
// If end < begin, check to make sure the given id is valid
- if (g_sel_hdr.begin > g_sel_hdr.end) {
- if (index >= g_sel_hdr.end && index < g_sel_hdr.begin) {
- syslog(LOG_ALERT, "sel_get_entry: Wrong Record ID2 %d\n", read_rec_id);
+ if (g_sel_hdr[node].begin > g_sel_hdr[node].end) {
+ if (index >= g_sel_hdr[node].end && index < g_sel_hdr[node].begin) {
+ syslog(LOG_WARNING, "sel_get_entry: Wrong Record ID2 %d\n", read_rec_id);
return -1;
}
}
- memcpy(msg->msg, g_sel_data[index].msg, sizeof(sel_msg_t));
+ memcpy(msg->msg, g_sel_data[node][index].msg, sizeof(sel_msg_t));
// Return the next record ID in the log
*next_rec_id = read_rec_id++;
@@ -292,7 +380,7 @@ sel_get_entry(int read_rec_id, sel_msg_t *msg, int *next_rec_id) {
}
// If this is the last entry in the log, return 0xFFFF
- if (*next_rec_id == g_sel_hdr.end) {
+ if (*next_rec_id == g_sel_hdr[node].end) {
*next_rec_id = SEL_RECID_LAST;
}
@@ -302,13 +390,13 @@ sel_get_entry(int read_rec_id, sel_msg_t *msg, int *next_rec_id) {
// Add a new entry in to SEL log
// IPMI/Section 31.6
int
-sel_add_entry(sel_msg_t *msg, int *rec_id) {
+sel_add_entry(int node, sel_msg_t *msg, int *rec_id) {
// If the SEL if full, roll over. To keep track of empty condition, use
// one empty location less than the max records.
- if (sel_num_entries() == SEL_RECORDS_MAX) {
- syslog(LOG_ALERT, "sel_add_entry: SEL rollover\n");
- if (++g_sel_hdr.begin > SEL_INDEX_MAX) {
- g_sel_hdr.begin = SEL_INDEX_MIN;
+ if (sel_num_entries(node) == SEL_RECORDS_MAX) {
+ syslog(LOG_WARNING, "sel_add_entry: SEL rollover\n");
+ if (++g_sel_hdr[node].begin > SEL_INDEX_MAX) {
+ g_sel_hdr[node].begin = SEL_INDEX_MIN;
}
}
@@ -316,27 +404,33 @@ sel_add_entry(sel_msg_t *msg, int *rec_id) {
time_stamp_fill(&msg->msg[3]);
// Add the enry at end
- memcpy(g_sel_data[g_sel_hdr.end].msg, msg->msg, sizeof(sel_msg_t));
+ memcpy(g_sel_data[node][g_sel_hdr[node].end].msg, msg->msg, sizeof(sel_msg_t));
// Return the newly added record ID
- *rec_id = g_sel_hdr.end+1;
+ *rec_id = g_sel_hdr[node].end+1;
- if (file_store_sel_data(*rec_id, msg)) {
- syslog(LOG_ALERT, "sel_add_entry: file_store_sel_data\n");
+ // Print the data in syslog
+ dump_sel_syslog(node, msg);
+
+ // Parse the SEL message
+ parse_sel((uint8_t) node, msg);
+
+ if (file_store_sel_data(node, *rec_id, msg)) {
+ syslog(LOG_WARNING, "sel_add_entry: file_store_sel_data\n");
return -1;
}
// Increment the end pointer
- if (++g_sel_hdr.end > SEL_INDEX_MAX) {
- g_sel_hdr.end = SEL_INDEX_MIN;
+ if (++g_sel_hdr[node].end > SEL_INDEX_MAX) {
+ g_sel_hdr[node].end = SEL_INDEX_MIN;
}
// Update timestamp for add in header
- time_stamp_fill(g_sel_hdr.ts_add.ts);
+ time_stamp_fill(g_sel_hdr[node].ts_add.ts);
// Store the structure persistently
- if (file_store_sel_hdr()) {
- syslog(LOG_ALERT, "sel_add_entry: file_store_sel_hdr\n");
+ if (file_store_sel_hdr(node)) {
+ syslog(LOG_WARNING, "sel_add_entry: file_store_sel_hdr\n");
return -1;
}
@@ -347,21 +441,21 @@ sel_add_entry(sel_msg_t *msg, int *rec_id) {
// IPMI/Section 31.9
// Note: To reduce wear/tear, instead of erasing, manipulating the metadata
int
-sel_erase(int rsv_id) {
- if (rsv_id != g_rsv_id) {
+sel_erase(int node, int rsv_id) {
+ if (rsv_id != g_rsv_id[node]) {
return -1;
}
// Erase SEL Logs
- g_sel_hdr.begin = SEL_INDEX_MIN;
- g_sel_hdr.end = SEL_INDEX_MIN;
+ g_sel_hdr[node].begin = SEL_INDEX_MIN;
+ g_sel_hdr[node].end = SEL_INDEX_MIN;
// Update timestamp for erase in header
- time_stamp_fill(g_sel_hdr.ts_erase.ts);
+ time_stamp_fill(g_sel_hdr[node].ts_erase.ts);
// Store the structure persistently
- if (file_store_sel_hdr()) {
- syslog(LOG_ALERT, "sel_erase: file_store_sel_hdr\n");
+ if (file_store_sel_hdr(node)) {
+ syslog(LOG_WARNING, "sel_erase: file_store_sel_hdr\n");
return -1;
}
@@ -372,8 +466,8 @@ sel_erase(int rsv_id) {
// IPMI/Section 31.2
// Note: Since we are not doing offline erasing, need not return in-progress state
int
-sel_erase_status(int rsv_id, sel_erase_stat_t *status) {
- if (rsv_id != g_rsv_id) {
+sel_erase_status(int node, int rsv_id, sel_erase_stat_t *status) {
+ if (rsv_id != g_rsv_id[node]) {
return -1;
}
@@ -384,21 +478,24 @@ sel_erase_status(int rsv_id, sel_erase_stat_t *status) {
}
// Initialize SEL log file
-int
-sel_init(void) {
+static int
+sel_node_init(int node) {
FILE *fp;
int i;
+ char fpath[SIZE_PATH_MAX] = {0};
+
+ sprintf(fpath, SEL_LOG_FILE, node);
// Check if the file exists or not
- if (access(SEL_LOG_FILE, F_OK) == 0) {
+ if (access(fpath, F_OK) == 0) {
// Since file is present, fetch all the contents to cache
- if (file_get_sel_hdr()) {
- syslog(LOG_ALERT, "init_sel: file_get_sel_hdr\n");
+ if (file_get_sel_hdr(node)) {
+ syslog(LOG_WARNING, "init_sel: file_get_sel_hdr\n");
return -1;
}
- if (file_get_sel_data()) {
- syslog(LOG_ALERT, "init_sel: file_get_sel_data\n");
+ if (file_get_sel_data(node)) {
+ syslog(LOG_WARNING, "init_sel: file_get_sel_data\n");
return -1;
}
@@ -406,35 +503,52 @@ sel_init(void) {
}
// File not present, so create the file
- fp = fopen(SEL_LOG_FILE, "w+");
+ fp = fopen(fpath, "w+");
if (fp == NULL) {
- syslog(LOG_ALERT, "init_sel: fopen\n");
+ syslog(LOG_WARNING, "init_sel: fopen\n");
return -1;
}
fclose (fp);
// Populate SEL Header in to the file
- g_sel_hdr.magic = SEL_HDR_MAGIC;
- g_sel_hdr.version = SEL_HDR_VERSION;
- g_sel_hdr.begin = SEL_INDEX_MIN;
- g_sel_hdr.end = SEL_INDEX_MIN;
- memset(g_sel_hdr.ts_add.ts, 0x0, 4);
- memset(g_sel_hdr.ts_erase.ts, 0x0, 4);
-
- if (file_store_sel_hdr()) {
- syslog(LOG_ALERT, "init_sel: file_store_sel_hdr\n");
+ g_sel_hdr[node].magic = SEL_HDR_MAGIC;
+ g_sel_hdr[node].version = SEL_HDR_VERSION;
+ g_sel_hdr[node].begin = SEL_INDEX_MIN;
+ g_sel_hdr[node].end = SEL_INDEX_MIN;
+ memset(g_sel_hdr[node].ts_add.ts, 0x0, 4);
+ memset(g_sel_hdr[node].ts_erase.ts, 0x0, 4);
+
+ if (file_store_sel_hdr(node)) {
+ syslog(LOG_WARNING, "init_sel: file_store_sel_hdr\n");
return -1;
}
// Populate SEL Data in to the file
for (i = 1; i <= SEL_RECORDS_MAX; i++) {
sel_msg_t msg = {0};
- if (file_store_sel_data(i, &msg)) {
- syslog(LOG_ALERT, "init_sel: file_store_sel_data\n");
+ if (file_store_sel_data(node, i, &msg)) {
+ syslog(LOG_WARNING, "init_sel: file_store_sel_data\n");
return -1;
}
}
+ g_rsv_id[node] = 0x01;
+
return 0;
}
+
+int
+sel_init(void) {
+ int ret;
+ int i;
+
+ for (i = 1; i < MAX_NODES+1; i++) {
+ ret = sel_node_init(i);
+ if (ret) {
+ return ret;
+ }
+ }
+
+ return ret;
+}
diff --git a/common/recipes-core/ipmid/files/sel.h b/common/recipes-core/ipmid/files/sel.h
index 3bb9a2f..500b078 100644
--- a/common/recipes-core/ipmid/files/sel.h
+++ b/common/recipes-core/ipmid/files/sel.h
@@ -37,15 +37,15 @@ typedef struct {
unsigned char msg[16];
} sel_msg_t;
-void sel_ts_recent_add(time_stamp_t *ts);
-void sel_ts_recent_erase(time_stamp_t *ts);
-int sel_num_entries(void);
-int sel_free_space(void);
-int sel_rsv_id();
-int sel_get_entry(int read_rec_id, sel_msg_t *msg, int *next_rec_id);
-int sel_add_entry(sel_msg_t *msg, int *rec_id);
-int sel_erase(int rsv_id);
-int sel_erase_status(int rsv_id, sel_erase_stat_t *status);
+void sel_ts_recent_add(int node, time_stamp_t *ts);
+void sel_ts_recent_erase(int node, time_stamp_t *ts);
+int sel_num_entries(int node);
+int sel_free_space(int node);
+int sel_rsv_id(int node);
+int sel_get_entry(int node, int read_rec_id, sel_msg_t *msg, int *next_rec_id);
+int sel_add_entry(int node, sel_msg_t *msg, int *rec_id);
+int sel_erase(int node, int rsv_id);
+int sel_erase_status(int node, int rsv_id, sel_erase_stat_t *status);
int sel_init(void);
#endif /* __SEL_H__ */
diff --git a/common/recipes-core/log-util/files/lib_pal.py b/common/recipes-core/log-util/files/lib_pal.py
new file mode 100644
index 0000000..dcae08a
--- /dev/null
+++ b/common/recipes-core/log-util/files/lib_pal.py
@@ -0,0 +1,31 @@
+#!/usr/bin/env python
+#
+# Copyright 2015-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+
+from ctypes import *
+
+lpal_hndl = CDLL("libpal.so")
+
+def pal_get_fru_name(fru):
+ name = create_string_buffer(16)
+ ret = lpal_hndl.pal_get_fru_name(c_uint8(fru), name)
+ if ret:
+ return None
+ else:
+ return name.value
diff --git a/common/recipes-core/log-util/files/log-util.py b/common/recipes-core/log-util/files/log-util.py
new file mode 100644
index 0000000..565e9a1
--- /dev/null
+++ b/common/recipes-core/log-util/files/log-util.py
@@ -0,0 +1,94 @@
+#!/usr/bin/env python
+#
+# Copyright 2015-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+#
+
+import re
+from datetime import datetime
+import sys
+from ctypes import *
+from lib_pal import *
+
+SYSLOGFILE = '/mnt/data/logfile'
+APPNAME = 'log-util'
+
+def print_usage():
+ print 'Usage: %s --show' % (APPNAME)
+
+def log_main():
+
+ if len(sys.argv) is not 2:
+ print_usage()
+ return -1
+
+ if sys.argv[1] != '--show':
+ print_usage()
+ return -1
+
+ fd = open(SYSLOGFILE, 'r')
+ syslog = fd.readlines()
+ fd.close()
+
+ print '%-4s %-8s %-22s %-16s %s' % (
+ "FRU#",
+ "FRU_NAME",
+ "TIME_STAMP",
+ "APP_NAME",
+ "MESSAGE"
+ )
+
+ for log in syslog:
+ if not (re.search(r' bmc [a-z]*.crit ', log)):
+ continue
+ if re.search(r'FRU: [0-9]{1,2}', log, re.IGNORECASE):
+ fru = ''.join(re.findall(r'FRU: [0-9]{1,2}', log, re.IGNORECASE))
+ # fru is in format "FRU: X"
+ fru = fru[5]
+
+ # Name of the FRU from the PAL library
+ name = pal_get_fru_name(int(fru))
+ else :
+ fru = '0'
+
+ name = 'all'
+
+
+ temp = re.split(r' bmc [a-z]*.crit ', log)
+
+ # Time format Sep 28 22:10:50
+ ts = temp[0]
+ currtime = datetime.now()
+ ts = '%d %s' % (currtime.year, ts)
+ time = datetime.strptime(ts, '%Y %b %d %H:%M:%S')
+ time = time.strftime('%Y-%m-%d %H:%M:%S')
+
+ temp2 = re.split(r': ', temp[1], 1)
+ app = temp2[0]
+ message = temp2[1]
+
+ print '%-4s %-8s %-22s %-16s %s' % (
+ fru,
+ name,
+ time,
+ app,
+ message
+ )
+
+
+if __name__ == '__main__':
+ log_main()
diff --git a/common/recipes-core/log-util/log-util_0.1.bb b/common/recipes-core/log-util/log-util_0.1.bb
new file mode 100644
index 0000000..0782688
--- /dev/null
+++ b/common/recipes-core/log-util/log-util_0.1.bb
@@ -0,0 +1,57 @@
+# Copyright 2015-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+SUMMARY = "Log Utility"
+DESCRIPTION = "Utility to parse and display logs."
+SECTION = "base"
+PR = "r1"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://log-util.py;beginline=5;endline=18;md5=0b1ee7d6f844d472fa306b2fee2167e0"
+
+
+SRC_URI = "file://log-util.py \
+ file://lib_pal.py \
+ "
+
+S = "${WORKDIR}"
+
+DEPENDS += "libpal"
+
+binfiles = "log-util.py lib_pal.py"
+
+pkgdir = "log-util"
+
+do_install() {
+ dst="${D}/usr/local/fbpackages/${pkgdir}"
+ install -d $dst
+ localbindir="${D}/usr/local/bin"
+ install -d ${localbindir}
+
+ install -m 755 log-util.py ${dst}/log-util
+ ln -s ../fbpackages/${pkgdir}/log-util ${localbindir}/log-util
+
+ install -m 755 lib_pal.py ${dst}/lib_pal.py
+ ln -s ../fbpackages/${pkgdir}/lib_pal.py ${localbindir}/lib_pal.py
+}
+
+RDEPENDS_${PN} += "libpal"
+
+FBPACKAGEDIR = "${prefix}/local/fbpackages"
+
+FILES_${PN} = "${FBPACKAGEDIR}/log-util ${prefix}/local/bin"
+
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
diff --git a/common/recipes-core/power-util/files/power-util.c b/common/recipes-core/power-util/files/power-util.c
index 0fda9d6..07e7c23 100644
--- a/common/recipes-core/power-util/files/power-util.c
+++ b/common/recipes-core/power-util/files/power-util.c
@@ -32,8 +32,8 @@
#define POWER_ON_STR "on"
#define POWER_OFF_STR "off"
-const char *pwr_option_list = "status, graceful-shutdown, off, on, cycle, 12V-off,"
- "12V-on, 12V-cycle";
+const char *pwr_option_list = "status, graceful-shutdown, off, on, cycle, "
+ "12V-off, 12V-on, 12V-cycle";
enum {
PWR_STATUS = 1,
@@ -47,22 +47,6 @@ enum {
PWR_SLED_CYCLE
};
-static int
-set_last_pwr_state(uint8_t fru, char * state) {
-
- int ret;
- char key[MAX_KEY_LEN] = {0};
-
- sprintf(key, "pwr_server%d_last_state", (int) fru);
-
- ret = pal_set_key_value(key, state);
- if (ret < 0) {
- syslog(LOG_ALERT, "set_last_pwr_state: pal_set_key_value failed for "
- "fru %u", fru);
- }
- return ret;
-}
-
static void
print_usage() {
printf("Usage: power-util [ %s ] [ %s ]\nUsage: power-util sled-cycle\n",
@@ -107,7 +91,7 @@ power_util(uint8_t fru, uint8_t opt) {
case PWR_STATUS:
ret = pal_get_server_power(fru, &status);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_get_server_power failed for fru %u\n", fru);
+ syslog(LOG_WARNING, "power_util: pal_get_server_power failed for fru %u\n", fru);
return ret;
}
printf("Power status for fru %u : %s\n", fru, status?"ON":"OFF");
@@ -119,22 +103,24 @@ power_util(uint8_t fru, uint8_t opt) {
ret = pal_set_server_power(fru, SERVER_GRACEFUL_SHUTDOWN);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_server_power failed for"
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
" fru %u", fru);
return ret;
} else if (ret == 1) {
printf("fru %u is already powered OFF...\n", fru);
return 0;
+ } else {
+ syslog(LOG_CRIT, "SERVER_GRACEFUL_SHUTDOWN successful for FRU: %d", fru);
}
- ret = set_last_pwr_state(fru, POWER_OFF_STR);
+ ret = pal_set_last_pwr_state(fru, POWER_OFF_STR);
if (ret < 0) {
return ret;
}
ret = pal_set_led(fru, LED_STATE_OFF);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_led failed for fru %u", fru);
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
return ret;
}
break;
@@ -145,22 +131,24 @@ power_util(uint8_t fru, uint8_t opt) {
ret = pal_set_server_power(fru, SERVER_POWER_OFF);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_server_power failed for"
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
" fru %u", fru);
return ret;
} else if (ret == 1) {
printf("fru %u is already powered OFF...\n", fru);
return 0;
+ } else {
+ syslog(LOG_CRIT, "SERVER_POWER_OFF successful for FRU: %d", fru);
}
- ret = set_last_pwr_state(fru, POWER_OFF_STR);
+ ret = pal_set_last_pwr_state(fru, POWER_OFF_STR);
if (ret < 0) {
return ret;
}
ret = pal_set_led(fru, LED_STATE_OFF);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_led failed for fru %u", fru);
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
return ret;
}
break;
@@ -171,22 +159,24 @@ power_util(uint8_t fru, uint8_t opt) {
ret = pal_set_server_power(fru, SERVER_POWER_ON);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_server_power failed for"
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
" fru %u", fru);
return ret;
} else if (ret == 1) {
printf("fru %u is already powered ON...\n", fru);
return 0;
+ } else {
+ syslog(LOG_CRIT, "SERVER_POWER_ON successful for FRU: %d", fru);
}
- ret = set_last_pwr_state(fru, POWER_ON_STR);
+ ret = pal_set_last_pwr_state(fru, POWER_ON_STR);
if (ret < 0) {
return ret;
}
ret = pal_set_led(fru, LED_STATE_ON);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_led failed for fru %u", fru);
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
return ret;
}
break;
@@ -197,41 +187,97 @@ power_util(uint8_t fru, uint8_t opt) {
ret = pal_set_server_power(fru, SERVER_POWER_CYCLE);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_server_power failed for"
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
" fru %u", fru);
return ret;
+ } else {
+ syslog(LOG_CRIT, "SERVER_POWER_CYCLE successful for FRU: %d", fru);
}
- ret = set_last_pwr_state(fru, POWER_ON_STR);
+ ret = pal_set_last_pwr_state(fru, POWER_ON_STR);
if (ret < 0) {
return ret;
}
ret = pal_set_led(fru, LED_STATE_ON);
if (ret < 0) {
- syslog(LOG_ALERT, "power_util: pal_set_led failed for fru %u", fru);
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
return ret;
}
break;
case PWR_12V_OFF:
- ret = 0; // TODO: Need to add the API to support this power state setting
+
+ printf("12V Powering fru %u to OFF state...\n", fru);
+
+ ret = pal_set_server_power(fru, SERVER_12V_OFF);
+ if (ret < 0) {
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
+ " fru %u", fru);
+ return ret;
+ } else {
+ syslog(LOG_CRIT, "SERVER_12V_OFF successful for FRU: %d", fru);
+ }
+
+ ret = pal_set_last_pwr_state(fru, POWER_OFF_STR);
+ if (ret < 0) {
+ return ret;
+ }
+
+ ret = pal_set_led(fru, LED_STATE_OFF);
+ if (ret < 0) {
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
+ return ret;
+ }
break;
case PWR_12V_ON:
- ret = 0; // TODO: Need to add the API to support this power state setting
+
+ printf("12V Powering fru %u to ON state...\n", fru);
+
+ ret = pal_set_server_power(fru, SERVER_12V_ON);
+ if (ret < 0) {
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
+ " fru %u", fru);
+ return ret;
+ } else {
+ syslog(LOG_CRIT, "SERVER_12V_ON successful for FRU: %d", fru);
+ }
break;
case PWR_12V_CYCLE:
- ret = 0; // TODO: Need to add the API to support this power state setting
+
+ printf("12V Power cycling fru %u...\n", fru);
+
+ ret = pal_set_server_power(fru, SERVER_12V_CYCLE);
+ if (ret < 0) {
+ syslog(LOG_WARNING, "power_util: pal_set_server_power failed for"
+ " fru %u", fru);
+ return ret;
+ } else {
+ syslog(LOG_CRIT, "SERVER_12V_CYCLE successful for FRU: %d", fru);
+ }
+
+ ret = pal_set_last_pwr_state(fru, POWER_OFF_STR);
+ if (ret < 0) {
+ return ret;
+ }
+
+ ret = pal_set_led(fru, LED_STATE_OFF);
+ if (ret < 0) {
+ syslog(LOG_WARNING, "power_util: pal_set_led failed for fru %u", fru);
+ return ret;
+ }
break;
case PWR_SLED_CYCLE:
+ syslog(LOG_CRIT, "SLED_CYCLE successful");
+ sleep(1);
pal_sled_cycle();
break;
default:
- syslog(LOG_ALERT, "power_util: wrong option");
+ syslog(LOG_WARNING, "power_util: wrong option");
}
@@ -292,4 +338,6 @@ main(int argc, char **argv) {
print_usage();
return ret;
}
+
+ return ret;
}
diff --git a/common/recipes-core/python/python_2.7.9.bbappend b/common/recipes-core/python/python_2.7.9.bbappend
new file mode 100644
index 0000000..c3f1fa1
--- /dev/null
+++ b/common/recipes-core/python/python_2.7.9.bbappend
@@ -0,0 +1,21 @@
+# Copyright 2014-present Facebook. All Rights Reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+# Patch from here - http://patchwork.openembedded.org/patch/96953/
+# is not available upstream yet . Until then we are adding ourselves to
+# satisfy ssl.py that has a dependency on this module.
+RDEPENDS_${PN}-io += "${PN}-contextlib"
diff --git a/common/recipes-core/sensor-mon/files/sensord.c b/common/recipes-core/sensor-mon/files/sensord.c
index 1852af3..0ad00f7 100644
--- a/common/recipes-core/sensor-mon/files/sensord.c
+++ b/common/recipes-core/sensor-mon/files/sensord.c
@@ -32,73 +32,17 @@
#include <facebook/bic.h>
#include <openbmc/ipmi.h>
#include <openbmc/sdr.h>
-#ifdef CONFIG_YOSEMITE
-#include <facebook/yosemite_sensor.h>
-#endif /* CONFIG_YOSEMITE */
-
-#define MAX_SENSOR_NUM 0xFF
-#define NORMAL_STATE 0x00
-
-#define SETBIT(x, y) (x | (1 << y))
-#define GETBIT(x, y) ((x & (1 << y)) > y)
-#define CLEARBIT(x, y) (x & (~(1 << y)))
-#define GETMASK(y) (1 << y)
-
-
-
-/* Enum for type of Upper and Lower threshold values */
-enum {
- UCR_THRESH = 0x01,
- UNC_THRESH,
- UNR_THRESH,
- LCR_THRESH,
- LNC_THRESH,
- LNR_THRESH,
- POS_HYST,
- NEG_HYST,
-};
-
-/* To hold the sensor info and calculated threshold values from the SDR */
-typedef struct {
- uint8_t flag;
- float ucr_thresh;
- float unc_thresh;
- float unr_thresh;
- float lcr_thresh;
- float lnc_thresh;
- float lnr_thresh;
- float pos_hyst;
- float neg_hyst;
- int curr_state;
- char name[23];
- char units[64];
-
-} thresh_sensor_t;
-
-/* Function pointer to read sensor current value */
-static int (*read_snr_val)(uint8_t, uint8_t, void *);
-
-#ifdef CONFIG_YOSEMITE
-
-// TODO: Change to 6 after adding SPB and NIC
-#define MAX_NUM_FRUS 4
-#define YOSEMITE_SDR_PATH "/tmp/sdr_%s.bin"
-
-static thresh_sensor_t snr_slot1[MAX_SENSOR_NUM] = {0};
-static thresh_sensor_t snr_slot2[MAX_SENSOR_NUM] = {0};
-static thresh_sensor_t snr_slot3[MAX_SENSOR_NUM] = {0};
-static thresh_sensor_t snr_slot4[MAX_SENSOR_NUM] = {0};
-static thresh_sensor_t snr_spb[MAX_SENSOR_NUM] = {0};
-static thresh_sensor_t snr_nic[MAX_SENSOR_NUM] = {0};
-
-static sensor_info_t sinfo_slot1[MAX_SENSOR_NUM] = {0};
-static sensor_info_t sinfo_slot2[MAX_SENSOR_NUM] = {0};
-static sensor_info_t sinfo_slot3[MAX_SENSOR_NUM] = {0};
-static sensor_info_t sinfo_slot4[MAX_SENSOR_NUM] = {0};
-static sensor_info_t sinfo_spb[MAX_SENSOR_NUM] = {0};
-static sensor_info_t sinfo_nic[MAX_SENSOR_NUM] = {0};
-#endif /* CONFIG_YOSEMITE */
+#include <openbmc/pal.h>
+#define DELAY 2
+
+static thresh_sensor_t g_snr[MAX_NUM_FRUS][MAX_SENSOR_NUM] = {0};
+
+static void
+print_usage() {
+ printf("Usage: sensord <options>\n");
+ printf("Options: [ %s ]\n", pal_fru_list);
+}
/*
* Returns the pointer to the struct holding all sensor info and
@@ -109,502 +53,58 @@ get_struct_thresh_sensor(uint8_t fru) {
thresh_sensor_t *snr;
-#ifdef CONFIG_YOSEMITE
- switch (fru) {
- case FRU_SLOT1:
- snr = snr_slot1;
- break;
- case FRU_SLOT2:
- snr = snr_slot2;
- break;
- case FRU_SLOT3:
- snr = snr_slot3;
- break;
- case FRU_SLOT4:
- snr = snr_slot4;
- break;
- case FRU_SPB:
- snr = snr_spb;
- break;
- case FRU_NIC:
- snr = snr_nic;
- break;
- default:
- syslog(LOG_ALERT, "get_struct_thresh_sensor: Wrong FRU ID %d\n", fru);
- return NULL;
- }
-#endif /* CONFIG_YOSEMITE */
-
- return snr;
-}
-
-
-/* Returns the all the SDRs for the particular fru# */
-static sensor_info_t *
-get_struct_sensor_info(uint8_t fru) {
-
- sensor_info_t *sinfo;
-
-#ifdef CONFIG_YOSEMITE
- switch (fru) {
- case FRU_SLOT1:
- sinfo = sinfo_slot1;
- break;
- case FRU_SLOT2:
- sinfo = sinfo_slot2;
- break;
- case FRU_SLOT3:
- sinfo = sinfo_slot3;
- break;
- case FRU_SLOT4:
- sinfo = sinfo_slot4;
- break;
- case FRU_SPB:
- sinfo = sinfo_spb;
- break;
- case FRU_NIC:
- sinfo = sinfo_nic;
- break;
- default:
- syslog(LOG_ALERT, "get_struct_sensor_info: Wrong FRU ID %d\n", fru);
- return NULL;
- }
-#endif /* CONFIG_YOSEMITE */
-
- return sinfo;
-}
-
-
-/* Returns the SDR for a particular sensor of particular fru# */
-static sdr_full_t *
-get_struct_sdr(uint8_t fru, uint8_t snr_num) {
-
- sdr_full_t *sdr;
- sensor_info_t *sinfo;
- sinfo = get_struct_sensor_info(fru);
- if (sinfo == NULL) {
- syslog(LOG_ALERT, "get_struct_sdr: get_struct_sensor_info failed\n");
+ if (fru < 1 || fru > MAX_NUM_FRUS) {
+ syslog(LOG_WARNING, "get_struct_thresh_sensor: Wrong FRU ID %d\n", fru);
return NULL;
}
- sdr = &sinfo[snr_num].sdr;
- return sdr;
+ snr = g_snr[fru-1];
+ return snr;
}
-/* Get the threshold values from the SDRs */
+/* Initialize all thresh_sensor_t structs for all the Yosemite sensors */
static int
-get_sdr_thresh_val(uint8_t fru, uint8_t snr_num, uint8_t thresh, void *value) {
+init_fru_snr_thresh(uint8_t fru) {
+ int i;
int ret;
- uint8_t x;
- uint8_t m_lsb, m_msb, m;
- uint8_t b_lsb, b_msb, b;
- int8_t b_exp, r_exp;
- uint8_t thresh_val;
- sdr_full_t *sdr;
-
- sdr = get_struct_sdr(fru, snr_num);
- if (sdr == NULL) {
- syslog(LOG_ALERT, "get_sdr_thresh_val: get_struct_sdr failed\n");
- return -1;
- }
-
- switch (thresh) {
- case UCR_THRESH:
- thresh_val = sdr->uc_thresh;
- break;
- case UNC_THRESH:
- thresh_val = sdr->unc_thresh;
- break;
- case UNR_THRESH:
- thresh_val = sdr->unr_thresh;
- break;
- case LCR_THRESH:
- thresh_val = sdr->lc_thresh;
- break;
- case LNC_THRESH:
- thresh_val = sdr->lnc_thresh;
- break;
- case LNR_THRESH:
- thresh_val = sdr->lnr_thresh;
- break;
- case POS_HYST:
- thresh_val = sdr->pos_hyst;
- break;
- case NEG_HYST:
- thresh_val = sdr->neg_hyst;
- break;
- default:
- syslog(LOG_ERR, "get_sdr_thresh_val: reading unknown threshold val");
- return -1;
- }
-
- // y = (mx + b * 10^b_exp) * 10^r_exp
- x = thresh_val;
-
- m_lsb = sdr->m_val;
- m_msb = sdr->m_tolerance >> 6;
- m = (m_msb << 8) | m_lsb;
-
- b_lsb = sdr->b_val;
- b_msb = sdr->b_accuracy >> 6;
- b = (b_msb << 8) | b_lsb;
-
- // exponents are 2's complement 4-bit number
- b_exp = sdr->rb_exp & 0xF;
- if (b_exp > 7) {
- b_exp = (~b_exp + 1) & 0xF;
- b_exp = -b_exp;
- }
- r_exp = (sdr->rb_exp >> 4) & 0xF;
- if (r_exp > 7) {
- r_exp = (~r_exp + 1) & 0xF;
- r_exp = -r_exp;
- }
-
- * (float *) value = ((m * x) + (b * pow(10, b_exp))) * (pow(10, r_exp));
-
- return 0;
-}
-
-/*
- * Populate all fields of thresh_sensor_t struct for a particular sensor.
- * Incase the threshold value is 0 mask the check for that threshvold
- * value in flag field.
- */
-int
-init_snr_thresh(uint8_t fru, uint8_t snr_num, uint8_t flag) {
-
- int value;
- float fvalue;
- uint8_t op, modifier;
+ uint8_t snr_num;
+ int sensor_cnt;
+ uint8_t *sensor_list;
thresh_sensor_t *snr;
- sdr_full_t *sdr;
-
- sdr = get_struct_sdr(fru, snr_num);
- if (sdr == NULL) {
- syslog(LOG_ALERT, "init_snr_name: get_struct_sdr failed\n");
- return -1;
- }
-
snr = get_struct_thresh_sensor(fru);
if (snr == NULL) {
- syslog(LOG_ALERT, "init_snr_thresh: get_struct_thresh_sensor failed");
- return -1;
- }
-
- snr[snr_num].flag = flag;
- snr[snr_num].curr_state = NORMAL_STATE;
-
- if (sdr_get_sensor_name(sdr, snr[snr_num].name)) {
- syslog(LOG_ALERT, "sdr_get_sensor_name: FRU %d: num: 0x%X: reading name"
- " from SDR failed.", fru, snr_num);
- return -1;
- }
-
- // TODO: Add support for modifier (Mostly modifier is zero)
- if (sdr_get_sensor_units(sdr, &op, &modifier, snr[snr_num].units)) {
- syslog(LOG_ALERT, "sdr_get_sensor_units: FRU %d: num 0x%X: reading units"
- " from SDR failed.", fru, snr_num);
+#ifdef DEBUG
+ syslog(LOG_WARNING, "init_fru_snr_thresh: get_struct_thresh_sensor failed");
+#endif /* DEBUG */
return -1;
}
- if (get_sdr_thresh_val(fru, snr_num, UCR_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UCR_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].ucr_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, UCR_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, UCR_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
- }
+ ret = pal_get_fru_sensor_list(fru, &sensor_list, &sensor_cnt);
+ if (ret < 0) {
+ return ret;
}
- if (get_sdr_thresh_val(fru, snr_num, UNC_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UNC_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].unc_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, UNC_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, UNC_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
- }
- }
-
- if (get_sdr_thresh_val(fru, snr_num, UNR_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UNR_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].unr_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, UNR_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, UNR_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
- }
- }
-
- if (get_sdr_thresh_val(fru, snr_num, LCR_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LCR_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].lcr_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, LCR_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, LCR_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
- }
- }
-
- if (get_sdr_thresh_val(fru, snr_num, LNC_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LNC_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].lnc_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, LNC_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, LNC_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
+ for (i < 0; i < sensor_cnt; i++) {
+ snr_num = sensor_list[i];
+ ret = sdr_get_snr_thresh(fru, snr_num,
+ GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH), &snr[snr_num]);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_WARNING, "init_fru_snr_thresh: sdr_get_snr_thresh for FRU: %d", fru);
+#endif /* DEBUG */
+ continue;
}
}
- if (get_sdr_thresh_val(fru, snr_num, LNR_THRESH, &fvalue)) {
- syslog(LOG_ERR,
- "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LNR_THRESH",
- fru, snr_num, snr[snr_num].name);
- } else {
- snr[snr_num].lnr_thresh = fvalue;
- if (!(fvalue)) {
- snr[snr_num].flag = CLEARBIT(snr[snr_num].flag, LNR_THRESH);
- syslog(LOG_ALERT,
- "FRU: %d, num: 0x%X, %-16s, LNR_THRESH check disabled val->%.2f",
- fru, snr_num, snr[snr_num].name, fvalue);
- }
+ // TODO: This is a HACK. Need to add the pal_threshold_verify support
+ if (fru > 0 && fru < 5) {
+ snr[BIC_SENSOR_SOC_THERM_MARGIN].flag = SETBIT(snr[BIC_SENSOR_SOC_THERM_MARGIN].flag, UCR_THRESH);
}
- if (get_sdr_thresh_val(fru, snr_num, POS_HYST, &fvalue)) {
- syslog(LOG_ERR, "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, POS_HYST",
- fru, snr_num, snr[snr_num].name);
- } else
- snr[snr_num].pos_hyst = fvalue;
-
- if (get_sdr_thresh_val(fru, snr_num, NEG_HYST, &fvalue)) {
- syslog(LOG_ERR, "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, NEG_HYST",
- fru, snr_num, snr[snr_num].name);
- } else
- snr[snr_num].neg_hyst = fvalue;
-
return 0;
}
-#ifdef CONFIG_YOSEMITE
-/* Initialize all thresh_sensor_t structs for all the Yosemite sensors */
-static void
-init_yosemite_snr_thresh(uint8_t fru) {
-
- int i;
-
- switch (fru) {
- case FRU_SLOT1:
- case FRU_SLOT2:
- case FRU_SLOT3:
- case FRU_SLOT4:
-
- for (i < 0; i < bic_sensor_cnt; i++) {
- init_snr_thresh(fru, bic_sensor_list[i], GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
- }
- /*
- init_snr_thresh(fru, BIC_SENSOR_MB_OUTLET_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCCIN_VR_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_GBE_VR_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_1V05PCH_VR_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_MB_INLET_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_PCH_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_THERM_MARGIN, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VDDR_VR_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_GBE_VR_CURR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_1V05_PCH_VR_CURR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCCIN_VR_POUT, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCCIN_VR_CURR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCCIN_VR_VOL,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_INA230_POWER, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_PACKAGE_PWR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_TJMAX, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VDDR_VR_POUT, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VDDR_VR_CURR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VDDR_VR_VOL,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_SCSUS_VR_CURR, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_SCSUS_VR_VOL,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_SCSUS_VR_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_SCSUS_VR_POUT, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_GBE_VR_POUT, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_VCC_GBE_VR_VOL,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_1V05_PCH_VR_VOL,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_DIMMA0_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_DIMMA1_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_DIMMB0_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_SOC_DIMMB1_TEMP, GETMASK(UCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_P3V3_MB,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_P12V_MB,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_P1V05_PCH,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_P3V3_STBY_MB,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_P5V_STBY_MB,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_PV_BAT,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_PVDDR,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
-
- init_snr_thresh(fru, BIC_SENSOR_PVCC_GBE,
- GETMASK(UCR_THRESH) | GETMASK(LCR_THRESH));
- // TODO: Add Support for Discrete sensors
- // init_snr_thresh(fru, BIC_SENSOR_POST_ERR, //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_SYSTEM_STATUS, //Discrete
- // init_snr_thresh(fru, BIC_SENSOR_SPS_FW_HLTH); //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_POWER_THRESH_EVENT, //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_MACHINE_CHK_ERR, //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_PCIE_ERR); //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_OTHER_IIO_ERR); //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_PROC_HOT_EXT); //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_POWER_ERR); //Event-only
- // init_snr_thresh(fru, , ); //Event-only
- // init_snr_thresh(fru, BIC_SENSOR_PROC_FAIL); //Discrete
- // init_snr_thresh(fru, BIC_SENSOR_SYS_BOOT_STAT ); //Discrete
- // init_snr_thresh(fru, BIC_SENSOR_VR_HOT); //Discrete
- // init_snr_thresh(fru, BIC_SENSOR_CPU_DIMM_HOT ); //Discrete
- // init_snr_thresh(fru, BIC_SENSOR_CAT_ERR, //Event-only
-
- */
-
- break;
-
- case FRU_SPB:
- // TODO: Add support for threshold calculation for SP sensors
- /*
- init_snr_thresh(fru, SP_SENSOR_INLET_TEMP, "SP_SENSOR_INLET_TEMP");
- init_snr_thresh(fru, SP_SENSOR_OUTLET_TEMP, "SP_SENSOR_OUTLET_TEMP");
- init_snr_thresh(fru, SP_SENSOR_MEZZ_TEMP, "SP_SENSOR_MEZZ_TEMP");
- init_snr_thresh(fru, SP_SENSOR_FAN0_TACH, "SP_SENSOR_FAN0_TACH");
- init_snr_thresh(fru, SP_SENSOR_FAN1_TACH, "SP_SENSOR_FAN1_TACH");
- init_snr_thresh(fru, SP_SENSOR_AIR_FLOW, "SP_SENSOR_AIR_FLOW");
- init_snr_thresh(fru, SP_SENSOR_P5V, "SP_SENSOR_P5V");
- init_snr_thresh(fru, SP_SENSOR_P12V, "SP_SENSOR_P12V");
- init_snr_thresh(fru, SP_SENSOR_P3V3_STBY, "SP_SENSOR_P3V3_STBY");
- init_snr_thresh(fru, SP_SENSOR_P12V_SLOT0, "SP_SENSOR_P12V_SLOT0");
- init_snr_thresh(fru, SP_SENSOR_P12V_SLOT1, "SP_SENSOR_P12V_SLOT1");
- init_snr_thresh(fru, SP_SENSOR_P12V_SLOT2, "SP_SENSOR_P12V_SLOT2");
- init_snr_thresh(fru, SP_SENSOR_P12V_SLOT3, "SP_SENSOR_P12V_SLOT3");
- init_snr_thresh(fru, SP_SENSOR_P3V3, "SP_SENSOR_P3V3");
- init_snr_thresh(fru, SP_SENSOR_HSC_IN_VOLT, "SP_SENSOR_HSC_IN_VOLT");
- init_snr_thresh(fru, SP_SENSOR_HSC_OUT_CURR, "SP_SENSOR_HSC_OUT_CURR");
- init_snr_thresh(fru, SP_SENSOR_HSC_TEMP, "SP_SENSOR_HSC_TEMP");
- init_snr_thresh(fru, SP_SENSOR_HSC_IN_POWER, "SP_SENSOR_HSC_IN_POWER");
- */
- break;
-
- case FRU_NIC:
- // TODO: Add support for NIC sensor threshold, if any.
- break;
-
- default:
- syslog(LOG_ALERT, "init_yosemite_snr_thresh: wrong FRU ID");
- exit(-1);
- }
-}
-#endif /* CONFIG_YOSEMITE */
-
-/* Wrapper function to initialize all the platform sensors */
-static void
-init_all_snr_thresh() {
- int fru;
-
- char path[64] = {0};
- sensor_info_t *sinfo;
-
-
-#ifdef CONFIG_YOSEMITE
- for (fru = FRU_SLOT1; fru < (FRU_SLOT1 + MAX_NUM_FRUS); fru++) {
-
- if (get_fru_sdr_path(fru, path) < 0) {
- syslog(LOG_ALERT, "yosemite_sdr_init: get_fru_sdr_path failed\n");
- continue;
- }
-#endif /* CONFIG_YOSEMITE */
-
- sinfo = get_struct_sensor_info(fru);
-
- if (sdr_init(path, sinfo) < 0)
- syslog(LOG_ERR, "init_all_snr_thresh: sdr_init failed for FRU %d", fru);
- }
-
-#ifdef CONFIG_YOSEMITE
- for (fru = FRU_SLOT1; fru < (FRU_SLOT1 + MAX_NUM_FRUS); fru++) {
- init_yosemite_snr_thresh(fru);
- }
-#endif /* CONFIG_YOSEMITE */
-}
-
-
-
-
static float
get_snr_thresh_val(uint8_t fru, uint8_t snr_num, uint8_t thresh) {
@@ -633,7 +133,7 @@ get_snr_thresh_val(uint8_t fru, uint8_t snr_num, uint8_t thresh) {
val = snr[snr_num].lnr_thresh;
break;
default:
- syslog(LOG_ALERT, "get_snr_thresh_val: wrong thresh enum value");
+ syslog(LOG_WARNING, "get_snr_thresh_val: wrong thresh enum value");
exit(-1);
}
@@ -662,7 +162,7 @@ check_thresh_deassert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
switch (thresh) {
case UNC_THRESH:
- if (curr_val <= thresh_val) {
+ if (curr_val < (thresh_val - snr[snr_num].pos_hyst)) {
curr_state = ~(SETBIT(curr_state, UNR_THRESH) |
SETBIT(curr_state, UCR_THRESH) |
SETBIT(curr_state, UNC_THRESH));
@@ -671,7 +171,7 @@ check_thresh_deassert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
break;
case UCR_THRESH:
- if (curr_val <= thresh_val) {
+ if (curr_val < (thresh_val - snr[snr_num].pos_hyst)) {
curr_state = ~(SETBIT(curr_state, UCR_THRESH) |
SETBIT(curr_state, UNR_THRESH));
sprintf(thresh_name, "Upper Critical");
@@ -679,14 +179,14 @@ check_thresh_deassert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
break;
case UNR_THRESH:
- if (curr_val <= thresh_val) {
+ if (curr_val < (thresh_val - snr[snr_num].pos_hyst)) {
curr_state = ~(SETBIT(curr_state, UNR_THRESH));
sprintf(thresh_name, "Upper Non Recoverable");
}
break;
case LNC_THRESH:
- if (curr_val >= thresh_val) {
+ if (curr_val > (thresh_val + snr[snr_num].neg_hyst)) {
curr_state = ~(SETBIT(curr_state, LNR_THRESH) |
SETBIT(curr_state, LCR_THRESH) |
SETBIT(curr_state, LNC_THRESH));
@@ -695,7 +195,7 @@ check_thresh_deassert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
break;
case LCR_THRESH:
- if (curr_val >= thresh_val) {
+ if (curr_val > (thresh_val + snr[snr_num].neg_hyst)) {
curr_state = ~(SETBIT(curr_state, LCR_THRESH) |
SETBIT(curr_state, LNR_THRESH));
sprintf(thresh_name, "Lower Critical");
@@ -703,23 +203,23 @@ check_thresh_deassert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
break;
case LNR_THRESH:
- if (curr_val >= thresh_val) {
+ if (curr_val > (thresh_val + snr[snr_num].neg_hyst)) {
curr_state = ~(SETBIT(curr_state, LNR_THRESH));
sprintf(thresh_name, "Lower Non Recoverable");
}
break;
default:
- syslog(LOG_ALERT, "get_snr_thresh_val: wrong thresh enum value");
+ syslog(LOG_WARNING, "get_snr_thresh_val: wrong thresh enum value");
exit(-1);
}
if (curr_state) {
snr[snr_num].curr_state &= curr_state;
- syslog(LOG_CRIT, "DEASSERT: %s threshold raised - FRU: %d, num: 0x%X,"
- " snr: %-16s,",thresh_name, fru, snr_num, snr[snr_num].name);
- syslog(LOG_CRIT, "curr_val: %.2f %s, thresh_val: %.2f %s cf: %u",
- curr_val, snr[snr_num].units, thresh_val, snr[snr_num].units, snr[snr_num].curr_state);
+ syslog(LOG_CRIT, "DEASSERT: %s threshold - settled - FRU: %d, num: 0x%X "
+ "curr_val: %.2f %s, thresh_val: %.2f %s, snr: %-16s",thresh_name,
+ fru, snr_num,curr_val, snr[snr_num].units, thresh_val,
+ snr[snr_num].units, snr[snr_num].name);
}
}
@@ -794,17 +294,99 @@ check_thresh_assert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
break;
default:
- syslog(LOG_ALERT, "get_snr_thresh_val: wrong thresh enum value");
+ syslog(LOG_WARNING, "get_snr_thresh_val: wrong thresh enum value");
exit(-1);
}
if (curr_state) {
curr_state &= snr[snr_num].flag;
snr[snr_num].curr_state |= curr_state;
- syslog(LOG_CRIT, "ASSERT: %s threshold raised - FRU: %d, num: 0x%X,"
- " snr: %-16s,",thresh_name, fru, snr_num, snr[snr_num].name);
- syslog(LOG_CRIT, "curr_val: %.2f %s, thresh_val: %.2f %s cf: %u",
- curr_val, snr[snr_num].units, thresh_val, snr[snr_num].units, snr[snr_num].curr_state);
+ syslog(LOG_CRIT, "ASSERT: %s threshold - raised - FRU: %d, num: 0x%X"
+ " curr_val: %.2f %s, thresh_val: %.2f %s, snr: %-16s", thresh_name,
+ fru, snr_num, curr_val, snr[snr_num].units, thresh_val,
+ snr[snr_num].units, snr[snr_num].name);
+ }
+}
+
+
+/*
+ * Starts monitoring all the sensors on a fru for all discrete sensors.
+ * Each pthread runs this monitoring for a different fru.
+ */
+static void *
+snr_discrete_monitor(void *arg) {
+
+#ifdef DEBUG2
+ char tmplog[1000];
+#endif /* DEBUG2 */
+ uint8_t fru = *(uint8_t *) arg;
+ int i, ret;
+ uint8_t discrete_cnt;
+ uint8_t snr_num;
+ //uint8_t *discrete_list;
+ thresh_sensor_t *snr;
+ float normal_val, curr_val;
+
+ // TODO: Need to resolve the SEGFAULT in the call below and replace HACK here.
+ /*
+ ret = pal_get_fru_discrete_list(fru, &discrete_list, &discrete_cnt);
+ if (ret < 0) {
+ return;
+ }
+ */
+ /* HACK */
+ uint8_t discrete_list[3];
+ if (fru != FRU_SPB && fru != FRU_NIC) {
+ discrete_list[0] = BIC_SENSOR_SYSTEM_STATUS;
+ discrete_list[1] = BIC_SENSOR_VR_HOT;
+ discrete_list[2] = BIC_SENSOR_CPU_DIMM_HOT;
+ } else {
+ return -1;
+ }
+
+ discrete_cnt = 3;
+
+ snr = get_struct_thresh_sensor(fru);
+ if (snr == NULL) {
+ syslog(LOG_WARNING, "snr_thresh_monitor: get_struct_thresh_sensor failed");
+ exit(-1);
+ }
+
+ for (i = 0; i < discrete_cnt; i++) {
+ snr_num = discrete_list[i];
+ pal_get_sensor_name(fru, snr_num, snr[snr_num].name);
+ }
+
+#if defined(TESTING) || defined(DEBUG)
+ int cnt = 0;
+#endif
+ while(1) {
+ for (i = 0; i < discrete_cnt; i++) {
+ snr_num = discrete_list[i];
+ ret = pal_sensor_read(fru, snr_num, &curr_val);
+
+#ifdef DEBUG2
+ sprintf(tmplog, "echo 0x%X %s %d >> /tmp/discretetest%d", snr_num, snr[snr_num].name, (int) curr_val, fru);
+ system(tmplog);
+#endif /* DEBUG2 */
+
+#if defined(TESTING) || defined(DEBUG)
+ if (cnt == 2 && snr_num == BIC_SENSOR_SYSTEM_STATUS) {
+ curr_val = ((int) curr_val) | 0x1;
+ } else if (cnt == 6 && snr_num == BIC_SENSOR_SYSTEM_STATUS) {
+ curr_val = ((int) curr_val) & 0x0;
+ }
+#endif
+ if ((snr[snr_num].curr_state != (int) curr_val) && !ret) {
+ pal_sensor_discrete_check(fru, snr_num, snr[snr_num].name,
+ snr[snr_num].curr_state, (int) curr_val);
+ snr[snr_num].curr_state = (int) curr_val;
+ }
+ }
+#if defined(TESTING) || defined(DEBUG)
+ cnt ++;
+#endif
+ sleep(DELAY);
}
}
@@ -813,24 +395,28 @@ check_thresh_assert(uint8_t fru, uint8_t snr_num, uint8_t thresh,
* Each pthread runs this monitoring for a different fru.
*/
static void *
-snr_monitor(void *arg) {
+snr_thresh_monitor(void *arg) {
uint8_t fru = *(uint8_t *) arg;
int f, ret, snr_num;
float normal_val, curr_val;
thresh_sensor_t *snr;
-#ifdef TESTING
+#if defined(TESTING) || defined(DEBUG)
float temp_thresh;
int cnt = 0;
#endif /* TESTING */
snr = get_struct_thresh_sensor(fru);
if (snr == NULL) {
- syslog(LOG_ALERT, "snr_monitor: get_struct_thresh_sensor failed");
+ syslog(LOG_WARNING, "snr_thresh_monitor: get_struct_thresh_sensor failed");
exit(-1);
}
+#ifdef DEBUG2
+ char tmplog[1000];
+#endif /* DEBUG2 */
+
while(1) {
#ifdef TESTING
@@ -840,8 +426,11 @@ snr_monitor(void *arg) {
for (snr_num = 0; snr_num < MAX_SENSOR_NUM; snr_num++) {
curr_val = 0;
if (snr[snr_num].flag) {
- if (!(ret = read_snr_val(fru, snr_num, &curr_val))) {
-
+ if (!(ret = pal_sensor_read(fru, snr_num, &curr_val))) {
+#ifdef DEBUG2
+ sprintf(tmplog, "echo 0x%X %s %.2f >> /tmp/analog%d", snr_num, snr[snr_num].name, curr_val, fru);
+ system(tmplog);
+#endif /* DEBUG2 */
#ifdef TESTING
/*
@@ -871,7 +460,6 @@ snr_monitor(void *arg) {
snr[snr_num].units);
}
#endif /* DEBUG */
-
check_thresh_assert(fru, snr_num, UNR_THRESH, curr_val);
check_thresh_assert(fru, snr_num, UCR_THRESH, curr_val);
check_thresh_assert(fru, snr_num, UNC_THRESH, curr_val);
@@ -885,117 +473,149 @@ snr_monitor(void *arg) {
check_thresh_deassert(fru, snr_num, LNC_THRESH, curr_val);
check_thresh_deassert(fru, snr_num, LCR_THRESH, curr_val);
check_thresh_deassert(fru, snr_num, LNR_THRESH, curr_val);
-
} else {
/*
- * Incase the read_snr_val failed for a sensor,
+ * Incase the pal_sensor_read failed for a sensor,
* disable all the threshold checks for that sensor
* after logging an approciate syslog message.
*/
+ if (ret == ERR_NOT_READY) {
+ continue;
+ }
+
if (ret) {
+#ifdef DEBUG
syslog(LOG_ERR, "FRU: %d, num: 0x%X, snr:%-16s, read failed",
fru, snr_num, snr[snr_num].name);
- syslog(LOG_ERR, "FRU: %d, num: 0x%X, snr:%-16s, check disabled",
- fru, snr_num, snr[snr_num].name);
- snr[snr_num].flag = 0;
- //}
+#endif
+
+ /*
+ * Check if the fru is up and running before disabling the sensor.
+ * If the fru is powered down, DO NOT disable the sensor check.
+ */
+ char state[MAX_VALUE_LEN];
+
+ pal_get_last_pwr_state(fru, state);
+ if (!strcmp(state, "on")) {
+ snr[snr_num].flag = 0;
+ syslog(LOG_ERR, "FRU: %d, num: 0x%X, snr:%-16s, check disabled",
+ fru, snr_num, snr[snr_num].name);
+ }
}
- } /* read_snr_val return check */
+ } /* pal_sensor_read return check */
} /* flag check */
} /* loop for all sensors */
- sleep(5);
+ sleep(DELAY);
} /* while loop*/
} /* function definition */
+#ifdef DEBUG
+void print_snr_thread(uint8_t fru, thresh_sensor_t *snr)
+{
+ int i,j;
+ float curr_val;
+ char tmplog[1000];
+ char print[1000];
+
+ for (i = 0; i <= MAX_SENSOR_NUM; i++) {
+ if (snr[i].flag) {
+ curr_val = 0;
+ if(!(pal_sensor_read(fru, i, &curr_val))) {
+ sprintf(tmplog, "%-30s: %s %.2f %.2f %.2f %.2f\n",
+ snr[i].name, snr[i].units,
+ snr[i].ucr_thresh,
+ snr[i].lcr_thresh,
+ snr[i].pos_hyst,
+ snr[i].neg_hyst);
+ sprintf(print, "echo %s >> /tmp/print%d", tmplog, fru);
+ system(print);
+ }
+ }
+ }
+}
+#endif /* DEBUG */
+
/* Spawns a pthread for each fru to monitor all the sensors on it */
-static void
+static int
run_sensord(int argc, char **argv) {
- int i, arg;
+ int ret, arg;
+ uint8_t fru;
+ uint8_t fru_flag = 0;
pthread_t thread_snr[MAX_NUM_FRUS];
- int fru[MAX_NUM_FRUS] = {0};
-
- for (arg = 1; arg < argc; arg ++) {
-#ifdef CONFIG_YOSEMITE
- if (!(strcmp(argv[arg], "slot1")))
- fru[FRU_SLOT1 - 1] = FRU_SLOT1;
- else if (!(strcmp(argv[arg], "slot2")))
- fru[FRU_SLOT2 - 1] = FRU_SLOT2;
- else if (!(strcmp(argv[arg], "slot3")))
- fru[FRU_SLOT3 - 1] = FRU_SLOT3;
- else if (!(strcmp(argv[arg], "slot4")))
- fru[FRU_SLOT4 - 1] = FRU_SLOT4;
- else if (!(strcmp(argv[arg], "spb")))
- fru[FRU_SPB - 1] = FRU_SPB;
- else if (!(strcmp(argv[arg], "nic")))
- fru[FRU_NIC - 1] = FRU_NIC;
- else {
- syslog(LOG_ALERT, "Wrong argument: %s", argv[arg]);
- exit(1);
- }
-#endif /* CONFIG_YOSEMITE */
+ pthread_t discrete_snr[MAX_NUM_FRUS];
+
+ arg = 1;
+ while(arg < argc) {
+ ret = pal_get_fru_id(argv[arg], &fru);
+ if (ret < 0)
+ return ret;
+
+ fru_flag = SETBIT(fru_flag, fru);
+ arg++;
}
- for (i = 0; i < MAX_NUM_FRUS; i++) {
- if (fru[i]) {
- if (pthread_create(&thread_snr[i], NULL, snr_monitor,
- (void*) &fru[i]) < 0) {
- syslog(LOG_ALERT, "pthread_create for FRU %d failed\n", fru[i]);
+ for (fru = 1; fru <= MAX_NUM_FRUS; fru++) {
+
+ if (GETBIT(fru_flag, fru)) {
+
+ if (init_fru_snr_thresh(fru))
+ return ret;
+
+ /* Threshold Sensors */
+ if (pthread_create(&thread_snr[fru-1], NULL, snr_thresh_monitor,
+ (void*) &fru) < 0) {
+ syslog(LOG_WARNING, "pthread_create for FRU %d failed\n", fru);
}
#ifdef DEBUG
else {
- syslog(LOG_ALERT, "pthread_create for FRU %d succeed\n", fru[i]);
+ syslog(LOG_WARNING, "pthread_create for FRU %d succeed\n", fru);
}
#endif /* DEBUG */
+ sleep(1);
+
+ /* Discrete Sensors */
+ if (pthread_create(&discrete_snr[fru-1], NULL, snr_discrete_monitor,
+ (void*) &fru) < 0) {
+ syslog(LOG_WARNING, "pthread_create for FRU %d failed\n", fru);
+ }
+#ifdef DEBUG
+ else {
+ syslog(LOG_WARNING, "pthread_create for discrete FRU %d succeed\n", fru);
+ }
+#endif /* DEBUG */
+ sleep(1);
}
- sleep(1);
}
- for (i = 0; i < MAX_NUM_FRUS; i++) {
- if (fru[i])
- pthread_join(thread_snr[i], NULL);
- }
-}
+#ifdef DEBUG
+ int i;
+ for (i = 1; i <= MAX_NUM_FRUS; i++)
+ print_snr_thread(i, g_snr[i-1]);
+#endif /* DEBUG */
+ for (fru = 1; fru <= MAX_NUM_FRUS; fru++) {
-#ifdef DEBUG
-void print_snr_thread(uint8_t fru, thresh_sensor_t *snr)
-{
- int i;
- float curr_val;
+ if (GETBIT(fru_flag, fru))
+ pthread_join(discrete_snr[fru-1], NULL);
+ }
- for (i = 1; i <= MAX_SENSOR_NUM; i++) {
- if (snr[i].flag) {
- curr_val = 0;
- if(!(read_snr_val(fru, i, &curr_val))) {
- printf("%-30s:\t%.2f %s\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\t%.2f\n",
- snr[i].name, curr_val,snr[i].units,
- snr[i].ucr_thresh,
- snr[i].unc_thresh,
- snr[i].lcr_thresh,
- snr[i].lnr_thresh,
- snr[i].pos_hyst,
- snr[i].neg_hyst);
- } else
- printf("Reading failed: %-16s\n", snr[i].name);
- }
+ for (fru = 1; fru <= MAX_NUM_FRUS; fru++) {
+
+ if (GETBIT(fru_flag, fru))
+ pthread_join(thread_snr[fru-1], NULL);
}
}
-#endif /* DEBUG */
+
int
main(int argc, void **argv) {
int dev, rc, pid_file;
if (argc < 2) {
- syslog(LOG_ALERT, "Usage: sensord <options>");
- printf("Usage: sensord <options>\n");
-#ifdef CONFIG_YOSEMITE
- syslog(LOG_ALERT, "Options: [slot1 | slot2 | slot3 | slot4 | spb | nic]");
- printf("Options: [slot1 | slot2 | slot3 | slot4 | spb | nic]\n");
-#endif /* CONFIG_YOSEMITE */
+ print_usage();
exit(1);
}
@@ -1008,24 +628,15 @@ main(int argc, void **argv) {
}
} else {
-#ifdef CONFIG_YOSEMITE
- read_snr_val = &yosemite_sensor_read;
-#endif /* CONFIG_YOSEMITE */
-
- init_all_snr_thresh();
-
-#ifdef DEBUG
- print_snr_thread(1, snr_slot1);
- print_snr_thread(2, snr_slot2);
- print_snr_thread(3, snr_slot3);
- print_snr_thread(4, snr_slot4);
-#endif /* DEBUG */
-
daemon(0,1);
openlog("sensord", LOG_CONS, LOG_DAEMON);
syslog(LOG_INFO, "sensord: daemon started");
- run_sensord(argc, (char **) argv);
- }
+ rc = run_sensord(argc, (char **) argv);
+ if (rc < 0) {
+ print_usage();
+ return -1;
+ }
+ }
return 0;
}
diff --git a/common/recipes-core/sensor-mon/sensor-mon_0.1.bb b/common/recipes-core/sensor-mon/sensor-mon_0.1.bb
index adbd4cb..2cd2e4d 100644
--- a/common/recipes-core/sensor-mon/sensor-mon_0.1.bb
+++ b/common/recipes-core/sensor-mon/sensor-mon_0.1.bb
@@ -31,9 +31,9 @@ S = "${WORKDIR}"
binfiles = "sensord \
"
-CFLAGS += " -lsdr "
+CFLAGS += " -lsdr -lpal "
-DEPENDS += " libsdr "
+DEPENDS += " libpal libsdr "
pkgdir = "sensor-mon"
diff --git a/common/recipes-core/sensor-util/files/Makefile b/common/recipes-core/sensor-util/files/Makefile
index 2d39a04..168e4d7 100644
--- a/common/recipes-core/sensor-util/files/Makefile
+++ b/common/recipes-core/sensor-util/files/Makefile
@@ -3,7 +3,7 @@ all: sensor-util
sensor-util: sensor-util.o
- $(CC) $(CFLAGS) -lpal -lrt -lm -std=gnu99 -o $@ $^ $(LDFLAGS)
+ $(CC) $(CFLAGS) -lsdr -lpal -lrt -lm -std=gnu99 -o $@ $^ $(LDFLAGS)
.PHONY: clean
diff --git a/common/recipes-core/sensor-util/files/sensor-util.c b/common/recipes-core/sensor-util/files/sensor-util.c
index eb38d65..c37fc38 100644
--- a/common/recipes-core/sensor-util/files/sensor-util.c
+++ b/common/recipes-core/sensor-util/files/sensor-util.c
@@ -26,72 +26,74 @@
#include <stdint.h>
#include <string.h>
#include <errno.h>
+#include <stdbool.h>
#include <openbmc/pal.h>
+#include <openbmc/sdr.h>
static int
print_usage() {
- printf("Usage: sensor-util [ %s ] <sensor num>\n"
- "sensor num is optional.", pal_fru_list);
+ printf("Usage: sensor-util [ %s ] <--threshold> <sensor num>\n",
+ pal_fru_list);
}
static void
-print_single_sensor_reading(uint8_t fru, uint8_t *sensor_list, int sensor_cnt, uint8_t num) {
-
- int i;
- float fvalue;
- char name[24];
- char units[64];
- int ret = 0;
-
- for (i = 0; i < sensor_cnt; i++) {
-
- if (sensor_list[i] == num) {
- ret = 1;
- pal_get_sensor_name(fru, sensor_list[i], name);
- pal_get_sensor_units(fru, sensor_list[i], units);
-
- if (pal_sensor_read(fru, sensor_list[i], &fvalue) < 0) {
-
- printf("pal_sensor_read failed: fru: %d num: 0x%X name: %-23s\n",
- fru, sensor_list[i], name);
- } else {
- printf("%-23s: %.2f %s\n", name, fvalue, units);
- }
-
- break;
- }
+print_sensor_reading(float fvalue, thresh_sensor_t *thresh, bool threshold) {
+
+ if (threshold) {
+ printf("%-23s: Curr: %.2f %-8s\t"
+ " UCR: %.2f "
+ " UNC: %.2f "
+ " UNR: %.2f "
+ " LCR: %.2f "
+ " LNC: %.2f "
+ " LNR: %.2f \n",
+ thresh->name, fvalue, thresh->units,
+ thresh->ucr_thresh,
+ thresh->unc_thresh,
+ thresh->unr_thresh,
+ thresh->lcr_thresh,
+ thresh->lnc_thresh,
+ thresh->lnr_thresh);
+ } else {
+ printf("%-23s: %.2f %s\n", thresh->name, fvalue, thresh->units);
}
- if (!ret) {
- printf("Wrong sensor number!\n");
- print_usage();
- exit(-1);
- }
}
static void
-print_sensor_reading(uint8_t fru, uint8_t *sensor_list, int sensor_cnt) {
+calculate_sensor_reading(uint8_t fru, uint8_t *sensor_list, int sensor_cnt, int num, bool threshold) {
int i;
+ uint8_t snr_num;
float fvalue;
- char name[24];
- char units[64];
+ char path[64];
+ thresh_sensor_t thresh;
for (i = 0; i < sensor_cnt; i++) {
- /* Clear the variable */
- sprintf(name, "");
- sprintf(units, "");
+ snr_num = sensor_list[i];
- pal_get_sensor_name(fru, sensor_list[i], name);
- pal_get_sensor_units(fru, sensor_list[i], units);
+ /* If calculation is for a single sensor, ignore all others. */
+ if (num && snr_num != num) {
+ continue;
+ }
- if (pal_sensor_read(fru, sensor_list[i], &fvalue) < 0) {
+ if (threshold) {
+ if (sdr_get_snr_thresh(fru, snr_num, 0, &thresh))
+ syslog(LOG_ERR, "sdr_init_snr_thresh failed for FRU %d num: 0x%X", fru, snr_num);
+ } else {
+ sdr_get_sensor_name(fru, sensor_list[i], thresh.name);
+ sdr_get_sensor_units(fru, sensor_list[i], thresh.units);
+ }
- printf("pal_sensor_read failed: fru: %d num: 0x%X name: %-23s\n",
- fru, sensor_list[i], name);
+ usleep(50);
+
+ if (pal_sensor_read(fru, snr_num, &fvalue) < 0) {
+ printf("pal_sensor_read failed: FRU: %d num: 0x%X name: %-23s\n",
+ fru, sensor_list[i], thresh.name, thresh.units);
+ continue;
} else {
- printf("%-23s: %.2f %s\n", name, fvalue, units);
+ print_sensor_reading(fvalue, &thresh, threshold);
}
}
}
@@ -99,25 +101,32 @@ print_sensor_reading(uint8_t fru, uint8_t *sensor_list, int sensor_cnt) {
int
main(int argc, char **argv) {
+ int i;
int ret;
int sensor_cnt;
uint8_t *sensor_list;
uint8_t fru;
- uint8_t num;
+ uint8_t num = 0;
+ bool threshold = false;
- if (argc < 2 || argc > 3) {
+ if (argc < 2 || argc > 4) {
print_usage();
exit(-1);
}
- if (argc == 3) {
- errno = 0;
- num = (uint8_t) strtol(argv[2], NULL, 0);
- if (errno) {
- printf("Sensor number format incorrect.\n");
- print_usage();
- exit(-1);
+ i = 3; /* Starting at argument 3*/
+ while (argc > 2 && i <= argc) {
+ if (!(strcmp(argv[i-1], "--threshold"))) {
+ threshold = true;
+ } else {
+ errno = 0;
+ num = (uint8_t) strtol(argv[i-1], NULL, 0);
+ if (errno) {
+ print_usage();
+ exit(-1);
+ }
}
+ i++;
}
@@ -131,42 +140,24 @@ main(int argc, char **argv) {
fru = 1;
while (fru <= MAX_NUM_FRUS) {
- if (fru == FRU_NIC) {
- printf("\nsensor-util does not support nic\n");
- exit(-1);
- }
-
ret = pal_get_fru_sensor_list(fru, &sensor_list, &sensor_cnt);
if (ret < 0) {
return ret;
}
- if (num) {
- print_single_sensor_reading(fru, sensor_list, sensor_cnt, num);
- } else {
- print_sensor_reading(fru, sensor_list, sensor_cnt);
- }
+ calculate_sensor_reading(fru, sensor_list, sensor_cnt, num, threshold);
fru++;
printf("\n");
}
} else {
- if (fru == FRU_NIC) {
- printf("\nsensor-util does not support nic\n");
- //exit(-1);
- }
-
ret = pal_get_fru_sensor_list(fru, &sensor_list, &sensor_cnt);
if (ret < 0) {
return ret;
}
- if (num) {
- print_single_sensor_reading(fru, sensor_list, sensor_cnt, num);
- } else {
- print_sensor_reading(fru, sensor_list, sensor_cnt);
- }
+ calculate_sensor_reading(fru, sensor_list, sensor_cnt, num, threshold);
}
return 0;
diff --git a/common/recipes-core/sensor-util/sensor-util_0.1.bb b/common/recipes-core/sensor-util/sensor-util_0.1.bb
index 227ec53..d802694 100644
--- a/common/recipes-core/sensor-util/sensor-util_0.1.bb
+++ b/common/recipes-core/sensor-util/sensor-util_0.1.bb
@@ -13,7 +13,7 @@ S = "${WORKDIR}"
binfiles = "sensor-util"
-DEPENDS =+ " libpal "
+DEPENDS =+ " libsdr libpal "
pkgdir = "sensor-util"
diff --git a/common/recipes-lib/fruid/files/fruid.c b/common/recipes-lib/fruid/files/fruid.c
index dc71ac8..e665c27 100644
--- a/common/recipes-lib/fruid/files/fruid.c
+++ b/common/recipes-lib/fruid/files/fruid.c
@@ -65,7 +65,9 @@ static char * calculate_time(uint8_t * mfg_time)
char * mfg_time_str = (char *) malloc(len);
if (!mfg_time_str) {
- syslog(LOG_ALERT, "fruid: malloc: memory allocation failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "fruid: malloc: memory allocation failed\n");
+#endif
return NULL;
}
@@ -120,13 +122,17 @@ static char * get_chassis_type(uint8_t type_hex)
/* If the type is not in the list defined.*/
if (type > FRUID_CHASSIS_TYPECODE_MAX || type < FRUID_CHASSIS_TYPECODE_MIN) {
+#ifdef DEBUG
syslog(LOG_INFO, "fruid: chassis area: invalid chassis type\n");
+#endif
return NULL;
}
char * type_str = (char *) malloc(strlen(fruid_chassis_type[type]));
if (!type_str) {
- syslog(LOG_ALERT, "fruid: malloc: memory allocation failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "fruid: malloc: memory allocation failed\n");
+#endif
return NULL;
}
@@ -179,7 +185,9 @@ static char * _fruid_area_field_read(uint8_t *offset)
field_len_eff > 0 ? (field = (char *) malloc(field_len_eff + 1)) :
(field = (char *) malloc(strlen(FIELD_EMPTY)));
if (!field) {
- syslog(LOG_ALERT, "fruid: malloc: memory allocation failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "fruid: malloc: memory allocation failed\n");
+#endif
return NULL;
}
@@ -327,7 +335,9 @@ int parse_fruid_area_product(uint8_t * product,
/* Check if the format version is as per IPMI FRUID v1.0 format spec */
fruid_product->format_ver = product[index++];
if (fruid_product->format_ver != FRUID_FORMAT_VER) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: product_area: format version not supported");
+#endif
return EPROTONOSUPPORT;
}
@@ -339,7 +349,9 @@ int parse_fruid_area_product(uint8_t * product,
fruid_product->area_len, fruid_product->chksum);
if (ret) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: product_area: chksum not verified.");
+#endif
return EBADF;
}
@@ -401,7 +413,9 @@ int parse_fruid_area_board(uint8_t * board,
/* Check if the format version is as per IPMI FRUID v1.0 format spec */
fruid_board->format_ver = board[index++];
if (fruid_board->format_ver != FRUID_FORMAT_VER) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: board_area: format version not supported");
+#endif
return EPROTONOSUPPORT;
}
fruid_board->area_len = board[index++] * FRUID_AREA_LEN_MULTIPLIER;
@@ -412,7 +426,9 @@ int parse_fruid_area_board(uint8_t * board,
fruid_board->area_len, fruid_board->chksum);
if (ret) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: board_area: chksum not verified.");
+#endif
return EBADF;
}
@@ -471,7 +487,9 @@ int parse_fruid_area_chassis(uint8_t * chassis,
/* Check if the format version is as per IPMI FRUID v1.0 format spec */
fruid_chassis->format_ver = chassis[index++];
if (fruid_chassis->format_ver != FRUID_FORMAT_VER) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: chassis_area: format version not supported");
+#endif
return EPROTONOSUPPORT;
}
@@ -482,7 +500,9 @@ int parse_fruid_area_chassis(uint8_t * chassis,
ret = verify_chksum((uint8_t *) chassis,
fruid_chassis->area_len, fruid_chassis->chksum);
if (ret) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: chassis_area: chksum not verified.");
+#endif
return EBADF;
}
@@ -540,7 +560,9 @@ int parse_fruid_header(uint8_t * eeprom, fruid_header_t * header)
ret = verify_chksum((uint8_t *) header,
sizeof(fruid_header_t), header->chksum);
if (ret) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: common_header: chksum not verified.");
+#endif
return EBADF;
}
@@ -634,7 +656,9 @@ int fruid_parse(const char * bin, fruid_info_t * fruid)
/* Open the FRUID binary file */
fruid_fd = fopen(bin, "rb");
if (!fruid_fd) {
+#ifdef DEBUG
syslog(LOG_ERR, "fruid: unable to open the file");
+#endif
return ENOENT;
}
@@ -646,7 +670,9 @@ int fruid_parse(const char * bin, fruid_info_t * fruid)
eeprom = (uint8_t *) malloc(fruid_len);
if (!eeprom) {
- syslog(LOG_ALERT, "fruid: malloc: memory allocation failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "fruid: malloc: memory allocation failed\n");
+#endif
return ENOMEM;
}
diff --git a/common/recipes-lib/ipmb/files/ipmb.c b/common/recipes-lib/ipmb/files/ipmb.c
index 731eeba..9fe12f5 100644
--- a/common/recipes-lib/ipmb/files/ipmb.c
+++ b/common/recipes-lib/ipmb/files/ipmb.c
@@ -42,26 +42,39 @@ lib_ipmb_handle(unsigned char bus_id,
int s, t, len;
struct sockaddr_un remote;
char sock_path[64] = {0};
+ struct timeval tv;
sprintf(sock_path, "%s_%d", SOCK_PATH_IPMB, bus_id);
// TODO: Need to update to reuse the socket instead of creating new
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
- syslog(LOG_ALERT, "lib_ipmb_handle: socket() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmb_handle: socket() failed\n");
+#endif
return;
}
+ // setup timeout for receving on socket
+ tv.tv_sec = TIMEOUT_IPMB + 1;
+ tv.tv_usec = 0;
+
+ setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,sizeof(struct timeval));
+
remote.sun_family = AF_UNIX;
strcpy(remote.sun_path, sock_path);
len = strlen(remote.sun_path) + sizeof(remote.sun_family);
if (connect(s, (struct sockaddr *)&remote, len) == -1) {
- syslog(LOG_ALERT, "ipmb_handle: connect() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "ipmb_handle: connect() failed\n");
+#endif
goto clean_exit;
}
if (send(s, request, req_len, 0) == -1) {
- syslog(LOG_ALERT, "ipmb_handle: send() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "ipmb_handle: send() failed\n");
+#endif
goto clean_exit;
}
@@ -69,9 +82,13 @@ lib_ipmb_handle(unsigned char bus_id,
*res_len = t;
} else {
if (t < 0) {
- syslog(LOG_ALERT, "lib_ipmb_handle: recv() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmb_handle: recv() failed\n");
+#endif
} else {
- printf("Server closed connection\n");
+#ifdef DEBUG
+ syslog(LOG_DEBUG, "Server closed connection\n");
+#endif
}
}
diff --git a/common/recipes-lib/ipmb/files/ipmb.h b/common/recipes-lib/ipmb/files/ipmb.h
index d9bc16b..070e7ed 100644
--- a/common/recipes-lib/ipmb/files/ipmb.h
+++ b/common/recipes-lib/ipmb/files/ipmb.h
@@ -40,7 +40,10 @@ extern "C" {
// Slot#0 is on I2C Bus1
#define IPMB_BUS_SLOT0 1
-#define TIMEOUT_IPMI 4
+// TODO: Some IPMB responses take about 5-6 seconds
+// Need to add a timeout parameter to IPMB request
+// For now changing global timeout to 8 seconds
+#define TIMEOUT_IPMB 8
#define MAX_IPMB_RES_LEN 255
typedef struct _ipmb_req_t {
diff --git a/common/recipes-lib/ipmi/files/ipmi.c b/common/recipes-lib/ipmi/files/ipmi.c
index 3579eca..1b0f210 100644
--- a/common/recipes-lib/ipmi/files/ipmi.c
+++ b/common/recipes-lib/ipmi/files/ipmi.c
@@ -41,24 +41,37 @@ lib_ipmi_handle(unsigned char *request, unsigned char req_len,
int s, t, len;
struct sockaddr_un remote;
+ struct timeval tv;
// TODO: Need to update to reuse the socket instead of creating new
if ((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1) {
- syslog(LOG_ALERT, "lib_ipmi_handle: socket() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmi_handle: socket() failed\n");
+#endif
return;
}
+ // setup timeout for receving on socket
+ tv.tv_sec = TIMEOUT_IPMI + 1;
+ tv.tv_usec = 0;
+
+ setsockopt(s, SOL_SOCKET, SO_RCVTIMEO, (char *)&tv,sizeof(struct timeval));
+
remote.sun_family = AF_UNIX;
strcpy(remote.sun_path, SOCK_PATH_IPMI);
len = strlen(remote.sun_path) + sizeof(remote.sun_family);
if (connect(s, (struct sockaddr *)&remote, len) == -1) {
- syslog(LOG_ALERT, "lib_ipmi_handle: connect() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmi_handle: connect() failed\n");
+#endif
return;
}
if (send(s, request, req_len, 0) == -1) {
- syslog(LOG_ALERT, "lib_ipmi_handle: send() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmi_handle: send() failed\n");
+#endif
return;
}
@@ -66,7 +79,9 @@ lib_ipmi_handle(unsigned char *request, unsigned char req_len,
*res_len = t;
} else {
if (t < 0) {
- syslog(LOG_ALERT, "lib_ipmi_handle: recv() failed\n");
+#ifdef DEBUG
+ syslog(LOG_WARNING, "lib_ipmi_handle: recv() failed\n");
+#endif
} else {
printf("Server closed connection");
}
diff --git a/common/recipes-lib/ipmi/files/ipmi.h b/common/recipes-lib/ipmi/files/ipmi.h
index 2ae7f1c..7b54dd1 100644
--- a/common/recipes-lib/ipmi/files/ipmi.h
+++ b/common/recipes-lib/ipmi/files/ipmi.h
@@ -36,6 +36,7 @@ extern "C" {
#define SIZE_AUTH_ENABLES 5
#define SIZE_IP_ADDR 4
+#define SIZE_IP6_ADDR 16
#define SIZE_MAC_ADDR 6
#define SIZE_NET_MASK 4
#define SIZE_IP_HDR 3
@@ -58,7 +59,8 @@ extern "C" {
#define SIZE_SEL_REC 16
-#define BIC_INTF_HDR_SIZE 3
+// NetFn, Command, Checksum, IANAID(3 bytes), BIC Interface type
+#define BIC_INTF_HDR_SIZE 7
#define LUN_OFFSET 2
@@ -76,6 +78,8 @@ extern "C" {
#define TYPE_ASCII_6BIT 2
#define TYPE_ASCII_8BIT 3
+#define TIMEOUT_IPMI 5
+
// IPMI request Structure (IPMI/Section 9.2)
typedef struct
{
@@ -231,6 +235,7 @@ typedef struct
unsigned char no_of_dest;
unsigned char dest_type[SIZE_DEST_TYPE];
unsigned char dest_addr[SIZE_DEST_ADDR];
+ unsigned char ip6_addr[SIZE_IP6_ADDR];
} lan_config_t;
// Structure to store Processor Information
@@ -322,6 +327,7 @@ enum
{
CMD_STORAGE_GET_FRUID_INFO = 0x10,
CMD_STORAGE_READ_FRUID_DATA = 0x11,
+ CMD_STORAGE_WRITE_FRUID_DATA = 0x12,
CMD_STORAGE_GET_SDR_INFO = 0x20,
CMD_STORAGE_RSV_SDR = 0x22,
CMD_STORAGE_GET_SDR = 0x23,
@@ -354,17 +360,21 @@ enum
CMD_OEM_SET_DIMM_INFO = 0x1C,
CMD_OEM_SET_POST_START = 0x73,
CMD_OEM_SET_POST_END = 0x74,
+ CMD_OEM_GET_SLOT_INFO = 0x7E,
};
// OEM 1S Command Codes (Quanta/FB defined commands)
enum
{
CMD_OEM_1S_MSG_IN = 0x1,
+ CMD_OEM_1S_MSG_OUT = 0x2,
CMD_OEM_1S_GET_GPIO = 0x3,
CMD_OEM_1S_GET_GPIO_CONFIG = 0x5,
CMD_OEM_1S_SET_GPIO_CONFIG = 0x6,
CMD_OEM_1S_INTR = 0x7,
CMD_OEM_1S_POST_BUF = 0x8,
+ CMD_OEM_1S_UPDATE_FW = 0x9,
+ CMD_OEM_1S_GET_FW_VER = 0xB,
CMD_OEM_1S_GET_CONFIG = 0xE,
CMD_OEM_1S_PLAT_DISC = 0xF,
CMD_OEM_1S_SET_CONFIG = 0x10,
@@ -408,6 +418,7 @@ enum
LAN_PARAM_NO_OF_DEST,
LAN_PARAM_DEST_TYPE,
LAN_PARAM_DEST_ADDR,
+ LAN_PARAM_IP6_ADDR = 197, /* OEM parameter for IPv6 */
};
// Boot Option Parameters (IPMI/Table 28-14)
@@ -441,6 +452,7 @@ enum
BIC_INTF_ME = 0x01,
BIC_INTF_SOL = 0x02,
BIC_INTF_KCS = 0x03,
+ BIC_INTF_KCS_SMM = 0x04,
};
void lib_ipmi_handle(unsigned char *request, unsigned char req_len,
diff --git a/common/recipes-lib/sdr/files/Makefile b/common/recipes-lib/sdr/files/Makefile
index 11fe3ee..607f914 100644
--- a/common/recipes-lib/sdr/files/Makefile
+++ b/common/recipes-lib/sdr/files/Makefile
@@ -3,7 +3,7 @@ lib: libsdr.so
libsdr.so: sdr.c
$(CC) $(CFLAGS) -fPIC -c -o sdr.o sdr.c
- $(CC) -lm -shared -o libsdr.so sdr.o -lc
+ $(CC) -lpal -lm -shared -o libsdr.so sdr.o -lc
.PHONY: clean
diff --git a/common/recipes-lib/sdr/files/sdr.c b/common/recipes-lib/sdr/files/sdr.c
index 208b10f..2b05bf5 100644
--- a/common/recipes-lib/sdr/files/sdr.c
+++ b/common/recipes-lib/sdr/files/sdr.c
@@ -27,6 +27,7 @@
#include <fcntl.h>
#include <errno.h>
#include <syslog.h>
+#include <string.h>
#include "sdr.h"
#define FIELD_RATE_UNIT(x) ((x & (0x07 << 3)) >> 3)
@@ -34,7 +35,9 @@
#define FIELD_PERCENTAGE(x) (x & 0x01)
#define FIELD_TYPE(x) ((x & (0x03 << 6)) >> 6)
-#define FIELD_LEN(x) (x & 0xF)
+#define FIELD_LEN(x) (x & 0x1F)
+
+#define MAX_NAME_LEN 16
/* Array for BCD Plus definition. */
const char bcd_plus_array[] = "0123456789 -.XXX";
@@ -48,10 +51,11 @@ const char * ascii_6bit[4] = {
};
/* Get the units of the sensor from the SDR */
-int
-sdr_get_sensor_units(sdr_full_t *sdr, uint8_t *op, uint8_t *modifier,
+static int
+_sdr_get_sensor_units(sdr_full_t *sdr, uint8_t *op, uint8_t *modifier,
char *units) {
+ int ret;
uint8_t percent;
uint8_t rate_idx;
uint8_t base_idx;
@@ -88,10 +92,46 @@ sdr_get_sensor_units(sdr_full_t *sdr, uint8_t *op, uint8_t *modifier,
return 0;
}
+int
+sdr_get_sensor_units(uint8_t fru, uint8_t snr_num, char *units) {
+
+ int ret = 0;
+ uint8_t op;
+ uint8_t modifier;
+ sdr_full_t *sdr;
+
+ sensor_info_t sinfo[MAX_SENSOR_NUM] = {0};
+
+ if (pal_sensor_sdr_init(fru, sinfo) < 0) {
+ sdr = NULL;
+ } else {
+ sdr = &sinfo[snr_num].sdr;
+ }
+
+ if (sdr != NULL) {
+ ret = _sdr_get_sensor_units(sdr, &op, &modifier, units);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_ERR, "_sdr_get_sensor_units failed for FRU: %d snr_num: %d",
+ fru, snr_num);
+#endif
+ }
+ } else {
+ ret = pal_get_sensor_units(fru, snr_num, units);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_ERR, "pal_get_sensor_units failed for FRU: %d snr_num: %d",
+ fru, snr_num);
+#endif
+ }
+ }
+
+ return ret;
+}
/* Get the name of the sensor from the SDR */
-int
-sdr_get_sensor_name(sdr_full_t *sdr, char *name) {
+static int
+_sdr_get_sensor_name(sdr_full_t *sdr, char *name) {
int field_type, field_len;
int idx, idx_eff, val;
char *str;
@@ -105,9 +145,9 @@ sdr_get_sensor_name(sdr_full_t *sdr, char *name) {
/* Case: length is zero */
if (field_len == 1) {
- syslog(LOG_ALERT, "get_sensor_name: str length is 0\n");
- // TODO: Fix this hack later
- sprintf(name, "%s", str);
+#ifdef DEBUG
+ syslog(LOG_WARNING, "get_sensor_name: str length is 0\n");
+#endif
return -1;
}
@@ -174,37 +214,326 @@ sdr_get_sensor_name(sdr_full_t *sdr, char *name) {
return 0;
}
-/* Populates all sensor_info_t struct using the path to SDR dump */
int
-sdr_init(char *path, sensor_info_t *sinfo) {
- int fd;
- uint8_t buf[MAX_SDR_LEN] = {0};
- uint8_t bytes_rd = 0;
- uint8_t snr_num = 0;
+sdr_get_sensor_name(uint8_t fru, uint8_t snr_num, char *name) {
+
+ int ret = 0;
sdr_full_t *sdr;
- while (access(path, F_OK) == -1) {
- sleep(5);
+ sensor_info_t sinfo[MAX_SENSOR_NUM] = {0};
+
+ if (pal_sensor_sdr_init(fru, sinfo) < 0) {
+ sdr = NULL;
+ } else {
+ sdr = &sinfo[snr_num].sdr;
}
- fd = open(path, O_RDONLY);
- if (fd < 0) {
- syslog(LOG_ERR, "sdr_init: open failed for %s\n", path);
- return -1;
+ if (sdr != NULL) {
+ ret = _sdr_get_sensor_name(sdr, name);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_ERR, "_sdr_get_sensor_name failed for FRU: %d snr_num: %d",
+ fru, snr_num);
+#endif
+ }
+ } else {
+ ret = pal_get_sensor_name(fru, snr_num, name);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_ERR, "pal_get_sensor_name failed for FRU: %d snr_num: %d",
+ fru, snr_num);
+#endif
+ }
}
- while ((bytes_rd = read(fd, buf, sizeof(sdr_full_t))) > 0) {
- if (bytes_rd != sizeof(sdr_full_t)) {
- syslog(LOG_ERR, "sdr_init: read returns %d bytes\n", bytes_rd);
+ return ret;
+}
+
+/* Get the threshold values from the SDRs */
+static int
+get_sdr_thresh_val(uint8_t fru, sdr_full_t *sdr, uint8_t snr_num,
+ uint8_t thresh, void *value) {
+
+ int ret;
+ uint8_t x;
+ uint8_t m_lsb, m_msb, m;
+ uint8_t b_lsb, b_msb, b;
+ int8_t b_exp, r_exp;
+ uint8_t thresh_val;
+
+ switch (thresh) {
+ case UCR_THRESH:
+ thresh_val = sdr->uc_thresh;
+ break;
+ case UNC_THRESH:
+ thresh_val = sdr->unc_thresh;
+ break;
+ case UNR_THRESH:
+ thresh_val = sdr->unr_thresh;
+ break;
+ case LCR_THRESH:
+ thresh_val = sdr->lc_thresh;
+ break;
+ case LNC_THRESH:
+ thresh_val = sdr->lnc_thresh;
+ break;
+ case LNR_THRESH:
+ thresh_val = sdr->lnr_thresh;
+ break;
+ case POS_HYST:
+ thresh_val = sdr->pos_hyst;
+ break;
+ case NEG_HYST:
+ thresh_val = sdr->neg_hyst;
+ break;
+ default:
+#ifdef DEBUG
+ syslog(LOG_ERR, "get_sdr_thresh_val: reading unknown threshold val");
+#endif
return -1;
+ }
+
+ // y = (mx + b * 10^b_exp) * 10^r_exp
+ x = thresh_val;
+
+ m_lsb = sdr->m_val;
+ m_msb = sdr->m_tolerance >> 6;
+ m = (m_msb << 8) | m_lsb;
+
+ b_lsb = sdr->b_val;
+ b_msb = sdr->b_accuracy >> 6;
+ b = (b_msb << 8) | b_lsb;
+
+ // exponents are 2's complement 4-bit number
+ b_exp = sdr->rb_exp & 0xF;
+ if (b_exp > 7) {
+ b_exp = (~b_exp + 1) & 0xF;
+ b_exp = -b_exp;
+ }
+ r_exp = (sdr->rb_exp >> 4) & 0xF;
+ if (r_exp > 7) {
+ r_exp = (~r_exp + 1) & 0xF;
+ r_exp = -r_exp;
+ }
+
+ * (float *) value = ((m * x) + (b * pow(10, b_exp))) * (pow(10, r_exp));
+
+ return 0;
+}
+
+
+
+/*
+ * Populate all fields of thresh_sensor_t struct for a particular sensor.
+ * Incase the threshold value is 0 mask the check for that threshvold
+ * value in flag field.
+ */
+static int
+_sdr_get_snr_thresh(uint8_t fru, sdr_full_t *sdr, uint8_t snr_num,
+ uint8_t flag, thresh_sensor_t *snr) {
+
+ int ret;
+ int value;
+ float fvalue;
+ uint8_t op, modifier;
+
+ snr->flag = flag;
+ snr->curr_state = NORMAL_STATE;
+
+ if (_sdr_get_sensor_name(sdr, snr->name)) {
+#ifdef DEBUG
+ syslog(LOG_WARNING, "sdr_get_sensor_name: FRU %d: num: 0x%X: reading name"
+ " from SDR failed.", fru, snr_num);
+#endif
+ return -1;
+ }
+
+ // TODO: Add support for modifier (Mostly modifier is zero)
+ if (_sdr_get_sensor_units(sdr, &op, &modifier, snr->units)) {
+#ifdef DEBUG
+ syslog(LOG_WARNING, "sdr_get_sensor_units: FRU %d: num 0x%X: reading units"
+ " from SDR failed.", fru, snr_num);
+#endif
+ return -1;
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, UCR_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UCR_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->ucr_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, UCR_THRESH);
+ }
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, UNC_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UNC_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->unc_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, UNC_THRESH);
+ }
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, UNR_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, UNR_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->unr_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, UNR_THRESH);
+ }
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, LCR_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LCR_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->lcr_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, LCR_THRESH);
}
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, LNC_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LNC_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->lnc_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, LNC_THRESH);
+ }
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, LNR_THRESH, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, LNR_THRESH",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->lnr_thresh = fvalue;
+ if (!(fvalue)) {
+ snr->flag = CLEARBIT(snr->flag, LNR_THRESH);
+ }
+ }
- sdr = (sdr_full_t *) buf;
- snr_num = sdr->sensor_num;
- sinfo[snr_num].valid = true;
- memcpy(&sinfo[snr_num].sdr, sdr, sizeof(sdr_full_t));
+ if (get_sdr_thresh_val(fru, sdr, snr_num, POS_HYST, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, POS_HYST",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->pos_hyst = fvalue;
+ }
+
+ if (get_sdr_thresh_val(fru, sdr, snr_num, NEG_HYST, &fvalue)) {
+#ifdef DEBUG
+ syslog(LOG_ERR,
+ "get_sdr_thresh_val: failed for FRU: %d, num: 0x%X, %-16s, NEG_HYST",
+ fru, snr_num, snr->name);
+#endif
+ } else {
+ snr->neg_hyst = fvalue;
}
return 0;
}
+int
+sdr_get_snr_thresh(uint8_t fru,uint8_t snr_num, uint8_t flag,
+ thresh_sensor_t *snr) {
+
+ int ret = 0;
+ sdr_full_t *sdr;
+#ifdef DEBUG
+ int cnt = 0;
+#endif /* DEBUG */
+ int retry = 0;
+
+ sensor_info_t sinfo[MAX_SENSOR_NUM] = {0};
+
+ ret = pal_sensor_sdr_init(fru, sinfo);
+
+ while (ret == ERR_NOT_READY) {
+
+ if (retry++ > MAX_RETRIES_SDR_INIT) {
+ syslog(LOG_INFO, "sdr_get_snr_thresh: failed for fru: %d", fru);
+ return -1;
+ }
+#ifdef DEBUG
+ syslog(LOG_INFO, "sdr_get_snr_thresh: fru: %d, ret: %d cnt: %d", fru, ret, cnt++);
+#endif /* DEBUG */
+ sleep(1);
+ ret = pal_sensor_sdr_init(fru, sinfo);
+ }
+
+
+ if (ret < 0) {
+ sdr = NULL;
+ } else {
+ sdr = &sinfo[snr_num].sdr;
+ }
+
+ if (sdr != NULL) {
+ ret = _sdr_get_snr_thresh(fru, sdr, snr_num, flag, snr);
+ if (ret < 0) {
+#ifdef DEBUG
+ syslog(LOG_ERR, "_sdr_get_snr_thresh failed for FRU: %d snr_num: %d",
+ fru, snr_num);
+#endif
+ }
+ } else {
+
+ snr->flag = flag;
+ ret = pal_get_sensor_name(fru, snr_num, snr->name);
+ ret = pal_get_sensor_units(fru, snr_num, snr->units);
+ ret = pal_get_sensor_threshold(fru, snr_num, UCR_THRESH, &(snr->ucr_thresh));
+ if (!(snr->ucr_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, UCR_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, UNC_THRESH, &(snr->unc_thresh));
+ if (!(snr->unc_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, UNC_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, UNR_THRESH, &(snr->unr_thresh));
+ if (!(snr->unr_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, UNR_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, LCR_THRESH, &(snr->lcr_thresh));
+ if (!(snr->lcr_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, LCR_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, LNC_THRESH, &(snr->lnc_thresh));
+ if (!(snr->lnc_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, LNC_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, LNR_THRESH, &(snr->lnr_thresh));
+ if (!(snr->lnr_thresh)) {
+ snr->flag = CLEARBIT(snr->flag, LNR_THRESH);
+ }
+ ret = pal_get_sensor_threshold(fru, snr_num, POS_HYST, &(snr->pos_hyst));
+ ret = pal_get_sensor_threshold(fru, snr_num, NEG_HYST, &(snr->neg_hyst));
+
+ }
+
+ return ret;
+}
diff --git a/common/recipes-lib/sdr/files/sdr.h b/common/recipes-lib/sdr/files/sdr.h
index c474fb1..c260914 100644
--- a/common/recipes-lib/sdr/files/sdr.h
+++ b/common/recipes-lib/sdr/files/sdr.h
@@ -23,21 +23,40 @@
#include <stdbool.h>
#include <openbmc/ipmi.h>
+#include <openbmc/pal.h>
#ifdef __cplusplus
extern "C" {
#endif
#define MAX_SDR_LEN 64
-
+#define NORMAL_STATE 0x00
+#define MAX_SENSOR_NUM 0xFF
#define MAX_SENSOR_RATE_UNIT 7
#define MAX_SENSOR_BASE_UNIT 92
-typedef struct _sensor_info_t {
- bool valid;
- sdr_full_t sdr;
-} sensor_info_t;
+#define SETBIT(x, y) (x | (1 << y))
+#define GETBIT(x, y) ((x & (1 << y)) > y)
+#define CLEARBIT(x, y) (x & (~(1 << y)))
+#define GETMASK(y) (1 << y)
+
+/* To hold the sensor info and calculated threshold values from the SDR */
+typedef struct {
+ uint8_t flag;
+ float ucr_thresh;
+ float unc_thresh;
+ float unr_thresh;
+ float lcr_thresh;
+ float lnc_thresh;
+ float lnr_thresh;
+ float pos_hyst;
+ float neg_hyst;
+ int curr_state;
+ char name[17];
+ char units[64];
+
+} thresh_sensor_t;
/* List of all the Sensor Rate Units types. */
const char * sensor_rate_units[] = {
@@ -150,11 +169,10 @@ const char * sensor_base_units[] = {
"", /* 093 */
};
-int sdr_init(char *path, sensor_info_t *sinfo);
-
-int sdr_get_sensor_units(sdr_full_t *sdr, uint8_t *op, uint8_t *modifier,
- char *units);
-int sdr_get_sensor_name(sdr_full_t *sdr, char *name);
+int sdr_get_sensor_name(uint8_t fru, uint8_t snr_num, char *name);
+int sdr_get_sensor_units(uint8_t fru, uint8_t snr_num, char *units);
+int sdr_get_snr_thresh(uint8_t fru, uint8_t snr_num, uint8_t flag,
+ thresh_sensor_t *snr);
#ifdef __cplusplus
} // extern "C"
diff --git a/common/recipes-lib/sdr/libsdr_0.1.bb b/common/recipes-lib/sdr/libsdr_0.1.bb
index 958e0c6..73ebf3f 100644
--- a/common/recipes-lib/sdr/libsdr_0.1.bb
+++ b/common/recipes-lib/sdr/libsdr_0.1.bb
@@ -16,7 +16,7 @@ SRC_URI = "file://Makefile \
S = "${WORKDIR}"
-DEPENDS += " libipmi "
+DEPENDS += " libipmi libpal "
do_install() {
install -d ${D}${libdir}
diff --git a/common/recipes-rest/cherryPy/cherryPy_3.8.0.bb b/common/recipes-rest/cherryPy/cherryPy_3.8.0.bb
new file mode 100644
index 0000000..3c2179e
--- /dev/null
+++ b/common/recipes-rest/cherryPy/cherryPy_3.8.0.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "CherryPy HTTP framework"
+SECTION = "base"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://cherrypy/LICENSE.txt;md5=a476d86a3f85c89411ecaad012eed1e3"
+
+SRC_URI = "https://pypi.python.org/packages/source/C/CherryPy/CherryPy-${PV}.tar.gz"
+SRC_URI[md5sum] = "542b96b2cd825e8120e8cd822bc18f4b"
+SRC_URI[sha256sum] = "ffcdb43667d4098247efaf8c82dd36d3dd4f8e5dc768ef5e90b480899e523bea"
+
+S = "${WORKDIR}/CherryPy-${PV}"
+
+inherit setuptools
+
+FILES_${PN} += "/usr/lib/* /usr/share/cherrypy"
diff --git a/common/recipes-rest/rest-api/files/node_server.py b/common/recipes-rest/rest-api/files/node_server.py
index 57a5c42..cf64f03 100644
--- a/common/recipes-rest/rest-api/files/node_server.py
+++ b/common/recipes-rest/rest-api/files/node_server.py
@@ -56,7 +56,7 @@ class serverNode(node):
else:
res = 'success'
- result = { "result": res }
+ result = { "result": res }
return result
@@ -64,6 +64,9 @@ def get_node_server(num):
actions = ["power-on",
"power-off",
"power-cycle",
- "graceful-shutdown"
+ "graceful-shutdown",
+ "12v-on",
+ "12v-off",
+ "12v-cycle"
]
return serverNode(num = num, actions = actions)
diff --git a/common/recipes-rest/rest-api/files/pal.py b/common/recipes-rest/rest-api/files/pal.py
index 8faef30..f0e076d 100644
--- a/common/recipes-rest/rest-api/files/pal.py
+++ b/common/recipes-rest/rest-api/files/pal.py
@@ -67,6 +67,14 @@ def pal_set_server_power(slot_id, command):
cmd.value = 2
elif command == 'graceful-shutdown':
cmd.value = 3
+ elif command == '12v-off':
+ cmd.value = 4
+ elif command == '12v-on':
+ cmd.value = 5
+ elif command == '12v-cycle':
+ cmd.value = 6
+ else:
+ return -1
ret = lpal_hndl.pal_set_server_power(slot_id, cmd)
if ret:
return -1
diff --git a/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_setup.py b/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_setup.py
deleted file mode 100644
index 7c126d9..0000000
--- a/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_setup.py
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/python -tt
-# Copyright 2015-present Facebook. All rights reserved.
-#
-# This program file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by the
-# Free Software Foundation; version 2 of the License.
-#
-# This program is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-# for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program in a file named COPYING; if not, write to the
-# Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor,
-# Boston, MA 02110-1301 USA
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-from __future__ import unicode_literals
-
-from board_gpio_table import board_gpio_table
-from soc_gpio_table import soc_gpio_table
-
-import openbmc_gpio
-import openbmc_gpio_table
-
-import logging
-import sys
-
-
-def setup_board_gpio(soc_gpio_table, board_gpio_table, validate=True):
- soc = openbmc_gpio_table.SocGPIOTable(soc_gpio_table)
- gpio_configured = []
- for gpio in board_gpio_table:
- try:
- soc.config_function(gpio.gpio, write_through=False)
- gpio_configured.append(gpio.gpio)
- except openbmc_gpio_table.ConfigUnknownFunction as e:
- # not multiple-function GPIO pin
- pass
- except openbmc_gpio_table.NotSmartEnoughException as e:
- logging.error('Failed to configure "%s" for "%s": %s'
- % (gpio.gpio, gpio.shadow, str(e)))
-
- soc.write_to_hw()
-
- if validate:
- all_functions = set(soc.get_active_functions(refresh=True))
- for gpio in gpio_configured:
- if gpio not in all_functions:
- raise Exception('Failed to configure function "%s"' % gpio)
-
- for gpio in board_gpio_table:
- openbmc_gpio.gpio_export(gpio.gpio, gpio.shadow)
- if gpio.value == openbmc_gpio_table.GPIO_INPUT:
- continue
- elif gpio.value == openbmc_gpio_table.GPIO_OUT_HIGH:
- openbmc_gpio.gpio_set(gpio.gpio, 1)
- elif gpio.value == openbmc_gpio_table.GPIO_OUT_LOW:
- openbmc_gpio.gpio_set(gpio.gpio, 0)
- else:
- raise Exception('Invalid value "%s"' % gpio.value)
-
-def main():
- print('Setting up GPIOs ... ', end='')
- sys.stdout.flush()
- openbmc_gpio.setup_shadow()
- setup_board_gpio(soc_gpio_table, board_gpio_table)
- print('Done')
- sys.stdout.flush()
- return 0
-
-if __name__ == '__main__':
- sys.exit(main())
diff --git a/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_table.py b/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_table.py
index dda8a98..d188dcb 100644
--- a/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_table.py
+++ b/common/recipes-utils/openbmc-gpio/files/openbmc_gpio_table.py
@@ -21,6 +21,7 @@ from __future__ import unicode_literals
from soc_gpio import soc_get_register
+import openbmc_gpio
import logging
import os
import sys
@@ -267,3 +268,36 @@ class BoardGPIO(object):
self.gpio = gpio
self.shadow = shadow
self.value = value
+
+def setup_board_gpio(soc_gpio_table, board_gpio_table, validate=True):
+ soc = SocGPIOTable(soc_gpio_table)
+ gpio_configured = []
+ for gpio in board_gpio_table:
+ try:
+ soc.config_function(gpio.gpio, write_through=False)
+ gpio_configured.append(gpio.gpio)
+ except ConfigUnknownFunction as e:
+ # not multiple-function GPIO pin
+ pass
+ except NotSmartEnoughException as e:
+ logging.error('Failed to configure "%s" for "%s": %s'
+ % (gpio.gpio, gpio.shadow, str(e)))
+
+ soc.write_to_hw()
+
+ if validate:
+ all_functions = set(soc.get_active_functions(refresh=True))
+ for gpio in gpio_configured:
+ if gpio not in all_functions:
+ raise Exception('Failed to configure function "%s"' % gpio)
+
+ for gpio in board_gpio_table:
+ openbmc_gpio.gpio_export(gpio.gpio, gpio.shadow)
+ if gpio.value == GPIO_INPUT:
+ continue
+ elif gpio.value == GPIO_OUT_HIGH:
+ openbmc_gpio.gpio_set(gpio.gpio, 1)
+ elif gpio.value == GPIO_OUT_LOW:
+ openbmc_gpio.gpio_set(gpio.gpio, 0)
+ else:
+ raise Exception('Invalid value "%s"' % gpio.value)
diff --git a/common/recipes-utils/openbmc-gpio/files/setup.py b/common/recipes-utils/openbmc-gpio/files/setup.py
index 59c7de4..bf7be3d 100644
--- a/common/recipes-utils/openbmc-gpio/files/setup.py
+++ b/common/recipes-utils/openbmc-gpio/files/setup.py
@@ -18,6 +18,7 @@
from distutils.core import setup
+from setup_board import board_py_modules
setup(
name = 'openbmc-gpio',
@@ -31,6 +32,6 @@ setup(
'phymemory',
'soc_gpio',
'soc_gpio_table',
- 'board_gpio_table',
- ],
+ 'board_gpio_table', ]
+ + board_py_modules ,
)
diff --git a/common/recipes-utils/openbmc-gpio/files/setup_board.py b/common/recipes-utils/openbmc-gpio/files/setup_board.py
new file mode 100644
index 0000000..aff7398
--- /dev/null
+++ b/common/recipes-utils/openbmc-gpio/files/setup_board.py
@@ -0,0 +1,23 @@
+# Copyright 2015-present Facebook. All rights reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+
+# This is a dummy board GPIO table. If this is included in the final image,
+# please double check the configuration of your image to define the correct
+# GPIO table to be used for your board.
+
+board_py_modules = [
+]
diff --git a/common/recipes-utils/openbmc-gpio/openbmc-gpio_0.1.bb b/common/recipes-utils/openbmc-gpio/openbmc-gpio_0.1.bb
index 6bf4cc1..a2b46d4 100644
--- a/common/recipes-utils/openbmc-gpio/openbmc-gpio_0.1.bb
+++ b/common/recipes-utils/openbmc-gpio/openbmc-gpio_0.1.bb
@@ -25,12 +25,12 @@ SRC_URI = " \
file://board_gpio_table.py \
file://openbmc_gpio.py \
file://openbmc_gpio_table.py \
- file://openbmc_gpio_setup.py \
file://openbmc_gpio_util.py \
file://phymemory.py \
file://setup.py \
file://soc_gpio.py \
file://soc_gpio_table.py \
+ file://setup_board.py \
"
S = "${WORKDIR}"
@@ -41,9 +41,6 @@ OPENBMC_GPIO_UTILS = " \
OPENBMC_GPIO_SOC_TABLE = "soc_gpio_table.py"
-# Change OPENBMC_GPIO_SETUP to "0" to exclude openbmc_gpio_setup.py from the image
-OPENBMC_GPIO_SETUP = "1"
-
inherit distutils
DEPENDS_${PN} = "python python-distribute update-rc.d-native"
@@ -63,13 +60,5 @@ do_install_append() {
for f in ${OPENBMC_GPIO_UTILS}; do
install -m 755 $f ${localbindir}/${f}
done
-
- install -d ${D}${sysconfdir}/init.d
- install -d ${D}${sysconfdir}/rcS.d
- if [ "${OPENBMC_GPIO_SETUP}" == "1" ]; then
- install -m 755 openbmc_gpio_setup.py ${D}${sysconfdir}/init.d/openbmc_gpio_setup.py
- update-rc.d -r ${D} openbmc_gpio_setup.py start 59 S .
- fi
}
-FILES_${PN} += "/usr/local/bin ${sysconfdir}"
diff --git a/common/recipes-utils/spatula/files/setup-spatula.sh b/common/recipes-utils/spatula/files/setup-spatula.sh
index 391a212..238f395 100644
--- a/common/recipes-utils/spatula/files/setup-spatula.sh
+++ b/common/recipes-utils/spatula/files/setup-spatula.sh
@@ -31,7 +31,7 @@
. /etc/init.d/functions
ACTION="$1"
-CMD="/usr/local/bin/spatula_wrapper.py"
+CMD="/usr/local/bin/spatula_wrapper.py --lldp"
case "$ACTION" in
start)
echo -n "Setting up Spatula: "
diff --git a/common/recipes-utils/spatula/files/spatula_wrapper.py b/common/recipes-utils/spatula/files/spatula_wrapper.py
index 2717bef..770e4e8 100644
--- a/common/recipes-utils/spatula/files/spatula_wrapper.py
+++ b/common/recipes-utils/spatula/files/spatula_wrapper.py
@@ -24,35 +24,81 @@ import os
import subprocess
import time
import argparse
+import re
SPATULA_FILE = '/etc/spatula/spatula'
+LLDP_UTIL = '/usr/bin/lldp-util'
LOG_FORMAT = '[%(levelname)s] %(asctime)s: %(message)s'
DATE_FORMAT = '%Y-%m-%d %H:%M:%S'
DEFAULT_SLEEP = 900 # default sleep 15 mins
+DEFAULT_PORT = 8087
+DEFAULT_INTERFACE = 'usb0'
class SpatulaWrapper(object):
def __init__(self, address='fe80::2', interface='usb0',
- port=8087, ssl=False):
- proto = 'http'
- if ssl:
- proto = 'https'
+ port=8087, tls=False, lldp=False):
+ self.interface = interface
+ self.lldp = lldp
+ self.port = port
+ self.proto = 'http'
+ if tls:
+ self.proto = 'https'
+ # not used if auto-discovering
self.url = '{proto}://{address}%{iface}:{port}'.format(
- proto = proto,
+ proto = self.proto,
address = address,
- iface = interface,
- port = port)
+ iface = self.interface,
+ port = self.port)
+
+ def _getLldpMessage(self):
+ try:
+ if os.path.exists(LLDP_UTIL):
+ # request a single packet and time out in 30 seconds
+ lldp = subprocess.Popen([LLDP_UTIL, '-n', '4', '-t', '30'],
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE)
+ found = []
+ for line in lldp.stdout:
+ # example (one line):
+ # LLDP: local_port=eth0 \
+ # remote_system=rsw1bz.19.snc1.facebook.com \
+ # remote_port=00:90:fb:52:1a:49
+ if line.startswith('LLDP: '):
+ matches = re.findall(r'\w+=\S+', line.replace('LLDP: ', ''))
+ matches = [m.split('=', 1) for m in matches]
+ found.append(dict(matches))
+ if not found:
+ raise Exception('timed out waiting for LLDP packet')
+ # dedupe before returning since we may get multiple packets
+ # from the same device
+ return [dict(t) for t in set([tuple(d.items()) for d in found])]
+ else:
+ raise Exception('missing lldp-util: {}'.format(LLDP_UTIL))
+ except Exception as err:
+ raise Exception('failed discovering management system via LLDP: {}'.format(err))
def _getSpatula(self, endpoint='/spatula'):
'''
Get the executable spatula script from the host.
'''
- url = '{}{}'.format(self.url, endpoint)
- try:
- request = urllib2.Request(url)
- response = urllib2.urlopen(request)
- return response.read()
- except Exception as err:
- raise Exception('failed getting Spatula {}: {}'.format(url, err))
+ urls = []
+ urls.append('{}{}'.format(self.url, endpoint))
+ if self.lldp:
+ for lldp in self._getLldpMessage():
+ urls.append('{proto}://{address}%{iface}:{port}{endpoint}'.format(
+ proto = self.proto,
+ address = lldp['remote_system'],
+ iface = lldp['local_port'],
+ port = self.port,
+ endpoint = endpoint))
+ for url in urls:
+ try:
+ request = urllib2.Request(url)
+ response = urllib2.urlopen(request)
+ return response.read()
+ except Exception as err:
+ continue
+ raise Exception('failed getting Spatula {}: {}'.format(urls, err))
def _success(self, endpoint='/success'):
'''
@@ -114,7 +160,18 @@ if __name__ == '__main__':
args = argparse.ArgumentParser()
args.add_argument('-s', '--sleep', default=DEFAULT_SLEEP,
help='Sleep time between spatula runs (default=%(default)s)')
+ args.add_argument('--interface', '-i', default=DEFAULT_INTERFACE,
+ help='Interface to use for management system')
+ args.add_argument('--port', '-p', default=DEFAULT_PORT,
+ help='Port to contact on management system')
+ args.add_argument('--lldp', default=False, action="store_true",
+ help='Automatically discover management system with LLDP')
+ args.add_argument('--tls', default=False, action="store_true",
+ help='Connect to bmc_proxy using TLS')
params = args.parse_args()
logging.basicConfig(format=LOG_FORMAT, datefmt=DATE_FORMAT)
- wrapper = SpatulaWrapper()
+ wrapper = SpatulaWrapper(interface=params.interface,
+ tls=params.tls,
+ port=params.port,
+ lldp=params.lldp)
wrapper.run(params.sleep)
diff --git a/meta-aspeed/conf/distro/include/tclibc-eglibc.inc b/meta-aspeed/conf/distro/include/tclibc-eglibc.inc
new file mode 100644
index 0000000..15f5ee5
--- /dev/null
+++ b/meta-aspeed/conf/distro/include/tclibc-eglibc.inc
@@ -0,0 +1,40 @@
+#
+# eglibc specific configuration
+#
+
+LIBCEXTENSION = "${@['', '-gnu'][(d.getVar('ABIEXTENSION', True) or '') != '']}"
+
+# Add glibc overrides to the overrides for eglibc.
+LIBCOVERRIDE = ":libc-glibc"
+OVERRIDES .= "${LIBCOVERRIDE}"
+
+PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc"
+PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= "nativesdk-eglibc"
+PREFERRED_PROVIDER_virtual/nativesdk-libintl ?= "nativesdk-eglibc"
+PREFERRED_PROVIDER_virtual/libintl ?= "eglibc"
+PREFERRED_PROVIDER_virtual/libc ?= "eglibc"
+PREFERRED_PROVIDER_virtual/nativesdk-libc ?= "nativesdk-eglibc"
+PREFERRED_PROVIDER_virtual/libc-locale ?= "eglibc-locale"
+
+CXXFLAGS += "-fvisibility-inlines-hidden"
+
+LIBC_DEPENDENCIES = "libsegfault \
+ eglibc \
+ eglibc-dbg \
+ eglibc-dev \
+ eglibc-utils \
+ eglibc-thread-db \
+ ${@get_libc_locales_dependencies(d)}"
+
+LIBC_LOCALE_DEPENDENCIES = "\
+ eglibc-localedata-i18n \
+ eglibc-gconv-ibm850 \
+ eglibc-gconv-cp1252 \
+ eglibc-gconv-iso8859-1 \
+ eglibc-gconv-iso8859-15"
+
+def get_libc_locales_dependencies(d):
+ if 'libc-locales' in (d.getVar('DISTRO_FEATURES', True) or '').split() :
+ return d.getVar('LIBC_LOCALE_DEPENDENCIES', True) or ''
+ else:
+ return ''
diff --git a/meta-aspeed/conf/machine/include/ast1250.inc b/meta-aspeed/conf/machine/include/ast1250.inc
index 099fdb0..210e3b5 100644
--- a/meta-aspeed/conf/machine/include/ast1250.inc
+++ b/meta-aspeed/conf/machine/include/ast1250.inc
@@ -11,12 +11,14 @@ EXTRA_IMAGEDEPENDS += "u-boot"
# Uncomment the following line to enable the hard floating point abi. Note that
# this breaks some binary libraries and 3D (neither of which ship with
# meta-yocto). For maximum compatibility, leave this disabled.
-DEFAULTTUNE ?= "arm926ejs"
require conf/machine/include/tune-arm926ejs.inc
PREFERRED_PROVIDER_virtual/kernel ?= "linux-aspeed"
PREFERRED_VERSION_linux-aspeed ?= "2.6.28%"
+PREFERRED_VERSION_u-boot ?= "v2013.07"
+PREFERRED_VERSION_u-boot-fw-utils ?= "v2013.07"
+
KERNEL_IMAGETYPE ?= "uImage"
KERNEL_EXTRA_ARGS ?= "UIMAGE_LOADADDR=0x40008000"
diff --git a/meta-aspeed/recipes-bsp/u-boot/files/patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch b/meta-aspeed/recipes-bsp/u-boot/files/patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch
new file mode 100644
index 0000000..559e65b
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/files/patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch
@@ -0,0 +1,13 @@
+diff --git a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-v2013.07/include/configs/fbyosemite.h b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-v2013.07/include/configs/fbyosemite.h
+index 73a3cf9..397ca48 100644
+--- a/meta-aspeed/recipes-bsp/u-boot/files/u-boot-v2013.07/include/configs/fbyosemite.h
++++ b/meta-aspeed/recipes-bsp/u-boot/files/u-boot-v2013.07/include/configs/fbyosemite.h
+@@ -155,7 +155,7 @@
+ */
+ #define CONFIG_NR_DRAM_BANKS 1 /* we have 1 bank of DRAM */
+ #define PHYS_SDRAM_1 0x40000000 /* SDRAM Bank #1 */
+-#define PHYS_SDRAM_1_SIZE 0x8000000 /* 128 MB */
++#define PHYS_SDRAM_1_SIZE 0x10000000 /* 256 MB */
+
+ #define CONFIG_SYS_SDRAM_BASE 0x40000000
+
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
deleted file mode 100644
index be61682..0000000
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07%.bbappend
+++ /dev/null
@@ -1,13 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://fw_env.config \
- file://patch-2013.07/0000-u-boot-aspeed-064.patch \
- file://patch-2013.07/0001-u-boot-openbmc.patch \
- file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
- "
-do_install_append() {
- if [ -e ${WORKDIR}/fw_env.config ] ; then
- install -d ${D}${sysconfdir}
- install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
- fi
-}
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
new file mode 100644
index 0000000..fcf8ac8
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -0,0 +1,38 @@
+SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+SECTION = "bootloader"
+DEPENDS = "mtd-utils"
+
+# This revision corresponds to the tag "v2013.07"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse
+SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
+
+PV = "v2013.07"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
+ file://patch-2013.07/0000-u-boot-aspeed-064.patch \
+ file://patch-2013.07/0001-u-boot-openbmc.patch \
+ file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
+ file://patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch;striplevel=6 \
+ "
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
+
+inherit uboot-config
+
+do_compile () {
+ oe_runmake ${UBOOT_MACHINE}
+ oe_runmake env
+}
+
+do_install () {
+ install -d ${D}${base_sbindir}
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot.inc b/meta-aspeed/recipes-bsp/u-boot/u-boot.inc
new file mode 100644
index 0000000..cb1c403
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot.inc
@@ -0,0 +1,78 @@
+SUMMARY = "Universal Boot Loader for embedded devices"
+HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
+SECTION = "bootloaders"
+PROVIDES = "virtual/bootloader"
+
+inherit uboot-config deploy
+
+EXTRA_OEMAKE = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}"'
+
+# Allow setting an additional version string that will be picked up by the
+# u-boot build system and appended to the u-boot version. If the .scmversion
+# file already exists it will not be overwritten.
+UBOOT_LOCALVERSION ?= ""
+
+# Some versions of u-boot use .bin and others use .img. By default use .bin
+# but enable individual recipes to change this value.
+UBOOT_SUFFIX ?= "bin"
+UBOOT_IMAGE ?= "u-boot-${MACHINE}-${PV}-${PR}.${UBOOT_SUFFIX}"
+UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}"
+UBOOT_SYMLINK ?= "u-boot-${MACHINE}.${UBOOT_SUFFIX}"
+UBOOT_MAKE_TARGET ?= "all"
+
+# Some versions of u-boot build an SPL (Second Program Loader) image that
+# should be packaged along with the u-boot binary as well as placed in the
+# deploy directory. For those versions they can set the following variables
+# to allow packaging the SPL.
+SPL_BINARY ?= ""
+SPL_IMAGE ?= "${SPL_BINARY}-${MACHINE}-${PV}-${PR}"
+SPL_SYMLINK ?= "${SPL_BINARY}-${MACHINE}"
+
+do_compile () {
+ if [ "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', 'ld-is-gold', '', d)}" = "ld-is-gold" ] ; then
+ sed -i 's/$(CROSS_COMPILE)ld$/$(CROSS_COMPILE)ld.bfd/g' config.mk
+ fi
+
+ unset LDFLAGS
+ unset CFLAGS
+ unset CPPFLAGS
+
+ if [ ! -e ${B}/.scmversion -a ! -e ${S}/.scmversion ]
+ then
+ echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion
+ echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion
+ fi
+
+ oe_runmake ${UBOOT_MACHINE}
+ oe_runmake ${UBOOT_MAKE_TARGET}
+}
+
+do_install () {
+ if [ -e ${WORKDIR}/fw_env.config ] ; then
+ install -d ${D}${sysconfdir}
+ install -m 644 ${WORKDIR}/fw_env.config ${D}${sysconfdir}/fw_env.config
+ fi
+}
+
+FILES_${PN} = "${sysconfdir}"
+FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:"
+
+do_deploy () {
+ install -d ${DEPLOYDIR}
+ install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE}
+
+ cd ${DEPLOYDIR}
+ rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK}
+ ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY}
+
+ if [ "x${SPL_BINARY}" != "x" ]
+ then
+ install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE}
+ rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY}
+ ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK}
+ fi
+}
+
+addtask deploy before do_build after do_compile
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
deleted file mode 100644
index a2f26a5..0000000
--- a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07%.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://patch-2013.07/0000-u-boot-aspeed-064.patch \
- file://patch-2013.07/0001-u-boot-openbmc.patch \
- file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
- "
diff --git a/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07.bb b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07.bb
new file mode 100644
index 0000000..253c525
--- /dev/null
+++ b/meta-aspeed/recipes-bsp/u-boot/u-boot_2013.07.bb
@@ -0,0 +1,23 @@
+require u-boot.inc
+
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \
+ file://README;beginline=1;endline=22;md5=78b195c11cb6ef63e6985140db7d7bab"
+
+# This revision corresponds to the tag "v2013.07"
+# We use the revision in order to avoid having to fetch it from the repo during parse
+SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
+
+PV = "v2013.07"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master \
+ file://fw_env.config \
+ file://patch-2013.07/0000-u-boot-aspeed-064.patch \
+ file://patch-2013.07/0001-u-boot-openbmc.patch \
+ file://patch-2013.07/0002-Create-snapshot-of-OpenBMC.patch;striplevel=6 \
+ file://patch-2013.07/0003-u-boot-snapshot-of-OpenBMC-f926614.patch;striplevel=6 \
+ "
+
+S = "${WORKDIR}/git"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-aspeed/recipes-core/eglibc/cross-localedef-native_2.19.bb b/meta-aspeed/recipes-core/eglibc/cross-localedef-native_2.19.bb
new file mode 100644
index 0000000..3ce0e1d
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/cross-localedef-native_2.19.bb
@@ -0,0 +1,49 @@
+SUMMARY = "Cross locale generation tool for eglibc"
+HOMEPAGE = "http://www.eglibc.org/home"
+SECTION = "libs"
+LICENSE = "LGPL-2.1"
+
+LIC_DIR = "${WORKDIR}/eglibc-${PV}/libc"
+LIC_FILES_CHKSUM = "file://${LIC_DIR}/LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
+ file://${LIC_DIR}/COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://${LIC_DIR}/posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
+ file://${LIC_DIR}/COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+
+
+inherit native
+inherit autotools
+
+# pick up an eglibc patch
+FILESPATH = "${FILE_DIRNAME}/eglibc-${PV}"
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \
+ file://fix_for_centos_5.8.patch;patchdir=.. \
+ "
+SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
+SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
+
+S = "${WORKDIR}/eglibc-${PV}/localedef"
+
+do_unpack_append() {
+ bb.build.exec_func('do_move_ports', d)
+}
+
+do_move_ports() {
+ if test -d ${WORKDIR}/eglibc-${PV}/ports ; then
+ rm -rf ${WORKDIR}/libc/ports
+ mv ${WORKDIR}/eglibc-${PV}/ports ${WORKDIR}/libc/
+ fi
+}
+
+EXTRA_OECONF = "--with-glibc=${WORKDIR}/eglibc-${PV}/libc"
+CFLAGS += "-DNOT_IN_libc=1"
+
+do_configure () {
+ ${S}/configure ${EXTRA_OECONF}
+}
+
+
+do_install() {
+ install -d ${D}${bindir}
+ install -m 0755 ${B}/localedef ${D}${bindir}/cross-localedef
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch
new file mode 100644
index 0000000..b4489e9
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-R_ARM_TLS_DTPOFF32.patch
@@ -0,0 +1,56 @@
+
+Quote from bug 1443 which explains what the patch does :
+
+ We build some random program and link it with -lust. When we run it,
+ it dies with a SIGSEGV before reaching main().
+
+ Libust.so depends on liburcu-bp.so from the usermode-rcu package.
+ Although libust.so is not prelinked, liburcu-bp.so IS prelinked; this
+ is critical.
+
+ Libust.so uses a TLS / __thread variable that is defined in liburcu-
+ bp.so. There are special ARM-specific relocation types that allow two
+ shared libraries to share thread-specific data. This is critical too.
+
+ One more critical issue: although liburcu-bp.so is prelinked, we can't
+ load it at its prelinked address, because we also link against
+ librt.so, and librt.so uses that address.
+
+ The dynamic linker is forced to relink liburcu-bp.so at a different
+ address. In the course of relinking, it processes the special ARM
+ relocation record mentioned above. The prelinker has already filled
+ in the information, which is a short offset into a table of thread-
+ specific data that is allocated per-thread for each library that uses
+ TLS. Because the normal behavior of a relocation is to add the symbol
+ value to an addend stored at the address being relocated, we end up
+ adding the short offset to itself, doubling it.
+
+ Now we have an awkward situation. The libust.so library doesn't know
+ about the addend, so its TLS data for this element is correct. The
+ liburcu-bp.so library has a different offset for the element. When we
+ go to initialize the element for the first time in liburcu-bp.so, we
+ write the address of the result at the doubled (broken) offset.
+ Later, when we refer to the address from libust.so, we check the value
+ at the correct offset, but it's NULL, so we eat hot SIGSEGV.
+
+Upstream-Status: Pending
+
+Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
+---
+ .../libc/ports/sysdeps/arm/dl-machine.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+ndex 8d905e8..dcfa71e 100644
+--- libc.orig/ports/sysdeps/arm/dl-machine.h
++++ libc/ports/sysdeps/arm/dl-machine.h
+@@ -503,7 +503,7 @@ elf_machine_rel (struct link_map *map, const Elf32_Rel *reloc,
+
+ case R_ARM_TLS_DTPOFF32:
+ if (sym != NULL)
+- *reloc_addr += sym->st_value;
++ *reloc_addr = sym->st_value;
+ break;
+
+ case R_ARM_TLS_TPOFF32:
+--
+
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch
new file mode 100644
index 0000000..4559a11
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-menuconfig-support.patch
@@ -0,0 +1,912 @@
+Pulled from
+http://www.eglibc.org/archives/patches/msg01042.html
+
+Upstream-Status: Pending
+Signed-off-by: Khem
+
+Hi,
+
+This patch adds 'make menuconfig' support to EGLIBC.
+
+
+EGLIBC can re-use the Linux kernel kconfig host tools ('conf' and 'mconf') unmodified, by passing appropriate environment variables and with some pre- and post-processing on the input/output config files.
+
+There are three new make targets supported, which all are defined in the new libc/options-config/Makefile, which is included by the top-level libc/Makefile:
+
+- 'make defconfig'. This passes 'libc/option-groups.defaults' to 'conf' as a default config, and outputs 'option-groups.config' to the top-level build directory, which will be the same as the default config.
+
+- 'make config'. This is the same line-oriented interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
+
+- 'make menuconfig'. This is the same menu-based interface as in the Linux kernel. Input and output is 'option-groups.config' in the top-level build directory.
+
+
+Pre-Processing:
+
+
+The Linux kernel kconfig tools expect a prefix of "CONFIG_" on all config option names, but EGLIBC expects a prefix of "OPTION_". The pre-processing script, libc/options-config/config-preproc.pl, simply replaces "CONFIG_ with "OPTION_" in the given config file. The libc/options-config/Makefile passes the script output to a temporary config file, which is then passed to 'conf' or 'mconf'.
+
+Post-Processing (libc/options-config/config-postproc.pl):
+
+
+- Disabled options are output as a comment line of the form "# CONFIG_FOO is not set". This needs to be changed to an explicit "CONFIG_FOO=n" in order to be compatible with 'option-groups.awk' which generates the option-groups.h header.
+
+- "CONFIG_" prefix is changed back to "OPTION_".
+
+
+- The kconfig tools will not output anything for options that depend on a parent option, when the parent option is disabled. This implicit disable must be converted to an explicit "CONFIG_FOO=n" in order to be compatible with the way EGLIBC overrides the default option settings in 'libc/option-groups.defaults' with those in 'option-groups.config'.
+
+
+A new configure option, '--with-kconfig=<PATH>', tells EGLIBC where to find the pre-built 'conf' and 'mconf' host tools from Linux kernel builds.
+
+libc/EGLIBC.cross-building is updated to include instructions for using '--with-kconfig' for the final EGLIBC build, and shows how and when to run 'make *config'.
+
+libc/EGLIBC.option-groups is updated to include new information on the menuconfig support.
+
+Thanks,
+
+attached is the updated patch to address above issues.
+
+Steve
+
+--
+Steve Longerbeam | Senior Embedded Engineer, ESD Services
+Mentor Embedded(tm) | 46871 Bayside Parkway, Fremont, CA 94538
+P 510.354.5838 | M 408.410.2735
+Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
+
+
+Index: libc/EGLIBC.cross-building
+===================================================================
+--- libc.orig/EGLIBC.cross-building
++++ libc/EGLIBC.cross-building
+@@ -243,9 +243,29 @@ full EGLIBC build:
+ > $src/libc/configure \
+ > --prefix=/usr \
+ > --with-headers=$sysroot/usr/include \
++ > --with-kconfig=$obj/linux/scripts/kconfig \
+ > --build=$build \
+ > --host=$target \
+ > --disable-profile --without-gd --without-cvs --enable-add-ons
++
++Note the additional '--with-kconfig' option. This tells EGLIBC where to
++find the host config tools used by the kernel 'make config' and 'make
++menuconfig'. These tools can be re-used by EGLIBC for its own 'make
++*config' support, which will create 'option-groups.config' for you.
++But first make sure those tools have been built by running some
++dummy 'make *config' calls in the kernel directory:
++
++ $ cd $obj/linux
++ $ PATH=$tools/bin:$PATH make config \
++ > ARCH=$linux_arch CROSS_COMPILE=$target- \
++ $ PATH=$tools/bin:$PATH make menuconfig \
++ > ARCH=$linux_arch CROSS_COMPILE=$target- \
++
++Now we can configure and build the full EGLIBC:
++
++ $ cd $obj/eglibc
++ $ PATH=$tools/bin:$PATH make defconfig
++ $ PATH=$tools/bin:$PATH make menuconfig
+ $ PATH=$tools/bin:$PATH make
+ $ PATH=$tools/bin:$PATH make install install_root=$sysroot
+
+Index: libc/configure.ac
+===================================================================
+--- libc.orig/configure.ac
++++ libc/configure.ac
+@@ -127,6 +127,16 @@ AC_ARG_WITH([headers],
+ [sysheaders=''])
+ AC_SUBST(sysheaders)
+
++AC_ARG_WITH([kconfig],
++ AC_HELP_STRING([--with-kconfig=PATH],
++ [location of kconfig tools to use (from Linux
++ kernel builds) to re-use for configuring EGLIBC
++ option groups]),
++ [KCONFIG_TOOLS=$withval],
++ [KCONFIG_TOOLS=''])
++AC_SUBST(KCONFIG_TOOLS)
++
++
+ AC_SUBST(use_default_link)
+ AC_ARG_WITH([default-link],
+ AC_HELP_STRING([--with-default-link],
+Index: libc/config.make.in
+===================================================================
+--- libc.orig/config.make.in
++++ libc/config.make.in
+@@ -45,6 +45,8 @@ sysincludes = @SYSINCLUDES@
+ c++-sysincludes = @CXX_SYSINCLUDES@
+ all-warnings = @all_warnings@
+
++kconfig_tools = @KCONFIG_TOOLS@
++
+ have-z-combreloc = @libc_cv_z_combreloc@
+ have-z-execstack = @libc_cv_z_execstack@
+ have-Bgroup = @libc_cv_Bgroup@
+Index: libc/options-config/config-postproc.pl
+===================================================================
+--- /dev/null
++++ libc/options-config/config-postproc.pl
+@@ -0,0 +1,54 @@
++#!/usr/bin/perl
++
++$usage = "usage: $0 <default config file> <config file>\n";
++
++die "$usage" unless @ARGV;
++$defaults = shift @ARGV;
++die "$usage" unless @ARGV;
++die "Could not open $ARGV[0]" unless -T $ARGV[0];
++
++sub yank {
++ @option = grep($_ ne $_[0], @option);
++}
++
++open(DEFAULTS, $defaults) || die "Could not open $defaults\n";
++
++# get the full list of available options using the default config file
++$i = 0;
++while (<DEFAULTS>) {
++ if (/^\s*OPTION_(\w+)\s*=/) {
++ $option[$i++] = $1;
++ }
++}
++
++# now go through the config file, making the necessary changes
++while (<>) {
++ if (/Linux Kernel Configuration/) {
++ # change title
++ s/Linux Kernel/Option Groups/;
++ print;
++ } elsif (/^\s*CONFIG_(\w+)\s*=/) {
++ # this is an explicit option set line, change CONFIG_ to OPTION_
++ # before printing and remove this option from option list
++ $opt = $1;
++ yank($opt);
++ s/CONFIG_/OPTION_/g;
++ print;
++ } elsif (/^\s*#\s+CONFIG_(\w+) is not set/) {
++ # this is a comment line, change CONFIG_ to OPTION_, remove this
++ # option from option list, and convert to explicit OPTION_FOO=n
++ $opt = $1;
++ yank($opt);
++ s/CONFIG_/OPTION_/g;
++ print "OPTION_$opt=n\n";
++ } else {
++ print;
++ }
++}
++
++# any options left in @options, are options that were not mentioned in
++# the config file, and implicitly that means the option must be set =n,
++# so do that here.
++foreach $opt (@option) {
++ print "OPTION_$opt=n\n";
++}
+Index: libc/options-config/config-preproc.pl
+===================================================================
+--- /dev/null
++++ libc/options-config/config-preproc.pl
+@@ -0,0 +1,8 @@
++#!/usr/bin/perl
++
++if (@ARGV) {
++ while (<>) {
++ s/OPTION_/CONFIG_/g;
++ print;
++ }
++}
+Index: libc/options-config/Makefile
+===================================================================
+--- /dev/null
++++ libc/options-config/Makefile
+@@ -0,0 +1,55 @@
++# ===========================================================================
++# EGLIBC option-groups configuration targets
++# These targets are included from top-level makefile
++
++ifneq ($(kconfig_tools),)
++ifneq (no,$(PERL))
++
++ocdir := options-config
++
++OconfigDefaults := option-groups.defaults
++OconfigDefaults_tmp := $(common-objpfx).tmp.defconfig
++OconfigDef := option-groups.def
++Oconfig := $(common-objpfx)option-groups.config
++Oconfig_tmp := $(common-objpfx).tmp.config
++
++conf := $(kconfig_tools)/conf
++mconf := $(kconfig_tools)/mconf
++
++preproc := $(PERL) $(ocdir)/config-preproc.pl
++postproc := $(PERL) $(ocdir)/config-postproc.pl
++
++PHONY += defconfig config menuconfig
++
++defconfig: $(conf) $(OconfigDefaults) $(OconfigDef)
++ rm -f $(OconfigDefaults_tmp)
++ rm -f $(Oconfig_tmp)
++ $(preproc) $(OconfigDefaults) > $(OconfigDefaults_tmp)
++ KCONFIG_CONFIG=$(Oconfig_tmp) $< --defconfig=$(OconfigDefaults_tmp) \
++ $(OconfigDef)
++ $(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++ rm $(Oconfig_tmp)
++ rm $(OconfigDefaults_tmp)
++
++config: $(conf) $(OconfigDefaults) $(OconfigDef)
++ rm -f $(Oconfig_tmp)
++ $(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
++ KCONFIG_CONFIG=$(Oconfig_tmp) $< --oldaskconfig $(OconfigDef)
++ $(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++ rm $(Oconfig_tmp)
++
++menuconfig: $(mconf) $(OconfigDefaults) $(OconfigDef)
++ rm -f $(Oconfig_tmp)
++ $(preproc) $(wildcard $(Oconfig)) > $(Oconfig_tmp)
++ KCONFIG_CONFIG=$(Oconfig_tmp) $< $(OconfigDef)
++ $(postproc) $(OconfigDefaults) $(Oconfig_tmp) > $(Oconfig)
++ rm $(Oconfig_tmp)
++
++# Help text used by make help
++help:
++ @echo ' defconfig - New config with default from default config'
++ @echo ' config - Update current config utilising a line-oriented program'
++ @echo ' menuconfig - Update current config utilising a menu based program'
++
++endif
++endif
+Index: libc/option-groups.def
+===================================================================
+--- libc.orig/option-groups.def
++++ libc/option-groups.def
+@@ -4,19 +4,19 @@
+ #
+ # An entry of the form:
+ #
+-# config OPTION_GROUP_NAME
++# config GROUP_NAME
+ # bool "one-line explanation of what this option group controls"
+ # help
+ # Multi-line help explaining the option group's meaning in
+ # some detail, terminated by indentation level.
+ #
+-# defines an option group whose variable is OPTION_GROUP_NAME, with
++# defines an option group whose variable is GROUP_NAME, with
+ # meaningful values 'y' (enabled) and 'n' (disabled). The
+ # documentation is formatted to be consumed by some sort of
+ # interactive configuration interface, but EGLIBC doesn't have such an
+ # interface yet.
+ #
+-# An option may have a 'depends' line, indicating which other options
++# An option may have a 'depends on' line, indicating which other options
+ # must also be enabled if this option is. At present, EGLIBC doesn't
+ # check that these dependencies are satisfied.
+ #
+@@ -41,9 +41,9 @@
+ # although this simply reestablishes the value already set by
+ # 'option-groups.defaults'.
+
+-config OPTION_EGLIBC_ADVANCED_INET6
++config EGLIBC_ADVANCED_INET6
+ bool "IPv6 Advanced Sockets API support (RFC3542)"
+- depends OPTION_EGLIBC_INET
++ depends on EGLIBC_INET
+ help
+ This option group includes the functions specified by RFC 3542,
+ "Advanced Sockets Application Program Interface (API) for
+@@ -71,7 +71,7 @@ config OPTION_EGLIBC_ADVANCED_INET6
+ inet6_rth_segments
+ inet6_rth_space
+
+-config OPTION_EGLIBC_BACKTRACE
++config EGLIBC_BACKTRACE
+ bool "Functions for producing backtraces"
+ help
+ This option group includes functions for producing a list of
+@@ -85,7 +85,7 @@ config OPTION_EGLIBC_BACKTRACE
+ backtrace_symbols
+ backtrace_symbols_fd
+
+-config OPTION_EGLIBC_BIG_MACROS
++config EGLIBC_BIG_MACROS
+ bool "Use extensive inline code"
+ help
+ This option group specifies whether certain pieces of code
+@@ -93,7 +93,7 @@ config OPTION_EGLIBC_BIG_MACROS
+ group is not selected, function calls will be used instead,
+ hence reducing the library footprint.
+
+-config OPTION_EGLIBC_BSD
++config EGLIBC_BSD
+ bool "BSD-specific functions, and their compatibility stubs"
+ help
+ This option group includes functions specific to BSD kernels.
+@@ -109,10 +109,9 @@ config OPTION_EGLIBC_BSD
+ revoke
+ setlogin
+
+-config OPTION_EGLIBC_CXX_TESTS
++config EGLIBC_CXX_TESTS
+ bool "Tests that link against the standard C++ library."
+- depends OPTION_POSIX_WIDE_CHAR_DEVICE_IO
+- depends OPTION_EGLIBC_LIBM
++ depends on POSIX_WIDE_CHAR_DEVICE_IO && EGLIBC_LIBM
+ help
+ This option group does not include any C library functions;
+ instead, it controls which EGLIBC tests an ordinary 'make
+@@ -121,23 +120,22 @@ config OPTION_EGLIBC_CXX_TESTS
+ run.
+
+ The standard C++ library depends on the math library 'libm' and
+- the wide character I/O functions included in EGLIBC. If those
+- option groups are disabled, this test must also be disabled.
++ the wide character I/O functions included in EGLIBC. So those
++ option groups must be enabled if this test is enabled.
+
+-config OPTION_EGLIBC_CATGETS
++config EGLIBC_CATGETS
+ bool "Functions for accessing message catalogs"
+- depends OPTION_EGLIBC_LOCALE_CODE
++ depends on EGLIBC_LOCALE_CODE
+ help
+ This option group includes functions for accessing message
+ catalogs: catopen, catclose, and catgets.
+
+- This option group depends on the OPTION_EGLIBC_LOCALE_CODE
+- option group; if you disable that, you must also disable this.
++ This option group depends on the EGLIBC_LOCALE_CODE
++ option group.
+
+-config OPTION_EGLIBC_CHARSETS
++config EGLIBC_CHARSETS
+ bool "iconv/gconv character set conversion libraries"
+ help
+-
+ This option group includes support for character sets other
+ than ASCII (ANSI_X3.4-1968) and Unicode and ISO-10646 in their
+ various encodings. This affects both the character sets
+@@ -198,16 +196,16 @@ config OPTION_EGLIBC_CHARSETS
+ WCHAR_T - EGLIBC's internal form (target-endian,
+ 32-bit ISO 10646)
+
+-config OPTION_EGLIBC_CRYPT
++config EGLIBC_CRYPT
+ bool "Encryption library"
+ help
+ This option group includes the `libcrypt' library which
+ provides functions for one-way encryption. Supported
+ encryption algorithms include MD5, SHA-256, SHA-512 and DES.
+
+-config OPTION_EGLIBC_CRYPT_UFC
++config EGLIBC_CRYPT_UFC
+ bool "Ultra fast `crypt' implementation"
+- depends OPTION_EGLIBC_CRYPT
++ depends on EGLIBC_CRYPT
+ help
+ This option group provides ultra fast DES-based implementation of
+ the `crypt' function. When this option group is disabled,
+@@ -216,7 +214,7 @@ config OPTION_EGLIBC_CRYPT_UFC
+ errno to ENOSYS if /salt/ passed does not correspond to either MD5,
+ SHA-256 or SHA-512 algorithm.
+
+-config OPTION_EGLIBC_DB_ALIASES
++config EGLIBC_DB_ALIASES
+ bool "Functions for accessing the mail aliases database"
+ help
+ This option group includues functions for looking up mail
+@@ -233,7 +231,7 @@ config OPTION_EGLIBC_DB_ALIASES
+ When this option group is disabled, the NSS service libraries
+ also lack support for querying their mail alias tables.
+
+-config OPTION_EGLIBC_ENVZ
++config EGLIBC_ENVZ
+ bool "Functions for handling envz-style environment vectors."
+ help
+ This option group contains functions for creating and operating
+@@ -248,7 +246,7 @@ config OPTION_EGLIBC_ENVZ
+ envz_entry envz_remove
+ envz_get envz_strip
+
+-config OPTION_EGLIBC_FCVT
++config EGLIBC_FCVT
+ bool "Functions for converting floating-point numbers to strings"
+ help
+ This option group includes functions for converting
+@@ -262,14 +260,14 @@ config OPTION_EGLIBC_FCVT
+ fcvt_r qfcvt_r
+ gcvt qgcvt
+
+-config OPTION_EGLIBC_FMTMSG
++config EGLIBC_FMTMSG
+ bool "Functions for formatting messages"
+ help
+ This option group includes the following functions:
+
+ addseverity fmtmsg
+
+-config OPTION_EGLIBC_FSTAB
++config EGLIBC_FSTAB
+ bool "Access functions for 'fstab'"
+ help
+ This option group includes functions for reading the mount
+@@ -283,7 +281,7 @@ config OPTION_EGLIBC_FSTAB
+ getfsent setfsent
+ getfsfile
+
+-config OPTION_EGLIBC_FTRAVERSE
++config EGLIBC_FTRAVERSE
+ bool "Functions for traversing file hierarchies"
+ help
+ This option group includes functions for traversing file
+@@ -297,9 +295,9 @@ config OPTION_EGLIBC_FTRAVERSE
+ fts_set nftw64
+ fts_close
+
+-config OPTION_EGLIBC_GETLOGIN
++config EGLIBC_GETLOGIN
+ bool "The getlogin function"
+- depends OPTION_EGLIBC_UTMP
++ depends on EGLIBC_UTMP
+ help
+ This function group includes the 'getlogin' and 'getlogin_r'
+ functions, which return the user name associated by the login
+@@ -309,17 +307,17 @@ config OPTION_EGLIBC_GETLOGIN
+ fall back on 'getlogin' to find the user's login name for tilde
+ expansion when the 'HOME' environment variable is not set.
+
+-config OPTION_EGLIBC_IDN
++config EGLIBC_IDN
+ bool "International domain names support"
+ help
+ This option group includes the `libcidn' library which
+ provides support for international domain names.
+
+-config OPTION_EGLIBC_INET
++config EGLIBC_INET
+ bool "Networking support"
+ help
+ This option group includes networking-specific functions and
+- data. With OPTION_EGLIBC_INET disabled, the EGLIBC
++ data. With EGLIBC_INET disabled, the EGLIBC
+ installation and API changes as follows:
+
+ - The following libraries are not installed:
+@@ -439,14 +437,14 @@ config OPTION_EGLIBC_INET
+ use Unix-domain sockets to communicate with the syslog daemon;
+ syslog is valuable in non-networked contexts.
+
+-config OPTION_EGLIBC_INET_ANL
++config EGLIBC_INET_ANL
+ bool "Asynchronous name lookup"
+- depends OPTION_EGLIBC_INET
++ depends on EGLIBC_INET
+ help
+ This option group includes the `libanl' library which
+ provides support for asynchronous name lookup.
+
+-config OPTION_EGLIBC_LIBM
++config EGLIBC_LIBM
+ bool "libm (math library)"
+ help
+ This option group includes the 'libm' library, containing
+@@ -464,7 +462,7 @@ config OPTION_EGLIBC_LIBM
+ group, you will not be able to build 'libstdc++' against the
+ resulting EGLIBC installation.
+
+-config OPTION_EGLIBC_LOCALES
++config EGLIBC_LOCALES
+ bool "Locale definitions"
+ help
+ This option group includes all locale definitions other than
+@@ -472,17 +470,17 @@ config OPTION_EGLIBC_LOCALES
+ only the "C" locale is supported.
+
+
+-config OPTION_EGLIBC_LOCALE_CODE
++config EGLIBC_LOCALE_CODE
+ bool "Locale functions"
+- depends OPTION_POSIX_C_LANG_WIDE_CHAR
++ depends on POSIX_C_LANG_WIDE_CHAR
+ help
+ This option group includes locale support functions, programs,
+- and libraries. With OPTION_EGLIBC_LOCALE_FUNCTIONS disabled,
++ and libraries. With EGLIBC_LOCALE_CODE disabled,
+ EGLIBC supports only the 'C' locale (also known as 'POSIX'),
+ and ignores the settings of the 'LANG' and 'LC_*' environment
+ variables.
+
+- With OPTION_EGLIBC_LOCALE_CODE disabled, the following
++ With EGLIBC_LOCALE_CODE disabled, the following
+ functions are omitted from libc:
+
+ duplocale localeconv nl_langinfo rpmatch strfmon_l
+@@ -491,46 +489,43 @@ config OPTION_EGLIBC_LOCALE_CODE
+ Furthermore, only the LC_CTYPE and LC_TIME categories of the
+ standard "C" locale are available.
+
+- The OPTION_EGLIBC_CATGETS option group depends on this option
+- group; if you disable OPTION_EGLIBC_LOCALE_CODE, you must also
+- disable OPTION_EGLIBC_CATGETS.
++ The EGLIBC_CATGETS option group depends on this option group.
++
+
+-config OPTION_EGLIBC_MEMUSAGE
++config EGLIBC_MEMUSAGE
+ bool "Memory profiling library"
+ help
+ This option group includes the `libmemusage' library and
+ the `memusage' and `memusagestat' utilities.
+ These components provide memory profiling functions.
+
+- OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
++ EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+
+ Libmemusage library buffers the profiling data in memory
+ before writing it out to disk. By default, the library
+ allocates 1.5M buffer, which can be substantial for some
+- systems. OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
++ systems. EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE option
+ allows to change the default buffer size. It specifies
+ the number of entries the buffer should have.
+ On most architectures one buffer entry amounts to 48 bytes,
+ so setting this option to the value of 512 will reduce the size of
+ the memory buffer to 24K.
+
+-config OPTION_EGLIBC_NIS
++config EGLIBC_NIS
+ bool "Support for NIS, NIS+, and the special 'compat' services."
+- depends OPTION_EGLIBC_INET
+- depends OPTION_EGLIBC_SUNRPC
++ depends on EGLIBC_INET && EGLIBC_SUNRPC
+ help
+ This option group includes the NIS, NIS+, and 'compat' Name
+ Service Switch service libraries. When it is disabled, those
+ services libraries are not installed; you should remove any
+ references to them from your 'nsswitch.conf' file.
+
+- This option group depends on the OPTION_EGLIBC_INET option
++ This option group depends on the EGLIBC_INET option
+ group; you must enable that to enable this option group.
+
+-config OPTION_EGLIBC_NSSWITCH
++config EGLIBC_NSSWITCH
+ bool "Name service switch (nsswitch) support"
+ help
+-
+ This option group includes support for the 'nsswitch' facility.
+ With this option group enabled, all EGLIBC functions for
+ accessing various system databases (passwords and groups;
+@@ -544,12 +539,12 @@ config OPTION_EGLIBC_NSSWITCH
+ 'option-groups.config' file must set the following two
+ variables:
+
+- OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
++ EGLIBC_NSSWITCH_FIXED_CONFIG
+
+ Set this to the name of a file whose contents observe the
+ same syntax as an ordinary '/etc/nsswitch.conf' file. The
+ EGLIBC build process parses this file just as EGLIBC would
+- at run time if OPTION_EGLIBC_NSSWITCH were enabled, and
++ at run time if EGLIBC_NSSWITCH were enabled, and
+ produces a C library that uses the nsswitch service
+ libraries to search for database entries as this file
+ specifies, instead of consulting '/etc/nsswitch.conf' at run
+@@ -567,7 +562,7 @@ config OPTION_EGLIBC_NSSWITCH
+ you will probably want to delete references to databases not
+ needed on your system.
+
+- OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS
++ EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+
+ The EGLIBC build process uses this file to decide which
+ functions to make available from which service libraries.
+@@ -585,28 +580,28 @@ config OPTION_EGLIBC_NSSWITCH
+ Be sure to mention each function in each service you wish to
+ use. If you do not mention a service's function here, the
+ EGLIBC database access functions will not find it, even if
+- it is listed in the OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG
++ it is listed in the EGLIBC_NSSWITCH_FIXED_CONFIG
+ file.
+
+- In this arrangement, EGLIBC will not use the 'dlopen' and
+- 'dlsym' functions to find database access functions. Instead,
+- libc hard-codes references to the service libraries' database
+- access functions. You must explicitly link your program
+- against the name service libraries (those whose names start
+- with 'libnss_', in the sysroot's '/lib' directory) whose
+- functions you intend to use. This arrangement helps
+- system-wide static analysis tools decide which functions a
+- system actually uses.
+-
+- Note that some nsswitch service libraries require other option
+- groups to be enabled; for example, the OPTION_EGLIBC_INET
+- option group must be enabled to use the 'libnss_dns.so.2'
+- service library, which uses the Domain Name System network
+- protocol to answer queries.
++ In this arrangement, EGLIBC will not use the 'dlopen' and
++ 'dlsym' functions to find database access functions. Instead,
++ libc hard-codes references to the service libraries' database
++ access functions. You must explicitly link your program
++ against the name service libraries (those whose names start
++ with 'libnss_', in the sysroot's '/lib' directory) whose
++ functions you intend to use. This arrangement helps
++ system-wide static analysis tools decide which functions a
++ system actually uses.
++
++ Note that some nsswitch service libraries require other option
++ groups to be enabled; for example, the EGLIBC_INET
++ option group must be enabled to use the 'libnss_dns.so.2'
++ service library, which uses the Domain Name System network
++ protocol to answer queries.
+
+-config OPTION_EGLIBC_RCMD
++config EGLIBC_RCMD
+ bool "Support for 'rcmd' and related library functions"
+- depends OPTION_EGLIBC_INET
++ depends on EGLIBC_INET
+ help
+ This option group includes functions for running commands on
+ remote machines via the 'rsh' protocol, and doing authentication
+@@ -622,7 +617,7 @@ config OPTION_EGLIBC_RCMD
+ rresvport ruserpass
+ rresvport_af
+
+-config OPTION_EGLIBC_RTLD_DEBUG
++config EGLIBC_RTLD_DEBUG
+ bool "Runtime linker debug print outs"
+ help
+ This option group enables debug output of the runtime linker
+@@ -633,7 +628,7 @@ config OPTION_EGLIBC_RTLD_DEBUG
+ the `ldd' utility which may also be used by the prelinker.
+ In particular, the `--unused' ldd option will not work correctly.
+
+-config OPTION_EGLIBC_SPAWN
++config EGLIBC_SPAWN
+ bool "Support for POSIX posix_spawn functions"
+ help
+ This option group includes the POSIX functions for executing
+@@ -669,7 +664,7 @@ config OPTION_EGLIBC_SPAWN
+ disabled, those programs will only operate on uncompressed
+ charmap files.
+
+-config OPTION_EGLIBC_STREAMS
++config EGLIBC_STREAMS
+ bool "Support for accessing STREAMS."
+ help
+ This option group includes functions for reading and writing
+@@ -685,14 +680,14 @@ config OPTION_EGLIBC_STREAMS
+ isastream fdetach
+ putmsg
+
+-config OPTION_EGLIBC_SUNRPC
++config EGLIBC_SUNRPC
+ bool "Support for the Sun 'RPC' protocol."
+- depends OPTION_EGLIBC_INET
++ depends on EGLIBC_INET
+ help
+ This option group includes support for the Sun RPC protocols,
+ including the 'rpcgen' and 'rpcinfo' programs.
+
+-config OPTION_EGLIBC_UTMP
++config EGLIBC_UTMP
+ bool "Older access functions for 'utmp' login records"
+ help
+ This option group includes the older 'utent' family of
+@@ -719,9 +714,9 @@ config OPTION_EGLIBC_UTMP
+
+ libutil.so (and libutil.a)
+
+-config OPTION_EGLIBC_UTMPX
++config EGLIBC_UTMPX
+ bool "POSIX access functions for 'utmp' login records"
+- depends OPTION_EGLIBC_UTMP
++ depends on EGLIBC_UTMP
+ help
+ This option group includes the POSIX functions for reading and
+ writing user login records in the 'utmp' file (usually
+@@ -742,21 +737,21 @@ config OPTION_EGLIBC_UTMPX
+ updwtmpx
+ utmpxname
+
+-config OPTION_EGLIBC_WORDEXP
++config EGLIBC_WORDEXP
+ bool "Shell-style word expansion"
+ help
+ This option group includes the 'wordexp' function for
+ performing word expansion in the manner of the shell, and the
+ accompanying 'wordfree' function.
+
+-config OPTION_POSIX_C_LANG_WIDE_CHAR
++config POSIX_C_LANG_WIDE_CHAR
+ bool "ISO C library wide character functions, excluding I/O"
+ help
+ This option group includes the functions defined by the ISO C
+ standard for working with wide and multibyte characters in
+ memory. Functions for reading and writing wide and multibyte
+ characters from and to files call in the
+- OPTION_POSIX_WIDE_CHAR_DEVICE_IO option group.
++ POSIX_WIDE_CHAR_DEVICE_IO option group.
+
+ This option group includes the following functions:
+
+@@ -778,14 +773,14 @@ config OPTION_POSIX_C_LANG_WIDE_CHAR
+ mbrlen wcscoll wcstol
+ mbrtowc wcscpy wcstold
+
+-config OPTION_POSIX_REGEXP
++config POSIX_REGEXP
+ bool "Regular expressions"
+ help
+ This option group includes the POSIX regular expression
+ functions, and the associated non-POSIX extensions and
+ compatibility functions.
+
+- With OPTION_POSIX_REGEXP disabled, the following functions are
++ With POSIX_REGEXP disabled, the following functions are
+ omitted from libc:
+
+ re_comp re_max_failures regcomp
+@@ -799,9 +794,9 @@ config OPTION_POSIX_REGEXP
+ <regexp.h> header file, 'compile', 'step', and 'advance', is
+ omitted.
+
+-config OPTION_POSIX_REGEXP_GLIBC
++config POSIX_REGEXP_GLIBC
+ bool "Regular expressions from GLIBC"
+- depends OPTION_POSIX_REGEXP
++ depends on POSIX_REGEXP
+ help
+ This option group specifies which regular expression
+ library to use. The choice is between regex
+@@ -810,9 +805,9 @@ config OPTION_POSIX_REGEXP_GLIBC
+ optimized for speed; regex from libiberty is more than twice
+ as small while still is enough for most practical purposes.
+
+-config OPTION_POSIX_WIDE_CHAR_DEVICE_IO
++config POSIX_WIDE_CHAR_DEVICE_IO
+ bool "Input and output functions for wide characters"
+- depends OPTION_POSIX_C_LANG_WIDE_CHAR
++ depends on POSIX_C_LANG_WIDE_CHAR
+ help
+ This option group includes functions for reading and writing
+ wide characters to and from <stdio.h> streams.
+Index: libc/Makefile
+===================================================================
+--- libc.orig/Makefile
++++ libc/Makefile
+@@ -24,6 +24,7 @@ endif
+
+ include Makeconfig
+
++include options-config/Makefile
+
+ # This is the default target; it makes everything except the tests.
+ .PHONY: all
+Index: libc/configure
+===================================================================
+--- libc.orig/configure
++++ libc/configure
+@@ -621,6 +621,7 @@ KSH
+ libc_cv_have_bash2
+ BASH_SHELL
+ libc_cv_gcc_static_libgcc
++KCONFIG_TOOLS
+ CXX_SYSINCLUDES
+ SYSINCLUDES
+ AUTOCONF
+@@ -734,6 +735,7 @@ with_fp
+ with_binutils
+ with_selinux
+ with_headers
++with_kconfig
+ with_default_link
+ enable_sanity_checks
+ enable_shared
+@@ -1438,6 +1440,9 @@ Optional Packages:
+ --with-selinux if building with SELinux support
+ --with-headers=PATH location of system headers to use (for example
+ /usr/src/linux/include) [default=compiler default]
++ --with-kconfig=PATH location of kconfig tools to use (from Linux kernel
++ builds) to re-use for configuring EGLIBC option
++ groups
+ --with-default-link do not use explicit linker scripts
+ --with-cpu=CPU select code for CPU variant
+
+@@ -3401,6 +3406,14 @@ fi
+
+
+
++# Check whether --with-kconfig was given.
++if test "${with_kconfig+set}" = set; then
++ withval=$with_kconfig; KCONFIG_TOOLS=$withval
++else
++ KCONFIG_TOOLS=''
++fi
++
++
+
+ # Check whether --with-default-link was given.
+ if test "${with_default_link+set}" = set; then :
+Index: libc/EGLIBC.option-groups
+===================================================================
+--- libc.orig/EGLIBC.option-groups
++++ libc/EGLIBC.option-groups
+@@ -56,33 +56,9 @@ disable option groups one by one, until
+
+ The Option Groups
+
+-EGLIBC currently implements the following option groups, also
+-documented in the file 'option-groups.def':
+-
+-OPTION_EGLIBC_CATGETS
+- This option group includes functions for accessing message
+- catalogs: catopen, catclose, and catgets.
+-
+-OPTION_EGLIBC_LOCALES
+- This option group includes all locale definitions other than
+- those for the "C" locale. If this option group is omitted, then
+- only the "C" locale is supported.
+-
+-OPTION_EGLIBC_LIBM
+- This option group includes the 'libm' library, containing
+- mathematical functions. If this option group is omitted, then
+- an EGLIBC installation does not include shared or unshared versions
+- of the math library.
+-
+- Note that this does not remove all floating-point related
+- functionality from EGLIBC; for example, 'printf' and 'scanf'
+- can still print and read floating-point values with this option
+- group disabled.
+-
+- Note that the ISO Standard C++ library 'libstdc++' depends on
+- EGLIBC's math library 'libm'. If you disable this option
+- group, you will not be able to build 'libstdc++' against the
+- resulting EGLIBC installation.
++To see the current full list of implemented option groups, refer to the
++file 'option-groups.def' at the top of the source tree, or run
++'make menuconfig' from the top-level build directory.
+
+ The POSIX.1-2001 specification includes a suggested partition of all
+ the functions in the POSIX C API into option groups: math functions
+@@ -110,6 +86,18 @@ data, but include mathematical functions
+ OPTION_EGLIBC_LOCALES = n
+ OPTION_EGLIBC_LIBM = y
+
++Like the Linux kernel, EGLIBC supports a similar set of '*config' make
++targets to make it easier to create 'option-groups.config', with all
++dependencies between option groups automatically satisfied. Run
++'make help' to see the list of supported make config targets. For
++example, 'make menuconfig' will update the current config utilising a
++menu based program.
++
++The option group names and their type (boolean, int, hex, string), help
++description, and dependencies with other option groups, are described by
++'option-groups.def' at the top of the source tree, analogous to the
++'Kconfig' files in the Linux kernel.
++
+ In general, each option group variable controls whether a given set of
+ object files in EGLIBC is compiled and included in the final
+ libraries, or omitted from the build.
+@@ -132,22 +120,3 @@ under development.
+
+ We have used the system to subset some portions of EGLIBC's
+ functionality. It needs to be extended to cover more of the library.
+-
+-At the moment, EGLIBC performs no sanity checks on the contents of
+-'option-groups.config'; if an option group's name is mistyped, the
+-option group is silently included in the build. EGLIBC should check
+-that all variables set in 'option-groups.config' are proper option
+-group names, and that their values are appropriate.
+-
+-Some portions of EGLIBC depend on others; for example, the Sun Remote
+-Procedure Call functions in 'sunrpc' depend on the networking
+-functions in 'inet'. The sanity checking described above should check
+-that the selection configuration satisfies dependencies within EGLIBC,
+-and produce a legible error message if it does not. At the moment,
+-inconsistent configurations produce link errors late in the build
+-process.
+-
+-The Linux kernel's configuration system provides interactive
+-interfaces for creating and modifying configuration files (which also
+-perform the sanity checking and dependency tracking described above).
+-EGLIBC should provide similar interfaces.
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
new file mode 100644
index 0000000..a8463ea
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch
@@ -0,0 +1,36 @@
+From 713d822908d1b2ae8403af7f9375c7054ed3dd49 Mon Sep 17 00:00:00 2001
+From: Ting Liu <b28495@freescale.com>
+Date: Wed, 19 Dec 2012 04:39:57 -0600
+Subject: [PATCH] eglibc: run libm-err-tab.pl with specific dirs in ${S}
+
+libm-err-tab.pl will parse all the files named "libm-test-ulps"
+in the given dir recursively. To avoid parsing the one in
+${S}/.pc/ (it does exist after eglibc adds aarch64 support,
+${S}/.pc/aarch64-0001-glibc-fsf-v1-eaf6f205.patch/ports/sysdeps/
+aarch64/libm-test-ulps), run libm-err-tab.pl with specific dirs
+in ${S}.
+
+Upstream-Status: inappropriate [OE specific]
+
+Signed-off-by: Ting Liu <b28495@freescale.com>
+---
+ manual/Makefile | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/manual/Makefile b/manual/Makefile
+index 6fddff0..7af242e 100644
+--- a/manual/Makefile
++++ b/manual/Makefile
+@@ -109,7 +109,8 @@ $(objpfx)libm-err.texi: $(objpfx)stamp-libm-err
+ $(objpfx)stamp-libm-err: libm-err-tab.pl $(wildcard $(foreach dir,$(sysdirs),\
+ $(dir)/libm-test-ulps))
+ pwd=`pwd`; \
+- $(PERL) $< $$pwd/.. > $(objpfx)libm-err-tmp
++ $(PERL) $< $$pwd/../ports > $(objpfx)libm-err-tmp
++ $(PERL) $< $$pwd/../sysdeps >> $(objpfx)libm-err-tmp
+ $(move-if-change) $(objpfx)libm-err-tmp $(objpfx)libm-err.texi
+ touch $@
+
+--
+1.7.9.7
+
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch
new file mode 100644
index 0000000..7caba48
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0002-eglibc-menuconfig-hex-string-options.patch
@@ -0,0 +1,169 @@
+pulled from
+
+http://www.eglibc.org/archives/patches/msg01043.html
+
+
+Upstream-Status: Pending
+Signed-off-by: Khem
+
+
+This patch builds on the menuconfig patch for EGLIBC.
+
+
+There are a few options that have non-boolean types, that would benefit from the new 'make *config' support:
+
+EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE (int)
+EGLIBC_NSSWITCH_FIXED_CONFIG (string)
+EGLIBC_NSSWITCH_FIXED_FUNCTIONS (string)
+
+
+The patch converts these to real options in libc/option-groups.def. Also, libc/scripts/option-groups.awk is modified to output a '#define' line for int, hex, or string options encountered in the config file.
+
+In the post-processing script config-postproc.pl, a small change is needed: for any boolean option FOO that is implicitly disabled in the kconfig output, make sure that option is indeed a boolean before printing the explicit OPTION_FOO=n.
+
+Finally, libc/malloc/Makefile passes __OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE as a CPPFLAGS, which is not necessary anymore because this macro will now be present in the generated header.
+
+attached is the updated patch to address above issues.
+
+Steve
+
+--
+Steve Longerbeam | Senior Embedded Engineer, ESD Services
+Mentor Embedded(tm) | 46871 Bayside Parkway, Fremont, CA 94538
+P 510.354.5838 | M 408.410.2735
+Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
+
+
+Index: libc/malloc/Makefile
+===================================================================
+--- libc.orig/malloc/Makefile 2012-01-04 22:06:18.000000000 -0800
++++ libc/malloc/Makefile 2012-05-09 19:35:28.598682105 -0700
+@@ -48,10 +48,6 @@
+ ifeq ($(OPTION_EGLIBC_MEMUSAGE),y)
+ extra-libs = libmemusage
+ extra-libs-others = $(extra-libs)
+-
+-ifdef OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+-CPPFLAGS-memusage += -D__OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE=$(OPTION_EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE)
+-endif
+ endif
+
+ libmemusage-routines = memusage
+Index: libc/option-groups.def
+===================================================================
+--- libc.orig/option-groups.def 2012-05-09 19:33:48.398677256 -0700
++++ libc/option-groups.def 2012-05-09 19:35:28.610682107 -0700
+@@ -513,8 +513,11 @@
+ the `memusage' and `memusagestat' utilities.
+ These components provide memory profiling functions.
+
+- EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
+-
++config EGLIBC_MEMUSAGE_DEFAULT_BUFFER_SIZE
++ int "Memory profiling library buffer size"
++ depends on EGLIBC_MEMUSAGE
++ default "32768"
++ help
+ Libmemusage library buffers the profiling data in memory
+ before writing it out to disk. By default, the library
+ allocates 1.5M buffer, which can be substantial for some
+@@ -553,8 +556,11 @@
+ 'option-groups.config' file must set the following two
+ variables:
+
+- EGLIBC_NSSWITCH_FIXED_CONFIG
+-
++config EGLIBC_NSSWITCH_FIXED_CONFIG
++ string "Nsswitch fixed config filename"
++ depends on !EGLIBC_NSSWITCH
++ default ""
++ help
+ Set this to the name of a file whose contents observe the
+ same syntax as an ordinary '/etc/nsswitch.conf' file. The
+ EGLIBC build process parses this file just as EGLIBC would
+@@ -576,8 +582,11 @@
+ you will probably want to delete references to databases not
+ needed on your system.
+
+- EGLIBC_NSSWITCH_FIXED_FUNCTIONS
+-
++config EGLIBC_NSSWITCH_FIXED_FUNCTIONS
++ string "Nsswitch fixed functions filename"
++ depends on !EGLIBC_NSSWITCH
++ default ""
++ help
+ The EGLIBC build process uses this file to decide which
+ functions to make available from which service libraries.
+ The file 'nss/fixed-nsswitch.functions' serves as a sample
+Index: libc/options-config/config-postproc.pl
+===================================================================
+--- libc.orig/options-config/config-postproc.pl 2012-05-09 19:33:36.530676681 -0700
++++ libc/options-config/config-postproc.pl 2012-05-09 19:35:28.610682107 -0700
+@@ -8,7 +8,7 @@
+ die "Could not open $ARGV[0]" unless -T $ARGV[0];
+
+ sub yank {
+- @option = grep($_ ne $_[0], @option);
++ @option = grep(!($_ =~ /$_[0]\s*=/), @option);
+ }
+
+ open(DEFAULTS, $defaults) || die "Could not open $defaults\n";
+@@ -16,7 +16,7 @@
+ # get the full list of available options using the default config file
+ $i = 0;
+ while (<DEFAULTS>) {
+- if (/^\s*OPTION_(\w+)\s*=/) {
++ if (/^\s*OPTION_(\w+\s*=.*$)/) {
+ $option[$i++] = $1;
+ }
+ }
+@@ -35,8 +35,9 @@
+ s/CONFIG_/OPTION_/g;
+ print;
+ } elsif (/^\s*#\s+CONFIG_(\w+) is not set/) {
+- # this is a comment line, change CONFIG_ to OPTION_, remove this
+- # option from option list, and convert to explicit OPTION_FOO=n
++ # this is a comment line for an unset boolean option, change CONFIG_
++ # to OPTION_, remove this option from option list, and convert to
++ # explicit OPTION_FOO=n
+ $opt = $1;
+ yank($opt);
+ s/CONFIG_/OPTION_/g;
+@@ -46,9 +47,12 @@
+ }
+ }
+
+-# any options left in @options, are options that were not mentioned in
++# any boolean options left in @options, are options that were not mentioned in
+ # the config file, and implicitly that means the option must be set =n,
+ # so do that here.
+ foreach $opt (@option) {
+- print "OPTION_$opt=n\n";
++ if ($opt =~ /=\s*[yn]/) {
++ $opt =~ s/=\s*[yn]/=n/;
++ print "OPTION_$opt\n";
++ }
+ }
+Index: libc/scripts/option-groups.awk
+===================================================================
+--- libc.orig/scripts/option-groups.awk 2012-01-04 22:06:00.000000000 -0800
++++ libc/scripts/option-groups.awk 2012-05-09 19:35:28.610682107 -0700
+@@ -46,9 +46,15 @@
+ print "#define __" var " 1"
+ else if (vars[var] == "n")
+ print "/* #undef __" var " */"
+- # Ignore variables that don't have boolean values.
+- # Ideally, this would be driven by the types given in
+- # option-groups.def.
++ else if (vars[var] ~ /^[0-9]+/ ||
++ vars[var] ~ /^0x[0-9aAbBcCdDeEfF]+/ ||
++ vars[var] ~ /^\"/)
++ print "#define __" var " " vars[var]
++ else
++ print "/* #undef __" var " */"
++ # Ignore variables that don't have boolean, int, hex, or
++ # string values. Ideally, this would be driven by the types
++ # given in option-groups.def.
+ }
+ }
+
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch
new file mode 100644
index 0000000..d137f5b
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/0003-eglibc-menuconfig-build-instructions.patch
@@ -0,0 +1,176 @@
+Pulled from
+
+http://www.eglibc.org/archives/patches/msg01035.html
+
+Upstream-Status: Pending
+Signed-off-by: Khem
+
+As part of the menuconfig development, I encountered some outdated information in the cross-build instructions, libc/EGLIBC.cross-building. This patch updates the file with new (and tested) instructions. It is unrelated to the menuconfig support, but applies after.
+
+My testing was done with an ARM target, and an x86_64 Linux host, so I converted the instructions to use those host/target types from the original i686/powerpc. Hope that's ok.
+
+
+Thanks,
+
+--
+Steve Longerbeam | Senior Embedded Engineer, ESD Services
+Mentor Embedded(tm) | 46871 Bayside Parkway, Fremont, CA 94538
+P 510.354.5838 | M 408.410.2735
+Nucleus(r) | Linux(r) | Android(tm) | Services | UI | Multi-OS
+
+
+ EGLIBC.cross-building | 59 +++++++++++++++++++++++++++++---------------------
+ 1 file changed, 35 insertions(+), 24 deletions(-)
+
+Index: libc/EGLIBC.cross-building
+===================================================================
+--- libc.orig/EGLIBC.cross-building 2012-05-09 19:33:36.522676681 -0700
++++ libc/EGLIBC.cross-building 2012-05-09 19:36:13.918684298 -0700
+@@ -47,31 +47,34 @@
+ EGLIBC requires recent versions of the GNU binutils, GCC, and the
+ Linux kernel. The web page <http://www.eglibc.org/prerequisites>
+ documents the current requirements, and lists patches needed for
+-certain target architectures. As of this writing, EGLIBC required
+-binutils 2.17, GCC 4.1, and Linux 2.6.19.1.
++certain target architectures. As of this writing, these build
++instructions have been tested with binutils 2.22.51, GCC 4.6.2,
++and Linux 3.1.
+
+ First, let's set some variables, to simplify later commands. We'll
+-build EGLIBC and GCC for a PowerPC target, known to the Linux kernel
+-as 'powerpc', and we'll do the build on an Intel Linux box:
++build EGLIBC and GCC for an ARM target, known to the Linux kernel
++as 'arm', and we'll do the build on an Intel x86_64 Linux box:
+
+- $ build=i686-pc-linux-gnu
++ $ build=x86_64-pc-linux-gnu
+ $ host=$build
+- $ target=powerpc-none-linux-gnu
+- $ linux_arch=powerpc
++ $ target=arm-none-linux-gnueabi
++ $ linux_arch=arm
+
+ We're using the aforementioned versions of Binutils, GCC, and Linux:
+
+- $ binutilsv=binutils-2.17
+- $ gccv=gcc-4.1.1
+- $ linuxv=linux-2.6.20
++ $ binutilsv=binutils-2.22.51
++ $ gccv=gcc-4.6.2
++ $ linuxv=linux-3.1
+
+ We're carrying out the entire process under '~/cross-build', which
+-contains unpacked source trees:
++contains unpacked source trees for binutils, gcc, and linux kernel,
++along with EGLIBC svn trunk (which can be checked-out with
++'svn co http://www.eglibc.org/svn/trunk eglibc'):
+
+- $ top=$HOME/cross-build/ppc
++ $ top=$HOME/cross-build/$target
+ $ src=$HOME/cross-build/src
+ $ ls $src
+- binutils-2.17 gcc-4.1.1 libc linux-2.6.20
++ binutils-2.22.51 eglibc gcc-4.6.2 linux-3.1
+
+ We're going to place our build directories in a subdirectory 'obj',
+ we'll install the cross-development toolchain in 'tools', and we'll
+@@ -99,7 +102,7 @@
+
+ The First GCC
+
+-For our work, we need a cross-compiler targeting a PowerPC Linux
++For our work, we need a cross-compiler targeting an ARM Linux
+ system. However, that configuration includes the shared library
+ 'libgcc_s.so', which is compiled against the EGLIBC headers (which we
+ haven't installed yet) and linked against 'libc.so' (which we haven't
+@@ -125,7 +128,8 @@
+ > --prefix=$tools \
+ > --without-headers --with-newlib \
+ > --disable-shared --disable-threads --disable-libssp \
+- > --disable-libgomp --disable-libmudflap \
++ > --disable-libgomp --disable-libmudflap --disable-libquadmath \
++ > --disable-decimal-float --disable-libffi \
+ > --enable-languages=c
+ $ PATH=$tools/bin:$PATH make
+ $ PATH=$tools/bin:$PATH make install
+@@ -162,12 +166,13 @@
+ > CXX=$tools/bin/$target-g++ \
+ > AR=$tools/bin/$target-ar \
+ > RANLIB=$tools/bin/$target-ranlib \
+- > $src/libc/configure \
++ > $src/eglibc/libc/configure \
+ > --prefix=/usr \
+ > --with-headers=$sysroot/usr/include \
+ > --build=$build \
+ > --host=$target \
+- > --disable-profile --without-gd --without-cvs --enable-add-ons
++ > --disable-profile --without-gd --without-cvs \
++ > --enable-add-ons=nptl,libidn,../ports
+
+ The option '--prefix=/usr' may look strange, but you should never
+ configure EGLIBC with a prefix other than '/usr': in various places,
+@@ -181,6 +186,11 @@
+ The '--with-headers' option tells EGLIBC where the Linux headers have
+ been installed.
+
++The '--enable-add-ons=nptl,libidn,../ports' option tells EGLIBC to look
++for the listed glibc add-ons. Most notably the ports add-on (located
++just above the libc sources in the EGLIBC svn tree) is required to
++support ARM targets.
++
+ We can now use the 'install-headers' makefile target to install the
+ headers:
+
+@@ -223,6 +233,7 @@
+ > --prefix=$tools \
+ > --with-sysroot=$sysroot \
+ > --disable-libssp --disable-libgomp --disable-libmudflap \
++ > --disable-libffi --disable-libquadmath \
+ > --enable-languages=c
+ $ PATH=$tools/bin:$PATH make
+ $ PATH=$tools/bin:$PATH make install
+@@ -240,13 +251,14 @@
+ > CXX=$tools/bin/$target-g++ \
+ > AR=$tools/bin/$target-ar \
+ > RANLIB=$tools/bin/$target-ranlib \
+- > $src/libc/configure \
++ > $src/eglibc/libc/configure \
+ > --prefix=/usr \
+ > --with-headers=$sysroot/usr/include \
+ > --with-kconfig=$obj/linux/scripts/kconfig \
+ > --build=$build \
+ > --host=$target \
+- > --disable-profile --without-gd --without-cvs --enable-add-ons
++ > --disable-profile --without-gd --without-cvs \
++ > --enable-add-ons=nptl,libidn,../ports
+
+ Note the additional '--with-kconfig' option. This tells EGLIBC where to
+ find the host config tools used by the kernel 'make config' and 'make
+@@ -337,15 +349,15 @@
+ ELF Header:
+ ...
+ Type: EXEC (Executable file)
+- Machine: PowerPC
++ Machine: ARM
+
+ ...
+ Program Headers:
+ Type Offset VirtAddr PhysAddr FileSiz MemSiz Flg Align
+ PHDR 0x000034 0x10000034 0x10000034 0x00100 0x00100 R E 0x4
+- INTERP 0x000134 0x10000134 0x10000134 0x0000d 0x0000d R 0x1
+- [Requesting program interpreter: /lib/ld.so.1]
+- LOAD 0x000000 0x10000000 0x10000000 0x008f0 0x008f0 R E 0x10000
++ INTERP 0x000134 0x00008134 0x00008134 0x00013 0x00013 R 0x1
++ [Requesting program interpreter: /lib/ld-linux.so.3]
++ LOAD 0x000000 0x00008000 0x00008000 0x0042c 0x0042c R E 0x8000
+ ...
+
+ Looking at the dynamic section of the installed 'libgcc_s.so', we see
+@@ -357,7 +369,6 @@
+ Dynamic section at offset 0x1083c contains 24 entries:
+ Tag Type Name/Value
+ 0x00000001 (NEEDED) Shared library: [libc.so.6]
+- 0x00000001 (NEEDED) Shared library: [ld.so.1]
+ 0x0000000e (SONAME) Library soname: [libgcc_s.so.1]
+ ...
+
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch
new file mode 100644
index 0000000..7258c82
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/GLRO_dl_debug_mask.patch
@@ -0,0 +1,143 @@
+Its controlled by __OPTION_EGLIBC_RTLD_DEBUG
+so we should use GLRO_dl_debug_mask
+
+Singed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Upstream-Status: Pending
+Index: libc/elf/dl-open.c
+===================================================================
+--- libc.orig/elf/dl-open.c 2012-10-25 10:18:12.000000000 -0700
++++ libc/elf/dl-open.c 2013-01-09 11:49:02.635577870 -0800
+@@ -155,7 +155,7 @@
+ ns->_ns_main_searchlist->r_list[new_nlist++] = map;
+
+ /* We modify the global scope. Report this. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
+ _dl_debug_printf ("\nadd %s [%lu] to global scope\n",
+ map->l_name, map->l_ns);
+ }
+@@ -298,7 +298,7 @@
+ LIBC_PROBE (map_complete, 3, args->nsid, r, new);
+
+ /* Print scope information. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
+ _dl_show_scope (new, 0);
+
+ /* Only do lazy relocation if `LD_BIND_NOW' is not set. */
+@@ -515,7 +515,7 @@
+ }
+
+ /* Print scope information. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
+ _dl_show_scope (imap, from_scope);
+ }
+
+Index: libc/ports/sysdeps/mips/dl-lookup.c
+===================================================================
+--- libc.orig/ports/sysdeps/mips/dl-lookup.c 2012-08-17 12:39:53.000000000 -0700
++++ libc/ports/sysdeps/mips/dl-lookup.c 2013-01-09 11:49:02.635577870 -0800
+@@ -111,7 +111,7 @@
+ continue;
+
+ /* Print some debugging info if wanted. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SYMBOLS, 0))
+ _dl_debug_printf ("symbol=%s; lookup in file=%s [%lu]\n",
+ undef_name,
+ map->l_name[0] ? map->l_name : rtld_progname,
+@@ -432,7 +432,7 @@
+ hash table. */
+ if (__builtin_expect (tab->size, 0))
+ {
+- assert (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK);
++ assert (GLRO_dl_debug_mask & DL_DEBUG_PRELINK);
+ __rtld_lock_unlock_recursive (tab->lock);
+ goto success;
+ }
+@@ -681,7 +681,7 @@
+ }
+
+ /* Display information if we are debugging. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0))
+ _dl_debug_printf ("\
+ \nfile=%s [%lu]; needed by %s [%lu] (relocation dependency)\n\n",
+ map->l_name[0] ? map->l_name : rtld_progname,
+@@ -788,7 +788,7 @@
+ {
+ if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
+ && skip_map == NULL
+- && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
++ && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED))
+ {
+ /* We could find no value for a strong reference. */
+ const char *reference_name = undef_map ? undef_map->l_name : "";
+@@ -861,7 +861,7 @@
+ if (__builtin_expect (current_value.m->l_used == 0, 0))
+ current_value.m->l_used = 1;
+
+- if (__builtin_expect (GLRO(dl_debug_mask)
++ if (__builtin_expect (GLRO_dl_debug_mask
+ & (DL_DEBUG_BINDINGS|DL_DEBUG_PRELINK), 0))
+ _dl_debug_bindings (undef_name, undef_map, ref,
+ &current_value, version, type_class, protected);
+@@ -926,7 +926,7 @@
+ {
+ const char *reference_name = undef_map->l_name;
+
+- if (GLRO(dl_debug_mask) & DL_DEBUG_BINDINGS)
++ if (GLRO_dl_debug_mask & DL_DEBUG_BINDINGS)
+ {
+ _dl_debug_printf ("binding file %s [%lu] to %s [%lu]: %s symbol `%s'",
+ (reference_name[0]
+@@ -942,7 +942,7 @@
+ _dl_debug_printf_c ("\n");
+ }
+ #ifdef SHARED
+- if (GLRO(dl_debug_mask) & DL_DEBUG_PRELINK)
++ if (GLRO_dl_debug_mask & DL_DEBUG_PRELINK)
+ {
+ int conflict = 0;
+ struct sym_val val = { NULL, NULL };
+Index: libc/elf/rtld.c
+===================================================================
+--- libc.orig/elf/rtld.c 2012-10-10 08:35:46.000000000 -0700
++++ libc/elf/rtld.c 2013-01-09 11:49:02.635577870 -0800
+@@ -2118,7 +2118,7 @@
+ GLRO(dl_init_all_dirs) = GL(dl_all_dirs);
+
+ /* Print scope information. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_SCOPES, 0))
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_SCOPES, 0))
+ {
+ _dl_debug_printf ("\nInitial object scopes\n");
+
+Index: libc/elf/dl-lookup.c
+===================================================================
+--- libc.orig/elf/dl-lookup.c 2012-08-17 12:39:53.000000000 -0700
++++ libc/elf/dl-lookup.c 2013-01-09 11:49:02.635577870 -0800
+@@ -771,7 +771,7 @@
+ {
+ if ((*ref == NULL || ELFW(ST_BIND) ((*ref)->st_info) != STB_WEAK)
+ && skip_map == NULL
+- && !(GLRO(dl_debug_mask) & DL_DEBUG_UNUSED))
++ && !(GLRO_dl_debug_mask & DL_DEBUG_UNUSED))
+ {
+ /* We could find no value for a strong reference. */
+ const char *reference_name = undef_map ? undef_map->l_name : "";
+Index: libc/elf/get-dynamic-info.h
+===================================================================
+--- libc.orig/elf/get-dynamic-info.h 2012-12-02 13:11:45.000000000 -0800
++++ libc/elf/get-dynamic-info.h 2013-01-09 12:53:51.015657653 -0800
+@@ -157,7 +157,7 @@
+ them. Therefore to avoid breaking existing applications the
+ best we can do is add a warning during debugging with the
+ intent of notifying the user of the problem. */
+- if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)
++ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_FILES, 0)
+ && l->l_flags_1 & ~DT_1_SUPPORTED_MASK)
+ _dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n",
+ l->l_flags_1 & ~DT_1_SUPPORTED_MASK);
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch
new file mode 100644
index 0000000..cf58035
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/IO-acquire-lock-fix.patch
@@ -0,0 +1,17 @@
+import http://sourceware.org/ml/libc-ports/2007-12/msg00000.html
+
+Upstream-Status: Pending
+
+Index: libc/bits/stdio-lock.h
+===================================================================
+--- libc.orig/bits/stdio-lock.h 2009-10-28 14:34:19.000000000 -0700
++++ libc/bits/stdio-lock.h 2009-10-28 14:34:54.000000000 -0700
+@@ -50,6 +50,8 @@ __libc_lock_define_recursive (typedef, _
+ _IO_cleanup_region_start ((void (*) (void *)) _IO_funlockfile, (_fp)); \
+ _IO_flockfile (_fp)
+
++# define _IO_acquire_lock_clear_flags2(_fp) _IO_acquire_lock (_fp)
++
+ # define _IO_release_lock(_fp) \
+ _IO_funlockfile (_fp); \
+ _IO_cleanup_region_end (0)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch
new file mode 100644
index 0000000..f5023c0
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/add_resource_h_to_wait_h.patch
@@ -0,0 +1,20 @@
+The older versions of perf still require sys/resource.h to be
+present in this header, the newer version of perf in 3.2 and
+beyond directly include sys/resource.h
+
+Upstream-Status: Inapproriate [older kernel/perf specific]
+
+Signed-off-by: Saul Wold <sgw@linux.intel.com>
+
+Index: libc/posix/sys/wait.h
+===================================================================
+--- libc.orig/posix/sys/wait.h
++++ libc/posix/sys/wait.h
+@@ -28,6 +28,7 @@
+ __BEGIN_DECLS
+
+ #include <signal.h>
++#include <sys/resource.h>
+
+ /* These macros could also be defined in <stdlib.h>. */
+ #if !defined _STDLIB_H || (!defined __USE_XOPEN && !defined __USE_XOPEN2K8)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch
new file mode 100644
index 0000000..4313aa5
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc-svn-arm-lowlevellock-include-tls.patch
@@ -0,0 +1,21 @@
+In file included from ../nptl/sysdeps/unix/sysv/linux/libc-lowlevellock.c:21:
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c: In function '__lll_lock_wait_private':
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: warning: implicit declaration of function 'THREAD_GETMEM'
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'THREAD_SELF' undeclared (first use in this function)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: (Each undeclared identifier is reported only once
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: for each function it appears in.)
+../nptl/sysdeps/unix/sysv/linux/lowlevellock.c:34: error: 'header' undeclared (first use in this function)
+make[4]: *** [/var/tmp/portage/sys-libs/glibc-2.7-r1/work/build-default-armv4l-unknown-linux-gnu-nptl/nptl/rtld-libc-lowlevellock.os] Error 1
+
+Upstream-Status: Pending
+
+--- libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h.orig
++++ libc/ports/sysdeps/unix/sysv/linux/arm/nptl/lowlevellock.h
+@@ -25,6 +25,7 @@
+ #include <atomic.h>
+ #include <sysdep.h>
+ #include <kernel-features.h>
++#include <tls.h>
+
+ #define FUTEX_WAIT 0
+ #define FUTEX_WAKE 1
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch
new file mode 100644
index 0000000..bbf4605
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/eglibc_fix_findidx_parameters.patch
@@ -0,0 +1,38 @@
+Upstream-Status: backport
+
+Imported patch from: http://www.eglibc.org/archives/patches/msg01124.html
+
+Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/09
+
+Index: libc/posix/xregex.c
+===================================================================
+--- libc.orig/posix/xregex.c
++++ libc/posix/xregex.c
+@@ -2943,7 +2943,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ _NL_CURRENT (LC_COLLATE,
+ _NL_COLLATE_INDIRECTWC);
+
+- idx = findidx ((const wint_t**)&cp);
++ idx = findidx ((const wint_t**)&cp, -1);
+ if (idx == 0 || cp < (wint_t*) str + c1)
+ /* This is no valid character. */
+ FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -3392,7 +3392,7 @@ PREFIX(regex_compile) (const char *ARG_P
+ indirect = (const int32_t *)
+ _NL_CURRENT (LC_COLLATE, _NL_COLLATE_INDIRECTMB);
+
+- idx = findidx (&cp);
++ idx = findidx (&cp, -1);
+ if (idx == 0 || cp < str + c1)
+ /* This is no valid character. */
+ FREE_STACK_RETURN (REG_ECOLLATE);
+@@ -6363,7 +6363,7 @@ byte_re_match_2_internal (struct re_patt
+ }
+ str_buf[i] = TRANSLATE(*(d+i));
+ str_buf[i+1] = '\0'; /* sentinel */
+- idx2 = findidx ((const wint_t**)&cp);
++ idx2 = findidx ((const wint_t**)&cp, -1);
+ }
+
+ /* Update d, however d will be incremented at
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/etc/ld.so.conf
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch
new file mode 100644
index 0000000..2ca0bca
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fileops-without-wchar-io.patch
@@ -0,0 +1,22 @@
+Fix error like
+
+/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-eglibc/work/mips64-oe-linux/eglibc-2.16-r2+svnr19383/build-mips64-oe-linux/libc_pic.os: In function `_IO_new_file_fopen':
+/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-eglibc/work/mips64-oe-linux/eglibc-2.16-r2+svnr19383/eglibc-2_16/libc/libio/fileops.c:431: undefined reference to `_IO_file_close_it_internal'
+collect2: error: ld returned 1 exit status
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: libc/libio/fileops.c
+===================================================================
+--- libc.orig/libio/fileops.c 2012-07-04 18:25:47.000000000 -0700
++++ libc/libio/fileops.c 2012-07-24 00:21:17.220322557 -0700
+@@ -428,7 +428,7 @@
+ result->_mode = 1;
+ #else
+ /* Treat this as if we couldn't find the given character set. */
+- (void) INTUSE(_IO_file_close_it) (fp);
++ (void) _IO_file_close_it (fp);
+ __set_errno (EINVAL);
+ return NULL;
+ #endif
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch
new file mode 100644
index 0000000..25c43a9
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix-tibetian-locales.patch
@@ -0,0 +1,38 @@
+cross localedef fails to compile these locales because name_fmt field is empty
+It is not acceptable for cross localedef and it errors out
+
+LC_NAME: field `name_fmt' not defined
+
+We therefore give a dummy string to the format, the real fix needs some native
+tibetian person to define proper name_fmt
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: libc/localedata/locales/bo_CN
+===================================================================
+--- libc.orig/localedata/locales/bo_CN 2012-11-17 09:50:14.000000000 -0800
++++ libc/localedata/locales/bo_CN 2013-01-04 08:55:15.593612288 -0800
+@@ -145,7 +145,7 @@
+ LC_NAME
+ % FIXME
+
+-name_fmt ""
++name_fmt "FIXME"
+ % name_gen "FIXME"
+ % name_miss "FIXME"
+ % name_mr "FIXME"
+Index: libc/localedata/locales/bo_IN
+===================================================================
+--- libc.orig/localedata/locales/bo_IN 2012-11-17 09:50:14.000000000 -0800
++++ libc/localedata/locales/bo_IN 2013-01-04 08:54:12.345609028 -0800
+@@ -70,7 +70,7 @@
+
+ LC_NAME
+ % FIXME
+-name_fmt ""
++name_fmt "FIXME"
+ % name_gen "FIXME"
+ % name_miss "FIXME"
+ % name_mr "FIXME"
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
new file mode 100644
index 0000000..7618c99
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fix_for_centos_5.8.patch
@@ -0,0 +1,18 @@
+Upstream-Status: Inappropriate [other]
+
+This is a hack to fix building the locale bits on an older
+CentOs 5.X machine
+
+Index: eglibc-2_16/libc/locale/programs/config.h
+===================================================================
+--- eglibc-2_16.orig/libc/locale/programs/config.h
++++ eglibc-2_16/libc/locale/programs/config.h
+@@ -19,6 +19,8 @@
+ #ifndef _LD_CONFIG_H
+ #define _LD_CONFIG_H 1
+
++#define DUMMY_LOCALE_T
++
+ /* Use the internal textdomain used for libc messages. */
+ #define PACKAGE _libc_intl_domainname
+ #ifndef VERSION
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch
new file mode 100644
index 0000000..511ee9d
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/fsl-ppc-no-fsqrt.patch
@@ -0,0 +1,100 @@
+Create e5500 specific math_private.h and let it include when compiling for e5500/64bit core
+We prefefine __CPU_HAS_FSQRT to 0 and then in general ppc64 math_private.h we check if its
+already defined before redefining it. This way we can ensure that on e5500 builds it wont
+emit fsqrt intructions
+
+-Khem
+
+Upstream-Status: Pending
+
+Index: libc/sysdeps/powerpc/fpu/math_private.h
+===================================================================
+--- libc.orig/sysdeps/powerpc/fpu/math_private.h
++++ libc/sysdeps/powerpc/fpu/math_private.h
+@@ -25,10 +25,12 @@
+ #include <dl-procinfo.h>
+ #include_next <math_private.h>
+
+-# if __WORDSIZE == 64 || defined _ARCH_PWR4
+-# define __CPU_HAS_FSQRT 1
+-# else
+-# define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++# ifndef __CPU_HAS_FSQRT
++# if __WORDSIZE == 64 || defined _ARCH_PWR4
++# define __CPU_HAS_FSQRT 1
++# else
++# define __CPU_HAS_FSQRT ((GLRO(dl_hwcap) & PPC_FEATURE_64) != 0)
++# endif
+ # endif
+
+ extern double __slow_ieee754_sqrt (double);
+Index: libc/ports/sysdeps/powerpc/powerpc64/e5500/fpu/math_private.h
+===================================================================
+--- /dev/null
++++ libc/ports/sysdeps/powerpc/powerpc64/e5500/fpu/math_private.h
+@@ -0,0 +1,9 @@
++#ifndef _E5500_MATH_PRIVATE_H_
++#define _E5500_MATH_PRIVATE_H_ 1
++/* E5500 core FPU does not implement
++ fsqrt */
++
++#define __CPU_HAS_FSQRT 0
++#include_next <math_private.h>
++
++#endif /* _E5500_MATH_PRIVATE_H_ */
+Index: libc/ports/sysdeps/powerpc/powerpc64/e6500/fpu/math_private.h
+===================================================================
+--- /dev/null
++++ libc/ports/sysdeps/powerpc/powerpc64/e6500/fpu/math_private.h
+@@ -0,0 +1,9 @@
++#ifndef _E6500_MATH_PRIVATE_H_
++#define _E6500_MATH_PRIVATE_H_ 1
++/* E6500 core FPU does not implement
++ fsqrt */
++
++#define __CPU_HAS_FSQRT 0
++#include_next <math_private.h>
++
++#endif /* _E6500_MATH_PRIVATE_H_ */
+Index: libc/ports/sysdeps/powerpc/powerpc32/e500mc/fpu/math_private.h
+===================================================================
+--- /dev/null
++++ libc/ports/sysdeps/powerpc/powerpc32/e500mc/fpu/math_private.h
+@@ -0,0 +1,9 @@
++#ifndef _E500MC_MATH_PRIVATE_H_
++#define _E500MC_MATH_PRIVATE_H_ 1
++/* E500MC core FPU does not implement
++ fsqrt */
++
++#define __CPU_HAS_FSQRT 0
++#include_next <math_private.h>
++
++#endif /* _E500MC_MATH_PRIVATE_H_ */
+Index: libc/ports/sysdeps/powerpc/powerpc32/e5500/fpu/math_private.h
+===================================================================
+--- /dev/null
++++ libc/ports/sysdeps/powerpc/powerpc32/e5500/fpu/math_private.h
+@@ -0,0 +1,9 @@
++#ifndef _E5500_MATH_PRIVATE_H_
++#define _E5500_MATH_PRIVATE_H_ 1
++/* E5500 core FPU does not implement
++ fsqrt */
++
++#define __CPU_HAS_FSQRT 0
++#include_next <math_private.h>
++
++#endif /* _E5500_MATH_PRIVATE_H_ */
+Index: libc/ports/sysdeps/powerpc/powerpc32/e6500/fpu/math_private.h
+===================================================================
+--- /dev/null
++++ libc/ports/sysdeps/powerpc/powerpc32/e6500/fpu/math_private.h
+@@ -0,0 +1,9 @@
++#ifndef _E6500_MATH_PRIVATE_H_
++#define _E6500_MATH_PRIVATE_H_ 1
++/* E6500 core FPU does not implement
++ fsqrt */
++
++#define __CPU_HAS_FSQRT 0
++#include_next <math_private.h>
++
++#endif /* _E6500_MATH_PRIVATE_H_ */
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/generate-supported.mk b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/generate-supported.mk
new file mode 100644
index 0000000..d2a28c2
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/generate-supported.mk
@@ -0,0 +1,11 @@
+#!/usr/bin/make
+
+include $(IN)
+
+all:
+ rm -f $(OUT)
+ touch $(OUT)
+ for locale in $(SUPPORTED-LOCALES); do \
+ [ $$locale = true ] && continue; \
+ echo $$locale | sed 's,/, ,' >> $(OUT); \
+ done
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch
new file mode 100644
index 0000000..689b79c
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/glibc.fix_sqrt2.patch
@@ -0,0 +1,1516 @@
+Signed-of-by: Edmar Wienskoski <edmar@freescale.com>
+Upstream-Status: Pending
+
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+@@ -0,0 +1,134 @@
++/* Double-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float two108 = 3.245185536584267269e+32;
++static const float twom54 = 5.551115123125782702e-17;
++static const float half = 0.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the actual square root and half of its reciprocal
++ simultaneously. */
++
++#ifdef __STDC__
++double
++__ieee754_sqrt (double b)
++#else
++double
++__ieee754_sqrt (b)
++ double b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++ double y, g, h, d, r;
++ ieee_double_shape_type u;
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ u.value = b;
++
++ relax_fenv_state ();
++
++ __asm__ ("frsqrte %[estimate], %[x]\n"
++ : [estimate] "=f" (y) : [x] "f" (b));
++
++ /* Following Muller et al, page 168, equation 5.20.
++
++ h goes to 1/(2*sqrt(b))
++ g goes to sqrt(b).
++
++ We need three iterations to get within 1ulp. */
++
++ /* Indicate that these can be performed prior to the branch. GCC
++ insists on sinking them below the branch, however; it seems like
++ they'd be better before the branch so that we can cover any latency
++ from storing the argument and loading its high word. Oh well. */
++
++ g = b * y;
++ h = 0.5 * y;
++
++ /* Handle small numbers by scaling. */
++ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
++ return __ieee754_sqrt (b * two108) * twom54;
++
++#define FMADD(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmadd %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ r = FNMSUB (g, h, half);
++ g = FMADD (g, r, g);
++ h = FMADD (h, r, h);
++
++ /* g is now +/- 1ulp, or exactly equal to, the square root of b. */
++
++ /* Final refinement. */
++ d = FNMSUB (g, g, b);
++
++ fesetenv_register (fe);
++ return FMADD (d, h, g);
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_wash (b);
++}
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+===================================================================
+--- /dev/null
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+@@ -0,0 +1,101 @@
++/* Single-precision floating point square root.
++ Copyright (C) 2010 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <math.h>
++#include <math_private.h>
++#include <fenv_libc.h>
++#include <inttypes.h>
++
++#include <sysdep.h>
++#include <ldsodefs.h>
++
++static const ieee_float_shape_type a_nan = {.word = 0x7fc00000 };
++static const ieee_float_shape_type a_inf = {.word = 0x7f800000 };
++static const float threehalf = 1.5;
++
++/* The method is based on the descriptions in:
++
++ _The Handbook of Floating-Pointer Arithmetic_ by Muller et al., chapter 5;
++ _IA-64 and Elementary Functions: Speed and Precision_ by Markstein, chapter 9
++
++ We find the reciprocal square root and use that to compute the actual
++ square root. */
++
++#ifdef __STDC__
++float
++__ieee754_sqrtf (float b)
++#else
++float
++__ieee754_sqrtf (b)
++ float b;
++#endif
++{
++ if (__builtin_expect (b > 0, 1))
++ {
++#define FMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++#define FNMSUB(a_, c_, b_) \
++ ({ double __r; \
++ __asm__ ("fnmsub %[r], %[a], %[c], %[b]\n" \
++ : [r] "=f" (__r) : [a] "f" (a_), [c] "f" (c_), [b] "f" (b_)); \
++ __r;})
++
++ if (__builtin_expect (b != a_inf.value, 1))
++ {
++ double y, x;
++ fenv_t fe;
++
++ fe = fegetenv_register ();
++
++ relax_fenv_state ();
++
++ /* Compute y = 1.5 * b - b. Uses fewer constants than y = 0.5 * b. */
++ y = FMSUB (threehalf, b, b);
++
++ /* Initial estimate. */
++ __asm__ ("frsqrte %[x], %[b]\n" : [x] "=f" (x) : [b] "f" (b));
++
++ /* Iterate. x_{n+1} = x_n * (1.5 - y * (x_n * x_n)). */
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++ x = x * FNMSUB (y, x * x, threehalf);
++
++ /* All done. */
++ fesetenv_register (fe);
++ return x * b;
++ }
++ }
++ else if (b < 0)
++ {
++ /* For some reason, some PowerPC32 processors don't implement
++ FE_INVALID_SQRT. */
++#ifdef FE_INVALID_SQRT
++ feraiseexcept (FE_INVALID_SQRT);
++
++ fenv_union_t u = { .fenv = fegetenv_register () };
++ if ((u.l & FE_INVALID) == 0)
++#endif
++ feraiseexcept (FE_INVALID);
++ b = a_nan.value;
++ }
++ return f_washf (b);
++}
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/603e/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/603e/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e300c3/fpu/Implies
+@@ -0,0 +1,2 @@
++# e300c3 is a variant of 603e so use the same optimizations for sqrt
++powerpc/powerpc32/603e/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e500mc/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/e500mc/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e5500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/e5500/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e6500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc32/e6500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc32/e6500/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e5500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/e5500/fpu
+Index: libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies
+===================================================================
+--- /dev/null
++++ libc/sysdeps/unix/sysv/linux/powerpc/powerpc64/e6500/fpu/Implies
+@@ -0,0 +1 @@
++powerpc/powerpc64/e6500/fpu
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/grok_gold.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/grok_gold.patch
new file mode 100644
index 0000000..d46737a
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/grok_gold.patch
@@ -0,0 +1,34 @@
+Make ld --version output matching grok gold's output
+
+adapted from from upstream branch roland/gold-vs-libc
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Backport
+
+
+Index: libc/configure
+===================================================================
+--- libc.orig/configure
++++ libc/configure
+@@ -4654,7 +4654,7 @@ else
+ # Found it, now check the version.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5
+ $as_echo_n "checking version of $LD... " >&6; }
+- ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU ld.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
++ ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
+ case $ac_prog_version in
+ '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+ 2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*)
+Index: libc/configure.ac
+===================================================================
+--- libc.orig/configure.ac
++++ libc/configure.ac
+@@ -990,7 +990,7 @@ AC_CHECK_PROG_VER(AS, $AS, --version,
+ [GNU assembler.* \([0-9]*\.[0-9.]*\)],
+ [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], AS=: critic_missing="$critic_missing as")
+ AC_CHECK_PROG_VER(LD, $LD, --version,
+- [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
++ [GNU [Bbinutilsd][^.]* \([0-9][0-9]*\.[0-9.]*\)],
+ [2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
+
+ # These programs are version sensitive.
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch
new file mode 100644
index 0000000..be29856
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/initgroups_keys.patch
@@ -0,0 +1,20 @@
+This is needed since initgroups belongs to NET group
+so when NET is disabled in eglibc build then it reports
+as undefined symbol
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+
+Index: libc/nss/getent.c
+===================================================================
+--- libc.orig/nss/getent.c 2012-03-09 09:41:57.099581559 -0800
++++ libc/nss/getent.c 2012-03-09 09:42:13.095582334 -0800
+@@ -898,7 +898,7 @@
+ D(group)
+ D(gshadow)
+ DN(hosts)
+-D(initgroups)
++DN(initgroups)
+ DN(netgroup)
+ DN(networks)
+ D(passwd)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch
new file mode 100644
index 0000000..e83a0ad
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ld-search-order.patch
@@ -0,0 +1,56 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+The default lib search path order is:
+
+ 1) LD_LIBRARY_PATH
+ 2) RPATH from the binary
+ 3) ld.so.cache
+ 4) default search paths embedded in the linker
+
+For nativesdk binaries which are being used alongside binaries on a host system, we
+need the search paths to firstly search the shipped nativesdk libs but then also
+cover the host system. For example we want the host system's libGL and this may be
+in a non-standard location like /usr/lib/mesa. The only place the location is know
+about is in the ld.so.cache of the host system.
+
+Since nativesdk has a simple structure and doesn't need to use a cache itself, we
+repurpose the cache for use as a last resort in finding host system binaries. This
+means we need to switch the order of 3 and 4 above to make this work effectively.
+
+RP 14/10/2010
+
+Index: libc/elf/dl-load.c
+===================================================================
+--- libc.orig/elf/dl-load.c 2012-12-02 13:11:45.000000000 -0800
++++ libc/elf/dl-load.c 2013-01-09 07:00:59.135223084 -0800
+@@ -2215,7 +2215,14 @@
+ fd = open_path (name, namelen, mode & __RTLD_SECURE,
+ &loader->l_runpath_dirs, &realname, &fb, loader,
+ LA_SER_RUNPATH, &found_other_class);
+-
++ /* try the default path. */
++ if (fd == -1
++ && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
++ || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
++ && rtld_search_dirs.dirs != (void *) -1)
++ fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
++ &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
++ /* Finally try ld.so.cache */
+ #ifdef USE_LDCONFIG
+ if (fd == -1
+ && (__builtin_expect (! (mode & __RTLD_SECURE), 1)
+@@ -2283,14 +2290,6 @@
+ }
+ #endif
+
+- /* Finally, try the default path. */
+- if (fd == -1
+- && ((l = loader ?: GL(dl_ns)[nsid]._ns_loaded) == NULL
+- || __builtin_expect (!(l->l_flags_1 & DF_1_NODEFLIB), 1))
+- && rtld_search_dirs.dirs != (void *) -1)
+- fd = open_path (name, namelen, mode & __RTLD_SECURE, &rtld_search_dirs,
+- &realname, &fb, l, LA_SER_DEFAULT, &found_other_class);
+-
+ /* Add another newline when we are tracing the library loading. */
+ if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0))
+ _dl_debug_printf ("\n");
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch
new file mode 100644
index 0000000..9b646fe
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/mips-rld-map-check.patch
@@ -0,0 +1,26 @@
+
+On mips target, binutils currently sets DT_MIPS_RLD_MAP to 0 in dynamic
+section if a --version-script sets _RLD_MAP to local. This is apparently
+a binutils bug, but libc shouldn't segfault in this case.
+
+see also: http://sourceware.org/bugilla/show_bug.cgi?id=11615
+
+Upstream-Status: Pending
+
+9/19/2010 - added by Qing He <qing.he@intel.com>
+
+
+---
+diff -ru glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h glibc-2.10.1/ports/sysdeps/mips/dl-machine.h
+--- glibc-2.10.1.orig/ports/sysdeps/mips/dl-machine.h 2009-05-16 16:36:20.000000000 +0800
++++ glibc-2.10.1/ports/sysdeps/mips/dl-machine.h 2010-09-19 09:11:53.000000000 +0800
+@@ -70,7 +70,8 @@
+ /* If there is a DT_MIPS_RLD_MAP entry in the dynamic section, fill it in
+ with the run-time address of the r_debug structure */
+ #define ELF_MACHINE_DEBUG_SETUP(l,r) \
+-do { if ((l)->l_info[DT_MIPS (RLD_MAP)]) \
++do { if ((l)->l_info[DT_MIPS (RLD_MAP)] && \
++ (l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) \
+ *(ElfW(Addr) *)((l)->l_info[DT_MIPS (RLD_MAP)]->d_un.d_ptr) = \
+ (ElfW(Addr)) (r); \
+ } while (0)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch
new file mode 100644
index 0000000..1542b1b
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/multilib_readlib.patch
@@ -0,0 +1,17 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Replace the OECORE_KNOWN_INTERPRETER_NAMES with the value of
+variable EGLIBC_KNOWN_INTERPRETER_NAMES.
+
+Lianhao Lu, 08/01/2011
+
+--- libc/elf/readlib.c.orig 2011-08-12 17:05:51.864470837 +0800
++++ libc/elf/readlib.c 2011-08-12 17:06:39.346942074 +0800
+@@ -52,6 +52,7 @@
+ #ifdef SYSDEP_KNOWN_INTERPRETER_NAMES
+ SYSDEP_KNOWN_INTERPRETER_NAMES
+ #endif
++ OECORE_KNOWN_INTERPRETER_NAMES
+ };
+
+ static struct known_names known_libs[] =
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch
new file mode 100644
index 0000000..6ea666b
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc-sqrt_finite.patch
@@ -0,0 +1,184 @@
+on ppc fixes the errors like below
+| ./.libs/libpulsecore-1.1.so: undefined reference to `__sqrt_finite'
+| collect2: ld returned 1 exit status
+
+Upstream-Status: Pending
+
+ChangeLog
+
+2012-01-06 Khem Raj <raj.khem@gmail.com>
+
+ * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c: Add __*_finite alias.
+ Remove cruft.
+ * sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c: Ditto.
+ * sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c: Ditto.
+ * sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c: Ditto.
+
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+@@ -39,14 +39,8 @@ static const float half = 0.5;
+ We find the actual square root and half of its reciprocal
+ simultaneously. */
+
+-#ifdef __STDC__
+ double
+ __ieee754_sqrt (double b)
+-#else
+-double
+-__ieee754_sqrt (b)
+- double b;
+-#endif
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -132,3 +126,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+@@ -37,14 +37,8 @@ static const float threehalf = 1.5;
+ We find the reciprocal square root and use that to compute the actual
+ square root. */
+
+-#ifdef __STDC__
+ float
+ __ieee754_sqrtf (float b)
+-#else
+-float
+-__ieee754_sqrtf (b)
+- float b;
+-#endif
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -99,3 +93,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+@@ -39,14 +39,8 @@ static const float half = 0.5;
+ We find the actual square root and half of its reciprocal
+ simultaneously. */
+
+-#ifdef __STDC__
+ double
+ __ieee754_sqrt (double b)
+-#else
+-double
+-__ieee754_sqrt (b)
+- double b;
+-#endif
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -132,3 +126,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+@@ -37,14 +37,8 @@ static const float threehalf = 1.5;
+ We find the reciprocal square root and use that to compute the actual
+ square root. */
+
+-#ifdef __STDC__
+ float
+ __ieee754_sqrtf (float b)
+-#else
+-float
+-__ieee754_sqrtf (b)
+- float b;
+-#endif
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -99,3 +93,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+@@ -132,3 +132,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+@@ -99,3 +99,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+@@ -132,3 +132,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+@@ -99,3 +99,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+@@ -132,3 +132,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+@@ -99,3 +99,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+@@ -132,3 +132,4 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+@@ -99,3 +99,4 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++strong_alias (__ieee754_sqrtf, __sqrtf_finite)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch
new file mode 100644
index 0000000..60532cb
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppc_slow_ieee754_sqrt.patch
@@ -0,0 +1,365 @@
+ __ieee754_sqrt{,f} are now inline functions and call out __slow versions
+
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+Upstream-Status: Pending
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrt.c
+@@ -40,7 +40,7 @@ static const float half = 0.5;
+ simultaneously. */
+
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -77,7 +77,7 @@ __ieee754_sqrt (double b)
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+@@ -126,4 +126,12 @@ __ieee754_sqrt (double b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/603e/fpu/e_sqrtf.c
+@@ -38,7 +38,7 @@ static const float threehalf = 1.5;
+ square root. */
+
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -93,4 +93,10 @@ __ieee754_sqrtf (float b)
+ }
+ return f_washf (b);
+ }
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrt.c
+@@ -40,7 +40,7 @@ static const float half = 0.5;
+ simultaneously. */
+
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -77,7 +77,7 @@ __ieee754_sqrt (double b)
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+@@ -126,4 +126,12 @@ __ieee754_sqrt (double b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc64/e5500/fpu/e_sqrtf.c
+@@ -38,7 +38,7 @@ static const float threehalf = 1.5;
+ square root. */
+
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ {
+ if (__builtin_expect (b > 0, 1))
+ {
+@@ -93,4 +93,11 @@ __ieee754_sqrtf (float b)
+ }
+ return f_washf (b);
+ }
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
++
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrt.c
+@@ -41,10 +41,10 @@ static const float half = 0.5;
+
+ #ifdef __STDC__
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ #else
+ double
+-__ieee754_sqrt (b)
++__slow_ieee754_sqrt (b)
+ double b;
+ #endif
+ {
+@@ -83,7 +83,7 @@ __ieee754_sqrt (b)
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+@@ -132,4 +132,12 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc64/e6500/fpu/e_sqrtf.c
+@@ -39,10 +39,10 @@ static const float threehalf = 1.5;
+
+ #ifdef __STDC__
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ #else
+ float
+-__ieee754_sqrtf (b)
++__slow_ieee754_sqrtf (b)
+ float b;
+ #endif
+ {
+@@ -99,4 +99,12 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
++
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrt.c
+@@ -41,10 +41,10 @@ static const float half = 0.5;
+
+ #ifdef __STDC__
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ #else
+ double
+-__ieee754_sqrt (b)
++__slow_ieee754_sqrt (b)
+ double b;
+ #endif
+ {
+@@ -83,7 +83,7 @@ __ieee754_sqrt (b)
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+@@ -132,4 +132,12 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e500mc/fpu/e_sqrtf.c
+@@ -39,10 +39,10 @@ static const float threehalf = 1.5;
+
+ #ifdef __STDC__
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ #else
+ float
+-__ieee754_sqrtf (b)
++__slow_ieee754_sqrtf (b)
+ float b;
+ #endif
+ {
+@@ -99,4 +99,12 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
++
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrt.c
+@@ -41,10 +41,10 @@ static const float half = 0.5;
+
+ #ifdef __STDC__
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ #else
+ double
+-__ieee754_sqrt (b)
++__slow_ieee754_sqrt (b)
+ double b;
+ #endif
+ {
+@@ -83,7 +83,7 @@ __ieee754_sqrt (b)
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+@@ -132,4 +132,12 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e5500/fpu/e_sqrtf.c
+@@ -39,10 +39,10 @@ static const float threehalf = 1.5;
+
+ #ifdef __STDC__
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ #else
+ float
+-__ieee754_sqrtf (b)
++__slow_ieee754_sqrtf (b)
+ float b;
+ #endif
+ {
+@@ -99,4 +99,12 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
++
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+@@ -132,4 +132,12 @@ __ieee754_sqrt (b)
+ }
+ return f_wash (b);
+ }
++
++#undef __ieee754_sqrt
++double
++__ieee754_sqrt (double x)
++{
++ return __slow_ieee754_sqrt (x);
++}
++
+ strong_alias (__ieee754_sqrt, __sqrt_finite)
+Index: libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+===================================================================
+--- libc.orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+@@ -99,4 +99,12 @@ __ieee754_sqrtf (b)
+ }
+ return f_washf (b);
+ }
++
++#undef __ieee754_sqrtf
++float
++__ieee754_sqrtf (float x)
++{
++ return __slow_ieee754_sqrtf (x);
++}
++
+ strong_alias (__ieee754_sqrtf, __sqrtf_finite)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch
new file mode 100644
index 0000000..4c6c107
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/ppce6500-32b_slow_ieee754_sqrt.patch
@@ -0,0 +1,47 @@
+ __ieee754_sqrt{,f} are now inline functions and call out __slow versions
+
+
+Signed-off-by: chunrong guo <B40290@freescale.com>
+Upstream-Status: Pending
+
+diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c
+--- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:39:58.487229887 -0500
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrt.c 2014-04-08 04:40:52.643069198 -0500
+@@ -41,10 +41,10 @@
+
+ #ifdef __STDC__
+ double
+-__ieee754_sqrt (double b)
++__slow_ieee754_sqrt (double b)
+ #else
+ double
+-__ieee754_sqrt (b)
++__slow_ieee754_sqrt (b)
+ double b;
+ #endif
+ {
+@@ -83,7 +83,7 @@
+
+ /* Handle small numbers by scaling. */
+ if (__builtin_expect ((u.parts.msw & 0x7ff00000) <= 0x02000000, 0))
+- return __ieee754_sqrt (b * two108) * twom54;
++ return __slow_ieee754_sqrt (b * two108) * twom54;
+
+ #define FMADD(a_, c_, b_) \
+ ({ double __r; \
+diff -rNu libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c
+--- libc-orig/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:39:58.487229887 -0500
++++ libc/sysdeps/powerpc/powerpc32/e6500/fpu/e_sqrtf.c 2014-04-08 04:41:26.017067682 -0500
+@@ -39,10 +39,10 @@
+
+ #ifdef __STDC__
+ float
+-__ieee754_sqrtf (float b)
++__slow_ieee754_sqrtf (float b)
+ #else
+ float
+-__ieee754_sqrtf (b)
++__slow_ieee754_sqrtf (b)
+ float b;
+ #endif
+ {
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch
new file mode 100644
index 0000000..ca5f17b
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk.patch
@@ -0,0 +1,108 @@
+Upstream-Status: Inappropriate [SDK specific]
+
+This patch puts the dynamic loader path in the binaries, SYSTEM_DIRS strings
+and lengths as well as ld.so.cache path in the dynamic loader to specific
+sections in memory. The sections that contain paths have been allocated a 4096
+byte section, which is the maximum path length in linux. This will allow the
+relocating script to parse the ELF binary, detect the section and easily replace
+the strings in a certain path.
+
+Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
+
+Index: libc/elf/interp.c
+===================================================================
+--- libc.orig/elf/interp.c
++++ libc/elf/interp.c
+@@ -16,5 +16,5 @@
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+-const char __invoke_dynamic_linker__[] __attribute__ ((section (".interp")))
++const char __invoke_dynamic_linker__[4096] __attribute__ ((section (".interp")))
+ = RUNTIME_LINKER;
+Index: libc/elf/dl-load.c
+===================================================================
+--- libc.orig/elf/dl-load.c
++++ libc/elf/dl-load.c
+@@ -144,8 +144,8 @@ static size_t max_capstrlen attribute_re
+ /* Get the generated information about the trusted directories. */
+ #include "trusted-dirs.h"
+
+-static const char system_dirs[] = SYSTEM_DIRS;
+-static const size_t system_dirs_len[] =
++static const char system_dirs[4096] __attribute__ ((section (".sysdirs"))) = SYSTEM_DIRS;
++volatile static const size_t system_dirs_len[] __attribute__ ((section (".sysdirslen"))) =
+ {
+ SYSTEM_DIRS_LEN
+ };
+Index: libc/elf/dl-cache.c
+===================================================================
+--- libc.orig/elf/dl-cache.c
++++ libc/elf/dl-cache.c
+@@ -133,6 +133,10 @@ do \
+ while (0)
+
+
++const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache"))) =
++ SYSCONFDIR "/ld.so.cache";
++
++
+ int
+ internal_function
+ _dl_cache_libcmp (const char *p1, const char *p2)
+Index: libc/elf/ldconfig.c
+===================================================================
+--- libc.orig/elf/ldconfig.c
++++ libc/elf/ldconfig.c
+@@ -166,6 +166,9 @@ static struct argp argp =
+ options, parse_opt, NULL, doc, NULL, more_help, NULL
+ };
+
++
++extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache")));
++
+ /* Check if string corresponds to an important hardware capability or
+ a platform. */
+ static int
+Index: libc/sysdeps/generic/dl-cache.h
+===================================================================
+--- libc.orig/sysdeps/generic/dl-cache.h
++++ libc/sysdeps/generic/dl-cache.h
+@@ -27,10 +27,6 @@
+ ((flags) == 1 || (flags) == _DL_CACHE_DEFAULT_ID)
+ #endif
+
+-#ifndef LD_SO_CACHE
+-# define LD_SO_CACHE SYSCONFDIR "/ld.so.cache"
+-#endif
+-
+ #ifndef add_system_dir
+ # define add_system_dir(dir) add_dir (dir)
+ #endif
+Index: libc/elf/rtld.c
+===================================================================
+--- libc.orig/elf/rtld.c
++++ libc/elf/rtld.c
+@@ -99,6 +99,7 @@ uintptr_t __pointer_chk_guard_local
+ strong_alias (__pointer_chk_guard_local, __pointer_chk_guard)
+ #endif
+
++extern const char LD_SO_CACHE[4096] __attribute__ ((section (".ldsocache")));
+
+ /* List of auditing DSOs. */
+ static struct audit_list
+@@ -1031,12 +1032,12 @@ of this helper program; chances are you
+ --list list all dependencies and how they are resolved\n\
+ --verify verify that given object really is a dynamically linked\n\
+ object we can handle\n\
+- --inhibit-cache Do not use " LD_SO_CACHE "\n\
++ --inhibit-cache Do not use %s\n\
+ --library-path PATH use given PATH instead of content of the environment\n\
+ variable LD_LIBRARY_PATH\n\
+ --inhibit-rpath LIST ignore RUNPATH and RPATH information in object names\n\
+ in LIST\n\
+- --audit LIST use objects named in LIST as auditors\n");
++ --audit LIST use objects named in LIST as auditors\n", LD_SO_CACHE);
+
+ ++_dl_skip_args;
+ --_dl_argc;
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch
new file mode 100644
index 0000000..f164f8f
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-2.19/relocatable_sdk_fix_openpath.patch
@@ -0,0 +1,41 @@
+Upstream-Status: Inappropriate [SDK specific]
+
+eglibc-nativesdk: Fix buffer overrun with a relocated SDK
+
+When ld-linux-*.so.2 is relocated to a path that is longer than the
+original fixed location, the dynamic loader will crash in open_path
+because it implicitly assumes that max_dirnamelen is a fixed size that
+never changes.
+
+The allocated buffer will not be large enough to contain the directory
+path string which is larger than the fixed location provided at build
+time.
+
+Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
+
+---
+ elf/dl-load.c | 12 ++++++++++++
+ 1 file changed, 12 insertions(+)
+
+--- a/elf/dl-load.c
++++ b/elf/dl-load.c
+@@ -1919,7 +1919,19 @@ open_path (const char *name, size_t name
+ given on the command line when rtld is run directly. */
+ return -1;
+
++ do
++ {
++ struct r_search_path_elem *this_dir = *dirs;
++ if (this_dir->dirnamelen > max_dirnamelen)
++ {
++ max_dirnamelen = this_dir->dirnamelen;
++ }
++ }
++ while (*++dirs != NULL);
++
+ buf = alloca (max_dirnamelen + max_capstrlen + namelen);
++
++ dirs = sps->dirs;
+ do
+ {
+ struct r_search_path_elem *this_dir = *dirs;
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-collateral.inc b/meta-aspeed/recipes-core/eglibc/eglibc-collateral.inc
new file mode 100644
index 0000000..8feca09
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-collateral.inc
@@ -0,0 +1,12 @@
+INHIBIT_DEFAULT_DEPS = "1"
+LICENSE = "GPLv2 & LGPLv2.1"
+HOMEPAGE = "http://www.eglibc.org/"
+
+do_fetch[noexec] = "1"
+do_unpack[noexec] = "1"
+do_patch[noexec] = "1"
+do_configure[noexec] = "1"
+do_compile[noexec] = "1"
+
+do_install[depends] += "virtual/${MLPREFIX}libc:do_populate_sysroot"
+
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-common.inc b/meta-aspeed/recipes-core/eglibc/eglibc-common.inc
new file mode 100644
index 0000000..d18786a
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-common.inc
@@ -0,0 +1,9 @@
+SUMMARY = "Embedded GLIBC (GNU C Library)"
+DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC) that is designed to work well on embedded systems. EGLIBC strives to be source and binary compatible with GLIBC. EGLIBC's goals include reduced footprint, configurable components, better support for cross-compilation and cross-testing."
+HOMEPAGE = "http://www.eglibc.org/home"
+SECTION = "libs"
+LICENSE = "GPLv2 & LGPLv2.1"
+LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
+ file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
+ file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
+ file://COPYING.LIB;md5=bbb461211a33b134d42ed5ee802b37ff "
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-initial.inc b/meta-aspeed/recipes-core/eglibc/eglibc-initial.inc
new file mode 100644
index 0000000..39d553e
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-initial.inc
@@ -0,0 +1,78 @@
+DEPENDS = "linux-libc-headers virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+
+PACKAGES = ""
+PACKAGES_DYNAMIC = ""
+
+STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
+
+do_configure () {
+ sed -ie 's,{ (exit 1); exit 1; }; },{ (exit 0); }; },g' ${S}/configure
+ chmod +x ${S}/configure
+ (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+ find ${S} -name "configure" | xargs touch
+ ${S}/configure --host=${TARGET_SYS} --build=${BUILD_SYS} \
+ --prefix=/usr \
+ --without-cvs --disable-sanity-checks \
+ --with-headers=${STAGING_DIR_TARGET}${includedir} \
+ --with-kconfig=${STAGING_BINDIR_NATIVE} \
+ --enable-hacker-mode --enable-addons
+}
+
+do_compile () {
+ :
+}
+
+do_install () {
+ oe_runmake cross-compiling=yes install_root=${D} \
+ includedir='${includedir}' prefix='${prefix}' \
+ install-bootstrap-headers=yes install-headers
+
+ oe_runmake csu/subdir_lib
+ mkdir -p ${D}${libdir}/
+ install -m 644 csu/crt[1in].o ${D}${libdir}
+
+ # Two headers -- stubs.h and features.h -- aren't installed by install-headers,
+ # so do them by hand. We can tolerate an empty stubs.h for the moment.
+ # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html
+ mkdir -p ${D}${includedir}/gnu/
+ touch ${D}${includedir}/gnu/stubs.h
+ cp ${S}/include/features.h ${D}${includedir}/features.h
+
+ if [ -e ${B}/bits/stdio_lim.h ]; then
+ cp ${B}/bits/stdio_lim.h ${D}${includedir}/bits/
+ fi
+ # add links to linux-libc-headers: final eglibc build need this.
+ for t in linux asm asm-generic; do
+ ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
+ done
+}
+
+do_install_locale() {
+ :
+}
+
+do_siteconfig () {
+ :
+}
+
+SSTATEPOSTINSTFUNCS += "eglibcinitial_sstate_postinst"
+eglibcinitial_sstate_postinst() {
+ if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ]
+ then
+ # Recreate the symlinks to ensure they point to the correct location
+ for t in linux asm asm-generic; do
+ rm -f ${STAGING_DIR_TCBOOTSTRAP}${includedir}/$t
+ ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${STAGING_DIR_TCBOOTSTRAP}${includedir}/
+ done
+ fi
+}
+
+do_populate_sysroot[sstate-outputdirs] = "${STAGING_DIR_TCBOOTSTRAP}/"
+
+# We don't install any scripts so there is nothing to evacuate
+do_evacuate_scripts () {
+ :
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-initial_2.19.bb b/meta-aspeed/recipes-core/eglibc/eglibc-initial_2.19.bb
new file mode 100644
index 0000000..de45079
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-initial_2.19.bb
@@ -0,0 +1,11 @@
+require eglibc_${PV}.bb
+require eglibc-initial.inc
+
+DEPENDS += "kconfig-frontends-native"
+
+# main eglibc recipes muck with TARGET_CPPFLAGS to point into
+# final target sysroot but we
+# are not there when building eglibc-initial
+# so reset it here
+
+TARGET_CPPFLAGS = ""
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-ld.inc b/meta-aspeed/recipes-core/eglibc/eglibc-ld.inc
new file mode 100644
index 0000000..6261ae3
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-ld.inc
@@ -0,0 +1,56 @@
+def ld_append_if_tune_exists(d, infos, dict):
+ tune = d.getVar("DEFAULTTUNE", True) or ""
+ libdir = d.getVar("base_libdir", True) or ""
+ if tune in dict:
+ infos['ldconfig'].add('{"' + libdir + '/' + dict[tune][0] + '",' + dict[tune][1] + ' }')
+ infos['lddrewrite'].add(libdir+'/'+dict[tune][0])
+
+def eglibc_dl_info(d):
+ ld_info_all = {
+ "mips": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mipsel": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64el-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64el": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64el-nf-n32": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "mips64el-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "powerpc": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "powerpc-nf": ["ld.so.1", "FLAG_ELF_LIBC6"],
+ "powerpc64": ["ld64.so.1", "FLAG_ELF_LIBC6"],
+ "powerpc64-nf": ["ld64.so.1", "FLAG_ELF_LIBC6"],
+ "core2-32": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+ "core2-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
+ "x86": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+ "x86-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
+ "i586": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+ "corei7-32": ["ld-linux.so.2", "FLAG_ELF_LIBC6"],
+ "corei7-64": ["ld-linux-x86-64.so.2", "FLAG_ELF_LIBC6"],
+ }
+
+ infos = {'ldconfig':set(), 'lddrewrite':set()}
+ ld_append_if_tune_exists(d, infos, ld_info_all)
+
+ #DEFAULTTUNE_MULTILIB_ORIGINAL
+ original_tune=d.getVar("DEFAULTTUNE_MULTILIB_ORIGINAL",True)
+ if original_tune:
+ localdata = bb.data.createCopy(d)
+ localdata.setVar("DEFAULTTUNE", original_tune)
+ ld_append_if_tune_exists(localdata, infos, ld_info_all)
+
+ variants = d.getVar("MULTILIB_VARIANTS", True) or ""
+ for item in variants.split():
+ localdata = bb.data.createCopy(d)
+ overrides = localdata.getVar("OVERRIDES", False) + ":virtclass-multilib-" + item
+ localdata.setVar("OVERRIDES", overrides)
+ bb.data.update_data(localdata)
+ ld_append_if_tune_exists(localdata, infos, ld_info_all)
+ infos['ldconfig'] = ','.join(infos['ldconfig'])
+ infos['lddrewrite'] = ' '.join(infos['lddrewrite'])
+ return infos
+
+EGLIBC_KNOWN_INTERPRETER_NAMES = "${@eglibc_dl_info(d)['ldconfig']}"
+RTLDLIST = "${@eglibc_dl_info(d)['lddrewrite']}"
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-locale.inc b/meta-aspeed/recipes-core/eglibc/eglibc-locale.inc
new file mode 100644
index 0000000..4da5abd
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-locale.inc
@@ -0,0 +1,96 @@
+include eglibc-collateral.inc
+
+SUMMARY = "Locale data from eglibc"
+
+BPN = "eglibc"
+LOCALEBASEPN = "${MLPREFIX}eglibc"
+
+# eglibc-collateral.inc inhibits all default deps, but do_package needs objcopy
+# ERROR: objcopy failed with exit code 127 (cmd was 'i586-webos-linux-objcopy' --only-keep-debug 'eglibc-locale/2.17-r0/package/usr/lib/gconv/IBM1166.so' 'eglibc-locale/2.17-r0/package/usr/lib/gconv/.debug/IBM1166.so')
+# ERROR: Function failed: split_and_strip_files
+BINUTILSDEP = "virtual/${MLPREFIX}${TARGET_PREFIX}binutils:do_populate_sysroot"
+BINUTILSDEP_class-nativesdk = "virtual/${TARGET_PREFIX}binutils-crosssdk:do_populate_sysroot"
+do_package[depends] += "${BINUTILSDEP}"
+
+# Binary locales are generated at build time if ENABLE_BINARY_LOCALE_GENERATION
+# is set. The idea is to avoid running localedef on the target (at first boot)
+# to decrease initial boot time and avoid localedef being killed by the OOM
+# killer which used to effectively break i18n on machines with < 128MB RAM.
+
+# default to disabled
+ENABLE_BINARY_LOCALE_GENERATION ?= "0"
+ENABLE_BINARY_LOCALE_GENERATION_pn-nativesdk-eglibc-locale = "0"
+
+#enable locale generation on these arches
+# BINARY_LOCALE_ARCHES is a space separated list of regular expressions
+BINARY_LOCALE_ARCHES ?= "arm.* i[3-6]86 x86_64 powerpc mips mips64"
+
+# set "1" to use cross-localedef for locale generation
+# set "0" for qemu emulation of native localedef for locale generation
+LOCALE_GENERATION_WITH_CROSS-LOCALEDEF = "1"
+
+PROVIDES = "virtual/libc-locale"
+
+PACKAGES = "localedef ${PN}-dbg"
+
+PACKAGES_DYNAMIC = "^locale-base-.* \
+ ^eglibc-gconv-.* ^eglibc-charmap-.* ^eglibc-localedata-.* ^eglibc-binary-localedata-.* \
+ ^glibc-gconv-.* ^glibc-charmap-.* ^glibc-localedata-.* ^glibc-binary-localedata-.* \
+ ^${MLPREFIX}eglibc-gconv$"
+
+# Create a eglibc-binaries package
+ALLOW_EMPTY_${BPN}-binaries = "1"
+PACKAGES += "${BPN}-binaries"
+RRECOMMENDS_${BPN}-binaries = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-binary") != -1])}"
+
+# Create a eglibc-charmaps package
+ALLOW_EMPTY_${BPN}-charmaps = "1"
+PACKAGES += "${BPN}-charmaps"
+RRECOMMENDS_${BPN}-charmaps = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-charmap") != -1])}"
+
+# Create a eglibc-gconvs package
+ALLOW_EMPTY_${BPN}-gconvs = "1"
+PACKAGES += "${BPN}-gconvs"
+RRECOMMENDS_${BPN}-gconvs = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-gconv") != -1])}"
+
+# Create a eglibc-localedatas package
+ALLOW_EMPTY_${BPN}-localedatas = "1"
+PACKAGES += "${BPN}-localedatas"
+RRECOMMENDS_${BPN}-localedatas = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("eglibc-localedata") != -1])}"
+
+DESCRIPTION_localedef = "eglibc: compile locale definition files"
+
+# eglibc-gconv is dynamically added into PACKAGES, thus
+# FILES_eglibc-gconv will not be automatically extended in multilib.
+# Explicitly add ${MLPREFIX} for FILES_eglibc-gconv.
+FILES_${MLPREFIX}eglibc-gconv = "${libdir}/gconv/*"
+FILES_${PN}-dbg += "${libdir}/gconv/.debug/*"
+FILES_localedef = "${bindir}/localedef"
+
+LOCALETREESRC = "${STAGING_INCDIR}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}"
+
+do_install () {
+ mkdir -p ${D}${bindir} ${D}${datadir} ${D}${libdir}
+ if [ -n "$(ls ${LOCALETREESRC}/${bindir})" ]; then
+ cp -fpPR ${LOCALETREESRC}/${bindir}/* ${D}${bindir}
+ fi
+ if [ -n "$(ls ${LOCALETREESRC}/${localedir})" ]; then
+ mkdir -p ${D}${localedir}
+ cp -fpPR ${LOCALETREESRC}/${localedir}/* ${D}${localedir}
+ fi
+ if [ -e ${LOCALETREESRC}/${libdir}/gconv ]; then
+ cp -fpPR ${LOCALETREESRC}/${libdir}/gconv ${D}${libdir}
+ fi
+ if [ -e ${LOCALETREESRC}/${datadir}/i18n ]; then
+ cp -fpPR ${LOCALETREESRC}/${datadir}/i18n ${D}${datadir}
+ fi
+ if [ -e ${LOCALETREESRC}/${datadir}/locale ]; then
+ cp -fpPR ${LOCALETREESRC}/${datadir}/locale ${D}${datadir}
+ fi
+ chown root.root -R ${D}
+ cp -fpPR ${LOCALETREESRC}/SUPPORTED ${WORKDIR}
+}
+
+inherit libc-package
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-locale_2.19.bb b/meta-aspeed/recipes-core/eglibc/eglibc-locale_2.19.bb
new file mode 100644
index 0000000..ce6c1d2
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-locale_2.19.bb
@@ -0,0 +1 @@
+require eglibc-locale.inc
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-mtrace.inc b/meta-aspeed/recipes-core/eglibc/eglibc-mtrace.inc
new file mode 100644
index 0000000..d68783e
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-mtrace.inc
@@ -0,0 +1,13 @@
+include eglibc-collateral.inc
+
+SUMMARY = "mtrace utility provided by eglibc"
+DESCRIPTION = "mtrace utility provided by eglibc"
+RDEPENDS_${PN} = "perl"
+RPROVIDES_${PN} = "libc-mtrace"
+
+SRC = "${STAGING_INCDIR}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}"
+
+do_install() {
+ install -d -m 0755 ${D}${bindir}
+ install -m 0755 ${SRC}/mtrace ${D}${bindir}/
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-mtrace_2.19.bb b/meta-aspeed/recipes-core/eglibc/eglibc-mtrace_2.19.bb
new file mode 100644
index 0000000..6fa2be9
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-mtrace_2.19.bb
@@ -0,0 +1 @@
+require eglibc-mtrace.inc
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-options.inc b/meta-aspeed/recipes-core/eglibc/eglibc-options.inc
new file mode 100644
index 0000000..0432758
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-options.inc
@@ -0,0 +1,162 @@
+def eglibc_cfg(feature, tokens, cnf):
+ if type(tokens) == type(""):
+ tokens = [tokens]
+ if feature:
+ cnf.extend([token + '=y' for token in tokens])
+ else:
+ for token in tokens:
+ cnf.extend([token + '=n'])
+ if token == 'OPTION_EGLIBC_NSSWITCH':
+ cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_CONFIG=\"${S}/nss/nsswitch.conf\""])
+ cnf.extend(["OPTION_EGLIBC_NSSWITCH_FIXED_FUNCTIONS=\"${S}/nss/fixed-nsswitch.functions\""])
+
+# Map distro features to eglibc options settings
+def features_to_eglibc_settings(d):
+ cnf = ([])
+
+ ipv4 = base_contains('DISTRO_FEATURES', 'ipv4', True, False, d)
+ ipv6 = base_contains('DISTRO_FEATURES', 'ipv6', True, False, d)
+ libc_backtrace = base_contains('DISTRO_FEATURES', 'libc-backtrace', True, False, d)
+ libc_big_macros = base_contains('DISTRO_FEATURES', 'libc-big-macros', True, False, d)
+ libc_bsd = base_contains('DISTRO_FEATURES', 'libc-bsd', True, False, d)
+ libc_cxx_tests = base_contains('DISTRO_FEATURES', 'libc-cxx-tests', True, False, d)
+ libc_catgets = base_contains('DISTRO_FEATURES', 'libc-catgets', True, False, d)
+ libc_charsets = base_contains('DISTRO_FEATURES', 'libc-charsets', True, False, d)
+ libc_crypt = base_contains('DISTRO_FEATURES', 'libc-crypt', True, False, d)
+ libc_crypt_ufc = base_contains('DISTRO_FEATURES', 'libc-crypt-ufc', True, False, d)
+ libc_db_aliases = base_contains('DISTRO_FEATURES', 'libc-db-aliases', True, False, d)
+ libc_envz = base_contains('DISTRO_FEATURES', 'libc-envz', True, False, d)
+ libc_fcvt = base_contains('DISTRO_FEATURES', 'libc-fcvt', True, False, d)
+ libc_fmtmsg = base_contains('DISTRO_FEATURES', 'libc-fmtmsg', True, False, d)
+ libc_fstab = base_contains('DISTRO_FEATURES', 'libc-fstab', True, False, d)
+ libc_ftraverse = base_contains('DISTRO_FEATURES', 'libc-ftraverse', True, False, d)
+ libc_getlogin = base_contains('DISTRO_FEATURES', 'libc-getlogin', True, False, d)
+ libc_idn = base_contains('DISTRO_FEATURES', 'libc-idn', True, False, d)
+ libc_inet_anl = base_contains('DISTRO_FEATURES', 'libc-inet-anl', True, False, d)
+ libc_libm = base_contains('DISTRO_FEATURES', 'libc-libm', True, False, d)
+ libc_locales = base_contains('DISTRO_FEATURES', 'libc-locales', True, False, d)
+ libc_locale_code = base_contains('DISTRO_FEATURES', 'libc-locale-code', True, False, d)
+ libc_memusage = base_contains('DISTRO_FEATURES', 'libc-memusage', True, False, d)
+ libc_nis = base_contains('DISTRO_FEATURES', 'libc-nis', True, False, d)
+ libc_nsswitch = base_contains('DISTRO_FEATURES', 'libc-nsswitch', True, False, d)
+ libc_rcmd = base_contains('DISTRO_FEATURES', 'libc-rcmd', True, False, d)
+ libc_rtld_debug = base_contains('DISTRO_FEATURES', 'libc-rtld-debug', True, False, d)
+ libc_spawn = base_contains('DISTRO_FEATURES', 'libc-spawn', True, False, d)
+ libc_streams = base_contains('DISTRO_FEATURES', 'libc-streams', True, False, d)
+ libc_sunrpc = base_contains('DISTRO_FEATURES', 'libc-sunrpc', True, False, d)
+ libc_utmp = base_contains('DISTRO_FEATURES', 'libc-utmp', True, False, d)
+ libc_utmpx = base_contains('DISTRO_FEATURES', 'libc-utmpx', True, False, d)
+ libc_wordexp = base_contains('DISTRO_FEATURES', 'libc-wordexp', True, False, d)
+ libc_posix_clang_wchar = base_contains('DISTRO_FEATURES', 'libc-posix-clang-wchar', True, False, d)
+ libc_posix_regexp = base_contains('DISTRO_FEATURES', 'libc-posix-regexp', True, False, d)
+ libc_posix_regexp_glibc = base_contains('DISTRO_FEATURES', 'libc-posix-regexp-glibc', True, False, d)
+ libc_posix_wchar_io = base_contains('DISTRO_FEATURES', 'libc-posix-wchar-io', True, False, d)
+
+ # arrange the dependencies among eglibc configuable options according to file option-groups.def from eglibc source code
+ new_dep = True
+ while new_dep:
+ new_dep = False
+
+ if ipv6 and not ipv4:
+ new_dep = True
+ ipv4 = True
+
+ if ipv4 and not libc_nsswitch:
+ new_dep = True
+ libc_nsswitch = True
+
+ if libc_cxx_tests:
+ if not libc_posix_wchar_io:
+ new_dep = True
+ libc_posix_wchar_io = True
+ if not libc_libm:
+ new_dep = True
+ libc_libm = True
+
+ if libc_catgets and not libc_locale_code:
+ new_dep = True
+ libc_locale_code = True
+
+ if libc_crypt_ufc and not libc_crypt:
+ new_dep = True
+ libc_crypt = True
+
+ if libc_getlogin and not libc_utmp:
+ new_dep = True
+ libc_utmp = True
+
+ if libc_inet_anl and not ipv4:
+ new_dep = True
+ ipv4 = True
+
+ if libc_locale_code and not libc_posix_clang_wchar:
+ new_dep = True
+ libc_posix_clang_wchar = True
+
+ if libc_nis:
+ if not ipv4:
+ new_dep = True
+ ipv4 = True
+ if not libc_sunrpc:
+ new_dep = True
+ libc_sunrpc = True
+
+ if libc_rcmd and not ipv4:
+ new_dep = True
+ ipv4 = True
+
+ if libc_sunrpc and not ipv4:
+ new_dep = True
+ ipv4 = True
+
+ if libc_utmpx and not libc_utmp:
+ new_dep = True
+ libc_utmp = True
+
+ if libc_posix_regexp_glibc and not libc_posix_regexp:
+ new_dep = True
+ libc_posix_regexp = True
+
+ if libc_posix_wchar_io and not libc_posix_clang_wchar:
+ new_dep = True
+ libc_posix_clang_wchar = True
+
+ eglibc_cfg(ipv6, 'OPTION_EGLIBC_ADVANCED_INET6', cnf)
+ eglibc_cfg(libc_backtrace, 'OPTION_EGLIBC_BACKTRACE', cnf)
+ eglibc_cfg(libc_big_macros, 'OPTION_EGLIBC_BIG_MACROS', cnf)
+ eglibc_cfg(libc_bsd, 'OPTION_EGLIBC_BSD', cnf)
+ eglibc_cfg(libc_cxx_tests, 'OPTION_EGLIBC_CXX_TESTS', cnf)
+ eglibc_cfg(libc_catgets, 'OPTION_EGLIBC_CATGETS', cnf)
+ eglibc_cfg(libc_charsets, 'OPTION_EGLIBC_CHARSETS', cnf)
+ eglibc_cfg(libc_crypt, 'OPTION_EGLIBC_CRYPT', cnf)
+ eglibc_cfg(libc_crypt_ufc, 'OPTION_EGLIBC_CRYPT_UFC', cnf)
+ eglibc_cfg(libc_db_aliases, 'OPTION_EGLIBC_DB_ALIASES', cnf)
+ eglibc_cfg(libc_envz, 'OPTION_EGLIBC_ENVZ', cnf)
+ eglibc_cfg(libc_fcvt, 'OPTION_EGLIBC_FCVT', cnf)
+ eglibc_cfg(libc_fmtmsg, 'OPTION_EGLIBC_FMTMSG', cnf)
+ eglibc_cfg(libc_fstab, 'OPTION_EGLIBC_FSTAB', cnf)
+ eglibc_cfg(libc_ftraverse, 'OPTION_EGLIBC_FTRAVERSE', cnf)
+ eglibc_cfg(libc_getlogin, 'OPTION_EGLIBC_GETLOGIN', cnf)
+ eglibc_cfg(libc_idn, 'OPTION_EGLIBC_IDN', cnf)
+ eglibc_cfg(ipv4, 'OPTION_EGLIBC_INET', cnf)
+ eglibc_cfg(libc_inet_anl, 'OPTION_EGLIBC_INET_ANL', cnf)
+ eglibc_cfg(libc_libm, 'OPTION_EGLIBC_LIBM', cnf)
+ eglibc_cfg(libc_locales, 'OPTION_EGLIBC_LOCALES', cnf)
+ eglibc_cfg(libc_locale_code, 'OPTION_EGLIBC_LOCALE_CODE', cnf)
+ eglibc_cfg(libc_memusage, 'OPTION_EGLIBC_MEMUSAGE', cnf)
+ eglibc_cfg(libc_nis, 'OPTION_EGLIBC_NIS', cnf)
+ eglibc_cfg(libc_nsswitch, 'OPTION_EGLIBC_NSSWITCH', cnf)
+ eglibc_cfg(libc_rcmd, 'OPTION_EGLIBC_RCMD', cnf)
+ eglibc_cfg(libc_rtld_debug, 'OPTION_EGLIBC_RTLD_DEBUG', cnf)
+ eglibc_cfg(libc_spawn, 'OPTION_EGLIBC_SPAWN', cnf)
+ eglibc_cfg(libc_streams, 'OPTION_EGLIBC_STREAMS', cnf)
+ eglibc_cfg(libc_sunrpc, 'OPTION_EGLIBC_SUNRPC', cnf)
+ eglibc_cfg(libc_utmp, 'OPTION_EGLIBC_UTMP', cnf)
+ eglibc_cfg(libc_utmpx, 'OPTION_EGLIBC_UTMPX', cnf)
+ eglibc_cfg(libc_wordexp, 'OPTION_EGLIBC_WORDEXP', cnf)
+ eglibc_cfg(libc_posix_clang_wchar, 'OPTION_POSIX_C_LANG_WIDE_CHAR', cnf)
+ eglibc_cfg(libc_posix_regexp, 'OPTION_POSIX_REGEXP', cnf)
+ eglibc_cfg(libc_posix_regexp_glibc, 'OPTION_POSIX_REGEXP_GLIBC', cnf)
+ eglibc_cfg(libc_posix_wchar_io, 'OPTION_POSIX_WIDE_CHAR_DEVICE_IO', cnf)
+
+ return "\n".join(cnf)
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-package.inc b/meta-aspeed/recipes-core/eglibc/eglibc-package.inc
new file mode 100644
index 0000000..6721819
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-package.inc
@@ -0,0 +1,155 @@
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a eglibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import bb, re
+ uc_os = (re.match('.*uclibc*', d.getVar('TARGET_OS', True)) != None)
+ if uc_os:
+ raise bb.parse.SkipPackage("incompatible with target %s" %
+ d.getVar('TARGET_OS', True))
+}
+
+# Set this to zero if you don't want ldconfig in the output package
+USE_LDCONFIG ?= "1"
+
+PACKAGES = "${PN}-dbg catchsegv sln nscd ldd ${PN}-utils eglibc-thread-db ${PN}-pic libcidn libmemusage libsegfault ${PN}-pcprofile libsotruss ${PN} eglibc-extra-nss ${PN}-dev ${PN}-staticdev ${PN}-doc"
+
+# The ld.so in this eglibc supports the GNU_HASH
+RPROVIDES_${PN} = "glibc rtld(GNU_HASH)"
+RPROVIDES_${PN}-utils = "glibc-utils"
+RPROVIDES_${PN}-mtrace = "glibc-mtrace libc-mtrace"
+RPROVIDES_${PN}-pic = "glibc-pic"
+RPROVIDES_${PN}-dev = "glibc-dev libc6-dev virtual-libc-dev"
+RPROVIDES_${PN}-staticdev = "glibc-staticdev"
+RPROVIDES_${PN}-doc = "glibc-doc"
+RPROVIDES_eglibc-extra-nss = "glibc-extra-nss"
+RPROVIDES_eglibc-thread-db = "glibc-thread-db"
+RPROVIDES_${PN}-pcprofile = "glibc-pcprofile"
+RPROVIDES_${PN}-dbg = "glibc-dbg"
+libc_baselibs = "${base_libdir}/libcrypt*.so.* ${base_libdir}/libcrypt-*.so ${base_libdir}/libc.so.* ${base_libdir}/libc-*.so ${base_libdir}/libm*.so.* ${base_libdir}/libm-*.so ${base_libdir}/ld*.so.* ${base_libdir}/ld-*.so ${base_libdir}/libpthread*.so.* ${base_libdir}/libpthread-*.so ${base_libdir}/libresolv*.so.* ${base_libdir}/libresolv-*.so ${base_libdir}/librt*.so.* ${base_libdir}/librt-*.so ${base_libdir}/libutil*.so.* ${base_libdir}/libutil-*.so ${base_libdir}/libnsl*.so.* ${base_libdir}/libnsl-*.so ${base_libdir}/libnss_files*.so.* ${base_libdir}/libnss_files-*.so ${base_libdir}/libnss_compat*.so.* ${base_libdir}/libnss_compat-*.so ${base_libdir}/libnss_dns*.so.* ${base_libdir}/libnss_dns-*.so ${base_libdir}/libdl*.so.* ${base_libdir}/libdl-*.so ${base_libdir}/libanl*.so.* ${base_libdir}/libanl-*.so ${base_libdir}/libBrokenLocale*.so.* ${base_libdir}/libBrokenLocale-*.so"
+
+FILES_${PN} = "${libc_baselibs} ${libexecdir}/* ${@base_conditional('USE_LDCONFIG', '1', '${base_sbindir}/ldconfig ${sysconfdir}/ld.so.conf', '', d)}"
+FILES_ldd = "${bindir}/ldd"
+FILES_libsegfault = "${base_libdir}/libSegFault*"
+FILES_libcidn = "${base_libdir}/libcidn-*.so ${base_libdir}/libcidn.so.*"
+FILES_libmemusage = "${base_libdir}/libmemusage.so"
+FILES_eglibc-extra-nss = "${base_libdir}/libnss_*-*.so ${base_libdir}/libnss_*.so.*"
+FILES_sln = "/sbin/sln"
+FILES_${PN}-pic = "${libdir}/*_pic.a ${libdir}/*_pic.map ${libdir}/libc_pic/*.o"
+FILES_libsotruss = "${libdir}/audit/sotruss-lib.so"
+FILES_SOLIBSDEV = "${libdir}/lib*${SOLIBSDEV}"
+FILES_${PN}-dev += "${bindir}/rpcgen ${libdir}/*_nonshared.a ${base_libdir}/*_nonshared.a ${base_libdir}/*.o ${datadir}/aclocal"
+FILES_${PN}-staticdev += "${libdir}/*.a ${base_libdir}/*.a"
+FILES_nscd = "${sbindir}/nscd*"
+FILES_${PN}-mtrace = "${bindir}/mtrace"
+FILES_${PN}-utils = "${bindir}/* ${sbindir}/*"
+FILES_${PN}-dbg += "${libexecdir}/*/.debug ${libdir}/audit/.debug"
+FILES_catchsegv = "${bindir}/catchsegv"
+RDEPENDS_catchsegv = "libsegfault"
+FILES_${PN}-pcprofile = "${base_libdir}/libpcprofile.so"
+FILES_eglibc-thread-db = "${base_libdir}/libthread_db.so.* ${base_libdir}/libthread_db-*.so"
+RPROVIDES_${PN}-dev += "libc-dev"
+RPROVIDES_${PN}-staticdev += "libc-staticdev"
+
+SUMMARY_sln = "The static ln"
+DESCRIPTION_sln = "Similar to the 'ln' utility, but statically linked. sln is useful to make symbolic links to dynamic libraries if the dynamic linking system, for some reason, is not functional."
+SUMMARY_nscd = "Name service cache daemon"
+DESCRIPTION_nscd = "nscd, name service cache daemon, caches name service lookups for the passwd, group and hosts information. It can damatically improvide performance with remote, such as NIS or NIS+, name services."
+SUMMARY_eglibc-extra-nss = "hesiod, NIS and NIS+ nss libraries"
+DESCRIPTION_eglibc-extra-nss = "eglibc: nis, nisplus and hesiod search services."
+SUMMARY_ldd = "print shared library dependencies"
+DESCRIPTION_ldd = "${bindir}/ldd prints shared library dependencies for each program or shared library specified on the command line."
+SUMMARY_${PN}-utils = "Miscellaneous utilities provided by eglibc"
+DESCRIPTION_${PN}-utils = "Miscellaneous utilities including getconf, iconf, locale, gencat, tzselect, zic, rpcinfo, ..."
+DESCRIPTION_libsotruss = "Library to support sotruss which traces calls through PLTs"
+
+inherit libc-common multilib_header
+
+do_install_append () {
+ rm -f ${D}${sysconfdir}/localtime
+ rm -rf ${D}${localstatedir}
+
+ # remove empty eglibc dir
+ if [ -d ${D}${libdir}/eglibc -a ! -e ${D}${libdir}/eglibc/pt_chown ]; then
+ rmdir ${D}${libdir}/eglibc
+ fi
+ oe_multilib_header bits/syscall.h
+
+ if [ -f ${D}${bindir}/mtrace ]; then
+ sed -i -e '1s,#!.*perl,#! ${USRBINPATH}/env perl,' -e '2s,exec.*perl,exec ${USRBINPATH}/env perl,' ${D}${bindir}/mtrace
+ fi
+ rm -rf ${D}${includedir}/rpcsvc/rquota*
+ # Info dir listing isn't interesting at this point so remove it if it exists.
+ if [ -e "${D}${infodir}/dir" ]; then
+ rm -f ${D}${infodir}/dir
+ fi
+
+ if [ "${USE_LDCONFIG}" != "1" ]; then
+ # We won't ship this file (see FILES above) so let's not install it
+ rm -f ${D}${sysconfdir}/ld.so.conf
+ # This directory will be empty now so remove it too.
+ # But check whether it exists first, since it won't for eglibc-initial.
+ if [ -d ${D}${sysconfdir} ]; then
+ rmdir ${D}${sysconfdir}
+ fi
+ fi
+}
+
+do_install_locale () {
+ dest=${D}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
+ install -d ${dest}${base_libdir} ${dest}${bindir} ${dest}${libdir} ${dest}${datadir}
+ if [ "${base_libdir}" != "${libdir}" ]; then
+ cp -fpPR ${D}${base_libdir}/* ${dest}${base_libdir}
+ fi
+ if [ -e ${D}${bindir}/localedef ]; then
+ mv -f ${D}${bindir}/localedef ${dest}${bindir}
+ fi
+ if [ -e ${D}${libdir}/gconv ]; then
+ mv -f ${D}${libdir}/gconv ${dest}${libdir}
+ fi
+ if [ -e ${D}${exec_prefix}/lib ]; then
+ cp -fpPR ${D}${exec_prefix}/lib ${dest}${exec_prefix}
+ fi
+ if [ -e ${D}${datadir}/i18n ]; then
+ mv ${D}${datadir}/i18n ${dest}${datadir}
+ fi
+ cp -fpPR ${D}${datadir}/* ${dest}${datadir}
+ rm -rf ${D}${datadir}/locale/
+ cp -fpPR ${WORKDIR}/SUPPORTED ${dest}
+}
+
+addtask do_install_locale after do_install before do_populate_sysroot do_package
+
+bashscripts = "mtrace sotruss xtrace"
+
+do_evacuate_scripts () {
+ target=${D}${includedir}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}
+ mkdir -p $target
+ for i in ${bashscripts}; do
+ if [ -f ${D}${bindir}/$i ]; then
+ cp ${D}${bindir}/$i $target/
+ fi
+ done
+}
+
+addtask evacuate_scripts after do_install before do_populate_sysroot do_package
+
+PACKAGE_PREPROCESS_FUNCS += "eglibc_package_preprocess"
+
+eglibc_package_preprocess () {
+ rm -rf ${PKGD}/${includedir}/eglibc-locale-internal-${MULTIMACH_TARGET_SYS}
+ rm -rf ${PKGD}/${includedir}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}
+ for i in ${bashscripts}; do
+ rm -f ${PKGD}${bindir}/$i
+ done
+ rm -rf ${PKGD}/${localedir}
+ if [ "${libdir}" != "${exec_prefix}/lib" ]; then
+ # This dir only exists to hold locales
+ rm -rf ${PKGD}${exec_prefix}/lib
+ fi
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-scripts.inc b/meta-aspeed/recipes-core/eglibc/eglibc-scripts.inc
new file mode 100644
index 0000000..9ca6673
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-scripts.inc
@@ -0,0 +1,16 @@
+include eglibc-collateral.inc
+
+SUMMARY = "utility scripts provided by eglibc"
+DESCRIPTION = "utility scripts provided by eglibc"
+RDEPENDS_${PN} = "bash eglibc-mtrace"
+
+SRC = "${STAGING_INCDIR}/eglibc-scripts-internal-${MULTIMACH_TARGET_SYS}"
+
+bashscripts = "sotruss xtrace"
+
+do_install() {
+ install -d -m 0755 ${D}${bindir}
+ for i in ${bashscripts}; do
+ install -m 0755 ${SRC}/$i ${D}${bindir}/
+ done
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-scripts_2.19.bb b/meta-aspeed/recipes-core/eglibc/eglibc-scripts_2.19.bb
new file mode 100644
index 0000000..3113362
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-scripts_2.19.bb
@@ -0,0 +1 @@
+require eglibc-scripts.inc
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc-testing.inc b/meta-aspeed/recipes-core/eglibc/eglibc-testing.inc
new file mode 100644
index 0000000..ab3ec15
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc-testing.inc
@@ -0,0 +1,79 @@
+do_compile_append () {
+ # now generate script to drive testing
+ echo "#!/usr/bin/env sh" >${B}/${HOST_PREFIX}testeglibc
+ set >> ${B}/${HOST_PREFIX}testeglibc
+ # prune out the unneeded vars
+ sed -i -e "/^BASH/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^USER/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^OPT/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^DIRSTACK/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^EUID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^FUNCNAME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^GROUPS/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^HOST/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^HOME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^IFS/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LC_ALL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LOGNAME/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^MACHTYPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^OSTYPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PIPE/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^SHELL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^'/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^UID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^TERM/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PATCH_GET/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PKG_/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^POSIXLY_/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PPID/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PS4/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^Q/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^SHLVL/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^STAGING/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^LD_LIBRARY_PATH/d" ${B}/${HOST_PREFIX}testeglibc
+ sed -i -e "/^PSEUDO/d" ${B}/${HOST_PREFIX}testeglibc
+
+ # point to real sysroot not the toolchain bootstrap sysroot
+ sed -i -e "s/\-tcbootstrap//g" ${B}/${HOST_PREFIX}testeglibc
+
+ # use the final cross-gcc to test since some tests need libstdc++
+ sed -i -e "s/^PATH=.*\.gcc-cross-initial\:/PATH=/g" ${B}/${HOST_PREFIX}testeglibc
+
+ # append execution part script
+cat >> ${B}/${HOST_PREFIX}testeglibc << STOP
+target="\$1"
+if [ "x\$target" = "x" ]
+then
+ echo "Please specify the target machine and remote user in form of user@target"
+ exit 1;
+fi
+ssh \$target ls \$PWD\ 2>&1 > /dev/null
+if [ "x\$?" != "x0" ]
+then
+ echo "Failed connecting to \$target it could be because of:"
+ echo "1. You dont have passwordless ssh setup to access \$target"
+ echo "2. NFS share on \$target is not mounted or if mounted then not matching the build tree layout."
+ echo " The tree should be accessible at same location on build host and target"
+ echo " You can add nfs-server to IMAGE_FEATURES to get the nfs client on target"
+ echo "3. nfs server on build host is not running."
+ echo " Please make sure that you have 'no_root_squash' added in /etc/exports if you want"
+ echo " to test as root user on target (usually its recommended to create a non"
+ echo " root user."
+ echo " As a sanity check make sure that target can read/write to the eglibc build tree"
+ echo " Please refer to ${S}/EGLIBC.cross-testing for further instructions on setup"
+ exit 1
+fi
+ echo "# we test using cross compiler from real sysroot therefore override the" > ${B}/configparms
+ echo "# definitions that come from ${B}/config.make" >> ${B}/configparms
+
+ fgrep tcbootstrap ${B}/config.make > ${B}/configparms
+ sed -i -e "s/\-tcbootstrap//g" ${B}/configparms
+wrapper="${S}/scripts/cross-test-ssh.sh \$target"
+localedef="${STAGING_BINDIR_NATIVE}/cross-localedef --little-endian --uint32-align=4"
+make tests-clean
+make cross-localedef="\$localedef" cross-test-wrapper="\$wrapper" -k check
+rm -rf ${B}/configparms
+STOP
+
+ chmod +x ${B}/${HOST_PREFIX}testeglibc
+}
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc.inc b/meta-aspeed/recipes-core/eglibc/eglibc.inc
new file mode 100644
index 0000000..c0b2494
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc.inc
@@ -0,0 +1,84 @@
+require eglibc-common.inc
+require eglibc-ld.inc
+require eglibc-testing.inc
+
+STAGINGCC = "gcc-cross-initial-${TARGET_ARCH}"
+STAGINGCC_class-nativesdk = "gcc-crosssdk-initial-${TARGET_ARCH}"
+PATH_prepend = "${STAGING_BINDIR_TOOLCHAIN}.${STAGINGCC}:"
+
+TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TCBOOTSTRAP}"
+
+# eglibc can't be built without optimization, if someone tries to compile an
+# entire image as -O0, we override it with -O2 here and give a note about it.
+def get_optimization(d):
+ selected_optimization = d.getVar("SELECTED_OPTIMIZATION", True)
+ if base_contains("SELECTED_OPTIMIZATION", "-O0", "x", "", d) == "x":
+ bb.note("eglibc can't be built with -O0, -O2 will be used instead.")
+ return selected_optimization.replace("-O0", "-O2")
+ return selected_optimization
+
+SELECTED_OPTIMIZATION := "${@get_optimization(d)}"
+
+# siteconfig.bbclass runs configure which needs a working compiler
+# For the compiler to work we need a working libc yet libc isn't
+# in the sysroots directory at this point. This means the libc.so
+# linker script won't work as the --sysroot setting isn't correct.
+# Here we create a hacked up libc linker script and pass in the right
+# flags to let configure work. Ugly.
+EXTRASITECONFIG = "CFLAGS='${CFLAGS} -Wl,-L${WORKDIR}/site_config_libc -L${WORKDIR}/site_config_libc -L${SYSROOT_DESTDIR}${libdir} -L${SYSROOT_DESTDIR}${base_libdir} -Wl,-L${SYSROOT_DESTDIR}${libdir} -Wl,-L${SYSROOT_DESTDIR}${base_libdir}'"
+siteconfig_do_siteconfig_gencache_prepend = " \
+ mkdir -p ${WORKDIR}/site_config_libc; \
+ cp ${SYSROOT_DESTDIR}${libdir}/libc.so ${WORKDIR}/site_config_libc; \
+ sed -i -e 's# ${base_libdir}# ${SYSROOT_DESTDIR}${base_libdir}#g' -e 's# ${libdir}# ${SYSROOT_DESTDIR}${libdir}#g' ${WORKDIR}/site_config_libc/libc.so; \
+"
+
+# nptl needs unwind support in gcc, which can't be built without glibc.
+DEPENDS = "virtual/${TARGET_PREFIX}gcc-initial libgcc-initial linux-libc-headers virtual/${TARGET_PREFIX}libc-initial"
+# nptl needs libgcc but dlopens it, so our shlibs code doesn't detect this
+#RDEPENDS_${PN} += "${@['','libgcc']['nptl' in '${GLIBC_ADDONS}']}"
+PROVIDES = "virtual/libc virtual/${TARGET_PREFIX}libc-for-gcc"
+PROVIDES += "virtual/libintl virtual/libiconv"
+inherit autotools
+require eglibc-options.inc
+
+LEAD_SONAME = "libc.so"
+
+CACHED_CONFIGUREVARS += "ac_cv_path_KSH=${base_bindir}/bash \
+ ac_cv_path_BASH_SHELL=${base_bindir}/bash \
+ libc_cv_localedir=${localedir} \
+ libc_cv_ssp=no \
+ "
+
+GLIBC_EXTRA_OECONF ?= ""
+GLIBC_EXTRA_OECONF_class-nativesdk = ""
+INHIBIT_DEFAULT_DEPS = "1"
+
+ARM_INSTRUCTION_SET = "arm"
+
+# eglibc uses PARALLELMFLAGS variable to pass parallel build info so transfer
+# PARALLEL_MAKE into PARALLELMFLAGS and empty out PARALLEL_MAKE
+EGLIBCPARALLELISM := "PARALLELMFLAGS="${PARALLEL_MAKE}""
+EXTRA_OEMAKE[vardepsexclude] += "EGLIBCPARALLELISM"
+EXTRA_OEMAKE += "${EGLIBCPARALLELISM}"
+PARALLEL_MAKE = ""
+
+# eglibc make-syscalls.sh has a number of issues with /bin/dash and
+# it's output which make calls via the SHELL also has issues, so
+# ensure make uses /bin/bash
+EXTRA_OEMAKE += "SHELL=/bin/bash"
+
+OE_FEATURES = "${@features_to_eglibc_settings(d)}"
+do_configure_prepend() {
+ sed -e "s#@BASH@#/bin/sh#" -i ${S}/elf/ldd.bash.in
+ echo '${OE_FEATURES}' > ${B}/option-groups.config
+}
+
+do_configure_append() {
+ oe_runmake config
+
+ # Remove quotation marks from OPTION_EGLIBC_NSSWITCH_FIXED_*. This will
+ # avoid install error.
+ sed -i 's/^OPTION_EGLIBC_NSSWITCH_FIXED_\(.*\)="\(.*\)"$/OPTION_EGLIBC_NSSWITCH_FIXED_\1=\2/' option-groups.config
+}
+
+GLIBC_ADDONS ?= "ports,nptl,libidn"
diff --git a/meta-aspeed/recipes-core/eglibc/eglibc_2.19.bb b/meta-aspeed/recipes-core/eglibc/eglibc_2.19.bb
new file mode 100644
index 0000000..c65e6a5
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/eglibc_2.19.bb
@@ -0,0 +1,147 @@
+require eglibc.inc
+
+DEPENDS += "gperf-native kconfig-frontends-native"
+
+SRC_URI = "http://downloads.yoctoproject.org/releases/eglibc/eglibc-${PV}-svnr25243.tar.bz2 \
+ file://eglibc-svn-arm-lowlevellock-include-tls.patch \
+ file://IO-acquire-lock-fix.patch \
+ file://mips-rld-map-check.patch \
+ file://etc/ld.so.conf \
+ file://generate-supported.mk \
+ file://glibc.fix_sqrt2.patch \
+ file://multilib_readlib.patch \
+ file://ppc-sqrt_finite.patch \
+ file://GLRO_dl_debug_mask.patch \
+ file://initgroups_keys.patch \
+ file://eglibc_fix_findidx_parameters.patch \
+ file://ppc_slow_ieee754_sqrt.patch \
+ file://fileops-without-wchar-io.patch \
+ file://add_resource_h_to_wait_h.patch \
+ file://0001-eglibc-menuconfig-support.patch \
+ file://0002-eglibc-menuconfig-hex-string-options.patch \
+ file://0003-eglibc-menuconfig-build-instructions.patch \
+ file://fsl-ppc-no-fsqrt.patch \
+ file://0001-R_ARM_TLS_DTPOFF32.patch \
+ file://0001-eglibc-run-libm-err-tab.pl-with-specific-dirs-in-S.patch \
+ file://fix-tibetian-locales.patch \
+ file://ppce6500-32b_slow_ieee754_sqrt.patch \
+ file://grok_gold.patch \
+ "
+SRC_URI[md5sum] = "197836c2ba42fb146e971222647198dd"
+SRC_URI[sha256sum] = "baaa030531fc308f7820c46acdf8e1b2f8e3c1f40bcd28b6e440d1c95d170d4c"
+
+LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \
+ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+ file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \
+ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c"
+
+SRC_URI_append_class-nativesdk = " file://ld-search-order.patch \
+ file://relocatable_sdk.patch \
+ file://relocatable_sdk_fix_openpath.patch \
+ "
+S = "${WORKDIR}/eglibc-${PV}/libc"
+B = "${WORKDIR}/build-${TARGET_SYS}"
+
+PACKAGES_DYNAMIC = ""
+
+# the -isystem in bitbake.conf screws up glibc do_stage
+BUILD_CPPFLAGS = "-I${STAGING_INCDIR_NATIVE}"
+TARGET_CPPFLAGS = "-I${STAGING_DIR_TARGET}${includedir}"
+
+GLIBC_BROKEN_LOCALES = " _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1"
+
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/eglibc-${PV}', '${FILE_DIRNAME}/eglibc', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+#
+# For now, we will skip building of a gcc package if it is a uclibc one
+# and our build is not a uclibc one, and we skip a glibc one if our build
+# is a uclibc build.
+#
+# See the note in gcc/gcc_3.4.0.oe
+#
+
+python __anonymous () {
+ import re
+ uc_os = (re.match('.*uclibc$', d.getVar('TARGET_OS', True)) != None)
+ if uc_os:
+ raise bb.parse.SkipPackage("incompatible with target %s" %
+ d.getVar('TARGET_OS', True))
+}
+
+export libc_cv_slibdir = "${base_libdir}"
+
+EXTRA_OECONF = "--enable-kernel=${OLDEST_KERNEL} \
+ --without-cvs --disable-profile \
+ --disable-debug --without-gd \
+ --enable-clocale=gnu \
+ --enable-add-ons \
+ --with-headers=${STAGING_INCDIR} \
+ --without-selinux \
+ --enable-obsolete-rpc \
+ --with-kconfig=${STAGING_BINDIR_NATIVE} \
+ ${GLIBC_EXTRA_OECONF}"
+
+EXTRA_OECONF += "${@get_libc_fpu_setting(bb, d)}"
+
+do_patch_append() {
+ bb.build.exec_func('do_fix_readlib_c', d)
+}
+
+# for mips eglibc now builds syscall tables for all abi's
+# so we make sure that we choose right march option which is
+# compatible with o32,n32 and n64 abi's
+# e.g. -march=mips32 is not compatible with n32 and n64 therefore
+# we filter it out in such case -march=from-abi which will be
+# mips1 when using o32 and mips3 when using n32/n64
+
+TUNE_CCARGS_mips := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}"
+TUNE_CCARGS_mipsel := "${@oe_filter_out('-march=mips32', '${TUNE_CCARGS}', d)}"
+
+do_fix_readlib_c () {
+ sed -i -e 's#OECORE_KNOWN_INTERPRETER_NAMES#${EGLIBC_KNOWN_INTERPRETER_NAMES}#' ${S}/elf/readlib.c
+}
+
+do_configure () {
+# override this function to avoid the autoconf/automake/aclocal/autoheader
+# calls for now
+# don't pass CPPFLAGS into configure, since it upsets the kernel-headers
+# version check and doesn't really help with anything
+ if [ -z "`which rpcgen`" ]; then
+ echo "rpcgen not found. Install glibc-devel."
+ exit 1
+ fi
+ (cd ${S} && gnu-configize) || die "failure in running gnu-configize"
+ find ${S} -name "configure" | xargs touch
+ CPPFLAGS="" oe_runconf
+}
+
+rpcsvc = "bootparam_prot.x nlm_prot.x rstat.x \
+ yppasswd.x klm_prot.x rex.x sm_inter.x mount.x \
+ rusers.x spray.x nfs_prot.x rquota.x key_prot.x"
+
+do_compile () {
+ # -Wl,-rpath-link <staging>/lib in LDFLAGS can cause breakage if another glibc is in staging
+ unset LDFLAGS
+ base_do_compile
+ (
+ cd ${S}/sunrpc/rpcsvc
+ for r in ${rpcsvc}; do
+ h=`echo $r|sed -e's,\.x$,.h,'`
+ rpcgen -h $r -o $h || bbwarn "unable to generate header for $r"
+ done
+ )
+ echo "Adjust ldd script"
+ if [ -n "${RTLDLIST}" ]
+ then
+ prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'`
+ if [ "${prevrtld}" != "${RTLDLIST}" ]
+ then
+ sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#"
+ fi
+ fi
+
+}
+
+require eglibc-package.inc
+
+BBCLASSEXTEND = "nativesdk"
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch
new file mode 100644
index 0000000..cdfeaea
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/32and64bit.patch
@@ -0,0 +1,331 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+We run the ldconfig in the cross fashion. make the code bitsize aware so that
+we can cross build ldconfig cache for various architectures.
+
+Richard Purdie <richard.purdie@linuxfoundation.org> 2009/05/19
+Nitin A Kamble <nitin.a.kamble@intel.com> 2009/03/29
+
+Index: ldconfig-native-2.12.1/readelflib.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/readelflib.c
++++ ldconfig-native-2.12.1/readelflib.c
+@@ -40,39 +40,212 @@ do \
+
+ /* Returns 0 if everything is ok, != 0 in case of error. */
+ int
+-process_elf_file (const char *file_name, const char *lib, int *flag,
++process_elf_file32 (const char *file_name, const char *lib, int *flag,
+ unsigned int *osversion, char **soname, void *file_contents,
+ size_t file_length)
+ {
+ int i;
+ unsigned int j;
+- ElfW(Addr) loadaddr;
++ Elf32_Addr loadaddr;
+ unsigned int dynamic_addr;
+ size_t dynamic_size;
+ char *program_interpreter;
+
+- ElfW(Ehdr) *elf_header;
+- ElfW(Phdr) *elf_pheader, *segment;
+- ElfW(Dyn) *dynamic_segment, *dyn_entry;
++ Elf32_Ehdr *elf_header;
++ Elf32_Phdr *elf_pheader, *segment;
++ Elf32_Dyn *dynamic_segment, *dyn_entry;
+ char *dynamic_strings;
+
+- elf_header = (ElfW(Ehdr) *) file_contents;
++ elf_header = (Elf32_Ehdr *) file_contents;
+ *osversion = 0;
+
+- if (elf_header->e_ident [EI_CLASS] != ElfW (CLASS))
++ if (elf_header->e_type != ET_DYN)
+ {
+- if (opt_verbose)
++ error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
++ elf_header->e_type);
++ return 1;
++ }
++
++ /* Get information from elf program header. */
++ elf_pheader = (Elf32_Phdr *) (elf_header->e_phoff + file_contents);
++ check_ptr (elf_pheader);
++
++ /* The library is an elf library, now search for soname and
++ libc5/libc6. */
++ *flag = FLAG_ELF;
++
++ loadaddr = -1;
++ dynamic_addr = 0;
++ dynamic_size = 0;
++ program_interpreter = NULL;
++ for (i = 0, segment = elf_pheader;
++ i < elf_header->e_phnum; i++, segment++)
++ {
++ check_ptr (segment);
++
++ switch (segment->p_type)
+ {
+- if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
+- error (0, 0, _("%s is a 32 bit ELF file.\n"), file_name);
+- else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
+- error (0, 0, _("%s is a 64 bit ELF file.\n"), file_name);
+- else
+- error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);
++ case PT_LOAD:
++ if (loadaddr == (Elf32_Addr) -1)
++ loadaddr = segment->p_vaddr - segment->p_offset;
++ break;
++
++ case PT_DYNAMIC:
++ if (dynamic_addr)
++ error (0, 0, _("more than one dynamic segment\n"));
++
++ dynamic_addr = segment->p_offset;
++ dynamic_size = segment->p_filesz;
++ break;
++
++ case PT_INTERP:
++ program_interpreter = (char *) (file_contents + segment->p_offset);
++ check_ptr (program_interpreter);
++
++ /* Check if this is enough to classify the binary. */
++ for (j = 0; j < sizeof (interpreters) / sizeof (interpreters [0]);
++ ++j)
++ if (strcmp (program_interpreter, interpreters[j].soname) == 0)
++ {
++ *flag = interpreters[j].flag;
++ break;
++ }
++ break;
++
++ case PT_NOTE:
++ if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4)
++ {
++ Elf32_Word *abi_note = (Elf32_Word *) (file_contents
++ + segment->p_offset);
++ Elf32_Addr size = segment->p_filesz;
++
++ while (abi_note [0] != 4 || abi_note [1] != 16
++ || abi_note [2] != 1
++ || memcmp (abi_note + 3, "GNU", 4) != 0)
++ {
++#define ROUND(len) (((len) + sizeof (Elf32_Word)) - 1) & -sizeof (Elf32_Word)))
++ Elf32_Addr) note_size = 3 * sizeof (Elf32_Word))
++ + ROUND (abi_note[0])
++ + ROUND (abi_note[1]);
++
++ if (size - 32 < note_size || note_size == 0)
++ {
++ size = 0;
++ break;
++ }
++ size -= note_size;
++ abi_note = (void *) abi_note + note_size;
++ }
++
++ if (size == 0)
++ break;
++
++ *osversion = (abi_note [4] << 24) |
++ ((abi_note [5] & 0xff) << 16) |
++ ((abi_note [6] & 0xff) << 8) |
++ (abi_note [7] & 0xff);
++ }
++ break;
++
++ default:
++ break;
++ }
++
++ }
++ if (loadaddr == (Elf32_Addr) -1)
++ {
++ /* Very strange. */
++ loadaddr = 0;
++ }
++
++ /* Now we can read the dynamic sections. */
++ if (dynamic_size == 0)
++ return 1;
++
++ dynamic_segment = (Elf32_Dyn *) (file_contents + dynamic_addr);
++ check_ptr (dynamic_segment);
++
++ /* Find the string table. */
++ dynamic_strings = NULL;
++ for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ ++dyn_entry)
++ {
++ check_ptr (dyn_entry);
++ if (dyn_entry->d_tag == DT_STRTAB)
++ {
++ dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
++ check_ptr (dynamic_strings);
++ break;
+ }
+- return 1;
+ }
+
++ if (dynamic_strings == NULL)
++ return 1;
++
++ /* Now read the DT_NEEDED and DT_SONAME entries. */
++ for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ ++dyn_entry)
++ {
++ if (dyn_entry->d_tag == DT_NEEDED || dyn_entry->d_tag == DT_SONAME)
++ {
++ char *name = dynamic_strings + dyn_entry->d_un.d_val;
++ check_ptr (name);
++
++ if (dyn_entry->d_tag == DT_NEEDED)
++ {
++
++ if (*flag == FLAG_ELF)
++ {
++ /* Check if this is enough to classify the binary. */
++ for (j = 0;
++ j < sizeof (known_libs) / sizeof (known_libs [0]);
++ ++j)
++ if (strcmp (name, known_libs [j].soname) == 0)
++ {
++ *flag = known_libs [j].flag;
++ break;
++ }
++ }
++ }
++
++ else if (dyn_entry->d_tag == DT_SONAME)
++ *soname = xstrdup (name);
++
++ /* Do we have everything we need? */
++ if (*soname && *flag != FLAG_ELF)
++ return 0;
++ }
++ }
++
++ /* We reach this point only if the file doesn't contain a DT_SONAME
++ or if we can't classify the library. If it doesn't have a
++ soname, return the name of the library. */
++ if (*soname == NULL)
++ *soname = xstrdup (lib);
++
++ return 0;
++}
++
++int
++process_elf_file64 (const char *file_name, const char *lib, int *flag,
++ unsigned int *osversion, char **soname, void *file_contents,
++ size_t file_length)
++{
++ int i;
++ unsigned int j;
++ Elf64_Addr loadaddr;
++ unsigned int dynamic_addr;
++ size_t dynamic_size;
++ char *program_interpreter;
++
++ Elf64_Ehdr *elf_header;
++ Elf64_Phdr *elf_pheader, *segment;
++ Elf64_Dyn *dynamic_segment, *dyn_entry;
++ char *dynamic_strings;
++
++ elf_header = (Elf64_Ehdr *) file_contents;
++ *osversion = 0;
++
+ if (elf_header->e_type != ET_DYN)
+ {
+ error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
+@@ -81,7 +254,7 @@ process_elf_file (const char *file_name,
+ }
+
+ /* Get information from elf program header. */
+- elf_pheader = (ElfW(Phdr) *) (elf_header->e_phoff + file_contents);
++ elf_pheader = (Elf64_Phdr *) (elf_header->e_phoff + file_contents);
+ check_ptr (elf_pheader);
+
+ /* The library is an elf library, now search for soname and
+@@ -100,7 +273,7 @@ process_elf_file (const char *file_name,
+ switch (segment->p_type)
+ {
+ case PT_LOAD:
+- if (loadaddr == (ElfW(Addr)) -1)
++ if (loadaddr == (Elf64_Addr) -1)
+ loadaddr = segment->p_vaddr - segment->p_offset;
+ break;
+
+@@ -129,16 +302,16 @@ process_elf_file (const char *file_name,
+ case PT_NOTE:
+ if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4)
+ {
+- ElfW(Word) *abi_note = (ElfW(Word) *) (file_contents
++ Elf64_Word *abi_note = (Elf64_Word *) (file_contents
+ + segment->p_offset);
+- ElfW(Addr) size = segment->p_filesz;
++ Elf64_Addr size = segment->p_filesz;
+
+ while (abi_note [0] != 4 || abi_note [1] != 16
+ || abi_note [2] != 1
+ || memcmp (abi_note + 3, "GNU", 4) != 0)
+ {
+-#define ROUND(len) (((len) + sizeof (ElfW(Word)) - 1) & -sizeof (ElfW(Word)))
+- ElfW(Addr) note_size = 3 * sizeof (ElfW(Word))
++#define ROUND(len) (((len) + sizeof (Elf64_Word) - 1) & -sizeof (Elf64_Word))
++ Elf64_Addr note_size = 3 * sizeof (Elf64_Word)
+ + ROUND (abi_note[0])
+ + ROUND (abi_note[1]);
+
+@@ -166,7 +339,7 @@ process_elf_file (const char *file_name,
+ }
+
+ }
+- if (loadaddr == (ElfW(Addr)) -1)
++ if (loadaddr == (Elf64_Addr) -1)
+ {
+ /* Very strange. */
+ loadaddr = 0;
+@@ -176,7 +349,7 @@ process_elf_file (const char *file_name,
+ if (dynamic_size == 0)
+ return 1;
+
+- dynamic_segment = (ElfW(Dyn) *) (file_contents + dynamic_addr);
++ dynamic_segment = (Elf64_Dyn *) (file_contents + dynamic_addr);
+ check_ptr (dynamic_segment);
+
+ /* Find the string table. */
+@@ -233,3 +406,33 @@ process_elf_file (const char *file_name,
+
+ return 0;
+ }
++/* Returns 0 if everything is ok, != 0 in case of error. */
++int
++process_elf_file (const char *file_name, const char *lib, int *flag,
++ unsigned int *osversion, char **soname, void *file_contents,
++ size_t file_length)
++{
++ int i;
++ unsigned int j;
++ ElfW(Addr) loadaddr;
++ unsigned int dynamic_addr;
++ size_t dynamic_size;
++ char *program_interpreter;
++
++ ElfW(Ehdr) *elf_header;
++ ElfW(Phdr) *elf_pheader, *segment;
++ ElfW(Dyn) *dynamic_segment, *dyn_entry;
++ char *dynamic_strings;
++
++ elf_header = (ElfW(Ehdr) *) file_contents;
++ *osversion = 0;
++
++ if (elf_header->e_ident [EI_CLASS] == ELFCLASS32)
++ return process_elf_file32(file_name, lib,flag, osversion, soname, file_contents, file_length);
++ else if (elf_header->e_ident [EI_CLASS] == ELFCLASS64)
++ return process_elf_file64(file_name, lib,flag, osversion, soname, file_contents, file_length);
++ error (0, 0, _("Unknown ELFCLASS in file %s.\n"), file_name);
++ return 1;
++}
++
++
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/README b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/README
new file mode 100644
index 0000000..43fb983
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/README
@@ -0,0 +1,8 @@
+The files are pulled verbatim from glibc 2.5 and then patched to allow
+standalone compilation of ldconfig.
+
+Richard Purdie
+OpenedHand Ltd.
+
+Upgraded the ldconfig recipe to eglibc 2.12.1
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/03/29
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch
new file mode 100644
index 0000000..7f8e4db
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endian-ness_handling.patch
@@ -0,0 +1,454 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+Do data input/output handling according to endien-ness of the library file. That
+enables use of ldconfig in the cross fashion for any architecture.
+
+2011/04/04
+Richard Purdie <richard.purdie@linuxfoundation.org>
+Nitin Kamble <nitin.a.kamble@intel.com>
+
+Index: ldconfig-native-2.12.1/readelflib.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/readelflib.c
++++ ldconfig-native-2.12.1/readelflib.c
+@@ -38,6 +38,28 @@ do \
+ } \
+ while (0);
+
++int be;
++static uint16_t read16(uint16_t x, int be)
++{
++ if (be)
++ return be16toh(x);
++ return le16toh(x);
++}
++
++static uint32_t read32(uint32_t x, int be)
++{
++ if (be)
++ return be32toh(x);
++ return le32toh(x);
++}
++
++static uint64_t read64(uint64_t x, int be)
++{
++ if (be)
++ return be64toh(x);
++ return le64toh(x);
++}
++
+ /* Returns 0 if everything is ok, != 0 in case of error. */
+ int
+ process_elf_file32 (const char *file_name, const char *lib, int *flag,
+@@ -59,15 +81,17 @@ process_elf_file32 (const char *file_nam
+ elf_header = (Elf32_Ehdr *) file_contents;
+ *osversion = 0;
+
+- if (elf_header->e_type != ET_DYN)
++ be = (elf_header->e_ident[EI_DATA] == ELFDATA2MSB);
++
++ if (read16(elf_header->e_type, be) != ET_DYN)
+ {
+ error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
+- elf_header->e_type);
++ read16(elf_header->e_type, be));
+ return 1;
+ }
+
+ /* Get information from elf program header. */
+- elf_pheader = (Elf32_Phdr *) (elf_header->e_phoff + file_contents);
++ elf_pheader = (Elf32_Phdr *) (read32(elf_header->e_phoff, be) + file_contents);
+ check_ptr (elf_pheader);
+
+ /* The library is an elf library, now search for soname and
+@@ -79,27 +103,27 @@ process_elf_file32 (const char *file_nam
+ dynamic_size = 0;
+ program_interpreter = NULL;
+ for (i = 0, segment = elf_pheader;
+- i < elf_header->e_phnum; i++, segment++)
++ i < read16(elf_header->e_phnum, be); i++, segment++)
+ {
+ check_ptr (segment);
+
+- switch (segment->p_type)
++ switch (read32(segment->p_type, be))
+ {
+ case PT_LOAD:
+ if (loadaddr == (Elf32_Addr) -1)
+- loadaddr = segment->p_vaddr - segment->p_offset;
++ loadaddr = read32(segment->p_vaddr, be) - read32(segment->p_offset, be);
+ break;
+
+ case PT_DYNAMIC:
+ if (dynamic_addr)
+ error (0, 0, _("more than one dynamic segment\n"));
+
+- dynamic_addr = segment->p_offset;
+- dynamic_size = segment->p_filesz;
++ dynamic_addr = read32(segment->p_offset, be);
++ dynamic_size = read32(segment->p_filesz, be);
+ break;
+
+ case PT_INTERP:
+- program_interpreter = (char *) (file_contents + segment->p_offset);
++ program_interpreter = (char *) (file_contents + read32(segment->p_offset, be));
+ check_ptr (program_interpreter);
+
+ /* Check if this is enough to classify the binary. */
+@@ -113,20 +137,20 @@ process_elf_file32 (const char *file_nam
+ break;
+
+ case PT_NOTE:
+- if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4)
++ if (!*osversion && read32(segment->p_filesz, be) >= 32 && segment->p_align >= 4)
+ {
+ Elf32_Word *abi_note = (Elf32_Word *) (file_contents
+- + segment->p_offset);
+- Elf32_Addr size = segment->p_filesz;
++ + read32(segment->p_offset, be));
++ Elf32_Addr size = read32(segment->p_filesz, be);
+
+- while (abi_note [0] != 4 || abi_note [1] != 16
+- || abi_note [2] != 1
++ while (read32(abi_note [0], be) != 4 || read32(abi_note [1], be) != 16
++ || read32(abi_note [2], be) != 1
+ || memcmp (abi_note + 3, "GNU", 4) != 0)
+ {
+-#define ROUND(len) (((len) + sizeof (Elf32_Word)) - 1) & -sizeof (Elf32_Word)))
+- Elf32_Addr) note_size = 3 * sizeof (Elf32_Word))
+- + ROUND (abi_note[0])
+- + ROUND (abi_note[1]);
++#define ROUND(len) (((len) + sizeof (Elf32_Word) - 1) & -sizeof (Elf32_Word))
++ Elf32_Addr note_size = 3 * sizeof (Elf32_Word)
++ + ROUND (read32(abi_note[0], be))
++ + ROUND (read32(abi_note[1], be));
+
+ if (size - 32 < note_size || note_size == 0)
+ {
+@@ -140,10 +164,10 @@ process_elf_file32 (const char *file_nam
+ if (size == 0)
+ break;
+
+- *osversion = (abi_note [4] << 24) |
+- ((abi_note [5] & 0xff) << 16) |
+- ((abi_note [6] & 0xff) << 8) |
+- (abi_note [7] & 0xff);
++ *osversion = (read32(abi_note [4], be) << 24) |
++ ((read32(abi_note [5], be) & 0xff) << 16) |
++ ((read32(abi_note [6], be) & 0xff) << 8) |
++ (read32(abi_note [7], be) & 0xff);
+ }
+ break;
+
+@@ -167,13 +191,13 @@ process_elf_file32 (const char *file_nam
+
+ /* Find the string table. */
+ dynamic_strings = NULL;
+- for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ for (dyn_entry = dynamic_segment; read32(dyn_entry->d_tag, be) != DT_NULL;
+ ++dyn_entry)
+ {
+ check_ptr (dyn_entry);
+- if (dyn_entry->d_tag == DT_STRTAB)
++ if (read32(dyn_entry->d_tag, be) == DT_STRTAB)
+ {
+- dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
++ dynamic_strings = (char *) (file_contents + read32(dyn_entry->d_un.d_val, be) - loadaddr);
+ check_ptr (dynamic_strings);
+ break;
+ }
+@@ -183,15 +207,15 @@ process_elf_file32 (const char *file_nam
+ return 1;
+
+ /* Now read the DT_NEEDED and DT_SONAME entries. */
+- for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ for (dyn_entry = dynamic_segment; read32(dyn_entry->d_tag, be) != DT_NULL;
+ ++dyn_entry)
+ {
+- if (dyn_entry->d_tag == DT_NEEDED || dyn_entry->d_tag == DT_SONAME)
++ if (read32(dyn_entry->d_tag, be) == DT_NEEDED || read32(dyn_entry->d_tag, be) == DT_SONAME)
+ {
+- char *name = dynamic_strings + dyn_entry->d_un.d_val;
++ char *name = dynamic_strings + read32(dyn_entry->d_un.d_val, be);
+ check_ptr (name);
+
+- if (dyn_entry->d_tag == DT_NEEDED)
++ if (read32(dyn_entry->d_tag, be) == DT_NEEDED)
+ {
+
+ if (*flag == FLAG_ELF)
+@@ -208,7 +232,7 @@ process_elf_file32 (const char *file_nam
+ }
+ }
+
+- else if (dyn_entry->d_tag == DT_SONAME)
++ else if (read32(dyn_entry->d_tag, be) == DT_SONAME)
+ *soname = xstrdup (name);
+
+ /* Do we have everything we need? */
+@@ -246,15 +270,17 @@ process_elf_file64 (const char *file_nam
+ elf_header = (Elf64_Ehdr *) file_contents;
+ *osversion = 0;
+
+- if (elf_header->e_type != ET_DYN)
++ be = (elf_header->e_ident[EI_DATA] == ELFDATA2MSB);
++
++ if (read16(elf_header->e_type, be) != ET_DYN)
+ {
+ error (0, 0, _("%s is not a shared object file (Type: %d).\n"), file_name,
+- elf_header->e_type);
++ read16(elf_header->e_type, be));
+ return 1;
+ }
+
+ /* Get information from elf program header. */
+- elf_pheader = (Elf64_Phdr *) (elf_header->e_phoff + file_contents);
++ elf_pheader = (Elf64_Phdr *) (read64(elf_header->e_phoff, be) + file_contents);
+ check_ptr (elf_pheader);
+
+ /* The library is an elf library, now search for soname and
+@@ -266,27 +292,27 @@ process_elf_file64 (const char *file_nam
+ dynamic_size = 0;
+ program_interpreter = NULL;
+ for (i = 0, segment = elf_pheader;
+- i < elf_header->e_phnum; i++, segment++)
++ i < read16(elf_header->e_phnum, be); i++, segment++)
+ {
+ check_ptr (segment);
+
+- switch (segment->p_type)
++ switch (read32(segment->p_type, be))
+ {
+ case PT_LOAD:
+ if (loadaddr == (Elf64_Addr) -1)
+- loadaddr = segment->p_vaddr - segment->p_offset;
++ loadaddr = read64(segment->p_vaddr, be) - read64(segment->p_offset, be);
+ break;
+
+ case PT_DYNAMIC:
+ if (dynamic_addr)
+ error (0, 0, _("more than one dynamic segment\n"));
+
+- dynamic_addr = segment->p_offset;
+- dynamic_size = segment->p_filesz;
++ dynamic_addr = read64(segment->p_offset, be);
++ dynamic_size = read32(segment->p_filesz, be);
+ break;
+
+ case PT_INTERP:
+- program_interpreter = (char *) (file_contents + segment->p_offset);
++ program_interpreter = (char *) (file_contents + read64(segment->p_offset, be));
+ check_ptr (program_interpreter);
+
+ /* Check if this is enough to classify the binary. */
+@@ -300,20 +326,21 @@ process_elf_file64 (const char *file_nam
+ break;
+
+ case PT_NOTE:
+- if (!*osversion && segment->p_filesz >= 32 && segment->p_align >= 4)
++ if (!*osversion && read32(segment->p_filesz, be) >= 32 && read32(segment->p_align, be) >= 4)
+ {
+ Elf64_Word *abi_note = (Elf64_Word *) (file_contents
+- + segment->p_offset);
+- Elf64_Addr size = segment->p_filesz;
++ + read64(segment->p_offset, be));
++ Elf64_Addr size = read32(segment->p_filesz, be);
+
+- while (abi_note [0] != 4 || abi_note [1] != 16
+- || abi_note [2] != 1
++ while (read32(abi_note [0], be) != 4 || read32(abi_note [1], be) != 16
++ || read32(abi_note [2], be) != 1
+ || memcmp (abi_note + 3, "GNU", 4) != 0)
+ {
++#undef ROUND
+ #define ROUND(len) (((len) + sizeof (Elf64_Word) - 1) & -sizeof (Elf64_Word))
+ Elf64_Addr note_size = 3 * sizeof (Elf64_Word)
+- + ROUND (abi_note[0])
+- + ROUND (abi_note[1]);
++ + ROUND (read32(abi_note[0], be))
++ + ROUND (read32(abi_note[1], be));
+
+ if (size - 32 < note_size || note_size == 0)
+ {
+@@ -327,10 +354,10 @@ process_elf_file64 (const char *file_nam
+ if (size == 0)
+ break;
+
+- *osversion = (abi_note [4] << 24) |
+- ((abi_note [5] & 0xff) << 16) |
+- ((abi_note [6] & 0xff) << 8) |
+- (abi_note [7] & 0xff);
++ *osversion = (read32(abi_note [4], be) << 24) |
++ ((read32(abi_note [5], be) & 0xff) << 16) |
++ ((read32(abi_note [6], be) & 0xff) << 8) |
++ (read32(abi_note [7], be) & 0xff);
+ }
+ break;
+
+@@ -354,13 +381,13 @@ process_elf_file64 (const char *file_nam
+
+ /* Find the string table. */
+ dynamic_strings = NULL;
+- for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ for (dyn_entry = dynamic_segment; read64(dyn_entry->d_tag, be) != DT_NULL;
+ ++dyn_entry)
+ {
+ check_ptr (dyn_entry);
+- if (dyn_entry->d_tag == DT_STRTAB)
++ if (read64(dyn_entry->d_tag, be) == DT_STRTAB)
+ {
+- dynamic_strings = (char *) (file_contents + dyn_entry->d_un.d_val - loadaddr);
++ dynamic_strings = (char *) (file_contents + read64(dyn_entry->d_un.d_val, be) - loadaddr);
+ check_ptr (dynamic_strings);
+ break;
+ }
+@@ -370,15 +397,15 @@ process_elf_file64 (const char *file_nam
+ return 1;
+
+ /* Now read the DT_NEEDED and DT_SONAME entries. */
+- for (dyn_entry = dynamic_segment; dyn_entry->d_tag != DT_NULL;
++ for (dyn_entry = dynamic_segment; read64(dyn_entry->d_tag, be) != DT_NULL;
+ ++dyn_entry)
+ {
+- if (dyn_entry->d_tag == DT_NEEDED || dyn_entry->d_tag == DT_SONAME)
++ if (read64(dyn_entry->d_tag, be) == DT_NEEDED || read64(dyn_entry->d_tag, be) == DT_SONAME)
+ {
+- char *name = dynamic_strings + dyn_entry->d_un.d_val;
++ char *name = dynamic_strings + read64(dyn_entry->d_un.d_val, be);
+ check_ptr (name);
+
+- if (dyn_entry->d_tag == DT_NEEDED)
++ if (read64(dyn_entry->d_tag, be) == DT_NEEDED)
+ {
+
+ if (*flag == FLAG_ELF)
+@@ -395,7 +422,7 @@ process_elf_file64 (const char *file_nam
+ }
+ }
+
+- else if (dyn_entry->d_tag == DT_SONAME)
++ else if (read64(dyn_entry->d_tag, be) == DT_SONAME)
+ *soname = xstrdup (name);
+
+ /* Do we have everything we need? */
+Index: ldconfig-native-2.12.1/readlib.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/readlib.c
++++ ldconfig-native-2.12.1/readlib.c
+@@ -169,7 +169,8 @@ process_file (const char *real_file_name
+ ret = 1;
+ }
+ /* Libraries have to be shared object files. */
+- else if (elf_header->e_type != ET_DYN)
++ else if ((elf_header->e_ident[EI_DATA] == ELFDATA2MSB && be16toh(elf_header->e_type) != ET_DYN) ||
++ (elf_header->e_ident[EI_DATA] == ELFDATA2LSB && le16toh(elf_header->e_type) != ET_DYN))
+ ret = 1;
+ else if (process_elf_file (file_name, lib, flag, osversion, soname,
+ file_contents, statbuf.st_size))
+Index: ldconfig-native-2.12.1/cache.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/cache.c
++++ ldconfig-native-2.12.1/cache.c
+@@ -39,6 +39,29 @@
+ # define N_(msgid) msgid
+ #define _(msg) msg
+
++extern int be;
++
++static uint16_t write16(uint16_t x, int be)
++{
++ if (be)
++ return htobe16(x);
++ return htole16(x);
++}
++
++static uint32_t write32(uint32_t x, int be)
++{
++ if (be)
++ return htobe32(x);
++ return htole32(x);
++}
++
++static uint64_t write64(uint64_t x, int be)
++{
++ if (be)
++ return htobe64(x);
++ return htole64(x);
++}
++
+ struct cache_entry
+ {
+ char *lib; /* Library name. */
+@@ -279,7 +302,12 @@ save_cache (const char *cache_name)
+ /* Number of normal cache entries. */
+ int cache_entry_old_count = 0;
+
+- for (entry = entries; entry != NULL; entry = entry->next)
++ if (be)
++ printf("saving cache in big endian encoding\n");
++ else
++ printf("saving cache in little endian encoding\n");
++
++ for (entry = entries; entry != NULL; entry = entry->next)
+ {
+ /* Account the final NULs. */
+ total_strlen += strlen (entry->lib) + strlen (entry->path) + 2;
+@@ -310,7 +338,7 @@ save_cache (const char *cache_name)
+ memset (file_entries, '\0', sizeof (struct cache_file));
+ memcpy (file_entries->magic, CACHEMAGIC, sizeof CACHEMAGIC - 1);
+
+- file_entries->nlibs = cache_entry_old_count;
++ file_entries->nlibs = write32(cache_entry_old_count, be);
+ }
+
+ struct cache_file_new *file_entries_new = NULL;
+@@ -330,8 +358,8 @@ save_cache (const char *cache_name)
+ memcpy (file_entries_new->version, CACHE_VERSION,
+ sizeof CACHE_VERSION - 1);
+
+- file_entries_new->nlibs = cache_entry_count;
+- file_entries_new->len_strings = total_strlen;
++ file_entries_new->nlibs = write32(cache_entry_count, be);
++ file_entries_new->len_strings = write32(total_strlen, be);
+ }
+
+ /* Pad for alignment of cache_file_new. */
+@@ -358,9 +386,9 @@ save_cache (const char *cache_name)
+ /* First the library. */
+ if (opt_format != 2 && entry->hwcap == 0)
+ {
+- file_entries->libs[idx_old].flags = entry->flags;
++ file_entries->libs[idx_old].flags = write32(entry->flags, be);
+ /* XXX: Actually we can optimize here and remove duplicates. */
+- file_entries->libs[idx_old].key = str_offset + pad;
++ file_entries->libs[idx_old].key = write32(str_offset + pad, be);
+ }
+ if (opt_format != 0)
+ {
+@@ -368,10 +396,10 @@ save_cache (const char *cache_name)
+ not doing so makes the code easier, the string table
+ always begins at the beginning of the the new cache
+ struct. */
+- file_entries_new->libs[idx_new].flags = entry->flags;
+- file_entries_new->libs[idx_new].osversion = entry->osversion;
+- file_entries_new->libs[idx_new].hwcap = entry->hwcap;
+- file_entries_new->libs[idx_new].key = str_offset;
++ file_entries_new->libs[idx_new].flags = write32(entry->flags, be);
++ file_entries_new->libs[idx_new].osversion = write32(entry->osversion, be);
++ file_entries_new->libs[idx_new].hwcap = write64(entry->hwcap, be);
++ file_entries_new->libs[idx_new].key = write32(str_offset, be);
+ }
+
+ size_t len = strlen (entry->lib) + 1;
+@@ -379,9 +407,9 @@ save_cache (const char *cache_name)
+ str_offset += len;
+ /* Then the path. */
+ if (opt_format != 2 && entry->hwcap == 0)
+- file_entries->libs[idx_old].value = str_offset + pad;
++ file_entries->libs[idx_old].value = write32(str_offset + pad, be);
+ if (opt_format != 0)
+- file_entries_new->libs[idx_new].value = str_offset;
++ file_entries_new->libs[idx_new].value = write32(str_offset, be);
+ len = strlen (entry->path) + 1;
+ str = mempcpy (str, entry->path, len);
+ str_offset += len;
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch
new file mode 100644
index 0000000..a18b2c2
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/endianess-header.patch
@@ -0,0 +1,113 @@
+Upstream-Status: Inappropriate [fix poky patch]
+
+This patch fixes build issues with a previous endian-ness_handling.patch on
+distros that don't have macros referenced
+
+7/20/2011
+Matthew McClintock <msm@freescale.com>
+
+diff -purN ldconfig-native-2.12.1.orig/endian_extra.h ldconfig-native-2.12.1/endian_extra.h
+--- ldconfig-native-2.12.1.orig/endian_extra.h 1969-12-31 18:00:00.000000000 -0600
++++ ldconfig-native-2.12.1/endian_extra.h 2011-07-19 18:09:14.323048417 -0500
+@@ -0,0 +1,64 @@
++/* Copyright (C) 1992, 1996, 1997, 2000, 2008 Free Software Foundation, Inc.
++ This file is part of the GNU C Library.
++
++ The GNU C Library is free software; you can redistribute it and/or
++ modify it under the terms of the GNU Lesser General Public
++ License as published by the Free Software Foundation; either
++ version 2.1 of the License, or (at your option) any later version.
++
++ The GNU C Library is distributed in the hope that it will be useful,
++ but WITHOUT ANY WARRANTY; without even the implied warranty of
++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
++ Lesser General Public License for more details.
++
++ You should have received a copy of the GNU Lesser General Public
++ License along with the GNU C Library; if not, write to the Free
++ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
++ 02111-1307 USA. */
++
++#include <endian.h>
++
++#ifndef _ENDIAN_EXTRA_H
++#define _ENDIAN_EXTRA_H 1
++
++/* Don't redefine these macros if they already exist */
++#ifndef htobe16
++#ifdef __USE_BSD
++/* Conversion interfaces. */
++# include <byteswap.h>
++
++# if __BYTE_ORDER == __LITTLE_ENDIAN
++# define htobe16(x) __bswap_16 (x)
++# define htole16(x) (x)
++# define be16toh(x) __bswap_16 (x)
++# define le16toh(x) (x)
++
++# define htobe32(x) __bswap_32 (x)
++# define htole32(x) (x)
++# define be32toh(x) __bswap_32 (x)
++# define le32toh(x) (x)
++
++# define htobe64(x) __bswap_64 (x)
++# define htole64(x) (x)
++# define be64toh(x) __bswap_64 (x)
++# define le64toh(x) (x)
++# else
++# define htobe16(x) (x)
++# define htole16(x) __bswap_16 (x)
++# define be16toh(x) (x)
++# define le16toh(x) __bswap_16 (x)
++
++# define htobe32(x) (x)
++# define htole32(x) __bswap_32 (x)
++# define be32toh(x) (x)
++# define le32toh(x) __bswap_32 (x)
++
++# define htobe64(x) (x)
++# define htole64(x) __bswap_64 (x)
++# define be64toh(x) (x)
++# define le64toh(x) __bswap_64 (x)
++# endif
++#endif
++#endif
++
++#endif /* endian_extra.h */
+diff -purN ldconfig-native-2.12.1.orig/cache.c ldconfig-native-2.12.1/cache.c
+--- ldconfig-native-2.12.1.orig/cache.c 2011-07-19 18:21:28.347041301 -0500
++++ ldconfig-native-2.12.1/cache.c 2011-07-19 18:22:54.118048064 -0500
+@@ -39,6 +39,8 @@
+ # define N_(msgid) msgid
+ #define _(msg) msg
+
++#include "endian_extra.h"
++
+ extern int be;
+
+ static uint16_t write16(uint16_t x, int be)
+diff -purN ldconfig-native-2.12.1.orig/readelflib.c ldconfig-native-2.12.1/readelflib.c
+--- ldconfig-native-2.12.1.orig/readelflib.c 2011-07-19 18:21:28.346041593 -0500
++++ ldconfig-native-2.12.1/readelflib.c 2011-07-19 18:23:05.324059875 -0500
+@@ -25,6 +25,9 @@
+
+ /* check_ptr checks that a pointer is in the mmaped file and doesn't
+ point outside it. */
++
++#include "endian_extra.h"
++
+ #undef check_ptr
+ #define check_ptr(ptr) \
+ do \
+diff -purN ldconfig-native-2.12.1.orig/readlib.c ldconfig-native-2.12.1/readlib.c
+--- ldconfig-native-2.12.1.orig/readlib.c 2011-07-19 18:21:28.346041593 -0500
++++ ldconfig-native-2.12.1/readlib.c 2011-07-19 18:23:23.877046210 -0500
+@@ -40,6 +40,8 @@
+
+ #include "ldconfig.h"
+
++#include "endian_extra.h"
++
+ #define _(msg) msg
+
+ #define Elf32_CLASS ELFCLASS32
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch
new file mode 100644
index 0000000..4e9aab9
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/flag_fix.patch
@@ -0,0 +1,24 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+The native version of ldconfig was using native definition of LD_SO (i.e.
+ld-linux-x86-64.so.2 ) which is not correct for doing the cross ldconfig.
+This was causing libc.so on the target marked as ELF lib rather than
+FLAG_ELF_LIBC6 in the ld.so.cache.
+
+Nitin A Kamble <nitin.a.kamble@intel.com> 2011/04/4
+
+Index: ldconfig-native-2.12.1/readlib.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/readlib.c
++++ ldconfig-native-2.12.1/readlib.c
+@@ -51,6 +51,10 @@ struct known_names
+ int flag;
+ };
+
++/* don't use host's definition of LD_SO */
++#undef LD_SO
++#define LD_SO "ld.so.1"
++
+ static struct known_names interpreters[] =
+ {
+ { "/lib/" LD_SO, FLAG_ELF_LIBC6 },
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
new file mode 100644
index 0000000..5ed4f6f
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-default-to-all-multilib-dirs.patch
@@ -0,0 +1,37 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+make ldconfig default to both /lib+/usr/lib, /lib32+/usr/lib32 and
+/lib64+/usr/lib64 on bi-ABI architectures.
+
+---
+ ldconfig.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff -urpN a/ldconfig.c b/ldconfig.c
+--- a/ldconfig.c
++++ b/ldconfig.c
+@@ -52,7 +52,11 @@
+
+ #define SYSCONFDIR "/etc"
+ #define LIBDIR "/usr/lib"
++#define LIBDIR32 "/usr/lib32"
++#define LIBDIR64 "/usr/lib64"
+ #define SLIBDIR "/lib"
++#define SLIBDIR32 "/lib32"
++#define SLIBDIR64 "/lib64"
+ # define N_(msgid) msgid
+ #define _(msg) msg
+
+@@ -1373,6 +1377,12 @@ main (int argc, char **argv)
+ add_system_dir (SLIBDIR);
+ if (strcmp (SLIBDIR, LIBDIR))
+ add_system_dir (LIBDIR);
++ add_system_dir (SLIBDIR32);
++ if (strcmp (SLIBDIR32, LIBDIR32))
++ add_system_dir (LIBDIR32);
++ add_system_dir (SLIBDIR64);
++ if (strcmp (SLIBDIR64, LIBDIR64))
++ add_system_dir (LIBDIR64);
+ }
+
+ const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2 b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
new file mode 100644
index 0000000..dc1e798
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig-native-2.12.1.tar.bz2
Binary files differ
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch
new file mode 100644
index 0000000..52986e6
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig.patch
@@ -0,0 +1,471 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+enable standalone building of ldconfig
+
+---
+ cache.c | 11 +-
+ chroot_canon.c | 7 +
+ dl-cache.c | 235 ---------------------------------------------------------
+ dl-cache.h | 3
+ ldconfig.c | 27 ++++--
+ readlib.c | 7 +
+ xstrdup.c | 11 --
+ 7 files changed, 45 insertions(+), 256 deletions(-)
+
+Index: ldconfig-native-2.12.1/cache.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/cache.c
++++ ldconfig-native-2.12.1/cache.c
+@@ -16,6 +16,9 @@
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <errno.h>
+ #include <error.h>
+ #include <dirent.h>
+@@ -31,8 +34,10 @@
+ #include <sys/stat.h>
+ #include <sys/types.h>
+
+-#include <ldconfig.h>
+-#include <dl-cache.h>
++#include "ldconfig.h"
++#include "dl-cache.h"
++# define N_(msgid) msgid
++#define _(msg) msg
+
+ struct cache_entry
+ {
+Index: ldconfig-native-2.12.1/chroot_canon.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/chroot_canon.c
++++ ldconfig-native-2.12.1/chroot_canon.c
+@@ -17,6 +17,9 @@
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -27,7 +30,9 @@
+ #include <stddef.h>
+ #include <stdint.h>
+
+-#include <ldconfig.h>
++#include "ldconfig.h"
++
++#define __set_errno(Val) errno = (Val)
+
+ #ifndef PATH_MAX
+ #define PATH_MAX 1024
+Index: ldconfig-native-2.12.1/dl-cache.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/dl-cache.c
++++ ldconfig-native-2.12.1/dl-cache.c
+@@ -20,12 +20,12 @@
+
+ #include <assert.h>
+ #include <unistd.h>
+-#include <ldsodefs.h>
++//#include "ldsodefs.h"
+ #include <sys/mman.h>
+ #include <dl-cache.h>
+ #include <dl-procinfo.h>
+
+-#include <stdio-common/_itoa.h>
++//#include "_itoa.h"
+
+ #ifndef _DL_PLATFORMS_COUNT
+ # define _DL_PLATFORMS_COUNT 0
+@@ -39,103 +39,7 @@ static size_t cachesize;
+ /* 1 if cache_data + PTR points into the cache. */
+ #define _dl_cache_verify_ptr(ptr) (ptr < cache_data_size)
+
+-#define SEARCH_CACHE(cache) \
+-/* We use binary search since the table is sorted in the cache file. \
+- The first matching entry in the table is returned. \
+- It is important to use the same algorithm as used while generating \
+- the cache file. */ \
+-do \
+- { \
+- left = 0; \
+- right = cache->nlibs - 1; \
+- \
+- while (left <= right) \
+- { \
+- __typeof__ (cache->libs[0].key) key; \
+- \
+- middle = (left + right) / 2; \
+- \
+- key = cache->libs[middle].key; \
+- \
+- /* Make sure string table indices are not bogus before using \
+- them. */ \
+- if (! _dl_cache_verify_ptr (key)) \
+- { \
+- cmpres = 1; \
+- break; \
+- } \
+- \
+- /* Actually compare the entry with the key. */ \
+- cmpres = _dl_cache_libcmp (name, cache_data + key); \
+- if (__builtin_expect (cmpres == 0, 0)) \
+- { \
+- /* Found it. LEFT now marks the last entry for which we \
+- know the name is correct. */ \
+- left = middle; \
+- \
+- /* There might be entries with this name before the one we \
+- found. So we have to find the beginning. */ \
+- while (middle > 0) \
+- { \
+- __typeof__ (cache->libs[0].key) key; \
+- \
+- key = cache->libs[middle - 1].key; \
+- /* Make sure string table indices are not bogus before \
+- using them. */ \
+- if (! _dl_cache_verify_ptr (key) \
+- /* Actually compare the entry. */ \
+- || _dl_cache_libcmp (name, cache_data + key) != 0) \
+- break; \
+- --middle; \
+- } \
+- \
+- do \
+- { \
+- int flags; \
+- __typeof__ (cache->libs[0]) *lib = &cache->libs[middle]; \
+- \
+- /* Only perform the name test if necessary. */ \
+- if (middle > left \
+- /* We haven't seen this string so far. Test whether the \
+- index is ok and whether the name matches. Otherwise \
+- we are done. */ \
+- && (! _dl_cache_verify_ptr (lib->key) \
+- || (_dl_cache_libcmp (name, cache_data + lib->key) \
+- != 0))) \
+- break; \
+- \
+- flags = lib->flags; \
+- if (_dl_cache_check_flags (flags) \
+- && _dl_cache_verify_ptr (lib->value)) \
+- { \
+- if (best == NULL || flags == GLRO(dl_correct_cache_id)) \
+- { \
+- HWCAP_CHECK; \
+- best = cache_data + lib->value; \
+- \
+- if (flags == GLRO(dl_correct_cache_id)) \
+- /* We've found an exact match for the shared \
+- object and no general `ELF' release. Stop \
+- searching. */ \
+- break; \
+- } \
+- } \
+- } \
+- while (++middle <= right); \
+- break; \
+- } \
+- \
+- if (cmpres < 0) \
+- left = middle + 1; \
+- else \
+- right = middle - 1; \
+- } \
+- } \
+-while (0)
+-
+-
+ int
+-internal_function
+ _dl_cache_libcmp (const char *p1, const char *p2)
+ {
+ while (*p1 != '\0')
+@@ -172,139 +76,3 @@ _dl_cache_libcmp (const char *p1, const
+ }
+ return *p1 - *p2;
+ }
+-
+-
+-/* Look up NAME in ld.so.cache and return the file name stored there,
+- or null if none is found. */
+-
+-const char *
+-internal_function
+-_dl_load_cache_lookup (const char *name)
+-{
+- int left, right, middle;
+- int cmpres;
+- const char *cache_data;
+- uint32_t cache_data_size;
+- const char *best;
+-
+- /* Print a message if the loading of libs is traced. */
+- if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0))
+- _dl_debug_printf (" search cache=%s\n", LD_SO_CACHE);
+-
+- if (cache == NULL)
+- {
+- /* Read the contents of the file. */
+- void *file = _dl_sysdep_read_whole_file (LD_SO_CACHE, &cachesize,
+- PROT_READ);
+-
+- /* We can handle three different cache file formats here:
+- - the old libc5/glibc2.0/2.1 format
+- - the old format with the new format in it
+- - only the new format
+- The following checks if the cache contains any of these formats. */
+- if (file != MAP_FAILED && cachesize > sizeof *cache
+- && memcmp (file, CACHEMAGIC, sizeof CACHEMAGIC - 1) == 0)
+- {
+- size_t offset;
+- /* Looks ok. */
+- cache = file;
+-
+- /* Check for new version. */
+- offset = ALIGN_CACHE (sizeof (struct cache_file)
+- + cache->nlibs * sizeof (struct file_entry));
+-
+- cache_new = (struct cache_file_new *) ((void *) cache + offset);
+- if (cachesize < (offset + sizeof (struct cache_file_new))
+- || memcmp (cache_new->magic, CACHEMAGIC_VERSION_NEW,
+- sizeof CACHEMAGIC_VERSION_NEW - 1) != 0)
+- cache_new = (void *) -1;
+- }
+- else if (file != MAP_FAILED && cachesize > sizeof *cache_new
+- && memcmp (file, CACHEMAGIC_VERSION_NEW,
+- sizeof CACHEMAGIC_VERSION_NEW - 1) == 0)
+- {
+- cache_new = file;
+- cache = file;
+- }
+- else
+- {
+- if (file != MAP_FAILED)
+- __munmap (file, cachesize);
+- cache = (void *) -1;
+- }
+-
+- assert (cache != NULL);
+- }
+-
+- if (cache == (void *) -1)
+- /* Previously looked for the cache file and didn't find it. */
+- return NULL;
+-
+- best = NULL;
+-
+- if (cache_new != (void *) -1)
+- {
+- uint64_t platform;
+-
+- /* This is where the strings start. */
+- cache_data = (const char *) cache_new;
+-
+- /* Now we can compute how large the string table is. */
+- cache_data_size = (const char *) cache + cachesize - cache_data;
+-
+- platform = _dl_string_platform (GLRO(dl_platform));
+- if (platform != (uint64_t) -1)
+- platform = 1ULL << platform;
+-
+-#define _DL_HWCAP_TLS_MASK (1LL << 63)
+- uint64_t hwcap_exclude = ~((GLRO(dl_hwcap) & GLRO(dl_hwcap_mask))
+- | _DL_HWCAP_PLATFORM | _DL_HWCAP_TLS_MASK);
+-
+- /* Only accept hwcap if it's for the right platform. */
+-#define HWCAP_CHECK \
+- if (lib->hwcap & hwcap_exclude) \
+- continue; \
+- if (GLRO(dl_osversion) && lib->osversion > GLRO(dl_osversion)) \
+- continue; \
+- if (_DL_PLATFORMS_COUNT \
+- && (lib->hwcap & _DL_HWCAP_PLATFORM) != 0 \
+- && (lib->hwcap & _DL_HWCAP_PLATFORM) != platform) \
+- continue
+- SEARCH_CACHE (cache_new);
+- }
+- else
+- {
+- /* This is where the strings start. */
+- cache_data = (const char *) &cache->libs[cache->nlibs];
+-
+- /* Now we can compute how large the string table is. */
+- cache_data_size = (const char *) cache + cachesize - cache_data;
+-
+-#undef HWCAP_CHECK
+-#define HWCAP_CHECK do {} while (0)
+- SEARCH_CACHE (cache);
+- }
+-
+- /* Print our result if wanted. */
+- if (__builtin_expect (GLRO_dl_debug_mask & DL_DEBUG_LIBS, 0)
+- && best != NULL)
+- _dl_debug_printf (" trying file=%s\n", best);
+-
+- return best;
+-}
+-
+-#ifndef MAP_COPY
+-/* If the system does not support MAP_COPY we cannot leave the file open
+- all the time since this would create problems when the file is replaced.
+- Therefore we provide this function to close the file and open it again
+- once needed. */
+-void
+-_dl_unload_cache (void)
+-{
+- if (cache != NULL && cache != (struct cache_file *) -1)
+- {
+- __munmap (cache, cachesize);
+- cache = NULL;
+- }
+-}
+-#endif
+Index: ldconfig-native-2.12.1/dl-cache.h
+===================================================================
+--- ldconfig-native-2.12.1.orig/dl-cache.h
++++ ldconfig-native-2.12.1/dl-cache.h
+@@ -101,5 +101,4 @@ struct cache_file_new
+ (((addr) + __alignof__ (struct cache_file_new) -1) \
+ & (~(__alignof__ (struct cache_file_new) - 1)))
+
+-extern int _dl_cache_libcmp (const char *p1, const char *p2)
+- internal_function;
++extern int _dl_cache_libcmp (const char *p1, const char *p2);
+Index: ldconfig-native-2.12.1/ldconfig.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/ldconfig.c
++++ ldconfig-native-2.12.1/ldconfig.c
+@@ -16,6 +16,9 @@
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #define PROCINFO_CLASS static
+ #include <alloca.h>
+ #include <argp.h>
+@@ -39,10 +42,20 @@
+ #include <glob.h>
+ #include <libgen.h>
+
+-#include <ldconfig.h>
+-#include <dl-cache.h>
++#include "ldconfig.h"
++#include "dl-cache.h"
++
++#include "dl-procinfo.h"
++
++#include "argp.h"
++
++
++#define SYSCONFDIR "/etc"
++#define LIBDIR "/usr/lib"
++#define SLIBDIR "/lib"
++# define N_(msgid) msgid
++#define _(msg) msg
+
+-#include <dl-procinfo.h>
+
+ #ifdef _DL_FIRST_PLATFORM
+ # define _DL_FIRST_EXTRA (_DL_FIRST_PLATFORM + _DL_PLATFORMS_COUNT)
+@@ -55,7 +68,7 @@
+ #endif
+
+ /* Get libc version number. */
+-#include <version.h>
++#include "version.h"
+
+ #define PACKAGE _libc_intl_domainname
+
+@@ -152,8 +165,8 @@ static const struct argp_option options[
+ { NULL, 0, NULL, 0, NULL, 0 }
+ };
+
+-#define PROCINFO_CLASS static
+-#include <dl-procinfo.c>
++//#define PROCINFO_CLASS static
++//#include <dl-procinfo.c>
+
+ /* Short description of program. */
+ static const char doc[] = N_("Configure Dynamic Linker Run Time Bindings.");
+@@ -291,6 +304,7 @@ parse_opt (int key, char *arg, struct ar
+ return 0;
+ }
+
++#define REPORT_BUGS_TO "mailing list : poky@yoctoproject.org"
+ /* Print bug-reporting information in the help message. */
+ static char *
+ more_help (int key, const char *text, void *input)
+@@ -315,7 +329,7 @@ For bug reporting instructions, please s
+ static void
+ print_version (FILE *stream, struct argp_state *state)
+ {
+- fprintf (stream, "ldconfig %s%s\n", PKGVERSION, VERSION);
++ fprintf (stream, "ldconfig (Hacked Poky Version)\n");
+ fprintf (stream, gettext ("\
+ Copyright (C) %s Free Software Foundation, Inc.\n\
+ This is free software; see the source for copying conditions. There is NO\n\
+@@ -1233,6 +1247,7 @@ set_hwcap (void)
+ hwcap_mask = strtoul (mask, NULL, 0);
+ }
+
++const char _libc_intl_domainname[] = "libc";
+
+ int
+ main (int argc, char **argv)
+Index: ldconfig-native-2.12.1/readlib.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/readlib.c
++++ ldconfig-native-2.12.1/readlib.c
+@@ -22,6 +22,9 @@
+ development version. Besides the simplification, it has also been
+ modified to read some other file formats. */
+
++#define _LARGEFILE64_SOURCE
++#define _GNU_SOURCE
++
+ #include <a.out.h>
+ #include <elf.h>
+ #include <error.h>
+@@ -35,7 +38,9 @@
+ #include <sys/stat.h>
+ #include <gnu/lib-names.h>
+
+-#include <ldconfig.h>
++#include "ldconfig.h"
++
++#define _(msg) msg
+
+ #define Elf32_CLASS ELFCLASS32
+ #define Elf64_CLASS ELFCLASS64
+Index: ldconfig-native-2.12.1/xstrdup.c
+===================================================================
+--- ldconfig-native-2.12.1.orig/xstrdup.c
++++ ldconfig-native-2.12.1/xstrdup.c
+@@ -16,15 +16,10 @@
+ along with this program; if not, write to the Free Software Foundation,
+ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+
+-#ifdef HAVE_CONFIG_H
+-# include <config.h>
+-#endif
++#define _GNU_SOURCE
++
++#include <string.h>
+
+-#if defined STDC_HEADERS || defined HAVE_STRING_H || _LIBC
+-# include <string.h>
+-#else
+-# include <strings.h>
+-#endif
+ void *xmalloc (size_t n) __THROW;
+ char *xstrdup (char *string) __THROW;
+
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
new file mode 100644
index 0000000..27bc411
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native-2.12.1/ldconfig_aux-cache_path_fix.patch
@@ -0,0 +1,36 @@
+Upstream-Status: Pending
+
+Coming from this bug: http://sourceware.org/bugzilla/show_bug.cgi?id=11149
+
+Nitin A Kamble <nitin.a.kamble@intel.com>2011/03/29
+
+--- ldconfig-native-2.12.1.orig/ldconfig.c
++++ ldconfig-native-2.12.1/ldconfig.c
+@@ -1359,14 +1359,9 @@ main (int argc, char **argv)
+
+ const char *aux_cache_file = _PATH_LDCONFIG_AUX_CACHE;
+ if (opt_chroot)
+- {
+- aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+- if (aux_cache_file == NULL)
+- error (EXIT_FAILURE, errno, _("Can't open cache file %s\n"),
+- _PATH_LDCONFIG_AUX_CACHE);
+- }
++ aux_cache_file = chroot_canon (opt_chroot, aux_cache_file);
+
+- if (! opt_ignore_aux_cache)
++ if (! opt_ignore_aux_cache && aux_cache_file)
+ load_aux_cache (aux_cache_file);
+ else
+ init_aux_cache ();
+@@ -1376,7 +1371,8 @@ main (int argc, char **argv)
+ if (opt_build_cache)
+ {
+ save_cache (cache_file);
+- save_aux_cache (aux_cache_file);
++ if (aux_cache_file)
++ save_aux_cache (aux_cache_file);
+ }
+
+ return 0;
+
diff --git a/meta-aspeed/recipes-core/eglibc/ldconfig-native_2.12.1.bb b/meta-aspeed/recipes-core/eglibc/ldconfig-native_2.12.1.bb
new file mode 100644
index 0000000..75ffbf6
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/ldconfig-native_2.12.1.bb
@@ -0,0 +1,32 @@
+SUMMARY = "A standalone native ldconfig build"
+
+LICENSE = "GPLv2+"
+
+LIC_FILES_CHKSUM = "file://${S}/ldconfig.c;endline=17;md5=1d15f20937c055cb5de2329a4c054399"
+
+SRC_URI = "file://ldconfig-native-2.12.1.tar.bz2 \
+ file://ldconfig.patch \
+ file://ldconfig_aux-cache_path_fix.patch \
+ file://32and64bit.patch \
+ file://endian-ness_handling.patch \
+ file://flag_fix.patch \
+ file://endianess-header.patch \
+ file://ldconfig-default-to-all-multilib-dirs.patch \
+"
+
+PR = "r2"
+
+FILESPATH = "${FILE_DIRNAME}/${PN}-${PV}/"
+
+inherit native
+
+S = "${WORKDIR}/${PN}-${PV}"
+
+do_compile () {
+ $CC ldconfig.c -std=gnu99 chroot_canon.c xmalloc.c xstrdup.c cache.c readlib.c -I. dl-cache.c -o ldconfig
+}
+
+do_install () {
+ install -d ${D}/${bindir}/
+ install ldconfig ${D}/${bindir}/
+}
diff --git a/meta-aspeed/recipes-core/eglibc/site_config/funcs b/meta-aspeed/recipes-core/eglibc/site_config/funcs
new file mode 100644
index 0000000..ccc8539
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/site_config/funcs
@@ -0,0 +1,474 @@
+a64l
+abs
+access
+__adjtimex
+alarm
+alphasort
+argz_append
+__argz_count
+argz_create_sep
+argz_insert
+__argz_next
+argz_next
+__argz_stringify
+argz_stringify
+asprintf
+atexit
+atof
+atoi
+bcmp
+bcopy
+bindresvport
+bind_textdomain_codeset
+btowc
+bzero
+calloc
+canonicalize_file_name
+catgets
+cfgetospeed
+cfsetispeed
+cfsetspeed
+chmod
+chown
+chroot
+clock
+close
+closedir
+closelog
+confstr
+connect
+daemon
+dcgettext
+difftime
+dirfd
+dirname
+dngettext
+dup2
+ecvt
+endgrent
+endmntent
+endpwent
+endutent
+endutxent
+epoll_ctl
+err
+ether_hostton
+ether_ntohost
+euidaccess
+execv
+fchdir
+fchmod
+fchmodat
+fchown
+fchownat
+fcntl
+fcvt
+fdatasync
+fdopendir
+feof_unlocked
+fgets_unlocked
+fgetxattr
+finite
+flistxattr
+flock
+flockfile
+fnmatch
+fork
+fpathconf
+__fpending
+fprintf
+free
+freeaddrinfo
+freeifaddrs
+fseeko
+__fsetlocking
+fsetxattr
+fstat64
+fstat
+fstatfs
+fsync
+ftello
+ftime
+ftruncate
+funlockfile
+futimes
+futimesat
+gai_strerror
+gcvt
+getaddrinfo
+getc_unlocked
+getcwd
+getdelim
+getdomainname
+getdtablesize
+getegid
+getenv
+geteuid
+getgid
+getgrent
+getgrent_r
+getgrgid_r
+getgrnam
+getgrnam_r
+getgrouplist
+getgroups
+gethostbyaddr_r
+gethostbyname2
+gethostbyname
+gethostbyname_r
+gethostent
+gethostid
+gethostname
+getifaddrs
+getline
+getloadavg
+getmntent
+getmsg
+getnameinfo
+getnetbyaddr_r
+getnetgrent_r
+getopt
+getopt_long
+getopt_long_only
+getpagesize
+getpass
+getpeername
+getpgrp
+getpid
+getppid
+getprotoent_r
+getpwent
+getpwent_r
+getpwnam
+getpwnam_r
+getpwuid
+getpwuid_r
+getresuid
+getrlimit
+getrusage
+getservbyname
+getservbyname_r
+getservbyport_r
+getservent
+getservent_r
+getspnam
+getspnam_r
+gettimeofday
+getttyent
+getttynam
+getuid
+getusershell
+getutent
+getutid
+getutline
+getutmp
+getutmpx
+getutxent
+getutxid
+getutxline
+getwd
+getxattr
+glob
+gmtime
+gmtime_r
+grantpt
+group_member
+herror
+hstrerror
+iconv
+iconv_open
+if_freenameindex
+if_indextoname
+if_nameindex
+if_nametoindex
+index
+inet_addr
+inet_aton
+inet_ntoa
+inet_ntop
+inet_pton
+initgroups
+innetgr
+iruserok
+isascii
+isatty
+isblank
+isgraph
+isinf
+isnan
+isprint
+isspace
+iswalnum
+iswcntrl
+iswctype
+iswprint
+iswspace
+iswupper
+isxdigit
+kill
+killpg
+lchown
+lckpwdf
+lgetxattr
+link
+listxattr
+llistxattr
+localtime
+localtime_r
+lockf
+lrand48
+lsearch
+lseek64
+lsetxattr
+lstat
+mallinfo
+malloc
+mblen
+mbrlen
+mbrtowc
+mbsinit
+mbsrtowcs
+mbtowc
+memalign
+memchr
+memcmp
+memcpy
+memmove
+mempcpy
+memrchr
+memset
+mkdir
+mkdirat
+mkdtemp
+mkfifo
+mknod
+mkstemp64
+mkstemp
+mktime
+mlock
+mmap
+mtrace
+munlock
+munmap
+nanosleep
+nice
+nl_langinfo
+ntp_adjtime
+ntp_gettime
+_obstack_free
+on_exit
+open64
+open
+openat
+opendir
+openlog
+pathconf
+pipe
+poll
+popen
+posix_memalign
+prctl
+pread
+printf
+__progname
+pselect
+pthread_mutex_lock
+ptsname
+putenv
+putgrent
+putpwent
+putspent
+pututline
+pututxline
+putwc
+pwrite
+qsort
+raise
+rand
+random
+rand_r
+read
+readdir
+readdir_r
+readlink
+realloc
+realpath
+re_comp
+recvmsg
+re_exec
+regcomp
+regexec
+remove
+rename
+re_search
+rmdir
+rpmatch
+rresvport_af
+ruserok
+ruserok_af
+sbrk
+scandir
+sched_setscheduler
+sched_yield
+__secure_getenv
+select
+semctl
+semget
+sendmsg
+setbuf
+setbuffer
+setegid
+setenv
+seteuid
+setgid
+setgroups
+sethostname
+setitimer
+_setjmp
+setjmp
+setlinebuf
+setlocale
+setmntent
+setpgid
+setpgrp
+setpriority
+setregid
+setresgid
+setresuid
+setreuid
+setrlimit
+setsid
+setsockopt
+settimeofday
+setuid
+setutent
+setutxent
+setvbuf
+setxattr
+sgetspent
+shmat
+shmctl
+shmdt
+shmget
+shutdown
+sigaction
+sigaddset
+sigaltstack
+sigblock
+sigemptyset
+sighold
+siginterrupt
+signal
+sigprocmask
+sigset
+sigsetmask
+sigstack
+sigsuspend
+sigvec
+snprintf
+socket
+socketpair
+sprintf
+srand48
+srand
+srandom
+sscanf
+stat
+statfs
+statvfs
+stime
+stpcpy
+strcasecmp
+strcasestr
+strchr
+strchrnul
+strcmp
+strcspn
+strdup
+strerror
+strerror_r
+strftime
+strlen
+strncasecmp
+strncmp
+strndup
+strnlen
+strpbrk
+strptime
+strrchr
+strsep
+strsignal
+strspn
+strstr
+strtod
+strtoimax
+strtok_r
+strtol
+strtoll
+strtoul
+strtoull
+strtoumax
+strverscmp
+strxfrm
+symlink
+sync
+sysconf
+sysctl
+sysinfo
+syslog
+_sys_siglist
+sys_siglist
+system
+tcgetattr
+tcgetpgrp
+tcsetattr
+tcsetpgrp
+time
+timegm
+times
+timezone
+tmpnam
+towlower
+towupper
+truncate
+tsearch
+ttyname
+tzset
+ulimit
+umask
+uname
+unlink
+unsetenv
+unshare
+updwtmp
+updwtmpx
+usleep
+ustat
+utime
+utimes
+utmpname
+utmpxname
+valloc
+vasprintf
+verrx
+vfork
+vfprintf
+vfscanf
+vhangup
+vprintf
+vsnprintf
+vsprintf
+wait3
+wait4
+waitpid
+wcrtomb
+wcscoll
+wcsdup
+wcslen
+wctob
+wctomb
+wctype
+wcwidth
+wmemchr
+wmemcpy
+wmempcpy
diff --git a/meta-aspeed/recipes-core/eglibc/site_config/headers b/meta-aspeed/recipes-core/eglibc/site_config/headers
new file mode 100644
index 0000000..609ab53
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/site_config/headers
@@ -0,0 +1,156 @@
+aio.h
+alloca.h
+argz.h
+arpa/inet.h
+arpa/nameser.h
+asm/byteorder.h
+asm/ioctls.h
+asm/page.h
+asm/types.h
+assert.h
+byteswap.h
+crypt.h
+ctype.h
+dirent.h
+dlfcn.h
+elf.h
+endian.h
+err.h
+errno.h
+execinfo.h
+fcntl.h
+features.h
+float.h
+fstab.h
+ftw.h
+getopt.h
+glob.h
+grp.h
+iconv.h
+ifaddrs.h
+inttypes.h
+langinfo.h
+lastlog.h
+libgen.h
+libintl.h
+limits.h
+linux/capability.h
+linux/fd.h
+linux/fs.h
+linux/hayesesp.h
+linux/hdreg.h
+linux/icmp.h
+linux/in6.h
+linux/joystick.h
+linux/ptrace.h
+linux/serial.h
+linux/sonypi.h
+linux/unistd.h
+linux/utsname.h
+linux/version.h
+locale.h
+malloc.h
+math.h
+mcheck.h
+memory.h
+mntent.h
+mqueue.h
+netdb.h
+net/if.h
+netinet/ether.h
+netinet/in.h
+netinet/ip6.h
+netinet/ip.h
+netinet/tcp.h
+netinet/udp.h
+netipx/ipx.h
+net/route.h
+paths.h
+poll.h
+pthread.h
+pty.h
+pwd.h
+regex.h
+resolv.h
+rpc/rpc.h
+rpc/types.h
+sched.h
+scsi/scsi.h
+search.h
+semaphore.h
+setjmp.h
+sgtty.h
+shadow.h
+signal.h
+stdarg.h
+stdbool.h
+stdc
+stddef.h
+stdint.h
+stdio.h
+stdlib.h
+string.h
+strings.h
+stropts.h
+sys/bitypes.h
+sys/cdefs.h
+sys/dir.h
+sys/epoll.h
+sysexits.h
+sys/fcntl.h
+sys/file.h
+sys/fsuid.h
+sys/ioctl.h
+sys/ipc.h
+syslog.h
+sys/mman.h
+sys/mount.h
+sys/mtio.h
+sys/param.h
+sys/poll.h
+sys/prctl.h
+sys/ptrace.h
+sys/queue.h
+sys/reg.h
+sys/resource.h
+sys/select.h
+sys/sem.h
+sys/shm.h
+sys/signal.h
+sys/socket.h
+sys/socketvar.h
+sys/soundcard.h
+sys/statfs.h
+sys/stat.h
+sys/statvfs.h
+sys/stropts.h
+sys/swap.h
+sys/sysctl.h
+sys/sysinfo.h
+sys/sysmacros.h
+sys/termios.h
+sys/timeb.h
+sys/time.h
+sys/times.h
+sys/timex.h
+sys/types.h
+sys/uio.h
+sys/un.h
+sys/unistd.h
+sys/user.h
+sys/utsname.h
+sys/vfs.h
+sys/wait.h
+termio.h
+termios.h
+time.h
+ttyent.h
+ulimit.h
+unistd.h
+ustat.h
+utime.h
+utmp.h
+utmpx.h
+values.h
+wchar.h
+wctype.h
diff --git a/meta-aspeed/recipes-core/eglibc/site_config/types b/meta-aspeed/recipes-core/eglibc/site_config/types
new file mode 100644
index 0000000..178bd85
--- /dev/null
+++ b/meta-aspeed/recipes-core/eglibc/site_config/types
@@ -0,0 +1,21 @@
+char
+char *
+double
+float
+int
+long
+long double
+long int
+long long
+long long int
+short
+short int
+signed char
+unsigned char
+unsigned int
+unsigned long
+unsigned long int
+unsigned long long int
+unsigned short
+unsigned short int
+void *
diff --git a/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0033-Linux-snapshot-of-OpenBMC-f926614.patch b/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0033-Linux-snapshot-of-OpenBMC-f926614.patch
new file mode 100644
index 0000000..4e4c76e
--- /dev/null
+++ b/meta-aspeed/recipes-kernel/linux/files/patch-2.6.28.9/0033-Linux-snapshot-of-OpenBMC-f926614.patch
@@ -0,0 +1,978 @@
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/arch/arm/plat-aspeed/dev-i2c.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/arch/arm/plat-aspeed/dev-i2c.c
+index fffa480..a6f75b1 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/arch/arm/plat-aspeed/dev-i2c.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/arch/arm/plat-aspeed/dev-i2c.c
+@@ -634,6 +634,9 @@ static struct i2c_board_info __initdata wedge100_i2c_bus5[] = {
+ {
+ I2C_BOARD_INFO("fb_panther_plus", 0x40),
+ },
++ {
++ I2C_BOARD_INFO("com_e_driver", 0x33),
++ }
+ };
+
+ static struct i2c_board_info __initdata wedge100_i2c_bus6[] = {
+@@ -767,11 +770,17 @@ static struct i2c_board_info __initdata ast_i2c_board_info_11[] = {
+ //Under I2C Dev 12
+ static struct i2c_board_info __initdata ast_i2c_board_info_12[] = {
+ // Mezz Card LAN_SMB bus (PHY, Temp. Sensor)
++ {
++ //I2C_BOARD_INFO("tmp75", 0x1f),
++ },
+ };
+
+ //Under I2C Dev 13
+ static struct i2c_board_info __initdata ast_i2c_board_info_13[] = {
+ // Mezz Card Mezz_SMB bus (FRUID, GPIO expander, QSFP+)
++ {
++ I2C_BOARD_INFO("24c64", 0x51),
++ },
+ };
+
+ /* end of CONFIG_YOSEMITE */
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/hwmon/ast_adc.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/hwmon/ast_adc.c
+index 8f5aa54..e21d52e 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/hwmon/ast_adc.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/hwmon/ast_adc.c
+@@ -525,7 +525,7 @@ ast_show_adc(struct device *dev, struct device_attribute *attr, char *sysfsbuf)
+ break;
+ case 1: //value
+ voltage = ast_get_voltage(sensor_attr->index);
+- return sprintf(sysfsbuf, "%d.%d (V)\n",voltage/100, voltage%100);
++ return sprintf(sysfsbuf, "%d.%02d (V)\n",voltage/100, voltage%100);
+ break;
+ case 2: //alarm
+ return sprintf(sysfsbuf, "%d \n", ast_get_adc_alarm(ast_adc,sensor_attr->index));
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/i2c/busses/i2c-ast.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/i2c/busses/i2c-ast.c
+index 9bb3154..48f0192 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/i2c/busses/i2c-ast.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/i2c/busses/i2c-ast.c
+@@ -49,14 +49,22 @@
+ /***************************************************************************/
+
+ #ifdef CONFIG_AST_I2C_SLAVE_RDWR
+-#define I2C_S_BUF_SIZE 64
+-#define I2C_S_RX_BUF_NUM 4
++#define I2C_S_BUF_SIZE 256
++#define I2C_S_RX_BUF_NUM 20
+ #define BUFF_FULL 0xff00
+ #define BUFF_ONGOING 1
+ #endif
+
+ #define AST_LOCKUP_DETECTED (0x1 << 15)
+
++// Enable SCL/SDA pull LOW detection for Yosemite platform
++#ifdef CONFIG_YOSEMITE
++#define AST_I2C_LOW_TIMEOUT 0x07
++#else
++#define AST_I2C_LOW_TIMEOUT 0x00
++#endif //CONFIG_YOSEMITE
++
++
+ struct ast_i2c_dev {
+ struct ast_i2c_driver_data *ast_i2c_data;
+ struct device *dev;
+@@ -192,12 +200,12 @@ static void ast_i2c_dev_init(struct ast_i2c_dev *i2c_dev)
+ , I2C_FUN_CTRL_REG);
+
+ /* Set AC Timing */
+- ast_i2c_write(i2c_dev, 0x3, I2C_AC_TIMING_REG2);
++ ast_i2c_write(i2c_dev, AST_I2C_LOW_TIMEOUT, I2C_AC_TIMING_REG2);
+ ast_i2c_write(i2c_dev, select_i2c_clock(i2c_dev), I2C_AC_TIMING_REG1);
+ }else {
+ /* target apeed is xxKhz*/
+ ast_i2c_write(i2c_dev, select_i2c_clock(i2c_dev), I2C_AC_TIMING_REG1);
+- ast_i2c_write(i2c_dev, AST_NO_TIMEOUT_CTRL, I2C_AC_TIMING_REG2);
++ ast_i2c_write(i2c_dev, AST_I2C_LOW_TIMEOUT, I2C_AC_TIMING_REG2);
+ }
+ #else
+ /* target apeed is xxKhz*/
+@@ -252,6 +260,7 @@ static void ast_i2c_slave_buff_init(struct ast_i2c_dev *i2c_dev)
+ static void ast_i2c_slave_rdwr_xfer(struct ast_i2c_dev *i2c_dev)
+ {
+ int i;
++ int count = 0;
+ unsigned long flags;
+
+ spin_lock_irqsave(&i2c_dev->slave_rx_lock, flags);
+@@ -265,15 +274,31 @@ static void ast_i2c_slave_rdwr_xfer(struct ast_i2c_dev *i2c_dev)
+ }
+ }
+ if(i == I2C_S_RX_BUF_NUM) {
+- printk("RX buffer full ........use tmp msgs buff \n");
+- //TODO...
++ // dev_err(i2c_dev->dev, "RX buffer full ........use tmp msgs buff \n");
++ for(i=0; i<I2C_S_RX_BUF_NUM; i++) {
++ if((i2c_dev->slave_rx_msg[i].flags == 0) && (i2c_dev->slave_rx_msg[i].addr == BUFF_ONGOING)) {
++ count++;
++ i2c_dev->slave_rx_msg[i].addr = 0;
++ }
++ }
++
++ if (count) {
++ dev_err(i2c_dev->dev, "Cleared slave ongoing buffers of count: %d\n", count);
++ }
++
++ for(i=0; i<I2C_S_RX_BUF_NUM; i++) {
++ if((i2c_dev->slave_rx_msg[i].flags == 0) && (i2c_dev->slave_rx_msg[i].addr != BUFF_ONGOING)) {
++ i2c_dev->slave_rx_msg[i].addr = BUFF_ONGOING;
++ break;
++ }
++ }
+ }
+ //printk("I2C_SLAVE_EVENT_START_WRITE ... %d \n", i);
+
+ i2c_dev->slave_msgs = &i2c_dev->slave_rx_msg[i];
+ break;
+ case I2C_SLAVE_EVENT_START_READ:
+- //printk("I2C_SLAVE_EVENT_START_READ ERROR .. not imple \n");
++ // printk("I2C_SLAVE_EVENT_START_READ ERROR .. not imple \n");
+ i2c_dev->slave_msgs = &i2c_dev->slave_tx_msg;
+ break;
+ case I2C_SLAVE_EVENT_WRITE:
+@@ -379,17 +404,17 @@ ast_i2c_bus_error_recover(struct ast_i2c_dev *i2c_dev)
+
+ if ((sts & AST_I2CD_SDA_LINE_STS) && (sts & AST_I2CD_SCL_LINE_STS)) {
+ //Means bus is idle.
+- dev_dbg(i2c_dev->dev, "I2C bus (%d) is idle. I2C slave doesn't exist?!\n", i2c_dev->bus_id);
++ dev_err(i2c_dev->dev, "I2C bus (%d) is idle. I2C slave doesn't exist?!\n", i2c_dev->bus_id);
+ return -1;
+ }
+
+- dev_dbg(i2c_dev->dev, "ERROR!! I2C(%d) bus hanged, try to recovery it!\n", i2c_dev->bus_id);
++ dev_err(i2c_dev->dev, "ERROR!! I2C(%d) bus hanged, try to recovery it!\n", i2c_dev->bus_id);
+
+
+ if ((sts & AST_I2CD_SDA_LINE_STS) && !(sts & AST_I2CD_SCL_LINE_STS)) {
+ //if SDA == 1 and SCL == 0, it means the master is locking the bus.
+ //Send a stop command to unlock the bus.
+- dev_dbg(i2c_dev->dev, "I2C's master is locking the bus, try to stop it.\n");
++ dev_err(i2c_dev->dev, "I2C's master is locking the bus, try to stop it.\n");
+ //
+ init_completion(&i2c_dev->cmd_complete);
+ i2c_dev->cmd_err = 0;
+@@ -401,15 +426,15 @@ ast_i2c_bus_error_recover(struct ast_i2c_dev *i2c_dev)
+
+ if(i2c_dev->cmd_err &&
+ i2c_dev->cmd_err != AST_I2CD_INTR_STS_NORMAL_STOP) {
+- dev_dbg(i2c_dev->dev, "recovery error \n");
++ dev_err(i2c_dev->dev, "recovery error \n");
+ return -1;
+ }
+
+ if (r == 0) {
+- dev_dbg(i2c_dev->dev, "recovery timed out\n");
++ dev_err(i2c_dev->dev, "recovery timed out\n");
+ return -1;
+ } else {
+- dev_dbg(i2c_dev->dev, "Recovery successfully\n");
++ dev_err(i2c_dev->dev, "Recovery successfully\n");
+ return 0;
+ }
+
+@@ -417,19 +442,20 @@ ast_i2c_bus_error_recover(struct ast_i2c_dev *i2c_dev)
+ } else if (!(sts & AST_I2CD_SDA_LINE_STS)) {
+ //else if SDA == 0, the device is dead. We need to reset the bus
+ //And do the recovery command.
+- dev_dbg(i2c_dev->dev, "I2C's slave is dead, try to recover it\n");
++ dev_err(i2c_dev->dev, "I2C's slave is dead, try to recover it\n");
+ //Let's retry 10 times
+ for (i = 0; i < 10; i++) {
+ ast_i2c_dev_init(i2c_dev);
+ //Do the recovery command BIT11
+ init_completion(&i2c_dev->cmd_complete);
++ i2c_dev->cmd_err = 0;
+ ast_i2c_write(i2c_dev, AST_I2CD_BUS_RECOVER_CMD_EN, I2C_CMD_REG);
+
+ r = wait_for_completion_interruptible_timeout(&i2c_dev->cmd_complete,
+ i2c_dev->adap.timeout*HZ);
+ if (i2c_dev->cmd_err != 0 &&
+ i2c_dev->cmd_err != AST_I2CD_INTR_STS_NORMAL_STOP) {
+- dev_dbg(i2c_dev->dev, "ERROR!! Failed to do recovery command(0x%08x)\n", i2c_dev->cmd_err);
++ dev_err(i2c_dev->dev, "ERROR!! Failed to do recovery command(0x%08x)\n", i2c_dev->cmd_err);
+ return -1;
+ }
+ //Check 0x14's SDA and SCL status
+@@ -438,14 +464,14 @@ ast_i2c_bus_error_recover(struct ast_i2c_dev *i2c_dev)
+ break;
+ }
+ if (i == 10) {
+- dev_dbg(i2c_dev->dev, "ERROR!! recover failed\n");
++ dev_err(i2c_dev->dev, "ERROR!! recover failed\n");
+ return -1;
+ }
+ } else {
+- dev_dbg(i2c_dev->dev, "Don't know how to handle this case?!\n");
++ dev_err(i2c_dev->dev, "Don't know how to handle this case?!\n");
+ return -1;
+ }
+- dev_dbg(i2c_dev->dev, "Recovery successfully\n");
++ dev_err(i2c_dev->dev, "Recovery successfully\n");
+ return 0;
+ }
+
+@@ -472,7 +498,8 @@ static int ast_i2c_wait_bus_not_busy(struct ast_i2c_dev *i2c_dev)
+ }
+
+ if (timeout <= 0) {
+- return -EAGAIN;
++ //TODO: sometimes the slave operation flag is not reset properly so go ahead with checking bus busy signal
++ dev_err(i2c_dev->dev, "slave operation set, check busy status line\n");
+ }
+
+ // Wait for Bus to go IDLE
+@@ -491,6 +518,8 @@ static int ast_i2c_wait_bus_not_busy(struct ast_i2c_dev *i2c_dev)
+ return 0;
+ }
+
++ // TODO: hack to reset slave operation flag manually
++ i2c_dev->slave_operation = 0;
+ return 0;
+ }
+
+@@ -499,9 +528,6 @@ static void ast_i2c_do_dma_xfer(struct ast_i2c_dev *i2c_dev)
+ u32 cmd = 0;
+ int i;
+
+- i2c_dev->master_xfer_mode = DMA_XFER;
+- i2c_dev->slave_xfer_mode = DMA_XFER;
+-
+ if(i2c_dev->slave_operation == 1) {
+ if(i2c_dev->slave_msgs->flags & I2C_M_RD) {
+ //DMA tx mode
+@@ -683,9 +709,6 @@ static void ast_i2c_do_pool_xfer(struct ast_i2c_dev *i2c_dev)
+ int i;
+ u32 *tx_buf;
+
+- i2c_dev->master_xfer_mode = BUFF_XFER;
+- i2c_dev->slave_xfer_mode = BUFF_XFER;
+-
+ #if defined(CONFIG_ARCH_AST2400)
+ ast_i2c_write(i2c_dev,
+ (ast_i2c_read(i2c_dev, I2C_FUN_CTRL_REG) &
+@@ -872,12 +895,6 @@ static void ast_i2c_do_byte_xfer(struct ast_i2c_dev *i2c_dev)
+ u8 *xfer_buf;
+ u32 cmd = 0;
+
+- i2c_dev->master_xfer_mode = BYTE_XFER;
+- i2c_dev->master_xfer_len = 1;
+-
+- i2c_dev->slave_xfer_mode = BYTE_XFER;
+- i2c_dev->slave_xfer_len = 1;
+-
+ if(i2c_dev->slave_operation == 1) {
+ dev_dbg(i2c_dev->dev,"S cnt %d, xf len %d \n",i2c_dev->slave_xfer_cnt, i2c_dev->slave_msgs->len);
+ if(i2c_dev->slave_msgs->flags & I2C_M_RD) {
+@@ -973,14 +990,16 @@ static void ast_i2c_slave_xfer_done(struct ast_i2c_dev *i2c_dev)
+ u32 xfer_len;
+ int i;
+ u8 *rx_buf;
++ unsigned long flags;
+
+ dev_dbg(i2c_dev->dev, "ast_i2c_slave_xfer_done [%d]\n",i2c_dev->slave_xfer_mode);
+
++
+ if (i2c_dev->slave_msgs->flags & I2C_M_RD) {
+ //tx done , only check tx count ...
+- if(i2c_dev->master_xfer_mode == BYTE_XFER) {
++ if(i2c_dev->slave_xfer_mode == BYTE_XFER) {
+ xfer_len = 1;
+- } else if (i2c_dev->master_xfer_mode == BUFF_XFER) {
++ } else if (i2c_dev->slave_xfer_mode == BUFF_XFER) {
+ xfer_len = AST_I2CD_TX_DATA_BUF_GET(ast_i2c_read(i2c_dev, I2C_BUF_CTRL_REG));
+ xfer_len++;
+ dev_dbg(i2c_dev->dev,"S tx buff done len %d \n",xfer_len);
+@@ -1004,10 +1023,12 @@ static void ast_i2c_slave_xfer_done(struct ast_i2c_dev *i2c_dev)
+ i2c_dev->slave_msgs->buf[i2c_dev->slave_xfer_cnt] = 0;
+ i2c_dev->slave_msgs->len = i2c_dev->slave_xfer_cnt;
+ } else {
++ if (i2c_dev->slave_xfer_cnt == 0)
++ dev_err(i2c_dev->dev,"Possible first byte failure issue\n");
+ i2c_dev->slave_msgs->buf[i2c_dev->slave_xfer_cnt] = ast_i2c_read(i2c_dev,I2C_BYTE_BUF_REG) >> 8;
+ }
+ dev_dbg(i2c_dev->dev,"rx buff %d, [%x] \n",i2c_dev->slave_xfer_cnt ,i2c_dev->slave_msgs->buf[i2c_dev->slave_xfer_cnt]);
+- } else if (i2c_dev->master_xfer_mode == BUFF_XFER) {
++ } else if (i2c_dev->slave_xfer_mode == BUFF_XFER) {
+ xfer_len = AST_I2CD_RX_BUF_ADDR_GET(ast_i2c_read(i2c_dev, I2C_BUF_CTRL_REG));
+ if(xfer_len == 0)
+ xfer_len = AST_I2C_PAGE_SIZE;
+@@ -1056,7 +1077,7 @@ static void ast_i2c_slave_xfer_done(struct ast_i2c_dev *i2c_dev)
+ i2c_dev->slave_xfer_cnt = 0;
+ } else {
+ if(i2c_dev->slave_xfer_cnt == i2c_dev->slave_msgs->len) {
+- dev_dbg(i2c_dev->dev,"slave next msgs \n");
++ dev_err(i2c_dev->dev,"slave next msgs with len %d\n", i2c_dev->slave_xfer_cnt);
+ #ifdef CONFIG_AST_I2C_SLAVE_RDWR
+ ast_i2c_slave_rdwr_xfer(i2c_dev);
+ #else
+@@ -1068,6 +1089,8 @@ static void ast_i2c_slave_xfer_done(struct ast_i2c_dev *i2c_dev)
+ i2c_dev->do_slave_xfer(i2c_dev);
+ }
+
++ // Read the current state for clearing up the slave mode
++ i2c_dev->state = (ast_i2c_read(i2c_dev,I2C_CMD_REG) >> 19) & 0xf;
+
+ if(AST_I2CD_IDLE == i2c_dev->state) {
+ dev_dbg(i2c_dev->dev,"** Slave go IDLE **\n");
+@@ -1077,7 +1100,10 @@ static void ast_i2c_slave_xfer_done(struct ast_i2c_dev *i2c_dev)
+ i2c_dev->ast_i2c_data->free_pool_buff_page(i2c_dev->req_page);
+ }
+
+- }
++ } else if (i2c_dev->slave_event == I2C_SLAVE_EVENT_STOP) {
++ // TODO: hack to reset slave operation flag in case the stop is received
++ i2c_dev->slave_operation = 0;
++ }
+
+ }
+
+@@ -1212,6 +1238,8 @@ unlock_out:
+ static void ast_i2c_slave_addr_match(struct ast_i2c_dev *i2c_dev)
+ {
+ u8 match;
++ unsigned long flags;
++
+
+ i2c_dev->slave_operation = 1;
+ i2c_dev->slave_xfer_cnt = 0;
+@@ -1219,7 +1247,6 @@ static void ast_i2c_slave_addr_match(struct ast_i2c_dev *i2c_dev)
+ i2c_dev->slave_msgs->buf[0] = match;
+ dev_dbg(i2c_dev->dev, "S Start Addr match [%x] \n",match);
+
+-
+ if(match & 1) {
+ i2c_dev->slave_event = I2C_SLAVE_EVENT_START_READ;
+ } else {
+@@ -1228,23 +1255,33 @@ static void ast_i2c_slave_addr_match(struct ast_i2c_dev *i2c_dev)
+
+ #ifdef CONFIG_AST_I2C_SLAVE_RDWR
+ ast_i2c_slave_rdwr_xfer(i2c_dev);
+- i2c_dev->slave_msgs->buf[0] = match;
+- i2c_dev->slave_xfer_cnt = 1;
++ i2c_dev->slave_msgs->buf[0] = match;
++ i2c_dev->slave_xfer_cnt = 1;
++ // Reset the length field as we have received new slave address match
++ i2c_dev->slave_msgs->len = 0x0;
+ #else
+ i2c_dev->ast_i2c_data->slave_xfer(i2c_dev->slave_event, &(i2c_dev->slave_msgs));
+ i2c_dev->slave_xfer_cnt = 0;
+ #endif
+
+- //request
+- if(i2c_dev->ast_i2c_data->slave_dma == BYTE_MODE)
++ //request: set slave_xfer_mode properly based on slave_dma mode
++ if(i2c_dev->ast_i2c_data->slave_dma == BYTE_MODE) {
+ i2c_dev->do_slave_xfer = ast_i2c_do_byte_xfer;
+- else if (i2c_dev->ast_i2c_data->slave_dma == DMA_MODE)
++ i2c_dev->slave_xfer_mode = BYTE_XFER;
++ i2c_dev->slave_xfer_len = 1;
++ } else if (i2c_dev->ast_i2c_data->slave_dma == DMA_MODE) {
+ i2c_dev->do_slave_xfer = ast_i2c_do_dma_xfer;
+- else {
+- if(i2c_dev->ast_i2c_data->request_pool_buff_page(&(i2c_dev->req_page)) == 0)
++ i2c_dev->slave_xfer_mode = DMA_XFER;
++ } else {
++ if(i2c_dev->ast_i2c_data->request_pool_buff_page(&(i2c_dev->req_page)) == 0) {
+ i2c_dev->do_slave_xfer = ast_i2c_do_pool_xfer;
+- else
++ i2c_dev->slave_xfer_mode = BUFF_XFER;
++ } else {
+ i2c_dev->do_slave_xfer = ast_i2c_do_byte_xfer;
++ dev_err(i2c_dev->dev,"i2cdriver: pool request failed for slave\n");
++ i2c_dev->slave_xfer_mode = BYTE_XFER;
++ i2c_dev->slave_xfer_len = 1;
++ }
+ }
+
+ i2c_dev->do_slave_xfer(i2c_dev);
+@@ -1254,6 +1291,7 @@ static void ast_i2c_slave_addr_match(struct ast_i2c_dev *i2c_dev)
+ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ {
+ u32 sts;
++ u32 temp;
+
+ struct ast_i2c_dev *i2c_dev = dev_id;
+ u32 isr_sts = readl(i2c_dev->ast_i2c_data->reg_gr);
+@@ -1280,17 +1318,15 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ }
+
+ if(AST_I2CD_INTR_STS_ABNORMAL & sts) {
+- i2c_dev->cmd_err |= AST_I2CD_INTR_STS_ABNORMAL;
+- // Turn off interrupts for further abnormal
+- // conditions until we fix this one.
+- ast_i2c_write(i2c_dev,
+- ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) &
+- ~AST_I2CD_ABNORMAL_INTR_EN,
+- I2C_INTR_CTRL_REG);
+- complete(&i2c_dev->cmd_complete);
+- sts &= ~AST_I2CD_INTR_STS_ABNORMAL;
++ // TODO: observed abnormal interrupt happening when the bus is stressed with traffic
++ dev_err(i2c_dev->dev, "abnormal interrupt happens with status: %x, slave mode: %d\n", sts, i2c_dev->slave_operation);
+ // Need to clear the interrupt
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_ABNORMAL, I2C_INTR_STS_REG);
++
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_ABNORMAL;
++ complete(&i2c_dev->cmd_complete);
++
++ return IRQ_HANDLED;
+ }
+
+ switch(sts) {
+@@ -1316,15 +1352,47 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ ast_i2c_master_xfer_done(i2c_dev);
+
+ } else {
+- printk("ast_i2c: TX_ACK | NORMAL_STOP; xfer_last %d\n", i2c_dev->xfer_last);
++ dev_err(i2c_dev->dev,"ast_i2c: TX_ACK | NORMAL_STOP; xfer_last %d\n", i2c_dev->xfer_last);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_ACK | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
++ uint32_t new_val = ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
++ AST_I2CD_NORMAL_STOP_INTR_EN |
++ AST_I2CD_TX_ACK_INTR_EN;
++ ast_i2c_write(i2c_dev, new_val, I2C_INTR_CTRL_REG);
++ //take care
++ i2c_dev->cmd_err |= AST_LOCKUP_DETECTED;
++ complete(&i2c_dev->cmd_complete);
++ }
++ break;
++ case AST_I2CD_INTR_STS_TX_ACK | AST_I2CD_INTR_STS_NORMAL_STOP | AST_I2CD_INTR_STS_SLAVE_MATCH :
++ if((i2c_dev->xfer_last == 1) && (i2c_dev->slave_operation == 0)) {
++ dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_TX_ACK | AST_I2CD_INTR_STS_NORMAL_STOP | AST_I2CD_INTR_STS_SLAVE_MATCH= %x\n",sts);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_ACK | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
++ //take care
++ ast_i2c_write(i2c_dev, ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
++ AST_I2CD_TX_ACK_INTR_EN, I2C_INTR_CTRL_REG);
++ ast_i2c_master_xfer_done(i2c_dev);
++
++ // Handle the new slave match interrupt
++ ast_i2c_slave_addr_match(i2c_dev);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
++ } else {
++ dev_err(i2c_dev->dev, "Slave TX_ACK | NORMAL_STOP | AST_I2CD_INTR_STS_SLAVE_MATCH; xfer_last %d\n", i2c_dev->xfer_last);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_ACK | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
+ uint32_t new_val = ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
+- AST_I2CD_NORMAL_STOP_INTR_EN |
++ AST_I2CD_NORMAL_STOP_INTR_EN |
+ AST_I2CD_TX_ACK_INTR_EN;
+ ast_i2c_write(i2c_dev, new_val, I2C_INTR_CTRL_REG);
+ //take care
+ i2c_dev->cmd_err |= AST_LOCKUP_DETECTED;
+ complete(&i2c_dev->cmd_complete);
++
++ // stop previous slave transaction
++ i2c_dev->slave_event = I2C_SLAVE_EVENT_STOP;
++ ast_i2c_slave_xfer_done(i2c_dev);
++
++ // Handle the new slave match interrupt
++ ast_i2c_slave_addr_match(i2c_dev);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
+ }
+ break;
+
+@@ -1332,9 +1400,8 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ if(i2c_dev->slave_operation == 1) {
+ i2c_dev->slave_event = I2C_SLAVE_EVENT_NACK;
+ ast_i2c_slave_xfer_done(i2c_dev);
+- dev_dbg(i2c_dev->dev, "S clear isr: AST_I2CD_INTR_STS_TX_NAK = %x\n",sts);
++ dev_err(i2c_dev->dev, "S clear isr: AST_I2CD_INTR_STS_TX_NAK = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK, I2C_INTR_STS_REG);
+-
+ } else {
+ dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_TX_NAK = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK, I2C_INTR_STS_REG);
+@@ -1352,7 +1419,10 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ case AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_NORMAL_STOP:
+ if(i2c_dev->slave_operation == 1) {
+ printk("SLAVE TODO .... \n");
+-
++ i2c_dev->slave_operation = 0;
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_NORMAL_STOP;
++ complete(&i2c_dev->cmd_complete);
+ } else {
+ dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_TX_NAK| AST_I2CD_INTR_STS_NORMAL_STOP = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
+@@ -1365,12 +1435,17 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ //Issue : Workaround for I2C slave mode
+ case AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_SLAVE_MATCH:
+ if(i2c_dev->slave_operation == 1) {
+- i2c_dev->slave_event = I2C_SLAVE_EVENT_NACK;
+- ast_i2c_slave_xfer_done(i2c_dev);
++ dev_err(i2c_dev->dev, "i2cdriver: TX_NAK and Slave match sts = %x\n",sts);
+ ast_i2c_slave_addr_match(i2c_dev);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK | AST_I2CD_INTR_STS_SLAVE_MATCH , I2C_INTR_STS_REG);
+ } else {
+ printk("ERROR !!!!\n");
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_NAK, I2C_INTR_STS_REG);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_TX_NAK;
++ complete(&i2c_dev->cmd_complete);
++
++ ast_i2c_slave_addr_match(i2c_dev);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SLAVE_MATCH , I2C_INTR_STS_REG);
+ }
+ break;
+ case AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_SLAVE_MATCH:
+@@ -1378,7 +1453,17 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ dev_dbg(i2c_dev->dev, "S clear isr: AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_SLAVE_MATCH = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
+ break;
++ case AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_SLAVE_MATCH | AST_I2CD_INTR_STS_ARBIT_LOSS:
++ dev_err(i2c_dev->dev, "M clear isr: sts = %x\n",sts);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_ARBIT_LOSS, I2C_INTR_STS_REG);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_ARBIT_LOSS;
++ ast_i2c_write(i2c_dev, ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
++ AST_I2CD_RX_DOWN_INTR_EN, I2C_INTR_CTRL_REG);
++ complete(&i2c_dev->cmd_complete);
+
++ ast_i2c_slave_addr_match(i2c_dev);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
++ break;
+ case AST_I2CD_INTR_STS_RX_DOWN:
+ if(i2c_dev->slave_operation == 1) {
+ i2c_dev->slave_event = I2C_SLAVE_EVENT_WRITE;
+@@ -1389,7 +1474,6 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_RX_DOWN = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_RX_DOWN, I2C_INTR_STS_REG);
+ ast_i2c_master_xfer_done(i2c_dev);
+-
+ }
+ break;
+
+@@ -1407,7 +1491,7 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ complete(&i2c_dev->cmd_complete);
+ }
+ break;
+- case (AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_NORMAL_STOP):
++ case AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_NORMAL_STOP:
+ /* Whether or not we're done, the hardware thinks we're done, so bail. */
+ if(i2c_dev->slave_operation == 0) {
+ dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_NORMAL_STOP = %x\n",sts);
+@@ -1416,18 +1500,47 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ ast_i2c_write(i2c_dev, ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
+ AST_I2CD_RX_DOWN_INTR_EN, I2C_INTR_CTRL_REG);
+ ast_i2c_master_xfer_done(i2c_dev);
+- }
++ } else {
++ dev_err(i2c_dev->dev, "S clear isr: AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_NORMAL_STOP = %x\n",sts);
++ i2c_dev->slave_event = I2C_SLAVE_EVENT_STOP;
++ ast_i2c_slave_xfer_done(i2c_dev);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_RX_DOWN | AST_I2CD_INTR_STS_NORMAL_STOP, I2C_INTR_STS_REG);
++ ast_i2c_write(i2c_dev, ast_i2c_read(i2c_dev,I2C_INTR_CTRL_REG) |
++ AST_I2CD_RX_DOWN_INTR_EN, I2C_INTR_CTRL_REG);
++ ast_i2c_master_xfer_done(i2c_dev);
++ }
+ break;
+ case AST_I2CD_INTR_STS_ARBIT_LOSS:
+- dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_ARBIT_LOSS = %x\n",sts);
++ dev_err(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_ARBIT_LOSS = %x\n",sts);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_ARBIT_LOSS, I2C_INTR_STS_REG);
+ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_ARBIT_LOSS;
+ complete(&i2c_dev->cmd_complete);
+ break;
+ case AST_I2CD_INTR_STS_SCL_TO:
++ dev_err(i2c_dev->dev, "SCL LOW detected with sts = %x, slave mode: %x\n",sts, i2c_dev->slave_operation);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SCL_TO, I2C_INTR_STS_REG);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_SCL_TO;
++ complete(&i2c_dev->cmd_complete);
++
++ // Reset i2c controller
++ temp = ast_i2c_read(i2c_dev,I2C_FUN_CTRL_REG);
++
++ ast_i2c_write(i2c_dev, temp & ~(AST_I2CD_SLAVE_EN | AST_I2CD_MASTER_EN), I2C_FUN_CTRL_REG);
++
++ ast_i2c_write(i2c_dev, temp, I2C_FUN_CTRL_REG);
++ break;
++ case AST_I2CD_INTR_STS_SLAVE_MATCH | AST_I2CD_INTR_STS_SCL_TO:
++ dev_err(i2c_dev->dev, "SCL LOW detected with sts = %x, slave mode: %x\n",sts, i2c_dev->slave_operation);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SCL_TO | AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
+ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_SCL_TO;
+ complete(&i2c_dev->cmd_complete);
+
++ // Reset i2c controller
++ temp = ast_i2c_read(i2c_dev,I2C_FUN_CTRL_REG);
++
++ ast_i2c_write(i2c_dev, temp & ~(AST_I2CD_SLAVE_EN | AST_I2CD_MASTER_EN), I2C_FUN_CTRL_REG);
++
++ ast_i2c_write(i2c_dev, temp, I2C_FUN_CTRL_REG);
+ break;
+ case AST_I2CD_INTR_STS_GCALL_ADDR:
+ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_GCALL_ADDR;
+@@ -1437,24 +1550,26 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+ case AST_I2CD_INTR_STS_SMBUS_DEF_ADDR:
+ break;
+ case AST_I2CD_INTR_STS_SMBUS_DEV_ALT:
+-
+ break;
+
+ case AST_I2CD_INTR_STS_SMBUS_ARP_ADDR:
+ break;
+ case AST_I2CD_INTR_STS_SDA_DL_TO:
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SDA_DL_TO, I2C_INTR_STS_REG);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_SDA_DL_TO;
++ complete(&i2c_dev->cmd_complete);
+ break;
+ case AST_I2CD_INTR_STS_BUS_RECOVER:
+- dev_dbg(i2c_dev->dev, "M clear isr: AST_I2CD_INTR_STS_BUS_RECOVER= %x\n",sts);
++ dev_err(i2c_dev->dev, "Bus recover with sts= %x, slave mode: %x\n",sts, i2c_dev->slave_operation);
+ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_BUS_RECOVER, I2C_INTR_STS_REG);
+ complete(&i2c_dev->cmd_complete);
+ break;
+ default:
+- //TODO: Clearing this interrupt for now, but needs to cleanup this ISR function
+- ast_i2c_write(i2c_dev, sts, I2C_INTR_STS_REG);
++ printk("GR %x : Status : %x, bus_id %d\n",i2c_dev->ast_i2c_data->reg_gr, sts, i2c_dev->bus_id);
+
+ // Handle Arbitration Loss
+ if (sts & AST_I2CD_INTR_STS_ARBIT_LOSS) {
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_ARBIT_LOSS, I2C_INTR_STS_REG);
+ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_ARBIT_LOSS;
+ complete(&i2c_dev->cmd_complete);
+ sts &= (~AST_I2CD_INTR_STS_ARBIT_LOSS);
+@@ -1462,22 +1577,35 @@ static irqreturn_t i2c_ast_handler(int this_irq, void *dev_id)
+
+ // Handle the write transaction ACK
+ if (sts & AST_I2CD_INTR_STS_TX_ACK) {
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_ACK, I2C_INTR_STS_REG);
+ ast_i2c_master_xfer_done(i2c_dev);
+- complete(&i2c_dev->cmd_complete);
+ sts &= (~AST_I2CD_INTR_STS_TX_ACK);
+ }
+
++ // Handle Normal Stop conditon
++ if (sts & AST_I2CD_INTR_STS_NORMAL_STOP) {
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_TX_ACK, I2C_INTR_STS_REG);
++ sts &= (~AST_I2CD_INTR_STS_NORMAL_STOP);
++ i2c_dev->cmd_err |= AST_I2CD_INTR_STS_NORMAL_STOP;
++ complete(&i2c_dev->cmd_complete);
++ }
++
+ // Handle the Slave address match
+ if (sts & AST_I2CD_INTR_STS_SLAVE_MATCH) {
+ ast_i2c_slave_addr_match(i2c_dev);
+ sts &= (~AST_I2CD_INTR_STS_SLAVE_MATCH);
++ ast_i2c_write(i2c_dev, AST_I2CD_INTR_STS_SLAVE_MATCH, I2C_INTR_STS_REG);
+ }
+
++
+ // TODO: Debug print for any unhandled condition
+ if(sts) {
+ printk("GR %x : Status : %x, bus_id %d\n",i2c_dev->ast_i2c_data->reg_gr, sts, i2c_dev->bus_id);
+ }
+
++ //TODO: Clearing this interrupt for now, but needs to cleanup this ISR function
++ ast_i2c_write(i2c_dev, sts, I2C_INTR_STS_REG);
++
+ return IRQ_HANDLED;
+ }
+
+@@ -1492,16 +1620,25 @@ static int ast_i2c_do_msgs_xfer(struct ast_i2c_dev *i2c_dev, struct i2c_msg *msg
+
+ spin_lock_irqsave(&i2c_dev->master_lock, flags);
+
+- //request
+- if(i2c_dev->ast_i2c_data->master_dma == BYTE_MODE)
++ //request: update master_xfer_mode based on master_dma selection
++ if(i2c_dev->ast_i2c_data->master_dma == BYTE_MODE) {
+ i2c_dev->do_master_xfer = ast_i2c_do_byte_xfer;
+- else if (i2c_dev->ast_i2c_data->master_dma == DMA_MODE)
++ i2c_dev->master_xfer_mode = BYTE_XFER;
++ i2c_dev->master_xfer_len = 1;
++ } else if (i2c_dev->ast_i2c_data->master_dma == DMA_MODE) {
+ i2c_dev->do_master_xfer = ast_i2c_do_dma_xfer;
+- else {
+- if(i2c_dev->ast_i2c_data->request_pool_buff_page(&(i2c_dev->req_page)) == 0)
++ i2c_dev->master_xfer_mode = DMA_XFER;
++ } else {
++ if(i2c_dev->ast_i2c_data->request_pool_buff_page(&(i2c_dev->req_page)) == 0) {
+ i2c_dev->do_master_xfer = ast_i2c_do_pool_xfer;
+- else
++ i2c_dev->master_xfer_mode = BUFF_XFER;
++ } else {
+ i2c_dev->do_master_xfer = ast_i2c_do_byte_xfer;
++ dev_err(i2c_dev->dev, "i2cdriver: pool request failed for master\n");
++ i2c_dev->master_xfer_mode = BYTE_XFER;
++ i2c_dev->master_xfer_len = 1;
++
++ }
+ }
+
+ // printk("start xfer ret = %d \n",ret);
+@@ -1534,7 +1671,7 @@ static int ast_i2c_do_msgs_xfer(struct ast_i2c_dev *i2c_dev, struct i2c_msg *msg
+ i2c_dev->master_msgs = NULL;
+
+ if (ret == 0) {
+- dev_dbg(i2c_dev->dev, "controller timed out\n");
++ dev_err(i2c_dev->dev, "controller timed out\n");
+ i2c_dev->state = (ast_i2c_read(i2c_dev,I2C_CMD_REG) >> 19) & 0xf;
+ // printk("sts [%x], isr sts [%x] \n",i2c_dev->state, ast_i2c_read(i2c_dev,I2C_INTR_STS_REG));
+ ret = -ETIMEDOUT;
+@@ -1564,9 +1701,10 @@ static int ast_i2c_do_msgs_xfer(struct ast_i2c_dev *i2c_dev, struct i2c_msg *msg
+
+ }
+ stop:
+- init_completion(&i2c_dev->cmd_complete);
+ if(i2c_dev->cmd_err & AST_I2CD_INTR_STS_NORMAL_STOP)
+ goto out;
++ init_completion(&i2c_dev->cmd_complete);
++ i2c_dev->cmd_err = 0;
+ ast_i2c_write(i2c_dev, AST_I2CD_M_STOP_CMD, I2C_CMD_REG);
+ wait_for_completion_interruptible_timeout(&i2c_dev->cmd_complete,
+ i2c_dev->adap.timeout*HZ);
+@@ -1605,7 +1743,7 @@ static int ast_i2c_xfer(struct i2c_adapter *adap, struct i2c_msg *msgs, int num)
+ ret = ast_i2c_do_msgs_xfer(i2c_dev, msgs, num);
+ if (ret != -EAGAIN)
+ goto out;
+- dev_dbg(&adap->dev, "Retrying transmission [%d]\n",i);
++ dev_dbg(&i2c_dev->adap.dev, "Retrying transmission [%d]\n",i);
+ udelay(100);
+ }
+
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/net/ftgmac100_26.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/net/ftgmac100_26.c
+index 3a5d796..f558d38 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/net/ftgmac100_26.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/net/ftgmac100_26.c
+@@ -901,6 +901,41 @@ void Enable_Broadcast_Filter (struct net_device * dev)
+ lp->Retry = 0;
+ }
+
++void Disable_Multicast_Filter (struct net_device * dev)
++{
++ struct ftgmac100_priv *lp = (struct ftgmac100_priv *)dev->priv;
++ unsigned long Combined_Channel_ID;
++ struct sk_buff * skb;
++
++ do {
++ skb = dev_alloc_skb (TX_BUF_SIZE + 16);
++ memset(skb->data, 0, TX_BUF_SIZE + 16);
++//TX
++ lp->InstanceID++;
++ lp->NCSI_Request.IID = lp->InstanceID;
++ lp->NCSI_Request.Command = DISABLE_GLOBAL_MULTICAST_FILTERING;
++ Combined_Channel_ID = (lp->NCSI_Cap.Package_ID << 5) + lp->NCSI_Cap.Channel_ID;
++ lp->NCSI_Request.Channel_ID = Combined_Channel_ID;
++ lp->NCSI_Request.Payload_Length = 0;
++ memcpy ((unsigned char *)skb->data, &lp->NCSI_Request, 30);
++ copy_data (dev, skb, lp->NCSI_Request.Payload_Length);
++ skb->len = 30 + lp->NCSI_Request.Payload_Length + 4;
++ ftgmac100_wait_to_send_packet (skb, dev);
++//RX
++ NCSI_Rx(dev);
++ if (((lp->NCSI_Respond.IID != lp->InstanceID) || (lp->NCSI_Respond.Command != (DISABLE_GLOBAL_MULTICAST_FILTERING | 0x80)) || (lp->NCSI_Respond.Response_Code != COMMAND_COMPLETED)) && (lp->Retry != RETRY_COUNT)) {
++ printk ("Retry: Command = %x, Response_Code = %x\n", lp->NCSI_Request.Command, lp->NCSI_Respond.Response_Code);
++ printk ("IID: %x:%x, Command: %x:%x\n", lp->InstanceID, lp->NCSI_Respond.IID, lp->NCSI_Request.Command, lp->NCSI_Respond.Command);
++ lp->Retry++;
++ lp->InstanceID--;
++ }
++ else {
++ lp->Retry = 0;
++ }
++ } while ((lp->Retry != 0) && (lp->Retry <= RETRY_COUNT));
++ lp->Retry = 0;
++}
++
+ void Disable_VLAN (struct net_device * dev)
+ {
+ struct ftgmac100_priv *lp = (struct ftgmac100_priv *)dev->priv;
+@@ -1416,6 +1451,8 @@ static void ftgmac100_enable( struct net_device *dev )
+ Enable_Set_MAC_Address(dev);
+ //Enable Broadcast Filter
+ Enable_Broadcast_Filter(dev);
++//Disable Multicast Filter
++ Disable_Multicast_Filter(dev);
+ //Disable VLAN
+ Disable_VLAN(dev);
+ //Enable AEN
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/serial/8250.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/serial/8250.c
+index f16da59..d01c1c7 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/serial/8250.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/serial/8250.c
+@@ -127,6 +127,11 @@ static unsigned long probe_rsa[PORT_RSA_MAX];
+ static unsigned int probe_rsa_count;
+ #endif /* CONFIG_SERIAL_8250_RSA */
+
++struct rs485_wait_state {
++ int gpio;
++ int waiting;
++};
++
+ struct uart_8250_port {
+ struct uart_port port;
+ struct timer_list timer; /* "no irq" timer */
+@@ -156,6 +161,8 @@ struct uart_8250_port {
+ */
+ void (*pm)(struct uart_port *port,
+ unsigned int state, unsigned int old);
++
++ struct rs485_wait_state rs485_wait_state;
+ };
+
+ struct irq_info {
+@@ -169,6 +176,9 @@ struct irq_info {
+ static struct hlist_head irq_lists[NR_IRQ_HASH];
+ static DEFINE_MUTEX(hash_mutex); /* Used to walk the hash */
+
++#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
++static void wait_for_xmitr(struct uart_8250_port *up, int bits);
++
+ /*
+ * Here we define the default xmit fifo size used for each type of UART.
+ */
+@@ -530,6 +540,31 @@ static void serial_dl_write(struct uart_8250_port *up, int value)
+ #define serial_dl_write(up, value) _serial_dl_write(up, value)
+ #endif
+
++// unfortunately it seems the gpio switch for RS485 can be late even with the
++// wait queue based wakeup of the task waiting on its completion, so we *have*
++// to do the gpio switch in the interrupt handler.
++static void rs485_wait_end(struct uart_8250_port *up) {
++ struct rs485_wait_state *rs485_wait_state =
++ &up->rs485_wait_state;
++ if (rs485_wait_state->waiting) {
++ int status;
++ status = serial_in(up, UART_LSR);
++ // no interrupt will be fire for shift register (TEMT) so we have to spin
++ // on it.
++ if (status & UART_LSR_THRE) {
++ wait_for_xmitr(up, BOTH_EMPTY);
++ // turn off RS485 DE pin
++ if (rs485_wait_state->gpio)
++ gpio_set_value(rs485_wait_state->gpio, 0);
++ // grab any phantom char seen on RX when transceiver switches
++ (void) serial_inp(up, UART_RX);
++ // enable read
++ up->port.ignore_status_mask &= ~UART_LSR_DR;
++ rs485_wait_state->waiting = 0;
++ }
++ }
++}
++
+ /*
+ * For the 16C950
+ */
+@@ -1235,6 +1270,7 @@ static inline void __stop_tx(struct uart_8250_port *p)
+ p->ier &= ~UART_IER_THRI;
+ serial_out(p, UART_IER, p->ier);
+ }
++ uart_write_wakeup(&p->port);
+ }
+
+ static void serial8250_stop_tx(struct uart_port *port)
+@@ -1436,7 +1472,7 @@ static unsigned int check_modem_status(struct uart_8250_port *up)
+ if (status & UART_MSR_DCTS)
+ uart_handle_cts_change(&up->port, status & UART_MSR_CTS);
+
+- wake_up_interruptible(&up->port.info->delta_msr_wait);
++ wake_up_interruptible(&up->port.info->delta_msr_wait);
+ }
+
+ return status;
+@@ -1462,6 +1498,7 @@ static void serial8250_handle_port(struct uart_8250_port *up)
+ if (status & UART_LSR_THRE)
+ transmit_chars(up);
+
++ rs485_wait_end(up);
+ spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+
+@@ -1777,8 +1814,6 @@ static void serial8250_break_ctl(struct uart_port *port, int break_state)
+ spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+
+-#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
+-
+ /*
+ * Wait for transmitter & holding register to empty
+ */
+@@ -2539,8 +2574,13 @@ static int serial8250_ioctl(struct uart_port *port, unsigned int cmd, unsigned l
+ int ret = -ENOIOCTLCMD;
+ // kernel-space RS485 drain-and-switch hack
+ if (cmd == TIOCSERWAITTEMT) {
+- // wait for kernel buffers and UART FIFO to both empty
+ struct circ_buf *xmit = &up->port.info->xmit;
++ spin_lock_irqsave(&up->port.lock, flags);
++ up->rs485_wait_state.gpio = arg;
++ up->rs485_wait_state.waiting = 1;
++ spin_unlock_irqrestore(&up->port.lock, flags);
++
++ // wait for kernel buffers and UART FIFO to both empty
+ wait_event_interruptible(
+ thre_wait,
+ uart_circ_empty(xmit) &&
+@@ -2548,14 +2588,6 @@ static int serial8250_ioctl(struct uart_port *port, unsigned int cmd, unsigned l
+ // spin until TEMT (transmit shift register empty)
+ spin_lock_irqsave(&up->port.lock, flags);
+ wait_for_xmitr(up, BOTH_EMPTY);
+- if (arg != 0) {
+- // turn off RS485 DE pin
+- gpio_set_value(arg, 0);
+- }
+- // grab any phantom char seen on RX when transceiver switches
+- (void) serial_inp(up, UART_RX);
+- // enable read
+- up->port.ignore_status_mask &= ~UART_LSR_DR;
+ spin_unlock_irqrestore(&up->port.lock, flags);
+ return 0;
+ }
+@@ -2607,6 +2639,8 @@ static void __init serial8250_isa_init_ports(void)
+
+ init_timer(&up->timer);
+ up->timer.function = serial8250_timeout;
++ up->rs485_wait_state.waiting = 0;
++ up->rs485_wait_state.gpio = 0;
+
+ /*
+ * ALPHA_KLUDGE_MCR needs to be killed.
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/usb/gadget/aspeed_udc.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/usb/gadget/aspeed_udc.c
+index a65e52a..51cb34c 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/usb/gadget/aspeed_udc.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/usb/gadget/aspeed_udc.c
+@@ -580,10 +580,10 @@ static void ep_dequeue_locked(struct ast_ep* ep, struct ast_usb_request *req) {
+
+ static void ep_dequeue_all(struct ast_ep* ep, int status) {
+ struct ast_usb_request *req;
+- struct ast_usb_request *n;
+ unsigned long flags;
+ spin_lock_irqsave(&ep->lock, flags);
+- list_for_each_entry_safe(req, n, &ep->queue, queue) {
++ while (!list_empty(&ep->queue)) {
++ req = list_entry(ep->queue.next, struct ast_usb_request, queue);
+ ep_dequeue_locked(ep, req);
+ req->req.status = status;
+ if(req->req.complete) {
+@@ -654,8 +654,14 @@ static void ep_txrx_check_done(struct ast_ep* ep) {
+ spin_lock_irqsave(&ep->lock, flags);
+ status = ep_hreadl(ep, DESC_STATUS);
+ // if txrx complete;
+- if(!(status & 0xff) &&
+- !list_empty(&ep->queue)) {
++ if (!(status & 0xff)) {
++ /* DMA is done */
++ ep->dma_busy = 0;
++ /* if the list is empty, nothing to do */
++ if (list_empty(&ep->queue)) {
++ spin_unlock_irqrestore(&ep->lock, flags);
++ return;
++ }
+ req = list_entry(ep->queue.next, struct ast_usb_request, queue);
+ if(!req->in_transit) {
+ spin_unlock_irqrestore(&ep->lock, flags);
+@@ -663,7 +669,6 @@ static void ep_txrx_check_done(struct ast_ep* ep) {
+ }
+ //head rq completed
+ req->in_transit = 0;
+- ep->dma_busy = 0;
+ if(!ep->to_host) {
+ req->lastpacket = (status >> 16) & 0x3ff;
+ __cpuc_flush_kern_all();
+diff --git a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/watchdog/ast_wdt.c b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/watchdog/ast_wdt.c
+index e599a55..cfe70a1 100644
+--- a/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/watchdog/ast_wdt.c
++++ b/meta-aspeed/recipes-kernel/linux/files/linux-aspeed-2.6.28.9/drivers/watchdog/ast_wdt.c
+@@ -450,7 +450,7 @@ static int ast_wdt_open(struct inode *inode, struct file *file)
+
+ static int ast_wdt_release(struct inode *inode, struct file *file)
+ {
+- if (expect_close != 42 || !nowayout)
++ if (expect_close != 42 && !nowayout)
+ {
+ /* handles the case where the device is closed without the "magic
+ * close" character (anything that is not 'V' qualifies -- see the
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
index a66c7e1..5e28e76 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed.inc
@@ -11,16 +11,22 @@ do_compile[depends] = "libgcc:do_populate_sysroot"
inherit kernel
# auto load the following modules
-module_autoload_tun = "tun"
-module_autoload_at24 = "at24"
-module_autoload_ads7828 = "ads7828"
-module_autoload_pcf8574 = "pcf8574"
-module_autoload_max127 = "max127"
+KERNEL_MODULE_AUTOLOAD += " \
+ adm1275 \
+ ads7828 \
+ at24 \
+ fb_panther_plus \
+ max127 \
+ pcf8574 \
+ pfe1100 \
+ pmbus_core \
+ tun \
+"
+
+KERNEL_MODULE_PROBECONF += " \
+ max127 \
+"
module_conf_max127 = "options max127 scaling=24414"
-module_autoload_pmbus_core = "pmbus_core"
-module_autoload_pfe1100 = "pfe1100"
-module_autoload_fb_panther_plus = "fb_panther_plus"
-module_autoload_adm1275 = "adm1275"
# Do not install kernel in rootfs
do_install[postfuncs] += "remove_kernel_image_from_rootfs"
diff --git a/meta-aspeed/recipes-kernel/linux/linux-aspeed_2.6.28.9.bb b/meta-aspeed/recipes-kernel/linux/linux-aspeed_2.6.28.9.bb
index 9a76066..7798bab 100644
--- a/meta-aspeed/recipes-kernel/linux/linux-aspeed_2.6.28.9.bb
+++ b/meta-aspeed/recipes-kernel/linux/linux-aspeed_2.6.28.9.bb
@@ -3,7 +3,7 @@
SRCREV = "1e85856853e24e9013d142adaad38c2adc7e48ac"
SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git;protocol=https;branch=linux-2.6.28.y \
- file://patch-2.6.28.9/0000-linux-aspeed-064.patch \
+ file://patch-2.6.28.9/0000-linux-aspeed-064.patch;striplevel=1 \
file://patch-2.6.28.9/0000-linux-openbmc.patch \
file://patch-2.6.28.9/0001-MTD-fix-m25p80-64-bit-divisions.patch \
file://patch-2.6.28.9/0005-mtd-Bug-in-m25p80.c-during-whole-chip-erase.patch \
@@ -23,28 +23,37 @@ SRC_URI = "git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
file://patch-2.6.28.9/0001-bzip2-lzma-library-support-for-gzip-bzip2-and-lzma-d.patch \
file://patch-2.6.28.9/0002-bzip2-lzma-config-and-initramfs-support-for-bzip2-lz.patch \
file://patch-2.6.28.9/0032-Create-snapshot-of-OpenBMC.patch \
+ file://patch-2.6.28.9/0033-Linux-snapshot-of-OpenBMC-f926614.patch;striplevel=6 \
"
-S = "${WORKDIR}/git"
-
LINUX_VERSION ?= "2.6.28.9"
LINUX_VERSION_EXTENSION ?= "-aspeed"
PR = "r1"
PV = "${LINUX_VERSION}"
+include linux-aspeed.inc
+
+S = "${WORKDIR}/git"
+
# Install bounds.h for external module install
# The default install script handles this. However, it looks for bounds.h from
# 'include/generated', which doesnot match 2.6.28, where the file is in
# 'include/linux'.
-do_install[postfuncs] += "install_bounds_h"
-install_bounds_h() {
- kerneldir=${D}${KERNEL_SRC_PATH}
- if [ -f include/linux/bounds.h ]; then
- cp -l include/linux/bounds.h $kerneldir/include/linux/bounds.h
- fi
+addtask create_generated after do_compile before do_shared_workdir
+do_create_generated() {
+ install -d ${B}/include/generated
+ cp -l ${B}/include/linux/bounds.h ${B}/include/generated/bounds.h
}
-KERNEL_CONFIG_COMMAND = "oe_runmake wedge_defconfig && oe_runmake oldconfig"
+# With Fido, ${KERNEL_SRC} is set to ${STAGING_KERENL_DIR}, which is passed
+# to kernel module build. So, copy all .h files from the build direcory to
+# the ${STAGING_KERNEL_DIR}
+addtask copy_to_kernelsrc after do_shared_workdir before do_compile_kernelmodules
+do_copy_to_kernelsrc() {
+ kerneldir=${STAGING_KERNEL_DIR}/include/linux
+ install -d ${kerneldir}
+ cp -l ${B}/include/linux/* ${kerneldir}/
+}
-include linux-aspeed.inc
+KERNEL_CC += " --sysroot=${PKG_CONFIG_SYSROOT_DIR}"
diff --git a/meta-aspeed/recipes-utils/openbmc-gpio/files/ast2400_gpio_table.py b/meta-aspeed/recipes-utils/openbmc-gpio/files/ast2400_gpio_table.py
new file mode 100644
index 0000000..68d4203
--- /dev/null
+++ b/meta-aspeed/recipes-utils/openbmc-gpio/files/ast2400_gpio_table.py
@@ -0,0 +1,1022 @@
+# Copyright 2015-present Facebook. All rights reserved.
+#
+# This program file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by the
+# Free Software Foundation; version 2 of the License.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program in a file named COPYING; if not, write to the
+# Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor,
+# Boston, MA 02110-1301 USA
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+from __future__ import unicode_literals
+
+from openbmc_gpio_table import (
+ BitsEqual, BitsNotEqual, And, Or, Function)
+
+
+# The fallowing table is generated using:
+# python ast_gpio_parser.py data/ast2400-gpio.csv
+# DO NOT MODIFY THE TABLE!!!
+# Manual modification will be overridden!!!
+
+soc_gpio_table = {
+ 'A1': [
+ Function('SD1WP#', BitsEqual(0x90, [0], 0x1)),
+ Function('SDA13', BitsEqual(0x90, [26], 0x1)),
+ Function('GPIOC7', None)
+ ],
+ 'A10': [
+ Function('GPIOU0', BitsEqual(0xa0, [8], 0x1)),
+ Function('RMII2TXD0', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2TXD0', None)
+ ],
+ 'A11': [
+ Function('GPIOV0', BitsEqual(0xa0, [16], 0x1)),
+ Function('RMII1CRSDV', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXD2', None)
+ ],
+ 'A12': [
+ Function('GPIOT0', BitsEqual(0xa0, [0], 0x1)),
+ Function('RMII1TXEN', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXCK', None)
+ ],
+ 'A13': [
+ Function('GPIOT5', BitsEqual(0xa0, [5], 0x1)),
+ Function('UNDEFINED5', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXD3', None)
+ ],
+ 'A14': [
+ Function('SGPSCK', BitsEqual(0x84, [0], 0x1)),
+ Function('GPIOG0', None)
+ ],
+ 'A15': [
+ Function('NRI3', BitsEqual(0x80, [19], 0x1)),
+ Function('GPIE2(Out)', Or(BitsEqual(0x8c, [13], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE3', None)
+ ],
+ 'A16': [
+ Function('SD2CD#', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID6(In)', Or(BitsEqual(0x8c, [11], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD6', None)
+ ],
+ 'A17': [
+ Function('SD2DAT1', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID2(Out)', Or(BitsEqual(0x8c, [9], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD3', None)
+ ],
+ 'A18': [
+ Function('SD2CLK', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID0(In)', Or(BitsEqual(0x8c, [8], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD0', None)
+ ],
+ 'A19': [
+ Function('NRTS4', BitsEqual(0x80, [29], 0x1)),
+ Function('SIOSCI#', Or(BitsEqual(0xa4, [15], 0x1), BitsEqual(0x70, [19], 0x0))),
+ Function('GPIOF5', None)
+ ],
+ 'A2': [
+ Function('SD1DAT0', BitsEqual(0x90, [0], 0x1)),
+ Function('SCL11', BitsEqual(0x90, [24], 0x1)),
+ Function('GPIOC2', None)
+ ],
+ 'A20': [
+ Function('NDSR4', BitsEqual(0x80, [26], 0x1)),
+ Function('SIOPWRGD', Or(BitsEqual(0xa4, [13], 0x1), BitsEqual(0x70, [19], 0x0))),
+ Function('GPIOF2', None)
+ ],
+ 'A3': [
+ Function('MDC2', BitsEqual(0x90, [2], 0x1)),
+ Function('TIMER7', BitsEqual(0x80, [6], 0x1)),
+ Function('GPIOA6', None)
+ ],
+ 'A4': [
+ Function('TIMER3', BitsEqual(0x80, [2], 0x1)),
+ Function('GPIOA2', None)
+ ],
+ 'A5': [
+ Function('MDIO1', BitsEqual(0x88, [31], 0x1)),
+ Function('GPIOR7', None)
+ ],
+ 'A6': [
+ Function('ROMD14', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('TXD6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH6', None)
+ ],
+ 'A7': [
+ Function('ROMD11', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NRI6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH3', None)
+ ],
+ 'A8': [
+ Function('ROMD8', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NCTS6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH0', None)
+ ],
+ 'A9': [
+ Function('GPIOV4', BitsEqual(0xa0, [20], 0x1)),
+ Function('RMII2RXD0', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2RXD0', None)
+ ],
+ 'AA1': [
+ Function('VPIB8', And(BitsNotEqual(0x90, [5, 4], 0x0), BitsEqual(0x84, [30], 0x1))),
+ Function('TXD2', BitsEqual(0x84, [30], 0x1)),
+ Function('GPIOM6', None)
+ ],
+ 'AA2': [
+ Function('VPIG2', And(BitsNotEqual(0x90, [5, 4], 0x0), BitsEqual(0x88, [2], 0x1))),
+ Function('PWM2', BitsEqual(0x88, [2], 0x1)),
+ Function('GPION2', None)
+ ],
+ 'AA22': [
+ Function('FLBUSY#', BitsEqual(0x84, [6], 0x1)),
+ Function('GPIOG6', None)
+ ],
+ 'AA3': [
+ Function('VPIG6', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [6], 0x1))),
+ Function('PWM6', BitsEqual(0x88, [6], 0x1)),
+ Function('GPION6', None)
+ ],
+ 'AA4': [
+ Function('VPIR0', And(BitsEqual(0x90, [5, 4], 0x3), BitsEqual(0x88, [10], 0x1))),
+ Function('GPIOO2/TACH2', None)
+ ],
+ 'AA5': [
+ Function('VPIR3', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [13], 0x1))),
+ Function('GPIOO5/TACH5', None)
+ ],
+ 'AA6': [
+ Function('VPIR9', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [19], 0x1))),
+ Function('GPIOP3/TACH11', None)
+ ],
+ 'AA7': [
+ Function('BMCINT', BitsEqual(0x88, [22], 0x1)),
+ Function('GPIOP6/TACH14', None)
+ ],
+ 'AB1': [
+ Function('VPIG3', And(BitsNotEqual(0x90, [5, 4], 0x0), BitsEqual(0x88, [3], 0x1))),
+ Function('PWM3', BitsEqual(0x88, [3], 0x1)),
+ Function('GPION3', None)
+ ],
+ 'AB2': [
+ Function('VPIG7', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [7], 0x1))),
+ Function('PWM7', BitsEqual(0x88, [7], 0x1)),
+ Function('GPION7', None)
+ ],
+ 'AB20': [
+ Function('USB2_HDN', BitsEqual(0x90, [29], 0x1)),
+ Function('USB2_DN', None)
+ ],
+ 'AB21': [
+ Function('USB2_HDP', BitsEqual(0x90, [29], 0x1)),
+ Function('USB2_DP', None)
+ ],
+ 'AB3': [
+ Function('VPIR1', And(BitsEqual(0x90, [5, 4], 0x3), BitsEqual(0x88, [11], 0x1))),
+ Function('GPIOO3/TACH3', None)
+ ],
+ 'AB4': [
+ Function('VPIR4', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [14], 0x1))),
+ Function('GPIOO6/TACH6', None)
+ ],
+ 'AB5': [
+ Function('VPIR7', And(BitsEqual(0x90, [5, 4], 0x2), BitsEqual(0x88, [17], 0x1))),
+ Function('GPIOP1/TACH9', None)
+ ],
+ 'AB7': [
+ Function('FLACK', BitsEqual(0x88, [23], 0x1)),
+ Function('GPIOP7/TACH15', None)
+ ],
+ 'B1': [
+ Function('SCL4', BitsEqual(0x90, [17], 0x1)),
+ Function('GPIOQ2', None)
+ ],
+ 'B10': [
+ Function('GPIOU1', BitsEqual(0xa0, [9], 0x1)),
+ Function('RMII2TXD1', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2TXD1', None)
+ ],
+ 'B11': [
+ Function('GPIOU7', BitsEqual(0xa0, [15], 0x1)),
+ Function('RMII1RXD1', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXD1', None)
+ ],
+ 'B12': [
+ Function('GPIOT1', BitsEqual(0xa0, [1], 0x1)),
+ Function('UNDEFINED3', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXCTL', None)
+ ],
+ 'B13': [
+ Function('OSCCLK', BitsEqual(0x2c, [1], 0x1)),
+ Function('WDTRST1', BitsEqual(0x84, [4], 0x1)),
+ Function('GPIOG4', None)
+ ],
+ 'B14': [
+ Function('RXD3', BitsEqual(0x80, [23], 0x1)),
+ Function('GPIE6(Out)', Or(BitsEqual(0x8c, [15], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE7', None)
+ ],
+ 'B15': [
+ Function('NDSR3', BitsEqual(0x80, [18], 0x1)),
+ Function('GPIE2(In)', Or(BitsEqual(0x8c, [13], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE2', None)
+ ],
+ 'B16': [
+ Function('SD2DAT3', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID4(Out)', Or(BitsEqual(0x8c, [10], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD5', None)
+ ],
+ 'B17': [
+ Function('SD2DAT0', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID2(In)', Or(BitsEqual(0x8c, [9], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD2', None)
+ ],
+ 'B18': [
+ Function('NDTR4', BitsEqual(0x80, [28], 0x1)),
+ Function('GPIOF4', None)
+ ],
+ 'B19': [
+ Function('NDCD4', BitsEqual(0x80, [25], 0x1)),
+ Function('SIOPBI#', Or(BitsEqual(0xa4, [12], 0x1), BitsEqual(0x70, [19], 0x0))),
+ Function('GPIOF1', None)
+ ],
+ 'B2': [
+ Function('SD1CD#', BitsEqual(0x90, [0], 0x1)),
+ Function('SCL13', BitsEqual(0x90, [26], 0x1)),
+ Function('GPIOC6', None)
+ ],
+ 'B22': [
+ Function('SPICS0#', BitsNotEqual(0x70, [13, 12], 0x0)),
+ Function('VBCS#', BitsEqual(0x70, [5], 0x1)),
+ Function('GPIOI4', None)
+ ],
+ 'B3': [
+ Function('SD1CMD', BitsEqual(0x90, [0], 0x1)),
+ Function('SDA10', BitsEqual(0x90, [23], 0x1)),
+ Function('GPIOC1', None)
+ ],
+ 'B4': [
+ Function('SDA9', BitsEqual(0x90, [22], 0x1)),
+ Function('TIMER6', BitsEqual(0x80, [5], 0x1)),
+ Function('GPIOA5', None)
+ ],
+ 'B5': [
+ Function('MAC2LINK', BitsEqual(0x80, [1], 0x1)),
+ Function('GPIOA1', None)
+ ],
+ 'B6': [
+ Function('ROMD13', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NRTS6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH5', None)
+ ],
+ 'B7': [
+ Function('ROMD10', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NDSR6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH2', None)
+ ],
+ 'B9': [
+ Function('GPIOV3', BitsEqual(0xa0, [19], 0x1)),
+ Function('UNDEFINED10', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2RXCTL', None)
+ ],
+ 'C1': [
+ Function('SCL6', BitsEqual(0x90, [19], 0x1)),
+ Function('GPIOK2', None)
+ ],
+ 'C10': [
+ Function('GPIOU2', BitsEqual(0xa0, [10], 0x1)),
+ Function('UNDEFINED7', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2TXD2', None)
+ ],
+ 'C11': [
+ Function('GPIOU6', BitsEqual(0xa0, [14], 0x1)),
+ Function('RMII1RXD0', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXD0', None)
+ ],
+ 'C12': [
+ Function('GPIOT2', BitsEqual(0xa0, [2], 0x1)),
+ Function('RMII1TXD0', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXD0', None)
+ ],
+ 'C13': [
+ Function('SGPSI1', BitsEqual(0x84, [3], 0x1)),
+ Function('GPIOG3', None)
+ ],
+ 'C14': [
+ Function('TXD3', BitsEqual(0x80, [22], 0x1)),
+ Function('GPIE6(In)', Or(BitsEqual(0x8c, [15], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE6', None)
+ ],
+ 'C15': [
+ Function('NDCD3', BitsEqual(0x80, [17], 0x1)),
+ Function('GPIE0(Out)', Or(BitsEqual(0x8c, [12], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE1', None)
+ ],
+ 'C16': [
+ Function('SD2DAT2', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID4(In)', Or(BitsEqual(0x8c, [10], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD4', None)
+ ],
+ 'C17': [
+ Function('RXD4', BitsEqual(0x80, [31], 0x1)),
+ Function('GPIOF7', None)
+ ],
+ 'C18': [
+ Function('SPIDO', BitsNotEqual(0x70, [13, 12], 0x0)),
+ Function('VBDO', BitsEqual(0x70, [5], 0x1)),
+ Function('GPIOI6', None)
+ ],
+ 'C2': [
+ Function('SDA3', BitsEqual(0x90, [16], 0x1)),
+ Function('GPIOQ1', None)
+ ],
+ 'C20': [
+ Function('SYSDI', BitsEqual(0x70, [13], 0x1)),
+ Function('GPIOI3', None)
+ ],
+ 'C21': [
+ Function('SIOS3#', Or(BitsEqual(0xa4, [8], 0x1), BitsEqual(0x70, [19], 0x0))),
+ Function('GPIOY0', None)
+ ],
+ 'C22': [
+ Function('SYSCS#', BitsEqual(0x70, [13], 0x1)),
+ Function('GPIOI0', None)
+ ],
+ 'C3': [
+ Function('SD1DAT3', BitsEqual(0x90, [0], 0x1)),
+ Function('SDA12', BitsEqual(0x90, [25], 0x1)),
+ Function('GPIOC5', None)
+ ],
+ 'C4': [
+ Function('SD1CLK', BitsEqual(0x90, [0], 0x1)),
+ Function('SCL10', BitsEqual(0x90, [23], 0x1)),
+ Function('GPIOC0', None)
+ ],
+ 'C5': [
+ Function('SCL9', BitsEqual(0x90, [22], 0x1)),
+ Function('TIMER5', BitsEqual(0x80, [4], 0x1)),
+ Function('GPIOA4', None)
+ ],
+ 'C6': [
+ Function('MDC1', BitsEqual(0x88, [30], 0x1)),
+ Function('GPIOR6', None)
+ ],
+ 'C7': [
+ Function('ROMD9', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NDCD6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH1', None)
+ ],
+ 'C8': [
+ Function('GPIOV7', BitsEqual(0xa0, [23], 0x1)),
+ Function('RMII2RXER', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2RXD3', None)
+ ],
+ 'C9': [
+ Function('GPIOV2', BitsEqual(0xa0, [18], 0x1)),
+ Function('RMII2RCLK', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2RXCK', None)
+ ],
+ 'D1': [
+ Function('SDA7', BitsEqual(0x90, [20], 0x1)),
+ Function('GPIOK5', None)
+ ],
+ 'D10': [
+ Function('GPIOU3', BitsEqual(0xa0, [11], 0x1)),
+ Function('UNDEFINED8', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2TXD3', None)
+ ],
+ 'D11': [
+ Function('GPIOU5', BitsEqual(0xa0, [13], 0x1)),
+ Function('UNDEFINED9', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXCTL', None)
+ ],
+ 'D12': [
+ Function('GPIOT3', BitsEqual(0xa0, [3], 0x1)),
+ Function('RMII1TXD1', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXD1', None)
+ ],
+ 'D13': [
+ Function('SGPSI0', BitsEqual(0x84, [2], 0x1)),
+ Function('GPIOG2', None)
+ ],
+ 'D14': [
+ Function('NRTS3', BitsEqual(0x80, [21], 0x1)),
+ Function('GPIE4(Out)', Or(BitsEqual(0x8c, [14], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE5', None)
+ ],
+ 'D15': [
+ Function('NCTS3', BitsEqual(0x80, [16], 0x1)),
+ Function('GPIE0(In)', Or(BitsEqual(0x8c, [12], 0x1), BitsEqual(0x70, [22], 0x1))),
+ Function('GPIOE0', None)
+ ],
+ 'D16': [
+ Function('SD2CMD', BitsEqual(0x90, [1], 0x1)),
+ Function('GPID0(Out)', Or(BitsEqual(0x8c, [8], 0x1), BitsEqual(0x70, [21], 0x1))),
+ Function('GPIOD1', None)
+ ],
+ 'D17': [
+ Function('NRI4', BitsEqual(0x80, [27], 0x1)),
+ Function('SIOPBO#', Or(BitsEqual(0xa4, [14], 0x1), BitsEqual(0x70, [19], 0x0))),
+ Function('GPIOF3', None)
+ ],
+ 'D18': [
+ Function('NCTS4', BitsEqual(0x80, [24], 0x1)),
+ Function('GPIOF0', None)
+ ],
+ 'D19': [
+ Function('SYSDO', BitsEqual(0x70, [13], 0x1)),
+ Function('GPIOI2', None)
+ ],
+ 'D2': [
+ Function('SDA5', BitsEqual(0x90, [18], 0x1)),
+ Function('GPIOK1', None)
+ ],
+ 'D3': [
+ Function('SCL3', BitsEqual(0x90, [16], 0x1)),
+ Function('GPIOQ0', None)
+ ],
+ 'D4': [
+ Function('SD1DAT2', BitsEqual(0x90, [0], 0x1)),
+ Function('SCL12', BitsEqual(0x90, [25], 0x1)),
+ Function('GPIOC4', None)
+ ],
+ 'D5': [
+ Function('MDIO2', BitsEqual(0x90, [2], 0x1)),
+ Function('TIMER8', BitsEqual(0x80, [7], 0x1)),
+ Function('GPIOA7', None)
+ ],
+ 'D6': [
+ Function('MAC1LINK', BitsEqual(0x80, [0], 0x1)),
+ Function('GPIOA0', None)
+ ],
+ 'D7': [
+ Function('ROMD12', Or(BitsEqual(0x90, [6], 0x1), BitsEqual(0x70, [4, 1, 0], 0x4))),
+ Function('NDTR6', BitsEqual(0x90, [7], 0x1)),
+ Function('GPIOH4', None)
+ ],
+ 'D8': [
+ Function('GPIOV6', BitsEqual(0xa0, [22], 0x1)),
+ Function('RMII2CRSDV', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2RXD2', None)
+ ],
+ 'D9': [
+ Function('GPIOT6', BitsEqual(0xa0, [6], 0x1)),
+ Function('RMII2TXEN', BitsEqual(0x70, [7], 0x0)),
+ Function('RGMII2TXCK', None)
+ ],
+ 'E10': [
+ Function('GPIOV1', BitsEqual(0xa0, [17], 0x1)),
+ Function('RMII1RXER', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXD3', None)
+ ],
+ 'E11': [
+ Function('GPIOU4', BitsEqual(0xa0, [12], 0x1)),
+ Function('RMII1RCLK', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1RXCK', None)
+ ],
+ 'E12': [
+ Function('GPIOT4', BitsEqual(0xa0, [4], 0x1)),
+ Function('UNDEFINED4', BitsEqual(0x70, [6], 0x0)),
+ Function('RGMII1TXD2', None)
+ ],
+ 'E13': [
+ Fun