From: "Martin J. Bligh" <Martin.Bligh@us.ibm.com>
To: Adrian Bunk <bunk@fs.tum.de>, Alan Cox <alan@redhat.com>,
johnstul@us.ibm.com
Cc: linux-kernel@vger.kernel.org
Subject: Re: Linux 2.4.20-rc4-ac1
Date: Thu, 28 Nov 2002 08:15:02 -0800 [thread overview]
Message-ID: <1568261310.1038471302@[10.10.2.3]> (raw)
In-Reply-To: <20021128130112.GB6981@fs.tum.de>
> Martin, could you please review whether the patch below which does the
> following is correct?
>
> - kill the last occurence of CLUSTERED_APIC_NUMAQ
> - only one definition of PCI_CONF1_ADDRESS is needed
> (#ifndef CONFIG_MULTIQUAD the BUS2LOCAL() has no effect)
> - fix an #endif comment
I'm confused at to what made this break recently .... what release
did this break on? Either it was something very recent, everyone
else is asleep, or you're doing something wierd (like compling with
MULTIQUAD on?)
CLUSTERED_APIC_NUMAQ is a part of the Summit patch introduction,
where John (cc'ed) splits clustered_apic_mode from a boolean into
a switch (in 2.4 ... I did 2.5 differently). Maybe we merged half
of a summit patch somehow, and didn't get the define?
Yeah, I have no idea why I redefined PCI_CONF1_ADDRESS (you're
correct, BUS2LOCAL is a no-op) ... That part of the patch is fine.
M.
> --- linux-2.4.19-full-ac/arch/i386/kernel/pci-pc.c.old 2002-11-28 12:51:01.000000000 +0100
> +++ linux-2.4.19-full-ac/arch/i386/kernel/pci-pc.c 2002-11-28 13:49:50.000000000 +0100
> @@ -51,10 +51,10 @@
>
> #ifdef CONFIG_PCI_DIRECT
>
> -#ifdef CONFIG_MULTIQUAD
> #define PCI_CONF1_ADDRESS(bus, dev, fn, reg) \
> (0x80000000 | (BUS2LOCAL(bus) << 16) | (dev << 11) | (fn << 8) | (reg & ~3))
>
> +#ifdef CONFIG_MULTIQUAD
> static int pci_conf1_mq_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value) /* CONFIG_MULTIQUAD */
> {
> unsigned long flags;
> @@ -173,9 +173,7 @@
> pci_conf1_write_mq_config_dword
> };
>
> -#endif /* !CONFIG_MULTIQUAD */
> -#define PCI_CONF1_ADDRESS(bus, dev, fn, reg) \
> - (0x80000000 | (bus << 16) | (dev << 11) | (fn << 8) | (reg & ~3))
> +#endif /* CONFIG_MULTIQUAD */
>
> static int pci_conf1_read (int seg, int bus, int dev, int fn, int reg, int len, u32 *value) /* !CONFIG_MULTIQUAD */
> {
> @@ -478,7 +476,7 @@
>
> #ifdef CONFIG_MULTIQUAD
> /* Multi-Quad has an extended PCI Conf1 */
> - if(clustered_apic_mode == CLUSTERED_APIC_NUMAQ)
> + if(clustered_apic_logical)
> return &pci_direct_mq_conf1;
> #endif
> return &pci_direct_conf1;
>
>
next prev parent reply other threads:[~2002-11-28 16:13 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2002-11-26 19:01 Alan Cox
2002-11-28 0:21 ` Adrian Bunk
2002-11-28 13:01 ` Adrian Bunk
2002-11-28 16:15 ` Martin J. Bligh [this message]
2002-11-29 16:16 ` Adrian Bunk
2002-11-28 13:43 ` Adrian Bunk
2002-11-28 14:05 ` Francois Romieu
2002-11-28 20:52 ` Francois Romieu
2002-11-29 17:01 Margit Schubert-While
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='1568261310.1038471302@[10.10.2.3]' \
--to=martin.bligh@us.ibm.com \
--cc=alan@redhat.com \
--cc=bunk@fs.tum.de \
--cc=johnstul@us.ibm.com \
--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 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®