From: Tomas Winkler <tomas.winkler@intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Alexander Usyskin <alexander.usyskin@intel.com>,
linux-kernel@vger.kernel.org,
Tomas Winkler <tomas.winkler@intel.com>
Subject: [char-misc-next 05/12] mei: define dma ring buffer sizes for PCH12 HW and newer
Date: Tue, 31 Jul 2018 09:35:37 +0300 [thread overview]
Message-ID: <20180731063544.25540-6-tomas.winkler@intel.com> (raw)
In-Reply-To: <20180731063544.25540-1-tomas.winkler@intel.com>
From: Alexander Usyskin <alexander.usyskin@intel.com>
Define dma ring buffer sizes for PCH12 (CLN HW and newer)
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
---
drivers/misc/mei/hw-me.c | 13 +++++++++++++
drivers/misc/mei/hw-me.h | 4 ++++
2 files changed, 17 insertions(+)
diff --git a/drivers/misc/mei/hw-me.c b/drivers/misc/mei/hw-me.c
index 0e3c31595dda..0759c3a668de 100644
--- a/drivers/misc/mei/hw-me.c
+++ b/drivers/misc/mei/hw-me.c
@@ -19,6 +19,7 @@
#include <linux/kthread.h>
#include <linux/interrupt.h>
#include <linux/pm_runtime.h>
+#include <linux/sizes.h>
#include "mei_dev.h"
#include "hbm.h"
@@ -1389,6 +1390,11 @@ static bool mei_me_fw_type_sps(struct pci_dev *pdev)
.fw_status.status[4] = PCI_CFG_HFS_5, \
.fw_status.status[5] = PCI_CFG_HFS_6
+#define MEI_CFG_DMA_128 \
+ .dma_size[DMA_DSCR_HOST] = SZ_128K, \
+ .dma_size[DMA_DSCR_DEVICE] = SZ_128K, \
+ .dma_size[DMA_DSCR_CTRL] = PAGE_SIZE
+
/* ICH Legacy devices */
static const struct mei_cfg mei_me_ich_cfg = {
MEI_CFG_ICH_HFS,
@@ -1421,6 +1427,12 @@ static const struct mei_cfg mei_me_pch8_sps_cfg = {
MEI_CFG_FW_SPS,
};
+/* Cannon Lake and newer devices */
+static const struct mei_cfg mei_me_pch12_cfg = {
+ MEI_CFG_PCH8_HFS,
+ MEI_CFG_DMA_128,
+};
+
/*
* mei_cfg_list - A list of platform platform specific configurations.
* Note: has to be synchronized with enum mei_cfg_idx.
@@ -1433,6 +1445,7 @@ static const struct mei_cfg *const mei_cfg_list[] = {
[MEI_ME_PCH_CPT_PBG_CFG] = &mei_me_pch_cpt_pbg_cfg,
[MEI_ME_PCH8_CFG] = &mei_me_pch8_cfg,
[MEI_ME_PCH8_SPS_CFG] = &mei_me_pch8_sps_cfg,
+ [MEI_ME_PCH12_CFG] = &mei_me_pch12_cfg,
};
const struct mei_cfg *mei_me_get_cfg(kernel_ulong_t idx)
diff --git a/drivers/misc/mei/hw-me.h b/drivers/misc/mei/hw-me.h
index 0c6fe71d1212..bbcc5fc106cd 100644
--- a/drivers/misc/mei/hw-me.h
+++ b/drivers/misc/mei/hw-me.h
@@ -31,10 +31,12 @@
*
* @fw_status: FW status
* @quirk_probe: device exclusion quirk
+ * @dma_size: device DMA buffers size
*/
struct mei_cfg {
const struct mei_fw_status fw_status;
bool (*quirk_probe)(struct pci_dev *pdev);
+ size_t dma_size[DMA_DSCR_NUM];
};
@@ -80,6 +82,7 @@ struct mei_me_hw {
* @MEI_ME_PCH8_SPS_CFG: Platform Controller Hub Gen8 and newer
* servers platforms with quirk for
* SPS firmware exclusion.
+ * @MEI_ME_PCH12_CFG: Platform Controller Hub Gen12 and newer
* @MEI_ME_NUM_CFG: Upper Sentinel.
*/
enum mei_cfg_idx {
@@ -90,6 +93,7 @@ enum mei_cfg_idx {
MEI_ME_PCH_CPT_PBG_CFG,
MEI_ME_PCH8_CFG,
MEI_ME_PCH8_SPS_CFG,
+ MEI_ME_PCH12_CFG,
MEI_ME_NUM_CFG,
};
--
2.14.4
next prev parent reply other threads:[~2018-07-31 6:38 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-31 6:35 [char-misc-next 00/12] mei: Add DMA ring Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 01/12] mei: add support for variable length mei headers Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 02/12] mei: hbm: define dma ring setup protocol Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 03/12] mei: hbm: introduce dma bit in the message header Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 04/12] mei: restrict dma ring support to hbm version 2.1 Tomas Winkler
2018-07-31 6:35 ` Tomas Winkler [this message]
2018-07-31 6:35 ` [char-misc-next 06/12] mei: dma ring buffers allocation Tomas Winkler
2018-08-02 8:18 ` Greg Kroah-Hartman
2018-08-02 8:20 ` Winkler, Tomas
2018-08-05 20:38 ` Winkler, Tomas
2018-09-12 7:13 ` Greg Kroah-Hartman
2018-07-31 6:35 ` [char-misc-next 07/12] mei: hbm: setup dma ring Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 08/12] mei: hw: add dma ring control block Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 09/12] mei: dma ring: implement rx circular buffer logic Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 10/12] mei: dma ring: implement transmit flow Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 11/12] mei: bump hbm version to 2.1 Tomas Winkler
2018-07-31 6:35 ` [char-misc-next 12/12] mei: me: mark CNP devices as having dma support Tomas Winkler
2018-08-02 8:19 ` [char-misc-next 00/12] mei: Add DMA ring Greg Kroah-Hartman
2018-08-08 16:11 ` Winkler, Tomas
2018-08-19 5:34 ` Winkler, Tomas
2018-08-19 6:12 ` 'Greg Kroah-Hartman'
2018-09-12 7:12 ` Greg Kroah-Hartman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180731063544.25540-6-tomas.winkler@intel.com \
--to=tomas.winkler@intel.com \
--cc=alexander.usyskin@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®