Two more x86-64 bug fixes in recent pull
cover Two more x86-64 bug fixes in recent pull
Two last minute fixes.
-Andi
PATCH 1/2 x86_64: Fix C3 timer test
There was a typo in the C3 latency test to decide of the TSC should be used or not. It used the C2 latency threshold, not the C3 one. Fix that.
This should fix the time on various dual core laptops.
--- arch/x86_64/kernel/time.c | 2 +- 1 files changed, 1 insertion(+), 1 deletion(-)
arch/x86_64/kernel/time.c +1 -1
@@ -948,7 +948,7 @@ __cpuinit int unsynchronized_tsc(void)if (boot_cpu_data.x86_vendor ==X86_VENDOR_INTEL ) {#ifdef CONFIG_ACPI /* But TSC doesn't tick in C3 so don't use it there */ -if (acpi_fadt.length >0 && acpi_fadt.plvl3_lat <100 ) +if (acpi_fadt.length >0 && acpi_fadt.plvl3_lat <1000 )return 1 ;#endif return 0 ;
PATCH 2/2 x86_64: increase PHB1 split transaction timeout
In reply to Andi KleenFrom: Muli Ben-Yehuda <[email protected]>
This patch increases the timeout for PCI split transactions on PHB1 on the first Calgary to work around an issue with the aic94xx adapter. Fixes kernel.org bugzilla #7180
(http://bugzilla.kernel.org/show_bug.cgi?id=7180)
Based on excellent debugging and a patch by Darrick J. Wong <[email protected]>
--- arch/x86_64/kernel/pci-calgary.c | 44 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletion(-)
arch/x86_64/kernel/pci-calgary.c +43 -1
@@ -52,7 +52,8 @@#define ONE_BASED_CHASSIS_NUM 1/* register offsets inside the host bridge space */ -#define PHB_CSR_OFFSET 0x0110 +#define CALGARY_CONFIG_REG 0x0108 +#define PHB_CSR_OFFSET 0x0110/* Channel Status */ #define PHB_PLSSR_OFFSET 0x0120#define PHB_CONFIG_RW_OFFSET 0x0160#define PHB_IOBASE_BAR_LOW 0x0170
@@ -83,6 +84,8 @@#define TAR_VALID 0x0000000000000008UL/* CSR (Channel/DMA Status Register) */ #define CSR_AGENT_MASK 0xffe0ffff +/* CCR (Calgary Configuration Register) */ +#define CCR_2SEC_TIMEOUT 0x000000000000000EUL#define MAX_NUM_OF_PHBS 8/* how many PHBs in total? */ #define MAX_NUM_CHASSIS 8/* max number of chassis */
@@ -732,6 +735,38 @@ static void calgary_watchdog(unsigned lo } } +static void __init calgary_increase_split_completion_timeout (void __iomem *bbar, +unsigned char busnum) +{ +u64 val64; +void __iomem *target; +unsigned long phb_shift =-1 ; +u64 mask; + +switch (busno_to_phbid (busnum)) { +case 0 : phb_shift = (63 -19 ); +break ; +case 1 : phb_shift = (63 -23 ); +break ; +case 2 : phb_shift = (63 -27 ); +break ; +case 3 : phb_shift = (63 -35 ); +break ; +default : +BUG_ON (busno_to_phbid (busnum)); + } + + target =calgary_reg (bbar,CALGARY_CONFIG_REG ); + val64 =be64_to_cpu (readq (target)); + +/* zero out this PHB's timer bits */ + mask = ~(0xFUL << phb_shift); + val64 &= mask; + val64 |= (CCR_2SEC_TIMEOUT << phb_shift); +writeq (cpu_to_be64 (val64), target); +readq (target);/* flush */ +} +static void __init calgary_enable_translation (struct pci_dev *dev) {u32 val32;
@@ -756,6 +791,13 @@ static void __init calgary_enable_translwritel (cpu_to_be32 (val32), target);readl (target);/* flush */ +/* +* Give split completion a longer timeout on bus 1 for aic94xx +* http://bugzilla.kernel.org/show_bug.cgi?id=7180 +*/ +if (busnum ==1 ) +calgary_increase_split_completion_timeout (bbar, busnum); +init_timer (&tbl->watchdog_timer); tbl->watchdog_timer.function = &calgary_watchdog; tbl->watchdog_timer.data = (unsigned long )dev;
Re: [PATCH] [2/2] x86_64: increase PHB1 split transaction timeout
Quoted 24 lines · Andi Kleen
Index:
linux/arch/x86_64/kernel/pci-calgary.c
===================================================================arch/x86_64/kernel/pci-calgary.c +4
-1@@ -52,7 +52,8 @@#define ONE_BASED_CHASSIS_NUM 1/* register offsets inside the host bridge space */ -#define PHB_CSR_OFFSET 0x0110 +#define CALGARY_CONFIG_REG 0x0108 +#define PHB_CSR_OFFSET 0x0110/* Channel Status */ #define PHB_PLSSR_OFFSET 0x0120#define PHB_CONFIG_RW_OFFSET 0x0160#define PHB_IOBASE_BAR_LOW 0x0170@@ -83,6 +84,8 @@#define TAR_VALID 0x0000000000000008UL/* CSR (Channel/DMA Status Register) */ #define CSR_AGENT_MASK 0xffe0ffff +/* CCR (Calgary Configuration Register) */ +#define CCR_2SEC_TIMEOUT 0x000000000000000EUL#define MAX_NUM_OF_PHBS 8/* how many PHBs in total? */ #define MAX_NUM_CHASSIS 8/* max number of chassis */
arch/x86_64/kernel/pci-calgary.c static void calgary_watchdog(unsigned lo · line 743
Quoted 9 lines
arch/x86_64/kernel/pci-calgary.c +6
-0@@ -732,6 +735,38 @@ static void calgary_watchdog(unsigned lo } } +static void __init calgary_increase_split_completion_timeout (void __iomem *bbar, +unsigned char busnum) +{ +u64 val64; +void __iomem *target; +unsigned long phb_shift =-1 ;
The initialization of this to -1 is unclear to me since we fall through to BUG_ON() if busno_to_phbid() returns anything under than 0-3. A shift value of MAX_ULONG is never appropriate.
Quoted 49 lines
arch/x86_64/kernel/pci-calgary.c +33
-1+u64 mask; + +switch (busno_to_phbid (busnum)) { +case 0 : phb_shift = (63 -19 ); +break ; +case 1 : phb_shift = (63 -23 ); +break ; +case 2 : phb_shift = (63 -27 ); +break ; +case 3 : phb_shift = (63 -35 ); +break ; +default : +BUG_ON (busno_to_phbid (busnum)); + } + + target =calgary_reg (bbar,CALGARY_CONFIG_REG ); + val64 =be64_to_cpu (readq (target)); + +/* zero out this PHB's timer bits */ + mask = ~(0xFUL << phb_shift); + val64 &= mask; + val64 |= (CCR_2SEC_TIMEOUT << phb_shift); +writeq (cpu_to_be64 (val64), target); +readq (target);/* flush */ +} +static void __init calgary_enable_translation (struct pci_dev *dev) {u32 val32;@@ -756,6 +791,13 @@ static void __init calgary_enable_translwritel (cpu_to_be32 (val32), target);readl (target);/* flush */ +/* +* Give split completion a longer timeout on bus 1 for aic94xx +* http://bugzilla.kernel.org/show_bug.cgi?id=7180 +*/ +if (busnum ==1 ) +calgary_increase_split_completion_timeout (bbar, busnum); +init_timer (&tbl->watchdog_timer); tbl->watchdog_timer.function = &calgary_watchdog; tbl->watchdog_timer.data = (unsigned long )dev; -To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] [2/2] x86_64: increase PHB1 split transaction timeout
Quoted 10 lines · David Rientjes
arch/x86_64/kernel/pci-calgary.c static void calgary_watchdog(unsigned lo · line 743
Quoted 6 lines
arch/x86_64/kernel/pci-calgary.c +6
-0+static void __init calgary_increase_split_completion_timeout (void __iomem *bbar, +unsigned char busnum) +{ +u64 val64; +void __iomem *target; +unsigned long phb_shift =-1 ;The initialization of this to -1 is unclear to me since we fall through to
BUG_ON()ifbusno_to_phbid()returns anything under than 0-3. A shift value ofMAX_ULONGis never appropriate.
Without the initialization gcc warns about 'phb_shift' potentially being used unitialized. I used '-1' exactly because it is never appropriate.
Cheers,
Muli