From: Diana Craciun <diana.craciun@oss.nxp.com>
To: linux-kernel@vger.kernel.org, laurentiu.tudor@nxp.com
Cc: stuyoder@gmail.com, gregkh@linuxfoundation.org,
leoyang.li@nxp.com, bharatb.linux@gmail.com,
Diana Craciun <diana.craciun@oss.nxp.com>,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH v4 04/13] bus/fsl-mc: Set the QMAN/BMAN region flags
Date: Wed, 26 Aug 2020 12:25:18 +0300 [thread overview]
Message-ID: <20200826092527.4992-5-diana.craciun@oss.nxp.com> (raw)
In-Reply-To: <20200826092527.4992-1-diana.craciun@oss.nxp.com>
The QMAN region is memory mapped, so it should be of type
IORESOURCE_MEM. The region flags bits were wrongly used to
pass additional information. Use the bus specific bits for
this purpose.
Signed-off-by: Diana Craciun <diana.craciun@oss.nxp.com>
---
drivers/bus/fsl-mc/fsl-mc-bus.c | 7 ++-----
drivers/bus/fsl-mc/fsl-mc-private.h | 6 ------
include/linux/fsl/mc.h | 8 ++++++++
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/drivers/bus/fsl-mc/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c
index 9a884936e53e..1bb70a92167e 100644
--- a/drivers/bus/fsl-mc/fsl-mc-bus.c
+++ b/drivers/bus/fsl-mc/fsl-mc-bus.c
@@ -615,11 +615,8 @@ static int fsl_mc_device_get_mmio_regions(struct fsl_mc_device *mc_dev,
regions[i].end = regions[i].start + region_desc.size - 1;
regions[i].name = "fsl-mc object MMIO region";
- regions[i].flags = IORESOURCE_IO;
- if (region_desc.flags & DPRC_REGION_CACHEABLE)
- regions[i].flags |= IORESOURCE_CACHEABLE;
- if (region_desc.flags & DPRC_REGION_SHAREABLE)
- regions[i].flags |= IORESOURCE_MEM;
+ regions[i].flags = region_desc.flags & IORESOURCE_BITS;
+ regions[i].flags |= IORESOURCE_MEM;
}
mc_dev->regions = regions;
diff --git a/drivers/bus/fsl-mc/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h
index 7a46a12eb747..9f200731b274 100644
--- a/drivers/bus/fsl-mc/fsl-mc-private.h
+++ b/drivers/bus/fsl-mc/fsl-mc-private.h
@@ -358,12 +358,6 @@ int dprc_set_obj_irq(struct fsl_mc_io *mc_io,
int obj_id,
u8 irq_index,
struct dprc_irq_cfg *irq_cfg);
-
-/* Region flags */
-/* Cacheable - Indicates that region should be mapped as cacheable */
-#define DPRC_REGION_CACHEABLE 0x00000001
-#define DPRC_REGION_SHAREABLE 0x00000002
-
/**
* enum dprc_region_type - Region type
* @DPRC_REGION_TYPE_MC_PORTAL: MC portal region
diff --git a/include/linux/fsl/mc.h b/include/linux/fsl/mc.h
index 3b5f0c98636d..03a5d16dde73 100644
--- a/include/linux/fsl/mc.h
+++ b/include/linux/fsl/mc.h
@@ -3,6 +3,7 @@
* Freescale Management Complex (MC) bus public interface
*
* Copyright (C) 2014-2016 Freescale Semiconductor, Inc.
+ * Copyright 2019-2020 NXP
* Author: German Rivera <German.Rivera@freescale.com>
*
*/
@@ -148,6 +149,13 @@ struct fsl_mc_obj_desc {
*/
#define FSL_MC_IS_DPRC 0x0001
+/* Region flags */
+/* Indicates that region can be mapped as cacheable */
+#define FSL_MC_REGION_CACHEABLE 0x00000001
+
+/* Indicates that region can be mapped as shareable */
+#define FSL_MC_REGION_SHAREABLE 0x00000002
+
/**
* struct fsl_mc_device - MC object device object
* @dev: Linux driver model device object
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-08-26 9:27 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-26 9:25 [PATCH v4 00/13] bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support Diana Craciun
2020-08-26 9:25 ` [PATCH v4 01/13] bus/fsl-mc: Do no longer export the total number of irqs outside dprc_scan_objects Diana Craciun
2020-08-26 9:25 ` [PATCH v4 02/13] bus/fsl-mc: Add a new parameter to dprc_scan_objects function Diana Craciun
2020-08-26 9:25 ` [PATCH v4 03/13] bus/fsl-mc: add support for 'driver_override' in the mc-bus Diana Craciun
2020-08-26 9:25 ` Diana Craciun [this message]
2020-08-26 9:25 ` [PATCH v4 05/13] bus/fsl-mc: Cache the DPRC API version Diana Craciun
2020-08-26 9:25 ` [PATCH v4 06/13] bus/fsl-mc: Add dprc-reset-container support Diana Craciun
2020-08-26 9:25 ` [PATCH v4 07/13] bus/fsl-mc: Export dprc_scan/dprc_remove functions to be used by multiple entities Diana Craciun
2020-08-26 9:25 ` [PATCH v4 08/13] bus/fsl-mc: Export a cleanup function for DPRC Diana Craciun
2020-08-26 9:25 ` [PATCH v4 09/13] bus/fsl-mc: Add a container setup function Diana Craciun
2020-08-26 9:25 ` [PATCH v4 10/13] bus/fsl_mc: Do not rely on caller to provide non NULL mc_io Diana Craciun
2020-08-26 9:25 ` [PATCH v4 11/13] bus/fsl-mc: Export IRQ pool handling functions to be used by VFIO Diana Craciun
2020-08-26 9:25 ` [PATCH v4 12/13] bus/fsl-mc: Extend ICID size from 16bit to 32bit Diana Craciun
2020-08-26 9:25 ` [PATCH v4 13/13] bus/fsl-mc: Add a new version for dprc_get_obj_region command Diana Craciun
2020-09-11 14:33 ` [PATCH v4 00/13] bus/fsl-mc: Extend mc-bus driver functionalities in preparation for mc-bus VFIO support Laurentiu Tudor
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=20200826092527.4992-5-diana.craciun@oss.nxp.com \
--to=diana.craciun@oss.nxp.com \
--cc=bharatb.linux@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=laurentiu.tudor@nxp.com \
--cc=leoyang.li@nxp.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stuyoder@gmail.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).