瀏覽代碼

[phantom] Do not halt PEGs on driver shutdown

Halting the PEGs breaks platforms where there is sideband access to
the NIC (e.g. HP machines using iLO).  (We have to retain the
unhalting code because on some other platforms (e.g. IBM blades with
BOFM) the pre-PXE firmware must halt the PEGs to avoid issues with the
BIOS rereading via the expansion ROM BAR.)
tags/v0.9.6
Michael Brown 16 年之前
父節點
當前提交
46f43d8ea7
共有 1 個檔案被更改,包括 0 行新增15 行删除
  1. 0
    15
      src/drivers/net/phantom/phantom.c

+ 0
- 15
src/drivers/net/phantom/phantom.c 查看文件

@@ -1784,19 +1784,6 @@ static int phantom_map_crb ( struct phantom_nic *phantom,
1784 1784
 	return 0;
1785 1785
 }
1786 1786
 
1787
-/**
1788
- * Halt all PEGs
1789
- *
1790
- * @v phantom		Phantom NIC
1791
- */
1792
-static void phantom_halt_pegs ( struct phantom_nic *phantom ) {
1793
-	phantom_writel ( phantom, 1, UNM_PEG_0_HALT );
1794
-	phantom_writel ( phantom, 1, UNM_PEG_1_HALT );
1795
-	phantom_writel ( phantom, 1, UNM_PEG_2_HALT );
1796
-	phantom_writel ( phantom, 1, UNM_PEG_3_HALT );
1797
-	phantom_writel ( phantom, 1, UNM_PEG_4_HALT );
1798
-}
1799
-
1800 1787
 /**
1801 1788
  * Unhalt all PEGs
1802 1789
  *
@@ -2089,7 +2076,6 @@ static int phantom_probe ( struct pci_device *pci,
2089 2076
  err_check_boot_enable:
2090 2077
  err_init_rcvpeg:
2091 2078
  err_init_cmdpeg:
2092
-	phantom_halt_pegs ( phantom );
2093 2079
  err_map_crb:
2094 2080
 	netdev_nullify ( netdev );
2095 2081
 	netdev_put ( netdev );
@@ -2108,7 +2094,6 @@ static void phantom_remove ( struct pci_device *pci ) {
2108 2094
 
2109 2095
 	unregister_settings ( &phantom->settings );
2110 2096
 	unregister_netdev ( netdev );
2111
-	phantom_halt_pegs ( phantom );
2112 2097
 	netdev_nullify ( netdev );
2113 2098
 	netdev_put ( netdev );
2114 2099
 }

Loading…
取消
儲存