scottk/OpenNetworkLinux
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/OpenNetworkLinux.git synced 2025-12-25 17:27:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #390 from Lewis-Kang/K4.14

Browse Source 
using kernel 4.14 for Accton/Edge-core's amd64 platforms
This commit is contained in:
Jeffrey Townsend
2018-05-30 10:44:34 -07:00
committed by GitHub
parent d9d247e9a2 bcaf264916
commit 4875b761da
91 changed files with 1615 additions and 1050 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1200
packages/base/any/kernels/4.14-lts/configs/x86_64-all/x86_64-all.config Normal file → Executable file
View File

File diff suppressed because it is too large Load Diff

34
packages/base/any/kernels/4.14-lts/patches/0001-drivers-i2c-muxes-pca954x-deselect-on-exit.patch Normal file
View File

@@ -0,0 +1,34 @@
diff --git a/drivers/i2c/muxes/Kconfig b/drivers/i2c/muxes/Kconfig
index 0f5c8fc..f93099c 100644
--- a/drivers/i2c/muxes/Kconfig
+++ b/drivers/i2c/muxes/Kconfig
@@ -73,6 +73,13 @@ config I2C_MUX_PCA954x
This driver can also be built as a module. If so, the module
will be called i2c-mux-pca954x.
+config I2C_MUX_PCA954X_DESELECT_ON_EXIT
+ bool "Enable deselect-on-exit feature for PCA954X devices."
+ depends on I2C_MUX_PCA954x
+ help
+ If you say yes here you enable the deselect-on-exit feature in
+ the pca954x i2c driver.
+
config I2C_MUX_PINCTRL
tristate "pinctrl-based I2C multiplexer"
depends on PINCTRL
diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index 7b992db..bdca051 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -218,8 +218,10 @@ static int pca954x_deselect_mux(struct i2c_mux_core *muxc, u32 chan)
struct pca954x *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
+#if !defined(CONFIG_I2C_MUX_PCA954X_DESELECT_ON_EXIT)
if (!(data->deselect & (1 << chan)))
return 0;
+#endif
/* Deselect active channel */
data->last_chan = 0;

241
packages/base/any/kernels/4.14-lts/patches/0002-driver-support-intel-igb-bcm5461S-phy.patch Normal file
View File

@@ -0,0 +1,241 @@
diff --git a/drivers/net/ethernet/intel/igb/e1000_82575.c b/drivers/net/ethernet/intel/igb/e1000_82575.c
index c37cc8b..41c0ff2 100644
--- a/drivers/net/ethernet/intel/igb/e1000_82575.c
+++ b/drivers/net/ethernet/intel/igb/e1000_82575.c
@@ -340,6 +340,12 @@ static s32 igb_init_phy_params_82575(struct e1000_hw *hw)
phy->ops.set_d3_lplu_state = igb_set_d3_lplu_state_82580;
phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;
break;
+ case BCM5461S_PHY_ID:
+ phy->type = e1000_phy_bcm5461s;
+ phy->ops.check_polarity = NULL;
+ phy->ops.get_cable_length = NULL;
+ phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_82580;
+ break;
case BCM54616_E_PHY_ID:
phy->type = e1000_phy_bcm54616;
break;
@@ -902,6 +908,16 @@ static s32 igb_get_phy_id_82575(struct e1000_hw *hw)
goto out;
}
ret_val = igb_get_phy_id(hw);
+ if (ret_val && hw->mac.type == e1000_i354) {
+ /* we do a special check for bcm5461s phy by setting
+ * the phy->addr to 5 and doing the phy check again. This
+ * call will succeed and retrieve a valid phy id if we have
+ * the bcm5461s phy
+ */
+ phy->addr = 5;
+ phy->type = e1000_phy_bcm5461s;
+ ret_val = igb_get_phy_id(hw);
+ }
goto out;
}
@@ -1289,6 +1305,9 @@ static s32 igb_get_cfg_done_82575(struct e1000_hw *hw)
(hw->phy.type == e1000_phy_igp_3))
igb_phy_init_script_igp3(hw);
+ if (hw->phy.type == e1000_phy_bcm5461s)
+ igb_phy_init_script_5461s(hw);
+
return 0;
}
@@ -1618,6 +1637,7 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
case e1000_i350:
case e1000_i210:
case e1000_i211:
+ case e1000_i354:
phpm_reg = rd32(E1000_82580_PHY_POWER_MGMT);
phpm_reg &= ~E1000_82580_PM_GO_LINKD;
wr32(E1000_82580_PHY_POWER_MGMT, phpm_reg);
@@ -1663,7 +1683,8 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw)
ret_val = igb_copper_link_setup_82580(hw);
break;
case e1000_phy_bcm54616:
- ret_val = 0;
+ break;
+ case e1000_phy_bcm5461s:
break;
default:
ret_val = -E1000_ERR_PHY;
diff --git a/drivers/net/ethernet/intel/igb/e1000_defines.h b/drivers/net/ethernet/intel/igb/e1000_defines.h
index 1de82f2..0703c3e 100644
--- a/drivers/net/ethernet/intel/igb/e1000_defines.h
+++ b/drivers/net/ethernet/intel/igb/e1000_defines.h
@@ -890,6 +890,7 @@
#define M88E1543_E_PHY_ID 0x01410EA0
#define M88E1512_E_PHY_ID 0x01410DD0
#define BCM54616_E_PHY_ID 0x03625D10
+#define BCM5461S_PHY_ID 0x002060C0
/* M88E1000 Specific Registers */
#define M88E1000_PHY_SPEC_CTRL 0x10 /* PHY Specific Control Register */
diff --git a/drivers/net/ethernet/intel/igb/e1000_hw.h b/drivers/net/ethernet/intel/igb/e1000_hw.h
index 6c9485a..2a0b83b 100644
--- a/drivers/net/ethernet/intel/igb/e1000_hw.h
+++ b/drivers/net/ethernet/intel/igb/e1000_hw.h
@@ -129,6 +129,7 @@ enum e1000_phy_type {
e1000_phy_82580,
e1000_phy_i210,
e1000_phy_bcm54616,
+ e1000_phy_bcm5461s,
};
enum e1000_bus_type {
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.c b/drivers/net/ethernet/intel/igb/e1000_phy.c
index 413025b..4c2a5ff 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.c
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.c
@@ -146,6 +146,13 @@ s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data)
* Control register. The MAC will take care of interfacing with the
* PHY to retrieve the desired data.
*/
+ if (phy->type == e1000_phy_bcm5461s) {
+ mdic = rd32(E1000_MDICNFG);
+ mdic &= ~E1000_MDICNFG_PHY_MASK;
+ mdic |= (phy->addr << E1000_MDICNFG_PHY_SHIFT);
+ wr32(E1000_MDICNFG, mdic);
+ }
+
mdic = ((offset << E1000_MDIC_REG_SHIFT) |
(phy->addr << E1000_MDIC_PHY_SHIFT) |
(E1000_MDIC_OP_READ));
@@ -202,6 +209,13 @@ s32 igb_write_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 data)
* Control register. The MAC will take care of interfacing with the
* PHY to retrieve the desired data.
*/
+ if (phy->type == e1000_phy_bcm5461s) {
+ mdic = rd32(E1000_MDICNFG);
+ mdic &= ~E1000_MDICNFG_PHY_MASK;
+ mdic |= (phy->addr << E1000_MDICNFG_PHY_SHIFT);
+ wr32(E1000_MDICNFG, mdic);
+ }
+
mdic = (((u32)data) |
(offset << E1000_MDIC_REG_SHIFT) |
(phy->addr << E1000_MDIC_PHY_SHIFT) |
@@ -1113,11 +1127,13 @@ s32 igb_setup_copper_link(struct e1000_hw *hw)
* depending on user settings.
*/
hw_dbg("Forcing Speed and Duplex\n");
- ret_val = hw->phy.ops.force_speed_duplex(hw);
- if (ret_val) {
- hw_dbg("Error Forcing Speed and Duplex\n");
- goto out;
- }
+ if (hw->phy.ops.force_speed_duplex) {
+ ret_val = hw->phy.ops.force_speed_duplex(hw);
+ if (ret_val) {
+ hw_dbg("Error Forcing Speed and Duplex\n");
+ goto out;
+ }
+ }
}
/* Check link status. Wait up to 100 microseconds for link to become
@@ -2647,3 +2663,66 @@ static s32 igb_set_master_slave_mode(struct e1000_hw *hw)
return hw->phy.ops.write_reg(hw, PHY_1000T_CTRL, phy_data);
}
+
+/**
+ * igb_phy_init_script_5461s - Inits the BCM5461S PHY
+ * @hw: pointer to the HW structure
+ *
+ * Initializes a Broadcom Gigabit PHY.
+ **/
+s32 igb_phy_init_script_5461s(struct e1000_hw *hw)
+{
+ u16 mii_reg_led = 0;
+
+ /* 1. Speed LED (Set the Link LED mode), Shadow 00010, 0x1C.bit2=1 */
+ hw->phy.ops.write_reg(hw, 0x1C, 0x0800);
+ hw->phy.ops.read_reg(hw, 0x1C, &mii_reg_led);
+ mii_reg_led |= 0x0004;
+ hw->phy.ops.write_reg(hw, 0x1C, mii_reg_led | 0x8000);
+
+ /* 2. Active LED (Set the Link LED mode), Shadow 01001, 0x1C.bit4=1, 0x10.bit5=0 */
+ hw->phy.ops.write_reg(hw, 0x1C, 0x2400);
+ hw->phy.ops.read_reg(hw, 0x1C, &mii_reg_led);
+ mii_reg_led |= 0x0010;
+ hw->phy.ops.write_reg(hw, 0x1C, mii_reg_led | 0x8000);
+ hw->phy.ops.read_reg(hw, 0x10, &mii_reg_led);
+ mii_reg_led &= 0xffdf;
+ hw->phy.ops.write_reg(hw, 0x10, mii_reg_led);
+
+ return 0;
+}
+
+/**
+ * igb_get_phy_info_5461s - Retrieve 5461s PHY information
+ * @hw: pointer to the HW structure
+ *
+ * Read PHY status to determine if link is up. If link is up, then
+ * set/determine 10base-T extended distance and polarity correction. Read
+ * PHY port status to determine MDI/MDIx and speed. Based on the speed,
+ * determine on the cable length, local and remote receiver.
+ **/
+s32 igb_get_phy_info_5461s(struct e1000_hw *hw)
+{
+ struct e1000_phy_info *phy = &hw->phy;
+ s32 ret_val;
+ bool link;
+
+ ret_val = igb_phy_has_link(hw, 1, 0, &link);
+ if (ret_val)
+ goto out;
+
+ if (!link) {
+ ret_val = -E1000_ERR_CONFIG;
+ goto out;
+ }
+
+ phy->polarity_correction = true;
+
+ phy->is_mdix = true;
+ phy->cable_length = E1000_CABLE_LENGTH_UNDEFINED;
+ phy->local_rx = e1000_1000t_rx_status_ok;
+ phy->remote_rx = e1000_1000t_rx_status_ok;
+
+out:
+ return ret_val;
+}
diff --git a/drivers/net/ethernet/intel/igb/e1000_phy.h b/drivers/net/ethernet/intel/igb/e1000_phy.h
index 9b622b3..3b28873 100644
--- a/drivers/net/ethernet/intel/igb/e1000_phy.h
+++ b/drivers/net/ethernet/intel/igb/e1000_phy.h
@@ -61,6 +61,8 @@ s32 igb_phy_has_link(struct e1000_hw *hw, u32 iterations,
void igb_power_up_phy_copper(struct e1000_hw *hw);
void igb_power_down_phy_copper(struct e1000_hw *hw);
s32 igb_phy_init_script_igp3(struct e1000_hw *hw);
+s32 igb_phy_init_script_5461s(struct e1000_hw *hw);
+s32 igb_get_phy_info_5461s(struct e1000_hw *hw);
s32 igb_initialize_M88E1512_phy(struct e1000_hw *hw);
s32 igb_initialize_M88E1543_phy(struct e1000_hw *hw);
s32 igb_read_phy_reg_mdic(struct e1000_hw *hw, u32 offset, u16 *data);
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index d1a44a8..1399989 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -7730,11 +7730,19 @@ static int igb_mii_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd)
data->phy_id = adapter->hw.phy.addr;
break;
case SIOCGMIIREG:
+ adapter->hw.phy.addr = data->phy_id;
if (igb_read_phy_reg(&adapter->hw, data->reg_num & 0x1F,
&data->val_out))
return -EIO;
break;
case SIOCSMIIREG:
+ if (!capable(CAP_NET_ADMIN))
+ return -EPERM;
+ adapter->hw.phy.addr = data->phy_id;
+ if (igb_write_phy_reg(&adapter->hw, data->reg_num & 0x1F,
+ data->val_in))
+ return -EIO;
+ break;
default:
return -EOPNOTSUPP;
}

2
packages/base/any/kernels/4.14-lts/patches/series
View File

@@ -1 +1,3 @@
0001-drivers-i2c-muxes-pca954x-deselect-on-exit.patch
0002-driver-support-intel-igb-bcm5461S-phy.patch

2
packages/platforms/accton/x86-64/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/arch-vendor-modules.yml ARCH=amd64 VENDOR=accton KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/arch-vendor-modules.yml ARCH=amd64 VENDOR=accton KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := common

384
packages/platforms/accton/x86-64/modules/builds/optoe.c Normal file → Executable file
View File

@@ -21,16 +21,16 @@
* c) 256 bytes are mapped at a time. 'Lower page 00h' is the first 128
* bytes of address space, and always references the same
* location, independent of the page select register.
* All mapped pages are mapped into the upper 128 bytes
* All mapped pages are mapped into the upper 128 bytes
* (offset 128-255) of the i2c address.
* d) Devices with one I2C address (eg QSFP) use I2C address 0x50
* d) Devices with one I2C address (eg QSFP) use I2C address 0x50
* (A0h in the spec), and map all pages in the upper 128 bytes
* of that address.
* e) Devices with two I2C addresses (eg SFP) have 256 bytes of data
* at I2C address 0x50, and 256 bytes of data at I2C address
* 0x51 (A2h in the spec). Page selection and paged access
* only apply to this second I2C address (0x51).
* e) The address space is presented, by the driver, as a linear
* e) The address space is presented, by the driver, as a linear
* address space. For devices with one I2C client at address
* 0x50 (eg QSFP), offset 0-127 are in the lower
* half of address 50/A0h/client[0]. Offset 128-255 are in
@@ -39,7 +39,7 @@
* half, offset 0-127).
* f) For devices with two I2C clients at address 0x50 and 0x51 (eg SFP),
* the address space places offset 0-127 in the lower
* half of 50/A0/client[0], offset 128-255 in the upper
* half of 50/A0/client[0], offset 128-255 in the upper
* half. Offset 256-383 is in the lower half of 51/A2/client[1].
* Offset 384-511 is in page 0, in the upper half of 51/A2/...
* Offset 512-639 is in page 1, in the upper half of 51/A2/...
@@ -118,29 +118,6 @@
#include <linux/sysfs.h>
#include <linux/jiffies.h>
#include <linux/i2c.h>
#include <linux/types.h>
#include <linux/memory.h>
/*
* The optoe driver is for read/write access to the EEPROM on standard
* I2C based optical transceivers (SFP, QSFP, etc)
*
* While based on the at24 driver, it eliminates code that supports other
* types of I2C EEPROMs, and adds support for pages accessed through the
* page-select register at offset 127.
*/
struct optoe_platform_data {
u32 byte_len; /* size (sum of all addr) */
u16 page_size; /* for writes */
u8 flags;
void (*setup)(struct memory_accessor *, void *context);
void *context;
#ifdef EEPROM_CLASS
struct eeprom_platform_data *eeprom_data; /* extra data for the eeprom_class */
#endif
};
#ifdef EEPROM_CLASS
#include <linux/eeprom_class.h>
@@ -148,6 +125,22 @@ struct optoe_platform_data {
#include <linux/types.h>
/* The maximum length of a port name */
#define MAX_PORT_NAME_LEN 20
struct optoe_platform_data {
u32 byte_len; /* size (sum of all addr) */
u16 page_size; /* for writes */
u8 flags;
void *dummy1; /* backward compatibility */
void *dummy2; /* backward compatibility */
#ifdef EEPROM_CLASS
struct eeprom_platform_data *eeprom_data;
#endif
char port_name[MAX_PORT_NAME_LEN];
};
/* fundamental unit of addressing for EEPROM */
#define OPTOE_PAGE_SIZE 128
/*
@@ -158,13 +151,14 @@ struct optoe_platform_data {
#define OPTOE_ARCH_PAGES 256
#define ONE_ADDR_EEPROM_SIZE ((1 + OPTOE_ARCH_PAGES) * OPTOE_PAGE_SIZE)
#define ONE_ADDR_EEPROM_UNPAGED_SIZE (2 * OPTOE_PAGE_SIZE)
/*
/*
* Dual address devices (eg SFP) have 256 pages, plus the unpaged
* low 128 bytes, plus 256 bytes at 0x50. If the device does not
* low 128 bytes, plus 256 bytes at 0x50. If the device does not
* support paging, it is 4 'pages' long.
*/
#define TWO_ADDR_EEPROM_SIZE ((3 + OPTOE_ARCH_PAGES) * OPTOE_PAGE_SIZE)
#define TWO_ADDR_EEPROM_UNPAGED_SIZE (4 * OPTOE_PAGE_SIZE)
#define TWO_ADDR_NO_0X51_SIZE (2 * OPTOE_PAGE_SIZE)
/* a few constants to find our way around the EEPROM */
#define OPTOE_PAGE_SELECT_REG 0x7F
@@ -172,13 +166,15 @@ struct optoe_platform_data {
#define ONE_ADDR_NOT_PAGEABLE (1<<2)
#define TWO_ADDR_PAGEABLE_REG 0x40
#define TWO_ADDR_PAGEABLE (1<<4)
#define TWO_ADDR_0X51_REG 92
#define TWO_ADDR_0X51_SUPP (1<<6)
#define OPTOE_ID_REG 0
#define OPTOE_READ_OP 0
#define OPTOE_WRITE_OP 1
#define OPTOE_EOF 0 /* used for access beyond end of device */
/* The maximum length of a port name */
#define MAX_PORT_NAME_LEN 20
struct optoe_data {
struct optoe_platform_data chip;
struct memory_accessor macc;
int use_smbus;
char port_name[MAX_PORT_NAME_LEN];
@@ -191,9 +187,9 @@ struct optoe_data {
struct attribute_group attr_group;
u8 *writebuf;
unsigned write_max;
unsigned int write_max;
unsigned num_addresses;
unsigned int num_addresses;
#ifdef EEPROM_CLASS
struct eeprom_device *eeprom_dev;
@@ -205,10 +201,6 @@ struct optoe_data {
struct i2c_client *client[];
};
typedef enum optoe_opcode {
OPTOE_READ_OP = 0,
OPTOE_WRITE_OP = 1
} optoe_opcode_e;
/*
* This parameter is to help this driver avoid blocking other drivers out
@@ -219,13 +211,13 @@ typedef enum optoe_opcode {
*
* This value is forced to be a power of two so that writes align on pages.
*/
static unsigned io_limit = OPTOE_PAGE_SIZE;
static unsigned int io_limit = OPTOE_PAGE_SIZE;
/*
* specs often allow 5 msec for a page write, sometimes 20 msec;
* it's important to recover from write timeouts.
*/
static unsigned write_timeout = 25;
static unsigned int write_timeout = 25;
/*
* flags to distinguish one-address (QSFP family) from two-address (SFP family)
@@ -251,7 +243,7 @@ MODULE_DEVICE_TABLE(i2c, optoe_ids);
* Task is to calculate the client (0 = i2c addr 50, 1 = i2c addr 51),
* the page, and the offset.
*
* Handles both single address (eg QSFP) and two address (eg SFP).
* Handles both single address (eg QSFP) and two address (eg SFP).
* For SFP, offset 0-255 are on client[0], >255 is on client[1]
* Offset 256-383 are on the lower half of client[1]
* Pages are accessible on the upper half of client[1].
@@ -265,7 +257,7 @@ MODULE_DEVICE_TABLE(i2c, optoe_ids);
* Callers must not read/write beyond the end of a client or a page
* without recomputing the client/page. Hence offset (within page)
* plus length must be less than or equal to 128. (Note that this
* routine does not have access to the length of the call, hence
* routine does not have access to the length of the call, hence
* cannot do the validity check.)
*
* Offset within Lower Page 00h and Upper Page 00h are not recomputed
@@ -274,7 +266,7 @@ MODULE_DEVICE_TABLE(i2c, optoe_ids);
static uint8_t optoe_translate_offset(struct optoe_data *optoe,
loff_t *offset, struct i2c_client **client)
{
unsigned page = 0;
unsigned int page = 0;
*client = optoe->client[0];
@@ -283,7 +275,7 @@ static uint8_t optoe_translate_offset(struct optoe_data *optoe,
if (*offset > 255) {
/* like QSFP, but shifted to client[1] */
*client = optoe->client[1];
*offset -= 256;
*offset -= 256;
}
}
@@ -305,7 +297,7 @@ static uint8_t optoe_translate_offset(struct optoe_data *optoe,
static ssize_t optoe_eeprom_read(struct optoe_data *optoe,
struct i2c_client *client,
char *buf, unsigned offset, size_t count)
char *buf, unsigned int offset, size_t count)
{
struct i2c_msg msg[2];
u8 msgbuf[2];
@@ -393,21 +385,21 @@ static ssize_t optoe_eeprom_read(struct optoe_data *optoe,
return status;
/* REVISIT: at HZ=100, this is sloooow */
msleep(1);
usleep_range(1000, 2000);
} while (time_before(read_time, timeout));
return -ETIMEDOUT;
}
static ssize_t optoe_eeprom_write(struct optoe_data *optoe,
struct i2c_client *client,
struct i2c_client *client,
const char *buf,
unsigned offset, size_t count)
unsigned int offset, size_t count)
{
struct i2c_msg msg;
ssize_t status;
unsigned long timeout, write_time;
unsigned next_page_start;
unsigned int next_page_start;
int i = 0;
/* write max is at most a page
@@ -496,7 +488,7 @@ static ssize_t optoe_eeprom_write(struct optoe_data *optoe,
return count;
/* REVISIT: at HZ=100, this is sloooow */
msleep(1);
usleep_range(1000, 2000);
} while (time_before(write_time, timeout));
return -ETIMEDOUT;
@@ -504,8 +496,8 @@ static ssize_t optoe_eeprom_write(struct optoe_data *optoe,
static ssize_t optoe_eeprom_update_client(struct optoe_data *optoe,
char *buf, loff_t off,
size_t count, optoe_opcode_e opcode)
char *buf, loff_t off,
size_t count, int opcode)
{
struct i2c_client *client;
ssize_t retval = 0;
@@ -515,10 +507,10 @@ static ssize_t optoe_eeprom_update_client(struct optoe_data *optoe,
page = optoe_translate_offset(optoe, &phy_offset, &client);
dev_dbg(&client->dev,
"optoe_eeprom_update_client off %lld page:%d phy_offset:%lld, count:%ld, opcode:%d\n",
off, page, phy_offset, (long int) count, opcode);
"%s off %lld page:%d phy_offset:%lld, count:%ld, opcode:%d\n",
__func__, off, page, phy_offset, (long int) count, opcode);
if (page > 0) {
ret = optoe_eeprom_write(optoe, client, &page,
ret = optoe_eeprom_write(optoe, client, &page,
OPTOE_PAGE_SELECT_REG, 1);
if (ret < 0) {
dev_dbg(&client->dev,
@@ -553,13 +545,14 @@ static ssize_t optoe_eeprom_update_client(struct optoe_data *optoe,
if (page > 0) {
/* return the page register to page 0 (why?) */
page = 0;
ret = optoe_eeprom_write(optoe, client, &page,
ret = optoe_eeprom_write(optoe, client, &page,
OPTOE_PAGE_SELECT_REG, 1);
if (ret < 0) {
dev_err(&client->dev,
"Restore page register to 0 failed:%d!\n", ret);
/* error only if nothing has been transferred */
if (retval == 0) retval = ret;
if (retval == 0)
retval = ret;
}
}
return retval;
@@ -575,9 +568,9 @@ static ssize_t optoe_eeprom_update_client(struct optoe_data *optoe,
* Returns updated len for this access:
* - entire access is legal, original len is returned.
* - access begins legal but is too long, len is truncated to fit.
* - initial offset exceeds supported pages, return -EINVAL
* - initial offset exceeds supported pages, return OPTOE_EOF (zero)
*/
static ssize_t optoe_page_legal(struct optoe_data *optoe,
static ssize_t optoe_page_legal(struct optoe_data *optoe,
loff_t off, size_t len)
{
struct i2c_client *client = optoe->client[0];
@@ -585,24 +578,44 @@ static ssize_t optoe_page_legal(struct optoe_data *optoe,
int status;
size_t maxlen;
if (off < 0) return -EINVAL;
if (off < 0)
return -EINVAL;
if (optoe->dev_class == TWO_ADDR) {
/* SFP case */
/* if no pages needed, we're good */
if ((off + len) <= TWO_ADDR_EEPROM_UNPAGED_SIZE) return len;
/* if only using addr 0x50 (first 256 bytes) we're good */
if ((off + len) <= TWO_ADDR_NO_0X51_SIZE)
return len;
/* if offset exceeds possible pages, we're not good */
if (off >= TWO_ADDR_EEPROM_SIZE) return -EINVAL;
if (off >= TWO_ADDR_EEPROM_SIZE)
return OPTOE_EOF;
/* in between, are pages supported? */
status = optoe_eeprom_read(optoe, client, &regval,
status = optoe_eeprom_read(optoe, client, &regval,
TWO_ADDR_PAGEABLE_REG, 1);
if (status < 0) return status; /* error out (no module?) */
if (status < 0)
return status; /* error out (no module?) */
if (regval & TWO_ADDR_PAGEABLE) {
/* Pages supported, trim len to the end of pages */
maxlen = TWO_ADDR_EEPROM_SIZE - off;
} else {
/* pages not supported, trim len to unpaged size */
if (off >= TWO_ADDR_EEPROM_UNPAGED_SIZE) return -EINVAL;
maxlen = TWO_ADDR_EEPROM_UNPAGED_SIZE - off;
if (off >= TWO_ADDR_EEPROM_UNPAGED_SIZE)
return OPTOE_EOF;
/* will be accessing addr 0x51, is that supported? */
/* byte 92, bit 6 implies DDM support, 0x51 support */
status = optoe_eeprom_read(optoe, client, &regval,
TWO_ADDR_0X51_REG, 1);
if (status < 0)
return status;
if (regval & TWO_ADDR_0X51_SUPP) {
/* addr 0x51 is OK */
maxlen = TWO_ADDR_EEPROM_UNPAGED_SIZE - off;
} else {
/* addr 0x51 NOT supported, trim to 256 max */
if (off >= TWO_ADDR_NO_0X51_SIZE)
return OPTOE_EOF;
maxlen = TWO_ADDR_NO_0X51_SIZE - off;
}
}
len = (len > maxlen) ? maxlen : len;
dev_dbg(&client->dev,
@@ -611,16 +624,20 @@ static ssize_t optoe_page_legal(struct optoe_data *optoe,
} else {
/* QSFP case */
/* if no pages needed, we're good */
if ((off + len) <= ONE_ADDR_EEPROM_UNPAGED_SIZE) return len;
if ((off + len) <= ONE_ADDR_EEPROM_UNPAGED_SIZE)
return len;
/* if offset exceeds possible pages, we're not good */
if (off >= ONE_ADDR_EEPROM_SIZE) return -EINVAL;
if (off >= ONE_ADDR_EEPROM_SIZE)
return OPTOE_EOF;
/* in between, are pages supported? */
status = optoe_eeprom_read(optoe, client, &regval,
status = optoe_eeprom_read(optoe, client, &regval,
ONE_ADDR_PAGEABLE_REG, 1);
if (status < 0) return status; /* error out (no module?) */
if (status < 0)
return status; /* error out (no module?) */
if (regval & ONE_ADDR_NOT_PAGEABLE) {
/* pages not supported, trim len to unpaged size */
if (off >= ONE_ADDR_EEPROM_UNPAGED_SIZE) return -EINVAL;
if (off >= ONE_ADDR_EEPROM_UNPAGED_SIZE)
return OPTOE_EOF;
maxlen = ONE_ADDR_EEPROM_UNPAGED_SIZE - off;
} else {
/* Pages supported, trim len to the end of pages */
@@ -635,7 +652,7 @@ static ssize_t optoe_page_legal(struct optoe_data *optoe,
}
static ssize_t optoe_read_write(struct optoe_data *optoe,
char *buf, loff_t off, size_t len, optoe_opcode_e opcode)
char *buf, loff_t off, size_t len, int opcode)
{
struct i2c_client *client = optoe->client[0];
int chunk;
@@ -645,8 +662,9 @@ static ssize_t optoe_read_write(struct optoe_data *optoe,
loff_t chunk_offset = 0, chunk_start_offset = 0;
dev_dbg(&client->dev,
"optoe_read_write: off %lld len:%ld, opcode:%s\n",
off, (long int) len, (opcode == OPTOE_READ_OP) ? "r": "w");
"%s: off %lld len:%ld, opcode:%s\n",
__func__, off, (long int) len,
(opcode == OPTOE_READ_OP) ? "r" : "w");
if (unlikely(!len))
return len;
@@ -655,13 +673,14 @@ static ssize_t optoe_read_write(struct optoe_data *optoe,
* from this host, but not from other I2C masters.
*/
mutex_lock(&optoe->lock);
/*
* Confirm this access fits within the device suppored addr range
* Confirm this access fits within the device suppored addr range
*/
status = optoe_page_legal(optoe, off, len);
if (status < 0) {
goto err;
if ((status == OPTOE_EOF) || (status < 0)) {
mutex_unlock(&optoe->lock);
return status;
}
len = status;
@@ -670,7 +689,7 @@ static ssize_t optoe_read_write(struct optoe_data *optoe,
* separate call to sff_eeprom_update_client(), to
* ensure that each access recalculates the client/page
* and writes the page register as needed.
* Note that chunk to page mapping is confusing, is different for
* Note that chunk to page mapping is confusing, is different for
* QSFP and SFP, and never needs to be done. Don't try!
*/
pending_len = len; /* amount remaining to transfer */
@@ -711,18 +730,22 @@ static ssize_t optoe_read_write(struct optoe_data *optoe,
off, (long int) len, chunk_start_offset, chunk_offset,
(long int) chunk_len, (long int) pending_len);
/*
* note: chunk_offset is from the start of the EEPROM,
* not the start of the chunk
/*
* note: chunk_offset is from the start of the EEPROM,
* not the start of the chunk
*/
status = optoe_eeprom_update_client(optoe, buf,
status = optoe_eeprom_update_client(optoe, buf,
chunk_offset, chunk_len, opcode);
if (status != chunk_len) {
/* This is another 'no device present' path */
dev_dbg(&client->dev,
"optoe_update_client for chunk %d chunk_offset %lld chunk_len %ld failed %d!\n",
chunk, chunk_offset, (long int) chunk_len, status);
goto err;
dev_dbg(&client->dev,
"o_u_c: chunk %d c_offset %lld c_len %ld failed %d!\n",
chunk, chunk_offset, (long int) chunk_len, status);
if (status > 0)
retval += status;
if (retval == 0)
retval = status;
break;
}
buf += status;
pending_len -= status;
@@ -731,11 +754,6 @@ static ssize_t optoe_read_write(struct optoe_data *optoe,
mutex_unlock(&optoe->lock);
return retval;
err:
mutex_unlock(&optoe->lock);
return status;
}
static ssize_t optoe_bin_read(struct file *filp, struct kobject *kobj,
@@ -760,34 +778,6 @@ static ssize_t optoe_bin_write(struct file *filp, struct kobject *kobj,
return optoe_read_write(optoe, buf, off, count, OPTOE_WRITE_OP);
}
/*-------------------------------------------------------------------------*/
/*
* This lets other kernel code access the eeprom data. For example, it
* might hold a board's Ethernet address, or board-specific calibration
* data generated on the manufacturing floor.
*/
static ssize_t optoe_macc_read(struct memory_accessor *macc,
char *buf, off_t offset, size_t count)
{
struct optoe_data *optoe = container_of(macc,
struct optoe_data, macc);
return optoe_read_write(optoe, buf, offset, count, OPTOE_READ_OP);
}
static ssize_t optoe_macc_write(struct memory_accessor *macc,
const char *buf, off_t offset, size_t count)
{
struct optoe_data *optoe = container_of(macc,
struct optoe_data, macc);
return optoe_read_write(optoe, (char *) buf, offset,
count, OPTOE_WRITE_OP);
}
/*-------------------------------------------------------------------------*/
static int optoe_remove(struct i2c_client *client)
{
@@ -810,6 +800,51 @@ static int optoe_remove(struct i2c_client *client)
return 0;
}
static ssize_t show_dev_class(struct device *dev,
struct device_attribute *dattr, char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
struct optoe_data *optoe = i2c_get_clientdata(client);
ssize_t count;
mutex_lock(&optoe->lock);
count = sprintf(buf, "%d\n", optoe->dev_class);
mutex_unlock(&optoe->lock);
return count;
}
static ssize_t set_dev_class(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct optoe_data *optoe = i2c_get_clientdata(client);
int dev_class;
/*
* dev_class is actually the number of i2c addresses used, thus
* legal values are "1" (QSFP class) and "2" (SFP class)
*/
if (kstrtoint(buf, 0, &dev_class) != 0 ||
dev_class < 1 || dev_class > 2)
return -EINVAL;
mutex_lock(&optoe->lock);
optoe->dev_class = dev_class;
mutex_unlock(&optoe->lock);
return count;
}
/*
* if using the EEPROM CLASS driver, we don't report a port_name,
* the EEPROM CLASS drive handles that. Hence all this code is
* only compiled if we are NOT using the EEPROM CLASS driver.
*/
#ifndef EEPROM_CLASS
static ssize_t show_port_name(struct device *dev,
struct device_attribute *dattr, char *buf)
{
@@ -844,51 +879,15 @@ static ssize_t set_port_name(struct device *dev,
return count;
}
static DEVICE_ATTR(port_name, S_IRUGO | S_IWUSR,
show_port_name, set_port_name);
static DEVICE_ATTR(port_name, 0644, show_port_name, set_port_name);
#endif /* if NOT defined EEPROM_CLASS, the common case */
static ssize_t show_dev_class(struct device *dev,
struct device_attribute *dattr, char *buf)
{
struct i2c_client *client = to_i2c_client(dev);
struct optoe_data *optoe = i2c_get_clientdata(client);
ssize_t count;
mutex_lock(&optoe->lock);
count = sprintf(buf, "%d\n", optoe->dev_class);
mutex_unlock(&optoe->lock);
return count;
}
static ssize_t set_dev_class(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct optoe_data *optoe = i2c_get_clientdata(client);
int dev_class;
/*
* dev_class is actually the number of sfp ports used, thus
* legal values are "1" (QSFP class) and "2" (SFP class)
*/
if (sscanf(buf, "%d", &dev_class) != 1 ||
dev_class < 1 || dev_class > 2)
return -EINVAL;
mutex_lock(&optoe->lock);
optoe->dev_class = dev_class;
mutex_unlock(&optoe->lock);
return count;
}
static DEVICE_ATTR(dev_class, S_IRUGO | S_IWUSR,
show_dev_class, set_dev_class);
static DEVICE_ATTR(dev_class, 0644, show_dev_class, set_dev_class);
static struct attribute *optoe_attrs[] = {
#ifndef EEPROM_CLASS
&dev_attr_port_name.attr,
#endif
&dev_attr_dev_class.attr,
NULL,
};
@@ -905,7 +904,7 @@ static int optoe_probe(struct i2c_client *client,
struct optoe_platform_data chip;
struct optoe_data *optoe;
int num_addresses = 0;
int i = 0;
char port_name[MAX_PORT_NAME_LEN];
if (client->addr != 0x50) {
dev_dbg(&client->dev, "probe, bad i2c addr: 0x%x\n",
@@ -916,16 +915,23 @@ static int optoe_probe(struct i2c_client *client,
if (client->dev.platform_data) {
chip = *(struct optoe_platform_data *)client->dev.platform_data;
dev_dbg(&client->dev, "probe, chip provided, flags:0x%x; name: %s\n", chip.flags, client->name);
/* take the port name from the supplied platform data */
#ifdef EEPROM_CLASS
strncpy(port_name, chip.eeprom_data->label, MAX_PORT_NAME_LEN);
#else
memcpy(port_name, chip.port_name, MAX_PORT_NAME_LEN);
#endif
dev_dbg(&client->dev,
"probe, chip provided, flags:0x%x; name: %s\n",
chip.flags, client->name);
} else {
if (!id->driver_data) {
err = -ENODEV;
goto exit;
}
dev_dbg(&client->dev, "probe, building chip\n");
strcpy(port_name, "unitialized");
chip.flags = 0;
chip.setup = NULL;
chip.context = NULL;
#ifdef EEPROM_CLASS
chip.eeprom_data = NULL;
#endif
@@ -965,7 +971,7 @@ static int optoe_probe(struct i2c_client *client,
mutex_init(&optoe->lock);
/* determine whether this is a one-address or two-address module */
if ((strcmp(client->name, "optoe1") == 0) ||
if ((strcmp(client->name, "optoe1") == 0) ||
(strcmp(client->name, "sff8436") == 0)) {
/* one-address (eg QSFP) family */
optoe->dev_class = ONE_ADDR;
@@ -985,7 +991,7 @@ static int optoe_probe(struct i2c_client *client,
optoe->use_smbus = use_smbus;
optoe->chip = chip;
optoe->num_addresses = num_addresses;
strcpy(optoe->port_name, "unitialized");
memcpy(optoe->port_name, port_name, MAX_PORT_NAME_LEN);
/*
* Export the EEPROM bytes through sysfs, since that's convenient.
@@ -993,12 +999,10 @@ static int optoe_probe(struct i2c_client *client,
*/
sysfs_bin_attr_init(&optoe->bin);
optoe->bin.attr.name = "eeprom";
optoe->bin.attr.mode = S_IRUGO;
optoe->bin.attr.mode = 0444;
optoe->bin.read = optoe_bin_read;
optoe->bin.size = chip.byte_len;
optoe->macc.read = optoe_macc_read;
if (!use_smbus ||
(i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_WRITE_I2C_BLOCK)) ||
@@ -1013,12 +1017,10 @@ static int optoe_probe(struct i2c_client *client,
* 2 byte writes are acceptable for PE and Vout changes per
* Application Note AN-2071.
*/
unsigned write_max = 1;
optoe->macc.write = optoe_macc_write;
unsigned int write_max = 1;
optoe->bin.write = optoe_bin_write;
optoe->bin.attr.mode |= S_IWUSR;
optoe->bin.attr.mode |= 0200;
if (write_max > io_limit)
write_max = io_limit;
@@ -1033,19 +1035,17 @@ static int optoe_probe(struct i2c_client *client,
goto exit_kfree;
}
} else {
dev_warn(&client->dev,
"cannot write due to controller restrictions.");
dev_warn(&client->dev,
"cannot write due to controller restrictions.");
}
optoe->client[0] = client;
/* use a dummy I2C device for two-address chips */
for (i = 1; i < num_addresses; i++) {
optoe->client[i] = i2c_new_dummy(client->adapter,
client->addr + i);
if (!optoe->client[i]) {
dev_err(&client->dev, "address 0x%02x unavailable\n",
client->addr + i);
/* SFF-8472 spec requires that the second I2C address be 0x51 */
if (num_addresses == 2) {
optoe->client[1] = i2c_new_dummy(client->adapter, 0x51);
if (!optoe->client[1]) {
dev_err(&client->dev, "address 0x51 unavailable\n");
err = -EADDRINUSE;
goto err_struct;
}
@@ -1063,6 +1063,7 @@ static int optoe_probe(struct i2c_client *client,
dev_err(&client->dev, "failed to create sysfs attribute group.\n");
goto err_struct;
}
#ifdef EEPROM_CLASS
optoe->eeprom_dev = eeprom_device_register(&client->dev,
chip.eeprom_data);
@@ -1081,14 +1082,11 @@ static int optoe_probe(struct i2c_client *client,
if (use_smbus == I2C_SMBUS_WORD_DATA ||
use_smbus == I2C_SMBUS_BYTE_DATA) {
dev_notice(&client->dev, "Falling back to %s reads, "
"performance will suffer\n", use_smbus ==
I2C_SMBUS_WORD_DATA ? "word" : "byte");
dev_notice(&client->dev,
"Falling back to %s reads, performance will suffer\n",
use_smbus == I2C_SMBUS_WORD_DATA ? "word" : "byte");
}
if (chip.setup)
chip.setup(&optoe->macc, chip.context);
return 0;
#ifdef EEPROM_CLASS
@@ -1098,9 +1096,9 @@ err_sysfs_cleanup:
#endif
err_struct:
for (i = 1; i < num_addresses; i++) {
if (optoe->client[i])
i2c_unregister_device(optoe->client[i]);
if (num_addresses == 2) {
if (optoe->client[1])
i2c_unregister_device(optoe->client[1]);
}
kfree(optoe->writebuf);

2
packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5512-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5512-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5512-54x

5
packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/modules/builds/x86-64-accton-as5512-54x-leds.c
View File

@@ -32,11 +32,6 @@
extern int accton_i2c_cpld_read(unsigned short cpld_addr, u8 reg);
extern int accton_i2c_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as5512_54x_led"
struct accton_as5512_54x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as5512-54x/platform-config/r0/src/lib/x86-64-accton-as5512-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5512-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5712-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5712-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5712-54x

157
packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/modules/builds/x86-64-accton-as5712-54x-cpld.c
View File

@@ -1,7 +1,8 @@
/*
* I2C multiplexer
* An I2C multiplexer dirver for accton as5712 CPLD
*
* Copyright (C) Brandon Chuang <brandon_chuang@accton.com.tw>
* Copyright (C) 2015 Accton Technology Corporation.
* Brandon Chuang <brandon_chuang@accton.com.tw>
*
* This module supports the accton cpld that hold the channel select
* mechanism for other i2c slave devices, such as SFP.
@@ -46,8 +47,6 @@
#define CPLD_CHANNEL_SELECT_REG 0x2
#define CPLD_DESELECT_CHANNEL 0xFF
#define ACCTON_I2C_CPLD_MUX_MAX_NCHANS NUM_OF_CPLD3_CHANS
static LIST_HEAD(cpld_client_list);
static struct mutex list_lock;
@@ -64,7 +63,7 @@ enum cpld_mux_type {
struct as5712_54x_cpld_data {
enum cpld_mux_type type;
struct i2c_adapter *virt_adaps[ACCTON_I2C_CPLD_MUX_MAX_NCHANS];
struct i2c_client *client;
u8 last_chan; /* last register value */
struct device *hwmon_dev;
@@ -595,8 +594,9 @@ static ssize_t show_present_all(struct device *dev, struct device_attribute *da,
int i, status, num_regs = 0;
u8 values[4] = {0};
u8 regs[] = {0x6, 0x7, 0x8, 0x14};
struct i2c_client *client = to_i2c_client(dev);
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -638,8 +638,9 @@ static ssize_t show_rxlos_all(struct device *dev, struct device_attribute *da,
int i, status;
u8 values[3] = {0};
u8 regs[] = {0xF, 0x10, 0x11};
struct i2c_client *client = to_i2c_client(dev);
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -668,7 +669,8 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
int status = 0;
u8 reg = 0, mask = 0, revert = 0;
@@ -819,8 +821,9 @@ static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
long disable;
int status;
u8 reg = 0, mask = 0;
@@ -890,10 +893,11 @@ exit:
static ssize_t access(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
int status;
u32 addr, val;
struct i2c_client *client = to_i2c_client(dev);
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
return -EINVAL;
@@ -949,32 +953,34 @@ static int as5712_54x_cpld_mux_reg_write(struct i2c_adapter *adap,
return res;
}
static int as5712_54x_cpld_mux_select_chan(struct i2c_adapter *adap,
void *client, u32 chan)
static int as5712_54x_cpld_mux_select_chan(struct i2c_mux_core *muxc,
u32 chan)
{
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
u8 regval;
int ret = 0;
regval = chan;
/* Only select the channel if its different from the last channel */
regval = chan;
/* Only select the channel if its different from the last channel */
if (data->last_chan != regval) {
ret = as5712_54x_cpld_mux_reg_write(adap, client, regval);
ret = as5712_54x_cpld_mux_reg_write(muxc->parent, client, regval);
data->last_chan = regval;
}
return ret;
}
static int as5712_54x_cpld_mux_deselect_mux(struct i2c_adapter *adap,
void *client, u32 chan)
static int as5712_54x_cpld_mux_deselect_mux(struct i2c_mux_core *muxc,
u32 chan)
{
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
/* Deselect active channel */
data->last_chan = chips[data->type].deselectChan;
return as5712_54x_cpld_mux_reg_write(adap, client, data->last_chan);
return as5712_54x_cpld_mux_reg_write(muxc->parent, client, data->last_chan);
}
static void as5712_54x_cpld_add_client(struct i2c_client *client)
@@ -1001,8 +1007,7 @@ static void as5712_54x_cpld_remove_client(struct i2c_client *client)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client == client) {
@@ -1039,44 +1044,43 @@ static ssize_t show_version(struct device *dev, struct device_attribute *attr, c
static int as5712_54x_cpld_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int chan=0;
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int num, force, class;
struct i2c_mux_core *muxc;
struct as5712_54x_cpld_data *data;
int ret = -ENODEV;
const struct attribute_group *group = NULL;
int ret = 0;
const struct attribute_group *group = NULL;
if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
goto exit;
return -ENODEV;
data = kzalloc(sizeof(struct as5712_54x_cpld_data), GFP_KERNEL);
if (!data) {
ret = -ENOMEM;
goto exit;
}
muxc = i2c_mux_alloc(adap, &client->dev,
chips[id->driver_data].nchans, sizeof(*data), 0,
as5712_54x_cpld_mux_select_chan, as5712_54x_cpld_mux_deselect_mux);
if (!muxc)
return -ENOMEM;
i2c_set_clientdata(client, data);
i2c_set_clientdata(client, muxc);
data = i2c_mux_priv(muxc);
data->client = client;
data->type = id->driver_data;
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
mutex_init(&data->update_lock);
data->type = id->driver_data;
if (data->type == as5712_54x_cpld2 || data->type == as5712_54x_cpld3) {
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
/* Now create an adapter for each channel */
for (num = 0; num < chips[data->type].nchans; num++) {
force = 0; /* dynamic adap number */
class = 0; /* no class by default */
/* Now create an adapter for each channel */
for (chan = 0; chan < chips[data->type].nchans; chan++) {
data->virt_adaps[chan] = i2c_add_mux_adapter(adap, &client->dev, client, 0, chan, 0,
as5712_54x_cpld_mux_select_chan,
as5712_54x_cpld_mux_deselect_mux);
ret = i2c_mux_add_adapter(muxc, force, num, class);
if (data->virt_adaps[chan] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "failed to register multiplexed adapter %d\n", chan);
goto exit_mux_register;
}
}
dev_info(&client->dev, "registered %d multiplexed busses for I2C mux %s\n",
chan, client->name);
}
if (ret) {
dev_err(&client->dev,
"failed to register multiplexed adapter"
" %d as bus %d\n", num, force);
goto add_mux_failed;
}
}
/* Register sysfs hooks */
switch (data->type) {
@@ -1095,33 +1099,37 @@ static int as5712_54x_cpld_mux_probe(struct i2c_client *client,
default:
break;
}
if (group) {
ret = sysfs_create_group(&client->dev.kobj, group);
if (ret) {
goto exit_mux_register;
goto add_mux_failed;
}
}
if (chips[data->type].nchans) {
dev_info(&client->dev,
"registered %d multiplexed busses for I2C %s\n",
num, client->name);
}
else {
dev_info(&client->dev,
"device %s registered\n", client->name);
}
as5712_54x_cpld_add_client(client);
return 0;
exit_mux_register:
for (chan--; chan >= 0; chan--) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
}
kfree(data);
exit:
add_mux_failed:
i2c_mux_del_adapters(muxc);
return ret;
}
static int as5712_54x_cpld_mux_remove(struct i2c_client *client)
{
struct as5712_54x_cpld_data *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type];
int chan;
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5712_54x_cpld_data *data = i2c_mux_priv(muxc);
const struct attribute_group *group = NULL;
as5712_54x_cpld_remove_client(client);
@@ -1145,14 +1153,7 @@ static int as5712_54x_cpld_mux_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, group);
}
for (chan = 0; chan < chip->nchans; ++chan) {
if (data->virt_adaps[chan]) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
data->virt_adaps[chan] = NULL;
}
}
kfree(data);
i2c_mux_del_adapters(muxc);
return 0;
}
@@ -1201,8 +1202,7 @@ int as5712_54x_cpld_read(unsigned short cpld_addr, u8 reg)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {
@@ -1225,8 +1225,7 @@ int as5712_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {
@@ -1263,7 +1262,7 @@ static void __exit as5712_54x_cpld_mux_exit(void)
}
MODULE_AUTHOR("Brandon Chuang <brandon_chuang@accton.com.tw>");
MODULE_DESCRIPTION("Accton I2C CPLD mux driver");
MODULE_DESCRIPTION("Accton as5712-54x CPLD driver");
MODULE_LICENSE("GPL");
module_init(as5712_54x_cpld_mux_init);

5
packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/modules/builds/x86-64-accton-as5712-54x-leds.c
View File

@@ -32,11 +32,6 @@
extern int as5712_54x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as5712_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as5712_54x_led"
struct accton_as5712_54x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as5712-54x/platform-config/r0/src/lib/x86-64-accton-as5712-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5712-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5812-54t ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5812-54t ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5812-54t

5
packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/modules/builds/x86-64-accton-as5812-54t-leds.c
View File

@@ -32,11 +32,6 @@
extern int as5812_54t_cpld_read(unsigned short cpld_addr, u8 reg);
extern int as5812_54t_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as5812_54t_led"
struct accton_as5812_54t_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54t/platform-config/r0/src/lib/x86-64-accton-as5812-54t-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5812-54t-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5812-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5812-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5812-54x

149
packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/modules/builds/x86-64-accton-as5812-54x-cpld.c
View File

@@ -65,7 +65,7 @@ enum cpld_mux_type {
struct as5812_54x_cpld_data {
enum cpld_mux_type type;
struct i2c_adapter *virt_adaps[ACCTON_I2C_CPLD_MUX_MAX_NCHANS];
struct i2c_client *client;
u8 last_chan; /* last register value */
struct device *hwmon_dev;
@@ -100,7 +100,6 @@ static const struct i2c_device_id as5812_54x_cpld_mux_id[] = {
{ }
};
MODULE_DEVICE_TABLE(i2c, as5812_54x_cpld_mux_id);
#define TRANSCEIVER_PRESENT_ATTR_ID(index) MODULE_PRESENT_##index
#define TRANSCEIVER_TXDISABLE_ATTR_ID(index) MODULE_TXDISABLE_##index
#define TRANSCEIVER_RXLOS_ATTR_ID(index) MODULE_RXLOS_##index
@@ -596,8 +595,9 @@ static ssize_t show_present_all(struct device *dev, struct device_attribute *da,
int i, status, num_regs = 0;
u8 values[4] = {0};
u8 regs[] = {0x6, 0x7, 0x8, 0x14};
struct i2c_client *client = to_i2c_client(dev);
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -639,8 +639,9 @@ static ssize_t show_rxlos_all(struct device *dev, struct device_attribute *da,
int i, status;
u8 values[3] = {0};
u8 regs[] = {0xF, 0x10, 0x11};
struct i2c_client *client = to_i2c_client(dev);
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -669,7 +670,8 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
int status = 0;
u8 reg = 0, mask = 0, revert = 0;
@@ -820,8 +822,9 @@ static ssize_t set_tx_disable(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
long disable;
int status;
u8 reg = 0, mask = 0;
@@ -891,10 +894,11 @@ exit:
static ssize_t access(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
int status;
u32 addr, val;
struct i2c_client *client = to_i2c_client(dev);
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
return -EINVAL;
@@ -916,7 +920,6 @@ exit:
mutex_unlock(&data->update_lock);
return status;
}
/* Write to mux register. Don't use i2c_transfer()/i2c_smbus_xfer()
for this as they will try to lock adapter a second time */
static int as5812_54x_cpld_mux_reg_write(struct i2c_adapter *adap,
@@ -950,32 +953,35 @@ static int as5812_54x_cpld_mux_reg_write(struct i2c_adapter *adap,
return res;
}
static int as5812_54x_cpld_mux_select_chan(struct i2c_adapter *adap,
void *client, u32 chan)
static int as5812_54x_cpld_mux_select_chan(struct i2c_mux_core *muxc,
u32 chan)
{
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
u8 regval;
int ret = 0;
regval = chan;
/* Only select the channel if its different from the last channel */
if (data->last_chan != regval) {
ret = as5812_54x_cpld_mux_reg_write(adap, client, regval);
ret = as5812_54x_cpld_mux_reg_write(muxc->parent, client, regval);
data->last_chan = regval;
}
return ret;
}
static int as5812_54x_cpld_mux_deselect_mux(struct i2c_adapter *adap,
void *client, u32 chan)
static int as5812_54x_cpld_mux_deselect_mux(struct i2c_mux_core *muxc,
u32 chan)
{
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
/* Deselect active channel */
data->last_chan = chips[data->type].deselectChan;
return as5812_54x_cpld_mux_reg_write(adap, client, data->last_chan);
return as5812_54x_cpld_mux_reg_write(muxc->parent, client, data->last_chan);
}
static void as5812_54x_cpld_add_client(struct i2c_client *client)
@@ -1002,8 +1008,7 @@ static void as5812_54x_cpld_remove_client(struct i2c_client *client)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client == client) {
@@ -1040,44 +1045,43 @@ static ssize_t show_version(struct device *dev, struct device_attribute *attr, c
static int as5812_54x_cpld_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int chan=0;
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int num, force, class;
struct i2c_mux_core *muxc;
struct as5812_54x_cpld_data *data;
int ret = -ENODEV;
const struct attribute_group *group = NULL;
int ret = 0;
const struct attribute_group *group = NULL;
if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
goto exit;
return -ENODEV;
data = kzalloc(sizeof(struct as5812_54x_cpld_data), GFP_KERNEL);
if (!data) {
ret = -ENOMEM;
goto exit;
}
muxc = i2c_mux_alloc(adap, &client->dev,
chips[id->driver_data].nchans, sizeof(*data), 0,
as5812_54x_cpld_mux_select_chan, as5812_54x_cpld_mux_deselect_mux);
if (!muxc)
return -ENOMEM;
i2c_set_clientdata(client, data);
i2c_set_clientdata(client, muxc);
data = i2c_mux_priv(muxc);
data->client = client;
data->type = id->driver_data;
data->last_chan = CPLD_DESELECT_CHANNEL; /* force the first selection */
mutex_init(&data->update_lock);
data->type = id->driver_data;
if (data->type == as5812_54x_cpld2 || data->type == as5812_54x_cpld3) {
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
/* Now create an adapter for each channel */
for (num = 0; num < chips[data->type].nchans; num++) {
force = 0; /* dynamic adap number */
class = 0; /* no class by default */
/* Now create an adapter for each channel */
for (chan = 0; chan < chips[data->type].nchans; chan++) {
data->virt_adaps[chan] = i2c_add_mux_adapter(adap, &client->dev, client, 0, chan, 0,
as5812_54x_cpld_mux_select_chan,
as5812_54x_cpld_mux_deselect_mux);
ret = i2c_mux_add_adapter(muxc, force, num, class);
if (data->virt_adaps[chan] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "failed to register multiplexed adapter %d\n", chan);
goto exit_mux_register;
}
}
dev_info(&client->dev, "registered %d multiplexed busses for I2C mux %s\n",
chan, client->name);
}
if (ret) {
dev_err(&client->dev,
"failed to register multiplexed adapter"
" %d as bus %d\n", num, force);
goto add_mux_failed;
}
}
/* Register sysfs hooks */
switch (data->type) {
@@ -1096,33 +1100,37 @@ static int as5812_54x_cpld_mux_probe(struct i2c_client *client,
default:
break;
}
if (group) {
ret = sysfs_create_group(&client->dev.kobj, group);
if (ret) {
goto exit_mux_register;
goto add_mux_failed;
}
}
if (chips[data->type].nchans) {
dev_info(&client->dev,
"registered %d multiplexed busses for I2C %s\n",
num, client->name);
}
else {
dev_info(&client->dev,
"device %s registered\n", client->name);
}
as5812_54x_cpld_add_client(client);
return 0;
exit_mux_register:
for (chan--; chan >= 0; chan--) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
}
kfree(data);
exit:
add_mux_failed:
i2c_mux_del_adapters(muxc);
return ret;
}
static int as5812_54x_cpld_mux_remove(struct i2c_client *client)
{
struct as5812_54x_cpld_data *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type];
int chan;
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as5812_54x_cpld_data *data = i2c_mux_priv(muxc);
const struct attribute_group *group = NULL;
as5812_54x_cpld_remove_client(client);
@@ -1146,14 +1154,7 @@ static int as5812_54x_cpld_mux_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, group);
}
for (chan = 0; chan < chip->nchans; ++chan) {
if (data->virt_adaps[chan]) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
data->virt_adaps[chan] = NULL;
}
}
kfree(data);
i2c_mux_del_adapters(muxc);
return 0;
}
@@ -1202,8 +1203,7 @@ int as5812_54x_cpld_read(unsigned short cpld_addr, u8 reg)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {
@@ -1226,8 +1226,7 @@ int as5812_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {
@@ -1264,7 +1263,7 @@ static void __exit as5812_54x_cpld_mux_exit(void)
}
MODULE_AUTHOR("Brandon Chuang <brandon_chuang@accton.com.tw>");
MODULE_DESCRIPTION("Accton I2C CPLD mux driver");
MODULE_DESCRIPTION("Accton as5812-54x CPLD driver");
MODULE_LICENSE("GPL");
module_init(as5812_54x_cpld_mux_init);

5
packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/modules/builds/x86-64-accton-as5812-54x-leds.c
View File

@@ -32,11 +32,6 @@
extern int as5812_54x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as5812_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as5812_54x_led"
struct accton_as5812_54x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as5812-54x/platform-config/r0/src/lib/x86-64-accton-as5812-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5812-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5822-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5822-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5822-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5822-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5822-54x

2
packages/platforms/accton/x86-64/x86-64-accton-as5822-54x/platform-config/r0/src/lib/x86-64-accton-as5822-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5822-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5912-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5912-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5912-54x

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54x/platform-config/r0/src/lib/x86-64-accton-as5912-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5912-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54xk/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5912-54xk ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5912-54xk ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54xk/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5912-54xk

2
packages/platforms/accton/x86-64/x86-64-accton-as5912-54xk/platform-config/r0/src/lib/x86-64-accton-as5912-54xk-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5912-54xk-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5916-54x

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54x/platform-config/r1/src/lib/x86-64-accton-as5916-54x-r1.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5916-54x-r1:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xk/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54xk ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54xk ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xk/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5916-54xk

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xk/platform-config/r1/src/lib/x86-64-accton-as5916-54xk-r1.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5916-54xk-r1:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54xm ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as5916-54xm ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as5916-54xm

24
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/onlp/builds/src/module/src/sysi.c
View File

@@ -26,6 +26,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <onlplib/i2c.h>
#include <onlplib/file.h>
#include <onlp/platformi/sysi.h>
#include <onlp/platformi/ledi.h>
@@ -55,17 +56,26 @@ onlp_sysi_platform_get(void)
int
onlp_sysi_onie_data_get(uint8_t** data, int* size)
{
int ret = ONLP_STATUS_OK;
int i = 0;
uint8_t* rdata = aim_zmalloc(256);
if(onlp_file_read(rdata, 256, size, IDPROM_PATH) == ONLP_STATUS_OK) {
if(*size == 256) {
*data = rdata;
return ONLP_STATUS_OK;
for (i = 0; i < 128; i++) {
ret = onlp_i2c_readw(0, 0x56, i*2, ONLP_I2C_F_FORCE);
if (ret < 0) {
aim_free(rdata);
*size = 0;
return ret;
}
rdata[i*2] = ret & 0xff;
rdata[i*2+1] = (ret >> 8) & 0xff;
}
aim_free(rdata);
*size = 0;
return ONLP_STATUS_E_INTERNAL;
*size = 256;
*data = rdata;
return ONLP_STATUS_OK;
}
int

2
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/platform-config/r0/src/lib/x86-64-accton-as5916-54xm-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as5916-54xm-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

3
packages/platforms/accton/x86-64/x86-64-accton-as5916-54xm/platform-config/r0/src/python/x86_64_accton_as5916_54xm_r0/__init__.py
View File

@@ -17,9 +17,6 @@ class OnlPlatform_x86_64_accton_as5916_54xm_r0(OnlPlatformAccton,
self.new_i2c_devices([
# initialize multiplexer (PCA9548)
('pca9548', 0x77, 0),
# initiate IDPROM
('24c02', 0x56, 0),
])
self.new_i2c_devices([

2
packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as6712-32x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as6712-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as6712-32x

137
packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/modules/builds/x86-64-accton-as6712-32x-cpld.c
View File

@@ -44,9 +44,6 @@
#define NUM_OF_CPLD2_CHANS 0x10
#define NUM_OF_CPLD3_CHANS 0x10
#define CPLD_CHANNEL_SELECT_REG 0x2
#define CPLD_DESELECT_CHANNEL 0xFF
#define ACCTON_I2C_CPLD_MUX_MAX_NCHANS NUM_OF_CPLD3_CHANS
static LIST_HEAD(cpld_client_list);
static struct mutex list_lock;
@@ -64,7 +61,7 @@ enum cpld_mux_type {
struct as6712_32x_cpld_data {
enum cpld_mux_type type;
struct i2c_adapter *virt_adaps[ACCTON_I2C_CPLD_MUX_MAX_NCHANS];
struct i2c_client *client;
u8 last_chan; /* last register value */
struct device *hwmon_dev;
@@ -273,8 +270,9 @@ static ssize_t show_present_all(struct device *dev, struct device_attribute *da,
int i, status;
u8 values[2] = {0};
u8 regs[] = {0xA, 0xB};
struct i2c_client *client = to_i2c_client(dev);
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -303,7 +301,8 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
int status = 0;
u8 reg = 0, mask = 0;
@@ -345,10 +344,11 @@ exit:
static ssize_t access(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
int status;
u32 addr, val;
struct i2c_client *client = to_i2c_client(dev);
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
return -EINVAL;
@@ -404,32 +404,34 @@ static int as6712_32x_cpld_mux_reg_write(struct i2c_adapter *adap,
return res;
}
static int as6712_32x_cpld_mux_select_chan(struct i2c_adapter *adap,
void *client, u32 chan)
static int as6712_32x_cpld_mux_select_chan(struct i2c_mux_core *muxc,
u32 chan)
{
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
u8 regval;
int ret = 0;
regval = chan;
/* Only select the channel if its different from the last channel */
if (data->last_chan != regval) {
ret = as6712_32x_cpld_mux_reg_write(adap, client, regval);
ret = as6712_32x_cpld_mux_reg_write(muxc->parent, client, regval);
data->last_chan = regval;
}
return ret;
}
static int as6712_32x_cpld_mux_deselect_mux(struct i2c_adapter *adap,
void *client, u32 chan)
static int as6712_32x_cpld_mux_deselect_mux(struct i2c_mux_core *muxc,
u32 chan)
{
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
/* Deselect active channel */
data->last_chan = chips[data->type].deselectChan;
return as6712_32x_cpld_mux_reg_write(adap, client, data->last_chan);
return as6712_32x_cpld_mux_reg_write(muxc->parent, client, data->last_chan);
}
static void as6712_32x_cpld_add_client(struct i2c_client *client)
@@ -456,8 +458,7 @@ static void as6712_32x_cpld_remove_client(struct i2c_client *client)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client == client) {
@@ -494,44 +495,43 @@ static ssize_t show_version(struct device *dev, struct device_attribute *attr, c
static int as6712_32x_cpld_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int chan=0;
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int num, force, class;
struct i2c_mux_core *muxc;
struct as6712_32x_cpld_data *data;
int ret = -ENODEV;
const struct attribute_group *group = NULL;
int ret = 0;
const struct attribute_group *group = NULL;
if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
goto exit;
return -ENODEV;
data = kzalloc(sizeof(struct as6712_32x_cpld_data), GFP_KERNEL);
if (!data) {
ret = -ENOMEM;
goto exit;
}
muxc = i2c_mux_alloc(adap, &client->dev,
chips[id->driver_data].nchans, sizeof(*data), 0,
as6712_32x_cpld_mux_select_chan, as6712_32x_cpld_mux_deselect_mux);
if (!muxc)
return -ENOMEM;
i2c_set_clientdata(client, data);
i2c_set_clientdata(client, muxc);
data = i2c_mux_priv(muxc);
data->client = client;
data->type = id->driver_data;
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
mutex_init(&data->update_lock);
data->type = id->driver_data;
if (data->type == as6712_32x_cpld2 || data->type == as6712_32x_cpld3) {
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
/* Now create an adapter for each channel */
for (num = 0; num < chips[data->type].nchans; num++) {
force = 0; /* dynamic adap number */
class = 0; /* no class by default */
/* Now create an adapter for each channel */
for (chan = 0; chan < chips[data->type].nchans; chan++) {
data->virt_adaps[chan] = i2c_add_mux_adapter(adap, &client->dev, client, 0, chan, 0,
as6712_32x_cpld_mux_select_chan,
as6712_32x_cpld_mux_deselect_mux);
ret = i2c_mux_add_adapter(muxc, force, num, class);
if (data->virt_adaps[chan] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "failed to register multiplexed adapter %d\n", chan);
goto exit_mux_register;
}
}
dev_info(&client->dev, "registered %d multiplexed busses for I2C mux %s\n",
chan, client->name);
}
if (ret) {
dev_err(&client->dev,
"failed to register multiplexed adapter"
" %d as bus %d\n", num, force);
goto add_mux_failed;
}
}
/* Register sysfs hooks */
switch (data->type) {
@@ -547,33 +547,37 @@ static int as6712_32x_cpld_mux_probe(struct i2c_client *client,
default:
break;
}
if (group) {
ret = sysfs_create_group(&client->dev.kobj, group);
if (ret) {
goto exit_mux_register;
goto add_mux_failed;
}
}
if (chips[data->type].nchans) {
dev_info(&client->dev,
"registered %d multiplexed busses for I2C %s\n",
num, client->name);
}
else {
dev_info(&client->dev,
"device %s registered\n", client->name);
}
as6712_32x_cpld_add_client(client);
return 0;
exit_mux_register:
for (chan--; chan >= 0; chan--) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
}
kfree(data);
exit:
add_mux_failed:
i2c_mux_del_adapters(muxc);
return ret;
}
static int as6712_32x_cpld_mux_remove(struct i2c_client *client)
{
struct as6712_32x_cpld_data *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type];
int chan;
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6712_32x_cpld_data *data = i2c_mux_priv(muxc);
const struct attribute_group *group = NULL;
as6712_32x_cpld_remove_client(client);
@@ -597,14 +601,7 @@ static int as6712_32x_cpld_mux_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, group);
}
for (chan = 0; chan < chip->nchans; ++chan) {
if (data->virt_adaps[chan]) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
data->virt_adaps[chan] = NULL;
}
}
kfree(data);
i2c_mux_del_adapters(muxc);
return 0;
}
@@ -653,8 +650,7 @@ int as6712_32x_cpld_read(unsigned short cpld_addr, u8 reg)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {
@@ -677,8 +673,7 @@ int as6712_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {

5
packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/modules/builds/x86-64-accton-as6712-32x-leds.c
View File

@@ -32,11 +32,6 @@
extern int as6712_32x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as6712_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as6712_32x_led"
struct accton_as6712_32x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as6712-32x/platform-config/r0/src/lib/x86-64-accton-as6712-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as6712-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as6812-32x

135
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/modules/builds/x86-64-accton-as6812-32x-cpld.c
View File

@@ -45,9 +45,6 @@
#define NUM_OF_CPLD2_CHANS 0x10
#define NUM_OF_CPLD3_CHANS 0x10
#define CPLD_CHANNEL_SELECT_REG 0x2
#define CPLD_DESELECT_CHANNEL 0xFF
#define ACCTON_I2C_CPLD_MUX_MAX_NCHANS NUM_OF_CPLD3_CHANS
static LIST_HEAD(cpld_client_list);
static struct mutex list_lock;
@@ -65,7 +62,7 @@ enum cpld_mux_type {
struct as6812_32x_cpld_data {
enum cpld_mux_type type;
struct i2c_adapter *virt_adaps[ACCTON_I2C_CPLD_MUX_MAX_NCHANS];
struct i2c_client *client;
u8 last_chan; /* last register value */
struct device *hwmon_dev;
@@ -274,8 +271,9 @@ static ssize_t show_present_all(struct device *dev, struct device_attribute *da,
int i, status;
u8 values[2] = {0};
u8 regs[] = {0xA, 0xB};
struct i2c_client *client = to_i2c_client(dev);
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
mutex_lock(&data->update_lock);
@@ -304,7 +302,8 @@ static ssize_t show_status(struct device *dev, struct device_attribute *da,
{
struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
struct i2c_client *client = to_i2c_client(dev);
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
int status = 0;
u8 reg = 0, mask = 0;
@@ -346,10 +345,11 @@ exit:
static ssize_t access(struct device *dev, struct device_attribute *da,
const char *buf, size_t count)
{
struct i2c_client *client = to_i2c_client(dev);
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
int status;
u32 addr, val;
struct i2c_client *client = to_i2c_client(dev);
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
if (sscanf(buf, "0x%x 0x%x", &addr, &val) != 2) {
return -EINVAL;
@@ -405,32 +405,34 @@ static int as6812_32x_cpld_mux_reg_write(struct i2c_adapter *adap,
return res;
}
static int as6812_32x_cpld_mux_select_chan(struct i2c_adapter *adap,
void *client, u32 chan)
static int as6812_32x_cpld_mux_select_chan(struct i2c_mux_core *muxc,
u32 chan)
{
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
u8 regval;
int ret = 0;
regval = chan;
/* Only select the channel if its different from the last channel */
if (data->last_chan != regval) {
ret = as6812_32x_cpld_mux_reg_write(adap, client, regval);
ret = as6812_32x_cpld_mux_reg_write(muxc->parent, client, regval);
data->last_chan = regval;
}
return ret;
}
static int as6812_32x_cpld_mux_deselect_mux(struct i2c_adapter *adap,
void *client, u32 chan)
static int as6812_32x_cpld_mux_deselect_mux(struct i2c_mux_core *muxc,
u32 chan)
{
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
struct i2c_client *client = data->client;
/* Deselect active channel */
data->last_chan = chips[data->type].deselectChan;
return as6812_32x_cpld_mux_reg_write(adap, client, data->last_chan);
return as6812_32x_cpld_mux_reg_write(muxc->parent, client, data->last_chan);
}
static void as6812_32x_cpld_add_client(struct i2c_client *client)
@@ -457,9 +459,8 @@ static void as6812_32x_cpld_remove_client(struct i2c_client *client)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
cpld_node = list_entry(list_node, struct cpld_client_node, list);
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client == client) {
found = 1;
@@ -495,44 +496,43 @@ static ssize_t show_version(struct device *dev, struct device_attribute *attr, c
static int as6812_32x_cpld_mux_probe(struct i2c_client *client,
const struct i2c_device_id *id)
{
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int chan=0;
struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
int num, force, class;
struct i2c_mux_core *muxc;
struct as6812_32x_cpld_data *data;
int ret = -ENODEV;
const struct attribute_group *group = NULL;
int ret = 0;
const struct attribute_group *group = NULL;
if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
goto exit;
return -ENODEV;
data = kzalloc(sizeof(struct as6812_32x_cpld_data), GFP_KERNEL);
if (!data) {
ret = -ENOMEM;
goto exit;
}
muxc = i2c_mux_alloc(adap, &client->dev,
chips[id->driver_data].nchans, sizeof(*data), 0,
as6812_32x_cpld_mux_select_chan, as6812_32x_cpld_mux_deselect_mux);
if (!muxc)
return -ENOMEM;
i2c_set_clientdata(client, data);
i2c_set_clientdata(client, muxc);
data = i2c_mux_priv(muxc);
data->client = client;
data->type = id->driver_data;
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
mutex_init(&data->update_lock);
data->type = id->driver_data;
if (data->type == as6812_32x_cpld2 || data->type == as6812_32x_cpld3) {
data->last_chan = chips[data->type].deselectChan; /* force the first selection */
/* Now create an adapter for each channel */
for (num = 0; num < chips[data->type].nchans; num++) {
force = 0; /* dynamic adap number */
class = 0; /* no class by default */
/* Now create an adapter for each channel */
for (chan = 0; chan < chips[data->type].nchans; chan++) {
data->virt_adaps[chan] = i2c_add_mux_adapter(adap, &client->dev, client, 0, chan, 0,
as6812_32x_cpld_mux_select_chan,
as6812_32x_cpld_mux_deselect_mux);
ret = i2c_mux_add_adapter(muxc, force, num, class);
if (data->virt_adaps[chan] == NULL) {
ret = -ENODEV;
dev_err(&client->dev, "failed to register multiplexed adapter %d\n", chan);
goto exit_mux_register;
}
}
dev_info(&client->dev, "registered %d multiplexed busses for I2C mux %s\n",
chan, client->name);
}
if (ret) {
dev_err(&client->dev,
"failed to register multiplexed adapter"
" %d as bus %d\n", num, force);
goto add_mux_failed;
}
}
/* Register sysfs hooks */
switch (data->type) {
@@ -553,28 +553,33 @@ static int as6812_32x_cpld_mux_probe(struct i2c_client *client,
if (group) {
ret = sysfs_create_group(&client->dev.kobj, group);
if (ret) {
goto exit_mux_register;
goto add_mux_failed;
}
}
if (chips[data->type].nchans) {
dev_info(&client->dev,
"registered %d multiplexed busses for I2C %s\n",
num, client->name);
}
else {
dev_info(&client->dev,
"device %s registered\n", client->name);
}
as6812_32x_cpld_add_client(client);
return 0;
exit_mux_register:
for (chan--; chan >= 0; chan--) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
}
kfree(data);
exit:
add_mux_failed:
i2c_mux_del_adapters(muxc);
return ret;
}
static int as6812_32x_cpld_mux_remove(struct i2c_client *client)
{
struct as6812_32x_cpld_data *data = i2c_get_clientdata(client);
const struct chip_desc *chip = &chips[data->type];
int chan;
struct i2c_mux_core *muxc = i2c_get_clientdata(client);
struct as6812_32x_cpld_data *data = i2c_mux_priv(muxc);
const struct attribute_group *group = NULL;
as6812_32x_cpld_remove_client(client);
@@ -598,14 +603,7 @@ static int as6812_32x_cpld_mux_remove(struct i2c_client *client)
sysfs_remove_group(&client->dev.kobj, group);
}
for (chan = 0; chan < chip->nchans; ++chan) {
if (data->virt_adaps[chan]) {
i2c_del_mux_adapter(data->virt_adaps[chan]);
data->virt_adaps[chan] = NULL;
}
}
kfree(data);
i2c_mux_del_adapters(muxc);
return 0;
}
@@ -654,8 +652,7 @@ int as6812_32x_cpld_read(unsigned short cpld_addr, u8 reg)
mutex_lock(&list_lock);
list_for_each(list_node, &cpld_client_list)
{
list_for_each(list_node, &cpld_client_list) {
cpld_node = list_entry(list_node, struct cpld_client_node, list);
if (cpld_node->client->addr == cpld_addr) {

2
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/modules/builds/x86-64-accton-as6812-32x-fan.c
View File

@@ -396,7 +396,7 @@ static struct platform_driver accton_as6812_32x_fan_driver = {
static int __init accton_as6812_32x_fan_init(void)
{
int ret;
ret = platform_driver_register(&accton_as6812_32x_fan_driver);
if (ret < 0) {
goto exit;

5
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/modules/builds/x86-64-accton-as6812-32x-leds.c
View File

@@ -32,11 +32,6 @@
extern int as6812_32x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as6812_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as6812_32x_led"
struct accton_as6812_32x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as6812-32x/platform-config/r0/src/lib/x86-64-accton-as6812-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as6812-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7312-54x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7312-54x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7312-54x

5
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/modules/builds/x86-64-accton-as7312-54x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7312_54x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7312_54x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7312_54x_led"
struct accton_as7312_54x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54x/platform-config/r0/src/lib/x86-64-accton-as7312-54x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7312-54x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54xs/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7312-54xs ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7312-54xs ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54xs/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7312-54xs

5
packages/platforms/accton/x86-64/x86-64-accton-as7312-54xs/modules/builds/x86-64-accton-as7312-54xs-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7312_54xs_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7312_54xs_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7312_54xs_led"
struct accton_as7312_54xs_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7312-54xs/platform-config/r0/src/lib/x86-64-accton-as7312-54xs-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7312-54xs-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7326-56x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7326-56x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7326-56x

5
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/modules/builds/x86-64-accton-as7326-56x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7326_56x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7326_56x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7326_56x_led"
struct accton_as7326_56x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7326-56x/platform-config/r0/src/lib/x86-64-accton-as7326-56x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7326-56x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7512-32x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7512-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7512-32x

2
packages/platforms/accton/x86-64/x86-64-accton-as7512-32x/platform-config/r0/src/lib/x86-64-accton-as7512-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7512-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7712-32x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7712-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7712-32x

5
packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/modules/builds/x86-64-accton-as7712-32x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7712_32x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7712_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7712_32x_led"
struct accton_as7712_32x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7712-32x/platform-config/r0/src/lib/x86-64-accton-as7712-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7712-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7716-32x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7716-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7716-32x

5
packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/modules/builds/x86-64-accton-as7716-32x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7716_32x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7716_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7716_32x_led"
struct accton_as7716_32x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7716-32x/platform-config/r0/src/lib/x86-64-accton-as7716-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7716-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7726-32x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7726-32x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7726-32x

5
packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/modules/builds/x86-64-accton-as7726-32x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7726_32x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7726_32x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "accton_as7726_32x_led"
struct accton_as7726_32x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7726-32x/platform-config/r0/src/lib/x86-64-accton-as7726-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7726-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-as7816-64x/modules/PKG.yml
View File

@@ -1 +1 @@
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7816-64x ARCH=amd64 KERNELS="onl-kernel-3.16-lts-x86-64-all:amd64"
!include $ONL_TEMPLATES/platform-modules.yml VENDOR=accton BASENAME=x86-64-accton-as7816-64x ARCH=amd64 KERNELS="onl-kernel-4.14-lts-x86-64-all:amd64"

2
packages/platforms/accton/x86-64/x86-64-accton-as7816-64x/modules/builds/Makefile
View File

@@ -1,4 +1,4 @@
KERNELS := onl-kernel-3.16-lts-x86-64-all:amd64
KERNELS := onl-kernel-4.14-lts-x86-64-all:amd64
KMODULES := $(wildcard *.c)
VENDOR := accton
BASENAME := x86-64-accton-as7816-64x

5
packages/platforms/accton/x86-64/x86-64-accton-as7816-64x/modules/builds/x86-64-accton-as7816-64x-leds.c
View File

@@ -33,11 +33,6 @@
extern int as7816_64x_cpld_read (unsigned short cpld_addr, u8 reg);
extern int as7816_64x_cpld_write(unsigned short cpld_addr, u8 reg, u8 value);
extern void led_classdev_unregister(struct led_classdev *led_cdev);
extern int led_classdev_register(struct device *parent, struct led_classdev *led_cdev);
extern void led_classdev_resume(struct led_classdev *led_cdev);
extern void led_classdev_suspend(struct led_classdev *led_cdev);
#define DRVNAME "as7816_64x_led"
struct as7816_64x_led_data {

2
packages/platforms/accton/x86-64/x86-64-accton-as7816-64x/platform-config/r0/src/lib/x86-64-accton-as7816-64x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-as7816-64x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-wedge-16x/platform-config/r0/src/lib/x86-64-accton-wedge-16x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-wedge-16x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-wedge100-32x/platform-config/r0/src/lib/x86-64-accton-wedge100-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-wedge100-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-wedge100bf-32x/platform-config/r0/src/lib/x86-64-accton-wedge100bf-32x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-wedge100bf-32x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-accton-wedge100bf-65x/platform-config/r0/src/lib/x86-64-accton-wedge100bf-65x-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-accton-wedge100bf-65x-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat

2
packages/platforms/accton/x86-64/x86-64-facebook-wedge100/platform-config/r0/src/lib/x86-64-facebook-wedge100-r0.yml
View File

@@ -18,7 +18,7 @@ x86-64-facebook-wedge100-r0:
--stop=1
kernel:
<<: *kernel-3-16
<<: *kernel-4-14
args: >-
nopat