[PATCH v3 11/20] tty/hvc: xen: Use xen page definition
Subsystems:
hypervisor virtual console driver , the rest , tty layer and serial drivers
3990d
REVIEWED: 1 (0M)
Revision v3 of 4 in this series; 1 review trailer.
3 messages,
2 authors,
2015-08-28 · open the first message on its own page
The console ring is always based on the page granularity of Xen.
Signed-off-by: Julien Grall <redacted>
Reviewed-by: Stefano Stabellini <redacted>
---
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Jiri Slaby <redacted>
Cc: David Vrabel <redacted>
Cc: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: linuxppc-dev@lists.ozlabs.org
Changes in v3:
- Some changes has been moved in the series "Use correctly the
Xen memory terminologies in Linux".
- Add Stefano's reviewed-by
---
drivers/tty/hvc/hvc_xen.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/tty/hvc/hvc_xen.c b/drivers/tty/hvc/hvc_xen.c
index 10beb15..0599d9d 100644
--- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c @@ -230,7 +230,7 @@ static int xen_hvm_console_init(void)
if ( r < 0 || v == 0 )
goto err ;
gfn = v ;
- info -> intf = xen_remap ( gfn << PAGE_SHIFT , PAGE_SIZE ); + info -> intf = xen_remap ( gfn << XEN_PAGE_SHIFT , PAGE_SIZE ); if ( info -> intf == NULL )
goto err ;
info -> vtermno = HVC_COOKIE ; @@ -472,7 +472,7 @@ static int xencons_resume(struct xenbus_device *dev)
struct xencons_info * info = dev_get_drvdata ( & dev -> dev );
xencons_disconnect_backend ( info );
- memset ( info -> intf , 0 , PAGE_SIZE ); + memset ( info -> intf , 0 , XEN_PAGE_SIZE ); return xencons_connect_backend ( dev , info );
}
--
2.1.4
On 07/08/15 17:46, Julien Grall wrote: The console ring is always based on the page granularity of Xen. [...] quoted hunk --- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c @@ -230,7 +230,7 @@ static int xen_hvm_console_init(void)
if ( r < 0 || v == 0 )
goto err ;
gfn = v ;
- info -> intf = xen_remap ( gfn << PAGE_SHIFT , PAGE_SIZE ); + info -> intf = xen_remap ( gfn << XEN_PAGE_SHIFT , PAGE_SIZE );
You need XEN_PAGE_SIZE here I think...
quoted hunk if (info->intf == NULL)
goto err;
info->vtermno = HVC_COOKIE; @@ -472,7 +472,7 @@ static int xencons_resume(struct xenbus_device *dev)
struct xencons_info *info = dev_get_drvdata(&dev->dev);
xencons_disconnect_backend(info);
- memset(info->intf, 0, PAGE_SIZE);+ memset(info->intf, 0, XEN_PAGE_SIZE);
...particularly since you use it here.
David
Hi David,
On 20/08/15 10:55, David Vrabel wrote: On 07/08/15 17:46, Julien Grall wrote: quoted The console ring is always based on the page granularity of Xen. [...] quoted --- a/drivers/tty/hvc/hvc_xen.c
+++ b/drivers/tty/hvc/hvc_xen.c @@ -230,7 +230,7 @@ static int xen_hvm_console_init(void)
if ( r < 0 || v == 0 )
goto err ;
gfn = v ;
- info -> intf = xen_remap ( gfn << PAGE_SHIFT , PAGE_SIZE ); + info -> intf = xen_remap ( gfn << XEN_PAGE_SHIFT , PAGE_SIZE );
You need XEN_PAGE_SIZE here I think...
Right, I did the mistake while rebase on my s/mfn/gfn/ series. I will
fix it in the next version.
Regards,
--
Julien Grall