From patchwork Tue Sep 13 23:06:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Boyd X-Patchwork-Id: 76121 Delivered-To: patch@linaro.org Received: by 10.140.106.72 with SMTP id d66csp1594097qgf; Tue, 13 Sep 2016 16:06:38 -0700 (PDT) X-Received: by 10.66.249.74 with SMTP id ys10mr5764169pac.29.1473807998468; Tue, 13 Sep 2016 16:06:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ai2si1039697pad.98.2016.09.13.16.06.38; Tue, 13 Sep 2016 16:06:38 -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 S932478AbcIMXGf (ORCPT + 4 others); Tue, 13 Sep 2016 19:06:35 -0400 Received: from mail-pa0-f43.google.com ([209.85.220.43]:33852 "EHLO mail-pa0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932217AbcIMXGe (ORCPT ); Tue, 13 Sep 2016 19:06:34 -0400 Received: by mail-pa0-f43.google.com with SMTP id wk8so91507pab.1 for ; Tue, 13 Sep 2016 16:06:34 -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; bh=UOCQXgVeO7kfYUgi4hh/MEWGn6HLd0fxSN5Lv57092M=; b=dJl79hG3IQeIll16e59p1hmZoD7K9Hx6fha4BO2z4ZpttFolGNLxlxPaRFnfR6wRFV O6scnuxcrukGcuiPtjWMRRu2BqTvqAHF+RfYyYgnZCCuBn5Km2HeAhEMtaREczxguZbe spYhMSq8dkz+gzZXf6Dh4MBu6KFlpn3Q8IdgI= 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; bh=UOCQXgVeO7kfYUgi4hh/MEWGn6HLd0fxSN5Lv57092M=; b=WooaOtHcsVzYwH5DHY/dMfI6g9pCPvB1IBTJppVr5TKqkrEyqaPY79ETlh2H91ejQJ Wq/lBp8NdmRI0/5zccxIV1bT/u1L3T1b7fa77C/I5QEEG8AUxqGovNyP64WuS657ojLC 957qUQvIHc2zTs9b09heMESyyWR1TXGZf+jVn5CrhLMc1Hv+/5Js4/IP1BqiyzlK3x1f Qz3WosfwXQdGlHBsWrLRPRV50jp4XlkSOcCFgfafHQ+Kii7C2eKgNSkE0F9DoNoiDH1S bn7969TA3IIsKT6gTGXN/08qRhOynb2Z9C1aFaHnMJpSSKJPzYknNLdwMqVrGV/w6qXE n8oQ== X-Gm-Message-State: AE9vXwMUZ3sJNSLmr1TynXXnzP8DwH0/Q2sg0TU3br8G/+3pb01I7dX8eloqFNi8Njkz5MnD X-Received: by 10.66.135.52 with SMTP id pp20mr5554413pab.121.1473807993553; Tue, 13 Sep 2016 16:06:33 -0700 (PDT) Received: from localhost.localdomain (i-global254.qualcomm.com. [199.106.103.254]) by smtp.gmail.com with ESMTPSA id i74sm33336782pfk.2.2016.09.13.16.06.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 13 Sep 2016 16:06:33 -0700 (PDT) From: Stephen Boyd To: linux-usb@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Peter Chen , Greg Kroah-Hartman Subject: [PATCH] usb: chipidea: Properly mark little endian descriptors Date: Tue, 13 Sep 2016 16:06:31 -0700 Message-Id: <20160913230631.6727-1-stephen.boyd@linaro.org> X-Mailer: git-send-email 2.9.0.rc2.8.ga28705d 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 --- 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 6acf4dba395e..61a65d1d05f2 100644 --- a/drivers/usb/chipidea/udc.c +++ b/drivers/usb/chipidea/udc.c @@ -364,7 +364,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); @@ -503,7 +503,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)); } wmb(); /* synchronize before ep prime */ @@ -530,7 +530,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)));