Skip to content

[AS9817-64D][AS9817-64O] Upgrade kernel from 6.1 to 6.12 #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
akenliu merged 4 commits into from
Mar 20, 2026
Merged

[AS9817-64D][AS9817-64O] Upgrade kernel from 6.1 to 6.12 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c470c58
[AS9817-64D][AS9817-64O] Upgrade kernel to 6.12
vincentchiang-ec Mar 14, 2026
c6425e2
[AS9817-64] Fix fpga.c platform_driver.remove return type for kernel …
vincentchiang-ec Mar 14, 2026
0c533cc
[AS9817-64] Fix mux.c API changes for kernel 6.12
vincentchiang-ec Mar 14, 2026
1d52ff8
[AS9817-64] Fix i2c_mux_add_adapter argument order for kernel 6.12
vincentchiang-ec Mar 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as9817-64/as9817-64d/modules/PKG.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9817-64d ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9817-64d ARCH=amd64 KERNELS="onl-kernel-6.12-lts-x86-64-all:amd64"
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as9817-64/as9817-64d/modules/builds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KERNELS := onl-kernel-6.1-lts-x86-64-all:amd64
KERNELS := onl-kernel-6.12-lts-x86-64-all:amd64
KMODULES := $(ONL)/packages/platforms/accton/x86-64/as9817-64/src/modules/
VENDOR := accton
BASENAME := x86-64-accton-as9817-64d
Expand Down
2 changes: 1 addition & 1 deletion ...on/x86-64/as9817-64/as9817-64d/platform-config/r0/src/lib/x86-64-accton-as9817-64d-r0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ x86-64-accton-as9817-64d-r0:
--stop=1

kernel:
<<: *kernel-6-1
<<: *kernel-6-12

args: >-
console=ttyS0,115200n8
Expand Down
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as9817-64/as9817-64o/modules/PKG.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9817-64o ARCH=amd64 KERNELS="onl-kernel-6.1-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as9817-64o ARCH=amd64 KERNELS="onl-kernel-6.12-lts-x86-64-all:amd64"
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as9817-64/as9817-64o/modules/builds/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KERNELS := onl-kernel-6.1-lts-x86-64-all:amd64
KERNELS := onl-kernel-6.12-lts-x86-64-all:amd64
KMODULES := $(ONL)/packages/platforms/accton/x86-64/as9817-64/src/modules/
VENDOR := accton
BASENAME := x86-64-accton-as9817-64o
Expand Down
2 changes: 1 addition & 1 deletion ...on/x86-64/as9817-64/as9817-64o/platform-config/r0/src/lib/x86-64-accton-as9817-64o-r0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ x86-64-accton-as9817-64o-r0:
--stop=1

kernel:
<<: *kernel-6-1
<<: *kernel-6-12

args: >-
console=ttyS0,115200n8
Expand Down
6 changes: 2 additions & 4 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-fan.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ static ssize_t show_dir(struct device *dev, struct device_attribute *da,
static ssize_t show_threshold(struct device *dev, struct device_attribute *da,
char *buf);
static int as9817_64_fan_probe(struct platform_device *pdev);
static int as9817_64_fan_remove(struct platform_device *pdev);
static void as9817_64_fan_remove(struct platform_device *pdev);

enum fan_id {
FAN_1,
Expand Down Expand Up @@ -554,16 +554,14 @@ static int as9817_64_fan_probe(struct platform_device *pdev)
return status;
}

static int as9817_64_fan_remove(struct platform_device *pdev)
static void as9817_64_fan_remove(struct platform_device *pdev)
{
mutex_lock(&data->update_lock);
if (data->hwmon_dev) {
hwmon_device_unregister(data->hwmon_dev);
data->hwmon_dev = NULL;
}
mutex_unlock(&data->update_lock);

return 0;
}

static int __init as9817_64_fan_init(void)
Expand Down
4 changes: 1 addition & 3 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-fpga.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1169,7 +1169,7 @@ static int as9817_64_pcie_fpga_stat_probe(struct platform_device *pdev)
return status;
}

static int as9817_64_pcie_fpga_stat_remove(struct platform_device *pdev)
static void as9817_64_pcie_fpga_stat_remove(struct platform_device *pdev)
{
struct as9817_64_fpga_data *fpga_ctl = platform_get_drvdata(pdev);

Expand All @@ -1189,8 +1189,6 @@ static int as9817_64_pcie_fpga_stat_remove(struct platform_device *pdev)
release_mem_region(fpga_ctl->pci_fpga_dev.data_region2, REGION_LEN);
pci_disable_device(fpga_ctl->pci_fpga_dev.pci_dev);
}

return 0;
}

static struct platform_driver pcie_fpga_port_stat_driver = {
Expand Down
4 changes: 1 addition & 3 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-i2c-ocores.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,7 +852,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
return ret;
}

static int ocores_i2c_remove(struct platform_device *pdev)
static void ocores_i2c_remove(struct platform_device *pdev)
{
struct ocores_i2c *i2c = platform_get_drvdata(pdev);
u8 ctrl;
Expand All @@ -870,8 +870,6 @@ static int ocores_i2c_remove(struct platform_device *pdev)

if (!IS_ERR(i2c->clk))
clk_disable_unprepare(i2c->clk);

return 0;
}

#ifdef CONFIG_PM_SLEEP
Expand Down
6 changes: 2 additions & 4 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-leds.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ static ssize_t set_led(struct device *dev, struct device_attribute *da,
static ssize_t show_led(struct device *dev, struct device_attribute *attr,
char *buf);
static int as9817_64_led_probe(struct platform_device *pdev);
static int as9817_64_led_remove(struct platform_device *pdev);
static void as9817_64_led_remove(struct platform_device *pdev);

struct as9817_64_led_data {
struct platform_device *pdev;
Expand Down Expand Up @@ -323,11 +323,9 @@ static int as9817_64_led_probe(struct platform_device *pdev)
return status;
}

static int as9817_64_led_remove(struct platform_device *pdev)
static void as9817_64_led_remove(struct platform_device *pdev)
{
sysfs_remove_group(&pdev->dev.kobj, &as9817_64_led_group);

return 0;
}

static int __init as9817_64_led_init(void)
Expand Down
6 changes: 3 additions & 3 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-mux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,9 +134,9 @@ static void as9817_64_mux_cleanup(struct i2c_mux_core *muxc)
/*
* I2C init/probing/exit functions
*/
static int as9817_64_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
static int as9817_64_mux_probe(struct i2c_client *client)
{
const struct i2c_device_id *id = i2c_client_get_device_id(client);
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
struct device *dev = &client->dev;
struct as9817_64_mux_data *data;
Expand All @@ -160,7 +160,7 @@ static int as9817_64_mux_probe(struct i2c_client *client,

/* Now create an adapter for each channel */
for (i = 0; i < chips[data->type].nchans; i++) {
ret = i2c_mux_add_adapter(muxc, 0, i, 0);
ret = i2c_mux_add_adapter(muxc, 0, i);
if (ret)
goto exit_mux;
}
Expand Down
6 changes: 2 additions & 4 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-psu.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ static ssize_t show_psu_info(struct device *dev, struct device_attribute *attr,
static ssize_t show_string(struct device *dev, struct device_attribute *attr,
char *buf);
static int as9817_64_psu_probe(struct platform_device *pdev);
static int as9817_64_psu_remove(struct platform_device *pdev);
static void as9817_64_psu_remove(struct platform_device *pdev);

enum psu_id {
PSU_1,
Expand Down Expand Up @@ -852,7 +852,7 @@ static int as9817_64_psu_probe(struct platform_device *pdev)
return 0;
}

static int as9817_64_psu_remove(struct platform_device *pdev)
static void as9817_64_psu_remove(struct platform_device *pdev)
{
int i = 0;

Expand All @@ -864,8 +864,6 @@ static int as9817_64_psu_remove(struct platform_device *pdev)
}
mutex_unlock(&data->update_lock);
}

return 0;
}

static int __init as9817_64_psu_init(void)
Expand Down
6 changes: 2 additions & 4 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-sys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
#define IPMI_RESET_CMD_LENGTH 6

static int as9817_64_sys_probe(struct platform_device *pdev);
static int as9817_64_sys_remove(struct platform_device *pdev);
static void as9817_64_sys_remove(struct platform_device *pdev);
static ssize_t show_version(struct device *dev,
struct device_attribute *da, char *buf);
static ssize_t get_bmc_fan_controller(struct device *dev,
Expand Down Expand Up @@ -418,11 +418,9 @@ static int as9817_64_sys_probe(struct platform_device *pdev)
return status;
}

static int as9817_64_sys_remove(struct platform_device *pdev)
static void as9817_64_sys_remove(struct platform_device *pdev)
{
sysfs_remove_group(&pdev->dev.kobj, &as9817_64_sys_group);

return 0;
}

static int __init as9817_64_sys_init(void)
Expand Down
6 changes: 2 additions & 4 deletions packages/platforms/accton/x86-64/as9817-64/src/modules/x86-64-accton-as9817-64-thermal.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ static ssize_t show_threshold(struct device *dev, struct device_attribute *da,
char *buf);
#endif
static int as9817_64_thermal_probe(struct platform_device *pdev);
static int as9817_64_thermal_remove(struct platform_device *pdev);
static void as9817_64_thermal_remove(struct platform_device *pdev);

enum temp_data_index {
TEMP_ADDR,
Expand Down Expand Up @@ -305,16 +305,14 @@ static int as9817_64_thermal_probe(struct platform_device *pdev)
return status;
}

static int as9817_64_thermal_remove(struct platform_device *pdev)
static void as9817_64_thermal_remove(struct platform_device *pdev)
{
mutex_lock(&data->update_lock);
if (data->hwmon_dev) {
hwmon_device_unregister(data->hwmon_dev);
data->hwmon_dev = NULL;
}
mutex_unlock(&data->update_lock);

return 0;
}

static int __init as9817_64_thermal_init(void)
Expand Down
2 changes: 1 addition & 1 deletion packages/platforms/accton/x86-64/as9817-64/src/x86_64_accton_as9817_64/module/src/sysi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ onlp_sysi_platform_info_get(onlp_platform_info_t* pi)
{
int i, len, ret = ONLP_STATUS_OK;
char *v[NUM_OF_CPLD_VER] = {NULL};
onlp_onie_info_t onie;
onlp_onie_info_t onie = {0};
char *bios_ver = NULL;
char *bmc_buf = NULL;
char *aux_buf = NULL;
Expand Down