| Message ID | 20200501113704.2240698-1-patrick@stwcx.xyz (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | aspeed: Add support for the sonorapass-bmc board | expand |
Patchew URL: https://patchew.org/QEMU/20200501113704.2240698-1-patrick@stwcx.xyz/
Hi,
This series seems to have some coding style problems. See output below for
more information:
Message-id: 20200501113704.2240698-1-patrick@stwcx.xyz
Subject: [PATCH] aspeed: Add support for the sonorapass-bmc board
Type: series
=== TEST SCRIPT BEGIN ===
#!/bin/bash
git rev-parse base > /dev/null || exit 0
git config --local diff.renamelimit 0
git config --local diff.renames True
git config --local diff.algorithm histogram
./scripts/checkpatch.pl --mailback base..
=== TEST SCRIPT END ===
From https://github.com/patchew-project/qemu
* [new tag] patchew/20200501113704.2240698-1-patrick@stwcx.xyz -> patchew/20200501113704.2240698-1-patrick@stwcx.xyz
Switched to a new branch 'test'
aab540d aspeed: Add support for the sonorapass-bmc board
=== OUTPUT BEGIN ===
ERROR: do not use C99 // comments
#53: FILE: hw/arm/aspeed.c:394:
+ // bus 2 :
ERROR: do not use C99 // comments
#56: FILE: hw/arm/aspeed.c:397:
+ // bus 2 : pca9546 @ 0x73
ERROR: do not use C99 // comments
#58: FILE: hw/arm/aspeed.c:399:
+ // bus 3 : pca9548 @ 0x70
ERROR: do not use C99 // comments
#60: FILE: hw/arm/aspeed.c:401:
+ // bus 4 :
ERROR: space prohibited after that open parenthesis '('
#61: FILE: hw/arm/aspeed.c:402:
+ uint8_t *eeprom4_54 = g_malloc0( 8 * 1024 );
ERROR: space prohibited before that close parenthesis ')'
#61: FILE: hw/arm/aspeed.c:402:
+ uint8_t *eeprom4_54 = g_malloc0( 8 * 1024 );
ERROR: do not use C99 // comments
#69: FILE: hw/arm/aspeed.c:410:
+ // bus 6 :
ERROR: do not use C99 // comments
#72: FILE: hw/arm/aspeed.c:413:
+ // bus 6 : pca9546 @ 0x73
ERROR: do not use C99 // comments
#74: FILE: hw/arm/aspeed.c:415:
+ // bus 8 :
ERROR: space prohibited after that open parenthesis '('
#75: FILE: hw/arm/aspeed.c:416:
+ uint8_t *eeprom8_56 = g_malloc0( 8 * 1024 );
ERROR: space prohibited before that close parenthesis ')'
#75: FILE: hw/arm/aspeed.c:416:
+ uint8_t *eeprom8_56 = g_malloc0( 8 * 1024 );
ERROR: do not use C99 // comments
#80: FILE: hw/arm/aspeed.c:421:
+ // bus 8 : adc128d818 @ 0x1d
ERROR: do not use C99 // comments
#81: FILE: hw/arm/aspeed.c:422:
+ // bus 8 : adc128d818 @ 0x1f
ERROR: do not use C99 // comments
#83: FILE: hw/arm/aspeed.c:424:
+ // bus 13 : pca9548 @ 0x71
ERROR: do not use C99 // comments
#84: FILE: hw/arm/aspeed.c:425:
+ // - channel 3:
ERROR: do not use C99 // comments
#85: FILE: hw/arm/aspeed.c:426:
+ // - tmm421 @ 0x4c
ERROR: do not use C99 // comments
#86: FILE: hw/arm/aspeed.c:427:
+ // - tmp421 @ 0x4e
ERROR: do not use C99 // comments
#87: FILE: hw/arm/aspeed.c:428:
+ // - tmp421 @ 0x4f
total: 18 errors, 0 warnings, 100 lines checked
Commit aab540d961cd (aspeed: Add support for the sonorapass-bmc board) has style problems, please review. If any of these errors
are false positives report them to the maintainer, see
CHECKPATCH in MAINTAINERS.
=== OUTPUT END ===
Test command exited with code: 1
The full log is available at
http://patchew.org/logs/20200501113704.2240698-1-patrick@stwcx.xyz/testing.checkpatch/?type=message.
---
Email generated automatically by Patchew [https://patchew.org/].
Please send your feedback to patchew-devel@redhat.com
On 5/1/20 1:37 PM, Patrick Williams wrote: > Sonora Pass is a 2 socket x86 motherboard designed by Facebook > and supported by OpenBMC. Strapping configuration was obtained > from hardware and i2c configuration is based on dts found at: > > https://github.com/facebook/openbmc-linux/blob/1633c87b8ba7c162095787c988979b748ba65dc8/arch/arm/boot/dts/aspeed-bmc-facebook-sonorapass.dts > > Booted a test image of http://github.com/facebook/openbmc to login > prompt. > > Signed-off-by: Patrick Williams <patrick@stwcx.xyz> With the fixed // comments, Reviewed-by: Cédric Le Goater <clg@kaod.org> Thanks, C. > --- > hw/arm/aspeed.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 76 insertions(+) > > diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c > index a6a2102a93..09b3277d56 100644 > --- a/hw/arm/aspeed.c > +++ b/hw/arm/aspeed.c > @@ -84,6 +84,21 @@ struct AspeedBoardState { > SCU_AST2500_HW_STRAP_ACPI_ENABLE | \ > SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER)) > > +/* Sonorapass hardware value: 0xF100D216 */ > +#define SONORAPASS_BMC_HW_STRAP1 ( \ > + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ > + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ > + SCU_AST2500_HW_STRAP_UART_DEBUG | \ > + SCU_AST2500_HW_STRAP_RESERVED28 | \ > + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ > + SCU_HW_STRAP_VGA_CLASS_CODE | \ > + SCU_HW_STRAP_LPC_RESET_PIN | \ > + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) | \ > + SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) | \ > + SCU_HW_STRAP_VGA_BIOS_ROM | \ > + SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ > + SCU_AST2500_HW_STRAP_RESERVED1) > + > /* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */ > #define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1 > > @@ -372,6 +387,48 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc) > i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x4a); > } > > +static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) > +{ > + AspeedSoCState *soc = &bmc->soc; > + > + // bus 2 : > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x48); > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x49); > + // bus 2 : pca9546 @ 0x73 > + > + // bus 3 : pca9548 @ 0x70 > + > + // bus 4 : > + uint8_t *eeprom4_54 = g_malloc0( 8 * 1024 ); > + smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), 0x54, > + eeprom4_54); > + /* PCA9539 @ 0x76, but PCA9552 is compatible */ > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x76); > + /* PCA9539 @ 0x77, but PCA9552 is compatible */ > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x77); > + > + // bus 6 : > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x48); > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x49); > + // bus 6 : pca9546 @ 0x73 > + > + // bus 8 : > + uint8_t *eeprom8_56 = g_malloc0( 8 * 1024 ); > + smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), 0x56, > + eeprom8_56); > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x60); > + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x61); > + // bus 8 : adc128d818 @ 0x1d > + // bus 8 : adc128d818 @ 0x1f > + > + // bus 13 : pca9548 @ 0x71 > + // - channel 3: > + // - tmm421 @ 0x4c > + // - tmp421 @ 0x4e > + // - tmp421 @ 0x4f > + > +} > + > static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) > { > AspeedSoCState *soc = &bmc->soc; > @@ -499,6 +556,21 @@ static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data) > mc->default_ram_size = 512 * MiB; > }; > > +static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) > +{ > + MachineClass *mc = MACHINE_CLASS(oc); > + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); > + > + mc->desc = "OpenPOWER SonoraPass BMC (ARM1176)"; > + amc->soc_name = "ast2500-a1"; > + amc->hw_strap1 = SONORAPASS_BMC_HW_STRAP1; > + amc->fmc_model = "mx66l1g45g"; > + amc->spi_model = "mx66l1g45g"; > + amc->num_cs = 2; > + amc->i2c_init = sonorapass_bmc_i2c_init; > + mc->default_ram_size = 512 * MiB; > +}; > + > static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) > { > MachineClass *mc = MACHINE_CLASS(oc); > @@ -563,6 +635,10 @@ static const TypeInfo aspeed_machine_types[] = { > .name = MACHINE_TYPE_NAME("swift-bmc"), > .parent = TYPE_ASPEED_MACHINE, > .class_init = aspeed_machine_swift_class_init, > + }, { > + .name = MACHINE_TYPE_NAME("sonorapass-bmc"), > + .parent = TYPE_ASPEED_MACHINE, > + .class_init = aspeed_machine_sonorapass_class_init, > }, { > .name = MACHINE_TYPE_NAME("witherspoon-bmc"), > .parent = TYPE_ASPEED_MACHINE, >
diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index a6a2102a93..09b3277d56 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -84,6 +84,21 @@ struct AspeedBoardState { SCU_AST2500_HW_STRAP_ACPI_ENABLE | \ SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER)) +/* Sonorapass hardware value: 0xF100D216 */ +#define SONORAPASS_BMC_HW_STRAP1 ( \ + SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE | \ + SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE | \ + SCU_AST2500_HW_STRAP_UART_DEBUG | \ + SCU_AST2500_HW_STRAP_RESERVED28 | \ + SCU_AST2500_HW_STRAP_DDR4_ENABLE | \ + SCU_HW_STRAP_VGA_CLASS_CODE | \ + SCU_HW_STRAP_LPC_RESET_PIN | \ + SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER) | \ + SCU_AST2500_HW_STRAP_SET_AXI_AHB_RATIO(AXI_AHB_RATIO_2_1) | \ + SCU_HW_STRAP_VGA_BIOS_ROM | \ + SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) | \ + SCU_AST2500_HW_STRAP_RESERVED1) + /* Witherspoon hardware value: 0xF10AD216 (but use romulus definition) */ #define WITHERSPOON_BMC_HW_STRAP1 ROMULUS_BMC_HW_STRAP1 @@ -372,6 +387,48 @@ static void swift_bmc_i2c_init(AspeedBoardState *bmc) i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 12), "tmp105", 0x4a); } +static void sonorapass_bmc_i2c_init(AspeedBoardState *bmc) +{ + AspeedSoCState *soc = &bmc->soc; + + // bus 2 : + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x48); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 2), "tmp105", 0x49); + // bus 2 : pca9546 @ 0x73 + + // bus 3 : pca9548 @ 0x70 + + // bus 4 : + uint8_t *eeprom4_54 = g_malloc0( 8 * 1024 ); + smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), 0x54, + eeprom4_54); + /* PCA9539 @ 0x76, but PCA9552 is compatible */ + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x76); + /* PCA9539 @ 0x77, but PCA9552 is compatible */ + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 4), "pca9552", 0x77); + + // bus 6 : + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x48); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 6), "tmp105", 0x49); + // bus 6 : pca9546 @ 0x73 + + // bus 8 : + uint8_t *eeprom8_56 = g_malloc0( 8 * 1024 ); + smbus_eeprom_init_one(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), 0x56, + eeprom8_56); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x60); + i2c_create_slave(aspeed_i2c_get_bus(DEVICE(&soc->i2c), 8), "pca9552", 0x61); + // bus 8 : adc128d818 @ 0x1d + // bus 8 : adc128d818 @ 0x1f + + // bus 13 : pca9548 @ 0x71 + // - channel 3: + // - tmm421 @ 0x4c + // - tmp421 @ 0x4e + // - tmp421 @ 0x4f + +} + static void witherspoon_bmc_i2c_init(AspeedBoardState *bmc) { AspeedSoCState *soc = &bmc->soc; @@ -499,6 +556,21 @@ static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data) mc->default_ram_size = 512 * MiB; }; +static void aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc = MACHINE_CLASS(oc); + AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc); + + mc->desc = "OpenPOWER SonoraPass BMC (ARM1176)"; + amc->soc_name = "ast2500-a1"; + amc->hw_strap1 = SONORAPASS_BMC_HW_STRAP1; + amc->fmc_model = "mx66l1g45g"; + amc->spi_model = "mx66l1g45g"; + amc->num_cs = 2; + amc->i2c_init = sonorapass_bmc_i2c_init; + mc->default_ram_size = 512 * MiB; +}; + static void aspeed_machine_witherspoon_class_init(ObjectClass *oc, void *data) { MachineClass *mc = MACHINE_CLASS(oc); @@ -563,6 +635,10 @@ static const TypeInfo aspeed_machine_types[] = { .name = MACHINE_TYPE_NAME("swift-bmc"), .parent = TYPE_ASPEED_MACHINE, .class_init = aspeed_machine_swift_class_init, + }, { + .name = MACHINE_TYPE_NAME("sonorapass-bmc"), + .parent = TYPE_ASPEED_MACHINE, + .class_init = aspeed_machine_sonorapass_class_init, }, { .name = MACHINE_TYPE_NAME("witherspoon-bmc"), .parent = TYPE_ASPEED_MACHINE,
Sonora Pass is a 2 socket x86 motherboard designed by Facebook and supported by OpenBMC. Strapping configuration was obtained from hardware and i2c configuration is based on dts found at: https://github.com/facebook/openbmc-linux/blob/1633c87b8ba7c162095787c988979b748ba65dc8/arch/arm/boot/dts/aspeed-bmc-facebook-sonorapass.dts Booted a test image of http://github.com/facebook/openbmc to login prompt. Signed-off-by: Patrick Williams <patrick@stwcx.xyz> --- hw/arm/aspeed.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 76 insertions(+)