| Message ID | 1485436562-7312-3-git-send-email-edgar.iglesias@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Edgar, On 26/01/17 13:16, Edgar E. Iglesias wrote: > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. I would add a word explain why it is reverted. Something like: "The default attribute mapping for MMIO as been relaxed and now rely on the hardware domain to set the correct memory attribute". Also, your signed-off is missing. Cheers,
On Tue, Jan 31, 2017 at 04:35:09PM +0000, Julien Grall wrote: > Hi Edgar, > > On 26/01/17 13:16, Edgar E. Iglesias wrote: > >From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > >This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. > > I would add a word explain why it is reverted. Something like: "The default > attribute mapping for MMIO as been relaxed and now rely on the hardware > domain to set the correct memory attribute". > > Also, your signed-off is missing. Thanks Julien, I've fixed this and will send out a v3 shortly. Best regards, Edgar > > Cheers, > > -- > Julien Grall
On Tue, 31 Jan 2017, Julien Grall wrote: > Hi Edgar, > > On 26/01/17 13:16, Edgar E. Iglesias wrote: > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > > This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. > > I would add a word explain why it is reverted. Something like: "The default > attribute mapping for MMIO as been relaxed and now rely on the hardware domain > to set the correct memory attribute". > > Also, your signed-off is missing. Assuming Edgar is OK with this, I fixed it up and committed. Edgar, please let me know if it's a problem.
On Tue, Jan 31, 2017 at 02:18:40PM -0800, Stefano Stabellini wrote: > On Tue, 31 Jan 2017, Julien Grall wrote: > > Hi Edgar, > > > > On 26/01/17 13:16, Edgar E. Iglesias wrote: > > > From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> > > > > > > This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. > > > > I would add a word explain why it is reverted. Something like: "The default > > attribute mapping for MMIO as been relaxed and now rely on the hardware domain > > to set the correct memory attribute". > > > > Also, your signed-off is missing. > > Assuming Edgar is OK with this, I fixed it up and committed. Edgar, > please let me know if it's a problem. Ah, thanks! Our emails crossed paths as I submitted v3 :-) Feel free to keep the commited version and ignore v3. Best regards, Edgar
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 4fc467c..c97a1f5 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -48,20 +48,6 @@ struct map_range_data p2m_type_t p2mt; }; -static const struct dt_device_match dev_map_attrs[] __initconst = -{ - { - __DT_MATCH_COMPATIBLE("mmio-sram"), - __DT_MATCH_PROP("no-memory-wc"), - .data = (void *) (uintptr_t) p2m_mmio_direct_dev, - }, - { - __DT_MATCH_COMPATIBLE("mmio-sram"), - .data = (void *) (uintptr_t) p2m_mmio_direct_nc, - }, - { /* sentinel */ }, -}; - //#define DEBUG_11_ALLOCATION #ifdef DEBUG_11_ALLOCATION # define D11PRINT(fmt, args...) printk(XENLOG_DEBUG fmt, ##args) @@ -1170,21 +1156,6 @@ static int handle_device(struct domain *d, struct dt_device_node *dev, return 0; } -static p2m_type_t lookup_map_attr(struct dt_device_node *node, - p2m_type_t parent_p2mt) -{ - const struct dt_device_match *r; - - /* Search and if nothing matches, use the parent's attributes. */ - r = dt_match_node(dev_map_attrs, node); - - /* - * If this node does not dictate specific mapping attributes, - * it inherits its parent's attributes. - */ - return r ? (uintptr_t) r->data : parent_p2mt; -} - static int handle_node(struct domain *d, struct kernel_info *kinfo, struct dt_device_node *node, p2m_type_t p2mt) @@ -1275,7 +1246,6 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, "WARNING: Path %s is reserved, skip the node as we may re-use the path.\n", path); - p2mt = lookup_map_attr(node, p2mt); res = handle_device(d, node, p2mt); if ( res) return res;
From: "Edgar E. Iglesias" <edgar.iglesias@xilinx.com> This reverts commit 1e75ed8b64bc1a9b47e540e6f100f17ec6d97f1b. --- xen/arch/arm/domain_build.c | 30 ------------------------------ 1 file changed, 30 deletions(-)