pch_gbe: correct receive time stamp filtering

This patch fixes the driver so that multicast PTP event messages can
be recognized by the hardware time stamping unit. The station address
register must be set according to the desired transport type.

[ RC - Rebased Takahiro's changes and wrote a commit message
  explaining the changes. ]

Signed-off-by: Takahiro Shimizu <tshimizu818@gmail.com>
Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
index 799a85a..53ac2fb 100644 (file)
--- a/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
+++ b/drivers/net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c
@@ -111,6 +111,9 @@ const char pch_driver_version[] = DRV_VERSION;
 /* 0x44 Time Synchronization Channel Event Register Bits */
 #define TX_SNAPSHOT_LOCKED (1<<0)
 #define RX_SNAPSHOT_LOCKED (1<<1)
+
+#define PTP_L4_MULTICAST_SA "01:00:5e:00:01:81"
+#define PTP_L2_MULTICAST_SA "01:1b:19:00:00:00"
 #endif
 
 static unsigned int copybreak __read_mostly = PCH_GBE_COPYBREAK_DEFAULT;
@@ -236,6 +239,7 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
        struct hwtstamp_config cfg;
        struct pch_gbe_adapter *adapter = netdev_priv(netdev);
        struct pci_dev *pdev;
+       u8 station[20];
 
        if (copy_from_user(&cfg, ifr->ifr_data, sizeof(cfg)))
                return -EFAULT;
@@ -269,9 +273,17 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
                adapter->hwts_rx_en = 1;
                pch_ch_control_write(pdev, MASTER_MODE | CAP_MODE0);
                break;
-       case HWTSTAMP_FILTER_PTP_V2_EVENT:
+       case HWTSTAMP_FILTER_PTP_V2_L4_EVENT:
+               adapter->hwts_rx_en = 1;
+               pch_ch_control_write(pdev, V2_MODE | CAP_MODE2);
+               strcpy(station, PTP_L4_MULTICAST_SA);
+               pch_set_station_address(station, pdev);
+               break;
+       case HWTSTAMP_FILTER_PTP_V2_L2_EVENT:
                adapter->hwts_rx_en = 1;
                pch_ch_control_write(pdev, V2_MODE | CAP_MODE2);
+               strcpy(station, PTP_L2_MULTICAST_SA);
+               pch_set_station_address(station, pdev);
                break;
        default:
                return -ERANGE;

diff --git a/drivers/ptp/Kconfig b/drivers/ptp/Kconfig
index cd9bc3b..5648dad 100644 (file)
--- a/drivers/ptp/Kconfig
+++ b/drivers/ptp/Kconfig
@@ -78,9 +78,13 @@ config PTP_1588_CLOCK_PCH
        depends on PCH_GBE
        help
          This driver adds support for using the PCH EG20T as a PTP
-         clock. This clock is only useful if your PTP programs are
-         getting hardware time stamps on the PTP Ethernet packets
-         using the SO_TIMESTAMPING API.
+         clock. The hardware supports time stamping of PTP packets
+         when using the end-to-end delay (E2E) mechansim. The peer
+         delay mechansim (P2P) is not supported.
+
+         This clock is only useful if your PTP programs are getting
+         hardware time stamps on the PTP Ethernet packets using the
+         SO_TIMESTAMPING API.
 
          To compile this driver as a module, choose M here: the module
          will be called ptp_pch.