From patchwork Mon Mar 17 06:44:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Lee X-Patchwork-Id: 330759 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id B3B5F2C00A6 for ; Mon, 17 Mar 2014 17:45:33 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WPRIe-0005m5-LA; Mon, 17 Mar 2014 06:45:28 +0000 Received: from mail-pd0-f174.google.com ([209.85.192.174]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WPRIW-0005kK-8t for kernel-team@lists.ubuntu.com; Mon, 17 Mar 2014 06:45:20 +0000 Received: by mail-pd0-f174.google.com with SMTP id y13so5159949pdi.19 for ; Sun, 16 Mar 2014 23:45:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=a+yuqeRC9+tpqrGWb1hhWQThjVJO/NsqeOvgY/LQWg0=; b=OPK7MTd8BcXCerOn2+ZIGDvlrfvUmOWbWReEiLoTHgp/1v4ktj2GD9v7a6LQQIxUlD 8maX9DFtUAnnaienyu4EJymmZcz/FMWxD140Hf5rZWwUoxlQR34FcWO6UTE4QONwWzfE 8CWZqK5LTrIgLkcRyiFFSyXuztNvmcsqvn/h0Qcwy0YR1JfE7AfJiOCJK3h0p0j7AT+m 7+v9Sljf8tFajqx5IfFHtjuqe0Xl/E6SfKWqoNDAmnYnSZTDcf+u2JkMDEyj5ewnTNNX SIaWiWCSW9Tszc/wwR+eivm6zUgIlI7G6brdAAFpy8mx/LSYtu8DsLj7Tf8hiydV45QM 2u8A== X-Gm-Message-State: ALoCoQmFUXeO0NbDI3Wu7wzGD6V1/ULTSRB6tTIc1grWmdhf0yw1OiEIbXfBbTjWh3SDh6rFSDK4 X-Received: by 10.68.36.41 with SMTP id n9mr23279719pbj.99.1395038719281; Sun, 16 Mar 2014 23:45:19 -0700 (PDT) Received: from localhost ([116.213.97.190]) by mx.google.com with ESMTPSA id pp5sm40182304pbb.33.2014.03.16.23.45.17 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Sun, 16 Mar 2014 23:45:18 -0700 (PDT) From: Adam Lee To: kernel-team@lists.ubuntu.com Subject: [Trusty][PATCH 2/2] Revert "USBNET: ax88179_178a: enable tso if usb host supports sg dma" Date: Mon, 17 Mar 2014 14:44:55 +0800 Message-Id: <1395038695-16352-2-git-send-email-adam.lee@canonical.com> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395038695-16352-1-git-send-email-adam.lee@canonical.com> References: <1395038695-16352-1-git-send-email-adam.lee@canonical.com> Cc: Ning Yu X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com From: Mathias Nyman BugLink: http://bugs.launchpad.net/bugs/1293361 This reverts commit 3804fad45411b48233b48003e33a78f290d227c8. This commit, together with commit 247bf557273dd775505fb9240d2d152f4f20d304 "xhci 1.0: Limit arbitrarily-aligned scatter gather." were origially added to get xHCI 1.0 hosts and usb ethernet ax88179_178a devices working together with scatter gather. xHCI 1.0 hosts pose some requirement on how transfer buffers are aligned, setting this requirement for 1.0 hosts caused USB 3.0 mass storage devices to fail more frequently. USB 3.0 mass storage devices used to work before 3.14-rc1. Theoretically, the TD fragment rules could have caused an occasional disk glitch. Now the devices *will* fail, instead of theoretically failing. >From a user perspective, this looks like a regression; the USB device obviously fails on 3.14-rc1, and may sometimes silently fail on prior kernels. The proper soluition is to implement the TD fragment rules for xHCI 1.0 hosts, but for now, revert this patch until scatter gather can be properly supported. Signed-off-by: Mathias Nyman Cc: stable Signed-off-by: Greg Kroah-Hartman (cherry picked from commit 469d417b68958a064c09e7875646c97c6e783dfc) Signed-off-by: Adam Lee --- drivers/net/usb/ax88179_178a.c | 8 -------- 1 file changed, 8 deletions(-) diff --git a/drivers/net/usb/ax88179_178a.c b/drivers/net/usb/ax88179_178a.c index fe9bb2d..cf7bac2 100644 --- a/drivers/net/usb/ax88179_178a.c +++ b/drivers/net/usb/ax88179_178a.c @@ -1030,20 +1030,12 @@ static int ax88179_bind(struct usbnet *dev, struct usb_interface *intf) dev->mii.phy_id = 0x03; dev->mii.supports_gmii = 1; - if (usb_device_no_sg_constraint(dev->udev)) - dev->can_dma_sg = 1; - dev->net->features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM; dev->net->hw_features |= NETIF_F_IP_CSUM | NETIF_F_IPV6_CSUM | NETIF_F_RXCSUM; - if (dev->can_dma_sg) { - dev->net->features |= NETIF_F_SG | NETIF_F_TSO; - dev->net->hw_features |= NETIF_F_SG | NETIF_F_TSO; - } - /* Enable checksum offload */ *tmp = AX_RXCOE_IP | AX_RXCOE_TCP | AX_RXCOE_UDP | AX_RXCOE_TCPV6 | AX_RXCOE_UDPV6;