MIPS: SGI fixes
cover MIPS: SGI fixes
Two fixes for the SGI O2 (IP32) and a defconfig fix for the Octane (IP30).
Patch 1 clears CRIME errors latched before the kernel starts, which are otherwise reported as new once the error interrupts are enabled.
Patch 2 reserves the firmware memory listed by the ARC descriptors on IP32, which now ends up in the page allocator and CMA.
Patch 3 enables the 1-wire drivers the Bridge probe needs, and the DS1685-family RTC driver, in ip30_defconfig, and drops four lines that savedefconfig removes.
Tested on SGI O2 and Octane machines.
Imre Kaloz (3):
MIPS: sgi-ip32: Clear latched CRIME errors at boot
MIPS: sgi-ip32: Reserve the firmware memory
MIPS: SGI-IP30: fix the defconfig defaults for the Bridge PROM and RTC
arch/mips/configs/ip30_defconfig | 9 ++++----- arch/mips/fw/arc/memory.c | 11 +++++++++-- arch/mips/include/asm/sgialib.h | 3 +++ arch/mips/sgi-ip32/crime.c | 4 ++++ arch/mips/sgi-ip32/ip32-memory.c | 3 +++ 5 files changed, 23 insertions(+), 7 deletions(-)
base-commit: 24a19b953e2a3d0ea5a8c4951a0ab8f32720c907
Signature · 1 line
2.47.3
PATCH 1/3 MIPS: sgi-ip32: Clear latched CRIME errors at boot
Errors already latched in CRIME when the kernel starts are reported as new, as a "CRIME memory error" or a "CRIME CPU error", once the error interrupts are enabled. Clear both status registers in crime_init().
--- arch/mips/sgi-ip32/crime.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/mips/sgi-ip32/crime.c +4 -0
@@ -34,6 +34,10 @@ void __init crime_init(void) crime =ioremap (CRIME_BASE ,sizeof (struct sgi_crime )); mace =ioremap (MACE_BASE ,sizeof (struct sgi_mace )); +/* Errors latched before the kernel starts would be reported as new */ + crime->mem_error_stat =0 ; + crime->cpu_error_stat =0 ; + id = crime->id; rev = id &CRIME_ID_REV ; id = (id &CRIME_ID_IDBITS ) >>4 ;
Signature · 1 line
2.47.3
PATCH 2/3 MIPS: sgi-ip32: Reserve the firmware memory
In reply to Imre KalozARC memory descriptors are ignored on IP32, so firmware data in low memory ends up in the page allocator and CMA. Reserve it using the generic ARC walk; RAM comes from CRIME, as ARC lists only the first 256 MiB.
--- arch/mips/fw/arc/memory.c | 11 +++++++++-- arch/mips/include/asm/sgialib.h | 3 +++ arch/mips/sgi-ip32/ip32-memory.c | 3 +++ 3 files changed, 15 insertions(+), 2 deletions(-)
arch/mips/fw/arc/memory.c +9 -2
@@ -120,7 +120,8 @@ static int __init prom_memtype_classify(union linux_memtypes type)return memtype_classify_arc (type); } -void __weak __init prom_meminit (void ) +/* Platforms that detect RAM themselves pass add_ram = false. */ +void __init prom_mdesc_init (bool add_ram) {struct linux_mdesc *p;
@@ -151,7 +152,8 @@ void __weak __init prom_meminit(void)if (base <PHYS_OFFSET )continue ; -memblock_add (base, size); +if (add_ram) +memblock_add (base, size);if (type == mem_reserved)memblock_reserve (base, size);
@@ -169,6 +171,11 @@ void __weak __init prom_meminit(void) } } +void __weak __init prom_meminit (void ) +{ +prom_mdesc_init (true); +} +void __weak __init prom_cleanup (void ) { }
arch/mips/include/asm/sgialib.h +3 -0
@@ -36,6 +36,9 @@ extern struct linux_mdesc *prom_getmdesc(struct linux_mdesc *curr);*/ extern void prom_meminit (void ); +/* Reserve the firmware's memory; add_ram also registers all ranges as RAM. */ +void prom_mdesc_init (bool add_ram); +/* PROM device tree library routines. */ #define PROM_NULL_COMPONENT ((pcomponent *) 0)
arch/mips/sgi-ip32/ip32-memory.c +3 -0
@@ -40,4 +40,7 @@ void __init prom_meminit(void) bank, base, size >> 20);memblock_add (base, size); } + +/* ARC describes only the first 256 MiB, so RAM comes from CRIME. */ +prom_mdesc_init (false); }
Signature · 1 line
2.47.3
PATCH 3/3 MIPS: SGI-IP30: fix the defconfig defaults for the Bridge PROM and RTC
In reply to Imre KalozThe Bridge probe reads its part number from the 1-wire PROM and defers until the SGI 1-wire master and DS250x slave are present, so without them there is no PCI bus and no serial console.
The IP30 RTC is a DS1685-family part, but the defconfig, derived from ip27_defconfig, has the M48T35 driver, so there is no RTC.
Enable the 1-wire drivers and select the DS1685 family.
Also drop four lines that savedefconfig removes, as CRYPTO_CAMELLIA, CRYPTO_CTS and CRYPTO_HMAC are selected built-in and IPV6_SIT=m is the default.
--- arch/mips/configs/ip30_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
arch/mips/configs/ip30_defconfig +4 -5
@@ -40,7 +40,6 @@ CONFIG_INET6_AH=m CONFIG_INET6_ESP=m CONFIG_INET6_IPCOMP=m CONFIG_IPV6_MIP6=m -CONFIG_IPV6_SIT=m CONFIG_IPV6_SIT_6RD=y CONFIG_IPV6_TUNNEL=m CONFIG_IPV6_MULTIPLE_TABLES=y
@@ -129,11 +128,14 @@ CONFIG_SERIAL_8250_IOC3=y CONFIG_NOZOMI=m CONFIG_HW_RANDOM_TIMERIOMEM=m # CONFIG_PTP_1588_CLOCK is not set +CONFIG_W1=y +CONFIG_W1_MASTER_SGI=y +CONFIG_W1_SLAVE_DS250X=y # CONFIG_HWMON is not set CONFIG_THERMAL=y CONFIG_SGI_MFD_IOC3=y CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_M48T35=y +CONFIG_RTC_DRV_DS1685_FAMILY=y CONFIG_UIO=y CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m
@@ -162,15 +164,12 @@ CONFIG_NFS_FS=y CONFIG_SECURITYFS=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_BLOWFISH=m -CONFIG_CRYPTO_CAMELLIA=m CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_SERPENT=m CONFIG_CRYPTO_TWOFISH=m -CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_LRW=m CONFIG_CRYPTO_XTS=m -CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_MD4=m CONFIG_CRYPTO_RMD160=m CONFIG_CRYPTO_WP512=m
Signature · 1 line
2.47.3
Re: [PATCH 3/3] MIPS: SGI-IP30: fix the defconfig defaults for the Bridge PROM and RTC
Quoted 13 lines · Imre Kaloz
The Bridge probe reads its part number from the 1-wire PROM and defers until the SGI 1-wire master and DS250x slave are present, so without them there is no PCI bus and no serial console.
The IP30 RTC is a DS1685-family part, but the defconfig, derived from
ip27_defconfig, has the M48T35 driver, so there is no RTC.Enable the 1-wire drivers and select the DS1685 family.
Also drop four lines that savedefconfig removes, as
CRYPTO_CAMELLIA,CRYPTO_CTSandCRYPTO_HMACare selected built-in and IPV6_SIT=m is the default.
Quoted 5 lines
Fixes bb2d63500b5c ("MIPS: config: Add ip30_defconfig")Signed-off-by Imre Kaloz <[email protected]>--- arch/mips/configs/ip30_defconfig | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-)
applied to mips-fixes
Thomas.
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessarily a good idea. [ RFC1925, 2.3 ]