From: Jonathan Cameron <Jonathan.Cameron@Huawei.com>
To: Dan Williams <dan.j.williams@intel.com>
Cc: <linux-cxl@vger.kernel.org>,
Ben Widawsky <ben.widawsky@intel.com>, <vishal.l.verma@intel.com>,
<alison.schofield@intel.com>, <nvdimm@lists.linux.dev>,
<ira.weiny@intel.com>
Subject: Re: [PATCH v3 15/28] cxl/pci: Make 'struct cxl_mem' device type generic
Date: Thu, 2 Sep 2021 17:55:59 +0100 [thread overview]
Message-ID: <20210902175559.00005da7@Huawei.com> (raw)
In-Reply-To: <162982120696.1124374.11635718440690909189.stgit@dwillia2-desk3.amr.corp.intel.com>
On Tue, 24 Aug 2021 09:06:47 -0700
Dan Williams <dan.j.williams@intel.com> wrote:
> In preparation for adding a unit test provider of a cxl_memdev, convert
> the 'struct cxl_mem' driver context to carry a generic device rather
> than a pci device.
>
> Note, some dev_dbg() lines needed extra reformatting per clang-format.
>
> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
> Acked-by: Ben Widawsky <ben.widawsky@intel.com>
Hi Dan,
Whilst it is obviously functionally correct, this had ended up places where
it goes form cxlm to dev to pci_dev to dev which is a bit messy.
Some places have it done the the more elegant form where we always
get the dev from the cxlm and the pci_dev form the dev
(and don't go back the other way).
Jonathan
> ---
> drivers/cxl/core/memdev.c | 3 +-
> drivers/cxl/cxlmem.h | 4 ++-
> drivers/cxl/pci.c | 60 ++++++++++++++++++++++-----------------------
> 3 files changed, 32 insertions(+), 35 deletions(-)
>
> diff --git a/drivers/cxl/core/memdev.c b/drivers/cxl/core/memdev.c
> index a9c317e32010..40789558f8c2 100644
> --- a/drivers/cxl/core/memdev.c
> +++ b/drivers/cxl/core/memdev.c
> @@ -149,7 +149,6 @@ static void cxl_memdev_unregister(void *_cxlmd)
> static struct cxl_memdev *cxl_memdev_alloc(struct cxl_mem *cxlm,
> const struct file_operations *fops)
> {
> - struct pci_dev *pdev = cxlm->pdev;
> struct cxl_memdev *cxlmd;
> struct device *dev;
> struct cdev *cdev;
> @@ -166,7 +165,7 @@ static struct cxl_memdev *cxl_memdev_alloc(struct cxl_mem *cxlm,
>
> dev = &cxlmd->dev;
> device_initialize(dev);
> - dev->parent = &pdev->dev;
> + dev->parent = cxlm->dev;
> dev->bus = &cxl_bus_type;
> dev->devt = MKDEV(cxl_mem_major, cxlmd->id);
> dev->type = &cxl_memdev_type;
> diff --git a/drivers/cxl/cxlmem.h b/drivers/cxl/cxlmem.h
> index 6c0b1e2ea97c..8397daea9d9b 100644
> --- a/drivers/cxl/cxlmem.h
> +++ b/drivers/cxl/cxlmem.h
> @@ -68,7 +68,7 @@ devm_cxl_add_memdev(struct device *host, struct cxl_mem *cxlm,
>
> /**
> * struct cxl_mem - A CXL memory device
> - * @pdev: The PCI device associated with this CXL device.
> + * @dev: The device associated with this CXL device.
> * @cxlmd: Logical memory device chardev / interface
> * @regs: Parsed register blocks
> * @payload_size: Size of space for payload
> @@ -82,7 +82,7 @@ devm_cxl_add_memdev(struct device *host, struct cxl_mem *cxlm,
> * @ram_range: Volatile memory capacity information.
> */
> struct cxl_mem {
> - struct pci_dev *pdev;
> + struct device *dev;
> struct cxl_memdev *cxlmd;
>
> struct cxl_regs regs;
> diff --git a/drivers/cxl/pci.c b/drivers/cxl/pci.c
> index 651e8d4ec974..24d84b69227a 100644
> --- a/drivers/cxl/pci.c
> +++ b/drivers/cxl/pci.c
> @@ -250,7 +250,7 @@ static int cxl_mem_wait_for_doorbell(struct cxl_mem *cxlm)
> cpu_relax();
> }
>
> - dev_dbg(&cxlm->pdev->dev, "Doorbell wait took %dms",
> + dev_dbg(cxlm->dev, "Doorbell wait took %dms",
> jiffies_to_msecs(end) - jiffies_to_msecs(start));
> return 0;
> }
> @@ -268,7 +268,7 @@ static bool cxl_is_security_command(u16 opcode)
> static void cxl_mem_mbox_timeout(struct cxl_mem *cxlm,
> struct mbox_cmd *mbox_cmd)
> {
> - struct device *dev = &cxlm->pdev->dev;
> + struct device *dev = cxlm->dev;
>
> dev_dbg(dev, "Mailbox command (opcode: %#x size: %zub) timed out\n",
> mbox_cmd->opcode, mbox_cmd->size_in);
> @@ -300,6 +300,7 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,
> struct mbox_cmd *mbox_cmd)
> {
> void __iomem *payload = cxlm->regs.mbox + CXLDEV_MBOX_PAYLOAD_OFFSET;
> + struct device *dev = cxlm->dev;
> u64 cmd_reg, status_reg;
> size_t out_len;
> int rc;
> @@ -325,8 +326,7 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,
>
> /* #1 */
> if (cxl_doorbell_busy(cxlm)) {
> - dev_err_ratelimited(&cxlm->pdev->dev,
> - "Mailbox re-busy after acquiring\n");
> + dev_err_ratelimited(dev, "Mailbox re-busy after acquiring\n");
> return -EBUSY;
> }
>
> @@ -345,7 +345,7 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,
> writeq(cmd_reg, cxlm->regs.mbox + CXLDEV_MBOX_CMD_OFFSET);
>
> /* #4 */
> - dev_dbg(&cxlm->pdev->dev, "Sending command\n");
> + dev_dbg(dev, "Sending command\n");
> writel(CXLDEV_MBOX_CTRL_DOORBELL,
> cxlm->regs.mbox + CXLDEV_MBOX_CTRL_OFFSET);
>
> @@ -362,7 +362,7 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,
> FIELD_GET(CXLDEV_MBOX_STATUS_RET_CODE_MASK, status_reg);
>
> if (mbox_cmd->return_code != 0) {
> - dev_dbg(&cxlm->pdev->dev, "Mailbox operation had an error\n");
> + dev_dbg(dev, "Mailbox operation had an error\n");
> return 0;
> }
>
> @@ -399,7 +399,7 @@ static int __cxl_mem_mbox_send_cmd(struct cxl_mem *cxlm,
> */
> static int cxl_mem_mbox_get(struct cxl_mem *cxlm)
> {
> - struct device *dev = &cxlm->pdev->dev;
> + struct device *dev = cxlm->dev;
> u64 md_status;
> int rc;
>
> @@ -502,7 +502,7 @@ static int handle_mailbox_cmd_from_user(struct cxl_mem *cxlm,
> u64 in_payload, u64 out_payload,
> s32 *size_out, u32 *retval)
> {
> - struct device *dev = &cxlm->pdev->dev;
> + struct device *dev = cxlm->dev;
> struct mbox_cmd mbox_cmd = {
> .opcode = cmd->opcode,
> .size_in = cmd->info.size_in,
> @@ -925,12 +925,12 @@ static int cxl_mem_setup_mailbox(struct cxl_mem *cxlm)
> */
> cxlm->payload_size = min_t(size_t, cxlm->payload_size, SZ_1M);
> if (cxlm->payload_size < 256) {
> - dev_err(&cxlm->pdev->dev, "Mailbox is too small (%zub)",
> + dev_err(cxlm->dev, "Mailbox is too small (%zub)",
> cxlm->payload_size);
> return -ENXIO;
> }
>
> - dev_dbg(&cxlm->pdev->dev, "Mailbox payload sized %zu",
> + dev_dbg(cxlm->dev, "Mailbox payload sized %zu",
> cxlm->payload_size);
>
> return 0;
> @@ -948,7 +948,7 @@ static struct cxl_mem *cxl_mem_create(struct pci_dev *pdev)
> }
>
> mutex_init(&cxlm->mbox_mutex);
> - cxlm->pdev = pdev;
> + cxlm->dev = dev;
> cxlm->enabled_cmds =
> devm_kmalloc_array(dev, BITS_TO_LONGS(cxl_cmd_count),
> sizeof(unsigned long),
> @@ -964,9 +964,9 @@ static struct cxl_mem *cxl_mem_create(struct pci_dev *pdev)
> static void __iomem *cxl_mem_map_regblock(struct cxl_mem *cxlm,
> u8 bar, u64 offset)
> {
> - struct pci_dev *pdev = cxlm->pdev;
> - struct device *dev = &pdev->dev;
> void __iomem *addr;
> + struct device *dev = cxlm->dev;
> + struct pci_dev *pdev = to_pci_dev(dev);
>
> /* Basic sanity check that BAR is big enough */
> if (pci_resource_len(pdev, bar) < offset) {
> @@ -989,7 +989,7 @@ static void __iomem *cxl_mem_map_regblock(struct cxl_mem *cxlm,
>
> static void cxl_mem_unmap_regblock(struct cxl_mem *cxlm, void __iomem *base)
> {
> - pci_iounmap(cxlm->pdev, base);
> + pci_iounmap(to_pci_dev(cxlm->dev), base);
> }
>
> static int cxl_mem_dvsec(struct pci_dev *pdev, int dvsec)
> @@ -1018,7 +1018,7 @@ static int cxl_mem_dvsec(struct pci_dev *pdev, int dvsec)
> static int cxl_probe_regs(struct cxl_mem *cxlm, void __iomem *base,
> struct cxl_register_map *map)
> {
> - struct pci_dev *pdev = cxlm->pdev;
> + struct pci_dev *pdev = to_pci_dev(cxlm->dev);
> struct device *dev = &pdev->dev;
As below.
> struct cxl_component_reg_map *comp_map;
> struct cxl_device_reg_map *dev_map;
> @@ -1057,7 +1057,7 @@ static int cxl_probe_regs(struct cxl_mem *cxlm, void __iomem *base,
>
> static int cxl_map_regs(struct cxl_mem *cxlm, struct cxl_register_map *map)
> {
> - struct pci_dev *pdev = cxlm->pdev;
> + struct pci_dev *pdev = to_pci_dev(cxlm->dev);
> struct device *dev = &pdev->dev;
That's going in circles.
struct device *dev = cxlm->dev;
struct pci_dev *pdev = to_pci_dev(dev);
or if you want to to maintain the order
struct device *dev = clxm->dev;
Also inconsistent with how you do it in
cxl_mem_map_regblock()
>
> switch (map->reg_type) {
> @@ -1096,8 +1096,8 @@ static void cxl_decode_register_block(u32 reg_lo, u32 reg_hi,
> */
> static int cxl_mem_setup_regs(struct cxl_mem *cxlm)
> {
> - struct pci_dev *pdev = cxlm->pdev;
> - struct device *dev = &pdev->dev;
> + struct pci_dev *pdev = to_pci_dev(cxlm->dev);
> + struct device *dev = cxlm->dev;
Trivial:
Seems a bit odd to not reorder these two and have
struct pci_dev *pdev = to_pci_dev(dev);
> u32 regloc_size, regblocks;
> void __iomem *base;
> int regloc, i, n_maps;
> @@ -1226,7 +1226,7 @@ static void cxl_walk_cel(struct cxl_mem *cxlm, size_t size, u8 *cel)
> struct cxl_mem_command *cmd = cxl_mem_find_command(opcode);
>
> if (!cmd) {
> - dev_dbg(&cxlm->pdev->dev,
> + dev_dbg(cxlm->dev,
> "Opcode 0x%04x unsupported by driver", opcode);
> continue;
> }
> @@ -1323,7 +1323,7 @@ static int cxl_mem_get_partition_info(struct cxl_mem *cxlm,
> static int cxl_mem_enumerate_cmds(struct cxl_mem *cxlm)
> {
> struct cxl_mbox_get_supported_logs *gsl;
> - struct device *dev = &cxlm->pdev->dev;
> + struct device *dev = cxlm->dev;
> struct cxl_mem_command *cmd;
> int i, rc;
>
> @@ -1418,15 +1418,14 @@ static int cxl_mem_identify(struct cxl_mem *cxlm)
> cxlm->partition_align_bytes = le64_to_cpu(id.partition_align);
> cxlm->partition_align_bytes *= CXL_CAPACITY_MULTIPLIER;
>
> - dev_dbg(&cxlm->pdev->dev, "Identify Memory Device\n"
> + dev_dbg(cxlm->dev,
> + "Identify Memory Device\n"
> " total_bytes = %#llx\n"
> " volatile_only_bytes = %#llx\n"
> " persistent_only_bytes = %#llx\n"
> " partition_align_bytes = %#llx\n",
> - cxlm->total_bytes,
> - cxlm->volatile_only_bytes,
> - cxlm->persistent_only_bytes,
> - cxlm->partition_align_bytes);
> + cxlm->total_bytes, cxlm->volatile_only_bytes,
> + cxlm->persistent_only_bytes, cxlm->partition_align_bytes);
>
> cxlm->lsa_size = le32_to_cpu(id.lsa_size);
> memcpy(cxlm->firmware_version, id.fw_revision, sizeof(id.fw_revision));
> @@ -1453,19 +1452,18 @@ static int cxl_mem_create_range_info(struct cxl_mem *cxlm)
> &cxlm->next_volatile_bytes,
> &cxlm->next_persistent_bytes);
> if (rc < 0) {
> - dev_err(&cxlm->pdev->dev, "Failed to query partition information\n");
> + dev_err(cxlm->dev, "Failed to query partition information\n");
> return rc;
> }
>
> - dev_dbg(&cxlm->pdev->dev, "Get Partition Info\n"
> + dev_dbg(cxlm->dev,
> + "Get Partition Info\n"
> " active_volatile_bytes = %#llx\n"
> " active_persistent_bytes = %#llx\n"
> " next_volatile_bytes = %#llx\n"
> " next_persistent_bytes = %#llx\n",
> - cxlm->active_volatile_bytes,
> - cxlm->active_persistent_bytes,
> - cxlm->next_volatile_bytes,
> - cxlm->next_persistent_bytes);
> + cxlm->active_volatile_bytes, cxlm->active_persistent_bytes,
> + cxlm->next_volatile_bytes, cxlm->next_persistent_bytes);
>
> cxlm->ram_range.start = 0;
> cxlm->ram_range.end = cxlm->active_volatile_bytes - 1;
>
next prev parent reply other threads:[~2021-09-02 16:56 UTC|newest]
Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-24 16:05 [PATCH v3 00/28] cxl_test: Enable CXL Topology and UAPI regression tests Dan Williams
2021-08-24 16:05 ` [PATCH v3 01/28] libnvdimm/labels: Introduce getters for namespace label fields Dan Williams
2021-08-24 16:05 ` [PATCH v3 02/28] libnvdimm/labels: Add isetcookie validation helper Dan Williams
2021-08-24 16:05 ` [PATCH v3 03/28] libnvdimm/labels: Introduce label setter helpers Dan Williams
2021-08-24 16:05 ` [PATCH v3 04/28] libnvdimm/labels: Add a checksum calculation helper Dan Williams
2021-08-24 16:05 ` [PATCH v3 05/28] libnvdimm/labels: Add blk isetcookie set / validation helpers Dan Williams
2021-08-24 16:05 ` [PATCH v3 06/28] libnvdimm/labels: Add blk special cases for nlabel and position helpers Dan Williams
2021-08-24 16:06 ` [PATCH v3 07/28] libnvdimm/labels: Add type-guid helpers Dan Williams
2021-08-24 16:06 ` [PATCH v3 08/28] libnvdimm/labels: Add claim class helpers Dan Williams
2021-08-24 16:06 ` [PATCH v3 09/28] libnvdimm/labels: Add address-abstraction uuid definitions Dan Williams
2021-08-24 16:06 ` [PATCH v3 10/28] libnvdimm/labels: Add uuid helpers Dan Williams
2021-08-24 16:06 ` [PATCH v3 11/28] libnvdimm/label: Add a helper for nlabel validation Dan Williams
2021-09-02 16:37 ` Jonathan Cameron
2021-08-24 16:06 ` [PATCH v3 12/28] libnvdimm/labels: Introduce the concept of multi-range namespace labels Dan Williams
2021-09-02 16:43 ` Jonathan Cameron
2021-08-24 16:06 ` [PATCH v3 13/28] libnvdimm/label: Define CXL region labels Dan Williams
2021-09-02 16:36 ` Jonathan Cameron
2021-09-02 16:41 ` Jonathan Cameron
2021-09-03 3:58 ` Dan Williams
2021-08-24 16:06 ` [PATCH v3 14/28] libnvdimm/labels: Introduce CXL labels Dan Williams
2021-09-03 17:00 ` Dan Williams
2021-08-24 16:06 ` [PATCH v3 15/28] cxl/pci: Make 'struct cxl_mem' device type generic Dan Williams
2021-09-02 16:55 ` Jonathan Cameron [this message]
2021-09-02 17:34 ` Dan Williams
2021-08-24 16:06 ` [PATCH v3 16/28] cxl/mbox: Introduce the mbox_send operation Dan Williams
2021-09-02 17:07 ` Jonathan Cameron
2021-08-24 16:06 ` [PATCH v3 17/28] cxl/mbox: Move mailbox and other non-PCI specific infrastructure to the core Dan Williams
2021-09-02 17:56 ` Jonathan Cameron
2021-09-02 18:56 ` Dan Williams
2021-08-24 16:07 ` [PATCH v3 18/28] cxl/pci: Use module_pci_driver Dan Williams
2021-09-02 17:58 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 19/28] cxl/mbox: Convert 'enabled_cmds' to DECLARE_BITMAP Dan Williams
2021-09-02 17:59 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 20/28] cxl/mbox: Add exclusive kernel command support Dan Williams
2021-09-02 18:09 ` Jonathan Cameron
2021-09-03 20:47 ` Dan Williams
2021-08-24 16:07 ` [PATCH v3 21/28] cxl/pmem: Translate NVDIMM label commands to CXL label commands Dan Williams
2021-09-02 18:22 ` Jonathan Cameron
2021-09-03 21:09 ` Dan Williams
2021-08-24 16:07 ` [PATCH v3 22/28] cxl/pmem: Add support for multiple nvdimm-bridge objects Dan Williams
2021-09-03 11:15 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 23/28] cxl/acpi: Do not add DSDT disabled ACPI0016 host bridge ports Dan Williams
2021-09-02 18:30 ` Jonathan Cameron
2021-09-03 17:51 ` Dan Williams
2021-08-24 16:07 ` [PATCH v3 24/28] tools/testing/cxl: Introduce a mocked-up CXL port hierarchy Dan Williams
2021-09-03 12:52 ` Jonathan Cameron
2021-09-03 21:49 ` Dan Williams
2021-09-06 8:32 ` Jonathan Cameron
2021-09-07 15:57 ` Dan Williams
2021-08-24 16:07 ` [PATCH v3 25/28] cxl/bus: Populate the target list at decoder create Dan Williams
2021-09-03 12:59 ` Jonathan Cameron
2021-09-03 22:43 ` Dan Williams
2021-09-06 8:52 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 26/28] cxl/mbox: Move command definitions to common location Dan Williams
2021-09-03 13:04 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 27/28] tools/testing/cxl: Introduce a mock memory device + driver Dan Williams
2021-09-03 13:21 ` Jonathan Cameron
2021-09-03 23:33 ` Dan Williams
2021-09-06 8:57 ` Jonathan Cameron
2021-08-24 16:07 ` [PATCH v3 28/28] cxl/core: Split decoder setup into alloc + add Dan Williams
2021-09-03 13:33 ` Jonathan Cameron
2021-09-03 16:26 ` Dan Williams
2021-09-03 18:01 ` Jonathan Cameron
2021-09-04 0:27 ` Dan Williams
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=20210902175559.00005da7@Huawei.com \
--to=jonathan.cameron@huawei.com \
--cc=alison.schofield@intel.com \
--cc=ben.widawsky@intel.com \
--cc=dan.j.williams@intel.com \
--cc=ira.weiny@intel.com \
--cc=linux-cxl@vger.kernel.org \
--cc=nvdimm@lists.linux.dev \
--cc=vishal.l.verma@intel.com \
/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;
as well as URLs for NNTP newsgroup(s).