From patchwork Wed Sep 14 05:53:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 76140 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1703824qgf; Tue, 13 Sep 2016 22:53:10 -0700 (PDT) X-Received: by 10.66.27.106 with SMTP id s10mr1375388pag.96.1473832390699; Tue, 13 Sep 2016 22:53:10 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id gg3si2884739pac.136.2016.09.13.22.53.10; Tue, 13 Sep 2016 22:53:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752643AbcINFxH (ORCPT + 4 others); Wed, 14 Sep 2016 01:53:07 -0400 Received: from mail-pf0-f179.google.com ([209.85.192.179]:33799 "EHLO mail-pf0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751676AbcINFxG (ORCPT ); Wed, 14 Sep 2016 01:53:06 -0400 Received: by mail-pf0-f179.google.com with SMTP id p64so2068094pfb.1 for ; Tue, 13 Sep 2016 22:53:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to; bh=uC/WzQ4QMWGGoRdDWPkWR1EYtz31jAx8yVuHdYHdpBc=; b=BtmUfJGYCyGPjZh6KVBmZOqPemy9HMJafzogzBv2pi0qE1oS/W+yzQDP441QGhzT20 6yf9PYJtWgQWOJeJl0hKGgiivTIYVFR7yjbZwCnHqbpKsyCPxGIqF05TLypZHBRH+Jrl uSaINeOdl7sevaM7hbWby5ZDgNUyzDAyzuZLw= 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; bh=uC/WzQ4QMWGGoRdDWPkWR1EYtz31jAx8yVuHdYHdpBc=; b=N+R4kbgKqBOybAU5g+Knk/CB0STdYrSuE/x87CDvJ96grC/Sk7T7+0NC9IyTej4niX OteyZKXSHlwc/pyV3KY78PaFO5fWdhl2XJN2gMKiPvdNCPua4NOm5oeV4rQDsZL0N7e0 COpaXVdZ9PLQlOMt1BckbyMQKqIfj7ORJd8Jy7oDEHRA5dvu/Ie/82nFPRoUXigm+UnK V1f+2zO3wfcXU8FyaQMi/nRYU5HVzhnphOnY58WHk6vy5FqE1NVI5k3j0EX9+wxK4BC6 Gam0ejkKsDuMvJpWJhL4+ZhIYkrdcIkxsudHvtSqm5GFnuB+SKYVTlgzKhI0KSVhxNv3 97Kw== X-Gm-Message-State: AE9vXwOlAKapG2FT1QyJEaOt45UTb8BDwn+jj0BoWfMEk30ojGSWrZgNqV/7Be0OXNXbT2AZ X-Received: by 10.98.193.129 with SMTP id i123mr1324713pfg.69.1473832385277; Tue, 13 Sep 2016 22:53:05 -0700 (PDT) Received: from localhost.localdomain (ip68-101-172-78.sd.sd.cox.net. [68.101.172.78]) by smtp.gmail.com with ESMTPSA id ra13sm2222991pac.29.2016.09.13.22.53.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Sep 2016 22:53:04 -0700 (PDT) From: Stephen Boyd To: Peter Chen Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, Greg Kroah-Hartman Subject: [PATCH/REBASED] usb: chipidea: Properly mark little endian descriptors Date: Tue, 13 Sep 2016 22:53:02 -0700 Message-Id: <20160914055302.1132-1-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d In-Reply-To: <20160914025045.GD30760@b29397-desktop> Sender: linux-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org The DMA descriptors are little endian, and we do a pretty good job of handling them with the proper le32_to_cpu() markings, but we don't actually mark them as __le32. This means checkers like sparse can't easily find new bugs. Let's mark the members of structures properly and fix the few places where we're missing conversions. Cc: Peter Chen Cc: Greg Kroah-Hartman Signed-off-by: Stephen Boyd --- Peter Chen wrote: > > I am afraid I can't apply for testing > > Applying: usb: chipidea: Properly mark little endian descriptors > fatal: sha1 information is lacking or useless > (drivers/usb/chipidea/udc.c). > error: could not build fake ancestor > Patch failed at 0001 usb: chipidea: Properly mark little endian > descriptors > The copy of the patch that failed is found in: .git/rebase-apply/patch > When you have resolved this problem, run "git am --continue". > If you prefer to skip this patch, run "git am --skip" instead. > To restore the original branch and stop patching, run "git am --abort". > > Would you please rebase my ci-for-usb-next branch? Sure no problem. Maybe you shouldn't specify a 3 way merge so that it attempts to apply without building a fake ancestor? Anyway, here it is. drivers/usb/chipidea/udc.c | 6 +++--- drivers/usb/chipidea/udc.h | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) -- 2.9.0.rc2.8.ga28705d -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/chipidea/udc.c b/drivers/usb/chipidea/udc.c index 661f43fe0f9e..a9b07befd398 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -365,7 +365,7 @@ static int add_td_to_list(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq, if (hwreq->req.length == 0 || hwreq->req.length % hwep->ep.maxpacket) mul++; - node->ptr->token |= mul << __ffs(TD_MULTO); + node->ptr->token |= cpu_to_le32(mul << __ffs(TD_MULTO)); } temp = (u32) (hwreq->req.dma + hwreq->req.actual); @@ -504,7 +504,7 @@ static int _hardware_enqueue(struct ci_hw_ep *hwep, struct ci_hw_req *hwreq) if (hwreq->req.length == 0 || hwreq->req.length % hwep->ep.maxpacket) mul++; - hwep->qh.ptr->cap |= mul << __ffs(QH_MULT); + hwep->qh.ptr->cap |= cpu_to_le32(mul << __ffs(QH_MULT)); } ret = hw_ep_prime(ci, hwep->num, hwep->dir, @@ -529,7 +529,7 @@ static void free_pending_td(struct ci_hw_ep *hwep) static int reprime_dtd(struct ci_hdrc *ci, struct ci_hw_ep *hwep, struct td_node *node) { - hwep->qh.ptr->td.next = node->dma; + hwep->qh.ptr->td.next = cpu_to_le32(node->dma); hwep->qh.ptr->td.token &= cpu_to_le32(~(TD_STATUS_HALTED | TD_STATUS_ACTIVE)); diff --git a/drivers/usb/chipidea/udc.h b/drivers/usb/chipidea/udc.h index e66df0020bd4..2ecd1174d66c 100644 --- a/drivers/usb/chipidea/udc.h +++ b/drivers/usb/chipidea/udc.h @@ -22,11 +22,11 @@ /* DMA layout of transfer descriptors */ struct ci_hw_td { /* 0 */ - u32 next; + __le32 next; #define TD_TERMINATE BIT(0) #define TD_ADDR_MASK (0xFFFFFFEUL << 5) /* 1 */ - u32 token; + __le32 token; #define TD_STATUS (0x00FFUL << 0) #define TD_STATUS_TR_ERR BIT(3) #define TD_STATUS_DT_ERR BIT(5) @@ -36,7 +36,7 @@ struct ci_hw_td { #define TD_IOC BIT(15) #define TD_TOTAL_BYTES (0x7FFFUL << 16) /* 2 */ - u32 page[5]; + __le32 page[5]; #define TD_CURR_OFFSET (0x0FFFUL << 0) #define TD_FRAME_NUM (0x07FFUL << 0) #define TD_RESERVED_MASK (0x0FFFUL << 0) @@ -45,18 +45,18 @@ struct ci_hw_td { /* DMA layout of queue heads */ struct ci_hw_qh { /* 0 */ - u32 cap; + __le32 cap; #define QH_IOS BIT(15) #define QH_MAX_PKT (0x07FFUL << 16) #define QH_ZLT BIT(29) #define QH_MULT (0x0003UL << 30) #define QH_ISO_MULT(x) ((x >> 11) & 0x03) /* 1 */ - u32 curr; + __le32 curr; /* 2 - 8 */ struct ci_hw_td td; /* 9 */ - u32 RESERVED; + __le32 RESERVED; struct usb_ctrlrequest setup; } __attribute__ ((packed, aligned(4)));