From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Ingo Molnar <mingo@elte•hu>
Cc: linux-next@vger•kernel.org,
Robert Richter <robert.richter@amd•com>,
Cyrill Gorcunov <gorcunov@gmail•com>,
Thomas Gleixner <tglx@linutronix•de>,
"H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the oprofile tree
Date: Mon, 25 Aug 2008 19:08:22 +1000 [thread overview]
Message-ID: <20080825190822.591685e5.sfr@canb.auug.org.au> (raw)
Hi Ingo,
Today's linux-next merge of the oprofile tree got a conflict in
arch/x86/kernel/apic_32.c between commit
274cfe5912eebe9d4e1a4c451fe617289a181fcf ("x86: apic - rearrange
functions and comments") from the x86 tree and commits
286f571837ba9d67625afd015366d79345abb414 ("x86: apic_*.c: add description
to AMD's extended LVT functions"),
09691616850b3614dfb44790e1e1419b6a7f5d13 ("x86: apic: export symbols for
extended interrupt LVT functions") and
6aa360e6c16c145edf1837690e0f7aaea6b86ef3 ("x86: apic: changing export
symbols to *_GPL") from the oprofile tree.
The former moved some code that was updated by the latter. I fixed it up
(see below) and can carry it.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc arch/x86/kernel/apic_32.c
index a91c57c,0ff576d..0000000
--- a/arch/x86/kernel/apic_32.c
+++ b/arch/x86/kernel/apic_32.c
@@@ -291,36 -241,6 +291,40 @@@ static void __setup_APIC_LVTT(unsigned
}
/*
+ * Setup extended LVT, AMD specific (K8, family 10h)
+ *
+ * Vector mappings are hard coded. On K8 only offset 0 (APIC500) and
+ * MCE interrupts are supported. Thus MCE offset must be set to 0.
++ *
++ * If mask=1, the LVT entry does not generate interrupts while mask=0
++ * enables the vector. See also the BKDGs.
+ */
+
+#define APIC_EILVT_LVTOFF_MCE 0
+#define APIC_EILVT_LVTOFF_IBS 1
+
+static void setup_APIC_eilvt(u8 lvt_off, u8 vector, u8 msg_type, u8 mask)
+{
+ unsigned long reg = (lvt_off << 4) + APIC_EILVT0;
+ unsigned int v = (mask << 16) | (msg_type << 8) | vector;
+
+ apic_write(reg, v);
+}
+
+u8 setup_APIC_eilvt_mce(u8 vector, u8 msg_type, u8 mask)
+{
+ setup_APIC_eilvt(APIC_EILVT_LVTOFF_MCE, vector, msg_type, mask);
+ return APIC_EILVT_LVTOFF_MCE;
+}
+
+u8 setup_APIC_eilvt_ibs(u8 vector, u8 msg_type, u8 mask)
+{
+ setup_APIC_eilvt(APIC_EILVT_LVTOFF_IBS, vector, msg_type, mask);
+ return APIC_EILVT_LVTOFF_IBS;
+}
++EXPORT_SYMBOL_GPL(setup_APIC_eilvt_ibs);
+
+/*
* Program the next event, relative to now
*/
static int lapic_next_event(unsigned long delta,
next reply other threads:[~2008-08-25 9:08 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-25 9:08 Stephen Rothwell [this message]
2008-08-25 9:13 ` linux-next: manual merge of the oprofile tree Ingo Molnar
2008-08-25 9:32 ` Robert Richter
2008-08-25 14:34 ` Cyrill Gorcunov
-- strict thread matches above, loose matches on Subject: below --
2008-09-13 0:06 Stephen Rothwell
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=20080825190822.591685e5.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=gorcunov@gmail$(echo .)com \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=robert.richter@amd$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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