staging: fsl-mc: add dpio driver
v5 cover staging: fsl-mc: add dpio driver
This patch series adds the driver for the DPIO object which is a step to addressing the final item in the staging TODO list-- adding a functional driver on top of the bus driver. The DPIO driver is a dependency for other functional drivers such as Ethernet.
An overview of the DPIO object and driver components are in patch 1. Patches 2-6 are internal components of the DPIO driver-- bit twiddling of hardware registers, DPAA2 data structures, and the queuing APIs exposed to other drivers.
Patch 7 adds the fsl-mc driver for the DPIO object. It provides the probe/remove functions, demonstrating a working example of how fsl-mc drivers initialize, interact with the management complex hardware, map their mappable MMIO regions, initialize interrupts, register an ISR, etc. All other DPAA2 drivers will follow a similar initialization pattern.
version 5 changes
-fixed typo in patch 5 that caused compile issue
version 4 changes
-removed the patch moving the bus driver out of staging, updated
all paths referenced in dpio (e.g. includes) to be drivers/staging
-defined macros for constants where needed
-copyright updates
-cleanup: fixed whitespace, alignment issues, typos, removed unneeded
comments
-fixed bug in SDQCR #define
-adding missing free in an error path
version 3 changes
-zero memory allocated for a dpio store
-replace hardcoded dequeue token with a #define and look for
that token when checking for a new result
version 2 changes (mostly feedback from Ioana Radulescu)
-removed unused structs and defines in dpio command definitions -added setter/getter for the FD ctrl field
-corrected comment for SG format_offset field description -added support for short length field in FD
-fix bug in buffer release command, by setting bpid field -handle error (NULL) return value from qbman_swp_mc_complete() -fix bug in sending management commands where the verb was
properly initialized
-use service_select_by_cpu() for re-arming DPIO interrupts -replace use of NR_CPUS with num_possible_cpus()
-handle error case where number of DPIOs exceeds number of possible
CPUs
-error message cleanup
-updated MAINTAINERS file with proper location for both fsl-mc bus
driver and dpio driver
Ioana Radulescu (1):
bus: fsl-mc: dpio: add APIs for DPIO objects
Roy Pledge (6):
bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs
bus: fsl-mc: dpio: add global dpaa2 definitions
bus: fsl-mc: dpio: add QBMan portal APIs for DPAA2
bus: fsl-mc: dpio: add the DPAA2 DPIO service interface
bus: fsl-mc: dpio: add the DPAA2 DPIO object driver
bus: fsl-mc: dpio: add maintainer for DPIO
Stuart Yoder (1):
bus: fsl-mc: dpio: add DPIO driver overview document
MAINTAINERS | 6 + drivers/staging/fsl-mc/bus/Kconfig | 10 + drivers/staging/fsl-mc/bus/Makefile | 3 + drivers/staging/fsl-mc/bus/dpio/Makefile | 9 + drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h | 76 ++ drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 296 +++++++ drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt | 135 +++ drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 616 ++++++++++++++ drivers/staging/fsl-mc/bus/dpio/dpio.c | 224 +++++ drivers/staging/fsl-mc/bus/dpio/dpio.h | 109 +++ drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 1033 +++++++++++++++++++++++ drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 469 ++++++++++ drivers/staging/fsl-mc/include/dpaa2-fd.h | 448 ++++++++++ drivers/staging/fsl-mc/include/dpaa2-global.h | 202 +++++ drivers/staging/fsl-mc/include/dpaa2-io.h | 139 +++ 15 files changed, 3775 insertions(+) create mode 100644 drivers/staging/fsl-mc/bus/dpio/Makefile create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-service.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.h create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h create mode 100644 drivers/staging/fsl-mc/include/dpaa2-fd.h create mode 100644 drivers/staging/fsl-mc/include/dpaa2-global.h create mode 100644 drivers/staging/fsl-mc/include/dpaa2-io.h
Signature · 1 line
1.9.0
PATCH v5 1/8 bus: fsl-mc: dpio: add DPIO driver overview document
add document describing the dpio driver and it's role, components and major interfaces
---
Notes:
-v4
-updated copyrightdrivers/staging/fsl-mc/bus/dpio/dpio-driver.txt | 135 ++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt
drivers/staging/fsl-mc/bus/dpio/dpio-driver.txt new file +135 -0
@@ -0,0 +1,135 @@ +Copyright 2016 NXP + +Introduction +------------ + +A DPAA2 DPIO (Data Path I/O) is a hardware object that provides +interfaces to enqueue and dequeue frames to/from network interfaces +and other accelerators. A DPIO also provides hardware buffer +pool management for network interfaces. + +This document provides an overview the Linux DPIO driver, its +subcomponents, and its APIs. + +See Documentation/dpaa2/overview.txt for a general overview of DPAA2 +and the general DPAA2 driver architecture in Linux. + +Driver Overview +--------------- + +The DPIO driver is bound to DPIO objects discovered on the fsl-mc bus and +provides services that: + A) allow other drivers, such as the Ethernet driver, to enqueue and dequeue + frames for their respective objects + B) allow drivers to register callbacks for data availability notifications + when data becomes available on a queue or channel + C) allow drivers to manage hardware buffer pools + +The Linux DPIO driver consists of 3 primary components-- + DPIO object driver-- fsl-mc driver that manages the DPIO object + DPIO service-- provides APIs to other Linux drivers for services + QBman portal interface-- sends portal commands, gets responses + + fsl-mc other + bus drivers + | | + +---+----+ +------+-----+ + |DPIO obj| |DPIO service| + | driver |---| (DPIO) | + +--------+ +------+-----+ + | + +------+-----+ + | QBman | + | portal i/f | + +------------+ + | + hardware + +The diagram below shows how the DPIO driver components fit with the other +DPAA2 Linux driver components: + +------------+ + | OS Network | + | Stack | + +------------+ +------------+ + | Allocator |. . . . . . . | Ethernet | + |(DPMCP,DPBP)| | (DPNI) | + +-.----------+ +---+---+----+ + . . ^ | + . . <data avail, | |<enqueue, + . . tx confirm> | | dequeue> + +-------------+ . | | + | DPRC driver | . +--------+ +------------+ + | (DPRC) | . . |DPIO obj| |DPIO service| + +----------+--+ | driver |-| (DPIO) | + | +--------+ +------+-----+ + |<dev add/remove> +------|-----+ + | | QBman | + +----+--------------+ | portal i/f | + | MC-bus driver | +------------+ + | | | + | /soc/fsl-mc | | + +-------------------+ | + | + =========================================|=========|======================== + +-+--DPIO---|-----------+ + | | | + | QBman Portal | + +-----------------------+ + + ============================================================================ + + +DPIO Object Driver (dpio-driver.c) +---------------------------------- + + The dpio-driver component registers with the fsl-mc bus to handle objects of + type "dpio". The implementation of probe() handles basic initialization + of the DPIO including mapping of the DPIO regions (the QBman SW portal) + and initializing interrupts and registering irq handlers. The dpio-driver + registers the probed DPIO with dpio-service. + +DPIO service (dpio-service.c, dpaa2-io.h) +------------------------------------------ + + The dpio service component provides queuing, notification, and buffers + management services to DPAA2 drivers, such as the Ethernet driver. A system + will typically allocate 1 DPIO object per CPU to allow queuing operations + to happen simultaneously across all CPUs. + + Notification handling + dpaa2_io_service_register() + dpaa2_io_service_deregister() + dpaa2_io_service_rearm() + + Queuing + dpaa2_io_service_pull_fq() + dpaa2_io_service_pull_channel() + dpaa2_io_service_enqueue_fq() + dpaa2_io_service_enqueue_qd() + dpaa2_io_store_create() + dpaa2_io_store_destroy() + dpaa2_io_store_next() + + Buffer pool management + dpaa2_io_service_release() + dpaa2_io_service_acquire() + +QBman portal interface (qbman-portal.c) +--------------------------------------- + + The qbman-portal component provides APIs to do the low level hardware + bit twiddling for operations such as: + -initializing Qman software portals + -building and sending portal commands + -portal interrupt configuration and processing + + The qbman-portal APIs are not public to other drivers, and are + only used by dpio-service. + +Other (dpaa2-fd.h, dpaa2-global.h) +---------------------------------- + + Frame descriptor and scatter-gather definitions and the APIs used to + manipulate them are defined in dpaa2-fd.h. + + Dequeue result struct and parsing APIs are defined in dpaa2-global.h.
Signature · 1 line
1.9.0
PATCH v5 2/8 bus: fsl-mc: dpio: add APIs for DPIO objects
In reply to Stuart YoderFrom: Ioana Radulescu <[email protected]>
Add the command build/parse APIs for operating on DPIO objects through the DPAA2 Management Complex.
---
Notes:
-v4
-adjust file location to be in drivers/staging -remove unneeded comments
-updated copyright
-v3
-no changes
-v2
-removed unused structs and defines
drivers/staging/fsl-mc/bus/Kconfig | 10 ++ drivers/staging/fsl-mc/bus/Makefile | 3 + drivers/staging/fsl-mc/bus/dpio/Makefile | 9 ++ drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h | 76 ++++++++++ drivers/staging/fsl-mc/bus/dpio/dpio.c | 224 +++++++++++++++++++++++++++++ drivers/staging/fsl-mc/bus/dpio/dpio.h | 109 ++++++++++++++ 6 files changed, 431 insertions(+) create mode 100644 drivers/staging/fsl-mc/bus/dpio/Makefile create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio.h
drivers/staging/fsl-mc/bus/Kconfig +10 -0
@@ -15,3 +15,13 @@ config FSL_MC_BUS architecture. The fsl-mc bus driver handles discovery of DPAA2 objects (which are represented as Linux devices) and binding objects to drivers. + +config FSL_MC_DPIO + tristate "QorIQ DPAA2 DPIO driver" + depends on FSL_MC_BUS + help + Driver for the DPAA2 DPIO object. A DPIO provides queue and + buffer management facilities for software to interact with + other DPAA2 objects. This driver does not expose the DPIO + objects individually, but groups them under a service layer + API.
drivers/staging/fsl-mc/bus/Makefile +3 -0
@@ -18,3 +18,6 @@ mc-bus-driver-objs := fsl-mc-bus.o \ irq-gic-v3-its-fsl-mc-msi.o \ dpmcp.o \ dpbp.o + +# MC DPIO driver +obj-$(CONFIG_FSL_MC_DPIO) += dpio/
drivers/staging/fsl-mc/bus/dpio/Makefile new file +9 -0
@@ -0,0 +1,9 @@ +# +# QorIQ DPAA2 DPIO driver +# + +subdir-ccflags-y := -Werror + +obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o + +fsl-mc-dpio-objs := dpio.o
drivers/staging/fsl-mc/bus/dpio/dpio-cmd.h new file +76 -0
76 lines not on this page · raw message
drivers/staging/fsl-mc/bus/dpio/dpio.c new file +224 -0
224 lines not on this page · raw message
drivers/staging/fsl-mc/bus/dpio/dpio.h new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
1.9.0
PATCH v5 3/8 bus: fsl-mc: dpio: add frame descriptor and scatter/gather APIs
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
Add global definitions for DPAA2 frame descriptors and scatter gather entries.
---
Notes:
-v4
-updated copyright
-adjust file location to be in drivers/staging
-address cleanup comments-- whitespace cleanup, use !! consistently
to convert expression to bool, remove unneeded parenthesis
-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
drivers/staging/fsl-mc/include/dpaa2-fd.h | 448 ++++++++++++++++++++++++++++++ 1 file changed, 448 insertions(+) create mode 100644 drivers/staging/fsl-mc/include/dpaa2-fd.h
drivers/staging/fsl-mc/include/dpaa2-fd.h new file +448 -0
@@ -0,0 +1,448 @@ +/* +* Copyright 2014-2016 Freescale Semiconductor Inc. +* Copyright 2016 NXP +* +* 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 <linux/kernel.h> + +/** +* 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 + +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) +{ +return (dma_addr_t )fd->simple.addr; +} + +/** +* dpaa2_fd_set_addr() - Set the addr field of frame descriptor +* @fd: the given frame descriptor +* @addr: the address needs to be set in frame descriptor +*/ +static inline void dpaa2_fd_set_addr (struct dpaa2_fd *fd,dma_addr_t addr) +{ + fd->simple.addr = addr; +} + +/** +* dpaa2_fd_get_frc() - Get the frame context in the frame descriptor +* @fd: the given frame descriptor +* +* Return the frame context field in the frame descriptor. +*/ +static inline u32 dpaa2_fd_get_frc (const struct dpaa2_fd *fd) +{ +return fd->simple.frc; +} + +/** +* dpaa2_fd_set_frc() - Set the frame context in the frame descriptor +* @fd: the given frame descriptor +* @frc: the frame context needs to be set in frame descriptor +*/ +static inline void dpaa2_fd_set_frc (struct dpaa2_fd *fd,u32 frc) +{ + fd->simple.frc = frc; +} + +/** +* dpaa2_fd_get_ctrl() - Get the control bits in the frame descriptor +* @fd: the given frame descriptor +* +* Return the control bits field in the frame descriptor. +*/ +static inline u32 dpaa2_fd_get_ctrl (const struct dpaa2_fd *fd) +{ +return fd->simple.ctrl; +} + +/** +* dpaa2_fd_set_ctrl() - Set the control bits in the frame descriptor +* @fd: the given frame descriptor +* @ctrl: the control bits to be set in the frame descriptor +*/ +static inline void dpaa2_fd_set_ctrl (struct dpaa2_fd *fd,u32 ctrl) +{ + fd->simple.ctrl = ctrl; +} + +/** +* dpaa2_fd_get_flc() - Get the flow context in the frame descriptor +* @fd: the given frame descriptor +* +* Return the flow context in the frame descriptor. +*/ +static inline dma_addr_t dpaa2_fd_get_flc (const struct dpaa2_fd *fd) +{ +return (dma_addr_t )fd->simple.flc; +} + +/** +* dpaa2_fd_set_flc() - Set the flow context field of frame descriptor +* @fd: the given frame descriptor +* @flc_addr: the flow context needs to be set in frame descriptor +*/ +static inline void dpaa2_fd_set_flc (struct dpaa2_fd *fd,dma_addr_t flc_addr) +{ + fd->simple.flc = flc_addr; +} + +static inline bool dpaa2_fd_short_len (const struct dpaa2_fd *fd) +{ +return !!((fd->simple.format_offset >>FD_SHORT_LEN_FLAG_SHIFT ) + &FD_SHORT_LEN_FLAG_MASK ); +} + +/** +* dpaa2_fd_get_len() - Get the length in the frame descriptor +* @fd: the given frame descriptor +* +* Return the length field in the frame descriptor. +*/ +static inline u32 dpaa2_fd_get_len (const struct dpaa2_fd *fd) +{ +if (dpaa2_fd_short_len (fd)) +return fd->simple.len &FD_SHORT_LEN_MASK ; + +return fd->simple.len; +} + +/** +* dpaa2_fd_set_len() - Set the length field of frame descriptor +* @fd: the given frame descriptor +* @len: the length needs to be set in frame descriptor +*/ +static inline void dpaa2_fd_set_len (struct dpaa2_fd *fd,u32 len) +{ + fd->simple.len = len; +} + +/** +* dpaa2_fd_get_offset() - Get the offset field in the frame descriptor +* @fd: the given frame descriptor +* +* Return the offset. +*/ +static inline uint16_t dpaa2_fd_get_offset (const struct dpaa2_fd *fd) +{ +return fd->simple.format_offset &FD_OFFSET_MASK ; +} + +/** +* 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 ; + fd->simple.format_offset |= offset; +} + +/** +* dpaa2_fd_get_format() - Get the format field in the frame descriptor +* @fd: the given frame descriptor +* +* Return the format. +*/ +static inline enum dpaa2_fd_format dpaa2_fd_get_format ( +const struct dpaa2_fd *fd) +{ +return (enum dpaa2_fd_format )((fd->simple.format_offset + >>FD_FORMAT_SHIFT ) &FD_FORMAT_MASK ); +} + +/** +* dpaa2_fd_set_format() - Set the format field of frame descriptor +* @fd: the given frame descriptor +* @format: the format needs to be set in frame descriptor +*/ +static inline void dpaa2_fd_set_format (struct dpaa2_fd *fd, +enum dpaa2_fd_format format) +{ + fd->simple.format_offset &= ~(FD_FORMAT_MASK <<FD_FORMAT_SHIFT ); + fd->simple.format_offset |= format <<FD_FORMAT_SHIFT ; +} + +/** +* dpaa2_fd_get_bpid() - Get the bpid field in the frame descriptor +* @fd: the given frame descriptor +* +* Return the buffer pool id. +*/ +static inline uint16_t dpaa2_fd_get_bpid (const struct dpaa2_fd *fd) +{ +return fd->simple.bpid; +} + +/** +* dpaa2_fd_set_bpid() - Set the bpid field of frame descriptor +* @fd: the given frame descriptor +* @bpid: buffer pool id to be set +*/ +static inline void dpaa2_fd_set_bpid (struct dpaa2_fd *fd,uint16_t bpid) +{ + fd->simple.bpid = bpid; +} + +/** +* struct dpaa2_sg_entry - the scatter-gathering structure +* @addr: address of the sg entry +* @len: length in this sg entry +* @bpid: buffer pool id +* @format_offset: format and offset fields +*/ +struct dpaa2_sg_entry { +__le64 addr; +__le32 len; +__le16 bpid; +__le16 format_offset; +}; + +enum dpaa2_sg_format { + dpaa2_sg_single =0 , + dpaa2_sg_frame_data, + dpaa2_sg_sgt_ext +}; + +/* Accessors for SG entry fields */ + +/** +* dpaa2_sg_get_addr() - Get the address from SG entry +* @sg: the given scatter-gathering object +* +* Return the address. +*/ +static inline dma_addr_t dpaa2_sg_get_addr (const struct dpaa2_sg_entry *sg) +{ +return le64_to_cpu ((dma_addr_t )sg->addr); +} + +/** +* dpaa2_sg_set_addr() - Set the address in SG entry +* @sg: the given scatter-gathering object +* @addr: the address to be set +*/ +static inline void dpaa2_sg_set_addr (struct dpaa2_sg_entry *sg,dma_addr_t addr) +{ + sg->addr =cpu_to_le64 (addr); +} + +static inline bool dpaa2_sg_short_len (const struct dpaa2_sg_entry *sg) +{ +return !!((le16_to_cpu (sg->format_offset) >>SG_SHORT_LEN_FLAG_SHIFT ) + &SG_SHORT_LEN_FLAG_MASK ); +} + +/** +* dpaa2_sg_get_len() - Get the length in SG entry +* @sg: the given scatter-gathering object +* +* Return the length. +*/ +static inline u32 dpaa2_sg_get_len (const struct dpaa2_sg_entry *sg) +{ +if (dpaa2_sg_short_len (sg)) +return le32_to_cpu (sg->len) &SG_SHORT_LEN_MASK ; + +return le32_to_cpu (sg->len); +} + +/** +* dpaa2_sg_set_len() - Set the length in SG entry +* @sg: the given scatter-gathering object +* @len: the length to be set +*/ +static inline void dpaa2_sg_set_len (struct dpaa2_sg_entry *sg,u32 len) +{ + sg->len =cpu_to_le32 (len); +} + +/** +* dpaa2_sg_get_offset() - Get the offset in SG entry +* @sg: the given scatter-gathering object +* +* Return the offset. +*/ +static inline u16 dpaa2_sg_get_offset (const struct dpaa2_sg_entry *sg) +{ +return le16_to_cpu (sg->format_offset) &SG_OFFSET_MASK ; +} + +/** +* 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 ); + sg->format_offset |=cpu_to_le16 (offset); +} + +/** +* dpaa2_sg_get_format() - Get the SG format in SG entry +* @sg: the given scatter-gathering object +* +* Return the format. +*/ +static inline enum dpaa2_sg_format +dpaa2_sg_get_format (const struct dpaa2_sg_entry *sg) +{ +return (enum dpaa2_sg_format )((le16_to_cpu (sg->format_offset) + >>SG_FORMAT_SHIFT ) &SG_FORMAT_MASK ); +} + +/** +* dpaa2_sg_set_format() - Set the SG format in SG entry +* @sg: the given scatter-gathering object +* @format: the format to be set +*/ +static inline void dpaa2_sg_set_format (struct dpaa2_sg_entry *sg, +enum dpaa2_sg_format format) +{ + sg->format_offset &=cpu_to_le16 (~(SG_FORMAT_MASK <<SG_FORMAT_SHIFT )); + sg->format_offset |=cpu_to_le16 (format <<SG_FORMAT_SHIFT ); +} + +/** +* dpaa2_sg_get_bpid() - Get the buffer pool id in SG entry +* @sg: the given scatter-gathering object +* +* Return the bpid. +*/ +static inline u16 dpaa2_sg_get_bpid (const struct dpaa2_sg_entry *sg) +{ +return le16_to_cpu (sg->bpid) &SG_BPID_MASK ; +} + +/** +* dpaa2_sg_set_bpid() - Set the buffer pool id in SG entry +* @sg: the given scatter-gathering object +* @bpid: the bpid to be set +*/ +static inline void dpaa2_sg_set_bpid (struct dpaa2_sg_entry *sg,u16 bpid) +{ + sg->bpid &=cpu_to_le16 (~(SG_BPID_MASK )); + sg->bpid |=cpu_to_le16 (bpid); +} + +/** +* 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 ); +} + +/** +* dpaa2_sg_set_final() - Set the final bit in SG entry +* @sg: the given scatter-gathering object +* @final: the final boolean to be set +*/ +static inline void dpaa2_sg_set_final (struct dpaa2_sg_entry *sg,bool final) +{ + sg->format_offset &=cpu_to_le16 (~(SG_FINAL_FLAG_MASK + <<SG_FINAL_FLAG_SHIFT )); + sg->format_offset |=cpu_to_le16 (final <<SG_FINAL_FLAG_SHIFT ); +} + +#endif /* __FSL_DPAA2_FD_H */
Signature · 1 line
1.9.0
PATCH v5 4/8 bus: fsl-mc: dpio: add global dpaa2 definitions
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
Create header for global dpaa2 definitions. Add definitions for dequeue results.
---
Notes:
-v4
-adjust file location to be in drivers/staging -whitespace/alignment cleanup, make dpaa2_dq_is_pull_complete()
return bool, fix spelling typo
-updated copyright
drivers/staging/fsl-mc/include/dpaa2-global.h | 202 ++++++++++++++++++++++++++ 1 file changed, 202 insertions(+) create mode 100644 drivers/staging/fsl-mc/include/dpaa2-global.h
drivers/staging/fsl-mc/include/dpaa2-global.h new file +202 -0
@@ -0,0 +1,202 @@ +/* +* Copyright 2014-2016 Freescale Semiconductor Inc. +* Copyright 2016 NXP +* +* 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_GLOBAL_H +#define __FSL_DPAA2_GLOBAL_H + +#include <linux/types.h> +#include <linux/cpumask.h> +#include "dpaa2-fd.h" + +struct dpaa2_dq { +union { +struct common { +u8 verb; +u8 reserved[63 ]; + } common; +struct dq { +u8 verb; +u8 stat; +__le16 seqnum; +__le16 oprid; +u8 reserved; +u8 tok; +__le32 fqid; +u32 reserved2; +__le32 fq_byte_cnt; +__le32 fq_frm_cnt; +__le64 fqd_ctx; +u8 fd[32 ]; + } dq; +struct scn { +u8 verb; +u8 stat; +u8 state; +u8 reserved; +__le32 rid_tok; +__le64 ctx; + } scn; + }; +}; + +/* Parsing frame dequeue results */ +/* FQ empty */ +#define DPAA2_DQ_STAT_FQEMPTY 0x80 +/* FQ held active */ +#define DPAA2_DQ_STAT_HELDACTIVE 0x40 +/* FQ force eligible */ +#define DPAA2_DQ_STAT_FORCEELIGIBLE 0x20 +/* valid frame */ +#define DPAA2_DQ_STAT_VALIDFRAME 0x10 +/* FQ ODP enable */ +#define DPAA2_DQ_STAT_ODPVALID 0x04 +/* volatile dequeue */ +#define DPAA2_DQ_STAT_VOLATILE 0x02 +/* volatile dequeue command is expired */ +#define DPAA2_DQ_STAT_EXPIRED 0x01 + +#define DQ_FQID_MASK 0x00FFFFFF +#define DQ_FRAME_COUNT_MASK 0x00FFFFFF + +/** +* dpaa2_dq_flags() - Get the stat field of dequeue response +* @dq: the dequeue result. +*/ +static inline u32 dpaa2_dq_flags (const struct dpaa2_dq *dq) +{ +return dq->dq.stat; +} + +/** +* dpaa2_dq_is_pull() - Check whether the dq response is from a pull +* command. +* @dq: the dequeue result +* +* Return 1 for volatile(pull) dequeue, 0 for static dequeue. +*/ +static inline int dpaa2_dq_is_pull (const struct dpaa2_dq *dq) +{ +return (int )(dpaa2_dq_flags (dq) &DPAA2_DQ_STAT_VOLATILE ); +} + +/** +* dpaa2_dq_is_pull_complete() - Check whether the pull command is completed. +* @dq: the dequeue result +* +* Return boolean. +*/ +static inline bool dpaa2_dq_is_pull_complete (const struct dpaa2_dq *dq) +{ +return !!(dpaa2_dq_flags (dq) &DPAA2_DQ_STAT_EXPIRED ); +} + +/** +* dpaa2_dq_seqnum() - Get the seqnum field in dequeue response +* @dq: the dequeue result +* +* seqnum is valid only if VALIDFRAME flag is TRUE +* +* Return seqnum. +*/ +static inline u16 dpaa2_dq_seqnum (const struct dpaa2_dq *dq) +{ +return le16_to_cpu (dq->dq.seqnum); +} + +/** +* dpaa2_dq_odpid() - Get the odpid field in dequeue response +* @dq: the dequeue result +* +* odpid is valid only if ODPVALID flag is TRUE. +* +* Return odpid. +*/ +static inline u16 dpaa2_dq_odpid (const struct dpaa2_dq *dq) +{ +return le16_to_cpu (dq->dq.oprid); +} + +/** +* dpaa2_dq_fqid() - Get the fqid in dequeue response +* @dq: the dequeue result +* +* Return fqid. +*/ +static inline u32 dpaa2_dq_fqid (const struct dpaa2_dq *dq) +{ +return le32_to_cpu (dq->dq.fqid) &DQ_FQID_MASK ; +} + +/** +* dpaa2_dq_byte_count() - Get the byte count in dequeue response +* @dq: the dequeue result +* +* Return the byte count remaining in the FQ. +*/ +static inline u32 dpaa2_dq_byte_count (const struct dpaa2_dq *dq) +{ +return le32_to_cpu (dq->dq.fq_byte_cnt); +} + +/** +* dpaa2_dq_frame_count() - Get the frame count in dequeue response +* @dq: the dequeue result +* +* Return the frame count remaining in the FQ. +*/ +static inline u32 dpaa2_dq_frame_count (const struct dpaa2_dq *dq) +{ +return le32_to_cpu (dq->dq.fq_frm_cnt) &DQ_FRAME_COUNT_MASK ; +} + +/** +* dpaa2_dq_fd_ctx() - Get the frame queue context in dequeue response +* @dq: the dequeue result +* +* Return the frame queue context. +*/ +static inline u64 dpaa2_dq_fqd_ctx (const struct dpaa2_dq *dq) +{ +return le64_to_cpu (dq->dq.fqd_ctx); +} + +/** +* dpaa2_dq_fd() - Get the frame descriptor in dequeue response +* @dq: the dequeue result +* +* Return the frame descriptor. +*/ +static inline const struct dpaa2_fd *dpaa2_dq_fd (const struct dpaa2_dq *dq) +{ +return (const struct dpaa2_fd *)&dq->dq.fd[0 ]; +} + +#endif /* __FSL_DPAA2_GLOBAL_H */
Signature · 1 line
1.9.0
PATCH v5 5/8 bus: fsl-mc: dpio: add QBMan portal APIs for DPAA2
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
Add QBman APIs for frame queue and buffer pool operations.
---
Notes:
-v5
-fixed typo that caused a compile error
-v4
-adjust file location to be in drivers/staging -updated copyright
-added definition for static dequeue token value -fixed bug in SDQCR #define
-added missing #include guard in qbman-portal.h -added #define for QMAN_REV_MASK
-whitespace, alignment cleanup
-v3
-replace hardcoded dequeue token with a #define and check that
token when checking for a new result (bug fix suggested by Ioana Radulescu)
-v2
-fix bug in buffer release command, by setting bpid field -handle error (NULL) return value from qbman_swp_mc_complete() -error message cleanup
-fix bug in sending management commands where the verb was
properly initialized
drivers/staging/fsl-mc/bus/dpio/Makefile | 2 +- drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 1033 ++++++++++++++++++++++++ drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 469 +++++++++++ 3 files changed, 1503 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.h
drivers/staging/fsl-mc/bus/dpio/Makefile +1 -1
@@ -6,4 +6,4 @@ subdir-ccflags-y := -Werror obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o -fsl-mc-dpio-objs := dpio.o +fsl-mc-dpio-objs := dpio.o qbman-portal.o
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +1033 -0
1,033 lines not on this page · raw message
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +469 -0
469 lines not on this page · raw message
Signature · 1 line
1.9.0
RE: [upstream-release] [PATCH v5 5/8] bus: fsl-mc: dpio: add QBMan portal APIs for DPAA2
Quoted 121 lines
-----Original Message-----
From: [email protected] [mailto:upstream- [email protected]] On Behalf Of Stuart Yoder
Sent: Friday, December 16, 2016 10:01 PM
To: [email protected]
Cc: [email protected]; [email protected]; Ruxandra Ioana Radulescu <[email protected]>; [email protected]; Haiying Wang <[email protected]>; Roy Pledge <[email protected]>; linux- [email protected]; Leo Li <[email protected]>; Catalin Horghidan <[email protected]>; Roy Pledge <[email protected]>; Stuart Yoder <[email protected]>; Laurentiu Tudor <[email protected]>
Subject: [upstream-release] [PATCH v5 5/8] bus: fsl-mc: dpio: add QBMan portal APIs for DPAA2From: Roy Pledge <[email protected]>
Add QBman APIs for frame queue and buffer pool operations.
Signed-off-by Roy Pledge <[email protected]>Signed-off-by Haiying Wang <[email protected]>Signed-off-by Stuart Yoder <[email protected]>---
Notes:
-v5
-fixed typo that caused a compile error
-v4
-adjust file location to be indrivers/staging-updated copyright
-added definition for static dequeue token value -fixed bug in SDQCR #define
-added missing #include guard inqbman-portal.h-added #define forQMAN_REV_MASK
-whitespace, alignment cleanup
-v3
-replace hardcoded dequeue token with a #define and check that
token when checking for a new result (bug fix suggested by Ioana Radulescu)
-v2
-fix bug in buffer release command, by setting bpid field -handle error (NULL) return value fromqbman_swp_mc_complete()-error message cleanup
-fix bug in sending management commands where the verb was
properly initializeddrivers/staging/fsl-mc/bus/dpio/Makefile | 2 +- drivers/staging/fsl-mc/bus/dpio/qbman-portal.c | 1033 ++++++++++++++++++++++++ drivers/staging/fsl-mc/bus/dpio/qbman-portal.h | 469 +++++++++++ 3 files changed, 1503 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.c create mode 100644 drivers/staging/fsl-mc/bus/dpio/qbman-portal.hdrivers/staging/fsl- renamed from drivers/staging/fsl-mc/bus/dpio/Makefile +0
-0mc/bus/dpio/Makefile
index 128befc..6588498 100644drivers/staging/fsl-mc/bus/dpio/Makefile +1
-1@@ -6,4 +6,4 @@ subdir-ccflags-y := -Werror obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o -fsl-mc-dpio-objs := dpio.o +fsl-mc-dpio-objs := dpio.o qbman-portal.odrivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +6
-0@@ -0,0 +1,1033 @@ +/* +* Copyright (C) 2014-2016 Freescale Semiconductor, Inc. +* Copyright 2016 NXP +* +* 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.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +5
-0+ +#include <asm/cacheflush.h> +#include <linux/io.h> +#include <linux/slab.h> +#include "../../include/dpaa2-global.h"
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c line 46
Quoted 10 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+ +#include "qbman-portal.h" + +#define QMAN_REV_4000 0x04000000 +#define QMAN_REV_4100 0x04010000 +#define QMAN_REV_4101 0x04010001 +#define QMAN_REV_MASK 0xffff0000 + +/* All QBMan command and result structures use this "valid bit" encoding */ +#define QB_VALID_BIT ((u32)0x80)
Can we define like
#define QB_VALID_BIT 0x80U
Quoted 44 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +28
-0+ +/* QBMan portal management command codes */ +#define QBMAN_MC_ACQUIRE 0x30 +#define QBMAN_WQCHAN_CONFIGURE 0x46 + +/* CINH register offsets */ +#define QBMAN_CINH_SWP_EQAR 0x8c0 +#define QBMAN_CINH_SWP_DQPI 0xa00 +#define QBMAN_CINH_SWP_DCAP 0xac0 +#define QBMAN_CINH_SWP_SDQCR 0xb00 +#define QBMAN_CINH_SWP_RAR 0xcc0 +#define QBMAN_CINH_SWP_ISR 0xe00 +#define QBMAN_CINH_SWP_IER 0xe40 +#define QBMAN_CINH_SWP_ISDR 0xe80 +#define QBMAN_CINH_SWP_IIR 0xec0 + +/* CENA register offsets */ +#define QBMAN_CENA_SWP_EQCR (n) (0x000 + ((u32)(n) << 6)) +#define QBMAN_CENA_SWP_DQRR (n) (0x200 + ((u32)(n) << 6)) +#define QBMAN_CENA_SWP_RCR (n) (0x400 + ((u32)(n) << 6)) +#define QBMAN_CENA_SWP_CR 0x600 +#define QBMAN_CENA_SWP_RR (vb) (0x700 + ((u32)(vb) >> 1)) +#define QBMAN_CENA_SWP_VDQCR 0x780 + +/* Reverse mapping of QBMAN_CENA_SWP_DQRR() */ +#define QBMAN_IDX_FROM_DQRR (p) (((unsigned long)p & 0x1ff) >> 6) + +/* Define token used to determine if response written to memory is valid */
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +15
-0+#define QMAN_DQ_TOKEN_VALID 1 + +/* SDQCR attribute codes */ +#define QB_SDQCR_FC_SHIFT 29 +#define QB_SDQCR_FC_MASK 0x1 +#define QB_SDQCR_DCT_SHIFT 24 +#define QB_SDQCR_DCT_MASK 0x3 +#define QB_SDQCR_TOK_SHIFT 16 +#define QB_SDQCR_TOK_MASK 0xff +#define QB_SDQCR_SRC_SHIFT 0 +#define QB_SDQCR_SRC_MASK 0xffff + +/* opaque token for static dequeues */ +#define QMAN_SDQCR_TOKEN 0xbb +
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c line 99
Quoted 10 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+enum qbman_sdqcr_dct { + qbman_sdqcr_dct_null =0 , + qbman_sdqcr_dct_prio_ics, + qbman_sdqcr_dct_active_ics, + qbman_sdqcr_dct_active +}; + +enum qbman_sdqcr_fc { + qbman_sdqcr_fc_one =0 , + qbman_sdqcr_fc_up_to_3 =1
" = 1" can be avoided.
Quoted 759 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +36
-0+}; + +/* Portal Access */ + +static inline u32 qbman_read_register (struct qbman_swp *p,u32 offset) +{ +return readl_relaxed (p->addr_cinh + offset); +} + +static inline void qbman_write_register (struct qbman_swp *p,u32 offset, +u32 value) +{ +writel_relaxed (value, p->addr_cinh + offset); +} + +static inline void *qbman_get_cmd (struct qbman_swp *p,u32 offset) +{ +return p->addr_cena + offset; +} + +#define QBMAN_CINH_SWP_CFG 0xd00 + +#define SWP_CFG_DQRR_MF_SHIFT 20 +#define SWP_CFG_EST_SHIFT 16 +#define SWP_CFG_WN_SHIFT 14 +#define SWP_CFG_RPM_SHIFT 12 +#define SWP_CFG_DCM_SHIFT 10 +#define SWP_CFG_EPM_SHIFT 8 +#define SWP_CFG_SD_SHIFT 5 +#define SWP_CFG_SP_SHIFT 4 +#define SWP_CFG_SE_SHIFT 3 +#define SWP_CFG_DP_SHIFT 2 +#define SWP_CFG_DE_SHIFT 1 +#define SWP_CFG_EP_SHIFT 0 + +static inline u32 qbman_set_swp_cfg(u8 max_fill, u8 wn, u8 est, u8rpm, u8 dcm,
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +45
-0+ u8 epm, int sd, int sp, int se, + int dp, int de, int ep) +{ + return cpu_to_le32 (max_fill << SWP_CFG_DQRR_MF_SHIFT | + est << SWP_CFG_EST_SHIFT | + wn << SWP_CFG_WN_SHIFT | + rpm << SWP_CFG_RPM_SHIFT | + dcm << SWP_CFG_DCM_SHIFT | + epm << SWP_CFG_EPM_SHIFT | + sd << SWP_CFG_SD_SHIFT | + sp << SWP_CFG_SP_SHIFT | + se << SWP_CFG_SE_SHIFT | + dp << SWP_CFG_DP_SHIFT | + de << SWP_CFG_DE_SHIFT | + ep << SWP_CFG_EP_SHIFT); +} + +/** +* qbman_swp_init() - Create a functional object representing the given +* QBMan portal descriptor. +* @d: the given qbman swp descriptor +* +* Return qbman_swp portal for success, NULL if the object cannot +* be created. +*/ +struct qbman_swp *qbman_swp_init (const struct qbman_swp_desc *d) +{ +struct qbman_swp *p =kmalloc (sizeof (*p),GFP_KERNEL ); +u32 reg; + +if (!p) +return NULL ; + p->desc = d; + p->mc.valid_bit =QB_VALID_BIT ; + p->sdq =0 ; + p->sdq |= qbman_sdqcr_dct_prio_ics <<QB_SDQCR_DCT_SHIFT ; + p->sdq |= qbman_sdqcr_fc_up_to_3 <<QB_SDQCR_FC_SHIFT ; + p->sdq |=QMAN_SDQCR_TOKEN <<QB_SDQCR_TOK_SHIFT ; + +atomic_set (&p->vdq.available,1 ); + p->vdq.valid_bit =QB_VALID_BIT ; + p->dqrr.next_idx =0 ; + p->dqrr.valid_bit =QB_VALID_BIT ; + + if ((p->desc->qman_version & QMAN_REV_MASK) <
QMAN_REV_4100) {drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +14
-0+ p->dqrr.dqrr_size =4 ; + p->dqrr.reset_bug =1 ; + }else { + p->dqrr.dqrr_size =8 ; + p->dqrr.reset_bug =0 ; + } + + p->addr_cena = d->cena_bar; + p->addr_cinh = d->cinh_bar; + + reg = qbman_set_swp_cfg(p->dqrr.dqrr_size, + 1, /* Writes Non-cacheable */ + 0, /* EQCR_CI stashing threshold */ + 3, /* RPM: Valid bit mode, RCR in array mode*/
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +1
-0+ 2, /* DCM: Discrete consumption ack mode*/
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +1
-0+ 3, /* EPM: Valid bit mode, EQCR in arraymode */
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +26
-0+0 ,/* mem stashing drop enable == FALSE */ +1 ,/* mem stashing priority == TRUE */ +0 ,/* mem stashing enable == FALSE */ +1 ,/* dequeue stashing priority == TRUE */ +0 ,/* dequeue stashing enable == FALSE */ + 0); /* EQCR_CI stashing priority == FALSE */ + +qbman_write_register (p,QBMAN_CINH_SWP_CFG , reg); + reg =qbman_read_register (p,QBMAN_CINH_SWP_CFG ); +if (!reg) { +pr_err ("qbman: the portal is not enabled!\n" ); +return NULL ; + } + +/* +* SDQCR needs to be initialized to 0 when no channels are +* being dequeued from or else the QMan HW will indicate an +* error. The values that were calculated above will be +* applied when dequeues from a specific channel are enabled. +*/ +qbman_write_register (p,QBMAN_CINH_SWP_SDQCR ,0 ); +return p; +} + +/** +* qbman_swp_finish() - Create and destroy a functional object representing
+ * the given QBMan portal descriptor.
+ * @p: theqbman_swpobject to be destroyed
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +66
-0+void qbman_swp_finish (struct qbman_swp *p) +{ +kfree (p); +} + +/** +* qbman_swp_interrupt_read_status() +* @p: the given software portal +* +* Return the value in the SWP_ISR register. +*/ +u32 qbman_swp_interrupt_read_status (struct qbman_swp *p) +{ +return qbman_read_register (p,QBMAN_CINH_SWP_ISR ); +} + +/** +* qbman_swp_interrupt_clear_status() +* @p: the given software portal +* @mask: The mask to clear in SWP_ISR register +*/ +void qbman_swp_interrupt_clear_status (struct qbman_swp *p,u32 mask) +{ +qbman_write_register (p,QBMAN_CINH_SWP_ISR , mask); +} + +/** +* qbman_swp_interrupt_get_trigger() - read interrupt enable register +* @p: the given software portal +* +* Return the value in the SWP_IER register. +*/ +u32 qbman_swp_interrupt_get_trigger (struct qbman_swp *p) +{ +return qbman_read_register (p,QBMAN_CINH_SWP_IER ); +} + +/** +* qbman_swp_interrupt_set_trigger() - enable interrupts for a swp +* @p: the given software portal +* @mask: The mask of bits to enable in SWP_IER +*/ +void qbman_swp_interrupt_set_trigger (struct qbman_swp *p,u32 mask) +{ +qbman_write_register (p,QBMAN_CINH_SWP_IER , mask); +} + +/** +* qbman_swp_interrupt_get_inhibit() - read interrupt mask register +* @p: the given software portal object +* +* Return the value in the SWP_IIR register. +*/ +int qbman_swp_interrupt_get_inhibit (struct qbman_swp *p) +{ +return qbman_read_register (p,QBMAN_CINH_SWP_IIR ); +} + +/** +* qbman_swp_interrupt_set_inhibit() - write interrupt mask register +* @p: the given software portal object +* @mask: The mask to set in SWP_IIR register +*/ +void qbman_swp_interrupt_set_inhibit (struct qbman_swp *p,int inhibit) +{ + qbman_write_register(p, QBMAN_CINH_SWP_IIR, inhibit ? 0xffffffff: 0);
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +4
-0+} + +/* +* Different management commands all use this common base layer of code to issue
+ * commands and poll for results.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +3
-0+ +/* +* Returns a pointer to where the caller should fill in their management command
+ * (caller should ignore the verb byte)
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +7
-0+void *qbman_swp_mc_start (struct qbman_swp *p) +{ +return qbman_get_cmd (p,QBMAN_CENA_SWP_CR ); +} + +/* +* Commits merges in the caller-supplied command verb (which should not include
+ * the valid-bit) and submits the command to hardware
+ */
+voidqbman_swp_mc_submit(struct qbman_swp *p, void *cmd, u8 cmd_verb)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +9
-0+{ +u8 *v = cmd; + +dma_wmb (); + *v = cmd_verb | p->mc.valid_bit; +} + +/* +* Checks for a completed response (returns non-NULL if only if the response
+ * is complete).
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +5
-0+void *qbman_swp_mc_result (struct qbman_swp *p) +{ +u32 *ret, verb; + + ret = qbman_get_cmd(p, QBMAN_CENA_SWP_RR(p-Quoted 1 line
mc.valid_bit));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +2
-0+ +/* Remove the valid-bit - command completed if the rest is non-zero */
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +31
-0+ verb = ret[0 ] & ~QB_VALID_BIT ; +if (!verb) +return NULL ; + p->mc.valid_bit ^=QB_VALID_BIT ; +return ret; +} + +#define QB_ENQUEUE_CMD_OPTIONS_SHIFT 0 +enum qb_enqueue_commands { + enqueue_empty =0 , + enqueue_response_always =1 , + enqueue_rejects_to_fq =2 +}; + +#define QB_ENQUEUE_CMD_ORP_ENABLE_SHIFT 2 +#define QB_ENQUEUE_CMD_IRQ_ON_DISPATCH_SHIFT 3 +#define QB_ENQUEUE_CMD_TARGET_TYPE_SHIFT 4 + +/** +* qbman_eq_desc_clear() - Clear the contents of a descriptor to +* default/starting state. +*/ +void qbman_eq_desc_clear (struct qbman_eq_desc *d) +{ +memset (d,0 ,sizeof (*d)); +} + +/** +* qbman_eq_desc_set_no_orp() - Set enqueue descriptor without orp +* @d: the enqueue descriptor. +* @response_success: 1 = enqueue with response always; 0 = enqueue with
+ * rejections returned on a FQ.
+ */
+voidqbman_eq_desc_set_no_orp(struct qbman_eq_desc *d, int respond_success)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+{ + d->verb &= ~(1 <<QB_ENQUEUE_CMD_ORP_ENABLE_SHIFT ); +if (respond_success) + d->verb |= enqueue_response_always; +else + d->verb |= enqueue_rejects_to_fq; +} + +/* +* Exactly one of the following descriptor "targets" should be set. (Calling any
+ * one of these will replace the effect of any prior call to one of these.)
+ * -enqueue to a frame queue
+ * -enqueue to a queuing destination
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +14
-0+ +/** +* qbman_eq_desc_set_fq() - set the FQ for the enqueue command +* @d: the enqueue descriptor +* @fqid: the id of the frame queue to be enqueued +*/ +void qbman_eq_desc_set_fq (struct qbman_eq_desc *d,u32 fqid) +{ + d->verb &= ~(1 <<QB_ENQUEUE_CMD_TARGET_TYPE_SHIFT ); + d->tgtid =cpu_to_le32 (fqid); +} + +/** +* qbman_eq_desc_set_qd() - Set Queuing Destination for the enqueue command
+ * @d: the enqueue descriptor + * @qdid: the id of the queuing destination to be enqueued + * @qd_bin: the queuing destination bin+ * @qd_prio: the queuing destination priority
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +25
-0+void qbman_eq_desc_set_qd (struct qbman_eq_desc *d,u32 qdid, +u32 qd_bin,u32 qd_prio) +{ + d->verb |=1 <<QB_ENQUEUE_CMD_TARGET_TYPE_SHIFT ; + d->tgtid =cpu_to_le32 (qdid); + d->qdbin =cpu_to_le16 (qd_bin); + d->qpri = qd_prio; +} + +#define EQAR_IDX (eqar) ((eqar) & 0x7) +#define EQAR_VB (eqar) ((eqar) & 0x80) +#define EQAR_SUCCESS (eqar) ((eqar) & 0x100) + +/** +* qbman_swp_enqueue() - Issue an enqueue command +* @s: the software portal used for enqueue +* @d: the enqueue descriptor +* @fd: the frame descriptor to be enqueued +* +* Please note that 'fd' should only be NULL if the "action" of the +* descriptor is "orp_hole" or "orp_nesn". +* +* Return 0 for successful enqueue, -EBUSY if the EQCR is not ready. +*/ +int qbman_swp_enqueue(struct qbman_swp *s, const struct
qbman_eq_desc*d,drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +9
-0+ const struct dpaa2_fd *fd) +{ +struct qbman_eq_desc *p; +u32 eqar =qbman_read_register (s,QBMAN_CINH_SWP_EQAR ); + +if (!EQAR_SUCCESS (eqar)) +return -EBUSY ; + + p = qbman_get_cmd(s,QBMAN_CENA_SWP_EQCR(EQAR_IDX(eqar)));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +17
-0+memcpy (&p->dca, &d->dca,31 ); +memcpy (&p->fd, fd,sizeof (*fd)); + +/* Set the verb byte, have to substitute in the valid-bit */ +dma_wmb (); + p->verb = d->verb |EQAR_VB (eqar); + +return 0 ; +} + +/* Static (push) dequeue */ + +/** +* qbman_swp_push_get() - Get the push dequeue setup +* @p: the software portal object +* @channel_idx: the channel index to query +* @enabled: returned boolean to show whether the push dequeue is enabled
+ * for the given channel
+ */
+voidqbman_swp_push_get(struct qbman_swp *s, u8 channel_idx, int *enabled)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +2
-0+{ + u16 src = (s->sdq >> QB_SDQCR_SRC_SHIFT) &
QB_SDQCR_SRC_MASK;drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +12
-0+ +WARN_ON (channel_idx >15 ); + *enabled = src | (1 << channel_idx); +} + +/** +* qbman_swp_push_set() - Enable or disable push dequeue +* @p: the software portal object +* @channel_idx: the channel index (0 to 15) +* @enable: enable or disable push dequeue +*/ +void qbman_swp_push_set(struct qbman_swp *s, u8 channel_idx, intenable)
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +13
-0+{ +u16 dqsrc; + +WARN_ON (channel_idx >15 ); +if (enable) + s->sdq |=1 << channel_idx; +else + s->sdq &= ~(1 << channel_idx); + +/* Read make the complete src map. If no channels are enabled +* the SDQCR must be 0 or else QMan will assert errors +*/ + dqsrc = (s->sdq >> QB_SDQCR_SRC_SHIFT) &
QB_SDQCR_SRC_MASK;drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +2
-0+if (dqsrc !=0 ) + qbman_write_register(s, QBMAN_CINH_SWP_SDQCR, s-Quoted 1 line
sdq);
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +61
-0+else +qbman_write_register (s,QBMAN_CINH_SWP_SDQCR ,0 ); +} + +#define QB_VDQCR_VERB_DCT_SHIFT 0 +#define QB_VDQCR_VERB_DT_SHIFT 2 +#define QB_VDQCR_VERB_RLS_SHIFT 4 +#define QB_VDQCR_VERB_WAE_SHIFT 5 + +enum qb_pull_dt_e { + qb_pull_dt_channel, + qb_pull_dt_workqueue, + qb_pull_dt_framequeue +}; + +/** +* qbman_pull_desc_clear() - Clear the contents of a descriptor to +* default/starting state +* @d: the pull dequeue descriptor to be cleared +*/ +void qbman_pull_desc_clear (struct qbman_pull_desc *d) +{ +memset (d,0 ,sizeof (*d)); +} + +/** +* qbman_pull_desc_set_storage()- Set the pull dequeue storage +* @d: the pull dequeue descriptor to be set +* @storage: the pointer of the memory to store the dequeue result +* @storage_phys: the physical address of the storage memory +* @stash: to indicate whether write allocate is enabled +* +* If not called, or if called with 'storage' as NULL, the result pull dequeues +* will produce results to DQRR. If 'storage' is non-NULL, then results are +* produced to the given memory location (using the DMA address which +* the caller provides in 'storage_phys'), and 'stash' controls whether or not +* those writes to main-memory express a cache-warming attribute. +*/ +void qbman_pull_desc_set_storage (struct qbman_pull_desc *d, +struct dpaa2_dq *storage, +dma_addr_t storage_phys, +int stash) +{ +/* save the virtual address */ + d->rsp_addr_virt = (u64 )storage; + +if (!storage) { + d->verb &= ~(1 <<QB_VDQCR_VERB_RLS_SHIFT ); +return ; + } + d->verb |=1 <<QB_VDQCR_VERB_RLS_SHIFT ; +if (stash) + d->verb |=1 <<QB_VDQCR_VERB_WAE_SHIFT ; +else + d->verb &= ~(1 <<QB_VDQCR_VERB_WAE_SHIFT ); + + d->rsp_addr =cpu_to_le64 (storage_phys); +} + +/** +* qbman_pull_desc_set_numframes() - Set the number of frames to be dequeued
+ * @d: the pull dequeue descriptor to be set
+ * @numframes: number of frames to be set, must be between 1 and 16, inclusive
+ */
+voidqbman_pull_desc_set_numframes(struct qbman_pull_desc *d, u8 numframes)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +11
-0+{ + d->numf = numframes -1 ; +} + +void qbman_pull_desc_set_token (struct qbman_pull_desc *d,u8 token) +{ + d->tok = token; +} + +/* +* Exactly one of the following descriptor "actions" should be set. (Calling any
+ * one of these will replace the effect of any prior call to one of these.)
+ * - pull dequeue from the given frame queue (FQ)
+ * - pull dequeue from any FQ in the given work queue (WQ)
+ * - pull dequeue from any FQ in any WQ in the given channel
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +3
-0+ +/** +* qbman_pull_desc_set_fq() - Set fqid from which the dequeue command dequeues
+ * @fqid: the frame queue index of the given FQ
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +4
-0+void qbman_pull_desc_set_fq (struct qbman_pull_desc *d,u32 fqid) +{ + d->verb |=1 <<QB_VDQCR_VERB_DCT_SHIFT ; + d->verb |= qb_pull_dt_framequeue <<
QB_VDQCR_VERB_DT_SHIFT;drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +5
-0+ d->dq_src =cpu_to_le32 (fqid); +} + +/** +* qbman_pull_desc_set_wq() - Set wqid from which the dequeue command dequeues
+ * @wqid: composed of channel id and wqid within the channel
+ * @dct: the dequeue command type
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+void qbman_pull_desc_set_wq (struct qbman_pull_desc *d,u32 wqid, +enum qbman_pull_type_e dct) +{ + d->verb |= dct <<QB_VDQCR_VERB_DCT_SHIFT ; + d->verb |= qb_pull_dt_workqueue <<QB_VDQCR_VERB_DT_SHIFT ; + d->dq_src =cpu_to_le32 (wqid); +} + +/** +* qbman_pull_desc_set_channel() - Set channelid from which the dequeue command
+ * dequeues
+ * @chid: the channel id to be dequeued
+ * @dct: the dequeue command type
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +45
-0+void qbman_pull_desc_set_channel (struct qbman_pull_desc *d,u32 chid, +enum qbman_pull_type_e dct) +{ + d->verb |= dct <<QB_VDQCR_VERB_DCT_SHIFT ; + d->verb |= qb_pull_dt_channel <<QB_VDQCR_VERB_DT_SHIFT ; + d->dq_src =cpu_to_le32 (chid); +} + +/** +* qbman_swp_pull() - Issue the pull dequeue command +* @s: the software portal object +* @d: the software portal descriptor which has been configured with +* the set of qbman_pull_desc_set_*() calls +* +* Return 0 for success, and -EBUSY if the software portal is not ready +* to do pull dequeue. +*/ +int qbman_swp_pull (struct qbman_swp *s,struct qbman_pull_desc *d) +{ +struct qbman_pull_desc *p; + +if (!atomic_dec_and_test (&s->vdq.available)) { +atomic_inc (&s->vdq.available); +return -EBUSY ; + } + s->vdq.storage = (void *)d->rsp_addr_virt; + d->tok =QMAN_DQ_TOKEN_VALID ; + p =qbman_get_cmd (s,QBMAN_CENA_SWP_VDQCR ); + *p = *d; +dma_wmb (); + +/* Set the verb byte, have to substitute in the valid-bit */ + p->verb |= s->vdq.valid_bit; + s->vdq.valid_bit ^=QB_VALID_BIT ; + +return 0 ; +} + +#define QMAN_DQRR_PI_MASK 0xf + +/** +* qbman_swp_dqrr_next() - Get an valid DQRR entry +* @s: the software portal object +* +* Return NULL if there are no unconsumed DQRR entries. Return a DQRR entry
+ * only once, so repeated calls can return a sequence of DQRR entries, without
+ * requiring they be consumed immediately or in any particular order.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +14
-0+const struct dpaa2_dq *qbman_swp_dqrr_next (struct qbman_swp *s) +{ +u32 verb; +u32 response_verb; +u32 flags; +struct dpaa2_dq *p; + +/* Before using valid-bit to detect if something is there, we have to +* handle the case of the DQRR reset bug... +*/ +if (unlikely (s->dqrr.reset_bug)) { +/* +* We pick up new entries by cache-inhibited producer index, +* which means that a non-coherent mapping would require us to
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +6
-0+* invalidate and read *only* once that PI has indicated that +* there's an entry here. The first trip around the DQRR ring +* will be much less efficient than all subsequent trips around +* it... +*/ +u8 pi =qbman_read_register (s,QBMAN_CINH_SWP_DQPI )&
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +21
-0+QMAN_DQRR_PI_MASK ; + +/* there are new entries if pi != next_idx */ +if (pi == s->dqrr.next_idx) +return NULL ; + +/* +* if next_idx is/was the last ring index, and 'pi' is +* different, we can disable the workaround as all the ring +* entries have now been DMA'd to so valid-bit checking is +* repaired. Note: this logic needs to be based on next_idx +* (which increments one at a time), rather than on pi (which +* can burst and wrap-around between our snapshots of it). +*/ +if (s->dqrr.next_idx == (s->dqrr.dqrr_size -1 )) { +pr_debug ("next_idx=%d, pi=%d, clear reset bug\n" , + s->dqrr.next_idx, pi); + s->dqrr.reset_bug =0 ; + } + prefetch(qbman_get_cmd(s, + QBMAN_CENA_SWP_DQRR(s-Quoted 1 line
dqrr.next_idx)));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +3
-0+ } + + p = qbman_get_cmd(s, QBMAN_CENA_SWP_DQRR(s-Quoted 1 line
dqrr.next_idx));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +5
-0+ verb = p->dq.verb; + +/* +* If the valid-bit isn't of the expected polarity, nothing there. Note, +* in the DQRR reset bug workaround, we shouldn't need to skip these
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +1
-0+* check, because we've already determined that a new entry is available
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +7
-0+* and we've invalidated the cacheline before reading it, so the +* valid-bit behaviour is repaired and should tell us what we already +* knew from reading PI. +*/ +if ((verb &QB_VALID_BIT ) != s->dqrr.valid_bit) { + prefetch(qbman_get_cmd(s, + QBMAN_CENA_SWP_DQRR(s-Quoted 1 line
dqrr.next_idx)));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +4
-0+return NULL ; + } +/* +* There's something there. Move "next_idx" attention to the next ring
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +19
-0+* entry (and prefetch it) before returning what we found. +*/ + s->dqrr.next_idx++; + s->dqrr.next_idx &= s->dqrr.dqrr_size -1 ;/* Wrap around */ +if (!s->dqrr.next_idx) + s->dqrr.valid_bit ^=QB_VALID_BIT ; + +/* +* If this is the final response to a volatile dequeue command +* indicate that the vdq is available +*/ + flags = p->dq.stat; + response_verb = verb &QBMAN_RESULT_MASK ; +if ((response_verb ==QBMAN_RESULT_DQ ) && + (flags &DPAA2_DQ_STAT_VOLATILE ) && + (flags &DPAA2_DQ_STAT_EXPIRED )) +atomic_inc (&s->vdq.available); + + prefetch(qbman_get_cmd(s, QBMAN_CENA_SWP_DQRR(s-Quoted 1 line
dqrr.next_idx)));
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +6
-0+ +return p; +} + +/** +* qbman_swp_dqrr_consume() - Consume DQRR entries previously returned from
+ *qbman_swp_dqrr_next().
+ * @s: the software portal object
+ * @dq: the DQRR entry to be consumed
+ */
+voidqbman_swp_dqrr_consume(struct qbman_swp *s, const struct dpaa2_dq *dq)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +2
-0+{ + qbman_write_register(s, QBMAN_CINH_SWP_DCAP,
QBMAN_IDX_FROM_DQRR(dq));drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +4
-0+} + +/** +* qbman_result_has_new_result() - Check and get the dequeue response from the
+ * dq storage memory set in pull dequeue command
+ * @s: the software portal object
+ * @dq: the dequeue result read from the memory
+ *
+ * Return 1 for getting a valid dequeue result, or 0 for not getting a valid
+ * dequeue result.
+ *
+ * Only used for user-provided storage of dequeue results, not DQRR. For
+ * efficiency purposes, the driver will perform any required endianness
+ * conversion to ensure that the user's dequeue result storage is in host- endian
+ * format. As such, once the user has calledqbman_result_has_new_result()and
+ * been returned a valid dequeue result, they should not call it again on
+ * the same memory location (except of course if another dequeue command has
+ * been executed to produce a new result to that location).
+ */
+intqbman_result_has_new_result(struct qbman_swp *s, const struct dpaa2_dq *dq)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +36
-0+{ +if (dq->dq.tok !=QMAN_DQ_TOKEN_VALID ) +return 0 ; + +/* +* Set token to be 0 so we will detect change back to 1 +* next time the looping is traversed. Const is cast away here +* as we want users to treat the dequeue responses as read only. +*/ + ((struct dpaa2_dq *)dq)->dq.tok =0 ; + +/* +* Determine whether VDQCR is available based on whether the +* current result is sitting in the first storage location of +* the busy command. +*/ +if (s->vdq.storage == dq) { + s->vdq.storage =NULL ; +atomic_inc (&s->vdq.available); + } + +return 1 ; +} + +/** +* qbman_release_desc_clear() - Clear the contents of a descriptor to +* default/starting state. +*/ +void qbman_release_desc_clear (struct qbman_release_desc *d) +{ +memset (d,0 ,sizeof (*d)); + d->verb =1 <<5 ;/* Release Command Valid */ +} + +/** +* qbman_release_desc_set_bpid() - Set the ID of the buffer pool to release to
+ */
+voidqbman_release_desc_set_bpid(struct qbman_release_desc *d, u16 bpid)drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +6
-0+{ + d->bpid =cpu_to_le16 (bpid); +} + +/** +* qbman_release_desc_set_rcdi() - Determines whether or not the portal's RCDI
+ * interrupt source should be asserted after the release command is completed.
+ */
+voidqbman_release_desc_set_rcdi(struct qbman_release_desc *d, int enable)
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c line 805
Quoted 5 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +5
-0+{ +if (enable) + d->verb |=1 <<6 ; +else + d->verb &= ~(1 <<6 );
Can we avoid hardcoded values, or a comment?
Quoted 769 lines
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +16
-0+} + +#define RAR_IDX (rar) ((rar) & 0x7) +#define RAR_VB (rar) ((rar) & 0x80) +#define RAR_SUCCESS (rar) ((rar) & 0x100) + +/** +* qbman_swp_release() - Issue a buffer release command +* @s: the software portal object +* @d: the release descriptor +* @buffers: a pointer pointing to the buffer address to be released +* @num_buffers: number of buffers to be released, must be less than 8 +* +* Return 0 for success, -EBUSY if the release command ring is not ready. +*/ +int qbman_swp_release(struct qbman_swp *s, const struct
qbman_release_desc*d,drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +22
-0+ const u64 *buffers, unsigned int num_buffers) +{ + int i; +struct qbman_release_desc *p; +u32 rar; + +if (!num_buffers || (num_buffers >7 )) +return -EINVAL ; + + rar =qbman_read_register (s,QBMAN_CINH_SWP_RAR ); +if (!RAR_SUCCESS (rar)) +return -EBUSY ; + +/* Start the release command */ + p =qbman_get_cmd (s,QBMAN_CENA_SWP_RCR (RAR_IDX (rar))); +/* Copy the caller's buffer pointers to the command */ +for (i =0 ; i < num_buffers; i++) + p->buf[i] =cpu_to_le64 (buffers[i]); + p->bpid = d->bpid; + +/* +* Set the verb byte, have to substitute in the valid-bit and the number
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +59
-0+* of buffers. +*/ +dma_wmb (); + p->verb = d->verb |RAR_VB (rar) | num_buffers; + +return 0 ; +} + +struct qbman_acquire_desc { +u8 verb; +u8 reserved; +u16 bpid; +u8 num; +u8 reserved2[59 ]; +}; + +struct qbman_acquire_rslt { +u8 verb; +u8 rslt; +u16 reserved; +u8 num; +u8 reserved2[3 ]; +u64 buf[7 ]; +}; + +/** +* qbman_swp_acquire() - Issue a buffer acquire command +* @s: the software portal object +* @bpid: the buffer pool index +* @buffers: a pointer pointing to the acquired buffer addresses +* @num_buffers: number of buffers to be acquired, must be less than 8 +* +* Return 0 for success, or negative error code if the acquire command +* fails. +*/ +int qbman_swp_acquire (struct qbman_swp *s,u16 bpid,u64 *buffers, +unsigned int num_buffers) +{ +struct qbman_acquire_desc *p; +struct qbman_acquire_rslt *r; +int i; + +if (!num_buffers || (num_buffers >7 )) +return -EINVAL ; + +/* Start the management command */ + p =qbman_swp_mc_start (s); + +if (!p) +return -EBUSY ; + +/* Encode the caller-provided attributes */ + p->bpid =cpu_to_le16 (bpid); + p->num = num_buffers; + +/* Complete the management command */ + r =qbman_swp_mc_complete (s, p,QBMAN_MC_ACQUIRE ); +if (unlikely (!r)) { + pr_err("qbman: acquire from BPID %d failed, noresponse\n",
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+ bpid); +return -EIO ; + } + +/* Decode the outcome */ +WARN_ON ((r->verb &0x7f ) !=QBMAN_MC_ACQUIRE ); + +/* Determine success or failure */ +if (unlikely (r->rslt !=QBMAN_MC_RSLT_OK )) { + pr_err("qbman: acquire from BPID 0x%x failed,code=0x%02x\n",
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +45
-0+ bpid, r->rslt); +return -EIO ; + } + +WARN_ON (r->num > num_buffers); + +/* Copy the acquired buffers to the caller's array */ +for (i =0 ; i < r->num; i++) + buffers[i] =le64_to_cpu (r->buf[i]); + +return (int )r->num; +} + +struct qbman_alt_fq_state_desc { +u8 verb; +u8 reserved[3 ]; +u32 fqid; +u8 reserved2[56 ]; +}; + +struct qbman_alt_fq_state_rslt { +u8 verb; +u8 rslt; +u8 reserved[62 ]; +}; + +#define ALT_FQ_FQID_MASK 0x00FFFFFF + +int qbman_swp_alt_fq_state (struct qbman_swp *s,u32 fqid, +u8 alt_fq_verb) +{ +struct qbman_alt_fq_state_desc *p; +struct qbman_alt_fq_state_rslt *r; + +/* Start the management command */ + p =qbman_swp_mc_start (s); +if (!p) +return -EBUSY ; + + p->fqid =cpu_to_le32 (fqid) &ALT_FQ_FQID_MASK ; + +/* Complete the management command */ + r =qbman_swp_mc_complete (s, p, alt_fq_verb); +if (unlikely (!r)) { + pr_err("qbman: mgmt cmd failed, no response(verb=0x%x)\n",
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +10
-0+ alt_fq_verb); +return -EIO ; + } + +/* Decode the outcome */ +WARN_ON (r->verb != alt_fq_verb); + +/* Determine success or failure */ +if (unlikely (r->rslt !=QBMAN_MC_RSLT_OK )) { + pr_err("qbman: ALT FQID %d failed: verb = 0x%08x code =0x%02x\n",
drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +50
-0+ fqid, r->verb, r->rslt); +return -EIO ; + } + +return 0 ; +} + +struct qbman_cdan_ctrl_desc { +u8 verb; +u8 reserved; +u16 ch; +u8 we; +u8 ctrl; +u16 reserved2; +u64 cdan_ctx; +u8 reserved3[48 ]; + +}; + +struct qbman_cdan_ctrl_rslt { +u8 verb; +u8 rslt; +u16 ch; +u8 reserved[60 ]; +}; + +int qbman_swp_CDAN_set (struct qbman_swp *s,u16 channelid, +u8 we_mask,u8 cdan_en, +u64 ctx) +{ +struct qbman_cdan_ctrl_desc *p =NULL ; +struct qbman_cdan_ctrl_rslt *r =NULL ; + +/* Start the management command */ + p =qbman_swp_mc_start (s); +if (!p) +return -EBUSY ; + +/* Encode the caller-provided attributes */ + p->verb =0 ; + p->ch =cpu_to_le16 (channelid); + p->we = we_mask; +if (cdan_en) + p->ctrl =1 ; +else + p->ctrl =0 ; + p->cdan_ctx =cpu_to_le64 (ctx); + +/* Complete the management command */ + r = qbman_swp_mc_complete(s, p,
QBMAN_WQCHAN_CONFIGURE);drivers/staging/fsl-mc/bus/dpio/qbman-portal.c new file +16
-0+if (unlikely (!r)) { +pr_err ("qbman: wqchan config failed, no response\n" ); +return -EIO ; + } + +WARN_ON ((r->verb &0x7f ) !=QBMAN_WQCHAN_CONFIGURE ); + +/* Determine success or failure */ +if (unlikely (r->rslt !=QBMAN_MC_RSLT_OK )) { +pr_err ("qbman: CDAN cQID %d failed: code = 0x%02x\n" , + channelid, r->rslt); +return -EIO ; + } + +return 0 ; +}drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0@@ -0,0 +1,469 @@ +/* +* Copyright (C) 2014-2016 Freescale Semiconductor, Inc. +* Copyright 2016 NXP +* +* 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.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +36
-0+#ifndef __FSL_QBMAN_PORTAL_H +#define __FSL_QBMAN_PORTAL_H + +#include "../../include/dpaa2-fd.h" + +struct dpaa2_dq ; +struct qbman_swp ; + +/* qbman software portal descriptor structure */ +struct qbman_swp_desc { +void *cena_bar;/* Cache-enabled portal base address */ +void *cinh_bar;/* Cache-inhibited portal base address */ +u32 qman_version; +}; + +#define QBMAN_SWP_INTERRUPT_EQRI 0x01 +#define QBMAN_SWP_INTERRUPT_EQDI 0x02 +#define QBMAN_SWP_INTERRUPT_DQRI 0x04 +#define QBMAN_SWP_INTERRUPT_RCRI 0x08 +#define QBMAN_SWP_INTERRUPT_RCDI 0x10 +#define QBMAN_SWP_INTERRUPT_VDCI 0x20 + +/* the structure for pull dequeue descriptor */ +struct qbman_pull_desc { +u8 verb; +u8 numf; +u8 tok; +u8 reserved; +u32 dq_src; +u64 rsp_addr; +u64 rsp_addr_virt; +u8 padding[40 ]; +}; + +enum qbman_pull_type_e { +/* dequeue with priority precedence, respect intra-class scheduling */
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +86
-0+ qbman_pull_type_prio = 1, +/* dequeue with active FQ precedence, respect ICS */ + qbman_pull_type_active, +/* dequeue with active FQ precedence, no ICS */ + qbman_pull_type_active_noics +}; + +/* Definitions for parsing dequeue entries */ +#define QBMAN_RESULT_MASK 0x7f +#define QBMAN_RESULT_DQ 0x60 +#define QBMAN_RESULT_FQRN 0x21 +#define QBMAN_RESULT_FQRNI 0x22 +#define QBMAN_RESULT_FQPN 0x24 +#define QBMAN_RESULT_FQDAN 0x25 +#define QBMAN_RESULT_CDAN 0x26 +#define QBMAN_RESULT_CSCN_MEM 0x27 +#define QBMAN_RESULT_CGCU 0x28 +#define QBMAN_RESULT_BPSCN 0x29 +#define QBMAN_RESULT_CSCN_WQ 0x2a + +/* QBMan FQ management command codes */ +#define QBMAN_FQ_SCHEDULE 0x48 +#define QBMAN_FQ_FORCE 0x49 +#define QBMAN_FQ_XON 0x4d +#define QBMAN_FQ_XOFF 0x4e + +/* structure of enqueue descriptor */ +struct qbman_eq_desc { +u8 verb; +u8 dca; +u16 seqnum; +u16 orpid; +u16 reserved1; +u32 tgtid; +u32 tag; +u16 qdbin; +u8 qpri; +u8 reserved[3 ]; +u8 wae; +u8 rspid; +u64 rsp_addr; +u8 fd[32 ]; +}; + +/* buffer release descriptor */ +struct qbman_release_desc { +u8 verb; +u8 reserved; +u16 bpid; +u32 reserved2; +u64 buf[7 ]; +}; + +/* Management command result codes */ +#define QBMAN_MC_RSLT_OK 0xf0 + +#define CODE_CDAN_WE_EN 0x1 +#define CODE_CDAN_WE_CTX 0x4 + +/* portal data structure */ +struct qbman_swp { +const struct qbman_swp_desc *desc; +void __iomem *addr_cena; +void __iomem *addr_cinh; + +/* Management commands */ +struct { +u32 valid_bit;/* 0x00 or 0x80 */ + } mc; + +/* Push dequeues */ +u32 sdq; + +/* Volatile dequeues */ +struct { +atomic_t available;/* indicates if a command can be sent */ +u32 valid_bit;/* 0x00 or 0x80 */ +struct dpaa2_dq *storage;/* NULL if DQRR */ + } vdq; + +/* DQRR */ +struct { +u32 next_idx; +u32 valid_bit; +u8 dqrr_size; +int reset_bug;/* indicates dqrr reset workaround is needed */
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +13
-0+ } dqrr; +}; + +struct qbman_swp *qbman_swp_init (const struct qbman_swp_desc *d); +void qbman_swp_finish (struct qbman_swp *p); +u32 qbman_swp_interrupt_read_status (struct qbman_swp *p); +void qbman_swp_interrupt_clear_status (struct qbman_swp *p,u32 mask); +u32 qbman_swp_interrupt_get_trigger (struct qbman_swp *p); +void qbman_swp_interrupt_set_trigger (struct qbman_swp *p,u32 mask); +int qbman_swp_interrupt_get_inhibit (struct qbman_swp *p); +void qbman_swp_interrupt_set_inhibit (struct qbman_swp *p,int inhibit); + +void qbman_swp_push_get(struct qbman_swp *p, u8 channel_idx, int*enabled);
+voidqbman_swp_push_set(struct qbman_swp *p, u8 channel_idx, int enable);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +7
-0+ +void qbman_pull_desc_clear (struct qbman_pull_desc *d); +void qbman_pull_desc_set_storage (struct qbman_pull_desc *d, +struct dpaa2_dq *storage, +dma_addr_t storage_phys, +int stash); +void qbman_pull_desc_set_numframes(struct qbman_pull_desc *d, u8numframes);
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +10
-0+void qbman_pull_desc_set_fq (struct qbman_pull_desc *d,u32 fqid); +void qbman_pull_desc_set_wq (struct qbman_pull_desc *d,u32 wqid, +enum qbman_pull_type_e dct); +void qbman_pull_desc_set_channel (struct qbman_pull_desc *d,u32 chid, +enum qbman_pull_type_e dct); + +int qbman_swp_pull (struct qbman_swp *p,struct qbman_pull_desc *d); + +const struct dpaa2_dq *qbman_swp_dqrr_next (struct qbman_swp *s); +void qbman_swp_dqrr_consume(struct qbman_swp *s, const struct
dpaa2_dq*dq);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +2
-0+ +int qbman_result_has_new_result(struct qbman_swp *p, const struct
dpaa2_dq*dq);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +3
-0+ +void qbman_eq_desc_clear (struct qbman_eq_desc *d); +void qbman_eq_desc_set_no_orp(struct qbman_eq_desc *d, int
respond_success);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+void qbman_eq_desc_set_token (struct qbman_eq_desc *d,u8 token); +void qbman_eq_desc_set_fq (struct qbman_eq_desc *d,u32 fqid); +void qbman_eq_desc_set_qd (struct qbman_eq_desc *d,u32 qdid, +u32 qd_bin,u32 qd_prio); + +int qbman_swp_enqueue(struct qbman_swp *p, const struct
qbman_eq_desc*d,drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +4
-0+ const struct dpaa2_fd *fd); + +void qbman_release_desc_clear (struct qbman_release_desc *d); +void qbman_release_desc_set_bpid(struct qbman_release_desc *d, u16bpid);
+voidqbman_release_desc_set_rcdi(struct qbman_release_desc *d, int enable);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +2
-0+ +int qbman_swp_release(struct qbman_swp *s, const struct
qbman_release_desc*d,drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +11
-0+ const u64 *buffers, unsigned int num_buffers); +int qbman_swp_acquire (struct qbman_swp *s,u16 bpid,u64 *buffers, +unsigned int num_buffers); +int qbman_swp_alt_fq_state (struct qbman_swp *s,u32 fqid, +u8 alt_fq_verb); +int qbman_swp_CDAN_set (struct qbman_swp *s,u16 channelid, +u8 we_mask,u8 cdan_en, +u64 ctx); + +void *qbman_swp_mc_start (struct qbman_swp *p); +void qbman_swp_mc_submit(struct qbman_swp *p, void *cmd, u8
cmd_verb);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +4
-0+void *qbman_swp_mc_result (struct qbman_swp *p); + +/** +* qbman_result_is_DQ() - check if the dequeue result is a dequeue response
+ * @dq: the dequeue result to be checked
+ *
+ * DQRR entries may contain non-dequeue results, ie. notifications
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +3
-0+static inline int qbman_result_is_DQ (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_DQ);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +16
-0+} + +/** +* qbman_result_is_SCN() - Check the dequeue result is notification or not +* @dq: the dequeue result to be checked +* +*/ +static inline int qbman_result_is_SCN (const struct dpaa2_dq *dq) +{ +return !qbman_result_is_DQ (dq); +} + +/* FQ Data Availability */ +static inline int qbman_result_is_FQDAN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_FQDAN);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Channel Data Availability */ +static inline int qbman_result_is_CDAN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_CDAN);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Congestion State Change */ +static inline int qbman_result_is_CSCN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_CSCN_WQ);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Buffer Pool State Change */ +static inline int qbman_result_is_BPSCN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_BPSCN);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Congestion Group Count Update */ +static inline int qbman_result_is_CGCU (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_CGCU);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Retirement */ +static inline int qbman_result_is_FQRN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_FQRN);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Retirement Immediate */ +static inline int qbman_result_is_FQRNI (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_FQRNI);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +6
-0+} + +/* Park */ +static inline int qbman_result_is_FQPN (const struct dpaa2_dq *dq) +{ + return ((dq->dq.verb & QBMAN_RESULT_MASK) ==
QBMAN_RESULT_FQPN);drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +4
-0+} + +/** +* qbman_result_SCN_state() - Get the state field in State-change notification
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +9
-0+static inline u8 qbman_result_SCN_state (const struct dpaa2_dq *scn) +{ +return scn->scn.state; +} + +#define SCN_RID_MASK 0x00FFFFFF + +/** +* qbman_result_SCN_rid() - Get the resource id in State-change notification
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +7
-0+static inline u32 qbman_result_SCN_rid (const struct dpaa2_dq *scn) +{ +return le32_to_cpu (scn->scn.rid_tok) &SCN_RID_MASK ; +} + +/** +* qbman_result_SCN_ctx() - Get the context data in State-change notification
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +27
-0+static inline u64 qbman_result_SCN_ctx (const struct dpaa2_dq *scn) +{ +return le64_to_cpu (scn->scn.ctx); +} + +/** +* qbman_swp_fq_schedule() - Move the fq to the scheduled state +* @s: the software portal object +* @fqid: the index of frame queue to be scheduled +* +* There are a couple of different ways that a FQ can end up parked state, +* This schedules it. +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_fq_schedule (struct qbman_swp *s,u32 fqid) +{ +return qbman_swp_alt_fq_state (s, fqid,QBMAN_FQ_SCHEDULE ); +} + +/** +* qbman_swp_fq_force() - Force the FQ to fully scheduled state +* @s: the software portal object +* @fqid: the index of frame queue to be forced +* +* Force eligible will force a tentatively-scheduled FQ to be fully-scheduled +* and thus be available for selection by any channel-dequeuing behaviour (push
+ * or pull). If the FQ is subsequently "dequeued" from the channel and is still
+ * empty at the time this happens, the resultingdq_entrywill have no FD.
+ * (qbman_result_DQ_fd()will return NULL.)
+ *
+ * Return 0 for success, or negative error code for failure.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +41
-0+static inline int qbman_swp_fq_force (struct qbman_swp *s,u32 fqid) +{ +return qbman_swp_alt_fq_state (s, fqid,QBMAN_FQ_FORCE ); +} + +/** +* qbman_swp_fq_xon() - sets FQ flow-control to XON +* @s: the software portal object +* @fqid: the index of frame queue +* +* This setting doesn't affect enqueues to the FQ, just dequeues. +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_fq_xon (struct qbman_swp *s,u32 fqid) +{ +return qbman_swp_alt_fq_state (s, fqid,QBMAN_FQ_XON ); +} + +/** +* qbman_swp_fq_xoff() - sets FQ flow-control to XOFF +* @s: the software portal object +* @fqid: the index of frame queue +* +* This setting doesn't affect enqueues to the FQ, just dequeues. +* XOFF FQs will remain in the tenatively-scheduled state, even when +* non-empty, meaning they won't be selected for scheduled dequeuing. +* If a FQ is changed to XOFF after it had already become truly-scheduled +* to a channel, and a pull dequeue of that channel occurs that selects +* that FQ for dequeuing, then the resulting dq_entry will have no FD. +* (qbman_result_DQ_fd() will return NULL.) +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_fq_xoff (struct qbman_swp *s,u32 fqid) +{ +return qbman_swp_alt_fq_state (s, fqid,QBMAN_FQ_XOFF ); +} + +/* If the user has been allocated a channel object that is going to generate +* CDANs to another channel, then the qbman_swp_CDAN* functions will be
+ * necessary.
+ *
+ * CDAN-enabled channels only generate a single CDAN notification, after which
+ * they need to be reenabled before they'll generate another. The idea is
+ * that pull dequeuing will occur in reaction to the CDAN, followed by a
+ * reenable step. Each function generates a distinct command to hardware, so a
+ * combination function is provided if the user wishes to modify the "context"
+ * (which shows up in each CDAN message) each time they reenable, as a single
+ * command to hardware.
+ */drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +10
-0+ +/** +* qbman_swp_CDAN_set_context() - Set CDAN context +* @s: the software portal object +* @channelid: the channel index +* @ctx: the context to be set in CDAN +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_CDAN_set_context(struct qbman_swp *s, u16channelid,
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +15
-0+ u64 ctx) +{ +return qbman_swp_CDAN_set (s, channelid, +CODE_CDAN_WE_CTX , +0 , ctx); +} + +/** +* qbman_swp_CDAN_enable() - Enable CDAN for the channel +* @s: the software portal object +* @channelid: the index of the channel to generate CDAN +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_CDAN_enable(struct qbman_swp *s, u16channelid)
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +14
-0+{ +return qbman_swp_CDAN_set (s, channelid, +CODE_CDAN_WE_EN , +1 ,0 ); +} + +/** +* qbman_swp_CDAN_disable() - disable CDAN for the channel +* @s: the software portal object +* @channelid: the index of the channel to generate CDAN +* +* Return 0 for success, or negative error code for failure. +*/ +static inline int qbman_swp_CDAN_disable(struct qbman_swp *s, u16channelid)
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +8
-0+{ +return qbman_swp_CDAN_set (s, channelid, +CODE_CDAN_WE_EN , +0 ,0 ); +} + +/** +* qbman_swp_CDAN_set_context_enable() - Set CDAN contest and enable CDAN
+ * @s: the software portal object
+ * @channelid: the index of the channel to generate CDAN
+ * @ctx:i the context set in CDAN
+ *
+ * Return 0 for success, or negative error code for failure.
+ */
+static inline int qbman_swp_CDAN_set_context_enable(structqbman_swp*s,drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +5
-0+ u16 channelid, + u64 ctx) +{ + return qbman_swp_CDAN_set(s, channelid, + CODE_CDAN_WE_EN |
CODE_CDAN_WE_CTX,drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +5
-0+ 1, ctx); +} + +/* Wraps up submit + poll-for-result */ +static inline void *qbman_swp_mc_complete(struct qbman_swp *swp,void *cmd,
drivers/staging/fsl-mc/bus/dpio/qbman-portal.h new file +16
-1+ u8 cmd_verb) +{ +int loopvar =1000 ; + +qbman_swp_mc_submit (swp, cmd, cmd_verb); + +do { + cmd =qbman_swp_mc_result (swp); + }while (cmd ==NULL && loopvar--); + +WARN_ON (!loopvar); + +return cmd; +} + +#endif /* __FSL_QBMAN_PORTAL_H */ --1.9.0
_______________________________________________
upstream-release mailing list
[email protected]
http://linux.freescale.net/mailman/listinfo/upstream-release
PATCH v5 6/8 bus: fsl-mc: dpio: add the DPAA2 DPIO service interface
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
The DPIO service interface handles initialization of DPIO objects and exports APIs to be used by other DPAA2 object drivers to perform queuing and buffer management related operations. The service allows registration of callbacks when frames or notifications are received.
---
Notes:
-v4
-updated copyright
-adjust file location to be in drivers/staging -updated copyright
-added missing free on error path
-fixed typo in comment
-whitespace and alignment cleanup
-v3
-zero memory allocated for a dpio store (bug fix suggested
by Ioana Radulescu)
-v2
-use service_select_by_cpu() for re-arming DPIO interrupts -replace use of NR_CPUS with num_possible_cpus()
drivers/staging/fsl-mc/bus/dpio/Makefile | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 616 +++++++++++++++++++++++++ drivers/staging/fsl-mc/include/dpaa2-io.h | 139 ++++++ 3 files changed, 756 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-service.c create mode 100644 drivers/staging/fsl-mc/include/dpaa2-io.h
drivers/staging/fsl-mc/bus/dpio/Makefile +1 -1
@@ -6,4 +6,4 @@ subdir-ccflags-y := -Werror obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o -fsl-mc-dpio-objs := dpio.o qbman-portal.o +fsl-mc-dpio-objs := dpio.o qbman-portal.o dpio-service.o
drivers/staging/fsl-mc/bus/dpio/dpio-service.c new file +616 -0
616 lines not on this page · raw message
drivers/staging/fsl-mc/include/dpaa2-io.h new file +139 -0
139 lines not on this page · raw message
Signature · 1 line
1.9.0
PATCH v5 7/8 bus: fsl-mc: dpio: add the DPAA2 DPIO object driver
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
The DPIO driver registers with the fsl-mc bus to handle bus-related events for DPIO objects. Key responsibility is mapping I/O regions, setting up interrupt handlers, and calling the DPIO service initialization during probe.
---
Notes:
-v4
-updated copyright
-adjust file location to be in drivers/staging -whitespace alignment cleanup
-v3
-no changes
-v2
-handle error case where number of DPIOs > NR_CPUs
drivers/staging/fsl-mc/bus/dpio/Makefile | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 296 ++++++++++++++++++++++++++ 2 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 drivers/staging/fsl-mc/bus/dpio/dpio-driver.c
drivers/staging/fsl-mc/bus/dpio/Makefile +1 -1
@@ -6,4 +6,4 @@ subdir-ccflags-y := -Werror obj-$(CONFIG_FSL_MC_DPIO) += fsl-mc-dpio.o -fsl-mc-dpio-objs := dpio.o qbman-portal.o dpio-service.o +fsl-mc-dpio-objs := dpio.o qbman-portal.o dpio-service.o dpio-driver.o
drivers/staging/fsl-mc/bus/dpio/dpio-driver.c new file +296 -0
296 lines not on this page · raw message
Signature · 1 line
1.9.0
PATCH v5 8/8 bus: fsl-mc: dpio: add maintainer for DPIO
In reply to Stuart YoderFrom: Roy Pledge <[email protected]>
add Roy Pledge as maintainer of DPIO
---
Notes:
-v4
-adjust file location to be in drivers/staging
-v3
-no changes
-v2
-corrected location of maintainer entryMAINTAINERS | 6 ++++++ 1 file changed, 6 insertions(+)
MAINTAINERS +6 -0
@@ -3980,6 +3980,12 @@ S: Maintained F: drivers/char/dtlk.c F: include/linux/dtlk.h +DPAA2 DATAPATH I/O (DPIO) DRIVER +M: Roy Pledge <[email protected]> +L: [email protected] +S: Maintained +F: drivers/staging/fsl-mc/bus/dpio + DPT_I2O SCSI RAID DRIVER M: Adaptec OEM Raid Solutions <[email protected]> L: [email protected]
Signature · 1 line
1.9.0