linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yinghai Lu <yinghai@kernel.org>
To: Jesse Barnes <jbarnes@virtuousgeek.org>
Cc: Ram Pai <linuxram@us.ibm.com>,
	"Cc: Dominik Brodowski" <linux@dominikbrodowski.net>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
	Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 1/7] PCI: Disable cardbus bridge MEM1 pref CTL
Date: Wed,  1 Feb 2012 14:42:44 -0800	[thread overview]
Message-ID: <1328136170-17613-2-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1328136170-17613-1-git-send-email-yinghai@kernel.org>

Some BIOS enable both pref for MEM0 and MEM1.

but we assume MEM1 is non-pref...

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
 drivers/pci/setup-bus.c |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c
index 090217a..d5897c3 100644
--- a/drivers/pci/setup-bus.c
+++ b/drivers/pci/setup-bus.c
@@ -914,6 +914,14 @@ static void pci_bus_size_cardbus(struct pci_bus *bus,
 	if (realloc_head)
 		add_to_list(realloc_head, bridge, b_res+1, pci_cardbus_io_size, 0 /* dont care */);
 
+	/* MEM1 must not be pref mmio */
+	pci_read_config_word(bridge, PCI_CB_BRIDGE_CONTROL, &ctrl);
+	if (ctrl & PCI_CB_BRIDGE_CTL_PREFETCH_MEM1) {
+		ctrl &= ~PCI_CB_BRIDGE_CTL_PREFETCH_MEM1;
+		pci_write_config_word(bridge, PCI_CB_BRIDGE_CONTROL, ctrl);
+		pci_read_config_word(bridge, PCI_CB_BRIDGE_CONTROL, &ctrl);
+	}
+
 	/*
 	 * Check whether prefetchable memory is supported
 	 * by this bridge.
-- 
1.7.7


  reply	other threads:[~2012-02-01 22:43 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-02-01 22:42 [PATCH 0/7] PCI : bridge resource reallocation patchset -- followup Yinghai Lu
2012-02-01 22:42 ` Yinghai Lu [this message]
2012-02-01 22:42 ` [PATCH 2/7] PCI: Fix cardbus bridge resources as optional size handling Yinghai Lu
2012-02-01 22:42 ` [PATCH 3/7] PCI: Skip reset cardbus assigned resource during pci bus rescan Yinghai Lu
2012-02-01 22:42 ` [PATCH 4/7] PCI: Retry on type IORESOURCE_IO allocation Yinghai Lu
2012-02-01 22:42 ` [PATCH 5/7] PCI: Make pci bridge reallocating enabled/disabled Yinghai Lu
2012-02-01 22:42 ` [PATCH 6/7] PCI: print out suggestion about using pci=realloc Yinghai Lu
2012-02-01 22:42 ` [PATCH 7/7] PCI: only enable pci realloc when SRIOV bar is not assigned Yinghai Lu
2012-02-10 23:33 [PATCH -v3 0/7] PCI : bridge resource reallocation patchset -- followup Yinghai Lu
2012-02-10 23:33 ` [PATCH 1/7] PCI: Disable cardbus bridge MEM1 pref CTL Yinghai Lu

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=1328136170-17613-2-git-send-email-yinghai@kernel.org \
    --to=yinghai@kernel.org \
    --cc=jbarnes@virtuousgeek.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=linux@dominikbrodowski.net \
    --cc=linuxram@us.ibm.com \
    --cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).