Re: [linux-yocto] Trial merge of v5.15.153 v6.1.83 for linux-yocto
In message: Trial merge of v5.15.153 v6.1.83 for linux-yocto on 27/03/2024 Kevin Hao wrote: > Hi Bruce, > > This is a trial merge of the stable kernel v5.15.153 v6.1.83 for the > following branches in the linux-yocto. > 205fb9414e6e v5.15/standard/sdkv5.10/axxia > 979be40c2ae5 v5.15/standard/preempt-rt/sdkv5.10/axxia > 74734259970f v5.15/standard/base > bb72fca17f4f v5.15/standard/preempt-rt/base > a9974f629f77 v5.15/standard/cn-sdkv5.4/octeon > 035c7daab2b7 v5.15/standard/preempt-rt/cn-sdkv5.4/octeon > b74aa0a8024d v5.15/standard/cn-sdkv5.15/octeon > 74297e0728f6 v5.15/standard/preempt-rt/cn-sdkv5.15/octeon > 29b806be96ce v5.15/standard/ti-sdk-5.10/ti-j72xx > f01334cdb2af v5.15/standard/preempt-rt/ti-sdk-5.10/ti-j72xx > 9e053973d336 v5.15/standard/nxp-sdk-5.15/nxp-soc > 4a93d86880fd v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-soc > e03d5d89e932 v5.15/standard/bcm-2xxx-rpi > b37087646460 v5.15/standard/preempt-rt/bcm-2xxx-rpi > ab3c32d818b9 v5.15/standard/nxp-sdk-5.15/nxp-s32g > edc5f2992f04 v5.15/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > a36ecee67619 v5.15/standard/intel-sdk-5.15/intel-socfpga > eda03308ec1b v5.15/standard/preempt-rt/intel-sdk-5.15/intel-socfpga > e4660c0705bd v5.15/standard/x86 > 4580de5a9dda v5.15/standard/preempt-rt/x86 > ea5b0ec91334 v5.15/standard/sdkv5.15/xlnx-soc > 61f2756657c7 v5.15/standard/preempt-rt/sdkv5.15/xlnx-soc > 2510a62351e0 v6.1/standard/sdkv5.10/axxia > 78197ec0c0cd v6.1/standard/preempt-rt/sdkv5.10/axxia > d32dd2590616 v6.1/standard/base > 2890500e8e88 v6.1/standard/preempt-rt/base > 1c83c7f6dfd4 v6.1/standard/ti-sdk-6.1/ti-j7xxx >#Have textual and semantic conflicts > 546a458e9c00 v6.1/standard/preempt-rt/ti-sdk-6.1/ti-j7xxx >#Have textual and semantic conflicts > 0007023c27e7 v6.1/standard/nxp-sdk-6.1/nxp-soc > c94ce1a29154 v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc > 24dd25d562cc v6.1/standard/cn-sdkv5.15/octeon >#Have textual and semantic conflicts > 953e77082395 v6.1/standard/preempt-rt/cn-sdkv5.15/octeon >#Have textual and semantic conflicts > f4affd3d699a v6.1/standard/microchip-polarfire-soc > d36420705bfe v6.1/standard/preempt-rt/microchip-polarfire-soc > 2402072fe574 v6.1/standard/bcm-2xxx-rpi > 8cbeb6bb9bd3 v6.1/standard/preempt-rt/bcm-2xxx-rpi > d920a160b2cd v6.1/standard/nxp-sdk-5.15/nxp-s32g > ed009ed30a24 v6.1/standard/preempt-rt/nxp-sdk-5.15/nxp-s32g > ee963980bc2a v6.1/standard/intel-sdk-6.1/intel-socfpga > 40d48601784d v6.1/standard/preempt-rt/intel-sdk-6.1/intel-socfpga > 3361bb9de599 v6.1/standard/x86 > 83245bce963e v6.1/standard/preempt-rt/x86 > 7cab8e94e5a9 v6.1/standard/sdkv6.1/xlnx-soc > 38579581e000 v6.1/standard/preempt-rt/sdkv6.1/xlnx-soc > > I am surprised that there are no merge conflicts on v5.15 branches, despite > having over > 300 patches in v5.15.153. All the merge conflicts come from v6.1.83. > > - The merge conflict on j7xx looks trivial, but we should note that there is > semantic > conflict here. We need to adjust the change in stable according to the change > in the SDK. > > - The merge conflicts on octeon branch are quite ugly, part of the reason is > that we > moved the resctrl from arch/x86/kernel/cpu to fs/, and another part is the > significant > changes to the octeontx2 Ethernet driver caused by v6.1.83. Thanks Kevin, I had a few challenges during the merge, but I did end up doing a force merge of your resolution to ensure that the octone branches match (at least that is what my git diff is telling me) I did just create add a new BSP, and it has issues: v6.1/standard/cn-sdkv6.1/octeon v6.1/standard/preempt-rt/cn-sdkv6.1/octeon For now, I've excluded them from the update, so they'll need to be resolved and sent separately. Bruce > > All the branches have passed my build test. I have pushed all these branches > to: > https://github.com/haokexin/linux > > You can use this as a reference for the linux-yocto stable kernel bump. > > Thanks, > Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13756): https://lists.yoctoproject.org/g/linux-yocto/message/13756 Mute This Topic: https://lists.yoctoproject.org/mt/105175729/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto] [linux-yocto v6.1] nxp-soc: Fix two build warnings
In message: [linux-yocto v6.1] nxp-soc: Fix two build warnings
on 27/03/2024 Kevin Hao wrote:
> From: Kevin Hao
>
> Hi Bruce,
>
> This patch series fixes two build warnings introduced by SDK commit
> 20932f1f83d3 ("fec_ecat: add fec native driver for raw packet proto").
>
> Please help me merge them onto the following two branches:
> v6.1/standard/nxp-sdk-6.1/nxp-soc
> v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc
merged.
Bruce
>
> Kevin Hao (2):
> af_packet: Delete the unused variable 'sk'
> net: Delete the unused variable in __sys_recvfrom()
>
> net/packet/af_packet.c | 2 --
> net/socket.c | 2 +-
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> --
> 2.44.0
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13755):
https://lists.yoctoproject.org/g/linux-yocto/message/13755
Mute This Topic: https://lists.yoctoproject.org/mt/105175660/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][linux-yocto v6.1/standard/nxp-sdk-6.1/nxp-soc & v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH] fec_ecat: Fix build warning in fec_ecat.c
merged.
Bruce
In message: [linux-yocto][linux-yocto v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH] fec_ecat: Fix build
warning in fec_ecat.c
on 28/03/2024 Xiaolei Wang wrote:
> commit ("fec_ecat: add fec native driver for raw packet prot"),
> introduced many warnings, which comes from the SDK, Since too
> many warnings are introduced by this file, this patch fixes all
> warnings.
>
> Signed-off-by: Xiaolei Wang
> ---
> drivers/net/ethernet/freescale/fec_ecat.c | 131 ++
> 1 file changed, 7 insertions(+), 124 deletions(-)
>
> diff --git a/drivers/net/ethernet/freescale/fec_ecat.c
> b/drivers/net/ethernet/freescale/fec_ecat.c
> index 86eb3341105b..06e0b22e710d 100644
> --- a/drivers/net/ethernet/freescale/fec_ecat.c
> +++ b/drivers/net/ethernet/freescale/fec_ecat.c
> @@ -316,15 +316,6 @@ static int fec_enet_get_bd_index(struct bufdesc *bdp,
> return ((const char *)bdp - (const char *)bd->base) >> bd->dsize_log2;
> }
>
> -static void swap_buffer(void *bufaddr, int len)
> -{
> - int i;
> - unsigned int *buf = bufaddr;
> -
> - for (i = 0; i < len; i += 4, buf++)
> - swab32s(buf);
> -}
> -
> static void swap_buffer2(void *dst_buf, void *src_buf, int len)
> {
> int i;
> @@ -383,7 +374,8 @@ static int fec_ecat_txq_submit_buff(struct
> fec_enet_priv_tx_q *txq,
> skb = txq->tx_skbuff[index];
> bufaddr = skb->data;
> buflen = len;
> - copy_from_user(skb->data, buff, len);
> + if(copy_from_user(skb->data, buff, len))
> + return -EFAULT;
> bdp->cbd_datlen = cpu_to_fec16(buflen);
> /* Push the data cache so the CPM does not get stale memory data. */
> dma_sync_single_for_device(>pdev->dev,
> @@ -424,7 +416,6 @@ static void fec_ecat_tx_queue(struct net_device *ndev)
> struct bufdesc *bdp;
> unsigned short status;
> struct fec_enet_priv_tx_q *txq = fep->tx_queue;
> - int index = 0;
>
> /* get next bdp of dirty_tx */
> bdp = txq->dirty_tx;
> @@ -487,7 +478,6 @@ static void fec_enet_bd_init(struct net_device *dev)
> struct fec_enet_priv_rx_q *rxq = fep->rx_queue;
> struct bufdesc *bdp;
> int i;
> - struct sk_buff *skb;
>
> /* Initialize the receive buffer descriptors. */
> bdp = rxq->bd.base;
> @@ -713,44 +703,6 @@ static int fec_enet_ipc_handle_init(struct
> fec_enet_private *fep)
> return imx_scu_get_handle(>ipc_handle);
> }
>
> -static void fec_enet_ipg_stop_set(struct fec_enet_private *fep, bool enabled)
> -{
> - struct device_node *np = fep->pdev->dev.of_node;
> - u32 rsrc_id, val;
> - int idx;
> -
> - if (!np || !fep->ipc_handle)
> - return;
> -
> - idx = of_alias_get_id(np, "ethernet");
> - if (idx < 0)
> - idx = 0;
> - rsrc_id = idx ? IMX_SC_R_ENET_1 : IMX_SC_R_ENET_0;
> -
> - val = enabled ? 1 : 0;
> - imx_sc_misc_set_control(fep->ipc_handle, rsrc_id, IMX_SC_C_IPG_STOP,
> val);
> -}
> -
> -static void fec_enet_stop_mode(struct fec_enet_private *fep, bool enabled)
> -{
> - struct fec_platform_data *pdata = fep->pdev->dev.platform_data;
> - struct fec_stop_mode_gpr *stop_gpr = >stop_gpr;
> -
> - if (stop_gpr->gpr) {
> - if (enabled)
> - regmap_update_bits(stop_gpr->gpr, stop_gpr->reg,
> -BIT(stop_gpr->bit),
> -BIT(stop_gpr->bit));
> - else
> - regmap_update_bits(stop_gpr->gpr, stop_gpr->reg,
> -BIT(stop_gpr->bit), 0);
> - } else if (pdata && pdata->sleep_mode_enable) {
> - pdata->sleep_mode_enable(enabled);
> - } else {
> - fec_enet_ipg_stop_set(fep, enabled);
> - }
> -}
> -
> static inline void fec_irqs_disable(struct net_device *ndev)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> @@ -762,7 +714,6 @@ static void
> fec_stop(struct net_device *ndev)
> {
> struct fec_enet_private *fep = netdev_priv(ndev);
> - u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8);
>
> /* We cannot expect a graceful transmit stop without link !!! */
> if (fep->link) {
> @@ -821,7 +772,6 @@ static int fec_ecat_recv_from_queue(struct net_device
> *ndev, void __user *buff,
> int recv_len = 0;
> int index = 0;
> boolneed_swap = fep->quirks & FEC_QUIRK_SWAP_FRAME;
> - int ret = 0;
>
> #ifdef CONFIG_M532x
> flush_cache_all();
> @@ -885,7 +835,8 @@ static int fec_ecat_recv_from_queue(struct net_device
> *ndev, void __user *buff,
> if (data[12] ==0x88 && data[13] ==0xa4) {
> len = len < pkt_len? len : pkt_len;
> if (!need_swap) {
> - copy_to_user(buff, data, len);
> + if(copy_to_user(buff, data, len))
Re: [linux-yocto] [kernel-cache][PATCH 1/3] bsp/genericarm64: enable support for Xilinx KV260
merged. SRCREV bumps will follow shortly. Bruce In message: [linux-yocto] [kernel-cache][PATCH 1/3] bsp/genericarm64: enable support for Xilinx KV260 on 27/03/2024 Ross Burton wrote: > From: Ross Burton > > Add more config options so that the Xilinx KV260 is fully supported. > > This work was done by Bill Mills , I simply > integrated it. > > Signed-off-by: Ross Burton > --- > bsp/genericarm64/genericarm64-gpio.cfg | 13 +- > bsp/genericarm64/genericarm64-i2c.cfg | 6 +- > bsp/genericarm64/genericarm64.cfg | 161 - > 3 files changed, 170 insertions(+), 10 deletions(-) > > diff --git a/bsp/genericarm64/genericarm64-gpio.cfg > b/bsp/genericarm64/genericarm64-gpio.cfg > index b7a94890..126b193f 100644 > --- a/bsp/genericarm64/genericarm64-gpio.cfg > +++ b/bsp/genericarm64/genericarm64-gpio.cfg > @@ -1,6 +1,9 @@ > +# GPIO Support > # Memory mapped GPIO drivers > # Altera GPIO > CONFIG_GPIO_ALTERA=m > +# Cadence GPIO support > +CONFIG_GPIO_CADENCE=m > # TI Davinci/Keystone GPIO support > CONFIG_GPIO_DAVINCI=m > # Synopsys DesignWare APB GPIO driver > @@ -17,6 +20,8 @@ CONFIG_GPIO_PL061=m > CONFIG_GPIO_RCAR=m > # GPIO based on SYSCON > CONFIG_GPIO_SYSCON=m > +# Cavium ThunderX/OCTEON-TX GPIO > +CONFIG_GPIO_THUNDERX=m > # UniPhier GPIO support > CONFIG_GPIO_UNIPHIER=m > # Toshiba Visconti GPIO support > @@ -25,6 +30,10 @@ CONFIG_GPIO_VISCONTI=m > CONFIG_GPIO_XGENE=y > # APM X-Gene GPIO standby controller support > CONFIG_GPIO_XGENE_SB=m > +# Xilinx GPIO support > +CONFIG_GPIO_XILINX=m > +# Xilinx Zynq GPIO support > +CONFIG_GPIO_ZYNQ=m > > # I2C GPIO expanders > # MAX7319, MAX7320-7327 I2C Port Expanders > @@ -41,5 +50,5 @@ CONFIG_GPIO_BD9571MWV=m > CONFIG_GPIO_MAX77620=m > # Kontron sl28cpld GPIO support > CONFIG_GPIO_SL28CPLD=m > -# Cavium ThunderX/OCTEON-TX GPIO > -CONFIG_GPIO_THUNDERX=m > +# TI TPS65086 GPO > +CONFIG_GPIO_TPS65086=m > diff --git a/bsp/genericarm64/genericarm64-i2c.cfg > b/bsp/genericarm64/genericarm64-i2c.cfg > index 6294579c..46777402 100644 > --- a/bsp/genericarm64/genericarm64-i2c.cfg > +++ b/bsp/genericarm64/genericarm64-i2c.cfg > @@ -53,9 +53,11 @@ CONFIG_I2C_S3C2410=m > CONFIG_I2C_SH_MOBILE=m > # NVIDIA Tegra internal I2C controller > CONFIG_I2C_TEGRA=m > -# Cavium ThunderX I2C bus support > -CONFIG_I2C_THUNDERX=m > # UniPhier FIFO-builtin I2C controller > CONFIG_I2C_UNIPHIER_F=m > +# Cavium ThunderX I2C bus support > +CONFIG_I2C_THUNDERX=m > +# Xilinx I2C Controller > +CONFIG_I2C_XILINX=m > # Renesas R-Car I2C Controller > CONFIG_I2C_RCAR=m > diff --git a/bsp/genericarm64/genericarm64.cfg > b/bsp/genericarm64/genericarm64.cfg > index 773ba6db..9cda73c8 100644 > --- a/bsp/genericarm64/genericarm64.cfg > +++ b/bsp/genericarm64/genericarm64.cfg > @@ -87,15 +87,27 @@ CONFIG_QORIQ_CPUFREQ=m > # ACPI (Advanced Configuration and Power Interface) Support > CONFIG_ACPI=y > > +# Memory Management options > +# Contiguous Memory Allocator > +CONFIG_CMA=y > + > +# Networking support > +# CAN bus subsystem support > +CONFIG_CAN=m > + > # Device Drivers > # PCI support > # PCI controller drivers > -# Generic PCI host controller > -CONFIG_PCI_HOST_GENERIC=m > # Cavium Thunder PCIe controller to off-chip devices > CONFIG_PCI_HOST_THUNDER_PEM=y > # Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon > CONFIG_PCI_HOST_THUNDER_ECAM=y > +# Generic PCI host controller > +CONFIG_PCI_HOST_GENERIC=m > +# Xilinx AXI PCIe controller > +CONFIG_PCIE_XILINX=y > +# Xilinx NWL PCIe controller > +CONFIG_PCIE_XILINX_NWL=y > > # DesignWare-based PCIe controllers > # Freescale i.MX6/7/8 PCIe controller (host mode) > @@ -104,6 +116,9 @@ CONFIG_PCI_IMX6_HOST=y > CONFIG_PCI_LAYERSCAPE=y > > # Bus devices > + > +CONFIG_ARM_CCI=y > +CONFIG_ARM_CCI400_COMMON=y > # TI sysc interconnect target module driver > CONFIG_TI_SYSC=y > # QorIQ DPAA2 fsl-mc bus driver > @@ -123,6 +138,10 @@ CONFIG_IMX_SCU=y > CONFIG_IMX_SCU_PD=y > > # Memory Technology Device (MTD) support > +# RAM/ROM/Flash chip drivers > +# Detect flash chips by Common Flash Interface (CFI) probe > +CONFIG_MTD_CFI=m > + > # NAND > # Raw/Parallel NAND Device Support > CONFIG_MTD_RAW_NAND=y > @@ -159,22 +178,32 @@ CONFIG_SATA_AHCI_PLATFORM=m > > # Network device support > # Ethernet driver support > +# Cadence MACB/GEM support > +CONFIG_MACB=m > +# Use IEEE 1588 hwstamp > +CONFIG_MACB_USE_HWSTAMP=y > # FEC ethernet controller (of ColdFire and some i.MX CPUs) > CONFIG_FEC=m > # ENETC PF driver > CONFIG_FSL_ENETC=m > # ENETC VF driver > CONFIG_FSL_ENETC_VF=m > -# STMicroelectronics Multi-Gigabit Ethernet driver > -CONFIG_STMMAC_ETH=m > -# TI K3 AM654x/J721E CPSW Ethernet driver > -CONFIG_TI_K3_AM65_CPSW_NUSS=m > # Marvell OcteonTX2 RVU Admin Function driver > CONFIG_OCTEONTX2_AF=m > # Marvell OcteonTX2 NIC Physical Function driver > CONFIG_OCTEONTX2_PF=m > # Marvell OcteonTX2 NIC Virtual Function driver > CONFIG_OCTEONTX2_VF=m > +#
Re: [linux-yocto] [yocto-kernel-cache yocto-6.6][PATCH 1/2] features/nf_tables: nft_objref is now builtin
merged to 6.6 and master. Bruce In message: [linux-yocto] [yocto-kernel-cache yocto-6.6][PATCH 1/2] features/nf_tables: nft_objref is now builtin on 27/03/2024 Lyu, William via lists.yoctoproject.org wrote: > From: William Lyu > > Starting from kernel v6.2 (including all rc versions), > CONFIG_NFT_OBJREF has become builtin and cannot be disabled [1]. So, > this configure option is removed from nf_tables.cfg. > > References > [1] > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d037abc2414b4539401e0e6aa278bedc4628ad69 > > Signed-off-by: William Lyu > --- > features/nf_tables/nf_tables.cfg | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/features/nf_tables/nf_tables.cfg > b/features/nf_tables/nf_tables.cfg > index 4debc628..5b0f28df 100644 > --- a/features/nf_tables/nf_tables.cfg > +++ b/features/nf_tables/nf_tables.cfg > @@ -11,7 +11,6 @@ CONFIG_NFT_LIMIT=m > CONFIG_NFT_CONNLIMIT=m > CONFIG_NFT_TUNNEL=m > CONFIG_NFT_NAT=m > -CONFIG_NFT_OBJREF=m > CONFIG_NFT_QUEUE=m > CONFIG_NFT_REJECT=m > CONFIG_NFT_REJECT_INET=m > -- > 2.43.0 > > > > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13752): https://lists.yoctoproject.org/g/linux-yocto/message/13752 Mute This Topic: https://lists.yoctoproject.org/mt/105198030/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [v2][linux-yocto][yocto-kernel-cache][yocto-6.1][PATCH] ti-am62: add TSN feature related kernel configs
I had a minor merge conflict with this change: - commit 8de3d1d2825a5d6fb30279acb583f9778c1da164 Author: Meng Li Date: Thu Feb 22 22:44:26 2024 +0800 ti-am62: enable optee related kernel configs Add optee feature and enable it in ti-am62 BSP. Signed-off-by: Meng Li Signed-off-by: Bruce Ashfield - but of course it was easy to resolve and this is now merged. Bruce In message: [v2][linux-yocto][yocto-kernel-cache][yocto-6.1][PATCH] ti-am62: add TSN feature related kernel configs on 27/03/2024 Xulin Sun wrote: > Add TSN feature related kernel configs, and drop the duplicated > kernel config CONFIG_NET_SCH_TAPRIO with tsn.cfg. > > Signed-off-by: Xulin Sun > --- > bsp/ti-am62/ti-am62.cfg | 1 - > bsp/ti-am62/ti-am62.scc | 1 + > 2 files changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bsp/ti-am62/ti-am62.cfg b/bsp/ti-am62/ti-am62.cfg > index fdef5c2b..2dab2c45 100755 > --- a/bsp/ti-am62/ti-am62.cfg > +++ b/bsp/ti-am62/ti-am62.cfg > @@ -251,7 +251,6 @@ CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y > CONFIG_NET_SWITCHDEV=y > CONFIG_TI_K3_AM65_CPTS=y > CONFIG_TI_AM65_CPSW_TAS=y > -CONFIG_NET_SCH_TAPRIO=y > CONFIG_BRIDGE_VLAN_FILTERING=y > > # > diff --git a/bsp/ti-am62/ti-am62.scc b/bsp/ti-am62/ti-am62.scc > index 9a0dda7f..d8d41953 100644 > --- a/bsp/ti-am62/ti-am62.scc > +++ b/bsp/ti-am62/ti-am62.scc > @@ -4,5 +4,6 @@ include cfg/fs/flash_fs.cfg > include features/hugetlb/hugetlb.scc > # Enable the ability to run 32 bit apps > include arch/arm/32bit-compat.scc > +include features/tsn/tsn.scc > > kconf hardware ti-am62.cfg > -- > 2.34.1 > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13751): https://lists.yoctoproject.org/g/linux-yocto/message/13751 Mute This Topic: https://lists.yoctoproject.org/mt/105173754/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache][yocto-6.1][PATCH] ti-am62: add kernel configs NET_SCH_CBS & NET_SCH_MQPRIO & NET_SCH_ETF
In message: Re: [linux-yocto][yocto-kernel-cache][yocto-6.1][PATCH] ti-am62: add kernel configs NET_SCH_CBS & NET_SCH_MQPRIO & NET_SCH_ETF on 27/03/2024 Kevin Hao wrote: > On Wed, Mar 27, 2024 at 03:30:35PM +0800, Xulin Sun via > lists.yoctoproject.org wrote: > > Add kernel configs NET_SCH_CBS & NET_SCH_MQPRIO & NET_SCH_ETF to support > > AM62AX TSN feature. > > > > Signed-off-by: Xulin Sun > > --- > > bsp/ti-am62/ti-am62.cfg | 3 +++ > > 1 file changed, 3 insertions(+) > > > > diff --git a/bsp/ti-am62/ti-am62.cfg b/bsp/ti-am62/ti-am62.cfg > > index fdef5c2b..537f4120 100755 > > --- a/bsp/ti-am62/ti-am62.cfg > > +++ b/bsp/ti-am62/ti-am62.cfg > > @@ -252,6 +252,9 @@ CONFIG_NET_SWITCHDEV=y > > CONFIG_TI_K3_AM65_CPTS=y > > CONFIG_TI_AM65_CPSW_TAS=y > > CONFIG_NET_SCH_TAPRIO=y > > +CONFIG_NET_SCH_ETF=y > > +CONFIG_NET_SCH_CBS=y > > +CONFIG_NET_SCH_MQPRIO=y > > We can use the feature/tsn. Thanks for the review Kevin! I'm grabbing the v2. Bruce > > Thanks, > Kevin -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13750): https://lists.yoctoproject.org/g/linux-yocto/message/13750 Mute This Topic: https://lists.yoctoproject.org/mt/105173259/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][yocto-kernel-cache yocto-6.1][PATCH 1/3] nxp-imx9: Delete IMX_SCU since imx93 does not need this driver
merged. Bruce In message: [linux-yocto][yocto-kernel-cache yocto-6.1][PATCH 1/3] nxp-imx9: Delete IMX_SCU since imx93 does not need this driver on 26/03/2024 Xiaolei Wang wrote: > IMX_SCU is specific on imx8, so remove it to avoid warnings > > [NOTE]: 'CONFIG_PINCTRL_IMX_SCU' last val (y) and .config val (n) do not match > [INFO]: CONFIG_PINCTRL_IMX_SCU : n > [INFO]: raw config text: > > config PINCTRL_IMX_SCU > tristate > select PINCTRL_IMX > depends on IMX_SCU && PINCTRL > > Config 'PINCTRL_IMX_SCU' has the following Direct dependencies > (PINCTRL_IMX_SCU=y): > IMX_SCU(=y) && PINCTRL(=y) > Parent dependencies are: > PINCTRL [y] IMX_SCU [y] > [INFO]: config 'CONFIG_PINCTRL_IMX_SCU' was set, but it wasn't > assignable, check (parent) dependencies > > [INFO]: selection details for 'CONFIG_PINCTRL_IMX_SCU': > Symbols currently n-selecting this symbol (no effect): > - PINCTRL_IMX8QM > - PINCTRL_IMX8QXP > - PINCTRL_IMX8DXL > > Signed-off-by: Xiaolei Wang > --- > bsp/nxp-imx9/nxp-imx9.cfg | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/bsp/nxp-imx9/nxp-imx9.cfg b/bsp/nxp-imx9/nxp-imx9.cfg > index 41964ea5..29c3b8e3 100644 > --- a/bsp/nxp-imx9/nxp-imx9.cfg > +++ b/bsp/nxp-imx9/nxp-imx9.cfg > @@ -164,7 +164,6 @@ CONFIG_SPI_SLAVE=y > CONFIG_PINCTRL=y > CONFIG_GPIOLIB=y > CONFIG_PINCTRL_IMX=y > -CONFIG_PINCTRL_IMX_SCU=y > CONFIG_PINCTRL_IMX93=y > CONFIG_GPIO_MAX732X=y > CONFIG_GPIO_PCA953X=y > -- > 2.25.1 > In message: [linux-yocto][yocto-kernel-cache yocto-6.1][PATCH 3/3] nxp-imx9: Delete MXC_CLK_SCU since imx93 does not need this driver on 26/03/2024 Xiaolei Wang wrote: > MXC_CLK_SCU is specific on imx8, so remove it to avoid warnings > > [NOTE]: 'CONFIG_MXC_CLK_SCU' last val (y) and .config val (n) do not match > [INFO]: CONFIG_MXC_CLK_SCU : n > [INFO]: raw config text: > > config MXC_CLK_SCU > tristate > depends on COMMON_CLK > > Config 'MXC_CLK_SCU' has the following Direct dependencies > (MXC_CLK_SCU=y): > COMMON_CLK(=y) > Parent dependencies are: > COMMON_CLK [y] > [INFO]: config 'CONFIG_MXC_CLK_SCU' was set, but it wasn't assignable, > check (parent) dependencies > > [INFO]: selection details for 'CONFIG_MXC_CLK_SCU': > Symbols currently n-selecting this symbol (no effect): > - CLK_IMX8QXP > > Signed-off-by: Xiaolei Wang > --- > bsp/nxp-imx9/nxp-imx9.cfg | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/bsp/nxp-imx9/nxp-imx9.cfg b/bsp/nxp-imx9/nxp-imx9.cfg > index c034cb5c..8ad37abb 100644 > --- a/bsp/nxp-imx9/nxp-imx9.cfg > +++ b/bsp/nxp-imx9/nxp-imx9.cfg > @@ -511,7 +511,6 @@ CONFIG_DMABUF_HEAPS_DSP=y > # Clock driver for ARM Reference designs > # > CONFIG_MXC_CLK=y > -CONFIG_MXC_CLK_SCU=y > CONFIG_CLK_IMX93=y > > # > -- > 2.25.1 > In message: [linux-yocto][yocto-kernel-cache yocto-6.1][PATCH 2/3] nxp-imx9: Enable NET_DSA for nxp-imx9 on 26/03/2024 Xiaolei Wang wrote: > Enable NET_DSA for nxp-imx9. > > Signed-off-by: Xiaolei Wang > --- > bsp/nxp-imx9/nxp-imx9.cfg | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/bsp/nxp-imx9/nxp-imx9.cfg b/bsp/nxp-imx9/nxp-imx9.cfg > index 29c3b8e3..c034cb5c 100644 > --- a/bsp/nxp-imx9/nxp-imx9.cfg > +++ b/bsp/nxp-imx9/nxp-imx9.cfg > @@ -113,6 +113,7 @@ CONFIG_AT803X_PHY=y > CONFIG_REALTEK_PHY=y > CONFIG_STMMAC_ETH=y > CONFIG_FEC_ECAT=y > +CONFIG_NET_DSA=m > CONFIG_NET_DSA_NETC=m > CONFIG_NET_DSA_SJA1105=m > CONFIG_NET_DSA_SJA1105_PTP=y > -- > 2.25.1 > -=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#13749): https://lists.yoctoproject.org/g/linux-yocto/message/13749 Mute This Topic: https://lists.yoctoproject.org/mt/105197672/21656 Group Owner: linux-yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
Re: [linux-yocto][branch v6.1/standard/nxp-sdk-6.1/nxp-soc & v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 1/2] net: stmmac: Fix build error fpe_cfg undeclared
merged.
Bruce
In message: [linux-yocto][branch v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 1/2] net: stmmac: Fix build
error fpe_cfg undeclared
on 23/03/2024 Xiaolei Wang wrote:
> Use priv->plat->fpe_cfg instead of fpe_cfg to avoid fpe_cfg undeclared
>
> Fixes: b102a918b11cb ("net: stmmac: add ethtool preempt support")
> Signed-off-by: Xiaolei Wang
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> index e483caafbdda..7e396b6976e6 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c
> @@ -1221,7 +1221,7 @@ static int stmmac_set_preempt(struct net_device *dev,
> struct ethtool_fp *fpcmd)
> priv->plat->fpe_cfg->enable = 1;
> priv->fp_enabled_admin = 1;
> }
> - stmmac_fpe_configure(priv, priv->ioaddr, fpe_cfg,
> + stmmac_fpe_configure(priv, priv->ioaddr, priv->plat->fpe_cfg,
>priv->plat->tx_queues_to_use,
>priv->plat->rx_queues_to_use, fpe.enable, );
>
> --
> 2.25.1
>
In message: [linux-yocto][branch v6.1/standard/nxp-sdk-6.1/nxp-soc &
v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH 2/2] net: stmmac: Fix build
error too few parameters
on 23/03/2024 Xiaolei Wang wrote:
> Since commit ed7e211b6786 ("net: stmmac: fix FPE events losing")
> adds the fpe_cfg parameter, add it to avoid build errors.
>
> error: too few arguments to function 'priv->hw->mac->fpe_send_mpacket'
>
> Signed-off-by: Xiaolei Wang
> ---
> drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> index 034ae1dc65ec..859af9117a0f 100644
> --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
> @@ -958,7 +958,7 @@ static void stmmac_fpe_link_state_handle(struct
> stmmac_priv *priv, bool is_up)
>
> if (is_up) {
> if (*hs_enable)
> - stmmac_fpe_send_mpacket(priv, priv->ioaddr,
> MPACKET_VERIFY);
> + stmmac_fpe_send_mpacket(priv, priv->ioaddr, fpe_cfg,
> MPACKET_VERIFY);
> } else {
> *lo_state = FPE_STATE_OFF;
> *lp_state = FPE_STATE_OFF;
> --
> 2.25.1
>
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#13747):
https://lists.yoctoproject.org/g/linux-yocto/message/13747
Mute This Topic: https://lists.yoctoproject.org/mt/105197595/21656
Group Owner: linux-yocto+ow...@lists.yoctoproject.org
Unsubscribe: https://lists.yoctoproject.org/g/linux-yocto/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
[linux-yocto][linux-yocto v6.1/standard/nxp-sdk-6.1/nxp-soc & v6.1/standard/preempt-rt/nxp-sdk-6.1/nxp-soc][PATCH] fec_ecat: Fix build warning in fec_ecat.c
commit ("fec_ecat: add fec native driver for raw packet prot"),
introduced many warnings, which comes from the SDK, Since too
many warnings are introduced by this file, this patch fixes all
warnings.
Signed-off-by: Xiaolei Wang
---
drivers/net/ethernet/freescale/fec_ecat.c | 131 ++
1 file changed, 7 insertions(+), 124 deletions(-)
diff --git a/drivers/net/ethernet/freescale/fec_ecat.c
b/drivers/net/ethernet/freescale/fec_ecat.c
index 86eb3341105b..06e0b22e710d 100644
--- a/drivers/net/ethernet/freescale/fec_ecat.c
+++ b/drivers/net/ethernet/freescale/fec_ecat.c
@@ -316,15 +316,6 @@ static int fec_enet_get_bd_index(struct bufdesc *bdp,
return ((const char *)bdp - (const char *)bd->base) >> bd->dsize_log2;
}
-static void swap_buffer(void *bufaddr, int len)
-{
- int i;
- unsigned int *buf = bufaddr;
-
- for (i = 0; i < len; i += 4, buf++)
- swab32s(buf);
-}
-
static void swap_buffer2(void *dst_buf, void *src_buf, int len)
{
int i;
@@ -383,7 +374,8 @@ static int fec_ecat_txq_submit_buff(struct
fec_enet_priv_tx_q *txq,
skb = txq->tx_skbuff[index];
bufaddr = skb->data;
buflen = len;
- copy_from_user(skb->data, buff, len);
+ if(copy_from_user(skb->data, buff, len))
+ return -EFAULT;
bdp->cbd_datlen = cpu_to_fec16(buflen);
/* Push the data cache so the CPM does not get stale memory data. */
dma_sync_single_for_device(>pdev->dev,
@@ -424,7 +416,6 @@ static void fec_ecat_tx_queue(struct net_device *ndev)
struct bufdesc *bdp;
unsigned short status;
struct fec_enet_priv_tx_q *txq = fep->tx_queue;
- int index = 0;
/* get next bdp of dirty_tx */
bdp = txq->dirty_tx;
@@ -487,7 +478,6 @@ static void fec_enet_bd_init(struct net_device *dev)
struct fec_enet_priv_rx_q *rxq = fep->rx_queue;
struct bufdesc *bdp;
int i;
- struct sk_buff *skb;
/* Initialize the receive buffer descriptors. */
bdp = rxq->bd.base;
@@ -713,44 +703,6 @@ static int fec_enet_ipc_handle_init(struct
fec_enet_private *fep)
return imx_scu_get_handle(>ipc_handle);
}
-static void fec_enet_ipg_stop_set(struct fec_enet_private *fep, bool enabled)
-{
- struct device_node *np = fep->pdev->dev.of_node;
- u32 rsrc_id, val;
- int idx;
-
- if (!np || !fep->ipc_handle)
- return;
-
- idx = of_alias_get_id(np, "ethernet");
- if (idx < 0)
- idx = 0;
- rsrc_id = idx ? IMX_SC_R_ENET_1 : IMX_SC_R_ENET_0;
-
- val = enabled ? 1 : 0;
- imx_sc_misc_set_control(fep->ipc_handle, rsrc_id, IMX_SC_C_IPG_STOP,
val);
-}
-
-static void fec_enet_stop_mode(struct fec_enet_private *fep, bool enabled)
-{
- struct fec_platform_data *pdata = fep->pdev->dev.platform_data;
- struct fec_stop_mode_gpr *stop_gpr = >stop_gpr;
-
- if (stop_gpr->gpr) {
- if (enabled)
- regmap_update_bits(stop_gpr->gpr, stop_gpr->reg,
- BIT(stop_gpr->bit),
- BIT(stop_gpr->bit));
- else
- regmap_update_bits(stop_gpr->gpr, stop_gpr->reg,
- BIT(stop_gpr->bit), 0);
- } else if (pdata && pdata->sleep_mode_enable) {
- pdata->sleep_mode_enable(enabled);
- } else {
- fec_enet_ipg_stop_set(fep, enabled);
- }
-}
-
static inline void fec_irqs_disable(struct net_device *ndev)
{
struct fec_enet_private *fep = netdev_priv(ndev);
@@ -762,7 +714,6 @@ static void
fec_stop(struct net_device *ndev)
{
struct fec_enet_private *fep = netdev_priv(ndev);
- u32 rmii_mode = readl(fep->hwp + FEC_R_CNTRL) & (1 << 8);
/* We cannot expect a graceful transmit stop without link !!! */
if (fep->link) {
@@ -821,7 +772,6 @@ static int fec_ecat_recv_from_queue(struct net_device
*ndev, void __user *buff,
int recv_len = 0;
int index = 0;
boolneed_swap = fep->quirks & FEC_QUIRK_SWAP_FRAME;
- int ret = 0;
#ifdef CONFIG_M532x
flush_cache_all();
@@ -885,7 +835,8 @@ static int fec_ecat_recv_from_queue(struct net_device
*ndev, void __user *buff,
if (data[12] ==0x88 && data[13] ==0xa4) {
len = len < pkt_len? len : pkt_len;
if (!need_swap) {
- copy_to_user(buff, data, len);
+ if(copy_to_user(buff, data, len))
+ return -EFAULT;
}
else {
swap_buffer2(buff, data, len);
@@ -1661,56 +1612,6 @@ static void fec_enet_get_regs(struct net_device *ndev,
#if !defined(CONFIG_M5272)
-static void fec_enet_get_pauseparam(struct net_device
