From: Bjorn Helgaas <helgaas@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
x86@kernel.org, Peter Anvin <hpa@zytor.com>,
Borislav Petkov <bp@alien8.de>,
Peter Zijlstra <peterz@infradead.org>,
Stephane Eranian <eranian@google.com>,
Andi Kleen <ak@linux.intel.com>,
linux-pci@vger.kernel.org
Subject: Re: [patch 2/7] x86/pci: Abort if legacy init fails
Date: Tue, 27 Jun 2017 15:59:53 -0500 [thread overview]
Message-ID: <20170627205952.GC764@bhelgaas-glaptop.roam.corp.google.com> (raw)
In-Reply-To: <20170316215057.047576516@linutronix.de>
[+cc linux-pci]
s|x86/pci: |x86/PCI: | for these three, to follow previous convention.
On Thu, Mar 16, 2017 at 10:50:04PM +0100, Thomas Gleixner wrote:
> If the legacy pci init fails, then there are no pci config space accesors
> available, but the code continues and tries to scan the busses, which fails
> due to the lack of config space accessors.
s/pci/PCI/ above.
> Return right away, if the last init fallback fails.
>
> Switch the few printks to pr_info while at it.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> ---
> arch/x86/pci/legacy.c | 18 ++++++++++--------
> 1 file changed, 10 insertions(+), 8 deletions(-)
>
> --- a/arch/x86/pci/legacy.c
> +++ b/arch/x86/pci/legacy.c
> @@ -24,12 +24,10 @@ static void pcibios_fixup_peer_bridges(v
>
> int __init pci_legacy_init(void)
> {
> - if (!raw_pci_ops) {
> - printk("PCI: System does not support PCI\n");
> - return 0;
> - }
> + if (!raw_pci_ops)
> + return 1;
>
> - printk("PCI: Probing PCI hardware\n");
> + pr_info("PCI: Probing PCI hardware\n");
> pcibios_scan_root(0);
> return 0;
> }
> @@ -46,7 +44,7 @@ void pcibios_scan_specific_bus(int busn)
> if (!raw_pci_read(0, busn, devfn, PCI_VENDOR_ID, 2, &l) &&
> l != 0x0000 && l != 0xffff) {
> DBG("Found device at %02x:%02x [%04x]\n", busn, devfn, l);
> - printk(KERN_INFO "PCI: Discovered peer bus %02x\n", busn);
> + pr_info("PCI: Discovered peer bus %02x\n", busn);
> pcibios_scan_root(busn);
> return;
> }
> @@ -60,8 +58,12 @@ static int __init pci_subsys_init(void)
> * The init function returns an non zero value when
> * pci_legacy_init should be invoked.
> */
> - if (x86_init.pci.init())
> - pci_legacy_init();
> + if (x86_init.pci.init()) {
> + if (pci_legacy_init()) {
> + pr_info("PCI: System does not support PCI\n");
> + return -ENODEV;
> + }
> + }
>
> pcibios_fixup_peer_bridges();
> x86_init.pci.init_irq();
>
>
next prev parent reply other threads:[~2017-06-27 21:00 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-16 21:50 [patch 0/7] x86/pci: Switch to lockless ECAM configuration mode Thomas Gleixner
2017-03-16 21:50 ` [patch 1/7] x86/pci: Remove duplicate defines Thomas Gleixner
2017-06-27 20:57 ` Bjorn Helgaas
2017-06-28 20:43 ` [tip:x86/platform] x86/PCI: " tip-bot for Thomas Gleixner
2017-03-16 21:50 ` [patch 2/7] x86/pci: Abort if legacy init fails Thomas Gleixner
2017-06-27 20:59 ` Bjorn Helgaas [this message]
2017-06-28 20:44 ` [tip:x86/platform] x86/PCI: " tip-bot for Thomas Gleixner
2017-03-16 21:50 ` [patch 3/7] x86/pci/ce4100: Properly lock accessor functions Thomas Gleixner
2017-03-17 0:28 ` Andi Kleen
2017-06-27 21:00 ` Bjorn Helgaas
2017-06-28 20:44 ` [tip:x86/platform] x86/PCI/ce4100: " tip-bot for Thomas Gleixner
2017-03-16 21:50 ` [patch 4/7] PCI: Provide Kconfig option for lockless config space accessors Thomas Gleixner
2017-06-27 21:11 ` Bjorn Helgaas
2017-06-28 20:31 ` Thomas Gleixner
2017-06-28 20:45 ` [tip:x86/platform] " tip-bot for Thomas Gleixner
2017-03-16 21:50 ` [patch 5/7] x86/pci: Select CONFIG_PCI_LOCKLESS_CONFIG Thomas Gleixner
2017-06-28 20:45 ` [tip:x86/platform] x86/PCI: " tip-bot for Thomas Gleixner
2017-03-16 21:50 ` [patch 6/7] x86/pci/mmcfg: Include 32/64 bit code into shared code Thomas Gleixner
2017-03-17 0:25 ` Andi Kleen
2017-03-17 8:41 ` Thomas Gleixner
2017-03-16 21:50 ` [patch 7/7] x86/pci/mmcfg: Switch to ECAM config mode if possible Thomas Gleixner
2017-03-17 0:26 ` Andi Kleen
2017-03-17 6:15 ` Thomas Gleixner
2017-06-27 21:31 ` Bjorn Helgaas
2017-06-28 20:46 ` [tip:x86/platform] x86/PCI/mmcfg: " tip-bot for Thomas Gleixner
2017-06-29 6:45 ` tip-bot for Thomas Gleixner
2017-06-29 23:26 ` Yinghai Lu
2017-06-30 3:18 ` Andi Kleen
2017-06-30 14:30 ` Thomas Gleixner
2017-06-30 17:16 ` Linus Torvalds
2017-06-30 18:30 ` Ivan Kokshaysky
2017-06-30 18:46 ` Thomas Gleixner
2017-06-13 0:25 ` [patch 0/7] x86/pci: Switch to lockless ECAM configuration mode Andi Kleen
2017-06-21 22:28 ` Thomas Gleixner
2017-06-27 20:55 ` Bjorn Helgaas
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=20170627205952.GC764@bhelgaas-glaptop.roam.corp.google.com \
--to=helgaas@kernel.org \
--cc=ak@linux.intel.com \
--cc=bp@alien8.de \
--cc=eranian@google.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=tglx@linutronix.de \
--cc=x86@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®