aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_niu.c
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-02-24 19:39:03 -0500
committerDavid S. Miller <davem@davemloft.net>2009-02-24 19:39:03 -0500
commitdbf64b10fa5b339d8b6e949f97c0d00750b08ca8 (patch)
treef3fe30e3d5f52d5a600ef10100e2de1670b54f86 /drivers/net/netxen/netxen_nic_niu.c
parent4da129421f898147235a3e6b40234d789df208b7 (diff)
netxen: cleanup unused code
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_niu.c')
-rw-r--r--drivers/net/netxen/netxen_nic_niu.c219
1 files changed, 0 insertions, 219 deletions
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index c3b9c83b32fe..3851a677fd55 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -299,14 +299,6 @@ int netxen_niu_gbe_disable_phy_interrupts(struct netxen_adapter *adapter)
299 return result; 299 return result;
300} 300}
301 301
302#if 0
303int netxen_niu_xgbe_clear_phy_interrupts(struct netxen_adapter *adapter)
304{
305 netxen_crb_writelit_adapter(adapter, NETXEN_NIU_ACTIVE_INT, -1);
306 return 0;
307}
308#endif /* 0 */
309
310static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter) 302static int netxen_niu_gbe_clear_phy_interrupts(struct netxen_adapter *adapter)
311{ 303{
312 int result = 0; 304 int result = 0;
@@ -467,104 +459,6 @@ int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
467 return 0; 459 return 0;
468} 460}
469 461
470#if 0
471/*
472 * netxen_niu_gbe_handle_phy_interrupt - Handles GbE PHY interrupts
473 * @param enable 0 means don't enable the port
474 * 1 means enable (or re-enable) the port
475 */
476int netxen_niu_gbe_handle_phy_interrupt(struct netxen_adapter *adapter,
477 int port, long enable)
478{
479 int result = 0;
480 __u32 int_src;
481
482 printk(KERN_INFO PFX "NETXEN: Handling PHY interrupt on port %d"
483 " (device enable = %d)\n", (int)port, (int)enable);
484
485 /*
486 * The read of the PHY INT status will clear the pending
487 * interrupt status
488 */
489 if (netxen_niu_gbe_phy_read(adapter,
490 NETXEN_NIU_GB_MII_MGMT_ADDR_INT_STATUS,
491 &int_src) != 0)
492 result = -EINVAL;
493 else {
494 printk(KERN_INFO PFX "PHY Interrupt source = 0x%x \n", int_src);
495 if (netxen_get_phy_int_jabber(int_src))
496 printk(KERN_INFO PFX "jabber Interrupt ");
497 if (netxen_get_phy_int_polarity_changed(int_src))
498 printk(KERN_INFO PFX "polarity changed ");
499 if (netxen_get_phy_int_energy_detect(int_src))
500 printk(KERN_INFO PFX "energy detect \n");
501 if (netxen_get_phy_int_downshift(int_src))
502 printk(KERN_INFO PFX "downshift \n");
503 if (netxen_get_phy_int_mdi_xover_changed(int_src))
504 printk(KERN_INFO PFX "mdi_xover_changed ");
505 if (netxen_get_phy_int_fifo_over_underflow(int_src))
506 printk(KERN_INFO PFX "fifo_over_underflow ");
507 if (netxen_get_phy_int_false_carrier(int_src))
508 printk(KERN_INFO PFX "false_carrier ");
509 if (netxen_get_phy_int_symbol_error(int_src))
510 printk(KERN_INFO PFX "symbol_error ");
511 if (netxen_get_phy_int_autoneg_completed(int_src))
512 printk(KERN_INFO PFX "autoneg_completed ");
513 if (netxen_get_phy_int_page_received(int_src))
514 printk(KERN_INFO PFX "page_received ");
515 if (netxen_get_phy_int_duplex_changed(int_src))
516 printk(KERN_INFO PFX "duplex_changed ");
517 if (netxen_get_phy_int_autoneg_error(int_src))
518 printk(KERN_INFO PFX "autoneg_error ");
519 if ((netxen_get_phy_int_speed_changed(int_src))
520 || (netxen_get_phy_int_link_status_changed(int_src))) {
521 __u32 status;
522
523 printk(KERN_INFO PFX
524 "speed_changed or link status changed");
525 if (netxen_niu_gbe_phy_read
526 (adapter,
527 NETXEN_NIU_GB_MII_MGMT_ADDR_PHY_STATUS,
528 &status) == 0) {
529 if (netxen_get_phy_speed(status) == 2) {
530 printk
531 (KERN_INFO PFX "Link speed changed"
532 " to 1000 Mbps\n");
533 netxen_niu_gbe_set_gmii_mode(adapter,
534 port,
535 enable);
536 } else if (netxen_get_phy_speed(status) == 1) {
537 printk
538 (KERN_INFO PFX "Link speed changed"
539 " to 100 Mbps\n");
540 netxen_niu_gbe_set_mii_mode(adapter,
541 port,
542 enable);
543 } else if (netxen_get_phy_speed(status) == 0) {
544 printk
545 (KERN_INFO PFX "Link speed changed"
546 " to 10 Mbps\n");
547 netxen_niu_gbe_set_mii_mode(adapter,
548 port,
549 enable);
550 } else {
551 printk(KERN_ERR PFX "ERROR reading "
552 "PHY status. Invalid speed.\n");
553 result = -1;
554 }
555 } else {
556 printk(KERN_ERR PFX
557 "ERROR reading PHY status.\n");
558 result = -1;
559 }
560
561 }
562 printk(KERN_INFO "\n");
563 }
564 return result;
565}
566#endif /* 0 */
567
568/* 462/*
569 * Return the current station MAC address. 463 * Return the current station MAC address.
570 * Note that the passed-in value must already be in network byte order. 464 * Note that the passed-in value must already be in network byte order.
@@ -641,86 +535,6 @@ int netxen_niu_macaddr_set(struct netxen_adapter *adapter,
641 return 0; 535 return 0;
642} 536}
643 537
644#if 0
645/* Enable a GbE interface */
646int netxen_niu_enable_gbe_port(struct netxen_adapter *adapter,
647 int port, netxen_niu_gbe_ifmode_t mode)
648{
649 __u32 mac_cfg0;
650 __u32 mac_cfg1;
651 __u32 mii_cfg;
652
653 if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
654 return -EINVAL;
655
656 mac_cfg0 = 0;
657 netxen_gb_soft_reset(mac_cfg0);
658 if (adapter->hw_write_wx(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
659 &mac_cfg0, 4))
660 return -EIO;
661 mac_cfg0 = 0;
662 netxen_gb_enable_tx(mac_cfg0);
663 netxen_gb_enable_rx(mac_cfg0);
664 netxen_gb_unset_rx_flowctl(mac_cfg0);
665 netxen_gb_tx_reset_pb(mac_cfg0);
666 netxen_gb_rx_reset_pb(mac_cfg0);
667 netxen_gb_tx_reset_mac(mac_cfg0);
668 netxen_gb_rx_reset_mac(mac_cfg0);
669
670 if (adapter->hw_write_wx(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
671 &mac_cfg0, 4))
672 return -EIO;
673 mac_cfg1 = 0;
674 netxen_gb_set_preamblelen(mac_cfg1, 0xf);
675 netxen_gb_set_duplex(mac_cfg1);
676 netxen_gb_set_crc_enable(mac_cfg1);
677 netxen_gb_set_padshort(mac_cfg1);
678 netxen_gb_set_checklength(mac_cfg1);
679 netxen_gb_set_hugeframes(mac_cfg1);
680
681 if (mode == NETXEN_NIU_10_100_MB) {
682 netxen_gb_set_intfmode(mac_cfg1, 1);
683 if (adapter->hw_write_wx(adapter,
684 NETXEN_NIU_GB_MAC_CONFIG_1(port),
685 &mac_cfg1, 4))
686 return -EIO;
687
688 /* set mii mode */
689 netxen_crb_writelit_adapter(adapter, NETXEN_NIU_GB0_GMII_MODE +
690 (port << 3), 0);
691 netxen_crb_writelit_adapter(adapter, NETXEN_NIU_GB0_MII_MODE +
692 (port << 3), 1);
693
694 } else if (mode == NETXEN_NIU_1000_MB) {
695 netxen_gb_set_intfmode(mac_cfg1, 2);
696 if (adapter->hw_write_wx(adapter,
697 NETXEN_NIU_GB_MAC_CONFIG_1(port),
698 &mac_cfg1, 4))
699 return -EIO;
700 /* set gmii mode */
701 netxen_crb_writelit_adapter(adapter, NETXEN_NIU_GB0_MII_MODE +
702 (port << 3), 0);
703 netxen_crb_writelit_adapter(adapter, NETXEN_NIU_GB0_GMII_MODE +
704 (port << 3), 1);
705 }
706 mii_cfg = 0;
707 netxen_gb_set_mii_mgmt_clockselect(mii_cfg, 7);
708 if (adapter->hw_write_wx(adapter, NETXEN_NIU_GB_MII_MGMT_CONFIG(port),
709 &mii_cfg, 4))
710 return -EIO;
711 mac_cfg0 = 0;
712 netxen_gb_enable_tx(mac_cfg0);
713 netxen_gb_enable_rx(mac_cfg0);
714 netxen_gb_unset_rx_flowctl(mac_cfg0);
715 netxen_gb_unset_tx_flowctl(mac_cfg0);
716
717 if (adapter->hw_write_wx(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
718 &mac_cfg0, 4))
719 return -EIO;
720 return 0;
721}
722#endif /* 0 */
723
724/* Disable a GbE interface */ 538/* Disable a GbE interface */
725int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter) 539int netxen_niu_disable_gbe_port(struct netxen_adapter *adapter)
726{ 540{
@@ -869,39 +683,6 @@ int netxen_niu_xg_macaddr_set(struct netxen_adapter *adapter,
869 return 0; 683 return 0;
870} 684}
871 685
872#if 0
873/*
874 * Return the current station MAC address.
875 * Note that the passed-in value must already be in network byte order.
876 */
877int netxen_niu_xg_macaddr_get(struct netxen_adapter *adapter,
878 netxen_ethernet_macaddr_t * addr)
879{
880 int phy = adapter->physical_port;
881 u32 stationhigh;
882 u32 stationlow;
883 u8 val[8];
884
885 if (addr == NULL)
886 return -EINVAL;
887 if (phy != 0)
888 return -EINVAL;
889
890 if (adapter->hw_read_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_HI,
891 &stationhigh, 4))
892 return -EIO;
893 if (adapter->hw_read_wx(adapter, NETXEN_NIU_XGE_STATION_ADDR_0_1,
894 &stationlow, 4))
895 return -EIO;
896 ((__le32 *)val)[1] = cpu_to_le32(stationhigh);
897 ((__le32 *)val)[0] = cpu_to_le32(stationlow);
898
899 memcpy(addr, val + 2, 6);
900
901 return 0;
902}
903#endif /* 0 */
904
905int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter, 686int netxen_niu_xg_set_promiscuous_mode(struct netxen_adapter *adapter,
906 u32 mode) 687 u32 mode)
907{ 688{