| Message ID | 49CECFCF.8060403@kernel.org (mailing list archive) |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Sonntag 29 März 2009 03:33:03 Yinghai Lu wrote: > please try follwing patch over pci/linux-next > > Thanks > > YH > > [PATCH] pci: don't enable too much HT MSI mapping -v6 Works fine now, thanks! pci 0000:00:00.0: Found disabled HT MSI Mapping pci 0000:00:00.0: Enabling HT MSI Mapping pci 0000:00:00.0: Found enabled HT MSI Mapping pci 0000:00:05.0: Boot video device pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:0e.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:0f.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:10.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:10.1: Enabling HT MSI Mapping So drop my patch and merge v6 of Yinghai Lu's one. Cheers, Prakash
On Sun, Mar 29, 2009 at 2:15 AM, Prakash Punnoor <prakash@punnoor.de> wrote: > On Sonntag 29 März 2009 03:33:03 Yinghai Lu wrote: >> please try follwing patch over pci/linux-next >> >> Thanks >> >> YH >> >> [PATCH] pci: don't enable too much HT MSI mapping -v6 > > Works fine now, thanks! > > pci 0000:00:00.0: Found disabled HT MSI Mapping > pci 0000:00:00.0: Enabling HT MSI Mapping > pci 0000:00:00.0: Found enabled HT MSI Mapping > pci 0000:00:05.0: Boot video device > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:0e.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:0f.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:10.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:10.1: Enabling HT MSI Mapping > can you put you pcie network card in the pcie slot belong to c51? we should find 00:03.0 the pcie bridge... Thanks YH -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Sonntag 29 März 2009 11:32:56 Yinghai Lu wrote: > On Sun, Mar 29, 2009 at 2:15 AM, Prakash Punnoor <prakash@punnoor.de> wrote: > > On Sonntag 29 März 2009 03:33:03 Yinghai Lu wrote: > >> please try follwing patch over pci/linux-next > >> > >> Thanks > >> > >> YH > >> > >> [PATCH] pci: don't enable too much HT MSI mapping -v6 > > > > Works fine now, thanks! > > > > pci 0000:00:00.0: Found disabled HT MSI Mapping > > pci 0000:00:00.0: Enabling HT MSI Mapping > > pci 0000:00:00.0: Found enabled HT MSI Mapping > > pci 0000:00:05.0: Boot video device > > pci 0000:00:09.0: Found disabled HT MSI Mapping > > pci 0000:00:0e.0: Enabling HT MSI Mapping > > pci 0000:00:09.0: Found disabled HT MSI Mapping > > pci 0000:00:0f.0: Enabling HT MSI Mapping > > pci 0000:00:09.0: Found disabled HT MSI Mapping > > pci 0000:00:10.0: Enabling HT MSI Mapping > > pci 0000:00:09.0: Found disabled HT MSI Mapping > > pci 0000:00:10.1: Enabling HT MSI Mapping > > can you put you pcie network card in the pcie slot belong to c51? > we should find 00:03.0 the pcie bridge... > Above is when inserted in PCIe 1x slot, now in my PCIe 16x slot (I don't have other options): pci 0000:00:00.0: Found disabled HT MSI Mapping pci 0000:00:00.0: Enabling HT MSI Mapping pci 0000:00:00.0: Found enabled HT MSI Mapping pci 0000:00:05.0: Boot video device pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:0e.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:0f.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:10.0: Enabling HT MSI Mapping pci 0000:00:09.0: Found disabled HT MSI Mapping pci 0000:00:10.1: Enabling HT MSI Mapping 00:04.0 PCI bridge: nVidia Corporation C51 PCI Express Bridge (rev a1) (prog-if 00 [Normal decode]) Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- Latency: 0, Cache Line Size: 32 bytes Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 I/O behind bridge: 0000a000-0000afff Memory behind bridge: fdc00000-fdcfffff Prefetchable memory behind bridge: 00000000fdd00000-00000000fddfffff Secondary status: 66MHz- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ <SERR- <PERR- BridgeCtl: Parity- SERR- NoISA+ VGA- MAbort- >Reset- FastB2B- PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- Capabilities: [40] Subsystem: nVidia Corporation Device 0000 Capabilities: [48] Power Management version 2 Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1+,D2+,D3hot+,D3cold+) Status: D0 PME-Enable- DSel=0 DScale=0 PME- Capabilities: [50] MSI: Mask- 64bit+ Count=1/2 Enable+ Address: 00000000fee0300c Data: 4149 Capabilities: [60] HyperTransport: MSI Mapping Enable- Fixed- Mapping Address Base: 00000000fee00000 Capabilities: [80] Express (v1) Root Port (Slot+), MSI 00 DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s <512ns, L1 <4us ExtTag- RBE- FLReset- DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- RlxdOrd+ ExtTag- PhantFunc- AuxPwr- NoSnoop+ MaxPayload 128 bytes, MaxReadReq 512 bytes DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr- TransPend- LnkCap: Port #0, Speed 2.5GT/s, Width x16, ASPM L0s L1, Latency L0 <512ns, L1 <4us ClockPM- Surprise- LLActRep+ BwNot- LnkCtl: ASPM Disabled; RCB 64 bytes Disabled- Retrain- CommClk+ ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- LnkSta: Speed 2.5GT/s, Width x1, TrErr- Train- SlotClk+ DLActive+ BWMgmt- ABWMgmt- SltCap: AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug- Surpise- Slot # 0, PowerLimit 0.000000; Interlock- NoCompl- SltCtl: Enable: AttnBtn- PwrFlt- MRL- PresDet- CmdCplt- HPIrq- LinkChg- Control: AttnInd Off, PwrInd On, Power- Interlock- SltSta: Status: AttnBtn- PowerFlt- MRL- CmdCplt- PresDet+ Interlock- Changed: MRL- PresDet+ LinkState+ RootCtl: ErrCorrectable- ErrNon-Fatal- ErrFatal- PMEIntEna- CRSVisible- RootCap: CRSVisible- RootSta: PME ReqID 0000, PMEStatus- PMEPending- Capabilities: [100] Virtual Channel <?> Kernel driver in use: pcieport-driver 00: de 10 fb 02 07 04 10 00 a1 00 04 06 08 00 01 00 10: 00 00 00 00 00 00 00 00 00 01 01 00 a1 a1 00 20 20: c0 fd c0 fd d1 fd d1 fd 00 00 00 00 00 00 00 00 30: 00 00 00 00 40 00 00 00 00 00 00 00 ff 00 04 00 40: 0d 48 00 00 de 10 00 00 01 50 02 f8 00 00 00 00 50: 05 60 83 00 0c 30 e0 fe 00 00 00 00 49 41 00 00 60: 08 80 00 a8 00 00 e0 fe 00 00 00 00 00 00 00 00 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 80: 10 00 41 01 c0 04 00 00 10 28 00 00 01 3d 11 00 90: 40 00 11 30 00 00 00 00 c0 01 48 01 00 00 00 00 a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
Prakash Punnoor wrote: > On Sonntag 29 März 2009 11:32:56 Yinghai Lu wrote: >> On Sun, Mar 29, 2009 at 2:15 AM, Prakash Punnoor <prakash@punnoor.de> wrote: >>> On Sonntag 29 März 2009 03:33:03 Yinghai Lu wrote: >>>> please try follwing patch over pci/linux-next >>>> >>>> Thanks >>>> >>>> YH >>>> >>>> [PATCH] pci: don't enable too much HT MSI mapping -v6 >>> Works fine now, thanks! >>> >>> pci 0000:00:00.0: Found disabled HT MSI Mapping >>> pci 0000:00:00.0: Enabling HT MSI Mapping >>> pci 0000:00:00.0: Found enabled HT MSI Mapping >>> pci 0000:00:05.0: Boot video device >>> pci 0000:00:09.0: Found disabled HT MSI Mapping >>> pci 0000:00:0e.0: Enabling HT MSI Mapping >>> pci 0000:00:09.0: Found disabled HT MSI Mapping >>> pci 0000:00:0f.0: Enabling HT MSI Mapping >>> pci 0000:00:09.0: Found disabled HT MSI Mapping >>> pci 0000:00:10.0: Enabling HT MSI Mapping >>> pci 0000:00:09.0: Found disabled HT MSI Mapping >>> pci 0000:00:10.1: Enabling HT MSI Mapping >> can you put you pcie network card in the pcie slot belong to c51? >> we should find 00:03.0 the pcie bridge... >> > > > Above is when inserted in PCIe 1x slot, now in my PCIe 16x slot > (I don't have other options): > > pci 0000:00:00.0: Found disabled HT MSI Mapping > pci 0000:00:00.0: Enabling HT MSI Mapping > pci 0000:00:00.0: Found enabled HT MSI Mapping > pci 0000:00:05.0: Boot video device > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:0e.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:0f.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:10.0: Enabling HT MSI Mapping > pci 0000:00:09.0: Found disabled HT MSI Mapping > pci 0000:00:10.1: Enabling HT MSI Mapping > > > > 00:04.0 PCI bridge: nVidia Corporation C51 PCI Express Bridge (rev a1) (prog-if 00 [Normal decode]) > Control: I/O+ Mem+ BusMaster+ SpecCycle- MemWINV- VGASnoop- ParErr- Stepping- SERR- FastB2B- DisINTx+ > Status: Cap+ 66MHz- UDF- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort- >SERR- <PERR- INTx- > Latency: 0, Cache Line Size: 32 bytes > Bus: primary=00, secondary=01, subordinate=01, sec-latency=0 > I/O behind bridge: 0000a000-0000afff > Memory behind bridge: fdc00000-fdcfffff > Prefetchable memory behind bridge: 00000000fdd00000-00000000fddfffff > Secondary status: 66MHz- FastB2B- ParErr- DEVSEL=fast >TAbort- <TAbort- <MAbort+ <SERR- <PERR- > BridgeCtl: Parity- SERR- NoISA+ VGA- MAbort- >Reset- FastB2B- > PriDiscTmr- SecDiscTmr- DiscTmrStat- DiscTmrSERREn- > Capabilities: [40] Subsystem: nVidia Corporation Device 0000 > Capabilities: [48] Power Management version 2 > Flags: PMEClk- DSI- D1- D2- AuxCurrent=0mA PME(D0+,D1+,D2+,D3hot+,D3cold+) > Status: D0 PME-Enable- DSel=0 DScale=0 PME- > Capabilities: [50] MSI: Mask- 64bit+ Count=1/2 Enable+ > Address: 00000000fee0300c Data: 4149 > Capabilities: [60] HyperTransport: MSI Mapping Enable- Fixed- > Mapping Address Base: 00000000fee00000 > Capabilities: [80] Express (v1) Root Port (Slot+), MSI 00 > DevCap: MaxPayload 128 bytes, PhantFunc 0, Latency L0s <512ns, L1 <4us > ExtTag- RBE- FLReset- > DevCtl: Report errors: Correctable- Non-Fatal- Fatal- Unsupported- > RlxdOrd+ ExtTag- PhantFunc- AuxPwr- NoSnoop+ > MaxPayload 128 bytes, MaxReadReq 512 bytes > DevSta: CorrErr- UncorrErr- FatalErr- UnsuppReq- AuxPwr- TransPend- > LnkCap: Port #0, Speed 2.5GT/s, Width x16, ASPM L0s L1, Latency L0 <512ns, L1 <4us > ClockPM- Surprise- LLActRep+ BwNot- > LnkCtl: ASPM Disabled; RCB 64 bytes Disabled- Retrain- CommClk+ > ExtSynch- ClockPM- AutWidDis- BWInt- AutBWInt- > LnkSta: Speed 2.5GT/s, Width x1, TrErr- Train- SlotClk+ DLActive+ BWMgmt- ABWMgmt- > SltCap: AttnBtn- PwrCtrl- MRL- AttnInd- PwrInd- HotPlug- Surpise- > Slot # 0, PowerLimit 0.000000; Interlock- NoCompl- > SltCtl: Enable: AttnBtn- PwrFlt- MRL- PresDet- CmdCplt- HPIrq- LinkChg- > Control: AttnInd Off, PwrInd On, Power- Interlock- > SltSta: Status: AttnBtn- PowerFlt- MRL- CmdCplt- PresDet+ Interlock- > Changed: MRL- PresDet+ LinkState+ > RootCtl: ErrCorrectable- ErrNon-Fatal- ErrFatal- PMEIntEna- CRSVisible- > RootCap: CRSVisible- > RootSta: PME ReqID 0000, PMEStatus- PMEPending- > Capabilities: [100] Virtual Channel <?> > Kernel driver in use: pcieport-driver > 00: de 10 fb 02 07 04 10 00 a1 00 04 06 08 00 01 00 > 10: 00 00 00 00 00 00 00 00 00 01 01 00 a1 a1 00 20 > 20: c0 fd c0 fd d1 fd d1 fd 00 00 00 00 00 00 00 00 > 30: 00 00 00 00 40 00 00 00 00 00 00 00 ff 00 04 00 > 40: 0d 48 00 00 de 10 00 00 01 50 02 f8 00 00 00 00 > 50: 05 60 83 00 0c 30 e0 fe 00 00 00 00 49 41 00 00 > 60: 08 80 00 a8 00 00 e0 fe 00 00 00 00 00 00 00 00 > 70: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > 80: 10 00 41 01 c0 04 00 00 10 28 00 00 01 3d 11 00 > 90: 40 00 11 30 00 00 00 00 c0 01 48 01 00 00 00 00 > a0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > b0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > c0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > d0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > e0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > f0: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 > > ok, looks good. Jesse, please apply the -v6, in addition to -v5. YH -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index faf02dd..52714f2 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@ -2206,6 +2206,33 @@ static int __devinit host_bridge_with_leaf(struct pci_dev *host_bridge) return found; } +#define PCI_HT_CAP_SLAVE_CTRL0 4 /* link control */ +#define PCI_HT_CAP_SLAVE_CTRL1 8 /* link control to */ + +static int __devinit is_end_of_ht_chain(struct pci_dev *dev) +{ + int pos, ctrl_off; + int end = 0; + u16 flags, ctrl; + + pos = pci_find_ht_capability(dev, HT_CAPTYPE_SLAVE); + + if (!pos) + goto out; + + pci_read_config_word(dev, pos + PCI_CAP_FLAGS, &flags); + + ctrl_off = ((flags >> 10) & 1) ? + PCI_HT_CAP_SLAVE_CTRL0 : PCI_HT_CAP_SLAVE_CTRL1; + pci_read_config_word(dev, pos + ctrl_off, &ctrl); + + if (ctrl & (1 << 6)) + end = 1; + +out: + return end; +} + static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev) { struct pci_dev *host_bridge; @@ -2230,8 +2257,9 @@ static void __devinit nv_ht_enable_msi_mapping(struct pci_dev *dev) if (!found) return; - /* don't enable host_bridge with leaf directly here */ - if (host_bridge == dev && host_bridge_with_leaf(host_bridge)) + /* don't enable end_device/host_bridge with leaf directly here */ + if (host_bridge == dev && is_end_of_ht_chain(host_bridge) && + host_bridge_with_leaf(host_bridge)) goto out; /* root did that ! */
please try follwing patch over pci/linux-next Thanks YH [PATCH] pci: don't enable too much HT MSI mapping -v6 Impact: fix bug Prakash reported that his c51-mcp51 system ondie sound card doesn't work MSI but if he hack out the HT-MSI on mcp51, the MSI will work well with sound card. this patch rework the nv_msi_ht_cap_quirk() and will only try to avoid to enable ht_msi on device following that root dev, and don't touch that root dev v6: only do that trick with end_device on the chain. Reported-by: Prakash Punnoor <prakash@punnoor.de> Signed-off-by: Yinghai Lu <yinghai@kernel.org> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html