All of lore.kernel.org
 help / color / mirror / Atom feed
From: "H. J. Lu" <hjl@lucon.org>
To: linux ia64 kernel <linux-ia64@vger.kernel.org>
Cc: linux kernel <linux-kernel@vger.kernel.org>
Subject: PATCH: Fix 2.6 kernel for the new ia64 assembler
Date: Fri, 07 Oct 2005 18:01:19 +0000	[thread overview]
Message-ID: <20051007180119.GA11645@lucon.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

The new ia64 assembler uses slot 1 for the offset of a long (2-slot)
instruction and the old assembler uses slot 2. The 2.6 kernel assumes
slot 2 and won't boot when the new assembler is used:

http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433

This patch will work with either slot 1 or 2.


H.J.

[-- Attachment #2: linux-2.6-ia64-slo1-1.patch --]
[-- Type: text/plain, Size: 1510 bytes --]

--- linux/arch/ia64/kernel/patch.c.slot	2004-10-18 14:54:39.000000000 -0700
+++ linux/arch/ia64/kernel/patch.c	2005-10-07 09:23:04.000000000 -0700
@@ -64,22 +64,30 @@ ia64_patch (u64 insn_addr, u64 mask, u64
 void
 ia64_patch_imm64 (u64 insn_addr, u64 val)
 {
-	ia64_patch(insn_addr,
+	/* The assembler may generate offset pointing to either slot 1
+	   or slot 2 for a long (2-slot) instruction, occupying slots 1
+	   and 2.  */
+  	insn_addr &= -16UL;
+	ia64_patch(insn_addr + 2,
 		   0x01fffefe000UL, (  ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */
 				     | ((val & 0x0000000000200000UL) <<  0) /* bit 21 -> 21 */
 				     | ((val & 0x00000000001f0000UL) <<  6) /* bit 16 -> 22 */
 				     | ((val & 0x000000000000ff80UL) << 20) /* bit  7 -> 27 */
 				     | ((val & 0x000000000000007fUL) << 13) /* bit  0 -> 13 */));
-	ia64_patch(insn_addr - 1, 0x1ffffffffffUL, val >> 22);
+	ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22);
 }
 
 void
 ia64_patch_imm60 (u64 insn_addr, u64 val)
 {
-	ia64_patch(insn_addr,
+	/* The assembler may generate offset pointing to either slot 1
+	   or slot 2 for a long (2-slot) instruction, occupying slots 1
+	   and 2.  */
+  	insn_addr &= -16UL;
+	ia64_patch(insn_addr + 2,
 		   0x011ffffe000UL, (  ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */
 				     | ((val & 0x00000000000fffffUL) << 13) /* bit  0 -> 13 */));
-	ia64_patch(insn_addr - 1, 0x1fffffffffcUL, val >> 18);
+	ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18);
 }
 
 /*

WARNING: multiple messages have this Message-ID (diff)
From: "H. J. Lu" <hjl@lucon.org>
To: linux ia64 kernel <linux-ia64@vger.kernel.org>
Cc: linux kernel <linux-kernel@vger.kernel.org>
Subject: PATCH: Fix 2.6 kernel for the new ia64 assembler
Date: Fri, 7 Oct 2005 11:01:19 -0700	[thread overview]
Message-ID: <20051007180119.GA11645@lucon.org> (raw)

[-- Attachment #1: Type: text/plain, Size: 304 bytes --]

The new ia64 assembler uses slot 1 for the offset of a long (2-slot)
instruction and the old assembler uses slot 2. The 2.6 kernel assumes
slot 2 and won't boot when the new assembler is used:

http://sources.redhat.com/bugzilla/show_bug.cgi?id=1433

This patch will work with either slot 1 or 2.


H.J.

[-- Attachment #2: linux-2.6-ia64-slo1-1.patch --]
[-- Type: text/plain, Size: 1510 bytes --]

--- linux/arch/ia64/kernel/patch.c.slot	2004-10-18 14:54:39.000000000 -0700
+++ linux/arch/ia64/kernel/patch.c	2005-10-07 09:23:04.000000000 -0700
@@ -64,22 +64,30 @@ ia64_patch (u64 insn_addr, u64 mask, u64
 void
 ia64_patch_imm64 (u64 insn_addr, u64 val)
 {
-	ia64_patch(insn_addr,
+	/* The assembler may generate offset pointing to either slot 1
+	   or slot 2 for a long (2-slot) instruction, occupying slots 1
+	   and 2.  */
+  	insn_addr &= -16UL;
+	ia64_patch(insn_addr + 2,
 		   0x01fffefe000UL, (  ((val & 0x8000000000000000UL) >> 27) /* bit 63 -> 36 */
 				     | ((val & 0x0000000000200000UL) <<  0) /* bit 21 -> 21 */
 				     | ((val & 0x00000000001f0000UL) <<  6) /* bit 16 -> 22 */
 				     | ((val & 0x000000000000ff80UL) << 20) /* bit  7 -> 27 */
 				     | ((val & 0x000000000000007fUL) << 13) /* bit  0 -> 13 */));
-	ia64_patch(insn_addr - 1, 0x1ffffffffffUL, val >> 22);
+	ia64_patch(insn_addr + 1, 0x1ffffffffffUL, val >> 22);
 }
 
 void
 ia64_patch_imm60 (u64 insn_addr, u64 val)
 {
-	ia64_patch(insn_addr,
+	/* The assembler may generate offset pointing to either slot 1
+	   or slot 2 for a long (2-slot) instruction, occupying slots 1
+	   and 2.  */
+  	insn_addr &= -16UL;
+	ia64_patch(insn_addr + 2,
 		   0x011ffffe000UL, (  ((val & 0x0800000000000000UL) >> 23) /* bit 59 -> 36 */
 				     | ((val & 0x00000000000fffffUL) << 13) /* bit  0 -> 13 */));
-	ia64_patch(insn_addr - 1, 0x1fffffffffcUL, val >> 18);
+	ia64_patch(insn_addr + 1, 0x1fffffffffcUL, val >> 18);
 }
 
 /*

             reply	other threads:[~2005-10-07 18:01 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-10-07 18:01 H. J. Lu [this message]
2005-10-07 18:01 ` PATCH: Fix 2.6 kernel for the new ia64 assembler H. J. Lu
2005-10-07 18:05 ` David Mosberger-Tang
2005-10-07 18:05   ` David Mosberger-Tang
2005-10-07 18:19 ` James E Wilson
2005-10-07 19:27 ` Magenheimer, Dan (HP Labs Fort Collins)
2005-10-07 19:56 ` James E Wilson

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=20051007180119.GA11645@lucon.org \
    --to=hjl@lucon.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.