6.2.15-rc1 review
Subsystems (6)
Greg Kroah-Hartman
maintainerPATCH 542/663 clk: add missing of_node_put() in "assigned-clocks" property parsing
In reply to Greg Kroah-HartmanFrom: Clément Léger <[email protected]>
[ Upstream commit 27a6e1b09a782517fddac91259970ac466a3f7b6 ]
When returning from of_parse_phandle_with_args(), the np member of the of_phandle_args structure should be put after usage. Add missing of_node_put() calls in both __set_clk_parents() and __set_clk_rates().
--- drivers/clk/clk-conf.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/clk/clk-conf.c +10 -2
@@ -33,9 +33,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } pclk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (pclk)) {if (PTR_ERR (pclk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get parent clock %d for %pOF\n",
@@ -48,10 +51,12 @@ static int __set_clk_parents(struct device_node *node, bool clk_supplier)if (rc <0 ) goto err;if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np); rc =0 ; goto err; } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get assigned clock %d for %pOF\n",
@@ -93,10 +98,13 @@ static int __set_clk_rates(struct device_node *node, bool clk_supplier)else return rc; } -if (clkspec.np == node && !clk_supplier) +if (clkspec.np == node && !clk_supplier) { +of_node_put (clkspec.np);return 0 ; + } clk =of_clk_get_from_provider (&clkspec); +of_node_put (clkspec.np);if (IS_ERR (clk)) {if (PTR_ERR (clk) != -EPROBE_DEFER ) pr_warn("clk: couldn't get clock %d for %pOF\n",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 543/663 RDMA/siw: Remove namespace check from siw_netdev_event()
In reply to Greg Kroah-HartmanFrom: Tetsuo Handa <[email protected]>
[ Upstream commit 266e9b3475ba82212062771fdbc40be0e3c06ec8 ]
syzbot is reporting that siw_netdev_event(NETDEV_UNREGISTER) cannot destroy siw_device created after unshare(CLONE_NEWNET) due to net namespace check. It seems that this check was by error there and should be removed.
--- drivers/infiniband/sw/siw/siw_main.c | 3 --- 1 file changed, 3 deletions(-)
drivers/infiniband/sw/siw/siw_main.c +0 -3
@@ -437,9 +437,6 @@ static int siw_netdev_event(struct notifier_block *nb, unsigned long event,dev_dbg (&netdev->dev,"siw: event %lu\n" , event); -if (dev_net (netdev) != &init_net) -return NOTIFY_OK ; - base_dev =ib_device_get_by_netdev (netdev,RDMA_DRIVER_SIW );if (!base_dev)return NOTIFY_OK ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 544/663 clk: qcom: gcc-sm6115: Mark RCGs shared where applicable
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 996c32b745a15a637e8244a25f06b74acce98976 ]
The vast majority of shared RCGs were not marked as such. Fix it.
--- drivers/clk/qcom/gcc-sm6115.c | 50 +++++++++++++++++------------------ 1 file changed, 25 insertions(+), 25 deletions(-)
drivers/clk/qcom/gcc-sm6115.c +25 -25
@@ -694,7 +694,7 @@ static struct clk_rcg2 gcc_camss_axi_clk_src = { .parent_data = gcc_parents_7, .num_parents = ARRAY_SIZE(gcc_parents_7), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -715,7 +715,7 @@ static struct clk_rcg2 gcc_camss_cci_clk_src = { .parent_data = gcc_parents_9, .num_parents = ARRAY_SIZE(gcc_parents_9), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -738,7 +738,7 @@ static struct clk_rcg2 gcc_camss_csi0phytimer_clk_src = { .parent_data = gcc_parents_4, .num_parents = ARRAY_SIZE(gcc_parents_4), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -753,7 +753,7 @@ static struct clk_rcg2 gcc_camss_csi1phytimer_clk_src = { .parent_data = gcc_parents_4, .num_parents = ARRAY_SIZE(gcc_parents_4), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -768,7 +768,7 @@ static struct clk_rcg2 gcc_camss_csi2phytimer_clk_src = { .parent_data = gcc_parents_4, .num_parents = ARRAY_SIZE(gcc_parents_4), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -790,7 +790,7 @@ static struct clk_rcg2 gcc_camss_mclk0_clk_src = { .parent_data = gcc_parents_3, .num_parents = ARRAY_SIZE(gcc_parents_3), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -805,7 +805,7 @@ static struct clk_rcg2 gcc_camss_mclk1_clk_src = { .parent_data = gcc_parents_3, .num_parents = ARRAY_SIZE(gcc_parents_3), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -820,7 +820,7 @@ static struct clk_rcg2 gcc_camss_mclk2_clk_src = { .parent_data = gcc_parents_3, .num_parents = ARRAY_SIZE(gcc_parents_3), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -835,7 +835,7 @@ static struct clk_rcg2 gcc_camss_mclk3_clk_src = { .parent_data = gcc_parents_3, .num_parents = ARRAY_SIZE(gcc_parents_3), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -857,7 +857,7 @@ static struct clk_rcg2 gcc_camss_ope_ahb_clk_src = { .parent_data = gcc_parents_8, .num_parents = ARRAY_SIZE(gcc_parents_8), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -881,7 +881,7 @@ static struct clk_rcg2 gcc_camss_ope_clk_src = { .parent_data = gcc_parents_8, .num_parents = ARRAY_SIZE(gcc_parents_8), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -916,7 +916,7 @@ static struct clk_rcg2 gcc_camss_tfe_0_clk_src = { .parent_data = gcc_parents_5, .num_parents = ARRAY_SIZE(gcc_parents_5), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -941,7 +941,7 @@ static struct clk_rcg2 gcc_camss_tfe_0_csid_clk_src = { .parent_data = gcc_parents_6, .num_parents = ARRAY_SIZE(gcc_parents_6), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -956,7 +956,7 @@ static struct clk_rcg2 gcc_camss_tfe_1_clk_src = { .parent_data = gcc_parents_5, .num_parents = ARRAY_SIZE(gcc_parents_5), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -971,7 +971,7 @@ static struct clk_rcg2 gcc_camss_tfe_1_csid_clk_src = { .parent_data = gcc_parents_6, .num_parents = ARRAY_SIZE(gcc_parents_6), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -986,7 +986,7 @@ static struct clk_rcg2 gcc_camss_tfe_2_clk_src = { .parent_data = gcc_parents_5, .num_parents = ARRAY_SIZE(gcc_parents_5), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1001,7 +1001,7 @@ static struct clk_rcg2 gcc_camss_tfe_2_csid_clk_src = { .parent_data = gcc_parents_6, .num_parents = ARRAY_SIZE(gcc_parents_6), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1024,7 +1024,7 @@ static struct clk_rcg2 gcc_camss_tfe_cphy_rx_clk_src = { .parent_data = gcc_parents_10, .num_parents = ARRAY_SIZE(gcc_parents_10), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1046,7 +1046,7 @@ static struct clk_rcg2 gcc_camss_top_ahb_clk_src = { .parent_data = gcc_parents_7, .num_parents = ARRAY_SIZE(gcc_parents_7), .flags = CLK_SET_RATE_PARENT | CLK_OPS_PARENT_ENABLE, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1116,7 +1116,7 @@ static struct clk_rcg2 gcc_pdm2_clk_src = { .name = "gcc_pdm2_clk_src", .parent_data = gcc_parents_0, .num_parents = ARRAY_SIZE(gcc_parents_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1329,7 +1329,7 @@ static struct clk_rcg2 gcc_ufs_phy_axi_clk_src = { .name = "gcc_ufs_phy_axi_clk_src", .parent_data = gcc_parents_0, .num_parents = ARRAY_SIZE(gcc_parents_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1351,7 +1351,7 @@ static struct clk_rcg2 gcc_ufs_phy_ice_core_clk_src = { .name = "gcc_ufs_phy_ice_core_clk_src", .parent_data = gcc_parents_0, .num_parents = ARRAY_SIZE(gcc_parents_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1392,7 +1392,7 @@ static struct clk_rcg2 gcc_ufs_phy_unipro_core_clk_src = { .name = "gcc_ufs_phy_unipro_core_clk_src", .parent_data = gcc_parents_0, .num_parents = ARRAY_SIZE(gcc_parents_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1414,7 +1414,7 @@ static struct clk_rcg2 gcc_usb30_prim_master_clk_src = { .name = "gcc_usb30_prim_master_clk_src", .parent_data = gcc_parents_0, .num_parents = ARRAY_SIZE(gcc_parents_0), - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
@@ -1483,7 +1483,7 @@ static struct clk_rcg2 gcc_video_venus_clk_src = { .parent_data = gcc_parents_13, .num_parents = ARRAY_SIZE(gcc_parents_13), .flags = CLK_SET_RATE_PARENT, - .ops = &clk_rcg2_ops, + .ops = &clk_rcg2_shared_ops, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 545/663 power: supply: rk817: Fix low SOC bugs
In reply to Greg Kroah-HartmanFrom: Chris Morgan <[email protected]>
[ Upstream commit baba1315a74d12772d4940a05d58dc03e6ec0635 ]
When the SOC approaches zero, an integer overflows in the columb counter causing the driver to react poorly. This makes the driver think it's at (above) the fully charged capacity when in fact it's zero. It would then write this full capacity to NVRAM which would be used on boot if the device remained off for less than 5 hours and not plugged in.
This can be fixed and guarded against by doing the following:
- Changing the type of tmp in rk817_read_or_set_full_charge_on_boot() to be an int instead of a u32. That way we can account for negative numbers.
- Guard against negative values for the full charge on boot by setting the charge to 0 if the system charge reports less than 0.
- Catch scenarios where the battery voltage is below the design minimum voltage and set the system SOC to 0 at that time and update the columb counter with a charge level of 0.
- Change the off time value from 5 hours to 30 minutes before we recalculate the current capacity based on the OCV tables.
These changes allow the driver to operate better at low voltage/low capacity conditions.
--- drivers/power/supply/rk817_charger.c | 33 ++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 7 deletions(-)
drivers/power/supply/rk817_charger.c +26 -7
@@ -335,6 +335,20 @@ static int rk817_bat_calib_cap(struct rk817_charger *charger) charger->fcc_mah * 1000); } +/* +* Set the SOC to 0 if we are below the minimum system voltage. +*/ +if (volt_avg <= charger->bat_voltage_min_design_uv) { + charger->soc =0 ; + charge_now_adc =CHARGE_TO_ADC (0 , charger->res_div); +put_unaligned_be32 (charge_now_adc, bulk_reg); +regmap_bulk_write (rk808->regmap, +RK817_GAS_GAUGE_Q_INIT_H3 , bulk_reg,4 ); +dev_warn (charger->dev, +"Battery voltage %d below minimum voltage %d\n" , + volt_avg, charger->bat_voltage_min_design_uv); + } +rk817_record_battery_nvram_values (charger);return 0 ;
@@ -710,9 +724,10 @@ static int rk817_read_battery_nvram_values(struct rk817_charger *charger)/* * Read the nvram for state of charge. Sanity check for values greater -* than 100 (10000). If the value is off it should get corrected -* automatically when the voltage drops to the min (soc is 0) or when -* the battery is full (soc is 100). +* than 100 (10000) or less than 0, because other things (BSP kernels, +* U-Boot, or even i2cset) can write to this register. If the value is +* off it should get corrected automatically when the voltage drops to +* the min (soc is 0) or when the battery is full (soc is 100). */ ret =regmap_bulk_read (charger->rk808->regmap,RK817_GAS_GAUGE_BAT_R1 , bulk_reg,3 );
@@ -721,6 +736,8 @@ static int rk817_read_battery_nvram_values(struct rk817_charger *charger) charger->soc =get_unaligned_le24 (bulk_reg);if (charger->soc >10000 ) charger->soc =10000 ; +if (charger->soc <0 ) + charger->soc =0 ;return 0 ; }
@@ -731,8 +748,8 @@ rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger, {struct rk808 *rk808 = charger->rk808;u8 bulk_reg[4 ]; -u32 boot_voltage, boot_charge_mah, tmp; -int ret, reg, off_time; +u32 boot_voltage, boot_charge_mah; +int ret, reg, off_time, tmp;bool first_boot;/*
@@ -785,10 +802,12 @@ rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger,regmap_bulk_read (rk808->regmap,RK817_GAS_GAUGE_Q_PRES_H3 , bulk_reg,4 ); tmp =get_unaligned_be32 (bulk_reg); +if (tmp <0 ) + tmp =0 ; boot_charge_mah =ADC_TO_CHARGE_UAH (tmp, charger->res_div) /1000 ;/* -* Check if the columb counter has been off for more than 300 +* Check if the columb counter has been off for more than 30 * minutes as it tends to drift downward. If so, re-init soc * with the boot voltage instead. Note the unit values for the * OFF_CNT register appear to be in decaminutes and stops
@@ -799,7 +818,7 @@ rk817_read_or_set_full_charge_on_boot(struct rk817_charger *charger,* than 0 on a reboot anyway. */ regmap_read (rk808->regmap,RK817_GAS_GAUGE_OFF_CNT , &off_time); -if (off_time >=30 ) { +if (off_time >=3 ) {regmap_bulk_read (rk808->regmap,RK817_GAS_GAUGE_PWRON_VOL_H , bulk_reg,2 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 546/663 RDMA/cm: Trace icm_send_rej event before the cm state is reset
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit bd9de1badac7e4ff6780365d4aa38983f5e2a436 ]
Trace icm_send_rej event before the cm state is reset to idle, so that correct cm state will be logged. For example when an incoming request is rejected, the old trace log was:
icm_send_rej: local_id=961102742 remote_id=3829151631 state=IDLE reason=REJ_CONSUMER_DEFINED
With this patch:
icm_send_rej: local_id=312971016 remote_id=3778819983 state=MRA_REQ_SENT reason=REJ_CONSUMER_DEFINED--- drivers/infiniband/core/cm.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/infiniband/core/cm.c +2 -1
@@ -2912,6 +2912,8 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv, (ari && ari_length > IB_CM_REJ_ARI_LENGTH))return -EINVAL ; +trace_icm_send_rej (&cm_id_priv->id, reason); +switch (state) {case IB_CM_REQ_SENT :case IB_CM_MRA_REQ_RCVD :
@@ -2942,7 +2944,6 @@ static int cm_send_rej_locked(struct cm_id_private *cm_id_priv,return -EINVAL ; } -trace_icm_send_rej (&cm_id_priv->id, reason); ret =ib_post_send_mad (msg,NULL );if (ret) {cm_free_msg (msg);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 547/663 RDMA/srpt: Add a check for valid mad_agent pointer
In reply to Greg Kroah-HartmanFrom: Saravanan Vajravel <[email protected]>
[ Upstream commit eca5cd9474cd26d62f9756f536e2e656d3f62f3a ]
When unregistering MAD agent, srpt module has a non-null check for 'mad_agent' pointer before invoking ib_unregister_mad_agent(). This check can pass if 'mad_agent' variable holds an error value. The 'mad_agent' can have an error value for a short window when srpt_add_one() and srpt_remove_one() is executed simultaneously.
In srpt module, added a valid pointer check for 'sport->mad_agent' before unregistering MAD agent.
This issue can hit when RoCE driver unregisters ib_device
Stack Trace:
------------
BUG: kernel NULL pointer dereference, address: 000000000000004d PGD 145003067 P4D 145003067 PUD 2324fe067 PMD 0 Oops: 0002 [#1] PREEMPT SMP NOPTI CPU: 10 PID: 4459 Comm: kworker/u80:0 Kdump: loaded Tainted: P Hardware name: Dell Inc. PowerEdge R640/06NR82, BIOS 2.5.4 01/13/2020 Workqueue: bnxt_re bnxt_re_task [bnxt_re] RIP: 0010:_raw_spin_lock_irqsave+0x19/0x40 Call Trace: ib_unregister_mad_agent+0x46/0x2f0 [ib_core] IPv6: ADDRCONF(NETDEV_CHANGE): bond0: link becomes ready ? __schedule+0x20b/0x560 srpt_unregister_mad_agent+0x93/0xd0 [ib_srpt] srpt_remove_one+0x20/0x150 [ib_srpt] remove_client_context+0x88/0xd0 [ib_core] bond0: (slave p2p1): link status definitely up, 100000 Mbps full duplex disable_device+0x8a/0x160 [ib_core] bond0: active interface up! ? kernfs_name_hash+0x12/0x80 (NULL device *): Bonding Info Received: rdev: 000000006c0b8247 __ib_unregister_device+0x42/0xb0 [ib_core] (NULL device *): Master: mode: 4 num_slaves:2 ib_unregister_device+0x22/0x30 [ib_core] (NULL device *): Slave: id: 105069936 name:p2p1 link:0 state:0 bnxt_re_stopqps_and_ib_uninit+0x83/0x90 [bnxt_re] bnxt_re_alloc_lag+0x12e/0x4e0 [bnxt_re]
--- drivers/infiniband/ulp/srpt/ib_srpt.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/infiniband/ulp/srpt/ib_srpt.c +13 -10
@@ -549,6 +549,7 @@ static int srpt_format_guid(char *buf, unsigned int size, const __be64 *guid)*/ static int srpt_refresh_port (struct srpt_port *sport) { +struct ib_mad_agent *mad_agent;struct ib_mad_reg_req reg_req;struct ib_port_modify port_modify;struct ib_port_attr port_attr;
@@ -593,24 +594,26 @@ static int srpt_refresh_port(struct srpt_port *sport)set_bit (IB_MGMT_METHOD_GET , reg_req.method_mask);set_bit (IB_MGMT_METHOD_SET , reg_req.method_mask); - sport->mad_agent =ib_register_mad_agent (sport->sdev->device, - sport->port, -IB_QPT_GSI , - ®_req,0 , - srpt_mad_send_handler, - srpt_mad_recv_handler, - sport,0 ); -if (IS_ERR (sport->mad_agent)) { + mad_agent =ib_register_mad_agent (sport->sdev->device, + sport->port, +IB_QPT_GSI , + ®_req,0 , + srpt_mad_send_handler, + srpt_mad_recv_handler, + sport,0 ); +if (IS_ERR (mad_agent)) {pr_err ("%s-%d: MAD agent registration failed (%ld). Note: this is expected if SR-IOV is enabled.\n" ,dev_name (&sport->sdev->device->dev), sport->port, -PTR_ERR (sport->mad_agent)); +PTR_ERR (mad_agent)); sport->mad_agent =NULL ;memset (&port_modify,0 ,sizeof (port_modify)); port_modify.clr_port_cap_mask =IB_PORT_DEVICE_MGMT_SUP ;ib_modify_port (sport->sdev->device, sport->port,0 , &port_modify); - +return 0 ; } + + sport->mad_agent = mad_agent; }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 548/663 IB/hfi1: Fix SDMA mmu_rb_node not being evicted in LRU order
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit 9fe8fec5e43d5a80f43cbf61aaada1b047a1eb61 ]
hfi1_mmu_rb_remove_unless_exact() did not move mmu_rb_node objects in mmu_rb_handler->lru_list after getting a cache hit on an mmu_rb_node.
As a result, hfi1_mmu_rb_evict() was not guaranteed to evict truly least-recently used nodes.
This could be a performance issue for an application when that application:
- Uses some long-lived buffers frequently.
- Uses a large number of buffers once.
- Hits the mmu_rb_handler cache size or pinned-page limits, forcing mmu_rb_handler cache entries to be evicted.
In this case, the one-time use buffers cause the long-lived buffer entries to eventually filter to the end of the LRU list where hfi1_mmu_rb_evict() will consider evicting a frequently-used long-lived entry instead of evicting one of the one-time use entries.
Fix this by inserting new mmu_rb_node at the tail of mmu_rb_handler->lru_list and move mmu_rb_ndoe to the tail of mmu_rb_handler->lru_list when the mmu_rb_node is a hit in hfi1_mmu_rb_remove_unless_exact(). Change hfi1_mmu_rb_evict() to evict from the head of mmu_rb_handler->lru_list instead of the tail.
--- drivers/infiniband/hw/hfi1/mmu_rb.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/infiniband/hw/hfi1/mmu_rb.c +6 -7
@@ -130,7 +130,7 @@ int hfi1_mmu_rb_insert(struct mmu_rb_handler *handler, goto unlock; }__mmu_int_rb_insert (mnode, &handler->root); -list_add (&mnode->list, &handler->lru_list); +list_add_tail (&mnode->list, &handler->lru_list); ret = handler->ops->insert (handler->ops_arg, mnode);if (ret) {
@@ -181,8 +181,10 @@ bool hfi1_mmu_rb_remove_unless_exact(struct mmu_rb_handler *handler,spin_lock_irqsave (&handler->lock, flags); node =__mmu_rb_search (handler, addr, len);if (node) { -if (node->addr == addr && node->len == len) +if (node->addr == addr && node->len == len) { +list_move_tail (&node->list, &handler->lru_list); goto unlock; + }__mmu_int_rb_remove (node, &handler->root);list_del (&node->list);/* remove from LRU list */ ret = true;
@@ -206,8 +208,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg)INIT_LIST_HEAD (&del_list);spin_lock_irqsave (&handler->lock, flags); -list_for_each_entry_safe_reverse (rbnode, ptr, &handler->lru_list, - list) { +list_for_each_entry_safe (rbnode, ptr, &handler->lru_list, list) {if (handler->ops->evict (handler->ops_arg, rbnode, evict_arg, &stop)) {__mmu_int_rb_remove (rbnode, &handler->root);
@@ -219,9 +220,7 @@ void hfi1_mmu_rb_evict(struct mmu_rb_handler *handler, void *evict_arg) }spin_unlock_irqrestore (&handler->lock, flags); -while (!list_empty (&del_list)) { - rbnode = list_first_entry(&del_list, struct mmu_rb_node, list); -list_del (&rbnode->list); +list_for_each_entry_safe (rbnode, ptr, &del_list, list) { handler->ops->remove (handler->ops_arg, rbnode); } }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 549/663 IB/hfi1: Fix bugs with non-PAGE_SIZE-end multi-iovec user SDMA requests
In reply to Greg Kroah-HartmanFrom: Patrick Kelsey <[email protected]>
[ Upstream commit 00cbce5cbf88459cd1aa1d60d0f1df15477df127 ]
hfi1 user SDMA request processing has two bugs that can cause data corruption for user SDMA requests that have multiple payload iovecs where an iovec other than the tail iovec does not run up to the page boundary for the buffer pointed to by that iovec.a
Here are the specific bugs:
1. user_sdma_txadd() does not use struct user_sdma_iovec->iov.iov_len. Rather, user_sdma_txadd() will add up to PAGE_SIZE bytes from iovec to the packet, even if some of those bytes are past iovec->iov.iov_len and are thus not intended to be in the packet.
2. user_sdma_txadd() and user_sdma_send_pkts() fail to advance to the next iovec in user_sdma_request->iovs when the current iovec is not PAGE_SIZE and does not contain enough data to complete the packet. The transmitted packet will contain the wrong data from the iovec pages.
This has not been an issue with SDMA packets from hfi1 Verbs or PSM2 because they only produce iovecs that end short of PAGE_SIZE as the tail iovec of an SDMA request.
Fixing these bugs exposes other bugs with the SDMA pin cache (struct mmu_rb_handler) that get in way of supporting user SDMA requests with multiple payload iovecs whose buffers do not end at PAGE_SIZE. So this commit fixes those issues as well.
Here are the mmu_rb_handler bugs that non-PAGE_SIZE-end multi-iovec payload user SDMA requests can hit:
1. Overlapping memory ranges in mmu_rb_handler will result in duplicate pinnings.
2. When extending an existing mmu_rb_handler entry (struct mmu_rb_node), the mmu_rb code (1) removes the existing entry under a lock, (2) releases that lock, pins the new pages, (3) then reacquires the lock to insert the extended mmu_rb_node.
If someone else comes in and inserts an overlapping entry between (2) and (3), insert in (3) will fail.
The failure path code in this case unpins _all_ pages in either the original mmu_rb_node or the new mmu_rb_node that was inserted between
(2) and (3).
3. In hfi1_mmu_rb_remove_unless_exact(), mmu_rb_node->refcount is incremented outside of mmu_rb_handler->lock. As a result, mmu_rb_node could be evicted by another thread that gets mmu_rb_handler->lock and checks mmu_rb_node->refcount before mmu_rb_node->refcount is incremented.
4. Related to #2 above, SDMA request submission failure path does not check mmu_rb_node->refcount before freeing mmu_rb_node object.
If there are other SDMA requests in progress whose iovecs have pointers to the now-freed mmu_rb_node(s), those pointers to the now-freed mmu_rb nodes will be dereferenced when those SDMA requests complete.
--- drivers/infiniband/hw/hfi1/ipoib_tx.c | 1 + drivers/infiniband/hw/hfi1/mmu_rb.c | 66 +-- drivers/infiniband/hw/hfi1/mmu_rb.h | 8 +- drivers/infiniband/hw/hfi1/sdma.c | 21 +- drivers/infiniband/hw/hfi1/sdma.h | 16 +- drivers/infiniband/hw/hfi1/sdma_txreq.h | 1 + drivers/infiniband/hw/hfi1/trace_mmu.h | 4 - drivers/infiniband/hw/hfi1/user_sdma.c | 600 +++++++++++++++--------- drivers/infiniband/hw/hfi1/user_sdma.h | 5 - drivers/infiniband/hw/hfi1/verbs.c | 4 +- drivers/infiniband/hw/hfi1/vnic_sdma.c | 1 + 11 files changed, 423 insertions(+), 304 deletions(-)
drivers/infiniband/hw/hfi1/ipoib_tx.c +1 -0
@@ -215,6 +215,7 @@ static int hfi1_ipoib_build_ulp_payload(struct ipoib_txreq *tx,const skb_frag_t *frag = &skb_shinfo (skb)->frags[i]; ret = sdma_txadd_page(dd, + NULL, txreq, skb_frag_page(frag), frag->bv_offset,
drivers/infiniband/hw/hfi1/mmu_rb.c +14 -52
90 lines not on this page · raw message
drivers/infiniband/hw/hfi1/mmu_rb.h +3 -5
@@ -52,10 +52,8 @@ void hfi1_mmu_rb_unregister(struct mmu_rb_handler *handler);int hfi1_mmu_rb_insert (struct mmu_rb_handler *handler,struct mmu_rb_node *mnode);void hfi1_mmu_rb_evict (struct mmu_rb_handler *handler,void *evict_arg); -void hfi1_mmu_rb_remove (struct mmu_rb_handler *handler, -struct mmu_rb_node *mnode); -bool hfi1_mmu_rb_remove_unless_exact (struct mmu_rb_handler *handler, -unsigned long addr,unsigned long len, -struct mmu_rb_node **rb_node); +struct mmu_rb_node *hfi1_mmu_rb_get_first (struct mmu_rb_handler *handler, +unsigned long addr, +unsigned long len);#endif /* _HFI1_MMU_RB_H */
drivers/infiniband/hw/hfi1/sdma.c +4 -17
@@ -1593,22 +1593,7 @@ static inline void sdma_unmap_desc(struct hfi1_devdata *dd, struct sdma_desc *descp) { - switch (sdma_mapping_type(descp)) { - case SDMA_MAP_SINGLE: -dma_unmap_single ( - &dd->pcidev->dev, -sdma_mapping_addr (descp ), -sdma_mapping_len (descp ), -DMA_TO_DEVICE ); -break ; -case SDMA_MAP_PAGE : -dma_unmap_page ( - &dd->pcidev->dev, -sdma_mapping_addr (descp), -sdma_mapping_len (descp), -DMA_TO_DEVICE ); -break ; - } +system_descriptor_complete (dd ,descp ); }/*
@@ -3128,7 +3113,7 @@ int ext_coal_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx,/* Add descriptor for coalesce buffer */ tx->desc_limit =MAX_DESC ; -return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE , tx, +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, addr, tx->tlen); }
@@ -3167,10 +3152,12 @@ int _pad_sdma_tx_descs(struct hfi1_devdata *dd, struct sdma_txreq *tx)return rval; } } +/* finish the one just added */ make_tx_sdma_desc ( tx,SDMA_MAP_NONE , +NULL , dd->sdma_pad_phys,sizeof (u32) - (tx->packet_len & (sizeof (u32) -1 ))); tx->num_desc++;
drivers/infiniband/hw/hfi1/sdma.h +11 -5
@@ -594,6 +594,7 @@ static inline dma_addr_t sdma_mapping_addr(struct sdma_desc *d)static inline void make_tx_sdma_desc (struct sdma_txreq *tx,int type, +void *pinning_ctx,dma_addr_t addr,size_t len) {
@@ -612,6 +613,7 @@ static inline void make_tx_sdma_desc( << SDMA_DESC0_PHY_ADDR_SHIFT) | (((u64 )len &SDMA_DESC0_BYTE_COUNT_MASK ) <<SDMA_DESC0_BYTE_COUNT_SHIFT ); + desc->pinning_ctx = pinning_ctx; }/* helper to extend txreq */
@@ -643,6 +645,7 @@ static inline void _sdma_close_tx(struct hfi1_devdata *dd,static inline int _sdma_txadd_daddr (struct hfi1_devdata *dd,int type, +void *pinning_ctx,struct sdma_txreq *tx,dma_addr_t addr,u16 len)
@@ -652,6 +655,7 @@ static inline int _sdma_txadd_daddr(make_tx_sdma_desc ( tx, type, + pinning_ctx, addr, len);WARN_ON (len > tx->tlen); tx->num_desc++;
@@ -672,6 +676,7 @@ static inline int _sdma_txadd_daddr(/** * sdma_txadd_page() - add a page to the sdma_txreq * @dd: the device to use for mapping +* @pinning_ctx: context to be released at descriptor retirement * @tx: tx request to which the page is added * @page: page to map * @offset: offset within the page
@@ -687,6 +692,7 @@ static inline int _sdma_txadd_daddr(*/ static inline int sdma_txadd_page( struct hfi1_devdata *dd, + void *pinning_ctx, struct sdma_txreq *tx, struct page *page, unsigned long offset,
@@ -714,8 +720,7 @@ static inline int sdma_txadd_page(return -ENOSPC ; } -return _sdma_txadd_daddr ( - dd,SDMA_MAP_PAGE , tx, addr, len); +return _sdma_txadd_daddr (dd,SDMA_MAP_PAGE , pinning_ctx, tx, addr, len); }/**
@@ -749,7 +754,8 @@ static inline int sdma_txadd_daddr(return rval; } -return _sdma_txadd_daddr (dd,SDMA_MAP_NONE , tx, addr, len); +return _sdma_txadd_daddr (dd,SDMA_MAP_NONE ,NULL , tx, + addr, len); }/**
@@ -795,8 +801,7 @@ static inline int sdma_txadd_kvaddr(return -ENOSPC ; } -return _sdma_txadd_daddr ( - dd,SDMA_MAP_SINGLE , tx, addr, len); +return _sdma_txadd_daddr (dd,SDMA_MAP_SINGLE ,NULL , tx, addr, len); }struct iowait_work ;
@@ -1030,4 +1035,5 @@ extern uint mod_num_sdma;void sdma_update_lmc (struct hfi1_devdata *dd,u64 mask,u32 lid); +void system_descriptor_complete (struct hfi1_devdata *dd,struct sdma_desc *descp);#endif
drivers/infiniband/hw/hfi1/sdma_txreq.h +1 -0
@@ -19,6 +19,7 @@struct sdma_desc {/* private: don't use directly */ u64 qw[2 ]; +void *pinning_ctx; };/**
drivers/infiniband/hw/hfi1/trace_mmu.h +0 -4
@@ -37,10 +37,6 @@ DEFINE_EVENT(hfi1_mmu_rb_template, hfi1_mmu_rb_search, TP_PROTO(unsigned long addr, unsigned long len), TP_ARGS(addr, len)); -DEFINE_EVENT (hfi1_mmu_rb_template, hfi1_mmu_rb_remove, - TP_PROTO(unsigned long addr, unsigned long len), -TP_ARGS (addr, len)); -DEFINE_EVENT (hfi1_mmu_rb_template, hfi1_mmu_mem_invalidate, TP_PROTO(unsigned long addr, unsigned long len),TP_ARGS (addr, len));
drivers/infiniband/hw/hfi1/user_sdma.c +386 -214
700 lines not on this page · raw message
drivers/infiniband/hw/hfi1/user_sdma.h +0 -5
@@ -112,16 +112,11 @@ struct sdma_mmu_node {struct user_sdma_iovec {struct list_head list;struct iovec iov; -/* number of pages in this vector */ -unsigned int npages; -/* array of pinned pages for this vector */ -struct page **pages;/* * offset into the virtual address space of the vector at * which we last left off. */ u64 offset; -struct sdma_mmu_node *node; };/* evict operation argument */
drivers/infiniband/hw/hfi1/verbs.c +2 -2
@@ -778,8 +778,8 @@ static int build_verbs_tx_desc(/* add icrc, lt byte, and padding to flit */ if (extra_bytes) - ret =sdma_txadd_daddr (sde->dd, &tx->txreq, - sde->dd->sdma_pad_phys, extra_bytes); + ret =sdma_txadd_daddr (sde->dd, &tx->txreq, sde->dd->sdma_pad_phys, + extra_bytes); bail_txadd:return ret;
drivers/infiniband/hw/hfi1/vnic_sdma.c +1 -0
@@ -64,6 +64,7 @@ static noinline int build_vnic_ulp_payload(struct sdma_engine *sde,/* combine physically continuous fragments later? */ ret = sdma_txadd_page(sde->dd, + NULL, &tx->txreq, skb_frag_page(frag), skb_frag_off(frag),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 550/663 clk: imx: fracn-gppll: fix the rate table
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit cf8dccfedce848f67eaa42e8839305d028319161 ]
The Fvco should be range 2.4GHz to 5GHz, the original table voilate the spec, so update the table to fix it.
--- drivers/clk/imx/clk-fracn-gppll.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-)
drivers/clk/imx/clk-fracn-gppll.c +9 -7
@@ -60,18 +60,20 @@ struct clk_fracn_gppll { };/* -* Fvco = Fref * (MFI + MFN / MFD) -* Fout = Fvco / (rdiv * odiv) +* Fvco = (Fref / rdiv) * (MFI + MFN / MFD) +* Fout = Fvco / odiv +* The (Fref / rdiv) should be in range 20MHz to 40MHz +* The Fvco should be in range 2.5Ghz to 5Ghz */ static const struct imx_fracn_gppll_rate_table fracn_tbl[] = { -PLL_FRACN_GP (650000000U ,81 ,0 ,1 ,0 ,3 ), +PLL_FRACN_GP (650000000U ,162 ,50 ,100 ,0 ,6 ),PLL_FRACN_GP (594000000U ,198 ,0 ,1 ,0 ,8 ), -PLL_FRACN_GP (560000000U ,70 ,0 ,1 ,0 ,3 ), -PLL_FRACN_GP (498000000U ,83 ,0 ,1 ,0 ,4 ), +PLL_FRACN_GP (560000000U ,140 ,0 ,1 ,0 ,6 ), +PLL_FRACN_GP (498000000U ,166 ,0 ,1 ,0 ,8 ),PLL_FRACN_GP (484000000U ,121 ,0 ,1 ,0 ,6 ),PLL_FRACN_GP (445333333U ,167 ,0 ,1 ,0 ,9 ), -PLL_FRACN_GP (400000000U ,50 ,0 ,1 ,0 ,3 ), -PLL_FRACN_GP (393216000U ,81 ,92 ,100 ,0 ,5 ) +PLL_FRACN_GP (400000000U ,200 ,0 ,1 ,0 ,12 ), +PLL_FRACN_GP (393216000U ,163 ,84 ,100 ,0 ,10 ) };struct imx_fracn_gppll_clk imx_fracn_gppll = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 551/663 clk: imx: fracn-gppll: disable hardware select control
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit 4435467b15b069e5a6f50ca9a9260e86b74dbc13 ]
When programming PLL, should disable Hardware control select to make PLL controlled by register, not hardware inputs through OSCPLL.
--- drivers/clk/imx/clk-fracn-gppll.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/clk/imx/clk-fracn-gppll.c +6 -0
@@ -15,6 +15,7 @@#include "clk.h" #define PLL_CTRL 0x0 +#define HW_CTRL_SEL BIT(16)#define CLKMUX_BYPASS BIT(2)#define CLKMUX_EN BIT(1)#define POWERUP_MASK BIT(0)
@@ -193,6 +194,11 @@ static int clk_fracn_gppll_set_rate(struct clk_hw *hw, unsigned long drate, rate =imx_get_pll_settings (pll, drate); +/* Hardware control select disable. PLL is control by register */ + tmp =readl_relaxed (pll->base +PLL_CTRL ); + tmp &= ~HW_CTRL_SEL ; +writel_relaxed (tmp, pll->base +PLL_CTRL ); +/* Disable output */ tmp =readl_relaxed (pll->base +PLL_CTRL ); tmp &= ~CLKMUX_EN ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 552/663 clk: imx: imx8ulp: Fix XBAR_DIVBUS and AD_SLOW clock parents
In reply to Greg Kroah-HartmanFrom: Peng Fan <[email protected]>
[ Upstream commit d608c18018c897b88d66f1340fe274b7181817fa ]
XBAR_DIVBUS and AD_SLOW should set parent to XBAR_AD_DIVPLAT and XBAR_DIVBUS respectively, not the NIC_AD. otherwise we will get wrong clock rate.
--- drivers/clk/imx/clk-imx8ulp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-imx8ulp.c +2 -2
@@ -200,8 +200,8 @@ static int imx8ulp_clk_cgc1_init(struct platform_device *pdev) clks[IMX8ULP_CLK_NIC_AD_DIVPLAT ] =imx_clk_hw_divider_flags ("nic_ad_divplat" ,"nic_sel" , base +0x34 ,21 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); clks[IMX8ULP_CLK_NIC_PER_DIVPLAT ] =imx_clk_hw_divider_flags ("nic_per_divplat" ,"nic_ad_divplat" , base +0x34 ,14 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); clks[IMX8ULP_CLK_XBAR_AD_DIVPLAT ] =imx_clk_hw_divider_flags ("xbar_ad_divplat" ,"nic_ad_divplat" , base +0x38 ,14 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); - clks[IMX8ULP_CLK_XBAR_DIVBUS ] =imx_clk_hw_divider_flags ("xbar_divbus" ,"nic_ad_divplat" , base +0x38 ,7 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); - clks[IMX8ULP_CLK_XBAR_AD_SLOW ] =imx_clk_hw_divider_flags ("xbar_ad_slow" ,"nic_ad_divplat" , base +0x38 ,0 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); + clks[IMX8ULP_CLK_XBAR_DIVBUS ] =imx_clk_hw_divider_flags ("xbar_divbus" ,"xbar_ad_divplat" , base +0x38 ,7 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); + clks[IMX8ULP_CLK_XBAR_AD_SLOW ] =imx_clk_hw_divider_flags ("xbar_ad_slow" ,"xbar_divbus" , base +0x38 ,0 ,6 ,CLK_SET_RATE_PARENT |CLK_IS_CRITICAL ); clks[IMX8ULP_CLK_SOSC_DIV1_GATE ] =imx_clk_hw_gate_dis ("sosc_div1_gate" ,"sosc" , base +0x108 ,7 ); clks[IMX8ULP_CLK_SOSC_DIV2_GATE ] =imx_clk_hw_gate_dis ("sosc_div2_gate" ,"sosc" , base +0x108 ,15 );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 553/663 NFSv4.1: Always send a RECLAIM_COMPLETE after establishing lease
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 40882deb83c29d8df4470d4e5e7f137b6acf7ad1 ]
The spec requires that we always at least send a RECLAIM_COMPLETE when we're done establishing the lease and recovering any state.
--- fs/nfs/nfs4state.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/nfs/nfs4state.c +4 -0
@@ -67,6 +67,8 @@#define OPENOWNER_POOL_SIZE 8 +static void nfs4_state_start_reclaim_reboot (struct nfs_client *clp); +const nfs4_stateid zero_stateid = { { .data = {0 } }, .type =NFS4_SPECIAL_STATEID_TYPE ,
@@ -330,6 +332,8 @@ int nfs41_init_clientid(struct nfs_client *clp, const struct cred *cred) status =nfs4_proc_create_session (clp, cred);if (status !=0 ) goto out; +if (!(clp->cl_exchange_flags &EXCHGID4_FLAG_CONFIRMED_R )) +nfs4_state_start_reclaim_reboot (clp);nfs41_finish_session_reset (clp);nfs_mark_client_ready (clp,NFS_CS_READY ); out:
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 554/663 iommu/amd: Set page size bitmap during V2 domain allocation
In reply to Greg Kroah-HartmanFrom: Jerry Snitselaar <[email protected]>
[ Upstream commit 8f880d19e6ad645a4b8066d5ff091c980b3231e7 ]
With the addition of the V2 page table support, the domain page size bitmap needs to be set prior to iommu core setting up direct mappings for reserved regions. When reserved regions are mapped, if this is not done, it will be looking at the V1 page size bitmap when determining the page size to use in iommu_pgsize(). When it gets into the actual amd mapping code, a check of see if the page size is supported can fail, because at that point it is checking it against the V2 page size bitmap which only supports 4K, 2M, and 1G.
Add a check to __iommu_domain_alloc() to not override the bitmap if it was already set by the iommu ops domain_alloc() code path.
--- drivers/iommu/amd/iommu.c | 6 ++---- drivers/iommu/iommu.c | 9 +++++++-- 2 files changed, 9 insertions(+), 6 deletions(-)
drivers/iommu/amd/iommu.c +2 -4
@@ -1656,10 +1656,6 @@ static void do_attach(struct iommu_dev_data *dev_data, domain->dev_iommu[iommu->index] +=1 ; domain->dev_cnt +=1 ; -/* Override supported page sizes */ -if (domain->flags &PD_GIOV_MASK ) - domain->domain.pgsize_bitmap =AMD_IOMMU_PGSIZES_V2 ; -/* Update device table */ set_dte_entry (iommu, dev_data->devid, domain, ats, dev_data->iommu_v2);
@@ -2038,6 +2034,8 @@ static int protection_domain_init_v2(struct protection_domain *domain) domain->flags |=PD_GIOV_MASK ; + domain->domain.pgsize_bitmap =AMD_IOMMU_PGSIZES_V2 ; +if (domain_enable_v2 (domain,1 )) {domain_id_free (domain->id);return -ENOMEM ;
drivers/iommu/iommu.c +7 -2
@@ -1940,8 +1940,13 @@ static struct iommu_domain *__iommu_domain_alloc(struct bus_type *bus,return NULL ; domain->type = type; -/* Assume all sizes by default; the driver may override this later */ - domain->pgsize_bitmap = bus->iommu_ops->pgsize_bitmap; +/* +* If not already set, assume all sizes by default; the driver +* may override this later +*/ +if (!domain->pgsize_bitmap) + domain->pgsize_bitmap = bus->iommu_ops->pgsize_bitmap; +if (!domain->ops) domain->ops = bus->iommu_ops->default_domain_ops;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 555/663 s390/checksum: always use cksm instruction
In reply to Greg Kroah-HartmanFrom: Heiko Carstens <[email protected]>
[ Upstream commit e42ac7789df64120d7d3d57433dfc9f37ec0cb99 ]
Commit dfe843dce775 ("s390/checksum: support GENERIC_CSUM, enable it for KASAN") switched s390 to use the generic checksum functions, so that KASAN instrumentation also works checksum functions by avoiding architecture specific inline assemblies.
There is however the problem that the generic csum_partial() function returns a 32 bit value with a 16 bit folded checksum, while the original s390 variant does not fold to 16 bit. This in turn causes that the ipib_checksum in lowcore contains different values depending on kernel config options.
The ipib_checksum is used by system dumpers to verify if pointers in lowcore point to valid data. Verification is done by comparing checksum values. The system dumpers still use 32 bit checksum values which are not folded, and therefore the checksum verification fails (incorrectly).
Symptom is that reboot after dump does not work anymore when a KASAN instrumented kernel is dumped.
Fix this by not using the generic checksum implementation. Instead add an explicit kasan_check_read() so that KASAN knows about the read access from within the inline assembly.
--- arch/s390/Kconfig | 4 ---- arch/s390/include/asm/checksum.h | 9 ++------- 2 files changed, 2 insertions(+), 11 deletions(-)
arch/s390/Kconfig +0 -4
@@ -26,10 +26,6 @@ config GENERIC_BUG config GENERIC_BUG_RELATIVE_POINTERS def_bool y -config GENERIC_CSUM - bool - default y if KASAN - config GENERIC_LOCKBREAK def_bool y if PREEMPTION
arch/s390/include/asm/checksum.h +2 -7
@@ -12,12 +12,7 @@#ifndef _S390_CHECKSUM_H#define _S390_CHECKSUM_H -#ifdef CONFIG_GENERIC_CSUM - -#include <asm-generic/checksum.h> - -#else /* CONFIG_GENERIC_CSUM */ - +#include <linux/kasan-checks.h> #include <linux/uaccess.h> #include <linux/in6.h>
@@ -40,6 +35,7 @@ static inline __wsum csum_partial(const void *buff, int len, __wsum sum) .odd = (unsigned long) len, }; +kasan_check_read (buff, len); asmvolatile ("0: cksm %[sum],%[rp]\n" " jo 0b\n"
@@ -135,5 +131,4 @@ static inline __sum16 csum_ipv6_magic(const struct in6_addr *saddr, return csum_fold((__force __wsum)(sum >> 32)); } -#endif /* CONFIG_GENERIC_CSUM */ #endif /* _S390_CHECKSUM_H */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 556/663 clk: qcom: lpasscc-sc7280: Skip qdsp6ss clock registration
In reply to Greg Kroah-HartmanFrom: Srinivasa Rao Mandadapu <[email protected]>
[ Upstream commit 4fc1c2d9a2b7a394f3b873aae5e03bffd8b5cd31 ]
The qdsp6ss memory region is being shared by ADSP remoteproc device and lpasscc clock device, hence causing memory conflict.
To avoid this, when qdsp6ss clocks are being enabled in remoteproc driver, skip qdsp6ss clock registration if "qcom,adsp-pil-mode" is enabled and also assign max_register value.
--- drivers/clk/qcom/lpasscc-sc7280.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/clk/qcom/lpasscc-sc7280.c +10 -6
@@ -118,14 +118,18 @@ static int lpass_cc_sc7280_probe(struct platform_device *pdev) goto destroy_pm_clk; } - lpass_regmap_config.name ="qdsp6ss" ; - desc = &lpass_qdsp6ss_sc7280_desc; - - ret =qcom_cc_probe_by_index (pdev,0 , desc); -if (ret) - goto destroy_pm_clk; +if (!of_property_read_bool (pdev->dev.of_node,"qcom,adsp-pil-mode" )) { + lpass_regmap_config.name ="qdsp6ss" ; + lpass_regmap_config.max_register =0x3f ; + desc = &lpass_qdsp6ss_sc7280_desc; + + ret =qcom_cc_probe_by_index (pdev,0 , desc); +if (ret) + goto destroy_pm_clk; + } lpass_regmap_config.name ="top_cc" ; + lpass_regmap_config.max_register =0x4 ; desc = &lpass_cc_top_sc7280_desc; ret =qcom_cc_probe_by_index (pdev,1 , desc);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 557/663 clk: qcom: lpassaudiocc-sc7280: Add required gdsc power domain clks in lpass_cc_sc7280_desc
In reply to Greg Kroah-HartmanFrom: Mohammad Rafi Shaik <[email protected]>
[ Upstream commit aad09fc7c4a522892eb64a79627b17a3869936cb ]
Add GDSCs in lpass_cc_sc7280_desc struct.
When qcom,adsp-pil-mode is enabled, GDSCs required to solve dependencies in lpass_audiocc probe().
--- drivers/clk/qcom/lpassaudiocc-sc7280.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/clk/qcom/lpassaudiocc-sc7280.c +2 -0
@@ -696,6 +696,8 @@ static const struct qcom_cc_desc lpass_cc_sc7280_desc = { .config = &lpass_audio_cc_sc7280_regmap_config, .clks = lpass_cc_sc7280_clocks, .num_clks = ARRAY_SIZE(lpass_cc_sc7280_clocks), + .gdscs = lpass_aon_cc_sc7280_gdscs, + .num_gdscs = ARRAY_SIZE(lpass_aon_cc_sc7280_gdscs), };static const struct qcom_cc_desc lpass_audio_cc_sc7280_desc = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 558/663 clk: qcom: gcc-sm8350: fix PCIe PIPE clocks handling
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 1a500e0bc97b6cb3c0d9859e81973b8dd07d1b7b ]
On SM8350 platform the PCIe PIPE clocks require additional handling to function correctly. They are to be switched to the tcxo source before turning PCIe GDSCs off and should be switched to PHY PIPE source once they are working. Switch PCIe PHY clocks to use clk_regmap_phy_mux_ops, which provide support for this dance.
--- drivers/clk/qcom/gcc-sm8350.c | 47 ++++++++++------------------------- 1 file changed, 13 insertions(+), 34 deletions(-)
drivers/clk/qcom/gcc-sm8350.c +13 -34
@@ -17,6 +17,7 @@#include "clk-regmap.h" #include "clk-regmap-divider.h" #include "clk-regmap-mux.h" +#include "clk-regmap-phy-mux.h" #include "gdsc.h" #include "reset.h"
@@ -167,26 +168,6 @@ static const struct clk_parent_data gcc_parent_data_3[] = { { .fw_name = "core_bi_pll_test_se" }, }; -static const struct parent_map gcc_parent_map_4[] = { - {P_PCIE_0_PIPE_CLK ,0 }, - {P_BI_TCXO ,2 }, -}; - -static const struct clk_parent_data gcc_parent_data_4[] = { - { .fw_name ="pcie_0_pipe_clk" , }, - { .fw_name ="bi_tcxo" }, -}; - -static const struct parent_map gcc_parent_map_5[] = { - {P_PCIE_1_PIPE_CLK ,0 }, - {P_BI_TCXO ,2 }, -}; - -static const struct clk_parent_data gcc_parent_data_5[] = { - { .fw_name ="pcie_1_pipe_clk" }, - { .fw_name ="bi_tcxo" }, -}; -static const struct parent_map gcc_parent_map_6[] = { {P_BI_TCXO ,0 }, { P_GCC_GPLL0_OUT_MAIN, 1 },
@@ -289,32 +270,30 @@ static const struct clk_parent_data gcc_parent_data_14[] = { { .fw_name = "bi_tcxo" }, }; -static struct clk_regmap_mux gcc_pcie_0_pipe_clk_src = { +static struct clk_regmap_phy_mux gcc_pcie_0_pipe_clk_src = { .reg =0x6b054 , - .shift =0 , - .width =2 , - .parent_map = gcc_parent_map_4, .clkr = { .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie_0_pipe_clk_src" , - .parent_data = gcc_parent_data_4, - .num_parents =ARRAY_SIZE (gcc_parent_data_4), - .ops = &clk_regmap_mux_closest_ops, + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="pcie_0_pipe_clk" , + }, + .num_parents =1 , + .ops = &clk_regmap_phy_mux_ops, }, }, }; -static struct clk_regmap_mux gcc_pcie_1_pipe_clk_src = { +static struct clk_regmap_phy_mux gcc_pcie_1_pipe_clk_src = { .reg =0x8d054 , - .shift =0 , - .width =2 , - .parent_map = gcc_parent_map_5, .clkr = { .hw.init = &(struct clk_init_data ){ .name ="gcc_pcie_1_pipe_clk_src" , - .parent_data = gcc_parent_data_5, - .num_parents =ARRAY_SIZE (gcc_parent_data_5), - .ops = &clk_regmap_mux_closest_ops, + .parent_data = &(const struct clk_parent_data ){ + .fw_name ="pcie_1_pipe_clk" , + }, + .num_parents =1 , + .ops = &clk_regmap_phy_mux_ops, }, }, };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 559/663 clk: qcom: dispcc-qcm2290: get rid of test clock
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 62db82f9c8004f1226f5cec8a5441fb89eb984fa ]
The test clock apparently it's not used by anyone upstream. Remove it.
Stable-dep-of: 68d1151f0306 ("clk: qcom: dispcc-qcm2290: Remove inexistent DSI1PHY clk")
--- drivers/clk/qcom/dispcc-qcm2290.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/clk/qcom/dispcc-qcm2290.c +0 -6
@@ -71,7 +71,6 @@ static const struct parent_map disp_cc_parent_map_0[] = {static const struct clk_parent_data disp_cc_parent_data_0[] = { { .fw_name ="bi_tcxo" }, { .fw_name ="dsi0_phy_pll_out_byteclk" }, - { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_1[] = {
@@ -80,7 +79,6 @@ static const struct parent_map disp_cc_parent_map_1[] = {static const struct clk_parent_data disp_cc_parent_data_1[] = { { .fw_name ="bi_tcxo" }, - { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_2[] = {
@@ -91,7 +89,6 @@ static const struct parent_map disp_cc_parent_map_2[] = {static const struct clk_parent_data disp_cc_parent_data_2[] = { { .fw_name ="bi_tcxo_ao" }, { .fw_name ="gcc_disp_gpll0_div_clk_src" }, - { .fw_name ="core_bi_pll_test_se" }, };static const struct parent_map disp_cc_parent_map_3[] = {
@@ -104,7 +101,6 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = { { .fw_name = "bi_tcxo" }, { .hw = &disp_cc_pll0.clkr.hw }, { .fw_name = "gcc_disp_gpll0_clk_src" }, - { .fw_name = "core_bi_pll_test_se" }, }; static const struct parent_map disp_cc_parent_map_4[] = {
@@ -117,7 +113,6 @@ static const struct clk_parent_data disp_cc_parent_data_4[] = { { .fw_name = "bi_tcxo" }, { .fw_name = "dsi0_phy_pll_out_dsiclk" }, { .fw_name = "dsi1_phy_pll_out_dsiclk" }, - { .fw_name = "core_bi_pll_test_se" }, }; static const struct parent_map disp_cc_parent_map_5[] = {
@@ -126,7 +121,6 @@ static const struct parent_map disp_cc_parent_map_5[] = {static const struct clk_parent_data disp_cc_parent_data_5[] = { { .fw_name ="sleep_clk" }, - { .fw_name ="core_bi_pll_test_se" }, };static struct clk_rcg2 disp_cc_mdss_byte0_clk_src = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 560/663 clk: qcom: dispcc-qcm2290: Remove inexistent DSI1PHY clk
In reply to Greg Kroah-HartmanFrom: Konrad Dybcio <[email protected]>
[ Upstream commit 68d1151f03067533827fc50b770954ef33149533 ]
There's only one DSI PHY on this SoC. Remove the ghost entry for the clock produced by a secondary one.
--- drivers/clk/qcom/dispcc-qcm2290.c | 3 --- 1 file changed, 3 deletions(-)
drivers/clk/qcom/dispcc-qcm2290.c +0 -3
@@ -26,7 +26,6 @@ enum {P_DISP_CC_PLL0_OUT_MAIN ,P_DSI0_PHY_PLL_OUT_BYTECLK ,P_DSI0_PHY_PLL_OUT_DSICLK , -P_DSI1_PHY_PLL_OUT_DSICLK ,P_GPLL0_OUT_MAIN , P_SLEEP_CLK, };
@@ -106,13 +105,11 @@ static const struct clk_parent_data disp_cc_parent_data_3[] = {static const struct parent_map disp_cc_parent_map_4[] = { {P_BI_TCXO ,0 }, {P_DSI0_PHY_PLL_OUT_DSICLK ,1 }, - {P_DSI1_PHY_PLL_OUT_DSICLK ,2 }, };static const struct clk_parent_data disp_cc_parent_data_4[] = { { .fw_name ="bi_tcxo" }, { .fw_name ="dsi0_phy_pll_out_dsiclk" }, - { .fw_name ="dsi1_phy_pll_out_dsiclk" }, };static const struct parent_map disp_cc_parent_map_5[] = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 561/663 Input: raspberrypi-ts - fix refcount leak in rpi_ts_probe
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 5bca3688bdbc3b58a2894b8671a8e2378efe28bd ]
rpi_firmware_get() take reference, we need to release it in error paths as well. Use devm_rpi_firmware_get() helper to handling the resources. Also remove the existing rpi_firmware_put().
--- drivers/input/touchscreen/raspberrypi-ts.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/input/touchscreen/raspberrypi-ts.c +1 -2
@@ -134,7 +134,7 @@ static int rpi_ts_probe(struct platform_device *pdev)return -ENOENT ; } - fw =rpi_firmware_get (fw_node); + fw =devm_rpi_firmware_get (&pdev->dev, fw_node);of_node_put (fw_node);if (!fw)return -EPROBE_DEFER ;
@@ -160,7 +160,6 @@ static int rpi_ts_probe(struct platform_device *pdev) touchbuf = (u32 )ts->fw_regs_phys; error =rpi_firmware_property (fw,RPI_FIRMWARE_FRAMEBUFFER_SET_TOUCHBUF , &touchbuf,sizeof (touchbuf)); -rpi_firmware_put (fw);if (error || touchbuf !=0 ) {dev_warn (dev,"Failed to set touchbuf, %d\n" , error);return error;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 562/663 swiotlb: relocate PageHighMem test away from rmem_swiotlb_setup
In reply to Greg Kroah-HartmanFrom: Doug Berger <[email protected]>
[ Upstream commit a90922fa25370902322e9de6640e58737d459a50 ]
The reservedmem_of_init_fn's are invoked very early at boot before the memory zones have even been defined. This makes it inappropriate to test whether the page corresponding to a PFN is in ZONE_HIGHMEM from within one.
Removing the check allows an ARM 32-bit kernel with SPARSEMEM enabled to boot properly since otherwise we would be de-referencing an uninitialized sparsemem map to perform pfn_to_page() check.
The arm64 architecture happens to work (and also has no high memory) but other 32-bit architectures could also be having similar issues.
While it would be nice to provide early feedback about a reserved DMA pool residing in highmem, it is not possible to do that until the first time we try to use it, which is where the check is moved to.
--- kernel/dma/swiotlb.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
kernel/dma/swiotlb.c +5 -5
@@ -1003,6 +1003,11 @@ static int rmem_swiotlb_device_init(struct reserved_mem *rmem,/* Set Per-device io tlb area to one */ unsigned int nareas =1 ; +if (PageHighMem (pfn_to_page (PHYS_PFN (rmem->base)))) { +dev_err (dev,"Restricted DMA pool must be accessible within the linear mapping." ); +return -EINVAL ; + } +/* * Since multiple devices can share the same pool, the private data, * io_tlb_mem struct, will be initialized by the first device attached
@@ -1064,11 +1069,6 @@ static int __init rmem_swiotlb_setup(struct reserved_mem *rmem) of_get_flat_dt_prop(node, "no-map", NULL))return -EINVAL ; -if (PageHighMem (pfn_to_page (PHYS_PFN (rmem->base)))) { -pr_err ("Restricted DMA pool must be accessible within the linear mapping." ); -return -EINVAL ; - } - rmem->ops = &rmem_swiotlb_ops;pr_info ("Reserved memory: created restricted DMA pool at %pa, size %ld MiB\n" , &rmem->base, (unsigned long )rmem->size /SZ_1M );
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 563/663 swiotlb: fix debugfs reporting of reserved memory pools
In reply to Greg Kroah-HartmanFrom: Michael Kelley <[email protected]>
[ Upstream commit 5499d01c029069044a3b3e50501c77b474c96178 ]
For io_tlb_nslabs, the debugfs code reports the correct value for a specific reserved memory pool. But for io_tlb_used, the value reported is always for the default pool, not the specific reserved pool. Fix this.
--- kernel/dma/swiotlb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
kernel/dma/swiotlb.c +4 -2
@@ -935,7 +935,9 @@ EXPORT_SYMBOL_GPL(is_swiotlb_active);static int io_tlb_used_get (void *data,u64 *val) { - *val =mem_used (&io_tlb_default_mem); +struct io_tlb_mem *mem = data; + + *val =mem_used (mem);return 0 ; }DEFINE_DEBUGFS_ATTRIBUTE (fops_io_tlb_used, io_tlb_used_get,NULL ,"%llu\n" );
@@ -948,7 +950,7 @@ static void swiotlb_create_debugfs_files(struct io_tlb_mem *mem,return ;debugfs_create_ulong ("io_tlb_nslabs" ,0400 , mem->debugfs, &mem->nslabs); -debugfs_create_file ("io_tlb_used" ,0400 , mem->debugfs,NULL , +debugfs_create_file ("io_tlb_used" ,0400 , mem->debugfs, mem, &fops_io_tlb_used); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 564/663 RDMA/rxe: Convert tasklet args to queue pairs
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 3946fc2a42b18cf0b675121158a2625825ce27b5 ]
Originally is was thought that the tasklet machinery in rxe_task.c would be used in other applications but that has not happened for years. This patch replaces the 'void *arg' by struct 'rxe_qp *qp' in the parameters to the tasklet calls. This change will have no affect on performance but may make the code a little clearer.
Stable-dep-of: b2b1ddc45745 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"")
--- drivers/infiniband/sw/rxe/rxe_comp.c | 3 +-- drivers/infiniband/sw/rxe/rxe_loc.h | 6 +++--- drivers/infiniband/sw/rxe/rxe_req.c | 3 +-- drivers/infiniband/sw/rxe/rxe_resp.c | 3 +-- drivers/infiniband/sw/rxe/rxe_task.c | 11 ++++++----- drivers/infiniband/sw/rxe/rxe_task.h | 9 +++++---- 6 files changed, 17 insertions(+), 18 deletions(-)
drivers/infiniband/sw/rxe/rxe_comp.c +1 -2
@@ -571,9 +571,8 @@ static void free_pkt(struct rxe_pkt_infoib_device_put (dev); } -int rxe_completer (void *arg) +int rxe_completer (struct rxe_qp *qp) { -struct rxe_qp *qp = (struct rxe_qp *)arg;struct rxe_dev *rxe =to_rdev (qp->ibqp.device);struct rxe_send_wqe *wqe =NULL ;struct sk_buff *skb =NULL ;
drivers/infiniband/sw/rxe/rxe_loc.h +3 -3
@@ -171,9 +171,9 @@ void rxe_srq_cleanup(struct rxe_pool_elevoid rxe_dealloc (struct ib_device *ib_dev); -int rxe_completer (void *arg); -int rxe_requester (void *arg); -int rxe_responder (void *arg); +int rxe_completer (struct rxe_qp *qp); +int rxe_requester (struct rxe_qp *qp); +int rxe_responder (struct rxe_qp *qp);/* rxe_icrc.c */ int rxe_icrc_init (struct rxe_dev *rxe);
drivers/infiniband/sw/rxe/rxe_req.c +1 -2
@@ -635,9 +635,8 @@ static int rxe_do_local_ops(struct rxe_qreturn 0 ; } -int rxe_requester (void *arg) +int rxe_requester (struct rxe_qp *qp) { -struct rxe_qp *qp = (struct rxe_qp *)arg;struct rxe_dev *rxe =to_rdev (qp->ibqp.device);struct rxe_pkt_info pkt;struct sk_buff *skb;
drivers/infiniband/sw/rxe/rxe_resp.c +1 -2
@@ -1439,9 +1439,8 @@ static void rxe_drain_req_pkts(struct rxqueue_advance_consumer (q, q->type); } -int rxe_responder (void *arg) +int rxe_responder (struct rxe_qp *qp) { -struct rxe_qp *qp = (struct rxe_qp *)arg;struct rxe_dev *rxe =to_rdev (qp->ibqp.device);enum resp_states state;struct rxe_pkt_info *pkt =NULL ;
drivers/infiniband/sw/rxe/rxe_task.c +6 -5
@@ -11,7 +11,7 @@ int __rxe_do_task(struct rxe_task *task) {int ret; -while ((ret = task->func (task->arg)) ==0 ) +while ((ret = task->func (task->qp)) ==0 ) ; task->ret = ret;
@@ -29,7 +29,7 @@ static void do_task(struct tasklet_strucint cont;int ret;struct rxe_task *task =from_tasklet (task, t, tasklet); -struct rxe_qp *qp = (struct rxe_qp *)task->arg; +struct rxe_qp *qp = (struct rxe_qp *)task->qp;unsigned int iterations =RXE_MAX_ITERATIONS ;spin_lock_bh (&task->lock);
@@ -54,7 +54,7 @@ static void do_task(struct tasklet_struc do { cont = 0; - ret = task->func(task->arg); + ret = task->func(task->qp); spin_lock_bh(&task->lock); switch (task->state) {
@@ -91,9 +91,10 @@ static void do_task(struct tasklet_struc task->ret = ret; } -int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *)) +int rxe_init_task (struct rxe_task *task,struct rxe_qp *qp, +int (*func)(struct rxe_qp *)) { - task->arg = arg; + task->qp = qp; task->func = func; task->destroyed = false;
drivers/infiniband/sw/rxe/rxe_task.h +5 -4
@@ -22,18 +22,19 @@ struct rxe_task {struct tasklet_struct tasklet;int state;spinlock_t lock; -void *arg; -int (*func)(void *arg); +struct rxe_qp *qp; +int (*func)(struct rxe_qp *qp);int ret;bool destroyed; };/* * init rxe_task structure -* arg => parameter to pass to fcn +* qp => parameter to pass to func * func => function to call until it returns != 0 */ -int rxe_init_task (struct rxe_task *task,void *arg,int (*func)(void *)); +int rxe_init_task (struct rxe_task *task,struct rxe_qp *qp, +int (*func)(struct rxe_qp *));/* cleanup task */ void rxe_cleanup_task (struct rxe_task *task);
Greg Kroah-Hartman
maintainerPATCH 565/663 RDMA/rxe: Remove __rxe_do_task()
In reply to Greg Kroah-HartmanFrom: Bob Pearson <[email protected]>
[ Upstream commit 960ebe97e5238565d15063c8f4d1b2108efe2e65 ]
The subroutine __rxe_do_task is not thread safe and it has no way to guarantee that the tasks, which are designed with the assumption that they are non-reentrant, are not reentered. All of its uses are non-performance critical.
This patch replaces calls to __rxe_do_task with calls to rxe_sched_task. It also removes irrelevant or unneeded if tests.
Instead of calling the task machinery a single call to the tasklet function (rxe_requester, etc.) is sufficient to draing the queues if task execution has been disabled or stopped.
Together these changes allow the removal of __rxe_do_task.
Stable-dep-of: b2b1ddc45745 ("RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"")
--- drivers/infiniband/sw/rxe/rxe_qp.c | 56 +++++++++------------------- drivers/infiniband/sw/rxe/rxe_task.c | 13 ------- drivers/infiniband/sw/rxe/rxe_task.h | 6 --- 3 files changed, 17 insertions(+), 58 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +17 -39
@@ -473,29 +473,23 @@ static void rxe_qp_reset(struct rxe_qp *qp) {/* stop tasks from running */ rxe_disable_task (&qp->resp.task); - -/* stop request/comp */ -if (qp->sq.queue) { -if (qp_type (qp) ==IB_QPT_RC ) -rxe_disable_task (&qp->comp.task); -rxe_disable_task (&qp->req.task); - } +rxe_disable_task (&qp->comp.task); +rxe_disable_task (&qp->req.task);/* move qp to the reset state */ qp->req.state =QP_STATE_RESET ; qp->comp.state =QP_STATE_RESET ; qp->resp.state =QP_STATE_RESET ; -/* let state machines reset themselves drain work and packet queues -* etc. -*/ -__rxe_do_task (&qp->resp.task); +/* drain work and packet queuesc */ +rxe_requester (qp); +rxe_completer (qp); +rxe_responder (qp); -if (qp->sq.queue) { -__rxe_do_task (&qp->comp.task); -__rxe_do_task (&qp->req.task); +if (qp->rq.queue) +rxe_queue_reset (qp->rq.queue); +if (qp->sq.queue)rxe_queue_reset (qp->sq.queue); - }/* cleanup attributes */ atomic_set (&qp->ssn,0 );
@@ -518,13 +512,8 @@ static void rxe_qp_reset(struct rxe_qp *qp)/* reenable tasks */ rxe_enable_task (&qp->resp.task); - -if (qp->sq.queue) { -if (qp_type (qp) ==IB_QPT_RC ) -rxe_enable_task (&qp->comp.task); - -rxe_enable_task (&qp->req.task); - } +rxe_enable_task (&qp->comp.task); +rxe_enable_task (&qp->req.task); }/* drain the send queue */
@@ -533,10 +522,7 @@ static void rxe_qp_drain(struct rxe_qp *qp)if (qp->sq.queue) {if (qp->req.state !=QP_STATE_DRAINED ) { qp->req.state =QP_STATE_DRAIN ; -if (qp_type (qp) ==IB_QPT_RC ) -rxe_sched_task (&qp->comp.task); -else -__rxe_do_task (&qp->comp.task); +rxe_sched_task (&qp->comp.task);rxe_sched_task (&qp->req.task); } }
@@ -552,11 +538,7 @@ void rxe_qp_error(struct rxe_qp *qp)/* drain work and packet queues */ rxe_sched_task (&qp->resp.task); - -if (qp_type (qp) ==IB_QPT_RC ) -rxe_sched_task (&qp->comp.task); -else -__rxe_do_task (&qp->comp.task); +rxe_sched_task (&qp->comp.task);rxe_sched_task (&qp->req.task); }
@@ -773,24 +755,20 @@ static void rxe_qp_do_cleanup(struct work_struct *work) qp->valid =0 ; qp->qp_timeout_jiffies =0 ; -rxe_cleanup_task (&qp->resp.task);if (qp_type (qp) ==IB_QPT_RC ) {del_timer_sync (&qp->retrans_timer);del_timer_sync (&qp->rnr_nak_timer); } +rxe_cleanup_task (&qp->resp.task);rxe_cleanup_task (&qp->req.task);rxe_cleanup_task (&qp->comp.task);/* flush out any receive wr's or pending requests */ -if (qp->req.task.func) -__rxe_do_task (&qp->req.task); - -if (qp->sq.queue) { -__rxe_do_task (&qp->comp.task); -__rxe_do_task (&qp->req.task); - } +rxe_requester (qp); +rxe_completer (qp); +rxe_responder (qp);if (qp->sq.queue)rxe_queue_cleanup (qp->sq.queue);
drivers/infiniband/sw/rxe/rxe_task.c +0 -13
@@ -6,19 +6,6 @@#include "rxe.h" -int __rxe_do_task (struct rxe_task *task) - -{ -int ret; - -while ((ret = task->func (task->qp)) ==0 ) - ; - - task->ret = ret; - -return ret; -} -/* * this locking is due to a potential race where * a second caller finds the task already running
drivers/infiniband/sw/rxe/rxe_task.h +0 -6
@@ -39,12 +39,6 @@ int rxe_init_task(struct rxe_task *task, struct rxe_qp *qp,/* cleanup task */ void rxe_cleanup_task (struct rxe_task *task); -/* -* raw call to func in loop without any checking -* can call when tasklets are disabled -*/ -int __rxe_do_task (struct rxe_task *task); -void rxe_run_task (struct rxe_task *task);void rxe_sched_task (struct rxe_task *task);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 566/663 RDMA/rxe: Fix the error "trying to register non-static key in rxe_cleanup_task"
In reply to Greg Kroah-HartmanFrom: Zhu Yanjun <[email protected]>
[ Upstream commit b2b1ddc457458fecd1c6f385baa9fbda5f0c63ad ]
In the function rxe_create_qp(), rxe_qp_from_init() is called to initialize qp, internally things like rxe_init_task are not setup until rxe_qp_init_req().
If an error occurred before this point then the unwind will call rxe_cleanup() and eventually to rxe_qp_do_cleanup()/rxe_cleanup_task() which will oops when trying to access the uninitialized spinlock.
If rxe_init_task is not executed, rxe_cleanup_task will not be called.
--- drivers/infiniband/sw/rxe/rxe_qp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/infiniband/sw/rxe/rxe_qp.c +8 -3
@@ -761,9 +761,14 @@ static void rxe_qp_do_cleanup(struct work_struct *work)del_timer_sync (&qp->rnr_nak_timer); } -rxe_cleanup_task (&qp->resp.task); -rxe_cleanup_task (&qp->req.task); -rxe_cleanup_task (&qp->comp.task); +if (qp->resp.task.func) +rxe_cleanup_task (&qp->resp.task); + +if (qp->req.task.func) +rxe_cleanup_task (&qp->req.task); + +if (qp->comp.task.func) +rxe_cleanup_task (&qp->comp.task);/* flush out any receive wr's or pending requests */ rxe_requester (qp);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 567/663 RDMA/mlx5: Check pcie_relaxed_ordering_enabled() in UMR
In reply to Greg Kroah-HartmanFrom: Avihai Horon <[email protected]>
[ Upstream commit d43b020b0f82c088ef8ff3196ef00575a97d200e ]
relaxed_ordering_read HCA capability is set if both the device supports relaxed ordering (RO) read and RO is set in PCI config space.
RO in PCI config space can change during runtime. This will change the value of relaxed_ordering_read HCA capability in FW, but the driver will not see it since it queries the capabilities only once.
This can lead to the following scenario:
1. RO in PCI config space is enabled.
2. User creates MKey without RO.
3. RO in PCI config space is disabled.
As a result, relaxed_ordering_read HCA capability is turned off in FW but remains on in driver copy of the capabilities.
4. User requests to reconfig the MKey with RO via UMR.
5. Driver will try to reconfig the MKey with RO read although it shouldn't (as relaxed_ordering_read HCA capability is really off).
To fix this, check pcie_relaxed_ordering_enabled() before setting RO read in UMR.
--- drivers/infiniband/hw/mlx5/umr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/infiniband/hw/mlx5/umr.c +4 -2
@@ -380,6 +380,9 @@ static void mlx5r_umr_set_access_flags(struct mlx5_ib_dev *dev,struct mlx5_mkey_seg *seg, unsigned int access_flags) { + bool ro_read = (access_flags & IB_ACCESS_RELAXED_ORDERING) && +pcie_relaxed_ordering_enabled (dev->mdev->pdev); +MLX5_SET (mkc, seg, a, !!(access_flags &IB_ACCESS_REMOTE_ATOMIC ));MLX5_SET (mkc, seg, rw, !!(access_flags &IB_ACCESS_REMOTE_WRITE ));MLX5_SET (mkc, seg, rr, !!(access_flags &IB_ACCESS_REMOTE_READ ));
@@ -387,8 +390,7 @@ static void mlx5r_umr_set_access_flags(struct mlx5_ib_dev *dev,MLX5_SET (mkc, seg, lr,1 );MLX5_SET (mkc, seg, relaxed_ordering_write, !!(access_flags &IB_ACCESS_RELAXED_ORDERING )); -MLX5_SET (mkc, seg, relaxed_ordering_read, - !!(access_flags &IB_ACCESS_RELAXED_ORDERING )); +MLX5_SET (mkc, seg, relaxed_ordering_read, ro_read); } int mlx5r_umr_rereg_pd_access(struct mlx5_ib_mr *mr, struct ib_pd *pd,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 568/663 RDMA/mlx5: Fix flow counter query via DEVX
In reply to Greg Kroah-HartmanFrom: Mark Bloch <[email protected]>
[ Upstream commit 3e358ea8614ddfbc59ca7a3f5dff5dde2b350b2c ]
Commit cited in "fixes" tag added bulk support for flow counters but it didn't account that's also possible to query a counter using a non-base id if the counter was allocated as bulk.
When a user performs a query, validate the flow counter id given in the mailbox is inside the valid range taking bulk value into account.
--- drivers/infiniband/hw/mlx5/devx.c | 31 ++++++++++++++++++++++++++----- include/linux/mlx5/mlx5_ifc.h | 3 ++- 2 files changed, 28 insertions(+), 6 deletions(-)
drivers/infiniband/hw/mlx5/devx.c +26 -5
@@ -666,7 +666,21 @@ static bool devx_is_valid_obj_id(struct uverbs_attr_bundle *attrs, obj_id;case MLX5_IB_OBJECT_DEVX_OBJ : -return ((struct devx_obj *)uobj->object)->obj_id == obj_id; + { +u16 opcode =MLX5_GET (general_obj_in_cmd_hdr, in, opcode); +struct devx_obj *devx_uobj = uobj->object; + +if (opcode ==MLX5_CMD_OP_QUERY_FLOW_COUNTER && + devx_uobj->flow_counter_bulk_size) { +u64 end; + + end = devx_uobj->obj_id + + devx_uobj->flow_counter_bulk_size; +return devx_uobj->obj_id <= obj_id && end > obj_id; + } + +return devx_uobj->obj_id == obj_id; + }default :return false;
@@ -1517,10 +1531,17 @@ static int UVERBS_HANDLER(MLX5_IB_METHOD_DEVX_OBJ_CREATE)( goto obj_free;if (opcode ==MLX5_CMD_OP_ALLOC_FLOW_COUNTER ) { -u8 bulk =MLX5_GET (alloc_flow_counter_in, - cmd_in, - flow_counter_bulk); - obj->flow_counter_bulk_size =128UL * bulk; +u32 bulk =MLX5_GET (alloc_flow_counter_in, + cmd_in, + flow_counter_bulk_log_size); + +if (bulk) + bulk =1 << bulk; +else + bulk =128UL *MLX5_GET (alloc_flow_counter_in, + cmd_in, + flow_counter_bulk); + obj->flow_counter_bulk_size = bulk; } uobj->object = obj;
include/linux/mlx5/mlx5_ifc.h +2 -1
@@ -9144,7 +9144,8 @@ struct mlx5_ifc_alloc_flow_counter_in_bits {u8 reserved_at_20[0x10 ];u8 op_mod[0x10 ]; -u8 reserved_at_40[0x38 ]; +u8 reserved_at_40[0x33 ]; +u8 flow_counter_bulk_log_size[0x5 ];u8 flow_counter_bulk[0x8 ]; };
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 569/663 SUNRPC: remove the maximum number of retries in call_bind_status
In reply to Greg Kroah-HartmanFrom: Dai Ngo <[email protected]>
[ Upstream commit 691d0b782066a6eeeecbfceb7910a8f6184e6105 ]
Currently call_bind_status places a hard limit of 3 to the number of retries on EACCES error. This limit was done to prevent NLM unlock requests from being hang forever when the server keeps returning garbage. However this change causes problem for cases when NLM service takes longer than 9 seconds to register with the port mapper after a restart.
This patch removes this hard coded limit and let the RPC handles the retry based on the standard hard/soft task semantics.
--- include/linux/sunrpc/sched.h | 3 +-- net/sunrpc/clnt.c | 3 --- net/sunrpc/sched.c | 1 - 3 files changed, 1 insertion(+), 6 deletions(-)
include/linux/sunrpc/sched.h +1 -2
@@ -90,8 +90,7 @@ struct rpc_task {#endif unsigned char tk_priority : 2,/* Task priority */ tk_garb_retry : 2, - tk_cred_retry : 2, - tk_rebind_retry : 2; + tk_cred_retry : 2; };typedef void (*rpc_action )(struct rpc_task *);
net/sunrpc/clnt.c +0 -3
@@ -2050,9 +2050,6 @@ call_bind_status(struct rpc_task *task) status = -EOPNOTSUPP ;break ; } -if (task->tk_rebind_retry ==0 ) -break ; - task->tk_rebind_retry--;rpc_delay (task,3 *HZ ); goto retry_timeout;case -ENOBUFS :
net/sunrpc/sched.c +0 -1
@@ -817,7 +817,6 @@ rpc_init_task_statistics(struct rpc_task *task)/* Initialize retry counters */ task->tk_garb_retry =2 ; task->tk_cred_retry =2 ; - task->tk_rebind_retry =2 ;/* starting timestamp */ task->tk_start =ktime_get ();
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 570/663 RDMA/mlx5: Use correct device num_ports when modify DC
In reply to Greg Kroah-HartmanFrom: Mark Zhang <[email protected]>
[ Upstream commit 746aa3c8cb1a650ff2583497ac646e505831b9b9 ]
Just like other QP types, when modify DC, the port_num should be compared with dev->num_ports, instead of HCA_CAP.num_ports. Otherwise Multi-port vHCA on DC may not work.
--- drivers/infiniband/hw/mlx5/qp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/mlx5/qp.c +1 -1
@@ -4408,7 +4408,7 @@ static int mlx5_ib_modify_dct(struct ib_qp *ibqp, struct ib_qp_attr *attr,return -EINVAL ;if (attr->port_num ==0 || - attr->port_num >MLX5_CAP_GEN (dev->mdev, num_ports)) { + attr->port_num > dev->num_ports) {mlx5_ib_dbg (dev,"invalid port number %d. number of ports is %d\n" , attr->port_num, dev->num_ports);return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 571/663 clocksource/drivers/davinci: Fix memory leak in davinci_timer_register when init fails
In reply to Greg Kroah-HartmanFrom: Qinrun Dai <[email protected]>
[ Upstream commit fb73556386e074e9bee9fa2d253aeaefe4e063e0 ]
Smatch reports:drivers/clocksource/timer-davinci.c:332 davinci_timer_register()
warn: 'base' from ioremap() not released on lines: 274.
Fix this and other potential memory leak problems
by adding a set of corresponding exit lables.
--- drivers/clocksource/timer-davinci.c | 30 +++++++++++++++++++++++------ 1 file changed, 24 insertions(+), 6 deletions(-)
drivers/clocksource/timer-davinci.c +24 -6
@@ -257,21 +257,25 @@ int __init davinci_timer_register(struct clk *clk, resource_size(&timer_cfg->reg), "davinci-timer")) {pr_err ("Unable to request memory region\n" ); -return -EBUSY ; + rv = -EBUSY ; + goto exit_clk_disable; } base =ioremap (timer_cfg->reg.start,resource_size (&timer_cfg->reg));if (!base) {pr_err ("Unable to map the register range\n" ); -return -ENOMEM ; + rv = -ENOMEM ; + goto exit_mem_region; }davinci_timer_init (base); tick_rate =clk_get_rate (clk); clockevent =kzalloc (sizeof (*clockevent),GFP_KERNEL ); -if (!clockevent) -return -ENOMEM ; +if (!clockevent) { + rv = -ENOMEM ; + goto exit_iounmap_base; + } clockevent->dev.name ="tim12" ; clockevent->dev.features =CLOCK_EVT_FEAT_ONESHOT ;
@@ -296,7 +300,7 @@ int __init davinci_timer_register(struct clk *clk, "clockevent/tim12", clockevent);if (rv) {pr_err ("Unable to request the clockevent interrupt\n" ); -return rv; + goto exit_free_clockevent; } davinci_clocksource.dev.rating =300 ;
@@ -323,13 +327,27 @@ int __init davinci_timer_register(struct clk *clk, rv =clocksource_register_hz (&davinci_clocksource.dev, tick_rate);if (rv) {pr_err ("Unable to register clocksource\n" ); -return rv; + goto exit_free_irq; }sched_clock_register (davinci_timer_read_sched_clock,DAVINCI_TIMER_CLKSRC_BITS , tick_rate);return 0 ; + +exit_free_irq: +free_irq (timer_cfg->irq[DAVINCI_TIMER_CLOCKEVENT_IRQ ].start, + clockevent); +exit_free_clockevent: +kfree (clockevent); +exit_iounmap_base: +iounmap (base); +exit_mem_region: +release_mem_region (timer_cfg->reg.start, +resource_size (&timer_cfg->reg)); +exit_clk_disable: +clk_disable_unprepare (clk); +return rv; }static int __init of_davinci_timer_register (struct device_node *np)
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 572/663 openrisc: Properly store r31 to pt_regs on unhandled exceptions
In reply to Greg Kroah-HartmanFrom: Stafford Horne <[email protected]>
[ Upstream commit 812489ac4dd91144a74ce65ecf232252a2e406fb ]
In commit 91993c8c2ed5 ("openrisc: use shadow registers to save regs on exception") the unhandled exception path was changed to do an early store of r30 instead of r31. The entry code was not updated and r31 is not getting stored to pt_regs.
This patch updates the entry handler to store r31 instead of r30. We also remove some misleading commented out store r30 and r31 instructrions.
I noticed this while working on adding floating point exception handling, This issue probably would never impact anything since we kill the process or Oops right away on unhandled exceptions.
--- arch/openrisc/kernel/entry.S | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
arch/openrisc/kernel/entry.S +2 -4
@@ -173,7 +173,6 @@ handler: ;\ l.sw PT_GPR28(r1),r28 ;\ l.sw PT_GPR29(r1),r29 ;\ /* r30 already save */ ;\ -/* l.sw PT_GPR30(r1),r30*/ ;\ l.sw PT_GPR31(r1),r31 ;\ TRACE_IRQS_OFF_ENTRY ;\ /* Store -1 in orig_gpr11 for non-syscall exceptions */ ;\
@@ -211,9 +210,8 @@ handler: ;\ l.sw PT_GPR27(r1),r27 ;\ l.sw PT_GPR28(r1),r28 ;\ l.sw PT_GPR29(r1),r29 ;\ - /* r31 already saved */ ;\ - l.sw PT_GPR30(r1),r30 ;\ -/* l.sw PT_GPR31(r1),r31 */ ;\ + /* r30 already saved */ ;\ + l.sw PT_GPR31(r1),r31 ;\ /* Store -1 in orig_gpr11 for non-syscall exceptions */ ;\ l.addi r30,r0,-1 ;\ l.sw PT_ORIG_GPR11(r1),r30 ;\
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 573/663 timekeeping: Fix references to nonexistent ktime_get_fast_ns()
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 158009f1b4a33bc0f354b994eea361362bd83226 ]
There was never a function named ktime_get_fast_ns(). Presumably these should refer to ktime_get_mono_fast_ns() instead.
--- kernel/time/timekeeping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/time/timekeeping.c +2 -2
@@ -526,7 +526,7 @@ EXPORT_SYMBOL_GPL(ktime_get_raw_fast_ns);* partially updated. Since the tk->offs_boot update is a rare event, this * should be a rare occurrence which postprocessing should be able to handle. * -* The caveats vs. timestamp ordering as documented for ktime_get_fast_ns() +* The caveats vs. timestamp ordering as documented for ktime_get_mono_fast_ns() * apply as well. */ u64 notrace ktime_get_boot_fast_ns(void)
@@ -576,7 +576,7 @@ static __always_inline u64 __ktime_get_real_fast(struct tk_fast *tkf, u64 *mono)/** * ktime_get_real_fast_ns: - NMI safe and fast access to clock realtime. * -* See ktime_get_fast_ns() for documentation of the time stamp ordering. +* See ktime_get_mono_fast_ns() for documentation of the time stamp ordering. */ u64 ktime_get_real_fast_ns (void ) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 574/663 SMB3: Add missing locks to protect deferred close file list
In reply to Greg Kroah-HartmanFrom: Bharath SM <[email protected]>
[ Upstream commit ab9ddc87a9055c4bebd6524d5d761d605d52e557 ]
cifs_del_deferred_close function has a critical section which modifies the deferred close file list. We must acquire deferred_lock before calling cifs_del_deferred_close function.
--- fs/cifs/misc.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/cifs/misc.c +6 -0
@@ -749,7 +749,9 @@ cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode)list_for_each_entry (cfile, &cifs_inode->openFileList, flist) {if (delayed_work_pending (&cfile->deferred)) {if (cancel_delayed_work (&cfile->deferred)) { +spin_lock (&cifs_inode->deferred_lock);cifs_del_deferred_close (cfile); +spin_unlock (&cifs_inode->deferred_lock); tmp_list =kmalloc (sizeof (struct file_list ),GFP_ATOMIC );if (tmp_list ==NULL )
@@ -780,7 +782,9 @@ cifs_close_all_deferred_files(struct cifs_tcon *tcon)list_for_each_entry (cfile, &tcon->openFileList, tlist) {if (delayed_work_pending (&cfile->deferred)) {if (cancel_delayed_work (&cfile->deferred)) { +spin_lock (&CIFS_I (d_inode (cfile->dentry))->deferred_lock);cifs_del_deferred_close (cfile); +spin_unlock (&CIFS_I (d_inode (cfile->dentry))->deferred_lock); tmp_list =kmalloc (sizeof (struct file_list ),GFP_ATOMIC );if (tmp_list ==NULL )
@@ -815,7 +819,9 @@ cifs_close_deferred_file_under_dentry(struct cifs_tcon *tcon, const char *path)if (strstr (full_path, path)) {if (delayed_work_pending (&cfile->deferred)) {if (cancel_delayed_work (&cfile->deferred)) { +spin_lock (&CIFS_I (d_inode (cfile->dentry))->deferred_lock);cifs_del_deferred_close (cfile); +spin_unlock (&CIFS_I (d_inode (cfile->dentry))->deferred_lock); tmp_list =kmalloc (sizeof (struct file_list ),GFP_ATOMIC );if (tmp_list ==NULL )
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 575/663 SMB3: Close deferred file handles in case of handle lease break
In reply to Greg Kroah-HartmanFrom: Bharath SM <[email protected]>
[ Upstream commit d906be3fa571f6fc9381911304a0eca99f1b6951 ]
We should not cache deferred file handles if we dont have handle lease on a file. And we should immediately close all deferred handles in case of handle lease break.
--- fs/cifs/file.c | 16 ++++++++++++++++ fs/cifs/misc.c | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-)
fs/cifs/file.c +16 -0
@@ -5096,6 +5096,8 @@ void cifs_oplock_break(struct work_struct *work)struct TCP_Server_Info *server = tcon->ses->server;int rc =0 ;bool purge_cache = false; +struct cifs_deferred_close *dclose; +bool is_deferred = false;wait_on_bit (&cinode->flags,CIFS_INODE_PENDING_WRITERS ,TASK_UNINTERRUPTIBLE );
@@ -5131,6 +5133,20 @@ void cifs_oplock_break(struct work_struct *work)cifs_dbg (VFS ,"Push locks rc = %d\n" , rc); oplock_break_ack: +/* +* When oplock break is received and there are no active +* file handles but cached, then schedule deferred close immediately. +* So, new open will not use cached handle. +*/ +spin_lock (&CIFS_I (inode)->deferred_lock); + is_deferred =cifs_is_deferred_close (cfile, &dclose); +spin_unlock (&CIFS_I (inode)->deferred_lock); + +if (!CIFS_CACHE_HANDLE (cinode) && is_deferred && + cfile->deferred_close_scheduled &&delayed_work_pending (&cfile->deferred)) { +cifs_close_deferred_file (cinode); + } +/* * releasing stale oplock after recent reconnect of smb session using * a now incorrect file handle is not a data integrity issue but do
fs/cifs/misc.c +1 -1
@@ -764,7 +764,7 @@ cifs_close_deferred_file(struct cifsInodeInfo *cifs_inode)spin_unlock (&cifs_inode->open_file_lock);list_for_each_entry_safe (tmp_list, tmp_next_list, &file_head, list) { -_cifsFileInfo_put (tmp_list->cfile, true, false); +_cifsFileInfo_put (tmp_list->cfile, false, false);list_del (&tmp_list->list);kfree (tmp_list); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 576/663 ext4: fix i_disksize exceeding i_size problem in paritally written case
In reply to Greg Kroah-HartmanFrom: Zhihao Cheng <[email protected]>
[ Upstream commit 1dedde690303c05ef732b7c5c8356fdf60a4ade3 ]
It is possible for i_disksize can exceed i_size, triggering a warning.
generic_perform_write
copied = iov_iter_copy_from_user_atomic(len) // copied < len ext4_da_write_end
| ext4_update_i_disksize | new_i_size = pos + copied; | WRITE_ONCE(EXT4_I(inode)->i_disksize, newsize) // update i_disksize | generic_write_end | copied = block_write_end(copied, len) // copied = 0 | if (unlikely(copied < len)) | if (!PageUptodate(page)) | copied = 0; | if (pos + copied > inode->i_size) // return false
if (unlikely(copied == 0))
goto again;
if (unlikely(iov_iter_fault_in_readable(i, bytes))) {
status = -EFAULT;
break;
}
We get i_disksize greater than i_size here, which could trigger WARNING check 'i_size_read(inode) < EXT4_I(inode)->i_disksize' while doing dio:
ext4_dio_write_iter
iomap_dio_rw
__iomap_dio_rw // return err, length is not aligned to 512
ext4_handle_inode_extension
WARN_ON_ONCE(i_size_read(inode) < EXT4_I(inode)->i_disksize) // Oops
WARNING: CPU: 2 PID: 2609 at fs/ext4/file.c:319 CPU: 2 PID: 2609 Comm: aa Not tainted 6.3.0-rc2 RIP: 0010:ext4_file_write_iter+0xbc7 Call Trace: vfs_write+0x3b1 ksys_write+0x77 do_syscall_64+0x39
Fix it by updating 'copied' value before updating i_disksize just like ext4_write_inline_data_end() does.
A reproducer can be found in the buganizer link below.
--- fs/ext4/inode.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/inode.c +3 -0
@@ -3149,6 +3149,9 @@ static int ext4_da_write_end(struct file *file, ext4_has_inline_data(inode))return ext4_write_inline_data_end (inode, pos, len, copied, page); +if (unlikely (copied < len) && !PageUptodate (page)) + copied =0 ; + start = pos & (PAGE_SIZE -1 ); end = start + copied -1 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 577/663 ext4: fix use-after-free read in ext4_find_extent for bigalloc + inline
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit 835659598c67907b98cd2aa57bb951dfaf675c69 ]
Syzbot found the following issue:
loop0: detected capacity change from 0 to 2048
EXT4-fs (loop0): mounted filesystem 00000000-0000-0000-0000-000000000000 without journal. Quota mode: none.
==================================================================
BUG: KASAN: use-after-free in ext4_ext_binsearch_idx fs/ext4/extents.c:768 [inline] BUG: KASAN: use-after-free in ext4_find_extent+0x76e/0xd90 fs/ext4/extents.c:931 Read of size 4 at addr ffff888073644750 by task syz-executor420/5067 CPU: 0 PID: 5067 Comm: syz-executor420 Not tainted 6.2.0-rc1-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 10/26/2022 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x1b1/0x290 lib/dump_stack.c:106 print_address_description+0x74/0x340 mm/kasan/report.c:306 print_report+0x107/0x1f0 mm/kasan/report.c:417 kasan_report+0xcd/0x100 mm/kasan/report.c:517 ext4_ext_binsearch_idx fs/ext4/extents.c:768 [inline] ext4_find_extent+0x76e/0xd90 fs/ext4/extents.c:931 ext4_clu_mapped+0x117/0x970 fs/ext4/extents.c:5809 ext4_insert_delayed_block fs/ext4/inode.c:1696 [inline] ext4_da_map_blocks fs/ext4/inode.c:1806 [inline] ext4_da_get_block_prep+0x9e8/0x13c0 fs/ext4/inode.c:1870 ext4_block_write_begin+0x6a8/0x2290 fs/ext4/inode.c:1098 ext4_da_write_begin+0x539/0x760 fs/ext4/inode.c:3082 generic_perform_write+0x2e4/0x5e0 mm/filemap.c:3772 ext4_buffered_write_iter+0x122/0x3a0 fs/ext4/file.c:285 ext4_file_write_iter+0x1d0/0x18f0 call_write_iter include/linux/fs.h:2186 [inline] new_sync_write fs/read_write.c:491 [inline] vfs_write+0x7dc/0xc50 fs/read_write.c:584 ksys_write+0x177/0x2a0 fs/read_write.c:637 do_syscall_x64 arch/x86/entry/common.c:50 [inline] do_syscall_64+0x3d/0xb0 arch/x86/entry/common.c:80 entry_SYSCALL_64_after_hwframe+0x63/0xcd RIP: 0033:0x7f4b7a9737b9 RSP: 002b:00007ffc5cac3668 EFLAGS: 00000246 ORIG_RAX: 0000000000000001 RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007f4b7a9737b9 RDX: 00000000175d9003 RSI: 0000000020000200 RDI: 0000000000000004 RBP: 00007f4b7a933050 R08: 0000000000000000 R09: 0000000000000000 R10: 000000000000079f R11: 0000000000000246 R12: 00007f4b7a9330e0 R13: 0000000000000000 R14: 0000000000000000 R15: 0000000000000000 </TASK>
Above issue is happens when enable bigalloc and inline data feature. As commit 131294c35ed6 fixed delayed allocation bug in ext4_clu_mapped for bigalloc + inline. But it only resolved issue when has inline data, if inline data has been converted to extent(ext4_da_convert_inline_data_to_extent) before writepages, there is no EXT4_STATE_MAY_INLINE_DATA flag. However i_data is still store inline data in this scene. Then will trigger UAF when find extent.
To resolve above issue, there is need to add judge "ext4_has_inline_data(inode)" in ext4_clu_mapped().
--- fs/ext4/extents.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/ext4/extents.c +2 -1
@@ -5802,7 +5802,8 @@ int ext4_clu_mapped(struct inode *inode, ext4_lblk_t lclu)* mapped - no physical clusters have been allocated, and the * file has no extents */ -if (ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA )) +if (ext4_test_inode_state (inode,EXT4_STATE_MAY_INLINE_DATA ) || +ext4_has_inline_data (inode))return 0 ;/* search for the extent closest to the first block in the cluster */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 578/663 pinctrl: renesas: r8a779a0: Remove incorrect AVB[01] pinmux configuration
In reply to Greg Kroah-HartmanFrom: Hai Pham <[email protected]>
[ Upstream commit a145c9a8674ac8fbfa1595276e1b6cbfc5139038 ]
AVB[01]_{MAGIC,MDC,MDIO,TXCREFCLK} are registered as both PINMUX_SINGLE(fn) and PINMUX_IPSR_GPSR(fn) in the pinmux_data array.
The latter are correct, hence remove the former.
Without this fix, the Ethernet PHY is not operational on the MDIO bus.
--- drivers/pinctrl/renesas/pfc-r8a779a0.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/pinctrl/renesas/pfc-r8a779a0.c +0 -8
@@ -696,16 +696,8 @@ static const u16 pinmux_data[] = {PINMUX_SINGLE (PCIE0_CLKREQ_N ),PINMUX_SINGLE (AVB0_PHY_INT ), -PINMUX_SINGLE (AVB0_MAGIC ), -PINMUX_SINGLE (AVB0_MDC ), -PINMUX_SINGLE (AVB0_MDIO ), -PINMUX_SINGLE (AVB0_TXCREFCLK ),PINMUX_SINGLE (AVB1_PHY_INT ), -PINMUX_SINGLE (AVB1_MAGIC ), -PINMUX_SINGLE (AVB1_MDC ), -PINMUX_SINGLE (AVB1_MDIO ), -PINMUX_SINGLE (AVB1_TXCREFCLK ),PINMUX_SINGLE (AVB2_AVTP_PPS ), PINMUX_SINGLE(AVB2_AVTP_CAPTURE),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 579/663 pinctrl: renesas: r8a779f0: Fix tsn1_avtp_pps pin group
In reply to Greg Kroah-HartmanFrom: Phong Hoang <[email protected]>
[ Upstream commit 60003351e99167d8cfa7c161e95856efc016f381 ]
Correct a typo mistake in the definition of the tsn1_avtp_pps pin group mux.
--- drivers/pinctrl/renesas/pfc-r8a779f0.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/renesas/pfc-r8a779f0.c +1 -1
@@ -1213,7 +1213,7 @@ static const unsigned int tsn1_avtp_pps_pins[] = { RCAR_GP_PIN(3, 13), };static const unsigned int tsn1_avtp_pps_mux[] = { -TSN0_AVTP_PPS_MARK , +TSN1_AVTP_PPS_MARK , };static const unsigned int tsn1_avtp_capture_a_pins[] = {/* TSN1_AVTP_CAPTURE_A */
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 580/663 pinctrl: renesas: r8a779g0: Fix Group 4/5 pin functions
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 0a7a5226e7b177c68800985a19a80c1df9bceff6 ]
According to R-Car V4H Series User’s Manual: Hardware Rev. 0.54, pin groups 4 and 5 do not use Module Select Registers to configure pin functions, but use Peripheral Function Select Registers instead.
Hence:
- Remove the non-existent Module Select Registers (MODSEL[45]),
- Add the missing Peripheral Function Select Registers (IPxSR[45]),
- Correct the GPIO / Peripheral Function Select Register definitions
(GPSR]45_*),
- Correct the affected PINMUX definitions.
--- drivers/pinctrl/renesas/pfc-r8a779g0.c | 467 +++++++++++++++---------- 1 file changed, 279 insertions(+), 188 deletions(-)
drivers/pinctrl/renesas/pfc-r8a779g0.c +279 -188
@@ -156,54 +156,54 @@#define GPSR3_0 F_(MMC_SD_D1, IP0SR3_3_0)/* GPSR4 */ -#define GPSR4_24 FM(AVS1) -#define GPSR4_23 FM(AVS0) -#define GPSR4_22 FM(PCIE1_CLKREQ_N) -#define GPSR4_21 FM(PCIE0_CLKREQ_N) -#define GPSR4_20 FM(TSN0_TXCREFCLK) -#define GPSR4_19 FM(TSN0_TD2) -#define GPSR4_18 FM(TSN0_TD3) -#define GPSR4_17 FM(TSN0_RD2) -#define GPSR4_16 FM(TSN0_RD3) -#define GPSR4_15 FM(TSN0_TD0) -#define GPSR4_14 FM(TSN0_TD1) -#define GPSR4_13 FM(TSN0_RD1) -#define GPSR4_12 FM(TSN0_TXC) -#define GPSR4_11 FM(TSN0_RXC) -#define GPSR4_10 FM(TSN0_RD0) -#define GPSR4_9 FM(TSN0_TX_CTL) -#define GPSR4_8 FM(TSN0_AVTP_PPS0) -#define GPSR4_7 FM(TSN0_RX_CTL) -#define GPSR4_6 FM(TSN0_AVTP_CAPTURE) -#define GPSR4_5 FM(TSN0_AVTP_MATCH) -#define GPSR4_4 FM(TSN0_LINK) -#define GPSR4_3 FM(TSN0_PHY_INT) -#define GPSR4_2 FM(TSN0_AVTP_PPS1) -#define GPSR4_1 FM(TSN0_MDC) -#define GPSR4_0 FM(TSN0_MDIO) +#define GPSR4_24 F_(AVS1, IP3SR4_3_0) +#define GPSR4_23 F_(AVS0, IP2SR4_31_28) +#define GPSR4_22 F_(PCIE1_CLKREQ_N, IP2SR4_27_24) +#define GPSR4_21 F_(PCIE0_CLKREQ_N, IP2SR4_23_20) +#define GPSR4_20 F_(TSN0_TXCREFCLK, IP2SR4_19_16) +#define GPSR4_19 F_(TSN0_TD2, IP2SR4_15_12) +#define GPSR4_18 F_(TSN0_TD3, IP2SR4_11_8) +#define GPSR4_17 F_(TSN0_RD2, IP2SR4_7_4) +#define GPSR4_16 F_(TSN0_RD3, IP2SR4_3_0) +#define GPSR4_15 F_(TSN0_TD0, IP1SR4_31_28) +#define GPSR4_14 F_(TSN0_TD1, IP1SR4_27_24) +#define GPSR4_13 F_(TSN0_RD1, IP1SR4_23_20) +#define GPSR4_12 F_(TSN0_TXC, IP1SR4_19_16) +#define GPSR4_11 F_(TSN0_RXC, IP1SR4_15_12) +#define GPSR4_10 F_(TSN0_RD0, IP1SR4_11_8) +#define GPSR4_9 F_(TSN0_TX_CTL, IP1SR4_7_4) +#define GPSR4_8 F_(TSN0_AVTP_PPS0, IP1SR4_3_0) +#define GPSR4_7 F_(TSN0_RX_CTL, IP0SR4_31_28) +#define GPSR4_6 F_(TSN0_AVTP_CAPTURE, IP0SR4_27_24) +#define GPSR4_5 F_(TSN0_AVTP_MATCH, IP0SR4_23_20) +#define GPSR4_4 F_(TSN0_LINK, IP0SR4_19_16) +#define GPSR4_3 F_(TSN0_PHY_INT, IP0SR4_15_12) +#define GPSR4_2 F_(TSN0_AVTP_PPS1, IP0SR4_11_8) +#define GPSR4_1 F_(TSN0_MDC, IP0SR4_7_4) +#define GPSR4_0 F_(TSN0_MDIO, IP0SR4_3_0)/* GPSR 5 */ -#define GPSR5_20 FM(AVB2_RX_CTL) -#define GPSR5_19 FM(AVB2_TX_CTL) -#define GPSR5_18 FM(AVB2_RXC) -#define GPSR5_17 FM(AVB2_RD0) -#define GPSR5_16 FM(AVB2_TXC) -#define GPSR5_15 FM(AVB2_TD0) -#define GPSR5_14 FM(AVB2_RD1) -#define GPSR5_13 FM(AVB2_RD2) -#define GPSR5_12 FM(AVB2_TD1) -#define GPSR5_11 FM(AVB2_TD2) -#define GPSR5_10 FM(AVB2_MDIO) -#define GPSR5_9 FM(AVB2_RD3) -#define GPSR5_8 FM(AVB2_TD3) -#define GPSR5_7 FM(AVB2_TXCREFCLK) -#define GPSR5_6 FM(AVB2_MDC) -#define GPSR5_5 FM(AVB2_MAGIC) -#define GPSR5_4 FM(AVB2_PHY_INT) -#define GPSR5_3 FM(AVB2_LINK) -#define GPSR5_2 FM(AVB2_AVTP_MATCH) -#define GPSR5_1 FM(AVB2_AVTP_CAPTURE) -#define GPSR5_0 FM(AVB2_AVTP_PPS) +#define GPSR5_20 F_(AVB2_RX_CTL, IP2SR5_19_16) +#define GPSR5_19 F_(AVB2_TX_CTL, IP2SR5_15_12) +#define GPSR5_18 F_(AVB2_RXC, IP2SR5_11_8) +#define GPSR5_17 F_(AVB2_RD0, IP2SR5_7_4) +#define GPSR5_16 F_(AVB2_TXC, IP2SR5_3_0) +#define GPSR5_15 F_(AVB2_TD0, IP1SR5_31_28) +#define GPSR5_14 F_(AVB2_RD1, IP1SR5_27_24) +#define GPSR5_13 F_(AVB2_RD2, IP1SR5_23_20) +#define GPSR5_12 F_(AVB2_TD1, IP1SR5_19_16) +#define GPSR5_11 F_(AVB2_TD2, IP1SR5_15_12) +#define GPSR5_10 F_(AVB2_MDIO, IP1SR5_11_8) +#define GPSR5_9 F_(AVB2_RD3, IP1SR5_7_4) +#define GPSR5_8 F_(AVB2_TD3, IP1SR5_3_0) +#define GPSR5_7 F_(AVB2_TXCREFCLK, IP0SR5_31_28) +#define GPSR5_6 F_(AVB2_MDC, IP0SR5_27_24) +#define GPSR5_5 F_(AVB2_MAGIC, IP0SR5_23_20) +#define GPSR5_4 F_(AVB2_PHY_INT, IP0SR5_19_16) +#define GPSR5_3 F_(AVB2_LINK, IP0SR5_15_12) +#define GPSR5_2 F_(AVB2_AVTP_MATCH, IP0SR5_11_8) +#define GPSR5_1 F_(AVB2_AVTP_CAPTURE, IP0SR5_7_4) +#define GPSR5_0 F_(AVB2_AVTP_PPS, IP0SR5_3_0)/* GPSR 6 */ #define GPSR6_20 F_(AVB1_TXCREFCLK, IP2SR6_19_16)
@@ -397,6 +397,68 @@#define IP3SR3_19_16 FM(RPC_WP_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define IP3SR3_23_20 FM(RPC_INT_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* SR4 */ +/* IP0SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR4_3_0 FM(TSN0_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_7_4 FM(TSN0_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_11_8 FM(TSN0_AVTP_PPS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_15_12 FM(TSN0_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_19_16 FM(TSN0_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_23_20 FM(TSN0_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_27_24 FM(TSN0_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_31_28 FM(TSN0_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR4_3_0 FM(TSN0_AVTP_PPS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_7_4 FM(TSN0_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_11_8 FM(TSN0_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_15_12 FM(TSN0_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_19_16 FM(TSN0_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_23_20 FM(TSN0_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_27_24 FM(TSN0_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_31_28 FM(TSN0_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR4_3_0 FM(TSN0_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_7_4 FM(TSN0_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_11_8 FM(TSN0_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_15_12 FM(TSN0_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_19_16 FM(TSN0_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_23_20 FM(PCIE0_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_27_24 FM(PCIE1_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_31_28 FM(AVS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP3SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP3SR4_3_0 FM(AVS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* SR5 */ +/* IP0SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR5_3_0 FM(AVB2_AVTP_PPS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_7_4 FM(AVB2_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_11_8 FM(AVB2_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_15_12 FM(AVB2_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_19_16 FM(AVB2_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_23_20 FM(AVB2_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_27_24 FM(AVB2_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_31_28 FM(AVB2_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR5_3_0 FM(AVB2_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_7_4 FM(AVB2_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_11_8 FM(AVB2_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_15_12 FM(AVB2_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_19_16 FM(AVB2_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_23_20 FM(AVB2_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_27_24 FM(AVB2_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_31_28 FM(AVB2_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR5_3_0 FM(AVB2_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_7_4 FM(AVB2_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_11_8 FM(AVB2_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_15_12 FM(AVB2_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_19_16 FM(AVB2_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* SR6 */ /* IP0SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ #define IP0SR6_3_0 FM(AVB1_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)
@@ -542,6 +604,24 @@ FM(IP0SR3_23_20) IP0SR3_23_20 FM(IP1SR3_23_20) IP1SR3_23_20 FM(IP2SR3_23_20) IP2 FM(IP0SR3_27_24) IP0SR3_27_24 FM(IP1SR3_27_24) IP1SR3_27_24 FM(IP2SR3_27_24) IP2SR3_27_24 \ FM(IP0SR3_31_28) IP0SR3_31_28 FM(IP1SR3_31_28) IP1SR3_31_28 FM(IP2SR3_31_28) IP2SR3_31_28 \ \ +FM(IP0SR4_3_0) IP0SR4_3_0 FM(IP1SR4_3_0) IP1SR4_3_0 FM(IP2SR4_3_0) IP2SR4_3_0 FM(IP3SR4_3_0) IP3SR4_3_0 \ +FM(IP0SR4_7_4) IP0SR4_7_4 FM(IP1SR4_7_4) IP1SR4_7_4 FM(IP2SR4_7_4) IP2SR4_7_4 \ +FM(IP0SR4_11_8) IP0SR4_11_8 FM(IP1SR4_11_8) IP1SR4_11_8 FM(IP2SR4_11_8) IP2SR4_11_8 \ +FM(IP0SR4_15_12) IP0SR4_15_12 FM(IP1SR4_15_12) IP1SR4_15_12 FM(IP2SR4_15_12) IP2SR4_15_12 \ +FM(IP0SR4_19_16) IP0SR4_19_16 FM(IP1SR4_19_16) IP1SR4_19_16 FM(IP2SR4_19_16) IP2SR4_19_16 \ +FM(IP0SR4_23_20) IP0SR4_23_20 FM(IP1SR4_23_20) IP1SR4_23_20 FM(IP2SR4_23_20) IP2SR4_23_20 \ +FM(IP0SR4_27_24) IP0SR4_27_24 FM(IP1SR4_27_24) IP1SR4_27_24 FM(IP2SR4_27_24) IP2SR4_27_24 \ +FM(IP0SR4_31_28) IP0SR4_31_28 FM(IP1SR4_31_28) IP1SR4_31_28 FM(IP2SR4_31_28) IP2SR4_31_28 \ +\ +FM(IP0SR5_3_0) IP0SR5_3_0 FM(IP1SR5_3_0) IP1SR5_3_0 FM(IP2SR5_3_0) IP2SR5_3_0 \ +FM(IP0SR5_7_4) IP0SR5_7_4 FM(IP1SR5_7_4) IP1SR5_7_4 FM(IP2SR5_7_4) IP2SR5_7_4 \ +FM(IP0SR5_11_8) IP0SR5_11_8 FM(IP1SR5_11_8) IP1SR5_11_8 FM(IP2SR5_11_8) IP2SR5_11_8 \ +FM(IP0SR5_15_12) IP0SR5_15_12 FM(IP1SR5_15_12) IP1SR5_15_12 FM(IP2SR5_15_12) IP2SR5_15_12 \ +FM(IP0SR5_19_16) IP0SR5_19_16 FM(IP1SR5_19_16) IP1SR5_19_16 FM(IP2SR5_19_16) IP2SR5_19_16 \ +FM(IP0SR5_23_20) IP0SR5_23_20 FM(IP1SR5_23_20) IP1SR5_23_20 \ +FM(IP0SR5_27_24) IP0SR5_27_24 FM(IP1SR5_27_24) IP1SR5_27_24 \ +FM(IP0SR5_31_28) IP0SR5_31_28 FM(IP1SR5_31_28) IP1SR5_31_28 \ +\ FM(IP0SR6_3_0) IP0SR6_3_0 FM(IP1SR6_3_0) IP1SR6_3_0 FM(IP2SR6_3_0) IP2SR6_3_0 \ FM(IP0SR6_7_4) IP0SR6_7_4 FM(IP1SR6_7_4) IP1SR6_7_4 FM(IP2SR6_7_4) IP2SR6_7_4 \ FM(IP0SR6_11_8) IP0SR6_11_8 FM(IP1SR6_11_8) IP1SR6_11_8 FM(IP2SR6_11_8) IP2SR6_11_8 \
@@ -569,30 +649,6 @@ FM(IP0SR8_23_20) IP0SR8_23_20 FM(IP1SR8_23_20) IP1SR8_23_20 \ FM(IP0SR8_27_24) IP0SR8_27_24 \FM (IP0SR8_31_28)IP0SR8_31_28 -/* MOD_SEL4 */ /* 0 */ /* 1 */ -#define MOD_SEL4_19 FM(SEL_TSN0_TD2_0) FM(SEL_TSN0_TD2_1) -#define MOD_SEL4_18 FM(SEL_TSN0_TD3_0) FM(SEL_TSN0_TD3_1) -#define MOD_SEL4_15 FM(SEL_TSN0_TD0_0) FM(SEL_TSN0_TD0_1) -#define MOD_SEL4_14 FM(SEL_TSN0_TD1_0) FM(SEL_TSN0_TD1_1) -#define MOD_SEL4_12 FM(SEL_TSN0_TXC_0) FM(SEL_TSN0_TXC_1) -#define MOD_SEL4_9 FM(SEL_TSN0_TX_CTL_0) FM(SEL_TSN0_TX_CTL_1) -#define MOD_SEL4_8 FM(SEL_TSN0_AVTP_PPS0_0) FM(SEL_TSN0_AVTP_PPS0_1) -#define MOD_SEL4_5 FM(SEL_TSN0_AVTP_MATCH_0) FM(SEL_TSN0_AVTP_MATCH_1) -#define MOD_SEL4_2 FM(SEL_TSN0_AVTP_PPS1_0) FM(SEL_TSN0_AVTP_PPS1_1) -#define MOD_SEL4_1 FM(SEL_TSN0_MDC_0) FM(SEL_TSN0_MDC_1) - -/* MOD_SEL5 */ /* 0 */ /* 1 */ -#define MOD_SEL5_19 FM(SEL_AVB2_TX_CTL_0) FM(SEL_AVB2_TX_CTL_1) -#define MOD_SEL5_16 FM(SEL_AVB2_TXC_0) FM(SEL_AVB2_TXC_1) -#define MOD_SEL5_15 FM(SEL_AVB2_TD0_0) FM(SEL_AVB2_TD0_1) -#define MOD_SEL5_12 FM(SEL_AVB2_TD1_0) FM(SEL_AVB2_TD1_1) -#define MOD_SEL5_11 FM(SEL_AVB2_TD2_0) FM(SEL_AVB2_TD2_1) -#define MOD_SEL5_8 FM(SEL_AVB2_TD3_0) FM(SEL_AVB2_TD3_1) -#define MOD_SEL5_6 FM(SEL_AVB2_MDC_0) FM(SEL_AVB2_MDC_1) -#define MOD_SEL5_5 FM(SEL_AVB2_MAGIC_0) FM(SEL_AVB2_MAGIC_1) -#define MOD_SEL5_2 FM(SEL_AVB2_AVTP_MATCH_0) FM(SEL_AVB2_AVTP_MATCH_1) -#define MOD_SEL5_0 FM(SEL_AVB2_AVTP_PPS_0) FM(SEL_AVB2_AVTP_PPS_1) - /* MOD_SEL6 */ /* 0 */ /* 1 */#define MOD_SEL6_18 FM(SEL_AVB1_TD3_0) FM(SEL_AVB1_TD3_1)#define MOD_SEL6_16 FM(SEL_AVB1_TD2_0) FM(SEL_AVB1_TD2_1)
@@ -633,26 +689,23 @@ FM(IP0SR8_31_28) IP0SR8_31_28#define PINMUX_MOD_SELS \ \ -MOD_SEL4_19 MOD_SEL5_19 \ -MOD_SEL4_18 MOD_SEL6_18 \ - \ - MOD_SEL5_16 MOD_SEL6_16 MOD_SEL7_16 \ -MOD_SEL4_15 MOD_SEL5_15 MOD_SEL7_15 \ -MOD_SEL4_14 \ - MOD_SEL6_13 MOD_SEL7_13 \ -MOD_SEL4_12 MOD_SEL5_12 MOD_SEL6_12 \ - MOD_SEL5_11 MOD_SEL7_11 MOD_SEL8_11 \ - MOD_SEL6_10 MOD_SEL7_10 MOD_SEL8_10 \ -MOD_SEL4_9 MOD_SEL8_9 \ -MOD_SEL4_8 MOD_SEL5_8 MOD_SEL8_8 \ - MOD_SEL6_7 MOD_SEL7_7 MOD_SEL8_7 \ - MOD_SEL5_6 MOD_SEL6_6 MOD_SEL7_6 MOD_SEL8_6 \ -MOD_SEL4_5 MOD_SEL5_5 MOD_SEL6_5 MOD_SEL8_5 \ - MOD_SEL8_4 \ - MOD_SEL7_3 MOD_SEL8_3 \ -MOD_SEL4_2 MOD_SEL5_2 MOD_SEL6_2 MOD_SEL7_2 MOD_SEL8_2 \ -MOD_SEL4_1 MOD_SEL6_1 MOD_SEL8_1 \ - MOD_SEL5_0 MOD_SEL7_0 MOD_SEL8_0 +MOD_SEL6_18 \ +MOD_SEL6_16 MOD_SEL7_16 \ + MOD_SEL7_15 \ +MOD_SEL6_13 MOD_SEL7_13 \ +MOD_SEL6_12 \ + MOD_SEL7_11 MOD_SEL8_11 \ +MOD_SEL6_10 MOD_SEL7_10 MOD_SEL8_10 \ + MOD_SEL8_9 \ + MOD_SEL8_8 \ +MOD_SEL6_7 MOD_SEL7_7 MOD_SEL8_7 \ +MOD_SEL6_6 MOD_SEL7_6 MOD_SEL8_6 \ +MOD_SEL6_5 MOD_SEL8_5 \ + MOD_SEL8_4 \ + MOD_SEL7_3 MOD_SEL8_3 \ +MOD_SEL6_2 MOD_SEL7_2 MOD_SEL8_2 \ +MOD_SEL6_1 MOD_SEL8_1 \ + MOD_SEL7_0 MOD_SEL8_0enum {PINMUX_RESERVED =0 ,
@@ -686,59 +739,6 @@ enum {static const u16 pinmux_data[] = {PINMUX_DATA_GP_ALL (), -PINMUX_SINGLE (AVS1 ), -PINMUX_SINGLE (AVS0 ), -PINMUX_SINGLE (PCIE1_CLKREQ_N ), -PINMUX_SINGLE (PCIE0_CLKREQ_N ), - -/* TSN0 without MODSEL4 */ -PINMUX_SINGLE (TSN0_TXCREFCLK ), -PINMUX_SINGLE (TSN0_RD2 ), -PINMUX_SINGLE (TSN0_RD3 ), -PINMUX_SINGLE (TSN0_RD1 ), -PINMUX_SINGLE (TSN0_RXC ), -PINMUX_SINGLE (TSN0_RD0 ), -PINMUX_SINGLE (TSN0_RX_CTL ), -PINMUX_SINGLE (TSN0_AVTP_CAPTURE ), -PINMUX_SINGLE (TSN0_LINK ), -PINMUX_SINGLE (TSN0_PHY_INT ), -PINMUX_SINGLE (TSN0_MDIO ), -/* TSN0 with MODSEL4 */ -PINMUX_IPSR_NOGM (0 ,TSN0_TD2 ,SEL_TSN0_TD2_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_TD3 ,SEL_TSN0_TD3_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_TD0 ,SEL_TSN0_TD0_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_TD1 ,SEL_TSN0_TD1_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_TXC ,SEL_TSN0_TXC_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_TX_CTL ,SEL_TSN0_TX_CTL_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_AVTP_PPS0 ,SEL_TSN0_AVTP_PPS0_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_AVTP_MATCH ,SEL_TSN0_AVTP_MATCH_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_AVTP_PPS1 ,SEL_TSN0_AVTP_PPS1_1 ), -PINMUX_IPSR_NOGM (0 ,TSN0_MDC ,SEL_TSN0_MDC_1 ), - -/* TSN0 without MODSEL5 */ -PINMUX_SINGLE (AVB2_RX_CTL ), -PINMUX_SINGLE (AVB2_RXC ), -PINMUX_SINGLE (AVB2_RD0 ), -PINMUX_SINGLE (AVB2_RD1 ), -PINMUX_SINGLE (AVB2_RD2 ), -PINMUX_SINGLE (AVB2_MDIO ), -PINMUX_SINGLE (AVB2_RD3 ), -PINMUX_SINGLE (AVB2_TXCREFCLK ), -PINMUX_SINGLE (AVB2_PHY_INT ), -PINMUX_SINGLE (AVB2_LINK ), -PINMUX_SINGLE (AVB2_AVTP_CAPTURE ), -/* TSN0 with MODSEL5 */ -PINMUX_IPSR_NOGM (0 ,AVB2_TX_CTL ,SEL_AVB2_TX_CTL_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_TXC ,SEL_AVB2_TXC_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_TD0 ,SEL_AVB2_TD0_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_TD1 ,SEL_AVB2_TD1_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_TD2 ,SEL_AVB2_TD2_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_TD3 ,SEL_AVB2_TD3_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_MDC ,SEL_AVB2_MDC_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_MAGIC ,SEL_AVB2_MAGIC_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_AVTP_MATCH ,SEL_AVB2_AVTP_MATCH_1 ), -PINMUX_IPSR_NOGM (0 ,AVB2_AVTP_PPS ,SEL_AVB2_AVTP_PPS_1 ), -/* IP0SR0 */ PINMUX_IPSR_GPSR (IP0SR0_3_0 ,ERROROUTC_B ),PINMUX_IPSR_GPSR (IP0SR0_3_0 ,TCLK2_A ),
@@ -1029,6 +1029,66 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP3SR3_19_16 ,RPC_WP_N ),PINMUX_IPSR_GPSR (IP3SR3_23_20 ,RPC_INT_N ), +/* IP0SR4 */ +PINMUX_IPSR_GPSR (IP0SR4_3_0 ,TSN0_MDIO ), +PINMUX_IPSR_GPSR (IP0SR4_7_4 ,TSN0_MDC ), +PINMUX_IPSR_GPSR (IP0SR4_11_8 ,TSN0_AVTP_PPS1 ), +PINMUX_IPSR_GPSR (IP0SR4_15_12 ,TSN0_PHY_INT ), +PINMUX_IPSR_GPSR (IP0SR4_19_16 ,TSN0_LINK ), +PINMUX_IPSR_GPSR (IP0SR4_23_20 ,TSN0_AVTP_MATCH ), +PINMUX_IPSR_GPSR (IP0SR4_27_24 ,TSN0_AVTP_CAPTURE ), +PINMUX_IPSR_GPSR (IP0SR4_31_28 ,TSN0_RX_CTL ), + +/* IP1SR4 */ +PINMUX_IPSR_GPSR (IP1SR4_3_0 ,TSN0_AVTP_PPS0 ), +PINMUX_IPSR_GPSR (IP1SR4_7_4 ,TSN0_TX_CTL ), +PINMUX_IPSR_GPSR (IP1SR4_11_8 ,TSN0_RD0 ), +PINMUX_IPSR_GPSR (IP1SR4_15_12 ,TSN0_RXC ), +PINMUX_IPSR_GPSR (IP1SR4_19_16 ,TSN0_TXC ), +PINMUX_IPSR_GPSR (IP1SR4_23_20 ,TSN0_RD1 ), +PINMUX_IPSR_GPSR (IP1SR4_27_24 ,TSN0_TD1 ), +PINMUX_IPSR_GPSR (IP1SR4_31_28 ,TSN0_TD0 ), + +/* IP2SR4 */ +PINMUX_IPSR_GPSR (IP2SR4_3_0 ,TSN0_RD3 ), +PINMUX_IPSR_GPSR (IP2SR4_7_4 ,TSN0_RD2 ), +PINMUX_IPSR_GPSR (IP2SR4_11_8 ,TSN0_TD3 ), +PINMUX_IPSR_GPSR (IP2SR4_15_12 ,TSN0_TD2 ), +PINMUX_IPSR_GPSR (IP2SR4_19_16 ,TSN0_TXCREFCLK ), +PINMUX_IPSR_GPSR (IP2SR4_23_20 ,PCIE0_CLKREQ_N ), +PINMUX_IPSR_GPSR (IP2SR4_27_24 ,PCIE1_CLKREQ_N ), +PINMUX_IPSR_GPSR (IP2SR4_31_28 ,AVS0 ), + +/* IP3SR4 */ +PINMUX_IPSR_GPSR (IP3SR4_3_0 ,AVS1 ), + +/* IP0SR5 */ +PINMUX_IPSR_GPSR (IP0SR5_3_0 ,AVB2_AVTP_PPS ), +PINMUX_IPSR_GPSR (IP0SR5_7_4 ,AVB2_AVTP_CAPTURE ), +PINMUX_IPSR_GPSR (IP0SR5_11_8 ,AVB2_AVTP_MATCH ), +PINMUX_IPSR_GPSR (IP0SR5_15_12 ,AVB2_LINK ), +PINMUX_IPSR_GPSR (IP0SR5_19_16 ,AVB2_PHY_INT ), +PINMUX_IPSR_GPSR (IP0SR5_23_20 ,AVB2_MAGIC ), +PINMUX_IPSR_GPSR (IP0SR5_27_24 ,AVB2_MDC ), +PINMUX_IPSR_GPSR (IP0SR5_31_28 ,AVB2_TXCREFCLK ), + +/* IP1SR5 */ +PINMUX_IPSR_GPSR (IP1SR5_3_0 ,AVB2_TD3 ), +PINMUX_IPSR_GPSR (IP1SR5_7_4 ,AVB2_RD3 ), +PINMUX_IPSR_GPSR (IP1SR5_11_8 ,AVB2_MDIO ), +PINMUX_IPSR_GPSR (IP1SR5_15_12 ,AVB2_TD2 ), +PINMUX_IPSR_GPSR (IP1SR5_19_16 ,AVB2_TD1 ), +PINMUX_IPSR_GPSR (IP1SR5_23_20 ,AVB2_RD2 ), +PINMUX_IPSR_GPSR (IP1SR5_27_24 ,AVB2_RD1 ), +PINMUX_IPSR_GPSR (IP1SR5_31_28 ,AVB2_TD0 ), + +/* IP2SR5 */ +PINMUX_IPSR_GPSR (IP2SR5_3_0 ,AVB2_TXC ), +PINMUX_IPSR_GPSR (IP2SR5_7_4 ,AVB2_RD0 ), +PINMUX_IPSR_GPSR (IP2SR5_11_8 ,AVB2_RXC ), +PINMUX_IPSR_GPSR (IP2SR5_15_12 ,AVB2_TX_CTL ), +PINMUX_IPSR_GPSR (IP2SR5_19_16 ,AVB2_RX_CTL ), +/* IP0SR6 */ PINMUX_IPSR_GPSR(IP0SR6_3_0, AVB1_MDIO),
@@ -3419,6 +3479,82 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = { IP3SR3_7_4 IP3SR3_3_0)) }, + { PINMUX_CFG_REG_VAR("IP0SR4", 0xE6060060, 32, + GROUP(4, 4, 4, 4, 4, 4, 4, 4), + GROUP( + IP0SR4_31_28 + IP0SR4_27_24 + IP0SR4_23_20 + IP0SR4_19_16 + IP0SR4_15_12 + IP0SR4_11_8 + IP0SR4_7_4 + IP0SR4_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP1SR4", 0xE6060064, 32, + GROUP(4, 4, 4, 4, 4, 4, 4, 4), + GROUP( + IP1SR4_31_28 + IP1SR4_27_24 + IP1SR4_23_20 + IP1SR4_19_16 + IP1SR4_15_12 + IP1SR4_11_8 + IP1SR4_7_4 + IP1SR4_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP2SR4", 0xE6060068, 32, + GROUP(4, 4, 4, 4, 4, 4, 4, 4), + GROUP( + IP2SR4_31_28 + IP2SR4_27_24 + IP2SR4_23_20 + IP2SR4_19_16 + IP2SR4_15_12 + IP2SR4_11_8 + IP2SR4_7_4 + IP2SR4_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP3SR4", 0xE606006C, 32, + GROUP(-28, 4), + GROUP( + /* IP3SR4_31_4 RESERVED */ + IP3SR4_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP0SR5", 0xE6060860, 32, + GROUP(4, 4, 4, 4, 4, 4, 4, 4), + GROUP( + IP0SR5_31_28 + IP0SR5_27_24 + IP0SR5_23_20 + IP0SR5_19_16 + IP0SR5_15_12 + IP0SR5_11_8 + IP0SR5_7_4 + IP0SR5_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP1SR5", 0xE6060864, 32, + GROUP(4, 4, 4, 4, 4, 4, 4, 4), + GROUP( + IP1SR5_31_28 + IP1SR5_27_24 + IP1SR5_23_20 + IP1SR5_19_16 + IP1SR5_15_12 + IP1SR5_11_8 + IP1SR5_7_4 + IP1SR5_3_0)) + }, + { PINMUX_CFG_REG_VAR("IP2SR5", 0xE6060868, 32, + GROUP(-12, 4, 4, 4, 4, 4), + GROUP( + /* IP2SR5_31_20 RESERVED */ + IP2SR5_19_16 + IP2SR5_15_12 + IP2SR5_11_8 + IP2SR5_7_4 + IP2SR5_3_0)) + }, { PINMUX_CFG_REG("IP0SR6", 0xE6061060, 32, 4, GROUP( IP0SR6_31_28 IP0SR6_27_24
@@ -3505,51 +3641,6 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {#define F_ (x, y) x,#define FM (x) FN_##x, - {PINMUX_CFG_REG_VAR ("MOD_SEL4" ,0xE6060100 ,32 , -GROUP (-12 ,1 ,1 ,-2 ,1 ,1 ,-1 ,1 ,-2 ,1 ,1 ,-2 ,1 , --2 ,1 ,1 ,-1 ), -GROUP ( -/* RESERVED 31-20 */ - MOD_SEL4_19 - MOD_SEL4_18 -/* RESERVED 17-16 */ - MOD_SEL4_15 - MOD_SEL4_14 -/* RESERVED 13 */ - MOD_SEL4_12 - /* RESERVED 11-10 */ - MOD_SEL4_9 - MOD_SEL4_8 - /* RESERVED 7-6 */ - MOD_SEL4_5 - /* RESERVED 4-3 */ - MOD_SEL4_2 -MOD_SEL4_1 -/* RESERVED 0 */ - )) - }, - { PINMUX_CFG_REG_VAR("MOD_SEL5", 0xE6060900, 32, -GROUP (-12 ,1 ,-2 ,1 ,1 ,-2 ,1 ,1 ,-2 ,1 ,-1 , -1 ,1 ,-2 ,1 ,-1 ,1 ), -GROUP ( -/* RESERVED 31-20 */ - MOD_SEL5_19 - /* RESERVED 18-17 */ - MOD_SEL5_16 - MOD_SEL5_15 - /* RESERVED 14-13 */ - MOD_SEL5_12 - MOD_SEL5_11 - /* RESERVED 10-9 */ - MOD_SEL5_8 - /* RESERVED 7 */ - MOD_SEL5_6 - MOD_SEL5_5 - /* RESERVED 4-3 */ - MOD_SEL5_2 -/* RESERVED 1 */ -MOD_SEL5_0 )) - }, { PINMUX_CFG_REG_VAR("MOD_SEL6", 0xE6061100, 32, GROUP(-13, 1, -1, 1, -2, 1, 1, -1, 1, -2, 1, 1, 1, -2, 1, 1, -1),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 581/663 pinctrl: renesas: r8a779g0: Fix Group 6/7 pin functions
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 203734a0419cade9c76016f66e2c7ba354c249b4 ]
According to R-Car V4H Series User’s Manual: Hardware Rev. 0.54, pin groups 6 and 7 do not use Module Select Registers to configure pin functions.
Hence:
- Remove the non-existent Module Select Registers (MODSEL[67]),
- Correct the affected PINMUX definitions.
--- drivers/pinctrl/renesas/pfc-r8a779g0.c | 171 +++++++------------------ 1 file changed, 49 insertions(+), 122 deletions(-)
drivers/pinctrl/renesas/pfc-r8a779g0.c +49 -122
@@ -649,30 +649,6 @@ FM(IP0SR8_23_20) IP0SR8_23_20 FM(IP1SR8_23_20) IP1SR8_23_20 \ FM(IP0SR8_27_24) IP0SR8_27_24 \FM (IP0SR8_31_28)IP0SR8_31_28 -/* MOD_SEL6 */ /* 0 */ /* 1 */ -#define MOD_SEL6_18 FM(SEL_AVB1_TD3_0) FM(SEL_AVB1_TD3_1) -#define MOD_SEL6_16 FM(SEL_AVB1_TD2_0) FM(SEL_AVB1_TD2_1) -#define MOD_SEL6_13 FM(SEL_AVB1_TD0_0) FM(SEL_AVB1_TD0_1) -#define MOD_SEL6_12 FM(SEL_AVB1_TD1_0) FM(SEL_AVB1_TD1_1) -#define MOD_SEL6_10 FM(SEL_AVB1_AVTP_PPS_0) FM(SEL_AVB1_AVTP_PPS_1) -#define MOD_SEL6_7 FM(SEL_AVB1_TX_CTL_0) FM(SEL_AVB1_TX_CTL_1) -#define MOD_SEL6_6 FM(SEL_AVB1_TXC_0) FM(SEL_AVB1_TXC_1) -#define MOD_SEL6_5 FM(SEL_AVB1_AVTP_MATCH_0) FM(SEL_AVB1_AVTP_MATCH_1) -#define MOD_SEL6_2 FM(SEL_AVB1_MDC_0) FM(SEL_AVB1_MDC_1) -#define MOD_SEL6_1 FM(SEL_AVB1_MAGIC_0) FM(SEL_AVB1_MAGIC_1) - -/* MOD_SEL7 */ /* 0 */ /* 1 */ -#define MOD_SEL7_16 FM(SEL_AVB0_TX_CTL_0) FM(SEL_AVB0_TX_CTL_1) -#define MOD_SEL7_15 FM(SEL_AVB0_TXC_0) FM(SEL_AVB0_TXC_1) -#define MOD_SEL7_13 FM(SEL_AVB0_MDC_0) FM(SEL_AVB0_MDC_1) -#define MOD_SEL7_11 FM(SEL_AVB0_TD0_0) FM(SEL_AVB0_TD0_1) -#define MOD_SEL7_10 FM(SEL_AVB0_MAGIC_0) FM(SEL_AVB0_MAGIC_1) -#define MOD_SEL7_7 FM(SEL_AVB0_TD1_0) FM(SEL_AVB0_TD1_1) -#define MOD_SEL7_6 FM(SEL_AVB0_TD2_0) FM(SEL_AVB0_TD2_1) -#define MOD_SEL7_3 FM(SEL_AVB0_TD3_0) FM(SEL_AVB0_TD3_1) -#define MOD_SEL7_2 FM(SEL_AVB0_AVTP_MATCH_0) FM(SEL_AVB0_AVTP_MATCH_1) -#define MOD_SEL7_0 FM(SEL_AVB0_AVTP_PPS_0) FM(SEL_AVB0_AVTP_PPS_1) - /* MOD_SEL8 */ /* 0 */ /* 1 */#define MOD_SEL8_11 FM(SEL_SDA5_0) FM(SEL_SDA5_1)#define MOD_SEL8_10 FM(SEL_SCL5_0) FM(SEL_SCL5_1)
@@ -689,23 +665,18 @@ FM(IP0SR8_31_28) IP0SR8_31_28#define PINMUX_MOD_SELS \ \ -MOD_SEL6_18 \ -MOD_SEL6_16 MOD_SEL7_16 \ - MOD_SEL7_15 \ -MOD_SEL6_13 MOD_SEL7_13 \ -MOD_SEL6_12 \ - MOD_SEL7_11 MOD_SEL8_11 \ -MOD_SEL6_10 MOD_SEL7_10 MOD_SEL8_10 \ - MOD_SEL8_9 \ - MOD_SEL8_8 \ -MOD_SEL6_7 MOD_SEL7_7 MOD_SEL8_7 \ -MOD_SEL6_6 MOD_SEL7_6 MOD_SEL8_6 \ -MOD_SEL6_5 MOD_SEL8_5 \ - MOD_SEL8_4 \ - MOD_SEL7_3 MOD_SEL8_3 \ -MOD_SEL6_2 MOD_SEL7_2 MOD_SEL8_2 \ -MOD_SEL6_1 MOD_SEL8_1 \ - MOD_SEL7_0 MOD_SEL8_0 +MOD_SEL8_11 \ +MOD_SEL8_10 \ +MOD_SEL8_9 \ +MOD_SEL8_8 \ +MOD_SEL8_7 \ +MOD_SEL8_6 \ +MOD_SEL8_5 \ +MOD_SEL8_4 \ +MOD_SEL8_3 \ +MOD_SEL8_2 \ +MOD_SEL8_1 \ +MOD_SEL8_0enum {PINMUX_RESERVED =0 ,
@@ -1092,23 +1063,23 @@ static const u16 pinmux_data[] = {/* IP0SR6 */ PINMUX_IPSR_GPSR (IP0SR6_3_0 ,AVB1_MDIO ), -PINMUX_IPSR_MSEL (IP0SR6_7_4 ,AVB1_MAGIC ,SEL_AVB1_MAGIC_1 ), +PINMUX_IPSR_GPSR (IP0SR6_7_4 ,AVB1_MAGIC ), -PINMUX_IPSR_MSEL (IP0SR6_11_8 ,AVB1_MDC ,SEL_AVB1_MDC_1 ), +PINMUX_IPSR_GPSR (IP0SR6_11_8 ,AVB1_MDC ),PINMUX_IPSR_GPSR (IP0SR6_15_12 ,AVB1_PHY_INT ),PINMUX_IPSR_GPSR (IP0SR6_19_16 ,AVB1_LINK ),PINMUX_IPSR_GPSR (IP0SR6_19_16 ,AVB1_MII_TX_ER ), -PINMUX_IPSR_MSEL (IP0SR6_23_20 ,AVB1_AVTP_MATCH ,SEL_AVB1_AVTP_MATCH_1 ), -PINMUX_IPSR_MSEL (IP0SR6_23_20 ,AVB1_MII_RX_ER ,SEL_AVB1_AVTP_MATCH_0 ), +PINMUX_IPSR_GPSR (IP0SR6_23_20 ,AVB1_AVTP_MATCH ), +PINMUX_IPSR_GPSR (IP0SR6_23_20 ,AVB1_MII_RX_ER ), -PINMUX_IPSR_MSEL (IP0SR6_27_24 ,AVB1_TXC ,SEL_AVB1_TXC_1 ), -PINMUX_IPSR_MSEL (IP0SR6_27_24 ,AVB1_MII_TXC ,SEL_AVB1_TXC_0 ), +PINMUX_IPSR_GPSR (IP0SR6_27_24 ,AVB1_TXC ), +PINMUX_IPSR_GPSR (IP0SR6_27_24 ,AVB1_MII_TXC ), -PINMUX_IPSR_MSEL (IP0SR6_31_28 ,AVB1_TX_CTL ,SEL_AVB1_TX_CTL_1 ), -PINMUX_IPSR_MSEL (IP0SR6_31_28 ,AVB1_MII_TX_EN ,SEL_AVB1_TX_CTL_0 ), +PINMUX_IPSR_GPSR (IP0SR6_31_28 ,AVB1_TX_CTL ), +PINMUX_IPSR_GPSR (IP0SR6_31_28 ,AVB1_MII_TX_EN ),/* IP1SR6 */ PINMUX_IPSR_GPSR(IP1SR6_3_0, AVB1_RXC),
@@ -1117,17 +1088,17 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP1SR6_7_4 ,AVB1_RX_CTL ),PINMUX_IPSR_GPSR (IP1SR6_7_4 ,AVB1_MII_RX_DV ), -PINMUX_IPSR_MSEL (IP1SR6_11_8 ,AVB1_AVTP_PPS ,SEL_AVB1_AVTP_PPS_1 ), -PINMUX_IPSR_MSEL (IP1SR6_11_8 ,AVB1_MII_COL ,SEL_AVB1_AVTP_PPS_0 ), +PINMUX_IPSR_GPSR (IP1SR6_11_8 ,AVB1_AVTP_PPS ), +PINMUX_IPSR_GPSR (IP1SR6_11_8 ,AVB1_MII_COL ),PINMUX_IPSR_GPSR (IP1SR6_15_12 ,AVB1_AVTP_CAPTURE ),PINMUX_IPSR_GPSR (IP1SR6_15_12 ,AVB1_MII_CRS ), -PINMUX_IPSR_MSEL (IP1SR6_19_16 ,AVB1_TD1 ,SEL_AVB1_TD1_1 ), -PINMUX_IPSR_MSEL (IP1SR6_19_16 ,AVB1_MII_TD1 ,SEL_AVB1_TD1_0 ), +PINMUX_IPSR_GPSR (IP1SR6_19_16 ,AVB1_TD1 ), +PINMUX_IPSR_GPSR (IP1SR6_19_16 ,AVB1_MII_TD1 ), -PINMUX_IPSR_MSEL (IP1SR6_23_20 ,AVB1_TD0 ,SEL_AVB1_TD0_1 ), -PINMUX_IPSR_MSEL (IP1SR6_23_20 ,AVB1_MII_TD0 ,SEL_AVB1_TD0_0 ), +PINMUX_IPSR_GPSR (IP1SR6_23_20 ,AVB1_TD0 ), +PINMUX_IPSR_GPSR (IP1SR6_23_20 ,AVB1_MII_TD0 ),PINMUX_IPSR_GPSR (IP1SR6_27_24 ,AVB1_RD1 ), PINMUX_IPSR_GPSR(IP1SR6_27_24, AVB1_MII_RD1),
@@ -1136,14 +1107,14 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP1SR6_31_28 ,AVB1_MII_RD0 ),/* IP2SR6 */ -PINMUX_IPSR_MSEL (IP2SR6_3_0 ,AVB1_TD2 ,SEL_AVB1_TD2_1 ), -PINMUX_IPSR_MSEL (IP2SR6_3_0 ,AVB1_MII_TD2 ,SEL_AVB1_TD2_0 ), +PINMUX_IPSR_GPSR (IP2SR6_3_0 ,AVB1_TD2 ), +PINMUX_IPSR_GPSR (IP2SR6_3_0 ,AVB1_MII_TD2 ),PINMUX_IPSR_GPSR (IP2SR6_7_4 ,AVB1_RD2 ),PINMUX_IPSR_GPSR (IP2SR6_7_4 ,AVB1_MII_RD2 ), -PINMUX_IPSR_MSEL (IP2SR6_11_8 ,AVB1_TD3 ,SEL_AVB1_TD3_1 ), -PINMUX_IPSR_MSEL (IP2SR6_11_8 ,AVB1_MII_TD3 ,SEL_AVB1_TD3_0 ), +PINMUX_IPSR_GPSR (IP2SR6_11_8 ,AVB1_TD3 ), +PINMUX_IPSR_GPSR (IP2SR6_11_8 ,AVB1_MII_TD3 ),PINMUX_IPSR_GPSR (IP2SR6_15_12 ,AVB1_RD3 ), PINMUX_IPSR_GPSR(IP2SR6_15_12, AVB1_MII_RD3),
@@ -1151,29 +1122,29 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP2SR6_19_16 ,AVB1_TXCREFCLK ),/* IP0SR7 */ -PINMUX_IPSR_MSEL (IP0SR7_3_0 ,AVB0_AVTP_PPS ,SEL_AVB0_AVTP_PPS_1 ), -PINMUX_IPSR_MSEL (IP0SR7_3_0 ,AVB0_MII_COL ,SEL_AVB0_AVTP_PPS_0 ), +PINMUX_IPSR_GPSR (IP0SR7_3_0 ,AVB0_AVTP_PPS ), +PINMUX_IPSR_GPSR (IP0SR7_3_0 ,AVB0_MII_COL ),PINMUX_IPSR_GPSR (IP0SR7_7_4 ,AVB0_AVTP_CAPTURE ),PINMUX_IPSR_GPSR (IP0SR7_7_4 ,AVB0_MII_CRS ), -PINMUX_IPSR_MSEL (IP0SR7_11_8 ,AVB0_AVTP_MATCH ,SEL_AVB0_AVTP_MATCH_1 ), -PINMUX_IPSR_MSEL (IP0SR7_11_8 ,AVB0_MII_RX_ER ,SEL_AVB0_AVTP_MATCH_0 ), -PINMUX_IPSR_MSEL (IP0SR7_11_8 ,CC5_OSCOUT ,SEL_AVB0_AVTP_MATCH_0 ), +PINMUX_IPSR_GPSR (IP0SR7_11_8 ,AVB0_AVTP_MATCH ), +PINMUX_IPSR_GPSR (IP0SR7_11_8 ,AVB0_MII_RX_ER ), +PINMUX_IPSR_GPSR (IP0SR7_11_8 ,CC5_OSCOUT ), -PINMUX_IPSR_MSEL (IP0SR7_15_12 ,AVB0_TD3 ,SEL_AVB0_TD3_1 ), -PINMUX_IPSR_MSEL (IP0SR7_15_12 ,AVB0_MII_TD3 ,SEL_AVB0_TD3_0 ), +PINMUX_IPSR_GPSR (IP0SR7_15_12 ,AVB0_TD3 ), +PINMUX_IPSR_GPSR (IP0SR7_15_12 ,AVB0_MII_TD3 ),PINMUX_IPSR_GPSR (IP0SR7_19_16 ,AVB0_LINK ),PINMUX_IPSR_GPSR (IP0SR7_19_16 ,AVB0_MII_TX_ER ),PINMUX_IPSR_GPSR (IP0SR7_23_20 ,AVB0_PHY_INT ), -PINMUX_IPSR_MSEL (IP0SR7_27_24 ,AVB0_TD2 ,SEL_AVB0_TD2_1 ), -PINMUX_IPSR_MSEL (IP0SR7_27_24 ,AVB0_MII_TD2 ,SEL_AVB0_TD2_0 ), +PINMUX_IPSR_GPSR (IP0SR7_27_24 ,AVB0_TD2 ), +PINMUX_IPSR_GPSR (IP0SR7_27_24 ,AVB0_MII_TD2 ), -PINMUX_IPSR_MSEL (IP0SR7_31_28 ,AVB0_TD1 ,SEL_AVB0_TD1_1 ), -PINMUX_IPSR_MSEL (IP0SR7_31_28 ,AVB0_MII_TD1 ,SEL_AVB0_TD1_0 ), +PINMUX_IPSR_GPSR (IP0SR7_31_28 ,AVB0_TD1 ), +PINMUX_IPSR_GPSR (IP0SR7_31_28 ,AVB0_MII_TD1 ),/* IP1SR7 */ PINMUX_IPSR_GPSR(IP1SR7_3_0, AVB0_RD3),
@@ -1181,24 +1152,24 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP1SR7_7_4 ,AVB0_TXCREFCLK ), -PINMUX_IPSR_MSEL (IP1SR7_11_8 ,AVB0_MAGIC ,SEL_AVB0_MAGIC_1 ), +PINMUX_IPSR_GPSR (IP1SR7_11_8 ,AVB0_MAGIC ), -PINMUX_IPSR_MSEL (IP1SR7_15_12 ,AVB0_TD0 ,SEL_AVB0_TD0_1 ), -PINMUX_IPSR_MSEL (IP1SR7_15_12 ,AVB0_MII_TD0 ,SEL_AVB0_TD0_0 ), +PINMUX_IPSR_GPSR (IP1SR7_15_12 ,AVB0_TD0 ), +PINMUX_IPSR_GPSR (IP1SR7_15_12 ,AVB0_MII_TD0 ),PINMUX_IPSR_GPSR (IP1SR7_19_16 ,AVB0_RD2 ),PINMUX_IPSR_GPSR (IP1SR7_19_16 ,AVB0_MII_RD2 ), -PINMUX_IPSR_MSEL (IP1SR7_23_20 ,AVB0_MDC ,SEL_AVB0_MDC_1 ), +PINMUX_IPSR_GPSR (IP1SR7_23_20 ,AVB0_MDC ),PINMUX_IPSR_GPSR (IP1SR7_27_24 ,AVB0_MDIO ), -PINMUX_IPSR_MSEL (IP1SR7_31_28 ,AVB0_TXC ,SEL_AVB0_TXC_1 ), -PINMUX_IPSR_MSEL (IP1SR7_31_28 ,AVB0_MII_TXC ,SEL_AVB0_TXC_0 ), +PINMUX_IPSR_GPSR (IP1SR7_31_28 ,AVB0_TXC ), +PINMUX_IPSR_GPSR (IP1SR7_31_28 ,AVB0_MII_TXC ),/* IP2SR7 */ -PINMUX_IPSR_MSEL (IP2SR7_3_0 ,AVB0_TX_CTL ,SEL_AVB0_TX_CTL_1 ), -PINMUX_IPSR_MSEL (IP2SR7_3_0 ,AVB0_MII_TX_EN ,SEL_AVB0_TX_CTL_0 ), +PINMUX_IPSR_GPSR (IP2SR7_3_0 ,AVB0_TX_CTL ), +PINMUX_IPSR_GPSR (IP2SR7_3_0 ,AVB0_MII_TX_EN ),PINMUX_IPSR_GPSR (IP2SR7_7_4 ,AVB0_RD1 ), PINMUX_IPSR_GPSR(IP2SR7_7_4, AVB0_MII_RD1),
@@ -3641,50 +3612,6 @@ static const struct pinmux_cfg_reg pinmux_config_regs[] = {#define F_ (x, y) x,#define FM (x) FN_##x, - {PINMUX_CFG_REG_VAR ("MOD_SEL6" ,0xE6061100 ,32 , -GROUP (-13 ,1 ,-1 ,1 ,-2 ,1 ,1 , --1 ,1 ,-2 ,1 ,1 ,1 ,-2 ,1 ,1 ,-1 ), -GROUP ( -/* RESERVED 31-19 */ - MOD_SEL6_18 - /* RESERVED 17 */ - MOD_SEL6_16 -/* RESERVED 15-14 */ - MOD_SEL6_13 - MOD_SEL6_12 -/* RESERVED 11 */ - MOD_SEL6_10 - /* RESERVED 9-8 */ - MOD_SEL6_7 - MOD_SEL6_6 - MOD_SEL6_5 - /* RESERVED 4-3 */ - MOD_SEL6_2 -MOD_SEL6_1 -/* RESERVED 0 */ - )) - }, - { PINMUX_CFG_REG_VAR("MOD_SEL7", 0xE6061900, 32, -GROUP (-15 ,1 ,1 ,-1 ,1 ,-1 ,1 ,1 ,-2 ,1 ,1 , --2 ,1 ,1 ,-1 ,1 ), -GROUP ( -/* RESERVED 31-17 */ - MOD_SEL7_16 - MOD_SEL7_15 -/* RESERVED 14 */ - MOD_SEL7_13 - /* RESERVED 12 */ - MOD_SEL7_11 - MOD_SEL7_10 - /* RESERVED 9-8 */ - MOD_SEL7_7 - MOD_SEL7_6 - /* RESERVED 5-4 */ - MOD_SEL7_3 - MOD_SEL7_2 -/* RESERVED 1 */ -MOD_SEL7_0 )) - }, { PINMUX_CFG_REG_VAR("MOD_SEL8", 0xE6068100, 32, GROUP(-20, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1), GROUP(
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 582/663 pinctrl: renesas: r8a779g0: Fix ERROROUTC function names
In reply to Greg Kroah-HartmanFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9da805344d2a2d27a32cc9271230055d8818e887 ]
According to R-Car V4H Series User’s Manual: Hardware Rev. 0.54, the ERROROUTC signal is active-low. Hence add the missing "_N" suffix to the pin function's names.
Resize column 2 of all IPxSR* definitions to accomodate the longer names.
--- drivers/pinctrl/renesas/pfc-r8a779g0.c | 502 ++++++++++++------------- 1 file changed, 251 insertions(+), 251 deletions(-)
drivers/pinctrl/renesas/pfc-r8a779g0.c +251 -251
@@ -268,271 +268,271 @@#define GPSR8_0 F_(SCL0, IP0SR8_3_0)/* SR0 */ -/* IP0SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR0_3_0 F_(0, 0) FM(ERROROUTC_B) FM(TCLK2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_7_4 F_(0, 0) FM(MSIOF3_SS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_11_8 F_(0, 0) FM(MSIOF3_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_15_12 FM(IRQ3) FM(MSIOF3_SCK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_19_16 FM(IRQ2) FM(MSIOF3_TXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_23_20 FM(IRQ1) FM(MSIOF3_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_27_24 FM(IRQ0) FM(MSIOF3_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR0_31_28 FM(MSIOF5_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR0_3_0 FM(MSIOF5_SS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_7_4 FM(MSIOF5_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_11_8 FM(MSIOF5_TXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_15_12 FM(MSIOF5_SCK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_19_16 FM(MSIOF5_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_23_20 FM(MSIOF2_SS2) FM(TCLK1) FM(IRQ2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_27_24 FM(MSIOF2_SS1) FM(HTX1) FM(TX1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR0_31_28 FM(MSIOF2_SYNC) FM(HRX1) FM(RX1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR0_3_0 FM(MSIOF2_TXD) FM(HCTS1_N) FM(CTS1_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR0_7_4 FM(MSIOF2_SCK) FM(HRTS1_N) FM(RTS1_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR0_11_8 FM(MSIOF2_RXD) FM(HSCK1) FM(SCK1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR0_3_0 F_(0, 0) FM(ERROROUTC_N_B) FM(TCLK2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_7_4 F_(0, 0) FM(MSIOF3_SS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_11_8 F_(0, 0) FM(MSIOF3_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_15_12 FM(IRQ3) FM(MSIOF3_SCK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_19_16 FM(IRQ2) FM(MSIOF3_TXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_23_20 FM(IRQ1) FM(MSIOF3_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_27_24 FM(IRQ0) FM(MSIOF3_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR0_31_28 FM(MSIOF5_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR0_3_0 FM(MSIOF5_SS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_7_4 FM(MSIOF5_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_11_8 FM(MSIOF5_TXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_15_12 FM(MSIOF5_SCK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_19_16 FM(MSIOF5_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_23_20 FM(MSIOF2_SS2) FM(TCLK1) FM(IRQ2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_27_24 FM(MSIOF2_SS1) FM(HTX1) FM(TX1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR0_31_28 FM(MSIOF2_SYNC) FM(HRX1) FM(RX1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR0 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR0_3_0 FM(MSIOF2_TXD) FM(HCTS1_N) FM(CTS1_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR0_7_4 FM(MSIOF2_SCK) FM(HRTS1_N) FM(RTS1_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR0_11_8 FM(MSIOF2_RXD) FM(HSCK1) FM(SCK1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR1 */ -/* IP0SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR1_3_0 FM(MSIOF1_SS2) FM(HTX3_A) FM(TX3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_7_4 FM(MSIOF1_SS1) FM(HCTS3_N_A) FM(RX3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_11_8 FM(MSIOF1_SYNC) FM(HRTS3_N_A) FM(RTS3_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_15_12 FM(MSIOF1_SCK) FM(HSCK3_A) FM(CTS3_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_19_16 FM(MSIOF1_TXD) FM(HRX3_A) FM(SCK3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_23_20 FM(MSIOF1_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_27_24 FM(MSIOF0_SS2) FM(HTX1_X) FM(TX1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR1_31_28 FM(MSIOF0_SS1) FM(HRX1_X) FM(RX1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR1_3_0 FM(MSIOF0_SYNC) FM(HCTS1_N_X) FM(CTS1_N_X) FM(CANFD5_TX_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_7_4 FM(MSIOF0_TXD) FM(HRTS1_N_X) FM(RTS1_N_X) FM(CANFD5_RX_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_11_8 FM(MSIOF0_SCK) FM(HSCK1_X) FM(SCK1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_15_12 FM(MSIOF0_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_19_16 FM(HTX0) FM(TX0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_23_20 FM(HCTS0_N) FM(CTS0_N) FM(PWM8_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_27_24 FM(HRTS0_N) FM(RTS0_N) FM(PWM9_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR1_31_28 FM(HSCK0) FM(SCK0) FM(PWM0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR1_3_0 FM(HRX0) FM(RX0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_7_4 FM(SCIF_CLK) FM(IRQ4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_11_8 FM(SSI_SCK) FM(TCLK3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_15_12 FM(SSI_WS) FM(TCLK4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_19_16 FM(SSI_SD) FM(IRQ0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_23_20 FM(AUDIO_CLKOUT) FM(IRQ1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_27_24 FM(AUDIO_CLKIN) FM(PWM3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR1_31_28 F_(0, 0) FM(TCLK2) FM(MSIOF4_SS1) FM(IRQ3_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP3SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP3SR1_3_0 FM(HRX3) FM(SCK3_A) FM(MSIOF4_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR1_7_4 FM(HSCK3) FM(CTS3_N_A) FM(MSIOF4_SCK) FM(TPU0TO0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR1_11_8 FM(HRTS3_N) FM(RTS3_N_A) FM(MSIOF4_TXD) FM(TPU0TO1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR1_15_12 FM(HCTS3_N) FM(RX3_A) FM(MSIOF4_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR1_19_16 FM(HTX3) FM(TX3_A) FM(MSIOF4_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR1_3_0 FM(MSIOF1_SS2) FM(HTX3_A) FM(TX3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_7_4 FM(MSIOF1_SS1) FM(HCTS3_N_A) FM(RX3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_11_8 FM(MSIOF1_SYNC) FM(HRTS3_N_A) FM(RTS3_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_15_12 FM(MSIOF1_SCK) FM(HSCK3_A) FM(CTS3_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_19_16 FM(MSIOF1_TXD) FM(HRX3_A) FM(SCK3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_23_20 FM(MSIOF1_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_27_24 FM(MSIOF0_SS2) FM(HTX1_X) FM(TX1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR1_31_28 FM(MSIOF0_SS1) FM(HRX1_X) FM(RX1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR1_3_0 FM(MSIOF0_SYNC) FM(HCTS1_N_X) FM(CTS1_N_X) FM(CANFD5_TX_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_7_4 FM(MSIOF0_TXD) FM(HRTS1_N_X) FM(RTS1_N_X) FM(CANFD5_RX_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_11_8 FM(MSIOF0_SCK) FM(HSCK1_X) FM(SCK1_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_15_12 FM(MSIOF0_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_19_16 FM(HTX0) FM(TX0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_23_20 FM(HCTS0_N) FM(CTS0_N) FM(PWM8_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_27_24 FM(HRTS0_N) FM(RTS0_N) FM(PWM9_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR1_31_28 FM(HSCK0) FM(SCK0) FM(PWM0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR1_3_0 FM(HRX0) FM(RX0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_7_4 FM(SCIF_CLK) FM(IRQ4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_11_8 FM(SSI_SCK) FM(TCLK3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_15_12 FM(SSI_WS) FM(TCLK4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_19_16 FM(SSI_SD) FM(IRQ0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_23_20 FM(AUDIO_CLKOUT) FM(IRQ1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_27_24 FM(AUDIO_CLKIN) FM(PWM3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR1_31_28 F_(0, 0) FM(TCLK2) FM(MSIOF4_SS1) FM(IRQ3_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP3SR1 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP3SR1_3_0 FM(HRX3) FM(SCK3_A) FM(MSIOF4_SS2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR1_7_4 FM(HSCK3) FM(CTS3_N_A) FM(MSIOF4_SCK) FM(TPU0TO0_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR1_11_8 FM(HRTS3_N) FM(RTS3_N_A) FM(MSIOF4_TXD) FM(TPU0TO1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR1_15_12 FM(HCTS3_N) FM(RX3_A) FM(MSIOF4_RXD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR1_19_16 FM(HTX3) FM(TX3_A) FM(MSIOF4_SYNC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR2 */ -/* IP0SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR2_3_0 FM(FXR_TXDA) FM(CANFD1_TX) FM(TPU0TO2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_7_4 FM(FXR_TXENA_N) FM(CANFD1_RX) FM(TPU0TO3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_11_8 FM(RXDA_EXTFXR) FM(CANFD5_TX) FM(IRQ5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_15_12 FM(CLK_EXTFXR) FM(CANFD5_RX) FM(IRQ4_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_19_16 FM(RXDB_EXTFXR) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_23_20 FM(FXR_TXENB_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_27_24 FM(FXR_TXDB) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR2_31_28 FM(TPU0TO1) FM(CANFD6_TX) F_(0, 0) FM(TCLK2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR2_3_0 FM(TPU0TO0) FM(CANFD6_RX) F_(0, 0) FM(TCLK1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_7_4 FM(CAN_CLK) FM(FXR_TXENA_N_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_11_8 FM(CANFD0_TX) FM(FXR_TXENB_N_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_15_12 FM(CANFD0_RX) FM(STPWT_EXTFXR) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_19_16 FM(CANFD2_TX) FM(TPU0TO2) F_(0, 0) FM(TCLK3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_23_20 FM(CANFD2_RX) FM(TPU0TO3) FM(PWM1_B) FM(TCLK4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_27_24 FM(CANFD3_TX) F_(0, 0) FM(PWM2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR2_31_28 FM(CANFD3_RX) F_(0, 0) FM(PWM3_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR2_3_0 FM(CANFD4_TX) F_(0, 0) FM(PWM4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR2_7_4 FM(CANFD4_RX) F_(0, 0) FM(PWM5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR2_11_8 FM(CANFD7_TX) F_(0, 0) FM(PWM6) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR2_15_12 FM(CANFD7_RX) F_(0, 0) FM(PWM7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR2_3_0 FM(FXR_TXDA) FM(CANFD1_TX) FM(TPU0TO2_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_7_4 FM(FXR_TXENA_N) FM(CANFD1_RX) FM(TPU0TO3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_11_8 FM(RXDA_EXTFXR) FM(CANFD5_TX) FM(IRQ5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_15_12 FM(CLK_EXTFXR) FM(CANFD5_RX) FM(IRQ4_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_19_16 FM(RXDB_EXTFXR) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_23_20 FM(FXR_TXENB_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_27_24 FM(FXR_TXDB) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR2_31_28 FM(TPU0TO1) FM(CANFD6_TX) F_(0, 0) FM(TCLK2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR2_3_0 FM(TPU0TO0) FM(CANFD6_RX) F_(0, 0) FM(TCLK1_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_7_4 FM(CAN_CLK) FM(FXR_TXENA_N_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_11_8 FM(CANFD0_TX) FM(FXR_TXENB_N_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_15_12 FM(CANFD0_RX) FM(STPWT_EXTFXR) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_19_16 FM(CANFD2_TX) FM(TPU0TO2) F_(0, 0) FM(TCLK3_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_23_20 FM(CANFD2_RX) FM(TPU0TO3) FM(PWM1_B) FM(TCLK4_A) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_27_24 FM(CANFD3_TX) F_(0, 0) FM(PWM2_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR2_31_28 FM(CANFD3_RX) F_(0, 0) FM(PWM3_B) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR2 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR2_3_0 FM(CANFD4_TX) F_(0, 0) FM(PWM4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR2_7_4 FM(CANFD4_RX) F_(0, 0) FM(PWM5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR2_11_8 FM(CANFD7_TX) F_(0, 0) FM(PWM6) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR2_15_12 FM(CANFD7_RX) F_(0, 0) FM(PWM7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR3 */ -/* IP0SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR3_3_0 FM(MMC_SD_D1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_7_4 FM(MMC_SD_D0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_11_8 FM(MMC_SD_D2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_15_12 FM(MMC_SD_CLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_19_16 FM(MMC_DS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_23_20 FM(MMC_SD_D3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_27_24 FM(MMC_D5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR3_31_28 FM(MMC_D4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR3_3_0 FM(MMC_D7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_7_4 FM(MMC_D6) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_11_8 FM(MMC_SD_CMD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_15_12 FM(SD_CD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_19_16 FM(SD_WP) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_23_20 FM(IPC_CLKIN) FM(IPC_CLKEN_IN) FM(PWM1_A) FM(TCLK3_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_27_24 FM(IPC_CLKOUT) FM(IPC_CLKEN_OUT) FM(ERROROUTC_A) FM(TCLK4_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR3_31_28 FM(QSPI0_SSL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR3_3_0 FM(QSPI0_IO3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_7_4 FM(QSPI0_IO2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_11_8 FM(QSPI0_MISO_IO1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_15_12 FM(QSPI0_MOSI_IO0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_19_16 FM(QSPI0_SPCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_23_20 FM(QSPI1_MOSI_IO0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_27_24 FM(QSPI1_SPCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR3_31_28 FM(QSPI1_MISO_IO1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP3SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP3SR3_3_0 FM(QSPI1_IO2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR3_7_4 FM(QSPI1_SSL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR3_11_8 FM(QSPI1_IO3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR3_15_12 FM(RPC_RESET_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR3_19_16 FM(RPC_WP_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP3SR3_23_20 FM(RPC_INT_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR3_3_0 FM(MMC_SD_D1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_7_4 FM(MMC_SD_D0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_11_8 FM(MMC_SD_D2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_15_12 FM(MMC_SD_CLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_19_16 FM(MMC_DS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_23_20 FM(MMC_SD_D3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_27_24 FM(MMC_D5) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR3_31_28 FM(MMC_D4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR3_3_0 FM(MMC_D7) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_7_4 FM(MMC_D6) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_11_8 FM(MMC_SD_CMD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_15_12 FM(SD_CD) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_19_16 FM(SD_WP) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_23_20 FM(IPC_CLKIN) FM(IPC_CLKEN_IN) FM(PWM1_A) FM(TCLK3_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_27_24 FM(IPC_CLKOUT) FM(IPC_CLKEN_OUT) FM(ERROROUTC_N_A) FM(TCLK4_X) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR3_31_28 FM(QSPI0_SSL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR3_3_0 FM(QSPI0_IO3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_7_4 FM(QSPI0_IO2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_11_8 FM(QSPI0_MISO_IO1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_15_12 FM(QSPI0_MOSI_IO0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_19_16 FM(QSPI0_SPCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_23_20 FM(QSPI1_MOSI_IO0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_27_24 FM(QSPI1_SPCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR3_31_28 FM(QSPI1_MISO_IO1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP3SR3 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP3SR3_3_0 FM(QSPI1_IO2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR3_7_4 FM(QSPI1_SSL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR3_11_8 FM(QSPI1_IO3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR3_15_12 FM(RPC_RESET_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR3_19_16 FM(RPC_WP_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP3SR3_23_20 FM(RPC_INT_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR4 */ -/* IP0SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR4_3_0 FM(TSN0_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_7_4 FM(TSN0_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_11_8 FM(TSN0_AVTP_PPS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_15_12 FM(TSN0_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_19_16 FM(TSN0_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_23_20 FM(TSN0_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_27_24 FM(TSN0_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR4_31_28 FM(TSN0_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR4_3_0 FM(TSN0_AVTP_PPS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_7_4 FM(TSN0_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_11_8 FM(TSN0_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_15_12 FM(TSN0_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_19_16 FM(TSN0_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_23_20 FM(TSN0_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_27_24 FM(TSN0_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR4_31_28 FM(TSN0_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR4_3_0 FM(TSN0_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_7_4 FM(TSN0_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_11_8 FM(TSN0_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_15_12 FM(TSN0_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_19_16 FM(TSN0_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_23_20 FM(PCIE0_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_27_24 FM(PCIE1_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR4_31_28 FM(AVS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP3SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP3SR4_3_0 FM(AVS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR4_3_0 FM(TSN0_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_7_4 FM(TSN0_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_11_8 FM(TSN0_AVTP_PPS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_15_12 FM(TSN0_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_19_16 FM(TSN0_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_23_20 FM(TSN0_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_27_24 FM(TSN0_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR4_31_28 FM(TSN0_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR4_3_0 FM(TSN0_AVTP_PPS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_7_4 FM(TSN0_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_11_8 FM(TSN0_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_15_12 FM(TSN0_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_19_16 FM(TSN0_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_23_20 FM(TSN0_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_27_24 FM(TSN0_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR4_31_28 FM(TSN0_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR4_3_0 FM(TSN0_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_7_4 FM(TSN0_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_11_8 FM(TSN0_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_15_12 FM(TSN0_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_19_16 FM(TSN0_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_23_20 FM(PCIE0_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_27_24 FM(PCIE1_CLKREQ_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR4_31_28 FM(AVS0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP3SR4 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP3SR4_3_0 FM(AVS1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR5 */ -/* IP0SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR5_3_0 FM(AVB2_AVTP_PPS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_7_4 FM(AVB2_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_11_8 FM(AVB2_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_15_12 FM(AVB2_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_19_16 FM(AVB2_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_23_20 FM(AVB2_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_27_24 FM(AVB2_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR5_31_28 FM(AVB2_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR5_3_0 FM(AVB2_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_7_4 FM(AVB2_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_11_8 FM(AVB2_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_15_12 FM(AVB2_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_19_16 FM(AVB2_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_23_20 FM(AVB2_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_27_24 FM(AVB2_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR5_31_28 FM(AVB2_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR5_3_0 FM(AVB2_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR5_7_4 FM(AVB2_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR5_11_8 FM(AVB2_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR5_15_12 FM(AVB2_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR5_19_16 FM(AVB2_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR5_3_0 FM(AVB2_AVTP_PPS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_7_4 FM(AVB2_AVTP_CAPTURE) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_11_8 FM(AVB2_AVTP_MATCH) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_15_12 FM(AVB2_LINK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_19_16 FM(AVB2_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_23_20 FM(AVB2_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_27_24 FM(AVB2_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR5_31_28 FM(AVB2_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR5_3_0 FM(AVB2_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_7_4 FM(AVB2_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_11_8 FM(AVB2_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_15_12 FM(AVB2_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_19_16 FM(AVB2_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_23_20 FM(AVB2_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_27_24 FM(AVB2_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR5_31_28 FM(AVB2_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR5 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR5_3_0 FM(AVB2_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_7_4 FM(AVB2_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_11_8 FM(AVB2_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_15_12 FM(AVB2_TX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR5_19_16 FM(AVB2_RX_CTL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR6 */ -/* IP0SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR6_3_0 FM(AVB1_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_7_4 FM(AVB1_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_11_8 FM(AVB1_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_15_12 FM(AVB1_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_19_16 FM(AVB1_LINK) FM(AVB1_MII_TX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_23_20 FM(AVB1_AVTP_MATCH) FM(AVB1_MII_RX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_27_24 FM(AVB1_TXC) FM(AVB1_MII_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR6_31_28 FM(AVB1_TX_CTL) FM(AVB1_MII_TX_EN) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR6_3_0 FM(AVB1_RXC) FM(AVB1_MII_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_7_4 FM(AVB1_RX_CTL) FM(AVB1_MII_RX_DV) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_11_8 FM(AVB1_AVTP_PPS) FM(AVB1_MII_COL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_15_12 FM(AVB1_AVTP_CAPTURE) FM(AVB1_MII_CRS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_19_16 FM(AVB1_TD1) FM(AVB1_MII_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_23_20 FM(AVB1_TD0) FM(AVB1_MII_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_27_24 FM(AVB1_RD1) FM(AVB1_MII_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR6_31_28 FM(AVB1_RD0) FM(AVB1_MII_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR6_3_0 FM(AVB1_TD2) FM(AVB1_MII_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR6_7_4 FM(AVB1_RD2) FM(AVB1_MII_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR6_11_8 FM(AVB1_TD3) FM(AVB1_MII_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR6_15_12 FM(AVB1_RD3) FM(AVB1_MII_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR6_19_16 FM(AVB1_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR6_3_0 FM(AVB1_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_7_4 FM(AVB1_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_11_8 FM(AVB1_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_15_12 FM(AVB1_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_19_16 FM(AVB1_LINK) FM(AVB1_MII_TX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_23_20 FM(AVB1_AVTP_MATCH) FM(AVB1_MII_RX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_27_24 FM(AVB1_TXC) FM(AVB1_MII_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR6_31_28 FM(AVB1_TX_CTL) FM(AVB1_MII_TX_EN) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR6_3_0 FM(AVB1_RXC) FM(AVB1_MII_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_7_4 FM(AVB1_RX_CTL) FM(AVB1_MII_RX_DV) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_11_8 FM(AVB1_AVTP_PPS) FM(AVB1_MII_COL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_15_12 FM(AVB1_AVTP_CAPTURE) FM(AVB1_MII_CRS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_19_16 FM(AVB1_TD1) FM(AVB1_MII_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_23_20 FM(AVB1_TD0) FM(AVB1_MII_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_27_24 FM(AVB1_RD1) FM(AVB1_MII_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR6_31_28 FM(AVB1_RD0) FM(AVB1_MII_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR6 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR6_3_0 FM(AVB1_TD2) FM(AVB1_MII_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR6_7_4 FM(AVB1_RD2) FM(AVB1_MII_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR6_11_8 FM(AVB1_TD3) FM(AVB1_MII_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR6_15_12 FM(AVB1_RD3) FM(AVB1_MII_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR6_19_16 FM(AVB1_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR7 */ -/* IP0SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR7_3_0 FM(AVB0_AVTP_PPS) FM(AVB0_MII_COL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_7_4 FM(AVB0_AVTP_CAPTURE) FM(AVB0_MII_CRS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_11_8 FM(AVB0_AVTP_MATCH) FM(AVB0_MII_RX_ER) FM(CC5_OSCOUT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_15_12 FM(AVB0_TD3) FM(AVB0_MII_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_19_16 FM(AVB0_LINK) FM(AVB0_MII_TX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_23_20 FM(AVB0_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_27_24 FM(AVB0_TD2) FM(AVB0_MII_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR7_31_28 FM(AVB0_TD1) FM(AVB0_MII_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR7_3_0 FM(AVB0_RD3) FM(AVB0_MII_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_7_4 FM(AVB0_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_11_8 FM(AVB0_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_15_12 FM(AVB0_TD0) FM(AVB0_MII_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_19_16 FM(AVB0_RD2) FM(AVB0_MII_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_23_20 FM(AVB0_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_27_24 FM(AVB0_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR7_31_28 FM(AVB0_TXC) FM(AVB0_MII_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP2SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP2SR7_3_0 FM(AVB0_TX_CTL) FM(AVB0_MII_TX_EN) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR7_7_4 FM(AVB0_RD1) FM(AVB0_MII_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR7_11_8 FM(AVB0_RD0) FM(AVB0_MII_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR7_15_12 FM(AVB0_RXC) FM(AVB0_MII_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP2SR7_19_16 FM(AVB0_RX_CTL) FM(AVB0_MII_RX_DV) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR7_3_0 FM(AVB0_AVTP_PPS) FM(AVB0_MII_COL) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_7_4 FM(AVB0_AVTP_CAPTURE) FM(AVB0_MII_CRS) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_11_8 FM(AVB0_AVTP_MATCH) FM(AVB0_MII_RX_ER) FM(CC5_OSCOUT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_15_12 FM(AVB0_TD3) FM(AVB0_MII_TD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_19_16 FM(AVB0_LINK) FM(AVB0_MII_TX_ER) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_23_20 FM(AVB0_PHY_INT) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_27_24 FM(AVB0_TD2) FM(AVB0_MII_TD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR7_31_28 FM(AVB0_TD1) FM(AVB0_MII_TD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR7_3_0 FM(AVB0_RD3) FM(AVB0_MII_RD3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_7_4 FM(AVB0_TXCREFCLK) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_11_8 FM(AVB0_MAGIC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_15_12 FM(AVB0_TD0) FM(AVB0_MII_TD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_19_16 FM(AVB0_RD2) FM(AVB0_MII_RD2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_23_20 FM(AVB0_MDC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_27_24 FM(AVB0_MDIO) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR7_31_28 FM(AVB0_TXC) FM(AVB0_MII_TXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP2SR7 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP2SR7_3_0 FM(AVB0_TX_CTL) FM(AVB0_MII_TX_EN) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR7_7_4 FM(AVB0_RD1) FM(AVB0_MII_RD1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR7_11_8 FM(AVB0_RD0) FM(AVB0_MII_RD0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR7_15_12 FM(AVB0_RXC) FM(AVB0_MII_RXC) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP2SR7_19_16 FM(AVB0_RX_CTL) FM(AVB0_MII_RX_DV) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)/* SR8 */ -/* IP0SR8 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP0SR8_3_0 FM(SCL0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_7_4 FM(SDA0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_11_8 FM(SCL1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_15_12 FM(SDA1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_19_16 FM(SCL2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_23_20 FM(SDA2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_27_24 FM(SCL3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP0SR8_31_28 FM(SDA3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) - -/* IP1SR8 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ -#define IP1SR8_3_0 FM(SCL4) FM(HRX2) FM(SCK4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR8_7_4 FM(SDA4) FM(HTX2) FM(CTS4_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR8_11_8 FM(SCL5) FM(HRTS2_N) FM(RTS4_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR8_15_12 FM(SDA5) FM(SCIF_CLK2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR8_19_16 F_(0, 0) FM(HCTS2_N) FM(TX4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) -#define IP1SR8_23_20 F_(0, 0) FM(HSCK2) FM(RX4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +/* IP0SR8 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP0SR8_3_0 FM(SCL0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_7_4 FM(SDA0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_11_8 FM(SCL1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_15_12 FM(SDA1) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_19_16 FM(SCL2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_23_20 FM(SDA2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_27_24 FM(SCL3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP0SR8_31_28 FM(SDA3) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) + +/* IP1SR8 */ /* 0 */ /* 1 */ /* 2 */ /* 3 4 5 6 7 8 9 A B C D E F */ +#define IP1SR8_3_0 FM(SCL4) FM(HRX2) FM(SCK4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR8_7_4 FM(SDA4) FM(HTX2) FM(CTS4_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR8_11_8 FM(SCL5) FM(HRTS2_N) FM(RTS4_N) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR8_15_12 FM(SDA5) FM(SCIF_CLK2) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR8_19_16 F_(0, 0) FM(HCTS2_N) FM(TX4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) +#define IP1SR8_23_20 F_(0, 0) FM(HSCK2) FM(RX4) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0) F_(0, 0)#define PINMUX_GPSR \ GPSR3_29 \
@@ -711,7 +711,7 @@ static const u16 pinmux_data[] = {PINMUX_DATA_GP_ALL (),/* IP0SR0 */ -PINMUX_IPSR_GPSR (IP0SR0_3_0 ,ERROROUTC_B ), +PINMUX_IPSR_GPSR (IP0SR0_3_0 ,ERROROUTC_N_B ),PINMUX_IPSR_GPSR (IP0SR0_3_0 ,TCLK2_A ), PINMUX_IPSR_GPSR(IP0SR0_7_4, MSIOF3_SS1),
@@ -977,7 +977,7 @@ static const u16 pinmux_data[] = {PINMUX_IPSR_GPSR (IP1SR3_27_24 ,IPC_CLKOUT ),PINMUX_IPSR_GPSR (IP1SR3_27_24 ,IPC_CLKEN_OUT ), -PINMUX_IPSR_GPSR (IP1SR3_27_24 ,ERROROUTC_A ), +PINMUX_IPSR_GPSR (IP1SR3_27_24 ,ERROROUTC_N_A ),PINMUX_IPSR_GPSR (IP1SR3_27_24 ,TCLK4_X ), PINMUX_IPSR_GPSR(IP1SR3_31_28, QSPI0_SSL),
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 583/663 leds: TI_LMU_COMMON: select REGMAP instead of depending on it
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit a61079efc87888587e463afaed82417b162fbd69 ]
REGMAP is a hidden (not user visible) symbol. Users cannot set it directly thru "make *config", so drivers should select it instead of depending on it if they need it.
Consistently using "select" or "depends on" can also help reduce Kconfig circular dependency issues.
Therefore, change the use of "depends on REGMAP" to "select REGMAP".
--- drivers/leds/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/leds/Kconfig +1 -1
@@ -814,7 +814,7 @@ config LEDS_SPI_BYTE config LEDS_TI_LMU_COMMON tristate "LED driver for TI LMU" depends on LEDS_CLASS - depends on REGMAP + select REGMAP help Say Y to enable the LED driver for TI LMU devices. This supports common features between the TI LM3532, LM3631, LM3632,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 584/663 pinctrl: ralink: reintroduce ralink,rt2880-pinmux compatible string
In reply to Greg Kroah-HartmanFrom: Arınç ÜNAL <[email protected]>
[ Upstream commit 7c19147d9cfc0f9328049d2e278279150d7de9ca ]
There have been stable releases with the ralink,rt2880-pinmux compatible string included. Having it removed breaks the ABI. Reintroduce it.
--- drivers/pinctrl/ralink/pinctrl-mt7620.c | 1 + drivers/pinctrl/ralink/pinctrl-mt7621.c | 1 + drivers/pinctrl/ralink/pinctrl-rt2880.c | 1 + drivers/pinctrl/ralink/pinctrl-rt305x.c | 1 + drivers/pinctrl/ralink/pinctrl-rt3883.c | 1 + 5 files changed, 5 insertions(+)
drivers/pinctrl/ralink/pinctrl-mt7620.c +1 -0
@@ -372,6 +372,7 @@ static int mt7620_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id mt7620_pinctrl_match[] = { { .compatible ="ralink,mt7620-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, mt7620_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-mt7621.c +1 -0
@@ -97,6 +97,7 @@ static int mt7621_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id mt7621_pinctrl_match[] = { { .compatible ="ralink,mt7621-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, mt7621_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt2880.c +1 -0
@@ -41,6 +41,7 @@ static int rt2880_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt2880_pinctrl_match[] = { { .compatible ="ralink,rt2880-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt2880_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt305x.c +1 -0
@@ -118,6 +118,7 @@ static int rt305x_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt305x_pinctrl_match[] = { { .compatible ="ralink,rt305x-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt305x_pinctrl_match);
drivers/pinctrl/ralink/pinctrl-rt3883.c +1 -0
@@ -88,6 +88,7 @@ static int rt3883_pinctrl_probe(struct platform_device *pdev)static const struct of_device_id rt3883_pinctrl_match[] = { { .compatible ="ralink,rt3883-pinctrl" }, + { .compatible ="ralink,rt2880-pinmux" }, {} };MODULE_DEVICE_TABLE (of, rt3883_pinctrl_match);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 585/663 dmaengine: mv_xor_v2: Fix an error code.
In reply to Greg Kroah-HartmanFrom: Christophe JAILLET <[email protected]>
[ Upstream commit 827026ae2e56ec05ef1155661079badbbfc0b038 ]
If the probe is deferred, -EPROBE_DEFER should be returned, not +EPROBE_DEFER.
--- drivers/dma/mv_xor_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/dma/mv_xor_v2.c +1 -1
@@ -755,7 +755,7 @@ static int mv_xor_v2_probe(struct platform_device *pdev) xor_dev->clk =devm_clk_get (&pdev->dev,NULL );if (PTR_ERR (xor_dev->clk) == -EPROBE_DEFER ) { - ret =EPROBE_DEFER ; + ret = -EPROBE_DEFER ; goto disable_reg_clk; }if (!IS_ERR (xor_dev->clk)) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 586/663 leds: tca6507: Fix error handling of using fwnode_property_read_string
In reply to Greg Kroah-HartmanFrom: H. Nikolaus Schaller <[email protected]>
[ Upstream commit c1087c29e96a48e9080377e168d35dcb52fb068b ]
Commit 96f524105b9c ("leds: tca6507: use fwnode API instead of OF")
changed to fwnode API but did not take into account that a missing property "linux,default-trigger" now seems to return an error and as a side effect sets value to -1. This seems to be different from of_get_property() which always returned NULL in any case of error.
Neglecting this side-effect leads to
[ 11.201965] Unable to handle kernel paging request at virtual address ffffffff when read
in the strcmp() of led_trigger_set_default() if there is no led-trigger defined in the DTS.
I don't know if this was recently introduced somewhere in the fwnode lib or if the effect was missed in initial testing. Anyways it seems to be a bug to ignore the error return value of an optional value here in the driver.
--- drivers/leds/leds-tca6507.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/leds/leds-tca6507.c +3 -2
@@ -691,8 +691,9 @@ tca6507_led_dt_init(struct device *dev)if (fwnode_property_read_string (child,"label" , &led.name)) led.name =fwnode_get_name (child); -fwnode_property_read_string (child,"linux,default-trigger" , - &led.default_trigger); +if (fwnode_property_read_string (child,"linux,default-trigger" , + &led.default_trigger)) + led.default_trigger =NULL ; led.flags =0 ; if (fwnode_property_match_string(child, "compatible",
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 587/663 pwm: mtk-disp: Disable shadow registers before setting backlight values
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit 36dd7f530ae7d9ce9e853ffb8aa337de65c6600b ]
If shadow registers usage is not desired, disable that before performing any write to CON0/1 registers in the .apply() callback, otherwise we may lose clkdiv or period/width updates.
--- drivers/pwm/pwm-mtk-disp.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/pwm/pwm-mtk-disp.c +13 -11
@@ -138,6 +138,19 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm, high_width =mul_u64_u64_div_u64 (state->duty_cycle, rate, div); value = period | (high_width <<PWM_HIGH_WIDTH_SHIFT ); +if (mdp->data->bls_debug && !mdp->data->has_commit) { +/* +* For MT2701, disable double buffer before writing register +* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. +*/ +mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, + mdp->data->bls_debug_mask, + mdp->data->bls_debug_mask); +mtk_disp_pwm_update_bits (mdp, mdp->data->con0, + mdp->data->con0_sel, + mdp->data->con0_sel); + } +mtk_disp_pwm_update_bits (mdp, mdp->data->con0,PWM_CLKDIV_MASK , clk_div <<PWM_CLKDIV_SHIFT );
@@ -152,17 +165,6 @@ static int mtk_disp_pwm_apply(struct pwm_chip *chip, struct pwm_device *pwm,mtk_disp_pwm_update_bits (mdp, mdp->data->commit, mdp->data->commit_mask,0x0 ); - }else { -/* -* For MT2701, disable double buffer before writing register -* and select manual mode and use PWM_PERIOD/PWM_HIGH_WIDTH. -*/ -mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, - mdp->data->bls_debug_mask, - mdp->data->bls_debug_mask); -mtk_disp_pwm_update_bits (mdp, mdp->data->con0, - mdp->data->con0_sel, - mdp->data->con0_sel); } mtk_disp_pwm_update_bits(mdp, DISP_PWM_EN, mdp->data->enable_mask,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 588/663 pwm: mtk-disp: Configure double buffering before reading in .get_state()
In reply to Greg Kroah-HartmanFrom: AngeloGioacchino Del Regno <[email protected]>
[ Upstream commit b16c310115f2084b8826a35b77ef42bab6786d9f ]
The DISP_PWM controller's default behavior is to always use register double buffering: all reads/writes are then performed on shadow registers instead of working registers and this becomes an issue in case our chosen configuration in Linux is different from the default (or from the one that was pre-applied by the bootloader).
An example of broken behavior is when the controller is configured to use shadow registers, but this driver wants to configure it
otherwise: what happens is that the .get_state() callback is called right after registering the pwmchip and checks whether the PWM is enabled by reading the DISP_PWM_EN register;
At this point, if shadow registers are enabled but their content was not committed before booting Linux, we are *not* reading the current PWM enablement status, leading to the kernel knowing that the hardware is actually enabled when, in reality, it's not.
The aforementioned issue emerged since this driver was fixed with commit 0b5ef3429d8f ("pwm: mtk-disp: Fix the parameters calculated by the enabled flag of disp_pwm") making it to read the enablement status from the right register.
Configure the controller in the .get_state() callback to avoid this desync issue and get the backlight properly working again.
--- drivers/pwm/pwm-mtk-disp.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/pwm/pwm-mtk-disp.c +10 -0
@@ -196,6 +196,16 @@ static int mtk_disp_pwm_get_state(struct pwm_chip *chip,return err; } +/* +* Apply DISP_PWM_DEBUG settings to choose whether to enable or disable +* registers double buffer and manual commit to working register before +* performing any read/write operation +*/ +if (mdp->data->bls_debug) +mtk_disp_pwm_update_bits (mdp, mdp->data->bls_debug, + mdp->data->bls_debug_mask, + mdp->data->bls_debug_mask); + rate =clk_get_rate (mdp->clk_main); con0 =readl (mdp->base + mdp->data->con0); con1 =readl (mdp->base + mdp->data->con1);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 589/663 soundwire: intel: dont save hw_params for use in prepare
In reply to Greg Kroah-HartmanFrom: Pierre-Louis Bossart <[email protected]>
[ Upstream commit 0a0d1740bd8fd7dafb81fcb102fb5d0b83b1ce73 ]
The existing code copies the hw_params pointer and reuses it later in .prepare, specifically to re-initialize the ALH DMA channel information that's lost in suspend-resume cycles.
This is not needed, we can directly access the information from the substream/rtd - as done for the HDAudio DAIs in sound/soc/sof/intel/hda-dai.c
In addition, using the saved pointer causes the suspend-resume test cases to fail on specific platforms, depending on which version of GCC is used. Péter Ujfalusi and I have spent long hours to root-cause this problem that was reported by the Intel CI first with 6.2-rc1 and again v6.3-rc1. In the latter case we were lucky that the problem was 100% reproducible on local test devices, and found out that adding a dev_dbg() or adding a call to usleep_range() just before accessing the saved pointer "fixed" the issue. With errors appearing just by changing the compiler version or minor changes in the code generated, clearly we have a memory management Heisenbug.
The root-cause seems to be that the hw_params pointer is not persistent. The soc-pcm code allocates the hw_params structure on the stack, and passes it to the BE dailink hw_params and DAIs hw_params. Saving such a pointer and reusing it later during the .prepare stage cannot possibly work reliably, it's broken-by-design since v5.10. It's astonishing that the problem was not seen earlier.
This simple fix will have to be back-ported to -stable, due to changes to avoid the use of the get/set_dmadata routines this patch will only apply on kernels older than v6.1.
--- drivers/soundwire/cadence_master.h | 2 -- drivers/soundwire/intel.c | 11 +++++++---- 2 files changed, 7 insertions(+), 6 deletions(-)
drivers/soundwire/cadence_master.h +0 -2
@@ -84,7 +84,6 @@ struct sdw_cdns_stream_config {* @bus: Bus handle * @stream_type: Stream type * @link_id: Master link id -* @hw_params: hw_params to be applied in .prepare step * @suspended: status set when suspended, to be used in .prepare * @paused: status set in .trigger, to be used in suspend * @direction: stream direction
@@ -96,7 +95,6 @@ struct sdw_cdns_dai_runtime {struct sdw_bus *bus;enum sdw_stream_type stream_type;int link_id; -struct snd_pcm_hw_params *hw_params;bool suspended;bool paused;int direction;
drivers/soundwire/intel.c +7 -4
@@ -833,7 +833,6 @@ static int intel_hw_params(struct snd_pcm_substream *substream, dai_runtime->paused = false; dai_runtime->suspended = false; dai_runtime->pdi = pdi; - dai_runtime->hw_params = params;/* Inform DSP about PDI stream number */ ret = intel_params_stream(sdw, substream->stream, dai, params,
@@ -886,6 +885,11 @@ static int intel_prepare(struct snd_pcm_substream *substream, }if (dai_runtime->suspended) { +struct snd_soc_pcm_runtime *rtd =asoc_substream_to_rtd (substream); +struct snd_pcm_hw_params *hw_params; + + hw_params = &rtd->dpcm[substream->stream].hw_params; + dai_runtime->suspended = false;/*
@@ -897,7 +901,7 @@ static int intel_prepare(struct snd_pcm_substream *substream,*/ /* configure stream */ - ch =params_channels (dai_runtime->hw_params); + ch =params_channels (hw_params);if (substream->stream ==SNDRV_PCM_STREAM_CAPTURE ) dir =SDW_DATA_DIR_RX ;else
@@ -909,7 +913,7 @@ static int intel_prepare(struct snd_pcm_substream *substream,/* Inform DSP about PDI stream number */ ret =intel_params_stream (sdw, substream->stream, dai, - dai_runtime->hw_params, + hw_params, sdw->instance, dai_runtime->pdi->intel_alh_id); }
@@ -948,7 +952,6 @@ intel_hw_free(struct snd_pcm_substream *substream, struct snd_soc_dai *dai)return ret; } - dai_runtime->hw_params =NULL ; dai_runtime->pdi =NULL ;return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 590/663 phy: tegra: xusb: Add missing tegra_xusb_port_unregister for usb2_port and ulpi_port
In reply to Greg Kroah-HartmanFrom: Gaosheng Cui <[email protected]>
[ Upstream commit e024854048e733391b31fe5a398704b31b9af803 ]
The tegra_xusb_port_unregister should be called when usb2_port and ulpi_port map fails in tegra_xusb_add_usb2_port() or in tegra_xusb_add_ulpi_port(), fix it.
--- drivers/phy/tegra/xusb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/phy/tegra/xusb.c +2 -0
@@ -782,6 +782,7 @@ static int tegra_xusb_add_usb2_port(struct tegra_xusb_padctl *padctl, usb2->base.lane = usb2->base.ops->map (&usb2->base);if (IS_ERR (usb2->base.lane)) { err =PTR_ERR (usb2->base.lane); +tegra_xusb_port_unregister (&usb2->base); goto out; }
@@ -848,6 +849,7 @@ static int tegra_xusb_add_ulpi_port(struct tegra_xusb_padctl *padctl, ulpi->base.lane = ulpi->base.ops->map (&ulpi->base);if (IS_ERR (ulpi->base.lane)) { err =PTR_ERR (ulpi->base.lane); +tegra_xusb_port_unregister (&ulpi->base); goto out; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 591/663 phy: ti: j721e-wiz: Fix unreachable code in wiz_mode_select()
In reply to Greg Kroah-HartmanFrom: Siddharth Vadapalli <[email protected]>
[ Upstream commit 57c0e1362fdd57d0cea7ab1e583b58abf4bd8c2d ]
In the wiz_mode_select() function, the configuration performed for PHY_TYPE_USXGMII is unreachable. Fix it.
--- drivers/phy/ti/phy-j721e-wiz.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
drivers/phy/ti/phy-j721e-wiz.c +5 -6
@@ -430,18 +430,17 @@ static int wiz_mode_select(struct wiz *wiz)int i;for (i =0 ; i < num_lanes; i++) { -if (wiz->lane_phy_type[i] ==PHY_TYPE_DP ) +if (wiz->lane_phy_type[i] ==PHY_TYPE_DP ) { mode =LANE_MODE_GEN1 ; -else if (wiz->lane_phy_type[i] ==PHY_TYPE_QSGMII ) + }else if (wiz->lane_phy_type[i] ==PHY_TYPE_QSGMII ) { mode =LANE_MODE_GEN2 ; -else -continue ; - -if (wiz->lane_phy_type[i] ==PHY_TYPE_USXGMII ) { + }else if (wiz->lane_phy_type[i] ==PHY_TYPE_USXGMII ) { ret =regmap_field_write (wiz->p0_mac_src_sel[i],0x3 ); ret =regmap_field_write (wiz->p0_rxfclk_sel[i],0x3 ); ret =regmap_field_write (wiz->p0_refclk_sel[i],0x3 ); mode =LANE_MODE_GEN1 ; + }else { +continue ; } ret =regmap_field_write (wiz->p_standard_mode[i], mode);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 592/663 dma: gpi: remove spurious unlock in gpi_ch_init
In reply to Greg Kroah-HartmanFrom: Dmitry Baryshkov <[email protected]>
[ Upstream commit 91d6a468e335571f1e67e046050dea9af5fa4ebe ]
gpi_ch_init() doesn't lock the ctrl_lock mutex, so there is no need to unlock it too. Instead the mutex is handled by the function gpi_alloc_chan_resources(), which properly locks and unlocks the mutex.
=====================================
WARNING: bad unlock balance detected! 6.3.0-rc5-00253-g99792582ded1-dirty #15 Not tainted
-------------------------------------
kworker/u16:0/9 is trying to release lock (&gpii->ctrl_lock) at:
[<ffffb99d04e1284c>] gpi_alloc_chan_resources+0x108/0x5bc but there are no more locks to release!
other info that might help us debug this:
6 locks held by kworker/u16:0/9:
#0: ffff575740010938 ((wq_completion)events_unbound){+.+.}-{0:0}, at: process_one_work+0x220/0x594 #1: ffff80000809bdd0 (deferred_probe_work){+.+.}-{0:0}, at: process_one_work+0x220/0x594 #2: ffff575740f2a0f8 (&dev->mutex){....}-{3:3}, at: __device_attach+0x38/0x188
#3: ffff57574b5570f8 (&dev->mutex){....}-{3:3}, at: __device_attach+0x38/0x188
#4: ffffb99d06a2f180 (of_dma_lock){+.+.}-{3:3}, at: of_dma_request_slave_channel+0x138/0x280 #5: ffffb99d06a2ee20 (dma_list_mutex){+.+.}-{3:3}, at: dma_get_slave_channel+0x28/0x10c
stack backtrace: CPU: 7 PID: 9 Comm: kworker/u16:0 Not tainted 6.3.0-rc5-00253-g99792582ded1-dirty #15 Hardware name: Google Pixel 3 (DT) Workqueue: events_unbound deferred_probe_work_func Call trace: dump_backtrace+0xa0/0xfc show_stack+0x18/0x24 dump_stack_lvl+0x60/0xac dump_stack+0x18/0x24 print_unlock_imbalance_bug+0x130/0x148 lock_release+0x270/0x300 __mutex_unlock_slowpath+0x48/0x2cc mutex_unlock+0x20/0x2c gpi_alloc_chan_resources+0x108/0x5bc dma_chan_get+0x84/0x188 dma_get_slave_channel+0x5c/0x10c gpi_of_dma_xlate+0x110/0x1a0 of_dma_request_slave_channel+0x174/0x280 dma_request_chan+0x3c/0x2d4 geni_i2c_probe+0x544/0x63c platform_probe+0x68/0xc4 really_probe+0x148/0x2ac __driver_probe_device+0x78/0xe0 driver_probe_device+0x3c/0x160 __device_attach_driver+0xb8/0x138 bus_for_each_drv+0x84/0xe0 __device_attach+0x9c/0x188 device_initial_probe+0x14/0x20 bus_probe_device+0xac/0xb0 device_add+0x60c/0x7d8 of_device_add+0x44/0x60 of_platform_device_create_pdata+0x90/0x124 of_platform_bus_create+0x15c/0x3c8 of_platform_populate+0x58/0xf8 devm_of_platform_populate+0x58/0xbc geni_se_probe+0xf0/0x164 platform_probe+0x68/0xc4 really_probe+0x148/0x2ac __driver_probe_device+0x78/0xe0 driver_probe_device+0x3c/0x160 __device_attach_driver+0xb8/0x138 bus_for_each_drv+0x84/0xe0 __device_attach+0x9c/0x188 device_initial_probe+0x14/0x20 bus_probe_device+0xac/0xb0 deferred_probe_work_func+0x8c/0xc8 process_one_work+0x2bc/0x594 worker_thread+0x228/0x438 kthread+0x108/0x10c ret_from_fork+0x10/0x20
--- drivers/dma/qcom/gpi.c | 1 - 1 file changed, 1 deletion(-)
drivers/dma/qcom/gpi.c +0 -1
@@ -1966,7 +1966,6 @@ static int gpi_ch_init(struct gchan *gchan) error_config_int:gpi_free_ring (&gpii->ev_ring, gpii); exit_gpi_init: -mutex_unlock (&gpii->ctrl_lock);return ret; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 593/663 dmaengine: dw-edma: Fix to change for continuous transfer
In reply to Greg Kroah-HartmanFrom: Shunsuke Mie <[email protected]>
[ Upstream commit a251994a441ee0a69ba7062c8cd2d08ead3db379 ]
The dw-edma driver stops after processing a DMA request even if a request remains in the issued queue, which is not the expected behavior. The DMA engine API requires continuous processing.
Add a trigger to start after one processing finished if there are requests remain.
--- drivers/dma/dw-edma/dw-edma-core.c | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +11 -9
@@ -170,7 +170,7 @@ static void vchan_free_desc(struct virt_dma_desc *vdesc)dw_edma_free_desc (vd2dw_edma_desc (vdesc)); } -static void dw_edma_start_transfer (struct dw_edma_chan *chan) +static int dw_edma_start_transfer (struct dw_edma_chan *chan) {struct dw_edma_chunk *child;struct dw_edma_desc *desc;
@@ -178,16 +178,16 @@ static void dw_edma_start_transfer(struct dw_edma_chan *chan) vd =vchan_next_desc (&chan->vc);if (!vd) -return ; +return 0 ; desc =vd2dw_edma_desc (vd);if (!desc) -return ; +return 0 ; child =list_first_entry_or_null (&desc->chunk->list, struct dw_edma_chunk, list);if (!child) -return ; +return 0 ;dw_edma_v0_core_start (child, !desc->xfer_sz); desc->xfer_sz += child->ll_region.sz;
@@ -195,6 +195,8 @@ static void dw_edma_start_transfer(struct dw_edma_chan *chan)list_del (&child->list);kfree (child); desc->chunks_alloc--; + +return 1 ; } static int dw_edma_device_config(struct dma_chan *dchan,
@@ -572,14 +574,14 @@ static void dw_edma_done_interrupt(struct dw_edma_chan *chan)switch (chan->request) {case EDMA_REQ_NONE : desc =vd2dw_edma_desc (vd); -if (desc->chunks_alloc) { - chan->status =EDMA_ST_BUSY ; -dw_edma_start_transfer (chan); - }else { +if (!desc->chunks_alloc) {list_del (&vd->node);vchan_cookie_complete (vd); - chan->status =EDMA_ST_IDLE ; } + +/* Continue transferring if there are remaining chunks or issued requests. +*/ + chan->status =dw_edma_start_transfer (chan) ?EDMA_ST_BUSY :EDMA_ST_IDLE ;break ;case EDMA_REQ_STOP :
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 594/663 dmaengine: dw-edma: Fix to enable to issue dma request on DMA processing
In reply to Greg Kroah-HartmanFrom: Shunsuke Mie <[email protected]>
[ Upstream commit 970b17dfe264a9085ba4e593730ecfd496b950ab ]
The issue_pending request is ignored while driver is processing a DMA request. Fix to issue the pending requests on any dma channel status.
--- drivers/dma/dw-edma/dw-edma-core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/dma/dw-edma/dw-edma-core.c +5 -2
@@ -279,9 +279,12 @@ static void dw_edma_device_issue_pending(struct dma_chan *dchan)struct dw_edma_chan *chan =dchan2dw_edma_chan (dchan);unsigned long flags; +if (!chan->configured) +return ; +spin_lock_irqsave (&chan->vc.lock, flags); -if (chan->configured && chan->request ==EDMA_REQ_NONE && - chan->status ==EDMA_ST_IDLE &&vchan_issue_pending (&chan->vc)) { +if (vchan_issue_pending (&chan->vc) && chan->request ==EDMA_REQ_NONE && + chan->status ==EDMA_ST_IDLE ) { chan->status =EDMA_ST_BUSY ;dw_edma_start_transfer (chan); }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 595/663 dmaengine: at_xdmac: do not enable all cyclic channels
In reply to Greg Kroah-HartmanFrom: Claudiu Beznea <[email protected]>
[ Upstream commit f8435befd81dd85b7b610598551fadf675849bc1 ]
Do not global enable all the cyclic channels in at_xdmac_resume(). Instead save the global status in at_xdmac_suspend() and re-enable the cyclic channel only if it was active before suspend.
--- drivers/dma/at_xdmac.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/dma/at_xdmac.c +4 -1
@@ -243,6 +243,7 @@ struct at_xdmac {int irq;struct clk *clk;u32 save_gim; +u32 save_gs;struct dma_pool *at_xdmac_desc_pool;const struct at_xdmac_layout *layout;struct at_xdmac_chan chan[];
@@ -1988,6 +1989,7 @@ static int __maybe_unused atmel_xdmac_suspend(struct device *dev) } } atxdmac->save_gim =at_xdmac_read (atxdmac,AT_XDMAC_GIM ); + atxdmac->save_gs =at_xdmac_read (atxdmac,AT_XDMAC_GS );at_xdmac_off (atxdmac);clk_disable_unprepare (atxdmac->clk);
@@ -2027,7 +2029,8 @@ static int __maybe_unused atmel_xdmac_resume(struct device *dev)at_xdmac_chan_write (atchan,AT_XDMAC_CNDC , atchan->save_cndc);at_xdmac_chan_write (atchan,AT_XDMAC_CIE , atchan->save_cim);wmb (); -at_xdmac_write (atxdmac,AT_XDMAC_GE , atchan->mask); +if (atxdmac->save_gs & atchan->mask) +at_xdmac_write (atxdmac,AT_XDMAC_GE , atchan->mask); } }return 0 ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 596/663 pinctrl-bcm2835.c: fix race condition when setting gpio dir
In reply to Greg Kroah-HartmanFrom: Hans Verkuil <[email protected]>
[ Upstream commit b7badd752de05312fdb1aeb388480f706d0c087f ]
In the past setting the pin direction called pinctrl_gpio_direction() which uses a mutex to serialize this. That was changed to set the direction directly in the pin controller driver, but that lost the serialization mechanism. Since the direction of multiple pins are in the same register you can have a race condition, something that was in fact observed with the cec-gpio driver.
Add a new spinlock to serialize writing to the FSEL registers.
--- drivers/pinctrl/bcm/pinctrl-bcm2835.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-)
drivers/pinctrl/bcm/pinctrl-bcm2835.c +15 -4
@@ -90,6 +90,8 @@ struct bcm2835_pinctrl {struct pinctrl_gpio_range gpio_range;raw_spinlock_t irq_lock[BCM2835_NUM_BANKS ]; +/* Protect FSEL registers */ +spinlock_t fsel_lock; };/* pins are just named GPIO0..GPIO53 */
@@ -284,14 +286,19 @@ static inline void bcm2835_pinctrl_fsel_set( struct bcm2835_pinctrl *pc, unsigned pin, enum bcm2835_fsel fsel) { - u32 val = bcm2835_gpio_rd(pc, FSEL_REG(pin)); -enum bcm2835_fsel cur = (val >>FSEL_SHIFT (pin)) &BCM2835_FSEL_MASK ; + u32 val; +enum bcm2835_fsel cur; +unsigned long flags; + +spin_lock_irqsave (&pc->fsel_lock, flags); + val =bcm2835_gpio_rd (pc,FSEL_REG (pin)); + cur = (val >>FSEL_SHIFT (pin)) &BCM2835_FSEL_MASK ;dev_dbg (pc->dev,"read %08x (%u => %s)\n" , val, pin, - bcm2835_functions[cur]); + bcm2835_functions[cur]);if (cur == fsel) -return ; + goto unlock;if (cur !=BCM2835_FSEL_GPIO_IN && fsel !=BCM2835_FSEL_GPIO_IN ) {/* always transition through GPIO_IN */
@@ -309,6 +316,9 @@ static inline void bcm2835_pinctrl_fsel_set(dev_dbg (pc->dev,"write %08x (%u <= %s)\n" , val, pin, bcm2835_functions[fsel]);bcm2835_gpio_wr (pc,FSEL_REG (pin), val); + +unlock: +spin_unlock_irqrestore (&pc->fsel_lock, flags); }static int bcm2835_gpio_direction_input (struct gpio_chip *chip,unsigned offset)
@@ -1248,6 +1258,7 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) pc->gpio_chip = *pdata->gpio_chip; pc->gpio_chip.parent = dev; +spin_lock_init (&pc->fsel_lock);for (i =0 ; i <BCM2835_NUM_BANKS ; i++) {unsigned long events;unsigned offset;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 597/663 thermal/drivers/mediatek: Use devm_of_iomap to avoid resource leak in mtk_thermal_probe
In reply to Greg Kroah-HartmanFrom: Kang Chen <[email protected]>
[ Upstream commit f05c7b7d9ea9477fcc388476c6f4ade8c66d2d26 ]
Smatch reports:
1. mtk_thermal_probe() warn: 'apmixed_base' from of_iomap() not released.
2. mtk_thermal_probe() warn: 'auxadc_base' from of_iomap() not released.
The original code forgets to release iomap resource when handling errors, fix it by switch to devm_of_iomap.
--- drivers/thermal/mtk_thermal.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/thermal/mtk_thermal.c +12 -2
@@ -1028,7 +1028,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)return -ENODEV ; } - auxadc_base =of_iomap (auxadc,0 ); + auxadc_base =devm_of_iomap (&pdev->dev, auxadc,0 ,NULL ); +if (IS_ERR (auxadc_base)) { +of_node_put (auxadc); +return PTR_ERR (auxadc_base); + } + auxadc_phys_base =of_get_phys_base (auxadc);of_node_put (auxadc);
@@ -1044,7 +1049,12 @@ static int mtk_thermal_probe(struct platform_device *pdev)return -ENODEV ; } - apmixed_base =of_iomap (apmixedsys,0 ); + apmixed_base =devm_of_iomap (&pdev->dev, apmixedsys,0 ,NULL ); +if (IS_ERR (apmixed_base)) { +of_node_put (apmixedsys); +return PTR_ERR (apmixed_base); + } + apmixed_phys_base =of_get_phys_base (apmixedsys);of_node_put (apmixedsys);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 598/663 mfd: tqmx86: Do not access I2C_DETECT register through io_base
In reply to Greg Kroah-HartmanFrom: Matthias Schiffer <[email protected]>
[ Upstream commit 1be1b23696b3d4b0231c694f5e0767b4471d33a9 ]
The I2C_DETECT register is at IO port 0x1a7, which is outside the range passed to devm_ioport_map() for io_base, and was only working because there aren't actually any bounds checks for IO port accesses.
Extending the range does not seem like a good solution here, as it would then conflict with the IO resource assigned to the I2C controller. As this is just a one-off access during probe, use a simple inb() instead.
While we're at it, drop the unused define TQMX86_REG_I2C_INT_EN.
--- drivers/mfd/tqmx86.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/mfd/tqmx86.c +7 -3
@@ -49,9 +49,8 @@#define TQMX86_REG_IO_EXT_INT_MASK 0x3#define TQMX86_REG_IO_EXT_INT_GPIO_SHIFT 4 -#define TQMX86_REG_I2C_DETECT 0x47 +#define TQMX86_REG_I2C_DETECT 0x1a7#define TQMX86_REG_I2C_DETECT_SOFT 0xa5 -#define TQMX86_REG_I2C_INT_EN 0x49static uint gpio_irq;module_param (gpio_irq, uint,0 );
@@ -213,7 +212,12 @@ static int tqmx86_probe(struct platform_device *pdev)"Found %s - Board ID %d, PCB Revision %d, PLD Revision %d\n" , board_name, board_id, rev >> 4, rev & 0xf); - i2c_det =ioread8 (io_base +TQMX86_REG_I2C_DETECT ); +/* +* The I2C_DETECT register is in the range assigned to the I2C driver +* later, so we don't extend TQMX86_IOSIZE. Use inb() for this one-off +* access instead of ioport_map + unmap. +*/ + i2c_det =inb (TQMX86_REG_I2C_DETECT );if (gpio_irq_cfg) { io_ext_int_val =
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 599/663 mfd: tqmx86: Specify IO port register range more precisely
In reply to Greg Kroah-HartmanFrom: Matthias Schiffer <[email protected]>
[ Upstream commit 051c69ff4f607aa114c7bbdd7c41ed881367aeee ]
Registers 0x160..0x17f are unassigned. Use 0x180 as base register and update offets accordingly.
Also change the size of the range to include 0x19f. While 0x19f is currently reserved for future extensions, so are several of the previous registers up to 0x19e, and it is weird to leave out just the last one.
--- drivers/mfd/tqmx86.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/mfd/tqmx86.c +5 -5
@@ -16,8 +16,8 @@#include <linux/platform_data/i2c-ocores.h> #include <linux/platform_device.h> -#define TQMX86_IOBASE 0x160 -#define TQMX86_IOSIZE 0x3f +#define TQMX86_IOBASE 0x180 +#define TQMX86_IOSIZE 0x20#define TQMX86_IOBASE_I2C 0x1a0#define TQMX86_IOSIZE_I2C 0xa#define TQMX86_IOBASE_WATCHDOG 0x18b
@@ -25,7 +25,7 @@#define TQMX86_IOBASE_GPIO 0x18d#define TQMX86_IOSIZE_GPIO 0x4 -#define TQMX86_REG_BOARD_ID 0x20 +#define TQMX86_REG_BOARD_ID 0x00#define TQMX86_REG_BOARD_ID_E38M 1#define TQMX86_REG_BOARD_ID_50UC 2#define TQMX86_REG_BOARD_ID_E38C 3
@@ -40,8 +40,8 @@#define TQMX86_REG_BOARD_ID_E40S 13#define TQMX86_REG_BOARD_ID_E40C1 14#define TQMX86_REG_BOARD_ID_E40C2 15 -#define TQMX86_REG_BOARD_REV 0x21 -#define TQMX86_REG_IO_EXT_INT 0x26 +#define TQMX86_REG_BOARD_REV 0x01 +#define TQMX86_REG_IO_EXT_INT 0x06#define TQMX86_REG_IO_EXT_INT_NONE 0#define TQMX86_REG_IO_EXT_INT_7 1#define TQMX86_REG_IO_EXT_INT_9 2
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 600/663 mfd: tqmx86: Correct board names for TQMxE39x
In reply to Greg Kroah-HartmanFrom: Matthias Schiffer <[email protected]>
[ Upstream commit f376c479668557bcc2fd9e9fbc0f53e7819a11cd ]
It seems that this driver was developed based on preliminary documentation. Report the correct names for all TQMxE39x variants, as they are used by the released hardware revisions:
- Fix names for TQMxE39C1/C2 board IDs
- Distinguish TQMxE39M and TQMxE39S, which use the same board ID
The TQMxE39M/S are distinguished using the SAUC (Sanctioned Alternate Uses Configuration) register of the GPIO controller. This also prepares for the correct handling of the differences between the GPIO controllers of our COMe and SMARC modules.
--- drivers/mfd/tqmx86.c | 32 +++++++++++++++++--------------- 1 file changed, 17 insertions(+), 15 deletions(-)
drivers/mfd/tqmx86.c +17 -15
@@ -30,9 +30,9 @@#define TQMX86_REG_BOARD_ID_50UC 2#define TQMX86_REG_BOARD_ID_E38C 3#define TQMX86_REG_BOARD_ID_60EB 4 -#define TQMX86_REG_BOARD_ID_E39M 5 -#define TQMX86_REG_BOARD_ID_E39C 6 -#define TQMX86_REG_BOARD_ID_E39x 7 +#define TQMX86_REG_BOARD_ID_E39MS 5 +#define TQMX86_REG_BOARD_ID_E39C1 6 +#define TQMX86_REG_BOARD_ID_E39C2 7#define TQMX86_REG_BOARD_ID_70EB 8#define TQMX86_REG_BOARD_ID_80UC 9#define TQMX86_REG_BOARD_ID_110EB 11
@@ -48,6 +48,7 @@#define TQMX86_REG_IO_EXT_INT_12 3#define TQMX86_REG_IO_EXT_INT_MASK 0x3#define TQMX86_REG_IO_EXT_INT_GPIO_SHIFT 4 +#define TQMX86_REG_SAUC 0x17#define TQMX86_REG_I2C_DETECT 0x1a7#define TQMX86_REG_I2C_DETECT_SOFT 0xa5
@@ -110,7 +111,7 @@ static const struct mfd_cell tqmx86_devs[] = { }, }; -static const char *tqmx86_board_id_to_name (u8 board_id) +static const char *tqmx86_board_id_to_name (u8 board_id,u8 sauc) {switch (board_id) {case TQMX86_REG_BOARD_ID_E38M :
@@ -121,12 +122,12 @@ static const char *tqmx86_board_id_to_name(u8 board_id)return "TQMxE38C" ;case TQMX86_REG_BOARD_ID_60EB :return "TQMx60EB" ; -case TQMX86_REG_BOARD_ID_E39M : -return "TQMxE39M" ; -case TQMX86_REG_BOARD_ID_E39C : -return "TQMxE39C" ; -case TQMX86_REG_BOARD_ID_E39x: -return "TQMxE39x" ; +case TQMX86_REG_BOARD_ID_E39MS : +return (sauc ==0xff ) ?"TQMxE39M" :"TQMxE39S" ; +case TQMX86_REG_BOARD_ID_E39C1 : +return "TQMxE39C1" ; +case TQMX86_REG_BOARD_ID_E39C2 : +return "TQMxE39C2" ;case TQMX86_REG_BOARD_ID_70EB :return "TQMx70EB" ;case TQMX86_REG_BOARD_ID_80UC :
@@ -159,9 +160,9 @@ static int tqmx86_board_id_to_clk_rate(struct device *dev, u8 board_id)case TQMX86_REG_BOARD_ID_E40C1 :case TQMX86_REG_BOARD_ID_E40C2 :return 24000 ; -case TQMX86_REG_BOARD_ID_E39M : -case TQMX86_REG_BOARD_ID_E39C : -case TQMX86_REG_BOARD_ID_E39x: +case TQMX86_REG_BOARD_ID_E39MS : +case TQMX86_REG_BOARD_ID_E39C1 : +case TQMX86_REG_BOARD_ID_E39C2 :return 25000 ;case TQMX86_REG_BOARD_ID_E38M :case TQMX86_REG_BOARD_ID_E38C :
@@ -175,7 +176,7 @@ static int tqmx86_board_id_to_clk_rate(struct device *dev, u8 board_id)static int tqmx86_probe (struct platform_device *pdev) { -u8 board_id, rev, i2c_det, io_ext_int_val; +u8 board_id, sauc, rev, i2c_det, io_ext_int_val;struct device *dev = &pdev->dev;u8 gpio_irq_cfg, readback;const char *board_name;
@@ -205,7 +206,8 @@ static int tqmx86_probe(struct platform_device *pdev)return -ENOMEM ; board_id =ioread8 (io_base +TQMX86_REG_BOARD_ID ); - board_name =tqmx86_board_id_to_name (board_id); + sauc =ioread8 (io_base +TQMX86_REG_SAUC ); + board_name =tqmx86_board_id_to_name (board_id, sauc); rev =ioread8 (io_base +TQMX86_REG_BOARD_REV ); dev_info(dev,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 601/663 mfd: ocelot-spi: Fix unsupported bulk read
In reply to Greg Kroah-HartmanFrom: Colin Foster <[email protected]>
[ Upstream commit f0484d2f80a72022b7fac72bcb406392900ef1eb ]
Ocelot chips (VSC7511, VSC7512, VSC7513, VSC7514) don't support bulk read operations over SPI.
Many SPI buses have hardware that can optimize consecutive reads. Essentially an address is written to the chip, and if the SPI controller continues to toggle the clock, subsequent register values are reported. This can lead to significant optimizations, because the time between "address is written to the chip" and "chip starts to report data" can often take a fixed amount of time.
When support for Ocelot chips were added in commit f3e893626abe ("mfd:
ocelot: Add support for the vsc7512 chip via spi") it was believed that this optimization was supported. However it is not.
Most register transactions with the Ocelot chips are not done in bulk, so this bug could go unnoticed. The one scenario where bulk register operations _are_ performed is when polling port statistics counters, which was added in commit d87b1c08f38a ("net: mscc: ocelot: use bulk reads for stats").
Things get slightly more complicated here...
A bug was introduced in commit d4c367650704 ("net: mscc: ocelot: keep ocelot_stat_layout by reg address, not offset") that broke the optimization of bulk reads. This means that when Ethernet support for the VSC7512 chip was added in commit 3d7316ac81ac ("net: dsa: ocelot: add external ocelot switch control") things were actually working "as expected".
The bulk read opmtimization was discovered, and fixed in commit 6acc72a43eac ("net: mscc: ocelot: fix stats region batching") and the timing optimizations for SPI were noticed. A bulk read went from ~14ms to ~2ms. But this timing improvement came at the cost of every register reading zero due the fact that bulk reads don't work.
The read timings increase back to 13-14ms, but that's a price worth paying in order to receive valid data. This is verified in a DSA setup (cpsw-new switch tied to port 0 on the VSC7512, after having been running overnight)
Rx Octets: 16222055 # Counters from CPSW switch
Tx Octets: 12034702
Net Octets: 28256757
p00_rx_octets: 12034702 # Counters from Ocelot switch
p00_rx_frames_below_65_octets: 0
p00_rx_frames_65_to_127_octets: 88188
p00_rx_frames_128_to_255_octets: 13
p00_rx_frames_256_to_511_octets: 0
p00_rx_frames_512_to_1023_octets: 0
p00_rx_frames_over_1526_octets: 3306
p00_tx_octets: 16222055--- drivers/mfd/ocelot-spi.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/ocelot-spi.c +1 -0
@@ -130,6 +130,7 @@ static const struct regmap_config ocelot_spi_regmap_config = { .write_flag_mask = 0x80, + .use_single_read = true, .use_single_write = true, .can_multi_write = false,
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 602/663 mfd: arizona-spi: Add missing MODULE_DEVICE_TABLE
In reply to Greg Kroah-HartmanFrom: Charles Keepax <[email protected]>
[ Upstream commit 972c91fd7beddc3f19c8c855f6e60e7dbd435cbd ]
This patch adds missing MODULE_DEVICE_TABLE definition which generates correct modalias for automatic loading of this driver when it is built as a module.
--- drivers/mfd/arizona-spi.c | 1 + 1 file changed, 1 insertion(+)
drivers/mfd/arizona-spi.c +1 -0
@@ -277,6 +277,7 @@ static const struct of_device_id arizona_spi_of_match[] = { { .compatible = "cirrus,cs47l24", .data = (void *)CS47L24 }, {}, }; +MODULE_DEVICE_TABLE (of, arizona_spi_of_match);#endif static struct spi_driver arizona_spi_driver = {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 603/663 hte: tegra: fix struct of_device_id build error
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
[ Upstream commit 6680c835ada1b34e882d0a32612f7294c62e27e0 ]
Without the extra #include, this driver produces a build failure in some configurations.
drivers/hte/hte-tegra194-test.c:96:34: error: array type has incomplete element type 'struct of_device_id'
96 | static const struct of_device_id tegra_hte_test_of_match[] = {
--- drivers/hte/hte-tegra194-test.c | 1 + 1 file changed, 1 insertion(+)
drivers/hte/hte-tegra194-test.c +1 -0
@@ -6,6 +6,7 @@*/ #include <linux/err.h> +#include <linux/mod_devicetable.h> #include <linux/module.h> #include <linux/moduleparam.h> #include <linux/interrupt.h>
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 604/663 hte: tegra-194: Fix off by one in tegra_hte_map_to_line_id()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit e078180d66848a6a890daf0a3ce28dc43cc66790 ]
The "map_sz" is the number of elements in the "m" array so the > comparison needs to be changed to >= to prevent an out of bounds read.
--- drivers/hte/hte-tegra194.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hte/hte-tegra194.c +1 -1
@@ -251,7 +251,7 @@ static int tegra_hte_map_to_line_id(u32 eid, {if (m) { -if (eid > map_sz) +if (eid >= map_sz)return -EINVAL ;if (m[eid].slice ==NV_AON_SLICE_INVALID )return -EINVAL ;
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 605/663 ACPI: PM: Do not turn of unused power resources on the Toshiba Click Mini
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 9b04d99788cf475cbd277f30ec66230ccb7e99f4 ]
The CPR3 power resource on the Toshiba Click Mini toggles a GPIO which is called SISP (for SIS touchscreen power?) on/off.
This CPR3 power resource is not listed in any _PR? lists, let alone in a _PR0 list for the SIS0817 touchscreen ACPI device which needs it.
Before commit a1224f34d72a ("ACPI: PM: Check states of power resources during initialization") this was not an issue because since nothing referenced the CPR3 power resource its state was always ACPI_POWER_RESOURCE_STATE_UNKNOWN and power resources with this state get ignored by acpi_turn_off_unused_power_resources().
This clearly is a bug in the DSDT of this device. Add a DMI quirk to make acpi_turn_off_unused_power_resources() a no-op on this model to fix the touchscreen no longer working since kernel 5.16 .
This quirk also causes 2 other power resources to not get turned off, but the _OFF method on these already was a no-op, so this makes no difference for the other 2 power resources.
--- drivers/acpi/power.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
drivers/acpi/power.c +19 -0
@@ -23,6 +23,7 @@#define pr_fmt (fmt) "ACPI: PM: " fmt +#include <linux/dmi.h> #include <linux/kernel.h> #include <linux/module.h> #include <linux/init.h>
@@ -1022,6 +1023,21 @@ void acpi_resume_power_resources(void) }#endif +static const struct dmi_system_id dmi_leave_unused_power_resources_on[] = { + { +/* +* The Toshiba Click Mini has a CPR3 power-resource which must +* be on for the touchscreen to work, but which is not in any +* _PR? lists. The other 2 affected power-resources are no-ops. +*/ + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"TOSHIBA" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"SATELLITE Click Mini L9W-B" ), + }, + }, + {} +}; +/** * acpi_turn_off_unused_power_resources - Turn off power resources not in use. */
@@ -1029,6 +1045,9 @@ void acpi_turn_off_unused_power_resources(void) {struct acpi_power_resource *resource; +if (dmi_check_system (dmi_leave_unused_power_resources_on)) +return ; +mutex_lock (&power_resource_list_lock);list_for_each_entry_reverse (resource, &acpi_power_resource_list, list_node) {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 606/663 PM: hibernate: Turn snapshot_test into global variable
In reply to Greg Kroah-HartmanFrom: Chen Yu <[email protected]>
[ Upstream commit 08169a162f97819d3e5b4a342bb9cf5137787154 ]
There is need to check snapshot_test and open block device in different mode, so as to avoid the race condition.
No functional changes intended.
Stable-dep-of: 5904de0d735b ("PM: hibernate: Do not get block device exclusively in test_resume mode")
--- kernel/power/hibernate.c | 7 ++++++- kernel/power/power.h | 1 + 2 files changed, 7 insertions(+), 1 deletion(-)
kernel/power/hibernate.c +6 -1
@@ -64,6 +64,7 @@ enum {static int hibernation_mode =HIBERNATION_SHUTDOWN ;bool freezer_test_done; +bool snapshot_test;static const struct platform_hibernation_ops *hibernation_ops;
@@ -716,7 +717,6 @@ static int load_image_and_restore(void)*/ int hibernate (void ) { -bool snapshot_test = false;unsigned int sleep_flags;int error;
@@ -744,6 +744,9 @@ int hibernate(void)if (error) goto Exit; +/* protected by system_transition_mutex */ + snapshot_test = false; +lock_device_hotplug ();/* Allocate memory management structures */ error =create_basic_memory_bitmaps ();
@@ -940,6 +943,8 @@ static int software_resume(void)*/ mutex_lock_nested (&system_transition_mutex,SINGLE_DEPTH_NESTING ); + snapshot_test = false; +if (swsusp_resume_device) goto Check_image;
kernel/power/power.h +1 -0
@@ -59,6 +59,7 @@ asmlinkage int swsusp_save(void);/* kernel/power/hibernate.c */ extern bool freezer_test_done; +extern bool snapshot_test;extern int hibernation_snapshot (int platform_mode);extern int hibernation_restore (int platform_mode);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 607/663 PM: hibernate: Do not get block device exclusively in test_resume mode
In reply to Greg Kroah-HartmanFrom: Chen Yu <[email protected]>
[ Upstream commit 5904de0d735bbb3b4afe9375c5b4f9748f882945 ]
The system refused to do a test_resume because it found that the swap device has already been taken by someone else. Specifically, the swsusp_check()->blkdev_get_by_dev(FMODE_EXCL) is supposed to do this check.
Steps to reproduce:
dd if=/dev/zero of=/swapfile bs=$(cat /proc/meminfo |
awk '/MemTotal/ {print $2}') count=1024 conv=notrunc mkswap /swapfile
swapon /swapfile
swap-offset /swapfile
echo 34816 > /sys/power/resume_offset
echo test_resume > /sys/power/disk
echo disk > /sys/power/state
PM: Using 3 thread(s) for compression
PM: Compressing and saving image data (293150 pages)...
PM: Image saving progress: 0%
PM: Image saving progress: 10%
ata1: SATA link up 1.5 Gbps (SStatus 113 SControl 300) ata1.00: configured for UDMA/100
ata2: SATA link down (SStatus 0 SControl 300)
ata5: SATA link down (SStatus 0 SControl 300)
ata6: SATA link down (SStatus 0 SControl 300)
ata3: SATA link down (SStatus 0 SControl 300)
ata4: SATA link down (SStatus 0 SControl 300)
PM: Image saving progress: 20% PM: Image saving progress: 30% PM: Image saving progress: 40% PM: Image saving progress: 50% pcieport 0000:00:02.5: pciehp: Slot(0-5): No device found PM: Image saving progress: 60% PM: Image saving progress: 70% PM: Image saving progress: 80% PM: Image saving progress: 90%
PM: Image saving done
PM: hibernation: Wrote 1172600 kbytes in 2.70 seconds (434.29 MB/s)
PM: S|
PM: hibernation: Basic memory bitmaps freed
PM: Image not found (code -16)
This is because when using the swapfile as the hibernation storage, the block device where the swapfile is located has already been mounted by the OS distribution(usually mounted as the rootfs). This is not an issue for normal hibernation, because software_resume()->swsusp_check() happens before the block device(rootfs) mount. But it is a problem for the test_resume mode. Because when test_resume happens, the block device has been mounted already.
Thus remove the FMODE_EXCL for test_resume mode. This would not be a problem because in test_resume stage, the processes have already been frozen, and the race condition described in
Commit 39fbef4b0f77 ("PM: hibernate: Get block device exclusively in swsusp_check()") is unlikely to happen.
--- kernel/power/hibernate.c | 8 ++++++-- kernel/power/swap.c | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-)
kernel/power/hibernate.c +6 -2
@@ -688,18 +688,22 @@ static int load_image_and_restore(void) {int error;unsigned int flags; +fmode_t mode =FMODE_READ ; + +if (snapshot_test) + mode |=FMODE_EXCL ;pm_pr_dbg ("Loading hibernation image.\n" );lock_device_hotplug (); error =create_basic_memory_bitmaps ();if (error) { -swsusp_close (FMODE_READ |FMODE_EXCL ); +swsusp_close (mode); goto Unlock; } error =swsusp_read (&flags); -swsusp_close (FMODE_READ |FMODE_EXCL ); +swsusp_close (mode);if (!error) error =hibernation_restore (flags &SF_PLATFORM_MODE );
kernel/power/swap.c +6 -2
@@ -1518,9 +1518,13 @@ int swsusp_check(void) {int error;void *holder; +fmode_t mode =FMODE_READ ; + +if (snapshot_test) + mode |=FMODE_EXCL ; hib_resume_bdev =blkdev_get_by_dev (swsusp_resume_device, -FMODE_READ |FMODE_EXCL , &holder); + mode, &holder);if (!IS_ERR (hib_resume_bdev)) {set_blocksize (hib_resume_bdev,PAGE_SIZE );clear_page (swsusp_header);
@@ -1547,7 +1551,7 @@ int swsusp_check(void) put:if (error) -blkdev_put (hib_resume_bdev,FMODE_READ |FMODE_EXCL ); +blkdev_put (hib_resume_bdev, mode);else pr_debug ("Image signature found, resuming\n" ); }else {
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 608/663 afs: Fix updating of i_size with dv jump from server
In reply to Greg Kroah-HartmanFrom: Marc Dionne <[email protected]>
[ Upstream commit d7f74e9a917503ee78f2b603a456d7227cf38919 ]
If the data version returned from the server is larger than expected, the local data is invalidated, but we may still want to note the remote file size.
Since we're setting change_size, we have to also set data_changed for the i_size to get updated.
--- fs/afs/inode.c | 1 + 1 file changed, 1 insertion(+)
fs/afs/inode.c +1 -0
@@ -230,6 +230,7 @@ static void afs_apply_status(struct afs_operation *op,set_bit (AFS_VNODE_ZAP_DATA , &vnode->flags); } change_size = true; + data_changed = true; }else if (vnode->status.type ==AFS_FTYPE_DIR ) {/* Expected directory change is handled elsewhere so * that we can locally edit the directory and save on a
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 609/663 afs: Fix getattr to report server i_size on dirs, not local size
In reply to Greg Kroah-HartmanFrom: David Howells <[email protected]>
[ Upstream commit 45f66fa03ba9943cca5af88d691399332b8bde08 ]
Fix afs_getattr() to report the server's idea of the file size of a directory rather than the local size. The local size may differ as we edit the local copy to avoid having to redownload it and we may end up with a differently structured blob of a different size.
However, if the directory is discarded from the pagecache we then download it again and the user may see the directory file size apparently change.
--- fs/afs/inode.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/afs/inode.c +8 -1
@@ -450,7 +450,7 @@ static void afs_get_inode_cache(struct afs_vnode *vnode) 0 : FSCACHE_ADV_SINGLE_CHUNK, &key,sizeof (key), &aux,sizeof (aux), - vnode->status.size)); + i_size_read(&vnode->netfs.inode)));#endif }
@@ -766,6 +766,13 @@ int afs_getattr(struct user_namespace *mnt_userns, const struct path *path,if (test_bit (AFS_VNODE_SILLY_DELETED , &vnode->flags) && stat->nlink >0 ) stat->nlink -=1 ; + +/* Lie about the size of directories. We maintain a locally +* edited copy and may make different allocation decisions on +* it, but we need to give userspace the server's size. +*/ +if (S_ISDIR (inode->i_mode)) + stat->size = vnode->netfs.remote_i_size; }while (need_seqretry (&vnode->cb_lock, seq));done_seqretry (&vnode->cb_lock, seq);
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 610/663 afs: Avoid endless loop if file is larger than expected
In reply to Greg Kroah-HartmanFrom: Marc Dionne <[email protected]>
[ Upstream commit 9ea4eff4b6f4f36546d537a74da44fd3f30903ab ]
afs_read_dir fetches an amount of data that's based on what the inode size is thought to be. If the file on the server is larger than what was fetched, the code rechecks i_size and retries. If the local i_size was not properly updated, this can lead to an endless loop of fetching i_size from the server and noticing each time that the size is larger on the server.
If it is known that the remote size is larger than i_size, bump up the fetch size to that size.
--- fs/afs/dir.c | 4 ++++ 1 file changed, 4 insertions(+)
fs/afs/dir.c +4 -0
@@ -275,6 +275,7 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key)loff_t i_size;int nr_pages, i;int ret; +loff_t remote_size =0 ;_enter ("" );
@@ -289,6 +290,8 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key) expand: i_size =i_size_read (&dvnode->netfs.inode); +if (i_size < remote_size) + i_size = remote_size;if (i_size <2048 ) { ret =afs_bad (dvnode, afs_file_error_dir_small); goto error;
@@ -364,6 +367,7 @@ static struct afs_read *afs_read_dir(struct afs_vnode *dvnode, struct key *key)* buffer. */ up_write (&dvnode->validate_lock); + remote_size = req->file_size; goto expand; }
Signature · 1 line
2.39.2
Greg Kroah-Hartman
maintainerPATCH 611/663 parisc: Fix argument pointer in real64_call_asm()
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit 6e3220ba3323a2c24be834aebf5d6e9f89d0993f upstream.
Fix the argument pointer (ap) to point to real-mode memory instead of virtual memory.
It's interesting that this issue hasn't shown up earlier, as this could have happened with any 64-bit PDC ROM code.
I just noticed it because I suddenly faced a HPMC while trying to execute the 64-bit STI ROM code of an Visualize-FXe graphics card for the STI text console.
--- arch/parisc/kernel/real2.S | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
arch/parisc/kernel/real2.S +2 -3
@@ -235,9 +235,6 @@ ENTRY_CFI(real64_call_asm) /* save fn */ copy %arg2, %r31 - /* set up the new ap */ - ldo 64(%arg1), %r29 - /* load up the arg registers from the saved arg area */ /* 32-bit calling convention passes first 4 args in registers */ ldd 0*REG_SZ(%arg1), %arg0 /* note overwriting arg0 */
@@ -249,7 +246,9 @@ ENTRY_CFI(real64_call_asm) ldd 7*REG_SZ(%arg1), %r19 ldd 1*REG_SZ(%arg1), %arg1 /* do this one last! */ + /* set up real-mode stack and real-mode ap */ tophys_r1 %sp + ldo -16(%sp), %r29 /* Reference param save area */ b,l rfi_virt2real,%r2 nop
Greg Kroah-Hartman
maintainerPATCH 612/663 parisc: Ensure page alignment in flush functions
In reply to Greg Kroah-HartmanFrom: Helge Deller <[email protected]>
commit d755bd2caeb47fd806e12399fe8b56798fa5d2cc upstream.
Matthew Wilcox noticed, that if ARCH_HAS_FLUSH_ON_KUNMAP is defined (which is the case for PA-RISC), __kunmap_local() calls kunmap_flush_on_unmap(), which may call the parisc flush functions with a non-page-aligned address and thus the page might not be fully flushed.
This patch ensures that flush_kernel_dcache_page_asm() and flush_kernel_dcache_page_asm() will always operate on page-aligned addresses.
--- arch/parisc/kernel/pacache.S | 2 ++ 1 file changed, 2 insertions(+)
arch/parisc/kernel/pacache.S +2 -0
@@ -889,6 +889,7 @@ ENDPROC_CFI(flush_icache_page_asm) ENTRY_CFI(flush_kernel_dcache_page_asm) 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), %r23 + depi_safe 0, 31,PAGE_SHIFT, %r26 /* Clear any offset bits */ #ifdef CONFIG_64BIT depdi,z 1, 63-PAGE_SHIFT,1, %r25
@@ -925,6 +926,7 @@ ENDPROC_CFI(flush_kernel_dcache_page_asm ENTRY_CFI(purge_kernel_dcache_page_asm) 88: ldil L%dcache_stride, %r1 ldw R%dcache_stride(%r1), %r23 + depi_safe 0, 31,PAGE_SHIFT, %r26 /* Clear any offset bits */ #ifdef CONFIG_64BIT depdi,z 1, 63-PAGE_SHIFT,1, %r25
Greg Kroah-Hartman
maintainerPATCH 613/663 ALSA: usb-audio: Add quirk for Pioneer DDJ-800
In reply to Greg Kroah-HartmanFrom: Geraldo Nascimento <[email protected]>
commit 7501f472977df233d039d86c6981e0641708e1ca upstream.
One more Pioneer quirk, this time for DDJ-800, which is quite similar like other DJ DDJ models but with slightly different EPs or channels.
--- sound/usb/quirks-table.h | 58 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 58 insertions(+)
sound/usb/quirks-table.h +58 -0
@@ -3884,6 +3884,64 @@ YAMAHA_DEVICE(0x7010, "UB99"), } }, +{ +/* +* PIONEER DJ DDJ-800 +* PCM is 6 channels out, 6 channels in @ 44.1 fixed +* The Feedback for the output is the input +*/ + USB_DEVICE_VENDOR_SPEC(0x2b73, 0x0029), + .driver_info = (unsigned long ) &(const struct snd_usb_audio_quirk ) { + .ifnum =QUIRK_ANY_INTERFACE , + .type =QUIRK_COMPOSITE , + .data = (const struct snd_usb_audio_quirk []) { + { + .ifnum =0 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S24_3LE , + .channels =6 , + .iface =0 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x01 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC , + .rates =SNDRV_PCM_RATE_44100 , + .rate_min =44100 , + .rate_max =44100 , + .nr_rates =1 , + .rate_table = (unsigned int []) {44100 } + } + }, + { + .ifnum =0 , + .type =QUIRK_AUDIO_FIXED_ENDPOINT , + .data = &(const struct audioformat ) { + .formats =SNDRV_PCM_FMTBIT_S24_3LE , + .channels =6 , + .iface =0 , + .altsetting =1 , + .altset_idx =1 , + .endpoint =0x82 , + .ep_idx =1 , + .ep_attr =USB_ENDPOINT_XFER_ISOC | +USB_ENDPOINT_SYNC_ASYNC | +USB_ENDPOINT_USAGE_IMPLICIT_FB , + .rates =SNDRV_PCM_RATE_44100 , + .rate_min =44100 , + .rate_max =44100 , + .nr_rates =1 , + .rate_table = (unsigned int []) {44100 } + } + }, + { + .ifnum =-1 + } + } + } +}, +/* * MacroSilicon MS2100/MS2106 based AV capture cards *
Greg Kroah-Hartman
maintainerPATCH 614/663 ALSA: hda/realtek: Add quirk for ThinkPad P1 Gen 6
In reply to Greg Kroah-HartmanFrom: Vitaly Rodionov <[email protected]>
commit 067eb084592819ad59d07afcb5de3e61cee2757c upstream.
Lenovo ThinkPad P1 Gen 6 laptop has 2 CS35L41 amplifies on I2C bus connected to Realtek codec.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -9689,6 +9689,8 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x17aa ,0x22f1 ,"Thinkpad" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x17aa ,0x22f2 ,"Thinkpad" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x17aa ,0x22f3 ,"Thinkpad" ,ALC287_FIXUP_CS35L41_I2C_2 ), +SND_PCI_QUIRK (0x17aa ,0x2316 ,"Thinkpad P1 Gen 6" ,ALC287_FIXUP_CS35L41_I2C_2 ), +SND_PCI_QUIRK (0x17aa ,0x2317 ,"Thinkpad P1 Gen 6" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x17aa ,0x2318 ,"Thinkpad Z13 Gen2" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x17aa ,0x2319 ,"Thinkpad Z16 Gen2" ,ALC287_FIXUP_CS35L41_I2C_2 ), SND_PCI_QUIRK(0x17aa, 0x231a, "Thinkpad Z16 Gen2", ALC287_FIXUP_CS35L41_I2C_2),
Greg Kroah-Hartman
maintainerPATCH 615/663 ALSA: hda/realtek: Add quirk for ASUS UM3402YAR using CS35L41
In reply to Greg Kroah-HartmanFrom: Mark Asselstine <[email protected]>
commit 7e2d06628aab6324e1ac885910a52f4c038d4043 upstream.
This Asus Zenbook laptop uses Realtek HDA codec combined with 2xCS35L41 Amplifiers using I2C with External Boost.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9500,6 +9500,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x1043 ,0x1427 ,"Asus Zenbook UX31E" ,ALC269VB_FIXUP_ASUS_ZENBOOK ),SND_PCI_QUIRK (0x1043 ,0x1517 ,"Asus Zenbook UX31A" ,ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A ),SND_PCI_QUIRK (0x1043 ,0x1662 ,"ASUS GV301QH" ,ALC294_FIXUP_ASUS_DUAL_SPK ), +SND_PCI_QUIRK (0x1043 ,0x1683 ,"ASUS UM3402YAR" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x1043 ,0x16b2 ,"ASUS GU603" ,ALC289_FIXUP_ASUS_GA401 ),SND_PCI_QUIRK (0x1043 ,0x16e3 ,"ASUS UX50" ,ALC269_FIXUP_STEREO_DMIC ), SND_PCI_QUIRK(0x1043, 0x1740, "ASUS UX430UA", ALC295_FIXUP_ASUS_DACS),
Greg Kroah-Hartman
maintainerPATCH 616/663 ALSA: hda/realtek: support HP Pavilion Aero 13-be0xxx Mute LED
In reply to Greg Kroah-HartmanFrom: Caleb Harper <[email protected]>
commit e7477cb97607b373d175a759c8c0270a640ab3f2 upstream.
This patch adds support for the mute LED on the HP Pavilion Aero Laptop 13-be0xxx. The current behavior is that the LED does not turn on at any time and does not indicate to the user whether the sound is muted.
The solution is to add a PCI quirk to properly recognize and support the LED on this device.
This change has been tested on the device in question using modified versions of kernels 6.0.7-6.2.12 on Arch Linux.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9428,6 +9428,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8898 ,"HP EliteBook 845 G8 Notebook PC" ,ALC285_FIXUP_HP_LIMIT_INT_MIC_BOOST ),SND_PCI_QUIRK (0x103c ,0x88d0 ,"HP Pavilion 15-eh1xxx (mainboard 88D0)" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8902 ,"HP OMEN 16" ,ALC285_FIXUP_HP_MUTE_LED ), +SND_PCI_QUIRK (0x103c ,0x8919 ,"HP Pavilion Aero Laptop 13-be0xxx" ,ALC287_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x896d ,"HP ZBook Firefly 16 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x896e ,"HP EliteBook x360 830 G9" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8971, "HP EliteBook 830 G9", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 617/663 ALSA: hda/realtek: Fix mute and micmute LEDs for an HP laptop
In reply to Greg Kroah-HartmanFrom: Kai-Heng Feng <[email protected]>
commit 56fc217f0db4fc78e02a1b8450df06389474a5e5 upstream.
There's another laptop that needs the fixup to enable mute and micmute LEDs. So do it accordingly.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -9479,6 +9479,7 @@ static const struct snd_pci_quirk alc269SND_PCI_QUIRK (0x103c ,0x8b8d ,"HP" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8b8f ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8b92 ,"HP" ,ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED ), +SND_PCI_QUIRK (0x103c ,0x8b96 ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8bf0 ,"HP" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x1043 ,0x103e ,"ASUS X540SA" ,ALC256_FIXUP_ASUS_MIC ), SND_PCI_QUIRK(0x1043, 0x103f, "ASUS TX300", ALC282_FIXUP_ASUS_TX300),
Greg Kroah-Hartman
maintainerPATCH 618/663 nilfs2: do not write dirty data after degenerating to read-only
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit 28a65b49eb53e172d23567005465019658bfdb4d upstream.
According to syzbot's report, mark_buffer_dirty() called from nilfs_segctor_do_construct() outputs a warning with some patterns after nilfs2 detects metadata corruption and degrades to read-only mode.
After such read-only degeneration, page cache data may be cleared through nilfs_clear_dirty_page() which may also clear the uptodate flag for their buffer heads. However, even after the degeneration, log writes are still performed by unmount processing etc., which causes mark_buffer_dirty() to be called for buffer heads without the "uptodate" flag and causes the warning.
Since any writes should not be done to a read-only file system in the first place, this fixes the warning in mark_buffer_dirty() by letting nilfs_segctor_do_construct() abort early if in read-only mode.
This also changes the retry check of nilfs_segctor_write_out() to avoid unnecessary log write retries if it detects -EROFS that nilfs_segctor_do_construct() returned.
--- fs/nilfs2/segment.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/nilfs2/segment.c +4 -1
@@ -2039,6 +2039,9 @@ static int nilfs_segctor_do_construct(ststruct the_nilfs *nilfs = sci->sc_super->s_fs_info;int err; +if (sb_rdonly (sci->sc_super)) +return -EROFS ; +nilfs_sc_cstage_set (sci,NILFS_ST_INIT ); sci->sc_cno = nilfs->ns_cno;
@@ -2722,7 +2725,7 @@ static void nilfs_segctor_write_out(struflush_work (&sci->sc_iput_work); - }while (ret && retrycount-- >0 ); + }while (ret && ret != -EROFS && retrycount-- >0 ); }/**
Greg Kroah-Hartman
maintainerPATCH 619/663 nilfs2: fix infinite loop in nilfs_mdt_get_block()
In reply to Greg Kroah-HartmanFrom: Ryusuke Konishi <[email protected]>
commit a6a491c048882e7e424d407d32cba0b52d9ef2bf upstream.
If the disk image that nilfs2 mounts is corrupted and a virtual block address obtained by block lookup for a metadata file is invalid, nilfs_bmap_lookup_at_level() may return the same internal return code as -ENOENT, meaning the block does not exist in the metadata file.
This duplication of return codes confuses nilfs_mdt_get_block(), causing it to read and create a metadata block indefinitely.
In particular, if this happens to the inode metadata file, ifile, semaphore i_rwsem can be left held, causing task hangs in lock_mount.
Fix this issue by making nilfs_bmap_lookup_at_level() treat virtual block address translation failures with -ENOENT as metadata corruption instead of returning the error code.
--- fs/nilfs2/bmap.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-)
fs/nilfs2/bmap.c +12 -4
@@ -67,20 +67,28 @@ int nilfs_bmap_lookup_at_level(struct nidown_read (&bmap->b_sem); ret = bmap->b_ops->bop_lookup (bmap, key, level, ptrp); -if (ret <0 ) { - ret =nilfs_bmap_convert_error (bmap, __func__, ret); +if (ret <0 ) goto out; - } +if (NILFS_BMAP_USE_VBN (bmap)) { ret =nilfs_dat_translate (nilfs_bmap_get_dat (bmap), *ptrp, &blocknr);if (!ret) *ptrp = blocknr; +else if (ret == -ENOENT ) { +/* +* If there was no valid entry in DAT for the block +* address obtained by b_ops->bop_lookup, then pass +* internal code -EINVAL to nilfs_bmap_convert_error +* to treat it as metadata corruption. +*/ + ret = -EINVAL ; + } } out:up_read (&bmap->b_sem); -return ret; +return nilfs_bmap_convert_error (bmap, __func__, ret); } int nilfs_bmap_lookup_contig(struct nilfs_bmap *bmap, __u64 key, __u64 *ptrp,
Greg Kroah-Hartman
maintainerPATCH 620/663 mm: do not reclaim private data from pinned page
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit d824ec2a154677f63c56cc71ffe4578274f6e32e upstream.
If the page is pinned, there's no point in trying to reclaim it. Furthermore if the page is from the page cache we don't want to reclaim fs-private data from the page because the pinning process may be writing to the page at any time and reclaiming fs private info on a dirty page can upset the filesystem (see link below).
--- mm/vmscan.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
mm/vmscan.c +10 -0
@@ -1905,6 +1905,16 @@ retry: } } +/* +* Folio is unmapped now so it cannot be newly pinned anymore. +* No point in trying to reclaim folio if it is pinned. +* Furthermore we don't want to reclaim underlying fs metadata +* if the folio is pinned and thus potentially modified by the +* pinning process as that may upset the filesystem. +*/ +if (folio_maybe_dma_pinned (folio)) + goto activate_locked; + mapping =folio_mapping (folio);if (folio_test_dirty (folio)) {/*
Greg Kroah-Hartman
maintainerPATCH 621/663 drbd: correctly submit flush bio on barrier
In reply to Greg Kroah-HartmanFrom: Christoph Böhmwalder <[email protected]>
commit 3899d94e3831ee07ea6821c032dc297aec80586a upstream.
When we receive a flush command (or "barrier" in DRBD), we currently use a REQ_OP_FLUSH with the REQ_PREFLUSH flag set.
The correct way to submit a flush bio is by using a REQ_OP_WRITE without any data, and set the REQ_PREFLUSH flag.
Since commit b4a6bb3a67aa ("block: add a sanity check for non-write flush/fua bios"), this triggers a warning in the block layer, but this has been broken for quite some time before that.
So use the correct set of flags to actually make the flush happen.
--- drivers/block/drbd/drbd_receiver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/drbd/drbd_receiver.c +1 -1
@@ -1283,7 +1283,7 @@ static void one_flush_endio(struct bio *static void submit_one_flush (struct drbd_device *device,struct issue_flush_context *ctx) {struct bio *bio =bio_alloc (device->ldev->backing_bdev,0 , -REQ_OP_FLUSH |REQ_PREFLUSH ,GFP_NOIO ); +REQ_OP_WRITE |REQ_PREFLUSH ,GFP_NOIO );struct one_flush_context *octx =kmalloc (sizeof (*octx),GFP_NOIO );if (!octx) {
Greg Kroah-Hartman
maintainerPATCH 622/663 md/raid10: fix null-ptr-deref in raid10_sync_request
In reply to Greg Kroah-HartmanFrom: Li Nan <[email protected]>
commit a405c6f0229526160aa3f177f65e20c86fce84c5 upstream.
init_resync() inits mempool and sets conf->have_replacemnt at the beginning of sync, close_sync() frees the mempool when sync is completed.
After [1] recovery might be skipped and init_resync() is called but close_sync() is not. null-ptr-deref occurs with r10bio->dev[i].repl_bio.
The following is one way to reproduce the issue.
1) create a array, wait for resync to complete, mddev->recovery_cp is set to MaxSector.
2) recovery is woken and it is skipped. conf->have_replacement is set to 0 in init_resync(). close_sync() not called.
3) some io errors and rdev A is set to WantReplacement.
4) a new device is added and set to A's replacement.
5) recovery is woken, A have replacement, but conf->have_replacemnt is
0. r10bio->dev[i].repl_bio will not be alloced and null-ptr-deref occurs.
Fix it by not calling init_resync() if recovery skipped.
[1] commit 7e83ccbecd60 ("md/raid10: Allow skipping recovery when clean arrays are assembled")
--- drivers/md/raid10.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/md/raid10.c +4 -4
@@ -3302,10 +3302,6 @@ static sector_t raid10_sync_request(strusector_t chunk_mask = conf->geo.chunk_mask;int page_idx =0 ; -if (!mempool_initialized (&conf->r10buf_pool)) -if (init_resync (conf)) -return 0 ; -/* * Allow skipping a full rebuild for incremental assembly * of a clean array, like RAID1 does.
@@ -3321,6 +3317,10 @@ static sector_t raid10_sync_request(strureturn mddev->dev_sectors - sector_nr; } +if (!mempool_initialized (&conf->r10buf_pool)) +if (init_resync (conf)) +return 0 ; + skipped: max_sector = mddev->dev_sectors; if (test_bit(MD_RECOVERY_SYNC, &mddev->recovery) ||
Greg Kroah-Hartman
maintainerPATCH 623/663 md/raid5: Improve performance for sequential IO
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
commit fc05e06e6098ca2c28f7a10da0e00aeea20fa59e upstream.
Commit 7e55c60acfbb ("md/raid5: Pivot raid5_make_request()") changed the order in which requests for underlying disks are created. Since for large sequential IO adding of requests frequently races with md_raid5 thread submitting bios to underlying disks, this results in a change in IO pattern because intermediate states of new order of request creation result in more smaller discontiguous requests. For RAID5 on top of three rotational disks our performance testing revealed this results in regression in write throughput:
iozone -a -s 131072000 -y 4 -q 8 -i 0 -i 1 -R
before 7e55c60acfbb:
KB reclen write rewrite read reread
131072000 4 493670 525964 524575 513384
131072000 8 540467 532880 512028 513703after 7e55c60acfbb:
KB reclen write rewrite read reread
131072000 4 421785 456184 531278 509248
131072000 8 459283 456354 528449 543834To reduce the amount of discontiguous requests we can start generating requests with the stripe with the lowest chunk offset as that has the best chance of being adjacent to IO queued previously. This improves the performance to:
KB reclen write rewrite read reread
131072000 4 497682 506317 518043 514559
131072000 8 514048 501886 506453 504319restoring big part of the regression.
--- drivers/md/raid5.c | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 44 insertions(+), 1 deletion(-)
drivers/md/raid5.c +44 -1
@@ -6079,6 +6079,38 @@ out_release:return ret; } +/* +* If the bio covers multiple data disks, find sector within the bio that has +* the lowest chunk offset in the first chunk. +*/ +static sector_t raid5_bio_lowest_chunk_sector (struct r5conf *conf, +struct bio *bi) +{ +int sectors_per_chunk = conf->chunk_sectors; +int raid_disks = conf->raid_disks; +int dd_idx; +struct stripe_head sh; +unsigned int chunk_offset; +sector_t r_sector = bi->bi_iter.bi_sector & ~((sector_t )RAID5_STRIPE_SECTORS (conf)-1 ); +sector_t sector; + +/* We pass in fake stripe_head to get back parity disk numbers */ + sector =raid5_compute_sector (conf, r_sector,0 , &dd_idx, &sh); + chunk_offset =sector_div (sector, sectors_per_chunk); +if (sectors_per_chunk - chunk_offset >=bio_sectors (bi)) +return r_sector; +/* +* Bio crosses to the next data disk. Check whether it's in the same +* chunk. +*/ + dd_idx++; +while (dd_idx == sh.pd_idx || dd_idx == sh.qd_idx) + dd_idx++; +if (dd_idx >= raid_disks) +return r_sector; +return r_sector + sectors_per_chunk - chunk_offset; +} +static bool raid5_make_request (struct mddev *mddev,struct bio * bi) {DEFINE_WAIT_FUNC (wait, woken_wake_function);
@@ -6150,6 +6182,17 @@ static bool raid5_make_request(struct md }md_account_bio (mddev, &bi); +/* +* Lets start with the stripe with the lowest chunk offset in the first +* chunk. That has the best chances of creating IOs adjacent to +* previous IOs in case of sequential IO and thus creates the most +* sequential IO pattern. We don't bother with the optimization when +* reshaping as the performance benefit is not worth the complexity. +*/ +if (likely (conf->reshape_progress == MaxSector)) + logical_sector =raid5_bio_lowest_chunk_sector (conf, bi); + s = (logical_sector - ctx.first_sector) >>RAID5_STRIPE_SHIFT (conf); +add_wait_queue (&conf->wait_for_overlap, &wait);while (1 ) { res = make_stripe_request(mddev, conf, &ctx, logical_sector,
@@ -6178,7 +6221,7 @@ static bool raid5_make_request(struct mdcontinue ; } - s =find_first_bit (ctx.sectors_to_do, stripe_cnt); + s =find_next_bit_wrap (ctx.sectors_to_do, stripe_cnt, s);if (s == stripe_cnt)break ;
Greg Kroah-Hartman
maintainerPATCH 624/663 kasan: hw_tags: avoid invalid virt_to_page()
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
commit 29083fd84da576bfb3563d044f98d38e6b338f00 upstream.
When booting with 'kasan.vmalloc=off', a kernel configured with support for KASAN_HW_TAGS will explode at boot time due to bogus use of virt_to_page() on a vmalloc adddress. With CONFIG_DEBUG_VIRTUAL selected this will be reported explicitly, and with or without CONFIG_DEBUG_VIRTUAL the kernel will dereference a bogus address:
| ------------[ cut here ]------------ | virt_to_phys used for non-linear address: (____ptrval____) (0xffff800008000000) | WARNING: CPU: 0 PID: 0 at arch/arm64/mm/physaddr.c:15 __virt_to_phys+0x78/0x80 | Modules linked in: | CPU: 0 PID: 0 Comm: swapper/0 Not tainted 6.3.0-rc3-00073-g83865133300d-dirty #4 | Hardware name: linux,dummy-virt (DT) | pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __virt_to_phys+0x78/0x80 | lr : __virt_to_phys+0x78/0x80 | sp : ffffcd076afd3c80 | x29: ffffcd076afd3c80 x28: 0068000000000f07 x27: ffff800008000000 | x26: fffffbfff0000000 x25: fffffbffff000000 x24: ff00000000000000 | x23: ffffcd076ad3c000 x22: fffffc0000000000 x21: ffff800008000000 | x20: ffff800008004000 x19: ffff800008000000 x18: ffff800008004000 | x17: 666678302820295f x16: ffffffffffffffff x15: 0000000000000004 | x14: ffffcd076b009e88 x13: 0000000000000fff x12: 0000000000000003 | x11: 00000000ffffefff x10: c0000000ffffefff x9 : 0000000000000000 | x8 : 0000000000000000 x7 : 205d303030303030 x6 : 302e30202020205b | x5 : ffffcd076b41d63f x4 : ffffcd076afd3827 x3 : 0000000000000000 | x2 : 0000000000000000 x1 : ffffcd076afd3a30 x0 : 000000000000004f | Call trace: | __virt_to_phys+0x78/0x80 | __kasan_unpoison_vmalloc+0xd4/0x478 | __vmalloc_node_range+0x77c/0x7b8 | __vmalloc_node+0x54/0x64 | init_IRQ+0x94/0xc8 | start_kernel+0x194/0x420 | __primary_switched+0xbc/0xc4 | ---[ end trace 0000000000000000 ]--- | Unable to handle kernel paging request at virtual address 03fffacbe27b8000 | Mem abort info: | ESR = 0x0000000096000004 | EC = 0x25: DABT (current EL), IL = 32 bits | SET = 0, FnV = 0 | EA = 0, S1PTW = 0 | FSC = 0x04: level 0 translation fault | Data abort info: | ISV = 0, ISS = 0x00000004 | CM = 0, WnR = 0 | swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000041bc5000 | [03fffacbe27b8000] pgd=0000000000000000, p4d=0000000000000000 | Internal error: Oops: 0000000096000004 [#1] PREEMPT SMP | Modules linked in: | CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 6.3.0-rc3-00073-g83865133300d-dirty #4 | Hardware name: linux,dummy-virt (DT) | pstate: 200000c5 (nzCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) | pc : __kasan_unpoison_vmalloc+0xe4/0x478 | lr : __kasan_unpoison_vmalloc+0xd4/0x478 | sp : ffffcd076afd3ca0 | x29: ffffcd076afd3ca0 x28: 0068000000000f07 x27: ffff800008000000 | x26: 0000000000000000 x25: 03fffacbe27b8000 x24: ff00000000000000 | x23: ffffcd076ad3c000 x22: fffffc0000000000 x21: ffff800008000000 | x20: ffff800008004000 x19: ffff800008000000 x18: ffff800008004000 | x17: 666678302820295f x16: ffffffffffffffff x15: 0000000000000004 | x14: ffffcd076b009e88 x13: 0000000000000fff x12: 0000000000000001 | x11: 0000800008000000 x10: ffff800008000000 x9 : ffffb2f8dee00000 | x8 : 000ffffb2f8dee00 x7 : 205d303030303030 x6 : 302e30202020205b | x5 : ffffcd076b41d63f x4 : ffffcd076afd3827 x3 : 0000000000000000 | x2 : 0000000000000000 x1 : ffffcd076afd3a30 x0 : ffffb2f8dee00000 | Call trace: | __kasan_unpoison_vmalloc+0xe4/0x478 | __vmalloc_node_range+0x77c/0x7b8 | __vmalloc_node+0x54/0x64 | init_IRQ+0x94/0xc8 | start_kernel+0x194/0x420 | __primary_switched+0xbc/0xc4 | Code: d34cfc08 aa1f03fa 8b081b39 d503201f (f9400328) | ---[ end trace 0000000000000000 ]--- | Kernel panic - not syncing: Attempted to kill the idle task!
This is because init_vmalloc_pages() erroneously calls virt_to_page() on a vmalloc address, while virt_to_page() is only valid for addresses in the linear/direct map. Since init_vmalloc_pages() expects virtual addresses in the vmalloc range, it must use vmalloc_to_page() rather than virt_to_page().
We call init_vmalloc_pages() from __kasan_unpoison_vmalloc(), where we check !is_vmalloc_or_module_addr(), suggesting that we might encounter a non-vmalloc address. Luckily, this never happens. By design, we only call __kasan_unpoison_vmalloc() on pointers in the vmalloc area, and I have verified that we don't violate that expectation. Given that, is_vmalloc_or_module_addr() must always be true for any legitimate argument to __kasan_unpoison_vmalloc().
Correct init_vmalloc_pages() to use vmalloc_to_page(), and remove the redundant and misleading use of is_vmalloc_or_module_addr() in __kasan_unpoison_vmalloc().
--- mm/kasan/hw_tags.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
mm/kasan/hw_tags.c +2 -2
@@ -225,7 +225,7 @@ static void init_vmalloc_pages(const voiconst void *addr;for (addr = start; addr < start + size; addr +=PAGE_SIZE ) { -struct page *page =virt_to_page (addr); +struct page *page =vmalloc_to_page (addr);clear_highpage_kasan_tagged (page); }
@@ -237,7 +237,7 @@ void *__kasan_unpoison_vmalloc(const voiu8 tag;unsigned long redzone_start, redzone_size; -if (!kasan_vmalloc_enabled () || !is_vmalloc_or_module_addr (start)) { +if (!kasan_vmalloc_enabled ()) {if (flags &KASAN_VMALLOC_INIT )init_vmalloc_pages (start, size);return (void *)start;
Greg Kroah-Hartman
maintainerPATCH 625/663 mtd: core: provide unique name for nvmem device, take two
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit 1cd9ceaa5282ff10ea20a7fbadde5a476a1cc99e upstream.
Commit c048b60d39e1 ("mtd: core: provide unique name for nvmem device") tries to give the nvmem device a unique name, but fails badly if the mtd device doesn't have a "struct device" associated with it, i.e. if CONFIG_MTD_PARTITIONED_MASTER is not set. This will result in the name "(null)-user-otp", which is not unique. It seems the best we can do is to use the compatible name together with a unique identifier added by the nvmem subsystem by using NVMEM_DEVID_AUTO.
--- drivers/mtd/mtdcore.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/mtd/mtdcore.c +2 -3
@@ -888,8 +888,8 @@ static struct nvmem_device *mtd_otp_nvme/* OTP nvmem will be registered on the physical device */ config.dev = mtd->dev.parent; - config.name =kasprintf (GFP_KERNEL ,"%s-%s" ,dev_name (&mtd->dev), compatible); - config.id =NVMEM_DEVID_NONE ; + config.name = compatible; + config.id =NVMEM_DEVID_AUTO ; config.owner =THIS_MODULE ; config.type =NVMEM_TYPE_OTP ; config.root_only = true;
@@ -905,7 +905,6 @@ static struct nvmem_device *mtd_otp_nvme nvmem =NULL ;of_node_put (np); -kfree (config.name);return nvmem; }
Greg Kroah-Hartman
maintainerPATCH 626/663 mtd: core: fix nvmem error reporting
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit 8bd1d24e6ca3c599dd455b0e1b22f77bab8290eb upstream.
The master MTD will only have an associated device if CONFIG_MTD_PARTITIONED_MASTER is set, thus we cannot use dev_err() on mtd->dev. Instead use the parent device which is the physical flash memory.
--- drivers/mtd/mtdcore.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/mtd/mtdcore.c +3 -2
@@ -939,6 +939,7 @@ static int mtd_nvmem_fact_otp_reg_read(vstatic int mtd_otp_nvmem_add (struct mtd_info *mtd) { +struct device *dev = mtd->dev.parent;struct nvmem_device *nvmem;ssize_t size;int err;
@@ -952,7 +953,7 @@ static int mtd_otp_nvmem_add(struct mtd_ nvmem =mtd_otp_nvmem_register (mtd,"user-otp" , size, mtd_nvmem_user_otp_reg_read);if (IS_ERR (nvmem)) { -dev_err (&mtd->dev,"Failed to register OTP NVMEM device\n" ); +dev_err (dev,"Failed to register OTP NVMEM device\n" );return PTR_ERR (nvmem); } mtd->otp_user_nvmem = nvmem;
@@ -970,7 +971,7 @@ static int mtd_otp_nvmem_add(struct mtd_ nvmem =mtd_otp_nvmem_register (mtd,"factory-otp" , size, mtd_nvmem_fact_otp_reg_read);if (IS_ERR (nvmem)) { -dev_err (&mtd->dev,"Failed to register OTP NVMEM device\n" ); +dev_err (dev,"Failed to register OTP NVMEM device\n" ); err =PTR_ERR (nvmem); goto err; }
Greg Kroah-Hartman
maintainerPATCH 627/663 mtd: core: fix error path for nvmem provider
In reply to Greg Kroah-HartmanFrom: Michael Walle <[email protected]>
commit e0489f6e221f5ddee6cb3bd51b992b790c5fa4b9 upstream.
If mtd_otp_nvmem_add() fails, the partitions won't be removed because there is simply no call to del_mtd_partitions(). Unfortunately, add_mtd_partitions() will print all partitions to the kernel console. If mtd_otp_nvmem_add() returns -EPROBE_DEFER this would print the partitions multiple times to the kernel console. Instead move mtd_otp_nvmem_add() to the beginning of the function.
--- drivers/mtd/mtdcore.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/mtd/mtdcore.c +10 -3
@@ -1023,10 +1023,14 @@ int mtd_device_parse_register(struct mtdmtd_set_dev_defaults (mtd); + ret =mtd_otp_nvmem_add (mtd); +if (ret) + goto out; +if (IS_ENABLED (CONFIG_MTD_PARTITIONED_MASTER )) { ret =add_mtd_device (mtd);if (ret) -return ret; + goto out; }/* Prefer parsed partitions over driver-provided fallback */
@@ -1061,9 +1065,12 @@ int mtd_device_parse_register(struct mtdregister_reboot_notifier (&mtd->reboot_notifier); } - ret =mtd_otp_nvmem_add (mtd); - out: +if (ret) { +nvmem_unregister (mtd->otp_user_nvmem); +nvmem_unregister (mtd->otp_factory_nvmem); + } +if (ret &&device_is_registered (&mtd->dev))del_mtd_device (mtd);
Greg Kroah-Hartman
maintainerPATCH 628/663 mtd: spi-nor: core: Update flashs current address mode when changing address mode
In reply to Greg Kroah-HartmanFrom: Tudor Ambarus <[email protected]>
commit 37513c56139b79dd43c1774513c28f8ab2b05224 upstream.
The bug was obswerved while reading code. There are not many users of addr_mode_nbytes. Anyway, we should update the flash's current address mode when changing the address mode, fix it. We don't care for now about the set_4byte_addr_mode(nor, false) from spi_nor_restore(), as it is used at driver remove and shutdown.
--- drivers/mtd/spi-nor/core.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/core.c +3 -1
@@ -2733,6 +2733,7 @@ static int spi_nor_quad_enable(struct spstatic int spi_nor_init (struct spi_nor *nor) { +struct spi_nor_flash_parameter *params = nor->params;int err; err =spi_nor_octal_dtr_enable (nor, true);
@@ -2774,9 +2775,10 @@ static int spi_nor_init(struct spi_nor **/ WARN_ONCE (nor->flags &SNOR_F_BROKEN_RESET ,"enabling reset hack; may not recover from unexpected reboots\n" ); - err = nor->params->set_4byte_addr_mode (nor, true); + err = params->set_4byte_addr_mode (nor, true);if (err && err != -ENOTSUPP )return err; + params->addr_mode_nbytes =4 ; }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 629/663 drivers: remoteproc: xilinx: Fix carveout names
In reply to Greg Kroah-HartmanFrom: Tanmay Shah <[email protected]>
commit 81c18e08a609706c5c2887f267135fa0dece4119 upstream.
If the unit address is appended to node name of memory-region, then adding rproc carveouts fails as node name and unit-address both are passed as carveout name (i.e. vdev0vring0@xxxxxxxx). However, only node name is expected by remoteproc framework. This patch moves memory-region node parsing from driver probe to prepare and only passes node-name and not unit-address
--- drivers/remoteproc/xlnx_r5_remoteproc.c | 90 +++++++------------------------- 1 file changed, 20 insertions(+), 70 deletions(-)
drivers/remoteproc/xlnx_r5_remoteproc.c +20 -70
@@ -61,8 +61,6 @@ static const struct mem_bank_data zynqmp* @np: device node of RPU instance * @tcm_bank_count: number TCM banks accessible to this RPU * @tcm_banks: array of each TCM bank data -* @rmem_count: Number of reserved mem regions -* @rmem: reserved memory region nodes from device tree * @rproc: rproc handle * @pm_domain_id: RPU CPU power domain id */
@@ -71,8 +69,6 @@ struct zynqmp_r5_core {struct device_node *np;int tcm_bank_count;struct mem_bank_data **tcm_banks; -int rmem_count; -struct reserved_mem **rmem;struct rproc *rproc;u32 pm_domain_id; };
@@ -239,21 +235,29 @@ static int add_mem_regions_carveout(stru {struct rproc_mem_entry *rproc_mem;struct zynqmp_r5_core *r5_core; +struct of_phandle_iterator it;struct reserved_mem *rmem; -int i, num_mem_regions; +int i =0 ; r5_core = (struct zynqmp_r5_core *)rproc->priv; - num_mem_regions = r5_core->rmem_count; -for (i =0 ; i < num_mem_regions; i++) { - rmem = r5_core->rmem[i]; +/* Register associated reserved memory regions */ +of_phandle_iterator_init (&it, r5_core->np,"memory-region" ,NULL ,0 ); -if (!strncmp (rmem->name,"vdev0buffer" ,strlen ("vdev0buffer" ))) { +while (of_phandle_iterator_next (&it) ==0 ) { + rmem =of_reserved_mem_lookup (it.node); +if (!rmem) { +of_node_put (it.node); +dev_err (&rproc->dev,"unable to acquire memory-region\n" ); +return -EINVAL ; + } + +if (!strcmp (it.node->name,"vdev0buffer" )) {/* Init reserved memory for vdev buffer */ rproc_mem =rproc_of_resm_mem_entry_init (&rproc->dev, i, rmem->size, rmem->base, - rmem->name); + it.node->name); }else {/* Register associated reserved memory regions */ rproc_mem = rproc_mem_entry_init(&rproc->dev, NULL,
@@ -261,16 +265,19 @@ static int add_mem_regions_carveout(stru rmem->size, rmem->base, zynqmp_r5_mem_region_map, zynqmp_r5_mem_region_unmap, - rmem->name); + it.node->name); } -if (!rproc_mem) +if (!rproc_mem) { +of_node_put (it.node);return -ENOMEM ; + }rproc_add_carveout (rproc, rproc_mem);dev_dbg (&rproc->dev,"reserved mem carveout %s addr=%llx, size=0x%llx" , - rmem->name, rmem->base, rmem->size); + it.node->name, rmem->base, rmem->size); + i++; }return 0 ;
@@ -726,59 +733,6 @@ static int zynqmp_r5_get_tcm_node(structreturn 0 ; } -/** -* zynqmp_r5_get_mem_region_node() -* parse memory-region property and get reserved mem regions -* -* @r5_core: pointer to zynqmp_r5_core type object -* -* Return: 0 for success and error code for failure. -*/ -static int zynqmp_r5_get_mem_region_node (struct zynqmp_r5_core *r5_core) -{ -struct device_node *np, *rmem_np; -struct reserved_mem **rmem; -int res_mem_count, i; -struct device *dev; - - dev = r5_core->dev; - np = r5_core->np; - - res_mem_count =of_property_count_elems_of_size (np,"memory-region" , -sizeof (phandle)); -if (res_mem_count <=0 ) { -dev_warn (dev,"failed to get memory-region property %d\n" , - res_mem_count); -return 0 ; - } - - rmem =devm_kcalloc (dev, res_mem_count, -sizeof (struct reserved_mem *),GFP_KERNEL ); -if (!rmem) -return -ENOMEM ; - -for (i =0 ; i < res_mem_count; i++) { - rmem_np =of_parse_phandle (np,"memory-region" , i); -if (!rmem_np) - goto release_rmem; - - rmem[i] =of_reserved_mem_lookup (rmem_np); -if (!rmem[i]) { -of_node_put (rmem_np); - goto release_rmem; - } - -of_node_put (rmem_np); - } - - r5_core->rmem_count = res_mem_count; - r5_core->rmem = rmem; -return 0 ; - -release_rmem: -return -EINVAL ; -} -/* * zynqmp_r5_core_init() * Create and initialize zynqmp_r5_core type object
@@ -806,10 +760,6 @@ static int zynqmp_r5_core_init(struct zyfor (i =0 ; i < cluster->core_count; i++) { r5_core = cluster->r5_cores[i]; - ret =zynqmp_r5_get_mem_region_node (r5_core); -if (ret) -dev_warn (dev,"memory-region prop failed %d\n" , ret); -/* Initialize r5 cores with power-domains parsed from dts */ ret =of_property_read_u32_index (r5_core->np,"power-domains" ,1 , &r5_core->pm_domain_id);
Greg Kroah-Hartman
maintainerPATCH 630/663 mailbox: zynqmp: Fix IPI isr handling
In reply to Greg Kroah-HartmanFrom: Tanmay Shah <[email protected]>
commit 74ad37a30ffee3643bc34f9ca7225b20a66abaaf upstream.
Multiple IPI channels are mapped to same interrupt handler. Current isr implementation handles only one channel per isr. Fix this behavior by checking isr status bit of all child mailbox nodes.
--- drivers/mailbox/zynqmp-ipi-mailbox.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/mailbox/zynqmp-ipi-mailbox.c +3 -3
@@ -152,7 +152,7 @@ static irqreturn_t zynqmp_ipi_interrupt(struct zynqmp_ipi_message *msg;u64 arg0, arg3;struct arm_smccc_res res; -int ret, i; +int ret, i, status =IRQ_NONE ; (void )irq; arg0 =SMC_IPI_MAILBOX_STATUS_ENQUIRY ;
@@ -170,11 +170,11 @@ static irqreturn_t zynqmp_ipi_interrupt(memcpy_fromio (msg->data, mchan->req_buf, msg->len);mbox_chan_received_data (chan, (void *)msg); -return IRQ_HANDLED ; + status =IRQ_HANDLED ; } } } -return IRQ_NONE ; +return status; }/**
Greg Kroah-Hartman
maintainerPATCH 631/663 kcsan: Avoid READ_ONCE() in read_instrumented_memory()
In reply to Greg Kroah-HartmanFrom: Marco Elver <[email protected]>
commit 8dec88070d964bfeb4198f34cb5956d89dd1f557 upstream.
Haibo Li reported:
| Unable to handle kernel paging request at virtual address | ffffff802a0d8d7171 | Mem abort info:o: | ESR = 0x9600002121 | EC = 0x25: DABT (current EL), IL = 32 bitsts | SET = 0, FnV = 0 0 | EA = 0, S1PTW = 0 0 | FSC = 0x21: alignment fault | Data abort info:o: | ISV = 0, ISS = 0x0000002121 | CM = 0, WnR = 0 0 | swapper pgtable: 4k pages, 39-bit VAs, pgdp=000000002835200000 | [ffffff802a0d8d71] pgd=180000005fbf9003, p4d=180000005fbf9003, | pud=180000005fbf9003, pmd=180000005fbe8003, pte=006800002a0d8707 | Internal error: Oops: 96000021 [#1] PREEMPT SMP | Modules linked in: | CPU: 2 PID: 45 Comm: kworker/u8:2 Not tainted | 5.15.78-android13-8-g63561175bbda-dirty #1 | ... | pc : kcsan_setup_watchpoint+0x26c/0x6bc | lr : kcsan_setup_watchpoint+0x88/0x6bc | sp : ffffffc00ab4b7f0 | x29: ffffffc00ab4b800 x28: ffffff80294fe588 x27: 0000000000000001 | x26: 0000000000000019 x25: 0000000000000001 x24: ffffff80294fdb80 | x23: 0000000000000000 x22: ffffffc00a70fb68 x21: ffffff802a0d8d71 | x20: 0000000000000002 x19: 0000000000000000 x18: ffffffc00a9bd060 | x17: 0000000000000001 x16: 0000000000000000 x15: ffffffc00a59f000 | x14: 0000000000000001 x13: 0000000000000000 x12: ffffffc00a70faa0 | x11: 00000000aaaaaaab x10: 0000000000000054 x9 : ffffffc00839adf8 | x8 : ffffffc009b4cf00 x7 : 0000000000000000 x6 : 0000000000000007 | x5 : 0000000000000000 x4 : 0000000000000000 x3 : ffffffc00a70fb70 | x2 : 0005ff802a0d8d71 x1 : 0000000000000000 x0 : 0000000000000000 | Call trace: | kcsan_setup_watchpoint+0x26c/0x6bc | __tsan_read2+0x1f0/0x234 | inflate_fast+0x498/0x750 | zlib_inflate+0x1304/0x2384 | __gunzip+0x3a0/0x45c | gunzip+0x20/0x30 | unpack_to_rootfs+0x2a8/0x3fc | do_populate_rootfs+0xe8/0x11c | async_run_entry_fn+0x58/0x1bc | process_one_work+0x3ec/0x738 | worker_thread+0x4c4/0x838 | kthread+0x20c/0x258 | ret_from_fork+0x10/0x20 | Code: b8bfc2a8 2a0803f7 14000007 d503249f (78bfc2a8) ) | ---[ end trace 613a943cb0a572b6 ]-----
The reason for this is that on certain arm64 configuration since e35123d83ee3 ("arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y"), READ_ONCE() may be promoted to a full atomic acquire instruction which cannot be used on unaligned addresses.
Fix it by avoiding READ_ONCE() in read_instrumented_memory(), and simply forcing the compiler to do the required access by casting to the appropriate volatile type. In terms of generated code this currently only affects architectures that do not use the default READ_ONCE() implementation.
The only downside is that we are not guaranteed atomicity of the access itself, although on most architectures a plain load up to machine word size should still be atomic (a fact the default READ_ONCE() still relies on itself).
--- kernel/kcsan/core.c | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-)
kernel/kcsan/core.c +13 -4
@@ -337,11 +337,20 @@ static void delay_access(int type)*/ static __always_inline u64 read_instrumented_memory(const volatile void *ptr, size_t size) { +/* +* In the below we don't necessarily need the read of the location to +* be atomic, and we don't use READ_ONCE(), since all we need for race +* detection is to observe 2 different values. +* +* Furthermore, on certain architectures (such as arm64), READ_ONCE() +* may turn into more complex instructions than a plain load that cannot +* do unaligned accesses. +*/ switch (size) { -case 1 :return READ_ONCE (*(const u8 *)ptr); -case 2 :return READ_ONCE (*(const u16 *)ptr); -case 4 :return READ_ONCE (*(const u32 *)ptr); -case 8 :return READ_ONCE (*(const u64 *)ptr); +case 1 :return *(const volatile u8 *)ptr; +case 2 :return *(const volatile u16 *)ptr; +case 4 :return *(const volatile u32 *)ptr; +case 8 :return *(const volatile u64 *)ptr;default :return 0 ;/* Ignore; we do not diff the values. */ } }
Greg Kroah-Hartman
maintainerPATCH 632/663 mailbox: zynqmp: Fix typo in IPI documentation
In reply to Greg Kroah-HartmanFrom: Tanmay Shah <[email protected]>
commit 79963fbfc233759bd8a43462f120d15a1bd4f4fa upstream.
Xilinx IPI message buffers allows 32-byte data transfer. Fix documentation that says 12 bytes
--- include/linux/mailbox/zynqmp-ipi-message.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/mailbox/zynqmp-ipi-message.h +1 -1
@@ -9,7 +9,7 @@* @data: message payload * * This is the structure for data used in mbox_send_message -* the maximum length of data buffer is fixed to 12 bytes. +* the maximum length of data buffer is fixed to 32 bytes. * Client is supposed to be aware of this. */ struct zynqmp_ipi_message {
Greg Kroah-Hartman
maintainerPATCH 633/663 nfp: fix incorrect pointer deference when offloading IPsec with bonding
In reply to Greg Kroah-HartmanFrom: Huanhuan Wang <[email protected]>
commit 63cfd210034c772fad047afa13dd5a4664b0a72e upstream.
There are two pointers in struct xfrm_dev_offload, *dev, *real_dev. The *dev points whether bonding interface or real interface, if bonding IPsec offload is used, it points bonding interface; if not, it points real interface. And *real_dev always points real interface. So nfp should always use real_dev instead of dev.
Prior to this change the system becomes unresponsive when offloading IPsec for a device which is a lower device to a bonding device.
--- drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/netronome/nfp/crypto/ipsec.c +2 -2
@@ -267,7 +267,7 @@ static void set_sha2_512hmac(struct nfp_static int nfp_net_xfrm_add_state (struct xfrm_state *x) { -struct net_device *netdev = x->xso.dev; +struct net_device *netdev = x->xso.real_dev;struct nfp_ipsec_cfg_mssg msg = {};int i, key_len, trunc_len, err =0 ;struct nfp_ipsec_cfg_add_sa *cfg;
@@ -503,7 +503,7 @@ static void nfp_net_xfrm_del_state(struc .cmd = NFP_IPSEC_CFG_MSSG_INV_SA, .sa_idx = x->xso.offload_handle - 1, }; -struct net_device *netdev = x->xso.dev; +struct net_device *netdev = x->xso.real_dev;struct nfp_net *nn;int err;
Greg Kroah-Hartman
maintainerPATCH 634/663 wifi: rtl8xxxu: RTL8192EU always needs full init
In reply to Greg Kroah-HartmanFrom: Bitterblue Smith <[email protected]>
commit d46e04ccd40457a0119b76e11ab64a2ad403e138 upstream.
Always run the entire init sequence (rtl8xxxu_init_device()) for RTL8192EU. It's what the vendor driver does too.
This fixes a bug where the device is unable to connect after rebooting:
wlp3s0f3u2: send auth to ... (try 1/3)
wlp3s0f3u2: send auth to ... (try 2/3)
wlp3s0f3u2: send auth to ... (try 3/3)
wlp3s0f3u2: authentication with ... timed out
Rebooting leaves the device powered on (partially? at least the firmware is still running), but not really in a working state.
--- drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c +1 -0
@@ -1801,6 +1801,7 @@ struct rtl8xxxu_fileops rtl8192eu_fops = .rx_desc_size = sizeof(struct rtl8xxxu_rxdesc24), .has_s0s1 = 0, .gen2_thermal_meter = 1, + .needs_full_init = 1, .adda_1t_init = 0x0fc01616, .adda_1t_path_on = 0x0fc01616, .adda_2t_path_on_a = 0x0fc01616,
Greg Kroah-Hartman
maintainerPATCH 635/663 wifi: rtw88: rtw8821c: Fix rfe_option field width
In reply to Greg Kroah-HartmanFrom: Sascha Hauer <[email protected]>
commit 14705f969d98187a1cc2682e0c9bd2e230b8098f upstream.
On my RTW8821CU chipset rfe_option reads as 0x22. Looking at the vendor driver suggests that the field width of rfe_option is 5 bit, so rfe_option should be masked with 0x1f.
Without this the rfe_option comparisons with 2 further down the driver evaluate as false when they should really evaluate as true. The effect is that 2G channels do not work.
rfe_option is also used as an array index into rtw8821c_rfe_defs[]. rtw8821c_rfe_defs[34] (0x22) was added as part of adding USB support, likely because rfe_option reads as 0x22. As this now becomes 0x2, rtw8821c_rfe_defs[34] is no longer used and can be removed.
Note that this might not be the whole truth. In the vendor driver there are indeed places where the unmasked rfe_option value is used. However, the driver has several places where rfe_option is tested with the pattern if (rfe_option == 2 || rfe_option == 0x22) or if (rfe_option == 4 || rfe_option == 0x24), so that rfe_option BIT(5) has no influence on the code path taken. We therefore mask BIT(5) out from rfe_option entirely until this assumption is proved wrong by some chip variant we do not know yet.
--- drivers/net/wireless/realtek/rtw88/rtw8821c.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/wireless/realtek/rtw88/rtw8821c.c +1 -2
@@ -47,7 +47,7 @@ static int rtw8821c_read_efuse(struct rt map = (struct rtw8821c_efuse *)log_map; - efuse->rfe_option = map->rfe_option; + efuse->rfe_option = map->rfe_option &0x1f ; efuse->rf_board_option = map->rf_board_option; efuse->crystal_cap = map->xtal_k; efuse->pa_type_2g = map->pa_type;
@@ -1537,7 +1537,6 @@ static const struct rtw_rfe_def rtw8821c [2] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2), [4] = RTW_DEF_RFE_EXT(8821c, 0, 0, 2), [6] = RTW_DEF_RFE(8821c, 0, 0), - [34] = RTW_DEF_RFE(8821c, 0, 0), };static struct rtw_hw_reg rtw8821c_dig[] = {
Greg Kroah-Hartman
maintainerPATCH 636/663 wifi: rtw89: fix potential race condition between napi_init and napi_enable
In reply to Greg Kroah-HartmanFrom: Ping-Ke Shih <[email protected]>
commit 47515664ecfbde11425dff121f298ae4499425c9 upstream.
A race condition can happen if netdev is registered, but NAPI isn't initialized yet, and meanwhile user space starts the netdev that will enable NAPI. Then, it hits BUG_ON():
kernel BUG at net/core/dev.c:6423!
invalid opcode: 0000 [#1] PREEMPT SMP NOPTI
CPU: 0 PID: 417 Comm: iwd Not tainted 6.2.7-slab-dirty #3 eb0f5a8a9d91 Hardware name: LENOVO 21DL/LNVNB161216, BIOS JPCN20WW(V1.06) 09/20/2022 RIP: 0010:napi_enable+0x3f/0x50 Code: 48 89 c2 48 83 e2 f6 f6 81 89 08 00 00 02 74 0d 48 83 ... RSP: 0018:ffffada1414f3548 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffffa01425802080 RCX: 0000000000000000 RDX: 00000000000002ff RSI: ffffada14e50c614 RDI: ffffa01425808dc0 RBP: 0000000000000000 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000100 R12: ffffa01425808f58 R13: 0000000000000000 R14: ffffa01423498940 R15: 0000000000000001 FS: 00007f5577c0a740(0000) GS:ffffa0169fc00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f5577a19972 CR3: 0000000125a7a000 CR4: 0000000000750ef0 PKRU: 55555554 Call Trace: <TASK> rtw89_pci_ops_start+0x1c/0x70 [rtw89_pci 6cbc75429515c181cbc386478d5cfb32ffc5a0f8] rtw89_core_start+0xbe/0x160 [rtw89_core fe07ecb874820b6d778370d4acb6ef8a37847f22] rtw89_ops_start+0x26/0x40 [rtw89_core fe07ecb874820b6d778370d4acb6ef8a37847f22] drv_start+0x42/0x100 [mac80211 c07fa22af8c3cf3f7d7ab3884ca990784d72e2d2] ieee80211_do_open+0x311/0x7d0 [mac80211 c07fa22af8c3cf3f7d7ab3884ca990784d72e2d2] ieee80211_open+0x6a/0x90 [mac80211 c07fa22af8c3cf3f7d7ab3884ca990784d72e2d2] __dev_open+0xe0/0x180 __dev_change_flags+0x1da/0x250 dev_change_flags+0x26/0x70 do_setlink+0x37c/0x12c0 ? ep_poll_callback+0x246/0x290 ? __nla_validate_parse+0x61/0xd00 ? __wake_up_common_lock+0x8f/0xd0
To fix this, follow Jonas' suggestion to switch the order of these functions and move register netdev to be the last step of PCI probe. Also, correct the error handling of rtw89_core_register_hw().
--- drivers/net/wireless/realtek/rtw89/core.c | 10 +++++++--- drivers/net/wireless/realtek/rtw89/pci.c | 19 ++++++++++--------- 2 files changed, 17 insertions(+), 12 deletions(-)
drivers/net/wireless/realtek/rtw89/core.c +7 -3
@@ -3374,18 +3374,22 @@ static int rtw89_core_register_hw(struct ret =ieee80211_register_hw (hw);if (ret) {rtw89_err (rtwdev,"failed to register hw\n" ); - goto err; + goto err_free_supported_band; } ret =rtw89_regd_init (rtwdev, rtw89_regd_notifier);if (ret) {rtw89_err (rtwdev,"failed to init regd\n" ); - goto err; + goto err_unregister_hw; }return 0 ; -err: +err_unregister_hw: +ieee80211_unregister_hw (hw); +err_free_supported_band: +rtw89_core_clr_supported_band (rtwdev); +return ret; }
drivers/net/wireless/realtek/rtw89/pci.c +10 -9
@@ -3874,25 +3874,26 @@ int rtw89_pci_probe(struct pci_dev *pdevrtw89_pci_link_cfg (rtwdev);rtw89_pci_l1ss_cfg (rtwdev); - ret =rtw89_core_register (rtwdev); -if (ret) { -rtw89_err (rtwdev,"failed to register core\n" ); - goto err_clear_resource; - } -rtw89_core_napi_init (rtwdev); ret =rtw89_pci_request_irq (rtwdev, pdev);if (ret) {rtw89_err (rtwdev,"failed to request pci irq\n" ); - goto err_unregister; + goto err_deinit_napi; + } + + ret =rtw89_core_register (rtwdev); +if (ret) { +rtw89_err (rtwdev,"failed to register core\n" ); + goto err_free_irq; }return 0 ; -err_unregister: +err_free_irq: +rtw89_pci_free_irq (rtwdev, pdev); +err_deinit_napi:rtw89_core_napi_deinit (rtwdev); -rtw89_core_unregister (rtwdev); err_clear_resource:rtw89_pci_clear_resource (rtwdev, pdev); err_declaim_pci:
Greg Kroah-Hartman
maintainerPATCH 637/663 clk: microchip: fix potential UAF in auxdev release callback
In reply to Greg Kroah-HartmanFrom: Conor Dooley <[email protected]>
commit 7455b7007b9e93bcc2bc9c1c6c73a228e3152069 upstream.
Similar to commit 1c11289b34ab ("peci: cpu: Fix use-after-free in adev_release()"), the auxiliary device is not torn down in the correct order. If auxiliary_device_add() fails, the release callback will be called twice, resulting in a UAF. Due to timing, the auxdev code in this driver "took inspiration" from the aforementioned commit, and thus its bugs too!
Moving auxiliary_device_uninit() to the unregister callback instead avoids the issue.
--- drivers/clk/microchip/clk-mpfs.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/clk/microchip/clk-mpfs.c +1 -2
@@ -374,14 +374,13 @@ static void mpfs_reset_unregister_adev(vstruct auxiliary_device *adev = _adev;auxiliary_device_delete (adev); +auxiliary_device_uninit (adev); }static void mpfs_reset_adev_release (struct device *dev) {struct auxiliary_device *adev =to_auxiliary_dev (dev); -auxiliary_device_uninit (adev); -kfree (adev); }
Greg Kroah-Hartman
maintainerPATCH 638/663 clk: rockchip: rk3399: allow clk_cifout to force clk_cifout_src to reparent
In reply to Greg Kroah-HartmanFrom: Quentin Schulz <[email protected]>
commit 933bf364e152cd60902cf9585c2ba310d593e69f upstream.
clk_cifout is derived from clk_cifout_src through an integer divider limited to 32. clk_cifout_src is a child of either cpll, gpll or npll without any possibility of a divider of any sort. The default clock parent is cpll.
Let's allow clk_cifout to ask its parent clk_cifout_src to reparent in order to find the real closest possible rate for clk_cifout and not one derived from cpll only.
--- drivers/clk/rockchip/clk-rk3399.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk-rk3399.c +1 -1
@@ -1263,7 +1263,7 @@ static struct rockchip_clk_branch rk3399 RK3399_CLKSEL_CON(56), 6, 2, MFLAGS, RK3399_CLKGATE_CON(10), 7, GFLAGS), -COMPOSITE_NOGATE (SCLK_CIF_OUT ,"clk_cifout" , mux_clk_cif_p,0 , +COMPOSITE_NOGATE (SCLK_CIF_OUT ,"clk_cifout" , mux_clk_cif_p,CLK_SET_RATE_PARENT , RK3399_CLKSEL_CON(56), 5, 1, MFLAGS, 0, 5, DFLAGS),/* gic */
Greg Kroah-Hartman
maintainerPATCH 639/663 scripts/gdb: fix lx-timerlist for Python3
In reply to Greg Kroah-HartmanFrom: Peng Liu <[email protected]>
commit 7362042f3556528e9e9b1eb5ce8d7a3a6331476b upstream.
Below incompatibilities between Python2 and Python3 made lx-timerlist fail to run under Python3.
o xrange() is replaced by range() in Python3
o bytes and str are different types in Python3
o the return value of Inferior.read_memory() is memoryview object in Python3
akpm: cc stable so that older kernels are properly debuggable under newer Python.
--- scripts/gdb/linux/timerlist.py | 4 +++- scripts/gdb/linux/utils.py | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-)
scripts/gdb/linux/timerlist.py +3 -1
@@ -73,7 +73,7 @@ def print_cpu(hrtimer_bases, cpu, max_cl ts = cpus.per_cpu(tick_sched_ptr, cpu) text = "cpu: {}\n".format(cpu) - for i in xrange(max_clock_bases): + for i in range(max_clock_bases): text += " clock {}:\n".format(i) text += print_base(cpu_base['clock_base'][i])
@@ -158,6 +158,8 @@ def pr_cpumask(mask): num_bytes = (nr_cpu_ids + 7) / 8 buf = utils.read_memoryview(inf, bits, num_bytes).tobytes() buf = binascii.b2a_hex(buf) + if type(buf) is not str: + buf=buf.decode() chunks = [] i = num_bytes
scripts/gdb/linux/utils.py +4 -1
@@ -88,7 +88,10 @@ def get_target_endianness(): def read_memoryview(inf, start, length): - return memoryview(inf.read_memory(start, length)) + m = inf.read_memory(start, length) + if type(m) is memoryview: + return m + return memoryview(m) def read_u16(buffer, offset):
Greg Kroah-Hartman
maintainerPATCH 640/663 btrfs: scrub: reject unsupported scrub flags
In reply to Greg Kroah-HartmanFrom: Qu Wenruo <[email protected]>
commit 604e6681e114d05a2e384c4d1e8ef81918037ef5 upstream.
Since the introduction of scrub interface, the only flag that we support is BTRFS_SCRUB_READONLY. Thus there is no sanity checks, if there are some undefined flags passed in, we just ignore them.
This is problematic if we want to introduce new scrub flags, as we have no way to determine if such flags are supported.
Address the problem by introducing a check for the flags, and if unsupported flags are set, return -EOPNOTSUPP to inform the user space.
This check should be backported for all supported kernels before any new scrub flags are introduced.
--- fs/btrfs/ioctl.c | 5 +++++ include/uapi/linux/btrfs.h | 1 + 2 files changed, 6 insertions(+)
fs/btrfs/ioctl.c +5 -0
@@ -3160,6 +3160,11 @@ static long btrfs_ioctl_scrub(struct filif (IS_ERR (sa))return PTR_ERR (sa); +if (sa->flags & ~BTRFS_SCRUB_SUPPORTED_FLAGS ) { + ret = -EOPNOTSUPP ; + goto out; + } +if (!(sa->flags &BTRFS_SCRUB_READONLY )) { ret =mnt_want_write_file (file);if (ret)
include/uapi/linux/btrfs.h +1 -0
@@ -187,6 +187,7 @@ struct btrfs_scrub_progress { };#define BTRFS_SCRUB_READONLY 1 +#define BTRFS_SCRUB_SUPPORTED_FLAGS (BTRFS_SCRUB_READONLY)struct btrfs_ioctl_scrub_args {__u64 devid;/* in */ __u64 start;/* in */
Greg Kroah-Hartman
maintainerPATCH 641/663 s390/dasd: fix hanging blockdevice after request requeue
In reply to Greg Kroah-HartmanFrom: Stefan Haberland <[email protected]>
commit d8898ee50edecacdf0141f26fd90acf43d7e9cd7 upstream.
The DASD driver does not kick the requeue list when requeuing IO requests to the blocklayer. This might lead to hanging blockdevice when there is no other trigger for this.
Fix by automatically kick the requeue list when requeuing DASD requests to the blocklayer.
--- drivers/s390/block/dasd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/s390/block/dasd.c +1 -1
@@ -2941,7 +2941,7 @@ static int _dasd_requeue_request(structreturn 0 ;spin_lock_irq (&cqr->dq->lock); req = (struct request *) cqr->callback_data; -blk_mq_requeue_request (req, false); +blk_mq_requeue_request (req, true);spin_unlock_irq (&cqr->dq->lock);return 0 ;
Greg Kroah-Hartman
maintainerPATCH 642/663 ia64: fix an addr to taddr in huge_pte_offset()
In reply to Greg Kroah-HartmanFrom: Hugh Dickins <[email protected]>
commit 3647ebcfbfca384840231fe13fae665453238a61 upstream.
I know nothing of ia64 htlbpage_to_page(), but guess that the p4d line should be using taddr rather than addr, like everywhere else.
--- arch/ia64/mm/hugetlbpage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/ia64/mm/hugetlbpage.c +1 -1
@@ -58,7 +58,7 @@ huge_pte_offset (struct mm_struct *mm, u pgd =pgd_offset (mm, taddr);if (pgd_present (*pgd)) { - p4d =p4d_offset (pgd, addr); + p4d =p4d_offset (pgd, taddr);if (p4d_present (*p4d)) { pud =pud_offset (p4d, taddr);if (pud_present (*pud)) {
Greg Kroah-Hartman
maintainerPATCH 643/663 mm/mempolicy: correctly update prev when policy is equal on mbind
In reply to Greg Kroah-HartmanFrom: Lorenzo Stoakes <[email protected]>
commit 00ca0f2e86bf40b016a646e6323a8941a09cf106 upstream.
The refactoring in commit f4e9e0e69468 ("mm/mempolicy: fix use-after-free of VMA iterator") introduces a subtle bug which arises when attempting to apply a new NUMA policy across a range of VMAs in mbind_range().
The refactoring passes a **prev pointer to keep track of the previous VMA in order to reduce duplication, and in all but one case it keeps this correctly updated.
The bug arises when a VMA within the specified range has an equivalent policy as determined by mpol_equal() - which unlike other cases, does not update prev.
This can result in a situation where, later in the iteration, a VMA is found whose policy does need to change. At this point, vma_merge() is invoked with prev pointing to a VMA which is before the previous VMA.
Since vma_merge() discovers the curr VMA by looking for the one immediately after prev, it will now be in a situation where this VMA is incorrect and the merge will not proceed correctly.
This is checked in the VM_WARN_ON() invariant case with end > curr->vm_end, which, if a merge is possible, results in a warning (if CONFIG_DEBUG_VM is specified).
I note that vma_merge() performs these invariant checks only after merge_prev/merge_next are checked, which is debatable as it hides this issue if no merge is possible even though a buggy situation has arisen.
The solution is simply to update the prev pointer even when policies are equal.
This caused a bug to arise in the 6.2.y stable tree, and this patch resolves this bug.
--- mm/mempolicy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/mempolicy.c +3 -1
@@ -802,8 +802,10 @@ static int mbind_range(struct vma_iterat vmstart = vma->vm_start; } -if (mpol_equal (vma_policy (vma), new_pol)) +if (mpol_equal (vma_policy (vma), new_pol)) { + *prev = vma;return 0 ; + } pgoff = vma->vm_pgoff + ((vmstart - vma->vm_start) >>PAGE_SHIFT ); merged = vma_merge(vma->vm_mm, *prev, vmstart, vmend, vma->vm_flags,
Greg Kroah-Hartman
maintainerPATCH 644/663 vhost_vdpa: fix unmap process in no-batch mode
In reply to Greg Kroah-HartmanFrom: Cindy Lu <[email protected]>
commit c82729e06644f4e087f5ff0f91b8fb15e03b8890 upstream.
While using the vdpa device with vIOMMU enabled
in the guest VM, when the vdpa device bind to vfio-pci and run testpmd then system will fail to unmap.
The test process is
Load guest VM --> attach to virtio driver--> bind to vfio-pci driver So the mapping process is
1)batched mode map to normal MR
2)batched mode unmapped the normal MR
3)unmapped all the memory
4)mapped to iommu MR
This error happened in step 3). The iotlb was freed in step 2) and the function vhost_vdpa_process_iotlb_msg will return fail Which causes failure.
To fix this, we will not remove the AS while the iotlb->nmaps is 0. This will free in the vhost_vdpa_clean
Message-Id: <[email protected]>
--- drivers/vhost/vdpa.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/vhost/vdpa.c +1 -7
@@ -819,11 +819,7 @@ static void vhost_vdpa_unmap(struct vhosif (!v->in_batch) ops->set_map (vdpa, asid, iotlb); } -/* If we are in the middle of batch processing, delay the free -* of AS until BATCH_END. -*/ -if (!v->in_batch && !iotlb->nmaps) -vhost_vdpa_remove_as (v, asid); + } static int vhost_vdpa_va_map(struct vhost_vdpa *v,
@@ -1080,8 +1076,6 @@ static int vhost_vdpa_process_iotlb_msg(if (v->in_batch && ops->set_map) ops->set_map (vdpa, asid, iotlb); v->in_batch = false; -if (!iotlb->nmaps) -vhost_vdpa_remove_as (v, asid);break ;default : r = -EINVAL ;
Greg Kroah-Hartman
maintainerPATCH 645/663 dm verity: fix error handling for check_at_most_once on FEC
In reply to Greg Kroah-HartmanFrom: Yeongjin Gil <[email protected]>
commit e8c5d45f82ce0c238a4817739892fe8897a3dcc3 upstream.
In verity_end_io(), if bi_status is not BLK_STS_OK, it can be return directly. But if FEC configured, it is desired to correct the data page through verity_verify_io. And the return value will be converted to blk_status and passed to verity_finish_io().
BTW, when a bit is set in v->validated_blocks, verity_verify_io() skips verification regardless of I/O error for the corresponding bio. In this case, the I/O error could not be returned properly, and as a result, there is a problem that abnormal data could be read for the corresponding block.
To fix this problem, when an I/O error occurs, do not skip verification even if the bit related is set in v->validated_blocks.
--- drivers/md/dm-verity-target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-verity-target.c +1 -1
@@ -523,7 +523,7 @@ static int verity_verify_io(struct dm_vesector_t cur_block = io->block + b;struct ahash_request *req =verity_io_hash_req (v, io); -if (v->validated_blocks && +if (v->validated_blocks && bio->bi_status ==BLK_STS_OK &&likely (test_bit (cur_block, v->validated_blocks))) {verity_bv_skip_block (v, io, iter);continue ;
Greg Kroah-Hartman
maintainerPATCH 646/663 dm clone: call kmem_cache_destroy() in dm_clone_init() error path
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 6827af4a9a9f5bb664c42abf7c11af4978d72201 upstream.
Otherwise the _hydration_cache will leak if dm_register_target() fails.
--- drivers/md/dm-clone-target.c | 1 + 1 file changed, 1 insertion(+)
drivers/md/dm-clone-target.c +1 -0
@@ -2205,6 +2205,7 @@ static int __init dm_clone_init(void) r =dm_register_target (&clone_target);if (r <0 ) {DMERR ("Failed to register clone target" ); +kmem_cache_destroy (_hydration_cache);return r; }
Greg Kroah-Hartman
maintainerPATCH 647/663 dm integrity: call kmem_cache_destroy() in dm_integrity_init() error path
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 6b79a428c02769f2a11f8ae76bf866226d134887 upstream.
Otherwise the journal_io_cache will leak if dm_register_target() fails.
--- drivers/md/dm-integrity.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/md/dm-integrity.c +5 -3
@@ -4646,11 +4646,13 @@ static int __init dm_integrity_init(void } r =dm_register_target (&integrity_target); - -if (r <0 ) +if (r <0 ) {DMERR ("register failed %d" , r); +kmem_cache_destroy (journal_io_cache); +return r; + } -return r; +return 0 ; } static void __exit dm_integrity_exit(void)
Greg Kroah-Hartman
maintainerPATCH 648/663 dm flakey: fix a crash with invalid table line
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
commit 98dba02d9a93eec11bffbb93c7c51624290702d2 upstream.
This command will crash with NULL pointer dereference:
dmsetup create flakey --table \
"0 blockdev --getsize /dev/ram0 flakey /dev/ram0 0 0 1 2 corrupt_bio_byte 512"
Fix the crash by checking if arg_name is non-NULL before comparing it.
--- drivers/md/dm-flakey.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/md/dm-flakey.c +2 -2
@@ -124,9 +124,9 @@ static int parse_features(struct dm_arg_* Direction r or w? */ arg_name =dm_shift_arg (as); -if (!strcasecmp (arg_name,"w" )) +if (arg_name && !strcasecmp (arg_name,"w" )) fc->corrupt_bio_rw =WRITE ; -else if (!strcasecmp (arg_name,"r" )) +else if (arg_name && !strcasecmp (arg_name,"r" )) fc->corrupt_bio_rw =READ ;else { ti->error ="Invalid corrupt bio direction (r or w)" ;
Greg Kroah-Hartman
maintainerPATCH 649/663 dm ioctl: fix nested locking in table_clear() to remove deadlock concern
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
commit 3d32aaa7e66d5c1479a3c31d6c2c5d45dd0d3b89 upstream.
syzkaller found the following problematic rwsem locking (with write lock already held):
down_read+0x9d/0x450 kernel/locking/rwsem.c:1509 dm_get_inactive_table+0x2b/0xc0 drivers/md/dm-ioctl.c:773 __dev_status+0x4fd/0x7c0 drivers/md/dm-ioctl.c:844 table_clear+0x197/0x280 drivers/md/dm-ioctl.c:1537
In table_clear, it first acquires a write lock
https://elixir.bootlin.com/linux/v6.2/source/drivers/md/dm-ioctl.c#L1520down_write(&_hash_lock);
Then before the lock is released at L1539, there is a path shown above:table_clear -> __dev_status -> dm_get_inactive_table -> down_read
https://elixir.bootlin.com/linux/v6.2/source/drivers/md/dm-ioctl.c#L773down_read(&_hash_lock);
It tries to acquire the same read lock again, resulting in the deadlock problem.
Fix this by moving table_clear()'s __dev_status() call to after its up_write(&_hash_lock);
--- drivers/md/dm-ioctl.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/md/dm-ioctl.c +4 -3
@@ -1539,11 +1539,12 @@ static int table_clear(struct file *filp has_new_map = true; } - param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; - -__dev_status (hc->md, param); md = hc->md;up_write (&_hash_lock); + + param->flags &= ~DM_INACTIVE_PRESENT_FLAG ; +__dev_status (md, param); +if (old_map) {dm_sync_table (md);dm_table_destroy (old_map);
Greg Kroah-Hartman
maintainerPATCH 650/663 dm: dont lock fs when the map is NULL in process of resume
In reply to Greg Kroah-HartmanFrom: Li Lingfeng <[email protected]>
commit 38d11da522aacaa05898c734a1cec86f1e611129 upstream.
Commit fa247089de99 ("dm: requeue IO if mapping table not yet available") added a detection of whether the mapping table is available in the IO submission process. If the mapping table is unavailable, it returns BLK_STS_RESOURCE and requeues the IO.
This can lead to the following deadlock problem:
dm create mountioctl(DM_DEV_CREATE_CMD)ioctl(DM_TABLE_LOAD_CMD)
do_mount
vfs_get_tree
ext4_get_tree
get_tree_bdev
sget_fc
alloc_super
// got &s->s_umount
down_write_nested(&s->s_umount, ...);
ext4_fill_super
ext4_load_super
ext4_read_bh
submit_bio
// submit and wait io endioctl(DM_DEV_SUSPEND_CMD)dev_suspend
do_resume
dm_suspend
__dm_suspend
lock_fs
freeze_bdev
get_active_super
grab_super
// wait for &s->s_umount
down_write(&s->s_umount);
dm_swap_table
__bind
// set md->map(can't get here)IO will be continuously requeued while holding the lock since mapping table is NULL. At the same time, mapping table won't be set since the lock is not available.
Like request-based DM, bio-based DM also has the same problem.
It's not proper to just abort IO if the mapping table not available. So clear DM_SKIP_LOCKFS_FLAG when the mapping table is NULL, this allows the DM table to be loaded and the IO submitted upon resume.
--- drivers/md/dm-ioctl.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/md/dm-ioctl.c +4 -1
@@ -1151,10 +1151,13 @@ static int do_resume(struct dm_ioctl *pa/* Do we need to load a new map ? */ if (new_map) {sector_t old_size, new_size; +int srcu_idx;/* Suspend if it isn't already suspended */ -if (param->flags &DM_SKIP_LOCKFS_FLAG ) + old_map =dm_get_live_table (md, &srcu_idx); +if ((param->flags &DM_SKIP_LOCKFS_FLAG ) || !old_map) suspend_flags &= ~DM_SUSPEND_LOCKFS_FLAG ; +dm_put_live_table (md, srcu_idx);if (param->flags &DM_NOFLUSH_FLAG ) suspend_flags |=DM_SUSPEND_NOFLUSH_FLAG ;if (!dm_suspended_md (md))
Greg Kroah-Hartman
maintainerPATCH 651/663 blk-iocost: avoid 64-bit division in ioc_timer_fn
In reply to Greg Kroah-HartmanFrom: Arnd Bergmann <[email protected]>
commit 5f2779dfa7b8cc7dfd4a1b6586d86e0d193266f3 upstream.
The behavior of 'enum' types has changed in gcc-13, so now the UNBUSY_THR_PCT constant is interpreted as a 64-bit number because it is defined as part of the same enum definition as some other constants that do not fit within a 32-bit integer. This in turn leads to some inefficient code on 32-bit architectures as well as a link error:
arm-linux-gnueabi/bin/arm-linux-gnueabi-ld: block/blk-iocost.o: in function `ioc_timer_fn':
blk-iocost.c:(.text+0x68e8): undefined reference to `__aeabi_uldivmod'
arm-linux-gnueabi-ld: blk-iocost.c:(.text+0x6908): undefined reference to `__aeabi_uldivmod'
Split the enum definition to keep the 64-bit timing constants in a separate enum type from those constants that can clearly fit within a smaller type.
--- block/blk-iocost.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
block/blk-iocost.c +5 -3
@@ -258,6 +258,11 @@ enum {VRATE_MIN =VTIME_PER_USEC *VRATE_MIN_PPM /MILLION ,VRATE_CLAMP_ADJ_PCT =4 , +/* switch iff the conditions are met for longer than this */ + AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, +}; + +enum {/* if IOs end up waiting for requests, issue less */ RQ_WAIT_BUSY_PCT = 5,
@@ -296,9 +301,6 @@ enum {/* don't let cmds which take a very long time pin lagging for too long */ MAX_LAGGING_PERIODS = 10, -/* switch iff the conditions are met for longer than this */ - AUTOP_CYCLE_NSEC = 10LLU * NSEC_PER_SEC, -/* * Count IO size in 4k pages. The 12bit shift helps keeping * size-proportional components of cost calculation in closer
Greg Kroah-Hartman
maintainerPATCH 652/663 cifs: fix potential use-after-free bugs in TCP_Server_Info::hostname
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 90c49fce1c43e1cc152695e20363ff5087897c09 upstream.
TCP_Server_Info::hostname may be updated once or many times during reconnect, so protect its access outside reconnect path as well and then prevent any potential use-after-free bugs.
--- fs/cifs/cifs_debug.c | 7 ++++++- fs/cifs/cifs_debug.h | 12 ++++++------ fs/cifs/connect.c | 10 +++++++--- fs/cifs/sess.c | 7 ++++--- 4 files changed, 23 insertions(+), 13 deletions(-)
fs/cifs/cifs_debug.c +6 -1
@@ -279,8 +279,10 @@ static int cifs_debug_data_proc_show(strseq_printf (m,"\n%d) ConnectionId: 0x%llx " , c, server->conn_id); +spin_lock (&server->srv_lock);if (server->hostname)seq_printf (m,"Hostname: %s " , server->hostname); +spin_unlock (&server->srv_lock);#ifdef CONFIG_CIFS_SMB_DIRECT if (!server->rdma) goto skip_rdma;
@@ -620,10 +622,13 @@ static int cifs_stats_proc_show(struct s server->fastest_cmd[j], server->slowest_cmd[j]);for (j =0 ; j <NUMBER_OF_SMB2_COMMANDS ; j++) -if (atomic_read (&server->smb2slowcmd[j])) +if (atomic_read (&server->smb2slowcmd[j])) { +spin_lock (&server->srv_lock);seq_printf (m," %d slow responses from %s for command %d\n" ,atomic_read (&server->smb2slowcmd[j]), server->hostname, j); +spin_unlock (&server->srv_lock); + }#endif /* STATS2 */ list_for_each_entry (ses, &server->smb_ses_list, smb_ses_list) {list_for_each_entry (tcon, &ses->tcon_list, tcon_list) {
fs/cifs/cifs_debug.h +6 -6
@@ -81,19 +81,19 @@ do { \#define cifs_server_dbg_func (ratefunc, type, fmt, ...) \ do { \ - const char *sn = ""; \ - if (server && server->hostname) \ - sn = server->hostname; \ + spin_lock(&server->srv_lock); \ if ((type) & FYI && cifsFYI & CIFS_INFO) { \ pr_debug_ ## ratefunc("%s: \\\\%s " fmt, \ - __FILE__, sn, ##__VA_ARGS__); \ + __FILE__, server->hostname, \ + ##__VA_ARGS__); \ } else if ((type) & VFS) { \ pr_err_ ## ratefunc("VFS: \\\\%s " fmt, \ - sn, ##__VA_ARGS__); \ + server->hostname, ##__VA_ARGS__); \ } else if ((type) & NOISY && (NOISY != 0)) { \ pr_debug_ ## ratefunc("\\\\%s " fmt, \ - sn, ##__VA_ARGS__); \ + server->hostname, ##__VA_ARGS__); \ } \ + spin_unlock(&server->srv_lock); \ } while (0)#define cifs_server_dbg (type, fmt, ...) \
fs/cifs/connect.c +7 -3
@@ -435,8 +435,10 @@ static int __reconnect_target_unlocked(sif (server->hostname != target) { hostname =extract_hostname (target);if (!IS_ERR (hostname)) { +spin_lock (&server->srv_lock);kfree (server->hostname); server->hostname = hostname; +spin_unlock (&server->srv_lock); }else {cifs_dbg (FYI ,"%s: couldn't extract hostname or address from dfs target: %ld\n" , __func__,PTR_ERR (hostname));
@@ -593,9 +595,7 @@ cifs_echo_request(struct work_struct *wo goto requeue_echo; rc = server->ops->echo ? server->ops->echo (server) : -ENOSYS ; -if (rc) -cifs_dbg (FYI ,"Unable to send echo request to server: %s\n" , - server->hostname); +cifs_server_dbg (FYI ,"send echo request: rc = %d\n" , rc);/* Check witness registrations */ cifs_swn_check ();
@@ -1445,6 +1445,8 @@ static int match_server(struct TCP_Serve {struct sockaddr *addr = (struct sockaddr *)&ctx->dstaddr; +lockdep_assert_held (&server->srv_lock); +if (ctx->nosharesock)return 0 ;
@@ -1859,7 +1861,9 @@ cifs_setup_ipc(struct cifs_ses *ses, strif (tcon ==NULL )return -ENOMEM ; +spin_lock (&server->srv_lock);scnprintf (unc,sizeof (unc),"\\\\%s\\IPC$" , server->hostname); +spin_unlock (&server->srv_lock); xid =get_xid (); tcon->ses = ses;
fs/cifs/sess.c +4 -3
@@ -159,6 +159,7 @@ cifs_chan_is_iface_active(struct cifs_se/* returns number of channels added */ int cifs_try_adding_channels (struct cifs_sb_info *cifs_sb,struct cifs_ses *ses) { +struct TCP_Server_Info *server = ses->server;int old_chan_count, new_chan_count;int left;int rc =0 ;
@@ -178,16 +179,16 @@ int cifs_try_adding_channels(struct cifsreturn 0 ; } -if (ses->server->dialect <SMB30_PROT_ID ) { +if (server->dialect <SMB30_PROT_ID ) {spin_unlock (&ses->chan_lock);cifs_dbg (VFS ,"multichannel is not supported on this protocol version, use 3.0 or above\n" );return 0 ; } -if (!(ses->server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL )) { +if (!(server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL )) { ses->chan_max =1 ;spin_unlock (&ses->chan_lock); -cifs_dbg (VFS ,"server %s does not support multichannel\n" , ses->server->hostname); +cifs_server_dbg (VFS ,"no multichannel support\n" );return 0 ; }spin_unlock (&ses->chan_lock);
Greg Kroah-Hartman
maintainerPATCH 653/663 cifs: protect session status check in smb2_reconnect()
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 5bff9f741af60b143a5ae73417a8ec47fd5ff2f4 upstream.
Use @ses->ses_lock to protect access of @ses->ses_status.
--- fs/cifs/smb2pdu.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
fs/cifs/smb2pdu.c +11 -4
@@ -175,8 +175,17 @@ smb2_reconnect(__le16 smb2_command, stru } }spin_unlock (&tcon->tc_lock); -if ((!tcon->ses) || (tcon->ses->ses_status ==SES_EXITING ) || - (!tcon->ses->server) || !server) + + ses = tcon->ses; +if (!ses) +return -EIO ; +spin_lock (&ses->ses_lock); +if (ses->ses_status ==SES_EXITING ) { +spin_unlock (&ses->ses_lock); +return -EIO ; + } +spin_unlock (&ses->ses_lock); +if (!ses->server || !server)return -EIO ;spin_lock (&server->srv_lock);
@@ -204,8 +213,6 @@ again:if (rc)return rc; - ses = tcon->ses; -spin_lock (&ses->chan_lock);if (!cifs_chan_needs_reconnect (ses, server) && !tcon->need_reconnect) {spin_unlock (&ses->chan_lock);
Greg Kroah-Hartman
maintainerPATCH 654/663 cifs: fix sharing of DFS connections
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 8e3554150d6c80a84b3cb046615d1a0e943811dc upstream.
When matching DFS connections, we can't rely on the values set in cifs_sb_info::prepath and cifs_tcon::tree_name as they might change during DFS failover. The DFS referrals related to a specific DFS tcon are already matched earlier in match_server(), therefore we can safely skip those checks altogether as the connection is guaranteed to be unique for the DFS tcon.
Besides, when creating or finding an SMB session, make sure to also refcount any DFS root session related to it (cifs_ses::dfs_root_ses), so if a new DFS mount ends up reusing the connection from the old mount while there was an umount(2) still in progress (e.g. umount(2) -> cifs_umount() -> reconnect -> cifs_put_tcon()), the connection could potentially be put right after the umount(2) finished.
Patch has minor update to include fix for unused variable issue noted by the kernel test robot
--- fs/cifs/cifsglob.h | 1 fs/cifs/cifsproto.h | 44 +++++++++++++++++++ fs/cifs/connect.c | 116 ++++++++++++++++++++++++++-------------------------- fs/cifs/dfs.c | 62 +++++++++++++++++++-------- fs/cifs/ioctl.c | 2 fs/cifs/smb2pdu.c | 4 - 6 files changed, 148 insertions(+), 81 deletions(-)
fs/cifs/cifsglob.h +0 -1
@@ -1768,7 +1768,6 @@ struct cifs_mount_ctx {struct TCP_Server_Info *server;struct cifs_ses *ses;struct cifs_tcon *tcon; -char *origin_fullpath, *leaf_fullpath;struct list_head dfs_ses_list; };
fs/cifs/cifsproto.h +43 -1
60 lines not on this page · raw message
fs/cifs/connect.c +59 -57
229 lines not on this page · raw message
fs/cifs/dfs.c +43 -19
102 lines not on this page · raw message
fs/cifs/ioctl.c +1 -1
@@ -239,7 +239,7 @@ static int cifs_dump_full_key(struct cif* section, we need to make sure it won't be released * so increment its refcount */ - ses->ses_count++; +cifs_smb_ses_inc_refcount (ses); found = true; goto search_end; }
fs/cifs/smb2pdu.c +2 -2
@@ -3858,7 +3858,7 @@ void smb2_reconnect_server(struct work_sif (ses->tcon_ipc && ses->tcon_ipc->need_reconnect) {list_add_tail (&ses->tcon_ipc->rlist, &tmp_list); tcon_selected = tcon_exist = true; - ses->ses_count++; +cifs_smb_ses_inc_refcount (ses); }/* * handle the case where channel needs to reconnect
@@ -3869,7 +3869,7 @@ void smb2_reconnect_server(struct work_sif (!tcon_selected &&cifs_chan_needs_reconnect (ses, server)) {list_add_tail (&ses->rlist, &tmp_ses_list); ses_exist = true; - ses->ses_count++; +cifs_smb_ses_inc_refcount (ses); }spin_unlock (&ses->chan_lock); }
Greg Kroah-Hartman
maintainerPATCH 655/663 cifs: fix potential race when tree connecting ipc
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit ee20d7c6100752eaf2409d783f4f1449c29ea33d upstream.
Protect access of TCP_Server_Info::hostname when building the ipc tree name as it might get freed in cifsd thread and thus causing an use-after-free bug in __tree_connect_dfs_target(). Also, while at it, update status of IPC tcon on success and then avoid any extra tree connects.
--- fs/cifs/dfs.c | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 50 insertions(+), 7 deletions(-)
fs/cifs/dfs.c +50 -7
@@ -398,6 +398,54 @@ static int target_share_matches_server(sreturn rc; } +static void __tree_connect_ipc (const unsigned int xid,char *tree, +struct cifs_sb_info *cifs_sb, +struct cifs_ses *ses) +{ +struct TCP_Server_Info *server = ses->server; +struct cifs_tcon *tcon = ses->tcon_ipc; +int rc; + +spin_lock (&ses->ses_lock); +spin_lock (&ses->chan_lock); +if (cifs_chan_needs_reconnect (ses, server) || + ses->ses_status !=SES_GOOD ) { +spin_unlock (&ses->chan_lock); +spin_unlock (&ses->ses_lock); +cifs_server_dbg (FYI ,"%s: skipping ipc reconnect due to disconnected ses\n" , + __func__); +return ; + } +spin_unlock (&ses->chan_lock); +spin_unlock (&ses->ses_lock); + +cifs_server_lock (server); +scnprintf (tree,MAX_TREE_SIZE ,"\\\\%s\\IPC$" , server->hostname); +cifs_server_unlock (server); + + rc = server->ops->tree_connect (xid, ses, tree, tcon, + cifs_sb->local_nls); +cifs_server_dbg (FYI ,"%s: tree_reconnect %s: %d\n" , __func__, tree, rc); +spin_lock (&tcon->tc_lock); +if (rc) { + tcon->status =TID_NEED_TCON ; + }else { + tcon->status =TID_GOOD ; + tcon->need_reconnect = false; + } +spin_unlock (&tcon->tc_lock); +} + +static void tree_connect_ipc (const unsigned int xid,char *tree, +struct cifs_sb_info *cifs_sb, +struct cifs_tcon *tcon) +{ +struct cifs_ses *ses = tcon->ses; + +__tree_connect_ipc (xid, tree, cifs_sb, ses); +__tree_connect_ipc (xid, tree, cifs_sb,CIFS_DFS_ROOT_SES (ses)); +} +static int __tree_connect_dfs_target (const unsigned int xid,struct cifs_tcon *tcon,struct cifs_sb_info *cifs_sb,char *tree,bool islink,struct dfs_cache_tgt_list *tl)
@@ -406,7 +454,6 @@ static int __tree_connect_dfs_target(construct TCP_Server_Info *server = tcon->ses->server;const struct smb_version_operations *ops = server->ops;struct cifs_ses *root_ses =CIFS_DFS_ROOT_SES (tcon->ses); -struct cifs_tcon *ipc = root_ses->tcon_ipc;char *share =NULL , *prefix =NULL ;struct dfs_cache_tgt_iterator *tit;bool target_match;
@@ -442,18 +489,14 @@ static int __tree_connect_dfs_target(con }dfs_cache_noreq_update_tgthint (server->current_fullpath +1 , tit); - -if (ipc->need_reconnect) { -scnprintf (tree,MAX_TREE_SIZE ,"\\\\%s\\IPC$" , server->hostname); - rc = ops->tree_connect (xid, ipc->ses, tree, ipc, cifs_sb->local_nls); -cifs_dbg (FYI ,"%s: reconnect ipc: %d\n" , __func__, rc); - } +tree_connect_ipc (xid, tree, cifs_sb, tcon);scnprintf (tree,MAX_TREE_SIZE ,"\\%s" , share);if (!islink) { rc = ops->tree_connect (xid, tcon->ses, tree, tcon, cifs_sb->local_nls);break ; } +/* * If no dfs referrals were returned from link target, then just do a TREE_CONNECT * to it. Otherwise, cache the dfs referral and then mark current tcp ses for
Greg Kroah-Hartman
maintainerPATCH 656/663 cifs: protect access of TCP_Server_Info::{origin,leaf}_fullpath
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 3dc9c433c9dde15477d02b609ccb4328e2adb6dc upstream.
Protect access of TCP_Server_Info::{origin,leaf}_fullpath when matching DFS connections, and get rid of TCP_Server_Info::current_fullpath while we're at it.
--- fs/cifs/cifsglob.h | 20 +++++++++++++------- fs/cifs/connect.c | 10 ++++++---- fs/cifs/dfs.c | 14 ++++++++------ fs/cifs/dfs.h | 13 +++++++++++-- fs/cifs/dfs_cache.c | 6 +++++- 5 files changed, 43 insertions(+), 20 deletions(-)
fs/cifs/cifsglob.h +13 -7
@@ -742,17 +742,23 @@ struct TCP_Server_Info {#endif struct mutex refpath_lock;/* protects leaf_fullpath */ /* -* Canonical DFS full paths that were used to chase referrals in mount and reconnect. +* origin_fullpath: Canonical copy of smb3_fs_context::source. +* It is used for matching existing DFS tcons. * -* origin_fullpath: first or original referral path -* leaf_fullpath: last referral path (might be changed due to nested links in reconnect) +* leaf_fullpath: Canonical DFS referral path related to this +* connection. +* It is used in DFS cache refresher, reconnect and may +* change due to nested DFS links. * -* current_fullpath: pointer to either origin_fullpath or leaf_fullpath -* NOTE: cannot be accessed outside cifs_reconnect() and smb2_reconnect() +* Both protected by @refpath_lock and @srv_lock. The @refpath_lock is +* mosly used for not requiring a copy of @leaf_fullpath when getting +* cached or new DFS referrals (which might also sleep during I/O). +* While @srv_lock is held for making string and NULL comparions against +* both fields as in mount(2) and cache refresh. * -* format: \\HOST\SHARE\[OPTIONAL PATH] +* format: \\HOST\SHARE[\OPTIONAL PATH] */ -char *origin_fullpath, *leaf_fullpath, *current_fullpath; +char *origin_fullpath, *leaf_fullpath; };static inline bool is_smb1 (struct TCP_Server_Info *server)
fs/cifs/connect.c +6 -4
@@ -486,7 +486,6 @@ static int reconnect_target_unlocked(strstatic int reconnect_dfs_server (struct TCP_Server_Info *server) {int rc =0 ; -const char *refpath = server->current_fullpath +1 ;struct dfs_cache_tgt_list tl =DFS_CACHE_TGT_LIST_INIT (tl);struct dfs_cache_tgt_iterator *target_hint =NULL ;int num_targets =0 ;
@@ -499,8 +498,10 @@ static int reconnect_dfs_server(struct T* through /proc/fs/cifs/dfscache or the target list is empty due to server settings after * refreshing the referral, so, in this case, default it to 1. */ -if (!dfs_cache_noreq_find (refpath,NULL , &tl)) +mutex_lock (&server->refpath_lock); +if (!dfs_cache_noreq_find (server->leaf_fullpath +1 ,NULL , &tl)) num_targets =dfs_cache_get_nr_tgts (&tl); +mutex_unlock (&server->refpath_lock);if (!num_targets) num_targets =1 ;
@@ -544,7 +545,9 @@ static int reconnect_dfs_server(struct Tmod_delayed_work (cifsiod_wq, &server->reconnect,0 ); }while (server->tcpStatus == CifsNeedReconnect); -dfs_cache_noreq_update_tgthint (refpath, target_hint); +mutex_lock (&server->refpath_lock); +dfs_cache_noreq_update_tgthint (server->leaf_fullpath +1 , target_hint); +mutex_unlock (&server->refpath_lock);dfs_cache_free_tgts (&tl);/* Need to set up echo worker again once connection has been established */
@@ -1621,7 +1624,6 @@ cifs_get_tcp_session(struct smb3_fs_cont rc = -ENOMEM ; goto out_err; } - tcp_ses->current_fullpath = tcp_ses->leaf_fullpath; }if (ctx->nosharesock)
fs/cifs/dfs.c +8 -6
@@ -248,11 +248,12 @@ static int __dfs_mount_share(struct cifs tcon = mnt_ctx->tcon;mutex_lock (&server->refpath_lock); +spin_lock (&server->srv_lock);if (!server->origin_fullpath) { server->origin_fullpath = origin_fullpath; - server->current_fullpath = server->leaf_fullpath; origin_fullpath =NULL ; } +spin_unlock (&server->srv_lock);mutex_unlock (&server->refpath_lock);if (list_empty (&tcon->dfs_ses_list)) {
@@ -366,10 +367,11 @@ static int update_server_fullpath(struct rc =PTR_ERR (npath); }else {mutex_lock (&server->refpath_lock); +spin_lock (&server->srv_lock);kfree (server->leaf_fullpath); server->leaf_fullpath = npath; +spin_unlock (&server->srv_lock);mutex_unlock (&server->refpath_lock); - server->current_fullpath = server->leaf_fullpath; }return rc; }
@@ -474,7 +476,7 @@ static int __tree_connect_dfs_target(con share = prefix =NULL ;/* Check if share matches with tcp ses */ - rc =dfs_cache_get_tgt_share (server->current_fullpath +1 , tit, &share, &prefix); + rc =dfs_cache_get_tgt_share (server->leaf_fullpath +1 , tit, &share, &prefix);if (rc) {cifs_dbg (VFS ,"%s: failed to parse target share: %d\n" , __func__, rc);break ;
@@ -488,7 +490,7 @@ static int __tree_connect_dfs_target(concontinue ; } -dfs_cache_noreq_update_tgthint (server->current_fullpath +1 , tit); +dfs_cache_noreq_update_tgthint (server->leaf_fullpath +1 , tit);tree_connect_ipc (xid, tree, cifs_sb, tcon);scnprintf (tree,MAX_TREE_SIZE ,"\\%s" , share);
@@ -602,8 +604,8 @@ int cifs_tree_connect(const unsigned int cifs_sb =CIFS_SB (sb);/* If it is not dfs or there was no cached dfs referral, then reconnect to same share */ -if (!server->current_fullpath || -dfs_cache_noreq_find (server->current_fullpath +1 , &ref, &tl)) { +if (!server->leaf_fullpath || +dfs_cache_noreq_find (server->leaf_fullpath +1 , &ref, &tl)) { rc = ops->tree_connect (xid, tcon->ses, tcon->tree_name, tcon, cifs_sb->local_nls); goto out; }
fs/cifs/dfs.h +11 -2
@@ -43,8 +43,12 @@ static inline char *dfs_get_automount_desize_t len;char *s; -if (unlikely (!server->origin_fullpath)) +spin_lock (&server->srv_lock); +if (unlikely (!server->origin_fullpath)) { +spin_unlock (&server->srv_lock);return ERR_PTR (-EREMOTE ); + } +spin_unlock (&server->srv_lock); s =dentry_path_raw (dentry, page,PATH_MAX );if (IS_ERR (s))
@@ -53,13 +57,18 @@ static inline char *dfs_get_automount_deif (!s[1 ]) s++; +spin_lock (&server->srv_lock); len =strlen (server->origin_fullpath); -if (s < (char *)page + len) +if (s < (char *)page + len) { +spin_unlock (&server->srv_lock);return ERR_PTR (-ENAMETOOLONG ); + } s -= len;memcpy (s, server->origin_fullpath, len); +spin_unlock (&server->srv_lock);convert_delimiter (s,'/' ); +return s; }
fs/cifs/dfs_cache.c +5 -1
@@ -1278,8 +1278,12 @@ static void refresh_cache_worker(structspin_lock (&cifs_tcp_ses_lock);list_for_each_entry (server, &cifs_tcp_ses_list, tcp_ses_list) { -if (!server->leaf_fullpath) +spin_lock (&server->srv_lock); +if (!server->leaf_fullpath) { +spin_unlock (&server->srv_lock);continue ; + } +spin_unlock (&server->srv_lock);list_for_each_entry (ses, &server->smb_ses_list, smb_ses_list) {if (ses->tcon_ipc) {
Greg Kroah-Hartman
maintainerPATCH 657/663 thunderbolt: Use correct type in tb_port_is_clx_enabled() prototype
In reply to Greg Kroah-HartmanFrom: Jiri Slaby (SUSE) <[email protected]>
commit d31137619776f9c173a46a79bc7733a2b106061f upstream.
tb_port_is_clx_enabled() generates a valid warning with gcc-13:
drivers/thunderbolt/switch.c:1286:6: error: conflicting types for 'tb_port_is_clx_enabled' due to enum/integer mismatch; have 'bool(struct tb_port *, unsigned int)' ... drivers/thunderbolt/tb.h:1050:6: note: previous declaration of 'tb_port_is_clx_enabled' with type 'bool(struct tb_port *, enum tb_clx)' ...
I.e. the type of the 2nd parameter of tb_port_is_clx_enabled() in the declaration is unsigned int, while the definition spells enum tb_clx. Synchronize them to the former as the parameter is in fact a mask of the enum values.
--- drivers/thunderbolt/tb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/thunderbolt/tb.h +1 -1
@@ -1058,7 +1058,7 @@ void tb_port_lane_bonding_disable(structint tb_port_wait_for_link_width (struct tb_port *port,int width,int timeout_msec);int tb_port_update_credits (struct tb_port *port); -bool tb_port_is_clx_enabled (struct tb_port *port,enum tb_clx clx); +bool tb_port_is_clx_enabled (struct tb_port *port,unsigned int clx);int tb_switch_find_vse_cap (struct tb_switch *sw,enum tb_switch_vse_cap vsec);int tb_switch_find_cap (struct tb_switch *sw,enum tb_switch_cap cap);
Greg Kroah-Hartman
maintainerPATCH 658/663 perf auxtrace: Fix address filter entire kernel size
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 1f9f33ccf0320be21703d9195dd2b36a1c9a07cb upstream.
kallsyms is not completely in address order.
In find_entire_kern_cb(), calculate the kernel end from the maximum address not the last symbol.
Example:
Before:
$ sudo cat /proc/kallsyms | grep ' [twTw] ' | tail -1
ffffffffc00b8bd0 t bpf_prog_6deef7357e7b4530 [bpf]
$ sudo cat /proc/kallsyms | grep ' [twTw] ' | sort | tail -1
ffffffffc15e0cc0 t iwl_mvm_exit [iwlmvm]
$ perf.d093603a05aa record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
Address filter: filter 0xffffffff93200000/0x2ceba000After:
$ perf.8fb0f7a01f8e record -v --kcore -e intel_pt// --filter 'filter *' -- uname |& grep filter
Address filter: filter 0xffffffff93200000/0x2e3e2000--- tools/perf/util/auxtrace.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
tools/perf/util/auxtrace.c +4 -1
@@ -2444,6 +2444,7 @@ static int find_entire_kern_cb(void *arg char type, u64 start) {struct sym_args *args = arg; +u64 size;if (!kallsyms__is_function (type))return 0 ;
@@ -2453,7 +2454,9 @@ static int find_entire_kern_cb(void *arg args->start = start; }/* Don't know exactly where the kernel ends, so we add a page */ - args->size =round_up (start, page_size) + page_size - args->start; + size =round_up (start, page_size) + page_size - args->start; +if (size > args->size) + args->size = size;return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 659/663 perf intel-pt: Fix CYC timestamps after standalone CBR
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
commit 430635a0ef1ce958b7b4311f172694ece2c692b8 upstream.
After a standalone CBR (not associated with TSC), update the cycles reference timestamp and reset the cycle count, so that CYC timestamps are calculated relative to that point with the new frequency.
--- tools/perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +2 -0
@@ -1998,6 +1998,8 @@ static void intel_pt_calc_cbr(struct int decoder->cbr = cbr; decoder->cbr_cyc_to_tsc = decoder->max_non_turbo_ratio_fp / cbr; + decoder->cyc_ref_timestamp = decoder->timestamp; + decoder->cycle_cnt =0 ;intel_pt_mtc_cyc_cnt_cbr (decoder); }
Greg Kroah-Hartman
maintainerPATCH 660/663 i40e: Remove unused i40e status codes
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
commit 9d135352bb5d885a7b21417103423301a40c1b8b upstream.
In an effort to remove i40e status codes and replace them with standard kernel errornums, unused values of i40e_status_code were removed.
--- drivers/net/ethernet/intel/i40e/i40e_common.c | 70 -------------------------- drivers/net/ethernet/intel/i40e/i40e_status.h | 35 ------------- 2 files changed, 105 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -70
@@ -138,106 +138,40 @@ const char *i40e_stat_str(struct i40e_hwreturn "I40E_ERR_NVM" ;case I40E_ERR_NVM_CHECKSUM :return "I40E_ERR_NVM_CHECKSUM" ; -case I40E_ERR_PHY : -return "I40E_ERR_PHY" ;case I40E_ERR_CONFIG :return "I40E_ERR_CONFIG" ;case I40E_ERR_PARAM :return "I40E_ERR_PARAM" ; -case I40E_ERR_MAC_TYPE : -return "I40E_ERR_MAC_TYPE" ;case I40E_ERR_UNKNOWN_PHY :return "I40E_ERR_UNKNOWN_PHY" ; -case I40E_ERR_LINK_SETUP : -return "I40E_ERR_LINK_SETUP" ; -case I40E_ERR_ADAPTER_STOPPED : -return "I40E_ERR_ADAPTER_STOPPED" ;case I40E_ERR_INVALID_MAC_ADDR :return "I40E_ERR_INVALID_MAC_ADDR" ;case I40E_ERR_DEVICE_NOT_SUPPORTED :return "I40E_ERR_DEVICE_NOT_SUPPORTED" ; -case I40E_ERR_PRIMARY_REQUESTS_PENDING : -return "I40E_ERR_PRIMARY_REQUESTS_PENDING" ; -case I40E_ERR_INVALID_LINK_SETTINGS : -return "I40E_ERR_INVALID_LINK_SETTINGS" ; -case I40E_ERR_AUTONEG_NOT_COMPLETE : -return "I40E_ERR_AUTONEG_NOT_COMPLETE" ;case I40E_ERR_RESET_FAILED :return "I40E_ERR_RESET_FAILED" ; -case I40E_ERR_SWFW_SYNC : -return "I40E_ERR_SWFW_SYNC" ;case I40E_ERR_NO_AVAILABLE_VSI :return "I40E_ERR_NO_AVAILABLE_VSI" ;case I40E_ERR_NO_MEMORY :return "I40E_ERR_NO_MEMORY" ;case I40E_ERR_BAD_PTR :return "I40E_ERR_BAD_PTR" ; -case I40E_ERR_RING_FULL : -return "I40E_ERR_RING_FULL" ; -case I40E_ERR_INVALID_PD_ID : -return "I40E_ERR_INVALID_PD_ID" ; -case I40E_ERR_INVALID_QP_ID : -return "I40E_ERR_INVALID_QP_ID" ; -case I40E_ERR_INVALID_CQ_ID : -return "I40E_ERR_INVALID_CQ_ID" ; -case I40E_ERR_INVALID_CEQ_ID : -return "I40E_ERR_INVALID_CEQ_ID" ; -case I40E_ERR_INVALID_AEQ_ID : -return "I40E_ERR_INVALID_AEQ_ID" ;case I40E_ERR_INVALID_SIZE :return "I40E_ERR_INVALID_SIZE" ; -case I40E_ERR_INVALID_ARP_INDEX : -return "I40E_ERR_INVALID_ARP_INDEX" ; -case I40E_ERR_INVALID_FPM_FUNC_ID : -return "I40E_ERR_INVALID_FPM_FUNC_ID" ; -case I40E_ERR_QP_INVALID_MSG_SIZE : -return "I40E_ERR_QP_INVALID_MSG_SIZE" ; -case I40E_ERR_QP_TOOMANY_WRS_POSTED : -return "I40E_ERR_QP_TOOMANY_WRS_POSTED" ; -case I40E_ERR_INVALID_FRAG_COUNT : -return "I40E_ERR_INVALID_FRAG_COUNT" ;case I40E_ERR_QUEUE_EMPTY :return "I40E_ERR_QUEUE_EMPTY" ; -case I40E_ERR_INVALID_ALIGNMENT : -return "I40E_ERR_INVALID_ALIGNMENT" ; -case I40E_ERR_FLUSHED_QUEUE : -return "I40E_ERR_FLUSHED_QUEUE" ; -case I40E_ERR_INVALID_PUSH_PAGE_INDEX : -return "I40E_ERR_INVALID_PUSH_PAGE_INDEX" ; -case I40E_ERR_INVALID_IMM_DATA_SIZE : -return "I40E_ERR_INVALID_IMM_DATA_SIZE" ;case I40E_ERR_TIMEOUT :return "I40E_ERR_TIMEOUT" ; -case I40E_ERR_OPCODE_MISMATCH : -return "I40E_ERR_OPCODE_MISMATCH" ; -case I40E_ERR_CQP_COMPL_ERROR : -return "I40E_ERR_CQP_COMPL_ERROR" ; -case I40E_ERR_INVALID_VF_ID : -return "I40E_ERR_INVALID_VF_ID" ; -case I40E_ERR_INVALID_HMCFN_ID : -return "I40E_ERR_INVALID_HMCFN_ID" ; -case I40E_ERR_BACKING_PAGE_ERROR : -return "I40E_ERR_BACKING_PAGE_ERROR" ; -case I40E_ERR_NO_PBLCHUNKS_AVAILABLE : -return "I40E_ERR_NO_PBLCHUNKS_AVAILABLE" ; -case I40E_ERR_INVALID_PBLE_INDEX : -return "I40E_ERR_INVALID_PBLE_INDEX" ;case I40E_ERR_INVALID_SD_INDEX :return "I40E_ERR_INVALID_SD_INDEX" ;case I40E_ERR_INVALID_PAGE_DESC_INDEX :return "I40E_ERR_INVALID_PAGE_DESC_INDEX" ;case I40E_ERR_INVALID_SD_TYPE :return "I40E_ERR_INVALID_SD_TYPE" ; -case I40E_ERR_MEMCPY_FAILED : -return "I40E_ERR_MEMCPY_FAILED" ;case I40E_ERR_INVALID_HMC_OBJ_INDEX :return "I40E_ERR_INVALID_HMC_OBJ_INDEX" ;case I40E_ERR_INVALID_HMC_OBJ_COUNT :return "I40E_ERR_INVALID_HMC_OBJ_COUNT" ; -case I40E_ERR_INVALID_SRQ_ARM_LIMIT : -return "I40E_ERR_INVALID_SRQ_ARM_LIMIT" ; -case I40E_ERR_SRQ_ENABLED : -return "I40E_ERR_SRQ_ENABLED" ;case I40E_ERR_ADMIN_QUEUE_ERROR :return "I40E_ERR_ADMIN_QUEUE_ERROR" ;case I40E_ERR_ADMIN_QUEUE_TIMEOUT :
@@ -248,14 +182,10 @@ const char *i40e_stat_str(struct i40e_hwreturn "I40E_ERR_ADMIN_QUEUE_FULL" ;case I40E_ERR_ADMIN_QUEUE_NO_WORK :return "I40E_ERR_ADMIN_QUEUE_NO_WORK" ; -case I40E_ERR_BAD_IWARP_CQE : -return "I40E_ERR_BAD_IWARP_CQE" ;case I40E_ERR_NVM_BLANK_MODE :return "I40E_ERR_NVM_BLANK_MODE" ;case I40E_ERR_NOT_IMPLEMENTED :return "I40E_ERR_NOT_IMPLEMENTED" ; -case I40E_ERR_PE_DOORBELL_NOT_ENABLED : -return "I40E_ERR_PE_DOORBELL_NOT_ENABLED" ;case I40E_ERR_DIAG_TEST_FAILED :return "I40E_ERR_DIAG_TEST_FAILED" ;case I40E_ERR_NOT_READY :
drivers/net/ethernet/intel/i40e/i40e_status.h +0 -35
@@ -9,65 +9,30 @@ enum i40e_status_code {I40E_SUCCESS =0 ,I40E_ERR_NVM =-1 ,I40E_ERR_NVM_CHECKSUM =-2 , -I40E_ERR_PHY =-3 ,I40E_ERR_CONFIG =-4 ,I40E_ERR_PARAM =-5 , -I40E_ERR_MAC_TYPE =-6 ,I40E_ERR_UNKNOWN_PHY =-7 , -I40E_ERR_LINK_SETUP =-8 , -I40E_ERR_ADAPTER_STOPPED =-9 ,I40E_ERR_INVALID_MAC_ADDR =-10 ,I40E_ERR_DEVICE_NOT_SUPPORTED =-11 , -I40E_ERR_PRIMARY_REQUESTS_PENDING =-12 , -I40E_ERR_INVALID_LINK_SETTINGS =-13 , -I40E_ERR_AUTONEG_NOT_COMPLETE =-14 ,I40E_ERR_RESET_FAILED =-15 , -I40E_ERR_SWFW_SYNC =-16 ,I40E_ERR_NO_AVAILABLE_VSI =-17 ,I40E_ERR_NO_MEMORY =-18 ,I40E_ERR_BAD_PTR =-19 , -I40E_ERR_RING_FULL =-20 , -I40E_ERR_INVALID_PD_ID =-21 , -I40E_ERR_INVALID_QP_ID =-22 , -I40E_ERR_INVALID_CQ_ID =-23 , -I40E_ERR_INVALID_CEQ_ID =-24 , -I40E_ERR_INVALID_AEQ_ID =-25 ,I40E_ERR_INVALID_SIZE =-26 , -I40E_ERR_INVALID_ARP_INDEX =-27 , -I40E_ERR_INVALID_FPM_FUNC_ID =-28 , -I40E_ERR_QP_INVALID_MSG_SIZE =-29 , -I40E_ERR_QP_TOOMANY_WRS_POSTED =-30 , -I40E_ERR_INVALID_FRAG_COUNT =-31 ,I40E_ERR_QUEUE_EMPTY =-32 , -I40E_ERR_INVALID_ALIGNMENT =-33 , -I40E_ERR_FLUSHED_QUEUE =-34 , -I40E_ERR_INVALID_PUSH_PAGE_INDEX =-35 , -I40E_ERR_INVALID_IMM_DATA_SIZE =-36 ,I40E_ERR_TIMEOUT =-37 , -I40E_ERR_OPCODE_MISMATCH =-38 , -I40E_ERR_CQP_COMPL_ERROR =-39 , -I40E_ERR_INVALID_VF_ID =-40 , -I40E_ERR_INVALID_HMCFN_ID =-41 , -I40E_ERR_BACKING_PAGE_ERROR =-42 , -I40E_ERR_NO_PBLCHUNKS_AVAILABLE =-43 , -I40E_ERR_INVALID_PBLE_INDEX =-44 ,I40E_ERR_INVALID_SD_INDEX =-45 ,I40E_ERR_INVALID_PAGE_DESC_INDEX =-46 ,I40E_ERR_INVALID_SD_TYPE =-47 , -I40E_ERR_MEMCPY_FAILED =-48 ,I40E_ERR_INVALID_HMC_OBJ_INDEX =-49 ,I40E_ERR_INVALID_HMC_OBJ_COUNT =-50 , -I40E_ERR_INVALID_SRQ_ARM_LIMIT =-51 , -I40E_ERR_SRQ_ENABLED =-52 ,I40E_ERR_ADMIN_QUEUE_ERROR =-53 ,I40E_ERR_ADMIN_QUEUE_TIMEOUT =-54 ,I40E_ERR_BUF_TOO_SHORT =-55 ,I40E_ERR_ADMIN_QUEUE_FULL =-56 ,I40E_ERR_ADMIN_QUEUE_NO_WORK =-57 , -I40E_ERR_BAD_IWARP_CQE =-58 ,I40E_ERR_NVM_BLANK_MODE =-59 ,I40E_ERR_NOT_IMPLEMENTED =-60 , -I40E_ERR_PE_DOORBELL_NOT_ENABLED =-61 ,I40E_ERR_DIAG_TEST_FAILED =-62 ,I40E_ERR_NOT_READY =-63 , I40E_NOT_SUPPORTED = -64,
Greg Kroah-Hartman
maintainerPATCH 661/663 i40e: Remove string printing for i40e_status
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
commit 5d968af27a166e055bdd5f832f095d809eadb992 upstream.
Remove the i40e_stat_str() function which prints the string representation of the i40e_status error code. With upcoming changes moving away from i40e_status, there will be no need for this function
--- drivers/net/ethernet/intel/i40e/i40e_client.c | 8 drivers/net/ethernet/intel/i40e/i40e_common.c | 78 ----- drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 16 - drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 41 +- drivers/net/ethernet/intel/i40e/i40e_main.c | 307 ++++++++++----------- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 4 drivers/net/ethernet/intel/i40e/i40e_prototype.h | 1 drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 28 - 8 files changed, 201 insertions(+), 282 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_client.c +4 -4
@@ -686,8 +686,8 @@ static int i40e_client_update_vsi_ctxt(s ctxt.flags =I40E_AQ_VSI_TYPE_PF ;if (err) {dev_info (&pf->pdev->dev, -"couldn't get PF vsi config, err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, err), +"couldn't get PF vsi config, err %d aq_err %s\n" , + err,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));return -ENOENT ;
@@ -714,8 +714,8 @@ static int i40e_client_update_vsi_ctxt(s err =i40e_aq_update_vsi_params (&vsi->back->hw, &ctxt,NULL );if (err) {dev_info (&pf->pdev->dev, -"update VSI ctxt for PE failed, err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, err), +"update VSI ctxt for PE failed, err %d aq_err %s\n" , + err,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status)); }
drivers/net/ethernet/intel/i40e/i40e_common.c +0 -78
84 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c +8 -8
@@ -135,8 +135,8 @@ static int i40e_dcbnl_ieee_setets(struct ret =i40e_hw_dcb_config (pf, &pf->tmp_cfg);if (ret) {dev_info (&pf->pdev->dev, -"Failed setting DCB ETS configuration err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, ret), +"Failed setting DCB ETS configuration err %d aq_err %s\n" , + ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));return -EINVAL ; }
@@ -174,8 +174,8 @@ static int i40e_dcbnl_ieee_setpfc(struct ret =i40e_hw_dcb_config (pf, &pf->tmp_cfg);if (ret) {dev_info (&pf->pdev->dev, -"Failed setting DCB PFC configuration err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, ret), +"Failed setting DCB PFC configuration err %d aq_err %s\n" , + ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));return -EINVAL ; }
@@ -225,8 +225,8 @@ static int i40e_dcbnl_ieee_setapp(struct ret =i40e_hw_dcb_config (pf, &pf->tmp_cfg);if (ret) {dev_info (&pf->pdev->dev, -"Failed setting DCB configuration err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, ret), +"Failed setting DCB configuration err %d aq_err %s\n" , + ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));return -EINVAL ; }
@@ -290,8 +290,8 @@ static int i40e_dcbnl_ieee_delapp(struct ret =i40e_hw_dcb_config (pf, &pf->tmp_cfg);if (ret) {dev_info (&pf->pdev->dev, -"Failed setting DCB configuration err %s aq_err %s\n" , -i40e_stat_str (&pf->hw, ret), +"Failed setting DCB configuration err %d aq_err %s\n" , + ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));return -EINVAL ; }
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +20 -21
97 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_main.c +153 -154
774 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_nvm.c +2 -2
@@ -1429,8 +1429,8 @@ static i40e_status i40e_nvmupd_exec_aq(s buff_size, &cmd_details);if (status) {i40e_debug (hw,I40E_DEBUG_NVM , -"i40e_nvmupd_exec_aq err %s aq_err %s\n" , -i40e_stat_str (hw, status), +"%s err %d aq_err %s\n" , + __func__, status,i40e_aq_str (hw, hw->aq.asq_last_status)); *perrno =i40e_aq_rc_to_posix (status, hw->aq.asq_last_status);return status;
drivers/net/ethernet/intel/i40e/i40e_prototype.h +0 -1
@@ -55,7 +55,6 @@ void i40e_idle_aq(struct i40e_hw *hw);bool i40e_check_asq_alive (struct i40e_hw *hw);i40e_status i40e_aq_queue_shutdown (struct i40e_hw *hw,bool unloading);const char *i40e_aq_str (struct i40e_hw *hw,enum i40e_admin_queue_err aq_err); -const char *i40e_stat_str (struct i40e_hw *hw,i40e_status stat_err);i40e_status i40e_aq_get_rss_lut (struct i40e_hw *hw,u16 seid,bool pf_lut,u8 *lut,u16 lut_size);
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +14 -14
@@ -1264,9 +1264,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf,int aq_err = pf->hw.aq.asq_last_status;dev_err (&pf->pdev->dev, -"VF %d failed to set multicast promiscuous mode err %s aq_err %s\n" , +"VF %d failed to set multicast promiscuous mode err %d aq_err %s\n" , vf->vf_id, -i40e_stat_str (&pf->hw, aq_ret), + aq_ret,i40e_aq_str (&pf->hw, aq_err));return aq_ret;
@@ -1280,9 +1280,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf,int aq_err = pf->hw.aq.asq_last_status;dev_err (&pf->pdev->dev, -"VF %d failed to set unicast promiscuous mode err %s aq_err %s\n" , +"VF %d failed to set unicast promiscuous mode err %d aq_err %s\n" , vf->vf_id, -i40e_stat_str (&pf->hw, aq_ret), + aq_ret,i40e_aq_str (&pf->hw, aq_err)); }
@@ -1297,9 +1297,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf,int aq_err = pf->hw.aq.asq_last_status;dev_err (&pf->pdev->dev, -"VF %d failed to set multicast promiscuous mode err %s aq_err %s\n" , +"VF %d failed to set multicast promiscuous mode err %d aq_err %s\n" , vf->vf_id, -i40e_stat_str (&pf->hw, aq_ret), + aq_ret,i40e_aq_str (&pf->hw, aq_err));if (!aq_tmp)
@@ -1313,9 +1313,9 @@ i40e_set_vsi_promisc(struct i40e_vf *vf,int aq_err = pf->hw.aq.asq_last_status;dev_err (&pf->pdev->dev, -"VF %d failed to set unicast promiscuous mode err %s aq_err %s\n" , +"VF %d failed to set unicast promiscuous mode err %d aq_err %s\n" , vf->vf_id, -i40e_stat_str (&pf->hw, aq_ret), + aq_ret,i40e_aq_str (&pf->hw, aq_err));if (!aq_tmp)
@@ -3615,8 +3615,8 @@ static void i40e_del_all_cloud_filters(s ret =i40e_add_del_cloud_filter (vsi, cfilter, false);if (ret)dev_err (&pf->pdev->dev, -"VF %d: Failed to delete cloud filter, err %s aq_err %s\n" , - vf->vf_id,i40e_stat_str (&pf->hw, ret), +"VF %d: Failed to delete cloud filter, err %d aq_err %s\n" , + vf->vf_id, ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status));
@@ -3718,8 +3718,8 @@ static int i40e_vc_del_cloud_filter(stru ret =i40e_add_del_cloud_filter (vsi, &cfilter, false);if (ret) {dev_err (&pf->pdev->dev, -"VF %d: Failed to delete cloud filter, err %s aq_err %s\n" , - vf->vf_id,i40e_stat_str (&pf->hw, ret), +"VF %d: Failed to delete cloud filter, err %d aq_err %s\n" , + vf->vf_id, ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status)); goto err; }
@@ -3852,8 +3852,8 @@ static int i40e_vc_add_cloud_filter(stru ret =i40e_add_del_cloud_filter (vsi, cfilter, true);if (ret) {dev_err (&pf->pdev->dev, -"VF %d: Failed to add cloud filter, err %s aq_err %s\n" , - vf->vf_id,i40e_stat_str (&pf->hw, ret), +"VF %d: Failed to add cloud filter, err %d aq_err %s\n" , + vf->vf_id, ret,i40e_aq_str (&pf->hw, pf->hw.aq.asq_last_status)); goto err_free; }
Greg Kroah-Hartman
maintainerPATCH 662/663 i40e: use int for i40e_status
In reply to Greg Kroah-HartmanFrom: Jan Sokolowski <[email protected]>
commit 5180ff1364bc26c031b54a68a80aa90ce0028b70 upstream.
To prepare for removal of i40e_status, change the variables from i40e_status to int. This eases the transition when values are changed to return standard int error codes over enum i40e_status.
As such changes often also change variable orders, a cleanup is also applied here to make variables conform to RCT and some lines are also reformatted where applicable.
--- drivers/net/ethernet/intel/i40e/i40e.h | 6 drivers/net/ethernet/intel/i40e/i40e_adminq.c | 68 - drivers/net/ethernet/intel/i40e/i40e_alloc.h | 22 drivers/net/ethernet/intel/i40e/i40e_client.c | 4 drivers/net/ethernet/intel/i40e/i40e_common.c | 890 ++++++++++----------- drivers/net/ethernet/intel/i40e/i40e_dcb.c | 60 - drivers/net/ethernet/intel/i40e/i40e_dcb.h | 28 drivers/net/ethernet/intel/i40e/i40e_ddp.c | 14 drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 8 drivers/net/ethernet/intel/i40e/i40e_diag.c | 12 drivers/net/ethernet/intel/i40e/i40e_diag.h | 4 drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 24 drivers/net/ethernet/intel/i40e/i40e_hmc.c | 56 - drivers/net/ethernet/intel/i40e/i40e_hmc.h | 44 - drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 94 +- drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 32 drivers/net/ethernet/intel/i40e/i40e_main.c | 97 +- drivers/net/ethernet/intel/i40e/i40e_nvm.c | 248 ++--- drivers/net/ethernet/intel/i40e/i40e_osdep.h | 1 drivers/net/ethernet/intel/i40e/i40e_prototype.h | 644 +++++++-------- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 66 - 21 files changed, 1220 insertions(+), 1202 deletions(-)
drivers/net/ethernet/intel/i40e/i40e.h +3 -3
@@ -1287,9 +1287,9 @@ void i40e_ptp_stop(struct i40e_pf *pf);int i40e_ptp_alloc_pins (struct i40e_pf *pf);int i40e_update_adq_vsi_queues (struct i40e_vsi *vsi,int vsi_offset);int i40e_is_vsi_uplink_mode_veb (struct i40e_vsi *vsi); -i40e_status i40e_get_partition_bw_setting (struct i40e_pf *pf); -i40e_status i40e_set_partition_bw_setting (struct i40e_pf *pf); -i40e_status i40e_commit_partition_bw_setting (struct i40e_pf *pf); +int i40e_get_partition_bw_setting (struct i40e_pf *pf); +int i40e_set_partition_bw_setting (struct i40e_pf *pf); +int i40e_commit_partition_bw_setting (struct i40e_pf *pf);void i40e_print_link_message (struct i40e_vsi *vsi,bool isup);void i40e_set_fec_in_flags (u8 fec_cfg,u32 *flags);
drivers/net/ethernet/intel/i40e/i40e_adminq.c +34 -34
214 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_alloc.h +11 -11
@@ -20,16 +20,16 @@ enum i40e_memory_type { };/* prototype for functions used for dynamic memory allocation */ -i40e_status i40e_allocate_dma_mem (struct i40e_hw *hw, -struct i40e_dma_mem *mem, -enum i40e_memory_type type, -u64 size,u32 alignment); -i40e_status i40e_free_dma_mem (struct i40e_hw *hw, -struct i40e_dma_mem *mem); -i40e_status i40e_allocate_virt_mem (struct i40e_hw *hw, -struct i40e_virt_mem *mem, -u32 size); -i40e_status i40e_free_virt_mem (struct i40e_hw *hw, -struct i40e_virt_mem *mem); +int i40e_allocate_dma_mem (struct i40e_hw *hw, +struct i40e_dma_mem *mem, +enum i40e_memory_type type, +u64 size,u32 alignment); +int i40e_free_dma_mem (struct i40e_hw *hw, +struct i40e_dma_mem *mem); +int i40e_allocate_virt_mem (struct i40e_hw *hw, +struct i40e_virt_mem *mem, +u32 size); +int i40e_free_virt_mem (struct i40e_hw *hw, +struct i40e_virt_mem *mem);#endif /* _I40E_ALLOC_H_ */
drivers/net/ethernet/intel/i40e/i40e_client.c +2 -2
@@ -541,7 +541,7 @@ static int i40e_client_virtchnl_send(str {struct i40e_pf *pf = ldev->pf;struct i40e_hw *hw = &pf->hw; -i40e_status err; +int err; err =i40e_aq_send_msg_to_vf (hw, vf_id,VIRTCHNL_OP_IWARP ,0 , msg, len,NULL );
@@ -674,7 +674,7 @@ static int i40e_client_update_vsi_ctxt(sstruct i40e_vsi *vsi = pf->vsi[pf->lan_vsi];struct i40e_vsi_context ctxt;bool update = true; -i40e_status err; +int err;/* TODO: for now do not allow setting VF's VSI setting */ if (is_vf)
drivers/net/ethernet/intel/i40e/i40e_common.c +451 -439
2,057 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_dcb.c +30 -30
152 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_dcb.h +14 -14
@@ -264,20 +264,20 @@ void i40e_dcb_hw_calculate_pool_sizes(stvoid i40e_dcb_hw_rx_pb_config (struct i40e_hw *hw,struct i40e_rx_pb_config *old_pb_cfg,struct i40e_rx_pb_config *new_pb_cfg); -i40e_status i40e_get_dcbx_status (struct i40e_hw *hw, -u16 *status); -i40e_status i40e_lldp_to_dcb_config (u8 *lldpmib, -struct i40e_dcbx_config *dcbcfg); -i40e_status i40e_aq_get_dcb_config (struct i40e_hw *hw,u8 mib_type, -u8 bridgetype, -struct i40e_dcbx_config *dcbcfg); -i40e_status i40e_get_dcb_config (struct i40e_hw *hw); -i40e_status i40e_init_dcb (struct i40e_hw *hw, -bool enable_mib_change); -enum i40e_status_code +int i40e_get_dcbx_status (struct i40e_hw *hw, +u16 *status); +int i40e_lldp_to_dcb_config (u8 *lldpmib, +struct i40e_dcbx_config *dcbcfg); +int i40e_aq_get_dcb_config (struct i40e_hw *hw,u8 mib_type, +u8 bridgetype, +struct i40e_dcbx_config *dcbcfg); +int i40e_get_dcb_config (struct i40e_hw *hw); +int i40e_init_dcb (struct i40e_hw *hw, +bool enable_mib_change); +int i40e_get_fw_lldp_status (struct i40e_hw *hw,enum i40e_get_fw_lldp_status_resp *lldp_status); -i40e_status i40e_set_dcb_config (struct i40e_hw *hw); -i40e_status i40e_dcb_config_to_lldp (u8 *lldpmib,u16 *miblen, -struct i40e_dcbx_config *dcbcfg); +int i40e_set_dcb_config (struct i40e_hw *hw); +int i40e_dcb_config_to_lldp (u8 *lldpmib,u16 *miblen, +struct i40e_dcbx_config *dcbcfg);#endif /* _I40E_DCB_H_ */
drivers/net/ethernet/intel/i40e/i40e_ddp.c +7 -7
@@ -36,7 +36,7 @@ static int i40e_ddp_does_profile_exist(s {struct i40e_ddp_profile_list *profile_list;u8 buff[I40E_PROFILE_LIST_SIZE ]; -i40e_status status; +int status;int i; status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0,
@@ -91,7 +91,7 @@ static int i40e_ddp_does_profile_overlap {struct i40e_ddp_profile_list *profile_list;u8 buff[I40E_PROFILE_LIST_SIZE ]; -i40e_status status; +int status;int i; status = i40e_aq_get_ddp_list(hw, buff, I40E_PROFILE_LIST_SIZE, 0,
@@ -117,14 +117,14 @@ static int i40e_ddp_does_profile_overlap* * Register a profile to the list of loaded profiles. */ -static enum i40e_status_code +static int i40e_add_pinfo (struct i40e_hw *hw,struct i40e_profile_segment *profile,u8 *profile_info_sec,u32 track_id) {struct i40e_profile_section_header *sec;struct i40e_profile_info *pinfo; -i40e_status status;u32 offset =0 , info =0 ; +int status; sec = (struct i40e_profile_section_header *)profile_info_sec; sec->tbl_size =1 ;
@@ -157,14 +157,14 @@ i40e_add_pinfo(struct i40e_hw *hw, struc* * Removes DDP profile from the NIC. **/ -static enum i40e_status_code +static int i40e_del_pinfo (struct i40e_hw *hw,struct i40e_profile_segment *profile,u8 *profile_info_sec,u32 track_id) {struct i40e_profile_section_header *sec;struct i40e_profile_info *pinfo; -i40e_status status;u32 offset =0 , info =0 ; +int status; sec = (struct i40e_profile_section_header *)profile_info_sec; sec->tbl_size =1 ;
@@ -270,12 +270,12 @@ int i40e_ddp_load(struct net_device *netstruct i40e_profile_segment *profile_hdr;struct i40e_profile_info pinfo;struct i40e_package_header *pkg_hdr; -i40e_status status;struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back;u32 track_id;int istatus; +int status; pkg_hdr = (struct i40e_package_header *)data;if (!i40e_ddp_is_pkg_hdr_valid (netdev, pkg_hdr, size))
drivers/net/ethernet/intel/i40e/i40e_debugfs.c +4 -4
@@ -918,9 +918,9 @@ static ssize_t i40e_dbg_command_write(stdev_info (&pf->pdev->dev,"deleting relay %d\n" , veb_seid);i40e_veb_release (pf->veb[i]); }else if (strncmp (cmd_buf,"add pvid" ,8 ) ==0 ) { -i40e_status ret; -u16 vid;unsigned int v; +int ret; +u16 vid; cnt =sscanf (&cmd_buf[8 ],"%i %u" , &vsi_seid, &v);if (cnt !=2 ) {
@@ -1284,7 +1284,7 @@ static ssize_t i40e_dbg_command_write(st } }else if (strncmp (cmd_buf,"send aq_cmd" ,11 ) ==0 ) {struct i40e_aq_desc *desc; -i40e_status ret; +int ret; desc =kzalloc (sizeof (struct i40e_aq_desc ),GFP_KERNEL );if (!desc)
@@ -1330,9 +1330,9 @@ static ssize_t i40e_dbg_command_write(st desc =NULL ; }else if (strncmp (cmd_buf,"send indirect aq_cmd" ,20 ) ==0 ) {struct i40e_aq_desc *desc; -i40e_status ret;u16 buffer_len;u8 *buff; +int ret; desc =kzalloc (sizeof (struct i40e_aq_desc ),GFP_KERNEL );if (!desc)
drivers/net/ethernet/intel/i40e/i40e_diag.c +6 -6
@@ -10,8 +10,8 @@* @reg: reg to be tested * @mask: bits to be touched **/ -static i40e_status i40e_diag_reg_pattern_test (struct i40e_hw *hw, -u32 reg,u32 mask) +static int i40e_diag_reg_pattern_test (struct i40e_hw *hw, +u32 reg,u32 mask) {static const u32 patterns[] = {0x5A5A5A5A ,0xA5A5A5A5 ,0x00000000 ,0xFFFFFFFF
@@ -74,9 +74,9 @@ const struct i40e_diag_reg_test_info i40* * Perform registers diagnostic test **/ -i40e_status i40e_diag_reg_test (struct i40e_hw *hw) +int i40e_diag_reg_test (struct i40e_hw *hw) { -i40e_status ret_code =0 ; +int ret_code =0 ;u32 reg, mask;u32 elements;u32 i, j;
@@ -115,9 +115,9 @@ i40e_status i40e_diag_reg_test(struct i4* * Perform EEPROM diagnostic test **/ -i40e_status i40e_diag_eeprom_test (struct i40e_hw *hw) +int i40e_diag_eeprom_test (struct i40e_hw *hw) { -i40e_status ret_code; +int ret_code;u16 reg_val;/* read NVM control word and if NVM valid, validate EEPROM checksum*/
drivers/net/ethernet/intel/i40e/i40e_diag.h +2 -2
@@ -22,7 +22,7 @@ struct i40e_diag_reg_test_info {extern const struct i40e_diag_reg_test_info i40e_reg_list[]; -i40e_status i40e_diag_reg_test (struct i40e_hw *hw); -i40e_status i40e_diag_eeprom_test (struct i40e_hw *hw); +int i40e_diag_reg_test (struct i40e_hw *hw); +int i40e_diag_eeprom_test (struct i40e_hw *hw);#endif /* _I40E_DIAG_H_ */
drivers/net/ethernet/intel/i40e/i40e_ethtool.c +12 -12
@@ -1226,8 +1226,8 @@ static int i40e_set_link_ksettings(strucstruct i40e_vsi *vsi = np->vsi;struct i40e_hw *hw = &pf->hw;bool autoneg_changed = false; -i40e_status status =0 ;int timeout =50 ; +int status =0 ;int err =0 ;__u32 speed;u8 autoneg;
@@ -1485,7 +1485,7 @@ static int i40e_set_fec_cfg(struct net_dstruct i40e_aq_get_phy_abilities_resp abilities;struct i40e_pf *pf = np->vsi->back;struct i40e_hw *hw = &pf->hw; -i40e_status status =0 ; +int status =0 ;u32 flags =0 ;int err =0 ;
@@ -1547,7 +1547,7 @@ static int i40e_get_fec_param(struct netstruct i40e_aq_get_phy_abilities_resp abilities;struct i40e_pf *pf = np->vsi->back;struct i40e_hw *hw = &pf->hw; -i40e_status status =0 ; +int status =0 ;int err =0 ;u8 fec_cfg;
@@ -1634,7 +1634,7 @@ static int i40e_nway_reset(struct net_destruct i40e_pf *pf = np->vsi->back;struct i40e_hw *hw = &pf->hw;bool link_up = hw->phy.link_info.link_info &I40E_AQ_LINK_UP ; -i40e_status ret =0 ; +int ret =0 ; ret =i40e_aq_set_link_restart_an (hw, link_up,NULL );if (ret) {
@@ -1699,9 +1699,9 @@ static int i40e_set_pauseparam(struct nestruct i40e_link_status *hw_link_info = &hw->phy.link_info;struct i40e_dcbx_config *dcbx_cfg = &hw->local_dcbx_config;bool link_up = hw_link_info->link_info &I40E_AQ_LINK_UP ; -i40e_status status;u8 aq_failures;int err =0 ; +int status;u32 is_an;/* Changing the port's flow control is not supported if this isn't the
@@ -2583,8 +2583,8 @@ static u64 i40e_link_test(struct net_dev {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_pf *pf = np->vsi->back; -i40e_status status;bool link_up = false; +int status;netif_info (pf, hw, netdev,"link test\n" ); status =i40e_get_link_status (&pf->hw, &link_up);
@@ -2807,11 +2807,11 @@ static int i40e_set_phys_id(struct net_d enum ethtool_phys_id_state state) {struct i40e_netdev_priv *np =netdev_priv (netdev); -i40e_status ret =0 ;struct i40e_pf *pf = np->vsi->back;struct i40e_hw *hw = &pf->hw;int blink_freq =2 ;u16 temp_status; +int ret =0 ;switch (state) {case ETHTOOL_ID_ACTIVE :
@@ -5247,7 +5247,7 @@ static int i40e_set_priv_flags(struct nestruct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back;u32 reset_needed =0 ; -i40e_status status; +int status;u32 i, j; orig_flags =READ_ONCE (pf->flags);
@@ -5476,8 +5476,8 @@ static int i40e_get_module_info(struct nu32 sff8472_comp =0 ;u32 sff8472_swap =0 ;u32 sff8636_rev =0 ; -i40e_status status;u32 type =0 ; +int status;/* Check if firmware supports reading module EEPROM. */ if (!(hw->flags &I40E_HW_FLAG_AQ_PHY_ACCESS_CAPABLE )) {
@@ -5581,8 +5581,8 @@ static int i40e_get_module_eeprom(structstruct i40e_pf *pf = vsi->back;struct i40e_hw *hw = &pf->hw;bool is_sfp = false; -i40e_status status;u32 value =0 ; +int status;int i;if (!ee || !ee->len || !data)
@@ -5623,10 +5623,10 @@ static int i40e_get_eee(struct net_devic {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_aq_get_phy_abilities_resp phy_cfg; -enum i40e_status_code status =0 ;struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back;struct i40e_hw *hw = &pf->hw; +int status =0 ;/* Get initial PHY capabilities */ status =i40e_aq_get_phy_capabilities (hw, false, true, &phy_cfg,NULL );
@@ -5688,11 +5688,11 @@ static int i40e_set_eee(struct net_devic {struct i40e_netdev_priv *np =netdev_priv (netdev);struct i40e_aq_get_phy_abilities_resp abilities; -enum i40e_status_code status =I40E_SUCCESS ;struct i40e_aq_set_phy_config config;struct i40e_vsi *vsi = np->vsi;struct i40e_pf *pf = vsi->back;struct i40e_hw *hw = &pf->hw; +int status =I40E_SUCCESS ;__le16 eee_capability;/* Deny parameters we don't support */
drivers/net/ethernet/intel/i40e/i40e_hmc.c +28 -28
119 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_hmc.h +22 -22
50 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c +47 -47
75 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h +16 -16
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_main.c +49 -48
97 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_nvm.c +124 -124
248 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_osdep.h +0 -1
Lines of this file are not shown. View the raw message.
drivers/net/ethernet/intel/i40e/i40e_prototype.h +325 -319
644 lines not on this page · raw message
drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +33 -33
66 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.