From: Florian Fainelli <ffainelli@freebox.fr>
To: tglx@linutronix.de
Cc: mingo@redhat.com, x86@kernel.org, rui.zhang@intel.com,
alan@linux.intel.com, linux-kernel@vger.kernel.org,
Florian Fainelli <ffainelli@freebox.fr>,
Maxime Bizon <mbizon@freebox.fr>
Subject: [PATCH 3/3 v3] x86: ce4100: fixup PCI configuration register access for devices without interrupts
Date: Mon, 29 Oct 2012 14:40:20 +0100 [thread overview]
Message-ID: <1351518020-25556-4-git-send-email-ffainelli@freebox.fr> (raw)
In-Reply-To: <1351518020-25556-1-git-send-email-ffainelli@freebox.fr>
From: Maxime Bizon <mbizon@freebox.fr>
Some CE4100 devices such as the:
- DFX module (01:0b.7)
- entertainment encryption device (01:10.0)
- multimedia controller (01:12.0)
do not have a device interrupt at all. This patch fixes the PCI controller
code to declare the missing PCI configuration register space, as well as a
fixup method for forcing the interrupt pin to be 0 for these devices. This is
required to ensure that pci drivers matching on these devices will be able to
honor the various PCI subsystem calls touching the configuration space.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Florian Fainelli <ffainelli@freebox.fr>
Acked-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
---
arch/x86/pci/ce4100.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/arch/x86/pci/ce4100.c b/arch/x86/pci/ce4100.c
index 41bd2a2..b914e20 100644
--- a/arch/x86/pci/ce4100.c
+++ b/arch/x86/pci/ce4100.c
@@ -115,6 +115,16 @@ static void sata_revid_read(struct sim_dev_reg *reg, u32 *value)
reg_read(reg, value);
}
+static void reg_noirq_read(struct sim_dev_reg *reg, u32 *value)
+{
+ unsigned long flags;
+
+ raw_spin_lock_irqsave(&pci_config_lock, flags);
+ /* force interrupt pin value to 0 */
+ *value = reg->sim_reg.value & 0xfff00ff;
+ raw_spin_unlock_irqrestore(&pci_config_lock, flags);
+}
+
static struct sim_dev_reg bus1_fixups[] = {
DEFINE_REG(2, 0, 0x10, (16*MB), reg_init, reg_read, reg_write)
DEFINE_REG(2, 0, 0x14, (256), reg_init, reg_read, reg_write)
@@ -144,6 +154,7 @@ static struct sim_dev_reg bus1_fixups[] = {
DEFINE_REG(11, 5, 0x10, (64*KB), reg_init, reg_read, reg_write)
DEFINE_REG(11, 6, 0x10, (256), reg_init, reg_read, reg_write)
DEFINE_REG(11, 7, 0x10, (64*KB), reg_init, reg_read, reg_write)
+ DEFINE_REG(11, 7, 0x3c, 256, reg_init, reg_noirq_read, reg_write)
DEFINE_REG(12, 0, 0x10, (128*KB), reg_init, reg_read, reg_write)
DEFINE_REG(12, 0, 0x14, (256), reg_init, reg_read, reg_write)
DEFINE_REG(12, 1, 0x10, (1024), reg_init, reg_read, reg_write)
@@ -161,8 +172,10 @@ static struct sim_dev_reg bus1_fixups[] = {
DEFINE_REG(16, 0, 0x10, (64*KB), reg_init, reg_read, reg_write)
DEFINE_REG(16, 0, 0x14, (64*MB), reg_init, reg_read, reg_write)
DEFINE_REG(16, 0, 0x18, (64*MB), reg_init, reg_read, reg_write)
+ DEFINE_REG(16, 0, 0x3c, 256, reg_init, reg_noirq_read, reg_write)
DEFINE_REG(17, 0, 0x10, (128*KB), reg_init, reg_read, reg_write)
DEFINE_REG(18, 0, 0x10, (1*KB), reg_init, reg_read, reg_write)
+ DEFINE_REG(18, 0, 0x3c, 256, reg_init, reg_noirq_read, reg_write)
};
static void __init init_sim_regs(void)
--
1.7.10.4
next prev parent reply other threads:[~2012-10-29 13:41 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-26 9:05 [PATCH 0/3] x86: ce4100 fixes and improvements Florian Fainelli
2012-10-26 9:05 ` [PATCH 1/3] x86: ce4100: implement pm_poweroff Florian Fainelli
2012-10-26 9:30 ` Ingo Molnar
2012-10-26 9:05 ` [PATCH 2/3] x86: ce4100: force reboot method to be KBD Florian Fainelli
2012-10-26 9:32 ` Ingo Molnar
2012-10-26 9:05 ` [PATCH 3/3] x86: ce4100: fixup PCI configuration register access for devices without interrupts Florian Fainelli
2012-10-26 11:30 ` [PATCH 0/3 v2] x86: ce4100 fixes and improvements Florian Fainelli
2012-10-26 11:30 ` [PATCH 1/3 v2] x86: ce4100: implement pm_poweroff Florian Fainelli
2012-10-26 11:30 ` [PATCH 2/3 v2] x86: ce4100: force reboot method to be KBD Florian Fainelli
2012-10-26 14:58 ` Ingo Molnar
2012-10-26 11:30 ` [PATCH 3/3] x86: ce4100: fixup PCI configuration register access for devices without interrupts Florian Fainelli
2012-10-29 13:40 ` [PATCH 0/3 v3] x86: ce4100 fixes and improvements Florian Fainelli
2012-10-29 13:40 ` [PATCH 1/3 v3] x86: ce4100: implement pm_poweroff Florian Fainelli
2012-10-30 12:25 ` [tip:x86/urgent] x86/ce4100: Fix pm_poweroff tip-bot for Florian Fainelli
2012-10-29 13:40 ` [PATCH 2/3 v3] x86: ce4100: force reboot method to be KBD Florian Fainelli
2012-10-30 12:26 ` [tip:x86/urgent] x86/ce4100: Fix reboot by forcing the " tip-bot for Maxime Bizon
2012-10-29 13:40 ` Florian Fainelli [this message]
2012-10-30 12:27 ` [tip:x86/urgent] x86/ce4100: Fix PCI configuration register access for devices without interrupts tip-bot for Maxime Bizon
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=1351518020-25556-4-git-send-email-ffainelli@freebox.fr \
--to=ffainelli@freebox.fr \
--cc=alan@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mbizon@freebox.fr \
--cc=mingo@redhat.com \
--cc=rui.zhang@intel.com \
--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;
as well as URLs for NNTP newsgroup(s).