diff --git a/debian/sonic-platform-nokia-ixr7220h6-128.install b/debian/sonic-platform-nokia-ixr7220h6-128.install index 61f96a5..193b340 100644 --- a/debian/sonic-platform-nokia-ixr7220h6-128.install +++ b/debian/sonic-platform-nokia-ixr7220h6-128.install @@ -1,5 +1,4 @@ ixr7220h6-128/scripts/h6_128_platform_init.sh usr/local/bin -ixr7220h6-128/scripts/set_ps.py usr/local/bin ixr7220h6-128/scripts/ports_notify.py usr/local/bin ixr7220h6-128/service/h6_128_platform_init.service etc/systemd/system ixr7220h6-128/service/ports_notify.service etc/systemd/system/ diff --git a/debian/sonic-platform-nokia-ixr7220h6-128.postinst b/debian/sonic-platform-nokia-ixr7220h6-128.postinst index 640ea94..209b9a1 100644 --- a/debian/sonic-platform-nokia-ixr7220h6-128.postinst +++ b/debian/sonic-platform-nokia-ixr7220h6-128.postinst @@ -3,7 +3,6 @@ # # see: dh_installdeb(1) -chmod a+x /usr/local/bin/set_ps.py chmod a+x /usr/local/bin/h6_128_platform_init.sh systemctl enable h6_128_platform_init.service systemctl start h6_128_platform_init.service diff --git a/ixr7220h6-128/scripts/h6_128_platform_init.sh b/ixr7220h6-128/scripts/h6_128_platform_init.sh index af14aec..83fa720 100644 --- a/ixr7220h6-128/scripts/h6_128_platform_init.sh +++ b/ixr7220h6-128/scripts/h6_128_platform_init.sh @@ -24,10 +24,9 @@ load_kernel_drivers() { h6-128_profile() { - #MAC_ADDR=$(ip link show eth0 | grep ether | awk '{print $2}') MAC_ADDR=$(sudo decode-syseeprom -m) - sed -i "s/switchMacAddress=.*/switchMacAddress=$MAC_ADDR/g" /usr/share/sonic/device/x86_64-nokia_ixr7220_h6_128-r0/Nokia-IXR7220-H6-128/profile.ini - echo "Nokia-IXR7220-H6-128: Updated switch mac address ${MAC_ADDR}" + sed -i "s/switchMacAddress=.*/switchMacAddress=$MAC_ADDR/g" /usr/share/sonic/device/x86_64-nokia_ixr7220_h6_128-r0/Nokia-IXR7220-H6-P128/profile.ini + echo "Nokia-IXR7220-H6-P128: Updated switch mac address ${MAC_ADDR}" } file_exists() { @@ -141,8 +140,6 @@ echo optoe2 0x50 > /sys/bus/i2c/devices/i2c-131/new_device h6-128_profile -/usr/local/bin/set_ps.py - for ch in {1..8}; do echo 60 > /sys/bus/i2c/devices/144-0032/hwmon/hwmon*/fan${ch}_pwm echo 60 > /sys/bus/i2c/devices/145-0033/hwmon/hwmon*/fan${ch}_pwm diff --git a/ixr7220h6-128/scripts/set_ps.py b/ixr7220h6-128/scripts/set_ps.py deleted file mode 100644 index a5abb07..0000000 --- a/ixr7220h6-128/scripts/set_ps.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -import struct -from os import * -from mmap import * - -RESOURCE = "/sys/bus/pci/devices/0000:03:00.0/resource0" -REG1 = [0x2100, 0x2120, 0x2140, 0x2160, 0x2180, 0x21A0, 0x21C0, 0x21E0, 0x2200, 0x2220, 0x2240, 0x2260, 0x2280, 0x22A0, 0x22C0, 0x22E0] -REG2 = [0x2300, 0x2320, 0x2340, 0x2360, 0x2380, 0x23A0, 0x23C0, 0x23E0, 0x2400, 0x2420, 0x2440, 0x2460, 0x2480, 0x24A0, 0x24C0, 0x24E0, 0x2500, 0x2520] - -def pci_set_data8(resource, val, offset): - fd = open(resource, O_RDWR) - mm = mmap(fd, 0) - mm.seek(offset) - mm.write(struct.pack('B', val)) - mm.close() - close(fd) - -def main(): - for p in range(5): - pci_set_data8(RESOURCE, p+1, 0x2f00) - #print(f"SPI_MUX: set mux to {(p+1)}:\n\n") - for i in range(len(REG1)): - pci_set_data8(RESOURCE, 0x80, REG1[i]+8) - pci_set_data8(RESOURCE, 0x0B, REG1[i]) - pci_set_data8(RESOURCE, 0x0, REG1[i]+4) - if p == 0: - for i in range(len(REG2)): - pci_set_data8(RESOURCE, 0x80, REG2[i]+8) - pci_set_data8(RESOURCE, 0x0B, REG2[i]) - pci_set_data8(RESOURCE, 0x0, REG2[i]+4) - - return - - -if __name__ == '__main__': - main() - \ No newline at end of file diff --git a/ixr7220h6-128/service/h6_128_platform_init.service b/ixr7220h6-128/service/h6_128_platform_init.service index 0154996..75e1503 100644 --- a/ixr7220h6-128/service/h6_128_platform_init.service +++ b/ixr7220h6-128/service/h6_128_platform_init.service @@ -1,5 +1,5 @@ [Unit] -Description=Nokia-IXR7220-H6-128 Platform Service +Description=Nokia-IXR7220-H6-P128 Platform Service After=sysinit.target Before=pmon.service determine-reboot-cause.service