From: David Miller <davem@davemloft.net>
To: khalid.aziz@oracle.com
Cc: bob.picco@oracle.com, akpm@linux-foundation.org,
kirill.shutemov@linux.intel.com, sam@ravnborg.org,
rickard_strandqvist@spectrumdigital.se, allen.pais@oracle.com,
sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH Resend] sparc64: Resolve conflict between sparc v9 and M7 on usage of bit 9 of TTE
Date: Wed, 13 May 2015 23:45:17 -0400 (EDT) [thread overview]
Message-ID: <20150513.234517.834150584495147194.davem@davemloft.net> (raw)
In-Reply-To: <1430173189-12135-1-git-send-email-khalid.aziz@oracle.com>
From: Khalid Aziz <khalid.aziz@oracle.com>
Date: Mon, 27 Apr 2015 16:19:49 -0600
> @@ -342,9 +356,15 @@ static inline pgprot_t pgprot_noncached(pgprot_t prot)
> " andn %0, %4, %0\n"
> " or %0, %5, %0\n"
> " .previous\n"
> + " .section .sun_m7_2insn_patch, \"ax\"\n"
> + " .word 661b\n"
> + " andn %0, %6, %0\n"
> + " or %0, %5, %0\n"
> + " .previous\n"
> : "=r" (val)
> : "0" (val), "i" (_PAGE_CP_4U | _PAGE_CV_4U), "i" (_PAGE_E_4U),
> - "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V));
> + "i" (_PAGE_CP_4V | _PAGE_CV_4V), "i" (_PAGE_E_4V),
> + "i" (_PAGE_CP_4V));
Please don't change the indentation of the "i" arguments.
> @@ -2446,18 +2471,35 @@ static void __init sun4u_pgprot_init(void)
> static void __init sun4v_pgprot_init(void)
> {
> unsigned long page_none, page_shared, page_copy, page_readonly;
> - unsigned long page_exec_bit;
> + unsigned long page_exec_bit, page_cache4v_flag;
> int i;
...
> + switch (sun4v_chip_type) {
> + case SUN4V_CHIP_SPARC_M7:
> + page_cache4v_flag = _PAGE_CP_4V;
> + break;
> + default:
> + page_cache4v_flag = _PAGE_CACHE_4V;
> + break;
> + }
Ok you've computed what cacheability bits to use in page_cache4v_flag.
> - kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |
> + switch (sun4v_chip_type) {
> + case SUN4V_CHIP_SPARC_M7:
> + kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_P_4V |
> + _PAGE_W_4V);
> + break;
> + default:
> + kern_linear_pte_xor[0] |= (_PAGE_CP_4V | _PAGE_CV_4V |
> _PAGE_P_4V | _PAGE_W_4V);
> + break;
> + }
>
Then needlessly compute this all over again, just use the
value you have already in page_cache4v_flag.
> @@ -2541,9 +2591,18 @@ static unsigned long kern_large_tte(unsigned long paddr)
> _PAGE_CP_4U | _PAGE_CV_4U | _PAGE_P_4U |
> _PAGE_EXEC_4U | _PAGE_L_4U | _PAGE_W_4U);
> if (tlb_type == hypervisor)
> - val = (_PAGE_VALID | _PAGE_SZ4MB_4V |
> - _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_P_4V |
> - _PAGE_EXEC_4V | _PAGE_W_4V);
> + switch (sun4v_chip_type) {
> + case SUN4V_CHIP_SPARC_M7:
> + val = (_PAGE_VALID | _PAGE_SZ4MB_4V |
> + _PAGE_CP_4V | _PAGE_P_4V |
> + _PAGE_EXEC_4V | _PAGE_W_4V);
> + break;
> + default:
> + val = (_PAGE_VALID | _PAGE_SZ4MB_4V |
> + _PAGE_CP_4V | _PAGE_CV_4V | _PAGE_P_4V |
> + _PAGE_EXEC_4V | _PAGE_W_4V);
> + break;
> + }
Although in another function, we seem to compute it here yet again.
Perhaps early on put this into a "static unsigned long
page_cache4v_flag" and just use that everywhere.
If you do it early enough in paging_init() you should be fine.
next prev parent reply other threads:[~2015-05-14 3:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-27 22:19 Khalid Aziz
2015-05-14 3:45 ` David Miller [this message]
2015-05-14 13:47 ` Khalid Aziz
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=20150513.234517.834150584495147194.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=akpm@linux-foundation.org \
--cc=allen.pais@oracle.com \
--cc=bob.picco@oracle.com \
--cc=khalid.aziz@oracle.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rickard_strandqvist@spectrumdigital.se \
--cc=sam@ravnborg.org \
--cc=sparclinux@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®