replace alignment attributes

[dpdk.git] / drivers / bus / dpaa / include / fsl_qman.h

diff --git a/drivers/bus/dpaa/include/fsl_qman.h b/drivers/bus/dpaa/include/fsl_qman.h
index 29fb2eb..1b3342e 100644 (file)
--- a/drivers/bus/dpaa/include/fsl_qman.h
+++ b/drivers/bus/dpaa/include/fsl_qman.h
@@ -193,7 +193,7 @@ struct qm_fd {
                u32 cmd;
                u32 status;
        };
-} __attribute__((aligned(8)));
+} __rte_aligned(8);
 #define QM_FD_DD_NULL          0x00
 #define QM_FD_PID_MASK         0x3f
 static inline u64 qm_fd_addr_get64(const struct qm_fd *fd)
@@ -1215,9 +1215,13 @@ struct qman_fq {
        struct qman_fq_cb cb;
 
        u32 fqid_le;
+       u32 fqid;
+
+       int q_fd;
        u16 ch_id;
        u8 cgr_groupid;
-       u8 is_static;
+       u8 is_static:4;
+       u8 qp_initialized:4;
 
        /* DPDK Interface */
        void *dpaa_intf;
@@ -1230,7 +1234,6 @@ struct qman_fq {
        volatile unsigned long flags;
 
        enum qman_fq_state state;
-       u32 fqid;
        spinlock_t fqlock;
 
        struct rb_node node;
@@ -1332,6 +1335,13 @@ u32 qman_portal_dequeue(struct rte_event ev[], unsigned int poll_limit,
  */
 int qman_irqsource_add(u32 bits);
 
+/**
+ * qman_fq_portal_irqsource_add - samilar to qman_irqsource_add, but it
+ * takes portal (fq specific) as input rather than using the thread affined
+ * portal.
+ */
+int qman_fq_portal_irqsource_add(struct qman_portal *p, u32 bits);
+
 /**
  * qman_irqsource_remove - remove processing sources from being interrupt-driven
  * @bits: bitmask of QM_PIRQ_**I processing sources
@@ -1342,6 +1352,13 @@ int qman_irqsource_add(u32 bits);
  */
 int qman_irqsource_remove(u32 bits);
 
+/**
+ * qman_fq_portal_irqsource_remove - similar to qman_irqsource_remove, but it
+ * takes portal (fq specific) as input rather than using the thread affined
+ * portal.
+ */
+int qman_fq_portal_irqsource_remove(struct qman_portal *p, u32 bits);
+
 /**
  * qman_affine_channel - return the channel ID of an portal
  * @cpu: the cpu whose affine portal is the subject of the query