Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S938643AbcLPAUg (ORCPT ); Thu, 15 Dec 2016 19:20:36 -0500 Received: from mail-db5eur01on0061.outbound.protection.outlook.com ([104.47.2.61]:48885 "EHLO EUR01-DB5-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932655AbcLPAT6 (ORCPT ); Thu, 15 Dec 2016 19:19:58 -0500 From: Stuart Yoder To: Laurentiu Tudor , "gregkh@linuxfoundation.org" CC: "devel@driverdev.osuosl.org" , "linux-kernel@vger.kernel.org" , "agraf@suse.de" , "arnd@arndb.de" , Leo Li , Ioana Ciornei , "Catalin Horghidan" , Ruxandra Ioana Radulescu , Roy Pledge Subject: RE: [PATCH v3 4/9] bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs Thread-Topic: [PATCH v3 4/9] bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs Thread-Index: AQHSTCUa6xHTWBV/hkG06We9mcS52qD0klcAgBS4xfA= Date: Thu, 15 Dec 2016 16:41:04 +0000 Message-ID: References: <1480632094-3621-1-git-send-email-stuart.yoder@nxp.com> <1480632094-3621-5-git-send-email-stuart.yoder@nxp.com> <5841651D.5080703@nxp.com> In-Reply-To: <5841651D.5080703@nxp.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: spf=none (sender IP is ) smtp.mailfrom=stuart.yoder@nxp.com; x-originating-ip: [192.88.168.1] x-microsoft-exchange-diagnostics: 1;VI1PR0401MB2638;7:2SUw51UimhvCy5Vc/WvZtN/dylND/d3uHZWn/OtwPtfTNfUh16lArKy59IK+co3FanYAO2sa0mY2NDOxwlvxtyExxFoUV0mYzHVFuP3ttEuSAfyPp3+VwtyN9iR48piVJOB+GjxWL5HCckDRgHUBlQ9xUajtdsLf6DeOU2vjAT8RjNbEakG3mjelB/Q1VWW9Qi2WZ/nmP1XPh18O6GO8QOc10SueXOrlg1Qu3DvRuw54zRoOwL2eLZcIcNGdXVWPiRL85sbY/+FDxhA/dPUXPp2a1E3AoYTTZAt0FV+Kbzy09yn2gKmQcdClgLcl7lDvyNvpxvRsdrX1Ofq3/H4QptZKQD8ylio6mqS4pamscfCbmpBq9bkPfqqJWa1ffvlr9J4nOW9P1vbjh/v9Aecr4fSb3bvgEpw8kqogsqTgMHlsCnqzliVXLCD6c5RoFV42dRJwAtDt87x4pq8cZOBMPQ== x-forefront-antispam-report: SFV:SKI;SCL:-1SFV:NSPM;SFS:(10009020)(6009001)(7916002)(39850400002)(39410400002)(39860400002)(39840400002)(39450400003)(13464003)(24454002)(199003)(377454003)(189002)(54356999)(76576001)(76176999)(102836003)(3846002)(122556002)(6116002)(229853002)(2501003)(4326007)(50986999)(106356001)(106116001)(2900100001)(74316002)(77096006)(8676002)(2906002)(66066001)(25786008)(6506006)(33656002)(3900700001)(9686002)(92566002)(8936002)(6436002)(38730400001)(86362001)(575784001)(5001770100001)(2950100002)(3660700001)(7736002)(105586002)(7696004)(3280700002)(5660300001)(68736007)(189998001)(81166006)(97736004)(101416001)(81156014)(305945005)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:VI1PR0401MB2638;H:VI1PR0401MB2638.eurprd04.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-ms-office365-filtering-correlation-id: eb805943-f945-4cfc-6d31-08d4250929ab x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:VI1PR0401MB2638; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(9452136761055)(185117386973197); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123562025)(20161123555025)(20161123564025)(20161123560025)(6072148)(6047074);SRVR:VI1PR0401MB2638;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0401MB2638; x-forefront-prvs: 0157DEB61B spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Dec 2016 16:41:04.7884 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0401MB2638 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id uBG0KgU6010313 Content-Length: 7348 Lines: 207 > -----Original Message----- > From: Laurentiu Tudor > Sent: Friday, December 02, 2016 6:12 AM > To: Stuart Yoder ; gregkh@linuxfoundation.org > Cc: devel@driverdev.osuosl.org; linux-kernel@vger.kernel.org; agraf@suse.de; arnd@arndb.de; Leo Li > ; Ioana Ciornei ; Catalin Horghidan > ; Ruxandra Ioana Radulescu ; Roy Pledge > > Subject: Re: [PATCH v3 4/9] bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs > > > Some more bits and pieces inside. > > --- > Best Regards, Laurentiu > > On 12/02/2016 12:41 AM, Stuart Yoder wrote: > > From: Roy Pledge > > > > Add global definitions for DPAA2 frame descriptors and scatter > > gather entries. > > > > Signed-off-by: Roy Pledge > > Signed-off-by: Stuart Yoder > > --- > > > > Notes: > > -v3 > > -no changes > > -v2 > > -added setter/getter for the FD ctrl field > > -corrected comment for SG format_offset field description > > -added support for short length field in FD > > > > include/linux/fsl/dpaa2-fd.h | 448 +++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 448 insertions(+) > > create mode 100644 include/linux/fsl/dpaa2-fd.h > > > > diff --git a/include/linux/fsl/dpaa2-fd.h b/include/linux/fsl/dpaa2-fd.h > > new file mode 100644 > > index 0000000..182c8f4 > > --- /dev/null > > +++ b/include/linux/fsl/dpaa2-fd.h > > @@ -0,0 +1,448 @@ > > +/* > > + * Copyright 2014-2016 Freescale Semiconductor Inc. > > + * > > + * Redistribution and use in source and binary forms, with or without > > + * modification, are permitted provided that the following conditions are met: > > + * * Redistributions of source code must retain the above copyright > > + * notice, this list of conditions and the following disclaimer. > > + * * Redistributions in binary form must reproduce the above copyright > > + * notice, this list of conditions and the following disclaimer in the > > + * documentation and/or other materials provided with the distribution. > > + * * Neither the name of Freescale Semiconductor nor the > > + * names of its contributors may be used to endorse or promote products > > + * derived from this software without specific prior written permission. > > + * > > + * ALTERNATIVELY, this software may be distributed under the terms of the > > + * GNU General Public License ("GPL") as published by the Free Software > > + * Foundation, either version 2 of that License or (at your option) any > > + * later version. > > + * > > + * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY > > + * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED > > + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE > > + * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY > > + * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES > > + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; > > + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND > > + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > > + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS > > + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > > + */ > > +#ifndef __FSL_DPAA2_FD_H > > +#define __FSL_DPAA2_FD_H > > + > > +#include > > + > > +/** > > + * DOC: DPAA2 FD - Frame Descriptor APIs for DPAA2 > > + * > > + * Frame Descriptors (FDs) are used to describe frame data in the DPAA2. > > + * Frames can be enqueued and dequeued to Frame Queues (FQs) which are consumed > > + * by the various DPAA accelerators (WRIOP, SEC, PME, DCE) > > + * > > + * There are three types of frames: single, scatter gather, and frame lists. > > + * > > + * The set of APIs in this file must be used to create, manipulate and > > + * query Frame Descriptors. > > + */ > > + > > +/** > > + * struct dpaa2_fd - Struct describing FDs > > + * @words: for easier/faster copying the whole FD structure > > + * @addr: address in the FD > > + * @len: length in the FD > > + * @bpid: buffer pool ID > > + * @format_offset: format, offset, and short-length fields > > + * @frc: frame context > > + * @ctrl: control bits...including dd, sc, va, err, etc > > + * @flc: flow context address > > + * > > + * This structure represents the basic Frame Descriptor used in the system. > > + */ > > +struct dpaa2_fd { > > + union { > > + u32 words[8]; > > + struct dpaa2_fd_simple { > > + __le64 addr; > > + __le32 len; > > + __le16 bpid; > > + __le16 format_offset; > > + __le32 frc; > > + __le32 ctrl; > > + __le64 flc; > > + } simple; > > + }; > > +}; > > + > > +#define FD_SHORT_LEN_FLAG_MASK 0x1 > > +#define FD_SHORT_LEN_FLAG_SHIFT 14 > > +#define FD_SHORT_LEN_MASK 0x1FFFF > > +#define FD_OFFSET_MASK 0x0FFF > > +#define FD_FORMAT_MASK 0x3 > > +#define FD_FORMAT_SHIFT 12 > > +#define SG_SHORT_LEN_FLAG_MASK 0x1 > > +#define SG_SHORT_LEN_FLAG_SHIFT 14 > > +#define SG_SHORT_LEN_MASK 0x1FFFF > > +#define SG_OFFSET_MASK 0x0FFF > > +#define SG_FORMAT_MASK 0x3 > > +#define SG_FORMAT_SHIFT 12 > > +#define SG_BPID_MASK 0x3FFF > > +#define SG_FINAL_FLAG_MASK 0x1 > > +#define SG_FINAL_FLAG_SHIFT 15 > > We should align the values of these macros as we do in other places. Yes, agree. > > +enum dpaa2_fd_format { > > + dpaa2_fd_single = 0, > > + dpaa2_fd_list, > > + dpaa2_fd_sg > > +}; > > + > > +/** > > + * dpaa2_fd_get_addr() - get the addr field of frame descriptor > > + * @fd: the given frame descriptor > > + * > > + * Return the address in the frame descriptor. > > + */ > > +static inline dma_addr_t dpaa2_fd_get_addr(const struct dpaa2_fd *fd) > > +{ > > + > > Extra empty line. Ok. > > +/** > > + * dpaa2_fd_set_offset() - Set the offset field of frame descriptor > > + * @fd: the given frame descriptor > > + * @offset: the offset needs to be set in frame descriptor > > + */ > > +static inline void dpaa2_fd_set_offset(struct dpaa2_fd *fd, uint16_t offset) > > +{ > > + fd->simple.format_offset &= ~(FD_OFFSET_MASK); > > Paranthesis not needed. Ok. > > +/** > > + * dpaa2_sg_set_offset() - Set the offset in SG entry > > + * @sg: the given scatter-gathering object > > + * @offset: the offset to be set > > + */ > > +static inline void dpaa2_sg_set_offset(struct dpaa2_sg_entry *sg, > > + u16 offset) > > +{ > > + sg->format_offset &= cpu_to_le16(~(SG_OFFSET_MASK)); > > Extra-paranthesis around SG_OFFSET_MASK not needed. Ok. > > +/** > > + * dpaa2_sg_is_final() - Check final bit in SG entry > > + * @sg: the given scatter-gathering object > > + * > > + * Return bool. > > + */ > > +static inline bool dpaa2_sg_is_final(const struct dpaa2_sg_entry *sg) > > +{ > > + return !!(le16_to_cpu(sg->format_offset) >> SG_FINAL_FLAG_SHIFT); > > In other places in this file we don't use the '!!' to convert to bool. Maybe we should drop it here too. As per the separate comments with Dan, I'll leave and check for consistency with other places in this file. Thanks, Stuart